diff --git a/.github/workflows/publish-nuget.yaml b/.github/workflows/publish-nuget.yaml
index 1b0e3595..5685ac66 100644
--- a/.github/workflows/publish-nuget.yaml
+++ b/.github/workflows/publish-nuget.yaml
@@ -46,7 +46,7 @@ jobs:
         env:
           NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}  
 
-      - name: Build
+      - name: Build and Package
         id: build
         shell: powershell
         run: |
diff --git a/.gitignore b/.gitignore
index 982e3b42..89c66054 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,295 @@
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/bin
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/bin
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/bin
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/bin
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/bin
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/bin
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj
-ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj
-ExtendedWPFToolkitSolution_35/.vs/Xceed.Wpf.Toolkit/v17
-ExtendedWPFToolkitSolution/.vs/Xceed.Wpf.Toolkit/v17
-*.vsidx
-ExtendedWPFToolkitSolution/.vs/ProjectEvaluation
-*.v2
-*.g.i.cs
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+**/Properties/launchSettings.json
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/ExtendedWPFToolkitSolution/Libs/READ_ME.txt b/ExtendedWPFToolkitSolution/Libs/READ_ME.txt
deleted file mode 100644
index 973d2375..00000000
--- a/ExtendedWPFToolkitSolution/Libs/READ_ME.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The file Xceed.Wpf.Samples.SampleData.dll has been created from Xceed.Silverlight.Samples.SampleData.dll of the Silverlight ListBox.
-Only the Silverlight has been changed to Wpf.
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.Samples.SampleData.dll b/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.Samples.SampleData.dll
deleted file mode 100644
index 050b99de..00000000
Binary files a/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.Samples.SampleData.dll and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs
deleted file mode 100644
index ec5cb4b8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 0d3b20a4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 0fb35ca9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Markup;
-
-// 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 Toolkit for WPF - AvalonDock Aero Theme")]
-[assembly: AssemblyDescription("This assembly implements the Aero Theme for the AvalonDock layout system.")]
-
-[assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct("Xceed Toolkit for WPF - AvalonDock")]
-[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
-
-
-
-// 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
-
-internal static class _XceedVersionInfo
-{
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-    public const string BaseVersion = "3.4";
-    [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
deleted file mode 100644
index 3316fb13..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfoCommon.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 3606e3ee..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml
+++ /dev/null
@@ -1,155 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor1}"
-                        StartPoint="0,0"
-                        EndPoint="1,0">
-      <LinearGradientBrush.GradientStops>
-         <GradientStop Color="#EBEEFA" Offset="0" />
-         <GradientStop Color="#F4F7FC" Offset="1" />
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor2}"
-                     Color="White"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor3}"
-                     Color="Black"/>
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor4}"
-                         StartPoint="0,0"
-                         EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStop Color="#CFCFCF" Offset="0" />
-         <GradientStop Color="#F2F2F2" Offset="1" />
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor5}"
-                     Color="#898C95"/>
-
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor6}"
-                         StartPoint="0,0"
-                         EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStop Color="#FCFDFE" Offset="0" />
-         <GradientStop Color="#D2E6FA" Offset="1" />
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor7}"
-                         StartPoint="0,0"
-                         EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStop Color="#ECF5FC" Offset="0" />
-         <GradientStop Color="#98B4D2" Offset="1" />
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor8}"
-                     Color="#D2E6FA"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor9}"
-                     Color="#FFF5F4EA"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor10}"
-                     Color="Black"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor11}"
-                     Color="#FFBBC0C7" />
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor12}"
-                     Color="#555564"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor13}"
-                     Color="White"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor14}"
-                     Color="#69A1BF"/>
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor15}"
-                         StartPoint="0,0"
-                         EndPoint="0,1">
-      <GradientStop Color="#8FADCE" Offset="0" />
-      <GradientStop Color="#BDD3EF" Offset="1" />
-   </LinearGradientBrush>
-
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor16}"
-                         StartPoint="0,0"
-                         EndPoint="0,1">
-      <GradientStop Color="#B7CAE0" Offset="0" />
-      <GradientStop Color="#E8F0FF" Offset="1" />
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor17}"
-                         StartPoint="0,0"
-                         EndPoint="0,1">
-      <GradientStop Color="#F7FCFE" Offset="0" />
-      <GradientStop Color="#81D0F1" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=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="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=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="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor26}"
-                         StartPoint="0,0"
-                         EndPoint="0,1">
-      <GradientStop Color="#F2F2F2" Offset="0" />
-      <GradientStop Color="#CFCFCF" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor27}"
-                         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="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor28}"
-                         Color="White"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor30}"
-        Color="#CED4DF"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor31}"
-        Color="#FFE8A6"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor32}"
-                     Color="#3C7FB1"/>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type at:AeroColors}, ResourceId=BaseColor33}"
-        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
deleted file mode 100644
index 92347555..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index f6889983..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableBottom.png and /dev/null 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
deleted file mode 100644
index db47a05e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableLeft.png and /dev/null 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
deleted file mode 100644
index 8595a905..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableRight.png and /dev/null 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
deleted file mode 100644
index 82fe2661..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableTop.png and /dev/null 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
deleted file mode 100644
index 3997ed0e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableBottom.png and /dev/null 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
deleted file mode 100644
index 0816f578..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableLeft.png and /dev/null 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
deleted file mode 100644
index 387bbdf5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableRight.png and /dev/null 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
deleted file mode 100644
index 7f12e82a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableTop.png and /dev/null 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
deleted file mode 100644
index 042f0110..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentBottom.png and /dev/null 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
deleted file mode 100644
index 9e1fcc99..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentInside.png and /dev/null 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
deleted file mode 100644
index 624755e3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentLeft.png and /dev/null 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
deleted file mode 100644
index 2fcab104..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentRight.png and /dev/null 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
deleted file mode 100644
index 1ff0015d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentTop.png and /dev/null 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
deleted file mode 100644
index 3387e44e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneEmpty.png and /dev/null 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
deleted file mode 100644
index a179fc52..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneLargeEmpty.png and /dev/null 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
deleted file mode 100644
index 4c50d26d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/HTabGroup.png and /dev/null 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
deleted file mode 100644
index b8f6ced2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/Locked.png and /dev/null 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
deleted file mode 100644
index abefd96b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide.png and /dev/null 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
deleted file mode 100644
index 87b66ced..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Black.png and /dev/null 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
deleted file mode 100644
index 470548dc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Dark.png and /dev/null 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
deleted file mode 100644
index 132bdfaf..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose.png and /dev/null 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
deleted file mode 100644
index abf709cb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Black.png and /dev/null 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
deleted file mode 100644
index 575e4fdb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Dark.png and /dev/null 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
deleted file mode 100644
index 86db3070..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu.png and /dev/null 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
deleted file mode 100644
index be081925..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Black.png and /dev/null 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
deleted file mode 100644
index 253f2a63..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Dark.png and /dev/null 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
deleted file mode 100644
index 79d8c2d0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize.png and /dev/null 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
deleted file mode 100644
index 42ae679a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Black.png and /dev/null 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
deleted file mode 100644
index e28e0607..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Dark.png and /dev/null 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
deleted file mode 100644
index 653373ce..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu.png and /dev/null 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
deleted file mode 100644
index 31e2f102..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Black.png and /dev/null 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
deleted file mode 100644
index 25a47678..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Dark.png and /dev/null 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
deleted file mode 100644
index 1bccead4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore.png and /dev/null 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
deleted file mode 100644
index 7c7e0032..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Black.png and /dev/null 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
deleted file mode 100644
index f3ebfe4c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Dark.png and /dev/null 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
deleted file mode 100644
index c3f279f7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/VTabGroup.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
deleted file mode 100644
index 0bbf9bac..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
+++ /dev/null
@@ -1,1992 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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" />
-  <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
-
-  <!--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  Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
-                   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="Images/PinDocMenu_Dark.png" >
-                </Image>
-              </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="Images/PinDocMenu_Black.png" />
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="MenuDropDownButton"
-                     Value="True">
-              <Setter Property="Content"
-                      TargetName="MenuDropDownButton">
-                <Setter.Value>
-                  <Image Source="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="Images/PinMenu_Dark.png" >
-                </Image>
-              </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="Images/PinAutoHide_Dark.png" >
-                </Image>
-              </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="Images/PinClose_Dark.png" >
-                </Image>
-              </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.CanClose, RelativeSource={RelativeSource Mode=Self}}"
-                         Value="True">
-              <Setter Property="Command"
-                      TargetName="PART_HidePin"
-                      Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="ToolTip"
-                      TargetName="PART_HidePin"
-                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-
-            </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="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="MenuDropDownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgMenuPin"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_AutoHidePin"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgAutoHidePin"
-                      Value="Images/PinAutoHide_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_HidePin"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgHidePin"
-                      Value="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="Images/DockAnchorableLeft.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetRight"
-                     VerticalAlignment="Center"
-                     HorizontalAlignment="Right"
-                     Source="Images/DockAnchorableRight.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetBottom"
-                     VerticalAlignment="Bottom"
-                     HorizontalAlignment="Center"
-                     Source="Images/DockAnchorableBottom.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetTop"
-                     VerticalAlignment="Top"
-                     HorizontalAlignment="Center"
-                     Source="Images/DockAnchorableTop.PNG"
-                     Stretch="None" >
-              </Image>
-            </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="Images/DockPaneEmpty.png"
-                       Stretch="None"
-                       Margin="0,0.5,0,-0.5" >
-                </Image>
-                <Border Name="PART_AnchorablePaneDropTargetTop"
-                        Grid.Column="1"
-                        Grid.Row="0"
-                        Margin="0,3.5,0, 0">
-                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetRight"
-                        Grid.Column="2"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetBottom"
-                        Grid.Column="1"
-                        Grid.Row="2"
-                        Margin="0,-0.5,0,0">
-                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetLeft"
-                        Grid.Column="0"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetInto"
-                        Grid.Column="1"
-                        Grid.Row="1"
-                        Margin="0,0.5,0,0">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </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="Images/DockPaneEmpty.PNG"
-                       Stretch="None" >
-                </Image>
-                <Border Name="PART_DocumentPaneDropTargetTop"
-                        Grid.Column="1"
-                        Grid.Row="0"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentTop.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetRight"
-                        Grid.Column="2"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentRight.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetBottom"
-                        Grid.Column="1"
-                        Grid.Row="2"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentBottom.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetLeft"
-                        Grid.Column="0"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentLeft.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetInto"
-                        Grid.Column="1"
-                        Grid.Row="1">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </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="Images/DockPaneLargeEmpty.PNG"
-                       Stretch="None" >
-                </Image>
-                <Border Name="PART_DocumentPaneFullDropTargetTop"
-                        Grid.Column="2"
-                        Grid.Row="1">
-                  <Image Source="Images/DockDocumentTop.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetRight"
-                        Grid.Column="3"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentRight.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetBottom"
-                        Grid.Column="2"
-                        Grid.Row="3">
-                  <Image Source="Images/DockDocumentBottom.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetLeft"
-                        Grid.Column="1"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentLeft.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetInto"
-                        Grid.Column="2"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-
-                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
-                        Grid.Column="2"
-                        Grid.Row="0">
-                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
-                        Grid.Column="4"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
-                        Grid.Column="2"
-                        Grid.Row="4">
-                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
-                        Grid.Column="0"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-
-              </Grid>
-            </Grid>
-
-          </Canvas>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentHeaderTemplate">
-    <TextBlock Text="{Binding Title}"
-               TextTrimming="CharacterEllipsis" >
-    </TextBlock>
-  </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" >
-      </Image>
-      <TextBlock x:Name="title"
-                 Margin="4,0,0,0"
-                 Text="{Binding Title}"
-                 TextTrimming="CharacterEllipsis"
-                 Grid.Column="1" >
-      </TextBlock>
-    </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" >
-    </TextBlock>
-  </DataTemplate>
-
-  <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableTitleTemplate">
-    <TextBlock Text="{Binding Title}"
-               TextTrimming="CharacterEllipsis" >
-    </TextBlock>
-  </DataTemplate>
-
-  <DataTemplate x:Key="AvalonDock_ThemeAero_IconContentTemplate">
-    <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
-           Stretch="Uniform" >
-    </Image>
-  </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.Document_Close}"
-              Command="{Binding Path=CloseCommand}"
-              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
-              Command="{Binding Path=HideCommand}">
-      <MenuItem.Visibility>
-        <MultiBinding Converter="{StaticResource AnchorableContextMenuHideVisibilityConverter}">
-          <Binding Path="IsEnabled"
-                   RelativeSource="{RelativeSource Self}"
-                   Mode="OneWay"
-                   Converter="{StaticResource BoolToVisibilityConverter}" />
-          <Binding Path="CanClose" />
-        </MultiBinding>
-      </MenuItem.Visibility>
-    </MenuItem>
-  </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_CloseAll}"
-              Command="{Binding Path=CloseAllCommand}" />
-    <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="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="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}}"
-                              ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                              ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, 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}">
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Border Grid.ColumnSpan="3"
-                        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="2"
-                        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="Images/PinClose_Dark.png" >
-                  </Image>
-                </Button>
-              </Grid>
-            </Border>
-          </avalonDockControls:DropDownControlArea>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding Path=IsSelected}"
-                           Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding Path=IsActive}"
-                         Value="true">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-            </DataTrigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-            </MultiDataTrigger>
-            <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}}" >
-                </avalonDockControls:DropDownControlArea>
-              </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="BorderThickness"
-            Value="1" />
-    <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="{TemplateBinding BorderThickness}"
-                    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="Images/PinMenu_Dark.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinMaximize_Dark.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinRestore_Dark.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinClose_Dark.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="ContextMenuDropdownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinMaximize"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinRestore"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinClose"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinClose"
-                      Value="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="BorderBrush"
-            Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}" />
-    <Setter Property="BorderThickness"
-            Value="4" />
-    <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="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}">
-              <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="Images/PinMenu_Dark.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinMaximize_Dark.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinRestore_Dark.png"
-                              Width="13" >
-                      </Image>
-                    </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="Images/PinClose_Dark.png"
-                             Width="13" >
-                      </Image>
-                    </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>
-            <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}"
-                         Value="True">
-              <Setter Property="Command"
-                      TargetName="PART_PinClose"
-                      Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="ToolTip"
-                      TargetName="PART_PinClose"
-                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-
-            </DataTrigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="SinglePaneContextMenu"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="SinglePaneContextMenu"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinMaximize"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinRestore"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinClose"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinClose"
-                      Value="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} }" >
-                    </Image>
-                    <TextBlock x:Name="selectedElementTitle"
-                               Text="{Binding SelectedDocument.LayoutElement.Title}"
-                               TextTrimming="CharacterEllipsis"
-                               Grid.Column="1"
-                               VerticalAlignment="Center"
-                               FontWeight="Bold"
-                               Margin="4,0,0,0" >
-                    </TextBlock>
-                  </Grid>
-                  <TextBlock x:Name="selectedElementDescription"
-                             Text="{Binding SelectedDocument.LayoutElement.Description}"
-                             TextTrimming="CharacterEllipsis"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                </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" >
-                      </TextBlock>
-                      <ListBox x:Name="PART_AnchorableListBox"
-                               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" >
-                              </Image>
-                              <TextBlock Text="{Binding LayoutElement.Title}"
-                                         TextTrimming="CharacterEllipsis"
-                                         Grid.Column="1"
-                                         Margin="4,0,0,0" >
-                              </TextBlock>
-                            </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" >
-                      </TextBlock>
-                      <ListBox x:Name="PART_DocumentListBox"
-                               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" >
-                              </Image>
-                              <TextBlock Text="{Binding LayoutElement.Title}"
-                                         TextTrimming="CharacterEllipsis"
-                                         Grid.Column="1"
-                                         Margin="4,0,0,0" >
-                              </TextBlock>
-                            </Grid>
-                          </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemsPanel>
-                          <ItemsPanelTemplate>
-                            <WrapPanel Orientation="Vertical" />
-                          </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                      </ListBox>
-                    </Grid>
-                  </Grid>
-                </Border>
-
-                <Grid Grid.Row="2"
-                      Margin="5">
-                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                </Grid>
-              </Grid>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="SelectedDocument"
-                     Value="{x:Null}">
-              <Setter Property="Text"
-                      Value="{Binding SelectedAnchorable.LayoutElement.Title}"
-                      TargetName="selectedElementTitle" />
-              <Setter Property="Text"
-                      Value="{x:Null}"
-                      TargetName="selectedElementDescription" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </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
deleted file mode 100644
index 9cd16fb2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj
+++ /dev/null
@@ -1,128 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj" />
-  </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>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Brushes.baml
deleted file mode 100644
index f2fc70fd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index c65238fb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Theme.baml
deleted file mode 100644
index 7558b5b0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Theme.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt
deleted file mode 100644
index 38d68938..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Theme.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources
deleted file mode 100644
index 9216728b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
deleted file mode 100644
index 556f4e24..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/obj/Release/Xceed.Wpf.AvalonDock.Themes.Aero_MarkupCompile.lref
+++ /dev/null
@@ -1,5 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Aero\Theme.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/sn.snk and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
deleted file mode 100644
index 80be6b75..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Markup;
-
-// 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 Toolkit for WPF - AvalonDock Metro Theme")]
-[assembly: AssemblyDescription("This assembly implements the Metro Theme for the AvalonDock layout system.")]
-
-[assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct("Xceed Toolkit for WPF - AvalonDock")]
-[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
-
-
-
-// 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
-
-internal static class _XceedVersionInfo
-{
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-    public const string BaseVersion = "3.4";
-    [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
deleted file mode 100644
index 3316fb13..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfoCommon.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 4a3e67b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index a786a61f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableBottom.png and /dev/null 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
deleted file mode 100644
index 1499c434..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableLeft.png and /dev/null 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
deleted file mode 100644
index e6802ba3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableRight.png and /dev/null 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
deleted file mode 100644
index cd79f578..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableTop.png and /dev/null 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
deleted file mode 100644
index 00436bba..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableBottom.png and /dev/null 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
deleted file mode 100644
index 6500b08c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableLeft.png and /dev/null 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
deleted file mode 100644
index a71a8c50..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableRight.png and /dev/null 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
deleted file mode 100644
index 2ac77654..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableTop.png and /dev/null 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
deleted file mode 100644
index c5bed349..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentBottom.png and /dev/null 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
deleted file mode 100644
index 038ac8b3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentInside.png and /dev/null 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
deleted file mode 100644
index d77a43f2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentLeft.png and /dev/null 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
deleted file mode 100644
index 83322201..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentRight.png and /dev/null 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
deleted file mode 100644
index f8e075d9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentTop.png and /dev/null 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
deleted file mode 100644
index 8ad11767..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneEmpty.png and /dev/null 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
deleted file mode 100644
index 8205a034..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneLargeEmpty.png and /dev/null 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
deleted file mode 100644
index 4c50d26d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/HTabGroup.png and /dev/null 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
deleted file mode 100644
index b8f6ced2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/Locked.png and /dev/null 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
deleted file mode 100644
index abefd96b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide.png and /dev/null 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
deleted file mode 100644
index 87b66ced..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Black.png and /dev/null 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
deleted file mode 100644
index 470548dc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Dark.png and /dev/null 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
deleted file mode 100644
index 132bdfaf..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose.png and /dev/null 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
deleted file mode 100644
index abf709cb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Black.png and /dev/null 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
deleted file mode 100644
index 575e4fdb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Dark.png and /dev/null 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
deleted file mode 100644
index 86db3070..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu.png and /dev/null 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
deleted file mode 100644
index be081925..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu_Black.png and /dev/null 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
deleted file mode 100644
index 79d8c2d0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize.png and /dev/null 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
deleted file mode 100644
index 42ae679a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Black.png and /dev/null 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
deleted file mode 100644
index e28e0607..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Dark.png and /dev/null 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
deleted file mode 100644
index 653373ce..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu.png and /dev/null 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
deleted file mode 100644
index 31e2f102..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Black.png and /dev/null 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
deleted file mode 100644
index 25a47678..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Dark.png and /dev/null 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
deleted file mode 100644
index 1bccead4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore.png and /dev/null 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
deleted file mode 100644
index 7c7e0032..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Black.png and /dev/null 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
deleted file mode 100644
index f3ebfe4c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Dark.png and /dev/null 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
deleted file mode 100644
index c3f279f7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/VTabGroup.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs
deleted file mode 100644
index 1223c096..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
deleted file mode 100644
index 1027b5d7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
+++ /dev/null
@@ -1,2059 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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" />
-  <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
-
-  <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>
-
-  <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>
-
-  <!--DocumentPaneControlStyle-->
-  <Style x:Key="AvalonDock_ThemeMetro_DocumentPaneControlStyle"
-         TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
-    <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  Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
-                   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="Images/PinDocMenu.png" >
-                </Image>
-              </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="Images/PinDocMenu_Black.png" />
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="MenuDropDownButton"
-                     Value="True">
-              <Setter Property="Content"
-                      TargetName="MenuDropDownButton">
-                <Setter.Value>
-                  <Image Source="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="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="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="Images/PinMenu.png" >
-                </Image>
-              </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="Images/PinAutoHide.png" >
-                </Image>
-              </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="Images/PinClose.png" >
-                </Image>
-              </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.CanClose, RelativeSource={RelativeSource Mode=Self}}"
-                         Value="True">
-              <Setter Property="Command"
-                      TargetName="PART_HidePin"
-                      Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="ToolTip"
-                      TargetName="PART_HidePin"
-                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-
-            </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="Images/PinAutoHide_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgHidePin"
-                      Value="Images/PinClose_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgMenuPin"
-                      Value="Images/PinMenu_Dark.png" />
-            </DataTrigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="MenuDropDownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgMenuPin"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="MenuDropDownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgMenuPin"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_AutoHidePin"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgAutoHidePin"
-                      Value="Images/PinAutoHide_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_HidePin"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgHidePin"
-                      Value="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="Images/DockAnchorableLeft.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetRight"
-                     VerticalAlignment="Center"
-                     HorizontalAlignment="Right"
-                     Source="Images/DockAnchorableRight.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetBottom"
-                     VerticalAlignment="Bottom"
-                     HorizontalAlignment="Center"
-                     Source="Images/DockAnchorableBottom.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetTop"
-                     VerticalAlignment="Top"
-                     HorizontalAlignment="Center"
-                     Source="Images/DockAnchorableTop.PNG"
-                     Stretch="None" >
-              </Image>
-            </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="Images/DockPaneEmpty.png"
-                       Stretch="None"
-                       Margin="0,0.5,0,-0.5" >
-                </Image>
-                <Border Name="PART_AnchorablePaneDropTargetTop"
-                        Grid.Column="1"
-                        Grid.Row="0"
-                        Margin="0,3.5,0, 0">
-                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetRight"
-                        Grid.Column="2"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetBottom"
-                        Grid.Column="1"
-                        Grid.Row="2"
-                        Margin="0,-0.5,0,0">
-                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetLeft"
-                        Grid.Column="0"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetInto"
-                        Grid.Column="1"
-                        Grid.Row="1"
-                        Margin="0,0.5,0,0">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </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="Images/DockPaneEmpty.PNG"
-                       Stretch="None" >
-                </Image>
-                <Border Name="PART_DocumentPaneDropTargetTop"
-                        Grid.Column="1"
-                        Grid.Row="0"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentTop.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetRight"
-                        Grid.Column="2"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentRight.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetBottom"
-                        Grid.Column="1"
-                        Grid.Row="2"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentBottom.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetLeft"
-                        Grid.Column="0"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentLeft.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetInto"
-                        Grid.Column="1"
-                        Grid.Row="1">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </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="Images/DockPaneLargeEmpty.PNG"
-                       Stretch="None" >
-                </Image>
-                <Border Name="PART_DocumentPaneFullDropTargetTop"
-                        Grid.Column="2"
-                        Grid.Row="1">
-                  <Image Source="Images/DockDocumentTop.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetRight"
-                        Grid.Column="3"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentRight.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetBottom"
-                        Grid.Column="2"
-                        Grid.Row="3">
-                  <Image Source="Images/DockDocumentBottom.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetLeft"
-                        Grid.Column="1"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentLeft.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetInto"
-                        Grid.Column="2"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-
-                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
-                        Grid.Column="2"
-                        Grid.Row="0">
-                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
-                        Grid.Column="4"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
-                        Grid.Column="2"
-                        Grid.Row="4">
-                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
-                        Grid.Column="0"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-
-              </Grid>
-            </Grid>
-
-          </Canvas>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="AvalonDock_ThemeMetro_DocumentHeaderTemplate">
-    <TextBlock Text="{Binding Title}"
-               TextTrimming="CharacterEllipsis" >
-    </TextBlock>
-  </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" >
-      </Image>
-      <TextBlock x:Name="title"
-                 Margin="4,0,0,0"
-                 Text="{Binding Title}"
-                 TextTrimming="CharacterEllipsis"
-                 Grid.Column="1" >
-      </TextBlock>
-    </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" >
-    </TextBlock>
-  </DataTemplate>
-
-  <DataTemplate x:Key="AvalonDock_ThemeMetro_AnchorableTitleTemplate">
-    <TextBlock Text="{Binding Title}"
-               TextTrimming="CharacterEllipsis"
-               VerticalAlignment="Center" >
-    </TextBlock>
-  </DataTemplate>
-
-  <DataTemplate x:Key="AvalonDock_ThemeMetro_IconContentTemplate">
-    <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
-           Stretch="Uniform" >
-    </Image>
-  </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.Document_Close}"
-              Command="{Binding Path=CloseCommand}"
-              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
-              Command="{Binding Path=HideCommand}">
-      <MenuItem.Visibility>
-        <MultiBinding Converter="{StaticResource AnchorableContextMenuHideVisibilityConverter}">
-          <Binding Path="IsEnabled"
-                   RelativeSource="{RelativeSource Self}"
-                   Mode="OneWay"
-                   Converter="{StaticResource BoolToVisibilityConverter}" />
-          <Binding Path="CanClose" />
-        </MultiBinding>
-      </MenuItem.Visibility>
-    </MenuItem>
-  </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_CloseAll}"
-              Command="{Binding Path=CloseAllCommand}" />
-    <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="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="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}}"
-                              ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                              ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, 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" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Border Grid.ColumnSpan="3"
-                        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="2"
-                        Visibility="Hidden"
-                        Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                        ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
-                  <Image x:Name="PART_ImgPinClose"
-                         Source="Images/PinClose.png" >
-                  </Image>
-                </Button>
-              </Grid>
-            </Border>
-          </avalonDockControls:DropDownControlArea>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding Path=IsSelected}"
-                           Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-            </MultiDataTrigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding Path=IsLastFocusedDocument}"
-                         Value="true">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-              <Setter Property="Source"
-                      Value="Images/PinClose_Dark.png"
-                      TargetName="PART_ImgPinClose" />
-            </DataTrigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-              <Condition Binding="{Binding Path=IsActive}"
-                         Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-              <Setter Property="Source"
-                      Value="Images/PinClose_Dark.png"
-                      TargetName="PART_ImgPinClose" />
-            </MultiDataTrigger>
-            <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="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}}" >
-                </avalonDockControls:DropDownControlArea>
-              </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">
-                <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="BorderThickness"
-            Value="1" />
-    <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="{TemplateBinding BorderThickness}">
-              <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="Images/PinMenu.png"
-                             Width="13">
-                      </Image>
-                    </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="Images/PinMaximize.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinRestore.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinClose.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="ContextMenuDropdownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinMaximize"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinRestore"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinClose"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinClose"
-                      Value="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="BorderBrush"
-            Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor6}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <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="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}">
-              <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="Images/PinMenu.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinMaximize.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinRestore.png"
-                              Width="13" >
-                      </Image>
-                    </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="Images/PinClose.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinClose_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Dark.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}"
-                         Value="True">
-              <Setter Property="Command"
-                      TargetName="PART_PinClose"
-                      Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="ToolTip"
-                      TargetName="PART_PinClose"
-                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-
-            </DataTrigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="SinglePaneContextMenu"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="SinglePaneContextMenu"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinMaximize"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinRestore"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinClose"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinClose"
-                      Value="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="White"
-                    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} }" >
-                    </Image>
-                    <TextBlock x:Name="selectedElementTitle"
-                               Text="{Binding SelectedDocument.LayoutElement.Title}"
-                               TextTrimming="CharacterEllipsis"
-                               Grid.Column="1"
-                               VerticalAlignment="Center"
-                               FontWeight="Bold"
-                               Margin="4,0,0,0" >
-                    </TextBlock>
-                  </Grid>
-                  <TextBlock x:Name="selectedElementDescription"
-                             Text="{Binding SelectedDocument.LayoutElement.Description}"
-                             TextTrimming="CharacterEllipsis"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                </Grid>
-
-                <Border Grid.Row="1"
-                        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" >
-                      </TextBlock>
-                      <ListBox x:Name="PART_AnchorableListBox"
-                               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" >
-                              </Image>
-                              <TextBlock Text="{Binding LayoutElement.Title}"
-                                         TextTrimming="CharacterEllipsis"
-                                         Grid.Column="1"
-                                         Margin="4,0,0,0" >
-                              </TextBlock>
-                            </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" >
-                      </TextBlock>
-                      <ListBox x:Name="PART_DocumentListBox"
-                               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" >
-                              </Image>
-                              <TextBlock Text="{Binding LayoutElement.Title}"
-                                         TextTrimming="CharacterEllipsis"
-                                         Grid.Column="1"
-                                         Margin="4,0,0,0" >
-                              </TextBlock>
-                            </Grid>
-                          </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemsPanel>
-                          <ItemsPanelTemplate>
-                            <WrapPanel Orientation="Vertical" />
-                          </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                      </ListBox>
-                    </Grid>
-                  </Grid>
-                </Border>
-
-                <Grid Grid.Row="2"
-                      Margin="5">
-                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}"
-                             VerticalAlignment="Center">
-                  </TextBlock>
-                </Grid>
-              </Grid>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="SelectedDocument"
-                     Value="{x:Null}">
-              <Setter Property="Text"
-                      Value="{Binding SelectedAnchorable.LayoutElement.Title}"
-                      TargetName="selectedElementTitle" />
-              <Setter Property="Text"
-                      Value="{x:Null}"
-                      TargetName="selectedElementDescription" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </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
deleted file mode 100644
index b87b384b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <OutputType>Library</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-  </PropertyGroup>
-  <ItemGroup>
-    <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" />
-    <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" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Brushes.baml
deleted file mode 100644
index f9a94fe5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Theme.baml
deleted file mode 100644
index 7c3c5841..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Theme.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt
deleted file mode 100644
index 0c30339b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Theme.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\obj\Release\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources
deleted file mode 100644
index 9f250192..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
deleted file mode 100644
index a99d42b4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/obj/Release/Xceed.Wpf.AvalonDock.Themes.Metro_MarkupCompile.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.Metro\Theme.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/sn.snk and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs
deleted file mode 100644
index 51a580b8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Markup;
-
-// 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 Toolkit for WPF - AvalonDock VS2010 Theme")]
-[assembly: AssemblyDescription("This assembly implements the VS2010 Theme for the AvalonDock layout system.")]
-
-[assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct("Xceed Toolkit for WPF - AvalonDock")]
-[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
-
-
-// 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
-
-internal static class _XceedVersionInfo
-{
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-    public const string BaseVersion = "3.4";
-    [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
deleted file mode 100644
index 3316fb13..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfoCommon.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 98b4b391..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml
+++ /dev/null
@@ -1,195 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index a786a61f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableBottom.png and /dev/null 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
deleted file mode 100644
index 1499c434..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableLeft.png and /dev/null 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
deleted file mode 100644
index e6802ba3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableRight.png and /dev/null 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
deleted file mode 100644
index cd79f578..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableTop.png and /dev/null 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
deleted file mode 100644
index 00436bba..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableBottom.png and /dev/null 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
deleted file mode 100644
index 6500b08c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableLeft.png and /dev/null 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
deleted file mode 100644
index a71a8c50..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableRight.png and /dev/null 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
deleted file mode 100644
index 2ac77654..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableTop.png and /dev/null 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
deleted file mode 100644
index c5bed349..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentBottom.png and /dev/null 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
deleted file mode 100644
index 038ac8b3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentInside.png and /dev/null 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
deleted file mode 100644
index d77a43f2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentLeft.png and /dev/null 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
deleted file mode 100644
index 83322201..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentRight.png and /dev/null 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
deleted file mode 100644
index f8e075d9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentTop.png and /dev/null 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
deleted file mode 100644
index 8ad11767..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneEmpty.png and /dev/null 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
deleted file mode 100644
index 8205a034..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneLargeEmpty.png and /dev/null 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
deleted file mode 100644
index 4c50d26d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/HTabGroup.png and /dev/null 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
deleted file mode 100644
index b8f6ced2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/Locked.png and /dev/null 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
deleted file mode 100644
index abefd96b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide.png and /dev/null 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
deleted file mode 100644
index 87b66ced..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Black.png and /dev/null 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
deleted file mode 100644
index 470548dc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Dark.png and /dev/null 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
deleted file mode 100644
index 132bdfaf..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose.png and /dev/null 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
deleted file mode 100644
index abf709cb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Black.png and /dev/null 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
deleted file mode 100644
index 575e4fdb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Dark.png and /dev/null 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
deleted file mode 100644
index 86db3070..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu.png and /dev/null 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
deleted file mode 100644
index be081925..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu_Black.png and /dev/null 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
deleted file mode 100644
index 79d8c2d0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize.png and /dev/null 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
deleted file mode 100644
index 42ae679a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Black.png and /dev/null 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
deleted file mode 100644
index e28e0607..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Dark.png and /dev/null 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
deleted file mode 100644
index 653373ce..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu.png and /dev/null 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
deleted file mode 100644
index 31e2f102..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Black.png and /dev/null 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
deleted file mode 100644
index 25a47678..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Dark.png and /dev/null 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
deleted file mode 100644
index 1bccead4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore.png and /dev/null 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
deleted file mode 100644
index 7c7e0032..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Black.png and /dev/null 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
deleted file mode 100644
index f3ebfe4c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Dark.png and /dev/null 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
deleted file mode 100644
index c3f279f7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/VTabGroup.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
deleted file mode 100644
index d7d484db..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
+++ /dev/null
@@ -1,2199 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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" />
-  <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
-
-
-  <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 Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
-                  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="Images/PinDocMenu.png" >
-                </Image>
-              </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="Images/PinDocMenu_Black.png" />
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="MenuDropDownButton"
-                     Value="True">
-              <Setter Property="Content"
-                      TargetName="MenuDropDownButton">
-                <Setter.Value>
-                  <Image Source="/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>
-                  <DataTrigger Binding="{Binding IsActive}"
-                               Value="True">
-                    <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" />
-                  </DataTrigger>
-
-                  <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="Images/PinMenu.png" >
-                </Image>
-              </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="Images/PinAutoHide.png" >
-                </Image>
-              </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="Images/PinClose.png" >
-                </Image>
-              </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="Images/PinAutoHide_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgHidePin"
-                      Value="Images/PinClose_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgMenuPin"
-                      Value="Images/PinMenu_Dark.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding Model.CanClose, RelativeSource={RelativeSource Mode=Self}}"
-                         Value="True">
-              <Setter Property="Command"
-                      TargetName="PART_HidePin"
-                      Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="ToolTip"
-                      TargetName="PART_HidePin"
-                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-
-            </DataTrigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="MenuDropDownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgMenuPin"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="MenuDropDownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgMenuPin"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_AutoHidePin"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgAutoHidePin"
-                      Value="Images/PinAutoHide_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_HidePin"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgHidePin"
-                      Value="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="Images/DockAnchorableLeft.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetRight"
-                     VerticalAlignment="Center"
-                     HorizontalAlignment="Right"
-                     Source="Images/DockAnchorableRight.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetBottom"
-                     VerticalAlignment="Bottom"
-                     HorizontalAlignment="Center"
-                     Source="Images/DockAnchorableBottom.PNG"
-                     Stretch="None" >
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetTop"
-                     VerticalAlignment="Top"
-                     HorizontalAlignment="Center"
-                     Source="Images/DockAnchorableTop.PNG"
-                     Stretch="None" >
-              </Image>
-            </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="Images/DockPaneEmpty.png"
-                       Stretch="None"
-                       Margin="0,0.5,0,-0.5" >
-                </Image>
-                <Border Name="PART_AnchorablePaneDropTargetTop"
-                        Grid.Column="1"
-                        Grid.Row="0"
-                        Margin="0,3.5,0, 0">
-                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetRight"
-                        Grid.Column="2"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetBottom"
-                        Grid.Column="1"
-                        Grid.Row="2"
-                        Margin="0,-0.5,0,0">
-                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetLeft"
-                        Grid.Column="0"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetInto"
-                        Grid.Column="1"
-                        Grid.Row="1"
-                        Margin="0,0.5,0,0">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </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="Images/DockPaneEmpty.PNG"
-                       Stretch="None" >
-                </Image>
-                <Border Name="PART_DocumentPaneDropTargetTop"
-                        Grid.Column="1"
-                        Grid.Row="0"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentTop.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetRight"
-                        Grid.Column="2"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentRight.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetBottom"
-                        Grid.Column="1"
-                        Grid.Row="2"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentBottom.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetLeft"
-                        Grid.Column="0"
-                        Grid.Row="1"
-                        Margin="2">
-                  <Image Source="Images/DockDocumentLeft.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetInto"
-                        Grid.Column="1"
-                        Grid.Row="1">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </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="Images/DockPaneLargeEmpty.PNG"
-                       Stretch="None" >
-                </Image>
-                <Border Name="PART_DocumentPaneFullDropTargetTop"
-                        Grid.Column="2"
-                        Grid.Row="1">
-                  <Image Source="Images/DockDocumentTop.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetRight"
-                        Grid.Column="3"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentRight.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetBottom"
-                        Grid.Column="2"
-                        Grid.Row="3">
-                  <Image Source="Images/DockDocumentBottom.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetLeft"
-                        Grid.Column="1"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentLeft.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneFullDropTargetInto"
-                        Grid.Column="2"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentInside.png"
-                         Stretch="None" >
-                  </Image>
-                </Border>
-
-                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane"
-                        Grid.Column="2"
-                        Grid.Row="0">
-                  <Image Source="Images/DockDocumentAsAnchorableTop.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane"
-                        Grid.Column="4"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentAsAnchorableRight.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane"
-                        Grid.Column="2"
-                        Grid.Row="4">
-                  <Image Source="Images/DockDocumentAsAnchorableBottom.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane"
-                        Grid.Column="0"
-                        Grid.Row="2">
-                  <Image Source="Images/DockDocumentAsAnchorableLeft.png"
-                         Stretch="None"
-                         Margin="2" >
-                  </Image>
-                </Border>
-
-              </Grid>
-            </Grid>
-
-          </Canvas>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="AvalonDock_ThemeVS2010_DocumentHeaderTemplate">
-    <TextBlock Text="{Binding Title}"
-               TextTrimming="CharacterEllipsis" >
-    </TextBlock>
-  </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" >
-      </Image>
-      <TextBlock x:Name="title"
-                 Margin="4,0,0,0"
-                 Text="{Binding Title}"
-                 TextTrimming="CharacterEllipsis"
-                 Grid.Column="1" >
-      </TextBlock>
-    </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" >
-    </TextBlock>
-  </DataTemplate>
-
-  <DataTemplate x:Key="AvalonDock_ThemeVS2010_AnchorableTitleTemplate">
-    <TextBlock Text="{Binding Title}"
-               TextTrimming="CharacterEllipsis" >
-    </TextBlock>
-  </DataTemplate>
-
-  <DataTemplate x:Key="AvalonDock_ThemeVS2010_IconContentTemplate">
-    <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
-           Stretch="Uniform" >
-    </Image>
-  </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.Document_Close}"
-              Command="{Binding Path=CloseCommand}"
-              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
-              Command="{Binding Path=HideCommand}">
-      <MenuItem.Visibility>
-        <MultiBinding Converter="{StaticResource AnchorableContextMenuHideVisibilityConverter}">
-          <Binding Path="IsEnabled"
-                   RelativeSource="{RelativeSource Self}"
-                   Mode="OneWay"
-                   Converter="{StaticResource BoolToVisibilityConverter}" />
-          <Binding Path="CanClose" />
-        </MultiBinding>
-      </MenuItem.Visibility>
-    </MenuItem>
-  </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_CloseAll}"
-              Command="{Binding Path=CloseAllCommand}" />
-    <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="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="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}}"
-                              ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                              ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, 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" />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Border Grid.ColumnSpan="3"
-                        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="2"
-                        Visibility="Hidden"
-                        Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
-                        ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
-                  <Image x:Name="PART_ImgPinClose"
-                         Source="Images/PinClose.png" >
-                  </Image>
-                </Button>
-              </Grid>
-            </Border>
-          </avalonDockControls:DropDownControlArea>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding Path=IsSelected}"
-                           Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-            </MultiDataTrigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding Path=IsLastFocusedDocument}"
-                         Value="true">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-              <Setter Property="Source"
-                      Value="Images/PinClose_Dark.png"
-                      TargetName="PART_ImgPinClose" />
-            </DataTrigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding Path=IsActive}"
-                           Value="True" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="DocumentCloseButton" />
-              <Setter Property="Source"
-                      Value="Images/PinClose_Dark.png"
-                      TargetName="PART_ImgPinClose" />
-            </MultiDataTrigger>
-            <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="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}}" >
-                </avalonDockControls:DropDownControlArea>
-              </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="BorderThickness"
-            Value="1" />
-    <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="{TemplateBinding BorderThickness}"
-                    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="Images/PinMenu.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinMaximize.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinRestore.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinClose.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinClose_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="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="Images/PinClose_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Dark.png" />
-            </MultiDataTrigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="ContextMenuDropdownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="ContextMenuDropdownButton"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinMaximize"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinRestore"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinClose"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinClose"
-                      Value="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="BorderBrush"
-            Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}" />
-    <Setter Property="BorderThickness"
-            Value="4" />
-    <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="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}">
-              <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="Images/PinMenu.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinMaximize.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinRestore.png"
-                              Width="13" >
-                      </Image>
-                    </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="Images/PinClose.png"
-                             Width="13" >
-                      </Image>
-                    </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="Images/PinClose_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Dark.png" />
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Dark.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}"
-                         Value="True">
-              <Setter Property="Command"
-                      TargetName="PART_PinClose"
-                      Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="ToolTip"
-                      TargetName="PART_PinClose"
-                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-
-            </DataTrigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="SinglePaneContextMenu"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsChecked"
-                     SourceName="SinglePaneContextMenu"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMenu"
-                      Value="Images/PinMenu_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinMaximize"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinMaximize"
-                      Value="Images/PinMaximize_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinRestore"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinRestore"
-                      Value="Images/PinRestore_Black.png" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     SourceName="PART_PinClose"
-                     Value="True">
-              <Setter Property="Source"
-                      TargetName="PART_ImgPinClose"
-                      Value="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} }" >
-                    </Image>
-                    <TextBlock x:Name="selectedElementTitle"
-                               Text="{Binding SelectedDocument.LayoutElement.Title}"
-                               TextTrimming="CharacterEllipsis"
-                               Grid.Column="1"
-                               VerticalAlignment="Center"
-                               FontWeight="Bold"
-                               Margin="4,0,0,0" >
-                    </TextBlock>
-                  </Grid>
-                  <TextBlock x:Name="selectedElementDescription"
-                             Text="{Binding SelectedDocument.LayoutElement.Description}"
-                             TextTrimming="CharacterEllipsis"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                </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" >
-                      </TextBlock>
-                      <ListBox x:Name="PART_AnchorableListBox"
-                               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" >
-                              </Image>
-                              <TextBlock Text="{Binding LayoutElement.Title}"
-                                         TextTrimming="CharacterEllipsis"
-                                         Grid.Column="1"
-                                         Margin="4,0,0,0" >
-                              </TextBlock>
-                            </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">
-                      </TextBlock>
-                      <ListBox x:Name="PART_DocumentListBox"
-                               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" >
-                              </Image>
-                              <TextBlock Text="{Binding LayoutElement.Title}"
-                                         TextTrimming="CharacterEllipsis"
-                                         Grid.Column="1"
-                                         Margin="4,0,0,0" >
-                              </TextBlock>
-                            </Grid>
-                          </DataTemplate>
-                        </ListBox.ItemTemplate>
-                        <ListBox.ItemsPanel>
-                          <ItemsPanelTemplate>
-                            <WrapPanel Orientation="Vertical" />
-                          </ItemsPanelTemplate>
-                        </ListBox.ItemsPanel>
-                      </ListBox>
-                    </Grid>
-                  </Grid>
-                </Border>
-
-                <Grid Grid.Row="2"
-                      Margin="5">
-                  <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                </Grid>
-              </Grid>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="SelectedDocument"
-                     Value="{x:Null}">
-              <Setter Property="Text"
-                      Value="{Binding SelectedAnchorable.LayoutElement.Title}"
-                      TargetName="selectedElementTitle" />
-              <Setter Property="Text"
-                      Value="{x:Null}"
-                      TargetName="selectedElementDescription" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </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
deleted file mode 100644
index 36d33474..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index cf0ab7e7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj
+++ /dev/null
@@ -1,76 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
-    <ExpressionBlendVersion>4.0.20901.0</ExpressionBlendVersion>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-  </PropertyGroup>
-  <ItemGroup>
-    <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" />
-  </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>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Brushes.baml
deleted file mode 100644
index 140e78f6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Theme.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Theme.baml
deleted file mode 100644
index c7159e9f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Theme.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt
deleted file mode 100644
index 1b504512..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Theme.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\obj\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources
deleted file mode 100644
index 91044a8c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
deleted file mode 100644
index 5885ecd8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/obj/Release/Xceed.Wpf.AvalonDock.Themes.VS2010_MarkupCompile.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Theme.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/sn.snk and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
deleted file mode 100644
index f311bd0c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Markup;
-
-// 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 Toolkit for WPF - 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 Toolkit for WPF - AvalonDock")]
-[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
-[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.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: 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
-
-internal static class _XceedVersionInfo
-{
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-    public const string BaseVersion = "3.4";
-    [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
deleted file mode 100644
index 3316fb13..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfoCommon.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 8be365f9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.AvalonDock.Commands
-{
-  internal class RelayCommand : ICommand
-  {
-    #region Fields
-
-    private readonly Action<object> _execute;
-    private 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
deleted file mode 100644
index 89586bc8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class AnchorablePaneControlOverlayArea : OverlayArea
-  {
-    #region Members
-
-    private LayoutAnchorablePaneControl _anchorablePaneControl;
-
-    #endregion
-
-    #region constructors
-
-    internal AnchorablePaneControlOverlayArea(
-        IOverlayWindow overlayWindow,
-        LayoutAnchorablePaneControl anchorablePaneControl )
-        : base( overlayWindow )
-    {
-
-      _anchorablePaneControl = anchorablePaneControl;
-      base.SetScreenDetectionArea( new Rect(
-          _anchorablePaneControl.PointToScreenDPI( new Point() ),
-          _anchorablePaneControl.TransformActualSizeToAncestor() ) );
-
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs
deleted file mode 100644
index 75e83b10..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs
+++ /dev/null
@@ -1,343 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal class AnchorablePaneDropTarget : DropTarget<LayoutAnchorablePaneControl>
-  {
-    #region Members
-
-    private LayoutAnchorablePaneControl _targetPane;
-    int _tabIndex = -1;
-
-    #endregion
-
-    #region Constructors
-
-    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;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs
deleted file mode 100644
index 00ee5fff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Controls;
-using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class AnchorablePaneTabPanel : Panel
-  {
-    #region Constructors
-
-    public AnchorablePaneTabPanel()
-    {
-      this.FlowDirection = System.Windows.FlowDirection.LeftToRight;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
deleted file mode 100644
index a4c5c481..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-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
-  {
-    #region Members
-
-    private bool _isMouseDown = false;
-
-    #endregion
-
-    #region Constructors
-
-    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()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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 );
-      }
-    }
-
-    private 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 )
-      {
-        this.SetLayoutItem( Model.Root.Manager.GetLayoutItemFromModel( Model ) );
-      }
-      else
-      {
-        this.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 )
-    {
-      this.SetValue( LayoutItemPropertyKey, value );
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    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;
-    }
-
-    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);
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void OnHide()
-    {
-      this.Model.Hide();
-    }
-
-    private void OnToggleAutoHide()
-    {
-      this.Model.ToggleAutoHide();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs
deleted file mode 100644
index 33260c23..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Threading;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal class AutoHideWindowManager
-  {
-    #region Members
-
-    private DockingManager _manager;
-    private WeakReference _currentAutohiddenAnchor = null;
-    private DispatcherTimer _closeTimer = null;
-
-    #endregion
-
-    #region Constructors
-
-    internal AutoHideWindowManager( DockingManager manager )
-    {
-      _manager = manager;
-      this.SetupCloseTimer();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    public void ShowAutoHideWindow( LayoutAnchorControl anchor )
-    {
-      if( _currentAutohiddenAnchor.GetValueOrDefault<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 );
-    }
-
-    private 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();
-      };
-    }
-
-    private void StartCloseTimer()
-    {
-      _closeTimer.Start();
-    }
-
-    private void StopCloseTimer()
-    {
-      _closeTimer.Stop();
-      _manager.AutoHideWindow.Hide();
-      _currentAutohiddenAnchor = null;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs
deleted file mode 100644
index b31b35b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Windows.Data;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal class BindingHelper
-  {
-    #region Methods
-
-    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 );
-                 } );
-            }
-          }
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs
deleted file mode 100644
index c5d9274e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class ContextMenuEx : ContextMenu
-  {
-    #region Constructors
-
-    static ContextMenuEx()
-    {
-    }
-
-    public ContextMenuEx()
-    {
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs
deleted file mode 100644
index 415cdf49..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal class DockingManagerDropTarget : DropTarget<DockingManager>
-  {
-    #region Members
-
-    private DockingManager _manager;
-
-    #endregion
-
-    #region Constructors
-
-    internal DockingManagerDropTarget( DockingManager manager, Rect detectionRect, DropTargetType type )
-        : base( manager, detectionRect, type )
-    {
-      _manager = manager;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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( floatingWindow.RootPanel );
-              newOrientedPanel.Children.Insert( 0, _manager.Layout.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( floatingWindow.RootPanel );
-              newOrientedPanel.Children.Insert( 0, _manager.Layout.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();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs
deleted file mode 100644
index 90091192..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class DockingManagerOverlayArea : OverlayArea
-  {
-    #region Members
-
-    private DockingManager _manager;
-
-    #endregion
-
-    #region Constructors
-
-    internal DockingManagerOverlayArea( IOverlayWindow overlayWindow, DockingManager manager )
-        : base( overlayWindow )
-    {
-      _manager = manager;
-
-      base.SetScreenDetectionArea( new Rect(
-          _manager.PointToScreenDPI( new Point() ),
-          _manager.TransformActualSizeToAncestor() ) );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs
deleted file mode 100644
index 6f427b03..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class DocumentPaneControlOverlayArea : OverlayArea
-  {
-    #region Members
-
-    private LayoutDocumentPaneControl _documentPaneControl;
-
-    #endregion
-
-    #region Constructors
-
-    internal DocumentPaneControlOverlayArea(
-        IOverlayWindow overlayWindow,
-        LayoutDocumentPaneControl documentPaneControl )
-        : base( overlayWindow )
-    {
-      _documentPaneControl = documentPaneControl;
-      base.SetScreenDetectionArea( new Rect(  _documentPaneControl.PointToScreenDPI( new Point() ),  _documentPaneControl.TransformActualSizeToAncestor() ) );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
deleted file mode 100644
index 5d86257d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal class DocumentPaneDropAsAnchorableTarget : DropTarget<LayoutDocumentPaneControl>
-  {
-    #region Members
-
-    private LayoutDocumentPaneControl _targetPane;
-    int _tabIndex = -1;
-
-    #endregion
-
-    #region Constructors
-
-    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;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private 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;
-
-
-
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs
deleted file mode 100644
index 2df4f018..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs
+++ /dev/null
@@ -1,513 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal class DocumentPaneDropTarget : DropTarget<LayoutDocumentPaneControl>
-  {
-    #region Members
-
-    private LayoutDocumentPaneControl _targetPane;
-    private int _tabIndex = -1;
-
-    #endregion
-
-    #region Constructors
-
-    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;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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 = 0;
-            if( _tabIndex != -1 )
-            {
-              i = _tabIndex;
-            }
-            else
-            {
-              var previousIndex = 0;
-              var previousContainer = ( ( ILayoutPreviousContainer )sourceModel ).PreviousContainer;
-              if( object.ReferenceEquals( previousContainer, targetModel ) && ( sourceModel.PreviousContainerIndex != -1 ) )
-              {
-                previousIndex = sourceModel.PreviousContainerIndex;
-              }
-
-              i = previousIndex;
-            }
-            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;
-
-            bool checkPreviousContainer = true;
-            int i = 0;
-            if( _tabIndex != -1 )
-            {
-              i = _tabIndex;
-              checkPreviousContainer = false;
-            }
-            LayoutAnchorable anchorableToActivate = null;
-
-            foreach( var anchorableToImport in layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray() )
-            {
-              if( checkPreviousContainer )
-              {
-                var previousContainer = ( ( ILayoutPreviousContainer )anchorableToImport ).PreviousContainer;
-                if( object.ReferenceEquals( previousContainer, targetModel ) && ( anchorableToImport.PreviousContainerIndex != -1 ) )
-                {
-                  i = anchorableToImport.PreviousContainerIndex;
-                }
-                checkPreviousContainer = false;
-              }
-
-              anchorableToImport.SetCanCloseInternal( true );
-
-              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;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
deleted file mode 100644
index 85812499..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal class DocumentPaneGroupDropTarget : DropTarget<LayoutDocumentPaneGroupControl>
-  {
-    #region Constructors
-
-    internal DocumentPaneGroupDropTarget( LayoutDocumentPaneGroupControl paneControl, Rect detectionRect, DropTargetType type )
-        : base( paneControl, detectionRect, type )
-    {
-      _targetPane = paneControl;
-    }
-
-    #endregion
-
-    #region Members
-
-    private LayoutDocumentPaneGroupControl _targetPane;
-
-    #endregion
-
-    #region Overrides
-
-    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() )
-            {
-              anchorableToImport.SetCanCloseInternal( true );
-
-              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;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs
deleted file mode 100644
index 1bacd43e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Controls;
-using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class DocumentPaneTabPanel : Panel
-  {
-    #region Constructors
-
-    public DocumentPaneTabPanel()
-    {
-      this.FlowDirection = System.Windows.FlowDirection.LeftToRight;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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 )
-    {
-      var visibleChildren = Children.Cast<UIElement>().Where( ch => ch.Visibility != System.Windows.Visibility.Collapsed );
-      var offset = 0.0;
-      var skipAllOthers = false;
-      foreach( TabItem doc in visibleChildren )
-      {
-        var layoutContent = doc.Content as LayoutContent;
-        if( skipAllOthers || offset + doc.DesiredSize.Width > finalSize.Width )
-        {
-          if( layoutContent.IsSelected && !doc.IsVisible )
-          {
-            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;
-              return ArrangeOverride( finalSize );
-            }
-          }
-          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 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs
deleted file mode 100644
index 1a533575..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal class DragService
-  {
-    #region Members
-
-    private DockingManager _manager;
-    private LayoutFloatingWindowControl _floatingWindow;
-    private List<IOverlayWindowHost> _overlayWindowHosts = new List<IOverlayWindowHost>();
-    private IOverlayWindowHost _currentHost;
-    private IOverlayWindow _currentWindow;
-    private List<IDropArea> _currentWindowAreas = new List<IDropArea>();
-    private IDropTarget _currentDropTarget;
-
-    #endregion
-
-    #region Public Methods
-
-    public DragService( LayoutFloatingWindowControl floatingWindow )
-    {
-      _floatingWindow = floatingWindow;
-      _manager = floatingWindow.Model.Root.Manager;
-
-
-      GetOverlayWindowHosts();
-    }
-
-    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;
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    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;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void GetOverlayWindowHosts()
-    {
-      _overlayWindowHosts.AddRange( _manager.GetFloatingWindowsByZOrder().OfType<LayoutAnchorableFloatingWindowControl>().Where( fw => fw != _floatingWindow && fw.IsVisible ) );
-      _overlayWindowHosts.Add( _manager );
-    }
-
-    #endregion    
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs
deleted file mode 100644
index 7cc2f647..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
-  {
-    #region Members
-
-    private Rect _detectionRect;
-    private DropAreaType _type;
-    private T _element;
-
-    #endregion
-
-    #region Constructors
-
-    internal DropArea( T areaElement, DropAreaType type )
-    {
-      _element = areaElement;
-      _detectionRect = areaElement.GetScreenArea();
-      _type = type;
-    }
-
-    #endregion
-
-    #region Properties
-
-    public Rect DetectionRect
-    {
-      get
-      {
-        return _detectionRect;
-      }
-    }   
-
-    public DropAreaType Type
-    {
-      get
-      {
-        return _type;
-      }
-    }
-
-    public T AreaElement
-    {
-      get
-      {
-        return _element;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs
deleted file mode 100644
index e4ae9a12..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Primitives;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class DropDownButton : ToggleButton
-  {
-    #region Constructors
-
-    public DropDownButton()
-    {
-      this.Unloaded += new RoutedEventHandler( DropDownButton_Unloaded );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    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();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void OnContextMenuClosed( object sender, RoutedEventArgs e )
-    {
-      //Debug.Assert(IsChecked.GetValueOrDefault());
-      var ctxMenu = sender as ContextMenu;
-      ctxMenu.Closed -= new RoutedEventHandler( OnContextMenuClosed );
-      IsChecked = false;
-    }
-
-    private void DropDownButton_Unloaded( object sender, RoutedEventArgs e )
-    {
-      // When changing theme, Unloaded event is called, erasing the DropDownContextMenu.
-      // Prevent this on theme changes.
-      if( this.IsLoaded )
-      {
-        DropDownContextMenu = null;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs
deleted file mode 100644
index ee848287..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows.Controls.Primitives;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class DropDownControlArea : UserControl
-  {
-    #region Constructors
-
-    //static DropDownControlArea()
-    //{
-    //    //IsHitTestVisibleProperty.OverrideMetadata(typeof(DropDownControlArea), new FrameworkPropertyMetadata(true));
-    //}
-
-    public DropDownControlArea()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    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;
-    //}
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
deleted file mode 100644
index 5177c483..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
-  {
-    #region Members
-
-    private Rect[] _detectionRect;
-    private T _targetElement;
-    private DropTargetType _type;
-
-    #endregion
-
-    #region Constructors
-
-    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;
-    }
-
-    #endregion
-
-    #region Properties
-
-    public Rect[] DetectionRects
-    {
-      get
-      {
-        return _detectionRect;
-      }
-    }
-
-    public T TargetElement
-    {
-      get
-      {
-        return _targetElement;
-      }
-    }    
-
-    public DropTargetType Type
-    {
-      get
-      {
-        return _type;
-      }
-    }
-
-    #endregion
-
-    #region Overrides
-
-    protected virtual void Drop( LayoutAnchorableFloatingWindow floatingWindow )
-    {
-    }
-
-    protected virtual void Drop( LayoutDocumentFloatingWindow floatingWindow )
-    {
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    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 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs
deleted file mode 100644
index b19b3a77..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  abstract class DropTargetBase : DependencyObject
-  {
-    #region Properties
-
-    #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
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs
deleted file mode 100644
index 20226c1d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 6d62cd8b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Media.Media3D;
-
-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
deleted file mode 100644
index 11d388bc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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 Member
-
-    private static List<DockingManager> _managers = new List<DockingManager>();
-    private static FullWeakDictionary<ILayoutElement, IInputElement> _modelFocusedElement = new FullWeakDictionary<ILayoutElement, IInputElement>();
-    private static WeakDictionary<ILayoutElement, IntPtr> _modelFocusedWindowHandle = new WeakDictionary<ILayoutElement, IntPtr>();
-    private static WeakReference _lastFocusedElement;
-    private static WindowHookHandler _windowHandler = null;
-    private static DispatcherOperation _setFocusAsyncOperation;
-    private static WeakReference _lastFocusedElementBeforeEnterMenuMode = null;
-
-    #endregion
-
-    #region Internal Methods
-
-    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;
-        }
-      }
-
-    }
-
-    /// <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;
-    }
-
-    /// <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 );
-
-
-      if( focused )
-      {
-        _lastFocusedElement = new WeakReference( model );
-      }
-
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    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;
-      }
-    }
-
-    private static void manager_PreviewGotKeyboardFocus( object sender, KeyboardFocusChangedEventArgs e )
-    {
-      var focusedElement = e.NewFocus as Visual;
-      if( focusedElement != null &&
-          !( focusedElement is LayoutAnchorableTabItem || focusedElement is LayoutDocumentTabItem ) )
-      //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;
-          }
-        }
-      }
-    }
-
-    private 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;
-            }
-          }
-        }
-      }
-    }
-
-    private static void WindowActivating( object sender, WindowActivateEventArgs e )
-    {
-      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.Input );
-        }
-      }
-    }
-
-    private 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 );
-    }
-    private 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
deleted file mode 100644
index c483acfa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.AvalonDock.Controls
-{
-  internal class FullWeakDictionary<K, V> where K : class
-  {
-    #region Members
-
-    private List<WeakReference> _keys = new List<WeakReference>();
-    private List<WeakReference> _values = new List<WeakReference>();
-
-    #endregion
-
-    #region Constructors
-
-    public FullWeakDictionary()
-    {
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    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 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs
deleted file mode 100644
index 2610304b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal interface IDropTarget
-  {
-    #region Properties
-
-    DropTargetType Type
-    {
-      get;
-    }
-
-    #endregion
-
-    #region Methods
-
-    Geometry GetPreviewPath( OverlayWindow overlayWindow, LayoutFloatingWindow floatingWindow );
-
-    bool HitTest( Point dragPoint );
-
-    void Drop( LayoutFloatingWindow floatingWindow );
-
-    void DragEnter();
-
-    void DragLeave();
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs
deleted file mode 100644
index e623f12c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index 22331abb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
deleted file mode 100644
index 450519c6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
deleted file mode 100644
index 9e58e7a5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  internal interface IOverlayWindowHost
-  {
-    #region Properties
-
-    DockingManager Manager
-    {
-      get;
-    }
-
-    #endregion
-
-    #region Methods
-
-    bool HitTest( Point dragPoint );
-
-    IOverlayWindow ShowOverlayWindow( LayoutFloatingWindowControl draggingWindow );
-
-    void HideOverlayWindow();
-
-    IEnumerable<IDropArea> GetDropAreas( LayoutFloatingWindowControl draggingWindow );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
deleted file mode 100644
index fdb45068..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutAnchorControl : Control, ILayoutControl
-  {
-    #region Members
-
-    private LayoutAnchorable _model;
-    private DispatcherTimer _openUpTimer = null;
-
-    #endregion
-
-    #region Constructors
-
-    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 );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Model
-
-    public ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }
-
-    #endregion
-
-    #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
-
-    #endregion
-
-    #region Private Methods
-
-    private 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;
-      }
-    }
-
-    private 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 );
-    }
-
-    private void _openUpTimer_Tick( object sender, EventArgs e )
-    {
-      _openUpTimer.Tick -= new EventHandler( _openUpTimer_Tick );
-      _openUpTimer.Stop();
-      _openUpTimer = null;
-      _model.Root.Manager.ShowAutoHideWindow( this );
-    }
-
-    #endregion
-
-    #region Overrides
-
-    //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;
-      }
-    }
-
-    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();
-      }
-    }
-
-    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 );
-    }
-
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs
deleted file mode 100644
index bea7877c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-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
-  {
-    #region Members
-
-    private ObservableCollection<LayoutAnchorControl> _childViews = new ObservableCollection<LayoutAnchorControl>();
-    private LayoutAnchorGroup _model;
-
-    #endregion
-
-    #region Constructors
-
-    static LayoutAnchorGroupControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutAnchorGroupControl ), new FrameworkPropertyMetadata( typeof( LayoutAnchorGroupControl ) ) );
-    }
-
-    internal LayoutAnchorGroupControl( LayoutAnchorGroup model )
-    {
-      _model = model;
-      CreateChildrenViews();
-
-      _model.Children.CollectionChanged += ( s, e ) => OnModelChildrenCollectionChanged( e );
-    }
-
-    #endregion
-
-    #region Properties
-
-    public ObservableCollection<LayoutAnchorControl> Children
-    {
-      get
-      {
-        return _childViews;
-      }
-    }
-
-    public ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    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 } );
-          }
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
deleted file mode 100644
index 76b8e207..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-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
-  {
-    #region Members
-
-    private LayoutAnchorSide _model = null;
-    private ObservableCollection<LayoutAnchorGroupControl> _childViews = new ObservableCollection<LayoutAnchorGroupControl>();
-
-
-    #endregion
-
-    #region Constructors
-
-    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();
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Model
-
-    public ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }
-
-    #endregion
-
-    #region Children
-
-    public ObservableCollection<LayoutAnchorGroupControl> Children
-    {
-      get
-      {
-        return _childViews;
-      }
-    }
-
-    #endregion
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-
-    #endregion
-
-    #region Private Methods
-
-    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 );
-        }
-      }
-    }
-
-    private 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;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
deleted file mode 100644
index 80ebc8b8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutAnchorableControl : Control
-  {
-    #region Constructors
-
-    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 });
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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( e.OldValue != null )
-      {
-        ( ( LayoutContent )e.OldValue ).PropertyChanged -= Model_PropertyChanged;
-      }
-
-      if( Model != null )
-      {
-        Model.PropertyChanged += Model_PropertyChanged;
-        SetLayoutItem( Model.Root.Manager.GetLayoutItemFromModel( Model ) );
-      }
-      else
-        SetLayoutItem( null );
-    }
-
-    private void Model_PropertyChanged( object sender, System.ComponentModel.PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName == "IsEnabled" )
-      {
-        if( Model != null )
-        {
-          IsEnabled = Model.IsEnabled;
-          if( !IsEnabled && Model.IsActive )
-          {
-            if( ( Model.Parent != null ) && ( Model.Parent is LayoutAnchorablePane ) )
-            {
-              ( ( LayoutAnchorablePane )Model.Parent ).SetNextSelectedIndex();
-            }
-          }
-        }
-      }
-    }
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    protected override void OnGotKeyboardFocus( System.Windows.Input.KeyboardFocusChangedEventArgs e )
-    {
-      if( Model != null )
-        Model.IsActive = true;
-
-      base.OnGotKeyboardFocus( e );
-    }
-
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
deleted file mode 100644
index 5bd804cf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
+++ /dev/null
@@ -1,441 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Converters;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.AvalonDock.Commands;
-using Microsoft.Windows.Shell;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutAnchorableFloatingWindowControl : LayoutFloatingWindowControl, IOverlayWindowHost
-  {
-    #region Members
-
-    private LayoutAnchorableFloatingWindow _model;
-    private OverlayWindow _overlayWindow = null;
-    private List<IDropArea> _dropAreas = null;
-
-    #endregion
-
-    #region Constructors
-
-    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 ) );
-      CloseWindowCommand = new RelayCommand( ( p ) => OnExecuteCloseWindowCommand( p ), ( p ) => CanExecuteCloseWindowCommand( p ) );
-      UpdateThemeResources();
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    public override ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }
-
-    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 );
-    }
-
-    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 );
-    }
-
-    internal override void UpdateThemeResources( Xceed.Wpf.AvalonDock.Themes.Theme oldTheme = null )
-    {
-      base.UpdateThemeResources( oldTheme );
-
-      if( _overlayWindow != null )
-      {
-        _overlayWindow.UpdateThemeResources( oldTheme );
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void _model_PropertyChanged( object sender, System.ComponentModel.PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName == "RootPanel" &&
-          _model.RootPanel == null )
-      {
-        InternalClose();
-      }
-    }
-
-    private 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;
-    }
-
-    private 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;
-    }
-
-    private bool IsContextMenuOpen()
-    {
-      var ctxMenu = _model.Root.Manager.AnchorableContextMenu;
-      if( ctxMenu != null && SingleContentLayoutItem != null )
-      {
-        return ctxMenu.IsOpen;
-      }
-
-      return false;
-    }
-
-    #endregion
-
-    #region Commands
-
-    #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
-
-    #region CloseWindowCommand
-    public ICommand CloseWindowCommand
-    {
-      get;
-      private set;
-    }
-
-    private bool CanExecuteCloseWindowCommand( 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.CanClose )
-        {
-          canExecute = false;
-          break;
-        }
-
-        var anchorableLayoutItem = manager.GetLayoutItemFromModel( anchorable ) as LayoutAnchorableItem;
-        if( anchorableLayoutItem == null ||
-            anchorableLayoutItem.CloseCommand == null ||
-            !anchorableLayoutItem.CloseCommand.CanExecute( parameter ) )
-        {
-          canExecute = false;
-          break;
-        }
-
-        canExecute = true;
-      }
-
-      return canExecute;
-    }
-
-    private void OnExecuteCloseWindowCommand( 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.CloseCommand.Execute( parameter );
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region IOverlayWindowHost
-
-    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;
-      }
-    }
-
-    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();
-    }
-
-    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;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
deleted file mode 100644
index 9d68940f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
-  {
-    #region Members
-
-    private LayoutAnchorable _anchorable;
-    private ICommand _defaultHideCommand;
-    private ICommand _defaultAutoHideCommand;
-    private ICommand _defaultDockCommand;
-    private ReentrantFlag _visibilityReentrantFlag = new ReentrantFlag();
-
-    #endregion
-
-    #region Constructors
-
-    internal LayoutAnchorableItem()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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 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
-
-    #endregion
-
-    #region Overrides
-
-    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()
-    {
-      if( ( _anchorable.Root != null ) && ( _anchorable.Root.Manager != null ) )
-      {
-        var dockingManager = _anchorable.Root.Manager;
-        dockingManager._ExecuteCloseCommand( _anchorable );
-      }
-    }
-
-    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();
-    }
-
-    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();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private 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
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
deleted file mode 100644
index 3c725619..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Windows;
-using System.Windows.Data;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
-  {
-    #region Members
-
-    private LayoutAnchorablePane _model;
-
-    #endregion
-
-    #region Constructors
-
-    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 );
-    }
-
-    #endregion
-
-    #region Properties
-
-    public ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }
-
-    #endregion
-
-    #region Overrides
-
-    protected override void OnGotKeyboardFocus( System.Windows.Input.KeyboardFocusChangedEventArgs e )
-    {
-      if( ( _model != null ) && ( _model.SelectedContent != null ) )
-      {
-        _model.SelectedContent.IsActive = true;
-      }
-
-      base.OnGotKeyboardFocus( e );
-    }
-
-    protected override void OnMouseLeftButtonDown( System.Windows.Input.MouseButtonEventArgs e )
-    {
-      base.OnMouseLeftButtonDown( e );
-
-      if( !e.Handled && ( _model != null ) && ( _model.SelectedContent != null ) )
-      {
-        _model.SelectedContent.IsActive = true;
-      }
-    }
-
-    protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButtonEventArgs e )
-    {
-      base.OnMouseRightButtonDown( e );
-
-      if( !e.Handled && ( _model != null ) && ( _model.SelectedContent != null ) )
-      {
-        _model.SelectedContent.IsActive = true;
-      }
-    }
-
-
-    #endregion
-
-    #region Private Methods
-
-    private void OnLayoutUpdated( object sender, EventArgs e )
-    {
-      var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
-      modelWithAtcualSize.ActualWidth = ActualWidth;
-      modelWithAtcualSize.ActualHeight = ActualHeight;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
deleted file mode 100644
index 99269059..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutAnchorablePaneGroupControl : LayoutGridControl<ILayoutAnchorablePane>, ILayoutControl
-  {
-    #region Members
-
-    private LayoutAnchorablePaneGroup _model;
-
-    #endregion
-
-    #region Constructors
-
-    internal LayoutAnchorablePaneGroupControl( LayoutAnchorablePaneGroup model )
-        : base( model, model.Orientation )
-    {
-      _model = model;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
deleted file mode 100644
index 743e0265..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutAnchorableTabItem : Control
-  {
-    #region Members
-
-    private bool _isMouseDown = false;
-    private static LayoutAnchorableTabItem _draggingItem = null;
-    private static bool _cancelMouseLeave = false;
-
-    #endregion
-
-    #region Constructors
-
-    static LayoutAnchorableTabItem()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutAnchorableTabItem ), new FrameworkPropertyMetadata( typeof( LayoutAnchorableTabItem ) ) );
-    }
-
-    public LayoutAnchorableTabItem()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #endregion
-
-    #region Overrides
-    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;
-      }
-      else
-      {
-        _cancelMouseLeave = false;
-      }
-    }
-
-    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 )
-      {
-        // drag the item if the mouse leave is not canceled.
-        // Mouse leave should be canceled when selecting a new tab to prevent automatic undock when Panel size is Auto.
-        _draggingItem = !_cancelMouseLeave ? this : null;
-      }
-
-      _isMouseDown = false;
-      _cancelMouseLeave = false;
-    }
-
-    protected override void OnMouseEnter( MouseEventArgs e )
-    {
-      base.OnMouseEnter( e );
-
-      if( _draggingItem != this &&
-          e.LeftButton == MouseButtonState.Pressed )
-      {
-        var model = Model;
-        var container = model.Parent as ILayoutContainer;
-        var containerPane = model.Parent as ILayoutPane;
-
-        if( ( containerPane is LayoutAnchorablePane ) && !( ( LayoutAnchorablePane )containerPane ).CanRepositionItems )
-          return;
-        if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutAnchorablePaneGroup ) && !( ( LayoutAnchorablePaneGroup )containerPane.Parent ).CanRepositionItems )
-          return;
-
-        var childrenList = container.Children.ToList();
-        containerPane.MoveChild( childrenList.IndexOf( _draggingItem.Model ), childrenList.IndexOf( model ) );
-      }
-    }
-
-    protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      base.OnPreviewGotKeyboardFocus( e );
-
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal static bool IsDraggingItem()
-    {
-      return _draggingItem != null;
-    }
-
-    internal static LayoutAnchorableTabItem GetDraggingItem()
-    {
-      return _draggingItem;
-    }
-    internal static void ResetDraggingItem()
-    {
-      _draggingItem = null;
-    }
-    internal static void CancelMouseLeave()
-    {
-      _cancelMouseLeave = true;
-    }
-
-  #endregion
-}
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
deleted file mode 100644
index 7d97aafe..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
+++ /dev/null
@@ -1,583 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutAutoHideWindowControl : HwndHost, ILayoutControl
-  {
-    #region Members
-
-    internal LayoutAnchorableControl _internalHost = null;
-
-    private LayoutAnchorControl _anchor;
-    private LayoutAnchorable _model;
-    private HwndSource _internalHwndSource = null;
-    private IntPtr parentWindowHandle;
-    private bool _internalHost_ContentRendered = false;
-    private ContentPresenter _internalHostPresenter = new ContentPresenter();
-    private Grid _internalGrid = null;
-    private AnchorSide _side;
-    private LayoutGridResizerControl _resizer = null;
-    private DockingManager _manager;
-    private Border _resizerGhost = null;
-    private Window _resizerWindowHost = null;
-    private Vector _initialStartPoint;
-
-    #endregion
-
-    #region Constructors
-
-    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()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #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
-
-    #region Model
-
-    public ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }
-
-    #endregion
-
-    #region Resizer
-
-    internal bool IsResizing
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    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 );
-    }
-
-    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();
-    }
-
-    protected override bool HasFocusWithinCore()
-    {
-      return false;
-    }
-
-    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);
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    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();
-    }
-
-    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;
-    }
-
-    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;
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void _internalHwndSource_ContentRendered( object sender, EventArgs e )
-    {
-      _internalHost_ContentRendered = true;
-    }
-
-    private void _model_PropertyChanged( object sender, System.ComponentModel.PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName == "IsAutoHidden" )
-      {
-        if( !_model.IsAutoHidden )
-        {
-          _manager.HideAutoHideWindow( _anchor );
-        }
-      }
-    }
-
-    private 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;
-    }
-
-    private 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;
-    }
-
-    private 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();
-    }
-
-    private void HideResizerOverlayWindow()
-    {
-      if( _resizerWindowHost != null )
-      {
-        _resizerWindowHost.Close();
-        _resizerWindowHost = null;
-      }
-    }
-
-    private 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();
-    }
-
-    private 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 ) );
-      }
-    }
-
-    private void OnResizerDragStarted( object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e )
-    {
-      var resizer = sender as LayoutGridResizerControl;
-      ShowResizerOverlayWindow( resizer );
-      IsResizing = true;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
deleted file mode 100644
index b2e4a37f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutDocumentControl : Control
-  {
-    #region Constructors
-
-    static LayoutDocumentControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutDocumentControl ), new FrameworkPropertyMetadata( typeof( LayoutDocumentControl ) ) );
-      FocusableProperty.OverrideMetadata( typeof( LayoutDocumentControl ), new FrameworkPropertyMetadata( true ) );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Model
-
-    /// <summary>
-    /// Model Dependency Property
-    /// </summary>
-    public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutContent ), typeof( LayoutDocumentControl ),
-      new FrameworkPropertyMetadata( null, 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( e.OldValue != null )
-      {
-        ( ( LayoutContent )e.OldValue ).PropertyChanged -= Model_PropertyChanged;
-      }
-
-      if( Model != null )
-      {
-        Model.PropertyChanged += Model_PropertyChanged;
-        SetLayoutItem( Model.Root.Manager.GetLayoutItemFromModel( Model ) );
-      }
-      else
-      {
-        SetLayoutItem( null );
-      }
-    }
-
-    private void Model_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName == "IsEnabled" )
-      {
-        if( Model != null )
-        {
-          IsEnabled = Model.IsEnabled;
-          if( !IsEnabled && Model.IsActive )
-          {
-            if( ( Model.Parent != null ) && ( Model.Parent is LayoutDocumentPane ) )
-            {
-              ( ( LayoutDocumentPane )Model.Parent ).SetNextSelectedIndex();
-            }
-          }
-        }
-      }
-    }
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      this.SetIsActive();
-      base.OnPreviewGotKeyboardFocus( e );
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      this.SetIsActive();
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseRightButtonDown( MouseButtonEventArgs e )
-    {
-      this.SetIsActive();
-      base.OnMouseLeftButtonDown( e );
-    }
-
-
-    #endregion
-
-    #region Private Methods
-
-    private void SetIsActive()
-    {
-      if( this.Model != null )
-      {
-        this.Model.IsActive = true;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
deleted file mode 100644
index 77a2f258..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.AvalonDock.Layout;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using Microsoft.Windows.Shell;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutDocumentFloatingWindowControl : LayoutFloatingWindowControl
-  {
-    #region Members
-
-    private LayoutDocumentFloatingWindow _model;
-
-    #endregion
-
-    #region Constructors
-
-    static LayoutDocumentFloatingWindowControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutDocumentFloatingWindowControl ), new FrameworkPropertyMetadata( typeof( LayoutDocumentFloatingWindowControl ) ) );
-    }
-
-    internal LayoutDocumentFloatingWindowControl( LayoutDocumentFloatingWindow model )
-        : base( model )
-    {
-      _model = model;
-      UpdateThemeResources();
-    }
-
-    #endregion
-
-    #region Properties
-
-    public LayoutItem RootDocumentLayoutItem
-    {
-      get
-      {
-        return _model.Root.Manager.GetLayoutItemFromModel( _model.RootDocument );
-      }
-    }
-
-    #endregion
-
-    #region Overrides
-
-    public override ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }
-
-    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 );
-      }
-    }
-
-    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 );
-    }
-
-    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 );
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void _model_RootDocumentChanged( object sender, EventArgs e )
-    {
-      if( _model.RootDocument == null )
-      {
-        InternalClose();
-      }
-    }
-
-    private 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;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs
deleted file mode 100644
index 7bcbba96..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows;
-using Xceed.Wpf.AvalonDock.Commands;
-using System.Windows.Input;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutDocumentItem : LayoutItem
-  {
-    #region Members
-
-    private LayoutDocument _document;
-
-    #endregion
-
-    #region Constructors
-
-    internal LayoutDocumentItem()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    protected override void Close()
-    {
-      if( ( _document.Root != null ) && ( _document.Root.Manager != null ) )
-      {
-        var dockingManager = _document.Root.Manager;
-        dockingManager._ExecuteCloseCommand( _document );
-      }
-    }
-
-    protected override void OnVisibilityChanged()
-    {
-      if( (_document != null) && (_document.Root != null) )
-      {
-        _document.IsVisible = ( this.Visibility == Visibility.Visible );
-
-        if( _document.Parent is LayoutDocumentPane )
-        {
-          ( ( LayoutDocumentPane )_document.Parent ).ComputeVisibility();
-        }
-      }
-
-      base.OnVisibilityChanged();
-    }
-
-
-
-
-
-
-
-    internal override void Attach( LayoutContent model )
-    {
-      _document = model as LayoutDocument;
-      base.Attach( model );
-    }
-
-    internal override void Detach()
-    {
-      _document = null;
-      base.Detach();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-
-
-
-
-
-
-#endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
deleted file mode 100644
index 74827cbc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
-  {
-    #region Members
-
-    private List<object> _logicalChildren = new List<object>();
-    private LayoutDocumentPane _model;
-
-    #endregion
-
-    #region Constructors
-
-    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 );
-    }
-
-    #endregion
-
-    #region Properties
-
-    public ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }
-
-    #endregion
-
-    #region Overrides
-
-    protected override System.Collections.IEnumerator LogicalChildren
-    {
-      get
-      {
-        return _logicalChildren.GetEnumerator();
-      }
-    }
-
-    protected override void OnSelectionChanged( SelectionChangedEventArgs e )
-    {
-      base.OnSelectionChanged( e );
-
-      if( _model.SelectedContent != null )
-        _model.SelectedContent.IsActive = true;
-    }
-
-    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;
-
-    }
-
-
-    #endregion
-
-    #region Private Methods
-
-    private void OnLayoutUpdated( object sender, EventArgs e )
-    {
-      var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
-      modelWithAtcualSize.ActualWidth = ActualWidth;
-      modelWithAtcualSize.ActualHeight = ActualHeight;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
deleted file mode 100644
index 17d577fb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutDocumentPaneGroupControl : LayoutGridControl<ILayoutDocumentPane>, ILayoutControl
-  {
-    #region Members
-
-    private LayoutDocumentPaneGroup _model;
-
-    #endregion
-
-    #region Constructors
-
-    internal LayoutDocumentPaneGroupControl( LayoutDocumentPaneGroup model )
-        : base( model, model.Orientation )
-    {
-      _model = model;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
deleted file mode 100644
index 951d2c1e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutDocumentTabItem : Control
-  {
-    #region Members
-
-    private List<Rect> _otherTabsScreenArea = null;
-    private List<TabItem> _otherTabs = null;
-    private Rect _parentDocumentTabPanelScreenArea;
-    private DocumentPaneTabPanel _parentDocumentTabPanel;
-    private bool _isMouseDown = false;
-    private Point _mouseDownPoint;
-
-    #endregion
-
-    #region Contructors
-
-    static LayoutDocumentTabItem()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( LayoutDocumentTabItem ), new FrameworkPropertyMetadata( typeof( LayoutDocumentTabItem ) ) );
-    }
-
-    public LayoutDocumentTabItem()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    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 )
-        {
-          this.UpdateDragDetails();
-          this.CaptureMouse();
-          _isMouseDown = false;
-        }
-      }
-
-      if( this.IsMouseCaptured )
-      {
-        var mousePosInScreenCoord = this.PointToScreenDPI( e.GetPosition( this ) );
-        if( !_parentDocumentTabPanelScreenArea.Contains( mousePosInScreenCoord ) )
-        {
-          this.StartDraggingFloatingWindowForContent();
-        }
-        else
-        {
-          int indexOfTabItemWithMouseOver = _otherTabsScreenArea.FindIndex( r => r.Contains( mousePosInScreenCoord ) );
-          if( indexOfTabItemWithMouseOver >= 0 )
-          {
-            var targetModel = _otherTabs[ indexOfTabItemWithMouseOver ].Content as LayoutContent;
-            var container = this.Model.Parent as ILayoutContainer;
-            var containerPane = this.Model.Parent as ILayoutPane;
-
-            if( ( containerPane is LayoutDocumentPane ) && !( ( LayoutDocumentPane )containerPane ).CanRepositionItems )
-              return;
-            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutDocumentPaneGroup ) && !( ( LayoutDocumentPaneGroup )containerPane.Parent ).CanRepositionItems )
-              return;
-
-            var childrenList = container.Children.ToList();
-            containerPane.MoveChild( childrenList.IndexOf( Model ), childrenList.IndexOf( targetModel ) );
-            this.Model.IsActive = true;
-            _parentDocumentTabPanel.UpdateLayout();
-            this.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 );
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private 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();
-    }
-
-    private void StartDraggingFloatingWindowForContent()
-    {
-      this.ReleaseMouseCapture();
-
-      if( this.Model is LayoutAnchorable )
-      {
-        ( ( LayoutAnchorable )this.Model ).ResetCanCloseInternal();
-      }
-      var manager = this.Model.Root.Manager;
-      manager.StartDraggingFloatingWindowForContent( this.Model );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
deleted file mode 100644
index 4a8b6a3d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
+++ /dev/null
@@ -1,587 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-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.Windows.Documents;
-using Xceed.Wpf.AvalonDock.Themes;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public abstract class LayoutFloatingWindowControl : Window, ILayoutControl
-  {
-    #region Members
-
-    private ResourceDictionary currentThemeResourceDictionary; // = null
-    private bool _isInternalChange; //false
-    private ILayoutElement _model;
-    private bool _attachDrag = false;
-    private HwndSource _hwndSrc;
-    private HwndSourceHook _hwndSrcHook;
-    private DragService _dragService = null;
-    private bool _internalCloseFlag = false;
-
-    #endregion
-
-    #region Constructors
-
-    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 ) );
-    }
-
-    protected LayoutFloatingWindowControl( ILayoutElement model )
-    {
-      this.Loaded += new RoutedEventHandler( OnLoaded );
-      this.Unloaded += new RoutedEventHandler( OnUnloaded );
-      _model = model;
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Model
-
-    public abstract ILayoutElement Model
-    {
-      get;
-    }
-
-    #endregion
-
-    #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 )
-    {
-      if( ( bool )e.NewValue )
-      {
-        CaptureMouse();
-      }
-      else
-      {
-        ReleaseMouseCapture();
-      }
-    }
-
-    #endregion
-
-    #region CloseInitiatedByUser
-
-    protected bool CloseInitiatedByUser
-    {
-      get
-      {
-        return !_internalCloseFlag;
-      }
-    }
-
-    #endregion
-
-    #region KeepContentVisibleOnClose
-
-    internal bool KeepContentVisibleOnClose
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region IsMaximized
-
-    /// <summary>
-    /// IsMaximized Dependency Property
-    /// </summary>
-    public static readonly DependencyProperty IsMaximizedProperty = DependencyProperty.Register( "IsMaximized", typeof( bool ), typeof( LayoutFloatingWindowControl ),
-              new FrameworkPropertyMetadata( ( bool )false ) );
-
-    /// <summary>
-    /// Gets/sets the IsMaximized property.  This dependency property 
-    /// indicates if the window is maximized.
-    /// </summary>
-    public bool IsMaximized
-    {
-      get
-      {
-        return ( bool )GetValue( IsMaximizedProperty );
-      }
-      private set
-      {
-        SetValue( IsMaximizedProperty, value );
-        UpdatePositionAndSizeOfPanes();
-      }
-    }
-
-    /// <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 override void OnStateChanged( EventArgs e )
-    {
-      if( !_isInternalChange )
-      {
-        if( WindowState == WindowState.Maximized )
-        {
-          UpdateMaximizedState( true );
-        }
-        else
-        {
-          WindowState = IsMaximized ? WindowState.Maximized : WindowState.Normal;
-        }
-      }
-
-      base.OnStateChanged( e );
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    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 );
-    }
-
-    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 );
-    }
-
-
-    #endregion
-
-    #region Internal Methods
-
-    internal virtual void UpdateThemeResources( Theme oldTheme = null )
-    {
-      if( oldTheme != null )
-      {
-        if( oldTheme is DictionaryTheme )
-        {
-          if( currentThemeResourceDictionary != null )
-          {
-            Resources.MergedDictionaries.Remove( currentThemeResourceDictionary );
-            currentThemeResourceDictionary = null;
-          }
-        }
-        else
-        {
-          var resourceDictionaryToRemove =
-              Resources.MergedDictionaries.FirstOrDefault( r => r.Source == oldTheme.GetResourceUri() );
-          if( resourceDictionaryToRemove != null )
-            Resources.MergedDictionaries.Remove(
-                resourceDictionaryToRemove );
-        }
-      }
-
-      var manager = _model.Root.Manager;
-      if( manager.Theme != null )
-      {
-        if( manager.Theme is DictionaryTheme )
-        {
-          currentThemeResourceDictionary = ( ( DictionaryTheme )manager.Theme ).ThemeResourceDictionary;
-          Resources.MergedDictionaries.Add( currentThemeResourceDictionary );
-        }
-        else
-        {
-          Resources.MergedDictionaries.Add( new ResourceDictionary() { Source = manager.Theme.GetResourceUri() } );
-        }
-      }
-    }
-
-    internal void AttachDrag( bool onActivated = true )
-    {
-      if( onActivated )
-      {
-        _attachDrag = true;
-        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 );
-      }
-    }
-
-    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();
-            if( this.IsMaximized )
-            {
-              this.UpdateMaximizedState( false );
-            }
-          }
-          break;
-        case Win32Helper.WM_LBUTTONUP: //set as handled right button click on title area (after showing context menu)
-          if( _dragService != null && Mouse.LeftButton == MouseButtonState.Released )
-          {
-            _dragService.Abort();
-            _dragService = null;
-            SetIsDragging( false );
-          }
-          break;
-        case Win32Helper.WM_SYSCOMMAND:
-          int command = ( int )wParam & 0xFFF0;
-          if( command == Win32Helper.SC_MAXIMIZE || command == Win32Helper.SC_RESTORE )
-          {
-            UpdateMaximizedState( command == Win32Helper.SC_MAXIMIZE );
-          }
-          break;
-      }
-
-
-
-      return IntPtr.Zero;
-    }
-
-    internal void InternalClose()
-    {
-      _internalCloseFlag = true;
-      Close();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private static object CoerceContentValue( DependencyObject sender, object content )
-    {
-      return new FloatingWindowContentHost( sender as LayoutFloatingWindowControl ) { Content = content as UIElement };
-    }
-
-    private 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 );
-
-      // Restore maximize state
-      var maximized = Model.Descendents().OfType<ILayoutElementForFloatingWindow>().Any( l => l.IsMaximized );
-      UpdateMaximizedState( maximized );
-    }
-
-    private void OnUnloaded( object sender, RoutedEventArgs e )
-    {
-      this.Unloaded -= new RoutedEventHandler( OnUnloaded );
-
-      if( _hwndSrc != null )
-      {
-        _hwndSrc.RemoveHook( _hwndSrcHook );
-        InternalClose();
-      }
-    }
-
-    private 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 );
-      }
-    }
-
-    private void UpdatePositionAndSizeOfPanes()
-    {
-      foreach( var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>() )
-      {
-        posElement.FloatingLeft = Left;
-        posElement.FloatingTop = Top;
-        posElement.FloatingWidth = Width;
-        posElement.FloatingHeight = Height;
-      }
-    }
-
-    private void UpdateMaximizedState( bool isMaximized )
-    {
-      foreach( var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>() )
-      {
-        posElement.IsMaximized = isMaximized;
-      }
-      IsMaximized = isMaximized;
-      _isInternalChange = true;
-      WindowState = isMaximized ? WindowState.Maximized : WindowState.Normal;
-      _isInternalChange = false;
-    }
-
-    private void UpdateDragPosition()
-    {
-      if( _dragService == null )
-      {
-        _dragService = new DragService( this );
-        SetIsDragging( true );
-      }
-
-      var mousePosition = this.TransformToDeviceDPI( Win32Helper.GetMousePosition() );
-      _dragService.UpdateMouseLocation( mousePosition );
-    }
-
-    #endregion
-
-    #region Internal Classes
-
-    protected internal class FloatingWindowContentHost : HwndHost
-    {
-      #region Members
-
-      private LayoutFloatingWindowControl _owner;
-      private HwndSource _wpfContentHost = null;
-      private Border _rootPresenter = null;
-      private DockingManager _manager = null;
-
-      #endregion
-
-      #region Constructors
-
-      public FloatingWindowContentHost( LayoutFloatingWindowControl owner )
-      {
-        _owner = owner;
-        var manager = _owner.Model.Root.Manager;
-      }
-
-      #endregion
-
-      #region Properties
-
-      #region RootVisual
-
-      public Visual RootVisual
-      {
-        get
-        {
-          return _rootPresenter;
-        }
-      }
-
-      #endregion
-
-      #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
-
-      #endregion
-
-      #region Overrides
-
-      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 DestroyWindowCore( HandleRef hwnd )
-      {
-        _manager.InternalRemoveLogicalChild( _rootPresenter );
-        if( _wpfContentHost != null )
-        {
-          _wpfContentHost.Dispose();
-          _wpfContentHost = null;
-        }
-      }
-
-      protected override Size MeasureOverride( Size constraint )
-      {
-        if( Content == null )
-          return base.MeasureOverride( constraint );
-
-        Content.Measure( constraint );
-        return Content.DesiredSize;
-      }
-
-      #endregion
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
deleted file mode 100644
index 0f8960d6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
+++ /dev/null
@@ -1,579 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Controls;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public abstract class LayoutGridControl<T> : Grid, ILayoutControl where T : class, ILayoutPanelElement
-  {
-    #region Members
-
-    private LayoutPositionableGroup<T> _model;
-    private Orientation _orientation;
-    private bool _initialized;
-    private ChildrenTreeChange? _asyncRefreshCalled;
-    private ReentrantFlag _fixingChildrenDockLengths = new ReentrantFlag();
-    private Border _resizerGhost = null;
-    private Window _resizerWindowHost = null;
-    private Vector _initialStartPoint;
-
-    #endregion
-
-    #region Constructors
-
-    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;
-    }
-
-    #endregion
-
-    #region Properties
-
-    public ILayoutElement Model
-    {
-      get
-      {
-        return _model;
-      }
-    }   
-
-    public Orientation Orientation
-    {
-      get
-      {
-        return ( _model as ILayoutOrientableGroup ).Orientation;
-      }
-    } 
-
-    private bool AsyncRefreshCalled
-    {
-      get
-      {
-        return _asyncRefreshCalled != null;
-      }
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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 );
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    protected void FixChildrenDockLengths()
-    {
-      using( _fixingChildrenDockLengths.Enter() )
-        OnFixChildrenDockLengths();
-    }
-
-    protected abstract void OnFixChildrenDockLengths();
-
-    #endregion
-
-    #region Private Methods
-
-    private void OnLayoutUpdated( object sender, EventArgs e )
-    {
-      var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
-      modelWithAtcualSize.ActualWidth = ActualWidth;
-      modelWithAtcualSize.ActualHeight = ActualHeight;
-
-      if( !_initialized )
-      {
-        _initialized = true;
-        UpdateChildren();
-      }
-    }
-
-    private 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 );
-      }
-    }
-
-    private 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();
-      }
-    }
-
-    private 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
-    }
-
-    private 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++;
-      }
-    }
-
-    private 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 );
-      }
-    }
-
-    private 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 );
-      }
-    }
-
-    private void OnSplitterDragStarted( object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e )
-    {
-      var resizer = sender as LayoutGridResizerControl;
-      ShowResizerOverlayWindow( resizer );
-    }
-
-    private 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 ) );
-      }
-    }
-
-    private 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 )
-      {
-        if( prevChildModel.DockWidth.IsStar )
-        {
-          prevChildModel.DockWidth = new GridLength( prevChildModel.DockWidth.Value * ( prevChildActualSize.Width + delta ) / prevChildActualSize.Width, GridUnitType.Star );
-        }
-        else
-        {
-          var width = ( prevChildModel.DockWidth.IsAuto ) ? prevChildActualSize.Width : prevChildModel.DockWidth.Value;
-          prevChildModel.DockWidth = new GridLength( width + delta, GridUnitType.Pixel );
-        }
-
-        if( nextChildModel.DockWidth.IsStar )
-        {
-          nextChildModel.DockWidth = new GridLength( nextChildModel.DockWidth.Value * ( nextChildActualSize.Width - delta ) / nextChildActualSize.Width, GridUnitType.Star );
-        }
-        else
-        {
-          var width = ( nextChildModel.DockWidth.IsAuto ) ? nextChildActualSize.Width : nextChildModel.DockWidth.Value;
-          nextChildModel.DockWidth = new GridLength( width - delta, GridUnitType.Pixel );
-        }
-      }
-      else
-      {
-        if( prevChildModel.DockHeight.IsStar )
-        {
-          prevChildModel.DockHeight = new GridLength( prevChildModel.DockHeight.Value * ( prevChildActualSize.Height + delta ) / prevChildActualSize.Height, GridUnitType.Star );
-        }
-        else
-        {
-          var height = ( prevChildModel.DockHeight.IsAuto ) ? prevChildActualSize.Height : prevChildModel.DockHeight.Value;
-          prevChildModel.DockHeight = new GridLength( height + delta, GridUnitType.Pixel );
-        }
-
-        if( nextChildModel.DockHeight.IsStar )
-        {
-          nextChildModel.DockHeight = new GridLength( nextChildModel.DockHeight.Value * ( nextChildActualSize.Height - delta ) / nextChildActualSize.Height, GridUnitType.Star );
-        }
-        else
-        {
-          var height = ( nextChildModel.DockHeight.IsAuto ) ? nextChildActualSize.Height : nextChildModel.DockHeight.Value;
-          nextChildModel.DockHeight = new GridLength( height - delta, GridUnitType.Pixel );
-        }
-      }
-
-      HideResizerOverlayWindow();
-    }
-
-    private 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;
-    }
-
-    private 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()
-      {
-        SizeToContent = System.Windows.SizeToContent.Manual,
-        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();
-    }
-
-    private  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
deleted file mode 100644
index 6347f96b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Primitives;
-using System.Windows;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutGridResizerControl : Thumb
-  {
-    #region Constructors
-
-    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 ) );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
deleted file mode 100644
index 8f61c4a9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
+++ /dev/null
@@ -1,1252 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Commands;
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public abstract class LayoutItem : FrameworkElement
-  {
-    #region Members
-
-    private ICommand _defaultCloseCommand;
-    private ICommand _defaultFloatCommand;
-    private ICommand _defaultDockAsDocumentCommand;
-    private ICommand _defaultCloseAllButThisCommand;
-    private ICommand _defaultCloseAllCommand;
-    private ICommand _defaultActivateCommand;
-    private ICommand _defaultNewVerticalTabGroupCommand;
-    private ICommand _defaultNewHorizontalTabGroupCommand;
-    private ICommand _defaultMoveToNextTabGroupCommand;
-    private ICommand _defaultMoveToPreviousTabGroupCommand;
-    private ContentPresenter _view = null;
-    private ReentrantFlag _isSelectedReentrantFlag = new ReentrantFlag();
-    private ReentrantFlag _isActiveReentrantFlag = new ReentrantFlag();
-
-    #endregion
-
-    #region Constructors
-
-    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()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region LayoutElement
-
-    public LayoutContent LayoutElement
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region Model
-
-    public object Model
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region View
-
-    public ContentPresenter View
-    {
-      get
-      {
-        if( _view == null )
-        {
-          _view = new ContentPresenter();
-
-          _view.SetBinding( ContentPresenter.ContentProperty, new Binding( "Content" ) { Source = LayoutElement } );
-          if( ( LayoutElement != null ) && ( LayoutElement.Root != null ) )
-          {
-            _view.SetBinding( ContentPresenter.ContentTemplateProperty, new Binding( "LayoutItemTemplate" ) { Source = LayoutElement.Root.Manager } );
-            _view.SetBinding( ContentPresenter.ContentTemplateSelectorProperty, new Binding( "LayoutItemTemplateSelector" ) { Source = LayoutElement.Root.Manager } );
-            if( LayoutElement.Root.Manager != null )
-            {
-              LayoutElement.Root.Manager.InternalAddLogicalChild( _view );
-            }
-          }
-        }
-
-        return _view;
-      }
-    }
-
-    #endregion
-
-    #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 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 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
-
-    /// <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  
-
-    /// <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 )
-    {
-      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 CloseAllCommand
-
-    /// <summary>
-    /// CloseAllCommand Dependency Property
-    /// </summary>
-    public static readonly DependencyProperty CloseAllCommandProperty = DependencyProperty.Register( "CloseAllCommand", typeof( ICommand ), typeof( LayoutItem ),
-            new FrameworkPropertyMetadata( null, new PropertyChangedCallback( OnCloseAllCommandChanged ), new CoerceValueCallback( CoerceCloseAllCommandValue ) ) );
-
-    /// <summary>
-    /// Gets or sets the CloseAllCommand property.  This dependency property 
-    /// indicates the 'Close All' command.
-    /// </summary>
-    public ICommand CloseAllCommand
-    {
-      get
-      {
-        return ( ICommand )GetValue( CloseAllCommandProperty );
-      }
-      set
-      {
-        SetValue( CloseAllCommandProperty, value );
-      }
-    }
-
-    /// <summary>
-    /// Handles changes to the CloseAllCommand property.
-    /// </summary>
-    private static void OnCloseAllCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( LayoutItem )d ).OnCloseAllCommandChanged( e );
-    }
-
-    /// <summary>
-    /// Provides derived classes an opportunity to handle changes to the CloseAllCommand property.
-    /// </summary>
-    protected virtual void OnCloseAllCommandChanged( DependencyPropertyChangedEventArgs e )
-    {
-    }
-
-    /// <summary>
-    /// Coerces the CloseAllCommand value.
-    /// </summary>
-    private static object CoerceCloseAllCommandValue( DependencyObject d, object value )
-    {
-      return value;
-    }
-
-    private bool CanExecuteCloseAllCommand( 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.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).Any();
-    }
-
-    private void ExecuteCloseAllCommand( object parameter )
-    {
-      LayoutElement.Root.Manager._ExecuteCloseAllCommand( 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
-
-    #endregion
-
-    #region Internal Methods
-
-    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 ) );
-      _defaultCloseAllCommand = new RelayCommand( ( p ) => ExecuteCloseAllCommand( p ), ( p ) => CanExecuteCloseAllCommand( 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( CloseAllCommand == _defaultCloseAllCommand )
-        BindingOperations.ClearBinding( this, CloseAllCommandProperty );
-      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( CloseAllCommand == null )
-        CloseAllCommand = _defaultCloseAllCommand;
-      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;
-      CanClose = LayoutElement.CanClose;
-    }
-
-    protected virtual void OnVisibilityChanged()
-    {
-      if( LayoutElement != null &&
-          Visibility == System.Windows.Visibility.Collapsed )
-        LayoutElement.Close();
-    }
-
-    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;
-    }
-
-    internal virtual void Detach()
-    {
-      LayoutElement.IsSelectedChanged -= new EventHandler( LayoutElement_IsSelectedChanged );
-      LayoutElement.IsActiveChanged -= new EventHandler( LayoutElement_IsActiveChanged );
-      LayoutElement = null;
-      Model = null;
-    }
-
-    internal void _ClearDefaultBindings()
-    {
-      ClearDefaultBindings();
-    }
-
-    internal void _SetDefaultBindings()
-    {
-      SetDefaultBindings();
-    }
-
-    internal bool IsViewExists()
-    {
-      return ( _view != null );
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private 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 );
-        }
-      }
-    }
-
-    private void LayoutElement_IsSelectedChanged( object sender, EventArgs e )
-    {
-      if( _isSelectedReentrantFlag.CanEnter )
-      {
-        using( _isSelectedReentrantFlag.Enter() )
-        {
-          IsSelected = LayoutElement.IsSelected;
-        }
-      }
-    }
-
-    private static void OnToolTipChanged( DependencyObject s, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( LayoutItem )s ).OnToolTipChanged();
-    }
-
-    private void OnToolTipChanged()
-    {
-      if( LayoutElement != null )
-        LayoutElement.ToolTip = ToolTip;
-    }
-
-    private static void OnVisibilityChanged( DependencyObject s, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( LayoutItem )s ).OnVisibilityChanged();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs
deleted file mode 100644
index 3fe90c42..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class LayoutPanelControl : LayoutGridControl<ILayoutPanelElement>, ILayoutControl
-  {
-    #region Members
-
-    private LayoutPanel _model;
-
-    #endregion
-
-    #region Constructors
-
-    internal LayoutPanelControl( LayoutPanel model )
-        : base( model, model.Orientation )
-    {
-      _model = model;
-
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs
deleted file mode 100644
index 55803e0b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class MenuItemEx : MenuItem
-  {
-    #region Members
-
-    private bool _reentrantFlag = false;
-
-    #endregion
-
-    #region Constructors
-
-    static MenuItemEx()
-    {
-      IconProperty.OverrideMetadata( typeof( MenuItemEx ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnIconPropertyChanged ) ) );
-    }
-
-    public MenuItemEx()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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
-
-    #endregion
-
-    #region Private Mehods
-
-    private static void OnIconPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( e.NewValue != null )
-      {
-        ( ( MenuItemEx )sender ).UpdateIcon();
-      }
-    }
-
-    private 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;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
deleted file mode 100644
index 9c2ea878..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
+++ /dev/null
@@ -1,491 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Themes;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  [TemplatePart( Name = PART_AnchorableListBox, Type = typeof( ListBox ) )]
-  [TemplatePart( Name = PART_DocumentListBox, Type = typeof( ListBox ) )]
-  public class NavigatorWindow : Window
-  {
-    #region Members
-
-    private const string PART_AnchorableListBox = "PART_AnchorableListBox";
-    private const string PART_DocumentListBox = "PART_DocumentListBox";
-
-    private ResourceDictionary currentThemeResourceDictionary; // = null
-    private DockingManager _manager;
-    private bool _isSelectingDocument;
-    private ListBox _anchorableListBox;
-    private ListBox _documentListBox;
-    private bool _internalSetSelectedDocument = false;
-    private bool _internalSetSelectedAnchorable = false;
-
-    #endregion
-
-    #region Constructors
-
-    static NavigatorWindow()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( NavigatorWindow ), new FrameworkPropertyMetadata( typeof( NavigatorWindow ) ) );
-      ShowActivatedProperty.OverrideMetadata( typeof( NavigatorWindow ), new FrameworkPropertyMetadata( false ) );
-      ShowInTaskbarProperty.OverrideMetadata( typeof( NavigatorWindow ), new FrameworkPropertyMetadata( false ) );
-    }
-
-    internal NavigatorWindow( DockingManager manager )
-    {
-      _manager = manager;
-
-      _internalSetSelectedDocument = true;
-      this.SetAnchorables( _manager.Layout.Descendents().OfType<LayoutAnchorable>().Where( a => a.IsVisible ).Select( d => ( LayoutAnchorableItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() );
-      this.SetDocuments( _manager.Layout.Descendents().OfType<LayoutDocument>().OrderByDescending( d => d.LastActivationTimeStamp.GetValueOrDefault() ).Select( d => ( LayoutDocumentItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() );
-      _internalSetSelectedDocument = false;
-
-      if( this.Documents.Length > 1 )
-      {
-        this.InternalSetSelectedDocument( this.Documents[ 1 ] );
-        _isSelectingDocument = true;
-      }
-      else if( this.Anchorables.Count() > 1 )
-      {
-        this.InternalSetSelectedAnchorable( this.Anchorables.ToArray()[ 1 ] );
-        _isSelectingDocument = false;
-      }
-
-      this.DataContext = this;
-
-      this.Loaded += new RoutedEventHandler( OnLoaded );
-      this.Unloaded += new RoutedEventHandler( OnUnloaded );
-
-      this.UpdateThemeResources();
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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 );
-      }
-    }
-
-    #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 );
-      }
-    }
-
-    #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( this.SelectedDocument != null &&
-          this.SelectedDocument.ActivateCommand.CanExecute( null ) )
-      {
-        this.Hide();
-        this.SelectedDocument.ActivateCommand.Execute( null );
-      }
-    }
-
-    #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 )
-    {
-      if( _internalSetSelectedAnchorable )
-        return;
-
-      var selectedAnchorable = e.NewValue as LayoutAnchorableItem;
-      if( this.SelectedAnchorable != null &&
-          this.SelectedAnchorable.ActivateCommand.CanExecute( null ) )
-      {
-        this.Close();
-        this.SelectedAnchorable.ActivateCommand.Execute( null );
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides   
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      _anchorableListBox = this.GetTemplateChild( PART_AnchorableListBox ) as ListBox;
-      _documentListBox = this.GetTemplateChild( PART_DocumentListBox ) as ListBox;
-    }
-
-    protected override void OnPreviewKeyDown( System.Windows.Input.KeyEventArgs e )
-    {
-      bool shouldHandle = false;
-
-      // Press Tab to switch Selected LayoutContent.
-      if( e.Key == System.Windows.Input.Key.Tab)
-      {
-        // Selecting LayoutDocuments
-        if( _isSelectingDocument )
-        {
-          if( this.SelectedDocument != null )
-          {
-            // Jump to next LayoutDocument
-            var docIndex = this.Documents.IndexOf<LayoutDocumentItem>( this.SelectedDocument );
-            if( docIndex < (this.Documents.Length - 1) )
-            {
-              this.SelectNextDocument();
-              shouldHandle = true;
-            }
-            // Jump to first LayoutAnchorable
-            else if( this.Anchorables.Count() > 0 )
-            {
-              _isSelectingDocument = false;
-              this.InternalSetSelectedDocument( null );
-              this.InternalSetSelectedAnchorable( this.Anchorables.First() );
-              shouldHandle = true;
-            }
-          }
-          // There is no SelectedDocument, select the first one.
-          else
-          {
-            if( this.Documents.Length > 0 )
-            {
-              this.InternalSetSelectedDocument( this.Documents[ 0 ] );
-              shouldHandle = true;
-            }
-          }
-        }
-        // Selecting LayoutAnchorables
-        else
-        {
-          if( this.SelectedAnchorable != null )
-          {
-            // Jump to next LayoutAnchorable
-            var anchorableIndex = this.Anchorables.ToArray().IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable );
-            if( anchorableIndex < (this.Anchorables.Count() - 1) )
-            {
-              this.SelectNextAnchorable();
-              shouldHandle = true;
-            }
-            // Jump to first LayoutDocument
-            else if( this.Documents.Length > 0 )
-            {
-              _isSelectingDocument = true;
-              this.InternalSetSelectedAnchorable( null );
-              this.InternalSetSelectedDocument( this.Documents[ 0 ] );
-              shouldHandle = true;
-            }
-          }
-          // There is no SelectedAnchorable, select the first one.
-          else
-          {
-            if( this.Anchorables.Count() > 0 )
-            {
-              this.InternalSetSelectedAnchorable( this.Anchorables.ToArray()[ 0 ] );
-              shouldHandle = true;
-            }
-          }
-        }
-      }
-
-      if( shouldHandle )
-      {
-        e.Handled = true;
-      }
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnPreviewKeyUp( System.Windows.Input.KeyEventArgs e )
-    {
-      if( e.Key != System.Windows.Input.Key.Tab )
-      {
-        this.Close();
-
-        if( this.SelectedDocument != null &&
-           this.SelectedDocument.ActivateCommand.CanExecute( null ) )
-        {
-          this.SelectedDocument.ActivateCommand.Execute( null );
-        }
-
-        if( this.SelectedDocument == null &&
-            this.SelectedAnchorable != null &&
-            this.SelectedAnchorable.ActivateCommand.CanExecute( null ) )
-        {
-          this.SelectedAnchorable.ActivateCommand.Execute( null );
-        }
-
-        e.Handled = true;
-      }
-
-      base.OnPreviewKeyUp( e );
-    }
-
-
-    #endregion
-
-    #region Internal Methods
-
-    /// <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 )
-    {
-      this.SetValue( AnchorablesPropertyKey, value );
-    }
-
-    /// <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 )
-    {
-      this.SetValue( DocumentsPropertyKey, value );
-    }
-
-    internal void UpdateThemeResources( Theme oldTheme = null )
-    {
-      if( oldTheme != null )
-      {
-        if( oldTheme is DictionaryTheme )
-        {
-          if( currentThemeResourceDictionary != null )
-          {
-            this.Resources.MergedDictionaries.Remove( currentThemeResourceDictionary );
-            currentThemeResourceDictionary = null;
-          }
-        }
-        else
-        {
-          var resourceDictionaryToRemove = this.Resources.MergedDictionaries.FirstOrDefault( r => r.Source == oldTheme.GetResourceUri() );
-          if( resourceDictionaryToRemove != null )
-          {
-            this.Resources.MergedDictionaries.Remove( resourceDictionaryToRemove );
-          }
-        }
-      }
-
-      if( _manager.Theme != null )
-      {
-        if( _manager.Theme is DictionaryTheme )
-        {
-          currentThemeResourceDictionary = ( ( DictionaryTheme )_manager.Theme ).ThemeResourceDictionary;
-          this.Resources.MergedDictionaries.Add( currentThemeResourceDictionary );
-        }
-        else
-        {
-          this.Resources.MergedDictionaries.Add( new ResourceDictionary() { Source = _manager.Theme.GetResourceUri() } );
-        }
-      }
-    }
-
-    internal void SelectNextDocument()
-    {
-      if( this.SelectedDocument != null )
-      {
-        int docIndex = this.Documents.IndexOf<LayoutDocumentItem>( this.SelectedDocument );
-        docIndex++;
-        if( docIndex == this.Documents.Length )
-        {
-          docIndex = 0;
-        }
-        this.InternalSetSelectedDocument( this.Documents[ docIndex ] );
-      }
-    }
-
-    internal void SelectNextAnchorable()
-    {
-      if( this.SelectedAnchorable != null )
-      {
-        var anchorablesArray = this.Anchorables.ToArray();
-        int anchorableIndex = anchorablesArray.IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable );
-        anchorableIndex++;
-        if( anchorableIndex == this.Anchorables.Count() )
-        {
-          anchorableIndex = 0;
-        }
-        this.InternalSetSelectedAnchorable( anchorablesArray[ anchorableIndex ] );
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void InternalSetSelectedAnchorable( LayoutAnchorableItem anchorableToSelect )
-    {
-      _internalSetSelectedAnchorable = true;
-      this.SelectedAnchorable = anchorableToSelect;
-      _internalSetSelectedAnchorable = false;
-
-      if( _anchorableListBox != null )
-      {
-        _anchorableListBox.Focus();
-      }
-    }
-
-    private void InternalSetSelectedDocument( LayoutDocumentItem documentToSelect )
-    {
-      _internalSetSelectedDocument = true;
-      this.SelectedDocument = documentToSelect;
-      _internalSetSelectedDocument = false;
-
-      if( ( _documentListBox != null ) && ( documentToSelect != null ) )
-      {
-        _documentListBox.Focus();
-      }
-    }
-
-    private void OnLoaded( object sender, RoutedEventArgs e )
-    {
-      this.Loaded -= new RoutedEventHandler( OnLoaded );
-
-      if( ( _documentListBox != null ) && (this.SelectedDocument != null) )
-      {
-        _documentListBox.Focus();
-      }
-      else if( ( _anchorableListBox != null ) && (this.SelectedAnchorable != null) )
-      {
-        _anchorableListBox.Focus();
-      }
-
-      WindowStartupLocation = WindowStartupLocation.CenterOwner;
-    }
-
-    private void OnUnloaded( object sender, RoutedEventArgs e )
-    {
-      this.Unloaded -= new RoutedEventHandler( OnUnloaded );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs
deleted file mode 100644
index d6fa1f76..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public abstract class OverlayArea : IOverlayWindowArea
-  {
-    #region Members
-
-    private IOverlayWindow _overlayWindow;
-    private Rect? _screenDetectionArea;
-
-    #endregion
-
-    #region Constructors
-
-    internal OverlayArea( IOverlayWindow overlayWindow )
-    {
-      _overlayWindow = overlayWindow;
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    protected void SetScreenDetectionArea( Rect rect )
-    {
-      _screenDetectionArea = rect;
-    }
-
-    #endregion
-
-    #region IOverlayWindowArea
-
-    Rect IOverlayWindowArea.ScreenDetectionArea
-    {
-      get
-      {
-        return _screenDetectionArea.Value;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
deleted file mode 100644
index e7a74d62..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
+++ /dev/null
@@ -1,729 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Shapes;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Themes;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class OverlayWindow : Window, IOverlayWindow
-  {
-    #region Members
-
-    private ResourceDictionary currentThemeResourceDictionary; // = null
-    private Canvas _mainCanvasPanel;
-    private Grid _gridDockingManagerDropTargets;
-    private Grid _gridAnchorablePaneDropTargets;
-    private Grid _gridDocumentPaneDropTargets;
-    private Grid _gridDocumentPaneFullDropTargets;
-
-    private FrameworkElement _dockingManagerDropTargetBottom;
-    private FrameworkElement _dockingManagerDropTargetTop;
-    private FrameworkElement _dockingManagerDropTargetLeft;
-    private FrameworkElement _dockingManagerDropTargetRight;
-
-    private FrameworkElement _anchorablePaneDropTargetBottom;
-    private FrameworkElement _anchorablePaneDropTargetTop;
-    private FrameworkElement _anchorablePaneDropTargetLeft;
-    private FrameworkElement _anchorablePaneDropTargetRight;
-    private FrameworkElement _anchorablePaneDropTargetInto;
-
-    private FrameworkElement _documentPaneDropTargetBottom;
-    private FrameworkElement _documentPaneDropTargetTop;
-    private FrameworkElement _documentPaneDropTargetLeft;
-    private FrameworkElement _documentPaneDropTargetRight;
-    private FrameworkElement _documentPaneDropTargetInto;
-
-    private FrameworkElement _documentPaneDropTargetBottomAsAnchorablePane;
-    private FrameworkElement _documentPaneDropTargetTopAsAnchorablePane;
-    private FrameworkElement _documentPaneDropTargetLeftAsAnchorablePane;
-    private FrameworkElement _documentPaneDropTargetRightAsAnchorablePane;
-
-    private FrameworkElement _documentPaneFullDropTargetBottom;
-    private FrameworkElement _documentPaneFullDropTargetTop;
-    private FrameworkElement _documentPaneFullDropTargetLeft;
-    private FrameworkElement _documentPaneFullDropTargetRight;
-    private FrameworkElement _documentPaneFullDropTargetInto;
-
-    private Path _previewBox;
-    private IOverlayWindowHost _host;
-    private LayoutFloatingWindowControl _floatingWindow = null;
-    private List<IDropArea> _visibleAreas = new List<IDropArea>();
-
-    #endregion
-
-    #region Constructors
-
-    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();
-    }
-
-    #endregion
-
-    #region Overrides
-
-    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;
-    }
-
-    protected override void OnClosing( System.ComponentModel.CancelEventArgs e )
-    {
-      base.OnClosing( e );
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void UpdateThemeResources( Theme oldTheme = null )
-    {
-      if( oldTheme != null )
-      {
-        if( oldTheme is DictionaryTheme )
-        {
-          if( currentThemeResourceDictionary != null )
-          {
-            Resources.MergedDictionaries.Remove( currentThemeResourceDictionary );
-            currentThemeResourceDictionary = null;
-          }
-        }
-        else
-        {
-          var resourceDictionaryToRemove =
-              Resources.MergedDictionaries.FirstOrDefault( r => r.Source == oldTheme.GetResourceUri() );
-          if( resourceDictionaryToRemove != null )
-            Resources.MergedDictionaries.Remove(
-                resourceDictionaryToRemove );
-        }
-      }
-
-      if( _host.Manager.Theme != null )
-      {
-        if( _host.Manager.Theme is DictionaryTheme )
-        {
-          currentThemeResourceDictionary = ( ( DictionaryTheme )_host.Manager.Theme ).ThemeResourceDictionary;
-          Resources.MergedDictionaries.Add( currentThemeResourceDictionary );
-        }
-        else
-        {
-          Resources.MergedDictionaries.Add( new ResourceDictionary() { Source = _host.Manager.Theme.GetResourceUri() } );
-        }
-      }
-    }
-
-    internal void EnableDropTargets()
-    {
-      if( _mainCanvasPanel != null )
-        _mainCanvasPanel.Visibility = System.Windows.Visibility.Visible;
-    }
-
-    internal void HideDropTargets()
-    {
-      if( _mainCanvasPanel != null )
-        _mainCanvasPanel.Visibility = System.Windows.Visibility.Hidden;
-
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    /// <summary>
-    /// This method controls the DropTargetInto button of the overlay window.
-    /// It checks that only 1 of the defined ContentLayouts can be present on the LayoutDocumentPane or LayoutAnchorablePane.
-    /// The combination between the ContentLayout Title and the ContentId is the search key, and has to be unique.
-    /// If a floating window is dropped on a LayoutDocumentPane or LayoutAnchorablePane, it checks if one of the containing LayoutContents
-    /// is already present on the LayoutDocumentPane or LayoutAnchorablePane. If so, then it will disable the DropTargetInto button.
-    /// </summary>
-    /// <param name="positionableElement">The given LayoutDocumentPane or LayoutAnchorablePane</param>
-    private void SetDropTargetIntoVisibility( ILayoutPositionableElement positionableElement )
-    {
-      if( positionableElement is LayoutAnchorablePane )
-      {
-        _anchorablePaneDropTargetInto.Visibility = Visibility.Visible;
-      }
-      else if( positionableElement is LayoutDocumentPane )
-      {
-        _documentPaneDropTargetInto.Visibility = Visibility.Visible;
-      }
-
-      if( positionableElement == null || _floatingWindow.Model == null || positionableElement.AllowDuplicateContent )
-      {
-        return;
-      }
-
-      // Find all content layouts in the anchorable pane (object to drop on)
-      var contentLayoutsOnPositionableElementPane = GetAllLayoutContents( positionableElement );
-
-      // Find all content layouts in the floating window (object to drop)
-      var contentLayoutsOnFloatingWindow = GetAllLayoutContents( _floatingWindow.Model );
-
-      // If any of the content layouts is present in the drop area, then disable the DropTargetInto button.
-      foreach( var content in contentLayoutsOnFloatingWindow )
-      {
-        if( !contentLayoutsOnPositionableElementPane.Any( item =>
-             item.Title == content.Title &&
-             item.ContentId == content.ContentId ) )
-        {
-          continue;
-        }
-
-        if( positionableElement is LayoutAnchorablePane )
-        {
-          _anchorablePaneDropTargetInto.Visibility = Visibility.Hidden;
-        }
-        else if( positionableElement is LayoutDocumentPane )
-        {
-          _documentPaneDropTargetInto.Visibility = Visibility.Hidden;
-        }
-        break;
-      }
-    }
-
-    /// <summary>
-    /// Find any LayoutDocument or LayoutAnchorable from a given source (e.g. LayoutDocumentPane, LayoutAnchorableFloatingWindow, etc.)
-    /// </summary>
-    /// <param name="source">The given source to search in</param>
-    /// <returns>A list of all LayoutContent's</returns>
-    private List<LayoutContent> GetAllLayoutContents( object source )
-    {
-      var result = new List<LayoutContent>();
-
-      var documentFloatingWindow = source as LayoutDocumentFloatingWindow;
-      if( documentFloatingWindow != null )
-      {
-        foreach( var layoutElement in documentFloatingWindow.Children )
-        {
-          result.AddRange( GetAllLayoutContents( layoutElement ) );
-        }
-      }
-
-      var anchorableFloatingWindow = source as LayoutAnchorableFloatingWindow;
-      if( anchorableFloatingWindow != null )
-      {
-        foreach( var layoutElement in anchorableFloatingWindow.Children )
-        {
-          result.AddRange( GetAllLayoutContents( layoutElement ) );
-        }
-      }
-
-      var documentPaneGroup = source as LayoutDocumentPaneGroup;
-      if( documentPaneGroup != null )
-      {
-        foreach( var layoutDocumentPane in documentPaneGroup.Children )
-        {
-          result.AddRange( GetAllLayoutContents( layoutDocumentPane ) );
-        }
-      }
-
-      var anchorablePaneGroup = source as LayoutAnchorablePaneGroup;
-      if( anchorablePaneGroup != null )
-      {
-        foreach( var layoutDocumentPane in anchorablePaneGroup.Children )
-        {
-          result.AddRange( GetAllLayoutContents( layoutDocumentPane ) );
-        }
-      }
-
-      var documentPane = source as LayoutDocumentPane;
-      if( documentPane != null )
-      {
-        foreach( var layoutContent in documentPane.Children )
-        {
-          result.Add( layoutContent );
-        }
-      }
-
-      var anchorablePane = source as LayoutAnchorablePane;
-      if( anchorablePane != null )
-      {
-        foreach( var layoutContent in anchorablePane.Children )
-        {
-          result.Add( layoutContent );
-        }
-      }
-
-      var document = source as LayoutDocument;
-      if( document != null )
-      {
-        result.Add( document );
-      }
-
-      var anchorable = source as LayoutAnchorable;
-      if( anchorable != null )
-      {
-        result.Add( anchorable );
-      }
-
-      return result;
-    }
-
-    #endregion
-
-    #region IOverlayWindow
-
-    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 );
-              if( _anchorablePaneDropTargetInto.IsVisible )
-                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;
-    }
-
-    void IOverlayWindow.DragEnter( LayoutFloatingWindowControl floatingWindow )
-    {
-      _floatingWindow = floatingWindow;
-      EnableDropTargets();
-    }
-
-    void IOverlayWindow.DragLeave( LayoutFloatingWindowControl floatingWindow )
-    {
-      Visibility = System.Windows.Visibility.Hidden;
-      _floatingWindow = null;
-    }
-
-    void IOverlayWindow.DragEnter( IDropArea area )
-    {
-      _visibleAreas.Add( area );
-
-      FrameworkElement areaElement;
-      switch( area.Type )
-      {
-        case DropAreaType.DockingManager:
-          areaElement = _gridDockingManagerDropTargets;
-          break;
-        case DropAreaType.AnchorablePane:
-          areaElement = _gridAnchorablePaneDropTargets;
-
-          var dropAreaAnchorablePaneGroup = area as DropArea<LayoutAnchorablePaneControl>;
-          var layoutAnchorablePane = dropAreaAnchorablePaneGroup.AreaElement.Model as LayoutAnchorablePane;
-          SetDropTargetIntoVisibility( layoutAnchorablePane );
-          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;
-
-              SetDropTargetIntoVisibility( layoutDocumentPane );
-
-              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;
-
-              SetDropTargetIntoVisibility( layoutDocumentPane );
-
-              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 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs
deleted file mode 100644
index f84f87af..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Controls
-{
-  public class OverlayWindowDropTarget : IOverlayWindowDropTarget
-  {
-    #region Members
-
-    private IOverlayWindowArea _overlayArea;
-    private Rect _screenDetectionArea;
-    private OverlayWindowDropTargetType _type;
-
-    #endregion
-
-    #region Constructors
-
-    internal OverlayWindowDropTarget( IOverlayWindowArea overlayArea, OverlayWindowDropTargetType targetType, FrameworkElement element )
-    {
-      _overlayArea = overlayArea;
-      _type = targetType;
-      _screenDetectionArea = new Rect( element.TransformToDeviceDPI( new Point() ), element.TransformActualSizeToAncestor() );
-    }
-
-    #endregion
-
-
-    #region IOverlayWindowDropTarget
-
-    Rect IOverlayWindowDropTarget.ScreenDetectionArea
-    {
-      get
-      {
-        return _screenDetectionArea;
-      }
-
-    }
-
-    OverlayWindowDropTargetType IOverlayWindowDropTarget.Type
-    {
-      get
-      {
-        return _type;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs
deleted file mode 100644
index 38019274..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 9da6440d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.AvalonDock.Controls
-{
-  internal class ReentrantFlag
-  {
-    #region Members
-
-    private bool _flag = false;
-
-    #endregion
-
-    #region Properties
-
-    public bool CanEnter
-    {
-      get
-      {
-        return !_flag;
-      }
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    public _ReentrantFlagHandler Enter()
-    {
-      if( _flag )
-        throw new InvalidOperationException();
-      return new _ReentrantFlagHandler( this );
-    }
-
-    #endregion
-
-    #region Internal Classes
-
-    public class _ReentrantFlagHandler : IDisposable
-    {
-      private ReentrantFlag _owner;
-      public _ReentrantFlagHandler( ReentrantFlag owner )
-      {
-        _owner = owner;
-        _owner._flag = true;
-      }
-
-      public void Dispose()
-      {
-        _owner._flag = false;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs
deleted file mode 100644
index b2890ef8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 29f1dd8b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs
+++ /dev/null
@@ -1,389 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index d4a955bc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 3f056311..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index c58f5321..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
+++ /dev/null
@@ -1,530 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index f15b715a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index ab3ca01f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs
+++ /dev/null
@@ -1,3545 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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( Utility.IsOSWindows8OrNewer ? IntPtr.Zero : 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
deleted file mode 100644
index 2f926d80..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs
+++ /dev/null
@@ -1,995 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 72c3f39a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs
+++ /dev/null
@@ -1,357 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 9157d939..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs
+++ /dev/null
@@ -1,1071 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 );
-      }
-    }
-
-    [SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )]
-    public static bool IsOSWindows8OrNewer
-    {
-      get
-      {
-        return _osVersion >= new Version( 6, 2 );
-      }
-    }
-
-    /// <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
deleted file mode 100644
index 1d13f3d9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs
+++ /dev/null
@@ -1,328 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 793fe87a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 1ef195c6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs
+++ /dev/null
@@ -1,606 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 6aa04db8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 732d94f1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs
+++ /dev/null
@@ -1,1228 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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 );
-
-      if( rootElement != null )
-      {
-        rootElement.Margin = new Thickness(
-            0,
-            0,
-            -( nonClientThickness.Left + nonClientThickness.Right ),
-            -( nonClientThickness.Top + nonClientThickness.Bottom ) );
-      }
-
-      // The negative thickness on the margin doesn't properly get applied in RTL layouts.
-      // 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( rootElement != null )
-      {
-        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 );
-        if( rootElement != null )
-        {
-          // 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
deleted file mode 100644
index b4b354bc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index 5de2fd00..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.AvalonDock.Controls
-{
-  internal class WeakDictionary<K, V> where K : class
-  {
-    #region Members
-
-    private List<WeakReference> _keys = new List<WeakReference>();
-    private List<V> _values = new List<V>();
-
-    #endregion
-
-    #region constructors
-
-    public WeakDictionary()
-    {
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    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;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private 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 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs
deleted file mode 100644
index e129acd5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.AvalonDock.Controls
-{
-  internal class WindowActivateEventArgs : EventArgs
-  {
-    #region Constructors
-
-    public WindowActivateEventArgs( IntPtr hwndActivating )
-    {
-      HwndActivating = hwndActivating;
-    }
-
-    #endregion
-
-    #region Properties
-
-    public IntPtr HwndActivating
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs
deleted file mode 100644
index 799cc477..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.AvalonDock.Controls
-{
-  internal class FocusChangeEventArgs : EventArgs
-  {
-    #region Constructors
-
-    public FocusChangeEventArgs( IntPtr gotFocusWinHandle, IntPtr lostFocusWinHandle )
-    {
-      GotFocusWinHandle = gotFocusWinHandle;
-      LostFocusWinHandle = lostFocusWinHandle;
-    }
-
-    #endregion
-
-    #region Properties
-
-    public IntPtr GotFocusWinHandle
-    {
-      get;
-      private set;
-    }
-    public IntPtr LostFocusWinHandle
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-  }
-
-  internal class WindowHookHandler
-  {
-    #region Members
-
-    private IntPtr _windowHook;
-    private Win32Helper.HookProc _hookProc;
-    private ReentrantFlag _insideActivateEvent = new ReentrantFlag();
-
-    #endregion
-
-    #region Constructors
-
-    public WindowHookHandler()
-    {
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    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 );
-    }
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler<FocusChangeEventArgs> FocusChanged;
-    //public event EventHandler<WindowActivateEventArgs> Activate;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
deleted file mode 100644
index f9225610..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 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
deleted file mode 100644
index 32af544c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 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
deleted file mode 100644
index 9a6e4e5f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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/AnchorableContextMenuHideVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
deleted file mode 100644
index 7fc71514..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.AvalonDock.Converters
-{
-  public class AnchorableContextMenuHideVisibilityConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( values.Count() == 2 )
-        && ( values[ 0 ] != DependencyProperty.UnsetValue )
-        && ( values[ 1 ] != DependencyProperty.UnsetValue )
-        && ( values[ 1 ] is bool ) )
-      {
-        var canClose = ( bool )values[ 1 ];
-
-        return canClose ? Visibility.Collapsed : values[ 0 ];
-      }
-      else
-      {
-        return values[ 0 ];
-      }
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, 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
deleted file mode 100644
index 137df6c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 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
deleted file mode 100644
index 971614a0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
deleted file mode 100644
index 318a08b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 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
deleted file mode 100644
index b129e989..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
deleted file mode 100644
index 1753097c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 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
deleted file mode 100644
index 0944e155..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
deleted file mode 100644
index 64018b94..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index 60ac9a05..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
+++ /dev/null
@@ -1,3324 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows;
-using System.Windows.Markup;
-using System.ComponentModel;
-using System.Windows.Interop;
-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.Themes;
-
-namespace Xceed.Wpf.AvalonDock
-{
-  [ContentProperty( "Layout" )]
-  [TemplatePart( Name = "PART_AutoHideArea" )]
-  public class DockingManager : Control, IOverlayWindowHost//, ILogicalChildrenContainer
-  {
-    #region Members
-
-    private ResourceDictionary currentThemeResourceDictionary; // = null
-    private AutoHideWindowManager _autoHideWindowManager;
-    private FrameworkElement _autohideArea;
-    private List<LayoutFloatingWindowControl> _fwList = new List<LayoutFloatingWindowControl>();
-    private OverlayWindow _overlayWindow = null;
-    private List<IDropArea> _areas = null;
-    private bool _insideInternalSetActiveContent = false;
-    private List<LayoutItem> _layoutItems = new List<LayoutItem>();
-    private bool _suspendLayoutItemCreation = false;
-    private DispatcherOperation _collectLayoutItemsOperations = null;
-    private NavigatorWindow _navigatorWindow = null;
-
-    internal bool SuspendDocumentsSourceBinding = false;
-    internal bool SuspendAnchorablesSourceBinding = false;    
-
-    #endregion
-
-    #region Constructors
-
-    static DockingManager()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DockingManager ), new FrameworkPropertyMetadata( typeof( DockingManager ) ) );
-      FocusableProperty.OverrideMetadata( typeof( DockingManager ), new FrameworkPropertyMetadata( false ) );
-      HwndSource.DefaultAcquireHwndFocusInMenuMode = false;
-    }
-
-
-    public DockingManager()
-    {
-
-#if !VS2008
-      Layout = new LayoutRoot() { RootPanel = new LayoutPanel( new LayoutDocumentPaneGroup( new LayoutDocumentPane() ) ) };
-#else
-          this.SetCurrentValue( DockingManager.LayoutProperty, new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) } );
-#endif
-      this.Loaded += new RoutedEventHandler( DockingManager_Loaded );
-      this.Unloaded += new RoutedEventHandler( DockingManager_Unloaded );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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>
-    /// 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>
-    /// 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();
-    }
-
-    #endregion
-
-    #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
-
-    #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
-
-    #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();
-      }
-    }
-
-    public System.Collections.IEnumerator LogicalChildrenPublic
-    {
-      get
-      {
-        return this.LogicalChildren;
-      }
-    }
-
-
-    internal void InternalAddLogicalChild( object 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 )
-    {
-      var wrToRemove = _logicalChildren.FirstOrDefault( ch => ch.GetValueOrDefault<object>() == element );
-      if( wrToRemove != null )
-        _logicalChildren.Remove( wrToRemove );
-      RemoveLogicalChild( element );
-    }
-
-    private void ClearLogicalChildrenList()
-    {
-      foreach( var child in _logicalChildren.Select( ch => ch.GetValueOrDefault<object>() ).ToArray() )
-        RemoveLogicalChild( child );
-      _logicalChildren.Clear();
-    }
-
-    #endregion
-
-    #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
-
-    #region Floating Windows
-
-    public IEnumerable<LayoutFloatingWindowControl> FloatingWindows
-    {
-      get
-      {
-        return _fwList;
-      }
-    }
-
-    #endregion
-
-    #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
-
-    #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 );
-    }
-
-    #endregion
-
-    #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 );
-    }
-
-
-
-    #endregion
-
-    #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 );
-    }
-
-    #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 )
-      {
-        if( oldTheme is DictionaryTheme )
-        {
-          if( currentThemeResourceDictionary != null )
-          {
-            resources.MergedDictionaries.Remove( currentThemeResourceDictionary );
-            currentThemeResourceDictionary = null;
-          }
-        }
-        else
-        {
-          var resourceDictionaryToRemove =
-             resources.MergedDictionaries.FirstOrDefault( r => r.Source == oldTheme.GetResourceUri() );
-          if( resourceDictionaryToRemove != null )
-            resources.MergedDictionaries.Remove(
-                resourceDictionaryToRemove );
-        }
-      }
-
-      if( newTheme != null )
-      {
-        if( newTheme is DictionaryTheme )
-        {
-          currentThemeResourceDictionary = ( ( DictionaryTheme )newTheme ).ThemeResourceDictionary;
-          resources.MergedDictionaries.Add( currentThemeResourceDictionary );
-        }
-        else
-        {
-          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
-
-    #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 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
-
-    #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
-
-    #endregion
-
-    #region Private Properties
-
-    private bool IsNavigatorWindowActive
-    {
-      get
-      {
-        return _navigatorWindow != null;
-      }
-    }
-
-    #endregion
-
-    #region Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-
-      _autohideArea = GetTemplateChild( "PART_AutoHideArea" ) as FrameworkElement;
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-    }
-
-
-    protected override Size ArrangeOverride( Size arrangeBounds )
-    {
-      _areas = null;
-      return base.ArrangeOverride( arrangeBounds );
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( Keyboard.IsKeyDown( Key.LeftCtrl ) || Keyboard.IsKeyDown( Key.RightCtrl ) )
-      {
-        if( e.IsDown && e.Key == Key.Tab )
-        {
-          if( !IsNavigatorWindowActive )
-          {
-            ShowNavigatorWindow();
-            e.Handled = true;
-          }
-        }
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    /// <summary>
-    /// Return the LayoutItem wrapper for the content passed as argument
-    /// </summary>
-    /// <param name="content">LayoutContent to search</param>
-    /// <returns>Either a 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 Internal Methods
-
-    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();
-        // Do not set the WindowState before showing or it will be lost
-        if( paneForExtensions != null && paneForExtensions.IsMaximized )
-        {
-          newFW.WindowState = WindowState.Maximized;
-        }
-        return newFW;
-      }
-
-      if( model is 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();
-        // Do not set the WindowState before showing or it will be lost
-        if( paneForExtensions != null && paneForExtensions.IsMaximized )
-        {
-          newFW.WindowState = WindowState.Maximized;
-        }
-        return newFW;
-      }
-
-      if( model is LayoutDocument )
-      {
-        var templateModelView = new LayoutDocumentControl() { Model = model as LayoutDocument };
-        return templateModelView;
-      }
-
-      return null;
-    }
-
-    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 );
-    }
-
-    internal FrameworkElement GetAutoHideAreaElement()
-    {
-      return _autohideArea;
-    }
-
-    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 + 10;      //10 includes BorderThickness and Margins inside LayoutDocumentFloatingWindowControl.
-      if( fwHeight == 0.0 )
-        fwHeight = parentPaneAsWithActualSize.ActualHeight + 10;    //10 includes BorderThickness and Margins inside LayoutDocumentFloatingWindowControl.
-
-      LayoutFloatingWindow fw;
-      LayoutFloatingWindowControl fwc;
-      if( contentModel is LayoutAnchorable )
-      {
-        var anchorableContent = contentModel as LayoutAnchorable;
-        fw = new LayoutAnchorableFloatingWindow()
-        {
-          RootPanel = new LayoutAnchorablePaneGroup(
-                new LayoutAnchorablePane( anchorableContent )
-                {
-                  DockWidth = parentPaneAsPositionableElement.DockWidth,
-                  DockHeight = parentPaneAsPositionableElement.DockHeight,
-                  DockMinHeight = parentPaneAsPositionableElement.DockMinHeight,
-                  DockMinWidth = parentPaneAsPositionableElement.DockMinWidth,
-                  FloatingLeft = parentPaneAsPositionableElement.FloatingLeft,
-                  FloatingTop = parentPaneAsPositionableElement.FloatingTop,
-                  FloatingWidth = parentPaneAsPositionableElement.FloatingWidth,
-                  FloatingHeight = parentPaneAsPositionableElement.FloatingHeight,
-                } )
-        };
-
-        Layout.FloatingWindows.Add( fw );
-
-        fwc = new LayoutAnchorableFloatingWindowControl(
-            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 + 10;       //10 includes BorderThickness and Margins inside LayoutAnchorableFloatingWindowControl.
-      if( fwHeight == 0.0 )
-        fwHeight = paneAsWithActualSize.ActualHeight + 10;   //10 includes BorderThickness and Margins inside LayoutAnchorableFloatingWindowControl.
-
-      var destPane = new LayoutAnchorablePane()
-      {
-        DockWidth = paneAsPositionableElement.DockWidth,
-        DockHeight = paneAsPositionableElement.DockHeight,
-        DockMinHeight = paneAsPositionableElement.DockMinHeight,
-        DockMinWidth = paneAsPositionableElement.DockMinWidth,
-        FloatingLeft = paneAsPositionableElement.FloatingLeft,
-        FloatingTop = paneAsPositionableElement.FloatingTop,
-        FloatingWidth = paneAsPositionableElement.FloatingWidth,
-        FloatingHeight = paneAsPositionableElement.FloatingHeight,
-      };
-
-      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 );
-    }
-
-    internal void _ExecuteCloseCommand( LayoutDocument document )
-    {
-      if( DocumentClosing != null )
-      {
-        var evargs = new DocumentClosingEventArgs( document );
-        DocumentClosing( this, evargs );
-        if( evargs.Cancel )
-          return;
-      }
-
-      if( document.CloseDocument() )
-      {
-        this.RemoveViewFromLogicalChild( document );
-
-        if( DocumentClosed != null )
-        {
-          var evargs = new DocumentClosedEventArgs( document );
-          DocumentClosed( this, evargs );
-        }
-      }
-    }
-
-    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() )
-      {
-        this.Close( contentToClose );
-      }
-    }
-
-    internal void _ExecuteCloseAllCommand( LayoutContent contentSelected )
-    {
-      foreach( var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where( d => ( d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow ) ).ToArray() )
-      {
-        this.Close( contentToClose );
-      }
-    }
-
-    internal void _ExecuteCloseCommand( LayoutAnchorable anchorable )
-    {
-      var model = anchorable as LayoutAnchorable;
-      if( model != null )
-      {
-        model.CloseAnchorable();
-        this.RemoveViewFromLogicalChild( anchorable );
-      }
-    }
-
-    internal void _ExecuteHideCommand( LayoutAnchorable anchorable )
-    {
-      var model = anchorable as LayoutAnchorable;
-      if( model != null )
-      {
-        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();
-    }
-
-    internal void _ExecuteContentActivateCommand( LayoutContent content )
-    {
-      content.IsActive = true;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private 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.Input );
-          //}
-        }
-
-        //if (!_insideInternalSetActiveContent)
-        //    ActiveContent = Layout.ActiveContent != null ?
-        //        Layout.ActiveContent.Content : null;
-        if( !_insideInternalSetActiveContent && ( Layout.ActiveContent != null ) )
-        {
-          this.ActiveContent = Layout.ActiveContent.Content;
-        }
-      }
-    }
-
-    private void OnLayoutRootUpdated( object sender, EventArgs e )
-    {
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    private void OnLayoutChanging( LayoutRoot newLayout )
-    {
-      if( LayoutChanging != null )
-        LayoutChanging( this, EventArgs.Empty );
-    }
-
-    private void DockingManager_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( !DesignerProperties.GetIsInDesignMode( this ) )
-      {
-        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;
-        }
-
-        SetupAutoHideWindow();
-
-        //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 );
-      }
-    }
-
-    private void DockingManager_Unloaded( object sender, RoutedEventArgs e )
-    {
-
-      if( !DesignerProperties.GetIsInDesignMode( this ) )
-      {
-        if( _autoHideWindowManager != null )
-        {
-          _autoHideWindowManager.HideAutoWindow();
-        }
-
-        if( AutoHideWindow != null )
-          AutoHideWindow.Dispose();
-
-        foreach( var fw in _fwList.ToArray() )
-        {
-          //fw.Owner = null;
-          fw.SetParentWindowToNull();
-          fw.KeepContentVisibleOnClose = true;
-          fw.Close();
-        }
-
-        DestroyOverlayWindow();
-        FocusElementManager.FinalizeFocusManagement( this );
-      }
-    }
-
-    private void SetupAutoHideWindow()
-    {
-      if( _autoHideWindowManager != null )
-        _autoHideWindowManager.HideAutoWindow();
-      else
-        _autoHideWindowManager = new AutoHideWindowManager( this );
-
-      if( AutoHideWindow != null )
-        AutoHideWindow.Dispose();
-
-      SetAutoHideWindow( new LayoutAutoHideWindowControl() );
-    }
-
-    private 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;
-    }
-
-    private void DestroyOverlayWindow()
-    {
-      if( _overlayWindow != null )
-      {
-        _overlayWindow.Close();
-        _overlayWindow = null;
-      }
-    }
-
-    private void AttachDocumentsSource( LayoutRoot layout, IEnumerable documentsSource )
-    {
-      if( documentsSource == null )
-        return;
-
-      if( layout == null )
-        return;
-
-      //if (layout.Descendents().OfType<LayoutDocument>().Any())
-      //    throw new InvalidOperationException("Unable to set the DocumentsSource property if LayoutDocument objects are already present in the model");
-      var documentsImported = layout.Descendents().OfType<LayoutDocument>().Select( d => d.Content ).ToArray();
-      var documents = documentsSource as IEnumerable;
-      var listOfDocumentsToImport = new List<object>( documents.OfType<object>() );
-
-      foreach( var document in listOfDocumentsToImport.ToArray() )
-      {
-        if( documentsImported.Contains( document ) )
-          listOfDocumentsToImport.Remove( document );
-      }
-
-
-      LayoutDocumentPane documentPane = null;
-      if( layout.LastFocusedDocument != null )
-      {
-        documentPane = layout.LastFocusedDocument.Parent as LayoutDocumentPane;
-      }
-
-      if( documentPane == null )
-      {
-        documentPane = layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
-      }
-
-      //if (documentPane == null)
-      //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
-
-      _suspendLayoutItemCreation = true;
-      foreach( var documentContentToImport in listOfDocumentsToImport )
-      {
-
-        //documentPane.Children.Add(new LayoutDocument() { Content = documentToImport });
-
-        var documentToImport = new LayoutDocument()
-        {
-          Content = documentContentToImport
-        };
-
-        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 = false;
-
-
-      var documentsSourceAsNotifier = documentsSource as INotifyCollectionChanged;
-      if( documentsSourceAsNotifier != null )
-        documentsSourceAsNotifier.CollectionChanged += new NotifyCollectionChangedEventHandler( documentsSourceElementsChanged );
-    }
-
-    private void documentsSourceElementsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( Layout == null )
-        return;
-
-      //When deserializing documents are created automatically by the deserializer
-      if( SuspendDocumentsSourceBinding )
-        return;
-
-      //handle remove
-      if( e.Action == 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 );
-            this.RemoveViewFromLogicalChild( 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 );
-          this.RemoveViewFromLogicalChild( documentToRemove );
-        }
-      }
-
-      if( Layout != null )
-      {
-        Layout.CollectGarbage();
-      }
-    }
-
-    private void DetachDocumentsSource( LayoutRoot layout, IEnumerable documentsSource )
-    {
-      if( documentsSource == null )
-        return;
-
-      if( layout == null )
-        return;
-
-      var documentsToRemove = layout.Descendents().OfType<LayoutDocument>()
-          .Where( d => documentsSource.Contains( d.Content ) ).ToArray();
-
-      foreach( var documentToRemove in documentsToRemove )
-      {
-        ( documentToRemove.Parent as ILayoutContainer ).RemoveChild(
-            documentToRemove );
-        this.RemoveViewFromLogicalChild( documentToRemove );
-      }
-
-      var documentsSourceAsNotifier = documentsSource as INotifyCollectionChanged;
-      if( documentsSourceAsNotifier != null )
-        documentsSourceAsNotifier.CollectionChanged -= new NotifyCollectionChangedEventHandler( documentsSourceElementsChanged );
-    }
-
-    private void Close( LayoutContent contentToClose )
-    {
-      if( !contentToClose.CanClose )
-        return;
-
-      var layoutItem = GetLayoutItemFromModel( contentToClose );
-      if( layoutItem.CloseCommand != null )
-      {
-        if( layoutItem.CloseCommand.CanExecute( null ) )
-          layoutItem.CloseCommand.Execute( null );
-      }
-      else
-      {
-        if( contentToClose is LayoutDocument )
-          _ExecuteCloseCommand( contentToClose as LayoutDocument );
-        else if( contentToClose is LayoutAnchorable )
-          _ExecuteCloseCommand( contentToClose as LayoutAnchorable );
-      }
-    }
-
-    private void AttachAnchorablesSource( LayoutRoot layout, IEnumerable anchorablesSource )
-    {
-      if( anchorablesSource == null )
-        return;
-
-      if( layout == null )
-        return;
-
-      //if (layout.Descendents().OfType<LayoutAnchorable>().Any())
-      //    throw new InvalidOperationException("Unable to set the AnchorablesSource property if LayoutAnchorable objects are already present in the model");
-      var anchorablesImported = layout.Descendents().OfType<LayoutAnchorable>().Select( d => d.Content ).ToArray();
-      var anchorables = anchorablesSource as IEnumerable;
-      var listOfAnchorablesToImport = new List<object>( anchorables.OfType<object>() );
-
-      foreach( var document in listOfAnchorablesToImport.ToArray() )
-      {
-        if( anchorablesImported.Contains( document ) )
-          listOfAnchorablesToImport.Remove( document );
-      }
-
-      LayoutAnchorablePane anchorablePane = null;
-      if( layout.ActiveContent != null )
-      {
-        //look for active content parent pane
-        anchorablePane = layout.ActiveContent.Parent as LayoutAnchorablePane;
-      }
-
-      if( anchorablePane == null )
-      {
-        //look for a pane on the right side
-        anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().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 );
-    }
-
-    private void anchorablesSourceElementsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( Layout == null )
-        return;
-
-      //When deserializing documents are created automatically by the deserializer
-      if( SuspendAnchorablesSourceBinding )
-        return;
-
-      //handle remove
-      if( e.Action == 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.Content = null;
-            ( anchorableToRemove.Parent as ILayoutContainer ).RemoveChild(
-                anchorableToRemove );
-            this.RemoveViewFromLogicalChild( 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 );
-          this.RemoveViewFromLogicalChild( anchorableToRemove );
-        }
-      }
-
-      if( Layout != null )
-        Layout.CollectGarbage();
-    }
-
-    private void DetachAnchorablesSource( LayoutRoot layout, IEnumerable anchorablesSource )
-    {
-      if( anchorablesSource == null )
-        return;
-
-      if( layout == null )
-        return;
-
-      var anchorablesToRemove = layout.Descendents().OfType<LayoutAnchorable>()
-          .Where( d => anchorablesSource.Contains( d.Content ) ).ToArray();
-
-      foreach( var anchorableToRemove in anchorablesToRemove )
-      {
-        ( anchorableToRemove.Parent as ILayoutContainer ).RemoveChild(
-            anchorableToRemove );
-        this.RemoveViewFromLogicalChild( anchorableToRemove );
-      }
-
-      var anchorablesSourceAsNotifier = anchorablesSource as INotifyCollectionChanged;
-      if( anchorablesSourceAsNotifier != null )
-        anchorablesSourceAsNotifier.CollectionChanged -= new NotifyCollectionChangedEventHandler( anchorablesSourceElementsChanged );
-    }
-
-    private void RemoveViewFromLogicalChild( LayoutContent layoutContent )
-    {
-      if( layoutContent == null )
-        return;
-
-      var layoutItem = this.GetLayoutItemFromModel( layoutContent );
-      if( layoutItem != null )
-      {
-        if( layoutItem.IsViewExists() )
-        {
-          this.InternalRemoveLogicalChild( layoutItem.View );
-        }
-      }
-    }
-
-    private void InternalSetActiveContent( object contentObject )
-    {
-      var layoutContent = Layout.Descendents().OfType<LayoutContent>().FirstOrDefault( lc => lc == contentObject || lc.Content == contentObject );
-      _insideInternalSetActiveContent = true;
-      Layout.ActiveContent = layoutContent;
-      _insideInternalSetActiveContent = false;
-    }
-
-    private 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 );
-      }
-    }
-
-    private void Layout_ElementRemoved( object sender, LayoutElementEventArgs e )
-    {
-      if( _suspendLayoutItemCreation )
-        return;
-
-      CollectLayoutItemsDeleted();
-    }
-
-    private 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();
-    }
-
-    private void CollectLayoutItemsDeleted()
-    {
-      if( _collectLayoutItemsOperations != null )
-        return;
-      _collectLayoutItemsOperations = Dispatcher.BeginInvoke( new Action( () =>
-      {
-        _collectLayoutItemsOperations = null;
-        foreach( var itemToRemove in _layoutItems.Where( item => item.LayoutElement.Root != Layout ).ToArray() )
-        {
-
-          if( itemToRemove != null &&
-                  itemToRemove.Model != null &&
-                  itemToRemove.Model is UIElement )
-          {
-            //((ILogicalChildrenContainer)this).InternalRemoveLogicalChild(itemToRemove.Model as UIElement);
-          }
-
-          itemToRemove.Detach();
-          _layoutItems.Remove( itemToRemove );
-
-        }
-      } ) );
-    }
-
-    private 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 );
-      }
-    }
-
-    private void ApplyStyleToLayoutItem( LayoutItem layoutItem )
-    {
-      layoutItem._ClearDefaultBindings();
-      if( LayoutItemContainerStyle != null )
-        layoutItem.Style = LayoutItemContainerStyle;
-      else if( LayoutItemContainerStyleSelector != null )
-        layoutItem.Style = LayoutItemContainerStyleSelector.SelectStyle( layoutItem.Model, layoutItem );
-      layoutItem._SetDefaultBindings();
-    }
-
-    private void CreateAnchorableLayoutItem( LayoutAnchorable contentToAttach )
-    {
-      if( _layoutItems.Any( item => item.LayoutElement == contentToAttach ) )
-      {
-        foreach( var item in _layoutItems )
-        {
-          ApplyStyleToLayoutItem( item );
-        }
-        return;
-      }
-
-      var layoutItem = new LayoutAnchorableItem();
-      layoutItem.Attach( contentToAttach );
-      ApplyStyleToLayoutItem( layoutItem );
-      _layoutItems.Add( layoutItem );
-
-      if( contentToAttach != null &&
-          contentToAttach.Content != null &&
-          contentToAttach.Content is UIElement )
-      {
-        InternalAddLogicalChild( contentToAttach.Content );
-      }
-
-    }
-
-    private void CreateDocumentLayoutItem( LayoutDocument contentToAttach )
-    {
-      if( _layoutItems.Any( item => item.LayoutElement == contentToAttach ) )
-      {
-        foreach( var item in _layoutItems )
-        {
-          ApplyStyleToLayoutItem( item );
-        }
-        return;
-      }
-
-      var layoutItem = new LayoutDocumentItem();
-      layoutItem.Attach( contentToAttach );
-      ApplyStyleToLayoutItem( layoutItem );
-      _layoutItems.Add( layoutItem );
-
-      if( contentToAttach != null &&
-          contentToAttach.Content != null &&
-          contentToAttach.Content is UIElement )
-      {
-        InternalAddLogicalChild( contentToAttach.Content );
-      }
-
-    }
-
-    private void ShowNavigatorWindow()
-    {
-      if( _navigatorWindow == null )
-      {
-        _navigatorWindow = new NavigatorWindow( this )
-        {
-          Owner = Window.GetWindow( this ),
-          WindowStartupLocation = WindowStartupLocation.CenterOwner
-        };
-      }
-
-      _navigatorWindow.ShowDialog();
-      _navigatorWindow = null;
-    }
-
-    #endregion
-
-    #region Events
-
-    /// <summary>
-    /// Event fired when <see cref="DockingManager.Layout"/> property changes
-    /// </summary>
-    public event EventHandler LayoutChanged;
-
-    /// <summary>
-    /// Event fired when <see cref="DockingManager.Layout"/> property is about to be changed
-    /// </summary>
-    public event EventHandler LayoutChanging;
-
-    /// <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;
-
-    public event EventHandler ActiveContentChanged;
-
-    #endregion
-
-    #region IOverlayWindowHost Interface
-
-    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;
-      }
-    }
-
-    IOverlayWindow IOverlayWindowHost.ShowOverlayWindow( LayoutFloatingWindowControl draggingWindow )
-    {
-      CreateOverlayWindow();
-      _overlayWindow.Owner = draggingWindow;
-      _overlayWindow.EnableDropTargets();
-      _overlayWindow.Show();
-      return _overlayWindow;
-    }
-
-    void IOverlayWindowHost.HideOverlayWindow()
-    {
-      _areas = null;
-      _overlayWindow.Owner = null;
-      _overlayWindow.HideDropTargets();
-    }
-
-    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;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs
deleted file mode 100644
index 42b645e4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index f7201e9b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-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
deleted file mode 100644
index d31c0e33..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
deleted file mode 100644
index c56c5572..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index e3531984..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index f71fd05d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index ce491425..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  public static class Extensions
-  {
-    #region Public Methods
-
-    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 )
-      {
-        var layoutPanel = parentContainer as LayoutPanel;
-        if( layoutPanel == null )
-        {
-          layoutPanel = parentContainer.FindParent<LayoutPanel>();
-        }
-
-        if( (layoutPanel != null) && ( layoutPanel.Children.Count > 0 ) )
-        {
-          if( layoutPanel.Orientation == System.Windows.Controls.Orientation.Horizontal )
-            return layoutPanel.Children[ 0 ].Descendents().Contains( element ) ? AnchorSide.Left : AnchorSide.Right;
-          return layoutPanel.Children[ 0 ].Descendents().Contains( element ) ? AnchorSide.Top : AnchorSide.Bottom;
-        }
-      }
-
-      Debug.Fail( "Unable to find the side for an element, possible layout problem!" );
-      return AnchorSide.Right;
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    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 );
-          }
-        }
-      }
-
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs
deleted file mode 100644
index f720726f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 542122aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.AvalonDock.Layout
-{
-  public interface ILayoutContainer : ILayoutElement
-  {
-    #region Properties
-
-    IEnumerable<ILayoutElement> Children
-    {
-      get;
-    }
-
-    int ChildrenCount
-    {
-      get;
-    }
-
-    #endregion
-
-    #region Methods
-
-    void RemoveChild( ILayoutElement element );
-
-    void ReplaceChild( ILayoutElement oldElement, ILayoutElement newElement );
-
-    #endregion    
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs
deleted file mode 100644
index da71a637..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.AvalonDock.Layout
-{
-  public interface ILayoutContentSelector
-  {
-    #region Properties
-
-    int SelectedContentIndex
-    {
-      get; set;
-    }
-
-    LayoutContent SelectedContent
-    {
-      get;
-    }
-
-    #endregion
-
-    #region Methods
-
-    int IndexOf( LayoutContent content );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs
deleted file mode 100644
index 8d6d120a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index af7a89c7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 4bbf399d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-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
deleted file mode 100644
index 26227a40..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index ea933786..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index 80088c02..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
deleted file mode 100644
index 36de7a57..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 0f76e247..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 234a813a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 34ef183c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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 AllowDuplicateContent
-    {
-      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
deleted file mode 100644
index 805d254b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 4408366c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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;
-    }
-
-    ObservableCollection<LayoutFloatingWindow> FloatingWindows
-    {
-      get;
-    }
-    ObservableCollection<LayoutAnchorable> Hidden
-    {
-      get;
-    }
-
-    void CollectGarbage();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs
deleted file mode 100644
index eb31dceb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.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
deleted file mode 100644
index 00b0412e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Markup;
-using System.Xml.Serialization;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "Children" )]
-  [Serializable]
-  public class LayoutAnchorGroup : LayoutGroup<LayoutAnchorable>, ILayoutPreviousContainer, ILayoutPaneSerializable
-  {
-    #region Constructors
-
-    public LayoutAnchorGroup()
-    {
-    }
-
-    #endregion
-
-    #region Overrides
-
-    protected override bool GetVisibility()
-    {
-      return Children.Count > 0;
-    }
-
-    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 );
-    }
-
-    #endregion
-
-    #region ILayoutPreviousContainer Interface
-
-    #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 ILayoutPreviousContainer.PreviousContainerId
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ILayoutPaneSerializable Interface
-
-    string _id;
-    string ILayoutPaneSerializable.Id
-    {
-      get
-      {
-        return _id;
-      }
-      set
-      {
-        _id = value;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs
deleted file mode 100644
index 1f995b80..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Markup;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "Children" )]
-  [Serializable]
-  public class LayoutAnchorSide : LayoutGroup<LayoutAnchorGroup>
-  {
-    #region Constructors
-
-    public LayoutAnchorSide()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Side
-
-    private AnchorSide _side;
-    public AnchorSide Side
-    {
-      get
-      {
-        return _side;
-      }
-      private set
-      {
-        if( _side != value )
-        {
-          RaisePropertyChanging( "Side" );
-          _side = value;
-          RaisePropertyChanged( "Side" );
-        }
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    protected override bool GetVisibility()
-    {
-      return Children.Count > 0;
-    }
-
-
-    protected override void OnParentChanged( ILayoutContainer oldValue, ILayoutContainer newValue )
-    {
-      base.OnParentChanged( oldValue, newValue );
-
-      UpdateSide();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    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;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
deleted file mode 100644
index 4502e764..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
+++ /dev/null
@@ -1,749 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-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 Members
-
-    private double _autohideWidth = 0.0;
-    private double _autohideMinWidth = 100.0;
-    private double _autohideHeight = 0.0;
-    private double _autohideMinHeight = 100.0;
-    private bool _canHide = true;
-    private bool _canAutoHide = true;
-    private bool _canCloseValueBeforeInternalSet;
-
-    #endregion
-
-    #region Constructors
-
-    public LayoutAnchorable()
-    {
-      // LayoutAnchorable will hide by default, not close.
-      _canClose = false;
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region AutoHideWidth
-
-    public double AutoHideWidth
-    {
-      get
-      {
-        return _autohideWidth;
-      }
-      set
-      {
-        if( _autohideWidth != value )
-        {
-          RaisePropertyChanging( "AutoHideWidth" );
-          value = Math.Max( value, _autohideMinWidth );
-          _autohideWidth = value;
-          RaisePropertyChanged( "AutoHideWidth" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region AutoHideMinWidth
-
-    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
-
-    public double AutoHideHeight
-    {
-      get
-      {
-        return _autohideHeight;
-      }
-      set
-      {
-        if( _autohideHeight != value )
-        {
-          RaisePropertyChanging( "AutoHideHeight" );
-          value = Math.Max( value, _autohideMinHeight );
-          _autohideHeight = value;
-          RaisePropertyChanged( "AutoHideHeight" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region AutoHideMinHeight
-
-    public double AutoHideMinHeight
-    {
-      get
-      {
-        return _autohideMinHeight;
-      }
-      set
-      {
-        if( _autohideMinHeight != value )
-        {
-          RaisePropertyChanging( "AutoHideMinHeight" );
-          if( value < 0 )
-            throw new ArgumentException( "value" );
-          _autohideMinHeight = value;
-          RaisePropertyChanged( "AutoHideMinHeight" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region CanHide
-
-    public bool CanHide
-    {
-      get
-      {
-        return _canHide;
-      }
-      set
-      {
-        if( _canHide != value )
-        {
-          _canHide = value;
-          RaisePropertyChanged( "CanHide" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region CanAutoHide
-
-    public bool CanAutoHide
-    {
-      get
-      {
-        return _canAutoHide;
-      }
-      set
-      {
-        if( _canAutoHide != value )
-        {
-          _canAutoHide = value;
-          RaisePropertyChanged( "CanAutoHide" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region IsAutoHidden
-
-    /// <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;
-      }
-    }
-
-    #endregion
-
-    #region IsHidden
-
-    [XmlIgnore]
-    public bool IsHidden
-    {
-      get
-      {
-        return ( Parent is LayoutRoot );
-      }
-    }
-
-    #endregion
-
-    #region IsVisible
-
-    [XmlIgnore]
-    public bool IsVisible
-    {
-      get
-      {
-        return Parent != null && !( Parent is LayoutRoot );
-      }
-      set
-      {
-        if( value )
-        {
-          Show();
-        }
-        else
-        {
-          Hide();
-        }
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler IsVisibleChanged;
-    public event EventHandler<CancelEventArgs> Hiding;
-
-    #endregion
-
-    #region Overrides
-
-    protected override void OnParentChanged( ILayoutContainer oldValue, ILayoutContainer newValue )
-    {
-      UpdateParentVisibility();
-      RaisePropertyChanged( "IsVisible" );
-      NotifyIsVisibleChanged();
-      RaisePropertyChanged( "IsHidden" );
-      RaisePropertyChanged( "IsAutoHidden" );
-      base.OnParentChanged( oldValue, newValue );
-    }
-
-    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();
-    }
-
-    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 );
-    }
-
-    public override void Close()
-    {
-      this.CloseAnchorable();
-    }
-
-#if TRACE
-        public override void ConsoleDump(int tab)
-        {
-          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
-          System.Diagnostics.Trace.WriteLine( "Anchorable()" );
-        }
-#endif
-
-    #endregion
-
-    #region Public Methods
-
-    /// <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();
-    }
-
-
-    /// <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();
-    }
-
-
-    /// <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 ) );
-        }
-
-      }
-    }
-
-    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();
-                previousContainer.DockMinWidth = this.AutoHideMinWidth;
-                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();
-                previousContainer.DockMinWidth = this.AutoHideMinWidth;
-                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();
-                previousContainer.DockMinHeight = this.AutoHideMinHeight;
-                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();
-                previousContainer.DockMinHeight = this.AutoHideMinHeight;
-                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 );
-
-        var parent = previousContainer.Parent as LayoutGroupBase;
-        while( ( parent != null ) )
-        {
-          if( parent is LayoutGroup<ILayoutPanelElement> )
-          {
-            ( ( LayoutGroup<ILayoutPanelElement> )parent ).ComputeVisibility();
-          }
-          parent = parent.Parent as LayoutGroupBase;
-        }
-      }
-      #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:
-            if( root.RightSide != null )
-            {
-              root.RightSide.Children.Add( newAnchorGroup );
-            }
-            break;
-          case AnchorSide.Left:
-            if( root.LeftSide != null )
-            {
-              root.LeftSide.Children.Add( newAnchorGroup );
-            }
-            break;
-          case AnchorSide.Top:
-            if( root.TopSide != null )
-            {
-              root.TopSide.Children.Add( newAnchorGroup );
-            }
-            break;
-          case AnchorSide.Bottom:
-            if( root.BottomSide != null )
-            {
-              root.BottomSide.Children.Add( newAnchorGroup );
-            }
-            break;
-        }
-      }
-      #endregion
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    protected virtual void OnHiding( CancelEventArgs args )
-    {
-      if( Hiding != null )
-        Hiding( this, args );
-    }
-
-    internal void CloseAnchorable()
-    {
-      if( this.TestCanClose() )
-      {
-        if( this.IsAutoHidden )
-          this.ToggleAutoHide();
-
-        this.CloseInternal();
-      }
-    }
-
-    internal void SetCanCloseInternal( bool canClose )
-    {
-      _canCloseValueBeforeInternalSet = _canClose;
-      _canClose = canClose;
-    }
-
-    internal void ResetCanCloseInternal()
-    {
-      _canClose = _canCloseValueBeforeInternalSet;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void NotifyIsVisibleChanged()
-    {
-      if( IsVisibleChanged != null )
-        IsVisibleChanged( this, EventArgs.Empty );
-    }
-
-    private void UpdateParentVisibility()
-    {
-      var parentPane = Parent as ILayoutElementWithVisibility;
-      if( parentPane != null )
-        parentPane.ComputeVisibility();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
deleted file mode 100644
index 2dc51092..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
+++ /dev/null
@@ -1,275 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Markup;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using System.Xml;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [Serializable]
-  [ContentProperty( "RootPanel" )]
-  public class LayoutAnchorableFloatingWindow : LayoutFloatingWindow, ILayoutElementWithVisibility
-  {
-    #region Members
-
-    private LayoutAnchorablePaneGroup _rootPanel = null;
-    [NonSerialized]
-    private bool _isVisible = true;
-
-    #endregion
-
-    #region Constructors
-
-    public LayoutAnchorableFloatingWindow()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region IsSinglePane
-
-    public bool IsSinglePane
-    {
-      get
-      {
-        return RootPanel != null && RootPanel.Descendents().OfType<ILayoutAnchorablePane>().Where( p => p.IsVisible ).Count() == 1;
-      }
-    }
-
-    #endregion
-
-    #region IsVisible
-
-    [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 );
-        }
-      }
-    }
-
-    #endregion
-
-    #region RootPanel
-
-    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();
-        }
-      }
-    }
-
-    #endregion
-
-    #region SinglePane
-
-    public ILayoutAnchorablePane SinglePane
-    {
-      get
-      {
-        if( !IsSinglePane )
-          return null;
-
-        var singlePane = RootPanel.Descendents().OfType<LayoutAnchorablePane>().Single( p => p.IsVisible );
-        singlePane.UpdateIsDirectlyHostedInFloatingWindow();
-        return singlePane;
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    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;
-      }
-    }
-
-    public override bool IsValid
-    {
-      get
-      {
-        return RootPanel != null;
-      }
-    }
-
-    public override void ReadXml( XmlReader reader )
-    {
-      reader.MoveToContent();
-      if( reader.IsEmptyElement )
-      {
-        reader.Read();
-        ComputeVisibility();
-        return;
-      }
-
-      var localName = reader.LocalName;
-      reader.Read();
-
-      while( true )
-      {
-        if( reader.LocalName.Equals( localName ) && ( reader.NodeType == XmlNodeType.EndElement ) )
-        {
-          break;
-        }
-
-        if( reader.NodeType == XmlNodeType.Whitespace )
-        {
-          reader.Read();
-          continue;
-        }
-
-        XmlSerializer serializer;
-        if( reader.LocalName.Equals( "LayoutAnchorablePaneGroup" ) )
-        {
-          serializer = new XmlSerializer( typeof( LayoutAnchorablePaneGroup ) );
-        }
-        else
-        {
-          var type = LayoutRoot.FindType( reader.LocalName );
-          if( type == null )
-          {
-            throw new ArgumentException( "AvalonDock.LayoutAnchorableFloatingWindow doesn't know how to deserialize " + reader.LocalName );
-          }
-          serializer = new XmlSerializer( type );
-        }
-
-        RootPanel = ( LayoutAnchorablePaneGroup )serializer.Deserialize( reader );
-      }
-
-      reader.ReadEndElement();
-    }
-
-#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
-
-    #endregion
-
-    #region Private Methods
-
-    private void _rootPanel_ChildrenTreeChanged( object sender, ChildrenTreeChangedEventArgs e )
-    {
-      RaisePropertyChanged( "IsSinglePane" );
-      RaisePropertyChanged( "SinglePane" );
-    }
-
-    private void ComputeVisibility()
-    {
-      if( RootPanel != null )
-        IsVisible = RootPanel.IsVisible;
-      else
-        IsVisible = false;
-    }
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler IsVisibleChanged;
-
-    #endregion
-
-    #region ILayoutElementWithVisibility Interface
-
-    void ILayoutElementWithVisibility.ComputeVisibility()
-    {
-      ComputeVisibility();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs
deleted file mode 100644
index abb9ef29..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Markup;
-using System.Xml.Serialization;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "Children" )]
-  [Serializable]
-  public class LayoutAnchorablePane : LayoutPositionableGroup<LayoutAnchorable>, ILayoutAnchorablePane, ILayoutPositionableElement, ILayoutContentSelector, ILayoutPaneSerializable
-  {
-    #region Members
-
-    private int _selectedIndex = -1;
-    [XmlIgnore]
-    private bool _autoFixSelectedContent = true;
-    private string _name = null;
-
-    #endregion
-
-    #region Constructors
-
-    public LayoutAnchorablePane()
-    {
-    }
-
-    public LayoutAnchorablePane( LayoutAnchorable anchorable )
-    {
-      Children.Add( anchorable );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region CanHide
-
-    public bool CanHide
-    {
-      get
-      {
-        return Children.All( a => a.CanHide );
-      }
-    }
-
-    #endregion
-
-    #region CanClose
-
-    public bool CanClose
-    {
-      get
-      {
-        return Children.All( a => a.CanClose );
-      }
-    }
-
-    #endregion
-
-    #region IsHostedInFloatingWindow
-
-    public bool IsHostedInFloatingWindow
-    {
-      get
-      {
-        return this.FindParent<LayoutFloatingWindow>() != null;
-      }
-    }
-
-    #endregion
-
-    #region Name
-
-    public string Name
-    {
-      get
-      {
-        return _name;
-      }
-      set
-      {
-        if( _name != value )
-        {
-          _name = value;
-          RaisePropertyChanged( "Name" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region SelectedContentIndex
-
-    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" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region SelectedContent
-
-    public LayoutContent SelectedContent
-    {
-      get
-      {
-        return _selectedIndex == -1 ? null : Children[ _selectedIndex ];
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    protected override bool GetVisibility()
-    {
-      return Children.Count > 0 && Children.Any( c => c.IsVisible );
-    }
-
-    protected override void ChildMoved( int oldIndex, int newIndex )
-    {
-      if( _selectedIndex == oldIndex )
-      {
-        RaisePropertyChanging( "SelectedContentIndex" );
-        _selectedIndex = newIndex;
-        RaisePropertyChanged( "SelectedContentIndex" );
-      }
-
-
-      base.ChildMoved( oldIndex, newIndex );
-    }
-
-    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();
-    }
-
-    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 );
-    }
-
-    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();
-    }
-
-#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
-
-    #endregion
-
-    #region Public Methods
-
-    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;
-      }
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void SetNextSelectedIndex()
-    {
-      SelectedContentIndex = -1;
-      for( int i = 0; i < this.Children.Count; ++i )
-      {
-        if( Children[ i ].IsEnabled )
-        {
-          SelectedContentIndex = i;
-          return;
-        }
-      }
-    }
-
-    internal void UpdateIsDirectlyHostedInFloatingWindow()
-    {
-      RaisePropertyChanged( "IsDirectlyHostedInFloatingWindow" );
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void AutoFixSelectedContent()
-    {
-      if( _autoFixSelectedContent )
-      {
-        if( SelectedContentIndex >= ChildrenCount )
-          SelectedContentIndex = Children.Count - 1;
-
-        if( SelectedContentIndex == -1 && ChildrenCount > 0 )
-          SetNextSelectedIndex();
-      }
-    }
-
-    private void OnParentChildrenCollectionChanged( object sender, EventArgs e )
-    {
-      RaisePropertyChanged( "IsDirectlyHostedInFloatingWindow" );
-    }
-
-    #endregion
-
-    #region ILayoutPaneSerializable Interface
-
-    string _id;
-
-    string ILayoutPaneSerializable.Id
-    {
-      get
-      {
-        return _id;
-      }
-      set
-      {
-        _id = value;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
deleted file mode 100644
index f00808f0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Controls;
-using System.Windows.Markup;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "Children" )]
-  [Serializable]
-  public class LayoutAnchorablePaneGroup : LayoutPositionableGroup<ILayoutAnchorablePane>, ILayoutAnchorablePane, ILayoutOrientableGroup
-  {
-    #region Constructors
-
-    public LayoutAnchorablePaneGroup()
-    {
-    }
-
-    public LayoutAnchorablePaneGroup( LayoutAnchorablePane firstChild )
-    {
-      Children.Add( firstChild );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Orientation
-
-    private Orientation _orientation;
-    public Orientation Orientation
-    {
-      get
-      {
-        return _orientation;
-      }
-      set
-      {
-        if( _orientation != value )
-        {
-          RaisePropertyChanging( "Orientation" );
-          _orientation = value;
-          RaisePropertyChanged( "Orientation" );
-        }
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    protected override bool GetVisibility()
-    {
-      return Children.Count > 0 && Children.Any( c => c.IsVisible );
-    }
-
-    protected override void OnIsVisibleChanged()
-    {
-      UpdateParentVisibility();
-      base.OnIsVisibleChanged();
-    }
-
-    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
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateParentVisibility()
-    {
-      var parentPane = Parent as ILayoutElementWithVisibility;
-      if( parentPane != null )
-        parentPane.ComputeVisibility();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
deleted file mode 100644
index ffa93dbc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
+++ /dev/null
@@ -1,905 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Markup;
-using System.Xml.Serialization;
-using System.Windows;
-using System.Globalization;
-using System.Windows.Media;
-using System.ComponentModel;
-using Xceed.Wpf.AvalonDock.Controls;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "Content" )]
-  [Serializable]
-  public abstract class LayoutContent : LayoutElement, IXmlSerializable, ILayoutElementForFloatingWindow, IComparable<LayoutContent>, ILayoutPreviousContainer
-  {
-    #region Constructors
-
-    internal LayoutContent()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Title
-
-    public static readonly DependencyProperty TitleProperty =  DependencyProperty.Register( "Title", typeof( string ), typeof( LayoutContent ), new UIPropertyMetadata( null, OnTitlePropertyChanged, CoerceTitleValue ) );
-
-    public string Title
-    {
-      get
-      {
-        return ( string )GetValue( TitleProperty );
-      }
-      set
-      {
-        SetValue( TitleProperty, value );
-      }
-    }
-
-    private static object CoerceTitleValue( DependencyObject obj, object value )
-    {
-      var lc = ( LayoutContent )obj;
-      if( ( ( string )value ) != lc.Title )
-      {
-        lc.RaisePropertyChanging( LayoutContent.TitleProperty.Name );
-      }
-      return value;
-    }
-
-    private static void OnTitlePropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args )
-    {
-      ( ( LayoutContent )obj ).RaisePropertyChanged( LayoutContent.TitleProperty.Name );
-    }
-
-    #endregion //Title
-
-    #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" );
-          LayoutAnchorableTabItem.CancelMouseLeave();
-        }
-      }
-    }
-
-    /// <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
-
-    #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
-
-    #region IsFloating
-    public bool IsFloating
-    {
-      get
-      {
-        return this.FindParent<LayoutFloatingWindow>() != null;
-      }
-    }
-
-    #endregion
-
-    #region IconSource
-
-    private ImageSource _iconSource = null;
-    public ImageSource IconSource
-    {
-      get
-      {
-        return _iconSource;
-      }
-      set
-      {
-        if( _iconSource != value )
-        {
-          _iconSource = value;
-          RaisePropertyChanged( "IconSource" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region CanClose
-
-    internal 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
-
-    #region IsEnabled
-
-    private bool _isEnabled = true;
-    public bool IsEnabled
-    {
-      get
-      {
-        return _isEnabled;
-      }
-      set
-      {
-        if( _isEnabled != value )
-        {
-          _isEnabled = value;
-          RaisePropertyChanged( "IsEnabled" );
-        }
-      }
-    }
-
-    #endregion
-
-
-
-
-
-
-
-    #endregion
-
-    #region Overrides
-
-    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 );
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    /// <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 abstract void Close();
-
-    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() );
-        }
-      }
-
-    }
-
-    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();
-
-    }
-
-
-
-
-
-    #endregion
-
-    #region Internal Methods
-
-    /// <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;
-    }
-
-    internal void CloseInternal()
-    {
-      var root = Root;
-      var parentAsContainer = Parent as ILayoutContainer;
-      parentAsContainer.RemoveChild( this );
-      if( root != null )
-        root.CollectGarbage();
-
-      OnClosed();
-    }
-
-    protected virtual void OnClosed()
-    {
-      if( Closed != null )
-        Closed( this, EventArgs.Empty );
-    }
-
-    protected virtual void OnClosing( CancelEventArgs args )
-    {
-      if( Closing != null )
-        Closing( this, args );
-    }
-
-    protected virtual void InternalDock()
-    {
-    }
-
-    #endregion
-
-    #region Events
-
-    /// <summary>
-    /// Event fired when the content is closed (i.e. removed definitely from the layout)
-    /// </summary>
-    public event EventHandler Closed;
-
-    /// <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;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
deleted file mode 100644
index 07d4b075..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [Serializable]
-  public class LayoutDocument : LayoutContent
-  {
-    #region Properties
-
-    #region IsVisible
-
-    public bool IsVisible
-    {
-      get
-      {
-        return _isVisible;
-      }
-      internal set
-      {
-        _isVisible = value;
-      }
-    }
-
-    private bool _isVisible = true;
-
-    #endregion
-
-    #region Description
-
-    private string _description = null;
-    public string Description
-    {
-      get
-      {
-        return _description;
-      }
-      set
-      {
-        if( _description != value )
-        {
-          _description = value;
-          RaisePropertyChanged( "Description" );
-        }
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    public override void WriteXml( System.Xml.XmlWriter writer )
-    {
-      base.WriteXml( writer );
-
-      if( !string.IsNullOrWhiteSpace( this.Description ) )
-        writer.WriteAttributeString( "Description", this.Description );
-    }
-
-    public override void ReadXml( System.Xml.XmlReader reader )
-    {
-      if( reader.MoveToAttribute( "Description" ) )
-        this.Description = reader.Value;
-
-      base.ReadXml( reader );
-    }
-
-    public override void Close()
-    {
-      if( ( this.Root != null ) && ( this.Root.Manager != null ) )
-      {
-        var dockingManager = this.Root.Manager;
-        dockingManager._ExecuteCloseCommand( this );
-      }
-      else
-      {
-        this.CloseDocument();
-      }
-    }
-
-#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();
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal bool CloseDocument()
-    {
-      if( this.TestCanClose() )
-      {
-        this.CloseInternal();
-        return true;
-      }
-
-      return false;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
deleted file mode 100644
index aa71ef3a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Markup;
-using System.Diagnostics;
-using System.Xml.Serialization;
-using System.Xml;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "RootDocument" )]
-  [Serializable]
-  public class LayoutDocumentFloatingWindow : LayoutFloatingWindow
-  {
-    #region Constructors
-
-    public LayoutDocumentFloatingWindow()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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 );
-        }
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    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;
-      }
-    }
-
-    public override void ReadXml( XmlReader reader )
-    {
-      reader.MoveToContent();
-      if( reader.IsEmptyElement )
-      {
-        reader.Read();
-        return;
-      }
-
-      var localName = reader.LocalName;
-      reader.Read();
-
-      while( true )
-      {
-        if( reader.LocalName.Equals( localName ) && ( reader.NodeType == XmlNodeType.EndElement ) )
-        {
-          break;
-        }
-
-        if( reader.NodeType == XmlNodeType.Whitespace )
-        {
-          reader.Read();
-          continue;
-        }
-
-        XmlSerializer serializer;
-        if( reader.LocalName.Equals( "LayoutDocument" ) )
-        {
-          serializer = new XmlSerializer( typeof( LayoutDocument ) );
-        }
-        else
-        {
-          var type = LayoutRoot.FindType( reader.LocalName );
-          if( type == null )
-          {
-            throw new ArgumentException( "AvalonDock.LayoutDocumentFloatingWindow doesn't know how to deserialize " + reader.LocalName );
-          }
-          serializer = new XmlSerializer( type );
-        }
-
-        RootDocument = ( LayoutDocument )serializer.Deserialize( reader );
-      }
-
-      reader.ReadEndElement();
-    }
-
-#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
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler RootDocumentChanged;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs
deleted file mode 100644
index 35589ba8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Markup;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "Children" )]
-  [Serializable]
-  public class LayoutDocumentPane : LayoutPositionableGroup<LayoutContent>, ILayoutDocumentPane, ILayoutPositionableElement, ILayoutContentSelector, ILayoutPaneSerializable
-  {
-    #region Constructors
-
-    public LayoutDocumentPane()
-    {
-    }
-    public LayoutDocumentPane( LayoutContent firstChild )
-    {
-      this.Children.Add( firstChild );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region ShowHeader
-
-    private bool _showHeader = true;
-    public bool ShowHeader
-    {
-      get
-      {
-        return _showHeader;
-      }
-      set
-      {
-        if( value != _showHeader )
-        {
-          _showHeader = value;
-          RaisePropertyChanged( "ShowHeader" );
-        }
-      }
-    }
-
-    #endregion
-
-    #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" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region SelectedContent
-
-    public LayoutContent SelectedContent
-    {
-      get
-      {
-        return _selectedIndex == -1 ? null : Children[ _selectedIndex ];
-      }
-    }
-
-    #endregion
-
-    #region ChildrenSorted
-
-    public IEnumerable<LayoutContent> ChildrenSorted
-    {
-      get
-      {
-        var listSorted = this.Children.ToList();
-        listSorted.Sort();
-        return listSorted;
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    protected override bool GetVisibility()
-    {
-      if( this.Parent is LayoutDocumentPaneGroup )
-        return ( this.ChildrenCount > 0 ) && this.Children.Any( c => ( c is LayoutDocument && ( ( LayoutDocument )c ).IsVisible ) || ( c is LayoutAnchorable ) );
-
-      return true;
-    }
-
-    protected override void ChildMoved( int oldIndex, int newIndex )
-    {
-      if( _selectedIndex == oldIndex )
-      {
-        RaisePropertyChanging( "SelectedContentIndex" );
-        _selectedIndex = newIndex;
-        RaisePropertyChanged( "SelectedContentIndex" );
-      }
-
-
-      base.ChildMoved( oldIndex, newIndex );
-    }
-
-    protected override void OnChildrenCollectionChanged()
-    {
-      if( this.SelectedContentIndex >= this.ChildrenCount )
-        this.SelectedContentIndex = this.Children.Count - 1;
-      if( this.SelectedContentIndex == -1 && this.ChildrenCount > 0 )
-      {
-        if( this.Root == null )
-        {
-          this.SetNextSelectedIndex();
-        }
-        else
-        {
-          var childrenToSelect = this.Children.OrderByDescending( c => c.LastActivationTimeStamp.GetValueOrDefault() ).First();
-          this.SelectedContentIndex = this.Children.IndexOf( childrenToSelect );
-          childrenToSelect.IsActive = true;
-        }
-      }
-
-      base.OnChildrenCollectionChanged();
-
-      RaisePropertyChanged( "ChildrenSorted" );
-    }
-
-    protected override void OnIsVisibleChanged()
-    {
-      this.UpdateParentVisibility();
-      base.OnIsVisibleChanged();
-    }
-
-    public override void WriteXml( System.Xml.XmlWriter writer )
-    {
-      if( _id != null )
-        writer.WriteAttributeString( "Id", _id );
-      if( !_showHeader )
-        writer.WriteAttributeString( "ShowHeader", _showHeader.ToString() );
-
-      base.WriteXml( writer );
-    }
-
-    public override void ReadXml( System.Xml.XmlReader reader )
-    {
-      if( reader.MoveToAttribute( "Id" ) )
-        _id = reader.Value;
-      if( reader.MoveToAttribute( "ShowHeader" ) )
-        _showHeader = bool.Parse( 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
-
-    #endregion
-
-    #region Public Methods
-
-    public int IndexOf( LayoutContent content )
-    {
-      return Children.IndexOf( content );
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void SetNextSelectedIndex()
-    {
-      this.SelectedContentIndex = -1;
-      for( int i = 0; i < this.Children.Count; ++i )
-      {
-        if( this.Children[ i ].IsEnabled )
-        {
-          this.SelectedContentIndex = i;
-          return;
-        }
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateParentVisibility()
-    {
-      var parentPane = this.Parent as ILayoutElementWithVisibility;
-      if( parentPane != null )
-        parentPane.ComputeVisibility();
-    }
-
-    #endregion
-
-    #region ILayoutPaneSerializable Interface
-
-    string _id;
-    string ILayoutPaneSerializable.Id
-    {
-      get
-      {
-        return _id;
-      }
-      set
-      {
-        _id = value;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs
deleted file mode 100644
index 495c7a96..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Windows.Markup;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "Children" )]
-  [Serializable]
-  public class LayoutDocumentPaneGroup : LayoutPositionableGroup<ILayoutDocumentPane>, ILayoutDocumentPane, ILayoutOrientableGroup
-  {
-    #region Constructors
-
-    public LayoutDocumentPaneGroup()
-    {
-    }
-
-    public LayoutDocumentPaneGroup( LayoutDocumentPane documentPane )
-    {
-      Children.Add( documentPane );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Orientation
-
-    private Orientation _orientation;
-    public Orientation Orientation
-    {
-      get
-      {
-        return _orientation;
-      }
-      set
-      {
-        if( _orientation != value )
-        {
-          RaisePropertyChanging( "Orientation" );
-          _orientation = value;
-          RaisePropertyChanged( "Orientation" );
-        }
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    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
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs
deleted file mode 100644
index e3965f1b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Xml.Serialization;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [Serializable]
-  public abstract class LayoutElement : DependencyObject, ILayoutElement
-  {
-    #region Members
-
-    [NonSerialized]
-    private ILayoutContainer _parent = null;
-    [NonSerialized]
-    private ILayoutRoot _root = null;
-
-    #endregion
-
-    #region Constructors
-
-    internal LayoutElement()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Parent
-
-    [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();
-        }
-      }
-    }
-
-    #endregion
-
-    #region Root
-
-    public ILayoutRoot Root
-    {
-      get
-      {
-        var parent = Parent;
-
-        while( parent != null && ( !( parent is ILayoutRoot ) ) )
-        {
-          parent = parent.Parent;
-        }
-
-        return parent as ILayoutRoot;
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Public Methods
-
-#if TRACE
-        public virtual void ConsoleDump(int tab)
-        {
-          System.Diagnostics.Trace.Write( new String( ' ', tab * 4 ) );
-          System.Diagnostics.Trace.WriteLine( this.ToString() );
-        }
-#endif
-
-    #endregion
-
-    #region Internal Methods
-
-    /// <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 );
-    }
-
-    protected virtual void RaisePropertyChanged( string propertyName )
-    {
-      if( PropertyChanged != null )
-        PropertyChanged( this, new System.ComponentModel.PropertyChangedEventArgs( propertyName ) );
-    }
-
-    protected virtual void RaisePropertyChanging( string propertyName )
-    {
-      if( PropertyChanging != null )
-        PropertyChanging( this, new System.ComponentModel.PropertyChangingEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    #region Events
-
-    [field: NonSerialized]
-    [field: XmlIgnore]
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    [field: NonSerialized]
-    [field: XmlIgnore]
-    public event PropertyChangingEventHandler PropertyChanging;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs
deleted file mode 100644
index d5189321..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.AvalonDock.Layout
-{
-  public class LayoutElementEventArgs : EventArgs
-  {
-    #region Constructors
-
-    public LayoutElementEventArgs( LayoutElement element )
-    {
-      Element = element;
-    }
-
-    #endregion
-
-    #region Properties
-
-    public LayoutElement Element
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs
deleted file mode 100644
index f41e479d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Xml.Serialization;
-using System.Xml.Schema;
-using System.Xml;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [Serializable]
-  public abstract class LayoutFloatingWindow : LayoutElement, ILayoutContainer, IXmlSerializable
-  {
-    #region Constructors
-
-    public LayoutFloatingWindow()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Children
-
-    public abstract IEnumerable<ILayoutElement> Children
-    {
-      get;
-    }
-
-    #endregion
-
-    #region ChildrenCount
-
-    public abstract int ChildrenCount
-    {
-      get;
-    }
-
-    #endregion
-
-    #region IsValid
-
-    public abstract bool IsValid
-    {
-      get;
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Public Methods
-
-    public abstract void RemoveChild( ILayoutElement element );
-
-    public abstract void ReplaceChild( ILayoutElement oldElement, ILayoutElement newElement );
-
-    public XmlSchema GetSchema()
-    {
-      return null;
-    }
-
-    public abstract void ReadXml( XmlReader reader );
-
-    public virtual void WriteXml( XmlWriter writer )
-    {
-      foreach( var child in Children )
-      {
-        var type = child.GetType();
-        var serializer = new XmlSerializer( type );
-        serializer.Serialize( writer, child );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs
deleted file mode 100644
index 179a373f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs
+++ /dev/null
@@ -1,317 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
-  {
-    #region Members
-
-    ObservableCollection<T> _children = new ObservableCollection<T>();
-
-    #endregion
-
-    #region Constructors
-
-    internal LayoutGroup()
-    {
-      _children.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler( _children_CollectionChanged );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Children
-
-    public ObservableCollection<T> Children
-    {
-      get
-      {
-        return _children;
-      }
-    }
-
-    #endregion
-
-    #region IsVisible
-
-    private bool _isVisible = true;
-    public bool IsVisible
-    {
-      get
-      {
-        return _isVisible;
-      }
-      protected set
-      {
-        if( _isVisible != value )
-        {
-          RaisePropertyChanging( "IsVisible" );
-          _isVisible = value;
-          OnIsVisibleChanged();
-          RaisePropertyChanged( "IsVisible" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region ChildrenCount
-
-    public int ChildrenCount
-    {
-      get
-      {
-        return _children.Count;
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    protected override void OnParentChanged( ILayoutContainer oldValue, ILayoutContainer newValue )
-    {
-      base.OnParentChanged( oldValue, newValue );
-
-      ComputeVisibility();
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    public void ComputeVisibility()
-    {
-      IsVisible = GetVisibility();
-    }
-
-    public void MoveChild( int oldIndex, int newIndex )
-    {
-      if( oldIndex == newIndex )
-        return;
-      _children.Move( oldIndex, newIndex );
-      ChildMoved( oldIndex, 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 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;
-        }
-        if( reader.NodeType == System.Xml.XmlNodeType.Whitespace )
-        {
-          reader.Read();
-          continue;
-        }
-
-        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 ) );
-        else
-        {
-          Type type = this.FindType( reader.LocalName );
-          if( type == null )
-            throw new ArgumentException( "AvalonDock.LayoutGroup doesn't know how to deserialize " + reader.LocalName );
-          serializer = new XmlSerializer( type );
-        }
-
-        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 );
-      }
-
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    protected virtual void OnIsVisibleChanged()
-    {
-      UpdateParentVisibility();
-    }
-
-    protected abstract bool GetVisibility();
-
-    protected virtual void ChildMoved( int oldIndex, int newIndex )
-    {
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private 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" );
-    }
-
-    private void UpdateParentVisibility()
-    {
-      var parentPane = Parent as ILayoutElementWithVisibility;
-      if( parentPane != null )
-        parentPane.ComputeVisibility();
-    }
-
-    private Type FindType( string name )
-    {
-      foreach( var a in AppDomain.CurrentDomain.GetAssemblies() )
-      {
-        foreach( var t in a.GetTypes() )
-        {
-          if( t.Name.Equals( name ) )
-            return t;
-        }
-      }
-      return null;
-    }
-
-    #endregion
-
-    #region ILayoutContainer Interface
-
-    IEnumerable<ILayoutElement> ILayoutContainer.Children
-    {
-      get
-      {
-        return _children.Cast<ILayoutElement>();
-      }
-    }
-
-    #endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs
deleted file mode 100644
index f0e0bb51..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Xml.Serialization;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [Serializable]
-  public abstract class LayoutGroupBase : LayoutElement
-  {
-    #region Internal Methods
-
-    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 );
-    }
-
-    protected virtual void OnChildrenTreeChanged( ChildrenTreeChange change )
-    {
-      if( ChildrenTreeChanged != null )
-        ChildrenTreeChanged( this, new ChildrenTreeChangedEventArgs( change ) );
-    }
-
-    #endregion
-
-    #region Events
-
-    [field: NonSerialized]
-    [field: XmlIgnore]
-    public event EventHandler ChildrenCollectionChanged;
-
-    [field: NonSerialized]
-    [field: XmlIgnore]
-    public event EventHandler<ChildrenTreeChangedEventArgs> ChildrenTreeChanged;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs
deleted file mode 100644
index 5d9c36b1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Markup;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "Children" )]
-  [Serializable]
-  public class LayoutPanel : LayoutPositionableGroup<ILayoutPanelElement>, ILayoutPanelElement, ILayoutOrientableGroup
-  {
-    #region Constructors
-
-    public LayoutPanel()
-    {
-    }
-
-    public LayoutPanel( ILayoutPanelElement firstChild )
-    {
-      Children.Add( firstChild );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region Orientation
-
-    private Orientation _orientation;
-    public Orientation Orientation
-    {
-      get
-      {
-        return _orientation;
-      }
-      set
-      {
-        if( _orientation != value )
-        {
-          RaisePropertyChanging( "Orientation" );
-          _orientation = value;
-          RaisePropertyChanged( "Orientation" );
-        }
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    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
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs
deleted file mode 100644
index 9818face..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs
+++ /dev/null
@@ -1,402 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [Serializable]
-  public abstract class LayoutPositionableGroup<T> : LayoutGroup<T>, ILayoutPositionableElement, ILayoutPositionableElementWithActualSize where T : class, ILayoutElement
-  {
-    #region Members
-
-    private static GridLengthConverter _gridLengthConverter = new GridLengthConverter();
-
-    #endregion
-
-    #region Constructors
-
-    public LayoutPositionableGroup()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region DockWidth
-
-    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();
-        }
-      }
-    }
-
-    #endregion
-
-    #region DockHeight
-
-    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();
-        }
-      }
-    }
-
-    #endregion
-
-    #region AllowDuplicateContent
-
-    private bool _allowDuplicateContent = true;
-    /// <summary>
-    /// Gets or sets the AllowDuplicateContent property.
-    /// When this property is true, then the LayoutDocumentPane or LayoutAnchorablePane allows dropping
-    /// duplicate content (according to its Title and ContentId). When this dependency property is false,
-    /// then the LayoutDocumentPane or LayoutAnchorablePane hides the OverlayWindow.DropInto button to prevent dropping of duplicate content.
-    /// </summary>
-    public bool AllowDuplicateContent
-    {
-      get
-      {
-        return _allowDuplicateContent;
-      }
-      set
-      {
-        if( _allowDuplicateContent != value )
-        {
-          RaisePropertyChanging( "AllowDuplicateContent" );
-          _allowDuplicateContent = value;
-          RaisePropertyChanged( "AllowDuplicateContent" );
-        }
-      }
-    }
-
-    #endregion
-
-    #region CanRepositionItems
-
-    private bool _canRepositionItems = true;
-    public bool CanRepositionItems
-    {
-      get
-      {
-        return _canRepositionItems;
-      }
-      set
-      {
-        if( _canRepositionItems != value )
-        {
-          RaisePropertyChanging( "CanRepositionItems" );
-          _canRepositionItems = value;
-          RaisePropertyChanged( "CanRepositionItems" );
-        }
-      }
-    }
-
-    #endregion
-
-    #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
-
-    #region ActualWidth
-
-    [NonSerialized]
-    double _actualWidth;
-    double ILayoutPositionableElementWithActualSize.ActualWidth
-    {
-      get
-      {
-        return _actualWidth;
-      }
-      set
-      {
-        _actualWidth = value;
-      }
-    }
-
-    #endregion
-
-    #region ActualHeight
-
-    [NonSerialized]
-    double _actualHeight;
-    double ILayoutPositionableElementWithActualSize.ActualHeight
-    {
-      get
-      {
-        return _actualHeight;
-      }
-      set
-      {
-        _actualHeight = value;
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    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 ) );
-      if( IsMaximized )
-        writer.WriteAttributeString( "IsMaximized", IsMaximized.ToString() );
-
-      base.WriteXml( writer );
-    }
-
-
-    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 );
-      if( reader.MoveToAttribute( "IsMaximized" ) )
-        _isMaximized = bool.Parse( reader.Value );
-
-      base.ReadXml( reader );
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    protected virtual void OnDockWidthChanged()
-    {
-    }
-
-    protected virtual void OnDockHeightChanged()
-    {
-    }
-
-    #endregion  
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
deleted file mode 100644
index f2fa1de9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
+++ /dev/null
@@ -1,1064 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Xml;
-using System.Xml.Schema;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.AvalonDock.Layout
-{
-  [ContentProperty( "RootPanel" )]
-  [Serializable]
-  public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot, IXmlSerializable
-  {
-    #region Constructors
-
-    public LayoutRoot()
-    {
-      RightSide = new LayoutAnchorSide();
-      LeftSide = new LayoutAnchorSide();
-      TopSide = new LayoutAnchorSide();
-      BottomSide = new LayoutAnchorSide();
-      RootPanel = new LayoutPanel( new LayoutDocumentPane() );
-    }
-
-    #endregion
-
-    #region Properties
-
-    #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;
-      }
-    }
-
-    #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;
-      }
-    }
-
-    #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;
-        }
-      }
-    }
-
-    #endregion
-
-    #region ChildrenCount
-
-    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 );
-        }
-      }
-    }
-
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-#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
-
-    #endregion
-
-    #region Public Methods
-
-    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;
-    }
-
-    /// <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
-
-      //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 );
-      //    ILayoutPanelElement[] singleChildChildren = new ILayoutPanelElement[ singleChild.ChildrenCount ];
-      //    singleChild.Children.CopyTo( singleChildChildren, 0 );
-      //    while( singleChild.ChildrenCount > 0 )
-      //    {
-      //      panelToCollapse.InsertChildAt(
-      //          panelToCollapse.ChildrenCount, singleChildChildren[ panelToCollapse.ChildrenCount ] );
-      //    }
-
-      //    exitFlag = false;
-      //    break;
-      //  }
-
-      //}
-      //while( !exitFlag );
-
-      #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
-    }
-
-    public XmlSchema GetSchema()
-    {
-      return null;
-    }
-
-    public void ReadXml( XmlReader reader )
-    {
-      reader.MoveToContent();
-      if( reader.IsEmptyElement )
-      {
-        reader.Read();
-        return;
-      }
-
-      Orientation orientation;
-      var layoutPanelElements = this.ReadRootPanel( reader, out orientation );
-      if( layoutPanelElements != null )
-      {
-        this.RootPanel = new LayoutPanel() { Orientation = orientation };
-        //Add all children to RootPanel
-        for( int i = 0; i < layoutPanelElements.Count; ++i )
-        {
-          this.RootPanel.Children.Add( layoutPanelElements[ i ] );
-        }
-      }
-
-      this.TopSide = new LayoutAnchorSide();
-      if( this.ReadElement( reader ) != null )
-      {
-        this.FillLayoutAnchorSide( reader, TopSide );
-      }
-      this.RightSide = new LayoutAnchorSide();
-      if( this.ReadElement( reader ) != null )
-      {
-        this.FillLayoutAnchorSide( reader, RightSide );
-      }
-      this.LeftSide = new LayoutAnchorSide();
-      if( this.ReadElement( reader ) != null )
-      {
-        this.FillLayoutAnchorSide( reader, LeftSide );
-      }
-      this.BottomSide = new LayoutAnchorSide();
-      if( this.ReadElement( reader ) != null )
-      {
-        this.FillLayoutAnchorSide( reader, BottomSide );
-      }
-
-      this.FloatingWindows.Clear();
-      var floatingWindows = this.ReadElementList( reader, true );
-      foreach( var floatingWindow in floatingWindows )
-      {
-        this.FloatingWindows.Add( ( LayoutFloatingWindow )floatingWindow );
-      }
-
-      this.Hidden.Clear();
-      var hidden = this.ReadElementList( reader, false );
-      foreach( var hiddenObject in hidden )
-      {
-        this.Hidden.Add( ( LayoutAnchorable )hiddenObject );
-      }
-    }
-
-    public void WriteXml( XmlWriter writer )
-    {
-      writer.WriteStartElement( "RootPanel" );
-      if( this.RootPanel != null )
-      {
-        this.RootPanel.WriteXml( writer );
-      }
-      writer.WriteEndElement();
-
-      writer.WriteStartElement( "TopSide" );
-      if( this.TopSide != null )
-      {
-        this.TopSide.WriteXml( writer );
-      }
-      writer.WriteEndElement();
-
-      writer.WriteStartElement( "RightSide" );
-      if( this.RightSide != null )
-      {
-        this.RightSide.WriteXml( writer );
-      }
-      writer.WriteEndElement();
-
-      writer.WriteStartElement( "LeftSide" );
-      if( this.LeftSide != null )
-      {
-        this.LeftSide.WriteXml( writer );
-      }
-      writer.WriteEndElement();
-
-      writer.WriteStartElement( "BottomSide" );
-      if( this.BottomSide != null )
-      {
-        this.BottomSide.WriteXml( writer );
-      }
-      writer.WriteEndElement();
-
-      // Write all floating windows (can be LayoutDocumentFloatingWindow or LayoutAnchorableFloatingWindow).
-      // To prevent "can not create instance of abstract type", the type is retrieved with GetType().Name
-      writer.WriteStartElement( "FloatingWindows" );
-      foreach( var layoutFloatingWindow in FloatingWindows )
-      {
-        writer.WriteStartElement( layoutFloatingWindow.GetType().Name );
-        layoutFloatingWindow.WriteXml( writer );
-        writer.WriteEndElement();
-      }
-      writer.WriteEndElement();
-
-      writer.WriteStartElement( "Hidden" );
-      foreach( var layoutAnchorable in Hidden )
-      {
-        writer.WriteStartElement( layoutAnchorable.GetType().Name );
-        layoutAnchorable.WriteXml( writer );
-        writer.WriteEndElement();
-      }
-      writer.WriteEndElement();
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal static Type FindType( string name )
-    {
-      foreach( var assembly in AppDomain.CurrentDomain.GetAssemblies() )
-      {
-        foreach( var type in assembly.GetTypes() )
-        {
-          if( type.Name.Equals( name ) )
-            return type;
-        }
-      }
-      return null;
-    }
-
-    internal void FireLayoutUpdated()
-    {
-      if( Updated != null )
-        Updated( this, EventArgs.Empty );
-    }
-
-    internal void OnLayoutElementAdded( LayoutElement element )
-    {
-      if( ElementAdded != null )
-        ElementAdded( this, new LayoutElementEventArgs( element ) );
-    }
-
-    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 ) );
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private 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;
-      }
-    }
-
-    private 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;
-            }
-
-          }
-        }
-      }
-
-
-
-    }
-
-    private 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;
-    }
-
-    private void UpdateActiveContentProperty()
-    {
-      var activeContent = ActiveContent;
-      if( _activeContentSet && ( activeContent == null || activeContent.Root != this ) )
-      {
-        _activeContentSet = false;
-        InternalSetActiveContent( activeContent, null );
-      }
-    }
-
-    private void FillLayoutAnchorSide( XmlReader reader, LayoutAnchorSide layoutAnchorSide )
-    {
-      var result = new List<LayoutAnchorGroup>();
-
-      while( true )
-      {
-        //Read all layoutAnchorSide children
-        var element = ReadElement( reader ) as LayoutAnchorGroup;
-        if( element != null )
-        {
-          result.Add( element );
-        }
-        else if( reader.NodeType == XmlNodeType.EndElement )
-        {
-          break;
-        }
-      }
-
-      reader.ReadEndElement();
-      foreach( var las in result )
-      {
-        layoutAnchorSide.Children.Add( las );
-      }
-    }
-
-    private List<ILayoutPanelElement> ReadRootPanel( XmlReader reader, out Orientation orientation )
-    {
-      orientation = Orientation.Horizontal;
-      var result = new List<ILayoutPanelElement>();
-
-      var startElementName = reader.LocalName;
-      reader.Read();
-      if( reader.LocalName.Equals( startElementName ) && ( reader.NodeType == XmlNodeType.EndElement ) )
-      {
-        return null;
-      }
-
-      while( reader.NodeType == XmlNodeType.Whitespace )
-      {
-        reader.Read();
-      }
-
-      if( reader.LocalName.Equals( "RootPanel" ) )
-      {
-        orientation = (reader.GetAttribute( "Orientation" ) == "Vertical") ? Orientation.Vertical : Orientation.Horizontal;
-        reader.Read();
-
-        while( true )
-        {
-          //Read all RootPanel children
-          var element = ReadElement( reader ) as ILayoutPanelElement;
-          if( element != null )
-          {
-            result.Add( element );
-          }
-          else if( reader.NodeType == XmlNodeType.EndElement )
-          {
-            break;
-          }
-        }
-      }
-
-      reader.ReadEndElement();
-
-      return result;
-    }
-
-    private List<object> ReadElementList( XmlReader reader, bool isFloatingWindow )
-    {
-      var resultList = new List<object>();
-
-      while( reader.NodeType == XmlNodeType.Whitespace )
-      {
-        reader.Read();
-      }
-
-      if( reader.IsEmptyElement )
-      {
-        reader.Read();
-        return resultList;
-      }
-
-      var startElementName = reader.LocalName;
-      reader.Read();
-      if( reader.LocalName.Equals( startElementName ) && ( reader.NodeType == XmlNodeType.EndElement ) )
-      {
-        return null;
-      }
-
-      while( reader.NodeType == XmlNodeType.Whitespace )
-      {
-        reader.Read();
-      }
-
-      while( true )
-      {
-        if( isFloatingWindow )
-        {
-          var result = this.ReadElement( reader ) as LayoutFloatingWindow;
-          if( result == null )
-          {
-            break;
-          }
-          resultList.Add( result );
-        }
-        else
-        {
-          var result = this.ReadElement( reader ) as LayoutAnchorable;
-          if( result == null )
-          {
-            break;
-          }
-          resultList.Add( result );
-        }
-      }
-
-      reader.ReadEndElement();
-
-      return resultList;
-    }
-
-    private object ReadElement( XmlReader reader )
-    {
-      while( reader.NodeType == XmlNodeType.Whitespace )
-      {
-        reader.Read();
-      }
-
-      if( reader.NodeType == XmlNodeType.EndElement )
-      {
-        return null;
-      }
-
-      XmlSerializer serializer;
-      switch( reader.LocalName )
-      {
-        case "LayoutAnchorablePaneGroup":
-          serializer = new XmlSerializer( typeof( LayoutAnchorablePaneGroup ) );
-          break;
-        case "LayoutAnchorablePane":
-          serializer = new XmlSerializer( typeof( LayoutAnchorablePane ) );
-          break;
-        case "LayoutAnchorable":
-          serializer = new XmlSerializer( typeof( LayoutAnchorable ) );
-          break;
-        case "LayoutDocumentPaneGroup":
-          serializer = new XmlSerializer( typeof( LayoutDocumentPaneGroup ) );
-          break;
-        case "LayoutDocumentPane":
-          serializer = new XmlSerializer( typeof( LayoutDocumentPane ) );
-          break;
-        case "LayoutDocument":
-          serializer = new XmlSerializer( typeof( LayoutDocument ) );
-          break;
-        case "LayoutAnchorGroup":
-          serializer = new XmlSerializer( typeof( LayoutAnchorGroup ) );
-          break;
-        case "LayoutPanel":
-          serializer = new XmlSerializer( typeof( LayoutPanel ) );
-          break;
-        case "LayoutDocumentFloatingWindow":
-          serializer = new XmlSerializer( typeof( LayoutDocumentFloatingWindow ) );
-          break;
-        case "LayoutAnchorableFloatingWindow":
-          serializer = new XmlSerializer( typeof( LayoutAnchorableFloatingWindow ) );
-          break;
-        case "LeftSide":
-        case "RightSide":
-        case "TopSide":
-        case "BottomSide":
-          if( reader.IsEmptyElement )
-          {
-            reader.Read();
-            return null;
-          }
-          return reader.Read();
-        default:
-          var type = LayoutRoot.FindType( reader.LocalName );
-          if( type == null )
-          {
-            throw new ArgumentException( "AvalonDock.LayoutRoot doesn't know how to deserialize " + reader.LocalName );
-          }
-          serializer = new XmlSerializer( type );
-          break;
-      }
-
-      return serializer.Deserialize( reader );
-    }
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler Updated;
-    public event EventHandler<LayoutElementEventArgs> ElementAdded;
-    public event EventHandler<LayoutElementEventArgs> ElementRemoved;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
deleted file mode 100644
index 24ceb24b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-
-namespace Xceed.Wpf.AvalonDock.Layout.Serialization
-{
-  public class LayoutSerializationCallbackEventArgs : CancelEventArgs
-  {
-    #region constructor
-
-    public LayoutSerializationCallbackEventArgs( LayoutContent model, object previousContent )
-    {
-      Cancel = false;
-      Model = model;
-      Content = previousContent;
-    }
-
-    #endregion
-
-    #region Properties
-
-    public LayoutContent Model
-    {
-      get; private set;
-    }
-
-    public object Content
-    {
-      get; set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs
deleted file mode 100644
index 3ff45860..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-
-namespace Xceed.Wpf.AvalonDock.Layout.Serialization
-{
-  public abstract class LayoutSerializer
-  {
-    #region Members
-
-    private DockingManager _manager;
-    private LayoutAnchorable[] _previousAnchorables = null;
-    private LayoutDocument[] _previousDocuments = null;
-
-    #endregion
-
-    #region Constructors
-
-    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();
-    }
-
-    #endregion
-
-    #region Properties
-
-    public DockingManager Manager
-    {
-      get
-      {
-        return _manager;
-      }
-    }
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler<LayoutSerializationCallbackEventArgs> LayoutSerializationCallback;
-
-    #endregion
-
-    #region Methods
-
-    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;
-          lcToFix.IconSource = previousDocument.IconSource;
-        }
-      }
-
-      layout.CollectGarbage();
-    }
-
-    protected void StartDeserialization()
-    {
-      Manager.SuspendDocumentsSourceBinding = true;
-      Manager.SuspendAnchorablesSourceBinding = true;
-    }
-
-    protected void EndDeserialization()
-    {
-      Manager.SuspendDocumentsSourceBinding = false;
-      Manager.SuspendAnchorablesSourceBinding = false;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
deleted file mode 100644
index 05d3321e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Xml.Serialization;
-using System.IO;
-
-namespace Xceed.Wpf.AvalonDock.Layout.Serialization
-{
-  public class XmlLayoutSerializer : LayoutSerializer
-  {
-    #region Constructors
-
-    public XmlLayoutSerializer( DockingManager manager )
-        : base( manager )
-    {
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    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 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs
deleted file mode 100644
index 81201acb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index d059d55d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs
deleted file mode 100644
index 620c95db..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,268 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.42000
-//
-//     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 Hide.
-        /// </summary>
-        public static string Anchorable_Hide {
-            get {
-                return ResourceManager.GetString("Anchorable_Hide", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Toggle Pin status.
-        /// </summary>
-        public static string Document_BtnPinned_Hint {
-            get {
-                return ResourceManager.GetString("Document_BtnPinned_Hint", 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.
-        /// </summary>
-        public static string Document_CloseAll {
-            get {
-                return ResourceManager.GetString("Document_CloseAll", 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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index b0800844..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>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_BtnPinned_Hint" xml:space="preserve">
-    <value>Pin-Status umschalten</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Schließen</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Schließen Sie alle</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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 9b2cf65c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>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>Esconder</value>
-  </data>
-  <data name="Document_BtnPinned_Hint" xml:space="preserve">
-    <value>Activar el estado del pin</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Cerrar</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Cerca de todo</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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 8acbf362..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>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>Cacher</value>
-  </data>
-  <data name="Document_BtnPinned_Hint" xml:space="preserve">
-    <value>Ancrer / désancrer</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Fermer</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Fermer tout</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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 54d0bcae..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>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_BtnPinned_Hint" xml:space="preserve">
-    <value>Toggle Pin állapot</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Bezárás</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Zárjon be minden</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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index d72bc67a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>Nascondi</value>
-  </data>
-  <data name="Document_BtnPinned_Hint" xml:space="preserve">
-    <value>Stato Toggle Pin</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Chiudi</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Chiudere tutte le</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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 5e2b95aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.resx
+++ /dev/null
@@ -1,180 +0,0 @@
-<?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>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>Esconder</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Fechar</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Feche todos os</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>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.resx
deleted file mode 100644
index 67b1d132..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>Hide</value>
-  </data>
-  <data name="Document_BtnPinned_Hint" xml:space="preserve">
-    <value>Toggle Pin status</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Close</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Close All</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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index db258c18..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>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>Ascunde</value>
-  </data>
-  <data name="Document_BtnPinned_Hint" xml:space="preserve">
-    <value>Starea de comutare Pin</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Închide</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Aproape toate</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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 247500ec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>Скрывать Автоматически</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_BtnPinned_Hint" xml:space="preserve">
-    <value>Статус Переключение Pin</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Закрыть</value>
-  </data>
-  <data name="Document_CloseAll" 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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index cccac740..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>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>Dölj</value>
-  </data>
-  <data name="Document_BtnPinned_Hint" xml:space="preserve">
-    <value>Toggle Pin status</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>Stäng</value>
-  </data>
-  <data name="Document_CloseAll" xml:space="preserve">
-    <value>Stäng alla</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
deleted file mode 100644
index 531d215d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 9cc57795..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.resx
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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>自动隐藏</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_BtnPinned_Hint" xml:space="preserve">
-    <value>切換引腳狀態</value>
-  </data>
-  <data name="Document_Close" xml:space="preserve">
-    <value>关闭</value>
-  </data>
-  <data name="Document_CloseAll" 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/DictionaryTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs
deleted file mode 100644
index 6857768b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.AvalonDock.Themes
-{
-  public abstract class DictionaryTheme : Theme
-  {
-    #region Constructors
-
-    public DictionaryTheme()
-    {
-    }
-
-    public DictionaryTheme( ResourceDictionary themeResourceDictionary )
-    {
-      this.ThemeResourceDictionary = themeResourceDictionary;
-    }
-
-    #endregion
-
-    #region Properties
-
-    public ResourceDictionary ThemeResourceDictionary
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    public override Uri GetResourceUri()
-    {
-      return null;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockBottom.PNG b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockBottom.PNG
deleted file mode 100644
index cdc7c06e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockBottom.PNG and /dev/null 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
deleted file mode 100644
index 88a086b0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockLeft.PNG and /dev/null 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
deleted file mode 100644
index 0377b966..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPane.PNG and /dev/null 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
deleted file mode 100644
index c3be3218..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPaneEmpty.png and /dev/null 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
deleted file mode 100644
index 067b3f06..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockRight.PNG and /dev/null 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
deleted file mode 100644
index b14b818c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockTop.PNG and /dev/null 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
deleted file mode 100644
index 4c50d26d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/HTabGroup.png and /dev/null 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
deleted file mode 100644
index a682de72..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneBottom.png and /dev/null 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
deleted file mode 100644
index 705a4900..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneLeft.png and /dev/null 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
deleted file mode 100644
index c08f50f1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneRight.png and /dev/null 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
deleted file mode 100644
index 14197efd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneTop.png and /dev/null 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
deleted file mode 100644
index 01be445a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneBottom.png and /dev/null 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
deleted file mode 100644
index a0b30b0e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneInside.png and /dev/null 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
deleted file mode 100644
index 21dfb7b0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneLeft.png and /dev/null 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
deleted file mode 100644
index 52438d8e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneRight.png and /dev/null 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
deleted file mode 100644
index 852a56b8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneTop.png and /dev/null 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
deleted file mode 100644
index b8f6ced2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/Locked.png and /dev/null 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
deleted file mode 100644
index 7a968a25..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinAutoHide.png and /dev/null 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
deleted file mode 100644
index 1bd384e1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinClose.png and /dev/null 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
deleted file mode 100644
index 35b3fef6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinDocMenu.png and /dev/null 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
deleted file mode 100644
index 19139428..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMaximize.png and /dev/null 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
deleted file mode 100644
index ebad71be..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMenu.png and /dev/null 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
deleted file mode 100644
index c95bb936..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinRestore.png and /dev/null 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
deleted file mode 100644
index c3f279f7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/VTabGroup.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs
deleted file mode 100644
index 857cd20c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index 88abbfc0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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
deleted file mode 100644
index 89dab4dd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
+++ /dev/null
@@ -1,1422 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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" />
-  <avalonDockConverters:AnchorableContextMenuHideVisibilityConverter x:Key="AnchorableContextMenuHideVisibilityConverter" />
-
-  <!--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 Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
-                  Panel.ZIndex="1">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel"
-                                                       Grid.Column="0"
-                                                       IsItemsHost="true"
-                                                       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>
-                <Border Background="White">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinDocMenu.png">
-                  </Image>
-                </Border>
-              </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="IsEnabled"
-                  Value="{Binding IsEnabled}" />
-          <Setter Property="ToolTip"
-                  Value="{Binding ToolTip}" />
-          <Setter Property="Padding"
-                  Value="2,0,2,0" />
-          <Setter Property="Margin"
-                  Value="0,2,0,0" />
-          <Setter Property="Template">
-            <Setter.Value>
-              <ControlTemplate TargetType="{x:Type TabItem}">
-                <Grid SnapsToDevicePixels="true">
-
-                  <Border x:Name="Bd"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          Background="{TemplateBinding Background}"
-                          Padding="{TemplateBinding Padding}"
-                          BorderThickness="1,1,1,0">
-                    <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="White" />
-                    <Setter Property="Panel.ZIndex"
-                            Value="1" />
-                    <Setter Property="Margin"
-                            Value="0,0,0,-2" />
-                    <Setter Property="Margin"
-                            TargetName="Content"
-                            Value="0,0,0,3" />
-                  </Trigger>
-                  <MultiTrigger>
-                    <MultiTrigger.Conditions>
-                      <Condition Property="IsMouseOver"
-                                 Value="true" />
-                      <Condition Property="Selector.IsSelected"
-                                 Value="false" />
-                    </MultiTrigger.Conditions>
-                    <Setter Property="Background"
-                            Value="{DynamicResource {x:Static SystemColors.GradientInactiveCaptionBrushKey}}" />
-                    <Setter Property="BorderBrush"
-                            Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                    <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="AnchorablePaneControlStyle"
-         TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
-    <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="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="IsEnabled"
-                  Value="{Binding IsEnabled}" />
-          <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"
-                          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="White" />
-                    <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="Background"
-                            Value="{DynamicResource {x:Static SystemColors.GradientInactiveCaptionBrushKey}}" />
-                    <Setter Property="BorderBrush"
-                            Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                    <Setter Property="Panel.ZIndex"
-                            Value="0" />
-                  </MultiTrigger>
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-                    <Setter Property="Foreground"
-                            Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-                </ControlTemplate.Triggers>
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-          <Style.Triggers>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TabControl}}, Path=Items.Count, FallbackValue=1}"
-                         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}">
-                <Border Background="White">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMenu.png">
-                  </Image>
-                </Border>
-              </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}">
-                <Border Background="White">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinAutoHide.png">
-                  </Image>
-                </Border>
-              </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}">
-                <Border Background="White">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png">
-                  </Image>
-                </Border>
-              </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.CanClose, RelativeSource={RelativeSource Mode=Self}}"
-                         Value="True">
-              <Setter Property="Command"
-                      TargetName="PART_HidePin"
-                      Value="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="ToolTip"
-                      TargetName="PART_HidePin"
-                      Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-
-            </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>
-              <Image x:Name="PART_DockingManagerDropTargetRight"
-                     VerticalAlignment="Center"
-                     HorizontalAlignment="Right"
-                     Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockRight.PNG"
-                     Stretch="None">
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetBottom"
-                     VerticalAlignment="Bottom"
-                     HorizontalAlignment="Center"
-                     Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockBottom.PNG"
-                     Stretch="None">
-              </Image>
-              <Image x:Name="PART_DockingManagerDropTargetTop"
-                     VerticalAlignment="Top"
-                     HorizontalAlignment="Center"
-                     Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockTop.PNG"
-                     Stretch="None">
-              </Image>
-            </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">
-                </Image>
-                <Border Name="PART_AnchorablePaneDropTargetTop"
-                        Grid.Column="1"
-                        Grid.Row="0">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneTop.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetRight"
-                        Grid.Column="2"
-                        Grid.Row="1">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneRight.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetBottom"
-                        Grid.Column="1"
-                        Grid.Row="2">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneBottom.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetLeft"
-                        Grid.Column="0"
-                        Grid.Row="1">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneLeft.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-                <Border Name="PART_AnchorablePaneDropTargetInto"
-                        Grid.Column="1"
-                        Grid.Row="1">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneInside.png"
-                         Stretch="None">
-                  </Image>
-                </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">
-                </Image>
-                <Border Name="PART_DocumentPaneDropTargetTop"
-                        Grid.Column="1"
-                        Grid.Row="0">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneTop.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetRight"
-                        Grid.Column="2"
-                        Grid.Row="1">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneRight.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetBottom"
-                        Grid.Column="1"
-                        Grid.Row="2">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneBottom.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetLeft"
-                        Grid.Column="0"
-                        Grid.Row="1">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneLeft.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-                <Border Name="PART_DocumentPaneDropTargetInto"
-                        Grid.Column="1"
-                        Grid.Row="1">
-                  <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneInside.png"
-                         Stretch="None">
-                  </Image>
-                </Border>
-              </Grid>
-            </Grid>
-          </Canvas>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="DocumentHeaderTemplate">
-    <TextBlock Text="{Binding Title}"
-               TextTrimming="CharacterEllipsis">
-    </TextBlock>
-  </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">
-      </Image>
-      <TextBlock x:Name="title"
-                 Margin="4,0,0,0"
-                 Text="{Binding Title}"
-                 TextTrimming="CharacterEllipsis"
-                 Grid.Column="1">
-      </TextBlock>
-    </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">
-    </TextBlock>
-  </DataTemplate>
-
-  <DataTemplate x:Key="AnchorableTitleTemplate">
-    <TextBlock Text="{Binding Title}"
-               TextTrimming="CharacterEllipsis">
-    </TextBlock>
-  </DataTemplate>
-
-  <DataTemplate x:Key="IconContentTemplate">
-    <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}"
-           Stretch="Uniform">
-    </Image>
-  </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.Document_Close}"
-              Command="{Binding Path=CloseCommand}"
-              Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
-    <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}"
-              Command="{Binding Path=HideCommand}">
-      <MenuItem.Visibility>
-        <MultiBinding Converter="{StaticResource AnchorableContextMenuHideVisibilityConverter}">
-          <Binding Path="IsEnabled"
-                   RelativeSource="{RelativeSource Self}"
-                   Mode="OneWay"
-                   Converter="{StaticResource BoolToVisibilityConverter}" />
-          <Binding Path="CanClose" />
-        </MultiBinding>
-      </MenuItem.Visibility>
-    </MenuItem>
-  </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_CloseAll}"
-              Command="{Binding Path=CloseAllCommand}" />
-    <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}}"
-                                          ContentTemplate="{Binding LayoutItem.View.ContentTemplate, RelativeSource={RelativeSource TemplatedParent}}"
-                                          ContentTemplateSelector="{Binding LayoutItem.View.ContentTemplateSelector, 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}">
-                          <Grid>
-                            <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="*" />
-                              <ColumnDefinition Width="Auto" />
-                              <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Border Grid.ColumnSpan="3"
-                                    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}}" />
-
-                            <Button x:Name="DocumentCloseButton"
-                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-                                    Grid.Column="2"
-                                    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">
-                              </Image>
-                            </Button>
-                          </Grid>
-                        </Border>
-                      </avalonDockControls:DropDownControlArea>
-                      <ControlTemplate.Triggers>
-                        <MultiDataTrigger>
-                          <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding Path=IsSelected}"
-                                       Value="True" />
-                          </MultiDataTrigger.Conditions>
-                          <Setter Property="Visibility"
-                                  Value="Visible"
-                                  TargetName="DocumentCloseButton" />
-                        </MultiDataTrigger>
-                        <MultiDataTrigger>
-                          <MultiDataTrigger.Conditions>
-                            <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource TemplatedParent}}"
-                                       Value="True" />
-                          </MultiDataTrigger.Conditions>
-                          <Setter Property="Visibility"
-                                  Value="Visible"
-                                  TargetName="DocumentCloseButton" />
-                        </MultiDataTrigger>
-                        <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}}">
-                            </avalonDockControls:DropDownControlArea>
-                          </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="BorderBrush"
-                        Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-                <Setter Property="BorderThickness"
-                        Value="3" />
-                <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="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}">
-                          <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">
-                                </Image>
-                              </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">
-                                </Image>
-                              </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">
-                                </Image>
-                              </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>
-                        <DataTrigger Binding="{Binding Model.RootDocument.IsActive, RelativeSource={RelativeSource Self}}"
-                                     Value="True">
-                          <Setter TargetName="WindowBorder"
-                                  Property="BorderBrush"
-                                  Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                        </DataTrigger>
-                      </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="BorderBrush"
-                        Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-                <Setter Property="BorderThickness"
-                        Value="3" />
-                <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:LayoutAnchorableFloatingWindowControl}">
-                      <Grid>
-                        <Border x:Name="WindowBorder"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}">
-                          <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">
-                                </Image>
-                              </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">
-                                </Image>
-                              </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">
-                                </Image>
-                              </Button>
-
-                              <Button x:Name="CloseButton"
-                                      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">
-                                </Image>
-                              </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>
-                        <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.IsActive, RelativeSource={RelativeSource Self}}"
-                                     Value="True">
-                          <Setter TargetName="WindowBorder"
-                                  Property="BorderBrush"
-                                  Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding Model.SinglePane.SelectedContent.CanClose, RelativeSource={RelativeSource Mode=Self}}"
-                                     Value="True">
-                          <Setter Property="Command"
-                                  TargetName="CloseButton"
-                                  Value="{Binding CloseWindowCommand, RelativeSource={RelativeSource TemplatedParent}}" />
-                          <Setter Property="ToolTip"
-                                  TargetName="CloseButton"
-                                  Value="{x:Static avalonDockProperties:Resources.Document_Close}" />
-
-                        </DataTrigger>
-                      </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">
-                                </Image>
-                                <TextBlock x:Name="selectedElementTitle"
-                                           Text="{Binding SelectedDocument.LayoutElement.Title}"
-                                           TextTrimming="CharacterEllipsis"
-                                           Grid.Column="1"
-                                           VerticalAlignment="Center"
-                                           FontWeight="Bold"
-                                           Margin="4,0,0,0">
-                                </TextBlock>
-                              </Grid>
-                              <TextBlock x:Name="selectedElementDescription"
-                                         Text="{Binding SelectedDocument.LayoutElement.Description}"
-                                         TextTrimming="CharacterEllipsis"
-                                         VerticalAlignment="Center">
-                              </TextBlock>
-                            </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">
-                                </TextBlock>
-                                <ListBox x:Name="PART_AnchorableListBox"
-                                         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">
-                                        </Image>
-                                        <TextBlock Text="{Binding LayoutElement.Title}"
-                                                   TextTrimming="CharacterEllipsis"
-                                                   Grid.Column="1"
-                                                   Margin="4,2,0,2">
-                                        </TextBlock>
-                                      </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">
-                                </TextBlock>
-                                <ListBox x:Name="PART_DocumentListBox"
-                                         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">
-                                        </Image>
-                                        <TextBlock Text="{Binding LayoutElement.Title}"
-                                                   TextTrimming="CharacterEllipsis"
-                                                   Grid.Column="1"
-                                                   Margin="4,2,0,2">
-                                        </TextBlock>
-                                      </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">
-                              </TextBlock>
-                            </Grid>
-                          </Grid>
-                        </Border>
-                      </Grid>
-                      <ControlTemplate.Triggers>
-                        <Trigger Property="SelectedDocument"
-                                 Value="{x:Null}">
-                          <Setter Property="Text"
-                                  Value="{Binding SelectedAnchorable.LayoutElement.Title}"
-                                  TargetName="selectedElementTitle" />
-                          <Setter Property="Text"
-                                  Value="{x:Null}"
-                                  TargetName="selectedElementDescription" />
-                        </Trigger>
-                      </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                  </Setter.Value>
-                </Setter>
-
-              </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs
deleted file mode 100644
index 2106dd9b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs
+++ /dev/null
@@ -1,493 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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_SYSCOMMAND = 0x0112;
-    // These are the wParam of WM_SYSCOMMAND
-    internal const int SC_MAXIMIZE = 0xF030;
-    internal const int SC_RESTORE = 0xF120;
-
-    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 )
-    {
-      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
deleted file mode 100644
index efd95082..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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
deleted file mode 100644
index 796f5798..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <OutputType>Library</OutputType>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <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>
-    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
deleted file mode 100644
index 9253ed6a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Debug/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\Themes\generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index c65238fb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Themes/generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Themes/generic.baml
deleted file mode 100644
index f533a4a6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Themes/generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources
deleted file mode 100644
index 731974d0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.de.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources
deleted file mode 100644
index c9f8c2a3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.es.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources
deleted file mode 100644
index 273694c5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources
deleted file mode 100644
index ebb52947..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources
deleted file mode 100644
index 9ef18955..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.it.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources
deleted file mode 100644
index b92e3121..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.resources
deleted file mode 100644
index 3d76d4a7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources
deleted file mode 100644
index 72cc3572..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources
deleted file mode 100644
index 1a506a3f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources
deleted file mode 100644
index 0dcddefb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources
deleted file mode 100644
index c37ae25c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5e4d048b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Themes\generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.hu.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.it.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.fr.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.es.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.pt-BR.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.ru.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.de.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.sv.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.zh-Hans.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.Properties.Resources.ro.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\Xceed.Wpf.AvalonDock.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.g.resources
deleted file mode 100644
index c285362a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
deleted file mode 100644
index 6fb7c203..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.i.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\GeneratedInternalTypeHelper.g.i.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\Themes\generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.lref
deleted file mode 100644
index 5c619c2d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/obj/Release/Xceed.Wpf.AvalonDock_MarkupCompile.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.AvalonDock\Themes\generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/sn.snk and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/EmptyDataItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/EmptyDataItem.cs
deleted file mode 100644
index 358fad4b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/EmptyDataItem.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  /// <summary>
-  /// This object is used as the dataItem of a VirtualItemInfo when creating a VirtualItemPage and waiting for the
-  /// fetch callback.
-  /// </summary>
-  internal class EmptyDataItem : INotifyPropertyChanged, ICustomTypeDescriptor
-  {
-    #region CONSTRUCTORS
-
-    internal EmptyDataItem()
-      : base()
-    {
-    }
-
-    internal EmptyDataItem( int index, VirtualList parentVirtualList )
-      : base()
-    {
-      if( index < 0 )
-        throw new ArgumentException( "Index must be greater than or equal to zero.", "index" );
-
-      if( parentVirtualList == null )
-        throw new ArgumentNullException( "parentVirtualList" );
-
-      m_index = index;
-      m_parentVirtualList = parentVirtualList;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region Index Property
-
-    public int Index
-    {
-      get
-      {
-        return m_index;
-      }
-    }
-
-    #endregion Index Property
-
-    #region INTERNAL PROPERTIES
-
-    internal VirtualList ParentVirtualList
-    {
-      get
-      {
-        return m_parentVirtualList;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region Indexer
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public object this[ object parameter ]
-    {
-      get
-      {
-        return null;
-      }
-      set
-      {
-      }
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private int m_index;
-    private VirtualList m_parentVirtualList;
-
-    #endregion PRIVATE FIELDS
-
-    #region CONSTANTS
-
-    private static readonly EmptyDataItemPropertyDescriptorCollection DefaultEmptyDataItemPropertyDescriptorCollection = new EmptyDataItemPropertyDescriptorCollection();
-
-    #endregion CONSTANTS
-
-    #region ICustomTypeDescriptor Members
-
-    public AttributeCollection GetAttributes()
-    {
-      return TypeDescriptor.GetAttributes( this );
-    }
-
-    public string GetClassName()
-    {
-      return TypeDescriptor.GetClassName( this );
-    }
-
-    public string GetComponentName()
-    {
-      return TypeDescriptor.GetComponentName( this );
-    }
-
-    public TypeConverter GetConverter()
-    {
-      return TypeDescriptor.GetConverter( this );
-    }
-
-    public EventDescriptor GetDefaultEvent()
-    {
-      return TypeDescriptor.GetDefaultEvent( this );
-    }
-
-    public PropertyDescriptor GetDefaultProperty()
-    {
-      return TypeDescriptor.GetDefaultProperty( this );
-    }
-
-    public object GetEditor( Type editorBaseType )
-    {
-      return TypeDescriptor.GetEditor( this, editorBaseType );
-    }
-
-    public EventDescriptorCollection GetEvents( Attribute[] attributes )
-    {
-      return TypeDescriptor.GetEvents( this, attributes );
-    }
-
-    public EventDescriptorCollection GetEvents()
-    {
-      return TypeDescriptor.GetEvents( this );
-    }
-
-    public PropertyDescriptorCollection GetProperties( Attribute[] attributes )
-    {
-      // We use a custom PropertyDescriptorCollection that will return the same instance 
-      // of an EmptyDataItemPropertyDescriptor for ANY property that will be ask. This is to avoid
-      // BindingErrors when an EmptyDataItem is used in the grid.
-      return EmptyDataItem.DefaultEmptyDataItemPropertyDescriptorCollection;
-    }
-
-    public PropertyDescriptorCollection GetProperties()
-    {
-      return this.GetProperties( null );
-    }
-
-    public object GetPropertyOwner( PropertyDescriptor pd )
-    {
-      return this;
-    }
-
-    #endregion ICustomTypeDescriptor Members
-
-    #region EmptyDataItemPropertyDescriptorCollection Class
-
-    private class EmptyDataItemPropertyDescriptorCollection : PropertyDescriptorCollection
-    {
-      private static readonly EmptyDataItemPropertyDescriptor DefaultEmptyDataItemPropertyDescriptor = new EmptyDataItemPropertyDescriptor();
-
-      private static readonly EmptyDataItemPropertyDescriptor[] DefaultEmptyDataItemPropertyDescriptorArray = new EmptyDataItemPropertyDescriptor[]
-        {
-          EmptyDataItemPropertyDescriptorCollection.DefaultEmptyDataItemPropertyDescriptor,
-        };
-
-      public EmptyDataItemPropertyDescriptorCollection()
-        : base( EmptyDataItemPropertyDescriptorCollection.DefaultEmptyDataItemPropertyDescriptorArray )
-      {
-      }
-
-      public override PropertyDescriptor Find( string name, bool ignoreCase )
-      {
-        return EmptyDataItemPropertyDescriptorCollection.DefaultEmptyDataItemPropertyDescriptor;
-      }
-
-      public override PropertyDescriptor this[ int index ]
-      {
-        get
-        {
-          return EmptyDataItemPropertyDescriptorCollection.DefaultEmptyDataItemPropertyDescriptor;
-        }
-      }
-
-      public override PropertyDescriptor this[ string name ]
-      {
-        get
-        {
-          return EmptyDataItemPropertyDescriptorCollection.DefaultEmptyDataItemPropertyDescriptor;
-        }
-      }
-    }
-
-    #endregion EmptyDataItemPropertyDescriptorCollection Class
-
-    #region EmptyDataItemPropertyDescriptor Class
-
-    private class EmptyDataItemPropertyDescriptor : PropertyDescriptor
-    {
-      private const string DefaultPropertyName = "Empty";
-      private static readonly Type ObjectType = typeof( object );
-
-      public EmptyDataItemPropertyDescriptor()
-        : base( EmptyDataItemPropertyDescriptor.DefaultPropertyName, null )
-      {
-      }
-
-      public override bool CanResetValue( object component )
-      {
-        return false;
-      }
-
-      public override Type ComponentType
-      {
-        get
-        {
-          return EmptyDataItemPropertyDescriptor.ObjectType;
-        }
-      }
-
-      public override object GetValue( object component )
-      {
-        return null;
-      }
-
-      public override bool IsReadOnly
-      {
-        get
-        {
-          return false;
-        }
-      }
-
-      public override Type PropertyType
-      {
-        get
-        {
-          return EmptyDataItemPropertyDescriptor.ObjectType;
-        }
-      }
-
-      public override void ResetValue( object component )
-      {
-      }
-
-      public override void SetValue( object component, object value )
-      {
-      }
-
-      public override bool ShouldSerializeValue( object component )
-      {
-        return false;
-      }
-    }
-
-    #endregion EmptyDataItemPropertyDescriptor Class
-
-    #region INotifyPropertyChanged Members
-
-    event PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged
-    {
-      add { }
-      remove { }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs
deleted file mode 100644
index d0eecffc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs
+++ /dev/null
@@ -1,892 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VirtualList : IList, IList<object>, INotifyCollectionChanged, IDisposable
-  {
-    public VirtualList( VirtualPageManager pagingManager )
-      : this( pagingManager, -1 )
-    {
-    }
-
-    public VirtualList( VirtualPageManager pagingManager, int virtualCount )
-    {
-      if( pagingManager == null )
-        throw new ArgumentNullException( "pagingManager" );
-
-      pagingManager.ManageList( this );
-
-      m_tableOfContent = new VirtualListTableOfContent( 8 );
-
-      m_virtualCount = virtualCount;
-    }
-
-    #region VirtualPagingManager Property
-
-    public VirtualPageManager PagingManager
-    {
-      get
-      {
-        return m_pagingManager;
-      }
-    }
-
-    #endregion
-
-    #region VirtualCount Property
-
-    public int VirtualCount
-    {
-      get
-      {
-        if( this.IsDisposed )
-          return 0;
-
-        if( m_virtualCount == -1 )
-          this.QueryAndSetVirtualCount();
-
-        return m_virtualCount;
-      }
-    }
-
-    #endregion
-
-    #region TableOfContent Property
-
-    internal VirtualListTableOfContent TableOfContent
-    {
-      get
-      {
-        return m_tableOfContent;
-      }
-    }
-
-    #endregion
-
-    #region VirtualPagingManager Property
-
-    internal VirtualPageManager VirtualPagingManager
-    {
-      get
-      {
-        return m_pagingManager;
-      }
-      set
-      {
-        // null is an acceptable value when disposing the list
-        if( ( m_pagingManager != null ) && ( value != null ) )
-          throw new InvalidOperationException( "An attempt was made to set a VirtualPageManager when one has already been provided." );
-
-        m_pagingManager = value;
-      }
-    }
-
-    #endregion
-
-    #region IsDisposed Property
-
-    internal bool IsDisposed
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualItemBookFlags.Disposed ];
-      }
-      private set
-      {
-        m_flags[ ( int )VirtualItemBookFlags.Disposed ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsRestarting Property
-
-    internal bool IsRestarting
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualItemBookFlags.Restarting ];
-      }
-      private set
-      {
-        m_flags[ ( int )VirtualItemBookFlags.Restarting ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasPagePendingCommit Property
-
-    internal bool HasPagePendingCommit
-    {
-      get
-      {
-        foreach( VirtualPage page in m_tableOfContent.VirtualPages )
-        {
-          if( page.IsCommitPending )
-            return true;
-        }
-
-        return false;
-      }
-    }
-
-    #endregion
-
-#if DEBUG
-    public override string ToString()
-    {
-      StringBuilder builder = new StringBuilder();
-
-      ReadOnlyCollection<VirtualPage> virtualPages = m_tableOfContent.VirtualPages;
-      int pageCount = virtualPages.Count;
-
-      for( int i = 0; i < pageCount; i++ )
-      {
-        VirtualPage page = virtualPages[ i ];
-
-        builder.Append( i.ToString() + ": Page " + page.ToString() + Environment.NewLine );
-      }
-
-      return builder.ToString();
-    }
-#endif
-
-    internal int IndexOf( object item )
-    {
-      if( ( item == null ) || ( this.IsDisposed ) )
-        return -1;
-
-      EmptyDataItem emptyDataItem = item as EmptyDataItem;
-
-      if( emptyDataItem != null )
-      {
-        if( ( emptyDataItem.ParentVirtualList == this ) && ( emptyDataItem.Index < m_virtualCount ) )
-          return emptyDataItem.Index;
-
-        return -1;
-      }
-
-      return m_tableOfContent.IndexOf( item );
-    }
-
-    internal bool IsPageDirty( int index )
-    {
-      VirtualPage page = this.GetPageOrDefaultForItemIndex( index, true );
-
-      return ( page == null ) ? false : page.IsDirty;
-    }
-
-    internal bool IsItemDirty( object item )
-    {
-      int localIndex = this.IndexOf( item );
-
-      if( localIndex == -1 )
-        return false;
-
-      VirtualizedItemInfo virtualizedItemInfo = this.GetVirtualizedItemInfoAtIndex( localIndex, false, true );
-
-      return ( virtualizedItemInfo == null ) ? false : virtualizedItemInfo.IsDirty;
-    }
-
-    internal VirtualizedItemValueCollection GetCachedValuesForItemAtIndex( int index )
-    {
-      VirtualizedItemInfo virtualizedItemInfo = this.GetVirtualizedItemInfoAtIndex( index, false, true );
-
-      return ( virtualizedItemInfo == null ) ? null : virtualizedItemInfo.OldValues;
-    }
-
-    internal void SetCachedValuesForItemAtIndex( int index, string[] names, object[] values )
-    {
-      VirtualizedItemInfo virtualizedItemInfo = this.GetVirtualizedItemInfoAtIndex( index, false, true );
-
-      if( virtualizedItemInfo == null )
-        throw new ArgumentOutOfRangeException( "index", index, "No VirtualizedItemInfo can be found at the specified index." );
-
-      virtualizedItemInfo.OldValues = new VirtualizedItemValueCollection( names, values );
-    }
-
-    internal void ClearCachedValuesForItemAtIndex( int index )
-    {
-      VirtualizedItemInfo virtualizedItemInfo = this.GetVirtualizedItemInfoAtIndex( index, false, true );
-
-      if( virtualizedItemInfo == null )
-        throw new ArgumentOutOfRangeException( "index", index, "No VirtualizedItemInfo can be found at the specified index." );
-
-      virtualizedItemInfo.OldValues = null;
-    }
-
-    internal object GetItemAt( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_virtualCount ) )
-        throw new ArgumentOutOfRangeException( "Index", index, "index must be greater than or equal to zero and less than count." );
-
-      VirtualizedItemInfo virtualizedItemInfo = this.GetVirtualizedItemInfoAtIndex( index, true, false );
-      return virtualizedItemInfo.DataItem;
-    }
-
-    internal VirtualizedItemInfo GetVirtualizedItemInfoAtIndex( int index, bool createPageIfLineNotFound, bool preventMovePageToFront )
-    {
-      VirtualizedItemInfo virtualizedItemInfo = null;
-
-      VirtualPage page = this.GetPageOrDefaultForItemIndex( index, preventMovePageToFront );
-
-      if( page != null )
-      {
-        virtualizedItemInfo = page.GetVirtualizedItemInfoAtIndex( index );
-
-        Debug.Assert( virtualizedItemInfo != null );
-      }
-      else if( createPageIfLineNotFound )
-      {
-        page = this.CreateNewPage( index );
-
-        virtualizedItemInfo = page.GetVirtualizedItemInfoAtIndex( index );
-        m_pagingManager.AddPage( page, VirtualPageManager.PageInsertPosition.Front );
-      }
-
-      return virtualizedItemInfo;
-    }
-
-    internal void LockPageForLocalIndex( int sourceIndex )
-    {
-      Debug.Assert( m_tableOfContent.ContainsPageForSourceIndex( sourceIndex ) );
-      Debug.Assert( this.GetPageOrDefaultForItemIndex( sourceIndex, true ) != null );
-
-      VirtualPage page;
-      if( m_tableOfContent.TryGetPageForSourceIndex( sourceIndex, out page ) )
-      {
-        if( page.LockPage() )
-        {
-          Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "List: " + this.GetHashCode().ToString() + " - LOCKING PAGE: " + page.ToString() + " for index: " + sourceIndex.ToString() + " NEW LOCKED PAGES COUNT: " + this.GetLockedPageCount().ToString() );
-        }
-
-        this.PreEmptiveLoadPages( sourceIndex, page );
-      }
-    }
-
-    internal void UnlockPageForLocalIndex( int sourceIndex )
-    {
-      if( this.IsDisposed )
-        return;
-
-      VirtualPage page;
-
-      if( m_tableOfContent.TryGetPageForSourceIndex( sourceIndex, out page ) )
-      {
-        if( page.UnlockPage() )
-        {
-          Debug.Assert( this.GetLockedPageCount() >= 0 );
-          Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "List: " + this.GetHashCode().ToString() + " - UN-LOCKING PAGE: " + page.ToString() + " for index: " + sourceIndex.ToString() + " NEW LOCKED PAGES COUNT: " + this.GetLockedPageCount().ToString() );
-
-          m_pagingManager.CleanUpAndDisposeUnused();
-        }
-      }
-    }
-
-    private void PreEmptiveLoadPages( int sourceIndex, VirtualPage page )
-    {
-      // The VirtualList is disposed or part of a PagingManager that will be disposed (only disconnected when dispose is required)
-      if( !this.PagingManager.IsConnected )
-        return;
-
-      Debug.Assert( !this.IsDisposed );
-
-      double preemptivePageQueryRatio = m_pagingManager.PreemptivePageQueryRatio;
-      int pageSize = m_pagingManager.PageSize;
-
-      double pageRatio = ( preemptivePageQueryRatio > 0.5 ) ? 0.5 : ( preemptivePageQueryRatio < 0.0 ) ? 0 : preemptivePageQueryRatio;
-
-      double boundariesItemCount = ( pageRatio * pageSize );
-
-      int preEmptivePageStartIndex = -1;
-
-      if( ( page.StartDataIndex > 0 ) && ( sourceIndex < ( page.StartDataIndex + boundariesItemCount ) ) )
-      {
-        // Pre emptively load the previous page.
-        preEmptivePageStartIndex = page.StartDataIndex - pageSize;
-      }
-      else if( ( page.EndDataIndex < ( m_virtualCount - 1 ) ) && ( sourceIndex > ( page.EndDataIndex - boundariesItemCount ) ) )
-      {
-        // Pre emptively load the next page.
-        preEmptivePageStartIndex = page.EndDataIndex + 1;
-      }
-
-      if( preEmptivePageStartIndex != -1 )
-      {
-        VirtualPage preEmptivePage = null;
-
-        // We do not want to move the pre-emptive page to the front if it is already created since it does not count as a legitimate user-acess.
-        preEmptivePage = this.GetPageOrDefaultForItemIndex( preEmptivePageStartIndex, true );
-
-        if( preEmptivePage == null )
-        {
-          // The pre-emptive page is not yet created. Let's do it and add it to the back since it is not really accessed at the moment.
-          preEmptivePage = this.CreateNewPage( preEmptivePageStartIndex );
-          m_pagingManager.AddPage( preEmptivePage, VirtualPageManager.PageInsertPosition.Back );
-        }
-      }
-    }
-
-    internal bool IsAsyncCommitQueuedForItem( object item )
-    {
-      VirtualPage virtualPage;
-
-      if( m_tableOfContent.TryGetPageForItem( item, out virtualPage ) )
-        return virtualPage.IsAsyncCommitInfoQueuedForItem( item );
-
-      return false;
-    }
-
-    internal void CommitAll()
-    {
-      foreach( VirtualPage page in m_tableOfContent.VirtualPages )
-      {
-        Debug.Assert( page != null );
-        Debug.Assert( page.ParentVirtualList == this );
-
-        if( page.IsDirty )
-        {
-          m_pagingManager.QueueCommitData( page );
-        }
-      }
-    }
-
-    internal void Restart()
-    {
-      if( this.IsRestarting )
-        return;
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Restart VirtualList requested, checking for pages to commit or abort..." );
-
-      this.IsRestarting = true;
-      m_pagingManager.OnVirtualListRestarting( this );
-
-      // We must keep a copy since restarting can remove pages from table of content
-      int virtualPagesCount = m_tableOfContent.VirtualPages.Count;
-
-      if( virtualPagesCount == 0 )
-      {
-        this.EndRestart();
-      }
-      else
-      {
-        // Restart every pages this VirtualList contains.
-        // Keep a reference to the pages that need to restart in order to know when this VirtualList is restarted
-        m_restartingPages.AddRange( m_tableOfContent.VirtualPages );
-
-        for( int i = virtualPagesCount - 1; i >= 0; i-- )
-        {
-          VirtualPage page = m_tableOfContent.VirtualPages[ i ];
-          Debug.Assert( !page.IsDisposed );
-
-          if( !page.IsRestarting )
-          {
-            page.Restart();
-          }
-        }
-      }
-    }
-
-    internal void OnVirtualPageRestarting( VirtualPage page )
-    {
-      // Notify the VirtualPageManager that this page is restarted to ensure it commits its data or aborts the QueryItems if already invoked
-      Debug.Assert( m_restartingPages.Contains( page ) );
-      m_pagingManager.OnVirtualListPageRestarting( this, page );
-    }
-
-    internal void OnVirtualPageRestarted( VirtualPage page )
-    {
-      Debug.Assert( m_restartingPages.Contains( page ) );
-
-      // The page is restarted, remove it from the restarting pages
-      m_restartingPages.Remove( page );
-
-      // Notify the manager that this page is restarted in order to let it remove it from its m_pageNodes and also from this VirtualList TableOfContent.
-      // NOTE: We do not remove it from the TableOfContent immediately to avoid have to insert a condition in  VirtualPageManager.RemovePage since this method
-      // used widely to ensure a page is removed from the TableOfContent and from the m_pageNodes list.
-      m_pagingManager.OnVirtualListPageRestarted( this, page );
-
-      // Ensure all restarted pages completed their commit or abort operation before notifying that this list is restarted
-      if( m_restartingPages.Count == 0 )
-      {
-        Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Cleared VirtualList" );
-        this.EndRestart();
-      }
-    }
-
-    internal void FillEmptyPage( AsyncQueryInfo asyncQueryInfo, object[] fetchedItems )
-    {
-      // The VirtualList is disposed or part of a PagingManager that will be disposed (only disconnected when dispose is required)
-      if( !this.PagingManager.IsConnected )
-        return;
-
-      Debug.Assert( !this.IsDisposed );
-      Debug.Assert( !asyncQueryInfo.IsDisposed );
-
-      // We do not want to move the page we are about to fill to the front since it does not count as a legitimate user-acess.  It will get moved to the front when one of its item is accessed.
-      VirtualPage page = null;
-      page = this.GetPageOrDefaultForItemIndex( asyncQueryInfo.StartIndex, true );
-
-      // Although extremely rare, this situation could occur if we are calling RemovePageNode and the QueryData Dispatcher Operation 
-      // which has been asyncronously invoked in CreateNewPage is raising the QueryData event at the exact moment when we
-      // try to abort the dispatcher operation.  This means that the customer will have queued an async request for data
-      // for a page we no longer care about, and have already removed from the Table of Content and our LinkedList.
-      // This should NOT occur if the user did not abort the request and called the AsyncQueryInfo EndQuery method since AsyncQueryInfo should
-      // not have invoked the EndQueryAction if its ShouldAbort property was set to true.
-      if( page == null )
-        return;
-
-      Debug.Assert( !page.IsFilled );
-      Debug.Assert( this.GetPageStartingIndexForItemIndex( asyncQueryInfo.StartIndex ) == asyncQueryInfo.StartIndex );
-
-      Debug.Assert( fetchedItems.Length <= page.Count );
-
-      if( fetchedItems.Length == page.Count )
-      {
-        object[] oldItems = page.ToItemArray();
-
-        m_tableOfContent.RemovePage( page );
-
-        page.EndQueryItems( asyncQueryInfo, fetchedItems );
-
-        m_tableOfContent.AddPage( page );
-
-        Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Replaced TOC items/index for page: " + page.ToString() );
-
-        this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, fetchedItems, oldItems, asyncQueryInfo.StartIndex ) );
-      }
-      else
-      {
-        // The expected count was not met.  Maybe the user told us the source was bigger than it really is, or maybe there were delete operations made on the source since the last restart.
-        // Let's refresh the CollectionView. This will restart the VirtualItemBook and raise the CollectionView's OnCollectionChanged Reset notification.
-        this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-      }
-    }
-
-    internal void NotifyCommitComplete( AsyncCommitInfo asyncCommitInfo )
-    {
-      if( asyncCommitInfo.VirtualizedItemInfos.Length < 1 )
-        throw new DataGridInternalException( "VirualizedItemInfos is empty." );
-
-      int indexForItemInPage = asyncCommitInfo.VirtualizedItemInfos[ 0 ].Index;
-
-      // We do not want to move the page we are about to flag has committed to the front since it does not count as a legitimate user-access.
-      // It will get moved to the front when one of its items is accessed.
-      VirtualPage page = null;
-      page = this.GetPageOrDefaultForItemIndex( indexForItemInPage, true );
-
-      if( page == null )
-        throw new InvalidOperationException( "An attempt was made to retrieve a page does not exist." );
-
-      if( ( !this.HasPagePendingCommit ) || ( !page.IsCommitPending ) )
-        throw new InvalidOperationException( "An attempt was made to commit a page that does not have a pending commit operation." );
-
-      Debug.Assert( page.IsDirty );
-
-      page.EndCommitItems( asyncCommitInfo );
-
-      // If we no longer have any pages pending commit.
-      if( !this.HasPagePendingCommit )
-      {
-        // CleanUp and queue a request to fill empty pages from the start of the queue.
-        m_pagingManager.CleanUpAndDisposeUnused();
-
-        // This is a failsafe, to make sure that during the clean-up other commit were not queued.
-        if( !this.HasPagePendingCommit )
-        {
-          if( !this.IsRestarting )
-          {
-            // After the call to cleanup, there should only be LOCKED pending fill pages remaining.  Those are the one to refetch.
-            List<VirtualPage> lockedPages = this.GetLockedPages();
-            int lockedPageCount = lockedPages.Count;
-
-            for( int i = 0; i < lockedPageCount; i++ )
-            {
-              VirtualPage lockedPage = lockedPages[ i ];
-
-              if( lockedPage.IsFilled )
-                continue;
-
-              // The locked page has been created while commit was pending.  Let's queue its query data operation.
-              m_pagingManager.QueueQueryData( lockedPage );
-            }
-          }
-          else
-          {
-            this.Restart();
-          }
-        }
-      }
-    }
-
-    private void EndRestart()
-    {
-      Debug.Assert( m_restartingPages.Count == 0 );
-
-      m_virtualCount = -1;
-      this.IsRestarting = false;
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "VirtualList restarted" );
-
-      m_pagingManager.OnVirtualListRestarted( this );
-
-      this.Dispose();
-    }
-
-    private int GetPageStartingIndexForItemIndex( int itemIndex )
-    {
-      int pageSize = m_pagingManager.PageSize;
-      return ( itemIndex / pageSize ) * pageSize;
-    }
-
-    private VirtualPage CreateNewPage( int itemIndex )
-    {
-      Debug.Assert( !m_tableOfContent.ContainsPageForSourceIndex( itemIndex ) );
-
-      int pageStartIndex = this.GetPageStartingIndexForItemIndex( itemIndex );
-
-      int pageSize = m_pagingManager.PageSize;
-
-      int expectedItemCount = Math.Min( pageSize, ( m_virtualCount - pageStartIndex ) );
-      expectedItemCount = Math.Max( 0, expectedItemCount );
-
-      VirtualPage page = VirtualPage.CreateEmptyPage( this, pageStartIndex, expectedItemCount );
-
-      m_tableOfContent.AddPage( page );
-
-      // If we have a pending commit page, this brandly new created page will get its query data queued when we are notified of a commit completed and that we no longer have any pages awaiting commiting.
-      if( !this.HasPagePendingCommit )
-      {
-        m_pagingManager.QueueQueryData( page );
-      }
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Creating VirtualItemPlaceHolder for page: " + page.ToString() );
-
-      return page;
-    }
-
-    private VirtualPage GetPageOrDefaultForItemIndex( int index, bool preventMoveToFront )
-    {
-      VirtualPage page = null;
-
-      if( m_tableOfContent.TryGetPageForSourceIndex( index, out page ) )
-      {
-        if( !preventMoveToFront )
-          m_pagingManager.MovePageToFront( page );
-      }
-
-      return page;
-    }
-
-    private int GetLockedPageCount()
-    {
-      int lockedPageCount = 0;
-
-      foreach( VirtualPage page in m_tableOfContent.VirtualPages )
-      {
-        Debug.Assert( page != null );
-
-        if( ( page != null ) && ( page.IsLocked ) )
-          lockedPageCount++;
-      }
-
-      return lockedPageCount;
-    }
-
-    private List<VirtualPage> GetLockedPages()
-    {
-      List<VirtualPage> lockedPages = new List<VirtualPage>();
-
-      foreach( VirtualPage page in m_tableOfContent.VirtualPages )
-      {
-        Debug.Assert( page != null );
-
-        if( ( page != null ) && ( page.IsLocked ) )
-        {
-          lockedPages.Add( page );
-        }
-      }
-
-      return lockedPages;
-    }
-
-    private void QueryAndSetVirtualCount()
-    {
-      int count = m_pagingManager.OnQueryItemCount( this );
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, ( count != -1 ) ? "QUERY VIRTUAL COUNT: " + count.ToString() : "QUERY VIRTUAL COUNT NOT HANDLED, SETTING COUNT TO ZERO." );
-
-      if( count == -1 )
-      {
-        count = 0;
-      }
-
-      m_virtualCount = count;
-    }
-
-    private void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      var handler = this.CollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #region IList<object> Members
-
-    int IList<object>.IndexOf( object item )
-    {
-      return this.IndexOf( item );
-    }
-
-    void IList<object>.Insert( int index, object item )
-    {
-      throw new NotImplementedException();
-    }
-
-    void IList<object>.RemoveAt( int index )
-    {
-      throw new NotImplementedException();
-    }
-
-    object IList<object>.this[ int index ]
-    {
-      get
-      {
-        return this.GetItemAt( index );
-      }
-      set
-      {
-        throw new NotImplementedException();
-      }
-    }
-
-    #endregion
-
-    #region ICollection<object> Members
-
-    void ICollection<object>.Add( object item )
-    {
-      throw new NotImplementedException();
-    }
-
-    void ICollection<object>.Clear()
-    {
-      throw new NotImplementedException();
-    }
-
-    bool ICollection<object>.Contains( object item )
-    {
-      return ( this.IndexOf( item ) != -1 );
-    }
-
-    void ICollection<object>.CopyTo( object[] array, int arrayIndex )
-    {
-      throw new NotImplementedException();
-    }
-
-    int ICollection<object>.Count
-    {
-      get
-      {
-        return this.VirtualCount;
-      }
-    }
-
-    bool ICollection<object>.IsReadOnly
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    bool ICollection<object>.Remove( object item )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-
-    #region IEnumerable<object> Members
-
-    IEnumerator<object> IEnumerable<object>.GetEnumerator()
-    {
-      return new VirtualListEnumerator( this );
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return ( ( IEnumerable<object> )this ).GetEnumerator();
-    }
-
-    #endregion
-
-    #region INotifyCollectionChanged Members
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    #endregion
-
-    #region IList Members
-
-    int IList.Add( object value )
-    {
-      throw new NotImplementedException();
-    }
-
-    void IList.Clear()
-    {
-      throw new NotImplementedException();
-    }
-
-    bool IList.Contains( object value )
-    {
-      return this.IndexOf( value ) != -1;
-    }
-
-    int IList.IndexOf( object value )
-    {
-      return this.IndexOf( value );
-    }
-
-    void IList.Insert( int index, object value )
-    {
-      throw new NotImplementedException();
-    }
-
-    bool IList.IsFixedSize
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    bool IList.IsReadOnly
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    void IList.Remove( object value )
-    {
-      throw new NotImplementedException();
-    }
-
-    void IList.RemoveAt( int index )
-    {
-      throw new NotImplementedException();
-    }
-
-    object IList.this[ int index ]
-    {
-      get
-      {
-        return this.GetItemAt( index );
-      }
-      set
-      {
-        throw new NotImplementedException();
-      }
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    void ICollection.CopyTo( Array array, int index )
-    {
-      throw new NotImplementedException();
-    }
-
-    int ICollection.Count
-    {
-      get
-      {
-        return this.VirtualCount;
-      }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        throw new NotImplementedException();
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        throw new NotImplementedException();
-      }
-    }
-
-    #endregion
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-
-      if( m_tableOfContent != null )
-      {
-        Debug.Assert( m_tableOfContent.VirtualPages.Count == 0 );
-
-        m_tableOfContent.Dispose();
-        m_tableOfContent = null;
-      }
-
-      m_pagingManager = null;
-      this.IsDisposed = true;
-
-    }
-
-    #endregion
-
-    private List<VirtualPage> m_restartingPages = new List<VirtualPage>();
-    private VirtualPageManager m_pagingManager;
-    private BitVector32 m_flags;
-    private int m_virtualCount;
-    private VirtualListTableOfContent m_tableOfContent;
-
-    [Flags]
-    private enum VirtualItemBookFlags
-    {
-      Restarting = 1,
-      Disposed = 2,
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListEnumerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListEnumerator.cs
deleted file mode 100644
index 9d20c42b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListEnumerator.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VirtualListEnumerator : IEnumerator<object>, IEnumerator
-  {
-    public VirtualListEnumerator( VirtualList virtualList )
-    {
-      if( virtualList == null )
-        throw new ArgumentNullException( "virtualList" );
-
-      m_virtualList = virtualList;
-
-      m_version = m_virtualList.PagingManager.Version;
-
-      m_orderedFilledVirtualPages =
-        m_virtualList.TableOfContent.VirtualPages.OrderBy(
-        virtualPage => virtualPage.StartDataIndex ).Where(
-          virtualPage => virtualPage.IsFilled ).ToArray();
-    }
-
-    #region INTERNAL PROPERTIES
-
-    internal bool BeforeStart
-    {
-      get
-      {
-        return m_beforeStart;
-      }
-    }
-
-    internal bool AfterEnd
-    {
-      get
-      {
-        return m_afterEnd;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-      m_currentItemInfo = null;
-      m_orderedFilledVirtualPages = null;
-      m_virtualList = null;
-    }
-
-    #endregion IDisposable Members
-
-    #region IEnumerator<object> Members
-
-    public object Current
-    {
-      get
-      {
-        return ( m_currentItemInfo == null ) ? null : m_currentItemInfo.DataItem;
-      }
-    }
-
-    #endregion IEnumerator<object> Members
-
-    #region IEnumerator Members
-
-    object IEnumerator.Current
-    {
-      get
-      {
-        return ( m_currentItemInfo == null ) ? null : m_currentItemInfo.DataItem;
-      }
-    }
-
-    public bool MoveNext()
-    {
-      if( m_version != m_virtualList.PagingManager.Version )
-        throw new InvalidOperationException( "Collection was modified." );
-
-      if( m_beforeStart )
-        m_beforeStart = false;
-
-      if( m_currentPageIndex < m_orderedFilledVirtualPages.Length )
-      {
-        VirtualPage virtualPage = m_orderedFilledVirtualPages[ m_currentPageIndex ];
-
-        m_currentItemInfo = virtualPage[ m_currentItemIndex ];
-
-        m_currentItemIndex++;
-
-        if( m_currentItemIndex >= virtualPage.Count )
-        {
-          m_currentItemIndex = 0;
-          m_currentPageIndex++;
-        }
-
-        return true;
-      }
-      else
-      {
-        m_currentItemInfo = null;
-        m_afterEnd = true;
-
-        return false;
-      }
-    }
-
-    public void Reset()
-    {
-      m_currentItemInfo = null;
-      m_currentItemIndex = 0;
-      m_currentPageIndex = 0;
-      m_afterEnd = false;
-      m_beforeStart = true;
-    }
-
-    #endregion IEnumerator Members
-
-    #region PRIVATE FIELDS
-
-    private VirtualList m_virtualList;
-    private VirtualPage[] m_orderedFilledVirtualPages;
-
-    private int m_version;
-    private VirtualizedItemInfo m_currentItemInfo;
-    private int m_currentPageIndex;
-    private int m_currentItemIndex;
-
-    private bool m_beforeStart;
-    private bool m_afterEnd;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListTableOfContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListTableOfContent.cs
deleted file mode 100644
index 3f60ff8b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListTableOfContent.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VirtualListTableOfContent : IDisposable
-  {
-    internal VirtualListTableOfContent( int initialCapacity )
-    {
-      m_virtualPages = new List<VirtualPage>();
-      m_readonlyVirtualPages = new ReadOnlyCollection<VirtualPage>( m_virtualPages );
-
-      m_objectVersusIndexDictionary = new Dictionary<object, int>( initialCapacity );
-      m_indexVersusPageDictionary = new Dictionary<int, VirtualPage>( initialCapacity );
-    }
-
-    public void AddPage( VirtualPage page )
-    {
-      Debug.Assert( !m_virtualPages.Contains( page ) );
-
-      m_virtualPages.Add( page );
-
-      int itemCount = page.Count;
-
-      for( int i = 0; i < itemCount; i++ )
-      {
-        VirtualizedItemInfo virtualizedItemInfo = page[ i ];
-
-        Debug.Assert( !m_objectVersusIndexDictionary.ContainsKey( virtualizedItemInfo.DataItem ) );
-        Debug.Assert( !m_indexVersusPageDictionary.ContainsKey( virtualizedItemInfo.Index ) );
-
-        m_objectVersusIndexDictionary.Add( virtualizedItemInfo.DataItem, virtualizedItemInfo.Index );
-        m_indexVersusPageDictionary.Add( virtualizedItemInfo.Index, page );
-      }
-    }
-
-    public void RemovePage( VirtualPage page )
-    {
-      Debug.Assert( m_virtualPages.Contains( page ) );
-
-      int itemCount = page.Count;
-
-      for( int i = 0; i < itemCount; i++ )
-      {
-        VirtualizedItemInfo virtualizedItemInfo = page[ i ];
-
-        Debug.Assert( m_objectVersusIndexDictionary.ContainsKey( virtualizedItemInfo.DataItem ) );
-        Debug.Assert( m_indexVersusPageDictionary.ContainsKey( virtualizedItemInfo.Index ) );
-
-        Debug.Assert( m_indexVersusPageDictionary[ virtualizedItemInfo.Index ] == page );
-
-        m_objectVersusIndexDictionary.Remove( virtualizedItemInfo.DataItem );
-        m_indexVersusPageDictionary.Remove( virtualizedItemInfo.Index );
-      }
-
-      m_virtualPages.Remove( page );
-    }
-
-    public int IndexOf( object item )
-    {
-      int index;
-
-      if( m_objectVersusIndexDictionary.TryGetValue( item, out index ) )
-        return index;
-
-      return -1;
-    }
-
-    public bool TryGetPageForItem( object item, out VirtualPage page )
-    {
-      page = null;
-
-      int index;
-
-      if( m_objectVersusIndexDictionary.TryGetValue( item, out index ) )
-        return m_indexVersusPageDictionary.TryGetValue( index, out page );
-
-      return false;
-    }
-
-    public bool TryGetPageForSourceIndex( int sourceIndex, out VirtualPage page )
-    {
-      return m_indexVersusPageDictionary.TryGetValue( sourceIndex, out page );
-    }
-
-    public bool ContainsPageForItem( object item )
-    {
-      int index;
-
-      if( m_objectVersusIndexDictionary.TryGetValue( item, out index ) )
-        return m_indexVersusPageDictionary.ContainsKey( index );
-
-      return false;
-    }
-
-    public bool ContainsPageForSourceIndex( int sourceIndex )
-    {
-      return m_indexVersusPageDictionary.ContainsKey( sourceIndex );
-    }
-
-    public int Count
-    {
-      get
-      {
-        Debug.Assert( m_objectVersusIndexDictionary.Count == m_indexVersusPageDictionary.Count );
-        return m_objectVersusIndexDictionary.Count;
-      }
-    }
-
-    public ReadOnlyCollection<VirtualPage> VirtualPages
-    {
-      get
-      {
-        return m_readonlyVirtualPages;
-      }
-    }
-
-    private Dictionary<object, int> m_objectVersusIndexDictionary;
-    private Dictionary<int, VirtualPage> m_indexVersusPageDictionary;
-
-    private List<VirtualPage> m_virtualPages;
-    private ReadOnlyCollection<VirtualPage> m_readonlyVirtualPages;
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-      while( m_virtualPages.Count > 0 )
-      {
-        // Remove the page from every Dictionaries and
-        // also from m_virtualPages
-        VirtualPage page = m_virtualPages[ 0 ];
-        this.RemovePage( page );
-        page.Dispose();
-      }
-
-      Debug.Assert( m_objectVersusIndexDictionary.Count == 0 );
-      Debug.Assert( m_indexVersusPageDictionary.Count == 0 );
-      Debug.Assert( m_virtualPages.Count == 0 );
-
-      m_objectVersusIndexDictionary.Clear();
-      m_indexVersusPageDictionary.Clear();
-      m_virtualPages.Clear();
-
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs
deleted file mode 100644
index 2dc5900c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs
+++ /dev/null
@@ -1,671 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Diagnostics;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VirtualPage : List<VirtualizedItemInfo>, IDisposable
-  {
-    internal static VirtualPage CreateEmptyPage( VirtualList parentVirtualList, int startSourceIndex, int entryCount )
-    {
-      if( parentVirtualList == null )
-        throw new ArgumentNullException( "parentVirtualList" );
-
-      if( startSourceIndex < 0 )
-        throw new ArgumentOutOfRangeException( "startSourceIndex", startSourceIndex, "startSourceIndex must be greater than or equal to zero." );
-
-      if( entryCount < 0 )
-        throw new ArgumentOutOfRangeException( "entryCount", entryCount, "entryCount must be greater than or equal to zero." );
-
-      EmptyDataItem[] emptyDataItems = new EmptyDataItem[ entryCount ];
-      for( int i = 0; i < entryCount; i++ )
-      {
-        emptyDataItems[ i ] = new EmptyDataItem( startSourceIndex + i, parentVirtualList );
-      }
-
-      VirtualPage emptyDataItemPage = new VirtualPage( parentVirtualList, startSourceIndex, emptyDataItems );
-      emptyDataItemPage.IsFilled = false;
-
-      return emptyDataItemPage;
-    }
-
-    private VirtualPage( VirtualList parentVirtualList, int startSourceIndex, object[] dataItems )
-      : base( dataItems.Length )
-    {
-      if( parentVirtualList == null )
-        throw new ArgumentNullException( "parentVirtualList" );
-
-      if( startSourceIndex < 0 )
-        throw new ArgumentOutOfRangeException( "startSourceIndex", startSourceIndex, "startSourceIndex must be greater than or equal to zero." );
-
-      m_startDataIndex = startSourceIndex;
-      m_asyncCommitInfoList = new List<AsyncCommitInfo>();
-
-      m_parentVirtualList = parentVirtualList;
-
-      int length = dataItems.Length;
-      for( int i = 0; i < length; i++ )
-      {
-        Debug.Assert( dataItems[ i ] != null );
-        this.Add( new VirtualizedItemInfo( m_startDataIndex + i, dataItems[ i ] ) );
-      }
-
-      this.IsFilled = true;
-    }
-
-    #region RemoveAfterOperation Property
-
-    public bool RemoveAfterOperation
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region IsAborting Property
-
-    public bool IsAborting
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region IsRestarting Property
-
-    public bool IsRestarting
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region IsEmpty Property
-
-    public bool IsEmpty
-    {
-      get
-      {
-        return ( this.Count == 0 );
-      }
-    }
-
-    #endregion
-
-    #region IsFilled Property
-
-    public bool IsFilled
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualItemPageFlags.IsFilled ];
-      }
-      private set
-      {
-        // Wether we are setting PendingFill to True or to False, we should not be touching this property if we are pending commit.
-        Debug.Assert( !this.IsCommitPending );
-
-        m_flags[ ( int )VirtualItemPageFlags.IsFilled ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsDisposed Read-Only Property
-
-    public bool IsDisposed
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualItemPageFlags.IsDisposed ];
-      }
-      private set
-      {
-        m_flags[ ( int )VirtualItemPageFlags.IsDisposed ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsCommitPending Property
-
-    public bool IsCommitPending
-    {
-      get
-      {
-        return m_asyncCommitInfoList.Count > 0;
-      }
-    }
-
-    #endregion
-
-    #region IsDirty Property
-
-    public bool IsDirty
-    {
-      get
-      {
-        if( !this.IsFilled )
-          return false;
-
-        int count = this.Count;
-
-        for( int i = 0; i < count; i++ )
-        {
-          if( this[ i ].IsDirty )
-            return true;
-        }
-
-        return false;
-      }
-    }
-
-    #endregion
-
-    #region IsLocked Property
-
-    public bool IsLocked
-    {
-      get
-      {
-        return ( m_lockCount > 0 );
-      }
-    }
-
-    #endregion
-
-    #region IsRemovable Property
-
-    public bool IsRemovable
-    {
-      get
-      {
-        // A page which IsPendingFill is removable since it hasn't even been filled yet.
-        return ( ( !this.IsLocked ) && ( !this.IsCommitPending ) );
-      }
-    }
-
-    #endregion
-
-    #region ParentVirtualList Property
-
-    public VirtualList ParentVirtualList
-    {
-      get
-      {
-        return m_parentVirtualList;
-      }
-    }
-
-    #endregion
-
-    #region StartDataIndex Property
-
-    public int StartDataIndex
-    {
-      get
-      {
-        return m_startDataIndex;
-      }
-    }
-
-    #endregion
-
-    #region EndDataIndex Property
-
-    public int EndDataIndex
-    {
-      get
-      {
-        return m_startDataIndex + ( this.Count - 1 );
-      }
-    }
-
-    #endregion
-
-    public VirtualizedItemInfo GetVirtualizedItemInfoAtIndex( int sourceIndex )
-    {
-      int index = this.SourceIndexToPageEntryIndex( sourceIndex );
-
-      if( index != -1 )
-        return this[ index ];
-
-      return null;
-    }
-
-#if DEBUG
-    public override string ToString()
-    {
-      string representation = string.Empty;
-
-      if( !this.IsFilled )
-      {
-        representation += "Fill Pending - ";
-      }
-
-      if( this.IsEmpty )
-      {
-        representation += m_startDataIndex.ToString() + " - EMPTY.";
-      }
-      else
-      {
-        representation += m_startDataIndex.ToString() + " - " + this.EndDataIndex.ToString();
-      }
-
-      return representation;
-    }
-#endif
-
-    public object[] ToItemArray()
-    {
-      int count = this.Count;
-
-      object[] items = new object[ count ];
-
-      for( int i = 0; i < count; i++ )
-      {
-        items[ i ] = this[ i ].DataItem;
-      }
-
-      return items;
-    }
-
-    internal bool LockPage()
-    {
-      m_lockCount++;
-
-      // Returns True if the page just became locked (and is not up for removal) or False if the call simply incremented the lock count.
-      return m_lockCount == 1;
-    }
-
-    internal bool UnlockPage()
-    {
-      if( m_lockCount > 0 )
-      {
-        m_lockCount--;
-      }
-      else
-      {
-        // Safety Net.  We return False, even though the lock count is reinitialized to zero, since the page did not just become unlocked.
-        // This can occur when the DataGridVirtualizingCollectionView hits ForceRefresh method restarts the VirtualItemBook, thus getting rid
-        // of locked and unlocked pages and THEN, the Generator's WeakEventListener of CollectionChanged cleans up its containers which in turn
-        // tries to unlock a source index which isn't locked at all (since it was cleared when the virtual item book reseted).
-        m_lockCount = 0;
-        return false;
-      }
-
-      // Returns True if the page just became unlocked (and is up for removal) or False if the call simply decremented the lock count.
-      return m_lockCount == 0;
-    }
-
-    internal void AbortQueryDataOperation()
-    {
-      Debug.Assert( !this.IsDisposed );
-
-      if( this.IsFilled )
-        throw new InvalidOperationException( "An attempt was made to abort a query that has already completed." );
-
-      if( m_asyncQueryInfo != null )
-      {
-        // This method can be reentered by another thread, while it's already being processed, with the result that the AbortQuery delegate may not be trigged by the CollectionView,
-        // and hence the client code not prevented it must abort the query/operation/connection.
-        lock( this )
-        {
-          if( this.IsAborting )
-            return;
-
-          this.IsAborting = true;
-        }
-
-        m_asyncQueryInfo.AbortQuery();
-      }
-    }
-
-    internal void QueueQueryData( Dispatcher dispatcher )
-    {
-      Debug.Assert( !this.IsDisposed );
-      Debug.Assert( m_asyncQueryInfo == null );
-
-      m_asyncQueryInfo = new AsyncQueryInfo(
-        dispatcher,
-        new Action<AsyncQueryInfo>( this.AsyncQueryInfo_BeginQueryItems ),
-        new Action<AsyncQueryInfo>( this.AsyncQueryInfo_AbortQueryItems ),
-        new Action<AsyncQueryInfo, object[]>( this.AsyncQueryInfo_EndQueryItems ),
-        new Action<AsyncQueryInfo>( this.AsyncQueryInfo_QueryErrorChanged ),
-        new Action<AsyncQueryInfo>( this.AsyncQueryInfo_BuiltInAbort ),
-        m_startDataIndex,
-        this.Count );
-
-      m_asyncQueryInfo.QueueQuery();
-    }
-
-    internal void EndQueryItems( AsyncQueryInfo asyncQueryInfo, object[] items )
-    {
-      Debug.Assert( !this.IsDisposed );
-
-      // This can occur when the user notify us that the QueryData is completed for an AsyncQueryInfo.StartIndex that refers to a Page which does exists
-      // but that was removed, then re-created thus creating another asyncQueryInfo and queuing another QueryData.
-      // The only way to get rid of this situation would be to keep a ref to the queued asyncQueryInfo even if we get rid of the page and re-link the same instance to the newly
-      // created page.  This optimization could be done in a future version.  For now, let's return and the second asyncQueryInfo will take care of filling the newly created page.
-      if( m_asyncQueryInfo != asyncQueryInfo )
-      {
-        Debug.Assert( false );
-
-        return;
-      }
-
-      if( this.IsFilled )
-        throw new InvalidOperationException( "An attempt was made to fill a virtual page that is already filled." );
-
-      if( items == null )
-        throw new ArgumentNullException( "items" );
-
-      for( int i = 0; i < items.Length; i++ )
-      {
-        VirtualizedItemInfo virtualizedItemInfo = this[ i ];
-
-        Debug.Assert( virtualizedItemInfo.DataItem is EmptyDataItem );
-        Debug.Assert( virtualizedItemInfo.Index == ( m_startDataIndex + i ) );
-
-        this[ i ].DataItem = items[ i ];
-      }
-
-      this.IsFilled = true;
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Page Filled - " + this.ToString() );
-    }
-
-    internal void QueueCommitData( Dispatcher dispatcher )
-    {
-      Debug.Assert( !this.IsDisposed );
-
-      int count = this.Count;
-
-      List<VirtualizedItemInfo> dirtyItemInfoNotAlreadyPendingCommit = new List<VirtualizedItemInfo>( count );
-
-      for( int i = 0; i < count; i++ )
-      {
-        VirtualizedItemInfo virtualizedItemInfo = this[ i ];
-
-        if( ( virtualizedItemInfo.IsDirty ) && ( !this.IsAsyncCommitInfoQueuedForItem( virtualizedItemInfo.DataItem ) ) )
-        {
-          Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "QueueCommitData for page " + this.ToString() + " and index " + virtualizedItemInfo.Index );
-
-          dirtyItemInfoNotAlreadyPendingCommit.Add( virtualizedItemInfo );
-        }
-      }
-
-      if( dirtyItemInfoNotAlreadyPendingCommit.Count > 0 )
-      {
-        AsyncCommitInfo asyncCommitInfo = new AsyncCommitInfo(
-          dispatcher,
-          new Action<AsyncCommitInfo>( this.AsyncCommitInfo_BeginCommitItems ),
-          new Action<AsyncCommitInfo>( this.AsyncCommitInfo_EndCommitItems ),
-          new Action<AsyncCommitInfo>( this.AsyncCommitInfo_CommitErrorChanged ),
-          dirtyItemInfoNotAlreadyPendingCommit.ToArray() );
-
-        m_asyncCommitInfoList.Add( asyncCommitInfo );
-        asyncCommitInfo.BeginCommit();
-      }
-    }
-
-    internal bool IsAsyncCommitInfoQueuedForItem( object item )
-    {
-      int pendingAsyncCommitInfoCount = m_asyncCommitInfoList.Count;
-
-      for( int i = 0; i < pendingAsyncCommitInfoCount; i++ )
-      {
-        VirtualizedItemInfo[] pendingCommitVirtualizedItemInfos = m_asyncCommitInfoList[ i ].VirtualizedItemInfos;
-
-        foreach( VirtualizedItemInfo pendingCommitVirtualizedItemInfo in pendingCommitVirtualizedItemInfos )
-        {
-          if( pendingCommitVirtualizedItemInfo.DataItem == item )
-            return true;
-        }
-      }
-
-      return false;
-    }
-
-    internal void EndCommitItems( AsyncCommitInfo asyncCommitInfo )
-    {
-      Debug.Assert( !this.IsDisposed );
-      Debug.Assert( m_asyncCommitInfoList.Contains( asyncCommitInfo ) );
-
-      VirtualizedItemInfo[] commitedItemInfos = asyncCommitInfo.VirtualizedItemInfos;
-
-      for( int i = 0; i < commitedItemInfos.Length; i++ )
-      {
-        commitedItemInfos[ i ].OldValues = null;
-      }
-
-      m_asyncCommitInfoList.Remove( asyncCommitInfo );
-
-      asyncCommitInfo.Dispose();
-    }
-
-    internal void Restart()
-    {
-      if( !this.IsRestarting )
-      {
-        Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Restart VirtualPage requested for " + this.ToString() );
-
-        this.IsRestarting = true;
-        this.ParentVirtualList.OnVirtualPageRestarting( this );
-      }
-
-      // The page has finished commiting or aborting
-      if( ( !this.IsCommitPending ) && ( !this.IsAborting ) )
-      {
-        this.EndRestart();
-      }
-    }
-
-    internal void EndRestart()
-    {
-      // VirtualPage will be disposed by the VirtualPageManager when it removes the page from is m_pageNodeList
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Restart VirtualPage completed for " + this.ToString() );
-
-      this.IsRestarting = false;
-      this.ParentVirtualList.OnVirtualPageRestarted( this );
-    }
-
-    private void AsyncQueryInfo_BuiltInAbort( AsyncQueryInfo queryInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnBuiltInAbort( this, queryInfo );
-      this.IsAborting = false;
-    }
-
-    private void AsyncQueryInfo_BeginQueryItems( AsyncQueryInfo queryInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnQueryItems( this, queryInfo );
-    }
-
-    private void AsyncQueryInfo_AbortQueryItems( AsyncQueryInfo queryInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnAbortQueryItems( this, queryInfo );
-
-      this.IsAborting = false;
-
-      // If the page was removed, it was also disposed. This case means the page was not restarting
-      if( !this.RemoveAfterOperation && this.ParentVirtualList.IsRestarting )
-      {
-        this.Restart();
-      }
-    }
-
-    private void AsyncQueryInfo_EndQueryItems( AsyncQueryInfo queryInfo, object[] fetchedItems )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-      Debug.Assert( !this.IsAborting );
-
-      // The page can be removed when the CollectionView raises a CollectionChanged and the selection is consequently updated, so make sure to lock it until the update operation is done.
-      this.LockPage();
-
-      this.ParentVirtualList.PagingManager.OnQueryItemsCompleted( this, queryInfo, fetchedItems );
-
-      this.UnlockPage();
-
-      if( this.ParentVirtualList.IsRestarting )
-      {
-        this.Restart();
-      }
-    }
-
-    private void AsyncQueryInfo_QueryErrorChanged( AsyncQueryInfo queryInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnQueryErrorChanged( this, queryInfo );
-
-      if( this.ParentVirtualList.IsRestarting )
-      {
-        this.Restart();
-      }
-    }
-
-    private void AsyncCommitInfo_BeginCommitItems( AsyncCommitInfo commitInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnCommitItems( this, commitInfo );
-    }
-
-    private void AsyncCommitInfo_EndCommitItems( AsyncCommitInfo commitInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnCommitItemsCompleted( this, commitInfo );
-
-      // Make sure the page has not been removed by the previous call before accessing the parent virtual list.
-      if( !this.IsDisposed && this.ParentVirtualList.IsRestarting )
-      {
-        this.Restart();
-      }
-    }
-
-    private void AsyncCommitInfo_CommitErrorChanged( AsyncCommitInfo commitInfo )
-    {
-      if( this.IsDisposed )
-        return;
-
-      Debug.Assert( ( this.ParentVirtualList != null ) || ( this.ParentVirtualList.PagingManager != null ) );
-
-      this.ParentVirtualList.PagingManager.OnCommitErrorChanged( this, commitInfo );
-
-      if( this.ParentVirtualList.IsRestarting )
-      {
-        this.Restart();
-      }
-    }
-
-    private int SourceIndexToPageEntryIndex( int sourceIndex )
-    {
-      if( ( this.Count != 0 ) && ( ( sourceIndex >= m_startDataIndex ) && ( sourceIndex <= this.EndDataIndex ) ) )
-        return sourceIndex - m_startDataIndex;
-
-      return -1;
-    }
-
-    private bool ContainsItem( object item )
-    {
-      int count = this.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( this[ i ].DataItem == item )
-          return true;
-      }
-
-      return false;
-    }
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-      Debug.Assert( !this.IsDisposed );
-      Debug.Assert( ( m_asyncCommitInfoList != null ) && ( m_asyncCommitInfoList.Count == 0 ), "Some async commit are not completed while disposing VirtualPage" );
-
-      if( m_asyncQueryInfo != null )
-      {
-        // We must dispose the AsyncQueryInfo to be sure it does not root this VirtualPage instance
-        m_asyncQueryInfo.Dispose();
-        m_asyncQueryInfo = null;
-      }
-
-      this.Clear();
-      m_parentVirtualList = null;
-
-      this.IsDisposed = true;
-
-    }
-
-    #endregion
-
-    private BitVector32 m_flags;
-
-    private int m_startDataIndex;
-    private int m_lockCount;
-
-    private VirtualList m_parentVirtualList;
-
-    public AsyncQueryInfo m_asyncQueryInfo;
-    private List<AsyncCommitInfo> m_asyncCommitInfoList;
-
-    [Flags]
-    private enum VirtualItemPageFlags
-    {
-      IsFilled = 1,
-      IsDisposed = 2,
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs
deleted file mode 100644
index 2969c085..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs
+++ /dev/null
@@ -1,817 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Specialized;
-using System.Diagnostics;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class VirtualPageManager : IDisposable
-  {
-    internal static bool DebugDataVirtualization = false;
-    private const DispatcherPriority CommitDataPriority = DispatcherPriority.Input;
-    private const int EstimatedLockedPageCount = 3;
-
-    public VirtualPageManager( Dispatcher dispatcher, int pageSize, int maxRealizedItemCount, double preemptivePageQueryRatio )
-    {
-      if( dispatcher == null )
-        throw new ArgumentNullException( "dispatcher" );
-
-      if( pageSize < 1 )
-        throw new ArgumentOutOfRangeException( "pageSize", pageSize, "pageSize must be greater than zero." );
-
-      if( maxRealizedItemCount < pageSize )
-        throw new ArgumentOutOfRangeException( "maxRealizedItemCount", maxRealizedItemCount, "maxRealizedItemCount must be greater than or equal to pageSize." );
-
-      m_managedLists = new List<VirtualList>();
-      m_pageNodes = new LinkedList<VirtualPage>();
-
-      this.Dispatcher = dispatcher;
-
-      m_pageSize = pageSize;
-      m_maxRealizedItemCount = maxRealizedItemCount;
-
-      m_maxRemovablePageCount = ( m_maxRealizedItemCount / m_pageSize );
-
-      m_preemptivePageQueryRatio = preemptivePageQueryRatio;
-
-      this.IsConnected = true;
-    }
-
-    #region Dispatcher Property
-
-    public Dispatcher Dispatcher
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region PageSize Property
-
-    public int PageSize
-    {
-      get
-      {
-        return m_pageSize;
-      }
-    }
-
-    #endregion
-
-    #region MaxRealizedItemCount Property
-
-    public int MaxRealizedItemCount
-    {
-      get
-      {
-        return m_maxRealizedItemCount;
-      }
-    }
-
-    #endregion
-
-    #region PreemptivePageQueryRatio Property
-
-    public double PreemptivePageQueryRatio
-    {
-      get
-      {
-        return m_preemptivePageQueryRatio;
-      }
-      set
-      {
-        m_preemptivePageQueryRatio = value;
-      }
-    }
-
-    #endregion
-
-    #region ManagedLists Property
-
-    public ReadOnlyCollection<VirtualList> ManagedLists
-    {
-      get
-      {
-        if( m_readOnlyManagedLists == null )
-        {
-          m_readOnlyManagedLists = new ReadOnlyCollection<VirtualList>( m_managedLists );
-        }
-
-        return m_readOnlyManagedLists;
-      }
-    }
-
-    #endregion
-
-    #region IsDisposed Property
-
-    protected bool IsDisposed
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualPageManagerFlags.IsDisposed ];
-      }
-      private set
-      {
-        m_flags[ ( int )VirtualPageManagerFlags.IsDisposed ] = value;
-      }
-    }
-
-    #endregion
-
-    #region EstimatedTotalPageCount Property
-
-    internal int EstimatedTotalPageCount
-    {
-      get
-      {
-        return m_maxRemovablePageCount + VirtualPageManager.EstimatedLockedPageCount;
-      }
-    }
-
-    #endregion
-
-    #region Version Property
-
-    internal int Version
-    {
-      get
-      {
-        return m_version;
-      }
-    }
-
-    #endregion
-
-    #region IsConnected Property
-
-    internal bool IsConnected
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualPageManagerFlags.IsConnected ];
-      }
-      private set
-      {
-        m_flags[ ( int )VirtualPageManagerFlags.IsConnected ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RestartingManager Property
-
-    private bool RestartingManager
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualPageManagerFlags.RestartingManager ];
-      }
-      set
-      {
-        m_flags[ ( int )VirtualPageManagerFlags.RestartingManager ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ShouldRefreshAfterRestart Property
-
-    private bool ShouldRefreshAfterRestart
-    {
-      get
-      {
-        return m_flags[ ( int )VirtualPageManagerFlags.ShouldRefreshAfterRestart ];
-      }
-      set
-      {
-        m_flags[ ( int )VirtualPageManagerFlags.ShouldRefreshAfterRestart ] = value;
-      }
-    }
-
-    #endregion
-
-    #region LastRemovable Property
-
-    private LinkedListNode<VirtualPage> LastRemovable
-    {
-      get
-      {
-        LinkedListNode<VirtualPage> lastRemovableNode = m_pageNodes.Last;
-
-        while( lastRemovableNode != null )
-        {
-          Debug.Assert( lastRemovableNode.Value != null );
-
-          VirtualPage page = lastRemovableNode.Value;
-
-          if( page.IsRemovable )
-            return lastRemovableNode;
-
-          lastRemovableNode = lastRemovableNode.Previous;
-        }
-
-        return lastRemovableNode;
-      }
-    }
-
-    #endregion
-
-    protected abstract int OnQueryItemCountCore( VirtualList virtualList );
-
-    protected virtual void OnVirtualPageManagerRestarting()
-    {
-    }
-
-    protected virtual void OnVirtualPageManagerRestarted( bool shouldRefresh )
-    {
-    }
-
-    protected virtual void EndRestart()
-    {
-      this.RestartingManager = false;
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "VirtualPageManager (" + this.GetHashCode() + ")- All virtual Lists restarted." );
-
-      this.OnVirtualPageManagerRestarted( this.ShouldRefreshAfterRestart );
-      this.ShouldRefreshAfterRestart = false;
-    }
-
-    protected internal abstract void OnBuiltInAbort( VirtualPage virtualPage, AsyncQueryInfo queryInfo );
-
-    protected internal virtual int OnQueryItemCount( VirtualList virtualList )
-    {
-      return this.OnQueryItemCountCore( virtualList );
-    }
-
-    protected internal abstract void OnQueryItems( VirtualPage page, AsyncQueryInfo queryInfo );
-
-    protected internal virtual void OnAbortQueryItems( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-    }
-
-    protected internal virtual void OnQueryItemsCompleted( VirtualPage page, AsyncQueryInfo queryInfo, object[] fetchedItems )
-    {
-      this.IncrementVersion();
-
-      page.ParentVirtualList.FillEmptyPage( queryInfo, fetchedItems );
-    }
-
-    protected internal virtual void OnCommitItems( VirtualPage page, AsyncCommitInfo commitInfo )
-    {
-    }
-
-    protected internal virtual void OnCommitItemsCompleted( VirtualPage page, AsyncCommitInfo commitInfo )
-    {
-      page.ParentVirtualList.NotifyCommitComplete( commitInfo );
-    }
-
-    protected internal virtual void OnQueryErrorChanged( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-    }
-
-    protected internal virtual void OnCommitErrorChanged( VirtualPage page, AsyncCommitInfo commitInfo )
-    {
-    }
-
-    internal virtual void OnVirtualListRestarting( VirtualList virtualList )
-    {
-      Debug.Assert( m_managedLists.Contains( virtualList ) );
-      Debug.Assert( this.RestartingManager, "Until CollectionViewGroups can be virtualized, we should not be restarting a leaf list on its own." );
-    }
-
-    internal virtual void OnVirtualListRestarted( VirtualList virtualList )
-    {
-      Debug.Assert( m_managedLists.Contains( virtualList ) );
-      Debug.Assert( this.RestartingManager, "Until CollectionViewGroups can be virtualized, we should not be restarting a leaf list on its own." );
-
-      if( this.RestartingManager )
-      {
-        m_restartingListsCount--;
-      }
-
-      // Make sure that no page nodes belonging to this virtual list are left in the linked list. Remove all remaining ones since after the manager is restarted, its content is completely cleared.
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
-      while( pageNode != null )
-      {
-        LinkedListNode<VirtualPage> previousNode = pageNode.Previous;
-
-        if( pageNode.Value.ParentVirtualList == virtualList )
-          throw new DataGridInternalException( "A VirtualPage was not remove from its parent VirtualList after it is restarted" );
-
-        pageNode = previousNode;
-      }
-
-      this.IncrementVersion();
-
-      // If the manager is restarting, no page left and no more list restarting
-      if( this.RestartingManager && ( m_pageNodes.Count == 0 ) && ( m_restartingListsCount == 0 ) )
-      {
-        this.EndRestart();
-      }
-    }
-
-    internal virtual void OnVirtualListPageRestarting( VirtualList virtualList, VirtualPage page )
-    {
-      Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Find( page );
-
-      Debug.Assert( pageNode != null );
-
-      // RemovePageNode takes care of either raising the AbortQueryData event or aborting the QueryData Dispatcher Operation altogether.
-      // It also takes care of raising the CommitVirtualData event for loaded pages which contains modified data.
-      this.QueueCommitDataOrAbortIfRequired( pageNode, false );
-    }
-
-    internal virtual void OnVirtualListPageRestarted( VirtualList virtualList, VirtualPage page )
-    {
-      Debug.Assert( m_managedLists.Contains( virtualList ) );
-      Debug.Assert( m_pageNodes.Contains( page ) );
-
-      this.RemovePage( page );
-    }
-
-    internal void QueueQueryData( VirtualPage page )
-    {
-      Debug.Assert( m_managedLists.Contains( page.ParentVirtualList ) );
-
-      page.QueueQueryData( this.Dispatcher );
-    }
-
-    internal void QueueCommitData( VirtualPage page )
-    {
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "QueueCommitData for page " + page.ToString() );
-      Debug.Assert( m_managedLists.Contains( page.ParentVirtualList ) );
-      Debug.Assert( page.IsFilled );
-      Debug.Assert( page.IsDirty );
-
-      if( this.RestartingManager )
-      {
-        this.ShouldRefreshAfterRestart = true;
-      }
-
-      page.QueueCommitData( this.Dispatcher );
-    }
-
-    internal List<LinkedListNode<VirtualPage>> GetUnlockedPendingFillNodes()
-    {
-      List<LinkedListNode<VirtualPage>> unlockedPendingFillNodes = new List<LinkedListNode<VirtualPage>>();
-
-      LinkedListNode<VirtualPage> lastUnlockedPendingFillNode = m_pageNodes.Last;
-
-      while( lastUnlockedPendingFillNode != null )
-      {
-        VirtualPage page = lastUnlockedPendingFillNode.Value;
-
-        Debug.Assert( page != null );
-
-        if( ( !page.IsLocked ) && ( !page.IsFilled ) )
-        {
-          unlockedPendingFillNodes.Add( lastUnlockedPendingFillNode );
-        }
-
-        lastUnlockedPendingFillNode = lastUnlockedPendingFillNode.Previous;
-      }
-
-      return unlockedPendingFillNodes;
-    }
-
-    internal void CleanUpAndDisposeUnused()
-    {
-      // Remove the less used unlocked pages.  This will also ask to save it.
-
-      // Also remove all pending fill pages which are not locked wether or not we are under the max unlocked page count.
-      // This is so the abort query event is raised so that the user can abort his fetching of data.
-
-      // Start with the unlocked pending fill pages since it is mandatory to remove them all in order to abort the async data fetching.  
-      // The first node in the list returned by the GetUnlockedPendingFillNodes method is the oldest one, so we can start removing from the beginning of the returned list.
-      List<LinkedListNode<VirtualPage>> unlockedPendingFillNodes = this.GetUnlockedPendingFillNodes();
-
-      int unlockedPendingFillCount = unlockedPendingFillNodes.Count;
-
-      for( int i = 0; i < unlockedPendingFillCount; i++ )
-      {
-        this.QueueCommitDataOrAbortIfRequired( unlockedPendingFillNodes[ i ], true );
-      }
-
-      // Then, move on to removing the other unlocked pages not up for commit, if we are above the max item in memory limit.  There should not be any pending fill pages left which are not locked.
-      int removablePageItemCount = this.GetRemovablePageItemCount();
-
-      while( removablePageItemCount > m_maxRealizedItemCount )
-      {
-        LinkedListNode<VirtualPage> lastRemovable = this.LastRemovable;
-
-        Debug.Assert( lastRemovable != null );
-
-        removablePageItemCount -= lastRemovable.Value.Count;
-
-        this.QueueCommitDataOrAbortIfRequired( lastRemovable, true );
-      }
-    }
-
-    internal void RemovePage( VirtualPage page )
-    {
-      if( page.IsDisposed )
-        return;
-
-      Debug.Assert( page != null );
-      Debug.Assert( !page.IsDirty );
-
-      // A filled page is being removed.  Change the version.
-      this.IncrementVersion();
-
-      // Update the table of content of the page's ParentVirtualList
-      page.ParentVirtualList.TableOfContent.RemovePage( page );
-
-      m_pageNodes.Remove( page );
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Removed Page: " + page.ToString() );
-
-      // Dispose the page since it will never be reused
-      page.Dispose();
-    }
-
-    internal void MovePageToFront( VirtualPage page )
-    {
-      // The further from the front a page is, the longer it has been since it was requested.
-      Debug.Assert( page != null );
-
-      LinkedListNode<VirtualPage> firstNode = m_pageNodes.First;
-
-      if( firstNode.Value != page )
-      {
-        LinkedListNode<VirtualPage> node = m_pageNodes.Find( page );
-        m_pageNodes.Remove( node );
-        m_pageNodes.AddFirst( node );
-
-        Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Moved To Front: Page " + page.ToString() );
-      }
-    }
-
-    internal void AddPage( VirtualPage page, PageInsertPosition insertPosition )
-    {
-      if( page == null )
-        throw new ArgumentNullException( "page", "TODOOC: An internal error occured while paging data. Page cannot be null." );
-
-      // We call clean-up before the call to AddFirst since if we do it afterward and the page is pending fill, we will remove it.
-      this.CleanUpAndDisposeUnused();
-
-      if( insertPosition == PageInsertPosition.Front )
-      {
-        m_pageNodes.AddFirst( page );
-      }
-      else
-      {
-        m_pageNodes.AddLast( page );
-      }
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Added To " + ( ( insertPosition == PageInsertPosition.Front ) ? "Front" : "Back" ) + ": Page " + page.ToString() );
-    }
-
-    internal void Restart()
-    {
-      if( this.RestartingManager )
-        return;
-
-      this.RestartingManager = true;
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "VirtualPageManager (" + this.GetHashCode() + ") - Restarting all virtual Lists. " );
-
-      this.OnVirtualPageManagerRestarting();
-
-      if( m_managedLists.Count == 0 )
-      {
-        // No pages, restart is completed
-        this.EndRestart();
-      }
-      else
-      {
-        m_restartingListsCount = m_managedLists.Count;
-        int managedListCount = m_managedLists.Count;
-
-        // Restart all VirtualLists 
-        for( int i = managedListCount - 1; i >= 0; i-- )
-        {
-          VirtualList virtualList = m_managedLists[ i ];
-          virtualList.Restart();
-        }
-      }
-    }
-
-    internal void Disconnect()
-    {
-      this.IsConnected = false;
-    }
-
-    internal void ManageList( VirtualList virtualList )
-    {
-      Debug.Assert( !m_managedLists.Contains( virtualList ) );
-      Debug.Assert( virtualList.VirtualPagingManager == null );
-
-      virtualList.VirtualPagingManager = this;
-
-      this.m_managedLists.Add( virtualList );
-    }
-
-    internal bool IsAsyncCommitQueuedForItem( object item )
-    {
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.First;
-
-      while( pageNode != null )
-      {
-        VirtualList virtualList = pageNode.Value.ParentVirtualList;
-
-        Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-        if( virtualList.IsAsyncCommitQueuedForItem( item ) )
-        {
-          Debug.Assert( !( item is EmptyDataItem ), "A commit operation should not have been queued for an EmptyDataItem." );
-
-          return true;
-        }
-
-        pageNode = pageNode.Next;
-      }
-
-      return false;
-    }
-
-    internal bool IsItemDirty( object item )
-    {
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.First;
-
-      while( pageNode != null )
-      {
-        VirtualList virtualList = pageNode.Value.ParentVirtualList;
-
-        Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-        if( virtualList.IsItemDirty( item ) )
-        {
-          Debug.Assert( !( item is EmptyDataItem ), "An EmptyDataItem should not have been flagged as dirty." );
-
-          return true;
-        }
-
-        pageNode = pageNode.Next;
-      }
-
-      return false;
-    }
-
-    internal void SetCachedValuesForItem( object item, string[] names, object[] values )
-    {
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.First;
-
-      while( pageNode != null )
-      {
-        VirtualList virtualList = pageNode.Value.ParentVirtualList;
-
-        Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-        int localIndex = virtualList.IndexOf( item );
-
-        if( localIndex != -1 )
-        {
-          virtualList.SetCachedValuesForItemAtIndex( localIndex, names, values );
-          return;
-        }
-
-        pageNode = pageNode.Next;
-      }
-
-      throw new InvalidOperationException( "An attempt was made to begin the edit process on an unknown item." );
-    }
-
-    internal VirtualizedItemValueCollection GetCachedValuesForItem( object item )
-    {
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.First;
-
-      while( pageNode != null )
-      {
-        VirtualList virtualList = pageNode.Value.ParentVirtualList;
-
-        Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-        int localIndex = virtualList.IndexOf( item );
-
-        if( localIndex != -1 )
-          return virtualList.GetCachedValuesForItemAtIndex( localIndex );
-
-        pageNode = pageNode.Next;
-      }
-
-      return null;
-    }
-
-    internal void ClearCachedValuesForItem( object item )
-    {
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.First;
-
-      while( pageNode != null )
-      {
-        VirtualList virtualList = pageNode.Value.ParentVirtualList;
-
-        Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-        int localIndex = virtualList.IndexOf( item );
-
-        if( localIndex != -1 )
-        {
-          virtualList.ClearCachedValuesForItemAtIndex( localIndex );
-          return;
-        }
-
-        pageNode = pageNode.Next;
-      }
-
-      throw new InvalidOperationException( "An attempt was made to leave the edit process on an unknown item." );
-    }
-
-    internal void CommitAll()
-    {
-      List<VirtualList> currentVirtualLists = new List<VirtualList>( m_pageNodes.Count );
-
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.First;
-
-      // Scan all in memory pages to build a list of unique VirtualLists which currently have items loaded in memory.
-      while( pageNode != null )
-      {
-        VirtualList virtualList = pageNode.Value.ParentVirtualList;
-
-        Debug.Assert( m_managedLists.Contains( virtualList ) );
-
-        if( !currentVirtualLists.Contains( virtualList ) )
-        {
-          currentVirtualLists.Add( virtualList );
-        }
-
-        pageNode = pageNode.Next;
-      }
-
-      int currentVirtualListCount = currentVirtualLists.Count;
-
-      for( int i = 0; i < currentVirtualListCount; i++ )
-      {
-        currentVirtualLists[ i ].CommitAll();
-      }
-    }
-
-    private int GetRemovablePageCount()
-    {
-      int removablePageCount = 0;
-
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
-
-      while( pageNode != null )
-      {
-        VirtualPage page = pageNode.Value;
-
-        Debug.Assert( page != null );
-
-        if( ( page != null ) && ( page.IsRemovable ) )
-        {
-          removablePageCount++;
-        }
-
-        pageNode = pageNode.Previous;
-      }
-
-      return removablePageCount;
-    }
-
-    private int GetRemovablePageItemCount()
-    {
-      int removablePageItemCount = 0;
-
-      LinkedListNode<VirtualPage> pageNode = m_pageNodes.Last;
-
-      while( pageNode != null )
-      {
-        VirtualPage page = pageNode.Value;
-
-        Debug.Assert( page != null );
-
-        if( ( page != null ) && ( page.IsRemovable ) )
-        {
-          removablePageItemCount += page.Count;
-        }
-
-        pageNode = pageNode.Previous;
-      }
-
-      return removablePageItemCount;
-    }
-
-    private void QueueCommitDataOrAbortIfRequired( LinkedListNode<VirtualPage> pageNode, bool removeAfterOperation )
-    {
-      VirtualPage page = pageNode.Value;
-
-      // Update the flag in case this page must be removed after an abort or commit operation
-      page.RemoveAfterOperation = removeAfterOperation;
-
-      // The only circumstance when we should remove a page which is not removable is if we are restarting.
-      Debug.Assert( ( page != null ) && ( !page.IsDisposed ) && ( ( page.IsRemovable ) || ( page.ParentVirtualList.IsRestarting ) ) );
-
-      if( page.IsDirty )
-      {
-        // Don't remove pages which contains modifications.  We'll remove them from the book when they are committed, if they aren't locked.
-        this.QueueCommitData( page );
-      }
-      else if( !page.IsFilled )
-      {
-        // The page is not filled, we must send abort the QueryData for this page in case it was sent
-        page.AbortQueryDataOperation();
-      }
-
-      // The page must be removed after operation and it has nothing to commit and is not  currently aborting an operation. It is safe to remove it
-      if( removeAfterOperation && !page.IsCommitPending && !page.IsAborting )
-      {
-        this.RemovePage( page );
-      }
-    }
-
-    private void IncrementVersion()
-    {
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-
-      this.DisposeCore();
-
-    }
-
-    protected virtual void DisposeCore()
-    {
-      if( m_managedLists != null )
-      {
-        m_managedLists.Clear();
-      }
-
-      if( m_pageNodes != null )
-      {
-        m_pageNodes.Clear();
-      }
-
-      this.IsDisposed = true;
-    }
-
-    #endregion
-
-    private int m_version;
-    private int m_restartingListsCount;
-
-    private BitVector32 m_flags = new BitVector32();
-
-    private LinkedList<VirtualPage> m_pageNodes;
-
-    private List<VirtualList> m_managedLists;
-    private ReadOnlyCollection<VirtualList> m_readOnlyManagedLists;
-
-    private int m_pageSize;
-    private int m_maxRealizedItemCount;
-    private double m_preemptivePageQueryRatio;
-    private int m_maxRemovablePageCount;
-
-    internal enum PageInsertPosition
-    {
-      Front = 0,
-      Back = 1
-    }
-
-    private enum VirtualPageManagerFlags
-    {
-      RestartingManager = 1,
-      ShouldRefreshAfterRestart = 2,
-      IsDisposed = 4,
-      IsConnected = 8,
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemInfo.cs
deleted file mode 100644
index 4e5f8753..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemInfo.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class VirtualizedItemInfo
-  {
-    #region CONSTRUCTORS
-
-    internal VirtualizedItemInfo( int index, object dataItem )
-    {
-      m_dataIndex = index;
-      m_dataItem = dataItem;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region DataItem Property
-
-    public object DataItem
-    {
-      get
-      {
-        return m_dataItem;
-      }
-      internal set
-      {
-        m_dataItem = value;
-      }
-    }
-
-    #endregion DataItem Property
-
-    #region Index Property
-
-    public int Index
-    {
-      get
-      {
-        return m_dataIndex;
-      }
-    }
-
-    #endregion Index Property
-
-    #region OldValues Property
-
-    public VirtualizedItemValueCollection OldValues
-    {
-      get
-      {
-        return m_oldValues;
-      }
-      internal set
-      {
-        m_oldValues = value;
-      }
-    }
-
-    #endregion OldValues Property
-
-    #region INTERNAL PROPERTIES
-
-    internal bool IsDirty
-    {
-      get
-      {
-        return m_oldValues != null;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region PRIVATE FIELDS
-
-    private object m_dataItem;
-    private int m_dataIndex;
-    private VirtualizedItemValueCollection m_oldValues;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemValueCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemValueCollection.cs
deleted file mode 100644
index 66b1a76e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemValueCollection.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class VirtualizedItemValueCollection : ICollection
-  {
-    internal VirtualizedItemValueCollection( string[] names, object[] values )
-    {
-      if( names.Length != values.Length )
-        throw new ArgumentException( "Names and Values must be of the same length." );
-
-      m_nameValueDictionary = new Dictionary<string, object>( names.Length );
-      m_valueList = new List<object>( values.Length );
-
-      for( int i = 0; i < names.Length; i++ )
-      {
-        object value = values[ i ];
-        m_nameValueDictionary.Add( names[ i ], value );
-        m_valueList.Add( value );
-      }
-
-    }
-
-    public object this[ int index ]
-    {
-      get
-      {
-        if( ( index < 0 ) || ( index >= m_valueList.Count ) )
-          throw new ArgumentOutOfRangeException( "index", index, "The index must be greater than or equal to zero and less than count." );
-
-        return m_valueList[ index ];
-      }
-    }
-
-    public object this[ string name ]
-    {
-      get
-      {
-        if( name == null )
-          throw new ArgumentNullException( "name" );
-
-        if( name == string.Empty )
-          throw new ArgumentException( "name" );
-
-        object val;
-
-        if( !m_nameValueDictionary.TryGetValue( name, out val ) )
-          throw new ArgumentException( "No value could be found for the specified property name." );
-
-        return val;
-      }
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_valueList.Count;
-      }
-    }
-
-    #region PRIVATE FIELDS
-
-    private Dictionary<string, object> m_nameValueDictionary;
-    private List<object> m_valueList;
-
-    #endregion PRIVATE FIELDS
-
-
-    #region ICollection Members
-
-    public void CopyTo( Array array, int index )
-    {
-      if( array == null )
-        throw new ArgumentNullException( "array" );
-
-      if( array.Rank != 1 )
-        throw new NotSupportedException( "Multi-dimensional arrays are not supported." );
-
-      if( index < 0 )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero." );
-
-      int count = this.Count;
-
-      if( ( array.Length - index ) < count )
-        throw new ArgumentException( "Invalid offset position." );
-
-      if( array is object[] )
-      {
-        object[] objects = ( object[] )array;
-
-        for( int i = 0; i < count; i++ )
-        {
-          objects[ i + index ] = m_valueList[ i ];
-        }
-      }
-      else
-      {
-        for( int i = 0; i < count; i++ )
-        {
-          array.SetValue( m_valueList[ i ], ( i + index ) );
-        }
-      }
-    }
-
-    public bool IsSynchronized
-    {
-      get 
-      { 
-        return false; 
-      }
-    }
-
-    public object SyncRoot
-    {
-      get 
-      {
-        return this;
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    public IEnumerator GetEnumerator()
-    {
-      return m_valueList.GetEnumerator();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs
deleted file mode 100644
index 0abec623..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Data;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataGridForeignKeyDescription : DependencyObject
-  {
-    public DataGridForeignKeyDescription()
-    {
-      this.SetForeignKeyConverter();
-    }
-
-    #region ForeignKeyConverter Property
-
-    public static readonly DependencyProperty ForeignKeyConverterProperty = DependencyProperty.Register(
-      "ForeignKeyConverter",
-      typeof( ForeignKeyConverter ),
-      typeof( DataGridForeignKeyDescription ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public ForeignKeyConverter ForeignKeyConverter
-    {
-      get
-      {
-        return ( ForeignKeyConverter )this.GetValue( DataGridForeignKeyDescription.ForeignKeyConverterProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridForeignKeyDescription.ForeignKeyConverterProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ItemsSource Property
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register(
-      "ItemsSource",
-      typeof( IEnumerable ),
-      typeof( DataGridForeignKeyDescription ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return ( IEnumerable )this.GetValue( DataGridForeignKeyDescription.ItemsSourceProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridForeignKeyDescription.ItemsSourceProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsAutoCreated Internal Property
-
-    internal bool IsAutoCreated
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ValuePath Property
-
-    public static readonly DependencyProperty ValuePathProperty = DependencyProperty.Register(
-      "ValuePath",
-      typeof( string ),
-      typeof( DataGridForeignKeyDescription ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public string ValuePath
-    {
-      get
-      {
-        return ( string )this.GetValue( DataGridForeignKeyDescription.ValuePathProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridForeignKeyDescription.ValuePathProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DisplayMemberPath Property
-
-    public static readonly DependencyProperty DisplayMemberPathProperty = DependencyProperty.Register(
-      "DisplayMemberPath",
-      typeof( string ),
-      typeof( DataGridForeignKeyDescription ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public string DisplayMemberPath
-    {
-      get
-      {
-        return ( string )this.GetValue( DataGridForeignKeyDescription.DisplayMemberPathProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridForeignKeyDescription.DisplayMemberPathProperty, value );
-      }
-    }
-
-    #endregion
-
-    protected virtual void SetForeignKeyConverter()
-    {
-      this.ForeignKeyConverter = new DataGridForeignKeyConverter();
-    }
-
-    internal Type GetDataType()
-    {
-      var itemsSource = this.ItemsSource;
-      if( itemsSource == null )
-        return null;
-
-      var displayMemberPath = this.DisplayMemberPath;
-      var foreignKeyConverter = this.ForeignKeyConverter;
-
-      if( string.IsNullOrWhiteSpace( displayMemberPath ) && ( foreignKeyConverter == null ) )
-        return null;
-
-      try
-      {
-        //Use the DisplayMemberPath or the ForeignKeyConverter to find the converted value data type, using a DataRowView or reflection.
-        if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
-        {
-          foreach( object item in itemsSource )
-          {
-            var dataRowView = item as DataRowView;
-            if( dataRowView == null )
-              continue;
-
-            if( !string.IsNullOrWhiteSpace( displayMemberPath ) )
-            {
-              var dataColumn = dataRowView.Row.Table.Columns[ displayMemberPath ];
-              if( dataColumn != null )
-              {
-                return dataColumn.DataType;
-              }
-            }
-            else
-            {
-              var valuePath = this.ValuePath;
-              if( valuePath != null )
-              {
-                var key = dataRowView[ valuePath ];
-                var value = foreignKeyConverter.GetValueFromKey( key, this );
-                if( value != null )
-                {
-                  return value.GetType();
-                }
-              }
-            }
-          }
-        }
-        else
-        {
-          foreach( object item in itemsSource )
-          {
-            if( item == null )
-              continue;
-
-            if( !string.IsNullOrWhiteSpace( displayMemberPath ) )
-              return item.GetType().GetProperty( displayMemberPath ).PropertyType;
-
-            if( item is Enum )
-              return item.GetType();
-
-            var valuePath = this.ValuePath;
-            if( valuePath != null )
-            {
-              var key = item.GetType().GetProperty( valuePath ).GetValue( item, null );
-              var value = foreignKeyConverter.GetValueFromKey( key, this );
-              if( value != null )
-              {
-                return value.GetType();
-              }
-            }
-          }
-        }
-      }
-      catch
-      {
-        //Swallow the exception, no need to terminate the application, since the original value will be exported.
-      }
-
-      return null;
-    }
-
-    internal object GetDisplayValue( object fieldValue )
-    {
-      if( fieldValue == null )
-        return null;
-
-      var foreignKeyConverter = this.ForeignKeyConverter;
-      if( foreignKeyConverter != null )
-        return foreignKeyConverter.GetValueFromKey( fieldValue, this );
-
-      return fieldValue;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs
deleted file mode 100644
index 816d0cd3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataTableForeignKeyDescription : DataGridForeignKeyDescription
-  {
-    public DataTableForeignKeyDescription()
-    {
-    }
-
-    internal DataTableForeignKeyDescription( ForeignKeyConstraint constraint )
-      : this()
-    {
-      this.ForeignKeyConstraint = constraint;
-    }
-
-    #region ForeignKeyConstraint Property
-
-    public static readonly DependencyProperty ForeignKeyConstraintProperty = DependencyProperty.Register(
-      "ForeignKeyConstraint",
-      typeof( ForeignKeyConstraint ),
-      typeof( DataTableForeignKeyDescription ),
-      new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( DataTableForeignKeyDescription.OnForeignKeyConstraintChanged ) ) );
-
-    public ForeignKeyConstraint ForeignKeyConstraint
-    {
-      get
-      {
-        return ( ForeignKeyConstraint )this.GetValue( DataTableForeignKeyDescription.ForeignKeyConstraintProperty );
-      }
-      set
-      {
-        this.SetValue( DataTableForeignKeyDescription.ForeignKeyConstraintProperty, value );
-      }
-    }
-
-    private static void OnForeignKeyConstraintChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var foreignKeyDescription = sender as DataTableForeignKeyDescription;
-      if( foreignKeyDescription != null )
-      {
-        foreignKeyDescription.UpdateValuePath();
-        foreignKeyDescription.UpdateItemsSource();
-      }
-    }
-
-    #endregion
-
-    protected override void SetForeignKeyConverter()
-    {
-      this.ForeignKeyConverter = new DataTableForeignKeyConverter();
-    }
-
-    private void UpdateValuePath()
-    {
-      // Affect the ValuePath if it was not explicitly set or bound
-      var valuePath = this.ReadLocalValue( ValuePathProperty );
-
-      if( string.IsNullOrEmpty( this.ValuePath )
-        && ( ( valuePath == DependencyProperty.UnsetValue )
-             || ( valuePath == null ) ) )
-      {
-        var foreignKeyConstraint = this.ForeignKeyConstraint;
-
-        // Affect the FieldName to the first RelatedColumn's name
-        // if there is only one DataColumn in the RelatedColumns Collection
-        if( ( foreignKeyConstraint != null )
-          && ( foreignKeyConstraint.RelatedColumns != null )
-          && ( foreignKeyConstraint.RelatedColumns.Length == 1 ) )
-        {
-          var foreignFieldName = foreignKeyConstraint.RelatedColumns[ 0 ].ColumnName;
-
-          if( !string.IsNullOrEmpty( foreignFieldName ) )
-          {
-            this.ValuePath = foreignFieldName;
-          }
-        }
-      }
-    }
-
-    private void UpdateItemsSource()
-    {
-      var foreignKeyConstraint = this.ForeignKeyConstraint;
-      if( foreignKeyConstraint == null )
-        return;
-
-      var relatedTable = foreignKeyConstraint.RelatedTable;
-      if( relatedTable == null )
-        return;
-
-      this.ItemsSource = relatedTable.DefaultView;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncCommitInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncCommitInfo.cs
deleted file mode 100644
index 856743ea..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncCommitInfo.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class AsyncCommitInfo : IDisposable
-  {
-    #region STATIC MEMBERS
-
-
-    #endregion STATIC MEMBERS
-
-    #region CONSTRUCTORS
-
-    internal AsyncCommitInfo(
-      Dispatcher dispatcher,
-      Action<AsyncCommitInfo> beginCommitDelegate,
-      Action<AsyncCommitInfo> endCommitDelegate,
-      Action<AsyncCommitInfo> commitErrorChangedDelegate,
-      VirtualizedItemInfo[] virtualizedItemInfos )
-    {
-      m_dispatcher = dispatcher;
-
-      m_beginCommitDelegate = beginCommitDelegate;
-      m_endCommitDelegate = endCommitDelegate;
-      m_commitErrorChangedDelegate = commitErrorChangedDelegate;
-
-      m_virtualizedItemInfos = virtualizedItemInfos;
-    }
-
-    #endregion CONSTRUCTORS
-
-
-    #region Items Property
-
-    public VirtualizedItemInfo[] VirtualizedItemInfos
-    {
-      get
-      {
-        return m_virtualizedItemInfos;
-      }
-    }
-
-    #endregion Items Property
-
-    #region AsyncState Property
-
-    public object AsyncState
-    {
-      get;
-      set;
-    }
-
-    #endregion AsyncState Property
-
-    #region Error Property
-
-    public object Error
-    {
-      get
-      {
-        return m_error;
-      }
-      set
-      {
-        Debug.Assert( !this.IsDisposed );
-
-        if( m_error != value )
-        {
-          m_error = value;
-
-          if( m_commitErrorChangedDelegate != null )
-          {
-            m_dispatcher.Invoke(
-              DispatcherPriority.Send,
-              m_commitErrorChangedDelegate,
-              this );
-          }
-        }
-      }
-    }
-
-    #endregion Error Property
-
-    #region IsDisposed Internal Property
-
-    internal bool IsDisposed
-    {
-      get
-      {
-        return m_isDisposed;
-      }
-    }
-
-    #endregion
-
-
-    #region PUBLIC METHODS
-
-    public void EndCommit()
-    {
-      Debug.Assert( !this.IsDisposed );
-
-      if( m_commitEndedDispatched )
-        throw new InvalidOperationException( "An attempt was made to call EndCommit when it has already been called for this AsyncCommitInfo." );
-
-      m_dispatcher.BeginInvoke(
-        DispatcherPriority.Send,
-        m_endCommitDelegate,
-        this );
-
-      m_commitEndedDispatched = true;
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region INTERNAL METHODS
-
-    internal void BeginCommit()
-    {
-      Debug.Assert( !this.IsDisposed );
-
-      m_dispatcher.BeginInvoke(
-        DispatcherPriority.Background,
-        m_beginCommitDelegate,
-        this );
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE FIELDS
-
-    private VirtualizedItemInfo[] m_virtualizedItemInfos;
-    private bool m_commitEndedDispatched;
-    private bool m_isDisposed;
-
-    private object m_error;
-
-    private Dispatcher m_dispatcher;
-    private Action<AsyncCommitInfo> m_beginCommitDelegate;
-    private Action<AsyncCommitInfo> m_endCommitDelegate;
-    private Action<AsyncCommitInfo> m_commitErrorChangedDelegate;
-
-    #endregion PRIVATE FIELDS
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-      if( m_isDisposed )
-      {
-        Debug.Assert( false, "The AsyncQueryInfo is disposed" );
-        return;
-      }
-
-      m_dispatcher = null;
-
-      m_beginCommitDelegate = null;
-      m_endCommitDelegate = null;
-      m_commitErrorChangedDelegate = null;
-
-      m_isDisposed = true;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs
deleted file mode 100644
index e06f09cf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Diagnostics;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class AsyncQueryInfo : IDisposable
-  {
-    internal AsyncQueryInfo(
-      Dispatcher dispatcher,
-      Action<AsyncQueryInfo> beginQueryDelegate,
-      Action<AsyncQueryInfo> abortQueryDelegate,
-      Action<AsyncQueryInfo, object[]> endQueryDelegate,
-      Action<AsyncQueryInfo> queryErrorChangedDelegate,
-      Action<AsyncQueryInfo> builtInAbortDelegate,
-      int startIndex,
-      int requestedItemCount )
-    {
-      m_dispatcher = dispatcher;
-      m_builtInAbortDelegate = builtInAbortDelegate;
-      m_beginQueryDelegate = beginQueryDelegate;
-      m_abortQueryDelegate = abortQueryDelegate;
-      m_endQueryDelegate = endQueryDelegate;
-
-      m_queryErrorChangedDelegate = queryErrorChangedDelegate;
-
-      m_startIndex = startIndex;
-      m_requestedItemCount = requestedItemCount;
-    }
-
-    #region StartIndex Property
-
-    public int StartIndex
-    {
-      get
-      {
-        return m_startIndex;
-      }
-    }
-
-    #endregion
-
-    #region RequestedItemCount Property
-
-    public int RequestedItemCount
-    {
-      get
-      {
-        return m_requestedItemCount;
-      }
-    }
-
-    #endregion
-
-    #region AsyncState Property
-
-    public object AsyncState
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region Error Property
-
-    public object Error
-    {
-      get
-      {
-        return m_error;
-      }
-      set
-      {
-        Debug.Assert( !this.IsDisposed );
-
-        if( m_error != value )
-        {
-          m_error = value;
-
-          if( m_queryErrorChangedDelegate != null )
-          {
-            m_dispatcher.Invoke( DispatcherPriority.Send, m_queryErrorChangedDelegate, this );
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region ShouldAbort Property
-
-    public bool ShouldAbort
-    {
-      get
-      {
-        return m_flags[ ( int )AsyncQueryInfoFlags.ShouldAbort ];
-      }
-      private set
-      {
-        m_flags[ ( int )AsyncQueryInfoFlags.ShouldAbort ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsDisposed Property
-
-    internal bool IsDisposed
-    {
-      get
-      {
-        return m_flags[ ( int )AsyncQueryInfoFlags.IsDisposed ];
-      }
-      private set
-      {
-        m_flags[ ( int )AsyncQueryInfoFlags.IsDisposed ] = value;
-      }
-    }
-
-    #endregion
-
-    #region BeginQueryDelegateInvoked Property
-
-    private bool BeginQueryDelegateInvoked
-    {
-      get
-      {
-        return m_flags[ ( int )AsyncQueryInfoFlags.BeginQueryDelegateInvoked ];
-      }
-      set
-      {
-        m_flags[ ( int )AsyncQueryInfoFlags.BeginQueryDelegateInvoked ] = value;
-      }
-    }
-
-    #endregion
-
-    public void EndQuery( object[] items )
-    {
-      // Ignore this query when disposed
-      if( this.IsDisposed )
-        return;
-
-      if( m_endQueryDelegateDispatcherOperation != null )
-        throw new InvalidOperationException( "An attempt was made to call EndQuery when it has already been called for this AsyncQueryInfo." );
-
-      if( this.ShouldAbort )
-        return;
-
-      m_endQueryDelegateDispatcherOperation = m_dispatcher.BeginInvoke( DispatcherPriority.Background, m_endQueryDelegate, this, new object[] { items } );
-    }
-
-    internal void QueueQuery()
-    {
-      Debug.Assert( !this.IsDisposed, "The AsyncQueryInfo is disposed" );
-
-      this.ShouldAbort = false;
-      this.BeginQueryDelegateInvoked = false;
-
-      //Make sure to abort the EndQuery operation before queuing a new query.
-      if( m_endQueryDelegateDispatcherOperation != null )
-      {
-        m_endQueryDelegateDispatcherOperation.Abort();
-        m_endQueryDelegateDispatcherOperation = null;
-      }
-
-#if SILVERLIGHT
-      m_dispatcher.BeginInvoke( new Action( this.BeginQuery ) );
-#else
-      m_beginQueryDispatcherOperation = m_dispatcher.BeginInvoke( DispatcherPriority.Background, new Action( this.BeginQueryDispatcherCallback ) );
-#endif
-    }
-
-    internal void AbortQuery()
-    {
-      Debug.Assert( !this.IsDisposed );
-
-      // Make sure to abort the EndQuery operation before queuing an abort query.
-      if( m_endQueryDelegateDispatcherOperation != null )
-      {
-        m_endQueryDelegateDispatcherOperation.Abort();
-        m_endQueryDelegateDispatcherOperation = null;
-      }
-
-      if( this.ShouldAbort )
-      {
-        Debug.Assert( m_beginQueryDispatcherOperation == null );
-
-        m_builtInAbortDelegate( this );
-        return;
-      }
-
-      this.ShouldAbort = true;
-
-      // If the BeginQuery already had time to execute, then we know the user was notified of the query request.  Notify him to cancel the query as soon as possible.
-      if( this.BeginQueryDelegateInvoked )
-      {
-        Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "CALLING Abort Query! For page at starting index: " + m_startIndex.ToString() );
-
-        m_dispatcher.BeginInvoke( DispatcherPriority.Send, m_abortQueryDelegate, this );
-      }
-      else
-      {
-        // BeginQueryDispatcherCallback was dispatched but not executed yet, abort it and return
-        if( m_beginQueryDispatcherOperation != null )
-        {
-          m_beginQueryDispatcherOperation.Abort();
-          m_beginQueryDispatcherOperation = null;
-        }
-
-        m_builtInAbortDelegate( this );
-      }
-    }
-
-    private void BeginQueryDispatcherCallback()
-    {
-      m_beginQueryDispatcherOperation = null;
-
-      Debug.Assert( !this.IsDisposed );
-
-      if( this.ShouldAbort )
-      {
-        Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "BUILT-IN BeginQueryDispatcherCallback Aborted! (" + this.GetHashCode() + ") For page at starting index: " + m_startIndex.ToString() );
-
-        m_builtInAbortDelegate( this );
-        return;
-      }
-
-      m_beginQueryDelegate( this );
-      this.BeginQueryDelegateInvoked = true;
-    }
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-      m_dispatcher = null;
-
-      Debug.Assert( m_beginQueryDispatcherOperation == null, "A BeginQueryDispatcherCallback is still pending on the Dispatcher" );
-
-      m_beginQueryDispatcherOperation = null;
-      m_builtInAbortDelegate = null;
-      m_abortQueryDelegate = null;
-      m_beginQueryDelegate = null;
-      m_endQueryDelegate = null;
-      m_queryErrorChangedDelegate = null;
-
-      this.IsDisposed = true;
-    }
-
-    #endregion
-
-    private int m_startIndex;
-    private int m_requestedItemCount;
-
-    private BitVector32 m_flags = new BitVector32();
-
-    private object m_error;
-
-    private Dispatcher m_dispatcher;
-
-    private DispatcherOperation m_beginQueryDispatcherOperation;
-    private DispatcherOperation m_endQueryDelegateDispatcherOperation;
-    private Action<AsyncQueryInfo> m_builtInAbortDelegate;
-    private Action<AsyncQueryInfo> m_beginQueryDelegate;
-    private Action<AsyncQueryInfo> m_abortQueryDelegate;
-    private Action<AsyncQueryInfo, object[]> m_endQueryDelegate;
-    private Action<AsyncQueryInfo> m_queryErrorChangedDelegate;
-
-    [Flags]
-    private enum AsyncQueryInfoFlags
-    {
-      ShouldAbort = 1,
-      EndQueryDelegateInvoked = 2,
-      BeginQueryDelegateInvoked = 4,
-      IsDisposed = 8,
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfoWeakComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfoWeakComparer.cs
deleted file mode 100644
index 1513f240..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfoWeakComparer.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class AsyncQueryInfoWeakComparer : IEqualityComparer<AsyncQueryInfo>
-  {
-    #region IEqualityComparer<AsyncQueryInfo> Members
-
-    public bool Equals( AsyncQueryInfo x, AsyncQueryInfo y )
-    {
-      if( ( x == null ) && ( y == null ) )
-        return true;
-
-      if( ( x == null ) || ( y == null ) )
-        return false;
-
-
-      if( ( x.StartIndex == y.StartIndex ) && ( x.RequestedItemCount == y.RequestedItemCount ) )
-        return true;
-
-      return false;
-    }
-
-    public int GetHashCode( AsyncQueryInfo obj )
-    {
-      if( obj == null )
-        return 0;
-
-      return obj.StartIndex ^ obj.RequestedItemCount;
-    }
-
-    #endregion IEqualityComparer<AsyncQueryInfo> Members
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/BindingPathValueExtractor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/BindingPathValueExtractor.cs
deleted file mode 100644
index ace88293..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/BindingPathValueExtractor.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Diagnostics;
-using System.Globalization;
-using System.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class BindingPathValueExtractor : FrameworkElement
-  {
-    #region CONSTRUCTORS
-
-    public BindingPathValueExtractor(
-      string xPath,
-      PropertyPath propertyPath,
-      bool onlyForWrite,
-      Type dataType,
-      IValueConverter converter,
-      object converterParameter,
-      CultureInfo converterCulture )
-    {
-      m_onlyForWrite = onlyForWrite;
-      m_targetType = dataType;
-      m_contextDataProvider = new ContextDataProvider();
-      m_binding = new Binding();
-      m_binding.XPath = xPath;
-      m_binding.Path = propertyPath;
-
-      if( converter == null )
-        throw new DataGridInternalException( "A Converter must be used" );
-
-      if( onlyForWrite )
-      {
-        m_binding.Mode = BindingMode.OneWayToSource;
-        m_binding.Converter = new ConvertBackInhibitorPassthroughConverter( converter );
-        m_binding.ConverterParameter = converterParameter;
-        m_binding.ConverterCulture = converterCulture;
-      }
-      else
-      {
-        m_binding.Mode = BindingMode.OneWay;
-        m_converter = converter;
-        m_converterParameter = converterParameter;
-        m_converterCulture = converterCulture;
-      }
-
-      m_binding.Source = m_contextDataProvider;
-
-      this.SetBinding(
-        BindingPathValueExtractor.ValueProperty,
-        m_binding );
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region ValueProperty
-
-    private static object UninitializedValueKey = new object();
-
-    private static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-      "Value", typeof( object ), typeof( BindingPathValueExtractor ), new PropertyMetadata( BindingPathValueExtractor.UninitializedValueKey ) );
-
-    private object Value
-    {
-      get
-      {
-        if( m_onlyForWrite )
-          throw new InvalidOperationException( "An attempt was made to read in a write-only binding." );
-
-        object value = this.GetValue( BindingPathValueExtractor.ValueProperty );
-
-        if( value == BindingPathValueExtractor.UninitializedValueKey )
-          value = null;
-
-        value = m_converter.Convert( value, m_targetType, m_converterParameter, m_converterCulture );
-
-        if( ( value == DependencyProperty.UnsetValue ) || ( value == Binding.DoNothing ) )
-          return null;
-
-        return value;
-      }
-      set
-      {
-        if( !m_onlyForWrite )
-          throw new InvalidOperationException( "An attempt was made to write in a read-only binding." );
-
-        this.SetValue( BindingPathValueExtractor.ValueProperty, value );
-      }
-    }
-
-    #endregion ValueProperty
-
-    #region PUBLIC METHODS
-
-    public object GetValueFromItem( object item )
-    {
-      m_contextDataProvider.SetNewDataContext( item );
-      return this.Value;
-
-      // To gain some performance we do not reset the context
-      //m_contextDataProvider.SetNewDataContext( null );
-    }
-
-    public void SetValueToItem( object item, object value )
-    {
-      if( m_binding.Mode == BindingMode.OneWay )
-        throw new InvalidOperationException( "An attempt was made to set a value for a read-only destination path." );
-
-      m_contextDataProvider.SetNewDataContext( item );
-      this.Value = value;
-
-      // To gain some performance we do not reset the context
-      //m_contextDataProvider.SetNewDataContext( null );
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region PRIVATE FIELDS
-
-    internal static readonly object[] EmptyObjectArray = new object[ 0 ];
-
-    private ContextDataProvider m_contextDataProvider;
-    private Binding m_binding;
-    private IValueConverter m_converter;
-    private object m_converterParameter;
-    private CultureInfo m_converterCulture;
-    private bool m_onlyForWrite;
-    private Type m_targetType;
-
-    #endregion PRIVATE FIELDS
-
-    #region PRIVATE ConvertBackInhibitorConverter CLASS
-
-    private class ConvertBackInhibitorPassthroughConverter : IValueConverter
-    {
-      public ConvertBackInhibitorPassthroughConverter( IValueConverter converter )
-      {
-        m_converter = converter;
-      }
-
-      #region IValueConverter Members
-
-      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        if( m_converter != null )
-          return m_converter.Convert( value, targetType, parameter, culture );
-
-        return value;
-      }
-
-      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        if( value == BindingPathValueExtractor.UninitializedValueKey )
-          return Binding.DoNothing;
-
-        if( m_converter != null )
-          return m_converter.ConvertBack( value, targetType, parameter, culture );
-
-        return value;
-      }
-
-      #endregion
-
-      #region PRIVATE FIELDS
-
-      private IValueConverter m_converter;
-
-      #endregion PRIVATE FIELDS
-    }
-
-    #endregion PRIVATE ConvertBackInhibitorConverter CLASS
-
-    #region PRIVATE ContextDataProvider CLASS
-
-    private class ContextDataProvider : DataSourceProvider
-    {
-      public ContextDataProvider()
-      {
-      }
-
-      public void SetNewDataContext( object dataContext )
-      {
-        m_dataContext = dataContext;
-        this.Refresh();
-      }
-
-      protected override void BeginQuery()
-      {
-        this.OnQueryFinished( m_dataContext );
-      }
-
-      private object m_dataContext;
-    }
-
-    #endregion PRIVATE ContextDataProvider CLASS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs
deleted file mode 100644
index 0b56e991..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.ObjectModel;
-using System.Diagnostics;
-
-
-namespace Xceed.Wpf.DataGrid
-{
-  public static class CollectionViewGroupExtensions
-  {
-
-    internal static SelectionRange GetRange( this CollectionViewGroup collectionViewGroup, DataGridContext dataGridContext )
-    {
-      int startIndex = -1;
-      int endIndex = -1;
-
-      DataGridVirtualizingCollectionViewGroupBase dataGridVirtualizingCollectionViewGroupBase = collectionViewGroup as DataGridVirtualizingCollectionViewGroupBase;
-      DataGridCollectionViewGroup dataGridCollectionViewGroup = collectionViewGroup as DataGridCollectionViewGroup;
-
-      if( dataGridVirtualizingCollectionViewGroupBase != null )
-      {
-        startIndex = dataGridVirtualizingCollectionViewGroupBase.StartGlobalIndex;
-        endIndex = startIndex + dataGridVirtualizingCollectionViewGroupBase.VirtualItemCount - 1;
-      }
-      else if( dataGridCollectionViewGroup != null )
-      {
-        startIndex = dataGridCollectionViewGroup.GetFirstRawItemGlobalSortedIndex();
-        endIndex = startIndex + dataGridCollectionViewGroup.GlobalRawItemCount - 1;
-      }
-      else if( collectionViewGroup.ItemCount > 0 )
-      {
-        if( dataGridContext == null )
-          throw new DataGridInternalException( "This collectionViewGroup require a DataGridContext instance" );
-
-        var firstItem = collectionViewGroup.GetFirstLeafItem();
-        var lastItem = collectionViewGroup.GetLastLeafItem();
-
-        if( firstItem != null && lastItem != null )
-        {
-          startIndex = dataGridContext.Items.IndexOf( firstItem );
-          endIndex = dataGridContext.Items.IndexOf( lastItem );
-        }
-      }
-
-      return ( startIndex >= 0 ) && ( startIndex <= endIndex )
-        ? new SelectionRange( startIndex, endIndex )
-        : SelectionRange.Empty;
-    }
-
-    public static IList<object> GetItems( this CollectionViewGroup collectionViewGroup )
-    {
-      var dataGridVirtualizingCollectionViewGroupBase = collectionViewGroup as DataGridVirtualizingCollectionViewGroupBase;
-      if( dataGridVirtualizingCollectionViewGroupBase != null )
-        return dataGridVirtualizingCollectionViewGroupBase.VirtualItems;
-
-      // The Items property of the DataGridCollectionViewGroup has been optimized to allow faster IndexOf and Contains. Since this property we could not
-      // override the property, we had to new it thus, we need to cast the CollectionViewGroup in the right type before acecssing the property.
-      var dataGridCollectionViewGroup = collectionViewGroup as DataGridCollectionViewGroup;
-      if( dataGridCollectionViewGroup != null )
-        return dataGridCollectionViewGroup.Items;
-
-      return collectionViewGroup.Items;
-    }
-
-    public static int GetItemCount( this CollectionViewGroup collectionViewGroup )
-    {
-      var dataGridVirtualizingCollectionViewGroupBase = collectionViewGroup as DataGridVirtualizingCollectionViewGroupBase;
-      if( dataGridVirtualizingCollectionViewGroupBase != null )
-        return dataGridVirtualizingCollectionViewGroupBase.VirtualItemCount;
-
-      return collectionViewGroup.ItemCount;
-    }
-
-    internal static IEnumerable<object> GetLeafItems( this CollectionViewGroup collectionViewGroup )
-    {
-      foreach( var item in collectionViewGroup.GetItems() )
-      {
-        if( item is CollectionViewGroup )
-        {
-          foreach( var subItem in ( ( CollectionViewGroup )item ).GetLeafItems() )
-          {
-            yield return subItem;
-          }
-        }
-        else
-        {
-          yield return item;
-        }
-      }
-    }
-
-    internal static object GetFirstLeafItem( this CollectionViewGroup collectionViewGroup )
-    {
-      IList<object> items = collectionViewGroup.GetItems();
-
-      if( items.Count == 0 )
-        return null;
-
-      var item = items[ 0 ];
-      var subGroup = item as CollectionViewGroup;
-
-      return ( subGroup != null )
-        ? subGroup.GetFirstLeafItem()
-        : item;
-    }
-
-    internal static object GetLastLeafItem( this CollectionViewGroup collectionViewGroup )
-    {
-      IList<object> items = collectionViewGroup.GetItems();
-
-      if( items.Count == 0 )
-        return null;
-
-      var item = items[ items.Count - 1 ];
-      var subGroup = item as CollectionViewGroup;
-
-      return ( subGroup != null )
-        ? subGroup.GetLastLeafItem()
-        : item;
-    }
-
-
-    internal static IEnumerable<CollectionViewGroup> GetSubGroups( this CollectionViewGroup collectionViewGroup )
-    {
-      foreach( var item in collectionViewGroup.GetItems() )
-      {
-        var subGroup = item as CollectionViewGroup;
-
-        //No need to check every items, they will be all Groups or not.
-        if( subGroup == null )
-          break;
-
-        yield return subGroup;
-
-        foreach( var subSubgroup in subGroup.GetSubGroups() )
-        {
-          yield return subGroup;
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CommitItemsEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CommitItemsEvent.cs
deleted file mode 100644
index d2e26886..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CommitItemsEvent.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class CommitItemsEventArgs : EventArgs
-  {
-    internal CommitItemsEventArgs( DataGridVirtualizingCollectionViewBase collectionView, AsyncCommitInfo asyncCommitInfo )
-    {
-      m_dataGridVirtualizingCollectionViewBase = collectionView;
-      m_asyncCommitInfo = asyncCommitInfo;
-    }
-
-    public DataGridVirtualizingCollectionViewBase CollectionView
-    {
-      get
-      {
-        return m_dataGridVirtualizingCollectionViewBase;
-      }
-    }
-
-    public AsyncCommitInfo AsyncCommitInfo
-    {
-      get
-      {
-        return m_asyncCommitInfo;
-      }
-    }
-
-    #region PRIVATE FIELDS
-
-    private DataGridVirtualizingCollectionViewBase m_dataGridVirtualizingCollectionViewBase;
-    private AsyncCommitInfo m_asyncCommitInfo;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ConnectionErrorChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ConnectionErrorChangedEventManager.cs
deleted file mode 100644
index 55233eec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ConnectionErrorChangedEventManager.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ConnectionErrorChangedEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private ConnectionErrorChangedEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static ConnectionErrorChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ConnectionErrorChangedEventManager );
-        var currentManager = ( ConnectionErrorChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ConnectionErrorChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridVirtualizingCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridVirtualizingCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridVirtualizingCollectionViewBase )source;
-      target.ConnectionErrorChanged += new EventHandler( this.DeliverEvent );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridVirtualizingCollectionViewBase )source;
-      target.ConnectionErrorChanged -= new EventHandler( this.DeliverEvent );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ConnectionStateChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ConnectionStateChangedEventManager.cs
deleted file mode 100644
index 5e0eaf03..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ConnectionStateChangedEventManager.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ConnectionStateChangedEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private ConnectionStateChangedEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static ConnectionStateChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ConnectionStateChangedEventManager );
-        var currentManager = ( ConnectionStateChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ConnectionStateChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridVirtualizingCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridVirtualizingCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridVirtualizingCollectionViewBase )source;
-      target.ConnectionStateChanged += new EventHandler( this.DeliverEvent );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridVirtualizingCollectionViewBase )source;
-      target.ConnectionStateChanged -= new EventHandler( this.DeliverEvent );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs
deleted file mode 100644
index 97e9ce23..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class CustomDistinctValueItemConfiguration
-  {
-    public CustomDistinctValueItemConfiguration()
-    {
-    }
-
-    public object Title
-    {
-      get;
-      set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfigurationCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfigurationCollection.cs
deleted file mode 100644
index b1b6c46c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfigurationCollection.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class CustomDistinctValueItemConfigurationCollection : ObservableCollection<CustomDistinctValueItemConfiguration>
-  {
-    internal CustomDistinctValueItemConfigurationCollection()
-    {
-    }
-
-    public CustomDistinctValueItemConfiguration this[ object configurationTitle ]
-    {
-      get
-      {
-        foreach( CustomDistinctValueItemConfiguration configuration in this )
-        {
-          if( configuration.Title == configurationTitle )
-          {
-            return configuration;
-          }
-        }
-
-        return null;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs
deleted file mode 100644
index eb81f1e5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs
+++ /dev/null
@@ -1,2456 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Windows.Data;
-using Xceed.Utils.Collections;
-using Xceed.Utils.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1039:ListsAreStronglyTyped" )]
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1035:ICollectionImplementationsHaveStronglyTypedMembers" )]
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix" )]
-  public sealed partial class DataGridCollectionView : DataGridCollectionViewBase, ISupportInitializeNotification, ICancelAddNew, IBindingList
-  {
-    public DataGridCollectionView( IEnumerable collection )
-      : this( collection, null, true, true )
-    {
-    }
-
-    public DataGridCollectionView( IEnumerable collection, Type itemType )
-      : this( collection, itemType, true, true )
-    {
-    }
-
-    public DataGridCollectionView( IEnumerable collection, Type itemType, bool autoCreateItemProperties, bool autoCreateDetailDescriptions )
-      : this( collection, itemType, autoCreateItemProperties, autoCreateDetailDescriptions, false )
-    {
-    }
-
-    public DataGridCollectionView( IEnumerable collection, Type itemType, bool autoCreateItemProperties, bool autoCreateDetailDescriptions, bool autoCreateForeignKeyDescriptions )
-      : base( null, collection, itemType, autoCreateItemProperties, autoCreateDetailDescriptions, autoCreateForeignKeyDescriptions )
-    {
-      if( collection == null )
-        throw new ArgumentNullException( "collection" );
-    }
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "This constructor is obsolete and should no longer be used.", true )]
-    public DataGridCollectionView( Type itemType )
-      : base( null, null, null, false, false, false )
-    {
-      throw new NotSupportedException( "This constructor is obsolete and should no longer be used." );
-    }
-
-    private DataGridCollectionView( IEnumerable collection, DataGridDetailDescription parentDetailDescription, DataGridCollectionView parentDataGridCollectionView )
-      : base( collection, parentDetailDescription, parentDataGridCollectionView.RootDataGridCollectionViewBase )
-    {
-      if( collection == null )
-        throw new ArgumentNullException( "collection" );
-
-      //If already deferring refreshes while a detail grid is expanded.
-      if( parentDataGridCollectionView.InDeferRefresh )
-      {
-        //If count is 0, it means this child collection view represents the first detail of its parent item, so create the parent's list of disposable.
-        if( parentDataGridCollectionView.DetailDeferRefreshes.Count == 0 )
-        {
-          parentDataGridCollectionView.DetailDeferRefreshes.Add( new List<IDisposable>() );
-        }
-
-        //Need to defer refresh on the detail CollectionView as well, and for as many "defers" there are presently at the master level.
-        foreach( List<IDisposable> detailDisposables in parentDataGridCollectionView.DetailDeferRefreshes )
-        {
-          detailDisposables.Add( this.DeferRefresh() );
-        }
-
-        //If Refresh() has been called on the root CollectionView, do it also for the detail one.
-        if( parentDataGridCollectionView.NeedsRefresh )
-        {
-          this.Refresh();
-        }
-      }
-    }
-
-    internal override void PreConstruct()
-    {
-      base.PreConstruct();
-
-      m_sourceItemList = new List<RawItem>( 128 );
-      m_filteredItemList = new List<RawItem>( 128 );
-
-      m_sourceItems = new SourceItemCollection( this );
-      this.RootGroup = new DataGridCollectionViewGroupRoot( this );
-    }
-
-    #region SourceItems Property
-
-    public IList SourceItems
-    {
-      get
-      {
-        this.EnsureThreadAndCollectionLoaded();
-        return m_sourceItems;
-      }
-    }
-
-    private SourceItemCollection m_sourceItems;
-
-    #endregion SourceItems Property
-
-    #region View Property
-
-    // The View property was created to continue the support of a binding where the 
-    // Path property was set to View to fix an issue with VS 2008:
-    // ItemsSource="{Binding Source={StaticResource cvs_orders}, Path=View}
-    //
-    // Since binding to a CollectionViewSource is like binding directly to 
-    // the object returned by the CVS (the DataGridCollectionView), which was not 
-    // the case with our older DataGridCollectionViewSource, we decided to expose "View" here
-    // to support the previously recommended fix.
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The View property is obsolete and should not be used. A Binding's Path property no longer needs to  be set to the underlying View.", true )]
-    public DataGridCollectionView View
-    {
-      get
-      {
-        return this;
-      }
-    }
-
-    #endregion View Property
-
-    #region Count Property
-
-    public override int Count
-    {
-      get
-      {
-        this.EnsureThreadAndCollectionLoaded();
-        return this.RootGroup.GlobalRawItemCount;
-      }
-    }
-
-    #endregion Count Property
-
-    #region IsAddingItem Property
-
-    [Obsolete( "The IsAddingItem property is obsolete and has been replaced by the IsAddingNew property.", false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public bool IsAddingItem
-    {
-      get
-      {
-        return this.IsAddingNew;
-      }
-    }
-
-    #endregion IsAddingItem Property
-
-    #region RawItemIndexComparer Property
-
-    private static RawItemIndexComparer RawItemIndexComparer
-    {
-      get
-      {
-        if( m_rawItemIndexComparer == null )
-          m_rawItemIndexComparer = new RawItemIndexComparer();
-
-        return m_rawItemIndexComparer;
-      }
-    }
-
-    #endregion
-
-    #region RawItemSortComparer Property
-
-    private RawItemSortComparer RawItemSortComparer
-    {
-      get
-      {
-        if( m_rawItemSortComparer == null )
-          m_rawItemSortComparer = new RawItemSortComparer( this );
-
-        return m_rawItemSortComparer;
-      }
-    }
-
-    #endregion
-
-    #region Insertion Property
-
-    public bool AllowNew
-    {
-      get
-      {
-        return this.CanAddNew;
-      }
-    }
-
-    #endregion
-
-    #region RootGroup Property
-
-    internal new DataGridCollectionViewGroupRoot RootGroup
-    {
-      get
-      {
-        return base.RootGroup as DataGridCollectionViewGroupRoot;
-      }
-      set
-      {
-        base.RootGroup = value;
-      }
-    }
-
-    #endregion
-
-    #region SortedItemVersion Property
-
-    internal int SortedItemVersion
-    {
-      get
-      {
-        return m_sortedItemVersion;
-      }
-    }
-
-    #endregion
-
-    #region SourceItemCount Property
-
-    internal override int SourceItemCount
-    {
-      get
-      {
-        return m_sourceItemList.Count;
-      }
-    }
-
-    #endregion
-
-    #region SyncRoot Property
-
-    internal override object SyncRoot
-    {
-      get
-      {
-        IEnumerable enumeration = this.Enumeration;
-
-        ICollection collection = enumeration as ICollection;
-
-        if( collection != null )
-          return collection.SyncRoot;
-
-        if( enumeration != null )
-          return enumeration;
-
-        return base.SyncRoot;
-      }
-    }
-
-    #endregion
-
-    public override bool MoveCurrentToPosition( int position )
-    {
-      if( position == this.CurrentPosition )
-        return ( this.CurrentItem != null );
-
-      this.EnsureThreadAndCollectionLoaded();
-      return this.SetCurrentItem( position, true );
-    }
-
-    public override void RemoveAt( int index )
-    {
-      if( !this.CanRemove )
-        throw new InvalidOperationException( "An attempt was made to remove an item from a source that does not support removal." );
-
-      RawItem rawItem = this.GetRawItemAt( index );
-      int sourceIndex;
-      object dataItem;
-
-      if( rawItem != null )
-      {
-        sourceIndex = rawItem.Index;
-        dataItem = rawItem.DataItem;
-      }
-      else
-      {
-        sourceIndex = -1;
-        dataItem = null;
-      }
-
-      DataGridRemovingItemEventArgs removingItemEventArgs = new DataGridRemovingItemEventArgs( this, dataItem, index, false );
-      this.RootDataGridCollectionViewBase.OnRemovingItem( removingItemEventArgs );
-
-      if( removingItemEventArgs.Cancel )
-        throw new DataGridException( "RemoveAt was canceled." );
-
-      if( !removingItemEventArgs.Handled )
-        this.InternalRemoveAt( sourceIndex );
-
-      if( ( !this.IsSourceSupportingChangeNotification ) && ( sourceIndex != -1 ) )
-      {
-        DeferredOperation deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Remove, sourceIndex, new object[] { dataItem } );
-
-        this.ExecuteOrQueueSourceItemOperation( deferredOperation );
-      }
-
-      DataGridItemRemovedEventArgs itemRemovedEventArgs = new DataGridItemRemovedEventArgs( this, dataItem, index );
-      this.RootDataGridCollectionViewBase.OnItemRemoved( itemRemovedEventArgs );
-    }
-
-    public override object GetItemAt( int index )
-    {
-      this.EnsureThreadAndCollectionLoaded();
-
-      return this.RootGroup.GetRawItemAtGlobalSortedIndex( index ).DataItem;
-    }
-
-    public void ResetItem( object item )
-    {
-      DeferredOperation deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.ResetItem, item );
-      this.ExecuteOrQueueSourceItemOperation( deferredOperation );
-    }
-
-    public void ResetItems( IList items )
-    {
-      DeferredOperation deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.ResetItem, items );
-      this.ExecuteOrQueueSourceItemOperation( deferredOperation );
-    }
-
-    public void RefreshUnboundItemProperties( object item = null )
-    {
-      DeferredOperation deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.RefreshUnboundItemProperties, item );
-      this.ExecuteOrQueueSourceItemOperation( deferredOperation );
-    }
-
-    public void RefreshUnboundItemProperties( IList items )
-    {
-      DeferredOperation deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.RefreshUnboundItemProperties, items );
-      this.ExecuteOrQueueSourceItemOperation( deferredOperation );
-    }
-
-    internal override DataGridCollectionViewBase CreateDetailDataGridCollectionViewBase(
-      IEnumerable detailDataSource,
-      DataGridDetailDescription parentDetailDescription,
-      DataGridCollectionViewBase parentDataGridCollectionViewBase )
-    {
-      Debug.Assert( parentDataGridCollectionViewBase is DataGridCollectionView );
-
-      if( parentDetailDescription != null )
-        return new DataGridCollectionView( detailDataSource, parentDetailDescription, parentDataGridCollectionViewBase as DataGridCollectionView );
-
-      return new DataGridCollectionView( detailDataSource );
-    }
-
-    internal override void CreateDefaultCollections( DataGridDetailDescription parentDetailDescription )
-    {
-      base.CreateDefaultCollections( parentDetailDescription );
-    }
-
-    internal override bool CanCreateItemProperties()
-    {
-      if( base.CanCreateItemProperties() )
-        return true;
-
-      return ( m_sourceItems.Count != 0 );
-    }
-
-    internal override int IndexOfSourceItem( object item )
-    {
-      if( item != null )
-      {
-        // The source index of raw items may not be up-to-date if some operations were deferred.
-        if( !this.DeferredOperationManager.HasPendingOperations )
-        {
-          // Use the RawItem/DataItem mapping instead of looping through the list for efficency.
-          var rawItem = this.GetFirstRawItemFromDataItem( item );
-
-          if( rawItem != null )
-            return rawItem.Index;
-        }
-
-        IList list = this.Enumeration as IList;
-        if( list != null )
-          return list.IndexOf( item );
-
-        var index = 0;
-        foreach( var obj in this.Enumeration )
-        {
-          if( obj == item )
-            return index;
-
-          index++;
-        }
-      }
-
-      return -1;
-    }
-
-    internal override void EnsurePosition( int globalSortedIndex )
-    {
-      RawItem rawItem = this.GetRawItemAt( globalSortedIndex );
-
-      this.EnsurePosition( rawItem, globalSortedIndex );
-    }
-
-    internal override void ExecuteSourceItemOperation( DeferredOperation deferredOperation, out bool refreshForced )
-    {
-      switch( deferredOperation.Action )
-      {
-        case DeferredOperation.DeferredOperationAction.Add:
-          {
-            refreshForced = !this.AddSourceItem( deferredOperation.NewStartingIndex, deferredOperation.NewItems, deferredOperation.NewSourceItemCount );
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.Move:
-          {
-            refreshForced = !this.MoveSourceItem( deferredOperation.OldStartingIndex, deferredOperation.OldItems, deferredOperation.NewStartingIndex );
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.Refresh:
-          {
-            refreshForced = false;
-            this.OnProxyCollectionRefresh();
-            this.ForceRefresh( true, false, true );
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.RefreshDistincValues:
-          {
-            refreshForced = false;
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.Regroup:
-          {
-            refreshForced = false;
-
-            // Ensure to defer the CurrentItem change when regrouping is completed to be sure the SaveCurrent has the right values when restoring
-            using( this.DeferCurrencyEvent() )
-            {
-              var oldCurrentPosition = -1;
-              var oldCurrentRawItem = default( RawItem );
-
-              this.SaveCurrentBeforeReset( out oldCurrentRawItem, out oldCurrentPosition );
-
-              var sortDescriptionInfos = default( IList<SortDescriptionInfo> );
-
-              this.GroupItems();
-              this.PrepareSort( out sortDescriptionInfos );
-              this.SortItems( sortDescriptionInfos );
-
-              // Ensure to send reset notifications
-              this.AdjustCurrentAndSendResetNotification( oldCurrentRawItem, oldCurrentPosition );
-              this.TriggerRootGroupChanged();
-            }
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.Remove:
-          {
-            refreshForced = !this.RemoveSourceItem( deferredOperation.OldStartingIndex, deferredOperation.OldItems.Count );
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.Replace:
-          {
-            refreshForced = !this.ReplaceSourceItem( deferredOperation.OldStartingIndex, deferredOperation.OldItems,
-                                                     deferredOperation.NewStartingIndex, deferredOperation.NewItems );
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.Resort:
-          {
-            refreshForced = false;
-
-            // Ensure to defer the CurrentItem change when resort is completed to be sure the SaveCurrent has the right values when restoring
-            using( this.DeferCurrencyEvent() )
-            {
-              var oldCurrentPosition = -1;
-              var oldCurrentRawItem = default( RawItem );
-
-              this.SaveCurrentBeforeReset( out oldCurrentRawItem, out oldCurrentPosition );
-
-              var sortDescriptionInfos = default( IList<SortDescriptionInfo> );
-
-              this.PrepareSort( out sortDescriptionInfos );
-              this.SortItems( sortDescriptionInfos );
-
-              // Ensure to send reset notifications
-              this.AdjustCurrentAndSendResetNotification( oldCurrentRawItem, oldCurrentPosition );
-
-              //If there is no grouping, there is no group changes, so no GroupChanged to raise.
-              if( !this.RootGroup.IsBottomLevel )
-              {
-                this.TriggerRootGroupChanged();
-              }
-            }
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.ResetItem:
-          {
-            refreshForced = false;
-            if( deferredOperation.DataItem != null )
-            {
-              this.ResetSourceItem( deferredOperation.DataItem );
-            }
-            else
-            {
-              this.ResetSourceItems( deferredOperation.NewItems );
-            }
-            m_currentChildCollectionView = null;
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.RefreshUnboundItemProperties:
-          {
-            refreshForced = false;
-            if( deferredOperation.NewItems != null )
-            {
-              this.RefreshUnboundItemPropertiesCore( deferredOperation.NewItems );
-            }
-            else
-            {
-              this.RefreshUnboundItemPropertiesCore( deferredOperation.DataItem );
-            }
-            m_currentChildCollectionView = null;
-            break;
-          }
-
-        default:
-          {
-            base.ExecuteSourceItemOperation( deferredOperation, out refreshForced );
-            break;
-          }
-      }
-    }
-
-    internal override void ForceRefresh( bool sendResetNotification, bool initialLoad, bool setCurrentToFirstOnInitialLoad )
-    {
-      if( this.Refreshing )
-        throw new InvalidOperationException( "An attempt was made to refresh the DataGridCollectionView while it is already in the process of refreshing." );
-
-      if( this.IsRefreshingDistinctValues )
-        throw new InvalidOperationException( "An attempt was made to refresh the DataGridCollectionView while it is already in the process of refreshing distinct values." );
-
-      this.SetCurrentEditItem( null );
-
-      var oldCurrentPosition = -1;
-      var oldCurrentRawItem = default( RawItem );
-
-      if( !initialLoad )
-      {
-        this.SaveCurrentBeforeReset( out oldCurrentRawItem, out oldCurrentPosition );
-      }
-
-      var sortDescriptionInfos = default( IList<SortDescriptionInfo> );
-
-      using( this.DeferCurrencyEvent() )
-      {
-        this.Refreshing = true;
-
-        try
-        {
-          lock( this.SyncRoot )
-          {
-            var deferredOperationManager = this.DeferredOperationManager;
-
-            lock( deferredOperationManager )
-            {
-              deferredOperationManager.ClearDeferredOperations();
-              m_lastAddCount = -1;
-
-              var bLoaded = false;
-              var enumeration = this.Enumeration;
-              var collectionView = enumeration as CollectionView;
-
-              if( collectionView == null )
-              {
-                var list = enumeration as IList;
-
-                if( list != null )
-                {
-                  int count = list.Count;
-
-                  m_sourceItemList.Clear();
-                  m_filteredItemList.Clear();
-                  m_dataItemToRawItemMap.Clear();
-
-                  for( int i = 0; i < count; i++ )
-                  {
-                    var item = list[ i ];
-                    var rawItem = new RawItem( i, item );
-
-                    m_sourceItemList.Add( rawItem );
-                    this.AddRawItemDataItemMapping( rawItem );
-
-                    if( this.PassesFilter( item ) )
-                    {
-                      m_filteredItemList.Add( rawItem );
-                    }
-                  }
-
-                  bLoaded = true;
-                }
-              }
-
-              if( !bLoaded )
-              {
-                if( enumeration != null )
-                {
-                  var count = 128;
-
-                  if( collectionView != null )
-                  {
-                    count = collectionView.Count;
-                  }
-                  else
-                  {
-                    var collection = enumeration as ICollection;
-                    if( collection != null )
-                    {
-                      count = collection.Count;
-                    }
-                  }
-
-                  m_sourceItemList.Clear();
-                  m_filteredItemList.Clear();
-                  m_dataItemToRawItemMap.Clear();
-
-                  var index = 0;
-                  var enumerator = enumeration.GetEnumerator();
-
-                  while( enumerator.MoveNext() )
-                  {
-                    var item = enumerator.Current;
-                    var rawItem = new RawItem( index, item );
-
-                    index++;
-                    m_sourceItemList.Add( rawItem );
-
-                    this.AddRawItemDataItemMapping( rawItem );
-
-                    if( this.PassesFilter( item ))
-                    {
-                      m_filteredItemList.Add( rawItem );
-                    }
-                  }
-                }
-              }
-
-              m_filteredItemList.TrimExcess();
-
-              // We set the current item to -1 to prevent the developper to get an invalid position.
-              // We will replace the current item to the correct one later.
-              this.SetCurrentItem( -1, null, false, false );
-              this.GroupItems();
-
-              // This will cache the data for the sorting
-              this.PrepareSort( out sortDescriptionInfos );
-            }
-          }
-
-          this.SortItems( sortDescriptionInfos );
-
-          unchecked
-          {
-            m_sortedItemVersion++;
-          }
-        }
-        finally
-        {
-          this.Refreshing = false;
-        }
-
-        if( initialLoad )
-        {
-          this.Loaded = true;
-          this.AdjustCurrencyAfterInitialLoad( setCurrentToFirstOnInitialLoad );
-        }
-        else
-        {
-          this.AdjustCurrencyAfterReset( oldCurrentRawItem, oldCurrentPosition, true );
-        }
-
-        if( sendResetNotification )
-        {
-          this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-        }
-
-        this.TriggerRootGroupChanged();
-      }
-    }
-
-    internal override void ClearGroupSortComparers()
-    {
-      m_groupSortComparers.Clear();
-      m_groupSortComparers.TrimExcess();
-    }
-
-    internal RawItem GetRawItemAt( int index )
-    {
-      this.EnsureThreadAndCollectionLoaded();
-      return this.RootGroup.GetRawItemAtGlobalSortedIndex( index );
-    }
-
-    internal object GetSourceItemAt( int index )
-    {
-      if( index > m_sourceItemList.Count - 1 )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than zero and less than SourceItems.Count." );
-
-      return m_sourceItemList[ index ].DataItem;
-    }
-
-    internal IEnumerator<RawItem> GetSourceListEnumerator()
-    {
-      return m_sourceItemList.GetEnumerator();
-    }
-
-    internal bool AddSourceItem( int startIndex, IList items, int newSourceItemCount )
-    {
-      if( items == null )
-        throw new ArgumentNullException( "items" );
-
-      if( ( startIndex < 0 ) || ( startIndex > m_sourceItemList.Count ) )
-      {
-        this.ForceRefresh( true, !this.Loaded, true );
-        return false;
-      }
-
-      if( ( newSourceItemCount != -1 ) && ( newSourceItemCount == m_lastAddCount ) )
-      {
-        // In that case, we are reciving a second add to confirm an insertion of a previous item.
-        // We will convert this add into a replace.
-        return this.ReplaceSourceItem( m_lastAddIndex, items, m_lastAddIndex, items );
-      }
-
-      m_lastAddCount = newSourceItemCount;
-      m_lastAddIndex = startIndex;
-
-      for( int i = 0; i < items.Count; i++ )
-      {
-        var index = startIndex + i;
-        var item = items[ i ];
-        var rawItem = new RawItem( index, item );
-
-        if( this.PassesFilter( item ) )
-        {
-          this.AddRawItemInSourceList( index, rawItem );
-          this.AddRawItemInFilteredList( rawItem );
-          this.AddRawItemInGroup( rawItem );
-        }
-        else
-        {
-          this.AddRawItemInSourceList( index, rawItem );
-        }
-      }
-
-      return true;
-    }
-
-    internal bool RemoveSourceItem( int startIndex, int count )
-    {
-      m_lastAddCount = -1;
-
-      if( ( startIndex < 0 ) || ( ( startIndex + count ) > m_sourceItemList.Count ) )
-      {
-        this.ForceRefresh( true, !this.Loaded, true );
-        return false;
-      }
-
-      for( int i = 0; i < count; i++ )
-      {
-        var rawItem = m_sourceItemList[ startIndex ];
-
-        if( this.CurrentEditItem == rawItem.DataItem )
-        {
-          this.SetCurrentEditItem( null );
-        }
-
-        if( this.RemoveRawItemInFilteredList( rawItem ) )
-        {
-          this.RemoveRawItemInSourceList( startIndex );
-          this.RemoveRawItemInGroup( rawItem );
-        }
-        else
-        {
-          this.RemoveRawItemInSourceList( startIndex );
-        }
-      }
-
-      return true;
-    }
-
-    internal bool ReplaceSourceItem( int oldStartIndex, IList oldItems, int newStartIndex, IList newItems )
-    {
-      m_lastAddCount = -1;
-
-      if( ( oldStartIndex < 0 ) || ( newStartIndex < 0 ) )
-      {
-        this.ForceRefresh( true, !this.Loaded, true );
-        return false;
-      }
-
-      int oldItemCount = oldItems.Count;
-      int newItemCount = newItems.Count;
-      int sourceItemListCount = m_sourceItemList.Count;
-
-      if( ( oldStartIndex + oldItemCount ) > sourceItemListCount || ( newStartIndex + newItemCount ) > sourceItemListCount )
-      {
-        this.ForceRefresh( true, !this.Loaded, true );
-        return false;
-      }
-
-      int extraOldItemCount = oldItemCount - newItemCount;
-
-      int count = Math.Min( newItemCount, oldItemCount );
-
-      using( this.DeferCurrencyEvent() )
-      {
-        for( int i = 0; i < count; i++ )
-        {
-          if( oldStartIndex == newStartIndex )
-          {
-            RawItem rawItem = m_sourceItemList[ oldStartIndex + i ];
-            object oldItem = rawItem.DataItem;
-            int globalSortedIndex = rawItem.GetGlobalSortedIndex();
-            object newItem = newItems[ i ];
-
-            // globalSortedIndex == -1 means item does not pass filter
-            if( globalSortedIndex != -1 )
-            {
-              bool itemChanged = !object.Equals( oldItem, newItem );
-              if( ( this.CurrentEditItem == oldItem ) && ( itemChanged ) )
-              {
-                try
-                {
-                  this.CancelEdit();
-                }
-                catch
-                {
-                }
-              }
-
-              if( this.CurrentEditItem != oldItem )
-              {
-                if( newItem != oldItem )
-                {
-                  this.RemoveRawItemDataItemMapping( rawItem );
-                  rawItem.SetDataItem( newItem );
-                  this.AddRawItemDataItemMapping( rawItem );
-
-                  this.AdjustCurrencyBeforeReplace( globalSortedIndex, newItem );
-                }
-
-                DataGridCollectionViewGroup oldGroup = rawItem.ParentGroup;
-
-                // Even if the newItem == oldItem, we want to set rawItem.ParentGroup.ProtectedItems[] for the change event to be raised.
-                if( ( oldGroup != null ) && ( oldGroup != this.RootGroup ) )
-                {
-                  oldGroup.ProtectedItems[ rawItem.SortedIndex ] = newItem;
-                }
-
-                this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, newItem, oldItem, rawItem.GetGlobalSortedIndex() ) );
-
-                this.EnsurePosition( rawItem, globalSortedIndex );
-
-                DataGridCollectionViewGroup newGroup = rawItem.ParentGroup;
-                bool movedToDifferentParentGroup = oldGroup != newGroup;
-              }
-            }
-            else
-            {
-              if( newItem != oldItem )
-              {
-                this.RemoveRawItemDataItemMapping( rawItem );
-                rawItem.SetDataItem( newItem );
-                this.AddRawItemDataItemMapping( rawItem );
-              }
-
-              // Since it is a replace, we must re-ensure position and invalidate stats function (no need to invalidate the old group, since the old item is filtered
-              // out, and thus has no parent group), even if it is an item being replaced by itself, in case a property changed would now let it pass the filter.
-              this.EnsurePosition( rawItem, globalSortedIndex );
-            }
-          }
-          else
-          {
-            Debug.Fail( "Replace should have an oldStartIndex equal to newStartIndex." );
-            this.RemoveSourceItem( oldStartIndex + i, 1 );
-            this.AddSourceItem( newStartIndex + i, new object[] { newItems[ i ] }, -1 );
-          }
-        }
-
-        if( extraOldItemCount > 0 )
-        {
-          this.RemoveSourceItem( oldStartIndex + newItemCount, extraOldItemCount );
-        }
-
-        int extraNewItemCount = newItemCount - oldItemCount;
-
-        if( extraNewItemCount > 0 )
-        {
-          object[] tempItems = new object[ extraNewItemCount ];
-
-          for( int i = 0; i < extraNewItemCount; i++ )
-          {
-            tempItems[ i ] = newItems[ oldItemCount + i ];
-          }
-
-          this.AddSourceItem( newStartIndex + oldItemCount, tempItems, -1 );
-        }
-      }
-
-      return true;
-    }
-
-    internal RawItem GetFirstRawItemFromDataItem( object dataItem )
-    {
-      this.EnsureThreadAndCollectionLoaded();
-
-      return m_dataItemToRawItemMap[ dataItem ];
-    }
-
-    internal int GetGlobalSortedIndexFromDataItem( object dataItem )
-    {
-      RawItem rawItem = this.GetFirstRawItemFromDataItem( dataItem );
-      int globalSortedIndex = rawItem.GetGlobalSortedIndex();
-      if( globalSortedIndex == -1 )
-      {
-        return rawItem.SortedIndex;
-      }
-
-      return globalSortedIndex;
-    }
-
-    internal IEnumerable<object> GetSortedFilteredDataItems()
-    {
-      foreach( RawItem item in this.RootGroup.RawItems )
-      {
-        yield return item.DataItem;
-      }
-    }
-
-    private static DataStore CreateStore( Type dataType, int initialCapacity )
-    {
-      if( dataType == typeof( bool ) )
-      {
-        return new BoolDataStore( initialCapacity );
-      }
-      else if( dataType == typeof( byte ) )
-      {
-        return new ValueTypeDataStore<byte>( initialCapacity );
-      }
-      else if( dataType == typeof( char ) )
-      {
-        return new ValueTypeDataStore<char>( initialCapacity );
-      }
-      else if( dataType == typeof( DateTime ) )
-      {
-        return new ValueTypeDataStore<DateTime>( initialCapacity );
-      }
-      else if( dataType == typeof( decimal ) )
-      {
-        return new ValueTypeDataStore<decimal>( initialCapacity );
-      }
-      else if( dataType == typeof( double ) )
-      {
-        return new ValueTypeDataStore<double>( initialCapacity );
-      }
-      else if( dataType == typeof( Guid ) )
-      {
-        return new ValueTypeDataStore<Guid>( initialCapacity );
-      }
-      else if( dataType == typeof( short ) )
-      {
-        return new ValueTypeDataStore<short>( initialCapacity );
-      }
-      else if( dataType == typeof( int ) )
-      {
-        return new ValueTypeDataStore<int>( initialCapacity );
-      }
-      else if( dataType == typeof( long ) )
-      {
-        return new ValueTypeDataStore<long>( initialCapacity );
-      }
-      else if( dataType == typeof( sbyte ) )
-      {
-        return new ValueTypeDataStore<sbyte>( initialCapacity );
-      }
-      else if( dataType == typeof( float ) )
-      {
-        return new ValueTypeDataStore<float>( initialCapacity );
-      }
-      else if( dataType == typeof( string ) )
-      {
-        return new StringDataStore( initialCapacity );
-      }
-      else if( dataType == typeof( TimeSpan ) )
-      {
-        return new ValueTypeDataStore<TimeSpan>( initialCapacity );
-      }
-      else if( dataType == typeof( ushort ) )
-      {
-        return new ValueTypeDataStore<ushort>( initialCapacity );
-      }
-      else if( dataType == typeof( uint ) )
-      {
-        return new ValueTypeDataStore<uint>( initialCapacity );
-      }
-      else if( dataType == typeof( ulong ) )
-      {
-        return new ValueTypeDataStore<ulong>( initialCapacity );
-      }
-      else
-      {
-        return new ObjectDataStore( initialCapacity );
-      }
-    }
-
-    private void EnsurePosition( RawItem rawItem, int globalSortedIndex )
-    {
-      Debug.Assert( rawItem.GetGlobalSortedIndex() == globalSortedIndex );
-
-      var dataItem = rawItem.DataItem;
-
-      if( this.PassesFilter( dataItem ) )
-      {
-        if( globalSortedIndex == -1 )
-        {
-          this.AddRawItemInFilteredList( rawItem );
-          this.AddRawItemInGroup( rawItem );
-          return;
-        }
-      }
-      else
-      {
-        if( globalSortedIndex != -1 )
-        {
-          this.RemoveRawItemInFilteredList( rawItem );
-          this.RemoveRawItemInGroup( rawItem );
-        }
-
-        return;
-      }
-
-      // Verify the row is in the correct group.
-      var newGroup = this.GetRawItemNewGroup( rawItem );
-      var currentGroup = rawItem.ParentGroup;
-
-      if( currentGroup != newGroup )
-      {
-        using( this.DeferCurrencyEvent() )
-        {         
-          var newSortIndex = newGroup.BinarySearchRawItem( rawItem, this.RawItemSortComparer );
-          if( newSortIndex < 0 )
-          {
-            newSortIndex = ~newSortIndex;
-          }
-
-          currentGroup.RemoveRawItemAt( rawItem.SortedIndex );
-          newGroup.InsertRawItem( newSortIndex, rawItem );
-
-          var newGlobalSortedIndex = rawItem.GetGlobalSortedIndex();
-          this.AdjustCurrencyAfterMove( globalSortedIndex, newGlobalSortedIndex, 1 );
-
-          this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Move, rawItem.DataItem, newGlobalSortedIndex, globalSortedIndex ) );
-        }
-      }
-      else
-      {
-        // Verify sorting only if we have not changed group, since adding an item in a group will automatically sort it.
-        // Even if we are not sorted, we must ensure the order matches the natural order of the source.
-        int newSortIndex = newGroup.BinarySearchRawItem( rawItem, this.RawItemSortComparer );
-
-        if( newSortIndex < 0 )
-        {
-          newSortIndex = ~newSortIndex;
-        }
-
-        if( newSortIndex > rawItem.SortedIndex )
-        {
-          newSortIndex--;
-        }
-
-        if( rawItem.SortedIndex != newSortIndex )
-        {
-          using( this.DeferCurrencyEvent() )
-          {
-            newGroup.MoveRawItem( rawItem.SortedIndex, newSortIndex );
-
-            var newGlobalSortedIndex = rawItem.GetGlobalSortedIndex();
-            this.AdjustCurrencyAfterMove( globalSortedIndex, newGlobalSortedIndex, 1 );
-
-            this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Move, rawItem.DataItem, newGlobalSortedIndex, globalSortedIndex ) );
-          }
-        }
-      }
-    }
-
-    private bool SetCurrentItem( int newCurrentPosition, bool isCancelable )
-    {
-      DataGridCollectionViewGroupRoot rootGroup = this.RootGroup;
-      int itemCount = rootGroup.GlobalRawItemCount;
-
-      if( ( newCurrentPosition < -1 ) || ( newCurrentPosition > itemCount ) )
-        throw new ArgumentOutOfRangeException( "newCurrentPosition", "The current position must be greater than -1 and less than Count." );
-
-      // When we have no items, the current item/position must not be changed
-      // We have done that to get a behavior like the microsoft BindingListCollectionView
-      if( itemCount == 0 )
-        return false;
-
-      object newCurrentItem = null;
-
-      if( ( newCurrentPosition >= 0 ) && ( newCurrentPosition < itemCount ) )
-      {
-        RawItem newCurrentRawItem = rootGroup.GetRawItemAtGlobalSortedIndex( newCurrentPosition );
-
-        if( newCurrentRawItem != null )
-          newCurrentItem = newCurrentRawItem.DataItem;
-      }
-
-      return this.SetCurrentItem( newCurrentPosition, newCurrentItem, isCancelable, false );
-    }
-
-    private bool SetCurrentItem( int newCurrentPosition, object newCurrentItem, bool isCancelable, bool beforeDeleteOperation )
-    {
-      object oldCurrentItem = this.CurrentItem;
-      int oldCurrentPosition = this.CurrentPosition;
-      bool oldIsCurrentBeforeFirst = this.IsCurrentBeforeFirst;
-      bool oldIsCurrentAfterLast = this.IsCurrentAfterLast;
-
-      if( ( !object.Equals( oldCurrentItem, newCurrentItem ) ) || ( oldCurrentPosition != newCurrentPosition ) )
-      {
-        // We raise the changing event even if we are in DeferCurrencyEvent
-        CurrentChangingEventArgs currentChangingEventArgs = new CurrentChangingEventArgs( isCancelable );
-        this.OnCurrentChanging( currentChangingEventArgs );
-
-        if( ( !currentChangingEventArgs.Cancel ) || ( !currentChangingEventArgs.IsCancelable ) )
-        {
-          int globalRawItemCount = this.RootGroup.GlobalRawItemCount;
-
-          if( beforeDeleteOperation )
-          {
-            Debug.Assert( globalRawItemCount > 0 );
-            globalRawItemCount--;
-          }
-
-          bool isCurrentBeforeFirst;
-          bool isCurrentAfterLast;
-
-          if( globalRawItemCount == 0 )
-          {
-            isCurrentBeforeFirst = true;
-            isCurrentAfterLast = true;
-          }
-          else
-          {
-            isCurrentBeforeFirst = newCurrentPosition < 0;
-            isCurrentAfterLast = newCurrentPosition >= globalRawItemCount;
-          }
-
-#if DEBUG
-          if( newCurrentItem == null )
-            Debug.Assert( ( newCurrentPosition == -1 ) || ( newCurrentPosition >= ( globalRawItemCount - 1 ) ) );
-#endif
-
-          this.SetCurrentItemAndPositionCore( newCurrentItem, newCurrentPosition, isCurrentBeforeFirst, isCurrentAfterLast );
-
-          if( !this.IsCurrencyDeferred )
-          {
-            if( !object.Equals( oldCurrentItem, newCurrentItem ) )
-            {
-              this.OnPropertyChanged( new PropertyChangedEventArgs( "CurrentItem" ) );
-            }
-
-            if( oldCurrentPosition != this.CurrentPosition )
-            {
-              this.OnPropertyChanged( new PropertyChangedEventArgs( "CurrentPosition" ) );
-            }
-
-            if( oldIsCurrentBeforeFirst != this.IsCurrentBeforeFirst )
-            {
-              this.OnPropertyChanged( new PropertyChangedEventArgs( "IsCurrentBeforeFirst" ) );
-            }
-
-            if( oldIsCurrentAfterLast != this.IsCurrentAfterLast )
-            {
-              this.OnPropertyChanged( new PropertyChangedEventArgs( "IsCurrentAfterLast" ) );
-            }
-
-            this.OnCurrentChanged();
-          }
-        }
-      }
-
-      return ( newCurrentItem != null );
-    }
-
-    private bool MoveSourceItem( int oldStartIndex, IList items, int newStartIndex )
-    {
-      var count = items.Count;
-
-      if( ( oldStartIndex < 0 ) || ( oldStartIndex + count > m_sourceItemList.Count ) || ( newStartIndex < 0 ) || ( newStartIndex > ( m_sourceItemList.Count - count ) ) )
-      {
-        this.ForceRefresh( true, !this.Loaded, true );
-        return false;
-      }
-
-      m_lastAddCount = -1;
-
-      if( oldStartIndex < newStartIndex )
-      {
-        for( int i = count - 1; i >= 0; i-- )
-        {
-          var oldIndex = oldStartIndex + i;
-          var newIndex = newStartIndex + i;
-
-          Debug.Assert( ( oldIndex >= 0 ) && ( oldIndex < m_sourceItemList.Count ) );
-          Debug.Assert( ( newIndex >= 0 ) && ( newIndex < m_sourceItemList.Count ) );
-
-          var rawItem = m_sourceItemList[ oldIndex ];
-          var wasFiltered = this.RemoveRawItemInFilteredList( rawItem );
-
-          m_sourceItemList.RemoveAt( oldIndex );
-          m_sourceItemList.Insert( newIndex, rawItem );
-
-          for( int j = oldIndex; j <= newIndex; j++ )
-          {
-            m_sourceItemList[ j ].SetIndex( j );
-          }
-
-          if( wasFiltered )
-          {
-            this.AddRawItemInFilteredList( rawItem );
-            this.EnsurePosition( rawItem, rawItem.GetGlobalSortedIndex() );
-          }
-        }
-      }
-      else if( oldStartIndex > newStartIndex )
-      {
-        for( int i = 0; i < count; i++ )
-        {
-          var oldIndex = oldStartIndex + i;
-          var newIndex = newStartIndex + i;
-
-          Debug.Assert( ( oldIndex >= 0 ) && ( oldIndex < m_sourceItemList.Count ) );
-          Debug.Assert( ( newIndex >= 0 ) && ( newIndex < m_sourceItemList.Count ) );
-
-          var rawItem = m_sourceItemList[ oldIndex ];
-          var wasFiltered = this.RemoveRawItemInFilteredList( rawItem );
-
-          m_sourceItemList.RemoveAt( oldIndex );
-          m_sourceItemList.Insert( newIndex, rawItem );
-
-          for( int j = newIndex; j <= oldIndex; j++ )
-          {
-            m_sourceItemList[ j ].SetIndex( j );
-          }
-
-          if( wasFiltered )
-          {
-            this.AddRawItemInFilteredList( rawItem );
-            this.EnsurePosition( rawItem, rawItem.GetGlobalSortedIndex() );
-          }
-        }
-      }
-
-      return true;
-    }
-
-    private bool ResetSourceItem( object dataItem )
-    {
-      var rawItem = default( RawItem );
-
-      //Verify if the item is in the same detail CollectionView as the previous item was found in.
-      if( m_currentChildCollectionView != null )
-      {
-        rawItem = m_currentChildCollectionView.GetFirstRawItemFromDataItem( dataItem );
-
-        //If the item was found, refresh it.
-        if( rawItem != null )
-        {
-          int globalSortedIndex = rawItem.GetGlobalSortedIndex();
-          m_currentChildCollectionView.EnsurePosition( rawItem, globalSortedIndex );
-          return true;
-        }
-      }
-
-      //If the item has not been found, try to find it in the current CollectionView.
-      rawItem = this.GetFirstRawItemFromDataItem( dataItem );
-      m_currentChildCollectionView = null;
-
-      //If the item was found, refresh it.
-      if( rawItem != null )
-      {
-        this.EnsurePosition( rawItem, rawItem.GetGlobalSortedIndex() );
-        return true;
-      }
-
-      //If the item was not found, look for it in an expended detail.
-      foreach( var detailContext in this.DataGridContext.GetChildContextsCore() )
-      {
-        var detailCollectionView = detailContext.Items as DataGridCollectionView;
-        if( detailCollectionView == null )
-          continue;
-
-        if( detailCollectionView.ResetSourceItem( dataItem ) )
-        {
-          //keep a reference to the detail CollectionView the item was found in, in case following items belong to the same detail.
-          m_currentChildCollectionView = detailCollectionView;
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    private void ResetSourceItems( IList items )
-    {
-      foreach( object dataItem in items )
-      {
-        this.ResetSourceItem( dataItem );
-      }
-    }
-
-    private void AddRawItemInSourceList( int index, RawItem rawItem )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index <= m_sourceItemList.Count ) );
-      Debug.Assert( rawItem != null );
-
-      m_sourceItemList.Insert( index, rawItem );
-
-      this.AddRawItemDataItemMapping( rawItem );
-
-      for( var i = m_sourceItemList.Count - 1; i > index; i-- )
-      {
-        m_sourceItemList[ i ].SetIndex( i );
-      }
-    }
-
-    private void AddRawItemInFilteredList( RawItem rawItem )
-    {
-      Debug.Assert( rawItem != null );
-
-      // The function take for granted that all RawItem's index are sequential,
-      // or if there is gap, the index contained in the gap are not already contained in the list.
-      if( ( m_filteredItemList.Count == 0 ) || ( m_filteredItemList.Last().Index < rawItem.Index ) )
-      {
-        m_filteredItemList.Add( rawItem );
-      }
-      else
-      {
-        var index = m_filteredItemList.BinarySearch( rawItem, DataGridCollectionView.RawItemIndexComparer );
-        Debug.Assert( index < 0 );
-
-        if( index < 0 )
-        {
-          index = ~index;
-        }
-
-        m_filteredItemList.Insert( index, rawItem );
-      }
-    }
-
-    private void AddRawItemInGroup( RawItem rawItem )
-    {
-      Debug.Assert( rawItem != null );
-
-      using( this.DeferCurrencyEvent() )
-      {
-        var newGroup = this.GetRawItemNewGroup( rawItem );
-        var index = newGroup.BinarySearchRawItem( rawItem, this.RawItemSortComparer );
-
-        if( index < 0 )
-        {
-          index = ~index;
-        }
-
-        var globalIndex = newGroup.GetFirstRawItemGlobalSortedIndex() + index;
-
-        this.AdjustCurrencyBeforeAdd( globalIndex );
-
-        newGroup.InsertRawItem( index, rawItem );
-
-        unchecked
-        {
-          m_sortedItemVersion++;
-        }
-
-        this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, rawItem.DataItem, globalIndex ) );
-      }
-    }
-
-    private void RemoveRawItemInSourceList( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_sourceItemList.Count ) );
-
-      this.RemoveRawItemDataItemMapping( m_sourceItemList[ index ] );
-
-      m_sourceItemList.RemoveAt( index );
-
-      for( int i = m_sourceItemList.Count - 1; i >= index; i-- )
-      {
-        m_sourceItemList[ i ].SetIndex( i );
-      }
-    }
-
-    private bool RemoveRawItemInFilteredList( RawItem rawItem )
-    {
-      Debug.Assert( rawItem != null );
-
-      // The function take for granted that all RawItem's index are sequential,
-      // There should not be any gap in the index sequence.
-      var index = m_filteredItemList.BinarySearch( rawItem, DataGridCollectionView.RawItemIndexComparer );
-      if( index < 0 )
-        return false;
-
-      Debug.Assert( ( index >= 0 ) && ( index < m_filteredItemList.Count ) );
-
-      m_filteredItemList.RemoveAt( index );
-
-      return true;
-    }
-
-    private void RemoveRawItemInGroup( RawItem rawItem )
-    {
-      Debug.Assert( rawItem != null );
-
-      var parentGroup = rawItem.ParentGroup;
-      if( parentGroup == null )
-        return;
-
-      var globalSortedIndex = rawItem.GetGlobalSortedIndex();
-
-      using( this.DeferCurrencyEvent() )
-      {
-        this.AdjustCurrencyBeforeRemove( globalSortedIndex );
-        parentGroup.RemoveRawItemAt( rawItem.SortedIndex );
-
-        unchecked
-        {
-          m_sortedItemVersion++;
-        }
-      }
-
-      // In the case of a remove, the CollectionChanged must be after the CurrentChanged since when the DataGridCollectionView is used with a Selector having the 
-      // IsSynchronizedWithCurrent set, the Selector will set the current position to -1 if the selected item is removed. 
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, rawItem.DataItem, globalSortedIndex ) );
-    }
-
-    private bool RefreshUnboundItemPropertiesCore( object dataItem = null )
-    {
-      if( dataItem != null )
-      {
-        //Verify if the item is in the same detail CollectionView as the previous item was found in.
-        if( m_currentChildCollectionView != null && m_currentChildCollectionView.m_sourceItems.Contains( dataItem ) )
-        {
-          m_currentChildCollectionView.ItemProperties.RefreshUnboundItemProperty( dataItem );
-          return true;
-        }
-
-        //Since the item was not found in the previous detail, it means items are not sequential, thus no need to keep looking into this detail.
-        m_currentChildCollectionView = null;
-
-        //Try to find it in the current CollectionView.
-        if( m_sourceItems.Contains( dataItem ) )
-        {
-          this.ItemProperties.RefreshUnboundItemProperty( dataItem );
-          return true;
-        }
-
-        //If not, try to find it in an expended detail
-        foreach( DataGridContext detailContext in this.DataGridContext.GetChildContextsCore() )
-        {
-          DataGridCollectionView detailCollectionView = detailContext.Items as DataGridCollectionView;
-          if( detailCollectionView != null )
-          {
-            if( detailCollectionView.RefreshUnboundItemPropertiesCore( dataItem ) )
-            {
-              m_currentChildCollectionView = detailCollectionView;
-              return true;
-            }
-          }
-        }
-
-        return false;
-      }
-
-      //If dataItem is null, it means every item must be Refreshed.  Let's start with the level we're on.
-      foreach( RawItem rawItem in m_sourceItemList )
-      {
-        this.ItemProperties.RefreshUnboundItemProperty( rawItem.DataItem );
-      }
-
-      //Refresh every expended detail of the parent
-      foreach( DataGridContext detailContext in this.DataGridContext.GetChildContextsCore() )
-      {
-        DataGridCollectionView detailCollectionView = detailContext.Items as DataGridCollectionView;
-        if( detailCollectionView != null )
-        {
-          detailCollectionView.RefreshUnboundItemPropertiesCore();
-        }
-      }
-
-      return true;
-    }
-
-    private void RefreshUnboundItemPropertiesCore( IList items )
-    {
-      foreach( object dataItem in items )
-      {
-        this.RefreshUnboundItemPropertiesCore( dataItem );
-      }
-    }
-
-    private void GroupItems()
-    {
-      // We set the current item to -1 to prevent the developper to get an invalid position.
-      // We will replace the current item to the correct one later.
-      this.SetCurrentItem( -1, null, false, false );
-
-      // We use a new DataGridCollectionViewGroupRoot instead of doing a clear to prevent
-      // some event to be raised.  And it should also be faster.
-      this.RootGroup = new DataGridCollectionViewGroupRoot( this );
-
-      ObservableCollection<GroupDescription> groupDescriptions = this.GroupDescriptions;
-
-      int groupDescriptionCount = groupDescriptions.Count;
-      int itemCount = m_filteredItemList.Count;
-
-      DataGridCollectionViewGroupRoot rootGroup = this.RootGroup;
-
-      if( groupDescriptionCount > 0 )
-      {
-        CultureInfo culture = this.Culture;
-
-        for( int i = 0; i < groupDescriptionCount; i++ )
-        {
-          DataGridGroupDescription groupDescription = groupDescriptions[ i ] as DataGridGroupDescription;
-
-          if( groupDescription != null )
-          {
-            groupDescription.SetContext( this );
-          }
-        }
-
-        try
-        {
-          rootGroup.SetSubGroupBy( groupDescriptions[ 0 ] );
-          rootGroup.CreateFixedGroupNames( 0, groupDescriptions, null );
-
-          for( int i = 0; i < itemCount; i++ )
-          {
-            RawItem rawItem = m_filteredItemList[ i ];
-            DataGridCollectionViewGroup currentGroup = rootGroup;
-
-            for( int j = 1; j <= groupDescriptionCount; j++ )
-            {
-              // We set SortComparers to null to avoid Sorting since we are in the middle of a "batch operation"
-              // The sorting will be done after the batch operation which is faster than sorting for each group modification
-              currentGroup = currentGroup.GetGroup( rawItem, j - 1, culture, groupDescriptions, null );
-            }
-
-            currentGroup.InsertRawItem( currentGroup.ItemCount, rawItem );
-          }
-        }
-        finally
-        {
-          for( int i = 0; i < groupDescriptionCount; i++ )
-          {
-            DataGridGroupDescription groupDescription = groupDescriptions[ i ] as DataGridGroupDescription;
-
-            if( groupDescription != null )
-            {
-              groupDescription.SetContext( null );
-            }
-          }
-        }
-      }
-      else
-      {
-        for( int i = 0; i < itemCount; i++ )
-        {
-          rootGroup.InsertRawItem( i, m_filteredItemList[ i ] );
-        }
-      }
-
-      unchecked
-      {
-        m_sortedItemVersion++;
-      }
-    }
-
-    private void SortItems( IList<SortDescriptionInfo> sortDescriptionInfos )
-    {
-      // We set the current item to -1 to prevent the developper to get an invalid position. We will replace the current item to the correct one later.
-      this.SetCurrentItem( -1, null, false, false );
-
-      var rootGroup = this.RootGroup;
-      if( rootGroup.IsBottomLevel )
-      {
-        rootGroup.SortRootRawItems( sortDescriptionInfos, m_sourceItemList );
-      }
-      else
-      {
-        // We use a new DataGridCollectionViewGroupRoot to prevent some event to be raised.
-        var newRootGroup = new DataGridCollectionViewGroupRoot( rootGroup );
-
-        rootGroup.SortItems( sortDescriptionInfos, this.GetGroupSortComparers(), 0, m_sourceItemList, newRootGroup );
-
-        this.RootGroup = newRootGroup;
-      }
-
-      unchecked
-      {
-        m_sortedItemVersion++;
-      }
-    }
-
-    private void SortGroups()
-    {
-      //This method assumes the that the RootGroup is not the bottom level group, i.e. there DataGrid is currently grouped.
-      this.RootGroup.SortGroups( this.GetGroupSortComparers(), 0 );
-
-      unchecked
-      {
-        m_sortedItemVersion++;
-      }
-    }
-
-    private void ResortGroups()
-    {
-      using( this.DeferCurrencyEvent() )
-      {
-        object oldCurrentDataItem = this.CurrentItem;
-        int oldCurrentPosition = this.CurrentPosition;
-
-        this.SortGroups();
-
-        RawItem currentRawItem = null;
-
-        if( oldCurrentDataItem != null )
-        {
-          currentRawItem = this.GetFirstRawItemFromDataItem( oldCurrentDataItem );
-        }
-
-        if( currentRawItem == null )
-        {
-          if( ( oldCurrentPosition > 0 ) && ( oldCurrentPosition < this.RootGroup.GlobalRawItemCount ) )
-          {
-            currentRawItem = this.RootGroup.GetRawItemAtGlobalSortedIndex( oldCurrentPosition );
-          }
-        }
-
-        if( currentRawItem != null )
-        {
-          this.SetCurrentItem( currentRawItem.GetGlobalSortedIndex(), oldCurrentDataItem, false, false );
-        }
-
-        this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-      }
-    }
-
-    private void PrepareSort( out IList<SortDescriptionInfo> sortDescriptionInfos )
-    {
-      sortDescriptionInfos = new List<SortDescriptionInfo>();
-
-      lock( this.SyncRoot )
-      {
-        lock( this.DeferredOperationManager )
-        {
-          var itemCount = m_sourceItemList.Count;
-
-          foreach( var sortDescription in this.SortDescriptions )
-          {
-            var itemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( this.ItemProperties, sortDescription.PropertyName );
-            var sortDescriptionInfo = new SortDescriptionInfo( itemProperty, sortDescription.Direction );
-
-            sortDescriptionInfos.Add( sortDescriptionInfo );
-
-            if( itemProperty == null )
-              continue;
-
-            // This will cache the data for the sorting
-            var dataStore = default( DataStore );
-            var isSortingOnForeignKeyDescription = false;
-
-            var foreignKeyDescription = itemProperty.ForeignKeyDescription;
-            if( foreignKeyDescription != null )
-            {
-              var dataType = foreignKeyDescription.GetDataType();
-              if( dataType != null )
-              {
-                dataStore = DataGridCollectionView.CreateStore( dataType, itemCount );
-                isSortingOnForeignKeyDescription = true;
-              }
-            }
-
-            itemProperty.IsSortingOnForeignKeyDescription = isSortingOnForeignKeyDescription;
-
-            //Create the DataStore if it has not been created yet.
-            if( !isSortingOnForeignKeyDescription )
-            {
-              if( itemProperty.SortComparer != null )
-              {
-                // If we have a sort comparer, keep the element in an object data type to increase the performance.
-                dataStore = DataGridCollectionView.CreateStore( typeof( object ), itemCount );
-              }
-              else
-              {
-                dataStore = DataGridCollectionView.CreateStore( itemProperty.DataType, itemCount );
-              }
-            }
-
-            sortDescriptionInfo.DataStore = dataStore;
-
-            var supportInitialize = itemProperty as ISupportInitialize;
-            if( supportInitialize != null )
-            {
-              supportInitialize.BeginInit();
-            }
-
-            try
-            {
-              if( isSortingOnForeignKeyDescription )
-              {
-                for( int i = 0; i < itemCount; i++ )
-                {
-                  var value = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, m_sourceItemList[ i ].DataItem );
-
-                  dataStore.SetData( i, foreignKeyDescription.GetDisplayValue( value ) );
-                }
-              }
-              else
-              {
-                for( int i = 0; i < itemCount; i++ )
-                {
-                  var value = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, m_sourceItemList[ i ].DataItem );
-
-                  dataStore.SetData( i, value );
-                }
-              }
-            }
-            finally
-            {
-              if( supportInitialize != null )
-              {
-                supportInitialize.EndInit();
-              }
-            }
-          }
-        }
-      }
-    }
-
-    private List<GroupSortComparer> GetGroupSortComparers()
-    {
-      if( m_groupSortComparers.Count > 0 )
-        return m_groupSortComparers;
-
-      var sortDescriptions = this.SortDescriptions;
-
-      foreach( var groupDescription in this.GroupDescriptions )
-      {
-        // Find all the SortInfos for the current sub group.
-        var groupDescriptionName = DataGridCollectionView.GetPropertyNameFromGroupDescription( groupDescription );
-        var sortInfos = new List<GroupSortComparer.SortInfo>( sortDescriptions.Count + 1 );
-
-        foreach( var sortDescription in sortDescriptions )
-        {
-          var sortDirection = sortDescription.Direction;
-          var sortDescriptionName = sortDescription.PropertyName;
-          var itemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( this.ItemProperties, sortDescriptionName );
-
-          if( string.Equals( groupDescriptionName, sortDescriptionName ) )
-          {
-            var foreignKeyDescription = ( itemProperty != null ) ? itemProperty.ForeignKeyDescription : null;
-            if( foreignKeyDescription != null )
-            {
-              if( foreignKeyDescription.ItemsSource != null
-                && ( !string.IsNullOrWhiteSpace( foreignKeyDescription.DisplayMemberPath ) || ( foreignKeyDescription.ForeignKeyConverter != null ) ) )
-              {
-                sortInfos.Add( new GroupSortComparer.SortInfo( foreignKeyDescription, sortDirection, this.GetSortComparer( groupDescription, itemProperty ) ) );
-              }
-            }
-
-            sortInfos.Add( new GroupSortComparer.SortInfo( sortDirection, this.GetSortComparer( groupDescription, itemProperty ) ) );
-          }
-        }
-
-        m_groupSortComparers.Add( new GroupSortComparer( sortInfos ) );
-      }
-
-      return m_groupSortComparers;
-    }
-
-    private IComparer GetSortComparer( GroupDescription groupDescription, DataGridItemPropertyBase itemProperty )
-    {
-      var dataGridGroupDescription = groupDescription as DataGridGroupDescription;
-      var sortComparer = default( IComparer );
-
-      if( dataGridGroupDescription != null )
-      {
-        sortComparer = dataGridGroupDescription.SortComparer;
-      }
-
-      if( ( sortComparer == null ) && ( itemProperty != null ) )
-      {
-        sortComparer = itemProperty.SortComparer;
-      }
-
-      if( sortComparer == null )
-      {
-        sortComparer = ObjectComparer.Singleton;
-      }
-
-      return sortComparer;
-    }
-
-    private void AdjustCurrentAndSendResetNotification( RawItem oldCurrentRawItem, int oldCurrentPosition )
-    {
-      this.AdjustCurrencyAfterReset( oldCurrentRawItem, oldCurrentPosition, false );
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-    }
-
-    private void TriggerRootGroupChanged()
-    {
-      // All the groups will be recreated. No need to trigger the StatFunctions PropertyChanged.
-      this.DeferredOperationManager.ClearInvalidatedGroups();
-
-      this.OnPropertyChanged( new PropertyChangedEventArgs( DataGridCollectionViewBase.RootGroupPropertyName ) );
-
-      // Flag that the Collection of groups itself has changed.
-      this.OnPropertyChanged( new PropertyChangedEventArgs( DataGridCollectionViewBase.GroupsPropertyName ) );
-    }
-
-    private DataGridCollectionViewGroup GetRawItemNewGroup( RawItem rawItem )
-    {
-      ObservableCollection<GroupDescription> groupDescriptions = this.GroupDescriptions;
-      int groupDescriptionCount = groupDescriptions.Count;
-
-      if( groupDescriptionCount == 0 )
-        return this.RootGroup;
-
-      CultureInfo culture = this.Culture;
-      List<GroupSortComparer> sortComparers = this.GetGroupSortComparers();
-
-      for( int i = 0; i < groupDescriptionCount; i++ )
-      {
-        DataGridGroupDescription groupDescription = groupDescriptions[ i ] as DataGridGroupDescription;
-
-        if( groupDescription != null )
-        {
-          groupDescription.SetContext( this );
-        }
-      }
-
-      try
-      {
-        DataGridCollectionViewGroup currentGroup = this.RootGroup;
-
-        for( int j = 1; j <= groupDescriptionCount; j++ )
-        {
-          currentGroup = currentGroup.GetGroup( rawItem, j - 1, culture, groupDescriptions, sortComparers );
-        }
-
-        return currentGroup;
-      }
-      finally
-      {
-        for( int i = 0; i < groupDescriptionCount; i++ )
-        {
-          DataGridGroupDescription groupDescription = groupDescriptions[ i ] as DataGridGroupDescription;
-
-          if( groupDescription != null )
-          {
-            groupDescription.SetContext( null );
-          }
-        }
-      }
-    }
-
-    private void AddRawItemDataItemMapping( RawItem rawItem )
-    {
-      m_dataItemToRawItemMap.Add( rawItem.DataItem, rawItem );
-    }
-
-    private void RemoveRawItemDataItemMapping( RawItem rawItem )
-    {
-      m_dataItemToRawItemMap.Remove( rawItem.DataItem, rawItem );
-    }
-
-    private void SaveCurrentBeforeReset( out RawItem oldCurrentRawItem, out int oldCurrentPosition )
-    {
-      Debug.Assert( this.Loaded );
-
-      if( this.IsCurrentAfterLast )
-      {
-        oldCurrentPosition = int.MaxValue;
-      }
-      else
-      {
-        oldCurrentPosition = this.CurrentPosition;
-      }
-
-      oldCurrentRawItem = ( oldCurrentPosition < 0 ) || ( oldCurrentPosition == int.MaxValue ) ? null : this.RootGroup.GetRawItemAtGlobalSortedIndex( oldCurrentPosition );
-    }
-
-    private void AdjustCurrencyAfterReset( RawItem oldCurrentRawItem, int oldCurrentPosition, bool itemsChanged )
-    {
-      DataGridCollectionViewGroupRoot rootGroup = this.RootGroup;
-
-      if( ( oldCurrentPosition < 0 ) || ( rootGroup.GlobalRawItemCount == 0 ) )
-      {
-        this.SetCurrentItem( -1, null, false, false );
-        return;
-      }
-
-      if( oldCurrentPosition == int.MaxValue )
-      {
-        this.SetCurrentItem( rootGroup.GlobalRawItemCount, null, false, false );
-        return;
-      }
-
-      if( itemsChanged )
-      {
-        object oldCurrentItem = oldCurrentRawItem.DataItem;
-        int newIndex = this.IndexOf( oldCurrentItem );
-
-        if( newIndex == -1 )
-        {
-          this.SetCurrentItem( -1, null, false, false );
-        }
-        else
-        {
-          this.SetCurrentItem( newIndex, oldCurrentItem, false, false );
-        }
-      }
-      else
-      {
-        this.SetCurrentItem( oldCurrentRawItem.GetGlobalSortedIndex(), oldCurrentRawItem.DataItem, false, false );
-      }
-    }
-
-    private void AdjustCurrencyAfterInitialLoad( bool setCurrentToFirst )
-    {
-      if( this.RootGroup.GlobalRawItemCount == 0 )
-      {
-        this.SetCurrentItem( -1, null, false, false );
-        return;
-      }
-
-      if( setCurrentToFirst )
-      {
-        this.SetCurrentItem( 0, this.RootGroup.GetRawItemAtGlobalSortedIndex( 0 ).DataItem, false, false );
-      }
-      else
-      {
-        this.SetCurrentItem( -1, null, false, false );
-      }
-    }
-
-    private void AdjustCurrencyBeforeAdd( int index )
-    {
-      if( this.RootGroup.GlobalRawItemCount == 0 )
-      {
-        this.SetCurrentItem( -1, null, false, false );
-      }
-      else if( index <= this.CurrentPosition )
-      {
-        this.SetCurrentItem( this.CurrentPosition + 1, this.CurrentItem, false, false );
-      }
-    }
-
-    private void AdjustCurrencyAfterMove( int oldIndex, int newIndex, int itemCount )
-    {
-      int oldRangeEnd = oldIndex + itemCount - 1;
-
-      // Current position was in the moved range
-      if( ( this.CurrentPosition >= oldIndex ) && ( this.CurrentPosition <= oldRangeEnd ) )
-      {
-        int offset = this.CurrentPosition - oldIndex;
-        this.SetCurrentItem( newIndex + offset, this.CurrentItem, false, false );
-      }
-      else if( ( ( oldIndex >= this.CurrentPosition ) || ( newIndex >= this.CurrentPosition ) )
-        && ( ( oldIndex <= this.CurrentPosition ) || ( newIndex <= this.CurrentPosition ) ) )
-      {
-        if( oldIndex < this.CurrentPosition )
-        {
-          this.SetCurrentItem( this.CurrentPosition - itemCount, this.CurrentItem, false, false );
-        }
-        else if( newIndex <= this.CurrentPosition )
-        {
-          this.SetCurrentItem( this.CurrentPosition + itemCount, this.CurrentItem, false, false );
-        }
-      }
-    }
-
-    private void AdjustCurrencyBeforeRemove( int index )
-    {
-      if( index < this.CurrentPosition )
-      {
-        this.SetCurrentItem( this.CurrentPosition - 1, this.CurrentItem, false, true );
-      }
-      else if( index == this.CurrentPosition )
-      {
-        DataGridCollectionViewGroupRoot rootGroup = this.RootGroup;
-
-        if( this.CurrentPosition == ( rootGroup.GlobalRawItemCount - 1 ) )
-        {
-          index = rootGroup.GlobalRawItemCount - 2;
-
-          if( index >= 0 )
-          {
-            this.SetCurrentItem( index, rootGroup.GetRawItemAtGlobalSortedIndex( index ).DataItem, false, true );
-          }
-          else
-          {
-            this.SetCurrentItem( index, null, false, true );
-          }
-        }
-        else
-        {
-          this.SetCurrentItem( index, rootGroup.GetRawItemAtGlobalSortedIndex( index + 1 ).DataItem, false, true );
-        }
-      }
-    }
-
-    private void AdjustCurrencyBeforeReplace( int index, object newItem )
-    {
-      if( index == this.CurrentPosition )
-      {
-        this.SetCurrentItem( index, newItem, false, false );
-      }
-    }
-
-    #region ICancelAddNew Members
-
-    void ICancelAddNew.CancelNew( int itemIndex )
-    {
-      this.CancelNew();
-    }
-
-    void ICancelAddNew.EndNew( int itemIndex )
-    {
-      this.CommitNew();
-    }
-
-    #endregion
-
-    #region ISupportInitializeNotification Members
-
-    private event EventHandler Initialized;
-
-    event EventHandler ISupportInitializeNotification.Initialized
-    {
-      add
-      {
-        this.Initialized = ( EventHandler )Delegate.Combine( this.Initialized, value );
-      }
-      remove
-      {
-        this.Initialized = ( EventHandler )Delegate.Remove( this.Initialized, value );
-      }
-    }
-
-    private void OnInitialized( EventArgs e )
-    {
-      if( this.Initialized != null )
-      {
-        this.Initialized( this, e );
-      }
-    }
-
-    bool ISupportInitializeNotification.IsInitialized
-    {
-      get
-      {
-        return m_batchInitializationCount == 0;
-      }
-    }
-
-    #endregion ISupportInitializeNotification Members
-
-    #region ISupportInitialize Members
-
-    void ISupportInitialize.BeginInit()
-    {
-      if( m_batchInitializationCount == 0 )
-      {
-        Debug.Assert( m_batchDeferred == null );
-        m_batchDeferred = this.DeferRefresh();
-      }
-
-      m_batchInitializationCount++;
-    }
-
-    void ISupportInitialize.EndInit()
-    {
-      if( m_batchInitializationCount > 0 )
-      {
-        m_batchInitializationCount--;
-      }
-
-      if( m_batchInitializationCount == 0 )
-      {
-        m_batchDeferred.Dispose();
-        m_batchDeferred = null;
-        this.OnInitialized( EventArgs.Empty );
-      }
-    }
-
-    #endregion ISupportInitialize Members
-
-    #region ICollectionView Members
-
-    public override IEnumerable SourceCollection
-    {
-      get
-      {
-        return this.Enumeration;
-      }
-    }
-
-    public override bool Contains( object item )
-    {
-      this.EnsureThreadAndCollectionLoaded();
-
-      if( item != null )
-      {
-        RawItem rawItem = this.GetFirstRawItemFromDataItem( item );
-        if( rawItem != null )
-        {
-          // A SortedIndex of -1 means that the RawItem is not in the m_filteredItemList.
-          if( rawItem.SortedIndex > -1 )
-            return true;
-        }
-      }
-
-      return false;
-    }
-
-    public override bool IsEmpty
-    {
-      get
-      {
-        this.EnsureThreadAndCollectionLoaded();
-        return ( this.RootGroup.GlobalRawItemCount == 0 );
-      }
-    }
-
-    public override int IndexOf( object item )
-    {
-      this.EnsureThreadAndCollectionLoaded();
-
-      if( item != null )
-      {
-        var rawItem = this.GetFirstRawItemFromDataItem( item );
-        if( rawItem != null )
-        {
-          // A SortedIndex of -1 means that the RawItem is not in the m_filteredItemList.
-          if( rawItem.SortedIndex >= 0 )
-            return rawItem.GetGlobalSortedIndex();
-        }
-      }
-
-      return -1;
-    }
-
-    #endregion ICollectionView Members
-
-    #region IBindingList Members
-
-    void IBindingList.AddIndex( PropertyDescriptor property )
-    {
-      throw new NotSupportedException( "The IBindingList.AddIndex method not supported." );
-    }
-
-    bool IBindingList.AllowEdit
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    bool IBindingList.AllowRemove
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    void IBindingList.ApplySort( PropertyDescriptor property, ListSortDirection direction )
-    {
-      throw new NotSupportedException( "The IBindingList.ApplySort method is not supported." );
-    }
-
-    int IBindingList.Find( PropertyDescriptor property, object key )
-    {
-      throw new NotSupportedException( "The IBindingList.Find method is not supported." );
-    }
-
-    bool IBindingList.IsSorted
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    private event ListChangedEventHandler ListChanged;
-
-    event ListChangedEventHandler IBindingList.ListChanged
-    {
-      add
-      {
-        this.ListChanged = ( ListChangedEventHandler )EventHandler.Combine( this.ListChanged, value );
-      }
-      remove
-      {
-        this.ListChanged = ( ListChangedEventHandler )EventHandler.Remove( this.ListChanged, value );
-      }
-    }
-
-    void IBindingList.RemoveIndex( PropertyDescriptor property )
-    {
-      throw new NotSupportedException( "The IBindingList.RemoveIndex method is not supported." );
-    }
-
-    void IBindingList.RemoveSort()
-    {
-      throw new NotSupportedException( "The IBindingList.RemoveSort method is not supported." );
-    }
-
-    ListSortDirection IBindingList.SortDirection
-    {
-      get
-      {
-        throw new NotSupportedException( "The IBindingList.SortDirection property is not supported." );
-      }
-    }
-
-    PropertyDescriptor IBindingList.SortProperty
-    {
-      get
-      {
-        throw new NotSupportedException( "The IBindingList.SortProperty property is not supported." );
-      }
-    }
-
-    bool IBindingList.SupportsChangeNotification
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    bool IBindingList.SupportsSearching
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    bool IBindingList.SupportsSorting
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    #endregion IBindingList Members
-
-    #region IList Members
-
-    int IList.Add( object value )
-    {
-      throw new NotSupportedException( "The IList.Add method is not supported." );
-    }
-
-    void IList.Clear()
-    {
-      throw new NotSupportedException( "The IList.Clear method is not supported." );
-    }
-
-    void IList.Insert( int index, object value )
-    {
-      throw new NotSupportedException( "The IList.Insert method is not supported." );
-    }
-
-    bool IList.IsFixedSize
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    bool IList.IsReadOnly
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    void IList.Remove( object value )
-    {
-      throw new NotSupportedException( "The IList.Remove method is not supported." );
-    }
-
-    void IList.RemoveAt( int index )
-    {
-      throw new NotSupportedException( "The IList.RemoveAt method is not supported." );
-    }
-
-    object IList.this[ int index ]
-    {
-      get
-      {
-        return this.GetItemAt( index );
-      }
-      set
-      {
-        throw new NotSupportedException( "The IList indexer is not supported." );
-      }
-    }
-
-    #endregion IList Members
-
-    #region ICollection Members
-
-    void ICollection.CopyTo( Array array, int index )
-    {
-      IEnumerator enumerator = this.GetEnumerator();
-
-      while( enumerator.MoveNext() )
-      {
-        array.SetValue( enumerator.Current, index );
-        index++;
-      }
-    }
-
-    void CopyTo( object[] array, int index )
-    {
-      IEnumerator enumerator = this.GetEnumerator();
-
-      while( enumerator.MoveNext() )
-      {
-        array[ index ] = enumerator.Current;
-        index++;
-      }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        return this.SyncRoot;
-      }
-    }
-
-    #endregion ICollection Members
-
-    #region IEnumerable Members
-
-    protected override IEnumerator GetEnumerator()
-    {
-      this.EnsureThreadAndCollectionLoaded();
-      return new DataGridCollectionViewEnumerator( this );
-    }
-
-    #endregion IEnumerable Members
-
-    private static RawItemIndexComparer m_rawItemIndexComparer;
-    private RawItemSortComparer m_rawItemSortComparer;
-    private List<GroupSortComparer> m_groupSortComparers = new List<GroupSortComparer>();
-
-    private int m_lastAddCount;
-    private int m_lastAddIndex;
-
-    private int m_batchInitializationCount;
-    private IDisposable m_batchDeferred;
-
-    private List<RawItem> m_sourceItemList;
-    private List<RawItem> m_filteredItemList;
-    private readonly RawItemMap m_dataItemToRawItemMap = new RawItemMap();
-
-    private int m_sortedItemVersion;
-    private DataGridCollectionView m_currentChildCollectionView;
-
-    #region Private Class EqualityComparerWrapper
-
-    private class EqualityComparerWrapper : IEqualityComparer<object>
-    {
-      public EqualityComparerWrapper( IEqualityComparer comparer )
-      {
-        if( comparer == null )
-        {
-          m_comparer = EqualityComparer<object>.Default;
-        }
-        else
-        {
-          m_comparer = comparer;
-        }
-      }
-
-      bool IEqualityComparer<object>.Equals( object x, object y )
-      {
-        return m_comparer.Equals( x, y );
-      }
-
-      int IEqualityComparer<object>.GetHashCode( object obj )
-      {
-        return m_comparer.GetHashCode( obj );
-      }
-
-      private IEqualityComparer m_comparer;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs
deleted file mode 100644
index 38435771..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs
+++ /dev/null
@@ -1,2901 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Threading;
-using Xceed.Utils.Collections;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public abstract partial class DataGridCollectionViewBase : CollectionView, IEditableCollectionView, IWeakEventListener, IItemProperties
-  {
-    #region Static Fields
-
-    internal static readonly string GroupsPropertyName = PropertyHelper.GetPropertyName( ( DataGridCollectionViewBase c ) => c.Groups );
-    internal static readonly string RootGroupPropertyName = PropertyHelper.GetPropertyName( ( DataGridCollectionViewBase c ) => c.RootGroup );
-
-    #endregion
-
-    #region Static Members
-
-    internal static string GetPropertyNameFromGroupDescription( GroupDescription groupDescription )
-    {
-      var propertyGroupDescription = groupDescription as PropertyGroupDescription;
-      if( propertyGroupDescription != null )
-        return propertyGroupDescription.PropertyName;
-
-      var dataGridGroupDescription = groupDescription as DataGridGroupDescription;
-      if( dataGridGroupDescription != null )
-        return dataGridGroupDescription.PropertyName;
-
-      return null;
-    }
-
-    #endregion
-
-//    static DataGridCollectionViewBase()
-//    {
-//      Licenser.VerifyLicenseSilently();
-//    }
-
-    private DataGridCollectionViewBase()
-      : base( new object[ 0 ] )
-    {
-
-      this.PreConstruct();
-
-      m_distinctValues = new DistinctValuesDictionary( this );
-
-      m_filteredItemProperties = new List<DataGridItemPropertyBase>();
-      m_readOnlyFilteredItemProperties = new ReadOnlyCollection<DataGridItemPropertyBase>( m_filteredItemProperties );
-
-      // The constructor used for detail creation will rectify the m_rootDataGridCollectionViewBase later on.
-      m_rootDataGridCollectionViewBase = this;
-
-      m_deferredOperationManager = new DeferredOperationManager( this, this.Dispatcher, true );
-    }
-
-    internal DataGridCollectionViewBase(
-      object modelSource,
-      IEnumerable source,
-      Type itemType,
-      bool autoCreateItemProperties,
-      bool autoCreateDetailDescriptions,
-      bool autoCreateForeignKeyDescriptions )
-      : this()
-    {
-      m_desiredItemType = itemType;
-
-      m_itemProperties = new DataGridItemPropertyCollection();
-      m_detailDescriptions = new DataGridDetailDescriptionCollection();
-      m_defaultPropertyDescriptions = new PropertyDescriptionRouteDictionary();
-
-      this.AutoCreateItemProperties = autoCreateItemProperties;
-      this.AutoCreateDetailDescriptions = autoCreateDetailDescriptions;
-      this.AutoCreateForeignKeyDescriptions = autoCreateForeignKeyDescriptions;
-
-      if( itemType == null )
-      {
-        if( source != null )
-        {
-          itemType = ItemsSourceHelper.GetItemTypeFromEnumeration( source );
-        }
-        else if( modelSource != null )
-        {
-          var queryable = modelSource as IQueryable;
-          if( queryable != null )
-          {
-            itemType = queryable.ElementType;
-          }
-        }
-      }
-      else
-      {
-        var listItemType = ItemsSourceHelper.GetItemTypeFromEnumeration( source ) ?? typeof( object );
-        if( !listItemType.IsAssignableFrom( itemType ) && !itemType.IsAssignableFrom( listItemType ) )
-          throw new InvalidOperationException( "The itemType is not assignable to the type of the list." );
-      }
-
-      m_modelSource = modelSource;
-      m_itemType = itemType;
-      m_enumeration = source;
-
-      this.CreateDefaultCollections( null );
-      this.RegisterChangedEvents();
-      this.SetupCurrent( true );
-      this.SetupDefaultPropertyDescriptions();
-      this.SetupDefaultDetailDescriptions();
-      this.PrepareItemProperties( m_itemProperties );
-
-      if( this.AutoCreateItemProperties )
-      {
-        ItemsSourceHelper.CreateAndAddItemPropertiesForPropertyDescriptions( m_itemProperties, m_defaultPropertyDescriptions.Values );
-        ItemsSourceHelper.AutoDetectSynonyms( this );
-      }
-    }
-
-    internal DataGridCollectionViewBase( IEnumerable collection, DataGridDetailDescription parentDetailDescription, DataGridCollectionViewBase rootDataGridCollectionViewBase )
-      : this()
-    {
-      if( parentDetailDescription == null )
-        throw new ArgumentNullException( "parentDetailDescription" );
-
-      m_rootDataGridCollectionViewBase = rootDataGridCollectionViewBase;
-      m_parentDetailDescription = parentDetailDescription;
-      m_itemProperties = parentDetailDescription.ItemProperties;
-      m_detailDescriptions = parentDetailDescription.DetailDescriptions;
-      m_defaultPropertyDescriptions = parentDetailDescription.DefaultPropertyDescriptions;
-
-      m_distinctValuesConstraint = m_parentDetailDescription.DistinctValuesConstraint;
-
-      this.AutoCreateDetailDescriptions = parentDetailDescription.AutoCreateDetailDescriptions;
-      this.AutoCreateItemProperties = parentDetailDescription.AutoCreateItemProperties;
-      this.AutoCreateForeignKeyDescriptions = parentDetailDescription.AutoCreateForeignKeyDescriptions;
-
-      if( parentDetailDescription.ItemType == null )
-      {
-        parentDetailDescription.ItemType = ItemsSourceHelper.GetItemTypeFromEnumeration( collection ) ?? typeof( object );
-      }
-
-      m_modelSource = default( object );
-      m_itemType = parentDetailDescription.ItemType;
-      m_enumeration = collection;
-
-      this.CreateDefaultCollections( m_parentDetailDescription );
-      this.RegisterChangedEvents();
-      this.SetupCurrent( false );
-      this.SetupDefaultPropertyDescriptions();
-      this.SetupDefaultDetailDescriptions();
-
-      // Creates the item properties if auto-creation is ON and no one already created them.
-      if( this.AutoCreateItemProperties && !m_parentDetailDescription.AutoCreateItemPropertiesCompleted )
-      {
-        ItemsSourceHelper.CreateAndAddItemPropertiesForPropertyDescriptions( m_itemProperties, m_defaultPropertyDescriptions.Values );
-        ItemsSourceHelper.AutoDetectSynonyms( this );
-
-        m_parentDetailDescription.AutoCreateItemPropertiesCompleted = true;
-      }
-
-      m_filteredItemProperties.Clear();
-
-      this.PrepareItemProperties( m_itemProperties );
-
-      // This is required in the Master/Detail scheme of things!
-      this.ForceRefresh( false, true, false );
-    }
-
-    internal virtual void PreConstruct()
-    {
-    }
-
-    #region ParentCollectionViewSource Internal Property
-
-    internal DataGridCollectionViewSourceBase ParentCollectionViewSourceBase
-    {
-      get
-      {
-        return m_parentCollectionViewSourceBase;
-      }
-      set
-      {
-        if( ( m_parentCollectionViewSourceBase != null ) && ( value != null ) && ( m_parentCollectionViewSourceBase != value ) )
-          throw new InvalidOperationException( "An attempt was made to use a DataGridCollectionView that is already being used by a DataGridCollectionViewSource." );
-
-        m_parentCollectionViewSourceBase = value;
-      }
-    }
-
-    private DataGridCollectionViewSourceBase m_parentCollectionViewSourceBase;
-
-    #endregion
-
-    #region NeedsRefresh Public Property
-
-    public override bool NeedsRefresh
-    {
-      get
-      {
-        return m_deferredOperationManager.RefreshPending;
-      }
-    }
-
-    #endregion
-
-    #region Culture Public Property
-
-    public override CultureInfo Culture
-    {
-      get
-      {
-        return base.Culture;
-      }
-      set
-      {
-        base.Culture = value;
-
-        // This is the only way we found to update the extra properties defined on our CollectionViewSource.
-        // In the CollectionViewSource.ApplyPropertiesToView method, the first thing that is done 
-        // is setting the Culture; therefore, we have no choice but to use this as the entry point and then
-        // apply our properties to the DataGridCollectionView.
-        // 
-        // See CollectionViewSource.ApplyPropertiesToView in reflector for a better understanding.
-        if( ( this.InDeferRefresh ) && ( m_parentCollectionViewSourceBase != null ) )
-        {
-          m_parentCollectionViewSourceBase.ApplyExtraPropertiesToView( this );
-        }
-      }
-    }
-
-    #endregion
-
-    #region AutoCreateItemProperties Public Property
-
-    public bool AutoCreateItemProperties
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.AutoCreateItemProperties ];
-      }
-      private set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.AutoCreateItemProperties ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AutoCreateDetailDescriptions Public Property
-
-    internal bool AutoCreateDetailDescriptions
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.AutoCreateDetailDescriptions ];
-      }
-      private set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.AutoCreateDetailDescriptions ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ParentDetailDescription Public Property
-
-    internal DataGridDetailDescription ParentDetailDescription
-    {
-      get
-      {
-        return m_parentDetailDescription;
-      }
-    }
-
-
-    #endregion
-
-    #region AutoCreateForeignKeyDescriptions Public Property
-
-    public bool AutoCreateForeignKeyDescriptions
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.AutoCreateForeignKeyDescriptions ];
-      }
-      private set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.AutoCreateForeignKeyDescriptions ] = value;
-      }
-    }
-
-    #endregion
-
-    #region SyncRoot Internal Property
-
-    internal virtual object SyncRoot
-    {
-      get
-      {
-        if( m_syncRoot == null )
-        {
-          Interlocked.CompareExchange( ref m_syncRoot, new object(), null );
-        }
-
-        return m_syncRoot;
-      }
-    }
-
-    private object m_syncRoot; //null
-
-    #endregion
-
-    #region DeferredOperationManager Internal Property
-
-    internal DeferredOperationManager DeferredOperationManager
-    {
-      get
-      {
-        return m_deferredOperationManager;
-      }
-    }
-
-    #endregion
-
-    #region InDeferRefresh Internal Property
-
-    internal bool InDeferRefresh
-    {
-      get
-      {
-        return ( m_deferRefreshCount > 0 );
-      }
-    }
-
-    #endregion
-
-    #region Loaded Internal Property
-
-    internal bool Loaded
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.Loaded ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.Loaded ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsRefreshingDestinctValues Internal Property
-
-    internal bool IsRefreshingDistinctValues
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.IsRefreshingDistinctValues ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.IsRefreshingDistinctValues ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Refreshing Internal Property
-
-    internal bool Refreshing
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.Refreshing ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.Refreshing ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ModelSource Internal Property
-
-    internal object ModelSource
-    {
-      get
-      {
-        return m_modelSource;
-      }
-    }
-
-    #endregion
-
-    #region ItemEditionIsManuallyHandled Private Property
-
-    private bool ItemEditionIsManuallyHandled
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.ItemEditionIsManuallyHandled ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.ItemEditionIsManuallyHandled ] = value;
-      }
-    }
-
-    #endregion
-
-    #region CreatingNewItemIsManuallyHandled Private Property
-
-    private bool CreatingNewItemIsManuallyHandled
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.CreatingNewItemIsManuallyHandled ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.CreatingNewItemIsManuallyHandled ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ItemProperties Public Property
-
-    public DataGridItemPropertyCollection ItemProperties
-    {
-      get
-      {
-        return m_itemProperties;
-      }
-    }
-
-    #endregion
-
-    #region DefaultItemPropertiesInitialized Private Property
-
-    private bool DefaultItemPropertiesInitialized
-    {
-      get
-      {
-        if( m_parentDetailDescription != null )
-          return m_parentDetailDescription.DefaultItemPropertiesInitialized;
-
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.DefaultItemPropertiesInitialized ];
-      }
-      set
-      {
-        if( m_parentDetailDescription != null )
-        {
-          m_parentDetailDescription.DefaultItemPropertiesInitialized = value;
-        }
-        else
-        {
-          m_flags[ ( int )DataGridCollectionViewBaseFlags.DefaultItemPropertiesInitialized ] = value;
-        }
-      }
-    }
-
-    #endregion
-
-    #region DefaultPropertyDescriptionsCreated Private Property
-
-    private bool DefaultPropertyDescriptionsCreated
-    {
-      get
-      {
-        if( m_parentDetailDescription != null )
-          return m_parentDetailDescription.DefaultPropertyDescriptionsCreated;
-
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.DefaultPropertyDescriptionsCreated ];
-      }
-      set
-      {
-        if( m_parentDetailDescription != null )
-        {
-          m_parentDetailDescription.DefaultPropertyDescriptionsCreated = value;
-        }
-        else
-        {
-          m_flags[ ( int )DataGridCollectionViewBaseFlags.DefaultPropertyDescriptionsCreated ] = value;
-        }
-      }
-    }
-
-    #endregion
-
-    #region CanCreateItemPropertiesFormModelSource Private Property
-
-    private bool CanCreateItemPropertiesFromModelSource
-    {
-      get
-      {
-        return ( ( m_modelSource != null ) && ( m_modelSource is DataTable || m_modelSource is IQueryable ) );
-      }
-    }
-
-    #endregion
-
-    #region DetailDeferRefreshes Internal Property
-
-    internal List<List<IDisposable>> DetailDeferRefreshes
-    {
-      get
-      {
-        return m_detailDeferRefreshes;
-      }
-    }
-
-    private List<List<IDisposable>> m_detailDeferRefreshes;
-
-    #endregion
-
-    #region DataGridContext Internal Property
-
-    internal DataGridContext DataGridContext
-    {
-      get
-      {
-        if( m_dataGridContext == null )
-          return null;
-
-        return m_dataGridContext.Target as DataGridContext;
-      }
-      set
-      {
-        if( value == null )
-        {
-          m_dataGridContext = null;
-        }
-        else
-        {
-          m_dataGridContext = new WeakReference( value );
-        }
-      }
-    }
-
-    private WeakReference m_dataGridContext;
-
-    #endregion
-
-    #region DataGridCollectionViewBase ABSTRACT MEMBERS
-
-    internal virtual int IndexOfSourceItem( object item )
-    {
-      return this.IndexOf( item );
-    }
-
-    internal abstract DataGridCollectionViewBase CreateDetailDataGridCollectionViewBase(
-      IEnumerable detailDataSource,
-      DataGridDetailDescription parentDetailDescription,
-      DataGridCollectionViewBase parentDataGridCollectionViewBase );
-
-    internal abstract void EnsurePosition( int globalSortedIndex );
-
-    internal abstract int SourceItemCount
-    {
-      get;
-    }
-
-    internal abstract void ForceRefresh( bool sendResetNotification, bool initialLoad, bool setCurrentToFirstOnInitialLoad );
-
-    #endregion
-
-    #region SOURCE
-
-    internal IEnumerable Enumeration
-    {
-      get
-      {
-        return m_enumeration;
-      }
-    }
-
-    public Type ItemType
-    {
-      get
-      {
-        return m_itemType;
-      }
-    }
-
-    internal Type DesiredItemType
-    {
-      get
-      {
-        return m_desiredItemType;
-      }
-    }
-
-    internal bool HasSource
-    {
-      get
-      {
-        return ( m_enumeration != null );
-      }
-    }
-
-    #endregion
-
-    #region SOURCE COLLECTION CHANGED HANDLERS
-
-    private void OnItemsSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      Debug.Assert( !( this is DataGridVirtualizingCollectionViewBase ),
-        "The DataGridVirtualizingCollectionView is unbound and therefore should never receive a notification from a source." );
-
-      lock( m_deferredOperationManager )
-      {
-        if( m_deferredOperationManager.RefreshPending )
-          return;
-
-        DeferredOperation deferredOperation = null;
-
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-            {
-              CollectionView collectionView = m_enumeration as CollectionView;
-              int count = ( collectionView == null ) ? -1 : collectionView.Count;
-
-              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Add, count, e.NewStartingIndex, e.NewItems );
-              break;
-            }
-
-          case NotifyCollectionChangedAction.Move:
-            {
-              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Move, -1, e.NewStartingIndex, e.NewItems, e.OldStartingIndex, e.OldItems );
-              break;
-            }
-
-          case NotifyCollectionChangedAction.Remove:
-            {
-              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Remove, e.OldStartingIndex, e.OldItems );
-              break;
-            }
-
-          case NotifyCollectionChangedAction.Replace:
-            {
-              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Replace, -1, e.NewStartingIndex, e.NewItems, e.OldStartingIndex, e.OldItems );
-              break;
-            }
-
-          case NotifyCollectionChangedAction.Reset:
-            {
-              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null );
-              break;
-            }
-
-          default:
-            throw new NotSupportedException( e.Action.ToString() + " is not a supported action." );
-        }
-
-        if( deferredOperation != null )
-        {
-          this.ExecuteOrQueueSourceItemOperation( deferredOperation );
-        }
-      }
-    }
-
-    private void OnItemsSourceListChanged( object sender, ListChangedEventArgs e )
-    {
-      Debug.Assert( !( this is DataGridVirtualizingCollectionViewBase ),
-        "The DataGridVirtualizingCollectionView is unbound and therefore should never receive a notification from a source." );
-
-      Action<PropertyDescriptor> propertyDescriptorHandler;
-      ListChangedType listChangedType = e.ListChangedType;
-
-      switch( listChangedType )
-      {
-        case ListChangedType.PropertyDescriptorAdded:
-          propertyDescriptorHandler = this.HandlePropertyDescriptorAdded;
-          break;
-
-        case ListChangedType.PropertyDescriptorChanged:
-          propertyDescriptorHandler = this.HandlePropertyDescriptorChanged;
-          break;
-
-        case ListChangedType.PropertyDescriptorDeleted:
-          propertyDescriptorHandler = this.HandlePropertyDescriptorDeleted;
-          break;
-
-        default:
-          propertyDescriptorHandler = null;
-          break;
-      }
-
-      if( propertyDescriptorHandler != null )
-      {
-        if( this.CheckAccess() )
-        {
-          propertyDescriptorHandler.Invoke( e.PropertyDescriptor );
-        }
-        else
-        {
-          this.Dispatcher.Invoke( new Action<PropertyDescriptor>( propertyDescriptorHandler ), e.PropertyDescriptor );
-        }
-      }
-      else
-      {
-        IBindingList bindingList = ( IBindingList )m_enumeration;
-        int index = e.NewIndex;
-        IList items = null;
-
-        if( ( listChangedType != ListChangedType.Reset ) && ( listChangedType != ListChangedType.ItemDeleted ) )
-        {
-          var indexInBound = ( index >= 0 ) && ( index < bindingList.Count );
-
-          //If we're within bounds
-          if( indexInBound )
-          {
-            //Let's get the item
-            items = new object[] { bindingList[ index ] };
-          }
-          else
-          {
-            //Let's reset the list because a change to the list has happenned (e.g. a delete) before we had a chance to process the current change.
-            listChangedType = ListChangedType.Reset;
-          }
-        }
-
-        lock( m_deferredOperationManager )
-        {
-          if( m_deferredOperationManager.RefreshPending )
-            return;
-
-          DeferredOperation deferredOperation;
-
-          switch( listChangedType )
-          {
-            case ListChangedType.ItemAdded:
-              {
-                deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Add, bindingList.Count, index, items );
-                break;
-              }
-
-            case ListChangedType.ItemChanged:
-              {
-                var collectionView = this as DataGridCollectionView;
-                deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Replace, -1, index, items, index, items );
-                break;
-              }
-
-            case ListChangedType.ItemDeleted:
-              {
-                deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Remove, index, new object[ 1 ] );
-                break;
-              }
-
-            case ListChangedType.ItemMoved:
-              {
-                deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Move, -1, index, items, e.OldIndex, items );
-                break;
-              }
-
-            case ListChangedType.Reset:
-              {
-                deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null );
-                break;
-              }
-
-            default:
-              throw new NotSupportedException( "This ListChangedType (" + listChangedType.ToString() + ") is not supported." );
-          }
-
-          Debug.Assert( deferredOperation != null );
-
-          this.ExecuteOrQueueSourceItemOperation( deferredOperation );
-        }
-      }
-    }
-
-    private void HandlePropertyDescriptorAdded( PropertyDescriptor property )
-    {
-      this.ClearDefaultPropertyDescriptions();
-      this.SetupDefaultPropertyDescriptions();
-
-      if( !this.AutoCreateItemProperties )
-        return;
-
-      if( m_itemProperties[ property.Name ] != null )
-        return;
-
-      var propertyRoute = PropertyRouteParser.Parse( property.Name );
-      if( propertyRoute == null )
-        return;
-
-      ItemsSourceHelper.CreateAndAddItemPropertyForPropertyDescription( m_itemProperties, m_defaultPropertyDescriptions[ propertyRoute ] );
-      ItemsSourceHelper.AutoDetectSynonyms( this, DataGridItemPropertyRoute.Create( ItemsSourceHelper.GetItemPropertyFromProperty( m_itemProperties, propertyRoute ) ) );
-    }
-
-    private void HandlePropertyDescriptorChanged( PropertyDescriptor property )
-    {
-      this.ClearDefaultPropertyDescriptions();
-      this.SetupDefaultPropertyDescriptions();
-
-      if( !this.AutoCreateItemProperties )
-        return;
-
-      if( property == null )
-      {
-        using( m_itemProperties.DeferCollectionChanged() )
-        {
-          for( int i = m_itemProperties.Count - 1; i >= 0; i-- )
-          {
-            var oldItemProperty = m_itemProperties[ i ] as DataGridItemProperty;
-            if( ( oldItemProperty != null ) && ( oldItemProperty.IsAutoCreated ) )
-            {
-              m_itemProperties.RemoveAt( i );
-            }
-          }
-        }
-
-        ItemsSourceHelper.CreateAndAddItemPropertiesForPropertyDescriptions( m_itemProperties, m_defaultPropertyDescriptions.Values );
-        ItemsSourceHelper.AutoDetectSynonyms( this );
-      }
-      else
-      {
-        var oldItemProperty = m_itemProperties[ property.Name ] as DataGridItemProperty;
-
-        if( ( oldItemProperty != null ) && ( oldItemProperty.IsAutoCreated ) )
-        {
-          // It is better to completely remove the item property and add a new one instead of changing is content.
-          m_itemProperties.Remove( oldItemProperty );
-
-          if( m_itemProperties[ property.Name ] != null )
-            return;
-
-          var propertyRoute = PropertyRouteParser.Parse( property.Name );
-          if( propertyRoute == null )
-            return;
-
-          ItemsSourceHelper.CreateAndAddItemPropertyForPropertyDescription( m_itemProperties, m_defaultPropertyDescriptions[ propertyRoute ] );
-          ItemsSourceHelper.AutoDetectSynonyms( this, DataGridItemPropertyRoute.Create( ItemsSourceHelper.GetItemPropertyFromProperty( m_itemProperties, propertyRoute ) ) );
-        }
-      }
-    }
-
-    private void HandlePropertyDescriptorDeleted( PropertyDescriptor property )
-    {
-      this.ClearDefaultPropertyDescriptions();
-      this.SetupDefaultPropertyDescriptions();
-
-      if( this.AutoCreateItemProperties )
-      {
-        var oldItemProperty = m_itemProperties[ property.Name ] as DataGridItemProperty;
-
-        if( ( oldItemProperty != null ) && ( oldItemProperty.IsAutoCreated ) )
-        {
-          m_itemProperties.Remove( oldItemProperty );
-        }
-      }
-    }
-
-    #endregion
-
-    #region CHILD COLLECTION CHANGED HANDLERS
-
-    // This method is also called for sub properties.
-    private void OnItemPropertiesCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      var addedItems = default( IEnumerable<DataGridItemPropertyBase> );
-      var removedItems = default( IEnumerable<DataGridItemPropertyBase> );
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          addedItems = e.NewItems.Cast<DataGridItemPropertyBase>();
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          removedItems = e.OldItems.Cast<DataGridItemPropertyBase>();
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          addedItems = e.NewItems.Cast<DataGridItemPropertyBase>();
-          removedItems = e.OldItems.Cast<DataGridItemPropertyBase>();
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-          throw new NotSupportedException();
-      }
-
-      if( ( addedItems == null ) && ( removedItems == null ) )
-        return;
-
-      var deferRefresh = ( this.Loaded ) ? this.DeferRefresh() : null;
-
-      try
-      {
-        if( removedItems != null )
-        {
-          foreach( var itemProperty in removedItems )
-          {
-            this.ClearItemProperty( itemProperty );
-          }
-        }
-
-        if( addedItems != null )
-        {
-          foreach( var itemProperty in addedItems )
-          {
-            this.PrepareItemProperty( itemProperty );
-          }
-        }
-      }
-      finally
-      {
-        lock( this.SyncRoot )
-        {
-          lock( this.DeferredOperationManager )
-          {
-            //This is required as the GroupSortStatResultPropertyName property affects this collection, and thus must be updated when there is a change to the ItemsProperties.
-            this.ClearGroupSortComparers();
-          }
-        }
-
-        if( deferRefresh != null )
-        {
-          deferRefresh.Dispose();
-        }
-      }
-    }
-
-    private void OnItemPropertyPropertyChanged( DataGridItemPropertyBase itemProperty, PropertyChangedEventArgs e )
-    {
-      if( itemProperty == null )
-        return;
-
-      var propertyName = e.PropertyName;
-
-      if( string.IsNullOrEmpty( propertyName ) || ( propertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
-      {
-        var itemProperties = itemProperty.ItemPropertiesInternal;
-        if( itemProperties != null )
-        {
-          this.ClearItemProperties( itemProperties );
-          this.PrepareItemProperties( itemProperties );
-        }
-      }
-    }
-
-    private void OnSortDescriptionsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      lock( this.SyncRoot )
-      {
-        lock( this.DeferredOperationManager )
-        {
-          this.ClearGroupSortComparers();
-
-          this.OnProxySortDescriptionsChanged( this, e );
-
-          if( this.DataGridSortDescriptions.IsResortDefered )
-          {
-            this.DataGridSortDescriptions.AddResortNotification( this.DeferRefresh() );
-          }
-
-          this.ExecuteOrQueueSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Resort, -1, null ) );
-        }
-      }
-    }
-
-    private void OnGroupDescriptionsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      lock( this.SyncRoot )
-      {
-        lock( this.DeferredOperationManager )
-        {
-          this.ClearGroupSortComparers();
-
-          this.OnProxyGroupDescriptionsChanged( this, e );
-
-          this.ExecuteOrQueueSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Regroup, -1, null ) );
-        }
-      }
-    }
-
-    #endregion
-
-    #region PROXY EVENTS
-
-    internal DataGridCollectionViewBase RootDataGridCollectionViewBase
-    {
-      get
-      {
-        return m_rootDataGridCollectionViewBase;
-      }
-    }
-
-    internal event EventHandler ProxyCollectionRefresh;
-
-    internal void OnProxyCollectionRefresh()
-    {
-      if( m_rootDataGridCollectionViewBase.ProxyCollectionRefresh != null )
-      {
-        m_rootDataGridCollectionViewBase.ProxyCollectionRefresh( this, EventArgs.Empty );
-      }
-    }
-
-    internal event NotifyCollectionChangedEventHandler ProxySortDescriptionsChanged;
-
-    internal void OnProxySortDescriptionsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( m_rootDataGridCollectionViewBase.ProxySortDescriptionsChanged != null )
-      {
-        m_rootDataGridCollectionViewBase.ProxySortDescriptionsChanged( sender, e );
-      }
-    }
-
-    internal event NotifyCollectionChangedEventHandler ProxyGroupDescriptionsChanged;
-
-    internal void OnProxyGroupDescriptionsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( m_rootDataGridCollectionViewBase.ProxyGroupDescriptionsChanged != null )
-      {
-        m_rootDataGridCollectionViewBase.ProxyGroupDescriptionsChanged( sender, e );
-      }
-    }
-
-    #endregion
-
-    #region EDIT PROCESS
-
-    internal void SetCurrentEditItem( object item )
-    {
-      m_currentEditItem = item;
-    }
-
-    private void EditItemInternal( object item, out bool beginEditCalled )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      beginEditCalled = false;
-      IEditableObject editableObject = ItemsSourceHelper.GetEditableObject( item );
-
-      if( editableObject != null )
-      {
-        // editableObject can be an Xceed DataRow when the datarow is directly inserted in us.
-        // In that case we do not call BeginEdit since we already being called from it.
-        if( !( editableObject is DataRow ) )
-        {
-          editableObject.BeginEdit();
-          beginEditCalled = true;
-        }
-      }
-    }
-
-    private void EndEditInternal( object item, out bool endEditCalled )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      endEditCalled = false;
-      var editableObject = ItemsSourceHelper.GetEditableObject( item );
-
-      // editableObject can be an Xceed datarow when directly inserted as Items in the DataGridControl.
-      if( ( editableObject != null ) && ( !( editableObject is Xceed.Wpf.DataGrid.DataRow ) ) )
-      {
-        // Keep a copy of the values, because if EndEdit throw ( for a DataView ), we loose the old values.
-        var itemProperties = this.ItemProperties;
-        var oldValueBeforeEndEdit = new Dictionary<DataGridItemPropertyBase, object>( itemProperties.Count );
-
-        foreach( var itemProperty in itemProperties )
-        {
-          oldValueBeforeEndEdit[ itemProperty ] = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
-        }
-
-        try
-        {
-          editableObject.EndEdit();
-          endEditCalled = true;
-        }
-        finally
-        {
-          if( !endEditCalled )
-          {
-            // Since the DataView of MS cancel the edition when EndEdit is throwing, we ensure to restart the editing mode.
-            editableObject.BeginEdit();
-
-            itemProperties.SuspendUnboundItemPropertyChanged( item );
-
-            try
-            {
-              // restore the oldvalues
-              foreach( var itemProperty in itemProperties )
-              {
-                var readOnly = ( ( item == m_currentAddItem ) && itemProperty.OverrideReadOnlyForInsertion.HasValue && itemProperty.OverrideReadOnlyForInsertion.Value )
-                                 ? false
-                                 : itemProperty.IsReadOnly;
-
-                if( !readOnly )
-                {
-                  ItemsSourceHelper.SetValueForItemProperty( itemProperty, item, oldValueBeforeEndEdit[ itemProperty ] );
-                }
-              }
-            }
-            finally
-            {
-              itemProperties.ResumeUnboundItemPropertyChanged( item );
-            }
-          }
-        }
-      }
-    }
-
-    private void CancelEditInternal( object item, out bool cancelEditCalled )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      cancelEditCalled = false;
-      IEditableObject editableObject = ItemsSourceHelper.GetEditableObject( item );
-
-      // editableObject can be an Xceed datarow when directly inserted as Items in the DataGridControl.
-      if( ( editableObject != null ) && ( !( editableObject is Xceed.Wpf.DataGrid.DataRow ) ) )
-      {
-        editableObject.CancelEdit();
-        cancelEditCalled = true;
-      }
-    }
-
-
-    public event EventHandler<DataGridItemCancelEventArgs> BeginningEdit;
-
-    internal virtual void OnBeginningEdit( DataGridItemCancelEventArgs e )
-    {
-      // We throw instead of setting e.Cancel to True because we do not want to give the developer the chance to set it back to False.
-      if( e.Item is EmptyDataItem )
-        throw new DataGridException( "Cannot begin edit on an empty data item." );
-
-      if( this.BeginningEdit != null )
-        this.BeginningEdit( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnBeginningEdit( e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> EditBegun;
-
-    internal virtual void OnEditBegun( DataGridItemEventArgs e )
-    {
-      if( this.EditBegun != null )
-        this.EditBegun( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnEditBegun( e );
-    }
-
-    public event EventHandler<DataGridItemHandledEventArgs> CancelingEdit;
-
-    internal void OnCancelingEdit( DataGridItemHandledEventArgs e )
-    {
-      if( this.CancelingEdit != null )
-        this.CancelingEdit( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnCancelingEdit( e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> EditCanceled;
-
-    internal virtual void OnEditCanceled( DataGridItemEventArgs e )
-    {
-      if( this.EditCanceled != null )
-      {
-        this.EditCanceled( this, e );
-      }
-
-      if( m_parentCollectionViewSourceBase != null )
-      {
-        m_parentCollectionViewSourceBase.OnEditCanceled( e );
-      }
-    }
-
-    public event EventHandler<DataGridItemCancelEventArgs> CommittingEdit;
-
-    internal void OnCommittingEdit( DataGridItemCancelEventArgs e )
-    {
-      if( this.CommittingEdit != null )
-        this.CommittingEdit( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnCommittingEdit( e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> EditCommitted;
-
-    internal virtual void OnEditCommitted( DataGridItemEventArgs e )
-    {
-      if( this.EditCommitted != null )
-        this.EditCommitted( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnEditCommitted( e );
-    }
-
-    #endregion
-
-    #region INSERTION PROCESS
-
-    internal void SetCurrentAddNew( object newItem, int position )
-    {
-      m_currentAddItem = newItem;
-      m_currentAddItemPosition = position;
-    }
-
-    public event EventHandler<DataGridItemEventArgs> InitializingNewItem;
-
-    internal void OnInitializingNewItem( DataGridItemEventArgs e )
-    {
-      if( this.InitializingNewItem != null )
-        this.InitializingNewItem( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnInitializingNewItem( e );
-    }
-
-    public event EventHandler<DataGridCreatingNewItemEventArgs> CreatingNewItem;
-
-    internal void OnCreatingNewItem( DataGridCreatingNewItemEventArgs e )
-    {
-      if( this.CreatingNewItem != null )
-        this.CreatingNewItem( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnCreatingNewItem( e );
-    }
-
-    public event EventHandler<DataGridCommittingNewItemEventArgs> CommittingNewItem;
-
-    internal void OnCommittingNewItem( DataGridCommittingNewItemEventArgs e )
-    {
-      if( this.CommittingNewItem != null )
-        this.CommittingNewItem( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnCommittingNewItem( e );
-    }
-
-    public event EventHandler<DataGridItemHandledEventArgs> CancelingNewItem;
-
-    internal void OnCancelingNewItem( DataGridItemHandledEventArgs e )
-    {
-      if( this.CancelingNewItem != null )
-        this.CancelingNewItem( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnCancelingNewItem( e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> NewItemCreated;
-
-    internal void OnNewItemCreated( DataGridItemEventArgs e )
-    {
-      if( this.NewItemCreated != null )
-        this.NewItemCreated( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnNewItemCreated( e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> NewItemCommitted;
-
-    internal void OnNewItemCommitted( DataGridItemEventArgs e )
-    {
-      if( this.NewItemCommitted != null )
-        this.NewItemCommitted( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnNewItemCommitted( e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> NewItemCanceled;
-
-    internal void OnNewItemCanceled( DataGridItemEventArgs e )
-    {
-      if( this.NewItemCanceled != null )
-        this.NewItemCanceled( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnNewItemCanceled( e );
-    }
-
-    #endregion
-
-    #region DELETION PROCESS
-
-    internal void InternalRemoveAt( int sourceIndex )
-    {
-      IList list = m_enumeration as IList;
-
-      if( list != null )
-      {
-        list.RemoveAt( sourceIndex );
-        return;
-      }
-
-      throw new InvalidOperationException( "An attempt was made to remove an item from the source collection." );
-    }
-
-    public event EventHandler<DataGridRemovingItemEventArgs> RemovingItem;
-
-    internal void OnRemovingItem( DataGridRemovingItemEventArgs e )
-    {
-      if( this.RemovingItem != null )
-        this.RemovingItem( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnRemovingItem( e );
-    }
-
-    public event EventHandler<DataGridItemRemovedEventArgs> ItemRemoved;
-
-    internal void OnItemRemoved( DataGridItemRemovedEventArgs e )
-    {
-      if( this.ItemRemoved != null )
-        this.ItemRemoved( this, e );
-
-      if( m_parentCollectionViewSourceBase != null )
-        m_parentCollectionViewSourceBase.OnItemRemoved( e );
-    }
-
-    #endregion
-
-    #region CURRENCY MANAGEMENT
-
-    internal IDisposable DeferCurrencyEvent()
-    {
-      return new DataGridCollectionViewBase.DeferCurrencyEventHelper( this );
-    }
-
-    internal bool IsCurrencyDeferred
-    {
-      get
-      {
-        return m_deferCurrencyEventCount > 0;
-      }
-    }
-
-    public override object CurrentItem
-    {
-      get
-      {
-        return m_currentItem;
-      }
-    }
-
-    public override int CurrentPosition
-    {
-      get
-      {
-        return m_currentPosition;
-      }
-    }
-
-    public override bool IsCurrentAfterLast
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.IsCurrentAfterLast ];
-      }
-    }
-
-    public override bool IsCurrentBeforeFirst
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.IsCurrentBeforeFirst ];
-      }
-    }
-
-    public override bool MoveCurrentTo( object item )
-    {
-      // This is done in DataGridCollectionView's IndexOf and MoveCurrentToPosition :
-      // this.EnsureThreadAndCollectionLoaded();
-
-      int index = this.IndexOf( item );
-      return this.MoveCurrentToPosition( index );
-    }
-
-    public override bool MoveCurrentToFirst()
-    {
-      // This is done in DataGridCollectionView's MoveCurrentToPosition :
-      // this.EnsureThreadAndCollectionLoaded();
-
-      return this.MoveCurrentToPosition( 0 );
-    }
-
-    public override bool MoveCurrentToLast()
-    {
-      // This is done in DataGridCollectionView's MoveCurrentToPosition :
-      // this.EnsureThreadAndCollectionLoaded();
-
-      return this.MoveCurrentToPosition( this.Count - 1 );
-    }
-
-    public override bool MoveCurrentToNext()
-    {
-      // This is done in DataGridCollectionView's MoveCurrentToPosition :
-      // this.EnsureThreadAndCollectionLoaded();
-
-      if( this.CurrentPosition < this.Count )
-        return this.MoveCurrentToPosition( this.CurrentPosition + 1 );
-
-      return false;
-    }
-
-    public override bool MoveCurrentToPrevious()
-    {
-      // This is done in DataGridCollectionView's MoveCurrentToPosition :
-      // this.EnsureThreadAndCollectionLoaded();
-
-      if( this.CurrentPosition > -1 )
-        return this.MoveCurrentToPosition( this.CurrentPosition - 1 );
-
-      return false;
-    }
-
-    internal virtual void SetCurrentItemAndPositionCore(
-      object currentItem,
-      int currentPosition,
-      bool isCurrentBeforeFirst,
-      bool isCurrentAfterLast )
-    {
-      m_currentItem = currentItem;
-      m_currentPosition = currentPosition;
-
-      m_flags[ ( int )DataGridCollectionViewBaseFlags.IsCurrentBeforeFirst ] = isCurrentBeforeFirst;
-      m_flags[ ( int )DataGridCollectionViewBaseFlags.IsCurrentAfterLast ] = isCurrentAfterLast;
-    }
-
-    #endregion
-
-    #region DEFERRED OPERATIONS HANDLING
-
-    internal event EventHandler PreBatchCollectionChanged;
-    internal event EventHandler PostBatchCollectionChanged;
-
-    internal void RaisePreBatchCollectionChanged()
-    {
-      var handler = this.PreBatchCollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    internal void RaisePostBatchCollectionChanged()
-    {
-      var handler = this.PostBatchCollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    internal void EnsureThread()
-    {
-      if( !this.CheckAccess() )
-        throw new InvalidOperationException( "An attempt was made to execute an operation on a thread other than the dispatcher thread." );
-    }
-
-    internal void EnsureThreadAndCollectionLoaded()
-    {
-      this.EnsureThread();
-
-      if( !this.Loaded )
-      {
-        this.ForceRefresh( false, true, true );
-        Debug.Assert( this.Loaded );
-      }
-    }
-
-    private bool QueueOperationForAddNew
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridCollectionViewBaseFlags.QueueOperationForAddNew ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridCollectionViewBaseFlags.QueueOperationForAddNew ] = value;
-      }
-    }
-
-    internal bool ShouldDeferOperation
-    {
-      get
-      {
-        if( this.InDeferRefresh || !this.CheckAccess() )
-          return true;
-
-        lock( m_deferredOperationManager )
-        {
-          return ( !this.Loaded ) || ( m_deferredOperationManager.HasPendingOperations );
-        }
-      }
-    }
-
-    private bool MustQueueOperationForPendingAddNew( int index, IList oldItems, IList newItems )
-    {
-      if( this.QueueOperationForAddNew )
-        return true;
-
-      if( m_currentAddItem == null )
-        return false;
-
-      if( oldItems != null )
-      {
-        if( ( oldItems.Count == 1 ) && ( oldItems[ 0 ] == m_currentAddItem ) )
-          return true;
-      }
-
-      if( newItems != null )
-      {
-        if( ( newItems.Count == 1 ) && ( newItems[ 0 ] == m_currentAddItem ) )
-          return true;
-      }
-
-      if( ( oldItems == null ) && ( newItems == null ) )
-      {
-        if( index == -1 )
-          return false;
-
-        if( m_currentAddItemPosition == index )
-          return true;
-      }
-
-      return false;
-    }
-
-    internal void ExecuteOrQueueSourceItemOperation( DeferredOperation deferredOperation )
-    {
-      bool queueOperationForPendingAddNew = this.MustQueueOperationForPendingAddNew( deferredOperation.OldStartingIndex, deferredOperation.OldItems, deferredOperation.NewItems );
-
-      if( queueOperationForPendingAddNew )
-      {
-        this.AddDeferredOperationForAddNew( deferredOperation );
-      }
-      else if( this.ShouldDeferOperation )
-      {
-        this.AddDeferredOperation( deferredOperation );
-      }
-      else
-      {
-        bool refreshForced;
-        this.ExecuteSourceItemOperation( deferredOperation, out refreshForced );
-      }
-    }
-
-    internal virtual void ExecuteSourceItemOperation( DeferredOperation deferredOperation, out bool refreshForced )
-    {
-      throw new NotSupportedException( deferredOperation.Action.ToString() + " is not a supported action." );
-    }
-
-    internal void AddDeferredOperation( DeferredOperation deferredOperation )
-    {
-      m_deferredOperationManager.Add( deferredOperation );
-    }
-
-    private void AddDeferredOperationForAddNew( DeferredOperation deferredOperation )
-    {
-      if( m_deferredAddNewOperationManager == null )
-        m_deferredAddNewOperationManager = new DeferredOperationManager( this, null, false );
-
-      m_deferredAddNewOperationManager.Add( deferredOperation );
-    }
-
-    #endregion
-
-    protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs args )
-    {
-
-      if( ( args != null )
-        && ( ( ( args.NewItems != null ) && ( args.NewItems.Count > 1 ) )
-          || ( ( args.OldItems != null ) && ( args.OldItems.Count > 1 ) ) ) )
-      {
-        args = new NotifyRangeCollectionChangedEventArgs( args );
-      }
-
-      base.OnCollectionChanged( args );
-    }
-
-    internal virtual void ProcessInvalidatedGroupStats( HashSet<DataGridCollectionViewGroup> invalidatedGroups, bool resortGroups )
-    {
-    }
-
-    internal virtual void ClearGroupSortComparers()
-    {
-    }
-
-    internal virtual bool CanCreateItemProperties()
-    {
-      return ( ( m_enumeration != null ) || ( m_itemType != typeof( object ) ) || this.CanCreateItemPropertiesFromModelSource );
-    }
-
-    internal virtual void CreateDefaultCollections( DataGridDetailDescription parentDetailDescription )
-    {
-      Debug.Assert( parentDetailDescription == null );
-
-      m_sortDescriptions = ( parentDetailDescription == null ) ? new DataGridSortDescriptionCollection() : parentDetailDescription.SortDescriptions as DataGridSortDescriptionCollection;
-      m_groupDescriptions = ( parentDetailDescription == null ) ? new GroupDescriptionCollection() : parentDetailDescription.GroupDescriptions;
-    }
-
-    internal bool IsSourceSupportingChangeNotification
-    {
-      get
-      {
-        return ItemsSourceHelper.IsSourceSupportingChangeNotification( m_enumeration );
-      }
-    }
-
-    internal void PrepareRootContextForDeferRefresh( DataGridContext dataGridContext )
-    {
-      this.DataGridContext = dataGridContext;
-      m_detailDeferRefreshes = new List<List<IDisposable>>();
-    }
-
-    internal void Dispose()
-    {
-      if( this.ParentCollectionViewSourceBase != null )
-      {
-        this.ParentCollectionViewSourceBase = null;
-
-        this.ClearDefaultPropertyDescriptions();
-        this.ClearItemProperties();
-      }
-
-      this.ClearItemProperties( m_itemProperties );
-      this.UnregisterChangedEvents();
-    }
-
-    private void SetupDefaultDetailDescriptions()
-    {
-      if( ( m_parentDetailDescription != null ) && m_parentDetailDescription.AutoCreateDetailDescriptionsCompleted )
-        return;
-
-      if( this.AutoCreateDetailDescriptions)
-      {
-        var defaultDetailDescriptions = ItemsSourceHelper.CreateDetailDescriptions( m_itemType, m_enumeration );
-        if( defaultDetailDescriptions != null )
-        {
-          foreach( var detailDescription in defaultDetailDescriptions )
-          {
-            if( m_detailDescriptions[ detailDescription.RelationName ] != null )
-              continue;
-
-            if( detailDescription.IsAutoCreated )
-            {
-              // Propagate the AutoCreateForeignKeyDescriptions values to the auto created DataGridDetailDescription.
-              detailDescription.AutoCreateForeignKeyDescriptions = this.AutoCreateForeignKeyDescriptions;
-            }
-
-            m_detailDescriptions.Add( detailDescription );
-          }
-        }
-      }
-
-      if( m_parentDetailDescription != null )
-      {
-        m_parentDetailDescription.AutoCreateDetailDescriptionsCompleted = true;
-      }
-    }
-
-    private void SetupCurrent( bool setToFirstItem )
-    {
-      Debug.Assert( !this.Loaded );
-
-      var enumerator = ( m_enumeration != null ) ? m_enumeration.GetEnumerator() : null;
-
-      try
-      {
-        if( ( enumerator != null ) && enumerator.MoveNext() )
-        {
-          if( setToFirstItem )
-          {
-            this.SetCurrentItemAndPositionCore( enumerator.Current, 0, false, false );
-          }
-          else
-          {
-            this.SetCurrentItemAndPositionCore( null, -1, true, false );
-          }
-        }
-        else
-        {
-          this.SetCurrentItemAndPositionCore( null, -1, true, true );
-        }
-      }
-      finally
-      {
-        var disposable = enumerator as IDisposable;
-        if( disposable != null )
-        {
-          disposable.Dispose();
-        }
-      }
-    }
-
-    private void RegisterChangedEvents()
-    {
-      this.RegisterSourceChanged( m_enumeration );
-
-      CollectionChangedEventManager.AddListener( m_sortDescriptions, this );
-      CollectionChangedEventManager.AddListener( m_groupDescriptions, this );
-
-      ItemPropertyGroupSortStatNameChangedEventManager.AddListener( m_itemProperties, this );
-
-      if( m_parentDetailDescription == null )
-      {
-        InitializeItemPropertyEventManager.AddListener( m_itemProperties, this );
-        CollectionChangedEventManager.AddListener( m_detailDescriptions, this );
-      }
-    }
-
-    private void UnregisterChangedEvents()
-    {
-      this.UnregisterSourceChanged( m_enumeration );
-
-      CollectionChangedEventManager.RemoveListener( m_sortDescriptions, this );
-      CollectionChangedEventManager.RemoveListener( m_groupDescriptions, this );
-
-      ItemPropertyGroupSortStatNameChangedEventManager.RemoveListener( m_itemProperties, this );
-
-      if( m_parentDetailDescription == null )
-      {
-        InitializeItemPropertyEventManager.RemoveListener( m_itemProperties, this );
-        CollectionChangedEventManager.RemoveListener( m_detailDescriptions, this );
-      }
-    }
-
-    private void RegisterSourceChanged( IEnumerable source )
-    {
-      if( source == null )
-        return;
-
-      var collectionChanged = source as INotifyCollectionChanged;
-      var bindingList = source as IBindingList;
-
-      if( collectionChanged != null )
-      {
-        CollectionChangedEventManager.AddListener( collectionChanged, this );
-      }
-      else if( ( bindingList != null ) && bindingList.SupportsChangeNotification )
-      {
-        ListChangedEventManager.AddListener( bindingList, this );
-      }
-    }
-
-    private void UnregisterSourceChanged( IEnumerable source )
-    {
-      if( source == null )
-        return;
-
-      var collectionChanged = source as INotifyCollectionChanged;
-      if( collectionChanged != null )
-      {
-        CollectionChangedEventManager.RemoveListener( collectionChanged, this );
-      }
-      var bindingList = source as IBindingList;
-      if( ( bindingList != null ) && bindingList.SupportsChangeNotification )
-      {
-        ListChangedEventManager.RemoveListener( bindingList, this );
-      }
-    }
-
-    private void RegisterItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      CollectionChangedEventManager.AddListener( itemProperties, this );
-    }
-
-    private void UnregisterItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      CollectionChangedEventManager.RemoveListener( itemProperties, this );
-    }
-
-    private void RegisterItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      PropertyChangedEventManager.AddListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
-    }
-
-    private void UnregisterItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      PropertyChangedEventManager.RemoveListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
-    }
-
-    private void PrepareItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        this.PrepareItemProperty( itemProperty );
-      }
-
-      this.RegisterItemProperties( itemProperties );
-    }
-
-    private void ClearItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        this.ClearItemProperty( itemProperty );
-      }
-
-      this.UnregisterItemProperties( itemProperties );
-    }
-
-    private void PrepareItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      // Set default value for CalculateDistinctValues if not explicitly set.
-      if( !itemProperty.IsCalculateDistinctValuesInitialized && ( m_parentDetailDescription != null ) )
-      {
-        itemProperty.CalculateDistinctValues = m_parentDetailDescription.DefaultCalculateDistinctValues;
-      }
-
-      var propertyPath = PropertyRouteParser.Parse( itemProperty );
-
-      this.RegisterItemProperty( itemProperty );
-      this.PrepareItemProperties( itemProperty.ItemPropertiesInternal );
-    }
-
-    private void ClearItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      this.ClearItemProperties( itemProperty.ItemPropertiesInternal );
-      this.UnregisterItemProperty( itemProperty );
-
-      var propertyPath = PropertyRouteParser.Parse( itemProperty );
-    }
-
-    private void SetupDefaultPropertyDescriptions()
-    {
-      if( this.DefaultPropertyDescriptionsCreated )
-        return;
-
-      var modelDataTable = ( m_enumeration as DataTable ) ?? ( m_modelSource as DataTable );
-
-      if( this.CanCreateItemProperties() )
-      {
-        this.DefaultItemPropertiesInitialized = false;
-        this.DefaultPropertyDescriptionsCreated = true;
-
-        ItemsSourceHelper.SetPropertyDescriptions( m_defaultPropertyDescriptions, modelDataTable, m_enumeration, m_itemType, true );
-      }
-
-      if( !this.DefaultItemPropertiesInitialized )
-      {
-        this.DefaultItemPropertiesInitialized = true;
-
-        // Initialize the item properties according to the default property descriptions.
-        foreach( var itemProperty in m_itemProperties )
-        {
-          var itemPropertyRoute = DataGridItemPropertyRoute.Create( itemProperty );
-
-          ItemsSourceHelper.SetPropertyDescriptionsFromItemProperty( m_defaultPropertyDescriptions, modelDataTable, m_enumeration, m_itemType, itemPropertyRoute );
-          ItemsSourceHelper.InitializePropertyDescriptions( m_defaultPropertyDescriptions, itemPropertyRoute, m_itemType, this.DefaultPropertyDescriptionsCreated );
-        }
-      }
-    }
-
-    private void ClearDefaultPropertyDescriptions()
-    {
-      this.DefaultItemPropertiesInitialized = false;
-      this.DefaultPropertyDescriptionsCreated = false;
-
-      m_defaultPropertyDescriptions.Clear();
-    }
-
-    private void ClearItemProperties()
-    {
-      m_itemProperties.Clear();
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
-
-        if( sender == this.SortDescriptions )
-        {
-          this.OnSortDescriptionsChanged( sender, eventArgs );
-        }
-        else if( sender == this.GroupDescriptions )
-        {
-          this.OnGroupDescriptionsChanged( sender, eventArgs );
-        }
-        else if( sender == this.Enumeration )
-        {
-          this.OnItemsSourceCollectionChanged( sender, eventArgs );
-        }
-        else if( sender is DataGridItemPropertyCollection )
-        {
-          this.OnItemPropertiesCollectionChanged( sender, eventArgs );
-        }
-      }
-      else if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        var eventArgs = ( PropertyChangedEventArgs )e;
-        var itemProperty = sender as DataGridItemPropertyBase;
-
-        if( itemProperty != null )
-        {
-          this.OnItemPropertyPropertyChanged( itemProperty, eventArgs );
-        }
-      }
-      else if( managerType == typeof( ListChangedEventManager ) )
-      {
-        if( sender == this.Enumeration )
-        {
-          this.OnItemsSourceListChanged( sender, ( ListChangedEventArgs )e );
-        }
-      }
-      else if( managerType == typeof( ItemPropertyGroupSortStatNameChangedEventManager ) )
-      {
-        if( sender == this.ItemProperties )
-        {
-          this.ClearGroupSortComparers();
-        }
-      }
-      else if( managerType == typeof( InitializeItemPropertyEventManager ) )
-      {
-        var eventArgs = ( InitializeItemPropertyEventArgs )e;
-
-        if( sender == this.ItemProperties )
-        {
-          var itemProperty = eventArgs.ItemProperty;
-          var itemPropertyRoute = DataGridItemPropertyRoute.Create( itemProperty );
-          var modelDataTable = ( m_enumeration as DataTable ) ?? ( m_modelSource as DataTable );
-
-          ItemsSourceHelper.SetPropertyDescriptionsFromItemProperty( m_defaultPropertyDescriptions, modelDataTable, m_enumeration, m_itemType, itemPropertyRoute );
-          ItemsSourceHelper.InitializePropertyDescriptions( m_defaultPropertyDescriptions, itemPropertyRoute, m_itemType, this.DefaultPropertyDescriptionsCreated );
-          ItemsSourceHelper.AutoDetectSynonyms( this, itemPropertyRoute );
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region ICollectionView Members
-
-    public override IDisposable DeferRefresh()
-    {
-      this.EnsureThread();
-
-      var dataGridContext = this.DataGridContext;
-
-      if( dataGridContext != null )
-      {
-        //Make sure detail DataGridCollectionView's are also deferred.
-        List<IDisposable> detailDisposables = new List<IDisposable>();
-        foreach( DataGridContext detailContext in dataGridContext.GetChildContextsCore() )
-        {
-          detailDisposables.Add( detailContext.Items.DeferRefresh() );
-        }
-
-        m_detailDeferRefreshes.Add( detailDisposables );
-      }
-
-      return new DataGridCollectionView.DeferRefreshHelper( this );
-    }
-
-    public override void Refresh()
-    {
-      this.EnsureThread();
-
-      var dataGridContext = this.DataGridContext;
-
-      if( this.InDeferRefresh )
-      {
-        if( dataGridContext != null )
-        {
-          //Make sure to queue a Refresh on all detail DataGridCollectionView's.
-          foreach( DataGridContext detailContext in dataGridContext.GetChildContextsCore() )
-          {
-            detailContext.Items.Refresh();
-          }
-        }
-
-        this.AddDeferredOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null ) );
-      }
-      else
-      {
-        if( dataGridContext != null )
-        {
-          //Make sure all detail DataGridCollectionView's are refreshed.
-          foreach( DataGridContext detailContext in dataGridContext.GetChildContextsCore() )
-          {
-            detailContext.Items.Refresh();
-          }
-        }
-
-        this.OnProxyCollectionRefresh();
-        this.ForceRefresh( true, !this.Loaded, true );
-      }
-    }
-
-    public override SortDescriptionCollection SortDescriptions
-    {
-      get
-      {
-        return m_sortDescriptions;
-      }
-    }
-
-    internal DataGridSortDescriptionCollection DataGridSortDescriptions
-    {
-      get
-      {
-        return m_sortDescriptions;
-      }
-    }
-
-    public override ObservableCollection<GroupDescription> GroupDescriptions
-    {
-      get
-      {
-        return m_groupDescriptions;
-      }
-    }
-
-    public override ReadOnlyObservableCollection<object> Groups
-    {
-      get
-      {
-        if( m_groupDescriptions.Count > 0 )
-        {
-          this.EnsureThreadAndCollectionLoaded();
-
-          IList<object> rootGroups = m_rootGroup.GetItems();
-
-          Debug.Assert( rootGroups is ReadOnlyObservableCollection<object>,
-            "The CollectionViewGroup GetItems extensibility method should always return a ReadOnlyObservableCollection<object> when " +
-            "dealing with a DataGridVirtualizingCollectionViewGroupRoot which has subgroups." );
-
-          return ( ReadOnlyObservableCollection<object> )rootGroups;
-        }
-
-        return null;
-      }
-    }
-
-    internal CollectionViewGroup RootGroup
-    {
-      get
-      {
-        return m_rootGroup;
-      }
-      set
-      {
-        m_rootGroup = value;
-      }
-    }
-
-    public override bool CanSort
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public override bool CanGroup
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public override bool CanFilter
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public override Predicate<object> Filter
-    {
-      get
-      {
-        return m_filter;
-      }
-      set
-      {
-        if( !this.CanFilter )
-          throw new NotSupportedException();
-
-        if( ( value == null ) && ( value == m_filter ) )
-          return;
-
-        m_filter = value;
-        this.Refresh();
-      }
-    }
-
-    public override bool PassesFilter( object item )
-    {
-      if( ( this.CanFilter ) && ( m_filter != null ) )
-        return m_filter( item );
-
-      return true;
-    }
-
-    #endregion
-
-    #region IEditableCollectionView
-
-    public virtual bool CanAddNew
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public virtual object AddNew()
-    {
-      if( !this.CanAddNew )
-        throw new InvalidOperationException( "An attempt was made to add an item to a source that does not support addition." );
-
-      // If a current AddNew has not been committed, commit it.
-      this.CommitNew();
-      this.CommitEdit();
-
-      this.QueueOperationForAddNew = true;
-
-      try
-      {
-        DataGridCreatingNewItemEventArgs creatingNewItemEventArgs = new DataGridCreatingNewItemEventArgs( this, null, false );
-
-        this.RootDataGridCollectionViewBase.OnCreatingNewItem( creatingNewItemEventArgs );
-
-        this.SetCurrentAddNew( creatingNewItemEventArgs.NewItem, -1 );
-
-        if( creatingNewItemEventArgs.Cancel )
-          throw new DataGridException( "AddNew was canceled." );
-
-        this.CreatingNewItemIsManuallyHandled = creatingNewItemEventArgs.Handled;
-
-        if( this.CreatingNewItemIsManuallyHandled )
-        {
-          if( m_currentAddItem == null )
-            throw new InvalidOperationException( "An attempt was made to handle the CreatingNewItem event without providing a new item." );
-        }
-        else
-        {
-          if( !this.HasSource )
-            throw new InvalidOperationException( "The CreatingNewItem event must be handled when not using an underlying data source." );
-
-          int newItemIndex;
-          object newItem = ItemsSourceHelper.AddNewDataItem( this.Enumeration, null, out newItemIndex );
-
-          this.SetCurrentAddNew( newItem, newItemIndex );
-        }
-
-        DataGridItemEventArgs initializingNewItemEventArgs = new DataGridItemEventArgs( this, m_currentAddItem );
-        this.RootDataGridCollectionViewBase.OnInitializingNewItem( initializingNewItemEventArgs );
-      }
-      catch
-      {
-        // QueueOperationForAddNew must be off when calling CancelNew
-        this.QueueOperationForAddNew = false;
-
-        if( m_currentAddItem != null )
-        {
-          this.CancelNew();
-        }
-
-        throw;
-      }
-      finally
-      {
-        this.QueueOperationForAddNew = false;
-      }
-
-      DataGridItemEventArgs itemCreatedEventArgs = new DataGridItemEventArgs( this, m_currentAddItem );
-      m_rootDataGridCollectionViewBase.OnNewItemCreated( itemCreatedEventArgs );
-
-      return m_currentAddItem;
-    }
-
-    public virtual void CommitNew()
-    {
-      if( m_currentAddItem == null )
-        return;
-
-      object item = m_currentAddItem;
-      DeferredOperation addOperationToNotifyIfNotAlreadyQueued = null;
-      this.QueueOperationForAddNew = true;
-
-      try
-      {
-        DataGridCommittingNewItemEventArgs committingNewItemEventArgs = new DataGridCommittingNewItemEventArgs( this, m_currentAddItem, false );
-
-        this.RootDataGridCollectionViewBase.OnCommittingNewItem( committingNewItemEventArgs );
-
-        if( committingNewItemEventArgs.Cancel )
-          throw new DataGridException( "CommitNew was canceled." );
-
-        if( this.CreatingNewItemIsManuallyHandled != committingNewItemEventArgs.Handled )
-          throw new InvalidOperationException( "When manually handling the item-insertion process the CreatingNewItem, CommittingNewItem, and CancelingNewItem events must all be handled." );
-
-        if( !committingNewItemEventArgs.Handled )
-        {
-          if( !this.HasSource )
-            throw new InvalidOperationException( "The CommittingNewItem event must be handled when not using an underlying data source." );
-
-          int addItemPosition = m_currentAddItemPosition;
-          ItemsSourceHelper.EndNewDataItem( this.Enumeration, null, m_currentAddItem, ref addItemPosition );
-
-          addOperationToNotifyIfNotAlreadyQueued = new DeferredOperation( DeferredOperation.DeferredOperationAction.Add, addItemPosition + 1,
-                                                                          addItemPosition, new object[] { m_currentAddItem } );
-        }
-        else
-        {
-          if( committingNewItemEventArgs.Index == -1 )
-            throw new InvalidOperationException( "An attempt was made to handle the CommittingNewItem event without providing the index at which the new item was inserted." );
-
-          if( committingNewItemEventArgs.NewCount == -1 )
-            throw new InvalidOperationException( "An attempt was made to handle the CommittingNewItem event without providing the new item count." );
-
-          if( committingNewItemEventArgs.Index >= committingNewItemEventArgs.NewCount )
-            throw new InvalidOperationException( "The index at which the new item was inserted was greater than the new item count." );
-
-          addOperationToNotifyIfNotAlreadyQueued = new DeferredOperation( DeferredOperation.DeferredOperationAction.Add, committingNewItemEventArgs.NewCount,
-                                                                          committingNewItemEventArgs.Index, new object[] { m_currentAddItem } );
-        }
-
-        this.SetCurrentAddNew( null, -1 );
-      }
-      finally
-      {
-        this.QueueOperationForAddNew = false;
-      }
-
-      if( m_deferredAddNewOperationManager != null )
-      {
-        m_deferredAddNewOperationManager.PurgeAddWithRemoveOrReplace();
-
-        DeferredOperationManager deferredOperationManager = this.DeferredOperationManager;
-
-        lock( deferredOperationManager )
-        {
-          if( this.ShouldDeferOperation )
-          {
-            deferredOperationManager.Combine( m_deferredAddNewOperationManager );
-          }
-          else
-          {
-            m_deferredAddNewOperationManager.Process();
-          }
-        }
-
-        m_deferredAddNewOperationManager = null;
-      }
-      else
-      {
-        Debug.Assert( !this.IsSourceSupportingChangeNotification );
-
-        // No pending operation was in m_deferredAddNewOperationManager, so the list has not trigger notification for the new item added.
-        // We will, in that case, raise the notification ourself.
-        this.ExecuteOrQueueSourceItemOperation( addOperationToNotifyIfNotAlreadyQueued );
-      }
-
-      DataGridItemEventArgs itemEventArgs = new DataGridItemEventArgs( this, item );
-      m_rootDataGridCollectionViewBase.OnNewItemCommitted( itemEventArgs );
-    }
-
-    public virtual void CancelNew()
-    {
-      if( m_currentAddItem == null )
-        return;
-
-      object currentAddItem = m_currentAddItem;
-      this.QueueOperationForAddNew = true;
-
-      try
-      {
-        DataGridItemHandledEventArgs cancelingNewItemEventArgs = new DataGridItemHandledEventArgs( this, currentAddItem );
-        this.RootDataGridCollectionViewBase.OnCancelingNewItem( cancelingNewItemEventArgs );
-
-        if( this.CreatingNewItemIsManuallyHandled != cancelingNewItemEventArgs.Handled )
-          throw new InvalidOperationException( "When manually handling the item-insertion process the CreatingNewItem, CommittingNewItem, and CancelingNewItem events must all be handled." );
-
-        if( !cancelingNewItemEventArgs.Handled )
-        {
-          if( !this.HasSource )
-            throw new InvalidOperationException( "The CancelingNewItem event must be handled when not using an underlying data source." );
-
-          ItemsSourceHelper.CancelNewDataItem( this.Enumeration, null, m_currentAddItem, m_currentAddItemPosition );
-        }
-
-        this.SetCurrentAddNew( null, -1 );
-      }
-      finally
-      {
-        this.QueueOperationForAddNew = false;
-      }
-
-      if( m_deferredAddNewOperationManager != null )
-      {
-        m_deferredAddNewOperationManager.PurgeAddWithRemoveOrReplace();
-
-        DeferredOperationManager deferredOperationManager = this.DeferredOperationManager;
-
-        lock( deferredOperationManager )
-        {
-          if( this.ShouldDeferOperation )
-          {
-            deferredOperationManager.Combine( m_deferredAddNewOperationManager );
-          }
-          else
-          {
-            m_deferredAddNewOperationManager.Process();
-          }
-        }
-
-        m_deferredAddNewOperationManager = null;
-      }
-
-      DataGridItemEventArgs itemEventArgs = new DataGridItemEventArgs( this, currentAddItem );
-      m_rootDataGridCollectionViewBase.OnNewItemCanceled( itemEventArgs );
-    }
-
-    public virtual void EditItem( object item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      this.CommitNew();
-
-      if( m_currentEditItem == item )
-        return;
-
-      this.CommitEdit();
-
-      var itemCancelEventArgs = new DataGridItemCancelEventArgs( this, item, false );
-      m_rootDataGridCollectionViewBase.OnBeginningEdit( itemCancelEventArgs );
-
-      if( itemCancelEventArgs.Cancel )
-        throw new DataGridException( "EditItem was canceled." );
-
-      this.ItemEditionIsManuallyHandled = itemCancelEventArgs.Handled;
-
-      if( !this.ItemEditionIsManuallyHandled )
-      {
-        bool beginEditCalled;
-        this.EditItemInternal( item, out beginEditCalled );
-
-        if( !beginEditCalled )
-        {
-          var itemProperties = this.ItemProperties;
-          m_oldValuesBeforeEdition = new Dictionary<DataGridItemPropertyBase, object>( itemProperties.Count );
-
-          foreach( var itemProperty in itemProperties )
-          {
-            m_oldValuesBeforeEdition[ itemProperty ] = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
-          }
-        }
-      }
-
-      m_currentEditItem = item;
-      m_rootDataGridCollectionViewBase.OnEditBegun( new DataGridItemEventArgs( this, item ) );
-    }
-
-    public virtual void CommitEdit()
-    {
-      if( m_currentEditItem == null )
-        return;
-
-      var itemCancelEventArgs = new DataGridItemCancelEventArgs( this, m_currentEditItem, false );
-      m_rootDataGridCollectionViewBase.OnCommittingEdit( itemCancelEventArgs );
-
-      if( itemCancelEventArgs.Cancel )
-        throw new DataGridException( "CommitEdit was canceled." );
-
-      if( itemCancelEventArgs.Handled != this.ItemEditionIsManuallyHandled )
-        throw new InvalidOperationException( "When manually handling the item-edition process the BeginningEdit, CommittingEdit, and CancelingEdit events must all be handled." );
-
-      if( !itemCancelEventArgs.Handled )
-      {
-        bool endEditCalled;
-        this.EndEditInternal( m_currentEditItem, out endEditCalled );
-        m_oldValuesBeforeEdition = null;
-      }
-
-      var itemEventArgs = new DataGridItemEventArgs( this, m_currentEditItem );
-      var index = this.IndexOfSourceItem( m_currentEditItem );
-
-      var items = new object[] { m_currentEditItem };
-      m_currentEditItem = null;
-
-      this.ExecuteOrQueueSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Replace, -1, index, items, index, items ) );
-
-      m_rootDataGridCollectionViewBase.OnEditCommitted( itemEventArgs );
-    }
-
-    public virtual bool CanCancelEdit
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public virtual void CancelEdit()
-    {
-      if( !this.CanCancelEdit )
-        throw new InvalidOperationException( "An attempt was made to cancel the edit process on a source that does not support cancellation." );
-
-      if( m_currentEditItem == null )
-        return;
-
-      var itemHandleEventArgs = new DataGridItemHandledEventArgs( this, m_currentEditItem );
-      m_rootDataGridCollectionViewBase.OnCancelingEdit( itemHandleEventArgs );
-
-      if( itemHandleEventArgs.Handled != this.ItemEditionIsManuallyHandled )
-        throw new InvalidOperationException( "An attempt was made to manually handle the edit prcess without handling the BeginningEdit, CommittingEdit, and CancelingEdit events." );
-
-      if( !itemHandleEventArgs.Handled )
-      {
-        bool cancelEditCalled;
-        this.CancelEditInternal( m_currentEditItem, out cancelEditCalled );
-
-        var itemProperties = this.ItemProperties;
-
-        if( ( !cancelEditCalled ) && ( itemProperties.Count > 0 ) )
-        {
-          itemProperties.SuspendUnboundItemPropertyChanged( m_currentEditItem );
-
-          try
-          {
-            foreach( var itemProperty in itemProperties )
-            {
-              var readOnly = ( ( m_currentEditItem == m_currentAddItem ) && itemProperty.OverrideReadOnlyForInsertion.HasValue && itemProperty.OverrideReadOnlyForInsertion.Value )
-                               ? false
-                               : itemProperty.IsReadOnly;
-
-              if( readOnly )
-                continue;
-
-              try
-              {
-                ItemsSourceHelper.SetValueForItemProperty( itemProperty, m_currentEditItem, m_oldValuesBeforeEdition[ itemProperty ] );
-              }
-              catch
-              {
-                // Swallow any Exception, setting a property to is old value should not throw.
-              }
-            }
-          }
-          finally
-          {
-            itemProperties.ResumeUnboundItemPropertyChanged( m_currentEditItem );
-          }
-        }
-      }
-
-      var itemEventArgs = new DataGridItemEventArgs( this, m_currentEditItem );
-      m_currentEditItem = null;
-      m_rootDataGridCollectionViewBase.OnEditCanceled( itemEventArgs );
-    }
-
-    public virtual bool CanRemove
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public virtual void Remove( object item )
-    {
-      if( !this.CanRemove )
-        throw new InvalidOperationException( "An attempt was made to remove an item from a source that does not support removal." );
-
-      if( this.IsEditingItem || this.IsAddingNew )
-        throw new InvalidOperationException( "An attempt was made to remove an item while an item is being edited or added." );
-
-      int sourceIndex = -2;
-
-      if( ( !this.HasSource ) || ( !this.IsSourceSupportingChangeNotification ) )
-        sourceIndex = this.IndexOfSourceItem( item );
-
-      DataGridRemovingItemEventArgs removingItemEventArgs = new DataGridRemovingItemEventArgs( this, item, -1, false );
-      this.RootDataGridCollectionViewBase.OnRemovingItem( removingItemEventArgs );
-
-      if( removingItemEventArgs.Cancel )
-        throw new DataGridException( "Remove was canceled." );
-
-      if( !removingItemEventArgs.Handled )
-      {
-        if( !this.HasSource )
-          throw new InvalidOperationException( "The RemovingItem event must be handled when not using an underlying data source." );
-
-        if( sourceIndex == -2 )
-          sourceIndex = this.IndexOfSourceItem( item );
-
-        if( sourceIndex != -1 )
-          this.InternalRemoveAt( sourceIndex );
-      }
-
-      if( ( !this.HasSource ) || ( !this.IsSourceSupportingChangeNotification ) )
-      {
-        DeferredOperation deferredOperation = new DeferredOperation(
-          DeferredOperation.DeferredOperationAction.Remove,
-          sourceIndex,
-          new object[] { item } );
-
-        this.ExecuteOrQueueSourceItemOperation( deferredOperation );
-      }
-
-      DataGridItemRemovedEventArgs itemRemovedEventArgs = new DataGridItemRemovedEventArgs( this, item, -1 );
-      this.RootDataGridCollectionViewBase.OnItemRemoved( itemRemovedEventArgs );
-    }
-
-    public virtual void RemoveAt( int index )
-    {
-      object item = this.GetItemAt( index );
-      this.Remove( item );
-    }
-
-    public virtual object CurrentAddItem
-    {
-      get
-      {
-        return m_currentAddItem;
-      }
-    }
-
-    public virtual object CurrentEditItem
-    {
-      get
-      {
-        return m_currentEditItem;
-      }
-    }
-
-    public virtual bool IsAddingNew
-    {
-      get
-      {
-        return m_currentAddItem != null;
-      }
-    }
-
-    public virtual bool IsEditingItem
-    {
-      get
-      {
-        return m_currentEditItem != null;
-      }
-    }
-
-    NewItemPlaceholderPosition IEditableCollectionView.NewItemPlaceholderPosition
-    {
-      get
-      {
-        return m_newItemPlaceholderPosition;
-      }
-      set
-      {
-        m_newItemPlaceholderPosition = value;
-      }
-    }
-
-    private NewItemPlaceholderPosition m_newItemPlaceholderPosition = NewItemPlaceholderPosition.None;
-
-    #endregion
-
-    #region IItemProperties Members
-
-    ReadOnlyCollection<ItemPropertyInfo> IItemProperties.ItemProperties
-    {
-      get
-      {
-        List<ItemPropertyInfo> itemPropertyInfos = this.GetItemPropertyInfos();
-
-        if( itemPropertyInfos == null )
-          return null;
-
-        return new ReadOnlyCollection<ItemPropertyInfo>( itemPropertyInfos );
-      }
-    }
-
-    internal virtual List<ItemPropertyInfo> GetItemPropertyInfos()
-    {
-      return ( from item in m_itemProperties
-               select new ItemPropertyInfo( item.Name, item.DataType, item.GetPropertyDescriptorForBinding() ) ).ToList();
-    }
-
-    #endregion
-
-    private BitVector32 m_flags = new BitVector32();
-
-    private DeferredOperationManager m_deferredOperationManager;
-    private DeferredOperationManager m_deferredAddNewOperationManager;
-
-    private int m_deferRefreshCount;
-
-    private readonly DataGridCollectionViewBase m_rootDataGridCollectionViewBase;
-
-    private Type m_itemType;
-    private Type m_desiredItemType;
-    private object m_modelSource;
-    private IEnumerable m_enumeration;
-
-    private int m_currentPosition;
-    private object m_currentItem;
-    private int m_deferCurrencyEventCount;
-
-    private object m_currentEditItem;
-    private Dictionary<DataGridItemPropertyBase, object> m_oldValuesBeforeEdition;
-
-    private object m_currentAddItem;
-    private int m_currentAddItemPosition = -1;
-
-    private DistinctValuesConstraint m_distinctValuesConstraint = DistinctValuesConstraint.All;
-    private DistinctValuesUpdateMode m_distinctValueUpdateMode = DistinctValuesUpdateMode.Manual;
-
-    private List<DataGridItemPropertyBase> m_filteredItemProperties;
-    private ReadOnlyCollection<DataGridItemPropertyBase> m_readOnlyFilteredItemProperties;
-
-    private DataGridDetailDescription m_parentDetailDescription;
-
-    private readonly DataGridItemPropertyCollection m_itemProperties;
-
-    private DataGridSortDescriptionCollection m_sortDescriptions;
-    private ObservableCollection<GroupDescription> m_groupDescriptions;
-    private readonly DataGridDetailDescriptionCollection m_detailDescriptions;
-    private readonly PropertyDescriptionRouteDictionary m_defaultPropertyDescriptions;
-
-    private CollectionViewGroup m_rootGroup;
-
-    private Predicate<object> m_filter;
-
-    // Containing a DataGridItemProperty key, ObservableCollection<object> values map
-    private DistinctValuesDictionary m_distinctValues;
-    private DataGridItemPropertyBase m_excludedItemPropertyFromDistinctValueCalculation;
-
-    [Flags]
-    private enum DataGridCollectionViewBaseFlags
-    {
-      Loaded = 1 << 0,
-      Refreshing = 1 << 1,
-      QueueOperationForAddNew = 1 << 2,
-      IsRefreshingDistinctValues = 1 << 3,
-      IsCurrentAfterLast = 1 << 4,
-      IsCurrentBeforeFirst = 1 << 5,
-      CreatingNewItemIsManuallyHandled = 1 << 6,
-      ItemEditionIsManuallyHandled = 1 << 7,
-      AutoCreateItemProperties = 1 << 8,
-      AutoCreateDetailDescriptions = 1 << 9,
-      AutoCreateForeignKeyDescriptions = 1 << 10,
-      DefaultItemPropertiesInitialized = 1 << 11,
-      DefaultPropertyDescriptionsCreated = 1 << 12,
-    }
-
-    private sealed class DeferRefreshHelper : IDisposable
-    {
-      public DeferRefreshHelper( DataGridCollectionViewBase collectionView )
-      {
-        m_collectionView = collectionView;
-
-        Interlocked.Increment( ref collectionView.m_deferRefreshCount );
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        // Prevent this method from being invoked more than once by the same IDisposable.
-        var collectionView = Interlocked.Exchange( ref m_collectionView, null );
-        if( collectionView == null )
-          return;
-
-        if( collectionView.CheckAccess() )
-        {
-          DeferRefreshHelper.ProcessDispose( collectionView );
-        }
-        else
-        {
-          //In case Dispose is called from a different thread, make sure the refresh is done on the UI thread.
-          collectionView.Dispatcher.BeginInvoke( new Action<DataGridCollectionViewBase>( DeferRefreshHelper.ProcessDispose ), DispatcherPriority.Send, collectionView );
-        }
-      }
-
-      private static void ProcessDispose( DataGridCollectionViewBase collectionView )
-      {
-        //If there are detail DataGridCollectionView's being defered.
-        if( collectionView.m_detailDeferRefreshes != null && collectionView.m_detailDeferRefreshes.Count > 0 )
-        {
-          //Dispose them.
-          foreach( IDisposable detailDisposable in collectionView.m_detailDeferRefreshes[ 0 ] )
-          {
-            if( detailDisposable != null )
-            {
-              detailDisposable.Dispose();
-            }
-          }
-
-          //Clear and remove the list that was just disposed of.
-          collectionView.m_detailDeferRefreshes[ 0 ].Clear();
-          collectionView.m_detailDeferRefreshes.RemoveAt( 0 );
-        }
-
-        //Only process the DeferRefresh when count is back to 0.
-        if( Interlocked.Decrement( ref collectionView.m_deferRefreshCount ) > 0 )
-          return;
-
-        if( collectionView.Loaded )
-        {
-          collectionView.m_deferredOperationManager.Process();
-        }
-        else
-        {
-          // We call ForceRefresh when not yet "Loaded" because we want the Dispose here to triger the CollectionChanged( NotifyCollectionChangedAction.Reset )
-          // This is needed because of the way the ItemsControl works (other than our grid).
-          collectionView.ForceRefresh( true, true, true );
-        }
-      }
-
-      ~DeferRefreshHelper()
-      {
-        //Make sure the defering process for the CollectionView stays in a valid state, by disposing of details and properly setting the count.
-        this.Dispose( false );
-      }
-
-      private DataGridCollectionViewBase m_collectionView;
-    }
-
-    private sealed class DeferCurrencyEventHelper : IDisposable
-    {
-      public DeferCurrencyEventHelper( DataGridCollectionViewBase collectionView )
-      {
-        m_collectionView = collectionView;
-        m_oldCurrentItem = m_collectionView.CurrentItem;
-        m_oldCurrentPosition = m_collectionView.CurrentPosition;
-        m_oldIsCurrentBeforeFirst = m_collectionView.IsCurrentBeforeFirst;
-        m_oldIsCurrentAfterLast = m_collectionView.IsCurrentAfterLast;
-
-        Interlocked.Increment( ref m_collectionView.m_deferCurrencyEventCount );
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        // Prevent this method from being invoked more than once by the same IDisposable.
-        var collectionView = Interlocked.Exchange( ref m_collectionView, null );
-        if( collectionView == null )
-          return;
-
-        if( collectionView.CheckAccess() )
-        {
-          DeferCurrencyEventHelper.ProcessDispose( collectionView, m_oldCurrentItem, m_oldCurrentPosition, m_oldIsCurrentBeforeFirst, m_oldIsCurrentAfterLast );
-        }
-        else
-        {
-          // Make sure the calls to the collection view will be done on the collection view's thread.
-          collectionView.Dispatcher.BeginInvoke(
-            new Action<DataGridCollectionViewBase, object, int, bool, bool>( DeferCurrencyEventHelper.ProcessDispose ),
-            DispatcherPriority.Send,
-            collectionView,
-            m_oldCurrentItem,
-            m_oldCurrentPosition,
-            m_oldIsCurrentBeforeFirst,
-            m_oldIsCurrentAfterLast );
-        }
-      }
-
-      private static void ProcessDispose(
-        DataGridCollectionViewBase collectionView,
-        object oldCurrentItem,
-        int oldCurrentPosition,
-        bool oldIsCurrentBeforeFirst,
-        bool oldIsCurrentAfterLast )
-      {
-        if( Interlocked.Decrement( ref collectionView.m_deferCurrencyEventCount ) > 0 )
-          return;
-
-        bool itemChanged = false;
-
-        if( !object.Equals( oldCurrentItem, collectionView.CurrentItem ) )
-        {
-          itemChanged = true;
-          collectionView.OnPropertyChanged( new PropertyChangedEventArgs( "CurrentItem" ) );
-        }
-
-        if( oldCurrentPosition != collectionView.CurrentPosition )
-        {
-          itemChanged = true;
-          collectionView.OnPropertyChanged( new PropertyChangedEventArgs( "CurrentPosition" ) );
-        }
-
-        if( oldIsCurrentBeforeFirst != collectionView.IsCurrentBeforeFirst )
-        {
-          itemChanged = true;
-          collectionView.OnPropertyChanged( new PropertyChangedEventArgs( "IsCurrentBeforeFirst" ) );
-        }
-
-        if( oldIsCurrentAfterLast != collectionView.IsCurrentAfterLast )
-        {
-          itemChanged = true;
-          collectionView.OnPropertyChanged( new PropertyChangedEventArgs( "IsCurrentAfterLast" ) );
-        }
-
-        if( itemChanged )
-        {
-          collectionView.OnCurrentChanged();
-        }
-      }
-
-      ~DeferCurrencyEventHelper()
-      {
-        this.Dispose( false );
-      }
-
-      private readonly int m_oldCurrentPosition;
-      private readonly object m_oldCurrentItem;
-      private readonly bool m_oldIsCurrentAfterLast;
-      private readonly bool m_oldIsCurrentBeforeFirst;
-
-      private DataGridCollectionViewBase m_collectionView;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs
deleted file mode 100644
index 93604b4e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class DataGridCollectionViewBaseDataProvider : DataSourceProvider, IWeakEventListener
-  {
-    internal DataGridCollectionViewBaseDataProvider( DataGridCollectionViewSourceBase parentSource )
-      : base()
-    {
-      if( parentSource == null )
-        throw new ArgumentNullException( "parentSource" );
-
-      m_parentSource = parentSource;
-    }
-
-    #region CurrentView Property
-
-    public DataGridCollectionViewBase CurrentView
-    {
-      get
-      {
-        return m_currentView;
-      }
-    }
-
-    private DataGridCollectionViewBase m_currentView;
-
-    #endregion
-
-    #region ParentSource Internal Property
-
-    internal DataGridCollectionViewSourceBase ParentSource
-    {
-      get
-      {
-        return m_parentSource;
-      }
-    }
-
-    private readonly DataGridCollectionViewSourceBase m_parentSource;
-
-    #endregion
-
-    public void DelayRefresh( Dispatcher dispatcher, DispatcherPriority priority )
-    {
-      // No need to call Refresh again since there is already one that is pending.
-      if( m_delayedRefreshPending )
-        return;
-
-      // Call Refresh on the dispatcher with the specified priority.
-      var operation = dispatcher.BeginInvoke(
-        priority,
-        new Action( delegate
-        {
-          this.Refresh();
-        } ) );
-
-      // If we're not already completed, set the internal flag to prevent
-      // another Refresh from being stacked on register to be notified
-      // when the operation complete.
-      if( operation.Status != DispatcherOperationStatus.Completed )
-      {
-        m_delayedRefreshPending = true;
-        operation.Completed += new EventHandler( this.OnDelayedRefreshCompleted );
-      }
-    }
-
-    protected override void BeginQuery()
-    {
-      var queryException = default( Exception );
-
-      try
-      {
-        this.EnsureDataGridCollectionViewBase();
-      }
-      catch( Exception exception )
-      {
-        queryException = exception;
-      }
-
-      this.OnQueryFinished( m_currentView, queryException, null, null );
-    }
-
-    internal abstract DataGridCollectionViewBase EnsureDataGridCollectionViewBaseCore();
-
-    private void EnsureDataGridCollectionViewBase()
-    {
-      var success = false;
-
-      try
-      {
-        var newView = this.EnsureDataGridCollectionViewBaseCore();
-        if( newView != m_currentView )
-        {
-          this.ClearView();
-
-          m_currentView = newView;
-
-          if( m_currentView != null )
-          {
-            m_currentView.ParentCollectionViewSourceBase = m_parentSource;
-          }
-        }
-
-        Debug.Assert( ( m_currentView == null ) || ( m_currentView.ParentCollectionViewSourceBase == m_parentSource ) );
-
-        success = true;
-      }
-      finally
-      {
-        if( !success )
-        {
-          this.ClearView();
-        }
-      }
-    }
-
-    private void ClearView()
-    {
-      if( m_currentView == null )
-        return;
-
-      var view = m_currentView;
-      m_currentView = null;
-
-      view.Dispose();
-    }
-
-    private void OnDelayedRefreshCompleted( object sender, EventArgs e )
-    {
-      m_delayedRefreshPending = false;
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( DataChangedEventManager ) )
-      {
-        this.Refresh();
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private bool m_delayedRefreshPending;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewDataProvider.cs
deleted file mode 100644
index c0c390af..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewDataProvider.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Windows;
-using System.ComponentModel;
-using System.Collections;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridCollectionViewDataProvider : DataGridCollectionViewBaseDataProvider
-  {
-    #region CONSTRUCTORS
-
-    public DataGridCollectionViewDataProvider( DataGridCollectionViewSource parentSource )
-      : base( parentSource )
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    internal override DataGridCollectionViewBase EnsureDataGridCollectionViewBaseCore()
-    {
-      DataGridCollectionViewSource parentSource = this.ParentSource as DataGridCollectionViewSource;
-      object source = parentSource.OriginalSource;
-      Type itemType = parentSource.ItemType;
-      DataSourceProvider dataSourceProvider = source as DataSourceProvider;
-
-      if( dataSourceProvider != m_dataSourceProvider )
-      {
-        if( m_dataSourceProvider != null )
-          DataChangedEventManager.RemoveListener( m_dataSourceProvider, this );
-
-        m_dataSourceProvider = dataSourceProvider;
-
-        if( m_dataSourceProvider != null )
-        {
-          DataChangedEventManager.AddListener( m_dataSourceProvider, this );
-          m_dataSourceProvider.InitialLoad();
-        }
-      }
-
-      if( dataSourceProvider != null )
-        source = dataSourceProvider.Data;
-
-      IListSource listSource = source as IListSource;
-
-      if( listSource != null )
-        source = listSource.GetList();
-
-      if( source == null )
-        return null;
-
-      IEnumerable enumerableSource = source as IEnumerable;
-      Debug.Assert( enumerableSource != null );
-
-      DataGridCollectionViewBase currentView = this.CurrentView;
-
-      if( ( currentView != null )
-        && ( currentView.SourceCollection == enumerableSource )
-        && ( currentView.DesiredItemType == itemType ) )
-      {
-        // No changes.
-        return currentView;
-      }
-
-      return new DataGridCollectionView(
-        enumerableSource,
-        itemType,
-        parentSource.AutoCreateItemProperties,
-        parentSource.AutoCreateDetailDescriptions,
-        parentSource.AutoCreateForeignKeyDescriptions );
-    }
-
-
-    private DataSourceProvider m_dataSourceProvider;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewEnumerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewEnumerator.cs
deleted file mode 100644
index 500fe8d3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewEnumerator.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridCollectionViewEnumerator : IEnumerator
-  {
-    public DataGridCollectionViewEnumerator( DataGridCollectionView collectionView )
-    {
-      m_collectionView = collectionView;
-      m_version = m_collectionView.SortedItemVersion;
-
-      this.Reset();
-    }
-
-    #region IEnumerator Members
-
-    public object Current
-    {
-      get
-      {
-        if( m_beforeStart == true )
-          throw new InvalidOperationException( "MoveNext must be called first." );
-
-        if( m_current == null )
-          throw new InvalidOperationException( "The index is past the end of the list." );
-
-        return m_current.DataItem;
-      }
-    }
-
-    public bool MoveNext()
-    {
-      bool retval = false;
-
-      if( m_version != m_collectionView.SortedItemVersion )
-        throw new InvalidOperationException( "The list of items has changed." );
-
-      if( m_beforeStart == true )
-      {
-        m_beforeStart = false;
-
-        if( ( m_currentGroup != null ) && ( m_currentGroup.RawItems.Count == 0 ) )
-        {
-          // This should only occur if the first leaf group encountered after the Reset call was empty.
-          this.MoveToNextNonEmptyLeafGroup();
-        }
-      }
-
-      if( m_afterEnd == true )
-      {
-        m_current = null;
-      }
-      else
-      {
-        if( ( m_currentGroup == null ) || ( m_currentGroup.RawItems.Count == 0 ) )
-        {
-          m_afterEnd = true;
-        }
-        else
-        {
-          //check indexes
-          if( m_currentItemIndex < m_currentGroup.RawItems.Count )
-          {
-            m_current = m_currentGroup.RawItems[ m_currentItemIndex ];
-            m_currentItemIndex++;
-
-            if( m_currentItemIndex >= m_currentGroup.RawItems.Count )
-            {
-              m_currentItemIndex = 0;
-              m_afterEnd = !this.MoveToNextNonEmptyLeafGroup();
-            }
-
-            retval = true;
-          }
-        }
-      }
-
-      return retval;
-    }
-
-    private bool MoveToNextNonEmptyLeafGroup()
-    {
-      bool foundNonEmptyLeafGroup = false;
-
-      while( foundNonEmptyLeafGroup == false )
-      {
-        if( m_currentGroupIndex.Count == 0 )
-          break;
-
-        m_currentGroup = m_currentGroup.Parent;
-        int index = m_currentGroupIndex.Pop();
-        index++;
-
-        if( index < m_currentGroup.ItemCount )
-        {
-          m_currentGroup = this.MoveToFirstLeafGroup( m_currentGroup, index );
-
-          foundNonEmptyLeafGroup = ( m_currentGroup.RawItems.Count > 0 );
-        }
-      }
-
-      return foundNonEmptyLeafGroup;
-    }
-
-    private DataGridCollectionViewGroup MoveToFirstLeafGroup( DataGridCollectionViewGroup referenceGroup, int index )
-    {
-      while( !referenceGroup.IsBottomLevel )
-      {
-        referenceGroup = referenceGroup.Items[ index ] as DataGridCollectionViewGroup;
-        m_currentGroupIndex.Push( index );
-
-        if( index != 0 )
-          index = 0;
-      }
-
-      return referenceGroup;
-    }
-
-    public void Reset()
-    {
-      m_beforeStart = true;
-      m_afterEnd = false;
-
-      m_current = null;
-      m_currentItemIndex = 0;
-      m_currentGroupIndex.Clear();
-
-      m_currentGroup = ( m_collectionView.Count == 0 ) ? null : this.MoveToFirstLeafGroup( m_collectionView.RootGroup, 0 );
-    }
-
-    #endregion
-
-    private DataGridCollectionViewGroup m_currentGroup;
-
-    private RawItem m_current;
-    private Stack<int> m_currentGroupIndex = new Stack<int>( 16 );
-    private int m_currentItemIndex;
-    private bool m_beforeStart;
-    private bool m_afterEnd;
-    private int m_version;
-    private DataGridCollectionView m_collectionView;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs
deleted file mode 100644
index 8ea26cba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs
+++ /dev/null
@@ -1,1055 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-    internal class DataGridCollectionViewGroup : CollectionViewGroup, ICustomTypeDescriptor
-    {
-        protected DataGridCollectionViewGroup(int capacity)
-          : this(null, null, 0, capacity, 4)
-        {
-        }
-
-        protected DataGridCollectionViewGroup(DataGridCollectionViewGroup template, DataGridCollectionViewGroup parent)
-          : this(template.Name, parent, template.m_unsortedIndex, template.m_sortedRawItems.Count, template.m_subGroups.Count)
-        {
-            m_nextSubGroupUnsortedIndex = template.m_nextSubGroupUnsortedIndex;
-            m_subGroupBy = template.m_subGroupBy;
-            m_groupByName = template.GroupByName;
-        }
-
-        private DataGridCollectionViewGroup(object name, DataGridCollectionViewGroup parent, int unsortedIndex)
-          : this(name, parent, unsortedIndex, 4, 4)
-        {
-        }
-
-        private DataGridCollectionViewGroup(object name, DataGridCollectionViewGroup parent, int unsortedIndex, int rawCapacity, int groupCapacity)
-          : base(name)
-        {
-            m_parent = parent;
-            m_unsortedIndex = unsortedIndex;
-            m_protectedItems = ObservableCollectionHelper.GetItems(base.ProtectedItems);
-            m_protectedItemsCollectionChanged = ObservableCollectionHelper.GetCollectionChanged(base.ProtectedItems);
-            m_optimizedItems = new OptimizedReadOnlyObservableCollection(this);
-            m_subGroups = new Dictionary<object, DataGridCollectionViewGroup>(groupCapacity);
-            m_sortedRawItems = new List<RawItem>(rawCapacity);
-        }
-
-        #region IsBottomLevel Property
-
-        public override bool IsBottomLevel
-        {
-            get
-            {
-                // returns true if .Items contain DataItem
-                return (m_subGroupBy == null);
-            }
-        }
-
-        #endregion
-
-        #region Items Property
-
-        internal new ReadOnlyObservableCollection<object> Items
-        {
-            get
-            {
-                return m_optimizedItems;
-            }
-        }
-
-        #endregion
-
-        #region ProtectedItems Property
-
-        internal new ObservableCollection<object> ProtectedItems
-        {
-            get
-            {
-                return base.ProtectedItems;
-            }
-        }
-
-        #endregion
-
-        #region UnsortedIndex Property
-
-        internal int UnsortedIndex
-        {
-            get
-            {
-                return m_unsortedIndex;
-            }
-        }
-
-        #endregion
-
-        #region GroupByName Property
-
-        internal string GroupByName
-        {
-            get
-            {
-                return m_groupByName;
-            }
-            set
-            {
-                m_groupByName = value;
-            }
-        }
-
-        private string m_groupByName;
-
-        #endregion
-
-        #region SubGroupBy Property
-
-        internal GroupDescription SubGroupBy
-        {
-            get
-            {
-                return m_subGroupBy;
-            }
-        }
-
-        #endregion
-
-        #region Parent Property
-
-        internal DataGridCollectionViewGroup Parent
-        {
-            get
-            {
-                return m_parent;
-            }
-        }
-
-        #endregion
-
-        #region GlobalRawItemCount Property
-
-        internal int GlobalRawItemCount
-        {
-            get
-            {
-                return m_globalRawItemCount;
-            }
-        }
-
-        #endregion
-
-        #region RawItems Property
-
-        internal List<RawItem> RawItems
-        {
-            get
-            {
-                return m_sortedRawItems;
-            }
-        }
-
-        #endregion
-
-        protected virtual DataGridCollectionView GetCollectionView()
-        {
-            if (m_parent != null)
-                return m_parent.GetCollectionView();
-
-            return null;
-        }
-
-        internal bool Contains(object item)
-        {
-            var group = item as DataGridCollectionViewGroup;
-            if (group != null)
-            {
-                //Must make sure the group the group is ref equals, because there can be groups with a null name at more than one level.
-                DataGridCollectionViewGroup foundGroup;
-                if (m_subGroups.TryGetValue(DataGridCollectionViewGroup.GetHashKeyFromName(group.Name), out foundGroup))
-                    return (foundGroup == group);
-
-                return false;
-            }
-
-            DataGridCollectionView collectionView = this.GetCollectionView();
-            if (collectionView != null)
-            {
-                RawItem rawItem = collectionView.GetFirstRawItemFromDataItem(item);
-                if (rawItem != null)
-                    return (rawItem.ParentGroup == this);
-            }
-
-            return false;
-        }
-
-        internal int IndexOf(object item)
-        {
-            if (item is DataGridCollectionViewGroup)
-                return this.ProtectedItems.IndexOf(item);
-
-            DataGridCollectionView collectionView = this.GetCollectionView();
-
-            if (collectionView != null)
-            {
-                RawItem rawItem = collectionView.GetFirstRawItemFromDataItem(item);
-
-                if ((rawItem != null) && (rawItem.ParentGroup == this))
-                    return rawItem.SortedIndex;
-            }
-
-            return -1;
-        }
-
-        internal int GetFirstRawItemGlobalSortedIndex()
-        {
-            var index = 0;
-            var group = this;
-            var parent = this.Parent;
-            var currentGroup = default(DataGridCollectionViewGroup);
-
-            while (parent != null)
-            {
-                var items = parent.ProtectedItems;
-                var count = items.Count;
-
-                for (int i = 0; i < count; i++)
-                {
-                    var value = items[i];
-                    if (value == group)
-                        break;
-
-                    currentGroup = value as DataGridCollectionViewGroup;
-                    index += currentGroup.GlobalRawItemCount;
-                }
-
-                group = parent;
-                parent = parent.Parent;
-            }
-
-            return index;
-        }
-
-        internal void SetSubGroupBy(GroupDescription groupBy)
-        {
-            bool oldIsBottomLevel = this.IsBottomLevel;
-            m_subGroupBy = groupBy;
-
-            if (oldIsBottomLevel != this.IsBottomLevel)
-            {
-                this.OnPropertyChanged(new PropertyChangedEventArgs("IsBottomLevel"));
-            }
-        }
-
-        internal DataGridCollectionViewGroup GetGroup(
-          RawItem rawItem,
-          int level,
-          CultureInfo culture,
-          ObservableCollection<GroupDescription> groupByList,
-          List<GroupSortComparer> groupSortComparers)
-        {
-            // If sortComparers is null, we are in massive group creation, no order check.
-
-            if (this.IsBottomLevel)
-                throw new InvalidOperationException("An attempt was made to get a group for which a GroupDescription has not been provided.");
-
-            object groupName = m_subGroupBy.GroupNameFromItem(rawItem.DataItem, level, culture);
-            DataGridCollectionViewGroup group;
-
-            if ((m_subGroupBy is DataGridGroupDescription) || (m_subGroupBy is PropertyGroupDescription))
-            {
-                m_subGroups.TryGetValue(DataGridCollectionViewGroup.GetHashKeyFromName(groupName), out group);
-            }
-            else
-            {
-                //If dealing with an unknown GroupDescription type, use the standard method to retrieve a group, in case group retrival is handle differently.
-                group = null;
-
-                foreach (var tempGroup in m_subGroups.Values)
-                {
-                    if (m_subGroupBy.NamesMatch(tempGroup.Name, groupName))
-                    {
-                        group = tempGroup;
-                        break;
-                    }
-                }
-            }
-
-            if (group == null)
-            {
-                group = this.CreateSubGroup(groupName, level, groupByList, groupSortComparers);
-            }
-
-            return group;
-        }
-
-        internal void SortItems(
-          IList<SortDescriptionInfo> sortDescriptionInfos,
-          List<GroupSortComparer> groupSortComparers,
-          int level,
-          List<RawItem> globalRawItems,
-          DataGridCollectionViewGroup newSortedGroup)
-        {
-            var itemCount = this.ProtectedItemCount;
-            if (itemCount == 0)
-                return;
-
-            if (this.IsBottomLevel)
-            {
-                var indexes = new int[itemCount + 1];
-
-                for (int i = 0; i < itemCount; i++)
-                {
-                    indexes[i] = m_sortedRawItems[i].Index;
-                }
-
-                // "Weak heap sort" sort array[0..NUM_ELEMENTS-1] to array[1..NUM_ELEMENTS]
-                var collectionViewSort = new DataGridCollectionViewSort(indexes, sortDescriptionInfos);
-
-                collectionViewSort.Sort(itemCount);
-                var index = 0;
-
-                for (int i = 1; i <= itemCount; i++)
-                {
-                    newSortedGroup.InsertRawItem(index, globalRawItems[indexes[i]]);
-                    index++;
-                }
-            }
-            else
-            {
-                var indexes = new int[itemCount + 1];
-
-                for (int i = 0; i < itemCount; i++)
-                {
-                    indexes[i] = i;
-                }
-
-                var subGroupsArray = new DataGridCollectionViewGroup[itemCount];
-                m_subGroups.Values.CopyTo(subGroupsArray, 0);
-
-                // "Weak heap sort" sort array[0..NUM_ELEMENTS-1] to array[1..NUM_ELEMENTS]
-                var collectionViewSort = new DataGridCollectionViewGroupSort(indexes, groupSortComparers[level], subGroupsArray);
-
-                collectionViewSort.Sort(itemCount);
-                int index = 0;
-                level++;
-
-                for (int i = 1; i <= itemCount; i++)
-                {
-                    DataGridCollectionViewGroup oldGroup = subGroupsArray[indexes[i]];
-                    DataGridCollectionViewGroup newGroup = new DataGridCollectionViewGroup(oldGroup, newSortedGroup);
-
-                    // Sort sub items
-                    oldGroup.SortItems(sortDescriptionInfos, groupSortComparers, level, globalRawItems, newGroup);
-
-                    newSortedGroup.InsertGroup(index, newGroup);
-                    index++;
-                }
-            }
-        }
-
-        internal void SortGroups(List<GroupSortComparer> groupSortComparers, int level)
-        {
-            int itemCount = this.ProtectedItemCount;
-
-            if (itemCount == 0)
-                return;
-
-            int[] indexes;
-            indexes = new int[itemCount + 1];
-            for (int i = 0; i < itemCount; i++)
-            {
-                indexes[i] = i;
-            }
-
-            DataGridCollectionViewGroup[] subGroupsArray = new DataGridCollectionViewGroup[itemCount];
-            m_subGroups.Values.CopyTo(subGroupsArray, 0);
-
-            // "Weak heap sort" sort array[0..NUM_ELEMENTS-1] to array[1..NUM_ELEMENTS]
-            DataGridCollectionViewGroupSort collectionViewSort = new DataGridCollectionViewGroupSort(indexes, groupSortComparers[level], subGroupsArray);
-
-            collectionViewSort.Sort(itemCount);
-            level++;
-            m_protectedItems.Clear();
-
-            for (int i = 1; i <= itemCount; i++)
-            {
-                DataGridCollectionViewGroup group = subGroupsArray[indexes[i]];
-
-                // Sort sub groups
-                if (!group.IsBottomLevel)
-                {
-                    group.SortGroups(groupSortComparers, level);
-                }
-
-                m_protectedItems.Add(group);
-            }
-
-            this.ProtectedItemCount = m_protectedItems.Count;
-            m_protectedItemsCollectionChanged.Invoke(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-        }
-
-        internal void CreateFixedGroupNames(int fixedGroupLevel, ObservableCollection<GroupDescription> groupByList, List<GroupSortComparer> groupSortComparers)
-        {
-            GroupDescription groupDescription = this.SubGroupBy;
-
-            if (groupDescription == null)
-                return;
-
-            Debug.Assert(groupByList[fixedGroupLevel] == this.SubGroupBy);
-
-            ObservableCollection<object> groupNames = groupDescription.GroupNames;
-            int count = groupNames.Count;
-
-            for (int i = 0; i < count; i++)
-            {
-                this.CreateSubGroup(groupNames[i], fixedGroupLevel, groupByList, groupSortComparers);
-            }
-        }
-
-
-        internal RawItem GetRawItemAtGlobalSortedIndex(int index)
-        {
-            if (this.IsBottomLevel)
-            {
-                return m_sortedRawItems[index];
-            }
-            else
-            {
-                foreach (object value in this.ProtectedItems)
-                {
-                    DataGridCollectionViewGroup subGroup = value as DataGridCollectionViewGroup;
-
-                    int subGroupCount = subGroup.GlobalRawItemCount;
-
-                    if (index < subGroupCount)
-                        return subGroup.GetRawItemAtGlobalSortedIndex(index);
-
-                    index -= subGroupCount;
-                }
-            }
-
-            throw new ArgumentOutOfRangeException("index");
-        }
-
-        internal int RawItemIndexOf(RawItem rawItem)
-        {
-            Debug.Assert(m_sortedRawItems != null);
-
-            if (m_sortedRawItems == null)
-                return -1;
-
-            return m_sortedRawItems.IndexOf(rawItem);
-        }
-
-        internal virtual void InsertRawItem(int index, RawItem rawItem)
-        {
-            Debug.Assert(this.IsBottomLevel);
-
-            m_globalRawItemCount++;
-            DataGridCollectionViewGroup parent = m_parent;
-
-            while (parent != null)
-            {
-                parent.m_globalRawItemCount++;
-                parent = parent.m_parent;
-            }
-
-            int count = m_sortedRawItems.Count;
-
-            for (int i = index; i < count; i++)
-            {
-                m_sortedRawItems[i].SetSortedIndex(i + 1);
-            }
-
-            m_sortedRawItems.Insert(index, rawItem);
-            rawItem.SetParentGroup(this);
-            rawItem.SetSortedIndex(index);
-
-            this.ProtectedItemCount++;
-            this.ProtectedItems.Insert(index, rawItem.DataItem);
-        }
-
-        internal virtual void RemoveRawItemAt(int index)
-        {
-            Debug.Assert(this.IsBottomLevel);
-            Debug.Assert(m_sortedRawItems.Count > 0);
-
-            int count = m_sortedRawItems.Count;
-            if (count == 0)
-                return;
-
-            if (index != -1)
-            {
-                m_globalRawItemCount--;
-                DataGridCollectionViewGroup parent = m_parent;
-
-                while (parent != null)
-                {
-                    parent.m_globalRawItemCount--;
-                    parent = parent.Parent;
-                }
-
-                for (int i = index + 1; i < count; i++)
-                {
-                    m_sortedRawItems[i].SetSortedIndex(i - 1);
-                }
-
-                RawItem rawItem = m_sortedRawItems[index];
-                rawItem.SetParentGroup(null);
-                rawItem.SetSortedIndex(-1);
-                m_sortedRawItems.RemoveAt(index);
-
-                this.ProtectedItemCount--;
-                this.ProtectedItems.RemoveAt(index);
-
-                if ((this.ProtectedItemCount == 0) && (m_parent != null))
-                {
-                    m_parent.RemoveGroup(this);
-                }
-            }
-        }
-
-        internal virtual void MoveRawItem(int oldIndex, int newIndex)
-        {
-            Debug.Assert(this.IsBottomLevel);
-            Debug.Assert(m_sortedRawItems != null);
-
-            if (m_sortedRawItems == null)
-                return;
-
-            RawItem rawItem = m_sortedRawItems[oldIndex];
-
-            m_sortedRawItems.RemoveAt(oldIndex);
-            m_sortedRawItems.Insert(newIndex, rawItem);
-
-            int startIndex = Math.Min(oldIndex, newIndex);
-            int endIndex = Math.Max(oldIndex, newIndex);
-
-            for (int i = startIndex; i <= endIndex; i++)
-            {
-                m_sortedRawItems[i].SetSortedIndex(i);
-            }
-
-            this.ProtectedItems.Move(oldIndex, newIndex);
-        }
-
-        internal int BinarySearchRawItem(RawItem value, IComparer<RawItem> comparer)
-        {
-            if (comparer == null)
-                throw new ArgumentNullException("comparer");
-
-            if (m_sortedRawItems == null)
-                return -1; // ~0
-
-            Debug.Assert((m_sortedRawItems.Count == this.ProtectedItemCount) || (this is DataGridCollectionViewGroupRoot));
-
-            int low = 0;
-            int hi = (m_sortedRawItems.Count) - 1;
-
-            while (low <= hi)
-            {
-                int compareResult;
-                int median = (low + ((hi - low) >> 1));
-
-                RawItem medianRawItem = m_sortedRawItems[median];
-
-                // We exclude ourself from the research because we seek for a new valid position
-                if (medianRawItem == value)
-                {
-                    if (low == hi)
-                        return low;
-
-                    median++;
-                    medianRawItem = m_sortedRawItems[median];
-                }
-
-                try
-                {
-                    compareResult = comparer.Compare(medianRawItem, value);
-                }
-                catch (Exception exception)
-                {
-                    throw new InvalidOperationException("IComparer has failed to compare the values.", exception);
-                }
-
-                if (compareResult == 0)
-                {
-                    return median;
-                }
-                if (compareResult < 0)
-                {
-                    low = median + 1;
-                }
-                else
-                {
-                    hi = median - 1;
-                }
-            }
-
-            return ~low;
-        }
-
-        private int BinarySearchGroup(DataGridCollectionViewGroup value, IComparer<DataGridCollectionViewGroup> comparer)
-        {
-            if (comparer == null)
-                throw new ArgumentNullException("comparer");
-
-            int low = 0;
-            int hi = (this.ProtectedItemCount) - 1;
-            int median;
-            int compareResult;
-
-            while (low <= hi)
-            {
-                median = (low + ((hi - low) >> 1));
-
-                DataGridCollectionViewGroup medianGroup = this.ProtectedItems[median] as DataGridCollectionViewGroup;
-
-                if (medianGroup == value)
-                {
-                    if (low == hi)
-                        return low;
-
-                    return median;
-                }
-
-                try
-                {
-                    compareResult = comparer.Compare(medianGroup, value);
-                }
-                catch (Exception exception)
-                {
-                    throw new InvalidOperationException("IComparer has failed to compare the values.", exception);
-                }
-
-                if (compareResult == 0)
-                {
-                    return median;
-                }
-                if (compareResult < 0)
-                {
-                    low = median + 1;
-                }
-                else
-                {
-                    hi = median - 1;
-                }
-            }
-
-            return ~low;
-        }
-
-        private static object GetHashKeyFromName(object groupName)
-        {
-            if (groupName == null)
-                return DBNull.Value;
-
-            return groupName;
-        }
-
-        private DataGridCollectionViewGroup CreateSubGroup(object groupName, int level, ObservableCollection<GroupDescription> groupByList,
-                                                            List<GroupSortComparer> groupSortComparers)
-        {
-            // If sortComparers is null, we are in massive group creation, no order check.
-            var group = new DataGridCollectionViewGroup(groupName, this, m_nextSubGroupUnsortedIndex);
-
-            var dataGridGroupDescription = groupByList[level] as DataGridGroupDescription;
-            if (dataGridGroupDescription != null)
-            {
-                group.GroupByName = dataGridGroupDescription.PropertyName;
-            }
-
-            unchecked
-            {
-                m_nextSubGroupUnsortedIndex++;
-            }
-
-            int index;
-
-            if (groupSortComparers == null)
-            {
-                Debug.Assert(this.ProtectedItemCount == this.ProtectedItems.Count);
-                index = this.ProtectedItemCount;
-            }
-            else
-            {
-                index = this.BinarySearchGroup(group, groupSortComparers[level]);
-
-                if (index < 0)
-                {
-                    index = ~index;
-                }
-            }
-
-            level++;
-
-            if (level < groupByList.Count)
-            {
-                group.SetSubGroupBy(groupByList[level]);
-                group.CreateFixedGroupNames(level, groupByList, groupSortComparers);
-            }
-
-            this.InsertGroup(index, group);
-            return group;
-        }
-
-        private void InsertGroup(int index, DataGridCollectionViewGroup group)
-        {
-            Debug.Assert(!this.IsBottomLevel);
-
-            m_subGroups.Add(DataGridCollectionViewGroup.GetHashKeyFromName(group.Name), group);
-            this.ProtectedItemCount++;
-            this.ProtectedItems.Insert(index, group);
-        }
-
-        private void RemoveGroup(DataGridCollectionViewGroup group)
-        {
-            if (group == null)
-                throw new ArgumentNullException("group");
-
-            Debug.Assert(this == group.m_parent);
-
-            // We do not remove group forced in SubGroupBy.GroupNames
-            if (group.UnsortedIndex < this.SubGroupBy.GroupNames.Count)
-                return;
-
-            Debug.Assert(!this.IsBottomLevel);
-            Debug.Assert((group.m_globalRawItemCount == 0) && (group.ProtectedItemCount == 0));
-
-            m_subGroups.Remove(DataGridCollectionViewGroup.GetHashKeyFromName(group.Name));
-
-            this.ProtectedItemCount--;
-            this.ProtectedItems.Remove(group);
-
-            if ((m_subGroups.Count == 0) && (m_parent != null))
-            {
-                m_parent.RemoveGroup(this);
-            }
-        }
-
-        #region ICustomTypeDescriptor Members
-
-        AttributeCollection ICustomTypeDescriptor.GetAttributes()
-        {
-            return AttributeCollection.Empty;
-        }
-
-        string ICustomTypeDescriptor.GetClassName()
-        {
-            return null;
-        }
-
-        string ICustomTypeDescriptor.GetComponentName()
-        {
-            return null;
-        }
-
-        TypeConverter ICustomTypeDescriptor.GetConverter()
-        {
-            return null;
-        }
-
-        EventDescriptor ICustomTypeDescriptor.GetDefaultEvent()
-        {
-            return null;
-        }
-
-        PropertyDescriptor ICustomTypeDescriptor.GetDefaultProperty()
-        {
-            return null;
-        }
-
-        object ICustomTypeDescriptor.GetEditor(Type editorBaseType)
-        {
-            return null;
-        }
-
-        EventDescriptorCollection ICustomTypeDescriptor.GetEvents(Attribute[] attributes)
-        {
-            return EventDescriptorCollection.Empty;
-        }
-
-        EventDescriptorCollection ICustomTypeDescriptor.GetEvents()
-        {
-            return EventDescriptorCollection.Empty;
-        }
-
-        // This method returns the StatFunction properties as defined by the "parent" 
-        // DataGridCollectionView as well as the other "standard" properties for this class.
-        // The StatFunction properties are NOT filtered by the specified attributes.
-        PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties(Attribute[] attributes)
-        {
-            if (attributes == null)
-            {
-                // We only cache the full property list.
-                if (m_classProperties == null)
-                {
-                    DataGridCollectionView view = this.GetCollectionView();
-
-                    Debug.Assert(view != null, "A group should always have a parent CollectionView for the StatFunctions to work.");
-
-                    if (view == null)
-                        return TypeDescriptor.GetProperties(typeof(DataGridCollectionViewGroup));
-
-                    PropertyDescriptorCollection classProperties = TypeDescriptor.GetProperties(typeof(DataGridCollectionViewGroup));
-                    PropertyDescriptor[] properties = new PropertyDescriptor[classProperties.Count];
-                    classProperties.CopyTo(properties, 0);
-
-                    m_classProperties = new PropertyDescriptorCollection(properties);
-                }
-
-                return m_classProperties;
-            }
-            else
-            {
-                PropertyDescriptorCollection props = TypeDescriptor.GetProperties(this, attributes);
-                DataGridCollectionView view = this.GetCollectionView();
-
-                return props;
-            }
-        }
-
-        PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties()
-        {
-            return ((ICustomTypeDescriptor)this).GetProperties(null);
-        }
-
-        object ICustomTypeDescriptor.GetPropertyOwner(PropertyDescriptor pd)
-        {
-            return this;
-        }
-
-        #endregion
-
-        #region INotifyPropertyChanged Members
-
-        protected sealed override event PropertyChangedEventHandler PropertyChanged
-        {
-            add
-            {
-                this.PropertyChangedImpl += value;
-            }
-            remove
-            {
-                this.PropertyChangedImpl -= value;
-            }
-        }
-
-        protected override void OnPropertyChanged(PropertyChangedEventArgs e)
-        {
-            var handler = this.PropertyChangedImpl;
-            if (handler == null)
-                return;
-
-            handler.Invoke(this, e);
-        }
-
-        private bool HasPropertyChangedListeners
-        {
-            get
-            {
-                return (this.PropertyChangedImpl != null);
-            }
-        }
-
-        private event PropertyChangedEventHandler PropertyChangedImpl;
-
-        #endregion
-
-        private PropertyDescriptorCollection m_classProperties;
-
-        protected int m_globalRawItemCount;
-        protected readonly List<RawItem> m_sortedRawItems;
-
-        private readonly OptimizedReadOnlyObservableCollection m_optimizedItems;
-        private readonly Dictionary<object, DataGridCollectionViewGroup> m_subGroups;
-        private readonly IList<object> m_protectedItems;
-        private readonly Action<NotifyCollectionChangedEventArgs> m_protectedItemsCollectionChanged;
-
-        private GroupDescription m_subGroupBy;
-        private readonly DataGridCollectionViewGroup m_parent;
-        private readonly int m_unsortedIndex;
-        private int m_nextSubGroupUnsortedIndex;
-
-        #region OptimizedReadOnlyObservableCollection Private Class
-
-        // We re-implement IList and IList<object> to override the implementation of the 
-        // IndexOf and Contains methods to use our optimized way.
-        private sealed class OptimizedReadOnlyObservableCollection : ReadOnlyObservableCollection<object>, IList, IList<object>
-        {
-            internal OptimizedReadOnlyObservableCollection(DataGridCollectionViewGroup dataGridCollectionViewGroup)
-              : base(dataGridCollectionViewGroup.ProtectedItems)
-            {
-                if (dataGridCollectionViewGroup == null)
-                    throw new ArgumentNullException("dataGridCollectionViewGroup");
-
-                m_dataGridCollectionViewGroup = dataGridCollectionViewGroup;
-            }
-
-            public new int IndexOf(object item)
-            {
-                // The DataGridCollectionViewGroup has been optimized to use the information
-                // stored on the RawItem associated with the data item instead of searching the item in the list.
-                return m_dataGridCollectionViewGroup.IndexOf(item);
-            }
-
-            public new bool Contains(object item)
-            {
-                // The DataGridCollectionViewGroup has been optimized to use the information
-                // stored on the RawItem associated with the data item instead of searching the item in the list.
-                return m_dataGridCollectionViewGroup.Contains(item);
-            }
-
-            private readonly DataGridCollectionViewGroup m_dataGridCollectionViewGroup;
-        }
-
-        #endregion
-
-        #region ObservableCollectionHelper Private Class
-
-        private static class ObservableCollectionHelper
-        {
-            private const string AssemblyName = "Xceed.Wpf.DataGrid.CollectionViewGroupExtractor";
-            private const string GetItemsMethodName = "GetItems";
-            private const string GetCollectionChangedMethodName = "GetCollectionChanged";
-
-            private static readonly Func<ObservableCollection<object>, IList<object>> s_getItems;
-            private static readonly Func<ObservableCollection<object>, Action<NotifyCollectionChangedEventArgs>> s_collectionChanged;
-
-            static ObservableCollectionHelper()
-            {
-                var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName(ObservableCollectionHelper.AssemblyName), AssemblyBuilderAccess.RunAndCollect);
-                var moduleBuilder = assemblyBuilder.DefineDynamicModule(ObservableCollectionHelper.AssemblyName);
-
-                var typeBuilder = moduleBuilder.DefineType("ObservableCollectionExtractor", TypeAttributes.Class | TypeAttributes.NotPublic | TypeAttributes.AutoLayout, typeof(ObservableCollection<object>));
-
-                ObservableCollectionHelper.DefineGetItemsMethod(typeBuilder);
-                ObservableCollectionHelper.DefineGetCollectionChangedMethod(typeBuilder);
-
-                var targetType = typeBuilder.CreateType();
-
-                s_getItems = (Func<ObservableCollection<object>, IList<object>>)Delegate.CreateDelegate(typeof(Func<ObservableCollection<object>, IList<object>>), targetType.GetMethod(ObservableCollectionHelper.GetItemsMethodName, BindingFlags.Public | BindingFlags.Static));
-                s_collectionChanged = (Func<ObservableCollection<object>, Action<NotifyCollectionChangedEventArgs>>)Delegate.CreateDelegate(typeof(Func<ObservableCollection<object>, Action<NotifyCollectionChangedEventArgs>>), targetType.GetMethod(ObservableCollectionHelper.GetCollectionChangedMethodName, BindingFlags.Public | BindingFlags.Static));
-            }
-
-            internal static IList<object> GetItems(ObservableCollection<object> source)
-            {
-                if (source == null)
-                    throw new ArgumentNullException("source");
-
-                var storage = (s_getItems != null) ? s_getItems.Invoke(source) : null;
-                if (storage == null)
-                    throw new InvalidOperationException("Unable to retrieve the ObservableCollection<>'s items storage.");
-
-                return storage;
-            }
-
-            internal static Action<NotifyCollectionChangedEventArgs> GetCollectionChanged(ObservableCollection<object> source)
-            {
-                if (source == null)
-                    throw new ArgumentNullException("source");
-
-                var collectionChanged = (s_collectionChanged != null) ? s_collectionChanged.Invoke(source) : null;
-                if (collectionChanged == null)
-                    throw new InvalidOperationException("Unable to retrieve the ObservableCollection<>'s collection change method.");
-
-                return collectionChanged;
-            }
-
-            private static void DefineGetItemsMethod(TypeBuilder typeBuilder)
-            {
-                var propertyInfo = typeof(ObservableCollection<object>).GetProperty("Items", BindingFlags.Instance | BindingFlags.NonPublic, null, typeof(IList<object>), new Type[0], null);
-                if ((propertyInfo == null) || !propertyInfo.CanRead)
-                    throw new InvalidOperationException("Unable to retrieve the ObservableCollection<>.Items property.");
-
-                var methodInfo = propertyInfo.GetGetMethod(true);
-                if ((methodInfo == null) || !ObservableCollectionHelper.HasCallingConvention(methodInfo.CallingConvention, CallingConventions.HasThis))
-                    throw new InvalidOperationException("Unable to retrieve the ObservableCollection<>.Items property.");
-
-                var methodBuilder = typeBuilder.DefineMethod(
-                                      ObservableCollectionHelper.GetItemsMethodName,
-                                      MethodAttributes.Public | MethodAttributes.Static,
-                                      CallingConventions.Standard,
-                                      typeof(IList<object>),
-                                      new Type[] { typeof(ObservableCollection<object>) });
-
-                var body = methodBuilder.GetILGenerator();
-                // Load the reference to the ObservableCollection and put it on top of the stack.
-                body.Emit(OpCodes.Ldarg_0);
-                // Invoke the property getter of the reference.  This operation pops the reference
-                // from the stack and pushes the result of the property getter.
-                body.Emit(OpCodes.Callvirt, methodInfo);
-                // Since the result of the propery getter will be retrieved by the method's caller,
-                // we may leave it on the stack and simply return.
-                body.Emit(OpCodes.Ret);
-            }
-
-            private static void DefineGetCollectionChangedMethod(TypeBuilder typeBuilder)
-            {
-                var methodInfo = typeof(ObservableCollection<object>).GetMethod("OnCollectionChanged", BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { typeof(NotifyCollectionChangedEventArgs) }, null);
-                if ((methodInfo == null) || methodInfo.IsPrivate || !ObservableCollectionHelper.HasCallingConvention(methodInfo.CallingConvention, CallingConventions.HasThis))
-                    throw new InvalidOperationException("Unable to retrieve the ObservableCollection<>.OnCollectionChanged method.");
-
-                var constructorInfo = typeof(Action<NotifyCollectionChangedEventArgs>).GetConstructor(new Type[] { typeof(object), typeof(IntPtr) });
-                if ((constructorInfo == null) || constructorInfo.IsPrivate || !ObservableCollectionHelper.HasCallingConvention(constructorInfo.CallingConvention, CallingConventions.HasThis))
-                    throw new InvalidOperationException("Unable to retrieve the Action<>'s constructor.");
-
-                var methodBuilder = typeBuilder.DefineMethod(
-                                      ObservableCollectionHelper.GetCollectionChangedMethodName,
-                                      MethodAttributes.Public | MethodAttributes.Static,
-                                      CallingConventions.Standard,
-                                      typeof(Action<NotifyCollectionChangedEventArgs>),
-                                      new Type[] { typeof(ObservableCollection<object>) });
-
-                var body = methodBuilder.GetILGenerator();
-                // Load the reference to the ObservableCollection and put it on top of the stack.
-                body.Emit(OpCodes.Ldarg_0);
-                // The last loaded reference will be consume in the call to "new Action<>".
-                // We must duplicate the value since it will be consume by the call that retrieve the
-                // target method's address.
-                body.Emit(OpCodes.Dup);
-                // This operation pops the top ObservableCollection's reference from the stack
-                // and pushes the ObservableCollection<>.OnCollectionChanged method's address.
-                body.Emit(OpCodes.Ldvirtftn, methodInfo);
-                // Create an Action<> delegate from the first ObservableCollection's reference we
-                // have put on the stack and the target method's address.
-                body.Emit(OpCodes.Newobj, constructorInfo);
-                // The resulting delegate should be on top of the stack.  We simply leave it there
-                // so it will be retrieved by the method's caller.
-                body.Emit(OpCodes.Ret);
-            }
-
-            private static bool HasCallingConvention(CallingConventions source, CallingConventions value)
-            {
-                return ((source & value) == value);
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs
deleted file mode 100644
index 55dde31d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridCollectionViewGroupRoot : DataGridCollectionViewGroup
-  {
-    internal DataGridCollectionViewGroupRoot( DataGridCollectionView parentCollectionView )
-      : base( 128 )
-    {
-      m_parentCollectionView = parentCollectionView;
-    }
-
-    internal DataGridCollectionViewGroupRoot( DataGridCollectionViewGroupRoot template )
-      : base( template, null )
-    {
-      m_parentCollectionView = template.m_parentCollectionView;
-    }
-
-    protected override DataGridCollectionView GetCollectionView()
-    {
-      return m_parentCollectionView;
-    }
-
-    internal void SortRootRawItems( IList<SortDescriptionInfo> sortDescriptionInfos, List<RawItem> globalRawItems )
-    {
-      Debug.Assert( this.IsBottomLevel );
-
-      var itemCount = m_sortedRawItems.Count;
-      if( itemCount == 0 )
-        return;
-
-      var indexes = new int[ itemCount + 1 ];
-
-      for( int i = 0; i < itemCount; i++ )
-      {
-        indexes[ i ] = m_sortedRawItems[ i ].Index;
-      }
-
-      // "Weak heap sort" sort array[0..NUM_ELEMENTS-1] to array[1..NUM_ELEMENTS]
-      var collectionViewSort = new DataGridCollectionViewSort( indexes, sortDescriptionInfos );
-
-      collectionViewSort.Sort( itemCount );
-      var index = 0;
-
-      for( int i = 1; i <= itemCount; i++ )
-      {
-        var newRawItem = globalRawItems[ indexes[ i ] ];
-        newRawItem.SetSortedIndex( index );
-        m_sortedRawItems[ index ] = newRawItem;
-        index++;
-      }
-    }
-
-    internal override void InsertRawItem( int index, RawItem rawItem )
-    {
-      Debug.Assert( this.IsBottomLevel );
-
-      m_globalRawItemCount++;
-      int count = m_sortedRawItems.Count;
-
-      for( int i = index; i < count; i++ )
-      {
-        m_sortedRawItems[ i ].SetSortedIndex( i + 1 );
-      }
-
-      m_sortedRawItems.Insert( index, rawItem );
-      rawItem.SetParentGroup( this );
-      rawItem.SetSortedIndex( index );
-    }
-
-    internal override void RemoveRawItemAt( int index )
-    {
-      Debug.Assert( this.IsBottomLevel );
-      Debug.Assert( m_sortedRawItems.Count > 0 );
-
-      int count = m_sortedRawItems.Count;
-      if( count == 0 )
-        return;
-
-      if( index != -1 )
-      {
-        m_globalRawItemCount--;
-
-        for( int i = index + 1; i < count; i++ )
-        {
-          m_sortedRawItems[ i ].SetSortedIndex( i - 1 );
-        }
-
-        RawItem rawItem = m_sortedRawItems[ index ];
-        rawItem.SetParentGroup( null );
-        rawItem.SetSortedIndex( -1 );
-        m_sortedRawItems.RemoveAt( index );
-      }
-    }
-
-    internal override void MoveRawItem( int oldIndex, int newIndex )
-    {
-      Debug.Assert( this.IsBottomLevel );
-
-      RawItem rawItem = m_sortedRawItems[ oldIndex ];
-
-      m_sortedRawItems.RemoveAt( oldIndex );
-      m_sortedRawItems.Insert( newIndex, rawItem );
-
-      int startIndex = Math.Min( oldIndex, newIndex );
-      int endIndex = Math.Max( oldIndex, newIndex );
-
-      for( int i = startIndex; i <= endIndex; i++ )
-      {
-        m_sortedRawItems[ i ].SetSortedIndex( i );
-      }
-    }
-
-    private DataGridCollectionView m_parentCollectionView;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupSort.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupSort.cs
deleted file mode 100644
index 40627242..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupSort.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Generic;
-using System.Text;
-
-using Xceed.Utils.Collections;
-using System.Collections.ObjectModel;
-using Xceed.Utils.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridCollectionViewGroupSort : IndexWeakHeapSort
-  {
-    public DataGridCollectionViewGroupSort( int[] dataIndexArray, GroupSortComparer groupSortedComparer, DataGridCollectionViewGroup[] protectedItems )
-      : base( dataIndexArray )
-    {
-      if( groupSortedComparer == null )
-        throw new ArgumentNullException( "groupSortedComparer" );
-
-      m_groupSortedComparer = groupSortedComparer;
-      m_groups = protectedItems;
-    }
-
-    public override int Compare( int xDataIndex, int yDataIndex )
-    {
-      DataGridCollectionViewGroup xGroup = m_groups[ xDataIndex ];
-      DataGridCollectionViewGroup yGroup = m_groups[ yDataIndex ];
-
-      return m_groupSortedComparer.Compare( xGroup, yGroup );
-    }
-
-    private GroupSortComparer m_groupSortedComparer;
-    private DataGridCollectionViewGroup[] m_groups;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs
deleted file mode 100644
index ba3e1704..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridCollectionViewSort : IndexWeakHeapSort
-  {
-    public DataGridCollectionViewSort( int[] dataIndexArray, IList<SortDescriptionInfo> sortDescriptionInfos )
-      : base( dataIndexArray )
-    {
-      m_sortDescriptionInfos = sortDescriptionInfos;
-    }
-
-    public override int Compare( int xDataIndex, int yDataIndex )
-    {
-      var lastSortDirection = ListSortDirection.Ascending;
-
-      if( m_sortDescriptionInfos != null )
-      {
-        foreach( var sortDescriptionInfo in m_sortDescriptionInfos )
-        {
-          lastSortDirection = sortDescriptionInfo.SortDirection;
-
-          if( sortDescriptionInfo.Property == null )
-            continue;
-
-          var sortComparer = sortDescriptionInfo.SortComparer;
-          var dataStore = sortDescriptionInfo.DataStore;
-          var compare = ( sortComparer != null )
-                          ? sortComparer.Compare( dataStore.GetData( xDataIndex ), dataStore.GetData( yDataIndex ) )
-                          : dataStore.Compare( xDataIndex, yDataIndex );
-
-          if( compare != 0 )
-            return ( lastSortDirection == ListSortDirection.Descending ) ? -compare : compare;
-        }
-      }
-
-      if( lastSortDirection == ListSortDirection.Descending )
-        return yDataIndex - xDataIndex;
-
-      return xDataIndex - yDataIndex;
-    }
-
-    private readonly IList<SortDescriptionInfo> m_sortDescriptionInfos;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs
deleted file mode 100644
index 0c88a205..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public sealed class DataGridCollectionViewSource : DataGridCollectionViewSourceBase
-  {
-    #region CONSTRUCTORS
-
-    static DataGridCollectionViewSource()
-    {
-      CollectionViewSource.CollectionViewTypeProperty.OverrideMetadata(
-        typeof( DataGridCollectionViewSource ),
-        new FrameworkPropertyMetadata( typeof( DataGridCollectionView ) ) );
-    }
-
-    public DataGridCollectionViewSource()
-      : base()
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region CollectionViewType Property
-
-    protected override void OnCollectionViewTypeChanged(
-      Type oldCollectionViewType,
-      Type newCollectionViewType )
-    {
-      if( newCollectionViewType != typeof( DataGridCollectionView ) )
-        throw new InvalidOperationException( "An attempt was made to use a view other than DataGridCollectionView." );
-
-      base.OnCollectionViewTypeChanged( oldCollectionViewType, newCollectionViewType );
-    }
-
-    #endregion CollectionViewType Property
-
-    #region UpdateChangedPropertyStatsOnly Property
-
-    internal bool UpdateChangedPropertyStatsOnly
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region SourceItems Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The SourceItems property is obsolete and should no longer be used. Unbound data should be wrapped in a collection and assigned to the Source property instead.", true )]
-    public ObservableCollection<object> SourceItems
-    {
-      get
-      {
-        throw new NotSupportedException( "The SourceItems property is obsolete and should no longer be used. Unbound data should be wrapped in a collection and assigned to the Source property instead." );
-      }
-    }
-
-    #endregion SourceItems Property
-
-    #region INTERNAL METHODS
-
-    internal override DataGridCollectionViewBaseDataProvider CreateDataProvider()
-    {
-      return new DataGridCollectionViewDataProvider( this );
-    }
-
-    internal override void ApplyExtraPropertiesToView( DataGridCollectionViewBase currentView )
-    {
-      base.ApplyExtraPropertiesToView( currentView );     
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE METHODS
-
-    private static void OnDataGridCollectionViewSourceDependencyPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridCollectionViewSource source = o as DataGridCollectionViewSource;
-
-      if( source == null )
-        return;
-
-      source.AdviseForwardedPropertyChanged();
-    }
-
-    #endregion PRIVATE METHODS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs
deleted file mode 100644
index 3e74c516..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs
+++ /dev/null
@@ -1,550 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public abstract class DataGridCollectionViewSourceBase : CollectionViewSource
-  {
-    static DataGridCollectionViewSourceBase()
-    {
-      CollectionViewSource.SourceProperty.OverrideMetadata(
-        typeof( DataGridCollectionViewSourceBase ),
-        new FrameworkPropertyMetadata(
-          null,
-          null,
-          new CoerceValueCallback( DataGridCollectionViewSourceBase.OnSourceCoerceValue ) ) );
-    }
-
-    public DataGridCollectionViewSourceBase()
-    {
-
-      m_itemProperties = new ObservableCollection<DataGridItemPropertyBase>();
-      m_itemProperties.CollectionChanged += new NotifyCollectionChangedEventHandler( this.ForwardedCollection_CollectionChanged );
-      m_dataGridDetailDescriptions = new DataGridDetailDescriptionCollection();
-      m_dataGridDetailDescriptions.CollectionChanged += new NotifyCollectionChangedEventHandler( this.ForwardedCollection_CollectionChanged );
-
-      // We force a culture because it is the only way to be
-      // notified when the Culture changes in order to launch our own
-      // ApplyExtraPropertiesToView (because the implentation of ApplyPropertiesToView is not virtual!)
-      // 
-      // See CollectionViewSource.ApplyPropertiesToView in reflector for a better understanding.
-      this.Culture = CultureInfo.InvariantCulture;
-    }
-
-    #region ItemProperties Property
-
-    public ObservableCollection<DataGridItemPropertyBase> ItemProperties
-    {
-      get
-      {
-        return m_itemProperties;
-      }
-    }
-
-    private ObservableCollection<DataGridItemPropertyBase> m_itemProperties;
-
-    #endregion
-
-    #region DetailDescriptions Property
-
-    internal ObservableCollection<DataGridDetailDescription> DetailDescriptions
-    {
-      get
-      {
-        return m_dataGridDetailDescriptions;
-      }
-    }
-
-    private ObservableCollection<DataGridDetailDescription> m_dataGridDetailDescriptions;
-
-    #endregion
-
-    #region ItemType Property
-
-    public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register(
-      "ItemType", typeof( Type ), typeof( DataGridCollectionViewSourceBase ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.NotDataBindable ) );
-
-    public Type ItemType
-    {
-      get
-      {
-        return this.GetValue( ItemTypeProperty ) as Type;
-      }
-      set
-      {
-        this.SetValue( ItemTypeProperty, value );
-
-        if( m_dataSourceProvider != null )
-          m_dataSourceProvider.DelayRefresh( this.Dispatcher, System.Windows.Threading.DispatcherPriority.DataBind );
-      }
-    }
-
-    #endregion
-
-    #region CollectionViewType Property
-
-    protected override void OnCollectionViewTypeChanged(
-      Type oldCollectionViewType,
-      Type newCollectionViewType )
-    {
-      if( !typeof( DataGridCollectionViewBase ).IsAssignableFrom( newCollectionViewType ) )
-        throw new InvalidOperationException( "An attempt was made to use a view other than DataGridCollectionViewBase." );
-
-      base.OnCollectionViewTypeChanged( oldCollectionViewType, newCollectionViewType );
-    }
-
-    #endregion
-
-    #region AutoCreateItemProperties Property
-
-    public static readonly DependencyProperty AutoCreateItemPropertiesProperty = DependencyProperty.Register(
-      "AutoCreateItemProperties", typeof( bool ), typeof( DataGridCollectionViewSourceBase ),
-      new FrameworkPropertyMetadata( true,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceChanged ) ) );
-
-    public bool AutoCreateItemProperties
-    {
-      get
-      {
-        return ( bool )this.GetValue( AutoCreateItemPropertiesProperty );
-      }
-      set
-      {
-        this.SetValue( AutoCreateItemPropertiesProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AutoCreateDetailDescriptions Property
-
-    internal static readonly DependencyProperty AutoCreateDetailDescriptionsProperty = DependencyProperty.Register(
-      "AutoCreateDetailDescriptions", typeof( bool ), typeof( DataGridCollectionViewSourceBase ),
-      new FrameworkPropertyMetadata( false,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceChanged ) ) );
-
-    internal bool AutoCreateDetailDescriptions
-    {
-      get
-      {
-        return ( bool )this.GetValue( AutoCreateDetailDescriptionsProperty );
-      }
-      set
-      {
-        this.SetValue( AutoCreateDetailDescriptionsProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DistinctValuesConstraints Property
-
-    public static readonly DependencyProperty DistinctValuesConstraintProperty = DependencyProperty.Register(
-      "DistinctValuesConstraint", typeof( DistinctValuesConstraint ), typeof( DataGridCollectionViewSourceBase ),
-      new UIPropertyMetadata( DistinctValuesConstraint.All,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceBaseDependencyPropertyChanged ) ) );
-
-    public DistinctValuesConstraint DistinctValuesConstraint
-    {
-      get
-      {
-        return ( DistinctValuesConstraint )this.GetValue( DistinctValuesConstraintProperty );
-      }
-      set
-      {
-        this.SetValue( DistinctValuesConstraintProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DistinctValuesUpdateMode Property
-
-    public static readonly DependencyProperty DistinctValuesUpdateModeProperty = DependencyProperty.Register(
-      "DistinctValuesUpdateMode", typeof( DistinctValuesUpdateMode ), typeof( DataGridCollectionViewSourceBase ),
-      new UIPropertyMetadata( DistinctValuesUpdateMode.Manual,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceBaseDependencyPropertyChanged ) ) );
-
-    public DistinctValuesUpdateMode DistinctValuesUpdateMode
-    {
-      get
-      {
-        return ( DistinctValuesUpdateMode )this.GetValue( DistinctValuesUpdateModeProperty );
-      }
-      set
-      {
-        this.SetValue( DistinctValuesUpdateModeProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DefaultCalculateDistinctValues Property
-
-    public static readonly DependencyProperty DefaultCalculateDistinctValuesProperty = DependencyProperty.Register(
-      "DefaultCalculateDistinctValues", typeof( bool ), typeof( DataGridCollectionViewSourceBase ),
-      new UIPropertyMetadata( true,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceBaseDependencyPropertyChanged ) ) );
-
-    public bool DefaultCalculateDistinctValues
-    {
-      get
-      {
-        return ( bool )this.GetValue( DefaultCalculateDistinctValuesProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultCalculateDistinctValuesProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Culture Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public new CultureInfo Culture
-    {
-      get
-      {
-        return base.Culture;
-      }
-      set
-      {
-        // We force a culture because it is the only way to be
-        // notified when the Culture changes in order to launch our own
-        // ApplyExtraPropertiesToView (because the implentation of ApplyPropertiesToView is not virtual!)
-        // 
-        // See CollectionViewSource.ApplyPropertiesToView in reflector for a better understanding.
-        if( value == null )
-          throw new ArgumentNullException( "Culture" );
-
-        base.Culture = value;
-      }
-    }
-
-    #endregion
-
-    #region DistinctValuesRefreshNeeded Event
-
-    public event EventHandler DistinctValuesRefreshNeeded;
-
-    internal void RaiseDistinctValuesRefreshNeeded()
-    {
-      //Inform the user DistinctValues need to be refreshed.
-      if( this.DistinctValuesRefreshNeeded != null )
-      {
-        this.DistinctValuesRefreshNeeded( this, EventArgs.Empty );
-      }
-    }
-
-    #endregion
-
-    #region Source property
-
-    public new object Source
-    {
-      get
-      {
-        return m_originalSource;
-      }
-      set
-      {
-        base.Source = value;
-      }
-    }
-
-    private static object OnSourceCoerceValue( DependencyObject d, object newValue )
-    {
-      if( newValue is DataGridCollectionViewBaseDataProvider )
-        return newValue;
-
-      DataGridCollectionViewSourceBase collectionViewSourceBase = ( DataGridCollectionViewSourceBase )d;
-      collectionViewSourceBase.m_originalSource = newValue;
-
-      if( collectionViewSourceBase.m_dataSourceProvider == null )
-      {
-        collectionViewSourceBase.m_dataSourceProvider = collectionViewSourceBase.CreateDataProvider();
-      }
-      else
-      {
-        collectionViewSourceBase.m_dataSourceProvider.DelayRefresh( collectionViewSourceBase.Dispatcher, System.Windows.Threading.DispatcherPriority.DataBind );
-      }
-
-      return collectionViewSourceBase.m_dataSourceProvider;
-    }
-
-    internal abstract DataGridCollectionViewBaseDataProvider CreateDataProvider();
-
-    #endregion
-
-    #region OriginalSource Property
-
-    internal object OriginalSource
-    {
-      get
-      {
-        return m_originalSource;
-      }
-    }
-
-    #endregion
-
-    #region AutoCreateForeignKeyDescriptions Property
-
-    public static readonly DependencyProperty AutoCreateForeignKeyDescriptionsProperty = DependencyProperty.Register(
-      "AutoCreateForeignKeyDescriptions",
-      typeof( bool ),
-      typeof( DataGridCollectionViewSourceBase ),
-      new FrameworkPropertyMetadata( false,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceChanged ) ) );
-
-    public bool AutoCreateForeignKeyDescriptions
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridCollectionViewSourceBase.AutoCreateForeignKeyDescriptionsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridCollectionViewSourceBase.AutoCreateForeignKeyDescriptionsProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DataSourceProvider Internal Property
-
-    internal DataGridCollectionViewBaseDataProvider DataSourceProvider
-    {
-      get
-      {
-        return m_dataSourceProvider;
-      }
-    }
-
-    #endregion
-
-    #region EVENTS
-
-    public event EventHandler<DataGridItemEventArgs> InitializingNewItem;
-
-    internal void OnInitializingNewItem( DataGridItemEventArgs e )
-    {
-      if( this.InitializingNewItem != null )
-        this.InitializingNewItem( this, e );
-    }
-
-    public event EventHandler<DataGridCreatingNewItemEventArgs> CreatingNewItem;
-
-    internal void OnCreatingNewItem( DataGridCreatingNewItemEventArgs e )
-    {
-      if( this.CreatingNewItem != null )
-        this.CreatingNewItem( this, e );
-    }
-
-    public event EventHandler<DataGridCommittingNewItemEventArgs> CommittingNewItem;
-
-    internal void OnCommittingNewItem( DataGridCommittingNewItemEventArgs e )
-    {
-      if( this.CommittingNewItem != null )
-        this.CommittingNewItem( this, e );
-    }
-
-    public event EventHandler<DataGridItemHandledEventArgs> CancelingNewItem;
-
-    internal void OnCancelingNewItem( DataGridItemHandledEventArgs e )
-    {
-      if( this.CancelingNewItem != null )
-        this.CancelingNewItem( this, e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> NewItemCreated;
-
-    internal void OnNewItemCreated( DataGridItemEventArgs e )
-    {
-      if( this.NewItemCreated != null )
-        this.NewItemCreated( this, e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> NewItemCommitted;
-
-    internal void OnNewItemCommitted( DataGridItemEventArgs e )
-    {
-      if( this.NewItemCommitted != null )
-        this.NewItemCommitted( this, e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> NewItemCanceled;
-
-    internal void OnNewItemCanceled( DataGridItemEventArgs e )
-    {
-      if( this.NewItemCanceled != null )
-        this.NewItemCanceled( this, e );
-    }
-
-    public event EventHandler<DataGridItemCancelEventArgs> BeginningEdit;
-
-    internal void OnBeginningEdit( DataGridItemCancelEventArgs e )
-    {
-      if( this.BeginningEdit != null )
-        this.BeginningEdit( this, e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> EditBegun;
-
-    internal void OnEditBegun( DataGridItemEventArgs e )
-    {
-      if( this.EditBegun != null )
-        this.EditBegun( this, e );
-    }
-
-    public event EventHandler<DataGridItemHandledEventArgs> CancelingEdit;
-
-    internal void OnCancelingEdit( DataGridItemHandledEventArgs e )
-    {
-      if( this.CancelingEdit != null )
-        this.CancelingEdit( this, e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> EditCanceled;
-
-    internal void OnEditCanceled( DataGridItemEventArgs e )
-    {
-      if( this.EditCanceled != null )
-      {
-        this.EditCanceled( this, e );
-      }
-    }
-
-    public event EventHandler<DataGridItemCancelEventArgs> CommittingEdit;
-
-    internal void OnCommittingEdit( DataGridItemCancelEventArgs e )
-    {
-      if( this.CommittingEdit != null )
-        this.CommittingEdit( this, e );
-    }
-
-    public event EventHandler<DataGridItemEventArgs> EditCommitted;
-
-    internal void OnEditCommitted( DataGridItemEventArgs e )
-    {
-      if( this.EditCommitted != null )
-        this.EditCommitted( this, e );
-    }
-
-    public event EventHandler<DataGridRemovingItemEventArgs> RemovingItem;
-
-    internal void OnRemovingItem( DataGridRemovingItemEventArgs e )
-    {
-      if( this.RemovingItem != null )
-        this.RemovingItem( this, e );
-    }
-
-    public event EventHandler<DataGridItemRemovedEventArgs> ItemRemoved;
-
-    internal void OnItemRemoved( DataGridItemRemovedEventArgs e )
-    {
-      if( this.ItemRemoved != null )
-        this.ItemRemoved( this, e );
-    }
-
-    #endregion
-
-    internal virtual void ApplyExtraPropertiesToView( DataGridCollectionViewBase currentView )
-    {
-      var currentViewItemProperties = currentView.ItemProperties;
-
-      foreach( var itemProperty in m_itemProperties )
-      {
-        currentViewItemProperties[ itemProperty.Name ] = itemProperty;
-      }
-
-      var defaultCalculateDistinctValues = this.DefaultCalculateDistinctValues;
-
-      foreach( var itemProperty in currentViewItemProperties )
-      {
-        // Set default value for CalculateDistinctValues if not explicitly set
-        if( !itemProperty.IsCalculateDistinctValuesInitialized )
-        {
-          itemProperty.CalculateDistinctValues = defaultCalculateDistinctValues;
-        }
-      }
-
-      var autoCreateForeignKeyDescriptions = this.AutoCreateForeignKeyDescriptions;
-
-      for( int i = 0; i < m_dataGridDetailDescriptions.Count; i++ )
-      {
-        DataGridDetailDescription detailDescription = m_dataGridDetailDescriptions[ i ];
-
-        // We assume we want to auto-create ForeignKeyDescriptions for DetailDescriptions
-        // if this.AutoCreateForeignKeyDescriptions is true and it was auto-created
-        if( detailDescription.IsAutoCreated )
-        {
-          detailDescription.AutoCreateForeignKeyDescriptions = autoCreateForeignKeyDescriptions;
-        }
-      }
-    }
-
-    internal static void OnDataGridCollectionViewSourceBaseDependencyPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridCollectionViewSourceBase source = o as DataGridCollectionViewSourceBase;
-
-      if( source == null )
-        return;
-
-      source.AdviseForwardedPropertyChanged();
-    }
-
-    internal static void OnDataGridCollectionViewSourceChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridCollectionViewSourceBase source = o as DataGridCollectionViewSourceBase;
-
-      if( source == null )
-        return;
-
-      if( source.m_dataSourceProvider != null )
-        source.m_dataSourceProvider.DelayRefresh( source.Dispatcher, System.Windows.Threading.DispatcherPriority.DataBind );
-    }
-
-    internal void ForwardedCollection_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.AdviseForwardedPropertyChanged();
-    }
-
-    internal void AdviseForwardedPropertyChanged()
-    {
-      // This is the only way to react like we are increasing the version number
-      // and ending with calling the base.ApplyPropertiesToView 
-      base.Culture = base.Culture;
-    }
-
-    #region Private Fields
-
-    private DataGridCollectionViewBaseDataProvider m_dataSourceProvider;
-    private object m_originalSource;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCommittingNewItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCommittingNewItemEvent.cs
deleted file mode 100644
index a61cda36..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCommittingNewItemEvent.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridCommittingNewItemEventArgs : DataGridItemCancelEventArgs
-  {
-    public DataGridCommittingNewItemEventArgs( DataGridCollectionViewBase collectionView, object item, bool cancel )
-      : base( collectionView, item, cancel )
-    {
-      m_index = -1;
-      m_newCount = -1;
-    }
-
-    #region Index Property
-
-    public int Index
-    {
-      get { return m_index; }
-      set { m_index = value; }
-    }
-
-    private int m_index;
-
-    #endregion Index Property
-
-    #region NewCount
-
-    public int NewCount
-    {
-      get { return m_newCount; }
-      set { m_newCount = value; }
-    }
-
-    private int m_newCount;
-
-    #endregion NewCount
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCreatingNewItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCreatingNewItemEvent.cs
deleted file mode 100644
index 0ef957f3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCreatingNewItemEvent.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridCreatingNewItemEventArgs : CancelEventArgs
-  {
-    public DataGridCreatingNewItemEventArgs(
-      DataGridCollectionViewBase collectionView,
-      object newItem,
-      bool cancel )
-      : base( cancel )
-    {
-      m_collectionView = collectionView;
-      m_newItem = newItem;
-    }
-
-    #region CollectionView Property
-
-    public DataGridCollectionViewBase CollectionView
-    {
-      get { return m_collectionView; }
-    }
-
-    private DataGridCollectionViewBase m_collectionView;
-
-    #endregion CollectionView Property
-
-    #region NewItem Property
-
-    public object NewItem
-    {
-      get
-      {
-        return m_newItem;
-      }
-      set
-      {
-        m_newItem = value;
-      }
-    }
-
-    private object m_newItem;
-
-    #endregion NewItem Property
-
-    #region Handled Property
-
-    public bool Handled
-    {
-      get
-      {
-        return m_handled;
-      }
-      set
-      {
-        m_handled = value;
-      }
-    }
-
-    private bool m_handled;
-
-    #endregion Handled Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs
deleted file mode 100644
index 7595a6eb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs
+++ /dev/null
@@ -1,507 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-using Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class DataGridDetailDescription : DependencyObject, IWeakEventListener
-  {
-    protected DataGridDetailDescription()
-    {
-      m_itemProperties = new DataGridItemPropertyCollection();
-      m_detailDescriptions = new DataGridDetailDescriptionCollection();
-      m_defaultPropertyDescriptions = new PropertyDescriptionRouteDictionary();
-
-      m_groupDescriptions = new GroupDescriptionCollection();
-      m_sortDescriptions = new DataGridSortDescriptionCollection();    
-
-      this.AutoCreateDetailDescriptions = true;
-      this.AutoCreateItemProperties = true;
-      this.DefaultCalculateDistinctValues = true;
-
-      CollectionChangedEventManager.AddListener( m_itemProperties, this );
-      InitializeItemPropertyEventManager.AddListener( m_itemProperties, this );
-      CollectionChangedEventManager.AddListener( m_detailDescriptions, this );
-    }
-
-    #region RelationName Public Property
-
-    public string RelationName
-    {
-      get
-      {
-        return m_relationName;
-      }
-      set
-      {
-        if( this.InternalIsSealed == true )
-          throw new InvalidOperationException( "An attempt was made to change the RelationName property after the DataGridDetailDescription has been sealed." );
-
-        m_relationName = value;
-      }
-    }
-
-    private string m_relationName;
-
-    #endregion
-
-    #region Title Public Property
-
-    public object Title
-    {
-      get
-      {
-        return m_title;
-      }
-      set
-      {
-        m_title = value;
-      }
-    }
-
-    private object m_title;
-
-    #endregion
-
-    #region TitleTemplate Public Property
-
-    public DataTemplate TitleTemplate
-    {
-      get
-      {
-        return m_titleTemplate;
-      }
-      set
-      {
-        m_titleTemplate = value;
-      }
-    }
-
-    private DataTemplate m_titleTemplate;
-
-    #endregion
-
-    #region AutoCreateItemProperties Public Property
-
-    public bool AutoCreateItemProperties
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateItemProperties ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateItemProperties ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AutoCreateDetailDescriptions Public Property
-
-    public bool AutoCreateDetailDescriptions
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateDetailDescriptions ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateDetailDescriptions ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AutoCreateForeignKeyDescriptions Public Property
-
-    public bool AutoCreateForeignKeyDescriptions
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateForeignKeyDescriptions ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateForeignKeyDescriptions ] = value;
-      }
-    }
-
-    #endregion
-
-    #region DistinctValuesConstraint Public Property
-
-    public DistinctValuesConstraint DistinctValuesConstraint
-    {
-      get
-      {
-        return m_distinctValuesConstraint;
-      }
-      set
-      {
-        m_distinctValuesConstraint = value;
-      }
-    }
-
-    private DistinctValuesConstraint m_distinctValuesConstraint = DistinctValuesConstraint.All;
-
-    #endregion
-
-    #region ItemProperties Public Property
-
-    public DataGridItemPropertyCollection ItemProperties
-    {
-      get
-      {
-        return m_itemProperties;
-      }
-    }
-
-    private readonly DataGridItemPropertyCollection m_itemProperties;
-
-    #endregion
-
-    #region DefaultCalculateDistinctValues Public Property
-
-    public bool DefaultCalculateDistinctValues
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultCalculateDistinctValues ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultCalculateDistinctValues ] = value;
-      }
-    }
-
-    #endregion
-
-    #region DetailDescriptions Public Property
-
-    public DataGridDetailDescriptionCollection DetailDescriptions
-    {
-      get
-      {
-        return m_detailDescriptions;
-      }
-    }
-
-    private readonly DataGridDetailDescriptionCollection m_detailDescriptions;
-
-    #endregion
-
-    #region GroupDescriptions Public Property
-
-    public ObservableCollection<GroupDescription> GroupDescriptions
-    {
-      get
-      {
-        return m_groupDescriptions;
-      }
-    }
-
-    private readonly GroupDescriptionCollection m_groupDescriptions;
-
-    #endregion
-
-    #region SortDescriptions Public Propertiy
-
-    public SortDescriptionCollection SortDescriptions
-    {
-      get
-      {
-        return m_sortDescriptions;
-      }
-    }
-
-    private readonly DataGridSortDescriptionCollection m_sortDescriptions;
-
-    #endregion
-
-    #region AutoCreateItemPropertiesCompleted Internal Property
-
-    internal bool AutoCreateItemPropertiesCompleted
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateItemPropertiesCompleted ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateItemPropertiesCompleted ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AutoCreateDetailDescriptionsCompleted Internal Property
-
-    internal bool AutoCreateDetailDescriptionsCompleted
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateDetailDescriptionsCompleted ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.AutoCreateDetailDescriptionsCompleted ] = value;
-      }
-    }
-
-    #endregion
-
-    #region DefaultItemPropertiesInitialized Internal Property
-
-    internal bool DefaultItemPropertiesInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultItemPropertiesInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultItemPropertiesInitialized ] = value;
-      }
-    }
-
-    #endregion
-
-    #region DefaultPropertyDescriptionsCreated Internal Property
-
-    internal bool DefaultPropertyDescriptionsCreated
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultPropertyDescriptionsCreated ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.DefaultPropertyDescriptionsCreated ] = value;
-      }
-    }
-
-    #endregion
-
-    #region DefaultPropertyDescriptions Internal Property
-
-    internal PropertyDescriptionRouteDictionary DefaultPropertyDescriptions
-    {
-      get
-      {
-        return m_defaultPropertyDescriptions;
-      }
-    }
-
-    private readonly PropertyDescriptionRouteDictionary m_defaultPropertyDescriptions;
-
-    #endregion
-
-    #region IsAutoCreated Internal Property
-
-    internal bool IsAutoCreated
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.IsAutoCreated ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.IsAutoCreated ] = value;
-      }
-    }
-
-    #endregion
-
-    #region InternalIsSealed Internal Property
-
-    internal bool InternalIsSealed
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.IsSealed ];
-      }
-      private set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.IsSealed ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsInitialized Internal Property
-
-    internal bool IsInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridDetailDescriptionFlags.IsInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridDetailDescriptionFlags.IsInitialized ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ItemType Internal Property
-
-    internal Type ItemType
-    {
-      get
-      {
-        return m_itemType;
-      }
-      set
-      {
-        if( value == m_itemType )
-          return;
-
-        m_itemType = value;
-      }
-    }
-
-    private Type m_itemType; //null
-
-    #endregion
-
-    #region DataGridSortDescriptions Internal Property
-
-    internal DataGridSortDescriptionCollection DataGridSortDescriptions
-    {
-      get
-      {
-        return m_sortDescriptions;
-      }
-    }
-
-    #endregion
-
-    protected internal virtual void Initialize( DataGridCollectionViewBase parentCollectionView )
-    {
-    }
-
-    protected internal abstract IEnumerable GetDetailsForParentItem( DataGridCollectionViewBase parentCollectionView, object parentItem );
-
-    internal void Seal()
-    {
-      this.InternalIsSealed = true;
-    }
-
-    internal void InternalInitialize( DataGridCollectionViewBase parentCollectionView )
-    {
-      if( string.IsNullOrEmpty( this.RelationName ) )
-        throw new InvalidOperationException( "An attempt was made to initialize a detail description that does not have a relation name." );
-
-      this.Initialize( parentCollectionView );
-    }
-
-    private void OnItemPropertiesCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      var removedItems = default( IEnumerable<DataGridItemPropertyBase> );
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Replace:
-          removedItems = e.OldItems.Cast<DataGridItemPropertyBase>();
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          removedItems = e.OldItems.Cast<DataGridItemPropertyBase>();
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-          throw new NotSupportedException();
-      }
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( ( managerType == null ) || ( sender == null ) || ( e == null ) )
-        return false;
-
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
-
-        if( m_itemProperties == sender )
-        {
-          this.OnItemPropertiesCollectionChanged( sender, eventArgs );
-        }
-        else if( m_detailDescriptions == sender )
-        {
-        }
-      }
-      else if( managerType == typeof( InitializeItemPropertyEventManager ) )
-      {
-        var eventArgs = ( InitializeItemPropertyEventArgs )e;
-
-        if( m_itemProperties == sender )
-        {
-          var itemProperty = eventArgs.ItemProperty;
-          var itemPropertyRoute = DataGridItemPropertyRoute.Create( itemProperty );
-
-          ItemsSourceHelper.SetPropertyDescriptionsFromItemProperty( m_defaultPropertyDescriptions, null, null, m_itemType, itemPropertyRoute );
-          ItemsSourceHelper.InitializePropertyDescriptions( m_defaultPropertyDescriptions, itemPropertyRoute, m_itemType, this.DefaultPropertyDescriptionsCreated );
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private BitVector32 m_flags = new BitVector32();
-
-    [Flags]
-    private enum DataGridDetailDescriptionFlags
-    {
-      IsSealed = 1 << 0,
-      DefaultCalculateDistinctValues = 1 << 1,
-      IsInitialized = 1 << 2,
-      AutoCreateItemProperties = 1 << 3,
-      AutoCreateDetailDescriptions = 1 << 4,
-      AutoCreateForeignKeyDescriptions = 1 << 5,
-      IsAutoCreated = 1 << 6,
-      AutoCreateItemPropertiesCompleted = 1 << 7,
-      AutoCreateDetailDescriptionsCompleted = 1 << 8,
-      DefaultItemPropertiesInitialized = 1 << 9,
-      DefaultPropertyDescriptionsCreated = 1 << 10,
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs
deleted file mode 100644
index 218d3575..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridDetailDescriptionCollection : ObservableCollection<DataGridDetailDescription>
-  {
-    public DataGridDetailDescriptionCollection()
-    {
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1002:DoNotExposeGenericLists" )]
-    public DataGridDetailDescriptionCollection( List<DataGridDetailDescription> detailDescriptions )
-      : base( detailDescriptions )
-    {
-    }
-
-    public DataGridDetailDescription this[ string relationName ]
-    {
-      get
-      {
-        var index = this.IndexOf( relationName );
-        if( index < 0 )
-          return null;
-
-        return this.Items[ index ];
-      }
-    }
-
-    public int IndexOf( string relationName )
-    {
-      var items = this.Items;
-      var count = items.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( string.Equals( items[ i ].RelationName, relationName ) )
-          return i;
-      }
-
-      return -1;
-    }
-
-    protected override void SetItem( int index, DataGridDetailDescription item )
-    {
-      if( string.IsNullOrEmpty( item.RelationName ) )
-        throw new ArgumentException( "The RelationName property of the specified DataGridDetailDescription cannot be null or empty.", "item" );
-
-      base.SetItem( index, item );
-    }
-
-    protected override void InsertItem( int index, DataGridDetailDescription item )
-    {
-      if( string.IsNullOrEmpty( item.RelationName ) )
-        throw new ArgumentException( "The RelationName property of the specified DataGridDetailDescription cannot be null or empty.", "item" );
-
-      base.InsertItem( index, item );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs
deleted file mode 100644
index 1bd2b380..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataGridGroupDescription : GroupDescription
-  {
-    public DataGridGroupDescription()
-    {
-    }
-
-    public DataGridGroupDescription( string propertyName )
-    {
-      m_propertyGroupDescription.PropertyName = propertyName;
-    }
-
-    public string PropertyName
-    {
-      get
-      {
-        return m_propertyGroupDescription.PropertyName;
-      }
-
-      set
-      {
-        m_propertyGroupDescription.PropertyName = value;
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "PropertyName" ) );
-      }
-    }
-
-    public IComparer SortComparer
-    {
-      get
-      {
-        return m_sortComparer;
-      }
-      set
-      {
-        m_sortComparer = value;
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "SortComparer" ) );
-      }
-    }
-
-    public GroupConfiguration GroupConfiguration
-    {
-      get
-      {
-        return m_groupConfiguration;
-      }
-      set
-      {
-        m_groupConfiguration = value;
-      }
-    }
-
-    public override object GroupNameFromItem( object item, int level, CultureInfo culture )
-    {
-      return this.GetPropertyValue( item );
-    }
-
-    public override sealed bool NamesMatch( object groupName, object itemName )
-    {
-      // We sealed up the NamesMatch because we will use a HashTable to find existing key
-      // for performance reason.
-      //
-      // We do not throw, because we want our GroupDescription to be usable in other CollectionView
-      return base.NamesMatch( groupName, itemName );
-    }
-
-    protected object GetPropertyValue( object item )
-    {
-      if( m_contextProperty != null )
-        return ItemsSourceHelper.GetValueFromItemProperty( m_contextProperty, item );
-
-      return m_propertyGroupDescription.GroupNameFromItem( item, 0, CultureInfo.InvariantCulture );
-    }
-
-    internal void SetContext( DataGridCollectionView collectionView )
-    {
-      if( collectionView == null )
-      {
-        m_contextProperty = null;
-      }
-      else
-      {
-        var propertyName = m_propertyGroupDescription.PropertyName;
-
-        if( string.IsNullOrEmpty( propertyName ) )
-        {
-          m_contextProperty = null;
-        }
-        else
-        {
-          m_contextProperty = ItemsSourceHelper.GetItemPropertyFromProperty( collectionView.ItemProperties, propertyName );
-        }
-      }
-    }
-
-    private IComparer m_sortComparer;
-    private DataGridItemPropertyBase m_contextProperty;
-    private PropertyGroupDescription m_propertyGroupDescription = new PropertyGroupDescription();
-    private GroupConfiguration m_groupConfiguration; // = null
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupInfo.cs
deleted file mode 100644
index ba7ffdcf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupInfo.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataGridGroupInfo
-  {
-    internal DataGridGroupInfo( GroupDescription groupDescription, CollectionViewGroup collectionViewGroup )
-    {
-      if( groupDescription == null )
-        throw new ArgumentNullException( "groupDescription" );
-
-      if( collectionViewGroup == null )
-        throw new ArgumentNullException( "collectionViewGroup" );
-
-      this.GroupDescription = groupDescription;
-      this.PropertyName = DataGridCollectionViewBase.GetPropertyNameFromGroupDescription( groupDescription );
-      this.Value = collectionViewGroup.Name;
-    }
-
-    #region GroupDescription PROPERTY
-
-    public GroupDescription GroupDescription
-    {
-      get;
-      private set;
-    }
-
-    #endregion GroupDescription PROPERTY
-
-    #region Value PROPERTY
-
-    public object Value
-    {
-      get;
-      private set;
-    }
-
-    #endregion Value PROPERTY
-
-    #region PropertyName PROPERTY
-
-    public string PropertyName
-    {
-      get;
-      private set;
-    }
-
-    #endregion PropertyName PROPERTY
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemCancelEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemCancelEvent.cs
deleted file mode 100644
index 51dfbbaa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemCancelEvent.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridItemCancelEventArgs : DataGridItemHandledEventArgs
-  {
-    public DataGridItemCancelEventArgs(
-      DataGridCollectionViewBase collectionView,
-      object item,
-      bool cancel )
-      : base( collectionView, item )
-    {
-      m_cancel = cancel;
-    }
-
-    #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/(CollectionView)/DataGridItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemEvent.cs
deleted file mode 100644
index aafe44f0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemEvent.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridItemEventArgs : EventArgs
-  {
-    public DataGridItemEventArgs(
-      DataGridCollectionViewBase collectionView,
-      object item )
-    {
-      m_collectionView = collectionView;
-      m_item = item;
-    }
-
-    #region CollectionView Property
-
-    public DataGridCollectionViewBase CollectionView
-    {
-      get { return m_collectionView; }
-    }
-
-    private DataGridCollectionViewBase m_collectionView;
-
-    #endregion CollectionView Property
-
-    #region Item Property
-
-    public object Item
-    {
-      get
-      {
-        return m_item;
-      }
-    }
-
-    private object m_item;
-
-    #endregion Item Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemHandledEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemHandledEvent.cs
deleted file mode 100644
index 03261982..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemHandledEvent.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridItemHandledEventArgs : DataGridItemEventArgs
-  {
-    public DataGridItemHandledEventArgs(
-      DataGridCollectionViewBase collectionView,
-      object item )
-      : base( collectionView, item )
-    {
-    }
-
-    #region Handled Property
-
-    public bool Handled
-    {
-      get
-      {
-        return m_handled;
-      }
-      set
-      {
-        m_handled = value;
-      }
-    }
-
-    private bool m_handled;
-
-    #endregion Handled Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.PropertyDescriptorFromItemProperty.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.PropertyDescriptorFromItemProperty.cs
deleted file mode 100644
index 4c488cfe..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.PropertyDescriptorFromItemProperty.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public partial class DataGridItemProperty
-  {
-    internal class PropertyDescriptorFromItemProperty : DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase
-    {
-      public PropertyDescriptorFromItemProperty( DataGridItemProperty dataGridItemProperty )
-        : base( dataGridItemProperty )
-      {
-        m_propertyDescriptorForValueChanged = dataGridItemProperty.PropertyDescriptor;
-      }
-
-      public override void AddValueChanged( object component, EventHandler handler )
-      {
-        if( m_propertyDescriptorForValueChanged != null )
-        {
-          if( !( component is EmptyDataItem ) )
-          {
-            m_propertyDescriptorForValueChanged.AddValueChanged( component, handler );
-          }
-        }
-        else
-        {
-          base.AddValueChanged( component, handler );
-        }
-      }
-
-      public override void RemoveValueChanged( object component, EventHandler handler )
-      {
-        if( m_propertyDescriptorForValueChanged != null )
-        {
-          if( !( component is EmptyDataItem ) )
-          {
-            m_propertyDescriptorForValueChanged.RemoveValueChanged( component, handler );
-          }
-        }
-        else
-        {
-          base.RemoveValueChanged( component, handler );
-        }
-      }
-
-      private PropertyDescriptor m_propertyDescriptorForValueChanged;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs
deleted file mode 100644
index 7e4ebe1a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs
+++ /dev/null
@@ -1,629 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Diagnostics;
-using System.Globalization;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [DebuggerDisplay( "Name = {Name}" )]
-  public partial class DataGridItemProperty : DataGridItemPropertyBase
-  {
-    public DataGridItemProperty()
-    {
-    }
-
-    public DataGridItemProperty( string name, string valuePath, Type dataType )
-      : this( name, null, valuePath, dataType )
-    {
-    }
-
-    public DataGridItemProperty( string name, string valueXPath, string valuePath, Type dataType )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "name cannot be null or empty.", "name" );
-
-      if( ( string.IsNullOrEmpty( valuePath ) ) && ( string.IsNullOrEmpty( valueXPath ) ) )
-        throw new ArgumentException( "valuePath or valueXPath cannot be null or empty." );
-
-      this.Initialize(
-        name,
-        null,
-        null,
-        valueXPath,
-        valuePath,
-        dataType,
-        false,
-        null,
-        null,
-        null,
-        null,
-        null );
-    }
-
-    public DataGridItemProperty( string name, string valuePath, Type dataType, bool isReadOnly )
-      : this( name, null, valuePath, dataType, isReadOnly )
-    {
-    }
-
-    public DataGridItemProperty( string name, string valueXPath, string valuePath, Type dataType, bool isReadOnly )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "name cannot be null or empty.", "name" );
-
-      if( ( string.IsNullOrEmpty( valuePath ) ) && ( string.IsNullOrEmpty( valueXPath ) ) )
-        throw new ArgumentException( "valuePath or valueXPath cannot be null or empty." );
-
-      this.Initialize(
-        name,
-        null,
-        null,
-        valueXPath,
-        valuePath,
-        dataType,
-        false,
-        isReadOnly,
-        null,
-        null,
-        null,
-        null );
-    }
-
-    public DataGridItemProperty( PropertyDescriptor propertyDescriptor )
-      : this( propertyDescriptor, false )
-    {
-    }
-
-    public DataGridItemProperty( string name, Type dataType )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "The name must not be null (Nothing in Visual Basic) or empty.", "name" );
-
-      if( dataType == null )
-        throw new ArgumentNullException( "dataType" );
-
-      this.Initialize(
-        name,
-        null,
-        null,
-        null,
-        null,
-        dataType,
-        false,
-        null,
-        null,
-        null,
-        null,
-        null );
-    }
-
-    public DataGridItemProperty( string name, Type dataType, bool isReadOnly )
-      : this( name, dataType, isReadOnly, null )
-    {
-    }
-
-    public DataGridItemProperty( string name, Type dataType, bool isReadOnly, Nullable<bool> overrideReadOnlyForInsertion )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "The name must not be null (Nothing in Visual Basic) or empty.", "name" );
-
-      if( dataType == null )
-        throw new ArgumentNullException( "dataType" );
-
-      this.Initialize(
-        name,
-        null,
-        null,
-        null,
-        null,
-        dataType,
-        false,
-        isReadOnly,
-        overrideReadOnlyForInsertion,
-        null,
-        null,
-        null );
-    }
-
-    public DataGridItemProperty( string name, PropertyDescriptor propertyDescriptor )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "The name must not be null (Nothing in Visual Basic) or empty.", "name" );
-
-      if( propertyDescriptor == null )
-        throw new ArgumentNullException( "propertyDescriptor" );
-
-      this.Initialize(
-        name,
-        propertyDescriptor,
-        null,
-        null,
-        null,
-        null,
-        false,
-        null,
-        null,
-        null,
-        null,
-        null );
-    }
-
-    internal DataGridItemProperty( PropertyDescriptor propertyDescriptor, bool isAutoCreated )
-    {
-      if( propertyDescriptor == null )
-        throw new ArgumentNullException( "propertyDescriptor" );
-
-      this.Initialize(
-        propertyDescriptor.Name,
-        propertyDescriptor,
-        null,
-        null,
-        null,
-        null,
-        isAutoCreated,
-        null,
-        null,
-        null,
-        null,
-        null );
-    }
-
-    internal DataGridItemProperty(
-      string name,
-      PropertyDescriptor propertyDescriptor,
-      string title,
-      string valueXPath,
-      string valuePath,
-      Type dataType,
-      bool isAutoCreated,
-      Nullable<bool> isReadOnly,
-      Nullable<bool> overrideReadOnlyForInsertion,
-      Nullable<bool> isDisplayable,
-      Nullable<bool> isASubRelationship,
-      DataGridForeignKeyDescription foreignKeyDescription )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "name cannot be null or empty.", "name" );
-
-      if( ( string.IsNullOrEmpty( valuePath ) ) && ( string.IsNullOrEmpty( valueXPath ) ) && ( propertyDescriptor == null ) )
-        throw new ArgumentException( "The valuePath, valueXPath, or propertyDescriptor must be provided." );
-
-      this.Initialize(
-        name,
-        propertyDescriptor,
-        title,
-        valueXPath,
-        valuePath,
-        dataType,
-        isAutoCreated,
-        isReadOnly,
-        overrideReadOnlyForInsertion,
-        isDisplayable,
-        isASubRelationship,
-        foreignKeyDescription );
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "This constructor is obsolete and should no longer be used.", true )]
-    protected DataGridItemProperty( DataGridItemProperty template )
-    {
-      throw new NotSupportedException();
-    }
-
-    private void Initialize(
-      string name,
-      PropertyDescriptor propertyDescriptor,
-      string title,
-      string valueXPath,
-      string valuePath,
-      Type dataType,
-      bool isAutoCreated,
-      Nullable<bool> isReadOnly,
-      Nullable<bool> overrideReadOnlyForInsertion,
-      Nullable<bool> isDisplayable,
-      Nullable<bool> isASubRelationship,
-      DataGridForeignKeyDescription foreignKeyDescription )
-    {
-      this.IsAutoCreated = isAutoCreated;
-      m_valueXPath = valueXPath;
-      m_valuePath = valuePath;
-      m_propertyDescriptor = propertyDescriptor;
-
-      if( m_propertyDescriptor == null )
-      {
-        if( ( string.IsNullOrEmpty( m_valueXPath ) ) && ( m_valuePath == "." ) )
-          m_propertyDescriptor = new SelfPropertyDescriptor( dataType );
-      }
-
-      if( m_propertyDescriptor != null )
-      {
-        this.IsBrowsable = m_propertyDescriptor.IsBrowsable;
-
-        if( m_propertyDescriptor.IsReadOnly )
-          isReadOnly = m_propertyDescriptor.IsReadOnly;
-      }
-
-      if( title == null )
-      {
-        if( m_propertyDescriptor != null )
-        {
-          title = m_propertyDescriptor.DisplayName;
-        }
-      }
-
-      if( isReadOnly == null )
-      {
-        if( m_propertyDescriptor != null )
-        {
-          isReadOnly = m_propertyDescriptor.IsReadOnly;
-        }
-      }
-
-      if( dataType == null )
-      {
-        if( m_propertyDescriptor != null )
-        {
-          dataType = m_propertyDescriptor.PropertyType;
-        }
-      }
-
-      this.ForeignKeyDescription = foreignKeyDescription;
-
-      base.Initialize( name, title, dataType, isReadOnly, overrideReadOnlyForInsertion, isDisplayable, isASubRelationship );
-    }
-
-    #region ValuePath Property
-
-    public string ValuePath
-    {
-      get
-      {
-        return m_valuePath;
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the ValuePath of a property already added to a containing collection." );
-
-        this.SetValuePath( value );
-      }
-    }
-
-    internal void SetValuePath( string valuePath )
-    {
-      m_valuePath = valuePath;
-      m_bindingPathValueExtractorForRead = null;
-      m_bindingPathValueExtractorForWrite = null;
-    }
-
-    private string m_valuePath;
-
-    #endregion
-
-    #region ValueXPath Property
-
-    public string ValueXPath
-    {
-      get
-      {
-        return m_valueXPath;
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the ValueXPath of a property already added to a containing collection." );
-
-        this.SetValueXPath( value );
-      }
-    }
-
-    internal void SetValueXPath( string valueXPath )
-    {
-      m_valueXPath = valueXPath;
-      m_bindingPathValueExtractorForRead = null;
-      m_bindingPathValueExtractorForWrite = null;
-    }
-
-    private string m_valueXPath;
-
-    #endregion
-
-    #region PropertyDescriptor Property
-
-    public PropertyDescriptor PropertyDescriptor
-    {
-      get
-      {
-        return m_propertyDescriptor;
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the PropertyDescriptor of a property already added to a containing collection." );
-
-        this.SetPropertyDescriptor( value );
-      }
-    }
-
-    internal void SetPropertyDescriptor( PropertyDescriptor propertyDescriptor )
-    {
-      m_propertyDescriptor = propertyDescriptor;
-
-      if( ( m_propertyDescriptor != null ) && ( !this.IsReadOnly ) )
-      {
-        this.SetIsReadOnly( propertyDescriptor.IsReadOnly );
-      }
-
-      m_bindingPathValueExtractorForRead = null;
-      m_bindingPathValueExtractorForWrite = null;
-    }
-
-    private PropertyDescriptor m_propertyDescriptor;
-
-    #endregion
-
-    #region IsAutoCreated Property
-
-    public bool IsAutoCreated
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region FieldName Internal Property
-
-    internal override string FieldName
-    {
-      get
-      {
-        var descriptor = this.PropertyDescriptor;
-        if( descriptor != null )
-          return descriptor.Name;
-
-        return base.FieldName;
-      }
-    }
-
-    #endregion
-
-    protected override object GetValueCore( object component )
-    {
-      if( m_propertyDescriptor != null )
-      {
-        object value;
-
-        try
-        {
-          value = m_propertyDescriptor.GetValue( component );
-        }
-        catch( DataException )
-        {
-          // We have to return null if the datarow is deleted from the DataTable.  When the System.Data.DataRow has RowState == detached,
-          // it can be because it has been deleted or it being inserted, nothing special found to differentiate that 2 state.  So doing a try catch.
-          value = null;
-        }
-
-        CultureInfo converterCulture = this.ConverterCulture;
-
-        if( converterCulture == null )
-        {
-          converterCulture = CultureInfo.InvariantCulture;
-        }
-
-        return this.GetBindingConverter( component ).Convert( value, this.DataType, this.ConverterParameter, converterCulture );
-      }
-
-      if( m_bindingPathValueExtractorForRead == null )
-      {
-        CultureInfo converterCulture = this.ConverterCulture;
-
-        if( converterCulture == null )
-        {
-          converterCulture = CultureInfo.InvariantCulture;
-        }
-
-        PropertyPath propertyPath = null;
-
-        if( !string.IsNullOrEmpty( this.ValuePath ) )
-        {
-          propertyPath = new PropertyPath( this.ValuePath, BindingPathValueExtractor.EmptyObjectArray );
-        }
-
-        m_bindingPathValueExtractorForRead = new BindingPathValueExtractor( this.ValueXPath, propertyPath, false, this.DataType,
-                                                                            this.GetBindingConverter( component ), this.ConverterParameter, converterCulture );
-      }
-
-      return m_bindingPathValueExtractorForRead.GetValueFromItem( component );
-    }
-
-    protected override void SetValueCore( object component, object value )
-    {
-      if( m_propertyDescriptor != null )
-      {
-        CultureInfo converterCulture = this.ConverterCulture;
-
-        if( converterCulture == null )
-        {
-          converterCulture = CultureInfo.InvariantCulture;
-        }
-
-        object convertedValue = this.GetBindingConverter( component ).ConvertBack( value, m_propertyDescriptor.PropertyType, this.ConverterParameter, converterCulture );
-
-        m_propertyDescriptor.SetValue( component, convertedValue );
-      }
-      else
-      {
-        if( m_bindingPathValueExtractorForWrite == null )
-        {
-          CultureInfo converterCulture = this.ConverterCulture;
-
-          if( converterCulture == null )
-          {
-            converterCulture = CultureInfo.InvariantCulture;
-          }
-
-          PropertyPath propertyPath = null;
-
-          if( !string.IsNullOrEmpty( this.ValuePath ) )
-          {
-            propertyPath = new PropertyPath( this.ValuePath, BindingPathValueExtractor.EmptyObjectArray );
-          }
-
-          m_bindingPathValueExtractorForWrite = new BindingPathValueExtractor( this.ValueXPath, propertyPath, true, this.DataType,
-                                                                               this.GetBindingConverter( component ), this.ConverterParameter, converterCulture );
-        }
-
-        m_bindingPathValueExtractorForWrite.SetValueToItem( component, value );
-      }
-
-      base.SetValueCore( component, value );
-    }
-
-    internal override PropertyDescriptorFromItemPropertyBase GetPropertyDescriptorForBindingCore()
-    {
-      return new PropertyDescriptorFromItemProperty( this );
-    }
-
-    internal override void SetUnspecifiedPropertiesValues(
-      PropertyDescription description,
-      Type itemType,
-      bool defaultItemPropertiesCreated )
-    {
-      var itemIsXceedDataRow = ( itemType != null ) ? typeof( DataRow ).IsAssignableFrom( itemType ) : false;
-
-      if( ( this.PropertyDescriptor == null ) && string.IsNullOrEmpty( this.ValuePath ) && string.IsNullOrEmpty( this.ValueXPath ) )
-      {
-        if( itemIsXceedDataRow )
-        {
-          this.SetPropertyDescriptor( new UnboundDataRowPropertyDescriptor( this.Name, this.DataType ) );
-        }
-        else
-        {
-          if( description == null )
-          {
-            if( this.Name == "." )
-            {
-              this.SetPropertyDescriptor( new SelfPropertyDescriptor( this.DataType ) );
-              this.SetValuePath( "." );
-              this.SetIsReadOnly( true );
-              this.SetOverrideReadOnlyForInsertion( false );
-            }
-          }
-          else
-          {
-            this.SetPropertyDescriptor( description.PropertyDescriptor );
-            this.SetValuePath( description.Path );
-            this.SetValueXPath( description.XPath );
-          }
-        }
-
-        if( defaultItemPropertiesCreated && ( this.PropertyDescriptor == null ) && string.IsNullOrEmpty( this.ValuePath ) && string.IsNullOrEmpty( this.ValueXPath ) )
-        {
-          // I have to add this particular exception case to make sure that when the ItemProperty is "re-normalized" when the first DataGridCollectionView
-          // is created for it, then the ValuePath is still null or empty (allowing it to be re-normalized)
-          this.SetValuePath( this.Name );
-        }
-      }
-
-      if( this.DataType == null )
-      {
-        //only try to affect the DataType if the DefaultPropertyDescriptions were set. (will not be the case when XAML parsing DetailDescriptions)
-        if( defaultItemPropertiesCreated )
-        {
-          if( description == null )
-            throw new InvalidOperationException( "An attempt was made to add an item (" + this.Name + ") without specifying its data type." );
-
-          this.SetDataType( description.DataType );
-        }
-      }
-
-      if( string.IsNullOrEmpty( this.Title ) )
-      {
-        if( !itemIsXceedDataRow && ( description != null ) && !string.IsNullOrEmpty( description.DisplayName ) )
-        {
-          this.Title = description.DisplayName;
-        }
-        else
-        {
-          this.Title = this.Name;
-        }
-      }
-
-      if( !this.IsReadOnly )
-      {
-        if( description != null )
-        {
-          this.SetIsReadOnly( description.IsReadOnly );
-        }
-      }
-
-      if( this.OverrideReadOnlyForInsertion == null )
-      {
-        //only try to affect the DataType if the DefaultItemProperties were set. (will not be the case when XAML parsing DetailDescriptions)
-        if( defaultItemPropertiesCreated )
-        {
-          this.SetOverrideReadOnlyForInsertion( ( description != null ) ? description.OverrideReadOnlyForInsertion : false );
-        }
-      }
-
-      if( ( !string.IsNullOrEmpty( this.ValueXPath ) ) && ( string.IsNullOrEmpty( this.ValuePath ) ) )
-      {
-        this.SetValuePath( "InnerText" );
-      }
-
-      var foreignKeyDescriptionIsNull = ( this.ForeignKeyDescription == null );
-      var foreignKeyDescriptionItemsSourceIsNull = false;
-
-      if( !foreignKeyDescriptionIsNull )
-      {
-        foreignKeyDescriptionItemsSourceIsNull = ( this.ForeignKeyDescription.ItemsSource == null );
-      }
-
-      // Update the ForeignKeyDescription if not set
-      if( foreignKeyDescriptionIsNull || foreignKeyDescriptionItemsSourceIsNull )
-      {
-        if( ( description != null ) && ( description.ForeignKeyDescription != null ) )
-        {
-          if( foreignKeyDescriptionIsNull )
-          {
-            this.SetForeignKeyDescription( description.ForeignKeyDescription );
-          }
-          else
-          {
-            if( foreignKeyDescriptionItemsSourceIsNull )
-            {
-              this.ForeignKeyDescription.ItemsSource = description.ForeignKeyDescription.ItemsSource;
-            }
-          }
-        }
-      }
-    }
-
-    #region Private Fields
-
-    private BindingPathValueExtractor m_bindingPathValueExtractorForRead;
-    private BindingPathValueExtractor m_bindingPathValueExtractorForWrite;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs
deleted file mode 100644
index dff6b4ae..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public abstract partial class DataGridItemPropertyBase
-  {
-    internal class PropertyDescriptorFromItemPropertyBase : EmptyDataItemSafePropertyDescriptor
-    {
-      public PropertyDescriptorFromItemPropertyBase( DataGridItemPropertyBase dataGridItemProperty )
-        : base( dataGridItemProperty.FieldName )
-      {
-        m_dataGridItemProperty = new WeakReference( dataGridItemProperty );
-        m_propertyType = dataGridItemProperty.DataType;
-      }
-
-      public DataGridItemPropertyBase DataGridItemProperty
-      {
-        get
-        {
-          return m_dataGridItemProperty.Target as DataGridItemPropertyBase;
-        }
-      }
-
-      public override string DisplayName
-      {
-        get
-        {
-          DataGridItemPropertyBase dataGridItemProperty = this.DataGridItemProperty;
-
-          if( dataGridItemProperty != null )
-            return dataGridItemProperty.Title;
-
-          return string.Empty;
-        }
-      }
-
-      public override bool IsReadOnly
-      {
-        get
-        {
-          DataGridItemPropertyBase dataGridItemProperty = this.DataGridItemProperty;
-
-          if( dataGridItemProperty == null )
-            return true;
-
-          return ( dataGridItemProperty.OverrideReadOnlyForInsertion ?? false )
-            ? false : dataGridItemProperty.IsReadOnly;
-        }
-      }
-
-      public override Type PropertyType
-      {
-        get
-        {
-          // This value need to not be changed during the life time of the PropertyDescriptor
-          return m_propertyType;
-        }
-      }
-
-      public override object GetValue( object component )
-      {
-        DataGridItemPropertyBase dataGridItemProperty = this.DataGridItemProperty;
-
-        if( dataGridItemProperty == null )
-          return null;
-
-        return dataGridItemProperty.GetValue( base.GetValue( component ) );
-      }
-
-      public override void SetValue( object component, object value )
-      {
-        if( component is EmptyDataItem )
-          throw new InvalidOperationException( "An attempt was made to set a value on an empty data item." );
-
-        DataGridItemPropertyBase dataGridItemProperty = this.DataGridItemProperty;
-
-        if( dataGridItemProperty == null )
-          return;
-
-        dataGridItemProperty.SetValue( component, value );
-      }
-
-      public void RaiseValueChanged( object component )
-      {
-        EventHandler valueChangedHandler = this.GetValueChangedHandler( component );
-
-        if( valueChangedHandler != null )
-        {
-          valueChangedHandler.Invoke( component, EventArgs.Empty );
-        }
-      }
-
-      private WeakReference m_dataGridItemProperty;
-      private Type m_propertyType;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs
deleted file mode 100644
index a2a3707b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs
+++ /dev/null
@@ -1,955 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Threading;
-using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [DebuggerDisplay( "Name = {Name}" )]
-  public abstract partial class DataGridItemPropertyBase : INotifyPropertyChanged, ICloneable
-  {
-    #region Static Fields
-
-    internal static readonly string CalculateDistinctValuesPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.CalculateDistinctValues );
-    internal static readonly string ContainingCollectionPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.ContainingCollection );
-    internal static readonly string ForeignKeyDescriptionPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.ForeignKeyDescription );
-    internal static readonly string GroupSortStatResultPropertyNamePropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.GroupSortStatResultPropertyName );
-    internal static readonly string IsNameSealedPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.IsNameSealed );
-    internal static readonly string IsSealedPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.IsSealed );
-    internal static readonly string ItemPropertiesInternalPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.ItemPropertiesInternal );
-    internal static readonly string MaxDistinctValuesPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.MaxDistinctValues );
-    internal static readonly string SynonymPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyBase i ) => i.Synonym );
-
-    #endregion
-
-    protected DataGridItemPropertyBase()
-    {
-      this.SetIsDisplayable( true );
-      this.IsBrowsable = true;
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "This constructor is obsolete and should no longer be used.", true )]
-    protected DataGridItemPropertyBase( DataGridItemPropertyBase template )
-      : this()
-    {
-      throw new NotSupportedException();
-    }
-
-    protected void Initialize(
-      string name,
-      string title,
-      Type dataType,
-      Nullable<bool> isReadOnly,
-      Nullable<bool> overrideReadOnlyForInsertion,
-      Nullable<bool> isDisplayable,
-      Nullable<bool> isASubRelationship )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "name cannot be null or empty.", "name" );
-
-      m_name = name;
-
-      if( title == null )
-      {
-        m_title = name;
-      }
-      else
-      {
-        m_title = title;
-      }
-
-      if( isReadOnly.HasValue )
-      {
-        this.SetIsReadOnly( isReadOnly.Value );
-      }
-
-      this.SetOverrideReadOnlyForInsertion( overrideReadOnlyForInsertion );
-      m_dataType = dataType;
-
-      if( isDisplayable.HasValue )
-      {
-        this.SetIsDisplayable( isDisplayable.Value );
-      }
-
-      if( isASubRelationship != null )
-      {
-        this.SetIsASubRelationship( isASubRelationship );
-      }
-    }
-
-    #region Name Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public string Name
-    {
-      get
-      {
-        return m_name;
-      }
-      set
-      {
-        if( string.IsNullOrEmpty( value ) )
-          throw new ArgumentException( "Name is null (Nothing in Visual Basic) or empty.", "Name" );
-
-        if( this.IsNameSealed || this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the name of a property already added to a containing collection." );
-
-        m_name = value;
-      }
-    }
-
-    private string m_name;
-
-    #endregion
-
-    #region DataType Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public Type DataType
-    {
-      get
-      {
-        return m_dataType;
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the DataType of a property already added to a containing collection." );
-
-        this.SetDataType( value );
-      }
-    }
-
-    internal void SetDataType( Type dataType )
-    {
-      if( dataType == null )
-        throw new ArgumentNullException( "dataType" );
-
-      m_dataType = dataType;
-    }
-
-    private Type m_dataType;
-
-    #endregion
-
-    #region IsReadOnly Property
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        return m_flags[ DataGridItemPropertyBaseFlags.IsReadOnly ];
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the IsReadOnly property of a DataGridItemProperty already added to a containing collection." );
-
-        this.SetIsReadOnly( value );
-      }
-    }
-
-    internal void SetIsReadOnly( bool isReadOnly )
-    {
-      m_flags[ DataGridItemPropertyBaseFlags.IsReadOnly ] = isReadOnly;
-    }
-
-    #endregion
-
-    #region OverrideReadOnlyForInsertion Property
-
-    public Nullable<bool> OverrideReadOnlyForInsertion
-    {
-      get
-      {
-        if( !m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertionSet ] )
-          return null;
-
-        return m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertion ];
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the OverrideReadOnlyForInsertion property of a DataGridItemProperty already added to a containing collection." );
-
-        this.SetOverrideReadOnlyForInsertion( value );
-      }
-    }
-
-    internal void SetOverrideReadOnlyForInsertion( Nullable<bool> overrideReadOnlyForInsertion )
-    {
-      if( overrideReadOnlyForInsertion.HasValue )
-      {
-        m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertion ] = overrideReadOnlyForInsertion.Value;
-        m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertionSet ] = true;
-      }
-      else
-      {
-        m_flags[ DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertionSet
-               | DataGridItemPropertyBaseFlags.IsOverrideReadOnlyForInsertion ] = false;
-      }
-    }
-
-    #endregion
-
-    #region Title Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public string Title
-    {
-      get
-      {
-        return m_title;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "Title" );
-
-        m_title = value;
-      }
-    }
-
-    private string m_title;
-
-    #endregion
-
-    #region Synonym Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public string Synonym
-    {
-      get
-      {
-        return m_synonym;
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the Synonym of a property already added to a containing collection." );
-
-        this.SetSynonym( value );
-      }
-    }
-
-    internal void SetSynonym( string value )
-    {
-      if( value == m_synonym )
-        return;
-
-      var wasSealed = this.IsSealed;
-      this.IsSealed = false;
-
-      m_synonym = value;
-
-      this.IsSealed = wasSealed;
-      this.OnPropertyChanged( DataGridItemPropertyBase.SynonymPropertyName );
-    }
-
-    private string m_synonym;
-
-    #endregion
-
-    #region SortComparer Property
-
-    public IComparer SortComparer
-    {
-      get
-      {
-        return m_sortComparer;
-      }
-      set
-      {
-        m_sortComparer = value;
-      }
-    }
-
-    private IComparer m_sortComparer;
-
-    #endregion
-
-    #region Converter Property
-
-    public IValueConverter Converter
-    {
-      get
-      {
-        return m_converter;
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the Converter property of a DataGridItemProperty already added to a containing collection." );
-
-        m_converter = value;
-      }
-    }
-
-    internal IValueConverter GetBindingConverter( object sourceItem )
-    {
-      if( !this.IsSealed )
-        throw new InvalidOperationException( "An attempt was made to apply a binding to a DataGridItemProperty that has not be added to the ItemProperties collection." );
-
-      if( m_bindingConverter == null )
-      {
-        if( m_converter != null )
-        {
-          m_bindingConverter = m_converter;
-        }
-        else
-        {
-          m_bindingConverter = new SourceDataConverter( ItemsSourceHelper.IsItemSupportingDBNull( sourceItem ), CultureInfo.InvariantCulture );
-        }
-      }
-
-      return m_bindingConverter;
-    }
-
-    private IValueConverter m_converter;
-    private IValueConverter m_bindingConverter;
-
-    #endregion
-
-    #region ConverterCulture Property
-
-    public CultureInfo ConverterCulture
-    {
-      get
-      {
-        return m_converterCulture;
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the ConverterCulture property of a DataGridItemProperty already added to a containing collection." );
-
-        m_converterCulture = value;
-      }
-    }
-
-    private CultureInfo m_converterCulture;
-
-    #endregion
-
-    #region ConverterParameter Property
-
-    public object ConverterParameter
-    {
-      get
-      {
-        return m_converterParameter;
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the ConverterParameter property of a DataGridItemProperty already added to a containing collection." );
-
-        m_converterParameter = value;
-      }
-    }
-
-    private object m_converterParameter;
-
-    #endregion
-
-    #region CalculateDistinctValues Property
-
-    public bool CalculateDistinctValues
-    {
-      get
-      {
-        // Always activate DistinctValues if not explicitly specified
-        if( !this.IsCalculateDistinctValuesInitialized )
-          return true;
-
-        return m_flags[ DataGridItemPropertyBaseFlags.CalculateDistinctValues ];
-      }
-      set
-      {
-        if( value != m_flags[ DataGridItemPropertyBaseFlags.CalculateDistinctValues ] )
-        {
-          m_flags[ DataGridItemPropertyBaseFlags.CalculateDistinctValues ] = value;
-          this.OnPropertyChanged( DataGridItemPropertyBase.CalculateDistinctValuesPropertyName );
-        }
-
-        this.IsCalculateDistinctValuesInitialized = true;
-      }
-    }
-
-    internal bool IsCalculateDistinctValuesInitialized
-    {
-      get
-      {
-        return m_flags[ DataGridItemPropertyBaseFlags.IsCalculateDistinctValuesInitialized ];
-      }
-      set
-      {
-        m_flags[ DataGridItemPropertyBaseFlags.IsCalculateDistinctValuesInitialized ] = value;
-      }
-    }
-
-    #endregion
-
-    #region MaxDistinctValues Property
-
-    public int MaxDistinctValues
-    {
-      get
-      {
-        return m_maxDistinctValues;
-      }
-      set
-      {
-        if( m_maxDistinctValues != value )
-        {
-          m_maxDistinctValues = value;
-          this.OnPropertyChanged( DataGridItemPropertyBase.MaxDistinctValuesPropertyName );
-        }
-      }
-    }
-
-    private int m_maxDistinctValues = -1; // -1 ==> no maximum
-
-    #endregion
-
-    #region DistinctValuesSortComparer Property
-
-    public IComparer DistinctValuesSortComparer
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region DistinctValuesEqualityComparer Property
-
-    public IEqualityComparer DistinctValuesEqualityComparer
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ForeignKeyDescription Property
-
-    public DataGridForeignKeyDescription ForeignKeyDescription
-    {
-      get
-      {
-        return m_foreignKeyDescription;
-      }
-      set
-      {
-        this.SetForeignKeyDescription( value );
-      }
-    }
-
-    internal void SetForeignKeyDescription( DataGridForeignKeyDescription description )
-    {
-      if( m_foreignKeyDescription != description )
-      {
-        m_foreignKeyDescription = description;
-        this.OnPropertyChanged( DataGridItemPropertyBase.ForeignKeyDescriptionPropertyName );
-      }
-    }
-
-    private DataGridForeignKeyDescription m_foreignKeyDescription; // = null;
-
-    #endregion
-
-    #region GroupSortStatResultPropertyName Property
-
-    public string GroupSortStatResultPropertyName
-    {
-      get
-      {
-        return m_groupSortStatResultPropertyName;
-      }
-      set
-      {
-        if( value == m_groupSortStatResultPropertyName )
-          return;
-
-        m_groupSortStatResultPropertyName = value;
-
-        this.OnPropertyChanged( DataGridItemPropertyBase.GroupSortStatResultPropertyNamePropertyName );
-      }
-    }
-
-    private string m_groupSortStatResultPropertyName;
-
-    #endregion
-
-    #region GroupSortStatResultComparer Property
-
-    public IComparer GroupSortStatResultComparer
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region IsDisplayable Property
-
-    public bool IsDisplayable
-    {
-      get
-      {
-        return m_flags[ DataGridItemPropertyBaseFlags.IsDisplayable ];
-      }
-      set
-      {
-        if( this.IsSealed )
-          throw new InvalidOperationException( "An attempt was made to change the IsDisplayable property of a DataGridItemProperty already added to a containing collection." );
-
-        this.SetIsDisplayable( value );
-      }
-    }
-
-    internal void SetIsDisplayable( bool value )
-    {
-      m_flags[ DataGridItemPropertyBaseFlags.IsDisplayable ] = value;
-    }
-
-    #endregion
-
-    #region ItemProperties Property
-
-    public DataGridItemPropertyCollection ItemProperties
-    {
-      get
-      {
-        if( m_itemProperties == null )
-        {
-          Interlocked.CompareExchange( ref m_itemProperties, new DataGridItemPropertyCollection( this ), null );
-          Debug.Assert( m_itemProperties != null );
-
-          this.OnPropertyChanged( DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
-        }
-
-        return m_itemProperties;
-      }
-    }
-
-    internal DataGridItemPropertyCollection ItemPropertiesInternal
-    {
-      get
-      {
-        return m_itemProperties;
-      }
-    }
-
-    private DataGridItemPropertyCollection m_itemProperties;
-
-    #endregion
-
-    #region FieldName Internal Property
-
-    internal virtual string FieldName
-    {
-      get
-      {
-        return this.Name;
-      }
-    }
-
-    #endregion
-
-    #region IsNameSealed Internal Property
-
-    internal bool IsNameSealed
-    {
-      get
-      {
-        return m_flags[ DataGridItemPropertyBaseFlags.IsNameSealed ];
-      }
-      set
-      {
-        if( value == this.IsNameSealed )
-          return;
-
-        m_flags[ DataGridItemPropertyBaseFlags.IsNameSealed ] = value;
-
-        this.OnPropertyChanged( DataGridItemPropertyBase.IsNameSealedPropertyName );
-      }
-    }
-
-    #endregion
-
-    #region IsSealed Internal Property
-
-    internal bool IsSealed
-    {
-      get
-      {
-        return m_flags[ DataGridItemPropertyBaseFlags.IsSealed ];
-      }
-      set
-      {
-        if( value == this.IsSealed )
-          return;
-
-        m_flags[ DataGridItemPropertyBaseFlags.IsSealed ] = value;
-
-        this.OnPropertyChanged( DataGridItemPropertyBase.IsSealedPropertyName );
-      }
-    }
-
-    #endregion
-
-    #region IsBrowsable Internal Property
-
-    // That property only indicates for the DefaultProperties generated if the property should take place in the real property list by default.
-    internal bool IsBrowsable
-    {
-      get
-      {
-        return m_flags[ DataGridItemPropertyBaseFlags.IsBrowsable ];
-      }
-      set
-      {
-        m_flags[ DataGridItemPropertyBaseFlags.IsBrowsable ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsASubRelationship Internal Property
-
-    internal bool IsASubRelationship
-    {
-      get
-      {
-        if( m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] )
-          return m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ];
-
-        if( m_dataType == null )
-          return false;
-
-        bool isASubRelationship = ItemsSourceHelper.IsASubRelationship( m_dataType );
-
-        if( this.IsSealed )
-        {
-          m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ] = isASubRelationship;
-          m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] = true;
-        }
-
-        return isASubRelationship;
-      }
-    }
-
-    private void SetIsASubRelationship( Nullable<bool> isASubRelationship )
-    {
-      if( isASubRelationship.HasValue )
-      {
-        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationship ] = isASubRelationship.Value;
-        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet ] = true;
-      }
-      else
-      {
-        m_flags[ DataGridItemPropertyBaseFlags.IsASubRelationshipSet
-               | DataGridItemPropertyBaseFlags.IsASubRelationship ] = false;
-      }
-    }
-
-    #endregion
-
-    #region IsSortingOnForeignKeyDescription Internal Property
-
-    internal bool IsSortingOnForeignKeyDescription
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ContainingCollection Internal Property
-
-    internal DataGridItemPropertyCollection ContainingCollection
-    {
-      get
-      {
-        return m_containingCollection;
-      }
-      private set
-      {
-        if( value == m_containingCollection )
-          return;
-
-        if( ( value != null ) && ( m_containingCollection != null ) )
-          throw new InvalidOperationException( "The property is already assigned to a DataGridItemPropertyCollection." );
-
-        m_containingCollection = value;
-
-        this.OnPropertyChanged( DataGridItemPropertyBase.ContainingCollectionPropertyName );
-      }
-    }
-
-    private DataGridItemPropertyCollection m_containingCollection; //null
-
-    #endregion
-
-    #region ValueChanged Internal Event
-
-    internal event EventHandler<ValueChangedEventArgs> ValueChanged;
-
-    private void OnValueChanged( ValueChangedEventArgs e )
-    {
-      var handler = this.ValueChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region DistinctValueSelector Event
-
-    public event EventHandler<QueryDistinctValueEventArgs> QueryDistinctValue
-    {
-      add
-      {
-        m_queryDistinctValue = ( EventHandler<QueryDistinctValueEventArgs> )Delegate.Combine( m_queryDistinctValue, value );
-      }
-      remove
-      {
-        m_queryDistinctValue = ( EventHandler<QueryDistinctValueEventArgs> )Delegate.Remove( m_queryDistinctValue, value );
-      }
-    }
-
-    private EventHandler<QueryDistinctValueEventArgs> m_queryDistinctValue;
-
-    internal object GetDistinctValueFromItem( object dataSourceValue )
-    {
-      if( m_queryDistinctValue == null )
-        return dataSourceValue;
-
-      QueryDistinctValueEventArgs args = new QueryDistinctValueEventArgs( dataSourceValue );
-
-      m_queryDistinctValue( this, args );
-
-      return args.DistinctValue;
-    }
-
-    #endregion
-
-    public object GetValue( object component )
-    {
-      var unboundDataItem = component as UnboundDataItem;
-      if( unboundDataItem != null )
-      {
-        component = unboundDataItem.DataItem;
-      }
-
-      // Since EmptyDataItemSafePropertyDescriptor ensures to return null to avoid Binding exceptions when a CollectionView other
-      // than the DataGridCollectionView is used, we must return null to avoid calling GetValueCore using null as component.
-      if( ( component == null ) || ( component is EmptyDataItem ) )
-        return null;
-
-      return this.GetValueCore( component );
-    }
-
-    public void SetValue( object component, object value )
-    {
-      var unboundDataItem = component as UnboundDataItem;
-      if( unboundDataItem != null )
-      {
-        component = unboundDataItem.DataItem;
-      }
-
-      if( component == null )
-        throw new InvalidOperationException( "An attempt was made to set a value on a null data item." );
-
-      if( component is EmptyDataItem )
-        throw new InvalidOperationException( "An attempt was made to set a value on an empty data item." );
-
-      if( this.IsReadOnly && !this.OverrideReadOnlyForInsertion.GetValueOrDefault( false ) )
-        throw new InvalidOperationException( "An attempt was made to set a read-only property." );
-
-      this.SetValueCore( component, value );
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The ICloneable interface is no longer supported.", true )]
-    public virtual object Clone()
-    {
-      throw new NotSupportedException();
-    }
-
-    protected abstract object GetValueCore( object component );
-
-    protected virtual void SetValueCore( object component, object value )
-    {
-      this.OnValueChanged( new ValueChangedEventArgs( component ) );
-    }
-
-    internal PropertyDescriptorFromItemPropertyBase GetPropertyDescriptorForBinding()
-    {
-      if( m_propertyDescriptorFromItemProperty == null )
-      {
-        m_propertyDescriptorFromItemProperty = this.GetPropertyDescriptorForBindingCore();
-      }
-
-      return m_propertyDescriptorFromItemProperty;
-    }
-
-    internal virtual PropertyDescriptorFromItemPropertyBase GetPropertyDescriptorForBindingCore()
-    {
-      return new PropertyDescriptorFromItemPropertyBase( this );
-    }
-
-    internal virtual void SetUnspecifiedPropertiesValues( PropertyDescription description, Type itemType, bool defaultItemPropertiesCreated )
-    {
-    }
-
-    internal void AttachToContainingCollection( DataGridItemPropertyCollection collection )
-    {
-      if( collection == null )
-        throw new ArgumentNullException( "collection" );
-
-      this.ContainingCollection = collection;
-    }
-
-    internal void DetachFromContainingCollection()
-    {
-      this.ContainingCollection = null;
-    }
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    private PropertyDescriptorFromItemPropertyBase m_propertyDescriptorFromItemProperty;
-    private BitFlags m_flags;
-
-    #region ValueChangedEventArgs Internal Class
-
-    internal class ValueChangedEventArgs : EventArgs
-    {
-      public ValueChangedEventArgs( object component )
-      {
-        this.Component = component;
-      }
-
-      public object Component
-      {
-        get;
-        private set;
-      }
-    }
-
-    #endregion
-
-    #region BitFlags Private Struct
-
-    private struct BitFlags
-    {
-      internal bool this[ DataGridItemPropertyBaseFlags flag ]
-      {
-        get
-        {
-          return ( ( m_data & flag ) == flag );
-        }
-        set
-        {
-          this.CheckIfIsDefined( flag );
-
-          if( value )
-          {
-            m_data |= flag;
-          }
-          else
-          {
-            m_data &= ~flag;
-          }
-        }
-      }
-
-      [Conditional( "DEBUG" )]
-      private void CheckIfIsDefined( DataGridItemPropertyBaseFlags value )
-      {
-        if( Enum.IsDefined( typeof( DataGridItemPropertyBaseFlags ), value ) )
-          return;
-
-        int flags = Convert.ToInt32( value );
-        foreach( var flag in Enum.GetValues( typeof( DataGridItemPropertyBaseFlags ) ) )
-        {
-          int flagValue = Convert.ToInt32( flag );
-          if( ( flags & flagValue ) == flagValue )
-          {
-            flags &= ~flagValue;
-
-            if( flags == 0 )
-              break;
-          }
-        }
-
-        Debug.Assert( flags == 0 );
-      }
-
-      private DataGridItemPropertyBaseFlags m_data;
-    }
-
-    #endregion
-
-    #region DataGridItemPropertyBaseFlags Private Enum
-
-    [Flags]
-    private enum DataGridItemPropertyBaseFlags : ushort
-    {
-      IsReadOnly = 0x0001,
-      IsOverrideReadOnlyForInsertionSet = 0x0002,
-      IsOverrideReadOnlyForInsertion = 0x0004,
-      IsASubRelationshipSet = 0x0008,
-      IsASubRelationship = 0x0010,
-      CalculateDistinctValues = 0x0020,
-      IsCalculateDistinctValuesInitialized = 0x0040,
-      IsNameSealed = 0x0080,
-      IsSealed = 0x0100,
-      IsBrowsable = 0x0200,
-      IsDisplayable = 0x0400,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs
deleted file mode 100644
index 16793294..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs
+++ /dev/null
@@ -1,978 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using Xceed.Utils.Wpf;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [DebuggerDisplay( "Count = {Count}" )]
-  public sealed class DataGridItemPropertyCollection :
-    IList<DataGridItemPropertyBase>,
-    IList,
-    ICollection<DataGridItemPropertyBase>,
-    ICollection,
-    IEnumerable<DataGridItemPropertyBase>,
-    IEnumerable,
-    INotifyCollectionChanged,
-    INotifyPropertyChanged
-  {
-    #region Static Fields
-
-    private static readonly string CountPropertyName = PropertyHelper.GetPropertyName( ( DataGridItemPropertyCollection c ) => c.Count );
-    private static readonly string ItemsPropertyName = "Item[]";
-
-    #endregion
-
-    internal DataGridItemPropertyCollection()
-      : this( null )
-    {
-    }
-
-    internal DataGridItemPropertyCollection( DataGridItemPropertyBase owner )
-    {
-      m_owner = owner;
-    }
-
-    #region [] Property
-
-    public DataGridItemPropertyBase this[ string name ]
-    {
-      get
-      {
-        if( !string.IsNullOrEmpty( name ) )
-        {
-          DataGridItemPropertyBase item;
-          if( m_nameToItem.TryGetValue( name, out item ) )
-            return item;
-        }
-
-        return null;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "value" );
-
-        if( string.IsNullOrEmpty( value.Name ) )
-          throw new ArgumentException( "An attempt was made to add an item that does not have a name.", "value" );
-
-        if( value.Name != name )
-          throw new ArgumentException( "The item's name is not the same as the parameter.", "name" );
-
-        var oldItem = this[ name ];
-        if( oldItem == null )
-        {
-          this.InsertItemAndNotify( m_collection.Count, value );
-        }
-        else
-        {
-          if( value == oldItem )
-            return;
-
-          var index = this.IndexOf( oldItem );
-          Debug.Assert( index >= 0 );
-
-          this.ReplaceItemAndNotify( index, oldItem, value );
-        }
-      }
-    }
-
-    #endregion
-
-    #region DataGridItemPropertyBase Internal Owner
-
-    internal DataGridItemPropertyBase Owner
-    {
-      get
-      {
-        return m_owner;
-      }
-    }
-
-    private readonly DataGridItemPropertyBase m_owner;
-
-    #endregion
-
-    #region SyncRoot Private Property
-
-    private object SyncRoot
-    {
-      get
-      {
-        return ( ( ICollection )this ).SyncRoot;
-      }
-    }
-
-    #endregion
-
-    #region ItemPropertyGroupSortStatNameChanged Internal Event
-
-    internal event EventHandler ItemPropertyGroupSortStatNameChanged;
-
-    private void OnItemPropertyGroupSortStatNameChanged()
-    {
-      var handler = this.ItemPropertyGroupSortStatNameChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    #endregion
-
-    #region InitializeItemProperty Internal Event
-
-    internal event EventHandler<InitializeItemPropertyEventArgs> InitializeItemProperty;
-
-    private void OnInitializeItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      var handler = this.InitializeItemProperty;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new InitializeItemPropertyEventArgs( itemProperty ) );
-    }
-
-    private void RelayInitializeItemProperty( InitializeItemPropertyEventArgs e )
-    {
-      var handler = this.InitializeItemProperty;
-      if( handler == null )
-        return;
-
-      Debug.Assert( e != null );
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    internal IDisposable DeferCollectionChanged()
-    {
-      return new DeferredDisposable( new DeferState( this ) );
-    }
-
-    internal bool Contains( string name )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        return false;
-
-      return m_nameToItem.ContainsKey( name );
-    }
-
-    internal DataGridItemPropertyBase GetForSynonym( string name )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        return null;
-
-      DataGridItemPropertyBase[] synonyms;
-      if( !m_synonymToItem.TryGetValue( name, out synonyms ) )
-        return null;
-
-      Debug.Assert( synonyms.Length > 0 );
-      if( synonyms.Length <= 0 )
-        return null;
-
-      return synonyms[ 0 ];
-    }
-
-    internal void RefreshUnboundItemProperty( object component )
-    {
-      if( m_unboundItems.Count <= 0 || ( component == null ) )
-        return;
-
-      var unboundDataItem = UnboundDataItem.GetUnboundDataItem( component );
-      if( unboundDataItem == null )
-        return;
-
-      var dataItem = unboundDataItem.DataItem;
-      if( ( dataItem == null ) || ( dataItem is EmptyDataItem ) )
-        return;
-
-      State state;
-      if( m_dataItems.TryGetValue( dataItem, out state ) && ( state.Refreshing || state.Suspended ) )
-        return;
-
-      m_dataItems.Add( dataItem, new State( true, false ) );
-
-      try
-      {
-        foreach( var item in m_unboundItems )
-        {
-          item.Refresh( unboundDataItem );
-        }
-      }
-      finally
-      {
-        state = m_dataItems[ dataItem ];
-
-        if( state.Suspended )
-        {
-          m_dataItems[ dataItem ] = new State( false, true );
-        }
-        else
-        {
-          m_dataItems.Remove( dataItem );
-        }
-      }
-    }
-
-    internal void SuspendUnboundItemPropertyChanged( object component )
-    {
-      if( component == null )
-        return;
-
-      var unboundDataItem = UnboundDataItem.GetUnboundDataItem( component );
-      if( unboundDataItem == null )
-        return;
-
-      var dataItem = unboundDataItem.DataItem;
-      if( ( dataItem == null ) || ( dataItem is EmptyDataItem ) )
-        return;
-
-      State state;
-      bool refreshing = false;
-
-      if( m_dataItems.TryGetValue( dataItem, out state ) )
-      {
-        if( state.Suspended )
-          return;
-
-        refreshing = state.Refreshing;
-      }
-
-      m_dataItems[ dataItem ] = new State( refreshing, true );
-    }
-
-    internal void ResumeUnboundItemPropertyChanged( object component )
-    {
-      if( component == null )
-        return;
-
-      var unboundDataItem = UnboundDataItem.GetUnboundDataItem( component );
-      if( unboundDataItem == null )
-        return;
-
-      var dataItem = unboundDataItem.DataItem;
-      if( ( dataItem == null ) || ( dataItem is EmptyDataItem ) )
-        return;
-
-      State state;
-      if( !m_dataItems.TryGetValue( dataItem, out state ) || !state.Suspended )
-      {
-        Debug.Fail( "The item is not suspended." );
-        return;
-      }
-
-      if( state.Refreshing )
-      {
-        m_dataItems[ dataItem ] = new State( true, false );
-      }
-      else
-      {
-        m_dataItems.Remove( dataItem );
-
-        this.RefreshUnboundItemProperty( dataItem );
-      }
-    }
-
-    private static NotifyCollectionChangedEventArgs Combine( NotifyCollectionChangedEventArgs x, NotifyCollectionChangedEventArgs y )
-    {
-      if( x == null )
-        return y;
-
-      if( y == null )
-        return x;
-
-      var addedItems = DataGridItemPropertyCollection.GetAddedItems( x ).ToList();
-      var removedItems = DataGridItemPropertyCollection.GetRemovedItems( x ).ToList();
-
-      foreach( var item in DataGridItemPropertyCollection.GetAddedItems( y ) )
-      {
-        if( !removedItems.Remove( item ) )
-        {
-          Debug.Assert( !addedItems.Contains( item ) );
-          addedItems.Add( item );
-        }
-      }
-
-      foreach( var item in DataGridItemPropertyCollection.GetRemovedItems( y ) )
-      {
-        if( !addedItems.Remove( item ) )
-        {
-          Debug.Assert( !removedItems.Contains( item ) );
-          removedItems.Add( item );
-        }
-      }
-
-      var addedItemsCount = addedItems.Count;
-      var removedItemsCount = removedItems.Count;
-
-      if( ( addedItemsCount > 0 ) && ( removedItemsCount > 0 ) )
-      {
-        if( ( x.Action != NotifyCollectionChangedAction.Replace ) || ( y.Action != NotifyCollectionChangedAction.Replace ) || ( addedItemsCount != removedItemsCount ) )
-          throw new NotSupportedException();
-
-        return new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, addedItems, removedItems );
-      }
-
-      if( addedItemsCount > 0 )
-        return new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, addedItems );
-
-      if( removedItemsCount > 0 )
-        return new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, removedItems );
-
-      return null;
-    }
-
-    private static IEnumerable<DataGridItemPropertyBase> GetAddedItems( NotifyCollectionChangedEventArgs source )
-    {
-      if( ( source != null ) && ( source.NewItems != null ) )
-        return source.NewItems.Cast<DataGridItemPropertyBase>();
-
-      return Enumerable.Empty<DataGridItemPropertyBase>();
-    }
-
-    private static IEnumerable<DataGridItemPropertyBase> GetRemovedItems( NotifyCollectionChangedEventArgs source )
-    {
-      if( ( source != null ) && ( source.OldItems != null ) )
-        return source.OldItems.Cast<DataGridItemPropertyBase>();
-
-      return Enumerable.Empty<DataGridItemPropertyBase>();
-    }
-
-    private void InsertItemAndNotify( int index, DataGridItemPropertyBase item )
-    {
-      this.InsertItem( index, item );
-
-      this.OnPropertyChanged( DataGridItemPropertyCollection.CountPropertyName );
-      this.OnPropertyChanged( DataGridItemPropertyCollection.ItemsPropertyName );
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, item, index ) );
-    }
-
-    private void ReplaceItemAndNotify( int index, DataGridItemPropertyBase oldItem, DataGridItemPropertyBase newItem )
-    {
-      this.RemoveItem( index, oldItem );
-      this.InsertItem( index, newItem );
-
-      this.OnPropertyChanged( DataGridItemPropertyCollection.ItemsPropertyName );
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, newItem, oldItem, index ) );
-    }
-
-    private void RemoveItemAndNotify( int index, DataGridItemPropertyBase item )
-    {
-      this.RemoveItem( index, item );
-
-      this.OnPropertyChanged( DataGridItemPropertyCollection.CountPropertyName );
-      this.OnPropertyChanged( DataGridItemPropertyCollection.ItemsPropertyName );
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, item, index ) );
-    }
-
-    private void InsertItem( int index, DataGridItemPropertyBase item )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index <= m_collection.Count ) );
-      Debug.Assert( item != null );
-      Debug.Assert( !string.IsNullOrEmpty( item.Name ) );
-
-      var name = item.Name;
-      if( m_nameToItem.ContainsKey( name ) )
-        throw new InvalidOperationException( "An item with the same name is already in the collection." );
-
-      if( item.ContainingCollection != null )
-        throw new InvalidOperationException( "The item is already contained in a collection." );
-
-      item.IsNameSealed = true;
-
-      m_collection.Insert( index, item );
-      m_nameToItem.Add( name, item );
-
-      var unboundItem = item as DataGridUnboundItemProperty;
-      if( unboundItem != null )
-      {
-        m_unboundItems.Add( unboundItem );
-      }
-
-      item.AttachToContainingCollection( this );
-
-      this.OnInitializeItemProperty( item );
-      this.RegisterEvents( item );
-
-      item.IsSealed = true;
-    }
-
-    private void RemoveItem( int index, DataGridItemPropertyBase item )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_collection.Count ) );
-      Debug.Assert( item != null );
-      Debug.Assert( object.ReferenceEquals( item, m_collection[ index ] ) );
-
-      this.UnregisterEvents( item );
-
-      m_collection.RemoveAt( index );
-      m_nameToItem.Remove( item.Name );
-
-      var unboundItem = item as DataGridUnboundItemProperty;
-      if( unboundItem != null )
-      {
-        m_unboundItems.Remove( unboundItem );
-      }
-
-      this.RemoveSynonym( item );
-      this.ClearItem( item );
-    }
-
-    private void AddSynonym( DataGridItemPropertyBase item )
-    {
-      Debug.Assert( item != null );
-
-      var synonym = item.Synonym;
-      if( string.IsNullOrEmpty( synonym ) )
-        return;
-
-      DataGridItemPropertyBase[] synonyms;
-      if( m_synonymToItem.TryGetValue( synonym, out synonyms ) )
-      {
-        Array.Resize( ref synonyms, synonyms.Length + 1 );
-      }
-      else
-      {
-        Array.Resize( ref synonyms, 1 );
-      }
-
-      synonyms[ synonyms.Length - 1 ] = item;
-      m_synonymToItem[ synonym ] = synonyms;
-    }
-
-    private void RemoveSynonym( DataGridItemPropertyBase item )
-    {
-      Debug.Assert( item != null );
-
-      var synonym = item.Synonym;
-      if( string.IsNullOrEmpty( synonym ) )
-        return;
-
-      DataGridItemPropertyBase[] synonyms;
-      if( !m_synonymToItem.TryGetValue( synonym, out synonyms ) )
-        return;
-
-      var removeAt = Array.IndexOf( synonyms, item );
-      Debug.Assert( removeAt >= 0 );
-
-      if( removeAt < 0 )
-        return;
-
-      if( synonyms.Length > 1 )
-      {
-        for( int i = removeAt + 1; i < synonyms.Length; i++ )
-        {
-          synonyms[ i - 1 ] = synonyms[ i ];
-        }
-
-        Array.Resize( ref synonyms, synonyms.Length - 1 );
-
-        m_synonymToItem[ synonym ] = synonyms;
-      }
-      else
-      {
-        m_synonymToItem.Remove( synonym );
-      }
-    }
-
-    private void ClearItem( DataGridItemPropertyBase item )
-    {
-      Debug.Assert( item != null );
-
-      item.IsNameSealed = false;
-      item.IsSealed = false;
-      item.DetachFromContainingCollection();
-    }
-
-    private void RegisterEvents( DataGridItemPropertyBase item )
-    {
-      Debug.Assert( item != null );
-
-      item.PropertyChanged += new PropertyChangedEventHandler( this.OnItemPropertyChanged );
-      item.ValueChanged += new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( this.OnItemValueChanged );
-
-      if( item.ItemPropertiesInternal != null )
-      {
-        item.ItemPropertiesInternal.InitializeItemProperty += new EventHandler<InitializeItemPropertyEventArgs>( this.OnItemInitializeItemProperty );
-      }
-    }
-
-    private void UnregisterEvents( DataGridItemPropertyBase item )
-    {
-      Debug.Assert( item != null );
-
-      item.PropertyChanged -= new PropertyChangedEventHandler( this.OnItemPropertyChanged );
-      item.ValueChanged -= new EventHandler<DataGridItemPropertyBase.ValueChangedEventArgs>( this.OnItemValueChanged );
-
-      if( item.ItemPropertiesInternal != null )
-      {
-        item.ItemPropertiesInternal.InitializeItemProperty -= new EventHandler<InitializeItemPropertyEventArgs>( this.OnItemInitializeItemProperty );
-      }
-    }
-
-    private void OnItemPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      var item = ( DataGridItemPropertyBase )sender;
-      var propertyName = e.PropertyName;
-
-      if( string.IsNullOrEmpty( e.PropertyName ) || ( propertyName == DataGridItemPropertyBase.GroupSortStatResultPropertyNamePropertyName ) )
-      {
-        this.OnItemPropertyGroupSortStatNameChanged();
-      }
-
-      if( string.IsNullOrEmpty( e.PropertyName ) || ( propertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
-      {
-        this.OnItemItemPropertiesInternalChanged( ( DataGridItemPropertyBase )sender );
-      }
-
-      if( string.IsNullOrEmpty( e.PropertyName ) || ( propertyName == DataGridItemPropertyBase.IsSealedPropertyName ) )
-      {
-        if( item.IsSealed )
-        {
-          this.AddSynonym( item );
-        }
-        else
-        {
-          this.RemoveSynonym( item );
-        }
-      }
-    }
-
-    private void OnItemValueChanged( object sender, DataGridItemPropertyBase.ValueChangedEventArgs e )
-    {
-      this.RefreshUnboundItemProperty( e.Component );
-    }
-
-    private void OnItemItemPropertiesInternalChanged( DataGridItemPropertyBase itemProperty )
-    {
-      if( ( itemProperty == null ) || ( itemProperty.ItemPropertiesInternal == null ) )
-        return;
-
-      itemProperty.ItemPropertiesInternal.InitializeItemProperty += new EventHandler<InitializeItemPropertyEventArgs>( this.OnItemInitializeItemProperty );
-    }
-
-    private void OnItemInitializeItemProperty( object sender, InitializeItemPropertyEventArgs e )
-    {
-      var itemProperties = sender as DataGridItemPropertyCollection;
-      if( itemProperties == null )
-        return;
-
-      this.RelayInitializeItemProperty( e );
-    }
-
-    #region IList<> Members
-
-    public DataGridItemPropertyBase this[ int index ]
-    {
-      get
-      {
-        if( ( index < 0 ) || ( index >= m_collection.Count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        return m_collection[ index ];
-      }
-      set
-      {
-        if( ( index < 0 ) || ( index > m_collection.Count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        if( value == null )
-          throw new ArgumentNullException( "value" );
-
-        if( string.IsNullOrEmpty( value.Name ) )
-          throw new ArgumentException( "The item must have a non empty name.", "value" );
-
-        if( index < m_collection.Count )
-        {
-          var oldItem = m_collection[ index ];
-          if( value == oldItem )
-            return;
-
-          this.ReplaceItemAndNotify( index, oldItem, value );
-        }
-        else
-        {
-          this.InsertItemAndNotify( index, value );
-        }
-      }
-    }
-
-    public int IndexOf( DataGridItemPropertyBase item )
-    {
-      if( !this.Contains( item ) )
-        return -1;
-
-      return m_collection.IndexOf( item );
-    }
-
-    public void Insert( int index, DataGridItemPropertyBase item )
-    {
-      if( ( index < 0 ) || ( index > m_collection.Count ) )
-        throw new ArgumentOutOfRangeException( "index" );
-
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      if( string.IsNullOrEmpty( item.Name ) )
-        throw new ArgumentException( "The item must have a non empty name.", "item" );
-
-      this.InsertItemAndNotify( index, item );
-    }
-
-    public void RemoveAt( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_collection.Count ) )
-        throw new ArgumentOutOfRangeException( "index" );
-
-      this.RemoveItemAndNotify( index, m_collection[ index ] );
-    }
-
-    #endregion
-
-    #region IList Members
-
-    bool IList.IsFixedSize
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    bool IList.IsReadOnly
-    {
-      get
-      {
-        return ( ( ICollection<DataGridItemPropertyBase> )this ).IsReadOnly;
-      }
-    }
-
-    object IList.this[ int index ]
-    {
-      get
-      {
-        return this[ index ];
-      }
-      set
-      {
-        this[ index ] = ( DataGridItemPropertyBase )value;
-      }
-    }
-
-    int IList.Add( object value )
-    {
-      var item = value as DataGridItemPropertyBase;
-      if( item == null )
-        return -1;
-
-      this.Add( item );
-
-      return m_collection.Count - 1;
-    }
-
-    bool IList.Contains( object value )
-    {
-      return this.Contains( value as DataGridItemPropertyBase );
-    }
-
-    int IList.IndexOf( object value )
-    {
-      var item = value as DataGridItemPropertyBase;
-      if( !this.Contains( item ) )
-        return -1;
-
-      return m_collection.IndexOf( item );
-    }
-
-    void IList.Insert( int index, object value )
-    {
-      this.Insert( index, ( DataGridItemPropertyBase )value );
-    }
-
-    void IList.Remove( object value )
-    {
-      this.Remove( value as DataGridItemPropertyBase );
-    }
-
-    void IList.RemoveAt( int index )
-    {
-      this.RemoveAt( index );
-    }
-
-    #endregion
-
-    #region ICollection<> Members
-
-    bool ICollection<DataGridItemPropertyBase>.IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public void Add( DataGridItemPropertyBase item )
-    {
-      this.Insert( m_collection.Count, item );
-    }
-
-    public void Clear()
-    {
-      if( m_collection.Count == 0 )
-        return;
-
-      var removedItems = m_collection.ToList();
-
-      m_collection.Clear();
-      m_nameToItem.Clear();
-      m_synonymToItem.Clear();
-      m_unboundItems.Clear();
-
-      foreach( var item in removedItems )
-      {
-        this.UnregisterEvents( item );
-        this.ClearItem( item );
-      }
-
-      this.OnPropertyChanged( DataGridItemPropertyCollection.CountPropertyName );
-      this.OnPropertyChanged( DataGridItemPropertyCollection.ItemsPropertyName );
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, removedItems ) );
-    }
-
-    public bool Contains( DataGridItemPropertyBase item )
-    {
-      if( item == null )
-        return false;
-
-      var name = item.Name;
-      if( string.IsNullOrEmpty( name ) )
-        return false;
-
-      DataGridItemPropertyBase stored;
-      if( !m_nameToItem.TryGetValue( name, out stored ) )
-        return false;
-
-      return ( item == stored );
-    }
-
-    void ICollection<DataGridItemPropertyBase>.CopyTo( DataGridItemPropertyBase[] array, int index )
-    {
-      m_collection.CopyTo( array, index );
-    }
-
-    public bool Remove( DataGridItemPropertyBase item )
-    {
-      if( !this.Contains( item ) )
-        return false;
-
-      var index = m_collection.IndexOf( item );
-      Debug.Assert( index >= 0 );
-
-      this.RemoveItemAndNotify( index, item );
-
-      return true;
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    public int Count
-    {
-      get
-      {
-        return m_collection.Count;
-      }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        return ( ( ICollection )m_collection ).SyncRoot;
-      }
-    }
-
-    void ICollection.CopyTo( Array array, int index )
-    {
-      ( ( ICollection )m_collection ).CopyTo( array, index );
-    }
-
-    #endregion
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<DataGridItemPropertyBase> GetEnumerator()
-    {
-      return m_collection.GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    #region INotifyCollectionChanged Members
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    private void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action == NotifyCollectionChangedAction.Reset )
-        throw new NotSupportedException();
-
-      var handler = this.CollectionChanged;
-      if( handler == null )
-        return;
-
-      lock( this.SyncRoot )
-      {
-        if( m_deferCollectionChangedCount != 0 )
-        {
-          m_deferCollectionChangedEventArgs = DataGridItemPropertyCollection.Combine( m_deferCollectionChangedEventArgs, e );
-          return;
-        }
-      }
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    private int m_deferCollectionChangedCount; //0
-    private NotifyCollectionChangedEventArgs m_deferCollectionChangedEventArgs; //null
-
-    private readonly List<DataGridItemPropertyBase> m_collection = new List<DataGridItemPropertyBase>();
-    private readonly Dictionary<string, DataGridItemPropertyBase> m_nameToItem = new Dictionary<string, DataGridItemPropertyBase>();
-    private readonly Dictionary<string, DataGridItemPropertyBase[]> m_synonymToItem = new Dictionary<string, DataGridItemPropertyBase[]>();
-    private readonly HashSet<DataGridUnboundItemProperty> m_unboundItems = new HashSet<DataGridUnboundItemProperty>();
-    private readonly Dictionary<object, State> m_dataItems = new Dictionary<object, State>( 0 );
-
-    #region DeferState Private Class
-
-    private sealed class DeferState : DeferredDisposableState
-    {
-      internal DeferState( DataGridItemPropertyCollection target )
-      {
-        Debug.Assert( target != null );
-        m_target = target;
-      }
-
-      protected override object SyncRoot
-      {
-        get
-        {
-          return m_target.SyncRoot;
-        }
-      }
-
-      protected override bool IsDeferred
-      {
-        get
-        {
-          return ( m_target.m_deferCollectionChangedCount != 0 );
-        }
-      }
-
-      protected override void Increment()
-      {
-        m_target.m_deferCollectionChangedCount++;
-      }
-
-      protected override void Decrement()
-      {
-        m_target.m_deferCollectionChangedCount--;
-      }
-
-      protected override void OnDeferEnding( bool disposing )
-      {
-        m_eventArgs = m_target.m_deferCollectionChangedEventArgs;
-        m_target.m_deferCollectionChangedEventArgs = null;
-
-        base.OnDeferEnding( disposing );
-      }
-
-      protected override void OnDeferEnded( bool disposing )
-      {
-        if( m_eventArgs == null )
-          return;
-
-        m_target.OnCollectionChanged( m_eventArgs );
-      }
-
-      private readonly DataGridItemPropertyCollection m_target;
-      private NotifyCollectionChangedEventArgs m_eventArgs;
-    }
-
-    #endregion
-
-    #region State Private Struct
-
-    private struct State
-    {
-      internal State( bool refreshing, bool suspended )
-      {
-        this.Refreshing = refreshing;
-        this.Suspended = suspended;
-      }
-
-      internal readonly bool Refreshing;
-      internal readonly bool Suspended;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCommittingValue.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCommittingValue.cs
deleted file mode 100644
index 03dfb914..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCommittingValue.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridItemPropertyCommittingValueEventArgs : EventArgs
-  {
-    public DataGridItemPropertyCommittingValueEventArgs( object item, object value )
-    {
-      this.Item = item;
-      this.Value = value;
-    }
-
-    public object Item { get; private set; }
-    public object Value { get; private set; }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyDictionary.cs
deleted file mode 100644
index fe93c0ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyDictionary.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataGridItemPropertyDictionary : Dictionary<DataGridItemPropertyBase, object>
-  {
-    internal DataGridItemPropertyDictionary()
-    {
-    }
-
-    public object this[ string name ]
-    {
-      get
-      {
-        foreach( object item in this.Keys )
-        {
-          DataGridItemPropertyBase dataGridItemProperty = item as DataGridItemPropertyBase;
-          Debug.Assert( dataGridItemProperty != null );
-
-          if( dataGridItemProperty.Name.Equals( name ) )
-            return this[ dataGridItemProperty ];
-        }
-
-        return null;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMap.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMap.cs
deleted file mode 100644
index c6874223..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMap.cs
+++ /dev/null
@@ -1,625 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataGridItemPropertyMap : IWeakEventListener
-  {
-    #region MasterItemProperties Property
-
-    internal DataGridItemPropertyCollection MasterItemProperties
-    {
-      get
-      {
-        return m_masterItemProperties;
-      }
-      set
-      {
-        if( value == m_masterItemProperties )
-          return;
-
-        using( this.DeferMappingChanged() )
-        {
-          this.UnregisterItemProperties( m_masterItemProperties );
-          this.UnmapItemProperties();
-
-          m_masterItemProperties = value;
-
-          this.MapItemProperties();
-          this.RegisterItemProperties( m_masterItemProperties );
-        }
-      }
-    }
-
-    private DataGridItemPropertyCollection m_masterItemProperties;
-
-    #endregion
-
-    #region DetailItemProperties Property
-
-    internal DataGridItemPropertyCollection DetailItemProperties
-    {
-      get
-      {
-        return m_detailItemProperties;
-      }
-      set
-      {
-        if( value == m_detailItemProperties )
-          return;
-
-        using( this.DeferMappingChanged() )
-        {
-          this.UnregisterItemProperties( m_detailItemProperties );
-          this.UnmapItemProperties();
-
-          m_detailItemProperties = value;
-
-          this.MapItemProperties();
-          this.RegisterItemProperties( m_detailItemProperties );
-        }
-      }
-    }
-
-    private DataGridItemPropertyCollection m_detailItemProperties;
-
-    #endregion
-
-    #region IsMapping Property
-
-    internal bool IsMapping
-    {
-      get
-      {
-        return ( m_masterItemProperties != null )
-            && ( m_detailItemProperties != null );
-      }
-    }
-
-    #endregion
-
-    #region MappingChanged Event
-
-    internal event EventHandler MappingChanged;
-
-    private void OnMappingChanged()
-    {
-      if( m_deferRaiseMappingChangedCount != 0 )
-      {
-        m_raiseMappingChanged = true;
-      }
-      else
-      {
-        m_raiseMappingChanged = false;
-
-        var handler = this.MappingChanged;
-        if( handler == null )
-          return;
-
-        handler.Invoke( this, EventArgs.Empty );
-      }
-    }
-
-    #endregion
-
-    internal IDisposable DeferMappingChanged()
-    {
-      return new DeferredDisposable( new DeferMappingChangedEvent( this ) );
-    }
-
-    internal bool TryGetMasterItemProperty( DataGridItemPropertyBase detailItemProperty, out DataGridItemPropertyBase masterItemProperty )
-    {
-      return DataGridItemPropertyMap.TryGetTargetItemProperty( m_detailToMaster, detailItemProperty, out masterItemProperty );
-    }
-
-    internal bool TryGetDetailItemProperty( DataGridItemPropertyBase masterItemProperty, out DataGridItemPropertyBase detailItemProperty )
-    {
-      return DataGridItemPropertyMap.TryGetTargetItemProperty( m_masterToDetail, masterItemProperty, out detailItemProperty );
-    }
-
-    private static bool TryGetTargetItemProperty( Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase> collection, DataGridItemPropertyBase sourceItemProperty, out DataGridItemPropertyBase targetItemProperty )
-    {
-      if( ( collection != null ) && ( sourceItemProperty != null ) && collection.TryGetValue( sourceItemProperty, out targetItemProperty ) )
-        return true;
-
-      targetItemProperty = default( DataGridItemPropertyBase );
-
-      return false;
-    }
-
-    private void RegisterItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      CollectionChangedEventManager.AddListener( itemProperties, this );
-
-      foreach( var itemProperty in itemProperties )
-      {
-        this.RegisterItemProperty( itemProperty );
-      }
-    }
-
-    private void UnregisterItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        this.UnregisterItemProperty( itemProperty );
-      }
-
-      CollectionChangedEventManager.RemoveListener( itemProperties, this );
-    }
-
-    private void RegisterItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      if( !m_listeningToPropertyChanged.Add( itemProperty ) )
-        return;
-
-      PropertyChangedEventManager.AddListener( itemProperty, this, string.Empty );
-      this.RegisterItemProperties( itemProperty.ItemPropertiesInternal );
-    }
-
-    private void UnregisterItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      if( !m_listeningToPropertyChanged.Remove( itemProperty ) )
-        return;
-
-      this.UnregisterItemProperties( itemProperty.ItemPropertiesInternal );
-      PropertyChangedEventManager.RemoveListener( itemProperty, this, string.Empty );
-    }
-
-    private void MapItemProperties()
-    {
-      this.MapItemProperties( m_masterItemProperties, m_detailItemProperties );
-    }
-
-    private void MapItemProperties( DataGridItemPropertyCollection masterItemProperties, DataGridItemPropertyCollection detailItemProperties )
-    {
-      if( ( masterItemProperties == null ) || ( masterItemProperties.Count <= 0 ) )
-        return;
-
-      foreach( var masterItemProperty in masterItemProperties )
-      {
-        this.MapMasterItemProperty( masterItemProperty );
-      }
-    }
-
-    private void MapItemProperties( DataGridItemPropertyBase masterItemProperty, DataGridItemPropertyBase detailItemProperty )
-    {
-      if( ( masterItemProperty == null ) || ( detailItemProperty == null ) )
-        return;
-
-      DataGridItemPropertyBase mappedItemProperty;
-      if( m_masterToDetail.TryGetValue( masterItemProperty, out mappedItemProperty ) )
-      {
-        if( mappedItemProperty == detailItemProperty )
-          return;
-
-        this.UnmapMasterItemProperty( masterItemProperty );
-      }
-
-      this.UnmapDetailItemProperty( detailItemProperty );
-
-      m_masterToDetail[ masterItemProperty ] = detailItemProperty;
-      m_detailToMaster[ detailItemProperty ] = masterItemProperty;
-
-      this.OnMappingChanged();
-      this.MapItemProperties( masterItemProperty.ItemPropertiesInternal, detailItemProperty.ItemPropertiesInternal );
-    }
-
-    private void MapMasterItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      var collection = itemProperty.ContainingCollection;
-      if( collection == null )
-        return;
-
-      DataGridItemPropertyCollection mappedItemProperties;
-      DataGridItemPropertyBase mappedItemProperty;
-
-      var owner = collection.Owner;
-      if( owner == null )
-      {
-        Debug.Assert( collection == m_masterItemProperties );
-        if( collection != m_masterItemProperties )
-          return;
-
-        mappedItemProperties = m_detailItemProperties;
-      }
-      else
-      {
-        if( !m_masterToDetail.TryGetValue( owner, out mappedItemProperty ) )
-          return;
-
-        mappedItemProperties = mappedItemProperty.ItemPropertiesInternal;
-      }
-
-      if( mappedItemProperties == null )
-        return;
-
-      mappedItemProperty = mappedItemProperties.GetForSynonym( itemProperty.Name );
-
-      if( mappedItemProperty != null )
-      {
-        this.MapItemProperties( itemProperty, mappedItemProperty );
-      }
-      else
-      {
-        this.UnmapMasterItemProperty( itemProperty );
-      }
-    }
-
-    private void MapDetailItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      var collection = itemProperty.ContainingCollection;
-      if( collection == null )
-        return;
-
-      DataGridItemPropertyCollection mappedItemProperties;
-      DataGridItemPropertyBase mappedItemProperty;
-
-      var owner = collection.Owner;
-      if( owner == null )
-      {
-        Debug.Assert( collection == m_detailItemProperties );
-        if( collection != m_detailItemProperties )
-          return;
-
-        mappedItemProperties = m_masterItemProperties;
-      }
-      else
-      {
-        if( !m_detailToMaster.TryGetValue( owner, out mappedItemProperty ) )
-          return;
-
-        mappedItemProperties = mappedItemProperty.ItemPropertiesInternal;
-      }
-
-      if( mappedItemProperties == null )
-        return;
-
-      mappedItemProperty = ( !string.IsNullOrEmpty( itemProperty.Synonym ) ) ? mappedItemProperties[ itemProperty.Synonym ] : null;
-
-      if( mappedItemProperty != null )
-      {
-        this.MapItemProperties( mappedItemProperty, itemProperty );
-      }
-      else
-      {
-        this.UnmapDetailItemProperty( itemProperty );
-      }
-    }
-
-    private void UnmapItemProperties()
-    {
-      if( ( m_masterItemProperties == null ) || ( m_detailItemProperties == null ) )
-        return;
-
-      while( m_masterToDetail.Count > 0 )
-      {
-        var entry = m_masterToDetail.First();
-
-        this.UnmapItemProperties( entry.Key, entry.Value, false );
-      }
-
-      Debug.Assert( m_masterToDetail.Count == 0 );
-      Debug.Assert( m_detailToMaster.Count == 0 );
-
-      while( m_detailToMaster.Count > 0 )
-      {
-        var entry = m_detailToMaster.First();
-
-        this.UnmapItemProperties( entry.Value, entry.Key, false );
-      }
-
-      m_masterToDetail.Clear();
-      m_detailToMaster.Clear();
-    }
-
-    private void UnmapItemProperties( DataGridItemPropertyBase masterItemProperty, DataGridItemPropertyBase detailItemProperty, bool recursive )
-    {
-      if( ( masterItemProperty == null ) || ( detailItemProperty == null ) )
-        return;
-
-      DataGridItemPropertyBase mappedItemProperty;
-      if( !m_masterToDetail.TryGetValue( masterItemProperty, out mappedItemProperty ) || ( mappedItemProperty != detailItemProperty ) )
-        throw new InvalidOperationException();
-
-      if( !m_detailToMaster.TryGetValue( detailItemProperty, out mappedItemProperty ) || ( mappedItemProperty != masterItemProperty ) )
-        throw new InvalidOperationException();
-
-      m_masterToDetail.Remove( masterItemProperty );
-      m_detailToMaster.Remove( detailItemProperty );
-
-      this.OnMappingChanged();
-
-      if( recursive )
-      {
-        this.UnmapMasterItemProperties( masterItemProperty.ItemPropertiesInternal );
-        this.UnmapDetailItemProperties( detailItemProperty.ItemPropertiesInternal );
-      }
-    }
-
-    private void UnmapMasterItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        this.UnmapMasterItemProperty( itemProperty );
-      }
-    }
-
-    private void UnmapDetailItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        this.UnmapDetailItemProperty( itemProperty );
-      }
-    }
-
-    private void UnmapMasterItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      DataGridItemPropertyBase mappedItemProperty;
-      if( !m_masterToDetail.TryGetValue( itemProperty, out mappedItemProperty ) )
-        return;
-
-      Debug.Assert( mappedItemProperty != null );
-
-      this.UnmapItemProperties( itemProperty, mappedItemProperty, true );
-    }
-
-    private void UnmapDetailItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      DataGridItemPropertyBase mappedItemProperty;
-      if( !m_detailToMaster.TryGetValue( itemProperty, out mappedItemProperty ) )
-        return;
-
-      Debug.Assert( mappedItemProperty != null );
-
-      this.UnmapItemProperties( mappedItemProperty, itemProperty, true );
-    }
-
-    private void OnItemPropertyCollectionChanged( DataGridItemPropertyCollection collection, NotifyCollectionChangedEventArgs e )
-    {
-      var rootCollection = ItemsSourceHelper.GetRootCollection( collection );
-      if( rootCollection == null )
-        return;
-
-      if( rootCollection == m_masterItemProperties )
-      {
-        if( e.Action == NotifyCollectionChangedAction.Reset )
-          throw new NotSupportedException();
-
-        if( e.Action == NotifyCollectionChangedAction.Move )
-          return;
-
-        using( this.DeferMappingChanged() )
-        {
-          if( e.OldItems != null )
-          {
-            foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
-            {
-              this.UnregisterItemProperty( itemProperty );
-              this.UnmapMasterItemProperty( itemProperty );
-            }
-          }
-
-          if( e.NewItems != null )
-          {
-            foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
-            {
-              this.RegisterItemProperty( itemProperty );
-              this.MapMasterItemProperty( itemProperty );
-            }
-          }
-        }
-      }
-      else if( rootCollection == m_detailItemProperties )
-      {
-        if( e.Action == NotifyCollectionChangedAction.Reset )
-          throw new NotSupportedException();
-
-        if( e.Action == NotifyCollectionChangedAction.Move )
-          return;
-
-        using( this.DeferMappingChanged() )
-        {
-          if( e.OldItems != null )
-          {
-            foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
-            {
-              this.UnregisterItemProperty( itemProperty );
-              this.UnmapDetailItemProperty( itemProperty );
-            }
-          }
-
-          if( e.NewItems != null )
-          {
-            foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
-            {
-              this.RegisterItemProperty( itemProperty );
-              this.MapDetailItemProperty( itemProperty );
-            }
-          }
-        }
-      }
-      else
-      {
-        Debug.Fail( "The collection should have been either for the master or the detail item properties." );
-        CollectionChangedEventManager.RemoveListener( collection, this );
-      }
-    }
-
-    private void OnItemPropertyPropertyChanged( DataGridItemPropertyBase itemProperty, PropertyChangedEventArgs e )
-    {
-      var rootCollection = ItemsSourceHelper.GetRootCollection( itemProperty );
-      if( rootCollection == null )
-        return;
-
-      using( this.DeferMappingChanged() )
-      {
-        if( string.IsNullOrEmpty( e.PropertyName ) || ( e.PropertyName == DataGridItemPropertyBase.SynonymPropertyName ) )
-        {
-          if( rootCollection == m_detailItemProperties )
-          {
-            this.MapDetailItemProperty( itemProperty );
-          }
-        }
-
-        if( string.IsNullOrEmpty( e.PropertyName ) || ( e.PropertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
-        {
-          var itemProperties = itemProperty.ItemPropertiesInternal;
-          if( itemProperties != null )
-          {
-            this.UnregisterItemProperties( itemProperties );
-            this.RegisterItemProperties( itemProperties );
-
-            if( rootCollection == m_masterItemProperties )
-            {
-              foreach( var childItemProperty in itemProperties )
-              {
-                this.MapMasterItemProperty( childItemProperty );
-              }
-            }
-            else if( rootCollection == m_detailItemProperties )
-            {
-              foreach( var childItemProperty in itemProperties )
-              {
-                this.MapDetailItemProperty( childItemProperty );
-              }
-            }
-          }
-        }
-      }
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.OnItemPropertyCollectionChanged( ( DataGridItemPropertyCollection )sender, ( NotifyCollectionChangedEventArgs )e );
-      }
-      else if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        this.OnItemPropertyPropertyChanged( ( DataGridItemPropertyBase )sender, ( PropertyChangedEventArgs )e );
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private readonly Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase> m_masterToDetail = new Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase>();
-    private readonly Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase> m_detailToMaster = new Dictionary<DataGridItemPropertyBase, DataGridItemPropertyBase>();
-    private readonly HashSet<DataGridItemPropertyBase> m_listeningToPropertyChanged = new HashSet<DataGridItemPropertyBase>();
-    private int m_deferRaiseMappingChangedCount;
-    private bool m_raiseMappingChanged; //false
-
-    #region DeferMappingChangedEvent Private Class
-
-    private sealed class DeferMappingChangedEvent : DeferredDisposableState
-    {
-      internal DeferMappingChangedEvent( DataGridItemPropertyMap target )
-      {
-        if( target == null )
-          throw new ArgumentNullException( "target" );
-
-        m_target = target;
-      }
-
-      protected override object SyncRoot
-      {
-        get
-        {
-          return m_target.m_listeningToPropertyChanged;
-        }
-      }
-
-      protected override bool IsDeferred
-      {
-        get
-        {
-          return ( m_target.m_deferRaiseMappingChangedCount != 0 );
-        }
-      }
-
-      protected override void Increment()
-      {
-        m_target.m_deferRaiseMappingChangedCount++;
-      }
-
-      protected override void Decrement()
-      {
-        m_target.m_deferRaiseMappingChangedCount--;
-      }
-
-      protected override void OnDeferEnded( bool disposing )
-      {
-        if( !disposing )
-          return;
-
-        if( m_target.m_raiseMappingChanged )
-        {
-          m_target.OnMappingChanged();
-        }
-      }
-
-      private readonly DataGridItemPropertyMap m_target;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMapHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMapHelper.cs
deleted file mode 100644
index 1a6e4563..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyMapHelper.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  internal static class DataGridItemPropertyMapHelper
-  {
-    internal static bool TryGetMasterColumnName( DataGridItemPropertyMap itemPropertyMap, string detailColumnName, out string masterColumnName )
-    {
-      masterColumnName = default( string );
-
-      if( itemPropertyMap == null )
-        return false;
-
-      var detailItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( itemPropertyMap.DetailItemProperties, detailColumnName );
-      if( detailItemProperty == null )
-        return false;
-
-      DataGridItemPropertyBase masterItemProperty;
-      if( !itemPropertyMap.TryGetMasterItemProperty( detailItemProperty, out masterItemProperty ) )
-        return false;
-
-      masterColumnName = PropertyRouteParser.Parse( masterItemProperty );
-
-      return !string.IsNullOrEmpty( masterColumnName );
-    }
-
-    internal static bool TryGetDetailColumnName( DataGridItemPropertyMap itemPropertyMap, string masterColumnName, out string detailColumnName )
-    {
-      detailColumnName = default( string );
-
-      if( itemPropertyMap == null )
-        return false;
-
-      var masterItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( itemPropertyMap.MasterItemProperties, masterColumnName );
-      if( masterItemProperty == null )
-        return false;
-
-      DataGridItemPropertyBase detailItemProperty;
-      if( !itemPropertyMap.TryGetDetailItemProperty( masterItemProperty, out detailItemProperty ) )
-        return false;
-
-      detailColumnName = PropertyRouteParser.Parse( detailItemProperty );
-
-      return !string.IsNullOrEmpty( detailColumnName );
-    }
-
-    internal static bool TryGetMasterColumn( DataGridContext detailContext, ColumnBase detailColumn, out ColumnBase masterColumn )
-    {
-      if( detailContext != null )
-      {
-        var masterContext = detailContext.RootDataGridContext;
-        if( masterContext != null )
-          return DataGridItemPropertyMapHelper.TryGetMasterColumn( detailContext.ItemPropertyMap, masterContext.Columns, detailColumn, out masterColumn );
-      }
-
-      masterColumn = default( ColumnBase );
-
-      return false;
-    }
-
-    internal static bool TryGetDetailColumn( DataGridContext detailContext, ColumnBase masterColumn, out ColumnBase detailColumn )
-    {
-      if( detailContext != null )
-        return DataGridItemPropertyMapHelper.TryGetDetailColumn( detailContext.ItemPropertyMap, detailContext.Columns, masterColumn, out detailColumn );
-
-      detailColumn = default( ColumnBase );
-
-      return false;
-    }
-
-    internal static bool TryGetMasterColumn( DataGridItemPropertyMap itemPropertyMap, ColumnCollection masterColumns, ColumnBase detailColumn, out ColumnBase masterColumn )
-    {
-      masterColumn = default( ColumnBase );
-
-      if( ( masterColumns == null ) || ( detailColumn == null ) )
-        return false;
-
-      string masterColumnName;
-      if( !DataGridItemPropertyMapHelper.TryGetMasterColumnName( itemPropertyMap, detailColumn.FieldName, out masterColumnName ) )
-        return false;
-
-      masterColumn = masterColumns[ masterColumnName ];
-
-      return ( masterColumn != null );
-    }
-
-    internal static bool TryGetDetailColumn( DataGridItemPropertyMap itemPropertyMap, ColumnCollection detailColumns, ColumnBase masterColumn, out ColumnBase detailColumn )
-    {
-      detailColumn = default( ColumnBase );
-
-      if( ( detailColumns == null ) || ( masterColumn == null ) )
-        return false;
-
-      string detailColumnName;
-      if( !DataGridItemPropertyMapHelper.TryGetDetailColumnName( itemPropertyMap, masterColumn.FieldName, out detailColumnName ) )
-        return false;
-
-      detailColumn = detailColumns[ detailColumnName ];
-
-      return ( detailColumn != null );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyQueryValueEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyQueryValueEvent.cs
deleted file mode 100644
index bdd409c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyQueryValueEvent.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridItemPropertyQueryValueEventArgs : EventArgs
-  {
-    public DataGridItemPropertyQueryValueEventArgs( object item )
-    {
-      this.Item = item;
-    }
-
-    public object Item { get; private set; }
-    public object Value { get; set; }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyRoute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyRoute.cs
deleted file mode 100644
index 1e094a81..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyRoute.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataGridItemPropertyRoute
-  {
-    private DataGridItemPropertyRoute( DataGridItemPropertyBase itemProperty )
-      : this( itemProperty, null )
-    {
-    }
-
-    private DataGridItemPropertyRoute( DataGridItemPropertyBase itemProperty, DataGridItemPropertyRoute parent )
-    {
-      Debug.Assert( itemProperty != null );
-
-      m_itemProperty = itemProperty;
-      m_parent = parent;
-    }
-
-    #region Current Property
-
-    internal DataGridItemPropertyBase Current
-    {
-      get
-      {
-        return m_itemProperty;
-      }
-    }
-
-    private readonly DataGridItemPropertyBase m_itemProperty;
-
-    #endregion
-
-    #region Parent Property
-
-    internal DataGridItemPropertyRoute Parent
-    {
-      get
-      {
-        return m_parent;
-      }
-    }
-
-    private readonly DataGridItemPropertyRoute m_parent;
-
-    #endregion
-
-    internal static DataGridItemPropertyRoute Create( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return null;
-
-      var collection = itemProperty.ContainingCollection;
-      if( collection == null )
-        return new DataGridItemPropertyRoute( itemProperty );
-
-      return new DataGridItemPropertyRoute(
-                   itemProperty,
-                   DataGridItemPropertyRoute.Create( collection.Owner ) );
-    }
-
-    internal static DataGridItemPropertyRoute Combine( DataGridItemPropertyBase itemProperty, DataGridItemPropertyRoute ancestors )
-    {
-      if( itemProperty == null )
-        return ancestors;
-
-      if( ancestors == null )
-        return DataGridItemPropertyRoute.Create( itemProperty );
-
-      var collection = itemProperty.ContainingCollection;
-      if( collection == null )
-        throw new InvalidOperationException();
-
-      if( collection.Owner != ancestors.Current )
-        throw new InvalidOperationException();
-
-      return new DataGridItemPropertyRoute( itemProperty, ancestors );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemRemovedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemRemovedEvent.cs
deleted file mode 100644
index a764a261..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemRemovedEvent.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridItemRemovedEventArgs : DataGridItemEventArgs
-  {
-    public DataGridItemRemovedEventArgs( DataGridCollectionViewBase collectionView, object item, int index )
-      : base( collectionView, item )
-    {
-      m_index = index;
-    }
-
-    #region Index Property
-
-    public int Index
-    {
-      get { return m_index; }
-    }
-
-    private int m_index;
-
-    #endregion Index Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs
deleted file mode 100644
index 4505d0ec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridLINQPageManager : DataGridPageManagerBase
-  {
-    public DataGridLINQPageManager( DataGridVirtualizingQueryableCollectionView collectionView, object syncRoot, bool supportsPrimaryKeyOptimizations )
-      : base( collectionView )
-    {
-      m_supportsPrimaryKeyOptimizations = supportsPrimaryKeyOptimizations;
-      m_syncRoot = syncRoot;
-    }
-
-    protected override void DisposeCore()
-    {
-      m_syncRoot = null;
-      base.DisposeCore();
-    }
-
-    protected override int OnQueryItemCountCore( VirtualList virtualList )
-    {
-      if( !this.IsConnected )
-        return 0;
-
-      DataGridVirtualizingQueryableCollectionViewGroup collectionViewGroup =
-        this.GetLinkedCollectionViewGroup( virtualList ) as DataGridVirtualizingQueryableCollectionViewGroup;
-
-      Debug.Assert( collectionViewGroup != null );
-
-      return collectionViewGroup.QueryItemCount();
-    }
-
-    protected internal override void OnQueryItems( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-      base.OnQueryItems( page, queryInfo );
-
-      DataGridVirtualizingQueryableCollectionViewGroup collectionViewGroup =
-        this.GetLinkedCollectionViewGroup( page.ParentVirtualList ) as DataGridVirtualizingQueryableCollectionViewGroup;
-
-      IQueryable queryableToUse;
-
-      int virtualItemCount = collectionViewGroup.VirtualItemCount;
-
-      bool queryableIsReversed;
-
-      if( ( !m_supportsPrimaryKeyOptimizations ) || ( queryInfo.StartIndex < ( virtualItemCount / 2 ) ) )
-      {
-        queryableIsReversed = false;
-        queryableToUse = collectionViewGroup.Queryable.Slice( queryInfo.StartIndex, queryInfo.RequestedItemCount );
-      }
-      else
-      {
-        queryableIsReversed = true;
-
-        int reversedStartIndex = virtualItemCount - ( queryInfo.StartIndex + queryInfo.RequestedItemCount );
-
-        queryableToUse = collectionViewGroup.ReversedQueryable.Slice( reversedStartIndex, queryInfo.RequestedItemCount );
-      }
-
-      System.Threading.ThreadPool.QueueUserWorkItem( new System.Threading.WaitCallback( this.AsyncGatherItems ), new object[] { queryInfo, queryableToUse, queryableIsReversed } );
-    }
-
-    protected internal override void OnQueryItemsCompleted( VirtualPage page, AsyncQueryInfo queryInfo, object[] fetchedItems )
-    {
-      DataGridVirtualizingQueryableCollectionView collectionView = this.CollectionView as DataGridVirtualizingQueryableCollectionView;
-
-      // The VirtualPageManager was Disposed
-      if( collectionView == null )
-        return;
-
-      using( collectionView.DeferRefresh() )
-      {
-        base.OnQueryItemsCompleted( page, queryInfo, fetchedItems );
-      }
-    }
-
-    private void AsyncGatherItems( object workItem )
-    {
-      object[] parameters = ( object[] )workItem;
-
-      AsyncQueryInfo queryInfo = parameters[ 0 ] as AsyncQueryInfo;
-
-      if( queryInfo.ShouldAbort )
-        return;
-
-      IQueryable queryable = ( IQueryable )parameters[ 1 ];
-      int requestedItemCount = queryInfo.RequestedItemCount;
-      object[] items = new object[ requestedItemCount ];
-
-      System.Collections.IEnumerator enumerator;
-
-      lock( m_syncRoot )
-      {
-        // We reverify here since a reset could have been issued while we were waiting on the lock statement.
-        if( ( queryInfo.ShouldAbort ) || ( !this.IsConnected ) || ( this.IsDisposed ) )
-          return;
-
-        try
-        {
-          Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Beginning Provider Execute for page at start index: " + queryInfo.StartIndex.ToString() );
-
-          enumerator = queryable.GetEnumerator();
-
-          Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Ended Provider Execute for page at start index: " + queryInfo.StartIndex.ToString() );
-
-          int i = 0;
-
-          while( enumerator.MoveNext() && ( i < requestedItemCount ) )
-          {
-            object current = enumerator.Current;
-
-            if( current != null )
-            {
-              items[ i ] = enumerator.Current;
-              i++;
-            }
-          }
-        }
-        catch( Exception exception )
-        {
-          // TimeOut exeception or other.
-          queryInfo.AbortQuery();
-          queryInfo.Error = exception.Message;
-          return;
-        }
-      }
-
-      items = items.Where( item => item != null ).ToArray();
-
-      try
-      {
-        if( items.Count() != requestedItemCount )
-          throw new InvalidOperationException( "The number of non-null items returned by the source must be equal to the provided item count." );
-      }
-      catch
-      {
-        //go silently here, in case the next sequance give a valid result.  At the same time, if it does not, the dev has information when debugging.
-      }
-
-      bool queryableWasReversed = ( bool )parameters[ 2 ];
-
-      if( queryableWasReversed )
-        Array.Reverse( items );
-
-      queryInfo.EndQuery( items );
-    }
-
-    private object m_syncRoot;
-    private bool m_supportsPrimaryKeyOptimizations;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManager.cs
deleted file mode 100644
index d5e1e0ea..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManager.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridPageManager : DataGridPageManagerBase
-  {
-    #region CONSTRUCTORS
-
-    public DataGridPageManager( DataGridVirtualizingCollectionView collectionView )
-      : base( collectionView )
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region DATA VIRTUALIZATION
-
-    protected override int OnQueryItemCountCore( VirtualList virtualList )
-    {
-      if( !this.IsConnected )
-        return 0;
-
-      DataGridVirtualizingCollectionView collectionView = this.CollectionView as DataGridVirtualizingCollectionView;
-
-      // The VirtualPageManager was Disposed
-      if( collectionView == null )
-        return 0;
-
-      DataGridVirtualizingCollectionViewGroup collectionViewGroup = this.GetLinkedCollectionViewGroup( virtualList ) as DataGridVirtualizingCollectionViewGroup;
-      Debug.Assert( ( collectionViewGroup != null ) && ( collectionView != null ) );
-
-      return collectionView.OnQueryItemCount( collectionViewGroup );
-    }
-
-    protected internal override void OnQueryItems( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-      base.OnQueryItems( page, queryInfo );
-
-      DataGridVirtualizingCollectionView collectionView = this.CollectionView as DataGridVirtualizingCollectionView;
-
-      // The VirtualPageManager was Disposed
-      if( collectionView == null )
-        return;
-
-      DataGridVirtualizingCollectionViewGroup collectionViewGroup = this.GetLinkedCollectionViewGroup( page.ParentVirtualList ) as DataGridVirtualizingCollectionViewGroup;
-
-      Debug.Assert( ( collectionViewGroup != null ) && ( collectionView != null ) );
-
-      collectionView.OnQueryItems( queryInfo, collectionViewGroup );
-    }
-
-    protected internal override void OnAbortQueryItems( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-      DataGridVirtualizingCollectionView collectionView = this.CollectionView as DataGridVirtualizingCollectionView;
-
-      // The VirtualPageManager was Disposed
-      if( collectionView == null )
-        return;
-
-      DataGridVirtualizingCollectionViewGroup collectionViewGroup = this.GetLinkedCollectionViewGroup( page.ParentVirtualList ) as DataGridVirtualizingCollectionViewGroup;
-
-      collectionView.OnAbortQueryItems( queryInfo, collectionViewGroup );
-
-      base.OnAbortQueryItems( page, queryInfo );
-    }
-
-    protected internal override void OnQueryItemsCompleted( VirtualPage page, AsyncQueryInfo queryInfo, object[] fetchedItems )
-    {
-      DataGridVirtualizingCollectionView collectionView = this.CollectionView as DataGridVirtualizingCollectionView;
-
-      // The VirtualPageManager was Disposed
-      if( collectionView == null )
-        return;
-
-      using( collectionView.DeferRefresh() )
-      {
-        base.OnQueryItemsCompleted( page, queryInfo, fetchedItems );
-      }
-    }
-
-    #endregion DATA VIRTUALIZATION
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManagerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManagerBase.cs
deleted file mode 100644
index c00a84ab..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManagerBase.cs
+++ /dev/null
@@ -1,584 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Collections;
-using System.Windows.Threading;
-using System.Collections.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class DataGridPageManagerBase : VirtualPageManager, IEnumerable<object>, IEnumerable
-  {
-    #region STATIC MEMBERS
-
-    private static AsyncQueryInfoWeakComparer QueryInfoWeakComparer = new AsyncQueryInfoWeakComparer();
-
-    #endregion STATIC MEMBERS
-
-    public DataGridPageManagerBase( DataGridVirtualizingCollectionViewBase collectionView )
-      : base( collectionView.Dispatcher, collectionView.PageSize, collectionView.MaxRealizedItemCount, collectionView.PreemptivePageQueryRatio )
-    {
-      m_collectionView = collectionView;
-      m_virtualListVSCollectionViewGroupDictionary = new Dictionary<VirtualList, DataGridVirtualizingCollectionViewGroupBase>();
-    }
-
-    #region CollectionView Property
-
-    public DataGridVirtualizingCollectionViewBase CollectionView
-    {
-      get
-      {
-        return m_collectionView;
-      }
-    }
-
-    #endregion CollectionView Property
-
-    #region PUBLIC METHODS
-
-    public DataGridVirtualizingCollectionViewGroupBase GetLinkedCollectionViewGroup( VirtualList virtualItemList )
-    {
-      DataGridVirtualizingCollectionViewGroupBase collectionViewGroup;
-
-      m_virtualListVSCollectionViewGroupDictionary.TryGetValue( virtualItemList, out collectionViewGroup );
-
-      return collectionViewGroup;
-    }
-
-    public int GetGlobalIndexOf( object item )
-    {
-      ReadOnlyCollection<VirtualList> virtualItemLists = this.ManagedLists;
-      int virtualItemListsCount = virtualItemLists.Count;
-
-      for( int i = 0; i < virtualItemListsCount; i++ )
-      {
-        VirtualList localList = virtualItemLists[ i ];
-        int localIndex = localList.IndexOf( item );
-
-        if( localIndex >= 0 )
-        {
-          Debug.Assert( m_virtualListVSCollectionViewGroupDictionary.ContainsKey( localList ) );
-
-          DataGridVirtualizingCollectionViewGroupBase dgvcvg = m_virtualListVSCollectionViewGroupDictionary[ localList ];
-
-          return localIndex + dgvcvg.StartGlobalIndex;
-        }
-      }
-
-      return -1;
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region PROTECTED METHODS
-
-    protected internal override void OnBuiltInAbort( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-      // When a built-in abort occurs, we ensure to remove
-      // any AsyncQueryInfo from references since the ConnectionState
-      // use this array to update its actual state
-      m_asyncQueryInfosInProgress.Remove( queryInfo );
-
-      // In case the page query was aborted when
-      // VirtualPageManager.CleanUpUnused is called
-      if( page.RemoveAfterOperation )
-        this.RemovePage( page );
-
-      this.UpdateConnectionState();
-    }
-
-    protected internal override void OnQueryItems( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-      // The VirtualPageManager is not connected to the CollectionView anymore,
-      // do NOT query items since it will be done by the new VirtualPageManager
-      // assigned to the same CollectionView
-      if( !this.IsConnected )
-        return;
-
-      Debug.Assert( !m_asyncQueryInfosInProgress.Contains( queryInfo ) );
-      m_asyncQueryInfosInProgress.Add( queryInfo );
-
-      if( m_asyncQueryInfosInError != null )
-      {
-        LinkedListNode<AsyncQueryInfo> queryInfoInErrorNode = m_asyncQueryInfosInError.First;
-
-        while( queryInfoInErrorNode != null )
-        {
-          if( DataGridPageManagerBase.QueryInfoWeakComparer.Equals( queryInfo, queryInfoInErrorNode.Value ) )
-          {
-            m_asyncQueryInfosInError.Remove( queryInfoInErrorNode );
-            break;
-          }
-
-          queryInfoInErrorNode = queryInfoInErrorNode.Next;
-        }
-
-        if( m_asyncQueryInfosInError.Count == 0 )
-          m_asyncQueryInfosInError = null;
-      }
-
-      this.UpdateConnectionState();
-    }
-
-    protected internal override void OnQueryItemsCompleted( VirtualPage page, AsyncQueryInfo queryInfo, object[] fetchedItems )
-    {
-      base.OnQueryItemsCompleted( page, queryInfo, fetchedItems );
-
-      Debug.Assert( m_asyncQueryInfosInProgress.Contains( queryInfo ) );
-      m_asyncQueryInfosInProgress.Remove( queryInfo );
-
-      this.UpdateConnectionState();
-    }
-
-    protected internal override void OnAbortQueryItems( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-      base.OnAbortQueryItems( page, queryInfo );
-
-      // It is possible that the queryInfo was removed previously
-      m_asyncQueryInfosInProgress.Remove( queryInfo );
-
-      // In case the page query was aborted when
-      // VirtualPageManager.CleanUpUnused is called
-      if( page.RemoveAfterOperation )
-        this.RemovePage( page );
-
-      this.UpdateConnectionState();
-    }
-
-    protected internal override void OnQueryErrorChanged( VirtualPage page, AsyncQueryInfo queryInfo )
-    {
-      base.OnQueryErrorChanged( page, queryInfo );
-
-      // It is possible that m_asyncQueryInfosInProgress does not contain the queryInfo when
-      // the query was aborted but the user did not stop the query and later on set the queryInfo error
-      // event if the queryInfo ShouldAbort is set to True.
-      Debug.Assert( ( m_asyncQueryInfosInProgress.Contains( queryInfo ) ) || ( queryInfo.ShouldAbort ) );
-
-      object error = queryInfo.Error;
-
-      if( error == null )
-      {
-        // Even if the queryInfo's ShouldAbort property is set to True, clean-up the error.
-        Debug.Assert( ( m_asyncQueryInfosInError != null ) && ( m_asyncQueryInfosInError.Contains( queryInfo ) ) );
-
-        m_asyncQueryInfosInError.Remove( queryInfo );
-
-        if( m_asyncQueryInfosInError.Count == 0 )
-          m_asyncQueryInfosInError = null;
-      }
-      else if( !queryInfo.ShouldAbort )
-      {
-        // Only add errors if the queryInfo's ShouldAbort property is set to False.
-        if( m_asyncQueryInfosInError == null )
-          m_asyncQueryInfosInError = new LinkedList<AsyncQueryInfo>();
-
-        if( m_asyncQueryInfosInError.Contains( queryInfo ) )
-          m_asyncQueryInfosInError.Remove( queryInfo );
-
-        m_asyncQueryInfosInError.AddFirst( queryInfo );
-      }
-
-      this.UpdateConnectionState();
-    }
-
-    protected override void OnVirtualPageManagerRestarting()
-    {
-      base.OnVirtualPageManagerRestarting();
-
-      // Keep a reference on the old CollectionViewGroupRoot of the 
-      // parent CollectionView to be able to clear all references
-      // of this group after the VirtualPageManager is disposed
-      m_managerCollectionViewGroupRoot = m_collectionView.RootGroup;
-    }
-
-    protected override void OnVirtualPageManagerRestarted( bool shouldRefresh )
-    {
-      base.OnVirtualPageManagerRestarted( shouldRefresh );
-
-      // No need for a refresh since a new VirtualPageManager will
-      // be created and force QueryItemsCount and QueryItems using 
-      // the same CollectionView
-
-      this.TryDispose();
-    }
-
-    protected internal override void OnCommitItems( VirtualPage page, AsyncCommitInfo commitInfo )
-    {
-      base.OnCommitItems( page, commitInfo );
-
-      Debug.Assert( !m_asyncCommitInfosInProgress.Contains( commitInfo ) );
-      m_asyncCommitInfosInProgress.Add( commitInfo );
-
-      this.UpdateConnectionState();
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "OnCommitItems for page " + page.ToString() );
-
-      m_collectionView.Dispatcher.BeginInvoke(
-        new Action<VirtualPage, AsyncCommitInfo>( this.RaiseCollectionViewOnCommitItems ),
-        DispatcherPriority.Background,
-        page,
-        commitInfo );
-    }
-
-    protected internal override void OnCommitItemsCompleted( VirtualPage page, AsyncCommitInfo commitInfo )
-    {
-      Debug.Assert( m_asyncCommitInfosInProgress.Contains( commitInfo ) );
-      m_asyncCommitInfosInProgress.Remove( commitInfo );
-      this.UpdateConnectionState();
-
-      base.OnCommitItemsCompleted( page, commitInfo );
-
-      // In case the page query was aborted when
-      // VirtualPageManager.CleanUpUnused is called
-      if( page.RemoveAfterOperation )
-        this.RemovePage( page );
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "OnCommitItemsCompleted for page " + page.ToString() );
-    }
-
-    protected internal override void OnCommitErrorChanged( VirtualPage page, AsyncCommitInfo commitInfo )
-    {
-      base.OnCommitErrorChanged( page, commitInfo );
-
-      Debug.Assert( m_asyncCommitInfosInProgress.Contains( commitInfo ) );
-
-      object error = commitInfo.Error;
-
-      if( error == null )
-      {
-        Debug.Assert( ( m_asyncCommitInfosInError != null ) && ( m_asyncCommitInfosInError.Contains( commitInfo ) ) );
-
-        m_asyncCommitInfosInError.Remove( commitInfo );
-
-        if( m_asyncCommitInfosInError.Count == 0 )
-          m_asyncCommitInfosInError = null;
-      }
-      else
-      {
-        if( m_asyncCommitInfosInError == null )
-          m_asyncCommitInfosInError = new LinkedList<AsyncCommitInfo>();
-
-        if( m_asyncCommitInfosInError.Contains( commitInfo ) )
-          m_asyncCommitInfosInError.Remove( commitInfo );
-
-        m_asyncCommitInfosInError.AddFirst( commitInfo );
-      }
-
-      this.UpdateConnectionState();
-    }
-
-    protected void UnlinkVirtualListAndCollectionViewGroup( VirtualList virtualList )
-    {
-      DataGridVirtualizingCollectionViewGroupBase collectionViewGroup = null;
-
-      if( m_virtualListVSCollectionViewGroupDictionary.TryGetValue( virtualList, out collectionViewGroup ) )
-      {
-        CollectionChangedEventManager.RemoveListener( virtualList, collectionViewGroup );
-        m_virtualListVSCollectionViewGroupDictionary.Remove( virtualList );
-      }
-    }
-
-    protected override void DisposeCore()
-    {
-      // Remove every CollectionChanged WeakEventListener from the 
-      // inner DataGridVirtualizingCollectionViewGroupBase
-      // and clear the references to them
-      Debug.Assert( m_virtualListVSCollectionViewGroupDictionary.Count == 0 );
-
-      // Dispose the RootGroup for which this manager
-      // was created
-      if( m_managerCollectionViewGroupRoot != null )
-      {
-        m_managerCollectionViewGroupRoot.Dispose();
-        m_managerCollectionViewGroupRoot = null;
-      }
-
-      // Force a PropertyChanged on the CollectionView
-      // for properties ConnectionState and Error to force
-      // bound countrol to update correctly using the values
-      // affected on the CollectionView by the new 
-      // VirtualPageManager
-      if( m_collectionView != null )
-      {
-        m_collectionView.RefreshConnectionStateAndError();
-        m_collectionView = null;
-      }
-
-      base.DisposeCore();
-    }
-
-    protected internal override int OnQueryItemCount( VirtualList virtualList )
-    {
-      try
-      {
-        return base.OnQueryItemCount( virtualList );
-      }
-      finally
-      {
-        this.UpdateConnectionState();
-      }
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region PRIVATE METHODS
-
-    private void TryDispose()
-    {
-      if( ( m_asyncCommitInfosInProgress.Count == 0 )
-          && ( m_asyncCommitInfosInError == null )
-          && ( m_asyncQueryInfosInError == null )
-          && ( m_asyncQueryInfosInProgress.Count == 0 ) )
-      {
-        // At this point, all data was correctly committed.
-
-        // This manager is no more required, we can dispose
-        // it. This will force a dispose of all VirtualList,
-        // their inner VirtualListTableOfContent and Pages.
-        this.Dispose();
-      }
-    }
-
-    private void UpdateConnectionState()
-    {
-      // Never update the ConnectionState when disconnected
-      // from the CollectionView or Disposed since another
-      // VirtualPageManager will take care or updating it
-      if( !this.IsConnected || this.IsDisposed )
-        return;
-
-      DataGridConnectionState state = DataGridConnectionState.Idle;
-      object error = null;
-
-      if( m_asyncCommitInfosInError != null )
-      {
-        state = DataGridConnectionState.Error;
-        Debug.Assert( m_asyncCommitInfosInError.Count > 0 );
-        error = m_asyncCommitInfosInError.First.Value.Error;
-      }
-      else if( m_asyncQueryInfosInError != null )
-      {
-        state = DataGridConnectionState.Error;
-        Debug.Assert( m_asyncQueryInfosInError.Count > 0 );
-        error = m_asyncQueryInfosInError.First.Value.Error;
-      }
-      else if( m_asyncCommitInfosInProgress.Count > 0 )
-      {
-        state = DataGridConnectionState.Committing;
-      }
-      else if( m_asyncQueryInfosInProgress.Count > 0 )
-      {
-        state = DataGridConnectionState.Loading;
-      }
-
-      m_collectionView.UpdateConnectionState( state, error );
-    }
-
-    private void RaiseCollectionViewOnCommitItems( VirtualPage dispatchedPage, AsyncCommitInfo dispatchedCommitInfo )
-    {
-      DataGridVirtualizingCollectionViewBase collectionView = this.CollectionView as DataGridVirtualizingCollectionViewBase;
-
-      DataGridVirtualizingCollectionViewGroupBase collectionViewGroup =
-        this.GetLinkedCollectionViewGroup( dispatchedPage.ParentVirtualList ) as DataGridVirtualizingCollectionViewGroupBase;
-
-      Debug.Assert( ( collectionViewGroup != null ) && ( collectionView != null ) );
-
-      collectionView.OnCommitItems( dispatchedCommitInfo );
-    }
-
-    #endregion
-
-    #region INTERNAL METHODS
-
-    internal void LinkVirtualListAndCollectionViewGroup( VirtualList virtualItemList, DataGridVirtualizingCollectionViewGroupBase collectionViewGroup )
-    {
-      Debug.Assert( !m_virtualListVSCollectionViewGroupDictionary.ContainsKey( virtualItemList ) );
-      Debug.Assert( !m_virtualListVSCollectionViewGroupDictionary.ContainsValue( collectionViewGroup ) );
-
-      m_virtualListVSCollectionViewGroupDictionary.Add( virtualItemList, collectionViewGroup );
-
-      CollectionChangedEventManager.AddListener( virtualItemList, collectionViewGroup );
-    }
-
-    internal override void OnVirtualListRestarted( VirtualList virtualList )
-    {
-      this.UnlinkVirtualListAndCollectionViewGroup( virtualList );
-      base.OnVirtualListRestarted( virtualList );
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE FIELDS
-
-    private DataGridVirtualizingCollectionViewGroupBase m_managerCollectionViewGroupRoot;
-    private DataGridVirtualizingCollectionViewBase m_collectionView;
-    private Dictionary<VirtualList, DataGridVirtualizingCollectionViewGroupBase> m_virtualListVSCollectionViewGroupDictionary;
-
-    private HashSet<AsyncQueryInfo> m_asyncQueryInfosInProgress = new HashSet<AsyncQueryInfo>();
-    private HashSet<AsyncCommitInfo> m_asyncCommitInfosInProgress = new HashSet<AsyncCommitInfo>();
-
-    private LinkedList<AsyncQueryInfo> m_asyncQueryInfosInError;
-    private LinkedList<AsyncCommitInfo> m_asyncCommitInfosInError;
-
-    #endregion PRIVATE FIELDS
-
-
-    #region IEnumerable<object> Members
-
-    public IEnumerator<object> GetEnumerator()
-    {
-      return new DataGridPageManagerEnumerator( this );
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return null;
-    }
-
-    #endregion
-
-
-    #region PRIVATE NESTED CLASSES
-
-    private class DataGridPageManagerEnumerator : IEnumerator<object>, IEnumerator
-    {
-      public DataGridPageManagerEnumerator( DataGridPageManagerBase dataGridPageManagerBase )
-      {
-        if( dataGridPageManagerBase == null )
-          throw new ArgumentNullException( "dataGridPageManagerBase" );
-
-        m_dataGridPageManagerBase = dataGridPageManagerBase;
-
-        VirtualList[] orderedVirtualLists =
-          m_dataGridPageManagerBase.m_virtualListVSCollectionViewGroupDictionary.Keys.OrderBy(
-            virtualList => m_dataGridPageManagerBase.m_virtualListVSCollectionViewGroupDictionary[ virtualList ].StartGlobalIndex ).ToArray();
-
-        m_orderedVirtualListEnumerators = new VirtualListEnumerator[ orderedVirtualLists.Length ];
-
-        for( int i = 0; i < orderedVirtualLists.Length; i++ )
-        {
-          m_orderedVirtualListEnumerators[ i ] = ( VirtualListEnumerator )( ( IEnumerable )orderedVirtualLists[ i ] ).GetEnumerator();
-        }
-      }
-
-      #region IEnumerator<object> Members
-
-      public object Current
-      {
-        get
-        {
-          return m_currentItem;
-        }
-      }
-
-      #endregion IEnumerator<object> Members
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        foreach( VirtualListEnumerator enumerator in m_orderedVirtualListEnumerators )
-        {
-          enumerator.Dispose();
-        }
-
-        m_orderedVirtualListEnumerators = null;
-        m_dataGridPageManagerBase = null;
-        m_currentItem = null;
-      }
-
-      #endregion
-
-      #region IEnumerator Members
-
-      public bool MoveNext()
-      {
-        // No need to check the VirtualPageManager's version.  The sub VirtualLists' Enumerator will take care of it.
-        while( m_currentEnumeratorIndex < m_orderedVirtualListEnumerators.Length )
-        {
-          VirtualListEnumerator enumerator = m_orderedVirtualListEnumerators[ m_currentEnumeratorIndex ];
-
-          enumerator.MoveNext();
-
-          if( !enumerator.AfterEnd )
-          {
-            m_currentItem = enumerator.Current;
-            return true;
-          }
-          else
-          {
-            // Reached the end of this enumerator.  Let's increment the currentEnumeratorIndex.
-            m_currentEnumeratorIndex++;
-          }
-        }
-
-        m_currentItem = null;
-        return false;
-      }
-
-      public void Reset()
-      {
-        m_currentEnumeratorIndex = 0;
-        m_currentItem = null;
-      }
-
-      object IEnumerator.Current
-      {
-        get
-        {
-          return this.Current;
-        }
-      }
-
-      bool IEnumerator.MoveNext()
-      {
-        return this.MoveNext();
-      }
-
-      void IEnumerator.Reset()
-      {
-        this.Reset();
-      }
-
-      #endregion IEnumerator Members
-
-
-      #region PRIVATE FIELDS
-
-      private DataGridPageManagerBase m_dataGridPageManagerBase;
-      private VirtualListEnumerator[] m_orderedVirtualListEnumerators;
-      private object m_currentItem;
-      private int m_currentEnumeratorIndex;
-
-      #endregion PRIVATE FIELDS
-    }
-
-    #endregion PRIVATE NESTED CLASSES
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridRemovingItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridRemovingItemEvent.cs
deleted file mode 100644
index 484902e5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridRemovingItemEvent.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridRemovingItemEventArgs : DataGridItemCancelEventArgs
-  {
-    public DataGridRemovingItemEventArgs( DataGridCollectionViewBase collectionView, object item, int index, bool cancel)
-      : base( collectionView, item, cancel )
-    {
-      m_index = index;
-    }
-
-    #region Index Property
-
-    public int Index
-    {
-      get { return m_index; }
-    }
-
-    private int m_index;
-
-    #endregion Index Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridSortDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridSortDescriptionCollection.cs
deleted file mode 100644
index c9b4ec2f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridSortDescriptionCollection.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridSortDescriptionCollection : SortDescriptionCollection
-  {
-    #region CONSTRUCTORS
-
-    public DataGridSortDescriptionCollection()
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region IsResortDefered PROPERTY
-
-    public bool IsResortDefered
-    {
-      get
-      {
-        return ( m_deferResortCount > 0 );
-      }
-    }
-
-    #endregion IsResortDefered PROPERTY
-
-    #region SyncContext PROPERTY
-
-    public SortDescriptionsSyncContext SyncContext
-    {
-      get
-      {
-        return m_syncContext;
-      }
-    }
-
-    #endregion SyncContext PROPERTY
-
-    #region PUBLIC METHODS
-
-    public IDisposable DeferResort()
-    {
-      return new DeferResortDisposable( this );
-    }
-
-    public void AddResortNotification( IDisposable notificationObject )
-    {
-      Debug.Assert( m_deferResortCount > 0 );
-
-      lock( m_notificationList )
-      {
-        m_notificationList.Enqueue( notificationObject );
-      }
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region PRIVATE FIELDS
-
-    private SortDescriptionsSyncContext m_syncContext = new SortDescriptionsSyncContext();
-    private int m_deferResortCount; // = 0
-    private Queue<IDisposable> m_notificationList = new Queue<IDisposable>();
-
-    #endregion PRIVATE FIELDS
-
-    #region NESTED CLASSES
-
-    private sealed class DeferResortDisposable : IDisposable
-    {
-      public DeferResortDisposable( DataGridSortDescriptionCollection parentCollection )
-      {
-        if( parentCollection == null )
-          throw new ArgumentNullException( "parentCollection" );
-
-        m_parentCollection = parentCollection;
-        m_parentCollection.m_deferResortCount++;
-      }
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        Debug.Assert( m_parentCollection.m_deferResortCount > 0 );
-
-        lock( m_parentCollection.m_notificationList )
-        {
-          m_parentCollection.m_deferResortCount--;
-
-          if( m_parentCollection.m_deferResortCount == 0 )
-          {
-            while( m_parentCollection.m_notificationList.Count > 0 )
-            {
-              IDisposable notificationObject = m_parentCollection.m_notificationList.Dequeue();
-
-              notificationObject.Dispose();
-              notificationObject = null;
-            }
-          }
-        }
-
-        m_parentCollection = null;
-      }
-
-      #endregion
-
-      private DataGridSortDescriptionCollection m_parentCollection; // = null
-    }
-
-    #endregion NESTED CLASSES
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs
deleted file mode 100644
index abf7aa6a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [DebuggerDisplay( "Name = {Name}" )]
-  public class DataGridUnboundItemProperty : DataGridItemPropertyBase
-  {
-    public DataGridUnboundItemProperty()
-    {
-    }
-
-    public DataGridUnboundItemProperty( string name, Type dataType )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "The name must not be null (Nothing in Visual Basic) or empty.", "name" );
-
-      if( dataType == null )
-        throw new ArgumentNullException( "dataType" );
-
-      this.Initialize( name, null, dataType, null, null, null, null );
-    }
-
-    public DataGridUnboundItemProperty( string name, Type dataType, bool isReadOnly )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "The name must not be null (Nothing in Visual Basic) or empty.", "name" );
-
-      if( dataType == null )
-        throw new ArgumentNullException( "dataType" );
-
-      this.Initialize( name, null, dataType, isReadOnly, null, null, null );
-    }
-
-    public DataGridUnboundItemProperty( string name, Type dataType, bool isReadOnly, bool overrideReadOnlyForInsertion )
-    {
-      if( string.IsNullOrEmpty( name ) )
-        throw new ArgumentException( "The name must not be null (Nothing in Visual Basic) or empty.", "name" );
-
-      if( dataType == null )
-        throw new ArgumentNullException( "dataType" );
-
-      this.Initialize( name, null, dataType, isReadOnly, overrideReadOnlyForInsertion, null, null );
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "This constructor is obsolete and should no longer be used.", true )]
-    protected DataGridUnboundItemProperty( DataGridUnboundItemProperty template )
-    {
-      throw new NotSupportedException();
-    }
-
-    public event EventHandler<DataGridItemPropertyQueryValueEventArgs> QueryValue;
-    public event EventHandler<DataGridItemPropertyCommittingValueEventArgs> CommittingValue;
-
-    protected override object GetValueCore( object component )
-    {
-      var handler = this.QueryValue;
-      if( handler == null )
-        return null;
-
-      var e = new DataGridItemPropertyQueryValueEventArgs( component );
-
-      handler.Invoke( this, e );
-
-      return e.Value;
-    }
-
-    protected override void SetValueCore( object component, object value )
-    {
-      var handler = this.CommittingValue;
-      if( handler != null )
-      {
-        handler.Invoke( this, new DataGridItemPropertyCommittingValueEventArgs( component, value ) );
-      }
-
-      base.SetValueCore( component, value );
-    }
-
-    internal void Refresh( object component )
-    {
-      var propertyDescriptor = this.GetPropertyDescriptorForBinding();
-      if( propertyDescriptor == null )
-        return;
-
-      propertyDescriptor.RaiseValueChanged( component );
-    }
-
-    internal override void SetUnspecifiedPropertiesValues(
-      PropertyDescription description,
-      Type itemType,
-      bool defaultItemPropertiesCreated )
-    {
-      if( this.DataType == null )
-        throw new InvalidOperationException( "An attempt was made to add an item without specifying its data type." );
-
-      if( string.IsNullOrEmpty( this.Title ) )
-      {
-        this.Title = this.Name;
-      }
-
-      if( !this.OverrideReadOnlyForInsertion.HasValue )
-      {
-        this.OverrideReadOnlyForInsertion = false;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs
deleted file mode 100644
index 17d68113..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 Xceed.Utils.Collections;
-using System.Data;
-using System.ComponentModel;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public sealed class DataGridVirtualizingCollectionView : DataGridVirtualizingCollectionViewBase
-  {
-    #region CONSTRUCTORS
-
-    public DataGridVirtualizingCollectionView()
-      : this( null, typeof( object ), true, DataGridVirtualizingCollectionViewBase.DefaultPageSize, DataGridVirtualizingCollectionViewBase.DefaultMaxRealizedItemCount )
-    {
-    }
-
-    public DataGridVirtualizingCollectionView( Type itemType )
-      : this( null, itemType, true, DataGridVirtualizingCollectionViewBase.DefaultPageSize, DataGridVirtualizingCollectionViewBase.DefaultMaxRealizedItemCount )
-    {
-    }
-
-    public DataGridVirtualizingCollectionView( Type itemType, bool autoCreateItemProperties, int pageSize, int maxRealizedItemCount )
-      : this( null, itemType, autoCreateItemProperties, pageSize, maxRealizedItemCount )
-    {
-    }
-
-
-    public DataGridVirtualizingCollectionView( DataTable sourceSchema )
-      : this( sourceSchema, typeof( object ), true, DataGridVirtualizingCollectionViewBase.DefaultPageSize, DataGridVirtualizingCollectionViewBase.DefaultMaxRealizedItemCount )
-    {
-    }
-
-    public DataGridVirtualizingCollectionView( DataTable sourceSchema, bool autoCreateItemProperties, int pageSize, int maxRealizedItemCount )
-      : this( sourceSchema, typeof( object ), autoCreateItemProperties, pageSize, maxRealizedItemCount )
-    {
-    }
-
-
-    private DataGridVirtualizingCollectionView( DataTable sourceSchema, Type itemType, bool autoCreateItemProperties, int pageSize, int maxRealizedItemCount )
-      : base( sourceSchema, itemType, autoCreateItemProperties, pageSize, maxRealizedItemCount )
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-
-    #region DATA VIRTUALIZATION
-
-    public event EventHandler<QueryItemCountEventArgs> QueryItemCount;
-
-    internal int OnQueryItemCount( DataGridVirtualizingCollectionViewGroup collectionViewGroup )
-    {
-      QueryItemCountEventArgs e = new QueryItemCountEventArgs( this, collectionViewGroup );
-
-      if( this.QueryItemCount != null )
-        this.QueryItemCount( this, e );
-
-      DataGridVirtualizingCollectionViewSource source = this.ParentCollectionViewSourceBase as DataGridVirtualizingCollectionViewSource;
-
-      if( source != null )
-        source.OnQueryItemCount( e );
-
-      return e.Count;
-    }
-
-    public event EventHandler<QueryGroupsEventArgs> QueryGroups;
-
-    internal List<GroupNameCountPair> OnQueryGroups( DataGridVirtualizingCollectionViewGroup parentGroup )
-    {
-      ObservableCollection<GroupDescription> groupDescriptions = this.GroupDescriptions;
-      int nextLevel = parentGroup.Level + 1;
-
-      Debug.Assert( ( groupDescriptions != null ) && ( groupDescriptions.Count > nextLevel ) );
-
-      QueryGroupsEventArgs e = new QueryGroupsEventArgs( this, parentGroup, groupDescriptions[ nextLevel ] );
-
-      if( this.QueryGroups != null )
-        this.QueryGroups( this, e );
-
-      DataGridVirtualizingCollectionViewSource source = this.ParentCollectionViewSourceBase as DataGridVirtualizingCollectionViewSource;
-
-      if( source != null )
-        source.OnQueryGroups( e );
-
-      return e.ChildGroupNameCountPairs;
-    }
-
-
-    public event EventHandler<QueryItemsEventArgs> AbortQueryItems;
-
-    internal void OnAbortQueryItems( AsyncQueryInfo asyncQueryInfo, DataGridVirtualizingCollectionViewGroup collectionViewGroup )
-    {
-      QueryItemsEventArgs e = new QueryItemsEventArgs( this, collectionViewGroup, asyncQueryInfo );
-
-      if( this.AbortQueryItems != null )
-        this.AbortQueryItems( this, e );
-
-      DataGridVirtualizingCollectionViewSource source = this.ParentCollectionViewSourceBase as DataGridVirtualizingCollectionViewSource;
-
-      if( source != null )
-        source.OnAbortQueryItems( e );
-    }
-
-    public event EventHandler<QueryItemsEventArgs> QueryItems;
-
-    internal void OnQueryItems( AsyncQueryInfo asyncQueryInfo, DataGridVirtualizingCollectionViewGroup collectionViewGroup )
-    {
-      QueryItemsEventArgs e = new QueryItemsEventArgs( this, collectionViewGroup, asyncQueryInfo );
-
-      if( this.QueryItems != null )
-        this.QueryItems( this, e );
-
-      DataGridVirtualizingCollectionViewSource source = this.ParentCollectionViewSourceBase as DataGridVirtualizingCollectionViewSource;
-
-      if( source != null )
-        source.OnQueryItems( e );
-    }
-
-    #endregion DATA VIRTUALIZATION
-
-    internal override IEnumerator GetVirtualEnumerator()
-    {
-      return ( ( DataGridVirtualizingCollectionViewGroupRoot )this.RootGroup ).GetVirtualPageManager().GetEnumerator();
-    }
-
-    internal override DataGridVirtualizingCollectionViewGroupBase CreateNewRootGroup()
-    {
-      bool rootIsBottomLevel = ( this.GroupDescriptions == null ) ? true : ( this.GroupDescriptions.Count == 0 );
-
-      return new DataGridVirtualizingCollectionViewGroupRoot( this, rootIsBottomLevel );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs
deleted file mode 100644
index 81ba31c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs
+++ /dev/null
@@ -1,977 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public abstract class DataGridVirtualizingCollectionViewBase : DataGridCollectionViewBase
-  {
-    #region STATIC MEMBERS
-
-    internal const int DefaultMaxRealizedItemCount = 1000;
-    internal const int DefaultPageSize = 200;
-    internal const double DefaultPreemptivePageQueryRatio = 0.25;
-
-    #endregion STATIC MEMBERS
-
-    #region CONSTRUCTORS
-
-    internal DataGridVirtualizingCollectionViewBase( object sourceModel, Type itemType, bool autoCreateItemProperties, int pageSize, int maxRealizedItemCount )
-      : base( sourceModel, null, itemType, autoCreateItemProperties, false, false )
-    {
-      if( itemType == null )
-      {
-        itemType = typeof( object );
-      }
-
-      if( pageSize < 1 )
-        throw new ArgumentOutOfRangeException( "pageSize", pageSize, "pageSize must be greater than zero." );
-
-      if( maxRealizedItemCount < 1 )
-        throw new ArgumentOutOfRangeException( "maxRealizedItemCount", maxRealizedItemCount, "maxRealizedItemCount must be greater than zero." );
-
-      if( maxRealizedItemCount < pageSize )
-      {
-        maxRealizedItemCount = pageSize;
-      }
-
-      m_pageSize = pageSize;
-      m_maxRealizedItemCount = maxRealizedItemCount;
-      m_preemptivePageQueryRatio = DataGridVirtualizingCollectionViewBase.DefaultPreemptivePageQueryRatio;
-    }
-
-    internal override DataGridCollectionViewBase CreateDetailDataGridCollectionViewBase(
-      IEnumerable detailDataSource,
-      DataGridDetailDescription parentDetailDescription,
-      DataGridCollectionViewBase parentDataGridCollectionViewBase )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-
-    #region CollectionView Members
-
-    public override bool CanGroup
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public override bool CanFilter
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public override IEnumerable SourceCollection
-    {
-      get
-      {
-        // VirtualizingDataGridCollectionView does not have a source.
-        return null;
-      }
-    }
-
-    public override bool Contains( object item )
-    {
-      if( item == null )
-        return false;
-
-      return ( this.IndexOf( item ) != -1 );
-    }
-
-    public override bool IsEmpty
-    {
-      get
-      {
-        return ( this.Count == 0 );
-      }
-    }
-
-    public override int IndexOf( object item )
-    {
-      this.EnsureThreadAndCollectionLoaded();
-
-      return this.RootGroup.GetGlobalIndexOf( item );
-    }
-
-    public override object GetItemAt( int index )
-    {
-      this.EnsureThreadAndCollectionLoaded();
-
-      if( index < 0 )
-        return null;
-
-      return this.RootGroup.GetItemAtGlobalIndex( index );
-    }
-
-    #endregion CollectionView Members
-
-    #region Currency management
-
-    public override object CurrentItem
-    {
-      get
-      {
-        if( ( !this.Loaded ) || ( this.IsCurrentBeforeFirst ) || ( this.IsCurrentAfterLast ) )
-          return null;
-
-        return base.CurrentItem;
-      }
-    }
-
-    public override bool MoveCurrentToPosition( int position )
-    {
-      if( position == this.CurrentPosition )
-        return ( this.CurrentItem != null );
-
-      this.EnsureThreadAndCollectionLoaded();
-      return this.SetCurrentItem( position, true );
-    }
-
-    private bool SetCurrentItem( int newCurrentPosition, bool isCancelable )
-    {
-      int count = this.Count;
-
-      if( ( newCurrentPosition < -1 ) || ( newCurrentPosition > count ) )
-        throw new ArgumentOutOfRangeException( "newCurrentPosition", "The current position must be greater than -1 and less than Count." );
-
-      object newCurrentItem = null;
-
-      if( ( newCurrentPosition >= 0 ) && ( newCurrentPosition < count ) )
-        newCurrentItem = this.GetItemAt( newCurrentPosition );
-
-      return this.SetCurrentItem( newCurrentPosition, newCurrentItem, isCancelable, false );
-    }
-
-    private bool SetCurrentItem( int newCurrentPosition, object newCurrentItem, bool isCancelable, bool beforeDeleteOperation )
-    {
-      object oldCurrentItem = this.CurrentItem;
-      int oldCurrentPosition = this.CurrentPosition;
-      bool oldIsCurrentBeforeFirst = this.IsCurrentBeforeFirst;
-      bool oldIsCurrentAfterLast = this.IsCurrentAfterLast;
-
-      if( ( !object.Equals( oldCurrentItem, newCurrentItem ) ) || ( oldCurrentPosition != newCurrentPosition ) )
-      {
-        // We raise the changing event even if we are in DeferCurrencyEvent
-        CurrentChangingEventArgs currentChangingEventArgs = new CurrentChangingEventArgs( isCancelable );
-        this.OnCurrentChanging( currentChangingEventArgs );
-
-        if( ( !currentChangingEventArgs.Cancel ) || ( !currentChangingEventArgs.IsCancelable ) )
-        {
-          int count = this.Count;
-
-          if( beforeDeleteOperation )
-          {
-            Debug.Assert( count > 0 );
-            count--;
-          }
-
-          bool isCurrentBeforeFirst;
-          bool isCurrentAfterLast;
-
-          if( count == 0 )
-          {
-            isCurrentBeforeFirst = true;
-            isCurrentAfterLast = true;
-          }
-          else
-          {
-            isCurrentBeforeFirst = newCurrentPosition < 0;
-            isCurrentAfterLast = newCurrentPosition >= count;
-          }
-
-#if DEBUG
-          if( newCurrentItem == null )
-            Debug.Assert( ( newCurrentPosition == -1 ) || ( newCurrentPosition >= ( count - 1 ) ) );
-#endif
-
-          this.SetCurrentItemAndPositionCore(
-            newCurrentItem, newCurrentPosition, isCurrentBeforeFirst, isCurrentAfterLast );
-
-          if( !this.IsCurrencyDeferred )
-          {
-            if( !object.Equals( oldCurrentItem, newCurrentItem ) )
-              this.OnPropertyChanged( new PropertyChangedEventArgs( "CurrentItem" ) );
-
-            if( oldCurrentPosition != this.CurrentPosition )
-              this.OnPropertyChanged( new PropertyChangedEventArgs( "CurrentPosition" ) );
-
-            if( oldIsCurrentBeforeFirst != this.IsCurrentBeforeFirst )
-              this.OnPropertyChanged( new PropertyChangedEventArgs( "IsCurrentBeforeFirst" ) );
-
-            if( oldIsCurrentAfterLast != this.IsCurrentAfterLast )
-              this.OnPropertyChanged( new PropertyChangedEventArgs( "IsCurrentAfterLast" ) );
-
-            this.OnCurrentChanged();
-          }
-        }
-      }
-
-      return ( newCurrentItem != null );
-    }
-
-    private void SaveCurrentBeforeReset( out int oldCurrentPosition )
-    {
-      Debug.Assert( this.Loaded );
-
-      if( this.IsCurrentAfterLast )
-      {
-        oldCurrentPosition = int.MaxValue;
-      }
-      else
-      {
-        oldCurrentPosition = this.CurrentPosition;
-      }
-    }
-
-    private void AdjustCurrencyAfterReset( int oldCurrentPosition )
-    {
-      if( oldCurrentPosition < 0 )
-      {
-        this.SetCurrentItem( -1, null, false, false );
-        return;
-      }
-
-      int count = this.Count;
-
-      if( oldCurrentPosition == int.MaxValue )
-      {
-        this.SetCurrentItem( count, null, false, false );
-        return;
-      }
-
-      if( oldCurrentPosition >= count )
-      {
-        this.SetCurrentItem( count - 1, false );
-        return;
-      }
-
-      this.SetCurrentItem( oldCurrentPosition, false );
-    }
-
-    #endregion Currency management
-
-    #region IEnumerable Members
-
-    protected override IEnumerator GetEnumerator()
-    {
-      this.EnsureThreadAndCollectionLoaded();
-
-      return this.GetVirtualEnumerator();
-    }
-
-    internal abstract IEnumerator GetVirtualEnumerator();
-
-    #endregion
-
-    #region Count Property
-
-    public override int Count
-    {
-      get
-      {
-        this.EnsureThreadAndCollectionLoaded();
-
-        int count = this.RootGroup.VirtualItemCount;
-
-        if( count > 0 )
-          return count;
-
-        return 0;
-      }
-    }
-
-    #endregion Count Property
-
-    #region DistinctValues Management
-
-    private void ResetDistinctValues()
-    {
-    }
-
-    #endregion
-
-    #region PageSize Property
-
-    public int PageSize
-    {
-      get
-      {
-        return m_pageSize;
-      }
-      set
-      {
-        if( m_pageSize != value )
-        {
-          m_pageSize = value;
-
-          // Cannot modify this PageManager property.  Must Refresh which will recreate the CollectionViewGroupRoot
-          // and the DataGridVirtualPageManagerBase taking the new pageSize into account.
-          this.Refresh();
-
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "PageSize" ) );
-        }
-      }
-    }
-
-    #endregion PageSize Property
-
-    #region MaxRealizedItemCount Property
-
-    public int MaxRealizedItemCount
-    {
-      get
-      {
-        return m_maxRealizedItemCount;
-      }
-      set
-      {
-        if( m_maxRealizedItemCount != value )
-        {
-          m_maxRealizedItemCount = value;
-
-          if( value < this.PageSize )
-          {
-            value = this.PageSize;
-          }
-
-          // Cannot modify this PageManager property.  Must Refresh which will recreate the CollectionViewGroupRoot
-          // and the DataGridVirtualPageManagerBase taking the new pageSize into account.
-          this.Refresh();
-
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "MaxRealizedItemCount" ) );
-        }
-      }
-    }
-
-    #endregion MaxRealizedItemCount Property
-
-    #region PreemptivePageQueryRatio Property
-
-    public double PreemptivePageQueryRatio
-    {
-      get
-      {
-        return m_preemptivePageQueryRatio;
-      }
-      set
-      {
-        if( m_preemptivePageQueryRatio != value )
-        {
-          m_preemptivePageQueryRatio = value;
-
-          // Cannot modify this PageManager property.  Must Refresh which will recreate the CollectionViewGroupRoot
-          // and the DataGridVirtualPageManagerBase taking the new pageSize into account.
-          this.Refresh();
-
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "PreemptivePageQueryRatio" ) );
-        }
-      }
-    }
-
-    #endregion PreemptivePageQueryRatio Property
-
-    #region CommitMode Property
-
-    public CommitMode CommitMode
-    {
-      get
-      {
-        return m_commitMode;
-      }
-      set
-      {
-        if( m_commitMode != value )
-        {
-          m_commitMode = value;
-          this.OnPropertyChanged( new PropertyChangedEventArgs( "CommitMode" ) );
-        }
-      }
-    }
-
-    #endregion CommitMode Property
-
-    #region DATA VIRTUALIZATION
-
-    public void CommitAll()
-    {
-      this.RootGroup.GetVirtualPageManager().CommitAll();
-    }
-
-    public event EventHandler<CommitItemsEventArgs> CommitItems;
-
-    internal void OnCommitItems( AsyncCommitInfo asyncCommitInfo )
-    {
-      CommitItemsEventArgs e = new CommitItemsEventArgs( this, asyncCommitInfo );
-
-      if( this.CommitItems != null )
-        this.CommitItems( this, e );
-
-      DataGridVirtualizingCollectionViewSourceBase source = this.ParentCollectionViewSourceBase as DataGridVirtualizingCollectionViewSourceBase;
-
-      if( source != null )
-        source.OnCommitItems( e );
-    }
-
-    public DataGridConnectionState ConnectionState
-    {
-      get
-      {
-        return m_connectionState;
-      }
-      private set
-      {
-        if( m_connectionState != value )
-        {
-          m_connectionState = value;
-          this.RefreshConnectionState();
-        }
-      }
-    }
-
-    private void RefreshConnectionState()
-    {
-      this.OnPropertyChanged( new PropertyChangedEventArgs( "ConnectionState" ) );
-      this.OnConnectionStateChanged();
-    }
-
-    public object ConnectionError
-    {
-      get
-      {
-        return m_connectionError;
-      }
-      private set
-      {
-        if( m_connectionError != value )
-        {
-          m_connectionError = value;
-          this.RefreshConnectionError();
-        }
-      }
-    }
-
-    private void RefreshConnectionError()
-    {
-      this.OnPropertyChanged( new PropertyChangedEventArgs( "ConnectionError" ) );
-      this.OnConnectionErrorChanged();
-    }
-
-    internal void RefreshConnectionStateAndError()
-    {
-      this.RefreshConnectionState();
-      this.RefreshConnectionError();
-    }
-
-    internal void UpdateConnectionState( DataGridConnectionState connectionState, object error )
-    {
-      this.ConnectionState = connectionState;
-      this.ConnectionError = error;
-    }
-
-    #endregion DATA VIRTUALIZATION
-
-
-    #region PUBLIC METHODS
-
-    public override void CommitNew()
-    {
-      // We are not calling base since the intended behavior is quite different with Virtualizing collection views.
-      object currentAddItem = this.CurrentAddItem;
-
-      if( currentAddItem == null )
-        return;
-
-      DataGridCommittingNewItemEventArgs committingNewItemEventArgs = new DataGridCommittingNewItemEventArgs( this, currentAddItem, false );
-
-      this.RootDataGridCollectionViewBase.OnCommittingNewItem( committingNewItemEventArgs );
-
-      if( committingNewItemEventArgs.Cancel )
-        throw new DataGridException( "CommitNew was canceled." );
-
-      if( !committingNewItemEventArgs.Handled )
-        throw new InvalidOperationException( "When manually handling the item-insertion process the CreatingNewItem, CommittingNewItem, and CancelingNewItem events must all be handled." );
-
-      // Contrarily to the data bound collection views, we do not care about the new index or new count since we will enqueue a Refresh operation.
-
-      this.SetCurrentAddNew( null, -1 );
-
-      this.ExecuteOrQueueSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null ) );
-    }
-
-    public override bool MoveCurrentTo( object item )
-    {
-      m_canSynchronizeSelectionWithCurrent = true;
-      bool ret = base.MoveCurrentTo( item );
-      m_canSynchronizeSelectionWithCurrent = false;
-
-      return ret;
-    }
-
-    public override bool MoveCurrentToFirst()
-    {
-      m_canSynchronizeSelectionWithCurrent = true;
-      bool ret = base.MoveCurrentToFirst();
-      m_canSynchronizeSelectionWithCurrent = false;
-
-      return ret;
-    }
-
-    public override bool MoveCurrentToLast()
-    {
-      m_canSynchronizeSelectionWithCurrent = true;
-      bool ret = base.MoveCurrentToLast();
-      m_canSynchronizeSelectionWithCurrent = false;
-
-      return ret;
-    }
-
-    public override bool MoveCurrentToNext()
-    {
-      m_canSynchronizeSelectionWithCurrent = true;
-      bool ret = base.MoveCurrentToNext();
-      m_canSynchronizeSelectionWithCurrent = false;
-
-      return ret;
-    }
-
-    public override bool MoveCurrentToPrevious()
-    {
-      m_canSynchronizeSelectionWithCurrent = true;
-      bool ret = base.MoveCurrentToPrevious();
-      m_canSynchronizeSelectionWithCurrent = false;
-
-      return ret;
-    }
-
-    #endregion PUBLIC METHODS
-
-    internal override void SetCurrentItemAndPositionCore( object currentItem, int currentPosition, bool isCurrentBeforeFirst, bool isCurrentAfterLast )
-    {
-      this.UpdateDataVirtualizationLockForCurrentPosition( false );
-
-      base.SetCurrentItemAndPositionCore( currentItem, currentPosition, isCurrentBeforeFirst, isCurrentAfterLast );
-
-      this.UpdateDataVirtualizationLockForCurrentPosition( true );
-    }
-
-    private void UpdateDataVirtualizationLockForCurrentPosition( bool applyLock )
-    {
-      if( base.RootGroup == null )
-        return;
-
-      if( !this.IsCurrentAfterLast && !this.IsCurrentBeforeFirst )
-      {
-        int currentPosition = this.CurrentPosition;
-
-        Debug.Assert( currentPosition > -1 );
-
-        if( applyLock )
-        {
-          this.RootGroup.LockGlobalIndex( currentPosition );
-        }
-        else
-        {
-          this.RootGroup.UnlockGlobalIndex( currentPosition );
-        }
-      }
-    }
-
-
-    #region DEFERRED OPERATIONS HANDLING
-
-    internal override void ExecuteSourceItemOperation( DeferredOperation deferredOperation, out bool refreshForced )
-    {
-      refreshForced = false;
-
-      switch( deferredOperation.Action )
-      {
-        case DeferredOperation.DeferredOperationAction.Add:
-        case DeferredOperation.DeferredOperationAction.Move:
-        case DeferredOperation.DeferredOperationAction.RefreshDistincValues:
-          {
-            Debug.Assert( false );
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.Refresh:
-        case DeferredOperation.DeferredOperationAction.Remove:
-        case DeferredOperation.DeferredOperationAction.Resort:
-        case DeferredOperation.DeferredOperationAction.Regroup:
-          {
-            this.ForceRefresh( true, false, true );
-            break;
-          }
-
-        case DeferredOperation.DeferredOperationAction.Replace:
-          {
-            this.ReplaceSourceItem( deferredOperation.OldStartingIndex, deferredOperation.OldItems,
-              deferredOperation.NewStartingIndex, deferredOperation.NewItems );
-            break;
-          }
-
-        default:
-          {
-            base.ExecuteSourceItemOperation( deferredOperation, out refreshForced );
-            break;
-          }
-      }
-    }
-
-    private void ReplaceSourceItem( int oldStartIndex, IList oldItems, int newStartIndex, IList newItems )
-    {
-      Debug.Assert( oldStartIndex == newStartIndex );
-      Debug.Assert( oldItems.Count == newItems.Count );
-
-      if( ( oldStartIndex == -1 ) || ( newStartIndex == -1 ) )
-      {
-        this.ForceRefresh( true, !this.Loaded, true );
-        return;
-      }
-
-      int newItemCount = newItems.Count;
-      int oldItemCount = oldItems.Count;
-      int extraOldItemCount = oldItemCount - newItemCount;
-
-      int currentPosition = this.CurrentPosition;
-
-      int count = Math.Min( newItemCount, oldItemCount );
-
-      for( int i = 0; i < count; i++ )
-      {
-        object oldItem = oldItems[ i ];
-        object newItem = newItems[ i ];
-
-        if( ( oldStartIndex == newStartIndex ) && ( object.Equals( oldItem, newItem ) ) )
-        {
-          if( this.CurrentEditItem != oldItem )
-          {
-            this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace,
-              new object[] { newItem },
-              new object[] { oldItem },
-              oldStartIndex + i ) );
-          }
-        }
-        else
-        {
-          this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace,
-            new object[] { newItem },
-            new object[] { oldItem },
-            oldStartIndex + i ) );
-
-          if( currentPosition == newStartIndex + i )
-            this.SetCurrentItem( currentPosition, newItem, false, false );
-        }
-      }
-    }
-
-    #endregion DEFERRED OPERATIONS HANDLING
-
-    #region INTERNAL PROPERTIES
-
-    internal new DataGridVirtualizingCollectionViewGroupBase RootGroup
-    {
-      get
-      {
-        if( base.RootGroup == null )
-          base.RootGroup = this.CreateNewRootGroup();
-
-        return base.RootGroup as DataGridVirtualizingCollectionViewGroupBase;
-      }
-      set
-      {
-        base.RootGroup = value;
-      }
-    }
-
-    internal override int SourceItemCount
-    {
-      get
-      {
-        return this.Count;
-      }
-    }
-
-    internal bool CanSynchronizeSelectionWithCurrent
-    {
-      get
-      {
-        return m_canSynchronizeSelectionWithCurrent;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
-    internal abstract DataGridVirtualizingCollectionViewGroupBase CreateNewRootGroup();
-
-    internal override void OnBeginningEdit( DataGridItemCancelEventArgs e )
-    {
-      object item = e.Item;
-
-      // We throw instead of setting e.Cancel to True because we do not want to give the developer the chance to set it back to False.
-      if( item is EmptyDataItem )
-        throw new DataGridException( "Cannot begin edit on an empty data item or on an item that has a pending commit async operation." );
-
-      DataGridPageManagerBase pageManager = this.RootGroup.GetVirtualPageManager();
-
-      if( pageManager.IsAsyncCommitQueuedForItem( item ) )
-        throw new DataGridException( "Cannot begin edit on an empty data item or on an item that has a pending commit async operation." );
-
-      base.OnBeginningEdit( e );
-    }
-
-    internal override void OnEditBegun( DataGridItemEventArgs e )
-    {
-      var item = e.Item;
-      var pageManager = this.RootGroup.GetVirtualPageManager();
-
-      if( !pageManager.IsItemDirty( item ) )
-      {
-        // First time we enter edit on this item.
-        var itemProperties = this.ItemProperties;
-        var count = itemProperties.Count;
-
-        var propertyNames = new string[ count ];
-        var cachedValues = new object[ count ];
-
-        for( int i = 0; i < count; i++ )
-        {
-          var itemProperty = itemProperties[ i ];
-
-          propertyNames[ i ] = PropertyRouteParser.Parse( itemProperty );
-          cachedValues[ i ] = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
-        }
-
-        // Cache the values of the never edited before row.  This will help the developer find the corresponding row
-        // in the source when times comes to commit the changes to the data source.
-        pageManager.SetCachedValuesForItem( item, propertyNames, cachedValues );
-      }
-
-      base.OnEditBegun( e );
-    }
-
-    internal override void OnEditCommitted( DataGridItemEventArgs e )
-    {
-      var item = e.Item;
-      var pageManager = this.RootGroup.GetVirtualPageManager();
-
-      // Compare cached values with current values.  If they are the same, we can clear the old values which in turn will
-      // make the item non dirty.
-      var clearIsDirty = true;
-
-      var cachedValues = pageManager.GetCachedValuesForItem( item );
-
-      Debug.Assert( cachedValues != null );
-
-      var itemProperties = this.ItemProperties;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        var currentValue = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
-
-        if( !( object.Equals( currentValue, cachedValues[ itemProperty.Name ] ) ) )
-        {
-          clearIsDirty = false;
-          break;
-        }
-      }
-
-      if( clearIsDirty )
-      {
-        // No modification was detected.
-        pageManager.ClearCachedValuesForItem( item );
-      }
-      else if( m_commitMode == CommitMode.EditCommitted )
-      {
-        pageManager.CommitAll();
-      }
-
-      base.OnEditCommitted( e );
-    }
-
-    internal override void OnEditCanceled( DataGridItemEventArgs e )
-    {
-      var item = e.Item;
-      var pageManager = this.RootGroup.GetVirtualPageManager();
-
-      // Compare cached values with current values.  If they are the same, we can clear the old values which in turn will
-      // make the item non dirty.
-      var clearIsDirty = true;
-
-      var cachedValues = pageManager.GetCachedValuesForItem( item );
-
-      Debug.Assert( cachedValues != null );
-
-      var itemProperties = this.ItemProperties;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        var currentValue = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, item );
-
-        if( !( object.Equals( currentValue, cachedValues[ PropertyRouteParser.Parse( itemProperty ) ] ) ) )
-        {
-          clearIsDirty = false;
-          break;
-        }
-      }
-
-      if( clearIsDirty )
-      {
-        pageManager.ClearCachedValuesForItem( item );
-      }
-
-      base.OnEditCanceled( e );
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region INTERNAL EVENTS
-
-    internal event EventHandler ConnectionStateChanged;
-
-    internal void OnConnectionStateChanged()
-    {
-      if( this.ConnectionStateChanged != null )
-        this.ConnectionStateChanged( this, EventArgs.Empty );
-    }
-
-    internal event EventHandler ConnectionErrorChanged;
-
-    internal void OnConnectionErrorChanged()
-    {
-      if( this.ConnectionErrorChanged != null )
-        this.ConnectionErrorChanged( this, EventArgs.Empty );
-    }
-
-    #endregion INTERNAL EVENTS
-
-
-    #region PRIVATE FIELDS
-
-    private CommitMode m_commitMode;
-
-    private int m_pageSize;
-    private double m_preemptivePageQueryRatio;
-    private int m_maxRealizedItemCount;
-
-    private object m_connectionError;
-    private DataGridConnectionState m_connectionState;
-
-    private bool m_canSynchronizeSelectionWithCurrent;
-
-    #endregion PRIVATE FIELDS
-
-
-    #region DataGridCollectionViewBase Implementation
-
-    internal override void EnsurePosition( int globalSortedIndex )
-    {
-    }
-
-    internal override void ForceRefresh( bool sendResetNotification, bool initialLoad, bool setCurrentToFirstOnInitialLoad )
-    {
-      if( this.Refreshing )
-        throw new InvalidOperationException( "An attempt was made to refresh the DataGridVirtualizingCollectionView while it is already in the process of refreshing." );
-
-      if( this.IsRefreshingDistinctValues )
-        throw new InvalidOperationException( "An attempt was made to refresh the DataGridVirtualizingCollectionView while it is already in the process of refreshing distinct values." );
-
-      this.SetCurrentEditItem( null );
-      int oldCurrentPosition = -1;
-
-      if( !initialLoad )
-        this.SaveCurrentBeforeReset( out oldCurrentPosition );
-
-      using( this.DeferCurrencyEvent() )
-      {
-        this.Refreshing = true;
-        try
-        {
-          lock( this.SyncRoot )
-          {
-            lock( this.DeferredOperationManager )
-            {
-              this.DeferredOperationManager.ClearDeferredOperations();
-
-              // We explicitly go through base so we do not end-up creating a RootGroup if there is none existing at the moment.
-              DataGridVirtualizingCollectionViewGroupBase rootGroup = base.RootGroup as DataGridVirtualizingCollectionViewGroupBase;
-              if( rootGroup != null )
-              {
-                DataGridPageManagerBase pageManager = rootGroup.GetVirtualPageManager();
-
-                // The pageManager can be null when no queryable source was set yet.
-                if( pageManager != null )
-                {
-                  // Disconnect the PageManager so that subsequent Items/Count interrogations are not processed.
-                  pageManager.Disconnect();
-
-                  // Restart all virtual lists.  The DataGridPageManagerBase will make a call to ForceRefresh once everything has been restarted if
-                  // commit operations had to be made.
-                  pageManager.Restart();
-                }
-              }
-
-              // Ensure to clear the DistinctValues cache when refreshing
-              // since the source could have changed
-              this.ResetDistinctValues();
-
-              base.RootGroup = this.CreateNewRootGroup();
-
-              // We set the current item to -1 to prevent the developper to get an invalid position.
-              // We will replace the current item to the correct one later.
-              this.SetCurrentItem( -1, null, false, false );
-            }
-          }
-        }
-        finally
-        {
-          this.Refreshing = false;
-        }
-
-        if( initialLoad )
-        {
-          this.Loaded = true;
-        }
-        else
-        {
-          this.AdjustCurrencyAfterReset( oldCurrentPosition );
-        }
-
-        if( sendResetNotification )
-        {
-          this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-        }
-
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "Groups" ) );
-      }
-    }
-
-    #endregion DataGridCollectionViewBase Implementation
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewDataProvider.cs
deleted file mode 100644
index b2bc3288..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewDataProvider.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class DataGridVirtualizingCollectionViewDataProvider : DataGridCollectionViewBaseDataProvider
-  {
-    #region CONSTRUCTORS
-
-    public DataGridVirtualizingCollectionViewDataProvider( DataGridVirtualizingCollectionViewSource parentSource )
-      : base( parentSource )
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region INTERNAL METHODS
-
-    internal override DataGridCollectionViewBase EnsureDataGridCollectionViewBaseCore()
-    {
-      DataGridVirtualizingCollectionViewSource parentSource = this.ParentSource as DataGridVirtualizingCollectionViewSource;
-
-      if( !parentSource.IsInitialized )
-        return null;
-
-      return new DataGridVirtualizingCollectionView(
-        parentSource.ItemType,
-        parentSource.AutoCreateItemProperties,
-        parentSource.PageSize,
-        parentSource.MaxRealizedItemCount );
-    }
-
-    #endregion INTERNAL METHODS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs
deleted file mode 100644
index 95c64d4f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridVirtualizingCollectionViewGroup : DataGridVirtualizingCollectionViewGroupBase, IWeakEventListener
-  {
-    private static List<DataGridGroupInfo> EmptyDataGridInfoList = new List<DataGridGroupInfo>( 0 );
-
-    internal DataGridVirtualizingCollectionViewGroup( object name, int initialItemsCount, int startGlobalIndex, DataGridVirtualizingCollectionViewGroup parent, int level, bool isBottomLevel )
-      : base( name, initialItemsCount, startGlobalIndex, parent, level, isBottomLevel )
-    {
-    }
-
-    #region GroupPath Property
-
-    internal List<DataGridGroupInfo> GroupPath
-    {
-      get
-      {
-        if( m_groupPath == null )
-        {
-          m_groupPath = this.BuildGroupPath();
-        }
-
-        return m_groupPath;
-      }
-    }
-
-    #endregion
-
-    internal override int QueryItemCount()
-    {
-      DataGridVirtualizingCollectionView collectionView = this.GetCollectionView() as DataGridVirtualizingCollectionView;
-      return collectionView.OnQueryItemCount( this );
-    }
-
-    internal override ObservableCollection<object> QuerySubCollectionViewGroupList( GroupDescription subGroupBy, int nextLevel, bool nextLevelIsBottom )
-    {
-      DataGridVirtualizingCollectionView collectionView = this.GetCollectionView() as DataGridVirtualizingCollectionView;
-
-      Debug.Assert( collectionView != null );
-
-      List<GroupNameCountPair> subGroupInfos = collectionView.OnQueryGroups( this );
-      int subGroupCount = subGroupInfos.Count;
-
-      // Create the collection of sub CollectionViewGroups
-      ObservableCollection<object> subCollectionViewGroupList = new ObservableCollection<object>();
-
-      int runningCount = this.StartGlobalIndex;
-      for( int i = 0; i < subGroupCount; i++ )
-      {
-        object subGroupName = subGroupInfos[ i ].Name;
-        int subGroupItemCount = subGroupInfos[ i ].ItemCount;
-
-        subCollectionViewGroupList.Add( new DataGridVirtualizingCollectionViewGroup( subGroupName, subGroupItemCount, runningCount, this, nextLevel, nextLevelIsBottom ) );
-
-        runningCount += subGroupItemCount;
-      }
-
-      return subCollectionViewGroupList;
-    }
-
-    private List<DataGridGroupInfo> BuildGroupPath()
-    {
-      DataGridVirtualizingCollectionViewGroup parent = this.Parent as DataGridVirtualizingCollectionViewGroup;
-
-      if( parent == null )
-        return new List<DataGridGroupInfo>();
-
-      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
-
-      ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
-
-      int level = this.Level;
-
-      Debug.Assert( this.Level != -1, "A DataGridCollectionViewGroupRoot should have returned a new List since its parent should have been null." );
-
-      List<DataGridGroupInfo> groupPath = new List<DataGridGroupInfo>( parent.GroupPath );
-
-      Debug.Assert( groupDescriptions.Count > level );
-
-      if( groupDescriptions.Count > level )
-      {
-        groupPath.Add( new DataGridGroupInfo( groupDescriptions[ level ], this ) );
-      }
-
-      return groupPath;
-    }
-
-    private List<DataGridGroupInfo> m_groupPath;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs
deleted file mode 100644
index bdad311d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class DataGridVirtualizingCollectionViewGroupBase : CollectionViewGroup, IWeakEventListener, IDisposable
-  {
-    internal DataGridVirtualizingCollectionViewGroupBase(
-      object name,
-      int initialItemsCount,
-      int startGlobalIndex,
-      DataGridVirtualizingCollectionViewGroupBase parent,
-      int level,
-      bool isBottomLevel )
-      : base( name )
-    {
-      m_parent = parent;
-      m_level = level;
-      m_isBottomLevel = isBottomLevel;
-      m_virtualItemCount = initialItemsCount;
-      m_startGlobalIndex = startGlobalIndex;
-    }
-
-    #region ItemCount (Obselete) Property
-
-    [Obsolete( "The ItemCount property is obsolete and has been replaced by the VirtualItemCount property. When referencing through a CollectionViewGroup, the CollectionViewGroupExtensions.GetItemCount extension method can be used.", true )]
-    public new int ItemCount
-    {
-      get
-      {
-        return this.VirtualItemCount;
-      }
-    }
-
-    #endregion
-
-    #region Items (Obselete) Property
-
-    [Obsolete( "The Items property is obsolete and has been replaced by the VirtualItems property. When referencing through a CollectionViewGroup, the CollectionViewGroupExtensions.GetItems extension method can be used.", true )]
-    public new ReadOnlyObservableCollection<object> Items
-    {
-      get
-      {
-        return base.Items;
-      }
-    }
-
-    #endregion
-
-    #region VirtualItemCount Property
-
-    public int VirtualItemCount
-    {
-      get
-      {
-        if( this.GetVirtualPageManager() == null )
-          return 0;
-
-        if( m_virtualItemCount == -1 )
-        {
-          if( m_isBottomLevel )
-          {
-            this.EnsureProtectedVirtualItems();
-            m_virtualItemCount = m_protectedVirtualItems.Count;
-          }
-          else
-          {
-            m_virtualItemCount = this.QueryItemCount();
-          }
-        }
-
-        return m_virtualItemCount;
-      }
-    }
-
-    #endregion
-
-    #region VirtualItems Property
-
-    public IList<object> VirtualItems
-    {
-      get
-      {
-        if( m_virtualItems == null )
-        {
-          this.EnsureProtectedVirtualItems();
-
-          ObservableCollection<object> observableProtectedItems = m_protectedVirtualItems as ObservableCollection<object>;
-
-          if( observableProtectedItems != null )
-          {
-            Debug.Assert( !m_isBottomLevel );
-            m_virtualItems = new ReadOnlyObservableCollection<object>( observableProtectedItems );
-          }
-          else
-          {
-            Debug.Assert( m_isBottomLevel );
-            m_virtualItems = m_protectedVirtualItems;
-          }
-        }
-
-        return m_virtualItems;
-      }
-    }
-
-    #endregion
-
-    #region IsBottomLevel Property
-
-    public override bool IsBottomLevel
-    {
-      get
-      {
-        return m_isBottomLevel;
-      }
-    }
-
-    #endregion
-
-    #region Parent Property
-
-    internal DataGridVirtualizingCollectionViewGroupBase Parent
-    {
-      get
-      {
-        return m_parent;
-      }
-    }
-
-    #endregion
-
-    #region Level Property
-
-    internal int Level
-    {
-      get
-      {
-        return m_level;
-      }
-    }
-
-    #endregion
-
-    #region StartGlobalIndex Property
-
-    internal int StartGlobalIndex
-    {
-      get
-      {
-        return m_startGlobalIndex;
-      }
-    }
-
-    #endregion
-
-    protected virtual DataGridVirtualizingCollectionViewBase GetCollectionView()
-    {
-      if( m_parent != null )
-        return m_parent.GetCollectionView();
-
-      return null;
-    }
-
-    internal abstract int QueryItemCount();
-
-    internal abstract ObservableCollection<object> QuerySubCollectionViewGroupList( GroupDescription subGroupBy, int nextLevel, bool nextLevelIsBottom );
-
-    internal virtual GroupDescription GetSubGroupBy()
-    {
-      CollectionView collectionView = this.GetCollectionView();
-
-      ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
-
-      int groupDescriptionsCount = ( groupDescriptions == null ) ? 0 : groupDescriptions.Count;
-
-      if( groupDescriptionsCount == 0 )
-        return null;
-
-      DataGridVirtualizingCollectionViewGroupBase parentCollectionViewGroup = this.Parent;
-
-      int level = 0;
-      while( parentCollectionViewGroup != null )
-      {
-        level++;
-        parentCollectionViewGroup = parentCollectionViewGroup.Parent;
-      }
-
-      Debug.Assert( groupDescriptionsCount >= level );
-
-      return groupDescriptions[ level ];
-    }
-
-    internal virtual void OnProtectedVirtualItemsCreated( IList<object> protectedVirtualItems )
-    {
-    }
-
-    internal virtual void DisposeCore()
-    {
-      m_protectedVirtualItems = new List<object>();
-      m_virtualItems = m_protectedVirtualItems;
-      m_parent = null;
-    }
-
-    internal virtual int GetGlobalIndexOf( object item )
-    {
-      return m_parent.GetGlobalIndexOf( item );
-    }
-
-    internal virtual DataGridPageManagerBase GetVirtualPageManager()
-    {
-      return m_parent.GetVirtualPageManager();
-    }
-
-    internal object GetItemAtGlobalIndex( int globalIndex )
-    {
-      Func<int, DataGridVirtualizingCollectionViewGroupBase, object> getItemFunction = ( localIndex, cvg ) =>
-      {
-        return cvg.m_protectedVirtualItems[ localIndex ];
-      };
-
-      return this.OperateOnGlobalIndex( globalIndex, getItemFunction );
-    }
-
-    internal void LockGlobalIndex( int globalIndex )
-    {
-      Func<int, DataGridVirtualizingCollectionViewGroupBase, object> lockingAction = ( localIndex, cvg ) =>
-      {
-        VirtualList virtualItemList = cvg.VirtualItems as VirtualList;
-
-        if( virtualItemList != null )
-        {
-          virtualItemList.LockPageForLocalIndex( localIndex );
-        }
-
-        return null;
-      };
-
-      this.OperateOnGlobalIndex( globalIndex, lockingAction );
-    }
-
-    internal void UnlockGlobalIndex( int globalIndex )
-    {
-      var collectionView = this.GetCollectionView();
-
-      if( collectionView != null )
-      {
-        var rootGroup = collectionView.RootGroup;
-
-        // This can happen when refreshing a CollectionView and the record count has changed in such a way that the global index to unlock is out of range of the new count.
-        if( ( rootGroup != null ) && ( ( globalIndex >= rootGroup.m_virtualItemCount ) ) )
-          return;
-      }
-
-      Func<int, DataGridVirtualizingCollectionViewGroupBase, object> unlockingAction = ( localIndex, cvg ) =>
-      {
-        VirtualList virtualItemList = cvg.VirtualItems as VirtualList;
-
-        if( virtualItemList != null )
-        {
-          virtualItemList.UnlockPageForLocalIndex( localIndex );
-        }
-
-        return null;
-      };
-
-      this.OperateOnGlobalIndex( globalIndex, unlockingAction );
-    }
-
-    private void EnsureProtectedVirtualItems()
-    {
-      if( m_protectedVirtualItems != null )
-        return;
-
-      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
-
-      Debug.Assert( collectionView != null );
-
-      if( m_isBottomLevel )
-      {
-        m_protectedVirtualItems = this.CreateNewVirtualList();
-      }
-      else
-      {
-        ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
-
-        int groupDescriptionCount = ( groupDescriptions == null ) ? 0 : groupDescriptions.Count;
-
-        int nextLevel = m_level + 1;
-
-        if( nextLevel > ( groupDescriptionCount - 1 ) )
-          throw new DataGridInternalException( "At attempt was made to retrieve child groups for a non-existing group description." );
-
-        GroupDescription subGroupBy = groupDescriptions[ nextLevel ];
-
-        if( subGroupBy == null )
-          throw new InvalidOperationException( "TODDOOC: " );
-
-        bool nextLevelIsBottom = ( nextLevel == ( groupDescriptionCount - 1 ) );
-
-        m_protectedVirtualItems = this.QuerySubCollectionViewGroupList( subGroupBy, nextLevel, nextLevelIsBottom );
-      }
-    }
-
-    private VirtualList CreateNewVirtualList()
-    {
-      Debug.Assert( m_isBottomLevel );
-
-      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
-
-      DataGridPageManagerBase virtualPageManagerBase = collectionView.RootGroup.GetVirtualPageManager();
-
-      VirtualList virtualItemList = new VirtualList( virtualPageManagerBase, m_virtualItemCount );
-      virtualPageManagerBase.LinkVirtualListAndCollectionViewGroup( virtualItemList, this );
-
-      return virtualItemList;
-    }
-
-    private int GetSubLevelCount()
-    {
-      CollectionView collectionView = this.GetCollectionView();
-
-      ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
-
-      int groupDescriptionsCount = ( groupDescriptions == null ) ? 0 : groupDescriptions.Count;
-
-      DataGridVirtualizingCollectionViewGroupBase parentCollectionViewGroup = this.Parent;
-
-      int level = 0;
-      while( parentCollectionViewGroup != null )
-      {
-        level++;
-        parentCollectionViewGroup = parentCollectionViewGroup.Parent;
-      }
-
-      Debug.Assert( groupDescriptionsCount >= level );
-
-      return ( groupDescriptionsCount - level );
-    }
-
-    private object OperateOnGlobalIndex( int index, Func<int, DataGridVirtualizingCollectionViewGroupBase, object> function )
-    {
-      this.EnsureProtectedVirtualItems();
-
-      if( this.IsBottomLevel )
-      {
-        return function( index, this );
-      }
-      else
-      {
-        // The Count property of the virtualItems collection will return the sub-group count since this is not the bottom level.
-        int count = m_protectedVirtualItems.Count;
-
-        for( int i = 0; i < count; i++ )
-        {
-          DataGridVirtualizingCollectionViewGroupBase subGroup = m_protectedVirtualItems[ i ] as DataGridVirtualizingCollectionViewGroupBase;
-
-          if( subGroup == null )
-            throw new InvalidOperationException( "Sub-group cannot be null (Nothing in Visual Basic)." );
-
-          // VirtualItemCount will return the sum of data items contained in this group and its possible subgroups.
-          int subGroupItemCount = subGroup.VirtualItemCount;
-
-          if( index < subGroupItemCount )
-            return subGroup.OperateOnGlobalIndex( index, function );
-
-          index -= subGroupItemCount;
-        }
-      }
-
-      throw new ArgumentOutOfRangeException( "index" );
-    }
-
-    private void OnVirtualItemListCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
-
-      lock( collectionView.DeferredOperationManager )
-      {
-        DeferredOperation deferredOperation = null;
-
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Replace:
-            {
-              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Replace, -1, e.NewStartingIndex + m_startGlobalIndex,
-                                                         e.NewItems, e.OldStartingIndex + m_startGlobalIndex, e.OldItems );
-              break;
-            }
-
-          case NotifyCollectionChangedAction.Reset:
-            {
-              deferredOperation = new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null );
-              break;
-            }
-
-          default:
-            throw new NotSupportedException( e.Action.ToString() + " is not a supported action." );
-        }
-
-        if( deferredOperation != null )
-        {
-          collectionView.ExecuteOrQueueSourceItemOperation( deferredOperation );
-        }
-      }
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.OnVirtualItemListCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-        return true;
-      }
-
-      return false;
-    }
-
-    #endregion IWeakEventListener Members
-
-    #region IDisposable Members
-
-    public void Dispose()
-    {
-      this.DisposeCore();
-    }
-
-    #endregion
-
-    private bool m_isBottomLevel;
-    private int m_level;
-
-    private int m_startGlobalIndex;
-    private int m_virtualItemCount;
-
-    private IList<object> m_protectedVirtualItems;
-    private IList<object> m_virtualItems;
-
-    private DataGridVirtualizingCollectionViewGroupBase m_parent;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs
deleted file mode 100644
index 23038be3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  internal class DataGridVirtualizingCollectionViewGroupRoot : DataGridVirtualizingCollectionViewGroup
-  {
-    internal DataGridVirtualizingCollectionViewGroupRoot( DataGridVirtualizingCollectionView collectionView, bool isBottomLevel )
-      : base( null, -1, 0, null, -1, isBottomLevel )
-    {
-      m_parentCollectionView = collectionView;
-      m_virtualPageManager = new DataGridPageManager( collectionView );
-    }
-
-    protected override DataGridVirtualizingCollectionViewBase GetCollectionView()
-    {
-      return m_parentCollectionView;
-    }
-
-    internal override int GetGlobalIndexOf( object item )
-    {
-      return m_virtualPageManager.GetGlobalIndexOf( item );
-    }
-
-    internal override DataGridPageManagerBase GetVirtualPageManager()
-    {
-      return m_virtualPageManager;
-    }
-
-    internal override void DisposeCore()
-    {
-      m_parentCollectionView = null;
-      m_virtualPageManager = null;
-      base.DisposeCore();
-    }
-
-    private DataGridVirtualizingCollectionView m_parentCollectionView;
-    private DataGridPageManager m_virtualPageManager;
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs
deleted file mode 100644
index 52a9e952..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DataGridVirtualizingCollectionViewSource : DataGridVirtualizingCollectionViewSourceBase
-  {
-    #region CONSTRUCTORS
-
-    static DataGridVirtualizingCollectionViewSource()
-    {
-      CollectionViewSource.CollectionViewTypeProperty.OverrideMetadata(
-        typeof( DataGridVirtualizingCollectionViewSource ),
-        new FrameworkPropertyMetadata( typeof( DataGridVirtualizingCollectionView ) ) );
-    }
-
-    public DataGridVirtualizingCollectionViewSource()
-      : base()
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region DATA VIRTUALIZATION EVENTS
-
-    public event EventHandler<QueryItemCountEventArgs> QueryItemCount;
-
-    internal void OnQueryItemCount( QueryItemCountEventArgs e )
-    {
-      if( this.QueryItemCount != null )
-        this.QueryItemCount( this, e );
-    }
-
-    public event EventHandler<QueryGroupsEventArgs> QueryGroups;
-
-    internal void OnQueryGroups( QueryGroupsEventArgs e )
-    {
-      if( this.QueryGroups != null )
-        this.QueryGroups( this, e );
-    }
-
-    public event EventHandler<QueryItemsEventArgs> AbortQueryItems;
-
-    internal void OnAbortQueryItems( QueryItemsEventArgs e )
-    {
-      if( this.AbortQueryItems != null )
-        this.AbortQueryItems( this, e );
-    }
-
-    public event EventHandler<QueryItemsEventArgs> QueryItems;
-
-    internal void OnQueryItems( QueryItemsEventArgs e )
-    {
-      if( this.QueryItems != null )
-        this.QueryItems( this, e );
-    }
-
-    #endregion DATA VIRTUALIZATION EVENTS
-
-
-    internal override DataGridCollectionViewBaseDataProvider CreateDataProvider()
-    {
-      return new DataGridVirtualizingCollectionViewDataProvider( this );
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs
deleted file mode 100644
index eba1b266..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public abstract class DataGridVirtualizingCollectionViewSourceBase : DataGridCollectionViewSourceBase
-  {
-    public DataGridVirtualizingCollectionViewSourceBase()
-    {
-      this.Source = null;
-
-      m_isInitialized = true;
-      this.DataSourceProvider.DelayRefresh( this.Dispatcher, System.Windows.Threading.DispatcherPriority.DataBind );
-    }
-
-    #region PageSize Property
-
-    public static readonly DependencyProperty PageSizeProperty = DependencyProperty.Register(
-      "PageSize", typeof( int ), typeof( DataGridVirtualizingCollectionViewSourceBase ),
-      new UIPropertyMetadata( DataGridVirtualizingCollectionViewBase.DefaultPageSize ) );
-
-    public int PageSize
-    {
-      get
-      {
-        return ( int )this.GetValue( DataGridVirtualizingCollectionViewSourceBase.PageSizeProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridVirtualizingCollectionViewSourceBase.PageSizeProperty, value );
-
-        if( this.DataSourceProvider != null )
-          this.DataSourceProvider.DelayRefresh( this.Dispatcher, System.Windows.Threading.DispatcherPriority.DataBind );
-      }
-    }
-
-    #endregion PageSize Property
-
-    #region MaxRealizedItemCount
-
-    public static readonly DependencyProperty MaxRealizedItemCountProperty = DependencyProperty.Register(
-      "MaxRealizedItemCount", typeof( int ), typeof( DataGridVirtualizingCollectionViewSourceBase ),
-      new UIPropertyMetadata( DataGridVirtualizingCollectionViewBase.DefaultMaxRealizedItemCount ) );
-
-    public int MaxRealizedItemCount
-    {
-      get
-      {
-        return ( int )GetValue( DataGridVirtualizingCollectionViewSourceBase.MaxRealizedItemCountProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridVirtualizingCollectionViewSourceBase.MaxRealizedItemCountProperty, value );
-
-        if( this.DataSourceProvider != null )
-          this.DataSourceProvider.DelayRefresh( this.Dispatcher, System.Windows.Threading.DispatcherPriority.DataBind );
-      }
-    }
-
-    #endregion MaxRealizedItemCount
-
-    #region PreemptivePageQueryRatio
-
-    public static readonly DependencyProperty PreemptivePageQueryRatioProperty = DependencyProperty.Register(
-      "PreemptivePageQueryRatio", typeof( double ), typeof( DataGridVirtualizingCollectionViewSourceBase ),
-      new UIPropertyMetadata( DataGridVirtualizingCollectionViewBase.DefaultPreemptivePageQueryRatio,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceBaseDependencyPropertyChanged ) ) );
-
-    public double PreemptivePageQueryRatio
-    {
-      get
-      {
-        return ( double )GetValue( DataGridVirtualizingCollectionViewSourceBase.PreemptivePageQueryRatioProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridVirtualizingCollectionViewSourceBase.PreemptivePageQueryRatioProperty, value );
-      }
-    }
-
-    #endregion PreemptivePageQueryRatio
-
-    #region CommitMode
-
-    public static readonly DependencyProperty CommitModeProperty = DependencyProperty.Register(
-      "CommitMode", typeof( CommitMode ), typeof( DataGridVirtualizingCollectionViewSourceBase ),
-      new UIPropertyMetadata( CommitMode.PageReleasedFromMemory,
-        new PropertyChangedCallback( DataGridCollectionViewSourceBase.OnDataGridCollectionViewSourceBaseDependencyPropertyChanged ) ) );
-
-    public CommitMode CommitMode
-    {
-      get
-      {
-        return ( CommitMode )GetValue( DataGridVirtualizingCollectionViewSourceBase.CommitModeProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridVirtualizingCollectionViewSourceBase.CommitModeProperty, value );
-      }
-    }
-
-    #endregion CommitMode
-
-    #region DATA VIRTUALIZATION EVENTS
-
-    public event EventHandler<CommitItemsEventArgs> CommitItems;
-
-    internal void OnCommitItems( CommitItemsEventArgs e )
-    {
-      if( this.CommitItems != null )
-        this.CommitItems( this, e );
-    }
-
-    #endregion DATA VIRTUALIZATION EVENTS
-
-    #region INTERNAL PROPERTIES
-
-    internal bool IsInitialized
-    {
-      get
-      {
-        return m_isInitialized;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
-    internal override void ApplyExtraPropertiesToView( DataGridCollectionViewBase currentView )
-    {
-      base.ApplyExtraPropertiesToView( currentView );
-
-      DataGridVirtualizingCollectionViewBase dataGridVirtualizingCollectionView = currentView as DataGridVirtualizingCollectionViewBase;
-
-      dataGridVirtualizingCollectionView.PreemptivePageQueryRatio = this.PreemptivePageQueryRatio;
-      dataGridVirtualizingCollectionView.CommitMode = this.CommitMode;
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE FIELDS
-
-    private bool m_isInitialized;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs
deleted file mode 100644
index 9f9f979c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public sealed class DataGridVirtualizingQueryableCollectionView : DataGridVirtualizingCollectionViewBase
-  {
-    public DataGridVirtualizingQueryableCollectionView()
-      : this( null, true, DataGridVirtualizingCollectionViewBase.DefaultPageSize, DataGridVirtualizingCollectionViewBase.DefaultMaxRealizedItemCount )
-    {
-    }
-
-    public DataGridVirtualizingQueryableCollectionView( IQueryable queryableSource )
-      : this( queryableSource, true, DataGridVirtualizingCollectionViewBase.DefaultPageSize, DataGridVirtualizingCollectionViewBase.DefaultMaxRealizedItemCount )
-    {
-    }
-
-    public DataGridVirtualizingQueryableCollectionView( IQueryable queryableSource, bool autoCreateItemProperties, int pageSize, int maxRealizedItemCount )
-      : base( queryableSource, null, autoCreateItemProperties, pageSize, maxRealizedItemCount )
-    {
-      m_pageManagerSyncRoot = new object();
-    }
-
-    #region QueryableSource PROPERTY
-
-    public IQueryable QueryableSource
-    {
-      get
-      {
-        return this.ModelSource as IQueryable;
-      }
-    }
-
-    #endregion QueryableSource PROPERTY
-
-    #region INTERNAL METHODS
-
-    internal override DataGridVirtualizingCollectionViewGroupBase CreateNewRootGroup()
-    {
-      bool rootIsBottomLevel = ( this.GroupDescriptions == null ) ? true : ( this.GroupDescriptions.Count == 0 );
-
-      return new DataGridVirtualizingQueryableCollectionViewGroupRoot( this, m_pageManagerSyncRoot, rootIsBottomLevel );
-    }
-
-    internal override System.Collections.IEnumerator GetVirtualEnumerator()
-    {
-      return ( ( DataGridVirtualizingQueryableCollectionViewGroupRoot )this.RootGroup ).GetVirtualPageManager().GetEnumerator();
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private object m_pageManagerSyncRoot;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewDataProvider.cs
deleted file mode 100644
index d1fde7e8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewDataProvider.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class DataGridVirtualizingQueryableCollectionViewDataProvider : DataGridCollectionViewBaseDataProvider
-  {
-    #region CONSTRUCTORS
-
-    public DataGridVirtualizingQueryableCollectionViewDataProvider( DataGridVirtualizingQueryableCollectionViewSource parentSource )
-      : base( parentSource )
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region INTERNAL METHODS
-
-    internal override DataGridCollectionViewBase EnsureDataGridCollectionViewBaseCore()
-    {
-      DataGridVirtualizingQueryableCollectionViewSource parentSource = this.ParentSource as DataGridVirtualizingQueryableCollectionViewSource;
-
-      if( !parentSource.IsInitialized )
-        return null;
-
-      return new DataGridVirtualizingQueryableCollectionView( 
-        parentSource.QueryableSource, 
-        parentSource.AutoCreateItemProperties,
-        parentSource.PageSize,
-        parentSource.MaxRealizedItemCount );
-    }
-
-    #endregion INTERNAL METHODS
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroup.cs
deleted file mode 100644
index 4a575760..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroup.cs
+++ /dev/null
@@ -1,283 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Diagnostics;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridVirtualizingQueryableCollectionViewGroup : DataGridVirtualizingCollectionViewGroupBase
-  {
-    #region CONSTRUCTORS
-
-    public DataGridVirtualizingQueryableCollectionViewGroup(
-      object name,
-      int initialItemsCount,
-      int startGlobalIndex,
-      DataGridVirtualizingQueryableCollectionViewGroup parent,
-      int level,
-      bool isBottomLevel )
-      : base( name, initialItemsCount, startGlobalIndex, parent, level, isBottomLevel )
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region INTERNAL PROPERTIES
-
-    internal IQueryable UnsortedFilteredQueryable
-    {
-      get
-      {
-        if( m_unsortedFilteredQueryable == null )
-          m_unsortedFilteredQueryable = this.CreateUnsortedFilteredQueryable();
-
-        return m_unsortedFilteredQueryable;
-      }
-    }
-
-    internal IQueryable Queryable
-    {
-      get
-      {
-        if( m_selectQueryable == null )
-          m_selectQueryable = this.CreateSelectQueryable( false );
-
-        return m_selectQueryable;
-      }
-    }
-
-    internal IQueryable ReversedQueryable
-    {
-      get
-      {
-        if( m_reversedSelectQueryable == null )
-          m_reversedSelectQueryable = this.CreateSelectQueryable( true );
-
-        return m_reversedSelectQueryable;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
-    internal override int QueryItemCount()
-    {
-      if( this.UnsortedFilteredQueryable != null )
-      {
-        try
-        {
-          return this.UnsortedFilteredQueryable.Count();
-        }
-        catch
-        {
-          // Timeout or other error occured.
-        }
-      }
-
-      return 0;
-    }
-
-    internal override ObservableCollection<object> QuerySubCollectionViewGroupList( GroupDescription childGroupBy, int nextLevel, bool nextLevelIsBottom )
-    {
-      string childGroupByPropertyName = DataGridCollectionViewBase.GetPropertyNameFromGroupDescription( childGroupBy );
-
-      if( String.IsNullOrEmpty( childGroupByPropertyName ) )
-        throw new NotSupportedException( "Custom groups are not supported when using a DataGridVirtualizingQueryableCollectionView." );
-
-      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
-
-      bool sortGroupBy = false;
-      ListSortDirection groupByDirection = ListSortDirection.Ascending;
-
-      foreach( SortDescription sortDescription in collectionView.SortDescriptions )
-      {
-        if( sortDescription.PropertyName == childGroupByPropertyName )
-        {
-          sortGroupBy = true;
-          groupByDirection = sortDescription.Direction;
-          break;
-        }
-      }
-
-      IQueryable groupsAndCountsQueryable = this.Queryable.GetSubGroupsAndCountsQueryable( childGroupByPropertyName, sortGroupBy, groupByDirection );
-
-      List<QueryableExtensions.IQueryableGroupNameCountPair> distinctValuesAndCounts = new List<QueryableExtensions.IQueryableGroupNameCountPair>();
-      try
-      {
-        System.Collections.IEnumerator enumerator = groupsAndCountsQueryable.GetEnumerator();
-
-        while( enumerator.MoveNext() )
-        {
-          QueryableExtensions.IQueryableGroupNameCountPair current = enumerator.Current as QueryableExtensions.IQueryableGroupNameCountPair;
-
-          if( current != null )
-            distinctValuesAndCounts.Add( current );
-        }
-      }
-      catch
-      {
-        // TimeOut exception on the connection or other.
-        distinctValuesAndCounts.Clear();
-      }
-
-
-      // If we are not the bottom level, we should have subgroups.
-      // However, if the connection timed out and the catch statement set the coundAndDistinctValues to an empty array,
-      // then we shouldn't add anything.  We cannot reset on the spot since we might already be resetting.
-
-
-      // Create the collection of sub CollectionViewGroups
-      ObservableCollection<object> subCollectionViewGroupList = new ObservableCollection<object>();
-
-      int runningCount = this.StartGlobalIndex;
-      int distinctValuesCount = distinctValuesAndCounts.Count;
-      for( int i = 0; i < distinctValuesCount; i++ )
-      {
-        QueryableExtensions.IQueryableGroupNameCountPair queryableGroupNameCountPair = distinctValuesAndCounts[ i ];
-
-        subCollectionViewGroupList.Add(
-          new DataGridVirtualizingQueryableCollectionViewGroup( queryableGroupNameCountPair.GroupName, queryableGroupNameCountPair.Count, runningCount, this, nextLevel, nextLevelIsBottom ) );
-
-        runningCount += queryableGroupNameCountPair.Count;
-      }
-
-      return subCollectionViewGroupList;
-    }
-
-    internal virtual IQueryable CreateUnsortedFilteredQueryable()
-    {
-      int level = this.Level;
-
-      Debug.Assert( ( level > -1 ), "The DataGridVirtualizingGroupRoot should have overriden this method without calling base." );
-
-      // Sub group.  Only group from parent, which will already be sorted.
-      DataGridVirtualizingQueryableCollectionViewGroup parentCollectionViewGroup = this.Parent as DataGridVirtualizingQueryableCollectionViewGroup;
-
-      IQueryable parentUnsortedQueryable = parentCollectionViewGroup.UnsortedFilteredQueryable;
-
-      Debug.Assert( parentUnsortedQueryable != null );
-
-      if( parentUnsortedQueryable == null )
-        return null;
-
-      // Narrow the filter to this group's clauses.
-      return this.FilterQueryable( parentUnsortedQueryable );
-    }
-
-    internal IQueryable CreateSelectQueryable( bool reversed )
-    {
-      // Sub group.  Only group from parent.  The sorting will be appended just before the Slice statement.
-      IQueryable queryable = this.UnsortedFilteredQueryable;
-
-      return this.SortQueryable( queryable, reversed );
-    }
-
-    internal override void DisposeCore()
-    {
-      m_unsortedFilteredQueryable = null;
-      m_reversedSelectQueryable = null;
-      m_selectQueryable = null;
-      base.DisposeCore();
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE METHODS
-
-    private IQueryable FilterQueryable( IQueryable queryable )
-    {
-      // Filters a queryable to match this Group's clause.
-      // This method does not apply the AutoFilter clauses or the FilterRow clauses.
-      // It is the DataGridVirtualizingQueryableCollectionViewGroupRoot's job to do so on the
-      // base queryable used as a base for all other queryables.
-
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      int level = this.Level;
-
-      DataGridVirtualizingCollectionViewBase collectionView = this.GetCollectionView();
-
-      ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
-
-      Debug.Assert( ( groupDescriptions != null ) && ( level < groupDescriptions.Count ) );
-
-      DataGridGroupDescription groupBy = groupDescriptions[ level ] as DataGridGroupDescription;
-
-      Debug.Assert( groupBy != null );
-
-      ParameterExpression sharedParameterExpression = queryable.CreateParameterExpression();
-
-      Expression expression = queryable.CreateEqualExpression( sharedParameterExpression, groupBy.PropertyName, this.Name );
-      return queryable.WhereFilter( sharedParameterExpression, expression );
-    }
-
-    private IQueryable SortQueryable( IQueryable queryable, bool reverseSort )
-    {
-      DataGridVirtualizingCollectionViewBase parentCollectionView = this.GetCollectionView();
-
-      Debug.Assert( parentCollectionView != null );
-
-      SortDescriptionCollection explicitSortDescriptions = parentCollectionView.SortDescriptions;
-
-      ListSortDirection directionToUseForImplicitSortDescriptions = ListSortDirection.Ascending;
-
-      if( explicitSortDescriptions.Count > 0 )
-        directionToUseForImplicitSortDescriptions = explicitSortDescriptions[ explicitSortDescriptions.Count - 1 ].Direction;
-
-      SortDescriptionCollection implicitSortDescriptions = new SortDescriptionCollection();
-
-      DataGridVirtualizingQueryableCollectionViewGroupRoot groupRoot =
-        parentCollectionView.RootGroup as DataGridVirtualizingQueryableCollectionViewGroupRoot;
-
-      Debug.Assert( groupRoot != null );
-
-      string[] primaryKeys = groupRoot.PrimaryKeys;
-
-      if( primaryKeys != null )
-      {
-        for( int i = 0; i < primaryKeys.Length; i++ )
-        {
-          string primaryKey = primaryKeys[ i ];
-
-          Debug.Assert( !string.IsNullOrEmpty( primaryKey ) );
-
-          implicitSortDescriptions.Add( new SortDescription( primaryKey, directionToUseForImplicitSortDescriptions ) );
-        }
-      }
-
-      return queryable.OrderBy( implicitSortDescriptions, explicitSortDescriptions, reverseSort );
-    }
-
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
-    private IQueryable m_unsortedFilteredQueryable;
-    private IQueryable m_selectQueryable;
-    private IQueryable m_reversedSelectQueryable;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs
deleted file mode 100644
index 44c4c1f3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.ComponentModel;
-using System.Collections;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridVirtualizingQueryableCollectionViewGroupRoot : DataGridVirtualizingQueryableCollectionViewGroup
-  {
-    #region CONSTRUCTORS
-
-    internal DataGridVirtualizingQueryableCollectionViewGroupRoot( 
-      DataGridVirtualizingQueryableCollectionView collectionView, 
-      object pageManagerSyncRoot, 
-      bool isBottomLevel )
-      : base( null, -1, 0, null, -1, isBottomLevel )
-    {
-      m_parentCollectionView = collectionView;
-      m_queryableSource = m_parentCollectionView.QueryableSource;
-
-      if( m_queryableSource != null )
-      {
-        m_primaryKeyPropertyNames = m_queryableSource.FindPrimaryKeys();
-        // Primary key optimizations are only possible when only one primary key is identified in the source.
-        // When dealing with sources defining more than one primary key, we would need to know in which order
-        bool supportsPrimaryKeyOptimizations = ( ( m_primaryKeyPropertyNames != null ) && ( m_primaryKeyPropertyNames.Length == 1 ) );
-
-        m_virtualPageManager = new DataGridLINQPageManager( collectionView,
-          pageManagerSyncRoot, 
-          supportsPrimaryKeyOptimizations );
-      }
-    }
-
-
-    #endregion CONSTRUCTORS
-
-    #region PROTECTED METHODS
-
-    protected override DataGridVirtualizingCollectionViewBase GetCollectionView()
-    {
-      return m_parentCollectionView;
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region INTERNAL PROPERTIES
-
-    public string[] PrimaryKeys
-    {
-      get
-      {
-        return m_primaryKeyPropertyNames;
-      }
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
-    internal override IQueryable CreateUnsortedFilteredQueryable()
-    {
-      return m_queryableSource;
-    }
-
-    internal override int GetGlobalIndexOf( object item )
-    {
-      return m_virtualPageManager.GetGlobalIndexOf( item );
-    }
-
-    internal override DataGridPageManagerBase GetVirtualPageManager()
-    {
-      return m_virtualPageManager;
-    }
-
-    internal object[] GetItemPropertyDistinctValues( DataGridItemPropertyBase dataGridItemProperty )
-    {
-      if( m_queryableSource == null )
-        return new object[ 0 ];
-
-      IQueryable distinctQueryable = m_queryableSource.GetSubGroupsAndCountsQueryable( dataGridItemProperty.Name, false, ListSortDirection.Ascending );
-
-      List<object> distinctValuesAndCounts = new List<object>();
-      try
-      {
-        System.Collections.IEnumerator enumerator = distinctQueryable.GetEnumerator();
-
-        while( enumerator.MoveNext() )
-        {
-          QueryableExtensions.IQueryableGroupNameCountPair current = enumerator.Current as QueryableExtensions.IQueryableGroupNameCountPair;
-
-          if( current != null )
-            distinctValuesAndCounts.Add( current.GroupName );
-        }
-
-        return distinctValuesAndCounts.ToArray();
-      }
-      catch
-      {
-        // TimeOut exception on the connection or other.
-        return new object[ 0 ];
-      }
-    }
-
-    internal override void DisposeCore()
-    {
-      m_parentCollectionView = null;
-      m_queryableSource = null;
-      m_virtualPageManager = null;
-      base.DisposeCore();
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE FIELDS
-
-    private DataGridVirtualizingQueryableCollectionView m_parentCollectionView;
-
-    private IQueryable m_queryableSource;
-
-    private string[] m_primaryKeyPropertyNames;
-
-    private DataGridLINQPageManager m_virtualPageManager;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs
deleted file mode 100644
index 42fb6592..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataGridVirtualizingQueryableCollectionViewSource : DataGridVirtualizingCollectionViewSourceBase
-  {
-    static DataGridVirtualizingQueryableCollectionViewSource()
-    {
-      CollectionViewSource.CollectionViewTypeProperty.OverrideMetadata(
-        typeof( DataGridVirtualizingQueryableCollectionViewSource ),
-        new FrameworkPropertyMetadata( typeof( DataGridVirtualizingQueryableCollectionView ) ) );
-    }
-
-    #region QueryableSource Property
-
-    public static readonly DependencyProperty QueryableSourceProperty = DependencyProperty.Register(
-      "QueryableSource",
-      typeof( IQueryable ),
-      typeof( DataGridVirtualizingQueryableCollectionViewSource ),
-      new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( DataGridVirtualizingQueryableCollectionViewSource.OnQueryableSourcePropertyChanged ) ) );
-
-    public IQueryable QueryableSource
-    {
-      get
-      {
-        return ( IQueryable )GetValue( DataGridVirtualizingQueryableCollectionViewSource.QueryableSourceProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridVirtualizingQueryableCollectionViewSource.QueryableSourceProperty, value );
-      }
-    }
-
-    private static void OnQueryableSourcePropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var source = sender as DataGridCollectionViewSourceBase;
-      if( source == null )
-        return;
-
-      source.AdviseForwardedPropertyChanged();
-
-      var provider = source.DataSourceProvider;
-      if( provider != null )
-      {
-        provider.DelayRefresh( source.Dispatcher, DispatcherPriority.DataBind );
-      }
-    }
-
-    #endregion
-
-    internal override DataGridCollectionViewBaseDataProvider CreateDataProvider()
-    {
-      return new DataGridVirtualizingQueryableCollectionViewDataProvider( this );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs
deleted file mode 100644
index 5fc2db7b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataRelationDetailDescription : DataGridDetailDescription
-  {
-    public DataRelationDetailDescription()
-      : base()
-    {
-    }
-
-    public DataRelationDetailDescription( DataRelation relation )
-      : this()
-    {
-      if( relation == null )
-        throw new ArgumentNullException( "relation" );
-
-      this.DataRelation = relation;
-      m_userAssignedDataRelation = true;
-    }
-
-    #region DataRelation Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public DataRelation DataRelation
-    {
-      get
-      {
-        return m_dataRelation;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "DataRelation" );
-
-        if( this.InternalIsSealed )
-          throw new InvalidOperationException( "An attempt was made to set the DataRelation property after the DataRelationDetailDescription has been sealed." );
-
-        m_dataRelation = value;
-        this.RelationName = value.RelationName;
-        this.Seal();
-      }
-    }
-
-    #endregion
-
-    protected internal override void Initialize( DataGridCollectionViewBase parentCollectionView )
-    {
-      base.Initialize( parentCollectionView );
-
-      if( this.DataRelation != null )
-        return;
-
-      string relationName = this.RelationName;
-
-      if( string.IsNullOrEmpty( relationName ) )
-        throw new InvalidOperationException( "An attempt was made to initialize a DataRelationDetailDescription whose RelationName property has not been set." );
-
-      this.DataRelation = this.FindDataRelation( parentCollectionView, relationName );
-    }
-
-    protected internal override IEnumerable GetDetailsForParentItem( DataGridCollectionViewBase parentCollectionView, object parentItem )
-    {
-      if( this.DataRelation == null )
-        throw new InvalidOperationException( "An attempt was made to obtain the details of a DataRelationDetailDescription object whose DataRelation property has not been set." );
-
-      this.Seal();
-
-      System.Data.DataRow dataRow = parentItem as System.Data.DataRow;
-      DataRowView dataRowView;
-
-      if( dataRow != null )
-      {
-        int rawIndex = parentCollectionView.IndexOfSourceItem( dataRow );
-
-        DataView dataView = parentCollectionView.SourceCollection as DataView;
-
-        if( dataView == null )
-          return null;
-
-        dataRowView = dataView[ rawIndex ];
-      }
-      else
-      {
-        dataRowView = parentItem as DataRowView;
-      }
-
-      if( dataRowView == null )
-        return null;
-
-      if( !m_userAssignedDataRelation )
-      {
-        if( m_dataRelation.ParentTable != dataRowView.Row.Table )
-        {
-          m_dataRelation = this.FindDataRelation( parentCollectionView, this.RelationName );
-        }
-      }
-
-      return dataRowView.CreateChildView( m_dataRelation );
-    }
-
-    private DataRelation FindDataRelation( DataGridCollectionViewBase parentCollectionView, string relationName )
-    {
-      DataView view = parentCollectionView.SourceCollection as DataView;
-
-      if( view == null )
-        throw new InvalidOperationException( "An attempt was made to initialize a DataRelationDetailDescription whose data source is not a DataView." );
-
-      foreach( DataRelation relation in view.Table.ChildRelations )
-      {
-        if( relation.RelationName == relationName )
-        {
-          return relation;
-        }
-      }
-
-      throw new InvalidOperationException( "An attempt was made to initialize a DataRelationDetailDescription whose data source does not contain a DataRelation corresponding to the specified name." );
-    }
-
-    private DataRelation m_dataRelation;
-    private bool m_userAssignedDataRelation;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs
deleted file mode 100644
index 2abf397e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataRowColumnPropertyDescriptor : PropertyDescriptor
-  {
-    internal DataRowColumnPropertyDescriptor( DataColumn column )
-      : base( column.ColumnName, null )
-    {
-      if( column == null )
-        throw new ArgumentNullException( "column" );
-
-      m_column = column;
-    }
-
-    #region DisplayName Property
-
-    public override string DisplayName
-    {
-      get
-      {
-        return m_column.Caption;
-      }
-    }
-
-    #endregion
-
-    #region Attributes Property
-
-    public override AttributeCollection Attributes
-    {
-      get
-      {
-        if( typeof( IList ).IsAssignableFrom( this.PropertyType ) )
-        {
-          var array = new Attribute[ base.Attributes.Count + 1 ];
-          base.Attributes.CopyTo( array, 0 );
-          array[ array.Length - 1 ] = new ListBindableAttribute( false );
-          return new AttributeCollection( array );
-        }
-
-        return base.Attributes;
-      }
-    }
-
-    #endregion
-
-    #region ComponentType Property
-
-    public override Type ComponentType
-    {
-      get
-      {
-        return typeof( System.Data.DataRow );
-      }
-    }
-
-    #endregion
-
-    #region IsBrowsable Property
-
-    public override bool IsBrowsable
-    {
-      get
-      {
-        return ( m_column.ColumnMapping != MappingType.Hidden )
-            && ( base.IsBrowsable );
-      }
-    }
-
-    #endregion
-
-    #region IsReadOnly Property
-
-    public override bool IsReadOnly
-    {
-      get
-      {
-        return m_column.ReadOnly;
-      }
-    }
-
-    #endregion
-
-    #region PropertyType Property
-
-    public override Type PropertyType
-    {
-      get
-      {
-        return ItemsSourceHelper.GetColumnDataType( m_column );
-      }
-    }
-
-    #endregion
-
-    public override bool CanResetValue( object component )
-    {
-      var value = this.GetValue( component );
-
-      return ( value != null )
-          && ( value != DBNull.Value );
-    }
-
-    public override object GetValue( object component )
-    {
-      var dataRow = component as System.Data.DataRow;
-      if( dataRow == null )
-        return null;
-
-      var value = default( object );
-
-      try
-      {
-        value = dataRow[ m_column ];
-      }
-      catch
-      {
-      }
-
-      if( value == DBNull.Value )
-        return null;
-
-      return value;
-    }
-
-    public override void ResetValue( object component )
-    {
-      this.SetValue( component, null );
-    }
-
-    public override void SetValue( object component, object value )
-    {
-      var dataRow = component as System.Data.DataRow;
-      if( dataRow == null )
-        throw new InvalidOperationException( "An attempt was made to set a value on a DataRow that does not exist." );
-
-      if( this.IsReadOnly )
-        throw new InvalidOperationException( "An attempt was made to set a value on a read-only field." );
-
-      var oldValue = dataRow[ m_column ];
-
-      if( ( oldValue == null ) || ( oldValue == DBNull.Value ) )
-      {
-        if( ( ( value == null ) || ( value == DBNull.Value ) ) )
-          return;
-      }
-      else
-      {
-        if( oldValue.Equals( value ) )
-          return;
-      }
-
-      if( value == null )
-      {
-        dataRow[ m_column ] = DBNull.Value;
-      }
-      else
-      {
-        dataRow[ m_column ] = value;
-      }
-
-      this.OnValueChanged( component, EventArgs.Empty );
-    }
-
-    public override bool ShouldSerializeValue( object component )
-    {
-      return false;
-    }
-
-    private readonly DataColumn m_column;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperation.cs
deleted file mode 100644
index f6694682..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperation.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DeferredOperation
-  {
-    internal static DeferredOperation RefreshDistinctValuesOperation = new DeferredOperation( DeferredOperationAction.RefreshDistincValues, false );
-
-    internal static DeferredOperation RefreshDistinctValuesOperationWithFilteredItemsChanged = new DeferredOperation( DeferredOperationAction.RefreshDistincValues, true );
-
-    public DeferredOperation( DeferredOperationAction action, bool filteredItemsChanged )
-      : this( action, -1, -1, null )
-    {
-      m_filteredItemsChanged = filteredItemsChanged;
-    }
-
-    public DeferredOperation( DeferredOperationAction action, object dataItem )
-    {
-      m_action = action;
-      m_dataItem = dataItem;
-    }
-
-    public DeferredOperation( DeferredOperationAction action, IList items )
-    {
-      m_action = action;
-      m_newItems = items;
-    }
-
-    public DeferredOperation( DeferredOperationAction action, int startingIndex, IList items )
-      : this( action, -1, startingIndex, items )
-    {
-    }
-
-    public DeferredOperation( DeferredOperationAction action, int newSourceItemCount, int startingIndex, IList items )
-    {
-      // newSourceItemCount is for when we are adding item in a IBindingList
-      // It is use to detect we 2 add are in fact only one, bcause the second one is just for confirming the first one.
-      m_action = action;
-      m_newSourceItemCount = newSourceItemCount;
-
-      switch( action )
-      {
-        case DeferredOperationAction.Add:
-        case DeferredOperationAction.Replace:
-          {
-            m_newItems = items;
-            m_newStartingIndex = startingIndex;
-            break;
-          }
-
-        case DeferredOperationAction.Remove:
-          {
-            m_oldItems = items;
-            m_oldStartingIndex = startingIndex;
-            break;
-          }
-
-        case DeferredOperationAction.Refresh:
-        case DeferredOperationAction.Resort:
-        case DeferredOperationAction.Regroup:
-        case DeferredOperationAction.RefreshDistincValues:
-          break;
-
-        default:
-          {
-            throw new ArgumentException( "An attempt was made to use the " + action.ToString() + " action, which is not supported by this constructor." );
-          }
-      }
-    }
-
-    public DeferredOperation( DeferredOperationAction action, int newSourceItemCount, int newStartingIndex, IList newItems, int oldStartingIndex, IList oldItems )
-    {
-      // newSourceItemCount is for when we are adding item in a IBindingList
-      // It is use to detect that 2 add are in fact only one, because the second one is just for confirming the first one.
-      m_action = action;
-      m_newSourceItemCount = newSourceItemCount;
-      m_newItems = newItems;
-      m_newStartingIndex = newStartingIndex;
-      m_oldItems = oldItems;
-      m_oldStartingIndex = oldStartingIndex;
-    }
-
-    #region Action Property
-
-    public DeferredOperationAction Action
-    {
-      get
-      {
-        return m_action;
-      }
-    }
-
-    private DeferredOperationAction m_action;
-
-    #endregion Action Property
-
-    #region NewSourceItemCount Property
-
-    public int NewSourceItemCount
-    {
-      get
-      {
-        return m_newSourceItemCount;
-      }
-    }
-
-    private int m_newSourceItemCount;
-
-    #endregion NewSourceItemCount Property
-
-    #region NewStartingIndex Property
-
-    public int NewStartingIndex
-    {
-      get
-      {
-        return m_newStartingIndex;
-      }
-    }
-
-    private int m_newStartingIndex;
-
-    #endregion NewStartingIndex Property
-
-    #region NewItems Property
-
-    public IList NewItems
-    {
-      get
-      {
-        return m_newItems;
-      }
-    }
-
-    private IList m_newItems;
-
-    #endregion NewItems Property
-
-    #region OldStartingIndex Property
-
-    public int OldStartingIndex
-    {
-      get
-      {
-        return m_oldStartingIndex;
-      }
-    }
-
-    private int m_oldStartingIndex;
-
-    #endregion OldStartingIndex Property
-
-    #region OldItems Property
-
-    public IList OldItems
-    {
-      get
-      {
-        return m_oldItems;
-      }
-    }
-
-    private IList m_oldItems;
-
-    #endregion OldItems Property
-
-    #region DataItem Property
-
-    public object DataItem
-    {
-      get
-      {
-        return m_dataItem;
-      }
-    }
-
-    private object m_dataItem;
-
-    #endregion
-
-    #region FilteredItemsChanged Property
-
-    public bool FilteredItemsChanged
-    {
-      get
-      {
-        return m_filteredItemsChanged;
-      }
-    }
-
-    private bool m_filteredItemsChanged;
-
-    #endregion FilteredItemsChanged Property
-
-    internal enum DeferredOperationAction
-    {
-      Unknow = 0,
-      Add = 1,
-      Move = 2,
-      Remove = 3,
-      Replace = 4,
-      Refresh = 5,
-      Resort = 6,
-      Regroup = 7,
-      RefreshDistincValues = 8,
-      ResetItem = 9,
-      RefreshUnboundItemProperties = 10
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs
deleted file mode 100644
index 4db22b8b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs
+++ /dev/null
@@ -1,599 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Diagnostics;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DeferredOperationManager
-  {
-    #region Static Fields
-
-    private static readonly TimeSpan MaxProcessDuration = TimeSpan.FromMilliseconds( 100d );
-    private static readonly TimeSpan MaxQueueDuration = TimeSpan.FromMilliseconds( 20d );
-
-    #endregion
-
-    internal DeferredOperationManager( DataGridCollectionViewBase collectionView, Dispatcher dispatcher, bool postPendingRefreshWithoutDispatching )
-    {
-      m_collectionView = collectionView;
-      m_deferredOperations = new List<DeferredOperation>( 1000 );
-      m_invalidatedGroups = new HashSet<DataGridCollectionViewGroup>();
-
-      if( postPendingRefreshWithoutDispatching )
-      {
-        this.Add( new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null ) );
-      }
-
-      m_dispatcher = dispatcher;
-    }
-
-    #region HasPendingOperations Property
-
-    public bool HasPendingOperations
-    {
-      get
-      {
-        lock( this )
-        {
-          return ( m_pendingFlags.Data != 0 ) || ( m_deferredOperations.Count > 0 );
-        }
-      }
-    }
-
-    #endregion
-
-    #region RefreshPending Property
-
-    public bool RefreshPending
-    {
-      get
-      {
-        return m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.RefreshPending ];
-      }
-      private set
-      {
-        m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.RefreshPending ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ResortPending Property
-
-    public bool ResortPending
-    {
-      get
-      {
-        return m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.ResortPending ];
-      }
-      private set
-      {
-        m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.ResortPending ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RegroupPending Property
-
-    public bool RegroupPending
-    {
-      get
-      {
-        return m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.RegroupPending ];
-      }
-      private set
-      {
-        m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.RegroupPending ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RefreshDistincValuesPending Property
-
-    public bool RefreshDistincValuesPending
-    {
-      get
-      {
-        return m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.RefreshDistincValuesPending ];
-      }
-      private set
-      {
-        m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.RefreshDistincValuesPending ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RefreshDistincValuesWithFilteredItemChangedPending Property
-
-    public bool RefreshDistincValuesWithFilteredItemChangedPending
-    {
-      get
-      {
-        return m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.RefreshDistincValuesWithFilteredItemChangedPending ];
-      }
-      private set
-      {
-        m_pendingFlags[ ( int )DeferredOperationManagerPendingFlags.RefreshDistincValuesWithFilteredItemChangedPending ] = value;
-      }
-    }
-
-    #endregion
-
-    #region DeferProcessOfInvalidatedGroupStats Property
-
-    internal bool DeferProcessOfInvalidatedGroupStats
-    {
-      private get
-      {
-        return m_deferProcessOfInvalidatedGroupStats;
-      }
-      set
-      {
-        lock( this )
-        {
-          //Make sure that stats calculation that have been defer are processed before defering again!
-          if( value && ( m_deferredOperationsToProcess > 0 ) )
-          {
-            m_forceProcessOfInvalidatedGroupStats = true;
-          }
-          m_deferProcessOfInvalidatedGroupStats = value;
-        }
-      }
-    }
-
-    private bool m_deferProcessOfInvalidatedGroupStats;
-
-    #endregion
-
-    public void ClearInvalidatedGroups()
-    {
-      lock( this )
-      {
-        if( ( m_dispatcherOperation != null ) && ( !this.HasPendingOperations ) )
-        {
-          m_dispatcherOperation.Abort();
-          m_dispatcherOperation = null;
-          m_dispatcherOperationStartTime = DateTime.MinValue;
-          m_hasNewOperationsSinceStartTime = false;
-        }
-
-        m_invalidatedGroups.Clear();
-      }
-    }
-
-    public void ClearDeferredOperations()
-    {
-      lock( this )
-      {
-        if( ( m_dispatcherOperation != null ) && ( m_invalidatedGroups.Count == 0 ) )
-        {
-          m_dispatcherOperation.Abort();
-          m_dispatcherOperation = null;
-          m_dispatcherOperationStartTime = DateTime.MinValue;
-          m_hasNewOperationsSinceStartTime = false;
-        }
-
-        m_pendingFlags[ -1 ] = false;
-        m_deferredOperations.Clear();
-      }
-    }
-
-    public void PurgeAddWithRemoveOrReplace()
-    {
-      if( m_deferredOperations.Count >= 2 )
-      {
-        var addOperation = m_deferredOperations[ 0 ];
-
-        if( addOperation.Action != DeferredOperation.DeferredOperationAction.Add )
-          return;
-
-        var addIndex = addOperation.NewStartingIndex;
-        var addCount = addOperation.NewItems.Count;
-
-        var firstIndexToRemove = 1;
-        var lastIndexToRemove = -1;
-
-        var count = m_deferredOperations.Count;
-        for( int i = 1; i < count; i++ )
-        {
-          var operation = m_deferredOperations[ i ];
-
-          var replaced = ( operation.Action == DeferredOperation.DeferredOperationAction.Replace );
-          var removed = ( operation.Action == DeferredOperation.DeferredOperationAction.Remove );
-
-          if( replaced || removed )
-          {
-            if( removed && ( i < count - 1 ) )
-            {
-              Debug.Fail( "How come we have a remove operation before the end?" );
-              return;
-            }
-
-            if( ( addIndex == operation.OldStartingIndex ) && ( addCount == operation.OldItems.Count ) )
-            {
-              lastIndexToRemove = i;
-
-              if( removed )
-              {
-                firstIndexToRemove = 0;
-              }
-            }
-            else
-            {
-              Debug.Fail( "Why do we have a replace or remove operation with different indexes?" );
-              return;
-            }
-          }
-          else
-          {
-            // Can be normal, we can receive 2 adds for the same item and same position when we are bound to an IBindingList ( like a DataView )
-            return;
-          }
-        }
-
-        if( lastIndexToRemove > -1 )
-        {
-          m_deferredOperations.RemoveRange( firstIndexToRemove, ( lastIndexToRemove - firstIndexToRemove ) + 1 );
-        }
-      }
-    }
-
-    public void Add( DeferredOperation operation )
-    {
-      lock( this )
-      {
-        if( this.RefreshPending )
-          return;
-
-        switch( operation.Action )
-        {
-          case DeferredOperation.DeferredOperationAction.Refresh:
-            {
-              this.RefreshPending = true;
-              m_deferredOperations.Clear();
-              break;
-            }
-
-          case DeferredOperation.DeferredOperationAction.RefreshDistincValues:
-            {
-              if( operation.FilteredItemsChanged )
-              {
-                this.RefreshDistincValuesWithFilteredItemChangedPending = true;
-              }
-              else
-              {
-                this.RefreshDistincValuesPending = true;
-              }
-
-              break;
-            }
-
-          case DeferredOperation.DeferredOperationAction.Regroup:
-            {
-              this.RegroupPending = true;
-              break;
-            }
-
-          case DeferredOperation.DeferredOperationAction.Resort:
-            {
-              this.ResortPending = true;
-              break;
-            }
-
-          default:
-            {
-              m_deferredOperations.Add( operation );
-              m_hasNewOperationsSinceStartTime = true;
-
-              if( this.DeferProcessOfInvalidatedGroupStats )
-              {
-                m_deferredOperationsToProcess++;
-              }
-
-              break;
-            }
-        }
-
-        if( ( m_dispatcher != null ) && ( m_dispatcherOperation == null ) )
-        {
-          Debug.Assert( m_collectionView.Loaded );
-
-          m_dispatcherOperation = m_dispatcher.BeginInvoke( DispatcherPriority.DataBind, new DispatcherOperationCallback( this.Dispatched_Process ), null );
-          m_dispatcherOperationStartTime = DateTime.UtcNow;
-          m_hasNewOperationsSinceStartTime = false;
-        }
-      }
-    }
-
-    public void Combine( DeferredOperationManager sourceDeferredOperationManager )
-    {
-      lock( this )
-      {
-        this.RefreshPending = this.RefreshPending || sourceDeferredOperationManager.RefreshPending;
-        this.RegroupPending = this.RegroupPending || sourceDeferredOperationManager.RegroupPending;
-        this.ResortPending = this.ResortPending || sourceDeferredOperationManager.ResortPending;
-        this.RefreshDistincValuesPending = this.RefreshDistincValuesPending || sourceDeferredOperationManager.RefreshDistincValuesPending;
-        this.RefreshDistincValuesWithFilteredItemChangedPending = this.RefreshDistincValuesWithFilteredItemChangedPending || sourceDeferredOperationManager.RefreshDistincValuesWithFilteredItemChangedPending;
-
-        if( this.RefreshPending )
-        {
-          m_deferredOperations.Clear();
-          return;
-        }
-
-        List<DeferredOperation> sourceOperations = sourceDeferredOperationManager.m_deferredOperations;
-
-        if( sourceOperations.Count == 0 )
-          return;
-
-        m_deferredOperations.InsertRange( 0, sourceOperations );
-      }
-    }
-
-    public void Process()
-    {
-      this.Process( true );
-    }
-
-    public void InvalidateGroupStats( DataGridCollectionViewGroup group, bool calculateAllStats = false, bool resortGroups = true )
-    {
-      if( group == null )
-        return;
-
-      lock( this )
-      {
-        if( this.RefreshPending )
-          return;
-
-        // When set to false, this will prevent group resorting when the DataGridCollectionView.ProcessInvalidatedGroupStats() is called through the disptached call below.
-        // If the current method is called again and this variable is set to true before groups are processed, it will be fine, as the grid is now in a state that will support group resorting.
-        m_resortGroups = resortGroups;
-
-        var parent = group;
-        while( parent != null )
-        {
-          if( !m_invalidatedGroups.Contains( parent ) )
-          {
-            m_invalidatedGroups.Add( parent );
-          }
-
-          parent = parent.Parent;
-        }
-
-        if( m_dispatcher != null )
-        {
-          if( m_dispatcherOperation == null )
-          {
-            m_dispatcherOperation = m_dispatcher.BeginInvoke( DispatcherPriority.DataBind, new DispatcherOperationCallback( this.Dispatched_Process ), null );
-            m_dispatcherOperationStartTime = DateTime.UtcNow;
-          }
-          else
-          {
-            m_hasNewOperationsSinceStartTime = true;
-          }
-        }
-      }
-    }
-
-    private object Dispatched_Process( object e )
-    {
-      this.Process( false );
-      return null;
-    }
-
-    private void Process( bool processAll )
-    {
-      //This method will be called again when Dispose() is called on the DeferRefreshHelper of the CollectionView.
-      if( m_collectionView.InDeferRefresh )
-        return;
-
-      if( !processAll )
-      {
-        lock( this )
-        {
-          if( ( m_hasNewOperationsSinceStartTime )
-            && ( m_dispatcherOperation != null )
-            && ( DateTime.UtcNow.Subtract( m_dispatcherOperationStartTime ) < DeferredOperationManager.MaxQueueDuration ) )
-          {
-            Debug.Assert( m_dispatcher != null );
-            m_dispatcherOperation = m_dispatcher.BeginInvoke( m_dispatcherOperation.Priority, new DispatcherOperationCallback( this.Dispatched_Process ), null );
-            m_hasNewOperationsSinceStartTime = false;
-
-            return;
-          }
-        }
-      }
-
-      // We lock here since it is possible that a DataTable Column's value array is being redimensioned 
-      // while we are trying to process the DeferredOperation.
-      lock( m_collectionView.SyncRoot )
-      {
-        lock( this )
-        {
-          // Abort the current dispatcher operation
-          if( m_dispatcherOperation != null )
-          {
-            m_dispatcherOperation.Abort();
-            m_dispatcherOperation = null;
-            m_dispatcherOperationStartTime = DateTime.MinValue;
-            m_hasNewOperationsSinceStartTime = false;
-          }
-
-          // A deferredOperation can cause a DeferRefresh to be disposed of, hence provoking a re-entry in this method.
-          // As a result, all variables must be cached to prevent re-executing the same deferredOperation.
-
-          List<DeferredOperation> deferredOperations = m_deferredOperations;
-          //Set a new list in case new operations are added while processing the current operations. 
-          m_deferredOperations = new List<DeferredOperation>( 10 );
-          bool refreshDistincValuesWithFilteredItemChangedPending = this.RefreshDistincValuesWithFilteredItemChangedPending;
-          this.RefreshDistincValuesWithFilteredItemChangedPending = false;
-          bool refreshDistincValuesPending = this.RefreshDistincValuesPending;
-          this.RefreshDistincValuesPending = false;
-          bool refreshPending = this.RefreshPending;
-          this.RefreshPending = false;
-          bool regroupPending = this.RegroupPending;
-          this.RegroupPending = false;
-          bool resortPending = this.ResortPending;
-          this.ResortPending = false;
-          bool refreshForced = false;
-
-          m_collectionView.RaisePreBatchCollectionChanged();
-
-          DateTime startTime = DateTime.UtcNow;
-
-          if( refreshPending )
-          {
-            m_collectionView.ExecuteSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Refresh, -1, null ), out refreshForced );
-          }
-          else if( regroupPending )
-          {
-            m_collectionView.ExecuteSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Regroup, -1, null ), out refreshForced );
-          }
-          else if( resortPending )
-          {
-            m_collectionView.ExecuteSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.Resort, -1, null ), out refreshForced );
-          }
-
-          if( ( deferredOperations.Count > 0 ) && ( !refreshForced ) )
-          {
-            int count = deferredOperations.Count;
-            int operationIndex = 0;
-
-            while( ( operationIndex < count ) && ( !refreshForced ) && ( processAll || ( DateTime.UtcNow.Subtract( startTime ) < DeferredOperationManager.MaxProcessDuration ) ) )
-            {
-              m_collectionView.ExecuteSourceItemOperation( deferredOperations[ operationIndex ], out refreshForced );
-              operationIndex++;
-            }
-
-            if( ( operationIndex < count ) && ( !refreshForced ) )
-            {
-              deferredOperations.RemoveRange( 0, operationIndex );
-              m_deferredOperationsToProcess -= operationIndex;
-            }
-            else
-            {
-              deferredOperations.Clear();
-              m_deferredOperationsToProcess = 0;
-            }
-          }
-
-          if( m_deferredOperations.Count == 0 )
-          {
-            m_deferredOperations = deferredOperations;
-          }
-          else
-          {
-            // When this method is re-entered, the processAll parameter should be true, which means all deferredOperations should have been processed. When assigning it back to m_deferredOperations,
-            // it's count should be 0.  Thus in the previous call on the stack, the "if" condition should always be true, hence this assert.
-            Debug.Assert( false, "Should never get there." );
-
-            //To be GC friendly, keep the original list, which at one point is the one created with a capacity of a 1000 items.
-            deferredOperations.InsertRange( deferredOperations.Count, m_deferredOperations );
-            m_deferredOperations = deferredOperations;
-          }
-
-          // The recalculation of the StatFunctions is performed last.
-          if( ( m_deferredOperationsToProcess <= 0 || m_forceProcessOfInvalidatedGroupStats ) && ( m_invalidatedGroups.Count != 0 ) )
-          {
-            m_collectionView.ProcessInvalidatedGroupStats( m_invalidatedGroups, m_resortGroups );
-            m_invalidatedGroups.Clear();
-            m_forceProcessOfInvalidatedGroupStats = false;
-          }
-
-          // Since a refresh has been forced, we don't want to process anything else.
-          if( !refreshForced )
-          {
-            if( processAll || ( DateTime.UtcNow.Subtract( startTime ) < DeferredOperationManager.MaxProcessDuration ) )
-            {
-              if( refreshDistincValuesWithFilteredItemChangedPending || refreshDistincValuesPending )
-              {
-                m_collectionView.ExecuteSourceItemOperation( new DeferredOperation( DeferredOperation.DeferredOperationAction.RefreshDistincValues,
-                                                                                    refreshDistincValuesWithFilteredItemChangedPending ), out refreshForced );
-              }
-            }
-            else
-            {
-              if( refreshDistincValuesWithFilteredItemChangedPending )
-              {
-                this.RefreshDistincValuesWithFilteredItemChangedPending = true;
-              }
-
-              if( refreshDistincValuesPending )
-              {
-                this.RefreshDistincValuesPending = true;
-              }
-            }
-          }
-
-          m_collectionView.RaisePostBatchCollectionChanged();
-
-          if( this.HasPendingOperations || m_invalidatedGroups.Count != 0 )
-          {
-            Debug.Assert( !processAll );
-            Debug.Assert( m_dispatcher != null );
-
-            // Requeue pending operations
-            if( m_dispatcherOperation == null )
-            {
-              if( m_dispatcher != null )
-              {
-                m_dispatcherOperation = m_dispatcher.BeginInvoke( DispatcherPriority.Input, new DispatcherOperationCallback( this.Dispatched_Process ), null );
-                m_dispatcherOperationStartTime = DateTime.UtcNow;
-                m_hasNewOperationsSinceStartTime = false;
-              }
-            }
-            else
-            {
-              m_dispatcherOperation.Priority = DispatcherPriority.Input;
-              m_dispatcherOperationStartTime = DateTime.UtcNow;
-            }
-          }
-        }
-      }
-    }
-
-    private readonly DataGridCollectionViewBase m_collectionView;
-    private List<DeferredOperation> m_deferredOperations;
-    private HashSet<DataGridCollectionViewGroup> m_invalidatedGroups;
-    private int m_deferredOperationsToProcess;
-    private BitVector32 m_pendingFlags;
-    private bool m_forceProcessOfInvalidatedGroupStats;
-    private bool m_resortGroups;
-
-    private readonly Dispatcher m_dispatcher;
-    private DispatcherOperation m_dispatcherOperation;
-    private DateTime m_dispatcherOperationStartTime;
-    private bool m_hasNewOperationsSinceStartTime;
-
-    [Flags]
-    private enum DeferredOperationManagerPendingFlags
-    {
-      RegroupPending = 1,
-      ResortPending = 2,
-      RefreshPending = 4,
-      RefreshDistincValuesPending = 8,
-      RefreshDistincValuesWithFilteredItemChangedPending = 16
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs
deleted file mode 100644
index 000071d4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DistinctValuesDictionary : ReadOnlyDictionary<string, ReadOnlyObservableHashList>
-  {
-    public DistinctValuesDictionary( DataGridCollectionViewBase dataGridCollectionViewBase )
-    {
-      if( dataGridCollectionViewBase == null )
-        throw new DataGridInternalException( "dataGridCollectionView is null." );
-
-      m_dataGridCollectionViewBase = dataGridCollectionViewBase;
-    }
-
-    public override ReadOnlyObservableHashList this[ string key ]
-    {
-      get
-      {
-        return this.AssertValueIsCreated( key );
-      }
-      set
-      {
-        base[ key ] = value;
-      }
-    }
-
-    public override bool TryGetValue( string key, out ReadOnlyObservableHashList value )
-    {
-      // We force the creation of the key in the Dictionary
-      value = this.AssertValueIsCreated( key );
-
-      return true;
-    }
-
-    internal bool InternalTryGetValue( string key, out ReadOnlyObservableHashList value )
-    {
-      return base.TryGetValue( key, out value );
-    }
-
-    private ReadOnlyObservableHashList AssertValueIsCreated( string key )
-    {
-      ReadOnlyObservableHashList value = null;
-
-      if( !base.TryGetValue( key, out value ) )
-      {
-        value = new ReadOnlyObservableHashList();
-        this.InternalAdd( key, value );
-      }
-
-      Debug.Assert( value != null );
-
-      return value;
-    }
-
-    private DataGridCollectionViewBase m_dataGridCollectionViewBase;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesRefreshNeededEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesRefreshNeededEventManager.cs
deleted file mode 100644
index f9423cce..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesRefreshNeededEventManager.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DistinctValuesRefreshNeededEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private DistinctValuesRefreshNeededEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static DistinctValuesRefreshNeededEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( DistinctValuesRefreshNeededEventManager );
-        var currentManager = ( DistinctValuesRefreshNeededEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DistinctValuesRefreshNeededEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-    }
-
-    protected override void StopListening( object source )
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EmptyDataItemSafePropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EmptyDataItemSafePropertyDescriptor.cs
deleted file mode 100644
index ed6cf94f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EmptyDataItemSafePropertyDescriptor.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class EmptyDataItemSafePropertyDescriptor : PropertyDescriptor
-  {
-    #region STATIC MEMBERS
-
-    private const string PropertyName = "__EmptyDataItemPropertyDescriptor";
-
-    private static readonly Attribute[] EmptyAttributeArray = new Attribute[ 0 ];
-
-    #endregion STATIC MEMBERS
-
-    #region SINGLETON
-
-    internal static EmptyDataItemSafePropertyDescriptor Singleton
-    {
-      get
-      {
-        if( ms_Singleton == null )
-          ms_Singleton = new EmptyDataItemSafePropertyDescriptor( EmptyDataItemSafePropertyDescriptor.PropertyName );
-
-        return ms_Singleton;
-      }
-    }
-
-    private static EmptyDataItemSafePropertyDescriptor ms_Singleton;
-
-    #endregion SINGLETON
-
-    #region CONSTRUCTORS
-
-    public EmptyDataItemSafePropertyDescriptor( string name )
-      : base( name, EmptyDataItemSafePropertyDescriptor.EmptyAttributeArray )
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    public override bool CanResetValue( object component )
-    {
-      return false;
-    }
-
-    public override Type ComponentType
-    {
-      get { return typeof( object ); }
-    }
-
-    public override object GetValue( object component )
-    {
-      if( component is EmptyDataItem )
-        return null;
-
-      return component;
-    }
-
-    public override bool IsReadOnly
-    {
-      get { return true; }
-    }
-
-    public override Type PropertyType
-    {
-      get { return typeof( object ); }
-    }
-
-    public override void ResetValue( object component )
-    {
-      throw new NotImplementedException();
-    }
-
-    public override void SetValue( object component, object value )
-    {
-      throw new NotImplementedException();
-    }
-
-    public override bool ShouldSerializeValue( object component )
-    {
-      return false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs
deleted file mode 100644
index 07cff6b0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Data.Entity.Core.Objects.DataClasses;
-using System.Reflection;
-
-namespace Xceed.Wpf.DataGrid
-{
-    internal class EntityDetailDescription : DataGridDetailDescription
-    {
-        public EntityDetailDescription()
-        {
-        }
-
-        public EntityDetailDescription(string propertyName)
-          : this()
-        {
-            if (string.IsNullOrEmpty(propertyName))
-                throw new ArgumentException("The specified property name is null or empty", "propertyName");
-
-            this.RelationName = propertyName;
-        }
-
-        #region QueryDetails Event
-
-        public event EventHandler<QueryEntityDetailsEventArgs> QueryDetails;
-
-        protected virtual void OnQueryDetails(QueryEntityDetailsEventArgs e)
-        {
-            var handler = this.QueryDetails;
-            if (handler == null)
-                return;
-
-            handler.Invoke(this, e);
-        }
-
-        #endregion
-
-        protected internal override IEnumerable GetDetailsForParentItem(DataGridCollectionViewBase parentCollectionView, object parentItem)
-        {
-            EntityObject entityObject = parentItem as EntityObject;
-
-            if (entityObject == null)
-                return null;
-
-            // Even if EntityObject is not in a loadable state, we must still return the IList
-            // so that the ItemProperties can be extracted based on the elements type.
-            bool entityObjectLoadable = ItemsSourceHelper.IsEntityObjectLoadable(entityObject);
-
-            // We let the user take charge of handling the details.
-            QueryEntityDetailsEventArgs args = new QueryEntityDetailsEventArgs(entityObject);
-
-            if (entityObjectLoadable)
-                this.OnQueryDetails(args);
-
-            // The parentItem must implement IEntityWithRelationships
-            Type parentItemType = parentItem.GetType();
-            if (typeof(IEntityWithRelationships).IsAssignableFrom(parentItemType))
-            {
-                // Since the relationship was based on the the property 
-                // name, we must find that property using reflection.
-                PropertyInfo propertyInfo = parentItemType.GetProperty(this.RelationName);
-
-                if (propertyInfo != null)
-                {
-                    RelatedEnd relatedEnd = propertyInfo.GetValue(parentItem, null) as RelatedEnd;
-
-                    if (relatedEnd != null)
-                    {
-                        // Make sure that the details are loaded 
-                        // except if the user already handled it.
-                        if (!relatedEnd.IsLoaded
-                          && !args.Handled
-                          && entityObjectLoadable)
-                        {
-                            relatedEnd.Load();
-                        }
-
-                        IListSource listSource = relatedEnd as IListSource;
-
-                        // Returns an IList to have proper change notification events.
-                        if (listSource != null)
-                            return listSource.GetList();
-                    }
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EnumerableDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EnumerableDetailDescription.cs
deleted file mode 100644
index 9bf607fc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EnumerableDetailDescription.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class EnumerableDetailDescription : DataGridDetailDescription
-  {
-    public EnumerableDetailDescription()
-      : base()
-    {
-      this.RelationName = "Children";
-    }
-
-    protected internal override IEnumerable GetDetailsForParentItem( DataGridCollectionViewBase parentCollectionView, object parentItem )
-    {
-      IEnumerable enumerable = parentItem as IEnumerable;
-
-      if (enumerable == null)
-        return null;
-
-      this.Seal();
-
-      return enumerable;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupDescriptionCollection.cs
deleted file mode 100644
index b999a42c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupDescriptionCollection.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ObjectModel;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class GroupDescriptionCollection : ObservableCollection<GroupDescription>
-  {
-    #region CONSTRUCTORS
-
-    public GroupDescriptionCollection()
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region PROTECTED METHODS
-
-    protected override void InsertItem( int index, GroupDescription item )
-    {
-      string newGroupName;
-
-      if( this.IsGroupDescriptionAlreadyPresent( item, out newGroupName ) == true )
-        throw new DataGridInternalException( "A group with the specified name already exists in the collection: " + ( ( newGroupName != null ) ? newGroupName : "" ) );
-
-      base.InsertItem( index, item );
-    }
-
-    protected override void SetItem( int index, GroupDescription item )
-    {
-      string newGroupName;
-
-      if( this.IsGroupDescriptionAlreadyPresent( item, out newGroupName ) == true )
-        throw new DataGridInternalException( "A group with the specified name already exists in the collection: " + ( ( newGroupName != null ) ? newGroupName : "" ) );
-
-      base.SetItem( index, item );
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region PRIVATE METHODS
-
-    private bool IsGroupDescriptionAlreadyPresent( GroupDescription newGroupDescription, out string newGroupName )
-    {
-      newGroupName = DataGridContext.GetColumnNameFromGroupDescription( newGroupDescription );
-
-      // We accept null or empty group names
-      if( !string.IsNullOrEmpty( newGroupName ) )
-      {
-        foreach( GroupDescription groupDescription in this.Items )
-        {
-          string groupName = DataGridContext.GetColumnNameFromGroupDescription( groupDescription );
-
-          if( !string.IsNullOrEmpty( groupName ) )
-          {
-            if( newGroupName == groupName )
-            {
-              return true;
-            }
-          }
-        }
-      }
-
-      return false;
-    }
-
-    #endregion PRIVATE METHODS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupNameCountPair.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupNameCountPair.cs
deleted file mode 100644
index 2029d28d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupNameCountPair.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class GroupNameCountPair
-  {
-    public GroupNameCountPair( object name, int itemCount )
-    {
-      if( name == null )
-        throw new ArgumentNullException( "name" );
-
-      if( itemCount < 0 )
-        throw new ArgumentOutOfRangeException( "itemCount", "The specified item count must be greater than or equal to zero." );
-
-      this.Name = name;
-      this.ItemCount = itemCount;
-    }
-
-    public object Name { get; private set; }
-    public int ItemCount { get; private set; }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs
deleted file mode 100644
index 4483ee7d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
-
-using Xceed.Utils.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class GroupSortComparer : IComparer<DataGridCollectionViewGroup>
-  {
-    public GroupSortComparer( List<SortInfo> sortInfos )
-    {
-      m_sortInfos = sortInfos;
-    }
-
-    #region IComparer<DataGridCollectionViewGroup> Members
-
-    public int Compare( DataGridCollectionViewGroup xGroup, DataGridCollectionViewGroup yGroup )
-    {
-      if( xGroup == null )
-      {
-        if( yGroup == null )
-        {
-          return 0;
-        }
-        else
-        {
-          return -1;
-        }
-      }
-      else
-      {
-        if( yGroup == null )
-        {
-          return 1;
-        }
-      }
-
-      var sortDirection = ListSortDirection.Ascending;
-      int result;
-
-      foreach( SortInfo sortInfo in m_sortInfos )
-      {
-        var foreignKeyDescription = sortInfo.ForeignKeyDescription;
-        var sortComparer = sortInfo.SortComparer;
-        sortDirection = sortInfo.SortDirection;
-
-        if( foreignKeyDescription != null )
-        {
-          result = sortComparer.Compare( foreignKeyDescription.GetDisplayValue( xGroup.Name ), foreignKeyDescription.GetDisplayValue( yGroup.Name ) );
-        }
-        else
-        {
-          result = sortComparer.Compare( xGroup.Name, yGroup.Name );
-        }
-
-        if( result != 0 )
-        {
-          if( sortDirection == ListSortDirection.Descending )
-            return -result;
-
-          return result;
-        }
-      }
-
-      if( sortDirection == ListSortDirection.Descending )
-        return yGroup.UnsortedIndex - xGroup.UnsortedIndex;
-
-      return xGroup.UnsortedIndex - yGroup.UnsortedIndex;
-    }
-
-    #endregion
-
-    private List<SortInfo> m_sortInfos;
-
-    public class SortInfo
-    {
-      public SortInfo( ListSortDirection sortDirection, IComparer sortComparer )
-      {
-        if( sortComparer == null )
-          throw new ArgumentNullException( "sortComparer" );
-
-        this.SortDirection = sortDirection;
-        this.SortComparer = sortComparer;
-      }
-
-      public SortInfo( DataGridForeignKeyDescription foreignKeyDescription, ListSortDirection sortDirection, IComparer sortComparer )
-      {
-        if( sortComparer == null )
-          throw new ArgumentNullException( "sortComparer" );
-
-        this.ForeignKeyDescription = foreignKeyDescription;
-        this.SortDirection = sortDirection;
-        this.SortComparer = sortComparer;
-      }
-
-
-      #region ForeignKeyDescription Property
-
-      internal DataGridForeignKeyDescription ForeignKeyDescription
-      {
-        get;
-        private set;
-      }
-
-      #endregion
-
-      #region SortDirection Property
-
-      public ListSortDirection SortDirection
-      {
-        get;
-        private set;
-      }
-
-      #endregion
-
-      #region SortComparer Property
-
-      public IComparer SortComparer
-      {
-        get;
-        private set;
-      }
-
-      #endregion
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ItemPropertyGroupSortStatNameChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ItemPropertyGroupSortStatNameChangedEventManager.cs
deleted file mode 100644
index 8ea99cf1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ItemPropertyGroupSortStatNameChangedEventManager.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal sealed class ItemPropertyGroupSortStatNameChangedEventManager : WeakEventManager
-  {
-    private ItemPropertyGroupSortStatNameChangedEventManager()
-    {
-    }
-
-    #region CurrentManager Private Property
-
-    private static ItemPropertyGroupSortStatNameChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ItemPropertyGroupSortStatNameChangedEventManager );
-        var currentManager = WeakEventManager.GetCurrentManager( managerType ) as ItemPropertyGroupSortStatNameChangedEventManager;
-
-        if( currentManager == null )
-        {
-          currentManager = new ItemPropertyGroupSortStatNameChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridItemPropertyCollection source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridItemPropertyCollection source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = source as DataGridItemPropertyCollection;
-      //target.ItemPropertyGroupSortStatNameChanged += new EventHandler( this.DeliverEvent );
-      target.ItemPropertyGroupSortStatNameChanged += target_ItemPropertyGroupSortStatNameChanged;
-    }
-
-    void target_ItemPropertyGroupSortStatNameChanged( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = source as DataGridItemPropertyCollection;
-      target.ItemPropertyGroupSortStatNameChanged -= new EventHandler( this.DeliverEvent );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/JaggedArrayPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/JaggedArrayPropertyDescriptor.cs
deleted file mode 100644
index b80a5f59..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/JaggedArrayPropertyDescriptor.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Data;
-using System.Collections;
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class JaggedArrayPropertyDescriptor : PropertyDescriptor
-  {
-    public JaggedArrayPropertyDescriptor( int columnIndex, Type columnDataType )
-      : base( ".[" + columnIndex.ToString( CultureInfo.InvariantCulture ) + "]", null )
-    {
-      m_columnIndex = columnIndex;
-      m_columnDataType = columnDataType;
-    }
-
-    public override AttributeCollection Attributes
-    {
-      get
-      {
-        if( typeof( IList ).IsAssignableFrom( this.PropertyType ) )
-        {
-          Attribute[] array = new Attribute[ base.Attributes.Count + 1 ];
-          base.Attributes.CopyTo( array, 0 );
-          array[ array.Length - 1 ] = new ListBindableAttribute( false );
-          return new AttributeCollection( array );
-        }
-
-        return base.Attributes;
-      }
-    }
-
-    public override Type ComponentType
-    {
-      get
-      {
-        return m_columnDataType.MakeArrayType();
-      }
-    }
-
-    public override bool IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public override Type PropertyType
-    {
-      get
-      {
-        return m_columnDataType;
-      }
-    }
-
-    public override bool CanResetValue( object component )
-    {
-      return false;
-    }
-
-    public override object GetValue( object component )
-    {
-      Array arrayComponent = component as Array;
-
-      if( arrayComponent == null )
-        return null;
-
-      return arrayComponent.GetValue( m_columnIndex );
-    }
-
-    public override void ResetValue( object component )
-    {
-    }
-
-    public override void SetValue( object component, object value )
-    {
-      Array arrayComponent = component as Array;
-
-      if( arrayComponent == null )
-        throw new InvalidOperationException( "An attempt was made to set a value on something other than a one dimension array." );
-
-      if( this.IsReadOnly )
-        throw new InvalidOperationException( "An attempt was made to set a value on a read-only property." );
-
-      arrayComponent.SetValue( value, m_columnIndex );
-    }
-
-    public override bool ShouldSerializeValue( object component )
-    {
-      return false;
-    }
-
-    private int m_columnIndex;
-    private Type m_columnDataType;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ListSourceDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ListSourceDetailDescription.cs
deleted file mode 100644
index fdab96ca..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ListSourceDetailDescription.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ListSourceDetailDescription : DataGridDetailDescription
-  {
-    public ListSourceDetailDescription()
-      : base()
-    {
-      this.RelationName = "Children";
-    }
-
-    protected internal override IEnumerable GetDetailsForParentItem( DataGridCollectionViewBase parentCollectionView, object parentItem )
-    {
-      IListSource listSource = parentItem as IListSource;
-
-      if( listSource == null )
-        return null;
-
-      this.Seal();
-
-      return listSource.GetList();
-
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PostBatchCollectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PostBatchCollectionChangedEventManager.cs
deleted file mode 100644
index d3426f16..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PostBatchCollectionChangedEventManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class PostBatchCollectionChangedEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private PostBatchCollectionChangedEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Static Property
-
-    private static PostBatchCollectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( PostBatchCollectionChangedEventManager );
-        var currentManager = ( PostBatchCollectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new PostBatchCollectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      PostBatchCollectionChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      PostBatchCollectionChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ( ( DataGridCollectionViewBase )source ).PostBatchCollectionChanged += new EventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ( ( DataGridCollectionViewBase )source ).PostBatchCollectionChanged -= new EventHandler( this.OnEventRaised );
-    }
-
-    private void OnEventRaised( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PreBatchCollectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PreBatchCollectionChangedEventManager.cs
deleted file mode 100644
index 573a752d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PreBatchCollectionChangedEventManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class PreBatchCollectionChangedEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private PreBatchCollectionChangedEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Static Property
-
-    private static PreBatchCollectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( PreBatchCollectionChangedEventManager );
-        var currentManager = ( PreBatchCollectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new PreBatchCollectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      PreBatchCollectionChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      PreBatchCollectionChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ( ( DataGridCollectionViewBase )source ).PreBatchCollectionChanged += new EventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ( ( DataGridCollectionViewBase )source ).PreBatchCollectionChanged -= new EventHandler( this.OnEventRaised );
-    }
-
-    private void OnEventRaised( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs
deleted file mode 100644
index 3f6fd826..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class PropertyDetailDescription : DataGridDetailDescription
-  {
-    public PropertyDetailDescription()
-      : base()
-    {
-    }
-
-    public PropertyDetailDescription( PropertyDescriptor relation )
-      : this()
-    {
-      if( relation == null )
-        throw new ArgumentNullException( "relation" );
-
-      this.PropertyDescriptor = relation;
-    }
-
-    #region PropertyDescriptor Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public PropertyDescriptor PropertyDescriptor
-    {
-      get
-      {
-        return m_propertyDescriptor;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "PropertyDescriptor" );
-
-        if( this.InternalIsSealed == true )
-          throw new InvalidOperationException( "An attempt was made to set the PropertyDescriptor property after the PropertyDetailDescription has been sealed." );
-
-        m_propertyDescriptor = value;
-        this.RelationName = value.Name;
-
-        this.Seal();
-      }
-    }
-
-    private PropertyDescriptor m_propertyDescriptor;
-
-    #endregion
-
-    protected internal override void Initialize( DataGridCollectionViewBase parentCollectionView )
-    {
-      base.Initialize( parentCollectionView );
-
-      if( this.PropertyDescriptor != null )
-        return;
-
-      string relationName = this.RelationName;
-
-      if( String.IsNullOrEmpty( relationName ) == true )
-        throw new InvalidOperationException( "An attempt was made to initialize a PropertyDetailDescription whose Name property has not been set." );
-
-      var enumeration = parentCollectionView as IEnumerable;
-      if( enumeration != null )
-      {
-        // Try to get it from the first item in the DataGridCollectionView
-        var firstItem = ItemsSourceHelper.GetFirstItemByEnumerable( enumeration );
-        if( firstItem != null )
-        {
-          var propertyDescriptor = this.GetPropertyDescriptorFromFirstItem( firstItem );
-          if( propertyDescriptor != null )
-          {
-            this.PropertyDescriptor = propertyDescriptor;
-            return;
-          }
-        }
-      }
-
-      // If the list is empty, check if the SourceCollection is ITypedList
-      var typedList = parentCollectionView.SourceCollection as ITypedList;
-      if( typedList != null )
-      {
-        var propertyDescriptor = this.GetPropertyDescriptorFromITypedList( typedList );
-        if( propertyDescriptor != null )
-        {
-          this.PropertyDescriptor = propertyDescriptor;
-          return;
-        }
-      }
-
-      throw new InvalidOperationException( "An attempt was made to initialize a PropertyDetailDescription whose data source does not contain a property that corresponds to the specified relation name." );
-    }
-
-    private PropertyDescriptor GetPropertyDescriptorFromITypedList( ITypedList typedList )
-    {
-      if( string.IsNullOrEmpty( this.RelationName ) || ( typedList == null ) )
-        return null;
-
-      var properties = typedList.GetItemProperties( null );
-      if( ( properties != null ) && ( properties.Count > 0 ) )
-        return properties[ this.RelationName ];
-
-      var listName = typedList.GetListName( null );
-      if( string.IsNullOrEmpty( listName ) )
-        return null;
-
-      var itemType = Type.GetType( listName, false, false );
-      if( itemType == null )
-        return null;
-
-      var descriptionProvider = TypeDescriptor.GetProvider( itemType );
-      if( descriptionProvider == null )
-        return null;
-
-      var descriptor = descriptionProvider.GetTypeDescriptor( itemType );
-      if( descriptor == null )
-        return null;
-
-      properties = descriptor.GetProperties();
-      if( ( properties != null ) && ( properties.Count > 0 ) )
-        return properties[ this.RelationName ];
-
-      return null;
-    }
-
-    private PropertyDescriptor GetPropertyDescriptorFromFirstItem( object firstItem )
-    {
-      if( string.IsNullOrEmpty( this.RelationName ) || ( firstItem == null ) )
-        return null;
-
-      var descriptor = ItemsSourceHelper.GetCustomTypeDescriptorFromItem( firstItem, firstItem.GetType() );
-      if( descriptor == null )
-        return null;
-
-      var properties = descriptor.GetProperties();
-      if( ( properties != null ) && ( properties.Count > 0 ) )
-        return properties[ this.RelationName ];
-
-      return null;
-    }
-
-    protected internal override IEnumerable GetDetailsForParentItem( DataGridCollectionViewBase parentCollectionView, object parentItem )
-    {
-      if( this.PropertyDescriptor == null )
-        throw new InvalidOperationException( "An attempt was made to obtain details of a PropertyDetailDescription object whose PropertyDescriptor property has not been set." );
-
-      this.Seal();
-
-      var value = this.PropertyDescriptor.GetValue( parentItem );
-      if( value == null )
-        return null;
-
-      var enumeration = value as IEnumerable;
-      if( enumeration == null )
-      {
-        var listSource = value as IListSource;
-        if( listSource != null )
-        {
-          enumeration = listSource.GetList();
-        }
-      }
-
-      return enumeration;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyRelationAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyRelationAttribute.cs
deleted file mode 100644
index b878a623..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyRelationAttribute.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Obsolete( "The PropertyRelationAttribute is obsolete. All IEnumerable properties will automatically be detected as detail relations. ", false )]
-  [AttributeUsage( AttributeTargets.Property )]
-  public sealed class PropertyRelationAttribute: Attribute
-  {
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyCollectionRefreshEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyCollectionRefreshEventManager.cs
deleted file mode 100644
index 6610e084..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyCollectionRefreshEventManager.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ProxyCollectionRefreshEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private ProxyCollectionRefreshEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static ProxyCollectionRefreshEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ProxyCollectionRefreshEventManager );
-        var currentManager = ( ProxyCollectionRefreshEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ProxyCollectionRefreshEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxyCollectionRefresh += new EventHandler( this.DeliverEvent );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxyCollectionRefresh -= new EventHandler( this.DeliverEvent );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyGroupDescriptionsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyGroupDescriptionsChangedEventManager.cs
deleted file mode 100644
index 95c6aa3d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxyGroupDescriptionsChangedEventManager.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ProxyGroupDescriptionsChangedEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private ProxyGroupDescriptionsChangedEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static ProxyGroupDescriptionsChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ProxyGroupDescriptionsChangedEventManager );
-        var currentManager = ( ProxyGroupDescriptionsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ProxyGroupDescriptionsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxyGroupDescriptionsChanged += new NotifyCollectionChangedEventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxyGroupDescriptionsChanged -= new NotifyCollectionChangedEventHandler( this.OnEventRaised );
-    }
-
-    private void OnEventRaised( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxySortDescriptionsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxySortDescriptionsChangedEventManager.cs
deleted file mode 100644
index 7c62a0cd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ProxySortDescriptionsChangedEventManager.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ProxySortDescriptionsChangedEventManager : WeakEventManager
-  {
-    #region Constructor
-
-    private ProxySortDescriptionsChangedEventManager()
-    {
-    }
-
-    #endregion
-
-    #region CurrentManager Private Property
-
-    private static ProxySortDescriptionsChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ProxySortDescriptionsChangedEventManager );
-        var currentManager = ( ProxySortDescriptionsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ProxySortDescriptionsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    public static void AddListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( DataGridCollectionViewBase source, IWeakEventListener listener )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( listener == null )
-        throw new ArgumentNullException( "listener" );
-
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxySortDescriptionsChanged += new NotifyCollectionChangedEventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridCollectionViewBase )source;
-      target.ProxySortDescriptionsChanged -= new NotifyCollectionChangedEventHandler( this.OnEventRaised );
-    }
-
-    private void OnEventRaised( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryDistinctValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryDistinctValueEventArgs.cs
deleted file mode 100644
index 3d69259f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryDistinctValueEventArgs.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class QueryDistinctValueEventArgs : EventArgs
-  {
-    internal QueryDistinctValueEventArgs( object dataSourceValue )
-    {
-      this.DataSourceValue = dataSourceValue;
-
-      // Initialize the DistinctValue as the original DataSourceValue
-      // in case it is not modified during the QueryDistinctValue event 
-      this.DistinctValue = dataSourceValue;
-    }
-
-    public object DataSourceValue
-    {
-      get;
-      private set;
-    }
-
-    public object DistinctValue
-    {
-      get;
-      set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryEntityDetailsEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryEntityDetailsEventArgs.cs
deleted file mode 100644
index 0b4deeea..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryEntityDetailsEventArgs.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data.Entity.Core.Objects.DataClasses;
-
-namespace Xceed.Wpf.DataGrid
-{
-    public class QueryEntityDetailsEventArgs : EventArgs
-    {
-        #region CONSTRUCTORS
-
-        internal QueryEntityDetailsEventArgs(EntityObject parentItem)
-          : base()
-        {
-            if (parentItem == null)
-                throw new ArgumentNullException("parentItem");
-
-            this.ParentItem = parentItem;
-        }
-
-        #endregion CONSTRUCTORS
-
-        #region ParentItem Property
-
-        public EntityObject ParentItem
-        {
-            get;
-            private set;
-        }
-
-        #endregion ParentItem Property
-
-        #region Handled Property
-
-        public bool Handled
-        {
-            get;
-            set;
-        }
-
-        #endregion Handled Property
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryGroupsEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryGroupsEventArgs.cs
deleted file mode 100644
index b76ad776..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryGroupsEventArgs.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class QueryGroupsEventArgs : EventArgs
-  {
-    #region CONSTRUCTORS
-
-    internal QueryGroupsEventArgs( 
-      DataGridVirtualizingCollectionView collectionView, 
-      DataGridVirtualizingCollectionViewGroup parentGroup, 
-      GroupDescription childGroupDescription )
-    {
-      m_dataGridVirtualizingCollectionView = collectionView;
-      m_readonlyGroupPath = parentGroup.GroupPath.AsReadOnly();
-      m_childGroupDescription = childGroupDescription;
-      this.ChildGroupPropertyName = DataGridCollectionViewBase.GetPropertyNameFromGroupDescription( childGroupDescription );
-
-      m_sortDirection = SortDirection.None;
-
-      SortDescriptionCollection sortDescriptions = m_dataGridVirtualizingCollectionView.SortDescriptions;
-
-      int sortDescriptionCount = ( sortDescriptions == null ) ? 0 : sortDescriptions.Count;
-
-      for( int i = 0; i < sortDescriptions.Count ; i++ )
-      {
-        SortDescription sortDescription = sortDescriptions[ i ];
-
-        if( string.Equals( sortDescription.PropertyName, this.ChildGroupPropertyName ) )
-        {
-          m_sortDirection = ( sortDescription.Direction == ListSortDirection.Ascending ) ? SortDirection.Ascending : SortDirection.Descending;
-          break;
-        }
-      }
-
-      m_childGroupNameCountPairs = new List<GroupNameCountPair>();
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region CollectionView PROPERTY
-
-    public DataGridVirtualizingCollectionView CollectionView
-    {
-      get
-      {
-        return m_dataGridVirtualizingCollectionView;
-      }
-    }
-
-    #endregion CollectionView PROPERTY
-
-    #region ChildGroupDescription PROPERTY
-
-    public GroupDescription ChildGroupDescription
-    {
-      get
-      {
-        return m_childGroupDescription;
-      }
-    }
-
-    #endregion ChildGroupDescription PROPERTY
-
-    #region ChildGroupPropertyName PROPERTY
-
-    public string ChildGroupPropertyName
-    {
-      get;
-      private set;
-    }
-
-    #endregion ChildGroupPropertyName PROPERTY
-
-    #region ChildSortDirection PROPERTY
-
-    public SortDirection ChildSortDirection
-    {
-      get
-      {
-        return m_sortDirection;
-      }
-    }
-
-    #endregion ChildSortDirection PROPERTY
-
-    #region ChildGroupNameCountPairs PROPERTY
-
-    public List<GroupNameCountPair> ChildGroupNameCountPairs
-    {
-      get
-      {
-        return m_childGroupNameCountPairs;
-      }
-    }
-
-    #endregion ChildGroupNameCountPairs PROPERTY
-
-
-    #region GroupPath PROPERTY
-
-    public ReadOnlyCollection<DataGridGroupInfo> GroupPath
-    {
-      get
-      {
-        return m_readonlyGroupPath;
-      }
-    }
-
-    #endregion GroupPath PROPERTY
-
-
-    #region PRIVATE FIELDS
-
-    private DataGridVirtualizingCollectionView m_dataGridVirtualizingCollectionView;
-    private GroupDescription m_childGroupDescription;
-    private SortDirection m_sortDirection;
-    private ReadOnlyCollection<DataGridGroupInfo> m_readonlyGroupPath;
-
-    private List<GroupNameCountPair> m_childGroupNameCountPairs;
-
-    #endregion PRIVATE FIELDS
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemCountEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemCountEvent.cs
deleted file mode 100644
index 822ecc55..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemCountEvent.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class QueryItemCountEventArgs : EventArgs
-  {
-    #region CONSTRUCTORS
-
-    internal QueryItemCountEventArgs( DataGridVirtualizingCollectionView collectionView, 
-      DataGridVirtualizingCollectionViewGroup collectionViewGroup )
-    {
-      m_dataGridVirtualizingCollectionView = collectionView;
-      m_readonlyGroupPath = collectionViewGroup.GroupPath.AsReadOnly();
-
-      m_count = -1;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region CollectionView PROPERTY
-
-    public DataGridVirtualizingCollectionView CollectionView
-    {
-      get
-      {
-        return m_dataGridVirtualizingCollectionView;
-      }
-    }
-
-    #endregion CollectionView PROPERTY
-
-    #region GroupPath PROPERTY
-
-    public ReadOnlyCollection<DataGridGroupInfo> GroupPath
-    {
-      get
-      {
-        return m_readonlyGroupPath;
-      }
-    }
-
-    #endregion GroupPath PROPERTY
-
-    #region Count PROPERTY
-
-    public int Count
-    {
-      get
-      {
-        return m_count;
-      }
-      set
-      {
-        m_count = value;
-      }
-    }
-
-    #endregion Count PROPERTY
-
-    #region PRIVATE FIELDS
-
-    private DataGridVirtualizingCollectionView m_dataGridVirtualizingCollectionView;
-    private ReadOnlyCollection<DataGridGroupInfo> m_readonlyGroupPath;
-
-    private int m_count;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemsEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemsEvent.cs
deleted file mode 100644
index dbf338d0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemsEvent.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class QueryItemsEventArgs : EventArgs
-  {
-    internal QueryItemsEventArgs(
-      DataGridVirtualizingCollectionView collectionView,
-      DataGridVirtualizingCollectionViewGroup collectionViewGroup,
-      AsyncQueryInfo asyncQueryInfo )
-    {
-      m_dataGridVirtualizingCollectionView = collectionView;
-
-      // The collectionViewGroup can be null when we abort
-      // a QueryItems for the old RootGroup when 
-      // DataGridVirtualizingCollectionViewBase.ForceRefresh
-      // is called
-      m_readonlyGroupPath = ( collectionViewGroup != null )
-        ? collectionViewGroup.GroupPath.AsReadOnly()
-        : new ReadOnlyCollection<DataGridGroupInfo>( new List<DataGridGroupInfo>() );
-
-      m_asyncQueryInfo = asyncQueryInfo;
-    }
-
-
-    #region CollectionView PROPERTY
-
-    public DataGridVirtualizingCollectionView CollectionView
-    {
-      get
-      {
-        return m_dataGridVirtualizingCollectionView;
-      }
-    }
-
-    #endregion CollectionView PROPERTY
-
-    #region GroupPath PROPERTY
-
-    public ReadOnlyCollection<DataGridGroupInfo> GroupPath
-    {
-      get
-      {
-        return m_readonlyGroupPath;
-      }
-    }
-
-    #endregion GroupPath PROPERTY
-
-
-    #region AsyncQueryInfo PROPERTY
-
-    public AsyncQueryInfo AsyncQueryInfo
-    {
-      get
-      {
-        return m_asyncQueryInfo;
-      }
-    }
-
-    #endregion AsyncQueryInfo PROPERTY
-
-
-    #region PRIVATE FIELDS
-
-    private DataGridVirtualizingCollectionView m_dataGridVirtualizingCollectionView;
-    private AsyncQueryInfo m_asyncQueryInfo;
-
-    private ReadOnlyCollection<DataGridGroupInfo> m_readonlyGroupPath;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryableExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryableExtensions.cs
deleted file mode 100644
index ee7d4f72..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryableExtensions.cs
+++ /dev/null
@@ -1,798 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Reflection;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class QueryableExtensions
-  {
-    #region REFLECTION METHODS
-
-    private static MemberInfo GetMemberInfo( Type type, string memberName )
-    {
-      MemberInfo[] members = type.FindMembers( MemberTypes.Property | MemberTypes.Field,
-        BindingFlags.Public | BindingFlags.Instance,
-        Type.FilterNameIgnoreCase, memberName );
-
-      if( members.Length != 0 )
-        return members[ 0 ];
-
-      return null;
-    }
-
-    internal static string[] FindPrimaryKeys( this IQueryable queryable )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      Type elementType = queryable.ElementType;
-
-      List<string> primaryKeyNames = new List<string>();
-
-      try
-      {
-        PropertyInfo[] properties = elementType.GetProperties();
-
-        for( int i = 0; i < properties.Length; i++ )
-        {
-          PropertyInfo propertyInfo = properties[ i ];
-
-          object[] attributes = propertyInfo.GetCustomAttributes( true );
-
-          for( int j = 0; j < attributes.Length; j++ )
-          {
-            Attribute attribute = attributes[ j ] as Attribute;
-
-            if( attribute == null )
-              continue;
-
-            Type attributeType = attribute.GetType();
-
-            if( attributeType.FullName == "System.Data.Linq.Mapping.ColumnAttribute" )
-            {
-              // LINQ to SQL support.
-              PropertyInfo isPrimaryKeyPropertyInfo = attributeType.GetProperty( "IsPrimaryKey" );
-
-              if( isPrimaryKeyPropertyInfo != null )
-              {
-                bool isPrimaryKey = ( bool )isPrimaryKeyPropertyInfo.GetValue( attribute, null );
-
-                if( isPrimaryKey )
-                  primaryKeyNames.Add( propertyInfo.Name );
-              }
-            }
-            else if( attributeType.FullName == "System.Data.Objects.DataClasses.EdmScalarPropertyAttribute" )
-            {
-              // LINQ to Entity support.
-              PropertyInfo entityKeyPropertyInfo = attributeType.GetProperty( "EntityKeyProperty" );
-
-              if( entityKeyPropertyInfo != null )
-              {
-                bool isPrimaryKey = ( bool )entityKeyPropertyInfo.GetValue( attribute, null );
-
-                if( isPrimaryKey )
-                  primaryKeyNames.Add( propertyInfo.Name );
-              }
-            }
-          }
-        }
-      }
-      catch
-      {
-      }
-
-      return primaryKeyNames.ToArray();
-    }
-
-
-    #endregion REFLECTION METHODS
-
-    #region ORDERING
-
-    internal static IQueryable OrderBy(
-      this IQueryable queryable,
-      SortDescriptionCollection implicitSortDescriptions,
-      SortDescriptionCollection explicitSortDescriptions,
-      bool reverse )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( ( implicitSortDescriptions == null ) && ( explicitSortDescriptions == null ) )
-        return queryable;
-
-      Expression orderedExpression = queryable.Expression;
-
-      Type queryableElementType = queryable.ElementType;
-
-      ParameterExpression[] parameters = new ParameterExpression[] { Expression.Parameter( queryableElementType, "" ) };
-
-      string ascendingOrderByMethodName = "OrderBy";
-      string descendingOrderByMethodName = "OrderByDescending";
-
-      if( explicitSortDescriptions != null )
-      {
-        foreach( SortDescription sortDescription in explicitSortDescriptions )
-        {
-          MemberExpression sortMemberExpression = QueryableExtensions.GenerateMemberExpression( parameters[ 0 ], sortDescription.PropertyName );
-
-          string methodNameToUse;
-
-          if( ( sortDescription.Direction == ListSortDirection.Ascending && !reverse ) || ( sortDescription.Direction == ListSortDirection.Descending && reverse ) )
-          {
-            methodNameToUse = ascendingOrderByMethodName;
-          }
-          else
-          {
-            methodNameToUse = descendingOrderByMethodName;
-          }
-
-          orderedExpression = Expression.Call( typeof( Queryable ),
-            methodNameToUse,
-            new Type[] { queryableElementType, sortMemberExpression.Type },
-            orderedExpression, Expression.Quote( Expression.Lambda( sortMemberExpression, parameters ) ) );
-
-
-          ascendingOrderByMethodName = "ThenBy";
-          descendingOrderByMethodName = "ThenByDescending";
-        }
-      }
-
-      if( implicitSortDescriptions != null )
-      {
-        foreach( SortDescription sortDescription in implicitSortDescriptions )
-        {
-          MemberExpression sortMemberExpression = QueryableExtensions.GenerateMemberExpression( parameters[ 0 ], sortDescription.PropertyName );
-
-          string methodNameToUse;
-
-          if( ( sortDescription.Direction == ListSortDirection.Ascending && !reverse ) || ( sortDescription.Direction == ListSortDirection.Descending && reverse ) )
-          {
-            methodNameToUse = ascendingOrderByMethodName;
-          }
-          else
-          {
-            methodNameToUse = descendingOrderByMethodName;
-          }
-
-          orderedExpression = Expression.Call( typeof( Queryable ),
-            methodNameToUse,
-            new Type[] { queryableElementType, sortMemberExpression.Type },
-            orderedExpression, Expression.Quote( Expression.Lambda( sortMemberExpression, parameters ) ) );
-
-
-          ascendingOrderByMethodName = "ThenBy";
-          descendingOrderByMethodName = "ThenByDescending";
-        }
-      }
-
-      return queryable.Provider.CreateQuery( orderedExpression );
-    }
-
-    #endregion ORDERING
-
-    #region FILTERING
-
-    internal static Expression CreateStartsWithExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params string[] values )
-    {
-      return QueryableExtensions.FilterString( queryable, sharedParameterExpression, propertyName, values, StringFilterMode.StartsWith );
-    }
-
-    internal static Expression CreateEndsWithExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params string[] values )
-    {
-      return QueryableExtensions.FilterString( queryable, sharedParameterExpression, propertyName, values, StringFilterMode.EndsWith );
-    }
-
-    internal static Expression CreateContainsExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params string[] values )
-    {
-      return QueryableExtensions.FilterString( queryable, sharedParameterExpression, propertyName, values, StringFilterMode.Contains );
-    }
-
-
-    internal static Expression CreateGreaterThanExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params object[] values )
-    {
-      return QueryableExtensions.CreateBinaryComparison(
-        queryable,
-        sharedParameterExpression,
-        propertyName,
-        values,
-        BinaryExpression.GreaterThan );
-    }
-
-    internal static Expression CreateGreaterThanOrEqualExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params object[] values )
-    {
-      return QueryableExtensions.CreateBinaryComparison(
-        queryable,
-        sharedParameterExpression,
-        propertyName,
-        values,
-        BinaryExpression.GreaterThanOrEqual );
-    }
-
-
-    internal static Expression CreateLesserThanExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params object[] values )
-    {
-      return QueryableExtensions.CreateBinaryComparison(
-        queryable,
-        sharedParameterExpression,
-        propertyName,
-        values,
-        BinaryExpression.LessThan );
-    }
-
-    internal static Expression CreateLesserThanOrEqualExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params object[] values )
-    {
-      return QueryableExtensions.CreateBinaryComparison(
-        queryable,
-        sharedParameterExpression,
-        propertyName,
-        values,
-        BinaryExpression.LessThanOrEqual );
-    }
-
-    internal static Expression CreateEqualExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params object[] values )
-    {
-      return QueryableExtensions.CreateBinaryComparison(
-        queryable,
-        sharedParameterExpression,
-        propertyName,
-        values,
-        BinaryExpression.Equal );
-    }
-
-    internal static Expression CreateDifferentThanExpression(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      params object[] values )
-    {
-      return QueryableExtensions.CreateBinaryComparison(
-        queryable,
-        sharedParameterExpression,
-        propertyName,
-        values,
-        BinaryExpression.NotEqual );
-    }
-
-
-    internal static ParameterExpression CreateParameterExpression( this IQueryable queryable )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      return Expression.Parameter( queryable.ElementType, "" );
-    }
-
-    private static Expression CreateBinaryComparison(
-      this IQueryable queryable,
-      ParameterExpression sharedParameterExpression,
-      string propertyName,
-      object[] values,
-      BinaryComparisonDelegate binaryComparisonDelegate )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( ( values == null ) || ( values.Length == 0 ) )
-        throw new ArgumentNullException( "values" );
-
-      if( binaryComparisonDelegate == null )
-        throw new ArgumentNullException( "binaryComparisonDelegate" );
-
-      MemberExpression memberExpression = QueryableExtensions.GenerateMemberExpression( sharedParameterExpression, propertyName );
-
-      Expression mergedFilterExpression = null;
-
-      for( int i = 0; i < values.Length; i++ )
-      {
-        ConstantExpression valueExpression = Expression.Constant( values[ i ] );
-
-        Expression newFilterExpression = binaryComparisonDelegate( memberExpression,
-          Expression.Convert( valueExpression, memberExpression.Type ) );
-
-        if( mergedFilterExpression == null )
-        {
-          mergedFilterExpression = newFilterExpression;
-        }
-        else
-        {
-          mergedFilterExpression = Expression.Or( mergedFilterExpression, newFilterExpression );
-        }
-      }
-
-      return mergedFilterExpression;
-    }
-
-
-    internal static IQueryable WhereFilter( this IQueryable queryable, ParameterExpression sharedParameterExpression, Expression expression )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      Type queryableElementType = queryable.ElementType;
-
-      LambdaExpression whereLambda = Expression.Lambda( expression, sharedParameterExpression );
-
-      MethodCallExpression whereCall =
-        Expression.Call(
-        typeof( Queryable ), "Where",
-        new Type[] { queryableElementType },
-        queryable.Expression,
-        Expression.Quote( whereLambda ) );
-
-      return queryable.Provider.CreateQuery( whereCall );
-    }
-
-
-
-    #endregion FILTERING
-
-    #region SELECTING
-
-    internal static IQueryable Select( this IQueryable queryable, string propertyName )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( string.IsNullOrEmpty( propertyName ) )
-      {
-        if( propertyName == null )
-          throw new ArgumentNullException( "propertyName" );
-
-        throw new ArgumentException( "A property name must be provided.", "propertyName" );
-      }
-
-      Type queryableElementType = queryable.ElementType;
-      ParameterExpression[] parameters = new ParameterExpression[] { Expression.Parameter( queryableElementType, "" ) };
-
-      MemberExpression selectMemberExpression = QueryableExtensions.GenerateMemberExpression( parameters[ 0 ], propertyName );
-
-      LambdaExpression selectLambdaExpression = Expression.Lambda( selectMemberExpression, parameters );
-
-      return queryable.Provider.CreateQuery(
-        Expression.Call( typeof( Queryable ), "Select",
-        new Type[] { queryableElementType, selectLambdaExpression.Body.Type },
-        queryable.Expression, Expression.Quote( selectLambdaExpression ) ) );
-    }
-
-    internal static IQueryable GetSubGroupsAndCountsQueryable( this IQueryable queryable, string subGroupBy, bool sortGroupBy, ListSortDirection direction )
-    {
-      // Create GroupBy
-      Type queryableElementType = queryable.ElementType;
-
-      ParameterExpression[] parameters = new ParameterExpression[] { Expression.Parameter( queryableElementType, "" ) };
-      MemberExpression memberExpression = QueryableExtensions.GenerateMemberExpression( parameters[ 0 ], subGroupBy );
-      LambdaExpression groupByLambdaExpression = Expression.Lambda( memberExpression, parameters );
-
-      MethodCallExpression groupByMethodExpression =
-        Expression.Call(
-        typeof( Queryable ), "GroupBy",
-        new Type[] { queryableElementType, groupByLambdaExpression.Body.Type },
-        new Expression[] { queryable.Expression, Expression.Quote( groupByLambdaExpression ) } );
-
-      IQueryable groupedResult = queryable.Provider.CreateQuery( groupByMethodExpression );
-
-      if( sortGroupBy )
-        groupedResult = groupedResult.OrderByKey( direction == ListSortDirection.Ascending );
-
-      ParameterExpression[] groupedParameters = new ParameterExpression[] { System.Linq.Expressions.Expression.Parameter( groupedResult.ElementType, "" ) };
-
-      MemberExpression keyMemberExpression = MemberExpression.Property( groupedParameters[ 0 ], "Key" );
-      MethodCallExpression countCallExpression = MethodCallExpression.Call( typeof( Enumerable ), "Count", new Type[] { queryableElementType }, groupedParameters );
-
-      QueryableGroupNameCountPairInfo queryableGroupNameCountPairInfo =
-        QueryableExtensions.QueryableGroupNameCountPairInfos.GetInfosForType( memberExpression.Type );
-
-      Expression[] newExpressionArguments = new Expression[ 2 ] { keyMemberExpression, countCallExpression };
-
-      NewExpression newExpression =
-        NewExpression.New(
-        queryableGroupNameCountPairInfo.ConstructorInfo,
-        newExpressionArguments,
-        new MemberInfo[] { queryableGroupNameCountPairInfo.KeyPropertyInfo, queryableGroupNameCountPairInfo.CountPropertyInfo } );
-
-      LambdaExpression finalLambdaExpression = System.Linq.Expressions.Expression.Lambda( newExpression, groupedParameters );
-
-      MethodCallExpression finalSelectExpression =
-        System.Linq.Expressions.Expression.Call(
-        typeof( Queryable ), "Select",
-        new Type[] { groupedResult.ElementType, finalLambdaExpression.Body.Type },
-        new System.Linq.Expressions.Expression[] { groupedResult.Expression, System.Linq.Expressions.Expression.Quote( finalLambdaExpression ) } );
-
-      return groupedResult.Provider.CreateQuery( finalSelectExpression );
-    }
-
-    internal static IQueryable Slice( this IQueryable queryable, int skip, int take )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      Expression skipAndTakeExpression = queryable.Expression;
-
-      Type queryableElementType = queryable.ElementType;
-
-      skipAndTakeExpression = QueryableExtensions.Skip( queryableElementType, skipAndTakeExpression, skip );
-      skipAndTakeExpression = QueryableExtensions.Take( queryableElementType, skipAndTakeExpression, take );
-
-      return queryable.Provider.CreateQuery( skipAndTakeExpression );
-    }
-
-    internal static int Count( this IQueryable queryable )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      Type queryableElementType = queryable.ElementType;
-      Expression expressionToCount = queryable.Expression;
-
-      MethodCallExpression countExpression = Expression.Call(
-        typeof( Queryable ), "Count",
-        new Type[] { queryableElementType }, expressionToCount );
-
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Beginning Provider Execute for total count." );
-      int count = ( int )queryable.Provider.Execute( countExpression );
-      Debug.WriteLineIf( VirtualPageManager.DebugDataVirtualization, "Ended Provider Execute for total count." );
-      return count;
-    }
-
-    #endregion SELECTING
-
-    #region PRIVATE METHODS
-
-    private static IQueryable OrderByKey( this IQueryable queryable, bool ascending )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      Expression orderedExpression = queryable.Expression;
-
-      Type queryableElementType = queryable.ElementType;
-
-      ParameterExpression parameter = queryable.CreateParameterExpression();
-
-      MemberExpression sortMemberExpression = QueryableExtensions.GenerateMemberExpression( parameter, "Key" );
-
-      string methodName = ( ascending ) ? "OrderBy" : "OrderByDescending";
-
-      orderedExpression = Expression.Call( typeof( Queryable ),
-            methodName,
-            new Type[] { queryableElementType, sortMemberExpression.Type },
-            orderedExpression, Expression.Quote( Expression.Lambda( sortMemberExpression, parameter ) ) );
-
-      return queryable.Provider.CreateQuery( orderedExpression );
-    }
-
-
-    internal static MemberExpression GenerateMemberExpression( ParameterExpression typeExpression, string name )
-    {
-      if( string.IsNullOrEmpty( name ) )
-      {
-        if( name == null )
-          throw new ArgumentNullException( "name" );
-
-        throw new ArgumentException( "A name must be provided.", "name" );
-      }
-
-      MemberExpression memberExpression = null;
-
-      MemberInfo member = QueryableExtensions.GetMemberInfo( typeExpression.Type, name );
-
-      if( member == null )
-        throw new DataGridInternalException( "MemberInfo is null." );
-
-      if( member is PropertyInfo )
-      {
-        // Member is a property.
-        memberExpression = Expression.Property( typeExpression, ( PropertyInfo )member );
-      }
-      else
-      {
-        // Member is a field.
-        memberExpression = Expression.Field( typeExpression, ( FieldInfo )member );
-      }
-
-      return memberExpression;
-    }
-
-    private static MethodCallExpression Take( Type queryableElementType, Expression expression, int count )
-    {
-      if( queryableElementType == null )
-        throw new ArgumentNullException( "queryableElementType" );
-
-      if( expression == null )
-        throw new ArgumentNullException( "expression" );
-
-      return Expression.Call( typeof( Queryable ), "Take", new Type[] { queryableElementType }, expression, Expression.Constant( count ) );
-    }
-
-    private static MethodCallExpression Skip( Type queryableElementType, Expression expression, int count )
-    {
-      if( queryableElementType == null )
-        throw new ArgumentNullException( "queryableElementType" );
-
-      if( expression == null )
-        throw new ArgumentNullException( "expression" );
-
-      return Expression.Call( typeof( Queryable ), "Skip", new Type[] { queryableElementType }, expression, Expression.Constant( count ) );
-    }
-
-    private static string GetMethodNameFromStringFilterMode( StringFilterMode stringFilterMode )
-    {
-      switch( stringFilterMode )
-      {
-        case StringFilterMode.StartsWith:
-          {
-            return "StartsWith";
-          }
-
-        case StringFilterMode.Contains:
-          {
-            return "Contains";
-          }
-
-        case StringFilterMode.EndsWith:
-          {
-            return "EndsWith";
-          }
-      }
-
-      Debug.Fail( "Should have handled the new StringFilterMode." );
-      return string.Empty;
-    }
-
-    private static Expression FilterString(
-     this IQueryable queryable,
-     ParameterExpression sharedParameterExpression,
-     string propertyName,
-     string[] values,
-     StringFilterMode stringFilterMode )
-    {
-      if( queryable == null )
-        throw new ArgumentNullException( "queryable" );
-
-      if( ( values == null ) || ( values.Length == 0 ) )
-        throw new ArgumentNullException( "values" );
-
-      string methodName = QueryableExtensions.GetMethodNameFromStringFilterMode( stringFilterMode );
-
-      Debug.Assert( !String.IsNullOrEmpty( methodName ) );
-
-      MemberExpression memberExpression = QueryableExtensions.GenerateMemberExpression( sharedParameterExpression, propertyName );
-
-      Expression mergedFilterCall = null;
-
-      for( int i = 0; i < values.Length; i++ )
-      {
-        ConstantExpression valueExpression = Expression.Constant( values[ i ] );
-
-        MethodCallExpression newFilterCall = Expression.Call(
-          memberExpression,
-          typeof( string ).GetMethod( methodName, new Type[] { typeof( string ) } ),
-          Expression.Convert( valueExpression, memberExpression.Type ) );
-
-        if( mergedFilterCall == null )
-        {
-          mergedFilterCall = newFilterCall;
-        }
-        else
-        {
-          mergedFilterCall = MethodCallExpression.Or( mergedFilterCall, newFilterCall );
-        }
-      }
-
-      return mergedFilterCall;
-    }
-
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
-    private delegate Expression BinaryComparisonDelegate( Expression left, Expression right );
-
-
-
-
-    #endregion PRIVATE FIELDS
-
-    #region INTERNAL NESTED CLASSES
-
-    internal interface IQueryableGroupNameCountPair
-    {
-      object GroupName
-      {
-        get;
-      }
-
-      Type GroupNameType
-      {
-        get;
-      }
-
-      int Count
-      {
-        get;
-      }
-    }
-
-    #endregion INTERNAL NESTED CLASSES
-
-    #region PRIVATE NESTED CLASSES
-
-    private class QueryableGroupNameCountPair<T> : IQueryableGroupNameCountPair
-    {
-      public QueryableGroupNameCountPair( T groupName, int count )
-      {
-        this.GroupName = groupName;
-        this.Count = count;
-      }
-
-      public T GroupName
-      {
-        get;
-        set;
-      }
-
-      public int Count
-      {
-        get;
-        set;
-      }
-
-      #region QueryableGroupNameCountPair Members
-
-      object IQueryableGroupNameCountPair.GroupName
-      {
-        get
-        {
-          return this.GroupName;
-        }
-      }
-
-      public Type GroupNameType
-      {
-        get
-        {
-          return typeof( T );
-        }
-      }
-
-      int IQueryableGroupNameCountPair.Count
-      {
-        get
-        {
-          return this.Count;
-        }
-      }
-
-      #endregion
-    }
-
-    private static class QueryableGroupNameCountPairInfos
-    {
-      public static QueryableGroupNameCountPairInfo GetInfosForType( Type sourceType )
-      {
-        if( QueryableGroupNameCountPairInfos.ReflectionInfoDictionary == null )
-          QueryableGroupNameCountPairInfos.ReflectionInfoDictionary = new Dictionary<Type, QueryableGroupNameCountPairInfo>();
-
-        QueryableGroupNameCountPairInfo queryableGroupNameCountPairInfo;
-
-        if( !QueryableGroupNameCountPairInfos.ReflectionInfoDictionary.TryGetValue( sourceType, out queryableGroupNameCountPairInfo ) )
-        {
-          Type queryableGroupNameCountPairType = typeof( QueryableGroupNameCountPair<> ).MakeGenericType( sourceType );
-
-          ConstructorInfo constructorInfo =
-            queryableGroupNameCountPairType.GetConstructor( new Type[] { sourceType, typeof( int ) } );
-
-          PropertyInfo keyPropertyInfo = queryableGroupNameCountPairType.GetProperty( "GroupName" );
-          PropertyInfo countPropertyInfo = queryableGroupNameCountPairType.GetProperty( "Count" );
-
-          queryableGroupNameCountPairInfo = new QueryableGroupNameCountPairInfo()
-          {
-            Type = queryableGroupNameCountPairType,
-            ConstructorInfo = constructorInfo,
-            KeyPropertyInfo = keyPropertyInfo,
-            CountPropertyInfo = countPropertyInfo
-          };
-
-          QueryableGroupNameCountPairInfos.ReflectionInfoDictionary.Add( sourceType, queryableGroupNameCountPairInfo );
-        }
-
-        return queryableGroupNameCountPairInfo;
-      }
-
-      private static Dictionary<Type, QueryableGroupNameCountPairInfo> ReflectionInfoDictionary;
-    }
-
-    private struct QueryableGroupNameCountPairInfo
-    {
-      public Type Type
-      {
-        get;
-        set;
-      }
-
-      public ConstructorInfo ConstructorInfo
-      {
-        get;
-        set;
-      }
-
-      public PropertyInfo KeyPropertyInfo
-      {
-        get;
-        set;
-      }
-
-      public PropertyInfo CountPropertyInfo
-      {
-        get;
-        set;
-      }
-    }
-
-    #endregion PRIVATE NESTED CLASSES
-
-    #region PRIVATE NESTED ENUMS
-
-    private enum StringFilterMode
-    {
-      StartsWith = 0,
-      Contains = 1,
-      EndsWith = 2
-    }
-
-    #endregion PRIVATE NESTED ENUMS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItem.cs
deleted file mode 100644
index d422c4dc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItem.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  // We use an intermediate liste to always acces the source with the index
-  // and never directly by keeping a variable that contains the source item directly.
-  // ( We do that to be able to work correctly with a DataView has source )
-  //
-  // RawItem is always pointing at the same item.
-  // The dataIndex may be changing to always represent the same item if the item is moving in the source.
-  internal class RawItem
-  {
-    public RawItem( int dataIndex, object dataItem )
-    {
-      m_dataIndex = dataIndex;
-      m_dataItem = dataItem;
-      m_sortedIndex = -1;
-    }
-
-    public int Index
-    {
-      get
-      {
-        return m_dataIndex;
-      }
-    }
-
-    public int SortedIndex
-    {
-      get
-      {
-        return m_sortedIndex;
-      }
-    }
-
-    public object DataItem
-    {
-      get
-      {
-        return m_dataItem;
-      }
-    }
-
-    public DataGridCollectionViewGroup ParentGroup
-    {
-      get
-      {
-        return m_parentGroup;
-      }
-    }
-
-    public int GetGlobalSortedIndex()
-    {
-      if( m_parentGroup == null )
-        return -1;
-
-      return m_sortedIndex + m_parentGroup.GetFirstRawItemGlobalSortedIndex();
-    }
-
-    internal void SetIndex( int newIndex )
-    {
-      m_dataIndex = newIndex;
-    }
-
-    internal void SetParentGroup( DataGridCollectionViewGroup parentGroup )
-    {
-      m_parentGroup = parentGroup;
-    }
-
-    internal void SetSortedIndex( int newIndex )
-    {
-      m_sortedIndex = newIndex;
-    }
-
-    internal void SetDataItem( object dataItem )
-    {
-      m_dataItem = dataItem;
-    }
-
-    private object m_dataItem;
-    private int m_dataIndex;
-    private int m_sortedIndex;
-    private DataGridCollectionViewGroup m_parentGroup;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemIndexComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemIndexComparer.cs
deleted file mode 100644
index fff0886d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemIndexComparer.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RawItemIndexComparer : IComparer<RawItem>
-  {
-    public RawItemIndexComparer()
-    {
-    }
-
-    #region IComparer<RawItem> Members
-
-    public int Compare( RawItem x, RawItem y )
-    {
-      if( x == null )
-      {
-        if( y == null )
-        {
-          return 0;
-        }
-        else
-        {
-          return -1;
-        }
-      }
-      else
-      {
-        if( y == null )
-        {
-          return 1;
-        }
-      }
-
-      return x.Index - y.Index;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemMap.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemMap.cs
deleted file mode 100644
index 01bef4eb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemMap.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class RawItemMap
-  {
-    #region [] Property
-
-    internal RawItem this[ object dataItem ]
-    {
-      get
-      {
-        Debug.Assert( dataItem != null );
-
-        RawItem value;
-        if( m_singleMap.TryGetValue( dataItem, out value ) )
-          return value;
-
-        RawItem[] values;
-        if( m_multiMap.TryGetValue( dataItem, out values ) )
-          return values[ 0 ];
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    internal void Add( object dataItem, RawItem rawItem )
-    {
-      Debug.Assert( dataItem != null );
-      Debug.Assert( rawItem != null );
-      Debug.Assert( dataItem == rawItem.DataItem );
-
-      RawItem single;
-      RawItem[] multiple;
-
-      if( m_singleMap.TryGetValue( dataItem, out single ) )
-      {
-        Debug.Assert( rawItem != single, "It's not normal to be called twice for the same RawItem." );
-
-        m_multiMap.Add( dataItem, new RawItem[] { single, rawItem } );
-        m_singleMap.Remove( dataItem );
-      }
-      else if( m_multiMap.TryGetValue( dataItem, out multiple ) )
-      {
-        Debug.Assert( !multiple.Contains( rawItem ), "It's not normal to be called twice for the same RawItem." );
-
-        var length = multiple.Length;
-
-        Array.Resize<RawItem>( ref multiple, length + 1 );
-        multiple[ length ] = rawItem;
-
-        m_multiMap[ dataItem ] = multiple;
-      }
-      else
-      {
-        m_singleMap.Add( dataItem, rawItem );
-      }
-    }
-
-    internal void Remove( object dataItem, RawItem rawItem )
-    {
-      Debug.Assert( dataItem != null );
-      Debug.Assert( rawItem != null );
-      Debug.Assert( dataItem == rawItem.DataItem );
-
-      if( m_singleMap.Remove( dataItem ) )
-        return;
-
-      RawItem[] multiple;
-      if( !m_multiMap.TryGetValue( dataItem, out multiple ) )
-        return;
-
-      var length = multiple.Length;
-      if( length == 2 )
-      {
-        if( multiple[ 0 ] == rawItem )
-        {
-          m_singleMap.Add( dataItem, multiple[ 1 ] );
-          m_multiMap.Remove( dataItem );
-        }
-        else if( multiple[ 1 ] == rawItem )
-        {
-          m_singleMap.Add( dataItem, multiple[ 0 ] );
-          m_multiMap.Remove( dataItem );
-        }
-      }
-      else
-      {
-        Debug.Assert( length > 2 );
-
-        var index = Array.IndexOf( multiple, rawItem );
-        if( index < 0 )
-          return;
-
-        RawItem[] copy = new RawItem[ length - 1 ];
-
-        if( index > 0 )
-        {
-          Array.Copy( multiple, 0, copy, 0, index );
-        }
-
-        if( index < length - 1 )
-        {
-          Array.Copy( multiple, index + 1, copy, index, length - index - 1 );
-        }
-
-        m_multiMap[ dataItem ] = copy;
-      }
-    }
-
-    internal void Clear()
-    {
-      m_singleMap.Clear();
-      m_multiMap.Clear();
-    }
-
-    #region Private Fields
-
-    private readonly Dictionary<object, RawItem> m_singleMap = new Dictionary<object, RawItem>( 128 );
-    private readonly Dictionary<object, RawItem[]> m_multiMap = new Dictionary<object, RawItem[]>( 0 );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs
deleted file mode 100644
index a3decd05..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-
-using Xceed.Utils.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RawItemSortComparer : IComparer<RawItem>
-  {
-    public RawItemSortComparer( DataGridCollectionView collectionView )
-    {
-      m_collectionView = collectionView;
-    }
-
-    #region IComparer<RawItem> Members
-
-    public int Compare( RawItem xRawItem, RawItem yRawItem )
-    {
-      if( xRawItem == null )
-        return ( yRawItem == null ) ? 0 : -1;
-
-      if( yRawItem == null )
-        return 1;
-
-      var lastSortDirection = ListSortDirection.Ascending;
-      var sortDescriptions = m_collectionView.SortDescriptions;
-      var sortDescriptionCount = sortDescriptions.Count;
-
-      if( sortDescriptionCount > 0 )
-      {
-        var result = default( int );
-        var itemProperties = m_collectionView.ItemProperties;
-
-        for( int i = 0; i < sortDescriptionCount; i++ )
-        {
-          var sortDescription = sortDescriptions[ i ];
-          lastSortDirection = sortDescription.Direction;
-
-          var itemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( itemProperties, sortDescription.PropertyName );
-          if( itemProperty == null )
-            continue;
-
-          var supportInitialize = itemProperty as ISupportInitialize;
-          var xData = default( object );
-          var yData = default( object );
-
-          if( supportInitialize != null )
-          {
-            supportInitialize.BeginInit();
-          }
-
-          try
-          {
-            xData = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, xRawItem.DataItem );
-            yData = ItemsSourceHelper.GetValueFromItemProperty( itemProperty, yRawItem.DataItem );
-
-            if( itemProperty.IsSortingOnForeignKeyDescription )
-            {
-              var foreignKeyDescription = itemProperty.ForeignKeyDescription;
-
-              xData = foreignKeyDescription.GetDisplayValue( xData );
-              yData = foreignKeyDescription.GetDisplayValue( yData );
-            }
-          }
-          finally
-          {
-            if( supportInitialize != null )
-            {
-              supportInitialize.EndInit();
-            }
-          }
-
-          var sortComparer = itemProperty.SortComparer;
-
-          if( sortComparer != null )
-          {
-            result = sortComparer.Compare( xData, yData );
-          }
-          else
-          {
-            result = ObjectDataStore.CompareData( xData, yData );
-          }
-
-          if( result != 0 )
-          {
-            if( lastSortDirection == ListSortDirection.Descending )
-              return -result;
-
-            return result;
-          }
-        }
-      }
-
-      if( lastSortDirection == ListSortDirection.Descending )
-        return yRawItem.Index - xRawItem.Index;
-
-      return xRawItem.Index - yRawItem.Index;
-    }
-
-    #endregion
-
-    private DataGridCollectionView m_collectionView;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SelfPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SelfPropertyDescriptor.cs
deleted file mode 100644
index 7a73eacd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SelfPropertyDescriptor.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Data;
-using System.Collections;
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelfPropertyDescriptor : PropertyDescriptor
-  {
-    public SelfPropertyDescriptor( Type columnDataType )
-      : base( ".", null )
-    {
-      m_columnDataType = columnDataType;
-    }
-
-    public override AttributeCollection Attributes
-    {
-      get
-      {
-        if( typeof( IList ).IsAssignableFrom( this.PropertyType ) )
-        {
-          Attribute[] array = new Attribute[ base.Attributes.Count + 1 ];
-          base.Attributes.CopyTo( array, 0 );
-          array[ array.Length - 1 ] = new ListBindableAttribute( false );
-          return new AttributeCollection( array );
-        }
-
-        return base.Attributes;
-      }
-    }
-
-    public override Type ComponentType
-    {
-      get
-      {
-        return m_columnDataType;
-      }
-    }
-
-    public override bool IsReadOnly
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public override Type PropertyType
-    {
-      get
-      {
-        return m_columnDataType;
-      }
-    }
-
-    public override bool CanResetValue( object component )
-    {
-      return false;
-    }
-
-    public override object GetValue( object component )
-    {
-      return component;
-    }
-
-    public override void ResetValue( object component )
-    {
-      throw new InvalidOperationException( "An attempt was made to set a value on a read-only property." );
-    }
-
-    public override void SetValue( object component, object value )
-    {
-      throw new InvalidOperationException( "An attempt was made to set a value on a read-only property." );
-    }
-
-    public override bool ShouldSerializeValue( object component )
-    {
-      return false;
-    }
-
-    private Type m_columnDataType;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortDescriptionsSyncContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortDescriptionsSyncContext.cs
deleted file mode 100644
index 6976c602..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortDescriptionsSyncContext.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SortDescriptionsSyncContext
-  {
-    //public bool IsInitializing
-    //{
-    //  get
-    //  {
-    //    return m_isInitializing;
-    //  }
-    //  set
-    //  {
-    //    m_isInitializing = value;
-    //  }
-    //}
-
-    public bool ProcessingSortSynchronization
-    {
-      get
-      {
-        return m_processingSortSynchronization;
-      }
-      set
-      {
-        m_processingSortSynchronization = value;
-      }
-    }
-
-    //public bool SynchronizeSortDelayed
-    //{
-    //  get
-    //  {
-    //    return m_synchronizeSortDelayed;
-    //  }
-    //  set
-    //  {
-    //    m_synchronizeSortDelayed = value;
-    //  }
-    //}
-
-    private bool m_processingSortSynchronization;
-    //private bool m_synchronizeSortDelayed;
-    //private bool m_isInitializing;
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs
deleted file mode 100644
index 46a87291..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections;
-
-using Xceed.Utils.Data;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SortDescriptionInfo
-  {
-    public SortDescriptionInfo( DataGridItemPropertyBase property, ListSortDirection direction )
-    {
-      m_property = property;
-      m_direction = direction;
-    }
-
-    #region SortDirection Property
-
-    public ListSortDirection SortDirection
-    {
-      get
-      {
-        return m_direction;
-      }
-    }
-
-    #endregion
-
-    #region Property Property
-
-    public DataGridItemPropertyBase Property
-    {
-      get
-      {
-        return m_property;
-      }
-    }
-
-    #endregion
-
-    #region DataStore Property
-
-    public DataStore DataStore
-    {
-      get
-      {
-        return m_dataStore;
-      }
-      set
-      {
-        m_dataStore = value;
-      }
-    }
-
-    #endregion
-
-    #region SortComparer Property
-
-    public IComparer SortComparer
-    {
-      get
-      {
-        if( m_property == null )
-          return null;
-
-        return m_property.SortComparer;
-      }
-    }
-
-    #endregion
-
-    public bool IsReverseOf( SortDescriptionInfo sortDescriptionInfo )
-    {
-      if( sortDescriptionInfo.m_property == m_property )
-      {
-        switch( sortDescriptionInfo.m_direction )
-        {
-          case ListSortDirection.Ascending:
-            return m_direction == ListSortDirection.Descending;
-
-          case ListSortDirection.Descending:
-            return m_direction == ListSortDirection.Ascending;
-        }
-      }
-
-      return false;
-    }
-
-    public override bool Equals( object obj )
-    {
-      SortDescriptionInfo sortDescriptionInfo = obj as SortDescriptionInfo;
-
-      if( sortDescriptionInfo == null )
-        return false;
-
-      if( ( sortDescriptionInfo.m_direction == m_direction ) &&
-        ( sortDescriptionInfo.m_property == m_property ) )
-      {
-        return true;
-      }
-
-      return false;
-    }
-
-    public override int GetHashCode()
-    {
-      return ( m_property.GetHashCode() ) ^ ( ( int )m_direction << 14 );
-    }
-
-    private ListSortDirection m_direction; // Initialize in constructor
-    private DataGridItemPropertyBase m_property; // Initialize in constructor
-    private DataStore m_dataStore; // = null
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SourceItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SourceItemCollection.cs
deleted file mode 100644
index d9f6d467..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SourceItemCollection.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Markup;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SourceItemCollection : IList, IAddChild
-  {
-    internal SourceItemCollection( DataGridCollectionView parentCollectionView )
-    {
-      if( parentCollectionView == null )
-        throw new ArgumentNullException( "parentCollectionView" );
-
-      m_parentCollectionView = parentCollectionView;
-    }
-
-    #region IList Members
-
-    public int Add( object value )
-    {
-      int index = this.Count;
-      this.Insert( index, value );
-      return index;
-    }
-
-    public void Clear()
-    {
-      this.CheckParentCollectionViewSourceNotUsed();
-      m_parentCollectionView.RemoveSourceItem( 0, this.Count );
-    }
-
-    public bool Contains( object value )
-    {
-      return m_parentCollectionView.IndexOfSourceItem( value ) != -1;
-    }
-
-    public int IndexOf( object value )
-    {
-      return m_parentCollectionView.IndexOfSourceItem( value );
-    }
-
-    public void Insert( int index, object value )
-    {
-      this.CheckParentCollectionViewSourceNotUsed();
-
-      if( ( index < 0 ) || ( index > this.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
-
-      m_parentCollectionView.AddSourceItem( index, new object[] { value }, this.Count + 1 );
-    }
-
-    public bool IsFixedSize
-    {
-      get
-      {
-        return !this.ParentCollectionViewSourceNotUsed();
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        return !this.ParentCollectionViewSourceNotUsed();
-      }
-    }
-
-    public void Remove( object value )
-    {
-      this.CheckParentCollectionViewSourceNotUsed();
-      int index = this.IndexOf( value );
-
-      if( index != -1 )
-        m_parentCollectionView.RemoveSourceItem( index, 1 );
-    }
-
-    public void RemoveAt( int index )
-    {
-      this.CheckParentCollectionViewSourceNotUsed();
-
-      if( ( index < 0 ) || ( index >= this.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-      m_parentCollectionView.RemoveSourceItem( index, 1 );
-    }
-
-    public object this[ int index ]
-    {
-      get
-      {
-        if( ( index < 0 ) || ( index >= this.Count ) )
-          throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-        return m_parentCollectionView.GetSourceItemAt( index );
-      }
-      set
-      {
-        if( ( index < 0 ) || ( index >= this.Count ) )
-          throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-        m_parentCollectionView.ReplaceSourceItem(
-          index, new object[] { this[ index ] },
-          index, new object[] { value } );
-      }
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    public void CopyTo( Array array, int index )
-    {
-      int count = this.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        array.SetValue( this[ i ], index );
-        index++;
-      }
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_parentCollectionView.SourceItemCount;
-      }
-    }
-
-    public bool IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public object SyncRoot
-    {
-      get
-      {
-        return this;
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    public IEnumerator GetEnumerator()
-    {
-      return new SourceItemCollectionEnumerator( m_parentCollectionView.GetSourceListEnumerator() );
-    }
-
-    #endregion
-
-    #region IAddChild Members
-
-    void IAddChild.AddChild( object value )
-    {
-      this.Add( value );
-    }
-
-    void IAddChild.AddText( string text )
-    {
-      this.Add( text );
-    }
-
-    #endregion
-
-    private void CheckParentCollectionViewSourceNotUsed()
-    {
-      if( this.ParentCollectionViewSourceNotUsed() )
-        throw new InvalidOperationException( "An attempt was made to modify the list of items while a source is being used." );
-    }
-
-    private bool ParentCollectionViewSourceNotUsed()
-    {
-      return ( m_parentCollectionView.SourceCollection != null );
-    }
-
-    private DataGridCollectionView m_parentCollectionView;
-
-    private class SourceItemCollectionEnumerator : IEnumerator
-    {
-      public SourceItemCollectionEnumerator( IEnumerator<RawItem> rawItemEnumerator )
-      {
-        m_rawItemEnumerator = rawItemEnumerator;
-      }
-
-      #region IEnumerator Members
-
-      public object Current
-      {
-        get
-        {
-          RawItem currentItem = m_rawItemEnumerator.Current;
-
-          if( currentItem == null )
-            return null;
-
-          return currentItem.DataItem;
-        }
-      }
-
-      public bool MoveNext()
-      {
-        return m_rawItemEnumerator.MoveNext();
-      }
-
-      public void Reset()
-      {
-        m_rawItemEnumerator.Reset();
-      }
-
-      #endregion
-
-      private IEnumerator<RawItem> m_rawItemEnumerator;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/StatResultComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/StatResultComparer.cs
deleted file mode 100644
index fdec585f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/StatResultComparer.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class StatResultComparer : IComparer
-  {
-    private StatResultComparer()
-    {
-    }
-
-    #region Singleton Property
-
-    public static StatResultComparer Singleton
-    {
-      get
-      {
-        if( _singleton == null )
-          _singleton = new StatResultComparer();
-
-        return _singleton;
-      }
-    }
-
-    private static StatResultComparer _singleton;
-
-    #endregion Singleton Property
-
-    public int Compare( object x, object y )
-    {
-      bool xIsExceptionOrNull = ( x == null ) || ( x == DBNull.Value ) || ( x is Exception );
-      bool yIsExceptionOrNull = ( y == null ) || ( y == DBNull.Value ) || ( y is Exception );
-
-      if( xIsExceptionOrNull )
-      {
-        if( yIsExceptionOrNull )
-        {
-          return 0;
-        }
-        else
-        {
-          return -1;
-        }
-      }
-      else
-      {
-        if( yIsExceptionOrNull )
-          return 1;
-
-        IComparable xComparer = x as IComparable;
-
-        if( xComparer != null )
-          return xComparer.CompareTo( y );
-
-        return 0;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs
deleted file mode 100644
index aff4b0a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class UnboundDataItem
-  {
-    #region Static Fields
-
-    private static readonly WeakDictionary<object, UnboundDataItem> s_collection = new WeakDictionary<object, UnboundDataItem>( 0, new Comparer() );
-    private static readonly UnboundDataItem s_empty = new UnboundDataItem( null );
-
-    #endregion
-
-    private UnboundDataItem( object dataItem )
-    {
-      m_dataItem = dataItem;
-    }
-
-    #region DataItem Property
-
-    internal object DataItem
-    {
-      get
-      {
-        return m_dataItem;
-      }
-    }
-
-    private readonly object m_dataItem;
-
-    #endregion
-
-    internal static UnboundDataItem GetUnboundDataItem( object dataItem )
-    {
-      if( dataItem == null )
-        return s_empty;
-
-      var value = dataItem as UnboundDataItem;
-      if( value != null )
-        return value;
-
-      lock( ( ( ICollection )s_collection ).SyncRoot )
-      {
-        if( !s_collection.TryGetValue( dataItem, out value ) )
-        {
-          value = new UnboundDataItem( dataItem );
-          s_collection.Add( dataItem, value );
-        }
-
-        return value;
-      }
-    }
-
-    #region Comparer Private Class
-
-    private sealed class Comparer : IEqualityComparer<object>
-    {
-      int IEqualityComparer<object>.GetHashCode( object obj )
-      {
-        if( obj == null )
-          return 0;
-
-        return obj.GetHashCode();
-      }
-
-      bool IEqualityComparer<object>.Equals( object x, object y )
-      {
-        return object.Equals( x, y );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataRowPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataRowPropertyDescriptor.cs
deleted file mode 100644
index d9f5e154..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataRowPropertyDescriptor.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Data;
-using System.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class UnboundDataRowPropertyDescriptor : PropertyDescriptor
-  {
-    public UnboundDataRowPropertyDescriptor( string fieldName, Type dataType )
-      : base( fieldName, null )
-    {
-      if( string.IsNullOrEmpty( fieldName ) )
-        throw new ArgumentException( "fieldName must not be null or empty.", "fieldName" );
-
-      if( dataType == null )
-        throw new ArgumentNullException( "dataType" );
-
-      m_fieldName = fieldName;
-      m_dataType = dataType;
-    }
-
-    public override string DisplayName
-    {
-      get
-      {
-        return m_fieldName;
-      }
-    }
-
-    public override AttributeCollection Attributes
-    {
-      get
-      {
-        if( typeof( IList ).IsAssignableFrom( this.PropertyType ) )
-        {
-          Attribute[] array = new Attribute[ base.Attributes.Count + 1 ];
-          base.Attributes.CopyTo( array, 0 );
-          array[ array.Length - 1 ] = new ListBindableAttribute( false );
-          return new AttributeCollection( array );
-        }
-
-        return base.Attributes;
-      }
-    }
-
-    public override Type ComponentType
-    {
-      get
-      {
-        return typeof( DataRow );
-      }
-    }
-
-    public override bool IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public override Type PropertyType
-    {
-      get
-      {
-        return m_dataType;
-      }
-    }
-
-    public override bool CanResetValue( object component )
-    {
-      object value = this.GetValue( component );
-      return ( value != null ) && ( value != DBNull.Value );
-    }
-
-    public override object GetValue( object component )
-    {
-      DataRow dataRow = component as DataRow;
-
-      if( dataRow == null )
-        return null;
-
-      Cell cell = dataRow.Cells[ m_fieldName ];
-
-      if( cell == null )
-        return null;
-
-      return cell.Content;
-    }
-
-    public override void ResetValue( object component )
-    {
-      this.SetValue( component, null );
-    }
-
-    public override void SetValue( object component, object value )
-    {
-      if( this.IsReadOnly )
-        throw new InvalidOperationException( "An attempt was made to set a value on a read-only field." );
-
-      DataRow dataRow = component as DataRow;
-
-      if( dataRow == null )
-        throw new InvalidOperationException( "An attempt was made to set a value on a DataRow that does not exist." );
-
-      Cell cell = dataRow.Cells[ m_fieldName ];
-
-      if( cell == null )
-        throw new InvalidOperationException( "An attempt was made to set a value on a Cell that does not exist." );
-
-      cell.Content = value;
-    }
-
-    public override bool ShouldSerializeValue( object component )
-    {
-      return false;
-    }
-
-    private string m_fieldName;
-    private Type m_dataType;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AddingNewDataItemEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AddingNewDataItemEventArgs.cs
deleted file mode 100644
index 54ee691c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AddingNewDataItemEventArgs.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Obsolete( "The AddingNewDataItem event is obsolete and has been replaced by the DataGridCollectionView.InsertingNewItem and InitializingNewItem events.", false )]
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public class AddingNewDataItemEventArgs : EventArgs
-  {
-    public AddingNewDataItemEventArgs()
-    {
-    }
-
-    public object DataItem
-    {
-      get
-      {
-        return m_dataItem;
-      }
-      set
-      {
-        m_dataItem = value;
-      }
-    }
-
-    private object m_dataItem;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AllowDetailToggleChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AllowDetailToggleChangedEventManager.cs
deleted file mode 100644
index 97ee3092..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/AllowDetailToggleChangedEventManager.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class AllowDetailToggleChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.AllowDetailToggleChanged += new EventHandler( this.OnAllowDetailToggleChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.AllowDetailToggleChanged += new EventHandler( this.OnAllowDetailToggleChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.AllowDetailToggleChanged -= new EventHandler( this.OnAllowDetailToggleChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.AllowDetailToggleChanged -= new EventHandler( this.OnAllowDetailToggleChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    private static AllowDetailToggleChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( AllowDetailToggleChangedEventManager );
-        AllowDetailToggleChangedEventManager currentManager = ( AllowDetailToggleChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new AllowDetailToggleChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnAllowDetailToggleChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CancelRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CancelRoutedEvent.cs
deleted file mode 100644
index 972f097d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CancelRoutedEvent.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-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/(Events)/CellValidatingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidatingEventArgs.cs
deleted file mode 100644
index 0ce4b2d7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidatingEventArgs.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class CellValidatingEventArgs : EventArgs
-  {
-    public CellValidatingEventArgs(
-      object value,
-      CultureInfo culture,
-      CellValidationContext context )
-    {
-      m_value = value;
-      m_culture = culture;
-      m_context = context;
-    }
-
-    public object Value
-    {
-      get
-      {
-        return m_value;
-      }
-    }
-
-    public CultureInfo Culture
-    {
-      get
-      {
-        return m_culture;
-      }
-    }
-
-    public CellValidationContext Context
-    {
-      get
-      {
-        return m_context;
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public ValidationResult Result
-    {
-      get
-      {
-        return m_validationResult;
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "Result" );
-
-        m_validationResult = value;
-      }
-    }
-
-    object m_value;
-    CultureInfo m_culture;
-    CellValidationContext m_context;
-    ValidationResult m_validationResult = ValidationResult.ValidResult;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidationErrorRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidationErrorRoutedEvent.cs
deleted file mode 100644
index 51376a50..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CellValidationErrorRoutedEvent.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void CellValidationErrorRoutedEventHandler( object sender, CellValidationErrorRoutedEventArgs e );
-
-  public class CellValidationErrorRoutedEventArgs : RoutedEventArgs
-  {
-    public CellValidationErrorRoutedEventArgs( CellValidationError cellValidationError )
-      : base()
-    {
-      if( cellValidationError == null )
-        throw new ArgumentNullException( "cellValidationError" );
-
-      m_cellValidationError = cellValidationError;
-    }
-
-    public CellValidationErrorRoutedEventArgs( RoutedEvent routedEvent, CellValidationError cellValidationError )
-      : base( routedEvent )
-    {
-      if( cellValidationError == null )
-        throw new ArgumentNullException( "cellValidationError" );
-
-      m_cellValidationError = cellValidationError;
-    }
-
-    public CellValidationErrorRoutedEventArgs( RoutedEvent routedEvent, object source, CellValidationError cellValidationError )
-      : base( routedEvent, source )
-    {
-      if( cellValidationError == null )
-        throw new ArgumentNullException( "cellValidationError" );
-
-      m_cellValidationError = cellValidationError;
-    }
-
-    #region CellValidationError PROPERTY
-
-    public CellValidationError CellValidationError
-    {
-      get
-      {
-        return m_cellValidationError;
-      }
-    }
-
-    private CellValidationError m_cellValidationError;
-
-    #endregion CellValidationError PROPERTY
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthChangedEvent.cs
deleted file mode 100644
index 4df0ddf5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthChangedEvent.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class ColumnActualWidthChangedEventArgs : EventArgs
-  {
-    internal ColumnActualWidthChangedEventArgs( ColumnBase column, double oldValue, double newValue )
-    {
-      m_column = column;
-      m_oldValue = oldValue;
-      m_newValue = newValue;
-    }
-
-    internal ColumnBase Column
-    {
-      get
-      {
-        return m_column;
-      }
-    }
-
-    internal double NewValue
-    {
-      get
-      {
-        return m_newValue;
-      }
-    }
-
-    internal double OldValue
-    {
-      get
-      {
-        return m_oldValue;
-      }
-    }
-
-    private ColumnBase m_column;
-    private double m_oldValue;
-    private double m_newValue;
-  }
-
-  internal delegate void ColumnActualWidthChangedEventHandler( object sender, ColumnActualWidthChangedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthEventManager.cs
deleted file mode 100644
index b06c6463..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnActualWidthEventManager.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ColumnActualWidthEventManager : WeakEventManager
-  {
-    internal static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.ActualWidthChanged += new ColumnActualWidthChangedEventHandler( this.OnActualWidthChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.ActualWidthChanged -= new ColumnActualWidthChangedEventHandler( this.OnActualWidthChanged );
-    }
-
-    private static ColumnActualWidthEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ColumnActualWidthEventManager );
-        ColumnActualWidthEventManager currentManager = ( ColumnActualWidthEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ColumnActualWidthEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnActualWidthChanged( object sender, ColumnActualWidthChangedEventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnSortDirectionChangingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnSortDirectionChangingEvent.cs
deleted file mode 100644
index f89fe7ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnSortDirectionChangingEvent.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void ColumnSortDirectionChangingEventHandler( object sender, ColumnSortDirectionChangingEventArgs e );
-
-  public class ColumnSortDirectionChangingEventArgs : RoutedEventArgs
-  {
-    public ColumnSortDirectionChangingEventArgs( RoutedEvent routedEvent, ColumnBase column, DataGridContext dataGridContext, SortDirection currentSortDirection, SortDirection nextSortDirection )
-      : base( routedEvent, column )
-    {
-      if( column == null )
-        throw new ArgumentNullException( "column" );
-
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      m_dataGridContext = dataGridContext;
-      m_current = currentSortDirection;
-      m_next = nextSortDirection;
-    }
-
-    #region Column Property
-
-    public ColumnBase Column
-    {
-      get
-      {
-        return ( ColumnBase )this.OriginalSource;
-      }
-    }
-
-    #endregion
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-    }
-
-    private DataGridContext m_dataGridContext;
-
-    #endregion
-
-    #region CurrentSortDirection Property
-
-    public SortDirection CurrentSortDirection
-    {
-      get
-      {
-        return m_current;
-      }
-    }
-
-    private SortDirection m_current;
-
-    #endregion
-
-    #region NextSortDirection Property
-
-    public SortDirection NextSortDirection
-    {
-      get
-      {
-        return m_next;
-      }
-      set
-      {
-        m_next = value;
-      }
-    }
-
-    private SortDirection m_next;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnVisibilePositionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnVisibilePositionChangedEventArgs.cs
deleted file mode 100644
index bc121bd9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnVisibilePositionChangedEventArgs.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class ColumnVisiblePositionChangedEventArgs : EventArgs
-  {
-    internal ColumnVisiblePositionChangedEventArgs( ColumnBase triggeringColumn, int oldPosition, int newPosition )
-    {
-      m_triggeringColumn = triggeringColumn;
-      m_newPosition = newPosition;
-      m_oldPosition = oldPosition;
-    }
-
-    internal ColumnBase TriggeringColumn
-    {
-      get
-      {
-        return m_triggeringColumn;
-      }
-    }
-
-    internal int PositionDelta
-    {
-      get
-      {
-        return m_newPosition - m_oldPosition;
-      }
-    }
-
-    private ColumnBase m_triggeringColumn;
-    private int m_newPosition;
-    private int m_oldPosition;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangedEventManager.cs
deleted file mode 100644
index 7245ae74..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangedEventManager.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ColumnsLayoutChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( ColumnHierarchyManager source, IWeakEventListener listener )
-    {
-      ColumnsLayoutChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( ColumnHierarchyManager source, IWeakEventListener listener )
-    {
-      ColumnsLayoutChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ( ( ColumnHierarchyManager )source ).LayoutChanged += new EventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ( ( ColumnHierarchyManager )source ).LayoutChanged -= new EventHandler( this.OnEventRaised );
-    }
-
-    private static ColumnsLayoutChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ColumnsLayoutChangedEventManager );
-        var currentManager = ( ColumnsLayoutChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ColumnsLayoutChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnEventRaised( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangingEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangingEventManager.cs
deleted file mode 100644
index 1446319b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ColumnsLayoutChangingEventManager.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ColumnsLayoutChangingEventManager : WeakEventManager
-  {
-    internal static void AddListener( ColumnHierarchyManager source, IWeakEventListener listener )
-    {
-      ColumnsLayoutChangingEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( ColumnHierarchyManager source, IWeakEventListener listener )
-    {
-      ColumnsLayoutChangingEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ( ( ColumnHierarchyManager )source ).LayoutChanging += new EventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ( ( ColumnHierarchyManager )source ).LayoutChanging -= new EventHandler( this.OnEventRaised );
-    }
-
-    private static ColumnsLayoutChangingEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( ColumnsLayoutChangingEventManager );
-        var currentManager = ( ColumnsLayoutChangingEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ColumnsLayoutChangingEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnEventRaised( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentColumnChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentColumnChangedEventManager.cs
deleted file mode 100644
index 3f7fe457..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentColumnChangedEventManager.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CurrentColumnChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( DetailConfiguration source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DetailConfiguration source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DetailConfiguration detailConfig = ( DetailConfiguration )source;
-      detailConfig.CurrentColumnChanged += new EventHandler( this.OnCurrentColumnChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DetailConfiguration detailConfig = ( DetailConfiguration )source;
-      detailConfig.CurrentColumnChanged -= new EventHandler( this.OnCurrentColumnChanged );
-    }
-
-    private static CurrentColumnChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( CurrentColumnChangedEventManager );
-        CurrentColumnChangedEventManager currentManager = ( CurrentColumnChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new CurrentColumnChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnCurrentColumnChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentItemChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentItemChangedEventManager.cs
deleted file mode 100644
index c9fc90c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/CurrentItemChangedEventManager.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class CurrentItemChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( DataGridContext source, IWeakEventListener listener )
-    {
-      CurrentItemChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DataGridContext source, IWeakEventListener listener )
-    {
-      CurrentItemChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ( ( DataGridContext )source ).CurrentItemChanged += new EventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ( ( DataGridContext )source ).CurrentItemChanged -= new EventHandler( this.OnEventRaised );
-    }
-
-    private static CurrentItemChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( CurrentItemChangedEventManager );
-        var currentManager = ( CurrentItemChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new CurrentItemChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnEventRaised( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlSelectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlSelectionChangedEventManager.cs
deleted file mode 100644
index 783432d8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlSelectionChangedEventManager.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridControlSelectionChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-
-      if( dataGridControl != null )
-        dataGridControl.SelectionChanged += this.DataGridControl_SelectionChanged;
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-
-      if( dataGridControl != null )
-        dataGridControl.SelectionChanged -= this.DataGridControl_SelectionChanged;
-    }
-
-    private static DataGridControlSelectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DataGridControlSelectionChangedEventManager );
-        DataGridControlSelectionChangedEventManager currentManager =
-          ( DataGridControlSelectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DataGridControlSelectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void DataGridControl_SelectionChanged( object sender, DataGridSelectionChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlTemplateChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlTemplateChangedEventManager.cs
deleted file mode 100644
index 7c26c53f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridControlTemplateChangedEventManager.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataGridControlTemplateChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.TemplateApplied += new EventHandler( this.OnTemplateApplied );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl.", "source" );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.TemplateApplied -= new EventHandler( this.OnTemplateApplied );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl.", "source" );
-    }
-
-    private static DataGridControlTemplateChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DataGridControlTemplateChangedEventManager );
-        DataGridControlTemplateChangedEventManager currentManager = ( DataGridControlTemplateChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DataGridControlTemplateChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnTemplateApplied( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangedEvent.cs
deleted file mode 100644
index 1d9de1ae..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangedEvent.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DataGridCurrentChangedEventHandler( object sender, DataGridCurrentChangedEventArgs e );
-
-  public class DataGridCurrentChangedEventArgs : RoutedEventArgs
-  {
-    internal DataGridCurrentChangedEventArgs( DataGridContext oldDataGridContext, object oldCurrent, DataGridContext newDataGridContext, object newCurrent )
-      : base( DataGridControl.CurrentChangedEvent )
-    {
-      this.OldDataGridContext = oldDataGridContext;
-      this.OldCurrent = oldCurrent;
-      this.NewDataGridContext = newDataGridContext;
-      this.NewCurrent = newCurrent;
-    }
-
-    public DataGridContext OldDataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public object OldCurrent
-    {
-      get;
-      private set;
-    }
-
-    public DataGridContext NewDataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public object NewCurrent
-    {
-      get;
-      private set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangingEvent.cs
deleted file mode 100644
index 2c828e7a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridCurrentChangingEvent.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  public delegate void DataGridCurrentChangingEventHandler( object sender, DataGridCurrentChangingEventArgs e );
-
-  public class DataGridCurrentChangingEventArgs : CancelRoutedEventArgs
-  {
-    internal DataGridCurrentChangingEventArgs( DataGridContext oldDataGridContext, object oldCurrent, DataGridContext newDataGridContext, object newCurrent, bool isCancelable )
-      : base( DataGridControl.CurrentChangingEvent )
-    {
-      this.IsCancelable = isCancelable;
-      this.OldDataGridContext = oldDataGridContext;
-      this.OldCurrent = oldCurrent;
-      this.NewDataGridContext = newDataGridContext;
-      this.NewCurrent = newCurrent;
-    }
-
-    public bool IsCancelable
-    {
-      get;
-      private set;
-    }
-
-    public DataGridContext OldDataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public object OldCurrent
-    {
-      get;
-      private set;
-    }
-
-    public DataGridContext NewDataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public object NewCurrent
-    {
-      get;
-      private set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangedEvent.cs
deleted file mode 100644
index 13f6576e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangedEvent.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DataGridSelectionChangedEventHandler( object sender, DataGridSelectionChangedEventArgs e );
-
-  public class DataGridSelectionChangedEventArgs : RoutedEventArgs
-  {
-    internal DataGridSelectionChangedEventArgs( IList<SelectionInfo> selectionInfos )
-      : base( DataGridControl.SelectionChangedEvent )
-    {
-      this.SelectionInfos = selectionInfos;
-    }
-
-    public IList<SelectionInfo> SelectionInfos
-    {
-      get;
-      private set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangingEvent.cs
deleted file mode 100644
index c2cd8b0f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DataGridSelectionChangingEvent.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public delegate void DataGridSelectionChangingEventHandler( object sender, DataGridSelectionChangingEventArgs e );
-
-  public class DataGridSelectionChangingEventArgs : CancelRoutedEventArgs
-  {
-    internal DataGridSelectionChangingEventArgs( IList<SelectionInfo> selectionInfos, bool isCancelable )
-      : base( DataGridControl.SelectionChangingEvent )
-    {
-      this.SelectionInfos = selectionInfos;
-      this.IsCancelable = isCancelable;
-    }
-
-    public bool IsCancelable
-    {
-      get;
-      private set;
-    }
-
-    public IList<SelectionInfo> SelectionInfos
-    {
-      get;
-      private set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DeletingSelectedItemErrorRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DeletingSelectedItemErrorRoutedEvent.cs
deleted file mode 100644
index ce6f8975..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DeletingSelectedItemErrorRoutedEvent.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DeletingSelectedItemErrorRoutedEventHandler( object sender, DeletingSelectedItemErrorRoutedEventArgs e );
-
-  public class DeletingSelectedItemErrorRoutedEventArgs : RoutedEventArgs
-  {
-    #region CONSTRUCTORS
-
-    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception )
-      : base()
-    {
-      m_item = item;
-      m_exception = exception;
-    }
-
-    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception, RoutedEvent routedEvent )
-      : base( routedEvent )
-    {
-      m_item = item;
-      m_exception = exception;
-    }
-
-    public DeletingSelectedItemErrorRoutedEventArgs( object item, Exception exception, RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-      m_item = item;
-      m_exception = exception;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region Item Property
-
-    public object Item
-    {
-      get
-      {
-        return m_item;
-      }
-    }
-
-    #endregion Item Property
-
-    #region Exception Property
-
-    public Exception Exception
-    {
-      get
-      {
-        return m_exception;
-      }
-    }
-
-    #endregion Exception Property
-
-    #region Action Property
-
-    public DeletingSelectedItemErrorAction Action
-    {
-      get
-      {
-        return m_action;
-      }
-      set
-      {
-        m_action = value;
-      }
-    }
-
-    #endregion Action Property
-
-    #region PRIVATE FIELDS
-
-    private object m_item;
-    private Exception m_exception;
-    private DeletingSelectedItemErrorAction m_action = DeletingSelectedItemErrorAction.Skip;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailVisibilityChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailVisibilityChangedEventManager.cs
deleted file mode 100644
index 336162ef..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailVisibilityChangedEventManager.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DetailVisibilityChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DetailConfiguration detailConfig = source as DetailConfiguration;
-      if( detailConfig != null )
-      {
-        detailConfig.VisibilityChanged += new EventHandler( this.OnVisibilityChanged );
-        return;
-      }
-
-      DetailConfigurationCollection detailConfigCollection = source as DetailConfigurationCollection;
-      if( detailConfigCollection != null )
-      {
-        detailConfigCollection.DetailVisibilityChanged += new EventHandler( this.OnVisibilityChanged );
-      }
-
-    }
-
-    protected override void StopListening( object source )
-    {
-      DetailConfiguration detailConfig = source as DetailConfiguration;
-      if( detailConfig != null )
-      {
-        detailConfig.VisibilityChanged -= new EventHandler( this.OnVisibilityChanged );
-        return;
-      }
-
-      DetailConfigurationCollection detailConfigCollection = source as DetailConfigurationCollection;
-      if( detailConfigCollection != null )
-      {
-        detailConfigCollection.DetailVisibilityChanged -= new EventHandler( this.OnVisibilityChanged );
-      }
-    }
-
-    private static DetailVisibilityChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DetailVisibilityChangedEventManager );
-        DetailVisibilityChangedEventManager currentManager = ( DetailVisibilityChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DetailVisibilityChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnVisibilityChanged( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsChangedEventManager.cs
deleted file mode 100644
index aa10bd11..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsChangedEventManager.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DetailsChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.DetailsChanged += this.OnDetailsChanged;
-        return;
-      }
-      else
-      {
-        CustomItemContainerGenerator generator = source as CustomItemContainerGenerator;
-        if( generator != null )
-        {
-          generator.DetailsChanged += this.OnDetailsChanged;
-          return;
-        }
-      }
-
-      throw new InvalidOperationException( "An attempt was made to use a source other than a DataGridControl or CustomItemContainerGenerator." );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.DetailsChanged -= this.OnDetailsChanged;
-        return;
-      }
-      else
-      {
-        CustomItemContainerGenerator generator = source as CustomItemContainerGenerator;
-        if( generator != null )
-        {
-          generator.DetailsChanged -= this.OnDetailsChanged;
-          return;
-        }
-      }
-
-      throw new InvalidOperationException( "An attempt was made to use a source other than a DataGridControl or CustomItemContainerGenerator." );
-    }
-
-    private static DetailsChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DetailsChangedEventManager );
-        DetailsChangedEventManager currentManager = ( DetailsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DetailsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnDetailsChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangedEventArgs.cs
deleted file mode 100644
index 3a5a9618..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangedEventArgs.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DetailsExpansionChangedEventHandler( object sender, DetailsExpansionChangedEventArgs e );
-
-  public class DetailsExpansionChangedEventArgs : RoutedEventArgs
-  {
-    public DetailsExpansionChangedEventArgs( RoutedEvent routedEvent, object dataItem, DataGridContext dataGridContext, bool isExpanded )
-      : base( routedEvent )
-    {
-      this.DataGridContext = dataGridContext;
-      this.IsExpanded = isExpanded;
-      this.MasterItem = dataItem;
-    }
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region IsExpanded Property 
-
-    public bool IsExpanded
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region MasterItem Property
-
-    public object MasterItem
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangingEventArgs.cs
deleted file mode 100644
index b79426a0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DetailsExpansionChangingEventArgs.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void DetailsExpansionChangingEventHandler( object sender, DetailsExpansionChangingEventArgs e );
-
-  public class DetailsExpansionChangingEventArgs : RoutedEventArgs
-  {
-    public DetailsExpansionChangingEventArgs( RoutedEvent routedEvent, object dataItem, DataGridContext dataGridContext, bool isExpanding )
-      : base( routedEvent )
-    {
-      this.DataGridContext = dataGridContext;
-      this.IsExpanding = isExpanding;
-      this.MasterItem = dataItem;
-    }
-
-    #region Cancel Property
-
-    public bool Cancel
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region IsExpanding Property 
-
-    public bool IsExpanding
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region MasterItem Property
-
-    public object MasterItem
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEvent.cs
deleted file mode 100644
index d0609a22..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEvent.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class DistinctValuesRequestedEventArgs : EventArgs
-  {
-    internal DistinctValuesRequestedEventArgs( string autoFilterColumnFieldName )
-    {
-      m_autoFilterColumnFieldName = autoFilterColumnFieldName;
-    }
-
-    internal string AutoFilterColumnFieldName
-    {
-      get
-      {
-        return m_autoFilterColumnFieldName;
-      }
-    }
-
-    internal HashSet<object> DistinctValues
-    {
-      get
-      {
-        return m_distinctValues;
-      }
-    }
-
-    private string m_autoFilterColumnFieldName;
-    private HashSet<object> m_distinctValues = new HashSet<object>();
-  }
-
-  internal delegate void DistinctValuesRequestedEventHandler( object sender, DistinctValuesRequestedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEventManager.cs
deleted file mode 100644
index 2f0e026b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/DistinctValuesRequestedEventManager.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DistinctValuesRequestedEventManager: WeakEventManager
-  {
-    internal static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.DistinctValuesRequested += this.OnDistinctValuesRequested;
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.DistinctValuesRequested -= this.OnDistinctValuesRequested;
-    }
-
-    private static DistinctValuesRequestedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( DistinctValuesRequestedEventManager );
-        DistinctValuesRequestedEventManager currentManager = ( DistinctValuesRequestedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new DistinctValuesRequestedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnDistinctValuesRequested( object sender, DistinctValuesRequestedEventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FittedWidthRequestedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FittedWidthRequestedEvent.cs
deleted file mode 100644
index 359e8dd6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FittedWidthRequestedEvent.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal sealed class FittedWidthRequestedEventArgs : EventArgs
-  {
-    #region Value Internal Read-Only Property
-
-    internal Nullable<double> Value
-    {
-      get
-      {
-        return m_value;
-      }
-    }
-
-    internal void SetValue( double value )
-    {
-      if( m_value.HasValue )
-      {
-        // We keep the highest of the two values.
-        if( m_value.Value >= value )
-          return;
-      }
-
-      m_value = value;
-    }
-
-    private Nullable<double> m_value;
-
-    #endregion
-  }
-
-  internal delegate void FittedWidthRequestedEventHandler( object sender, FittedWidthRequestedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FrameworkElementUnloadedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FrameworkElementUnloadedEventManager.cs
deleted file mode 100644
index 664a7244..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/FrameworkElementUnloadedEventManager.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class FrameworkElementUnloadedEventManager : WeakEventManager
-  {
-    internal static void AddListener( FrameworkElement source, IWeakEventListener listener )
-    {
-      FrameworkElementUnloadedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( FrameworkElement source, IWeakEventListener listener )
-    {
-      FrameworkElementUnloadedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var fe = source as FrameworkElement;
-      if( fe == null )
-        return;
-
-      fe.Unloaded += new RoutedEventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var fe = source as FrameworkElement;
-      if( fe == null )
-        return;
-
-      var dispatcher = fe.Dispatcher;
-      if( dispatcher.CheckAccess() )
-      {
-        this.StopListening( fe );
-      }
-      else
-      {
-        dispatcher.BeginInvoke( new Action<FrameworkElement>( this.StopListening ), DispatcherPriority.Send, fe );
-      }
-    }
-
-    private static FrameworkElementUnloadedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( FrameworkElementUnloadedEventManager );
-        var currentManager = ( FrameworkElementUnloadedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new FrameworkElementUnloadedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void StopListening( FrameworkElement fe )
-    {
-      fe.Unloaded -= new RoutedEventHandler( this.OnEventRaised );
-    }
-
-    private void OnEventRaised( object sender, RoutedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupConfigurationSelectorChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupConfigurationSelectorChangedEventManager.cs
deleted file mode 100644
index 4e7de696..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupConfigurationSelectorChangedEventManager.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class GroupConfigurationSelectorChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridContext context = source as DataGridContext;
-
-      if (context != null)
-      {
-        context.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      DataGridControl dataGridControl = source as DataGridControl;
-      if (dataGridControl != null)
-      {
-        dataGridControl.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      DetailConfiguration detailConfig = source as DetailConfiguration;
-      if (detailConfig != null)
-      {
-        detailConfig.GroupConfigurationSelectorChanged += new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      throw new InvalidOperationException("An attempt was made to register an item other than a DataGridContext, DataGridControl, or DetailConfiguration to the GroupConfigurationSelectorChangedEventManager.");
-    }
-
-    protected override void StopListening(object source)
-    {
-      DataGridContext context = source as DataGridContext;
-
-      if (context != null)
-      {
-        context.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      DataGridControl dataGridControl = source as DataGridControl;
-      if (dataGridControl != null)
-      {
-        dataGridControl.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      DetailConfiguration detailConfig = source as DetailConfiguration;
-      if (detailConfig != null)
-      {
-        detailConfig.GroupConfigurationSelectorChanged -= new EventHandler(this.OnGroupConfigurationSelectorChanged);
-        return;
-      }
-
-      throw new InvalidOperationException( "An attempt was made to unregister an item other than a DataGridContext, DataGridControl, or DetailConfiguration from the GroupConfigurationSelectorChangedEventManager." );
-    }
-
-    private static GroupConfigurationSelectorChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( GroupConfigurationSelectorChangedEventManager );
-        GroupConfigurationSelectorChangedEventManager currentManager = ( GroupConfigurationSelectorChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new GroupConfigurationSelectorChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnGroupConfigurationSelectorChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangedEventArgs.cs
deleted file mode 100644
index 9cac5769..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangedEventArgs.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void GroupExpansionChangedEventHandler( object sender, GroupExpansionChangedEventArgs e );
-
-  public class GroupExpansionChangedEventArgs : RoutedEventArgs
-  {
-    public GroupExpansionChangedEventArgs( RoutedEvent routedEvent, Group group, CollectionViewGroup collectionViewGroup, DataGridContext dataGridContext, bool isExpanded )
-      : base( routedEvent )
-    {
-      this.CollectionViewGroup = collectionViewGroup;
-      this.DataGridContext = dataGridContext;
-      this.Group = group;
-      this.IsExpanded = isExpanded;
-    }
-
-    #region CollectionViewGroup Property
-
-    public CollectionViewGroup CollectionViewGroup
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region Group Property
-
-    public Group Group
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region IsExpanded Property 
-
-    public bool IsExpanded
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangingEventArgs.cs
deleted file mode 100644
index bae3a76b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/GroupExpansionChangingEventArgs.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void GroupExpansionChangingEventHandler( object sender, GroupExpansionChangingEventArgs e );
-
-  public class GroupExpansionChangingEventArgs : RoutedEventArgs
-  {
-    public GroupExpansionChangingEventArgs( RoutedEvent routedEvent, Group group, CollectionViewGroup collectionViewGroup, DataGridContext dataGridContext, bool isExpanding )
-      : base( routedEvent )
-    {
-      this.CollectionViewGroup = collectionViewGroup;
-      this.DataGridContext = dataGridContext;
-      this.Group = group;
-      this.IsExpanding = isExpanding;
-    }
-
-    #region Cancel Property
-
-    public bool Cancel
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region CollectionViewGroup Property
-
-    public CollectionViewGroup CollectionViewGroup
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region Group Property
-
-    public Group Group
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region IsExpanding Property 
-
-    public bool IsExpanding
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventArgs.cs
deleted file mode 100644
index b9317115..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventArgs.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class InitializeItemPropertyEventArgs : EventArgs
-  {
-    internal InitializeItemPropertyEventArgs( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        throw new ArgumentNullException( "itemProperty" );
-
-      m_itemProperty = itemProperty;
-    }
-
-    internal DataGridItemPropertyBase ItemProperty
-    {
-      get
-      {
-        return m_itemProperty;
-      }
-    }
-
-    private readonly DataGridItemPropertyBase m_itemProperty;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventManager.cs
deleted file mode 100644
index 14145220..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/InitializeItemPropertyEventManager.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class InitializeItemPropertyEventManager : WeakEventManager
-  {
-    internal static void AddListener( DataGridItemPropertyCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DataGridItemPropertyCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var target = ( DataGridItemPropertyCollection )source;
-      target.InitializeItemProperty += new EventHandler<InitializeItemPropertyEventArgs>( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var target = ( DataGridItemPropertyCollection )source;
-      target.InitializeItemProperty -= new EventHandler<InitializeItemPropertyEventArgs>( this.OnEventRaised );
-    }
-
-    private static InitializeItemPropertyEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( InitializeItemPropertyEventManager );
-        var currentManager = ( InitializeItemPropertyEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new InitializeItemPropertyEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnEventRaised( object sender, InitializeItemPropertyEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ItemsSourceChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ItemsSourceChangedEventManager.cs
deleted file mode 100644
index a75070b8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ItemsSourceChangedEventManager.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ItemsSourceChangeCompletedEventManager : WeakEventManager
-  {
-    internal static void AddListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ItemsSourceChangeCompleted += new EventHandler( this.OnItemsSourceChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ItemsSourceChangeCompleted -= new EventHandler( this.OnItemsSourceChanged );
-    }
-
-    private static ItemsSourceChangeCompletedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ItemsSourceChangeCompletedEventManager );
-        ItemsSourceChangeCompletedEventManager currentManager = ( ItemsSourceChangeCompletedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ItemsSourceChangeCompletedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnItemsSourceChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ListChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ListChangedEventManager.cs
deleted file mode 100644
index 77528b36..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ListChangedEventManager.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ListChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( IBindingList source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( IBindingList source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      IBindingList list = ( IBindingList )source;
-      list.ListChanged += new ListChangedEventHandler( this.OnListChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      IBindingList list = ( IBindingList )source;
-      list.ListChanged -= new ListChangedEventHandler( this.OnListChanged );
-    }
-
-    private static ListChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ListChangedEventManager );
-        ListChangedEventManager currentManager = ( ListChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ListChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnListChanged( object sender, ListChangedEventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MappingChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MappingChangedEventManager.cs
deleted file mode 100644
index 9abbaea8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MappingChangedEventManager.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class MappingChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( DataGridItemPropertyMap source, IWeakEventListener listener )
-    {
-      MappingChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DataGridItemPropertyMap source, IWeakEventListener listener )
-    {
-      MappingChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ( ( DataGridItemPropertyMap )source ).MappingChanged += new EventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ( ( DataGridItemPropertyMap )source ).MappingChanged -= new EventHandler( this.OnEventRaised );
-    }
-
-    private static MappingChangedEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( MappingChangedEventManager );
-        var currentManager = ( MappingChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new MappingChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnEventRaised( object sender, EventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxGroupLevelsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxGroupLevelsChangedEventManager.cs
deleted file mode 100644
index 4274cbe0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxGroupLevelsChangedEventManager.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class MaxGroupLevelsChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.MaxGroupLevelsChanged += new EventHandler( this.OnMaxGroupLevelsChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.MaxGroupLevelsChanged += new EventHandler( this.OnMaxGroupLevelsChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.MaxGroupLevelsChanged -= new EventHandler( this.OnMaxGroupLevelsChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.MaxGroupLevelsChanged -= new EventHandler( this.OnMaxGroupLevelsChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    private static MaxGroupLevelsChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( MaxGroupLevelsChangedEventManager );
-        MaxGroupLevelsChangedEventManager currentManager = ( MaxGroupLevelsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new MaxGroupLevelsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnMaxGroupLevelsChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxSortLevelsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxSortLevelsChangedEventManager.cs
deleted file mode 100644
index d6bf7273..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/MaxSortLevelsChangedEventManager.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class MaxSortLevelsChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.MaxSortLevelsChanged += new EventHandler( this.OnMaxSortLevelsChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.MaxSortLevelsChanged += new EventHandler( this.OnMaxSortLevelsChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = source as DataGridControl;
-      if( dataGridControl != null )
-      {
-        dataGridControl.MaxSortLevelsChanged -= new EventHandler( this.OnMaxSortLevelsChanged );
-        return;
-      }
-
-      DetailConfiguration detailConfiguration = source as DetailConfiguration;
-      if( detailConfiguration != null )
-      {
-        detailConfiguration.MaxSortLevelsChanged -= new EventHandler( this.OnMaxSortLevelsChanged );
-        return;
-      }
-
-      throw new ArgumentException( "The specified source must be a DataGridControl or a DetailConfiguration.", "source" );
-    }
-
-    private static MaxSortLevelsChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( MaxSortLevelsChangedEventManager );
-        MaxSortLevelsChangedEventManager currentManager = ( MaxSortLevelsChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new MaxSortLevelsChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnMaxSortLevelsChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyBatchCollectionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyBatchCollectionChangedEventArgs.cs
deleted file mode 100644
index 43066596..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyBatchCollectionChangedEventArgs.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class NotifyBatchCollectionChangedEventArgs : NotifyCollectionChangedEventArgs
-  {
-    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action )
-      : base( action )
-    {
-    }
-
-    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList changedItems )
-      : base( action, changedItems )
-    {
-    }
-
-    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList changedItems, int startingIndex )
-      : base( action, changedItems, startingIndex )
-    {
-    }
-
-    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList changedItems, int index, int oldIndex )
-      : base( action, changedItems, index, oldIndex )
-    {
-    }
-
-    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList newItems, IList oldItems )
-      : base( action, newItems, oldItems )
-    {
-    }
-
-    private NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction action, IList newItems, IList oldItems, int startingIndex )
-      : base( action, newItems, oldItems, startingIndex )
-    {
-    }
-
-    #region Replacements Property
-
-    internal IDictionary<object, object> Replacements
-    {
-      get
-      {
-        if( m_fromTo == null )
-        {
-          m_fromTo = new Dictionary<object, object>( 0 );
-          m_toFrom = new Dictionary<object, object>( 0 );
-        }
-
-        return m_fromTo;
-      }
-    }
-
-    #endregion
-
-    internal static NotifyBatchCollectionChangedEventArgs Combine( NotifyCollectionChangedEventArgs x, NotifyCollectionChangedEventArgs y )
-    {
-      return NotifyBatchCollectionChangedEventArgs.Combine(
-               NotifyBatchCollectionChangedEventArgs.Create( x ),
-               NotifyBatchCollectionChangedEventArgs.Create( y ) );
-    }
-
-    private static NotifyBatchCollectionChangedEventArgs Combine( NotifyBatchCollectionChangedEventArgs x, NotifyBatchCollectionChangedEventArgs y )
-    {
-      if( x == null )
-        return y;
-
-      if( y == null )
-        return x;
-
-      var replacements = default( BiMap );
-      var result = default( NotifyBatchCollectionChangedEventArgs );
-
-      if( x.Action == y.Action )
-      {
-        switch( x.Action )
-        {
-          case NotifyCollectionChangedAction.Replace:
-            {
-              replacements = NotifyBatchCollectionChangedEventArgs.Merge(
-                               NotifyBatchCollectionChangedEventArgs.Map( x.OldItems, x.NewItems ),
-                               NotifyBatchCollectionChangedEventArgs.Map( y.OldItems, y.NewItems ) );
-              if( replacements == null )
-                return null;
-
-              result = new NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Add:
-          case NotifyCollectionChangedAction.Remove:
-          case NotifyCollectionChangedAction.Move:
-            result = new NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
-            break;
-
-          case NotifyCollectionChangedAction.Reset:
-            result = new NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
-            replacements = NotifyBatchCollectionChangedEventArgs.Merge( x.m_fromTo, y.m_fromTo );
-            break;
-
-          default:
-            throw new NotSupportedException();
-        }
-      }
-      else
-      {
-        if( x.Action == NotifyCollectionChangedAction.Replace )
-        {
-          replacements = NotifyBatchCollectionChangedEventArgs.Merge( NotifyBatchCollectionChangedEventArgs.Map( x.OldItems, x.NewItems ), null );
-        }
-        else if( ( x.Action == NotifyCollectionChangedAction.Reset ) && ( x.m_fromTo != null ) )
-        {
-          replacements = new BiMap( x.m_fromTo, x.m_toFrom );
-        }
-
-        switch( y.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-            {
-              if( replacements != null )
-              {
-                var fromTo = replacements.FromTo;
-                var toFrom = replacements.ToFrom;
-
-                foreach( var item in y.NewItems )
-                {
-                  object to;
-
-                  if( fromTo.TryGetValue( item, out to ) )
-                  {
-                    fromTo.Remove( item );
-                    toFrom.Remove( to );
-                  }
-                }
-              }
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Remove:
-            {
-              if( replacements != null )
-              {
-                var fromTo = replacements.FromTo;
-                var toFrom = replacements.ToFrom;
-
-                foreach( var item in y.OldItems )
-                {
-                  object from;
-
-                  if( toFrom.TryGetValue( item, out from ) )
-                  {
-                    fromTo.Remove( from );
-                    toFrom.Remove( item );
-                  }
-                }
-              }
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Replace:
-            {
-              var mapping = NotifyBatchCollectionChangedEventArgs.Map( y.OldItems, y.NewItems );
-
-              if( replacements != null )
-              {
-                replacements = NotifyBatchCollectionChangedEventArgs.Merge( replacements.FromTo, mapping );
-              }
-              else
-              {
-                replacements = NotifyBatchCollectionChangedEventArgs.Merge( mapping, null );
-              }
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Move:
-            break;
-
-          case NotifyCollectionChangedAction.Reset:
-            {
-              if( replacements != null )
-              {
-                replacements = NotifyBatchCollectionChangedEventArgs.Merge( replacements.FromTo, y.m_fromTo );
-              }
-              else
-              {
-                replacements = NotifyBatchCollectionChangedEventArgs.Merge( y.m_fromTo, null );
-              }
-            }
-            break;
-
-          default:
-            throw new NotSupportedException();
-        }
-
-        result = new NotifyBatchCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
-      }
-
-      if( ( result != null ) && ( replacements != null ) )
-      {
-        result.m_fromTo = replacements.FromTo;
-        result.m_toFrom = replacements.ToFrom;
-      }
-
-      return result;
-    }
-
-    private static NotifyBatchCollectionChangedEventArgs Create( NotifyCollectionChangedEventArgs e )
-    {
-      if( e == null )
-        return null;
-
-      var batch = e as NotifyBatchCollectionChangedEventArgs;
-      if( batch != null )
-        return batch;
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          return new NotifyBatchCollectionChangedEventArgs( e.Action, e.NewItems, e.NewStartingIndex );
-
-        case NotifyCollectionChangedAction.Remove:
-          return new NotifyBatchCollectionChangedEventArgs( e.Action, e.OldItems, e.OldStartingIndex );
-
-        case NotifyCollectionChangedAction.Move:
-          return new NotifyBatchCollectionChangedEventArgs( e.Action, e.OldItems, e.NewStartingIndex, e.OldStartingIndex );
-
-        case NotifyCollectionChangedAction.Replace:
-          return new NotifyBatchCollectionChangedEventArgs( e.Action, e.NewItems, e.OldItems, e.OldStartingIndex );
-
-        case NotifyCollectionChangedAction.Reset:
-          return new NotifyBatchCollectionChangedEventArgs( e.Action );
-
-        default:
-          throw new NotSupportedException();
-      }
-    }
-
-    private static BiMap Merge( IDictionary<object, object> x, IDictionary<object, object> y )
-    {
-      var fromTo = new Dictionary<object, object>();
-      var toFrom = new Dictionary<object, object>();
-
-      if( x != null )
-      {
-        foreach( var entry in x )
-        {
-          if( object.ReferenceEquals( entry.Key, entry.Value ) )
-            continue;
-
-          fromTo.Add( entry.Key, entry.Value );
-          toFrom.Add( entry.Value, entry.Key );
-        }
-      }
-
-      if( y != null )
-      {
-        foreach( var entry in y )
-        {
-          if( object.ReferenceEquals( entry.Key, entry.Value ) )
-            continue;
-
-          // Keep only the initial and final value.  For example, (A -> B -> C) becomes (A -> C).
-          var from = default( object );
-          if( toFrom.TryGetValue( entry.Key, out from ) )
-          {
-            toFrom.Remove( entry.Key );
-
-            if( object.ReferenceEquals( from, entry.Value ) )
-            {
-              fromTo.Remove( from );
-            }
-            else
-            {
-              fromTo[ from ] = entry.Value;
-              toFrom[ entry.Value ] = from;
-            }
-          }
-          else
-          {
-            // There is no need to check if the entry exists, since it should not or the same instance
-            // is use multiple time in the data source, which is not supported by the grid.
-            fromTo.Add( entry.Key, entry.Value );
-            toFrom.Add( entry.Value, entry.Key );
-          }
-        }
-      }
-
-      if( fromTo.Count <= 0 )
-        return null;
-
-      return new BiMap( fromTo, toFrom );
-    }
-
-    private static IDictionary<object, object> Map( IList oldItems, IList newItems )
-    {
-      Debug.Assert( oldItems != null );
-      Debug.Assert( newItems != null );
-      Debug.Assert( oldItems.Count == newItems.Count );
-
-      var items = new Dictionary<object, object>();
-      var count = oldItems.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        items.Add( oldItems[ i ], newItems[ i ] );
-      }
-
-      return items;
-    }
-
-    private IDictionary<object, object> m_fromTo;
-    private IDictionary<object, object> m_toFrom;
-
-    #region BiMap Private Class
-
-    private sealed class BiMap
-    {
-      internal BiMap( IDictionary<object, object> fromTo, IDictionary<object, object> toFrom )
-      {
-        this.FromTo = fromTo;
-        this.ToFrom = toFrom;
-      }
-
-      internal readonly IDictionary<object, object> FromTo;
-      internal readonly IDictionary<object, object> ToFrom;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyCollectionChangedEventArgsExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyCollectionChangedEventArgsExtensions.cs
deleted file mode 100644
index 8ac11222..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyCollectionChangedEventArgsExtensions.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class NotifyCollectionChangedEventArgsExtensions
-  {
-    internal static NotifyCollectionChangedEventArgs GetRangeActionOrSelf( this NotifyCollectionChangedEventArgs source )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      var rangeEventArgs = source as NotifyRangeCollectionChangedEventArgs;
-      if( rangeEventArgs != null )
-        return rangeEventArgs.OriginalEventArgs;
-
-      return source;
-    }
-
-    internal static object GetReplacement( this NotifyCollectionChangedEventArgs source, object item )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      var result = default( object );
-
-      if( item != null )
-      {
-        var batch = source as NotifyBatchCollectionChangedEventArgs;
-        if( batch != null )
-        {
-          if( !batch.Replacements.TryGetValue( item, out result ) )
-          {
-            result = null;
-          }
-        }
-        else if( source.Action == NotifyCollectionChangedAction.Replace )
-        {
-          var oldItems = source.OldItems;
-          var newItems = source.NewItems;
-
-          if( ( oldItems != null ) && ( newItems != null ) )
-          {
-            var index = oldItems.IndexOf( item );
-            if( index >= 0 )
-            {
-              result = newItems[ index ];
-            }
-          }
-        }
-      }
-
-      return result;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyRangeCollectionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyRangeCollectionChangedEventArgs.cs
deleted file mode 100644
index 5482024d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/NotifyRangeCollectionChangedEventArgs.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class NotifyRangeCollectionChangedEventArgs : NotifyCollectionChangedEventArgs
-  {
-    #region Constructor
-
-    internal NotifyRangeCollectionChangedEventArgs( NotifyCollectionChangedEventArgs args )
-      : base( NotifyCollectionChangedAction.Reset )
-    {
-      if( args == null )
-        throw new ArgumentNullException( "args" );
-
-      m_originalEventArgs = args;
-    }
-
-    #endregion
-
-    #region OriginalEventArgs Property
-
-    internal NotifyCollectionChangedEventArgs OriginalEventArgs
-    {
-      get
-      {
-        return m_originalEventArgs;
-      }
-    }
-
-    private readonly NotifyCollectionChangedEventArgs m_originalEventArgs;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEvent.cs
deleted file mode 100644
index ccef5ae2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEvent.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RealizedContainersRequestedEventArgs: EventArgs
-  {
-    public List<object> RealizedContainers
-    {
-      get
-      {
-        return m_realizedContainers;
-      }
-    }
-
-    private List<object> m_realizedContainers = new List<object>();
-  }
-
-  internal delegate void RealizedContainersRequestedEventHandler( object sender, RealizedContainersRequestedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEventManager.cs
deleted file mode 100644
index d3783e53..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RealizedContainersRequestedEventManager.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class RealizedContainersRequestedEventManager: WeakEventManager
-  {
-    private RealizedContainersRequestedEventManager()
-    {
-    }
-
-    public static void AddListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ColumnCollection source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.RealizedContainersRequested += this.OnRealizedContainersRequested;
-    }
-
-    protected override void StopListening( object source )
-    {
-      ColumnCollection columns = ( ColumnCollection )source;
-      columns.RealizedContainersRequested -= this.OnRealizedContainersRequested;
-    }
-
-    private static RealizedContainersRequestedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( RealizedContainersRequestedEventManager );
-        RealizedContainersRequestedEventManager currentManager = ( RealizedContainersRequestedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new RealizedContainersRequestedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnRealizedContainersRequested( object sender, RealizedContainersRequestedEventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestBringIntoViewWeakEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestBringIntoViewWeakEventManager.cs
deleted file mode 100644
index 858670ef..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestBringIntoViewWeakEventManager.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RequestBringIntoViewWeakEventManager : WeakEventManager
-  {
-    #region CurrentManager Static Property
-
-    private static RequestBringIntoViewWeakEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( RequestBringIntoViewWeakEventManager );
-        var currentManager = ( RequestBringIntoViewWeakEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new RequestBringIntoViewWeakEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    #endregion
-
-    internal static void AddListener( FrameworkElement source, IWeakEventListener listener )
-    {
-      RequestBringIntoViewWeakEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( FrameworkElement source, IWeakEventListener listener )
-    {
-      RequestBringIntoViewWeakEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var fe = ( FrameworkElement )source;
-
-      fe.RequestBringIntoView += new RequestBringIntoViewEventHandler( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var fe = ( FrameworkElement )source;
-
-      fe.RequestBringIntoView -= new RequestBringIntoViewEventHandler( this.OnEventRaised );
-    }
-
-    private void OnEventRaised( object sender, RequestBringIntoViewEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs
deleted file mode 100644
index 6ee4f79a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RequestingDelayBringIntoViewAndFocusCurrentEventArgs.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class RequestingDelayBringIntoViewAndFocusCurrentEventArgs : EventArgs
-  {
-    internal RequestingDelayBringIntoViewAndFocusCurrentEventArgs( AutoScrollCurrentItemSourceTriggers trigger )
-    {
-      m_trigger = trigger;
-    }
-
-    #region Trigger Property
-
-    internal AutoScrollCurrentItemSourceTriggers Trigger
-    {
-      get
-      {
-        return m_trigger;
-      }
-    }
-
-    private readonly AutoScrollCurrentItemSourceTriggers m_trigger;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RowValidationErrorRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RowValidationErrorRoutedEvent.cs
deleted file mode 100644
index 4385a741..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/RowValidationErrorRoutedEvent.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void RowValidationErrorRoutedEventHandler( object sender, RowValidationErrorRoutedEventArgs e );
-
-  public class RowValidationErrorRoutedEventArgs : RoutedEventArgs
-  {
-    public RowValidationErrorRoutedEventArgs( RowValidationError rowValidationError )
-      : base()
-    {
-      if( rowValidationError == null )
-        throw new ArgumentNullException( "rowValidationError" );
-
-      m_rowValidationError = rowValidationError;
-    }
-
-    public RowValidationErrorRoutedEventArgs( RoutedEvent routedEvent, RowValidationError rowValidationError )
-      : base( routedEvent )
-    {
-      if( rowValidationError == null )
-        throw new ArgumentNullException( "rowValidationError" );
-
-      m_rowValidationError = rowValidationError;
-    }
-
-    public RowValidationErrorRoutedEventArgs( RoutedEvent routedEvent, object source, RowValidationError rowValidationError )
-      : base( routedEvent, source )
-    {
-      if( rowValidationError == null )
-        throw new ArgumentNullException( "rowValidationError" );
-
-      m_rowValidationError = rowValidationError;
-    }
-
-    #region ValidationError PROPERTY
-
-    public RowValidationError RowValidationError
-    {
-      get
-      {
-        return m_rowValidationError;
-      }
-    }
-
-    private RowValidationError m_rowValidationError;
-
-    #endregion ValidationError PROPERTY
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ScrollChangedWeakEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ScrollChangedWeakEventManager.cs
deleted file mode 100644
index 3d713888..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ScrollChangedWeakEventManager.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ScrollChangedWeakEventManager : WeakEventManager
-  {
-    internal static void AddListener( ScrollViewer source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( ScrollViewer source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ScrollViewer scrollViewer = source as ScrollViewer;
-
-      if( scrollViewer != null )
-        scrollViewer.ScrollChanged += this.ScrollViewer_ScrollChanged;
-    }
-
-    protected override void StopListening( object source )
-    {
-      ScrollViewer scrollViewer = source as ScrollViewer;
-
-      if( scrollViewer != null )
-        scrollViewer.ScrollChanged -= this.ScrollViewer_ScrollChanged;
-    }
-
-    private static ScrollChangedWeakEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ScrollChangedWeakEventManager );
-        ScrollChangedWeakEventManager currentManager =
-          ( ScrollChangedWeakEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ScrollChangedWeakEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void ScrollViewer_ScrollChanged( object sender, ScrollChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedEventManager.cs
deleted file mode 100644
index 5c5ab821..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedEventManager.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Controls.Primitives;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelectionChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( Selector source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( Selector source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      Selector selector = ( Selector )source;
-
-      if( selector != null )
-        selector.SelectionChanged += new SelectionChangedEventHandler( this.Selector_SelectionChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      Selector selector = ( Selector )source;
-
-      if( selector != null )
-        selector.SelectionChanged -= new SelectionChangedEventHandler( this.Selector_SelectionChanged );
-    }
-
-    private static SelectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( SelectionChangedEventManager );
-        SelectionChangedEventManager currentManager = ( SelectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new SelectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void Selector_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventArgs.cs
deleted file mode 100644
index 247f799f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventArgs.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class SelectionChangedInternalEventArgs : EventArgs
-  {
-
-    internal SelectionChangedInternalEventArgs( SelectionInfo selectionInfo )
-    {
-      this.SelectionInfo = selectionInfo;
-    }
-
-    internal SelectionInfo SelectionInfo
-    {
-      get;
-      private set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventManager.cs
deleted file mode 100644
index fbd32012..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/SelectionChangedInternalEventManager.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class SelectionChangedInternalEventManager : WeakEventManager
-  {
-    internal static void AddListener( DataGridContext source, IWeakEventListener listener )
-    {
-      SelectionChangedInternalEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DataGridContext source, IWeakEventListener listener )
-    {
-      SelectionChangedInternalEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      ( ( DataGridContext )source ).SelectionChangedInternal += new EventHandler<SelectionChangedInternalEventArgs>( this.OnEventRaised );
-    }
-
-    protected override void StopListening( object source )
-    {
-      ( ( DataGridContext )source ).SelectionChangedInternal -= new EventHandler<SelectionChangedInternalEventArgs>( this.OnEventRaised );
-    }
-
-    private static SelectionChangedInternalEventManager CurrentManager
-    {
-      get
-      {
-        var managerType = typeof( SelectionChangedInternalEventManager );
-        var currentManager = ( SelectionChangedInternalEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new SelectionChangedInternalEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnEventRaised( object sender, SelectionChangedInternalEventArgs e )
-    {
-      this.DeliverEvent( sender, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ThemeChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ThemeChangedEventManager.cs
deleted file mode 100644
index cdf6af77..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ThemeChangedEventManager.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ThemeChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ThemeChanged += new EventHandler( this.OnThemeChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ThemeChanged -= new EventHandler( this.OnThemeChanged );
-    }
-
-    private static ThemeChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ThemeChangedEventManager );
-        ThemeChangedEventManager currentManager = ( ThemeChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ThemeChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnThemeChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ViewChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ViewChangedEventManager.cs
deleted file mode 100644
index 18730990..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/ViewChangedEventManager.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ViewChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( DataGridControl source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ViewChanged += new EventHandler( this.OnViewChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      DataGridControl dataGridControl = ( DataGridControl )source;
-      dataGridControl.ViewChanged -= new EventHandler( this.OnViewChanged );
-    }
-
-    private static ViewChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ViewChangedEventManager );
-        ViewChangedEventManager currentManager = ( ViewChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ViewChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnViewChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/VirtualizingCellCollectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/VirtualizingCellCollectionChangedEventManager.cs
deleted file mode 100644
index f82d3ef9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Events)/VirtualizingCellCollectionChangedEventManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VirtualizingCellCollectionChangedEventManager : WeakEventManager
-  {
-    internal static void AddListener( VirtualizingCellCollection source, IWeakEventListener listener )
-    {
-      VirtualizingCellCollectionChangedEventManager.CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    internal static void RemoveListener( VirtualizingCellCollection source, IWeakEventListener listener )
-    {
-      VirtualizingCellCollectionChangedEventManager.CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      VirtualizingCellCollection virtualizingCellCollection = source as VirtualizingCellCollection;
-      if( source == null )
-      {
-        throw new InvalidOperationException( "An attempt was made to use a source other than a VirtualizingCellCollection" );
-      }
-
-      virtualizingCellCollection.CollectionChanged += this.OnVirtualizingCellCollectionChanged;
-    }
-
-    protected override void StopListening( object source )
-    {
-      VirtualizingCellCollection virtualizingCellCollection = source as VirtualizingCellCollection;
-      if( source == null )
-      {
-        throw new InvalidOperationException( "An attempt was made to use a source other than a VirtualizingCellCollection" );
-      }
-
-      virtualizingCellCollection.CollectionChanged -= this.OnVirtualizingCellCollectionChanged;
-    }
-
-    private static VirtualizingCellCollectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( VirtualizingCellCollectionChangedEventManager );
-        VirtualizingCellCollectionChangedEventManager currentManager = WeakEventManager.GetCurrentManager( managerType ) as VirtualizingCellCollectionChangedEventManager;
-
-        if( currentManager == null )
-        {
-          currentManager = new VirtualizingCellCollectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnVirtualizingCellCollectionChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataGridForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataGridForeignKeyConverter.cs
deleted file mode 100644
index da972812..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataGridForeignKeyConverter.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataGridForeignKeyConverter : ForeignKeyConverter
-  {
-    public DataGridForeignKeyConverter()
-    {
-    }
-
-    public override object GetValueFromKey( object key, ForeignKeyConfiguration configuration )
-    {
-      var itemsSource = configuration.ItemsSource;
-      if( itemsSource == null )
-        return key;
-
-      if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
-        return new DataTableForeignKeyConverter().GetValueFromKey( key, configuration );
-
-      return this.GetValueFromKeyCore( key, itemsSource, configuration.ValuePath, configuration.DisplayMemberPath );
-    }
-
-    public override object GetKeyFromValue( object value, ForeignKeyConfiguration configuration )
-    {
-      if( value == null )
-        return null;
-
-      var displayMemberPath = configuration.DisplayMemberPath;
-      if( string.IsNullOrWhiteSpace( displayMemberPath ) )
-        return value;
-
-      var valuePath = configuration.ValuePath;
-      if( string.IsNullOrWhiteSpace( valuePath ) )
-        return value;
-
-      var itemsSource = configuration.ItemsSource;
-      if( itemsSource == null )
-        return value;
-
-      if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
-        return new DataTableForeignKeyConverter().GetKeyFromValue( value, configuration );
-
-      try
-      {
-        var enumerator = itemsSource.GetEnumerator();
-        enumerator.MoveNext();
-        var firstItem = enumerator.Current;
-        var itemType = firstItem.GetType();
-        var propertyInfo = itemType.GetProperty( displayMemberPath );
-
-        foreach( object item in itemsSource )
-        {
-          if( item == null )
-            continue;
-
-          var displayValue = propertyInfo.GetValue( item, null );
-
-          if( value.Equals( displayValue ) )
-            return itemType.GetProperty( valuePath ).GetValue( item, null );
-        }
-      }
-      catch
-      {
-        //Swallow the exception, no need to terminate the application, just return the original value.
-      }
-
-      return value;
-    }
-
-    public override object GetValueFromKey( object key, DataGridForeignKeyDescription description )
-    {
-      var itemsSource = description.ItemsSource;
-      if( itemsSource == null )
-        return key;
-
-      if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
-        return new DataTableForeignKeyConverter().GetValueFromKey( key, description );
-
-      return this.GetValueFromKeyCore( key, itemsSource, description.ValuePath, description.DisplayMemberPath );
-    }
-
-    private object GetValueFromKeyCore( object key, IEnumerable itemsSource, string valuePath, string displayMemberPath )
-    {
-      if( key == null )
-        return null;
-
-      if( string.IsNullOrWhiteSpace( displayMemberPath ) )
-        return key;
-
-      if( string.IsNullOrWhiteSpace( valuePath ) )
-        return key;
-
-      try
-      {
-        var enumerator = itemsSource.GetEnumerator();
-        enumerator.MoveNext();
-        var firstItem = enumerator.Current;
-        var itemType = firstItem.GetType();
-        var propertyInfo = itemType.GetProperty( valuePath );
-
-        foreach( object item in itemsSource )
-        {
-          if( item == null )
-            continue;
-
-          var value = propertyInfo.GetValue( item, null );
-
-          if( key.Equals( value ) )
-            return itemType.GetProperty( displayMemberPath ).GetValue( item, null );
-        }
-      }
-      catch
-      {
-        //Swallow the exception, no need to terminate the application, just return the original value.
-      }
-
-      return key;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs
deleted file mode 100644
index 0ed005c4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataTableForeignKeyConverter : ForeignKeyConverter
-  {
-    public DataTableForeignKeyConverter()
-    {
-    }
-
-    public override object GetValueFromKey( object key, ForeignKeyConfiguration configuration )
-    {
-      return this.GetValueFromKeyCore( key, configuration.ItemsSource, configuration.ValuePath, configuration.DisplayMemberPath, true );
-    }
-
-    public override object GetKeyFromValue( object value, ForeignKeyConfiguration configuration )
-    {
-      var dataView = configuration.ItemsSource as DataView;
-      if( dataView == null )
-      {
-        var dataTable = configuration.ItemsSource as DataTable;
-        if( dataTable != null )
-        {
-          dataView = dataTable.DefaultView;
-        }
-      }
-
-      if( dataView == null )
-      {
-        return value;
-      }
-
-      var dataRow = value as DataRowView;
-
-      if( dataRow == null )
-      {
-        return null;
-      }
-      else
-      {
-        return dataRow[ dataView.Sort ];
-      }
-    }
-
-    public override object GetValueFromKey( object key, DataGridForeignKeyDescription description )
-    {
-      return this.GetValueFromKeyCore( key, description.ItemsSource, description.ValuePath, description.DisplayMemberPath, false );
-    }
-
-    private object GetValueFromKeyCore( object key, IEnumerable itemsSource, string valuePath, string displayMemberPath, bool isConfiguration )
-    {
-      var dataView = itemsSource as DataView;
-      if( dataView == null )
-      {
-        var dataTable = itemsSource as DataTable;
-        if( dataTable != null )
-        {
-          dataView = dataTable.DefaultView;
-        }
-      }
-
-      if( dataView == null )
-      {
-        return key;
-      }
-
-      if( string.IsNullOrEmpty( valuePath ) )
-      {
-        return key;
-      }
-
-      dataView.Sort = valuePath;
-
-      DataRowView dataRow;
-
-      int index = -1;
-
-      if( ( key != null ) && ( !object.Equals( string.Empty, key ) ) )
-      {
-        try
-        {
-          index = dataView.Find( key );
-        }
-        catch( Exception )
-        {
-        }
-      }
-
-      if( index == -1 )
-      {
-        dataRow = null;
-      }
-      else
-      {
-        dataRow = dataView[ index ];
-      }
-
-      // Use the DisplayMemberPath if defined
-      if( dataRow != null )
-      {
-        if( !string.IsNullOrEmpty( displayMemberPath ) )
-        {
-          return dataRow[ displayMemberPath ];
-        }
-      }
-
-      if( isConfiguration )
-        return dataRow;
-
-      return key;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigNotifyCollectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigNotifyCollectionChangedEventManager.cs
deleted file mode 100644
index 0adf06c4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigNotifyCollectionChangedEventManager.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ForeignKeyConfigNotifyCollectionChangedEventManager : WeakEventManager
-  {
-    public static void AddListener( ForeignKeyConfiguration source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( ForeignKeyConfiguration source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var configuration = ( ForeignKeyConfiguration )source;
-      configuration.NotifiyCollectionChanged += new EventHandler( this.OnNotifiyCollectionChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      var configuration = ( ForeignKeyConfiguration )source;
-      configuration.NotifiyCollectionChanged -= new EventHandler( this.OnNotifiyCollectionChanged );
-    }
-
-    private static ForeignKeyConfigNotifyCollectionChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ForeignKeyConfigNotifyCollectionChangedEventManager );
-        var currentManager = ( ForeignKeyConfigNotifyCollectionChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ForeignKeyConfigNotifyCollectionChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnNotifiyCollectionChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs
deleted file mode 100644
index 1e3327aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs
+++ /dev/null
@@ -1,719 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Data;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class ForeignKeyConfiguration : DependencyObject, IWeakEventListener
-  {
-    static ForeignKeyConfiguration()
-    {
-      ForeignKeyConfiguration.DefaultDistinctValueItemContentTemplateProperty = ForeignKeyConfiguration.DefaultDistinctValueItemContentTemplatePropertyKey.DependencyProperty;
-      ForeignKeyConfiguration.DefaultCellContentTemplateProperty = ForeignKeyConfiguration.DefaultCellContentTemplatePropertyKey.DependencyProperty;
-      ForeignKeyConfiguration.DefaultGroupValueTemplateProperty = ForeignKeyConfiguration.DefaultGroupValueTemplatePropertyKey.DependencyProperty;
-      ForeignKeyConfiguration.DefaultScrollTipContentTemplateProperty = ForeignKeyConfiguration.DefaultScrollTipContentTemplatePropertyKey.DependencyProperty;
-      ForeignKeyConfiguration.DefaultCellEditorProperty = ForeignKeyConfiguration.DefaultCellEditorPropertyKey.DependencyProperty;
-    }
-
-    public ForeignKeyConfiguration()
-    {
-      this.SetDefaultCellContentTemplate( GenericContentTemplateSelector.ForeignKeyCellContentTemplate );
-      this.SetDefaultGroupValueTemplate( GenericContentTemplateSelector.ForeignKeyGroupValueTemplate );
-      this.SetDefaultScrollTipContentTemplate( GenericContentTemplateSelector.ForeignKeyScrollTipContentTemplate );
-      this.SetDefaultCellEditor( DefaultCellEditorSelector.ForeignKeyCellEditor );
-    }
-
-    #region ValuePath Property
-
-    public static readonly DependencyProperty ValuePathProperty = DependencyProperty.Register(
-      "ValuePath",
-      typeof( string ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public string ValuePath
-    {
-      get
-      {
-        return ( string )this.GetValue( ForeignKeyConfiguration.ValuePathProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.ValuePathProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DisplayMemberPath Property
-
-    public static readonly DependencyProperty DisplayMemberPathProperty = DependencyProperty.Register(
-      "DisplayMemberPath",
-      typeof( string ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public string DisplayMemberPath
-    {
-      get
-      {
-        return ( string )this.GetValue( ForeignKeyConfiguration.DisplayMemberPathProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.DisplayMemberPathProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ItemContainerStyle Property
-
-    public static readonly DependencyProperty ItemContainerStyleProperty = DependencyProperty.Register(
-      "ItemContainerStyle",
-      typeof( Style ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public Style ItemContainerStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( ForeignKeyConfiguration.ItemContainerStyleProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.ItemContainerStyleProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ItemContainerStyleSelector Property
-
-    public static readonly DependencyProperty ItemContainerStyleSelectorProperty = DependencyProperty.Register(
-      "ItemContainerStyleSelector",
-      typeof( StyleSelector ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public StyleSelector ItemContainerStyleSelector
-    {
-      get
-      {
-        return ( StyleSelector )this.GetValue( ForeignKeyConfiguration.ItemContainerStyleSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.ItemContainerStyleSelectorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsAutoCreated Property
-
-    internal bool IsAutoCreated
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ItemsSource Property
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register(
-      "ItemsSource",
-      typeof( IEnumerable ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( ForeignKeyConfiguration.OnItemsSourceChanged ) ) );
-
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return ( IEnumerable )this.GetValue( ForeignKeyConfiguration.ItemsSourceProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.ItemsSourceProperty, value );
-      }
-    }
-
-    private static void OnItemsSourceChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var foreignConfiguration = sender as ForeignKeyConfiguration;
-      if( foreignConfiguration != null )
-      {
-        foreignConfiguration.OnItemsSourceChanged( ( IEnumerable )e.OldValue, ( IEnumerable )e.NewValue );
-      }
-    }
-
-    private void OnItemsSourceChanged( IEnumerable oldItemsSource, IEnumerable newItemsSource )
-    {
-      //Unsubscribe from the old list changed event, if any.
-      if( oldItemsSource != null )
-      {
-        var oldNotifyCollectionChanged = oldItemsSource as INotifyCollectionChanged;
-        if( oldNotifyCollectionChanged != null )
-        {
-          CollectionChangedEventManager.RemoveListener( oldNotifyCollectionChanged, this );
-        }
-        else
-        {
-          var oldBindingList = oldItemsSource as IBindingList;
-          if( oldBindingList != null && oldBindingList.SupportsChangeNotification )
-          {
-            ListChangedEventManager.RemoveListener( oldBindingList, this );
-          }
-        }
-      }
-
-      //Subscribe from to the new list changed event, if any.
-      if( newItemsSource != null )
-      {
-        var newNotifyCollectionChanged = newItemsSource as INotifyCollectionChanged;
-        if( newNotifyCollectionChanged != null )
-        {
-          CollectionChangedEventManager.AddListener( newNotifyCollectionChanged, this );
-        }
-        else
-        {
-          var newBindingList = newItemsSource as IBindingList;
-          if( newBindingList != null && newBindingList.SupportsChangeNotification )
-          {
-            ListChangedEventManager.AddListener( newBindingList, this );
-          }
-        }
-      }
-    }
-
-    private void OnNotifiyCollectionChanged()
-    {
-      var handler = this.NotifiyCollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    internal event EventHandler NotifiyCollectionChanged;
-
-    #endregion
-
-    #region ForeignKeyConverter Property
-
-    public static readonly DependencyProperty ForeignKeyConverterProperty = DependencyProperty.Register(
-      "ForeignKeyConverter",
-      typeof( ForeignKeyConverter ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public ForeignKeyConverter ForeignKeyConverter
-    {
-      get
-      {
-        return ( ForeignKeyConverter )this.GetValue( ForeignKeyConfiguration.ForeignKeyConverterProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.ForeignKeyConverterProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ForeignKeyValueConverter Property
-
-    public static readonly DependencyProperty ForeignKeyValueConverterProperty = DependencyProperty.Register(
-      "ForeignKeyValueConverter",
-      typeof( IValueConverter ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public IValueConverter ForeignKeyValueConverter
-    {
-      get
-      {
-        return ( IValueConverter )this.GetValue( ForeignKeyConfiguration.ForeignKeyValueConverterProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.ForeignKeyValueConverterProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ForeignKeyValueConverterParameter Property
-
-    public static readonly DependencyProperty ForeignKeyValueConverterParameterProperty = DependencyProperty.Register(
-      "ForeignKeyValueConverterParameter",
-      typeof( object ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public object ForeignKeyValueConverterParameter
-    {
-      get
-      {
-        return ( object )this.GetValue( ForeignKeyConfiguration.ForeignKeyValueConverterParameterProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.ForeignKeyValueConverterParameterProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ForeignKeyValueConverterCulture Property
-
-    public static readonly DependencyProperty ForeignKeyValueConverterCultureProperty = DependencyProperty.Register(
-      "ForeignKeyValueConverterCulture",
-      typeof( CultureInfo ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public CultureInfo ForeignKeyValueConverterCulture
-    {
-      get
-      {
-        return ( CultureInfo )this.GetValue( ForeignKeyConfiguration.ForeignKeyValueConverterCultureProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.ForeignKeyValueConverterCultureProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region UseDefaultFilterCriterion Property
-
-    public static readonly DependencyProperty UseDefaultFilterCriterionProperty = DependencyProperty.Register(
-      "UseDefaultFilterCriterion",
-      typeof( bool ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool UseDefaultFilterCriterion
-    {
-      get
-      {
-        return ( bool )this.GetValue( ForeignKeyConfiguration.UseDefaultFilterCriterionProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.UseDefaultFilterCriterionProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region UseDisplayedValueWhenExporting Property
-
-    public static readonly DependencyProperty UseDisplayedValueWhenExportingProperty = DependencyProperty.Register(
-      "UseDisplayedValueWhenExporting",
-      typeof( bool ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool UseDisplayedValueWhenExporting
-    {
-      get
-      {
-        return ( bool )this.GetValue( ForeignKeyConfiguration.UseDisplayedValueWhenExportingProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyConfiguration.UseDisplayedValueWhenExportingProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ValuePathDataType Property
-
-    internal Type ValuePathDataType
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region DefaultDistinctValueItemContentTemplate Property
-
-    private static readonly DependencyPropertyKey DefaultDistinctValueItemContentTemplatePropertyKey = DependencyProperty.RegisterReadOnly(
-      "DefaultDistinctValueItemContentTemplate",
-      typeof( DataTemplate ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal static readonly DependencyProperty DefaultDistinctValueItemContentTemplateProperty;
-
-    internal DataTemplate DefaultDistinctValueItemContentTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ForeignKeyConfiguration.DefaultDistinctValueItemContentTemplateProperty );
-      }
-    }
-
-    private void SetDefaultDistinctValueItemContentTemplate( DataTemplate value )
-    {
-      this.SetValue( ForeignKeyConfiguration.DefaultDistinctValueItemContentTemplatePropertyKey, value );
-    }
-
-    private void ClearDefaultDistinctValueItemContentTemplate()
-    {
-      this.ClearValue( ForeignKeyConfiguration.DefaultDistinctValueItemContentTemplatePropertyKey );
-    }
-
-    #endregion
-
-    #region DefaultCellContentTemplate Internal Property
-
-    private static readonly DependencyPropertyKey DefaultCellContentTemplatePropertyKey = DependencyProperty.RegisterReadOnly(
-      "DefaultCellContentTemplate",
-      typeof( DataTemplate ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal static readonly DependencyProperty DefaultCellContentTemplateProperty;
-
-    internal DataTemplate DefaultCellContentTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ForeignKeyConfiguration.DefaultCellContentTemplateProperty );
-      }
-    }
-
-    private void SetDefaultCellContentTemplate( DataTemplate value )
-    {
-      this.SetValue( ForeignKeyConfiguration.DefaultCellContentTemplatePropertyKey, value );
-    }
-
-    private void ClearDefaultCellContentTemplate()
-    {
-      this.ClearValue( ForeignKeyConfiguration.DefaultCellContentTemplatePropertyKey );
-    }
-
-    #endregion
-
-    #region DefaultGroupValueTemplate Internal Property
-
-    private static readonly DependencyPropertyKey DefaultGroupValueTemplatePropertyKey = DependencyProperty.RegisterReadOnly(
-      "DefaultGroupValueTemplate",
-      typeof( DataTemplate ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal static readonly DependencyProperty DefaultGroupValueTemplateProperty;
-
-
-    internal DataTemplate DefaultGroupValueTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ForeignKeyConfiguration.DefaultGroupValueTemplateProperty );
-      }
-    }
-
-    private void SetDefaultGroupValueTemplate( DataTemplate value )
-    {
-      this.SetValue( ForeignKeyConfiguration.DefaultGroupValueTemplatePropertyKey, value );
-    }
-
-    private void ClearDefaultGroupValueTemplate()
-    {
-      this.ClearValue( ForeignKeyConfiguration.DefaultGroupValueTemplatePropertyKey );
-    }
-
-    #endregion
-
-    #region DefaultScrollTipContentTemplate Property
-
-    private static readonly DependencyPropertyKey DefaultScrollTipContentTemplatePropertyKey = DependencyProperty.RegisterReadOnly(
-      "DefaultScrollTipContentTemplate",
-      typeof( DataTemplate ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal static readonly DependencyProperty DefaultScrollTipContentTemplateProperty;
-
-    internal DataTemplate DefaultScrollTipContentTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ForeignKeyConfiguration.DefaultScrollTipContentTemplateProperty );
-      }
-    }
-
-    private void SetDefaultScrollTipContentTemplate( DataTemplate value )
-    {
-      this.SetValue( ForeignKeyConfiguration.DefaultScrollTipContentTemplatePropertyKey, value );
-    }
-
-    private void ClearDefaultScrollTipContentTemplate()
-    {
-      this.ClearValue( ForeignKeyConfiguration.DefaultScrollTipContentTemplatePropertyKey );
-    }
-
-    #endregion
-
-    #region DefaultCellEditor Internal Property
-
-    private static readonly DependencyPropertyKey DefaultCellEditorPropertyKey = DependencyProperty.RegisterReadOnly(
-      "DefaultCellEditor",
-      typeof( CellEditor ),
-      typeof( ForeignKeyConfiguration ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal static readonly DependencyProperty DefaultCellEditorProperty;
-
-    internal CellEditor DefaultCellEditor
-    {
-      get
-      {
-        return ( CellEditor )this.GetValue( ForeignKeyConfiguration.DefaultCellEditorProperty );
-      }
-    }
-
-    private void SetDefaultCellEditor( CellEditor value )
-    {
-      this.SetValue( ForeignKeyConfiguration.DefaultCellEditorPropertyKey, value );
-    }
-
-    private void ClearDefaultCellEditor()
-    {
-      this.ClearValue( ForeignKeyConfiguration.DefaultCellEditorPropertyKey );
-    }
-
-    #endregion
-
-    internal object GetDisplayMemberValue( object fieldValue )
-    {
-      try
-      {
-        var valuePath = this.ValuePath;
-        var displayMemberPath = this.DisplayMemberPath;
-
-        if( ( valuePath == null ) || ( displayMemberPath == null ) )
-          return fieldValue;
-
-        var itemsSource = this.ItemsSource;
-
-        //Convert the value from the ValuePath value to the DisplayMemberPath value, using a DataRowView or reflection.
-        if( ( itemsSource is DataView ) || ( itemsSource is DataTable ) )
-        {
-          foreach( object item in itemsSource )
-          {
-            var dataRowView = item as DataRowView;
-            if( dataRowView != null )
-            {
-              var value = dataRowView[ valuePath ];
-
-              if( fieldValue.Equals( value ) )
-                return dataRowView[ displayMemberPath ];
-            }
-          }
-        }
-        else
-        {
-          foreach( object item in itemsSource )
-          {
-            var value = item.GetType().GetProperty( valuePath ).GetValue( item, null );
-
-            if( fieldValue.Equals( value ) )
-              return item.GetType().GetProperty( displayMemberPath ).GetValue( item, null );
-          }
-        }
-      }
-      catch
-      {
-        //Swallow the exception, no need to terminate the application, since the original value will be exported.
-      }
-
-      return fieldValue;
-    }
-
-    internal static void UpdateColumnsForeignKeyConfigurations(
-      ObservableColumnCollection columns,
-      IEnumerable itemsSourceCollection,
-      PropertyDescriptionRouteDictionary propertyDescriptions,
-      bool autoCreateForeignKeyConfigurations )
-    {
-      var collectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
-      if( collectionViewBase != null )
-      {
-        ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView( columns, collectionViewBase.ItemProperties, autoCreateForeignKeyConfigurations );
-      }
-      else
-      {
-        ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromPropertyDescriptions( columns, propertyDescriptions, autoCreateForeignKeyConfigurations );
-      }
-    }
-
-    // If a DataGridCollectionViewBase is used, get the ItemProperties it defines to be able to retreive DataGridForeignKeyDescription for each of them
-    // to get the auto-detected ForeignKey ItemsSource (if any).
-    // If a DataGridCollectionViewBase is not used, the ItemsSource must be manually specified on each Column in order to correctly display/edit the Data
-    internal static void UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-      ObservableColumnCollection columns,
-      DataGridItemPropertyCollection itemProperties,
-      bool autoCreateForeignKeyConfigurations )
-    {
-      if( itemProperties == null )
-        return;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        var description = itemProperty.ForeignKeyDescription;
-        if( description != null )
-        {
-          var columnName = PropertyRouteParser.Parse( itemProperty );
-          var column = ( columnName != null ) ? columns[ columnName ] as Column : null;
-
-          if( column != null )
-          {
-            ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription( column, description, autoCreateForeignKeyConfigurations );
-          }
-        }
-
-        if( itemProperty.ItemPropertiesInternal != null )
-        {
-          ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-            columns,
-            itemProperty.ItemPropertiesInternal,
-            autoCreateForeignKeyConfigurations );
-        }
-      }
-    }
-
-    private static void UpdateColumnsForeignKeyConfigurationsFromPropertyDescriptions(
-      ObservableColumnCollection columns,
-      PropertyDescriptionRouteDictionary propertyDescriptions,
-      bool autoCreateForeignKeyConfigurations )
-    {
-      if( ( columns == null ) || ( propertyDescriptions == null ) )
-        return;
-
-      foreach( var column in columns )
-      {
-        var targetColumn = column as Column;
-        if( targetColumn == null )
-          continue;
-
-        var key = PropertyRouteParser.Parse( targetColumn.FieldName );
-        if( key == null )
-          continue;
-
-        var propertyDescription = propertyDescriptions[ key ];
-        if( propertyDescription == null )
-          continue;
-
-        var foreignKeyDescription = propertyDescription.Current.ForeignKeyDescription;
-        if( foreignKeyDescription == null )
-          continue;
-
-        ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription( targetColumn, foreignKeyDescription, autoCreateForeignKeyConfigurations );
-      }
-    }
-
-    internal static void SynchronizeForeignKeyConfigurationFromForeignKeyDescription(
-      Column column,
-      DataGridForeignKeyDescription description,
-      bool autoCreateForeignKeyConfigurations )
-    {
-      if( ( description == null ) || ( column == null ) )
-        return;
-
-      var configuration = column.ForeignKeyConfiguration;
-      if( configuration == null )
-      {
-        if( !autoCreateForeignKeyConfigurations )
-          return;
-
-        configuration = new ForeignKeyConfiguration();
-        configuration.IsAutoCreated = true;
-        column.ForeignKeyConfiguration = configuration;
-      }
-
-      // ValuePath will be affected to the FieldName when the configuration is auto-created to be able to modify local source using foreign key value
-      if( configuration.IsAutoCreated )
-      {
-        if( string.IsNullOrEmpty( configuration.ValuePath ) )
-        {
-          configuration.ValuePath = description.ValuePath;
-        }
-
-        if( string.IsNullOrEmpty( configuration.DisplayMemberPath ) )
-        {
-          configuration.DisplayMemberPath = description.DisplayMemberPath;
-        }
-      }
-
-      // Affect the ItemsSource on the configuration if it is not already set
-      if( ( configuration.ItemsSource == null ) && ( description.ItemsSource != null ) )
-      {
-        configuration.ItemsSource = description.ItemsSource;
-      }
-
-      // Set the Converter if it was not locally set
-      if( configuration.ForeignKeyConverter == null )
-      {
-        configuration.ForeignKeyConverter = description.ForeignKeyConverter;
-      }
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( ( managerType == typeof( CollectionChangedEventManager ) ) || ( managerType == typeof( ListChangedEventManager ) ) )
-      {
-        this.OnNotifiyCollectionChanged();
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigurationChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigurationChangedEventManager.cs
deleted file mode 100644
index 10db6557..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfigurationChangedEventManager.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ForeignKeyConfigurationChangedEventManager : WeakEventManager
-  {
-    private ForeignKeyConfigurationChangedEventManager()
-    {
-    }
-
-    public static void AddListener( Column source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( Column source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      Column column = ( Column )source;
-      column.ForeignKeyConfigurationChanged += new EventHandler( this.OnForeignKeyConfigurationChangedChanged );
-    }
-
-    protected override void StopListening( object source )
-    {
-      Column column = ( Column )source;
-      column.ForeignKeyConfigurationChanged -= new EventHandler( this.OnForeignKeyConfigurationChangedChanged );
-    }
-
-    private static ForeignKeyConfigurationChangedEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( ForeignKeyConfigurationChangedEventManager );
-        ForeignKeyConfigurationChangedEventManager currentManager = ( ForeignKeyConfigurationChangedEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new ForeignKeyConfigurationChangedEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnForeignKeyConfigurationChangedChanged( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyContentControl.cs
deleted file mode 100644
index 54bfb21b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyContentControl.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ForeignKeyContentControl : ContentControl
-  {
-    private static readonly Binding BindingToValue;
-
-    static ForeignKeyContentControl()
-    {
-      ForeignKeyContentControl.BindingToValue = new Binding();
-      ForeignKeyContentControl.BindingToValue.Mode = BindingMode.OneWay;
-      ForeignKeyContentControl.BindingToValue.Path = new PropertyPath( ForeignKeyContentControl.ValueProperty );
-      ForeignKeyContentControl.BindingToValue.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      ForeignKeyContentControl.FocusableProperty.OverrideMetadata( typeof( ForeignKeyContentControl ), new FrameworkPropertyMetadata( false ) );
-    }
-
-    public ForeignKeyContentControl()
-    {
-      // Bind ContentProperty to the Value property.
-      this.SetBinding( ForeignKeyContentControl.ContentProperty, ForeignKeyContentControl.BindingToValue );
-
-      // Ensure this control is not Focusable, it only displays converted value between
-      // ID and ForeignKey
-      this.Focusable = false;
-    }
-
-    #region ForeignKeyConfiguration Property
-
-    public static readonly DependencyProperty ForeignKeyConfigurationProperty = DependencyProperty.Register(
-      "ForeignKeyConfiguration",
-      typeof( ForeignKeyConfiguration ),
-      typeof( ForeignKeyContentControl ),
-      new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( ForeignKeyContentControl.OnForeignKeyConfigurationChanged ) ) );
-
-    public ForeignKeyConfiguration ForeignKeyConfiguration
-    {
-      get
-      {
-        return ( ForeignKeyConfiguration )this.GetValue( ForeignKeyContentControl.ForeignKeyConfigurationProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyContentControl.ForeignKeyConfigurationProperty, value );
-      }
-    }
-
-    private static void OnForeignKeyConfigurationChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ForeignKeyContentControl contentControl = sender as ForeignKeyContentControl;
-
-      if( contentControl != null )
-      {
-        contentControl.NotifyKeyChanged();
-      }
-    }
-
-    #endregion
-
-    #region Key Property
-
-    public static readonly DependencyProperty KeyProperty = DependencyProperty.Register(
-      "Key",
-      typeof( object ),
-      typeof( ForeignKeyContentControl ),
-      new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( ForeignKeyContentControl.OnKeyChanged ) ) );
-
-    public object Key
-    {
-      get
-      {
-        return ( object )this.GetValue( ForeignKeyContentControl.KeyProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyContentControl.KeyProperty, value );
-      }
-    }
-
-    private static void OnKeyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ForeignKeyContentControl contentControl = o as ForeignKeyContentControl;
-
-      if( contentControl != null )
-      {
-        contentControl.NotifyKeyChanged();
-      }
-    }
-
-    #endregion
-
-    #region Value Property
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-      "Value",
-      typeof( object ),
-      typeof( ForeignKeyContentControl ),
-      new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( OnValueChanged ) ) );
-
-    public object Value
-    {
-      get
-      {
-        return ( object )this.GetValue( ForeignKeyContentControl.ValueProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyContentControl.ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ForeignKeyContentControl contentControl = o as ForeignKeyContentControl;
-
-      if( contentControl != null )
-      {
-        contentControl.NotifyValueChanged();
-      }
-    }
-
-    #endregion
-
-    protected void NotifyKeyChanged()
-    {
-      if( m_isBeingModified )
-        return;
-
-      try
-      {
-        m_isBeingModified = true;
-
-        this.OnKeyChanged();
-      }
-      finally
-      {
-        m_isBeingModified = false;
-      }
-    }
-
-    protected void NotifyValueChanged()
-    {
-      if( m_isBeingModified )
-        return;
-
-      try
-      {
-        m_isBeingModified = true;
-
-        this.OnValueChanged();
-      }
-      finally
-      {
-        m_isBeingModified = false;
-      }
-    }
-
-    private void OnKeyChanged()
-    {
-      ForeignKeyConfiguration configuration = this.ForeignKeyConfiguration;
-
-      if( ( configuration != null ) && ( configuration.ForeignKeyConverter != null ) )
-      {
-        this.Value = configuration.ForeignKeyConverter.GetValueFromKey( this.Key, configuration );
-      }
-      else
-      {
-        this.Value = this.Key;
-      }
-    }
-
-    private void OnValueChanged()
-    {
-      ForeignKeyConfiguration configuration = this.ForeignKeyConfiguration;
-
-      if( ( configuration != null ) && ( configuration.ForeignKeyConverter != null ) )
-      {
-        this.Key = configuration.ForeignKeyConverter.GetKeyFromValue( this.Value, configuration );
-      }
-      else
-      {
-        this.Key = this.Value;
-      }
-    }
-
-    private bool m_isBeingModified; // = false;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs
deleted file mode 100644
index aea26416..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public abstract class ForeignKeyConverter
-  {
-    public ForeignKeyConverter()
-    {
-    }
-
-    public virtual object GetValueFromKey( object key, ForeignKeyConfiguration configuration )
-    {
-      return key;
-    }
-
-    public virtual object GetKeyFromValue( object value, ForeignKeyConfiguration configuration )
-    {
-      return value;
-    }
-
-    public virtual object GetValueFromKey( object key, DataGridForeignKeyDescription description )
-    {
-      return key;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyDistinctValueItemContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyDistinctValueItemContentControl.cs
deleted file mode 100644
index a0e5eca2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyDistinctValueItemContentControl.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class ForeignKeyDistinctValueItemContentControl : ForeignKeyContentControl
-  {
-    #region Static Fields
-
-    private static Binding ParentAutoFilterControlBinding;
-
-    #endregion
-
-    #region Constructors
-
-    static ForeignKeyDistinctValueItemContentControl()
-    {
-      ForeignKeyDistinctValueItemContentControl.ParentAutoFilterControlBinding = new Binding();
-      ForeignKeyDistinctValueItemContentControl.ParentAutoFilterControlBinding.Mode = BindingMode.OneWay;
-    }
-
-    public ForeignKeyDistinctValueItemContentControl()
-    {
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    #endregion
-
-    #region DefaultCellContentTemplateBinding Private Static Property
-
-    private static Binding DefaultCellContentTemplateBinding
-    {
-      get
-      {
-        if( ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache == null )
-        {
-          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache = new Binding();
-          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache.Mode = BindingMode.OneWay;
-          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache.Path = 
-            new PropertyPath( "(0).(1).(2)", 
-              Cell.ParentCellProperty, 
-              Cell.ParentColumnProperty, 
-              ColumnBase.CellContentTemplateProperty );
-        }
-
-        return ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateBindingCache;
-      }
-    }
-
-    private static Binding DefaultCellContentTemplateBindingCache; // = null;
-
-    #endregion
-
-    #region DefaultCellContentTemplateSelectorBinding Private Static Property
-
-    private static Binding DefaultCellContentTemplateSelectorBinding
-    {
-      get
-      {
-        if( ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache == null )
-        {
-          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache = new Binding();
-          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache.Mode = BindingMode.OneWay;
-          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-          ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache.Path =
-            new PropertyPath( "(0).(1).(2)",
-              Cell.ParentCellProperty,
-              Cell.ParentColumnProperty,
-              ColumnBase.CellContentTemplateSelectorProperty );
-        }
-
-        return ForeignKeyDistinctValueItemContentControl.DefaultCellContentTemplateSelectorBindingCache;
-      }
-    }
-
-    private static Binding DefaultCellContentTemplateSelectorBindingCache;
-
-    #endregion
-
-    #region DistinctValueItemTemplateBinding Private Static Property
-
-    private static Binding DistinctValueItemTemplateBinding
-    {
-      get
-      {
-        if( ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache == null )
-        {
-          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache = new Binding();
-          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache.Mode = BindingMode.OneWay;
-
-
-          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache.Path =
-            new PropertyPath( "DistinctValueItemTemplate" );
-        }
-
-        return ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateBindingCache;
-      }
-    }
-
-    private static Binding DistinctValueItemTemplateBindingCache; // = null;
-
-    #endregion
-
-    #region DefaultCellContentTemplateSelectorBinding Private Static Property
-
-    private static Binding DistinctValueItemTemplateSelectorBinding
-    {
-      get
-      {
-        if( ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache == null )
-        {
-          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache = new Binding();
-          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache.Mode = BindingMode.OneWay;
-
-
-          ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache.Path =
-            new PropertyPath( "DistinctValueItemTemplateSelector" );
-        }
-
-        return ForeignKeyDistinctValueItemContentControl.DistinctValueItemTemplateSelectorBindingCache;
-      }
-    }
-
-    private static Binding DistinctValueItemTemplateSelectorBindingCache;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyGroupContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyGroupContentControl.cs
deleted file mode 100644
index 6daa204f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyGroupContentControl.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ForeignKeyGroupContentControl : ContentControl
-  {
-    #region Contructors
-
-    static ForeignKeyGroupContentControl()
-    {
-      ForeignKeyGroupContentControl.GroupProperty = GroupHeaderControl.GroupProperty.AddOwner( typeof( ForeignKeyGroupContentControl ), new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( ForeignKeyGroupContentControl.OnGroupChanged ),
-        new CoerceValueCallback( ForeignKeyGroupContentControl.OnCoerceGroupChanged ) ) );
-    }
-
-    public ForeignKeyGroupContentControl()
-    {
-      // Ensure this control is not Focusable, it only displays converted value between
-      // ID and ForeignKey
-      this.Focusable = false;
-    }
-
-    #endregion
-
-    #region Group Internal Property
-
-    internal static readonly DependencyProperty GroupProperty;
-
-    internal Group Group
-    {
-      get
-      {
-        return GroupHeaderControl.GetGroup( this );
-      }
-    }
-
-    private static object OnCoerceGroupChanged( DependencyObject o, object newValue )
-    {
-      ForeignKeyGroupContentControl contentControl = o as ForeignKeyGroupContentControl;
-
-      if( contentControl != null )
-      {
-        Group currentGroup = contentControl.Group;
-        Group newGroup = newValue as Group;
-        bool clearContentTemplate = false;
-
-        if( ( currentGroup != null ) && ( newGroup != null ) )
-        {
-          if( ( currentGroup.Level == -1 ) || ( newGroup.Level == -1 ) )
-          {
-            clearContentTemplate = true;
-          }
-          // The Group is different, must clear the templates
-          else if( currentGroup.GroupBy != newGroup.GroupBy )
-          {
-            clearContentTemplate = true;
-          }
-        }
-        else
-        {
-          // The Group is null or different, must clear the templates
-          clearContentTemplate = true;
-        }
-
-        if( clearContentTemplate )
-        {
-          contentControl.ClearValue( ContentControl.ContentTemplateProperty );
-          contentControl.ClearValue( ContentControl.ContentTemplateSelectorProperty );
-        }
-      }
-
-      return newValue;
-    }
-
-    private static void OnGroupChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ForeignKeyGroupContentControl contentControl = sender as ForeignKeyGroupContentControl;
-
-      if( contentControl != null )
-      {
-        contentControl.UpdateContent( e.NewValue as Group );
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateContent( Group group )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      if( group == null )
-        return;
-
-      string groupBy = group.GroupBy;
-
-      if( string.IsNullOrEmpty( groupBy ) )
-        throw new DataGridInternalException( "Group.GroupBy is null." );
-
-      Column column = dataGridContext.Columns[ groupBy ] as Column;
-
-      object newContent = group.Value;
-
-      if( column != null )
-      {
-        ForeignKeyConfiguration foreignKeyConfiguration = column.ForeignKeyConfiguration;
-
-        if( foreignKeyConfiguration != null )
-        {
-          // Ensure to set the Content converted according to the DataContext
-          // when a converter is present. Else, the DataContext will be displayed
-          if( foreignKeyConfiguration.ForeignKeyConverter != null )
-          {
-            newContent = foreignKeyConfiguration.ForeignKeyConverter.GetValueFromKey(
-                                                                        group.Value,
-                                                                        foreignKeyConfiguration );
-          }
-        }
-      }
-
-      // We must update the template according
-      // to values present on Column
-      this.UpdateContentTemplate( column, group );
-
-      this.Content = newContent;
-    }
-
-    private void UpdateContentTemplate( Column column, Group group )
-    {
-      if( column == null )
-        return;
-
-      bool contentTemplateAffected = false;
-      bool contentTemplateSelectorAffected = false;
-
-      if( column.GroupValueTemplate != null )
-      {
-        this.ContentTemplate = column.GroupValueTemplate;
-        contentTemplateAffected = true;
-      }
-      else if( column.GroupValueTemplateSelector != null )
-      {
-        this.ContentTemplateSelector = column.GroupValueTemplateSelector;
-        contentTemplateSelectorAffected = true;
-      }
-
-      if( !contentTemplateAffected && !contentTemplateSelectorAffected )
-      {
-        ForeignKeyConfiguration foreignKeyConfiguration = column.ForeignKeyConfiguration;
-        if( foreignKeyConfiguration != null )
-        {
-          if( column.CellContentTemplate != null )
-          {
-            this.ContentTemplate = column.CellContentTemplate;
-            contentTemplateAffected = true;
-          }
-          else if( column.CellContentTemplateSelector != null )
-          {
-            this.ContentTemplateSelector = column.CellContentTemplateSelector;
-            contentTemplateSelectorAffected = true;
-          }
-        }
-      }
-
-      if( !contentTemplateAffected )
-      {
-        this.ClearValue( ContentPresenter.ContentTemplateProperty );
-      }
-
-      if( !contentTemplateSelectorAffected )
-      {
-        this.ClearValue( ContentPresenter.ContentTemplateSelectorProperty );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs
deleted file mode 100644
index 0e9589eb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Data;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ForeignKeyScrollTipContentControl : ForeignKeyContentControl
-  {
-    #region Static Fields
-
-    private static Binding MainColumnBinding; // = null;
-
-    #endregion
-
-    #region Constructors
-
-    static ForeignKeyScrollTipContentControl()
-    {
-      ForeignKeyScrollTipContentControl.MainColumnBinding = new Binding();
-      ForeignKeyScrollTipContentControl.MainColumnBinding.Mode = BindingMode.OneWay;
-      ForeignKeyScrollTipContentControl.MainColumnBinding.RelativeSource = new RelativeSource( RelativeSourceMode.FindAncestor, typeof( ScrollTip ), 1 );
-      ForeignKeyScrollTipContentControl.MainColumnBinding.Path = new PropertyPath( "(0).Columns.MainColumn", DataGridControl.DataGridContextProperty );
-    }
-
-    public ForeignKeyScrollTipContentControl()
-    {
-      BindingOperations.SetBinding(
-        this,
-        ForeignKeyScrollTipContentControl.MainColumnProperty,
-        ForeignKeyScrollTipContentControl.MainColumnBinding );
-
-      // Ensure this control is not Focusable, it only displays converted value between
-      // ID and ForeignKey
-      this.Focusable = false;
-    }
-
-    #endregion
-
-    #region MainColumn Property
-
-    public static readonly DependencyProperty MainColumnProperty = DependencyProperty.Register(
-      "MainColumn",
-      typeof( ColumnBase ),
-      typeof( ForeignKeyScrollTipContentControl ),
-      new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( ForeignKeyScrollTipContentControl.OnMainColumnChanged ) ) );
-
-    public ColumnBase MainColumn
-    {
-      get
-      {
-        return ( ColumnBase )this.GetValue( ForeignKeyScrollTipContentControl.MainColumnProperty );
-      }
-      set
-      {
-        this.SetValue( ForeignKeyScrollTipContentControl.MainColumnProperty, value );
-      }
-    }
-
-    private static void OnMainColumnChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ForeignKeyScrollTipContentControl contentControl = sender as ForeignKeyScrollTipContentControl;
-
-      if( contentControl != null )
-      {
-        // Reset ContentTemplate/Selector when the MainColum changes
-        // since it is set locally
-        contentControl.ContentTemplate = null;
-        contentControl.ContentTemplateSelector = null;
-
-        contentControl.UpdateKeyBinding();
-        contentControl.UpdateContentTemplate();
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateContentTemplate()
-    {
-      Column mainColumn = this.MainColumn as Column;
-
-      if( mainColumn == null )
-        return;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      UIViewBase uiViewBase = null;
-
-      if( dataGridContext != null )
-      {
-        DataGridControl dataGridControl = dataGridContext.DataGridControl;
-
-        if( dataGridControl != null )
-        {
-          uiViewBase = dataGridControl.GetView() as UIViewBase;
-        }
-      }
-
-      if( uiViewBase != null )
-      {
-        if( uiViewBase.ScrollTipContentTemplate != null )
-        {
-          this.ContentTemplate = uiViewBase.ScrollTipContentTemplate;
-        }
-        else
-        {
-          this.ContentTemplateSelector = uiViewBase.ScrollTipContentTemplateSelector;
-        }
-      }
-
-      if( ( this.ContentTemplate == null ) && ( this.ContentTemplateSelector == null ) )
-      {
-        if( mainColumn.CellContentTemplate != null )
-        {
-          this.ContentTemplate = mainColumn.CellContentTemplate;
-        }
-        else
-        {
-          this.ContentTemplateSelector = mainColumn.CellContentTemplateSelector;
-        }
-      }
-    }
-
-    private void UpdateKeyBinding()
-    {
-      Column mainColumn = this.MainColumn as Column;
-
-      if( mainColumn == null )
-        return;
-
-      // Disable warning for DisplayMemberBinding when internaly used
-#pragma warning disable 618
-      BindingBase displayMemberBinding = mainColumn.DisplayMemberBinding;
-
-      if( displayMemberBinding != null )
-      {
-        // Set the DisplayMemberBinding to the KeyProperty
-        this.SetBinding( ForeignKeyScrollTipContentControl.KeyProperty, displayMemberBinding );
-      }
-#pragma warning restore 618
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CollectionGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CollectionGeneratorNode.cs
deleted file mode 100644
index c71f366b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CollectionGeneratorNode.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CollectionGeneratorNode : NotifyCollectionChangedGeneratorNode
-  {
-    protected CollectionGeneratorNode( IList list, GeneratorNode parent )
-      : base( parent )
-    {
-      Debug.Assert( list != null, "list cannot be null for CollectionGeneratorNode" );
-
-      m_items = list;
-    }
-
-    public IList Items
-    {
-      get
-      {
-        return m_items;
-      }
-    }
-
-    public virtual int IndexOf( object item )
-    {
-      return m_items.IndexOf( item );
-    }
-
-    public virtual object GetAt( int index )
-    {
-      return m_items[ index ];
-    }
-
-    private readonly IList m_items;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEvent.cs
deleted file mode 100644
index bdf27017..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEvent.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal delegate void ContainersRemovedEventHandler( object sender, ContainersRemovedEventArgs e );
-
-  internal class ContainersRemovedEventArgs : EventArgs
-  {
-    public ContainersRemovedEventArgs( IList<DependencyObject> removedContainers )
-    {
-      if( removedContainers == null )
-        throw new ArgumentNullException( "removedContainers" );
-
-      m_removedContainers = removedContainers;
-    }
-
-    public IList<DependencyObject> RemovedContainers
-    {
-      get
-      {
-        return m_removedContainers;
-      }
-    }
-
-    private IList<DependencyObject> m_removedContainers;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEvent.cs
deleted file mode 100644
index 9016ccfc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEvent.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal delegate void CustomGeneratorChangedEventHandler( object sender, CustomGeneratorChangedEventArgs e );
-
-  internal sealed class CustomGeneratorChangedEventArgs : EventArgs
-  {
-    private CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction action, int count, IList<DependencyObject> containers )
-    {
-      m_action = action;
-      m_count = count;
-      m_containers = containers;
-    }
-
-    internal NotifyCollectionChangedAction Action
-    {
-      get
-      {
-        return m_action;
-      }
-    }
-
-    internal int Count
-    {
-      get
-      {
-        return m_count;
-      }
-    }
-
-    internal IList<DependencyObject> Containers
-    {
-      get
-      {
-        return m_containers;
-      }
-    }
-
-    internal static CustomGeneratorChangedEventArgs Add( int count )
-    {
-      return new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Add, count, null );
-    }
-
-    internal static CustomGeneratorChangedEventArgs Remove( int count, IList<DependencyObject> containers )
-    {
-      return new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Remove, count, containers );
-    }
-
-    internal static CustomGeneratorChangedEventArgs Reset()
-    {
-      return new CustomGeneratorChangedEventArgs( NotifyCollectionChangedAction.Reset, 0, null );
-    }
-
-    private readonly NotifyCollectionChangedAction m_action;
-    private readonly int m_count;
-    private readonly IList<DependencyObject> m_containers;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.Trace.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.Trace.cs
deleted file mode 100644
index 81cbe351..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.Trace.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using Xceed.Wpf.DataGrid.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  partial class CustomItemContainerGenerator
-  {
-    private IDisposable TraceBlock( DataGridTraceEventId eventId )
-    {
-      return this.TraceBlock( eventId, ( string )null, null );
-    }
-
-    private IDisposable TraceBlock( DataGridTraceEventId eventId, params DataGridTraceArg[] args )
-    {
-      return this.TraceBlock( eventId, null, args );
-    }
-
-    private IDisposable TraceBlock( DataGridTraceEventId eventId, string message, params DataGridTraceArg[] args )
-    {
-      var traceSource = DataGridControlTraceSources.ItemContainerGeneratorSource;
-      if( !traceSource.ShouldTraceBlock() )
-        return traceSource.NoTrace;
-
-      return traceSource.TraceBlock( eventId, message, this.GetTraceArgs( args ).ToList() );
-    }
-
-    [Conditional( "TRACE" )]
-    private void TraceEvent( TraceEventType eventType, DataGridTraceEventId eventId )
-    {
-      this.TraceEvent( eventType, eventId, ( string )null, null );
-    }
-
-    [Conditional( "TRACE" )]
-    private void TraceEvent( TraceEventType eventType, DataGridTraceEventId eventId, params DataGridTraceArg[] args )
-    {
-      this.TraceEvent( eventType, eventId, null, args );
-    }
-
-    [Conditional( "TRACE" )]
-    private void TraceEvent( TraceEventType eventType, DataGridTraceEventId eventId, string message, params DataGridTraceArg[] args )
-    {
-      var traceSource = DataGridControlTraceSources.ItemContainerGeneratorSource;
-      if( !traceSource.ShouldTrace( eventType ) )
-        return;
-
-      traceSource.TraceEvent( eventType, eventId, message, this.GetTraceArgs( args ).ToList() );
-    }
-
-    private IEnumerable<DataGridTraceArg> GetTraceArgs( DataGridTraceArg[] args )
-    {
-      if( ( args != null ) && ( args.Length > 0 ) )
-      {
-        foreach( var arg in args )
-        {
-          yield return arg;
-        }
-      }
-
-      yield return DataGridTraceArgs.Generator( this );
-      yield return DataGridTraceArgs.DataGridControl( m_dataGridControl );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs
deleted file mode 100644
index eccc13cb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs
+++ /dev/null
@@ -1,7589 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using Xceed.Utils.Collections;
-using Xceed.Wpf.DataGrid.Diagnostics;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal partial class CustomItemContainerGenerator
-    : IInhibitGenPosToIndexUpdating,
-    ICustomItemContainerGenerator,
-    IWeakEventListener,
-    INotifyPropertyChanged,
-    IDataGridContextVisitable
-  {
-    internal static CustomItemContainerGenerator CreateGenerator( DataGridControl dataGridControl, CollectionView collectionView, DataGridContext dataGridContext )
-    {
-      if( dataGridControl == null )
-        throw new ArgumentNullException( "dataGridControl" );
-
-      if( collectionView == null )
-        throw DataGridException.Create<ArgumentNullException>( "collectionView", dataGridControl );
-
-      if( dataGridContext == null )
-        throw DataGridException.Create<ArgumentNullException>( "dataGridContext", dataGridControl );
-
-      var recyclingPools = new CustomItemContainerGeneratorRecyclingPools();
-      var ensureNodeTreeCreatedRequiredFlag = new BubbleDirtyFlag( true );
-      var handleGlobalItemsResetFlag = new InheritAutoResetFlag();
-      var deferDetailsRemapFlag = new LeveledAutoResetFlag();
-      var generator = new CustomItemContainerGenerator( dataGridControl, collectionView, dataGridContext, recyclingPools, ensureNodeTreeCreatedRequiredFlag, handleGlobalItemsResetFlag, deferDetailsRemapFlag );
-
-      dataGridContext.SetGenerator( generator );
-
-      return generator;
-    }
-
-    private static CustomItemContainerGenerator CreateGenerator( DataGridControl dataGridControl, CollectionView collectionView, DataGridContext dataGridContext, CustomItemContainerGenerator masterGenerator )
-    {
-      if( dataGridControl == null )
-        throw new ArgumentNullException( "dataGridControl" );
-
-      if( collectionView == null )
-        throw DataGridException.Create<ArgumentNullException>( "collectionView", dataGridControl );
-
-      if( dataGridContext == null )
-        throw DataGridException.Create<ArgumentNullException>( "dataGridContext", dataGridControl );
-
-      if( masterGenerator == null )
-        throw DataGridException.Create<ArgumentNullException>( "masterGenerator", dataGridControl );
-
-      var recyclingPools = masterGenerator.m_recyclingPools;
-      var ensureNodeTreeCreatedRequiredFlag = new BubbleDirtyFlag( masterGenerator.m_ensureNodeTreeCreatedRequired, true );
-      var handleGlobalItemsResetFlag = new InheritAutoResetFlag( masterGenerator.m_handleGlobalItemsReset );
-      var deferDetailsRemapFlag = masterGenerator.m_deferDetailsRemap.GetChild();
-      var generator = new CustomItemContainerGenerator( dataGridControl, collectionView, dataGridContext, recyclingPools, ensureNodeTreeCreatedRequiredFlag, handleGlobalItemsResetFlag, deferDetailsRemapFlag );
-
-      dataGridContext.SetGenerator( generator );
-
-      return generator;
-    }
-
-    private CustomItemContainerGenerator(
-      DataGridControl dataGridControl,
-      CollectionView collectionView,
-      DataGridContext dataGridContext,
-      CustomItemContainerGeneratorRecyclingPools recyclingPools,
-      BubbleDirtyFlag ensureNodeTreeCreatedRequiredFlag,
-      InheritAutoResetFlag handleGlobalItemResetFlag,
-      LeveledAutoResetFlag deferDetailsRemapFlag )
-    {
-      Debug.Assert( dataGridControl != null );
-      Debug.Assert( collectionView != null );
-      Debug.Assert( dataGridContext != null );
-      Debug.Assert( recyclingPools != null );
-      Debug.Assert( ensureNodeTreeCreatedRequiredFlag != null );
-      Debug.Assert( handleGlobalItemResetFlag != null );
-      Debug.Assert( deferDetailsRemapFlag != null );
-
-      m_dataGridControl = dataGridControl;
-      m_dataGridContext = dataGridContext;
-      m_collectionView = collectionView;
-      m_recyclingPools = recyclingPools;
-      m_ensureNodeTreeCreatedRequired = ensureNodeTreeCreatedRequiredFlag;
-      m_handleGlobalItemsReset = handleGlobalItemResetFlag;
-      m_deferDetailsRemap = deferDetailsRemapFlag;
-
-      //initialize explicitly (set a local value) to the DataItem attached property (for nested DataGridControls)
-      CustomItemContainerGenerator.SetDataItemProperty( m_dataGridControl, EmptyDataItemDataProvider.Instance );
-
-      this.RegisterEvents();
-
-      m_nodeFactory = new GeneratorNodeFactory( this.OnGeneratorNodeItemsCollectionChanged,
-                                                this.OnGeneratorNodeGroupsCollectionChanged,
-                                                this.OnGeneratorNodeHeadersFootersCollectionChanged,
-                                                this.OnGeneratorNodeExpansionStateChanged,
-                                                this.OnGroupGeneratorNodeIsExpandedChanging,
-                                                this.OnGroupGeneratorNodeIsExpandedChanged,
-                                                dataGridControl );
-
-      m_headerFooterDataContextBinding = new Binding();
-      m_headerFooterDataContextBinding.Source = m_dataGridControl;
-      m_headerFooterDataContextBinding.Path = new PropertyPath( DataGridControl.DataContextProperty );
-
-      this.ResetNodeList();
-
-      this.IncrementCurrentGenerationCount();
-    }
-
-    #region CurrentGeneratorContentGeneration Internal Property
-
-    internal int CurrentGeneratorContentGeneration
-    {
-      get
-      {
-        return m_currentGeneratorContentGeneration;
-      }
-    }
-
-    private int m_currentGeneratorContentGeneration; //0
-
-    #endregion
-
-    #region DataItemProperty Attached Internal Property
-
-    internal static readonly DependencyProperty DataItemPropertyProperty = DependencyProperty.RegisterAttached(
-      "DataItemProperty",
-      typeof( DataItemDataProviderBase ),
-      typeof( CustomItemContainerGenerator ),
-      new FrameworkPropertyMetadata( EmptyDataItemDataProvider.Instance, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    internal static DataItemDataProviderBase GetDataItemProperty( DependencyObject obj )
-    {
-      return ( DataItemDataProviderBase )obj.GetValue( CustomItemContainerGenerator.DataItemPropertyProperty );
-    }
-
-    private static void SetDataItemProperty( DependencyObject obj, DataItemDataProviderBase value )
-    {
-      obj.SetValue( CustomItemContainerGenerator.DataItemPropertyProperty, value );
-    }
-
-    #endregion
-
-    #region IsInUse Internal Property
-
-    internal bool IsInUse
-    {
-      get
-      {
-        return m_flags[ ( int )CustomItemContainerGeneratorFlags.InUse ];
-      }
-      private set
-      {
-        m_flags[ ( int )CustomItemContainerGeneratorFlags.InUse ] = value;
-      }
-    }
-
-    internal void InvalidateIsInUse()
-    {
-      this.IsInUse = false;
-    }
-
-    internal void SetIsInUse()
-    {
-      this.IsInUse = true;
-    }
-
-    #endregion
-
-    #region ForceReset Internal Property
-
-    internal bool ForceReset
-    {
-      get
-      {
-        return m_flags[ ( int )CustomItemContainerGeneratorFlags.ForceReset ];
-      }
-      set
-      {
-        m_flags[ ( int )CustomItemContainerGeneratorFlags.ForceReset ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Header Property
-
-    public HeadersFootersGeneratorNode Header
-    {
-      get
-      {
-        return m_firstHeader;
-      }
-    }
-
-    private HeadersFootersGeneratorNode m_firstHeader;
-
-    #endregion
-
-    #region Footer Property
-
-    public HeadersFootersGeneratorNode Footer
-    {
-      get
-      {
-        return m_firstFooter;
-      }
-    }
-
-    private HeadersFootersGeneratorNode m_firstFooter;
-
-    #endregion
-
-    #region RealizedContainers Property
-
-    public ReadOnlyCollection<DependencyObject> RealizedContainers
-    {
-      get
-      {
-        return new ReadOnlyCollection<DependencyObject>( m_genPosToContainer );
-      }
-    }
-
-    #endregion
-
-    #region RealizedItems Property
-
-    public ReadOnlyCollection<object> RealizedItems
-    {
-      get
-      {
-        return new ReadOnlyCollection<object>( m_genPosToItem );
-      }
-    }
-
-    #endregion
-
-    #region Status Property
-
-    public GeneratorStatus Status
-    {
-      get
-      {
-        return m_generatorStatus;
-      }
-    }
-
-    private GeneratorStatus m_generatorStatus = GeneratorStatus.NotStarted;
-
-    #endregion
-
-    #region NodeFactory Private Property
-
-    private GeneratorNodeFactory NodeFactory
-    {
-      get
-      {
-        return m_nodeFactory;
-      }
-    }
-
-    private readonly GeneratorNodeFactory m_nodeFactory;
-
-    #endregion
-
-    #region IsDetailsRemapDeferred Private Property
-
-    private bool IsDetailsRemapDeferred
-    {
-      get
-      {
-        return m_deferDetailsRemap.IsSet;
-      }
-    }
-
-    private IDisposable DeferDetailsRemap()
-    {
-      return m_deferDetailsRemap.Set();
-    }
-
-    private readonly LeveledAutoResetFlag m_deferDetailsRemap;
-
-    #endregion
-
-    #region IsEnsuringNodeTreeCreated Private Property
-
-    private bool IsEnsuringNodeTreeCreated
-    {
-      get
-      {
-        return m_ensureNodeTreeCreated.IsSet;
-      }
-    }
-
-    private IDisposable SetIsEnsuringNodeTreeCreated()
-    {
-      m_ensureNodeTreeCreatedRequired.IsSet = false;
-
-      return m_ensureNodeTreeCreated.Set();
-    }
-
-    private readonly AutoResetFlag m_ensureNodeTreeCreated = AutoResetFlagFactory.Create();
-
-    #endregion
-
-    #region IsNodeTreeValid Private Property
-
-    private bool IsNodeTreeValid
-    {
-      get
-      {
-        return !m_ensureNodeTreeCreatedRequired.IsSet;
-      }
-    }
-
-    private void InvalidateNodeTree()
-    {
-      if( this.IsEnsuringNodeTreeCreated )
-        return;
-
-      m_ensureNodeTreeCreatedRequired.IsSet = true;
-    }
-
-    private readonly BubbleDirtyFlag m_ensureNodeTreeCreatedRequired;
-
-    #endregion
-
-    #region IsHandlingGlobalItemsReset Private Property
-
-    private bool IsHandlingGlobalItemsReset
-    {
-      get
-      {
-        return m_handleGlobalItemsReset.IsSet;
-      }
-    }
-
-    private bool IsHandlingGlobalItemsResetLocally
-    {
-      get
-      {
-        return m_handleGlobalItemsReset.IsSetLocal;
-      }
-    }
-
-    private IDisposable SetIsHandlingGlobalItemsResetLocally()
-    {
-      return m_handleGlobalItemsReset.SetLocal();
-    }
-
-    private readonly InheritAutoResetFlag m_handleGlobalItemsReset;
-
-    #endregion
-
-    #region IsItemsChangedInhibited Private Property
-
-    private bool IsItemsChangedInhibited
-    {
-      get
-      {
-        return m_isItemsChangedInhibited.IsSet;
-      }
-    }
-
-    private IDisposable InhibitItemsChanged()
-    {
-      return m_isItemsChangedInhibited.Set();
-    }
-
-    private readonly AutoResetFlag m_isItemsChangedInhibited = AutoResetFlagFactory.Create();
-
-    #endregion
-
-    #region DetailsChanged Event
-
-    public event EventHandler DetailsChanged;
-
-    #endregion
-
-    #region ItemsChanged Internal Event
-
-    internal event CustomGeneratorChangedEventHandler ItemsChanged;
-
-    private void SendRemoveEvent( int count, IList<DependencyObject> containers )
-    {
-      var handler = this.ItemsChanged;
-      if( ( handler == null ) || ( count <= 0 ) || this.IsItemsChangedInhibited )
-        return;
-
-      using( this.DeferDetailsRemap() )
-      {
-        handler.Invoke( this, CustomGeneratorChangedEventArgs.Remove( count, containers ) );
-      }
-    }
-
-    private void SendAddEvent( int count )
-    {
-      var handler = this.ItemsChanged;
-      if( ( handler == null ) || ( count <= 0 ) || this.IsItemsChangedInhibited )
-        return;
-
-      using( this.DeferDetailsRemap() )
-      {
-        handler.Invoke( this, CustomGeneratorChangedEventArgs.Add( count ) );
-      }
-    }
-
-    private void SendResetEvent()
-    {
-      var handler = this.ItemsChanged;
-      if( ( handler == null ) || this.IsItemsChangedInhibited )
-        return;
-
-      using( this.DeferDetailsRemap() )
-      {
-        handler.Invoke( this, CustomGeneratorChangedEventArgs.Reset() );
-      }
-    }
-
-    #endregion
-
-    #region ContainersRemoved Internal Event
-
-    internal event ContainersRemovedEventHandler ContainersRemoved;
-
-    private void OnContainersRemoved( IList<DependencyObject> containers )
-    {
-      var handler = this.ContainersRemoved;
-      if( ( handler == null ) || ( containers == null ) || ( containers.Count <= 0 ) )
-        return;
-
-      handler.Invoke( this, new ContainersRemovedEventArgs( containers ) );
-    }
-
-    #endregion
-
-    #region RecyclingCandidatesCleaned Internal Event
-
-    internal event RecyclingCandidatesCleanedEventHandler RecyclingCandidatesCleaned;
-
-    private void OnRecyclingCandidatesCleaned( object sender, RecyclingCandidatesCleanedEventArgs e )
-    {
-      if( !this.IsRecyclingEnabled )
-        return;
-
-      foreach( DependencyObject container in e.RecyclingCandidates )
-      {
-        this.ClearStatContext( container );
-      }
-
-      var handler = this.RecyclingCandidatesCleaned;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    public void ResetGeneratorContent()
-    {
-      this.CleanupGenerator();
-      this.EnsureNodeTreeCreated();
-    }
-
-    public DependencyObject ContainerFromIndex( int itemIndex )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceArgs.Index( itemIndex ) ) )
-      {
-        if( this.IsHandlingGlobalItemsReset )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Index( itemIndex ) );
-          return null;
-        }
-
-        this.EnsureNodeTreeCreated();
-
-        var index = m_genPosToIndex.IndexOf( itemIndex );
-        if( index >= 0 )
-        {
-          var container = m_genPosToContainer[ index ];
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Index( itemIndex ) );
-
-          var detailNode = m_genPosToNode[ index ] as DetailGeneratorNode;
-          if( detailNode == null )
-            return container;
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceMessages.ContainerIsInDetail, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Index( itemIndex ), DataGridTraceArgs.Node( detailNode ) );
-        }
-        else
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromIndex, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Index( itemIndex ) );
-        }
-
-        return null;
-      }
-    }
-
-    internal DependencyObject ContainerFromItem( object item )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromItem, DataGridTraceArgs.Item( item ) ) )
-      {
-        if( this.IsHandlingGlobalItemsReset )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromItem, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Item( item ) );
-          return null;
-        }
-
-        this.EnsureNodeTreeCreated();
-
-        var index = this.FindFirstGeneratedIndexForLocalItem( item );
-        if( index >= 0 )
-        {
-          var container = m_genPosToContainer[ index ];
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromItem, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Item( item ) );
-          return container;
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ContainerFromItem, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Item( item ) );
-        return null;
-      }
-    }
-
-    internal List<object> GetRealizedDataItemsForGroup( GroupGeneratorNode group )
-    {
-      var count = m_genPosToNode.Count;
-      var items = new List<object>( count );
-
-      for( int i = 0; i < count; i++ )
-      {
-        var node = m_genPosToNode[ i ] as ItemsGeneratorNode;
-        if( ( node != null ) && ( node.Parent == group ) )
-        {
-          items.Add( m_genPosToItem[ i ] );
-        }
-      }
-
-      return items;
-    }
-
-    internal List<object> GetRealizedDataItems()
-    {
-      var count = m_genPosToNode.Count;
-      var items = new List<object>( count );
-
-      for( int i = 0; i < count; i++ )
-      {
-        var node = m_genPosToNode[ i ] as ItemsGeneratorNode;
-        if( node != null )
-        {
-          items.Add( m_genPosToItem[ i ] );
-        }
-      }
-
-      return items;
-    }
-
-    internal object ItemFromContainer( DependencyObject container )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceArgs.Container( container ) ) )
-      {
-        if( this.IsHandlingGlobalItemsReset )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Container( container ) );
-          return null;
-        }
-
-        var dataItemStore = CustomItemContainerGenerator.GetDataItemProperty( container );
-        if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Container( container ) );
-          return null;
-        }
-
-        var dataItem = dataItemStore.Data;
-        var index = m_genPosToContainer.IndexOf( container );
-
-        if( index >= 0 )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ) );
-
-          var detailNode = m_genPosToNode[ index ] as DetailGeneratorNode;
-          if( detailNode != null )
-          {
-            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ContainerIsInDetail, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Node( detailNode ) );
-            return null;
-          }
-        }
-        else
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.Item( dataItem ) );
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromContainer, DataGridTraceMessages.ItemFound, DataGridTraceArgs.Item( dataItem ), DataGridTraceArgs.Container( container ) );
-        return dataItem;
-      }
-    }
-
-    public int IndexFromItem( object item )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceArgs.Item( item ) ) )
-      {
-        if( item == null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Item( item ) );
-          return -1;
-        }
-
-        this.EnsureNodeTreeCreated();
-
-        if( m_startNode == null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Item( item ) );
-          return -1;
-        }
-
-        var index = this.FindFirstGeneratedIndexForLocalItem( item );
-        if( index >= 0 )
-        {
-          var itemIndex = m_genPosToIndex[ index ];
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.IndexFound, DataGridTraceArgs.Index( itemIndex ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Item( item ) );
-          return itemIndex;
-        }
-        else
-        {
-          //Note: Under that specific case, I do not want to search through collapsed group nodes... Effectivelly, an item "below" a collapsed group node 
-          //      Have no index as per the "item to index" interface of the generator. 
-          var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-          var itemIndex = nodeHelper.FindItem( item );
-
-          if( itemIndex >= 0 )
-          {
-            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.IndexFound, DataGridTraceArgs.Index( itemIndex ), DataGridTraceArgs.Node( nodeHelper.CurrentNode ), DataGridTraceArgs.Item( item ) );
-            return itemIndex;
-          }
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IndexFromItem, DataGridTraceMessages.ItemNotFoundOrCollapsed, DataGridTraceArgs.Item( item ) );
-        return -1;
-      }
-    }
-
-    public object ItemFromIndex( int index )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ItemFromIndex, DataGridTraceArgs.Index( index ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_startNode == null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromIndex, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Index( index ) );
-          return null;
-        }
-
-        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        var item = nodeHelper.FindIndex( index );
-
-        if( item != null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromIndex, DataGridTraceMessages.ItemFound, DataGridTraceArgs.Item( item ), DataGridTraceArgs.Node( nodeHelper.CurrentNode ), DataGridTraceArgs.Index( index ) );
-        }
-        else
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ItemFromIndex, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Index( index ) );
-        }
-
-        return item;
-      }
-    }
-
-    internal bool IsGroupRealized( Group group )
-    {
-      var groupNode = ( group != null ) ? group.GeneratorNode : null;
-      if( groupNode == null )
-        return false;
-
-      foreach( var node in m_genPosToNode )
-      {
-        var parentNode = node;
-
-        // Find the first GroupGeneratorNode among its ancestors.
-        while( parentNode != null )
-        {
-          if( parentNode is GroupGeneratorNode )
-            break;
-
-          parentNode = parentNode.Parent;
-        }
-
-        // Find out if the GroupGeneratorNode found is the group or a
-        // child of the target group.
-        while( parentNode != null )
-        {
-          if( parentNode == groupNode )
-            return true;
-
-          // The current node cannot be a child of the target group if
-          // the parent node is not a group.
-          parentNode = parentNode.Parent as GroupGeneratorNode;
-        }
-      }
-
-      return false;
-    }
-
-    public int GetGroupIndex( Group group )
-    {
-      if( group == null )
-        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceArgs.Group( group ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_startNode == null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Group( group ) );
-          return -1;
-        }
-
-        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        if( nodeHelper.FindGroup( group.CollectionViewGroup ) )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Index( nodeHelper.Index ), DataGridTraceArgs.Node( nodeHelper.CurrentNode ), DataGridTraceArgs.Group( group ) );
-          return nodeHelper.Index;
-        }
-
-        foreach( var detailNode in this.GetDetailGeneratorNodes() )
-        {
-          var index = detailNode.DetailGenerator.GetGroupIndex( group );
-          if( index >= 0 )
-          {
-            var detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
-            if( detailIndex >= 0 )
-            {
-              var groupIndex = index + detailIndex;
-
-              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Index( groupIndex ), DataGridTraceArgs.Group( group ) );
-              return groupIndex;
-            }
-
-            this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.DetailNodeNotFound, DataGridTraceArgs.Group( group ) );
-            return -1;
-          }
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupIndex, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
-        return -1;
-      }
-    }
-
-    public Group GetGroupFromItem( object item )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceArgs.Item( item ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_startNode == null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Item( item ) );
-          return null;
-        }
-
-        GeneratorNode node;
-
-        var index = this.FindFirstGeneratedIndexForLocalItem( item );
-        if( index >= 0 )
-        {
-          node = m_genPosToNode[ index ];
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.NodeFound, DataGridTraceArgs.Node( node ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Item( item ) );
-        }
-        else
-        {
-          var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-          if( !nodeHelper.Contains( item ) ) //NOTE: this will only return items directly contained in this generator (not from details )
-            throw DataGridException.Create<InvalidOperationException>( "An attempt was made to retrieve the group of an item that does not belong to the generator.", m_dataGridControl );
-
-          //if the nodeHelper was able to locate the content, use the nodeHelper's CurrentNode as the node for the item.
-          node = nodeHelper.CurrentNode;
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.NodeFound, DataGridTraceArgs.Node( node ), DataGridTraceArgs.Item( item ) );
-        }
-
-        if( node != null )
-        {
-          var parentGroup = node.Parent as GroupGeneratorNode;
-          if( parentGroup != null )
-          {
-            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( parentGroup.UIGroup ), DataGridTraceArgs.Node( parentGroup ), DataGridTraceArgs.Item( item ) );
-            return parentGroup.UIGroup;
-          }
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetGroupFromItem, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Item( item ) );
-        return null;
-      }
-    }
-
-    public Group GetGroupFromCollectionViewGroup( CollectionViewGroup collectionViewGroup )
-    {
-      this.EnsureNodeTreeCreated();
-
-      return this.GetGroupFromCollectionViewGroupCore( collectionViewGroup );
-    }
-
-    private Group GetGroupFromCollectionViewGroupCore( CollectionViewGroup collectionViewGroup )
-    {
-      GroupGeneratorNode node;
-      if( m_groupNodeMappingCache.TryGetValue( collectionViewGroup, out node ) )
-        return node.UIGroup;
-
-      return null;
-    }
-
-    public CollectionViewGroup GetParentGroupFromItem( object item, bool recurseDetails )
-    {
-      if( item == null )
-        throw DataGridException.Create<ArgumentNullException>( "item", m_dataGridControl );
-
-      CollectionViewGroup collectionViewGroup;
-      if( !this.TryGetParentGroupFromItem( item, recurseDetails, out collectionViewGroup ) )
-        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to retrieve the parent group of an item that does not belong to the generator.", m_dataGridControl );
-
-      return collectionViewGroup;
-    }
-
-    public bool TryGetParentGroupFromItem( object item, bool recurseDetails, out CollectionViewGroup collectionViewGroup )
-    {
-      collectionViewGroup = null;
-
-      if( item == null )
-        return false;
-
-      this.EnsureNodeTreeCreated();
-
-      if( m_startNode == null )
-        throw DataGridException.Create<DataGridInternalException>( "Start node is null for the CollectionViewGroup.", m_dataGridControl );
-
-      if( this.TryGetParentGroupFromItemHelper( item, out collectionViewGroup ) )
-        return true;
-
-      if( recurseDetails )
-      {
-        //the item was not found in this generator's content... check all the detail generators
-        foreach( var generator in this.GetDetailGenerators() )
-        {
-          if( generator.TryGetParentGroupFromItem( item, recurseDetails, out collectionViewGroup ) )
-            return true;
-        }
-      }
-
-      return false;
-    }
-
-    private bool TryGetParentGroupFromItemHelper( object item, out CollectionViewGroup collectionViewGroup )
-    {
-      //This helper method is used to simplify previous code flow of the TryGetParentGroupFromItem method.
-      collectionViewGroup = null;
-
-      //-----------------------------------------------
-      //1 - First check is to see of the item is a CVG.
-      //-----------------------------------------------
-      var groupItem = item as CollectionViewGroup;
-      if( groupItem != null )
-      {
-        var group = this.GetGroupFromCollectionViewGroup( groupItem );
-        if( group != null )
-        {
-          var groupGeneratorNode = group.GeneratorNode;
-          if( groupGeneratorNode.Parent == null )
-            return true;
-
-          //if the nodeHelper was able to locate the content, use the nodeHelper's CurrentNode as the node for the item.
-          collectionViewGroup = ( ( GroupGeneratorNode )groupGeneratorNode.Parent ).CollectionViewGroup;
-          return true;
-        }
-
-        //item is a CVG, but is not present in the generator!
-        return false;
-      }
-
-      //-----------------------------------------------
-      //2 - Second check is to see if the item is already in the generated list
-      //-----------------------------------------------
-
-      //item might be in the "generated" list... much quicker to find-out if it is!
-      //note: if the item belongs to a detail, then it will be excluded from the "fast" algo.
-      var itemGenPosIndex = this.FindFirstGeneratedIndexForLocalItem( item );
-      if( itemGenPosIndex != -1 )
-      {
-        //item was generated and was not from a DetailGeneratorNode
-        if( m_genPosToNode[ itemGenPosIndex ].Parent == null )
-          return true;
-
-        collectionViewGroup = ( ( GroupGeneratorNode )m_genPosToNode[ itemGenPosIndex ].Parent ).CollectionViewGroup;
-        return true;
-      }
-
-      //-----------------------------------------------
-      //3 - Third check is to check of the item is a GroupHeaderFooterItem
-      //-----------------------------------------------
-      if( item.GetType() == typeof( GroupHeaderFooterItem ) )
-      {
-        var groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-        var parentGroup = groupHeaderFooterItem.Group;
-
-        if( this.GetGroupFromCollectionViewGroup( parentGroup ) != null )
-        {
-          //since the goal is the find the parentGroup from the item passed (which is a GroupHeader or GroupFooter), then the Group
-          //is what I am looking for.
-          collectionViewGroup = parentGroup;
-
-          return true;
-        }
-
-        //Item was a GroupHeaderFooterItem but was not part of the genreator!
-        return false;
-      }
-
-      //-----------------------------------------------
-      //4 - Final Check
-      //-----------------------------------------------
-
-      //if the item was not generated, then try to find the item as is within the generator's content  
-      var finalNodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      if( finalNodeHelper.AbsoluteFindItem( item ) )
-      {
-        //item was not generated but was part of this generator
-        if( finalNodeHelper.CurrentNode.Parent == null )
-          return true;
-
-        collectionViewGroup = ( ( GroupGeneratorNode )finalNodeHelper.CurrentNode.Parent ).CollectionViewGroup;
-        return true;
-      }
-
-      return false;
-    }
-
-    internal bool ExpandGroup( CollectionViewGroup group )
-    {
-      return this.ExpandGroup( group, false );
-    }
-
-    internal bool ExpandGroup( CollectionViewGroup group, bool recurseDetails )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to expand a group while the generator is busy generating items.", m_dataGridControl );
-
-      if( group == null )
-        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ExpandGroup, DataGridTraceArgs.Group( group ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_firstItem == null )
-          throw DataGridException.Create<DataGridInternalException>( "No GeneratorNode found for the group.", m_dataGridControl );
-
-        var uiGroup = this.GetGroupFromCollectionViewGroup( group );
-        if( uiGroup != null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ExpandGroup, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( uiGroup ), DataGridTraceArgs.Node( uiGroup.GeneratorNode ), DataGridTraceArgs.Value( uiGroup.GeneratorNode.IsExpanded ) );
-
-          uiGroup.GeneratorNode.IsExpanded = true;
-          return true;
-        }
-
-        if( recurseDetails )
-        {
-          foreach( var generator in this.GetDetailGenerators() )
-          {
-            // If the item is not found in the detail generator, it will return false;
-            if( generator.ExpandGroup( group, recurseDetails ) )
-              return true;
-          }
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ExpandGroup, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
-        return false;
-      }
-    }
-
-    internal bool CollapseGroup( CollectionViewGroup group )
-    {
-      return this.CollapseGroup( group, false );
-    }
-
-    internal bool CollapseGroup( CollectionViewGroup group, bool recurseDetails )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to collapse a group while the generator is busy generating items.", m_dataGridControl );
-
-      if( group == null )
-        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_CollapseGroup, DataGridTraceArgs.Group( group ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_firstItem == null )
-          throw DataGridException.Create<DataGridInternalException>( "No GeneratorNode found for the group.", m_dataGridControl );
-
-        var uiGroup = this.GetGroupFromCollectionViewGroup( group );
-        if( uiGroup != null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CollapseGroup, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( uiGroup ), DataGridTraceArgs.Node( uiGroup.GeneratorNode ), DataGridTraceArgs.Value( uiGroup.GeneratorNode.IsExpanded ) );
-
-          uiGroup.GeneratorNode.IsExpanded = false;
-          return true;
-        }
-
-        if( recurseDetails )
-        {
-          foreach( var generator in this.GetDetailGenerators() )
-          {
-            // If the item is not found in the detail generator, it will return false;
-            if( generator.CollapseGroup( group, recurseDetails ) )
-              return true;
-          }
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CollapseGroup, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
-        return false;
-      }
-    }
-
-    internal bool ToggleGroupExpansion( CollectionViewGroup group )
-    {
-      return this.ToggleGroupExpansion( group, false );
-    }
-
-    internal bool ToggleGroupExpansion( CollectionViewGroup group, bool recurseDetails )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to toggle a group's expansion while the generator is busy generating items.", m_dataGridControl );
-
-      if( group == null )
-        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_ToggleGroupExpansion, DataGridTraceArgs.Group( group ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_firstItem == null )
-          throw DataGridException.Create<DataGridInternalException>( "No GeneratorNode found for the group.", m_dataGridControl );
-
-        var uiGroup = this.GetGroupFromCollectionViewGroup( group );
-        if( uiGroup != null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ToggleGroupExpansion, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( uiGroup ), DataGridTraceArgs.Node( uiGroup.GeneratorNode ), DataGridTraceArgs.Value( uiGroup.GeneratorNode.IsExpanded ) );
-
-          var groupNode = uiGroup.GeneratorNode;
-          groupNode.IsExpanded = !groupNode.IsExpanded;
-          return true;
-        }
-
-        if( recurseDetails )
-        {
-          foreach( var generator in this.GetDetailGenerators() )
-          {
-            // If the item is not found in the detail generator, it will return false;
-            if( generator.ToggleGroupExpansion( group, recurseDetails ) )
-              return true;
-          }
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ToggleGroupExpansion, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
-        return false;
-      }
-    }
-
-    internal bool? IsGroupExpanded( CollectionViewGroup group )
-    {
-      return this.IsGroupExpanded( group, false );
-    }
-
-    internal bool? IsGroupExpanded( CollectionViewGroup group, bool recurseDetails )
-    {
-      if( group == null )
-        throw DataGridException.Create<ArgumentNullException>( "group", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_IsGroupExpanded, DataGridTraceArgs.Group( group ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_firstItem == null )
-          throw DataGridException.Create<DataGridInternalException>( "No GeneratorNode found for the group.", m_dataGridControl );
-
-        var uiGroup = this.GetGroupFromCollectionViewGroup( group );
-        if( uiGroup != null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IsGroupExpanded, DataGridTraceMessages.GroupFound, DataGridTraceArgs.Group( uiGroup ), DataGridTraceArgs.Node( uiGroup.GeneratorNode ), DataGridTraceArgs.Value( uiGroup.GeneratorNode.IsExpanded ) );
-          return uiGroup.GeneratorNode.IsExpanded;
-        }
-
-        if( recurseDetails )
-        {
-          //the group was not found in this generator, check in all the child generators for the group.
-          foreach( var generator in this.GetDetailGenerators() )
-          {
-            var result = generator.IsGroupExpanded( group, recurseDetails );
-            if( result.HasValue )
-              return result.Value;
-          }
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IsGroupExpanded, DataGridTraceMessages.GroupNotFound, DataGridTraceArgs.Group( group ) );
-        return null;
-      }
-    }
-
-    internal void ExpandDetails( object dataItem )
-    {
-
-    }
-
-    internal void CollapseDetails( object dataItem )
-    {
-
-    }
-
-    internal void ToggleDetails( object dataItem )
-    {
-    }
-
-    internal bool AreDetailsExpanded( object dataItem )
-    {
-      return false;
-    }
-
-    public void RemoveAllAndNotify()
-    {
-      if( m_startNode == null )
-        return;
-
-      this.RemoveGeneratedItems( int.MinValue, int.MaxValue, null );
-      this.SendResetEvent();
-      this.ClearRecyclingPools();
-    }
-
-    internal int FindIndexForItem( object item, DataGridContext dataGridContext )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceArgs.Item( item ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        // If the seeked DataGridContext is this generator's context, the item should be here.
-        // When the seeked DataGridContext is null, search for the first item match no matter the generator's context.
-        if( ( m_dataGridContext == dataGridContext ) || ( dataGridContext == null ) )
-        {
-          var itemIndex = this.IndexFromItem( item );
-          if( itemIndex >= 0 )
-          {
-            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemFound, DataGridTraceArgs.Item( item ), DataGridTraceArgs.Index( itemIndex ) );
-            return itemIndex;
-          }
-
-          if( dataGridContext != null )
-          {
-            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Item( item ) );
-            return -1;
-          }
-        }
-
-        foreach( var masterToDetails in m_masterToDetails )
-        {
-          var detailsTotalCount = 0;
-
-          foreach( var detailNode in masterToDetails.Value )
-          {
-            var itemIndex = detailNode.DetailGenerator.FindIndexForItem( item, dataGridContext );
-            if( itemIndex >= 0 )
-            {
-              var masterIndex = this.IndexFromItem( masterToDetails.Key );
-              if( masterIndex >= 0 )
-              {
-                var result = masterIndex + 1 + detailsTotalCount + itemIndex;
-
-                this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemFound, DataGridTraceArgs.Item( item ), DataGridTraceArgs.Index( result ) );
-                return result;
-              }
-
-              this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Item( item ) );
-              return -1;
-            }
-
-            detailsTotalCount += detailNode.ItemCount;
-          }
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_FindIndexForItem, DataGridTraceMessages.ItemNotFound, DataGridTraceArgs.Item( item ) );
-        return -1;
-      }
-    }
-
-    public DependencyObject GetRealizedContainerForIndex( int index )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedContainerForIndex, DataGridTraceArgs.Index( index ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        if( m_startNode == null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedContainerForIndex, DataGridTraceMessages.EmptyTree, DataGridTraceArgs.Index( index ) );
-          return null;
-        }
-
-        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        if( !nodeHelper.FindNodeForIndex( index ) )
-          throw DataGridException.Create<ArgumentException>( "The specified index does not correspond to an item in the generator.", m_dataGridControl, "index" );
-
-        var indexIndex = m_genPosToIndex.IndexOf( index );
-        if( indexIndex >= 0 )
-        {
-          var container = m_genPosToContainer[ indexIndex ];
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedContainerForIndex, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Container( container ), DataGridTraceArgs.GeneratorIndex( indexIndex ), DataGridTraceArgs.Index( index ) );
-          return container;
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedContainerForIndex, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Index( index ) );
-        return null;
-      }
-    }
-
-    public int GetRealizedIndexForContainer( DependencyObject container )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedIndexForContainer, DataGridTraceArgs.Container( container ) ) )
-      {
-        this.EnsureNodeTreeCreated();
-
-        var index = m_genPosToContainer.IndexOf( container );
-        if( index >= 0 )
-        {
-          var itemIndex = m_genPosToIndex[ index ];
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedIndexForContainer, DataGridTraceMessages.ContainerFound, DataGridTraceArgs.Index( itemIndex ), DataGridTraceArgs.GeneratorIndex( index ) );
-          return itemIndex;
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GetRealizedIndexForContainer, DataGridTraceMessages.ContainerNotFound, DataGridTraceArgs.Container( container ) );
-        return -1;
-      }
-    }
-
-    internal List<int> GetMasterIndexesWithExpandedDetails()
-    {
-      var masterIndexes = new List<int>();
-
-      foreach( var dataItem in m_masterToDetails.Keys )
-      {
-        var itemIndex = m_collectionView.IndexOf( dataItem );
-        Debug.Assert( itemIndex >= 0 );
-
-        masterIndexes.Add( itemIndex );
-      }
-
-      masterIndexes.Sort();
-
-      return masterIndexes;
-    }
-
-    internal IEnumerable<DataGridContext> GetChildContextsForMasterItem( object item )
-    {
-      if( item == null )
-        yield break;
-
-      List<DetailGeneratorNode> detailNodes;
-      if( m_masterToDetails.TryGetValue( item, out detailNodes ) )
-      {
-        foreach( var detailNode in detailNodes )
-        {
-          yield return detailNode.DetailContext;
-        }
-      }
-    }
-
-    public DataGridContext GetChildContext( object parentItem, string relationName )
-    {
-      if( parentItem == null )
-        throw DataGridException.Create<ArgumentNullException>( "parentItem", m_dataGridControl );
-
-      this.EnsureNodeTreeCreated();
-
-      //Note: This function does not validate if the parentItem is part of the generator or not, effectivelly, there is
-      // no need to validate of the parentItem is part of the Generator or not, the only calling function is already doing the 
-      // validation (DataGridContext.GetChildContext() ).
-      List<DetailGeneratorNode> details;
-      if( m_masterToDetails.TryGetValue( parentItem, out details ) )
-      {
-        foreach( DetailGeneratorNode detailNode in details )
-        {
-          //Note: DetailContext.SourceDetailConfiguration will always be non-null, since we are looking for child contexts ( only the root master context can have a null
-          //SourceDetailConfiguration.
-          if( detailNode.DetailContext.SourceDetailConfiguration.RelationName == relationName )
-            return detailNode.DetailContext;
-        }
-      }
-
-      return null;
-    }
-
-    public IEnumerable<DataGridContext> GetChildContexts()
-    {
-      this.EnsureNodeTreeCreated();
-
-      return this.GetChildContextsCore();
-    }
-
-    internal IEnumerable<DataGridContext> GetChildContextsCore()
-    {
-      return this.GetDetailContexts();
-    }
-
-    public bool Contains( object item )
-    {
-      this.EnsureNodeTreeCreated();
-
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      return nodeHelper.Contains( item );
-    }
-
-    #region Sticky Headers Methods
-
-    public List<StickyContainerGenerated> GenerateStickyHeaders(
-      DependencyObject container,
-      bool areHeadersSticky,
-      bool areGroupHeadersSticky,
-      bool areParentRowsSticky )
-    {
-      var generatedStickyContainers = new List<StickyContainerGenerated>();
-
-      GeneratorNode containerNode;
-      int containerRealizedIndex;
-      object containerDataItem;
-
-      if( this.FindGeneratorListMappingInformationForContainer( container,
-                                                                out containerNode,
-                                                                out containerRealizedIndex,
-                                                                out containerDataItem ) )
-      {
-        var nodeHelper = default( GeneratorNodeHelper );
-        var detailNode = containerNode as DetailGeneratorNode;
-
-        if( detailNode != null )
-        {
-          // Get the parent item of the detail node to be able
-          // to readjust the containerRealizedIndex to the one
-          // of the master item container since the detail node
-          // will be processed by the DetailGenerator.
-          containerDataItem = detailNode.DetailContext.ParentItem;
-
-          // OPTIMIZATION: We will look in the m_genPos* first to avoid using
-          //               FindItem for performance reason.
-          var index = m_genPosToItem.IndexOf( containerDataItem );
-          if( index >= 0 )
-          {
-            var sourceDataIndex = ( int )m_genPosToContainer[ index ].GetValue( DataGridVirtualizingPanel.ItemIndexProperty );
-            containerNode = m_genPosToNode[ index ];
-            containerRealizedIndex = m_genPosToIndex[ index ];
-
-            var collectionNode = containerNode as CollectionGeneratorNode;
-            if( collectionNode != null )
-            {
-              nodeHelper = new GeneratorNodeHelper( containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), sourceDataIndex );
-            }
-          }
-
-          if( nodeHelper == null )
-          {
-            // We want to find the ItemsGeneratorNode for the DetailNode.
-            nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-            containerRealizedIndex = nodeHelper.FindItem( containerDataItem );
-            containerNode = nodeHelper.CurrentNode;
-          }
-
-          if( containerRealizedIndex == -1 )
-            throw DataGridException.Create<DataGridInternalException>( "The index of a sticky header container is out of bound.", m_dataGridControl );
-
-          generatedStickyContainers.AddRange(
-            this.GenerateStickyHeadersForDetail( container,
-                                                 detailNode,
-                                                 areHeadersSticky,
-                                                 areGroupHeadersSticky,
-                                                 areParentRowsSticky ) );
-        }
-        else
-        {
-          var collectionNode = containerNode as CollectionGeneratorNode;
-          if( collectionNode != null )
-          {
-            // We don't need to have an up to date sourceDataIndex so we pass 0
-            nodeHelper = new GeneratorNodeHelper( containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), 0 );
-          }
-
-          if( nodeHelper == null )
-          {
-            nodeHelper = new GeneratorNodeHelper( containerNode, 0, 0 );
-            nodeHelper.ReverseCalculateIndex();
-          }
-        }
-
-        if( ( areParentRowsSticky )
-          && ( containerDataItem != null )
-          && ( this.AreDetailsExpanded( containerDataItem ) ) )
-        {
-          generatedStickyContainers.Add( this.GenerateStickyParentRow( containerRealizedIndex ) );
-        }
-
-        // We want to find the HeaderFooterGeneratorNode for the container 
-        // node. This is to find the headers for the container.
-        nodeHelper.MoveToFirst();
-        var headersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
-
-        // There is no headers to generate if the item count of the node is 0.
-        if( headersNode.ItemCount > 0 )
-        {
-          if( ( ( areHeadersSticky ) && ( headersNode.Parent == null ) )
-            || ( ( areGroupHeadersSticky ) && ( headersNode.Parent is GroupGeneratorNode ) ) )
-          {
-            generatedStickyContainers.AddRange(
-              this.GenerateStickyHeadersForNode( headersNode,
-                                                 nodeHelper.Index,
-                                                 containerRealizedIndex,
-                                                 ( headersNode == containerNode ) ) );
-          }
-        }
-
-        // We must also find the top most headers for our level of detail and, if they need to be sticky,
-        // we will generate the containers and add them the to list.
-        var topMostHeaderNode = this.GetTopMostHeaderNode( nodeHelper );
-        if( ( areHeadersSticky )
-          && ( topMostHeaderNode != null )
-          && ( topMostHeaderNode != headersNode )
-          && ( topMostHeaderNode.ItemCount > 0 ) )
-        {
-          generatedStickyContainers.AddRange(
-            this.GenerateStickyHeadersForNode( topMostHeaderNode, nodeHelper.Index ) );
-        }
-      }
-
-      return generatedStickyContainers;
-    }
-
-    private HeadersFootersGeneratorNode GetTopMostHeaderNode( GeneratorNodeHelper nodeHelper )
-    {
-      var parentNode = default( HeadersFootersGeneratorNode );
-
-      if( nodeHelper.MoveToParent()
-        && nodeHelper.MoveToFirst() )
-      {
-        if( ( nodeHelper.CurrentNode is HeadersFootersGeneratorNode )
-          && ( nodeHelper.CurrentNode.Parent == null ) )
-        {
-          parentNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
-        }
-        else
-        {
-          parentNode = this.GetTopMostHeaderNode( nodeHelper );
-        }
-      }
-
-      return parentNode;
-    }
-
-    private List<StickyContainerGenerated> GenerateStickyHeadersForDetail(
-      DependencyObject container,
-      DetailGeneratorNode detailNode,
-      bool areHeadersSticky,
-      bool areGroupHeadersSticky,
-      bool areParentRowsSticky )
-    {
-      var generatedStickyContainers = detailNode.DetailGenerator.GenerateStickyHeaders( container, areHeadersSticky, areGroupHeadersSticky, areParentRowsSticky );
-      var detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
-      var count = generatedStickyContainers.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        var stickyContainer = generatedStickyContainers[ i ];
-        var detailItemIndex = stickyContainer.Index + detailIndex;
-
-        //if the container was just realized, ensure to add it to the lists maintaining the generated items.
-        if( stickyContainer.IsNewlyRealized )
-        {
-          var insertionIndex = this.FindInsertionPoint( detailItemIndex );
-          var item = CustomItemContainerGenerator.GetDataItemProperty( stickyContainer.StickyContainer ).Data;
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GenerateStickyHeadersForDetail, DataGridTraceMessages.ContainerAdded, DataGridTraceArgs.Container( stickyContainer.StickyContainer ), DataGridTraceArgs.Node( detailNode ), DataGridTraceArgs.Item( item ), DataGridTraceArgs.GeneratorIndex( insertionIndex ), DataGridTraceArgs.Index( detailItemIndex ) );
-
-          m_genPosToIndex.Insert( insertionIndex, detailItemIndex );
-          m_genPosToItem.Insert( insertionIndex, item );
-          m_genPosToContainer.Insert( insertionIndex, stickyContainer.StickyContainer );
-          m_genPosToNode.Insert( insertionIndex, detailNode );
-        }
-
-        generatedStickyContainers[ i ] = new StickyContainerGenerated( stickyContainer.StickyContainer, detailItemIndex, stickyContainer.IsNewlyRealized );
-      }
-
-      return generatedStickyContainers;
-    }
-
-    private StickyContainerGenerated GenerateStickyParentRow( int itemNodeIndex )
-    {
-      var generator = ( ICustomItemContainerGenerator )this;
-      var position = generator.GeneratorPositionFromIndex( itemNodeIndex );
-
-      using( generator.StartAt( position, GeneratorDirection.Forward, true ) )
-      {
-        bool isNewlyRealized;
-        var container = generator.GenerateNext( out isNewlyRealized );
-
-        return new StickyContainerGenerated( container, itemNodeIndex, isNewlyRealized );
-      }
-    }
-
-    private List<StickyContainerGenerated> GenerateStickyHeadersForNode(
-      HeadersFootersGeneratorNode headerNode,
-      int headerNodeIndex )
-    {
-      return this.GenerateStickyHeadersForNode( headerNode, headerNodeIndex, -1, false );
-    }
-
-    private List<StickyContainerGenerated> GenerateStickyHeadersForNode(
-      HeadersFootersGeneratorNode headerNode,
-      int headerNodeIndex,
-      int realizedIndex,
-      bool isRealizedIndexPartOfHeaderNode )
-    {
-      var generatedStickyContainers = new List<StickyContainerGenerated>();
-
-      // The container is already part of the header.
-      var generator = ( ICustomItemContainerGenerator )this;
-      var position = generator.GeneratorPositionFromIndex( headerNodeIndex );
-
-      // In that case, the potential sticky containers are the requested one and up.
-      using( generator.StartAt( position, GeneratorDirection.Forward, true ) )
-      {
-        for( int i = 0; i < headerNode.ItemCount; i++ )
-        {
-          // If the realized index represent the index of one of the HeaderNode
-          // item, do not process
-          if( ( isRealizedIndexPartOfHeaderNode )
-              && ( headerNodeIndex + i > realizedIndex ) )
-            break;
-
-          var item = headerNode.GetAt( i );
-          var groupHeaderFooterItem = default( GroupHeaderFooterItem? );
-
-          if( item is GroupHeaderFooterItem )
-          {
-            groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-          }
-
-          if( ( groupHeaderFooterItem != null )
-            && ( !groupHeaderFooterItem.Value.Group.IsBottomLevel || ( this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) != true ) ) )
-          {
-            this.Skip();
-            continue;
-          }
-
-          bool isNewlyRealized;
-          var stickyContainer = generator.GenerateNext( out isNewlyRealized );
-
-          generatedStickyContainers.Add( new StickyContainerGenerated( stickyContainer, headerNodeIndex + i, isNewlyRealized ) );
-        }
-      }
-
-      return generatedStickyContainers;
-    }
-
-    private bool FindGeneratorListMappingInformationForContainer(
-      DependencyObject container,
-      out GeneratorNode containerNode,
-      out int containerRealizedIndex,
-      out object containerDataItem )
-    {
-      var index = m_genPosToContainer.IndexOf( container );
-      if( index < 0 )
-      {
-        containerNode = null;
-        containerRealizedIndex = -1;
-        containerDataItem = null;
-
-        return false;
-      }
-      else
-      {
-        containerNode = m_genPosToNode[ index ];
-        containerRealizedIndex = m_genPosToIndex[ index ];
-        containerDataItem = m_genPosToItem[ index ];
-
-        return true;
-      }
-    }
-
-    public int GetLastHoldingContainerIndexForStickyHeader( DependencyObject stickyHeader )
-    {
-      return this.GetLastHoldingContainerIndexForStickyHeaderRecurse( stickyHeader, this.ItemCount );
-    }
-
-    private int GetLastHoldingContainerIndexForStickyHeaderRecurse( DependencyObject stickyHeader, int parentCount )
-    {
-      var lastContainerIndex = 0;
-
-      int containerRealizedIndex;
-      GeneratorNode containerNode;
-      object containerDataItem;
-
-      if( this.FindGeneratorListMappingInformationForContainer( stickyHeader, out containerNode, out containerRealizedIndex, out containerDataItem ) )
-      {
-        var detailNode = containerNode as DetailGeneratorNode;
-        if( detailNode != null )
-        {
-          lastContainerIndex =
-            detailNode.DetailGenerator.GetLastHoldingContainerIndexForStickyHeaderRecurse( stickyHeader, detailNode.ItemCount ) +
-            this.FindGlobalIndexForDetailNode( detailNode );
-        }
-        else
-        {
-          var itemsNode = containerNode as ItemsGeneratorNode;
-          if( itemsNode != null )
-          {
-            // This means that the sticky container is a MasterRow for a detail.
-            if( this.AreDetailsExpanded( containerDataItem ) )
-            {
-              var detailNodesForDataItem = m_masterToDetails[ containerDataItem ];
-
-              foreach( DetailGeneratorNode detailNodeForDataItem in detailNodesForDataItem )
-              {
-                lastContainerIndex +=
-                  detailNodeForDataItem.ItemCount +
-                  this.FindGlobalIndexForDetailNode( detailNodeForDataItem ) -
-                  1;
-              }
-            }
-          }
-          else
-          {
-            var nodeHelper = default( GeneratorNodeHelper );
-
-            // This means that the sticky container is a Header.
-            var collectionNode = containerNode as CollectionGeneratorNode;
-            if( collectionNode != null )
-            {
-              // We don't need to have an up to date sourceDataIndex so we pass 0
-              nodeHelper = new GeneratorNodeHelper( containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), 0 );
-            }
-
-            if( nodeHelper == null )
-            {
-              nodeHelper = new GeneratorNodeHelper( containerNode, 0, 0 );
-              nodeHelper.ReverseCalculateIndex();
-            }
-
-            lastContainerIndex = nodeHelper.Index;
-
-            if( containerNode.Parent != null )
-            {
-              // This means that it is a GroupHeader
-              lastContainerIndex += containerNode.Parent.ItemCount - 1;
-            }
-            else
-            {
-              lastContainerIndex += Math.Max( 0, parentCount - 1 );
-            }
-          }
-        }
-      }
-
-      return lastContainerIndex;
-    }
-
-    public int GetFirstHoldingContainerIndexForStickyFooter( DependencyObject stickyFooter )
-    {
-      var firstContainerIndex = 0;
-
-      int containerRealizedIndex;
-      GeneratorNode containerNode;
-      object containerDataItem;
-
-      if( this.FindGeneratorListMappingInformationForContainer( stickyFooter, out containerNode, out containerRealizedIndex, out containerDataItem ) )
-      {
-        var detailNode = containerNode as DetailGeneratorNode;
-
-        if( detailNode != null )
-        {
-          int detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
-          firstContainerIndex = detailNode.DetailGenerator.GetFirstHoldingContainerIndexForStickyFooter( stickyFooter ) + detailIndex;
-        }
-        else
-        {
-          var nodeHelper = default( GeneratorNodeHelper );
-          var collectionNode = containerNode as CollectionGeneratorNode;
-
-          if( collectionNode != null )
-          {
-            // We don't need to have an up to date sourceDataIndex so we pass 0
-            nodeHelper = new GeneratorNodeHelper( containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), 0 );
-          }
-
-          if( nodeHelper == null )
-          {
-            nodeHelper = new GeneratorNodeHelper( containerNode, 0, 0 );
-            nodeHelper.ReverseCalculateIndex();
-          }
-
-          nodeHelper.MoveToFirst();
-          nodeHelper.MoveToNext(); // We exclude headers from this calculation.
-          firstContainerIndex = nodeHelper.Index;
-        }
-      }
-
-      return firstContainerIndex;
-    }
-
-    #endregion Sticky Headers Methods
-
-    #region Sticky Footers Methods
-
-    public List<StickyContainerGenerated> GenerateStickyFooters(
-      DependencyObject container,
-      bool areFootersSticky,
-      bool areGroupFootersSticky )
-    {
-      var generatedStickyContainers = new List<StickyContainerGenerated>();
-
-      GeneratorNode containerNode;
-      int containerRealizedIndex;
-      object containerDataItem;
-
-
-      if( this.FindGeneratorListMappingInformationForContainer( container,
-                                                                out containerNode,
-                                                                out containerRealizedIndex,
-                                                                out containerDataItem ) )
-      {
-        var nodeHelper = default( GeneratorNodeHelper );
-        var detailNode = containerNode as DetailGeneratorNode;
-
-        if( detailNode != null )
-        {
-          // Get the parent item of the detail node to be able
-          // to readjust the containerRealizedIndex to the one
-          // of the master item container since the detail node
-          // will be processed by the DetailGenerator.
-          containerDataItem = detailNode.DetailContext.ParentItem;
-
-          // OPTIMIZATION: We will look in the m_genPos* first to avoid using
-          //               FindItem for performance reason.
-          int index = m_genPosToItem.IndexOf( containerDataItem );
-          if( index >= 0 )
-          {
-            var sourceDataIndex = ( int )m_genPosToContainer[ index ].GetValue( DataGridVirtualizingPanel.ItemIndexProperty );
-            containerNode = m_genPosToNode[ index ];
-            containerRealizedIndex = m_genPosToIndex[ index ];
-
-            var collectionNode = containerNode as CollectionGeneratorNode;
-            if( collectionNode != null )
-            {
-              nodeHelper = new GeneratorNodeHelper( containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), sourceDataIndex );
-            }
-          }
-
-          if( nodeHelper == null )
-          {
-            // We want to find the ItemsGeneratorNode for the DetailNode.
-            nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-            containerRealizedIndex = nodeHelper.FindItem( containerDataItem );
-            containerNode = nodeHelper.CurrentNode;
-          }
-
-          if( containerRealizedIndex == -1 )
-            throw DataGridException.Create<DataGridInternalException>( "The index of a sticky footer container is out of bound.", m_dataGridControl );
-
-          generatedStickyContainers.AddRange(
-            this.GenerateStickyFootersForDetail( container, detailNode, areFootersSticky, areGroupFootersSticky ) );
-        }
-        else
-        {
-          var collectionNode = containerNode as CollectionGeneratorNode;
-          if( collectionNode != null )
-          {
-            // We don't need to have an up to date sourceDataIndex so we pass 0
-            nodeHelper = new GeneratorNodeHelper( containerNode, containerRealizedIndex - collectionNode.IndexOf( containerDataItem ), 0 );
-          }
-
-          if( nodeHelper == null )
-          {
-            nodeHelper = new GeneratorNodeHelper( containerNode, 0, 0 );
-            nodeHelper.ReverseCalculateIndex();
-          }
-        }
-
-        bool isHeaderNode =
-          ( ( nodeHelper.CurrentNode is HeadersFootersGeneratorNode ) &&
-            ( nodeHelper.CurrentNode.Previous == null ) );
-
-        // We want to find the HeaderFooterGeneratorNode for the container 
-        // node. This is to find the footers for the container.
-        nodeHelper.MoveToEnd();
-        var footersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
-
-        if( !isHeaderNode )
-        {
-          // There is no footers to generate if the item count of the node is 0.
-          if( footersNode.ItemCount > 0 )
-          {
-            if( ( ( areFootersSticky ) && ( footersNode.Parent == null ) )
-              || ( ( areGroupFootersSticky ) && ( footersNode.Parent is GroupGeneratorNode ) ) )
-            {
-              generatedStickyContainers.AddRange(
-                this.GenerateStickyFootersForNode( footersNode,
-                                                   nodeHelper.Index,
-                                                   containerRealizedIndex,
-                                                   ( footersNode == containerNode ) ) );
-            }
-          }
-        }
-
-        // We must also find the bottom most footers for our level of detail and, if they need to be sticky,
-        // we will generate the containers and add them the to list.
-        var bottomFootersNode = this.GetDetailFootersNode( nodeHelper );
-
-        if( ( areFootersSticky )
-          && ( bottomFootersNode != null )
-          && ( bottomFootersNode != footersNode )
-          && ( bottomFootersNode.ItemCount > 0 ) )
-        {
-          generatedStickyContainers.AddRange(
-            this.GenerateStickyFootersForNode( bottomFootersNode, nodeHelper.Index ) );
-        }
-      }
-
-      return generatedStickyContainers;
-    }
-
-    private List<StickyContainerGenerated> GenerateStickyFootersForDetail(
-      DependencyObject container,
-      DetailGeneratorNode detailNode,
-      bool areFootersSticky,
-      bool areGroupFootersSticky )
-    {
-      var generatedStickyContainers = detailNode.DetailGenerator.GenerateStickyFooters( container, areFootersSticky, areGroupFootersSticky );
-      var detailIndex = this.FindGlobalIndexForDetailNode( detailNode );
-      var count = generatedStickyContainers.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        var stickyContainer = generatedStickyContainers[ i ];
-        var detailItemIndex = stickyContainer.Index + detailIndex;
-
-        //if the container was just realized, ensure to add it to the lists maintaining the generated items.
-        if( stickyContainer.IsNewlyRealized )
-        {
-          var insertionIndex = this.FindInsertionPoint( detailItemIndex );
-          var item = CustomItemContainerGenerator.GetDataItemProperty( stickyContainer.StickyContainer ).Data;
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GenerateStickyFootersForDetail, DataGridTraceMessages.ContainerAdded, DataGridTraceArgs.Container( stickyContainer.StickyContainer ), DataGridTraceArgs.Node( detailNode ), DataGridTraceArgs.Item( item ), DataGridTraceArgs.GeneratorIndex( insertionIndex ), DataGridTraceArgs.Index( detailItemIndex ) );
-
-          m_genPosToIndex.Insert( insertionIndex, detailItemIndex );
-          m_genPosToItem.Insert( insertionIndex, item );
-          m_genPosToContainer.Insert( insertionIndex, stickyContainer.StickyContainer );
-          m_genPosToNode.Insert( insertionIndex, detailNode );
-        }
-
-        generatedStickyContainers[ i ] = new StickyContainerGenerated( stickyContainer.StickyContainer, detailItemIndex, stickyContainer.IsNewlyRealized );
-      }
-
-      return generatedStickyContainers;
-    }
-
-    private List<StickyContainerGenerated> GenerateStickyFootersForNode(
-      HeadersFootersGeneratorNode footerNode,
-      int footerNodeIndex )
-    {
-      return this.GenerateStickyFootersForNode( footerNode, footerNodeIndex, -1, false );
-    }
-
-    private List<StickyContainerGenerated> GenerateStickyFootersForNode(
-      HeadersFootersGeneratorNode footerNode,
-      int footerNodeIndex,
-      int realizedIndex,
-      bool isRealizedIndexPartOfFooterNode )
-    {
-      var generatedStickyContainers = new List<StickyContainerGenerated>();
-
-      int footersNodeItemCount = footerNode.ItemCount;
-
-      // The container is already part of the footer.
-      var generator = ( ICustomItemContainerGenerator )this;
-      var position = generator.GeneratorPositionFromIndex( footerNodeIndex + footersNodeItemCount - 1 );
-
-      // In that case, the potential sticky containers are the requested one and bottom.
-      using( generator.StartAt( position, GeneratorDirection.Backward, true ) )
-      {
-        for( int i = footersNodeItemCount - 1; i >= 0; i-- )
-        {
-          if( ( isRealizedIndexPartOfFooterNode )
-              && ( footerNodeIndex + i < realizedIndex ) )
-          {
-            continue;
-          }
-
-          var item = footerNode.GetAt( i );
-          var groupHeaderFooterItem = default( GroupHeaderFooterItem? );
-
-          if( item is GroupHeaderFooterItem )
-          {
-            groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-          }
-
-          if( ( groupHeaderFooterItem != null )
-            && ( !groupHeaderFooterItem.Value.Group.IsBottomLevel || ( this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) != true ) ) )
-          {
-            this.Skip();
-            continue;
-          }
-
-          bool isNewlyRealized;
-          var stickyContainer = generator.GenerateNext( out isNewlyRealized );
-
-          generatedStickyContainers.Add( new StickyContainerGenerated( stickyContainer, footerNodeIndex + i, isNewlyRealized ) );
-        }
-      }
-
-      return generatedStickyContainers;
-    }
-
-    private HeadersFootersGeneratorNode GetDetailFootersNode( GeneratorNodeHelper nodeHelper )
-    {
-      var parentNode = default( HeadersFootersGeneratorNode );
-
-      if( nodeHelper.MoveToParent()
-        && nodeHelper.MoveToEnd() )
-      {
-        if( ( nodeHelper.CurrentNode is HeadersFootersGeneratorNode )
-          && ( nodeHelper.CurrentNode.Parent == null ) )
-        {
-          parentNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
-        }
-        else
-        {
-          parentNode = this.GetDetailFootersNode( nodeHelper );
-        }
-      }
-
-      return parentNode;
-    }
-
-    #endregion Sticky Footers Methods
-
-    #region Sticky Header Count Methods
-
-    internal int GetStickyHeaderCountForIndex(
-     int index,
-     bool areHeadersSticky,
-     bool areGroupHeadersSticky,
-     bool areParentRowsSticky )
-    {
-      var stickyHeadersCount = 0;
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-      // Unable to find the node, no sticky header for this node
-      if( !nodeHelper.FindNodeForIndex( index ) )
-        return 0;
-
-      var indexNode = nodeHelper.CurrentNode;
-      var itemsGeneratorNode = indexNode as ItemsGeneratorNode;
-
-      // We found an ItemsGeneratorNode
-      if( itemsGeneratorNode != null )
-      {
-        var detailNode = itemsGeneratorNode.GetDetailNodeForIndex( index - nodeHelper.Index );
-
-        // Only do a special case if the index represent
-        // a DetailNode
-        if( detailNode != null )
-        {
-          if( ( areParentRowsSticky )
-            && ( this.AreDetailsExpanded( detailNode.DetailContext.ParentItem ) ) )
-          {
-            stickyHeadersCount++;
-          }
-
-          var detailFirstRealizedIndex = this.FindGlobalIndexForDetailNode( detailNode );
-          var correctedIndex = index - detailFirstRealizedIndex;
-
-          Debug.Assert( correctedIndex >= 0, "correctedIndex >= 0 .. 1" );
-
-          stickyHeadersCount +=
-            detailNode.DetailGenerator.GetStickyHeaderCountForIndex( correctedIndex,
-                                                                     areHeadersSticky,
-                                                                     areGroupHeadersSticky,
-                                                                     areParentRowsSticky );
-        }
-      }
-
-      // We want to find the HeaderFooterGeneratorNode for the container 
-      // node. This is to find the headers for the container.
-      nodeHelper.MoveToFirst();
-      var headersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
-
-      // There is no headers to generate if the item count of the node is 0.
-      if( headersNode.ItemCount > 0 )
-      {
-        if( ( ( headersNode.Parent == null ) && ( areHeadersSticky ) )
-          || ( ( headersNode.Parent is GroupGeneratorNode ) && ( areGroupHeadersSticky ) ) )
-        {
-          // We are generating sticky headers for a container that is already 
-          // part of the headers, we need to handle it differently.
-          stickyHeadersCount += this.GetStickyHeaderCountForNode( headersNode,
-                                                                  nodeHelper.Index,
-                                                                  index,
-                                                                  ( headersNode == indexNode ) );
-        }
-      }
-
-      // We must also find the top most headers for our level of detail and, if they need to be sticky,
-      // we will generate the containers and add them the to list.
-      var topMostHeaderNode = this.GetTopMostHeaderNode( nodeHelper );
-      if( ( topMostHeaderNode != null )
-        && ( topMostHeaderNode != headersNode )
-        && ( topMostHeaderNode.ItemCount > 0 )
-        && ( areHeadersSticky ) )
-      {
-        stickyHeadersCount += this.GetStickyHeaderCountForNode( topMostHeaderNode, nodeHelper.Index );
-      }
-
-      return stickyHeadersCount;
-    }
-
-    private int GetStickyHeaderCountForNode( HeadersFootersGeneratorNode headerNode, int headerNodeIndex )
-    {
-      return this.GetStickyHeaderCountForNode( headerNode, headerNodeIndex, -1, false );
-    }
-
-    private int GetStickyHeaderCountForNode(
-      HeadersFootersGeneratorNode headerNode,
-      int headerNodeIndex,
-      int realizedIndex,
-      bool isRealizedIndexPartOfHeaderNode )
-    {
-      var stickyHeaderCount = 0;
-
-      for( int i = 0; i < headerNode.ItemCount; i++ )
-      {
-        if( ( isRealizedIndexPartOfHeaderNode )
-            && ( headerNodeIndex + i >= realizedIndex ) )
-          break;
-
-        var item = headerNode.GetAt( i );
-        var groupHeaderFooterItem = default( GroupHeaderFooterItem? );
-
-        if( item is GroupHeaderFooterItem )
-        {
-          groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-        }
-
-        if( ( groupHeaderFooterItem != null )
-          && ( !groupHeaderFooterItem.Value.Group.IsBottomLevel || ( this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) != true ) ) )
-          continue;
-
-        stickyHeaderCount++;
-      }
-
-      return stickyHeaderCount;
-    }
-
-    #endregion
-
-    #region Sticky Footers Count Methods
-
-    internal int GetStickyFooterCountForIndex(
-      int index,
-      bool areFootersSticky,
-      bool areGroupFootersSticky )
-    {
-      var stickyFooterCount = 0;
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-      // Unable to find the node, no sticky header for this node
-      if( !nodeHelper.FindNodeForIndex( index ) )
-        return 0;
-
-      var indexNode = nodeHelper.CurrentNode;
-      var itemsGeneratorNode = indexNode as ItemsGeneratorNode;
-
-      // We found an ItemsGeneratorNode
-      if( itemsGeneratorNode != null )
-      {
-        var detailNode = itemsGeneratorNode.GetDetailNodeForIndex( index - nodeHelper.Index );
-        if( detailNode != null )
-        {
-          var detailFirstRealizedIndex = this.FindGlobalIndexForDetailNode( detailNode );
-          var correctedIndex = index - detailFirstRealizedIndex;
-
-          Debug.Assert( correctedIndex >= 0, "correctedIndex >= 0 .. 2" );
-
-          stickyFooterCount +=
-            detailNode.DetailGenerator.GetStickyFooterCountForIndex( correctedIndex,
-                                                                     areFootersSticky,
-                                                                     areGroupFootersSticky );
-        }
-      }
-
-      // We want to find the HeaderFooterGeneratorNode for the container 
-      // node. This is to find the footers for the container.
-      nodeHelper.MoveToEnd();
-      var footersNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
-
-      // There is no footers to generate if the item count of the node is 0.
-      if( footersNode.ItemCount > 0 )
-      {
-        if( ( ( footersNode.Parent == null ) && ( areFootersSticky ) )
-          || ( ( footersNode.Parent is GroupGeneratorNode ) && ( areGroupFootersSticky ) ) )
-        {
-          // We are generating sticky footers for a container that is already 
-          // part of the footers, we need to handle it differently.
-          stickyFooterCount += this.GetStickyFooterCountForNode( footersNode,
-                                                                 nodeHelper.Index,
-                                                                 index,
-                                                                 ( footersNode != indexNode ) );
-        }
-      }
-
-      // We must also find the bottom most footers for our level of detail and, if they need to be sticky,
-      // we will generate the containers and add them the to list.
-      var bottomFootersNode = this.GetDetailFootersNode( nodeHelper );
-
-      if( ( bottomFootersNode != null )
-        && ( bottomFootersNode != footersNode )
-        && ( bottomFootersNode.ItemCount > 0 )
-        && ( areFootersSticky ) )
-      {
-        stickyFooterCount += this.GetStickyFooterCountForNode( bottomFootersNode, nodeHelper.Index );
-      }
-
-      return stickyFooterCount;
-    }
-
-    private int GetStickyFooterCountForNode(
-      HeadersFootersGeneratorNode footerNode,
-      int footerNodeIndex )
-    {
-      return this.GetStickyFooterCountForNode( footerNode, footerNodeIndex, -1, false );
-    }
-
-    private int GetStickyFooterCountForNode(
-      HeadersFootersGeneratorNode footerNode,
-      int footerNodeIndex,
-      int realizedIndex,
-      bool isRealizedIndexPartOfHeaderNode )
-    {
-      var stickyFooterCount = 0;
-      var footersNodeItemCount = footerNode.ItemCount;
-
-      for( int i = footersNodeItemCount - 1; i >= 0; i-- )
-      {
-        if( ( isRealizedIndexPartOfHeaderNode )
-            && ( footerNodeIndex + i < realizedIndex ) )
-          continue;
-
-        var item = footerNode.GetAt( i );
-        var groupHeaderFooterItem = default( GroupHeaderFooterItem? );
-
-        if( item is GroupHeaderFooterItem )
-        {
-          groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-        }
-
-        if( ( groupHeaderFooterItem != null )
-          && ( !groupHeaderFooterItem.Value.Group.IsBottomLevel || ( this.IsGroupExpanded( groupHeaderFooterItem.Value.Group ) != true ) ) )
-          continue;
-
-        stickyFooterCount++;
-      }
-
-      return stickyFooterCount;
-    }
-
-    #endregion
-
-    #region IItemContainerGenerator Members
-
-    DependencyObject IItemContainerGenerator.GenerateNext( out bool isNewlyRealized )
-    {
-      if( this.Status != GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "The Generator is not active: StartAt() was not called prior calling GenerateNext() or the returned IDisposable was already disposed of.", m_dataGridControl );
-
-      isNewlyRealized = false;
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_IItemContainerGenerator_GenerateNext ) )
-      {
-        if( m_generatorNodeHelper == null ) //the m_generatorNodeHelper will be turned to null when we reach the end of the list ot items.
-          return null;
-
-        var node = m_generatorNodeHelper.CurrentNode;
-        if( node == null )
-          throw DataGridException.Create<DataGridInternalException>( "CurrentNode is null.", m_dataGridControl );
-
-        if( !( node is CollectionGeneratorNode ) )
-          throw DataGridException.Create<DataGridInternalException>( "CurrentNode is not a CollectionGeneratorNode.", m_dataGridControl );
-
-        if( node is GroupGeneratorNode )
-        {
-          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_IItemContainerGenerator_GenerateNext, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( node ) );
-        }
-
-        var container = default( DependencyObject );
-
-        //if a detail generator is currently "started", then rely on it for the generation of items
-        if( m_generatorCurrentDetail != null )
-        {
-          //if the detail generator was not yet started
-          if( m_generatorCurrentDetailDisposable == null )
-          {
-            //start it
-            m_generatorCurrentDetailDisposable = ( ( IItemContainerGenerator )m_generatorCurrentDetail.DetailGenerator ).StartAt( m_generatorCurrentDetail.DetailGenerator.GeneratorPositionFromIndex( m_generatorCurrentDetailIndex ), m_generatorDirection, true );
-          }
-
-          container = ( ( IItemContainerGenerator )m_generatorCurrentDetail.DetailGenerator ).GenerateNext( out isNewlyRealized );
-          node = m_generatorCurrentDetail;
-          //Detail Generator will have taken care of the "nasty" stuff ( ItemIndex, ... )
-        }
-        else
-        {
-          //otherwise, it means the item to be generated is within this generator.
-          container = this.GenerateNextLocalContainer( out isNewlyRealized );
-
-          //special case for table view grid lines
-          Xceed.Wpf.DataGrid.Views.ViewBase.SetIsLastItem( container, this.ShouldDrawBottomLine() );
-          DataGridControl.SetHasExpandedDetails( container, this.ItemHasExpandedDetails() );
-        }
-
-        //if the container was just realized, ensure to add it to the lists maintaining the generated items.
-        if( isNewlyRealized )
-        {
-          var insertionIndex = this.FindInsertionPoint( m_generatorCurrentGlobalIndex );
-          var item = CustomItemContainerGenerator.GetDataItemProperty( container ).Data;
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_IItemContainerGenerator_GenerateNext, DataGridTraceMessages.ContainerAdded, DataGridTraceArgs.Container( container ), DataGridTraceArgs.Node( node ), DataGridTraceArgs.Item( item ), DataGridTraceArgs.GeneratorIndex( insertionIndex ), DataGridTraceArgs.Index( m_generatorCurrentGlobalIndex ) );
-
-          if( insertionIndex > 0 )
-          {
-            if( m_generatorCurrentGlobalIndex <= m_genPosToIndex[ insertionIndex - 1 ] )
-              throw DataGridException.Create<DataGridInternalException>( "Realized item inserted at wrong location.", m_dataGridControl );
-          }
-          else if( m_genPosToIndex.Count > 0 )
-          {
-            if( m_generatorCurrentGlobalIndex >= m_genPosToIndex[ insertionIndex ] )
-              throw DataGridException.Create<DataGridInternalException>( "Realized item inserted at wrong location.", m_dataGridControl );
-          }
-
-          m_genPosToIndex.Insert( insertionIndex, m_generatorCurrentGlobalIndex );
-          m_genPosToItem.Insert( insertionIndex, item );
-          m_genPosToContainer.Insert( insertionIndex, container );
-          m_genPosToNode.Insert( insertionIndex, node );
-        }
-
-        if( m_generatorDirection == GeneratorDirection.Forward )
-        {
-          this.MoveGeneratorForward();
-        }
-        else
-        {
-          this.MoveGeneratorBackward();
-        }
-
-        return container;
-      }
-    }
-
-    DependencyObject IItemContainerGenerator.GenerateNext()
-    {
-      bool flag;
-
-      return ( ( IItemContainerGenerator )this ).GenerateNext( out flag );
-    }
-
-    public GeneratorPosition GeneratorPositionFromIndex( int itemIndex )
-    {
-      this.EnsureNodeTreeCreated();
-
-      var genPosIndex = m_genPosToIndex.IndexOf( itemIndex );
-      if( genPosIndex >= 0 )
-        return new GeneratorPosition( genPosIndex, 0 );
-
-      var storedIndex = -1;
-      var offset = itemIndex + 1;
-
-      //Find the closest (lower) realized index
-      for( int i = 0; i < m_genPosToIndex.Count; i++ )
-      {
-        storedIndex = i;
-        if( m_genPosToIndex[ i ] > itemIndex )
-        {
-          storedIndex = i - 1;
-          break;
-        }
-      }
-
-      //and from there, compute the offset.
-      if( storedIndex >= 0 )
-      {
-        offset = itemIndex - m_genPosToIndex[ storedIndex ];
-      }
-
-      return new GeneratorPosition( storedIndex, offset );
-    }
-
-    ItemContainerGenerator IItemContainerGenerator.GetItemContainerGeneratorForPanel( Panel panel )
-    {
-      return ( ( IItemContainerGenerator )( ( ItemsControl )m_dataGridControl ).ItemContainerGenerator ).GetItemContainerGeneratorForPanel( panel );
-    }
-
-    public int IndexFromGeneratorPosition( GeneratorPosition position )
-    {
-      this.EnsureNodeTreeCreated();
-
-      int retval = -1;
-
-      if( ( position.Index >= 0 ) && ( position.Index < m_genPosToIndex.Count ) )
-      {
-        //calculate based on the generator position passed.
-        retval = m_genPosToIndex[ position.Index ] + position.Offset;
-      }
-      else if( position.Index == -1 )
-      {
-        // if the Index is -1, then we ask for a non realized item, at the beginning of the range, so
-        // first step, ensure the GeneratorPosition asked is valid (offset non-Zero)
-        if( position.Offset > 0 )
-        {
-          //then return index based on the GenPos.
-          retval = position.Offset - 1;
-        }
-      }
-      //if not above 0, and not -1, then return an error (-1)...
-
-      return retval;
-    }
-
-    void IItemContainerGenerator.PrepareItemContainer( DependencyObject container )
-    {
-      if( this.Status != GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "The Generator is not active: StartAt() was not called prior calling PrepareItemContainer() or the returned IDisposable was already disposed of.", m_dataGridControl );
-
-      var dataItemStore = CustomItemContainerGenerator.GetDataItemProperty( container );
-      if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
-        return;
-
-      var dataItem = dataItemStore.Data;
-      if( dataItem == null )
-        return;
-
-      m_dataGridControl.PrepareItemContainer( container, dataItem );
-    }
-
-    void IItemContainerGenerator.Remove( GeneratorPosition position, int count )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
-
-      if( position.Offset != 0 )
-        throw DataGridException.Create<ArgumentException>( "The GeneratorPosition to remove cannot map to a non-realized item.", m_dataGridControl, "position" );
-
-      if( position.Index == -1 )
-        throw DataGridException.Create<ArgumentException>( "The GeneratorPosition to remove cannot map to a non-realized item.", m_dataGridControl, "position" );
-
-      if( count <= 0 )
-        throw DataGridException.Create<ArgumentException>( "The number of item to remove must be greater than or equal to one.", m_dataGridControl, "count" );
-
-      if( position.Index >= m_genPosToIndex.Count )
-        throw DataGridException.Create<DataGridInternalException>( "Trying to remove an item at an out-of-bound GeneratorPosition index", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_IItemContainerGenerator_Remove, DataGridTraceArgs.Index( position.Index ), DataGridTraceArgs.Count( count ) ) )
-      {
-        for( int i = 0; i < count; i++ )
-        {
-          if( this.RemoveGeneratedItem( position.Index, null ) == 0 )
-            //This case deserves a more solid approach... We do not want to allow removal from the user panel of an item that somehow is not present.
-            throw DataGridException.Create<DataGridInternalException>( "Trying to remove an item at an out-of-bound GeneratorPosition index.", m_dataGridControl );
-        }
-      }
-    }
-
-    void IItemContainerGenerator.RemoveAll()
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
-
-      using( this.SetIsHandlingGlobalItemsResetLocally() )
-      {
-        //Call to remove all shall not request container recycling panels to remove their containers. Therefore, I am not collecting the remove containers.
-        this.RemoveAllGeneratedItems();
-      }
-    }
-
-    IDisposable IItemContainerGenerator.StartAt( GeneratorPosition position, GeneratorDirection direction, bool allowStartAtRealizedItem )
-    {
-      this.SetIsInUse();
-
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
-
-      this.EnsureNodeTreeCreated();
-
-      if( ( !allowStartAtRealizedItem ) && ( position.Offset == 0 ) )
-      {
-        if( direction == GeneratorDirection.Forward )
-        {
-          position = this.FindNextUnrealizedGeneratorPosition( position );
-        }
-        else
-        {
-          position = this.FindPreviousUnrealizedGeneratorPosition( position );
-        }
-      }
-
-      return new CustomItemContainerGeneratorDisposableDisposer( this, position, direction );
-    }
-
-    IDisposable IItemContainerGenerator.StartAt( GeneratorPosition position, GeneratorDirection direction )
-    {
-      return ( ( IItemContainerGenerator )this ).StartAt( position, direction, false );
-    }
-
-    #endregion
-
-    #region ICustomItemContainerGenerator Members
-
-    public int ItemCount
-    {
-      get
-      {
-        this.EnsureNodeTreeCreated();
-
-        //if the value that was last cached is invalid
-        if( m_lastValidItemCountGeneration != m_currentGeneratorContentGeneration )
-        {
-          //then re-evaluate the number of items.
-          if( m_startNode != null )
-          {
-            // If it does that correctly, then this function is OK.
-            int chainLength;
-            GeneratorNodeHelper.EvaluateChain( m_startNode, out m_cachedItemCount, out chainLength );
-          }
-          else
-          {
-            m_cachedItemCount = 0;
-          }
-
-          m_lastValidItemCountGeneration = m_currentGeneratorContentGeneration;
-        }
-
-        //return the cached value.
-        return m_cachedItemCount;
-      }
-    }
-
-    public bool IsRecyclingEnabled
-    {
-      get
-      {
-        return m_flags[ ( int )CustomItemContainerGeneratorFlags.RecyclingEnabled ];
-      }
-      set
-      {
-        //if the container recycling is turned OFF from ON
-        if( value == ( bool )m_flags[ ( int )CustomItemContainerGeneratorFlags.RecyclingEnabled ] )
-          return;
-
-        if( !value )
-        {
-          this.ClearRecyclingPools();
-        }
-
-        m_flags[ ( int )CustomItemContainerGeneratorFlags.RecyclingEnabled ] = value;
-
-        foreach( var generator in this.GetDetailGenerators() )
-        {
-          generator.IsRecyclingEnabled = value;
-        }
-      }
-    }
-
-    private bool GenPosToIndexNeedsUpdate
-    {
-      get
-      {
-        return m_flags[ ( int )CustomItemContainerGeneratorFlags.GenPosToIndexNeedsUpdate ];
-      }
-      set
-      {
-        m_flags[ ( int )CustomItemContainerGeneratorFlags.GenPosToIndexNeedsUpdate ] = value;
-      }
-    }
-
-    void ICustomItemContainerGenerator.SetCurrentIndex( int newCurrentIndex )
-    {
-      // This method enables the possibility for the "ItemsHost" panels to set the current item of the 
-      // DataGridControl. This is required for scenarios such as the CardflowItemsHost.
-      this.EnsureNodeTreeCreated();
-
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-      //First, locate the item within the Generator.
-      object newCurrentItem = nodeHelper.FindIndex( newCurrentIndex );
-
-      if( newCurrentItem == null )
-        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to access an item at an index that does not correspond to an item.", m_dataGridControl );
-
-      //Then, if the item is within an ItemsNode, check if it belongs to a detail
-      var itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
-      if( itemsNode != null )
-      {
-        int masterIndex;
-        int detailIndex;
-        int detailNodeIndex;
-
-        var detailNode = itemsNode.GetDetailNodeForIndex( newCurrentIndex - nodeHelper.Index, out masterIndex, out detailIndex, out detailNodeIndex );
-        if( detailNode != null )
-        {
-          //call recursively the SetCurrentIndex method on the detail generator to ensure that if the item
-          //belongs to a sub-generator of the detail generator, then the appropriate DataGridContext will get invoked.
-          ICustomItemContainerGenerator detailGenerator = detailNode.DetailGenerator;
-          detailGenerator.SetCurrentIndex( detailIndex );
-          return;
-        }
-      }
-
-      //If the item is not within an ItemsNode or not within a detail
-      //then set it current within its context.
-      m_dataGridContext.SetCurrentItemCore( newCurrentItem, false, false, AutoScrollCurrentItemSourceTriggers.Navigation );
-    }
-
-    int ICustomItemContainerGenerator.GetCurrentIndex()
-    {
-      if( m_dataGridControl.CurrentContext != null )
-        return this.FindIndexForItem( m_dataGridControl.CurrentContext.InternalCurrentItem, m_dataGridContext );
-
-      return -1;
-    }
-
-    void ICustomItemContainerGenerator.RestoreFocus( DependencyObject container )
-    {
-      if( !m_genPosToContainer.Contains( container ) )
-        throw DataGridException.Create<ArgumentException>( "The specified container is not part of the generator's content.", m_dataGridControl, "container" );
-
-      var dataGridContext = DataGridControl.GetDataGridContext( container );
-      var column = ( dataGridContext == null ) ? null : dataGridContext.CurrentColumn;
-
-      m_dataGridControl.SetFocusHelper( container as UIElement, column, false, true );
-    }
-
-    #endregion
-
-    private DependencyObject GenerateNextLocalContainer( out bool isNewlyRealized )
-    {
-      var container = default( DependencyObject );
-      var node = m_generatorNodeHelper.CurrentNode as CollectionGeneratorNode;
-
-      //if the index exists in the list, then the item is already realized.
-      var genPosIndex = m_genPosToIndex.IndexOf( m_generatorCurrentGlobalIndex );
-      var itemsNode = node as ItemsGeneratorNode;
-
-      if( node == null )
-      {
-        this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_GenerateNextLocalContainer, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( node ), DataGridTraceArgs.GeneratorIndex( genPosIndex ) );
-      }
-
-      object dataItem;
-
-      if( genPosIndex >= 0 )
-      {
-        //retrieve the container for the item that is already stored in the data structure
-        container = m_genPosToContainer[ genPosIndex ];
-        dataItem = m_genPosToItem[ genPosIndex ];
-
-        var tempNode = m_genPosToNode[ genPosIndex ];
-        node = tempNode as CollectionGeneratorNode;
-
-        if( tempNode == null )
-        {
-          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_GenerateNextLocalContainer, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( node ), DataGridTraceArgs.GeneratorIndex( genPosIndex ), DataGridTraceArgs.Container( container ), DataGridTraceArgs.Item( dataItem ) );
-          throw DataGridException.Create<DataGridInternalException>( "CustomItemContainerGenerator.GenerateNextLocalContainer: cached Node is null", m_dataGridControl );
-        }
-        else if( node != m_generatorNodeHelper.CurrentNode )
-        {
-          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_GenerateNextLocalContainer, DataGridTraceMessages.NodeIsNotTheCurrentNode, DataGridTraceArgs.Node( tempNode ), DataGridTraceArgs.Node( m_generatorNodeHelper.CurrentNode ), DataGridTraceArgs.GeneratorIndex( genPosIndex ), DataGridTraceArgs.Container( container ), DataGridTraceArgs.Item( dataItem ) );
-          throw DataGridException.Create<DataGridInternalException>( "CustomItemContainerGenerator.GenerateNextLocalContainer: Node is not the current one.", m_dataGridControl );
-        }
-
-        isNewlyRealized = false;
-      }
-      else
-      {
-        //This means that the container is not already generated for the item...
-
-        //First need to fetch the dataItem
-        if( itemsNode != null )
-        {
-          dataItem = itemsNode.Items[ m_generatorCurrentOffset ]; //here I use this particular exception to prevent over-complicating the algo
-          //I know it's rather dirty but!!! (i.e. calling GetAt() would return something with details computed in ).
-
-          this.UpdateDataVirtualizationLockForItemsNode( itemsNode, dataItem, true );
-        }
-        else
-        {
-          dataItem = node.GetAt( m_generatorCurrentOffset );
-          //Here I Need to call the GetAt() to make sure the collapsed GroupHeaders/Footers are correctly generated...
-        }
-
-        //create the container for the item specified according to the item's type
-        container = this.CreateContainerForItem( dataItem, node );
-
-        //flag the container as newly generated.
-        isNewlyRealized = true;
-      }
-
-      if( itemsNode != null )
-      {
-        int itemIndex = m_generatorNodeHelper.SourceDataIndex + m_generatorCurrentOffset;
-
-        DataGridVirtualizingPanel.SetItemIndex( container, itemIndex );
-
-        //In order to make sure the container is properly selected, a new selection range must be initialized with the updated item index.
-        var currentSelection = new SelectionRange( itemIndex );
-        var rowToSelect = container as DataRow;
-
-        if( rowToSelect != null )
-        {
-          if( m_dataGridContext.SelectedItemsStore.Contains( currentSelection ) )
-          {
-            rowToSelect.SetIsSelected( true );
-          }
-          else
-          {
-            rowToSelect.SetIsSelected( false );
-          }
-        }
-      }
-      else
-      {
-        DataGridVirtualizingPanel.SetItemIndex( container, -1 );
-      }
-
-      if( node != null )
-      {
-        //determine the appropriate GroupConfiguration ( based on parent node ) and set it on the container.
-        var groupConfig = default( GroupConfiguration );
-        var parentNode = node.Parent as GroupGeneratorNode; //implicit rule: a parent node is always a GroupGeneratorNode
-
-        if( parentNode != null )
-        {
-          groupConfig = parentNode.GroupConfiguration;
-        }
-
-        if( groupConfig != null )
-        {
-          DataGridControl.SetContainerGroupConfiguration( container, groupConfig );
-        }
-      }
-
-      this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GenerateNextLocalContainer, DataGridTraceMessages.ContainerGenerated, DataGridTraceArgs.Container( container ), DataGridTraceArgs.Node( node ), DataGridTraceArgs.GeneratorIndex( genPosIndex ), DataGridTraceArgs.Value( isNewlyRealized ) );
-
-      return container;
-    }
-
-    private bool IsDataVirtualized( ItemsGeneratorNode node )
-    {
-      DataGridVirtualizingCollectionViewBase collectionView;
-      VirtualList items;
-
-      return this.TryGetVirtualizedCollection( node, out collectionView, out items );
-    }
-
-    private bool TryGetVirtualizedCollection( ItemsGeneratorNode node, out DataGridVirtualizingCollectionViewBase collectionView, out VirtualList items )
-    {
-      if( node == null )
-      {
-        collectionView = default( DataGridVirtualizingCollectionViewBase );
-        items = default( VirtualList );
-      }
-      else
-      {
-        var itemCollection = node.Items as ItemCollection;
-        if( itemCollection != null )
-        {
-          collectionView = itemCollection.SourceCollection as DataGridVirtualizingCollectionViewBase;
-          items = default( VirtualList );
-        }
-        else
-        {
-          collectionView = default( DataGridVirtualizingCollectionViewBase );
-          items = node.Items as VirtualList;
-        }
-      }
-
-      return ( collectionView != null )
-          || ( items != null );
-    }
-
-    private void UpdateDataVirtualizationLockForItemsNode( ItemsGeneratorNode node, object dataItem, bool applyLock )
-    {
-      DataGridVirtualizingCollectionViewBase collectionView;
-      VirtualList items;
-
-      if( !this.TryGetVirtualizedCollection( node, out collectionView, out items ) )
-        return;
-
-      if( collectionView != null )
-      {
-        var index = node.Items.IndexOf( dataItem );
-        if( applyLock )
-        {
-          collectionView.RootGroup.LockGlobalIndex( index );
-        }
-        else
-        {
-          collectionView.RootGroup.UnlockGlobalIndex( index );
-        }
-      }
-      else if( items != null )
-      {
-        var index = node.Items.IndexOf( dataItem );
-        if( applyLock )
-        {
-          items.LockPageForLocalIndex( index );
-        }
-        else
-        {
-          items.UnlockPageForLocalIndex( index );
-        }
-      }
-    }
-
-    private void MoveGeneratorForward()
-    {
-      var currentMasterNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
-
-      //if I was generating from a detail generator
-      if( m_generatorCurrentDetail != null )
-      {
-        if( ( currentMasterNode == null ) || ( currentMasterNode.Details == null ) )
-        {
-          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_MoveGeneratorForward, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( currentMasterNode ) );
-        }
-
-        //incremment the running counter for the item index generated in the detail generator
-        m_generatorCurrentDetailIndex++;
-
-        //if that was the last item from the detail generator
-        if( m_generatorCurrentDetailIndex >= m_generatorCurrentDetail.ItemCount )
-        {
-          //stop the detail generator
-          m_generatorCurrentDetailDisposable.Dispose();
-          m_generatorCurrentDetailDisposable = null;
-          m_generatorCurrentDetailIndex = -1;
-
-          //increment detail node index
-          m_generatorCurrentDetailNodeIndex++;
-
-          List<DetailGeneratorNode> detailsforMasterNode;
-          currentMasterNode.Details.TryGetValue( m_generatorCurrentOffset, out detailsforMasterNode );
-
-          if( detailsforMasterNode == null )
-          {
-            this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_MoveGeneratorForward, DataGridTraceMessages.DetailExpected, DataGridTraceArgs.Node( currentMasterNode ) );
-          }
-
-          while( ( m_generatorCurrentDetailNodeIndex < detailsforMasterNode.Count ) && ( m_generatorCurrentDetailIndex == -1 ) )
-          {
-            //try to use it
-            m_generatorCurrentDetail = detailsforMasterNode[ m_generatorCurrentDetailNodeIndex ];
-
-            if( m_generatorCurrentDetail.ItemCount > 0 )
-            {
-              m_generatorCurrentDetailIndex = 0;
-            }
-            else
-            {
-              //increment detail node index
-              m_generatorCurrentDetailNodeIndex++;
-            }
-          }
-
-          if( m_generatorCurrentDetailIndex == -1 )
-          {
-            //if there are no other details for this master item, then move the master item counter forward
-            m_generatorCurrentDetail = null;
-            m_generatorCurrentOffset++;
-          }
-        }
-      }
-      else
-      {
-        //If I was not generating from a detail generator
-
-        //Check if there is availlable details for the current item
-        List<DetailGeneratorNode> detailsForNode;
-
-        if( ( currentMasterNode != null ) && ( currentMasterNode.Details != null )
-          && ( currentMasterNode.Details.TryGetValue( m_generatorCurrentOffset, out detailsForNode ) ) )
-        {
-          var foundDetail = false;
-
-          for( int i = 0; i < detailsForNode.Count; i++ )
-          {
-            var detailNode = detailsForNode[ i ];
-
-            if( detailNode.ItemCount > 0 )
-            {
-              //There are details for the master item
-              m_generatorCurrentDetailIndex = 0;
-              m_generatorCurrentDetailNodeIndex = i;
-              m_generatorCurrentDetail = detailNode;
-              foundDetail = true;
-              break;
-            }
-          }
-
-          if( !foundDetail )
-          {
-            //there are no items in the details
-            m_generatorCurrentOffset++; //move to the next index in the local generator...
-          }
-        }
-        else
-        {
-          //there are no details OR the node is not an ItemsGeneratorNode (cannot have details)
-          m_generatorCurrentOffset++; //move to the next index...
-        }
-      }
-
-      //if the current offset is after the last "item" of the node (can be more than 1 item, for multi item nodes)
-      if( m_generatorCurrentOffset >= ( ( currentMasterNode != null ) ? currentMasterNode.Items.Count : m_generatorNodeHelper.CurrentNode.ItemCount ) )
-      {
-        //if we are at the last (and possible only) item in the node, move to the next node.
-        if( !m_generatorNodeHelper.MoveForward() )
-        {
-          //if we failed to move the the next node, then we want to make sure the generator will not be able to generate
-          //any more containers.
-          m_generatorNodeHelper = null;
-        }
-
-        //reset the offset, since we moved the the node helper.
-        m_generatorCurrentOffset = 0;
-      }
-
-      m_generatorCurrentGlobalIndex++;
-    }
-
-    private void MoveGeneratorBackward()
-    {
-      var currentMasterNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
-
-      //if I was generating from a detail generator
-      if( m_generatorCurrentDetail != null )
-      {
-        if( ( currentMasterNode == null ) || ( currentMasterNode.Details == null ) )
-        {
-          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_MoveGeneratorBackward, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( currentMasterNode ) );
-        }
-
-        //decrement the running counter for the item index generated in the detail generator
-        m_generatorCurrentDetailIndex--;
-
-        //if that was the first item from the detail generator
-        if( m_generatorCurrentDetailIndex < 0 )
-        {
-          //stop the detail generator
-          m_generatorCurrentDetailDisposable.Dispose();
-          m_generatorCurrentDetailDisposable = null;
-          m_generatorCurrentDetailIndex = -1;
-
-          //decrement detail node index
-          m_generatorCurrentDetailNodeIndex--;
-
-          if( m_generatorCurrentDetailNodeIndex >= 0 )
-          {
-            List<DetailGeneratorNode> detailsforMasterNode;
-            currentMasterNode.Details.TryGetValue( m_generatorCurrentOffset, out detailsforMasterNode );
-
-            if( detailsforMasterNode == null )
-            {
-              this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_MoveGeneratorBackward, DataGridTraceMessages.DetailExpected, DataGridTraceArgs.Node( currentMasterNode ) );
-            }
-
-            while( ( m_generatorCurrentDetailNodeIndex >= 0 ) && ( m_generatorCurrentDetailIndex == -1 ) )
-            {
-              //try to use it
-              m_generatorCurrentDetail = detailsforMasterNode[ m_generatorCurrentDetailNodeIndex ];
-
-              if( m_generatorCurrentDetail.ItemCount > 0 )
-              {
-                m_generatorCurrentDetailIndex = m_generatorCurrentDetail.ItemCount - 1;
-              }
-              else
-              {
-                //decrement detail node index
-                m_generatorCurrentDetailNodeIndex--;
-              }
-            }
-          }
-
-          if( m_generatorCurrentDetailIndex == -1 )
-          {
-            //if there are no other details for this master item, then 
-            //don't do anything, the current m_generatorCurrentOffset will
-            //be generated
-            m_generatorCurrentDetail = null;
-          }
-        }
-      }
-      else
-      {
-        //If I was not generating from a detail generator
-
-        //move the current offset to the previous element
-        m_generatorCurrentOffset--;
-
-        //do not try open details if the offset falls below 0
-        if( m_generatorCurrentOffset >= 0 )
-        {
-          //Check if there is availlable details for the current item
-          this.SetupLastDetailForNode( currentMasterNode );
-        }
-      }
-
-      //if the current offset is below the last "item" of the node (can be more than 1 item, for multi item nodes)
-      if( m_generatorCurrentOffset < 0 )
-      {
-        //if we are at the last (and possible only) item in the node, move to the next node.
-        if( !m_generatorNodeHelper.MoveBackward() )
-        {
-          //if we failed to move the the next node, then we want to make sure the generator will not be able to generate
-          //any more containers.
-          m_generatorNodeHelper = null;
-        }
-        else
-        {
-          currentMasterNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
-
-          //reset the offset, since we moved the the node helper.
-          m_generatorCurrentOffset = ( ( currentMasterNode != null ) ? currentMasterNode.Items.Count : m_generatorNodeHelper.CurrentNode.ItemCount ) - 1;
-
-          this.SetupLastDetailForNode( currentMasterNode );
-        }
-      }
-
-      m_generatorCurrentGlobalIndex--;
-    }
-
-    private void SetupLastDetailForNode( ItemsGeneratorNode node )
-    {
-      List<DetailGeneratorNode> detailsForNode;
-
-      if( ( node != null ) && ( node.Details != null ) && ( node.Details.TryGetValue( m_generatorCurrentOffset, out detailsForNode ) ) )
-      {
-        for( int i = detailsForNode.Count - 1; i >= 0; i-- )
-        {
-          var detailNode = detailsForNode[ i ];
-          if( detailNode.ItemCount > 0 )
-          {
-            //There are details for the master item
-            m_generatorCurrentDetailNodeIndex = i;
-            m_generatorCurrentDetail = detailNode;
-            m_generatorCurrentDetailIndex = detailNode.ItemCount - 1;
-            break;
-          }
-        }
-      }
-    }
-
-    private bool ShouldDrawBottomLine()
-    {
-      if( m_generatorStatus != GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to call the CustomItemContainerGenerator.ShouldDrawBottomLine method while containers are not being generated.", m_dataGridControl );
-
-      return ( m_generatorCurrentGlobalIndex == ( this.ItemCount - 1 ) );
-    }
-
-    private bool ItemHasExpandedDetails()
-    {
-      if( m_generatorStatus != GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to call the CustomItemContainerGenerator.ItemHasExpandedDetails method while containers are not being generated.", m_dataGridControl );
-
-      var itemsNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
-      if( ( itemsNode == null ) || ( itemsNode.Details == null ) )
-        return false;
-
-      return itemsNode.Details.ContainsKey( m_generatorCurrentOffset );
-    }
-
-    internal void CleanupGenerator()
-    {
-      this.CleanupGenerator( false );
-    }
-
-    internal void CleanupGenerator( bool isNestedCall )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_CleanupGenerator ) )
-      {
-        this.ForceReset = false;
-
-        if( this.IsHandlingGlobalItemsResetLocally )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_CleanupGenerator, DataGridTraceMessages.CannotProcessOnReset );
-          return;
-        }
-
-        using( this.SetIsHandlingGlobalItemsResetLocally() )
-        {
-          this.RemoveAllGeneratedItems();
-
-          if( !isNestedCall )
-          {
-            this.SendResetEvent();
-            this.ClearRecyclingPools();
-          }
-
-          this.ClearLateGroupLevelDescriptions();
-
-          if( m_startNode != null )
-          {
-            //Note: this does not disconnects the "general" master/detail relationship established between an Item and its details,
-            //within the Generator itself, however, it does break the link between the GeneratorNode where the details are mapped.
-            this.NodeFactory.CleanGeneratorNodeTree( m_startNode );
-          }
-
-          m_groupNodeMappingCache.Clear();
-          m_firstHeader = null;
-          m_firstFooter = null;
-          m_firstItem = null;
-          m_startNode = null;
-
-          //This absolutelly needs to be done after the node list is Cleaned!
-          this.CleanupDetailRelations();
-          this.InvalidateNodeTree();
-        }
-      }
-    }
-
-    private void CleanupDetailRelations()
-    {
-      var detailNodes = this.GetDetailGeneratorNodes().ToList();
-
-      m_masterToDetails.Clear();
-
-      foreach( var detailNode in detailNodes )
-      {
-        this.ClearDetailGeneratorNode( detailNode );
-      }
-
-      m_floatingDetails.Clear();
-    }
-
-    private void IncrementCurrentGenerationCount( bool updateGenPosList )
-    {
-      unchecked
-      {
-        m_currentGeneratorContentGeneration++;
-      }
-
-      if( updateGenPosList )
-      {
-        if( m_genPosToIndexUpdateInhibitCount == 0 )
-        {
-          this.UpdateGenPosToIndexList();
-          this.GenPosToIndexNeedsUpdate = false;
-        }
-        else
-        {
-          this.GenPosToIndexNeedsUpdate = true;
-        }
-      }
-    }
-
-    private void IncrementCurrentGenerationCount()
-    {
-      this.IncrementCurrentGenerationCount( true );
-    }
-
-    private void OnItemsSourceChanged( object sender, EventArgs e )
-    {
-      // Avoid re-entrance when processing a global reset
-      if( this.IsHandlingGlobalItemsReset )
-        return;
-
-      this.CleanupGenerator();
-    }
-
-    private void OnDetailConfigurationsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnDetailConfigurationsChanged ) )
-      {
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnDetailConfigurationsChanged, DataGridTraceArgs.Action( e.Action ) );
-
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Remove:
-            {
-              using( m_recyclingPools.DeferContainersRemoved() )
-              {
-                foreach( DetailConfiguration detailConfiguration in e.OldItems )
-                {
-                  this.CloseDetails( detailConfiguration );
-
-                  m_recyclingPools.Clear( detailConfiguration );
-                }
-              }
-              break;
-            }
-
-          case NotifyCollectionChangedAction.Move:
-          case NotifyCollectionChangedAction.Add:
-          case NotifyCollectionChangedAction.Replace:
-          case NotifyCollectionChangedAction.Reset:
-          default:
-            {
-              // That ensure the RemapFloatingDetails() got called and the loop on m_masterToDetails.Keys will not contain invalid item.
-              this.EnsureNodeTreeCreated();
-
-              foreach( object item in m_masterToDetails.Keys.ToList() )
-              {
-                this.CloseDetailsForItem( item, null );
-              }
-              break;
-            }
-        }
-      }
-    }
-
-    private void OnCollectionViewPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var propertyName = e.PropertyName;
-
-      if( string.IsNullOrEmpty( propertyName ) || ( propertyName == DataGridCollectionViewBase.GroupsPropertyName ) )
-      {
-        this.OnCollectionViewGroupsPropertyChanged();
-      }
-
-      if( string.IsNullOrEmpty( propertyName ) || ( propertyName == DataGridCollectionViewBase.RootGroupPropertyName ) )
-      {
-        this.OnCollectionViewRootGroupChanged();
-      }
-    }
-
-    private void OnCollectionViewGroupsPropertyChanged()
-    {
-      if( m_groupsCollection == m_collectionView.Groups )
-        return;
-
-      this.HandleGlobalItemsReset();
-    }
-
-    private void OnCollectionViewRootGroupChanged()
-    {
-      for( int i = 0; i < m_genPosToNode.Count; i++ )
-      {
-        if( !( m_genPosToNode[ i ] is HeadersFootersGeneratorNode ) )
-          continue;
-
-        this.SetStatContext( m_genPosToContainer[ i ], m_genPosToNode[ i ] );
-      }
-    }
-
-    private void OnItemsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnItemsChanged ) )
-      {
-        if( this.IsHandlingGlobalItemsResetLocally )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnItemsChanged, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Action( e.Action ) );
-          return;
-        }
-
-        if( this.Status == GeneratorStatus.GeneratingContainers )
-          throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnItemsChanged, DataGridTraceArgs.Action( e.Action ) );
-
-        if( this.ForceReset )
-        {
-          this.HandleGlobalItemsReset();
-        }
-        else
-        {
-          if( e.Action == NotifyCollectionChangedAction.Reset )
-          {
-            if( ( m_groupsCollection == null ) != ( m_collectionView.GroupDescriptions.Count == 0 ) )
-            {
-              this.HandleGlobalItemsReset();
-            }
-          }
-        }
-      }
-    }
-
-    private void OnGroupsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGroupsChanged, DataGridTraceArgs.Group( sender ) ) )
-      {
-        if( this.IsHandlingGlobalItemsResetLocally )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnGroupsChanged, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Group( sender ), DataGridTraceArgs.Action( e.Action ) );
-          return;
-        }
-
-        if( this.Status == GeneratorStatus.GeneratingContainers )
-          throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGroupsChanged, DataGridTraceArgs.Group( sender ), DataGridTraceArgs.Action( e.Action ) );
-
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-            {
-              var count = e.NewItems.Count;
-
-              //if the first item is empty, do not do anything, the structure will be generated when the generator is started!
-              if( m_firstItem != null )
-              {
-                //The only moment where the m_firstItem is null is typically when a reset occured...
-                //other moments is when there are 0 items.
-                this.HandleSameLevelGroupAddition( m_firstItem, out count, e );
-                this.IncrementCurrentGenerationCount();
-              }
-
-              this.SendAddEvent( count );
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Move:
-            {
-              if( m_firstItem != null )
-              {
-                if( !( m_firstItem is GroupGeneratorNode ) )
-                  throw DataGridException.Create<DataGridInternalException>( "Trying to move a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
-
-                Debug.Assert( e.OldStartingIndex != e.NewStartingIndex, "An attempt was made to move a group to the same location." );
-
-                this.HandleSameLevelGroupMove( m_firstItem, e );
-              }
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Remove:
-            {
-              if( m_firstItem != null )
-              {
-                if( !( m_firstItem is GroupGeneratorNode ) )
-                  throw DataGridException.Create<DataGridInternalException>( "Trying to remove a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
-
-                var count = default( int );
-                var containers = new List<DependencyObject>();
-
-                this.HandleSameLevelGroupRemove( m_firstItem, out count, e, containers );
-                this.IncrementCurrentGenerationCount();
-                this.SendRemoveEvent( count, containers );
-              }
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Replace:
-            throw DataGridException.Create<NotSupportedException>( "Replace not supported at the moment on groups.", m_dataGridControl );
-
-          case NotifyCollectionChangedAction.Reset:
-            {
-              if( m_firstItem != null )
-              {
-                if( !( m_firstItem is GroupGeneratorNode ) )
-                  throw DataGridException.Create<DataGridInternalException>( "Trying to reset a GeneratorNode that is not a GroupGeneratorNode.", m_dataGridControl );
-
-                this.HandleSameLevelGroupReset( m_firstItem );
-              }
-              else
-              {
-                this.HandleGlobalItemsReset();
-              }
-            }
-            break;
-        }
-      }
-    }
-
-    private void OnGeneratorNodeItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeItemsCollectionChanged, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) ) )
-      {
-        if( this.IsHandlingGlobalItemsResetLocally )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeItemsCollectionChanged, DataGridTraceMessages.CannotProcessOnReset, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) );
-          return;
-        }
-
-        if( this.Status == GeneratorStatus.GeneratingContainers )
-          throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-        var node = ( ItemsGeneratorNode )sender;
-        var updateContainersIndex = !node.IsComputedExpanded;
-
-        e = e.GetRangeActionOrSelf();
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeItemsCollectionChanged, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) );
-
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-            {
-              this.HandleItemAddition( node, e );
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Remove:
-            {
-              this.HandleItemRemoveMoveReplace( node, e );
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Move:
-          case NotifyCollectionChangedAction.Replace:
-            {
-              //detect the case where the replace is targeted at a single item, replaced with himself.
-              //This particular case is there to handle the particularities of the DGCV with regards to
-              //IBindingList.ListChanged.ChangeType == ItemChanged.
-              if( ( e.Action == NotifyCollectionChangedAction.Replace ) &&
-                  ( e.OldItems.Count == 1 ) && ( e.NewItems.Count == 1 ) &&
-                  ( e.NewItems[ 0 ] == e.OldItems[ 0 ] ) )
-              {
-                // Getting a replace with the same instance should just do nothing.
-                //
-                // Note : We know that will prevent a row from refreshing correctly if the item 
-                // are not implementing a mechanic of notification ( like INotifyPropertyChanged ).
-
-                updateContainersIndex = false;
-              }
-              else
-              {
-                //any other case, normal handling
-                this.HandleItemRemoveMoveReplace( node, e );
-              }
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Reset:
-            {
-              this.HandleItemReset( node );
-            }
-            break;
-        }
-
-        if( updateContainersIndex )
-        {
-          this.UpdateContainersIndex();
-        }
-      }
-    }
-
-    private void OnGeneratorNodeExpansionStateChanged( object sender, ExpansionStateChangedEventArgs e )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeExpansionStateChanged, DataGridTraceArgs.Node( sender ) ) )
-      {
-
-        var node = sender as GeneratorNode;
-        Debug.Assert( node != null );
-
-        var changedNode = node.Parent as GroupGeneratorNode;
-        if( changedNode == null )
-        {
-          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeExpansionStateChanged, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( node.Parent ) );
-        }
-
-        //Determine if the changedNode is "below" a collapsed group (because if so, I don't need any sort of notification or removal ).
-        var parentGroupNode = changedNode.Parent as GroupGeneratorNode;
-        if( ( parentGroupNode != null ) && ( !parentGroupNode.IsComputedExpanded ) )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeExpansionStateChanged, DataGridTraceMessages.NodeIsCollapsed, DataGridTraceArgs.Node( node ) );
-          return;
-        }
-
-        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
-        nodeHelper.ReverseCalculateIndex();
-
-        //if the node was "Collapsed"
-        if( !e.NewExpansionState )
-        {
-          var startIndex = nodeHelper.Index + e.IndexOffset;
-          var containers = new List<DependencyObject>();
-
-          this.RemoveGeneratedItems( startIndex, startIndex + e.Count - 1, containers );
-          this.SendRemoveEvent( e.Count, containers );
-        }
-        //if the node was "Expanded" 
-        else
-        {
-          this.SendAddEvent( e.Count );
-        }
-      }
-    }
-
-    private void OnGroupGeneratorNodeIsExpandedChanging( object sender, EventArgs e )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanging, DataGridTraceArgs.Node( sender ) ) )
-      {
-        if( m_currentGenPosToIndexInhibiterDisposable != null )
-        {
-          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanging, DataGridTraceMessages.InhibiterAlreadySet );
-        }
-
-        m_currentGenPosToIndexInhibiterDisposable = this.InhibitParentGenPosToIndexUpdate();
-
-        var groupGeneratorNode = sender as GroupGeneratorNode;
-
-        if( ( m_dataGridContext != null )
-          && ( !m_dataGridContext.IsDeferRestoringState )
-          && ( !m_dataGridContext.IsRestoringState )
-          && ( m_dataGridControl != null )
-          && ( groupGeneratorNode != null )
-          && ( groupGeneratorNode.IsExpanded ) )
-        {
-          var tableflowItemsHost = m_dataGridControl.ItemsHost as TableflowViewItemsHost;
-          if( tableflowItemsHost != null )
-          {
-            tableflowItemsHost.OnGroupCollapsing( groupGeneratorNode.UIGroup );
-          }
-        }
-      }
-    }
-
-    private void OnGroupGeneratorNodeIsExpandedChanged( object sender, EventArgs e )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanged, DataGridTraceArgs.Node( sender ) ) )
-      {
-        var node = sender as GroupGeneratorNode;
-        if( node != null )
-        {
-          this.IncrementCurrentGenerationCount();
-        }
-        else
-        {
-          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanged, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( sender ) );
-        }
-
-        if( m_currentGenPosToIndexInhibiterDisposable != null )
-        {
-          m_currentGenPosToIndexInhibiterDisposable.Dispose();
-          m_currentGenPosToIndexInhibiterDisposable = null;
-        }
-      }
-    }
-
-    private void OnGeneratorNodeGroupsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) ) )
-      {
-        var node = sender as GroupGeneratorNode;
-        if( node == null )
-        {
-          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) );
-          return;
-        }
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceArgs.Node( sender ), DataGridTraceArgs.Action( e.Action ) );
-
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-            {
-              var count = default( int );
-              this.HandleParentGroupAddition( node, out count, e );
-
-              if( node.IsComputedExpanded )
-              {
-                this.IncrementCurrentGenerationCount();
-                this.SendAddEvent( count );
-              }
-              else
-              {
-                this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceMessages.NodeIsCollapsed, DataGridTraceArgs.Node( node ) );
-              }
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Move:
-            {
-              if( node.Child == null )
-                throw DataGridException.Create<DataGridInternalException>( "An attempt was made to move a group with a null child GeneratorNode.", m_dataGridControl );
-
-              Debug.Assert( e.OldStartingIndex != e.NewStartingIndex, "An attempt was made to move a group to the same location." );
-
-              this.HandleSameLevelGroupMove( node.Child, e );
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Remove:
-            {
-              if( node.Child == null )
-                throw DataGridException.Create<DataGridInternalException>( "An attempt was made to remove a group with a null child GeneratorNode.", m_dataGridControl );
-
-              var count = default( int );
-              var containers = new List<DependencyObject>();
-
-              this.HandleParentGroupRemove( node, out count, e, containers );
-
-              if( node.IsComputedExpanded )
-              {
-                this.IncrementCurrentGenerationCount();
-                this.SendRemoveEvent( count, containers );
-              }
-              else
-              {
-                this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged, DataGridTraceMessages.NodeIsCollapsed, DataGridTraceArgs.Node( node ) );
-              }
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Replace:
-            throw DataGridException.Create<NotSupportedException>( "Replace not supported at the moment on groups.", m_dataGridControl );
-
-          case NotifyCollectionChangedAction.Reset:
-            {
-              if( node.Child == null )
-                throw DataGridException.Create<DataGridInternalException>( "An attempt was made to reset a group with a null child GeneratorNode.", m_dataGridControl );
-
-              this.HandleSameLevelGroupReset( node.Child );
-            }
-            break;
-        }
-      }
-    }
-
-    private void OnGeneratorNodeHeadersFootersCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeHeadersFootersCollectionChanged ) )
-      {
-        if( this.IsHandlingGlobalItemsResetLocally )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeHeadersFootersCollectionChanged, DataGridTraceMessages.CannotProcessOnReset );
-          return;
-        }
-
-        if( this.Status == GeneratorStatus.GeneratingContainers )
-          throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-        var nodes = ( IEnumerable<HeadersFootersGeneratorNode> )sender;
-        Debug.Assert( nodes != null );
-        Debug.Assert( nodes.Any() );
-
-        e = e.GetRangeActionOrSelf();
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnGeneratorNodeHeadersFootersCollectionChanged, DataGridTraceArgs.Action( e.Action ) );
-
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-            this.HandleHeadersFootersAddition( nodes, e );
-            break;
-
-          case NotifyCollectionChangedAction.Remove:
-          case NotifyCollectionChangedAction.Move:
-          case NotifyCollectionChangedAction.Replace:
-            this.HandleHeadersFootersRemoveMoveReplace( nodes, e );
-            break;
-
-          case NotifyCollectionChangedAction.Reset:
-            this.HandleGlobalItemsReset();
-            break;
-        }
-      }
-    }
-
-    private void OnViewThemeChanged( object sender, EventArgs e )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-      if( m_startNode != null )
-      {
-        this.CleanupGenerator();
-      }
-
-      this.IncrementCurrentGenerationCount();
-    }
-
-    private void OnGroupConfigurationSelectorChanged()
-    {
-      this.CleanupGenerator();
-    }
-
-    private void OnRecyclingPoolsContainersRemoved( object sender, ContainersRemovedEventArgs e )
-    {
-      this.OnContainersRemoved( e.RemovedContainers );
-    }
-
-    private void ResetNodeList()
-    {
-      this.UpdateHeaders( m_dataGridContext.Headers );
-
-      int addCount;
-      this.SetupInitialItemsNodes( out addCount );
-
-      this.UpdateFooters( m_dataGridContext.Footers );
-    }
-
-    private int ClearItems()
-    {
-      //if the first item is not null, that means that we have items within the grid.
-      if( m_firstItem == null )
-        return 0;
-
-      var previous = m_firstItem.Previous;
-
-      //there are footers items
-      if( m_firstFooter != null )
-      {
-        //there is a previous item (headers present)
-        if( previous != null )
-        {
-          m_firstFooter.Previous.Next = null; //clear the next pointer from the last item
-          m_firstFooter.Previous = previous; //set the last header as the previous from the first footer
-          previous.Next = m_firstFooter; //set the first footer as the next from the last header
-        }
-        else
-        {
-          //there is no header present
-          m_firstFooter.Previous.Next = null; //set the last item next to null (protect again recursive clearing)
-          m_firstFooter.Previous = null; //make the first footer have not previous
-
-          m_startNode = m_firstFooter;
-        }
-      }
-      else
-      {
-        //There is no footers after the items.
-        if( previous != null )
-        {
-          //this means we have some headers before the items.
-          previous.Next = null;
-        }
-        else
-        {
-          //this means we have no headers before the items and no footers after.
-          m_startNode = null;
-        }
-      }
-
-      int removeCount;
-      int chainLength;
-      GeneratorNodeHelper.EvaluateChain( m_firstItem, out removeCount, out chainLength );
-
-      this.ClearLateGroupLevelDescriptions();
-      m_groupNodeMappingCache.Clear();
-
-      this.NodeFactory.CleanGeneratorNodeTree( m_firstItem );
-      m_firstItem = null;
-
-      this.InvalidateNodeTree();
-
-      return removeCount;
-    }
-
-    private void ClearRecyclingPools()
-    {
-      // Only the top most generator may clear the recycling pools.
-      if( m_dataGridContext.SourceDetailConfiguration != null )
-        return;
-
-      m_recyclingPools.Clear();
-    }
-
-    private int RemoveGeneratedItem( int index, IList<DependencyObject> removedContainers )
-    {
-      if( ( index < 0 ) || ( index >= m_genPosToIndex.Count ) )
-        return 0;
-
-      Debug.Assert( ( m_genPosToContainer.Count == m_genPosToIndex.Count )
-                 && ( m_genPosToIndex.Count == m_genPosToItem.Count )
-                 && ( m_genPosToItem.Count == m_genPosToNode.Count ) );
-
-      var item = m_genPosToItem[ index ];
-      var container = m_genPosToContainer[ index ];
-      var node = m_genPosToNode[ index ];
-
-      //remove the item from the 4 lists... (same as doing a "remove")
-      this.GenPosArraysRemoveAt( index );
-
-      if( removedContainers != null )
-      {
-        removedContainers.Insert( 0, container );
-      }
-
-      //to ensure this is only done once, check if the node associated with the container is a Detail or not
-      var detailNode = node as DetailGeneratorNode;
-      if( detailNode == null )
-      {
-        //Node for item is NOT a detail, can safelly remove the container locally (int this generator instance).
-        this.RemoveContainer( container, item );
-
-        return 1;
-      }
-      else
-      {
-        //node is from a detail relationship, calling a more appropriate detail generator for removal
-        return detailNode.DetailGenerator.RemoveGeneratedItem( container );
-      }
-    }
-
-    private int RemoveGeneratedItem( DependencyObject container )
-    {
-      var index = m_genPosToContainer.IndexOf( container );
-      if( index < 0 )
-        return 0;
-
-      return this.RemoveGeneratedItem( index, null );
-    }
-
-    private void RemoveGeneratedItems( int startIndex, int endIndex, IList<DependencyObject> removedContainers )
-    {
-      if( startIndex > endIndex )
-        return;
-
-      var count = m_genPosToIndex.Count;
-      if( ( count <= 0 ) || ( m_genPosToIndex[ 0 ] > endIndex ) || ( m_genPosToIndex[ count - 1 ] < startIndex ) )
-        return;
-
-      Debug.Assert( ( m_genPosToContainer.Count == m_genPosToIndex.Count )
-                 && ( m_genPosToIndex.Count == m_genPosToItem.Count )
-                 && ( m_genPosToItem.Count == m_genPosToNode.Count ) );
-
-      //cycle through the list of generated items, and see if any items are generated between the indexes in the removed range.
-      //start from the end so that removing an item will not cause the indexes to shift.
-      for( var i = count - 1; i >= 0; i-- )
-      {
-        var index = m_genPosToIndex[ i ];
-
-        //if the item is within the range removed
-        if( ( index >= startIndex ) && ( index <= endIndex ) )
-        {
-          //this will ensure to recurse the call to the appropriate Detail Generator for clearing of the container.
-          //otherwise, it will only remove it from the list of container generated in the current generator instance.
-          this.RemoveGeneratedItem( i, removedContainers );
-        }
-      }
-    }
-
-    private void RemoveGeneratedItems( GeneratorNode referenceNode, IList<DependencyObject> removedContainers )
-    {
-      var toRemove = new List<GeneratorNode>();
-
-      toRemove.Add( referenceNode );
-
-      var itemsNode = referenceNode as ItemsGeneratorNode;
-      if( itemsNode != null )
-      {
-        if( itemsNode.Details != null )
-        {
-          //cycle through all the details currently mapped to the reference node
-          foreach( var detailsForNode in itemsNode.Details )
-          {
-            foreach( var detailNode in detailsForNode.Value )
-            {
-              toRemove.Add( detailNode );
-            }
-          }
-        }
-      }
-
-      //cycle through the list of generated items, and see if any items are from the reference node passed.
-      //start from the end so that removing an item will not cause the indexes to shift
-      for( int i = m_genPosToNode.Count - 1; i >= 0; i-- )
-      {
-        var node = m_genPosToNode[ i ];
-
-        //if the item is within the range removed
-        if( toRemove.Contains( node ) )
-        {
-          //this will ensure to recurse the call to the appropriate Detail Generator for clearing of the container.
-          //otherwise, it will only remove it from the list of container generated in the current generator instance.
-          this.RemoveGeneratedItem( i, removedContainers );
-        }
-      }
-    }
-
-    private void RemoveAllGeneratedItems()
-    {
-      Debug.Assert( this.IsHandlingGlobalItemsReset, "A flag is not set." );
-
-      //Call RemoveAllGeneratedItems() on all the detail generators
-      foreach( var generator in this.GetDetailGenerators() )
-      {
-        generator.RemoveAllGeneratedItems();
-      }
-
-      //then we can clean the list of items of items generated held by this generator
-      var genCountRemoved = m_genPosToNode.Count;
-
-      //start from the end so that removing an item will not cause the indexes to shift
-      for( int i = genCountRemoved - 1; i >= 0; i-- )
-      {
-        var node = m_genPosToNode[ i ];
-        var container = m_genPosToContainer[ i ];
-
-        //if item is NOT a detail
-        if( !( node is DetailGeneratorNode ) )
-        {
-          // Clear it.
-          this.RemoveContainer( container, m_genPosToItem[ i ] );
-        }
-
-        //Note: there is no need to call "RemoveContainer" on the "detail" items... since RemoveAllGeneratedItems() was called 
-        //      on all detail generators already.
-        this.GenPosArraysRemoveAt( i );
-      }
-    }
-
-    private bool RemoveGeneratedItems( HeadersFootersGeneratorNode referenceNode, object referenceItem, IList<DependencyObject> removedContainers )
-    {
-
-      //cycle through the list of generated items, and see if any items are generated between the indexes in the removed range.
-      //start from the end so that removing an item will not cause the indexes to shift
-      for( int i = m_genPosToNode.Count - 1; i >= 0; i-- )
-      {
-        var node = m_genPosToNode[ i ];
-
-        //if the item is within the range removed
-        if( node == referenceNode )
-        {
-          var item = m_genPosToItem[ i ];
-
-          if( item.Equals( referenceItem ) )
-          {
-            var container = m_genPosToContainer[ i ];
-
-            if( removedContainers != null )
-            {
-              removedContainers.Add( container );
-            }
-
-            this.RemoveContainer( container, referenceItem );
-            this.GenPosArraysRemoveAt( i );
-
-            return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
-    private void RemoveContainer( DependencyObject container, object dataItem )
-    {
-      m_dataGridControl.ClearItemContainer( container, dataItem );
-
-      var isContainerRecycled = false;
-
-      if( this.IsRecyclingEnabled )
-      {
-        isContainerRecycled = this.EnqueueContainer( container, dataItem );
-
-        var dataItemStore = container.ReadLocalValue( CustomItemContainerGenerator.DataItemPropertyProperty ) as DataItemDataProviderBase;
-        if( dataItemStore != null )
-        {
-          dataItemStore.ClearDataItem();
-        }
-      }
-
-      //If recycling is not enabled, or if the container could not be enqueued, make sure it is removed from the DataGridItemsHost's child collection.
-      if( !isContainerRecycled )
-      {
-        Debug.Assert( container != null );
-        this.OnContainersRemoved( new DependencyObject[] { container } );
-      }
-    }
-
-    private void RemoveDetailContainers( IEnumerable<DependencyObject> containers )
-    {
-      if( containers == null )
-        return;
-
-      var toRemove = new HashSet<DependencyObject>( containers );
-      if( toRemove.Count <= 0 )
-        return;
-
-      for( int i = m_genPosToContainer.Count - 1; i >= 0; i-- )
-      {
-        if( !toRemove.Contains( m_genPosToContainer[ i ] ) )
-          continue;
-
-        this.GenPosArraysRemoveAt( i );
-      }
-    }
-
-    private void GenPosArraysRemoveAt( int index )
-    {
-      //remove the item from the 4 lists... (same as doing a "remove")
-      var itemsNode = m_genPosToNode[ index ] as ItemsGeneratorNode;
-
-      // Unlock DataVirtualization hold on item's page.
-      if( itemsNode != null )
-      {
-        this.UpdateDataVirtualizationLockForItemsNode( itemsNode, m_genPosToItem[ index ], false );
-      }
-
-      this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_GenPosArraysRemoveAt, DataGridTraceMessages.ContainerRemoved, DataGridTraceArgs.Container( m_genPosToContainer[ index ] ), DataGridTraceArgs.Node( m_genPosToNode[ index ] ), DataGridTraceArgs.Item( m_genPosToItem[ index ] ), DataGridTraceArgs.GeneratorIndex( index ), DataGridTraceArgs.Index( m_genPosToIndex[ index ] ) );
-
-      m_genPosToContainer.RemoveAt( index );
-      m_genPosToIndex.RemoveAt( index );
-      m_genPosToItem.RemoveAt( index );
-      m_genPosToNode.RemoveAt( index );
-    }
-
-    private void UpdateHeaders( IList headers )
-    {
-      //If the m_firstHeader is not NULL, then there is nothing to do, since the Header node contains an  observable collection
-      //which we monitor otherwise.
-      if( m_firstHeader != null )
-        return;
-
-      //create the node(s) that would contain the headers
-      m_firstHeader = this.CreateHeaders( headers );
-
-      int count;
-      int chainLength;
-      GeneratorNodeHelper.EvaluateChain( m_firstHeader, out count, out chainLength );
-
-      //if there was items present in the linked list.
-      if( m_startNode != null )
-      {
-        //headers are automatically inserted at the beginning
-        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        nodeHelper.InsertBefore( m_firstHeader );
-      }
-      else
-      {
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_UpdateHeaders, DataGridTraceMessages.NewTreeCreated, DataGridTraceArgs.Node( m_firstHeader ) );
-      }
-
-      //set the start node as the first header node.
-      m_startNode = m_firstHeader;
-
-      this.InvalidateNodeTree();
-    }
-
-    private void UpdateFooters( IList footers )
-    {
-      //If the m_firstHeader is not NULL, then there is nothing to do, since the Header node contains an  observable collection
-      //which we monitor otherwise.
-      if( m_firstFooter != null )
-        return;
-
-      //create the node(s) that would contain the footers
-      m_firstFooter = this.CreateFooters( footers );
-
-      //if there are no footers, then the m_firstFooter will remain null
-      if( m_firstFooter != null )
-      {
-        int count;
-        int chainLength;
-        GeneratorNodeHelper.EvaluateChain( m_firstFooter, out count, out chainLength );
-
-        //if there was items present in the linked list.
-        if( m_startNode != null )
-        {
-          //since we called ClearFooters earlier, I can just go at the end of the list of items
-          GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-          nodeHelper.MoveToEnd();
-          nodeHelper.InsertAfter( m_firstFooter );
-        }
-        else
-        {
-          m_startNode = m_firstFooter;
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_UpdateFooters, DataGridTraceMessages.NewStartNode, DataGridTraceArgs.Node( m_startNode ) );
-        }
-      }
-
-      this.InvalidateNodeTree();
-    }
-
-    private HeadersFootersGeneratorNode CreateHeaders( IList headers )
-    {
-      return this.NodeFactory.CreateHeadersFootersGeneratorNode( headers, null, null, null );
-    }
-
-    private HeadersFootersGeneratorNode CreateFooters( IList footers )
-    {
-      return this.NodeFactory.CreateHeadersFootersGeneratorNode( footers, null, null, null );
-    }
-
-    private GeneratorNode SetupInitialItemsNodes( out int addCount )
-    {
-      addCount = 0;
-
-      var newItemNode = default( GeneratorNode );
-
-      this.RefreshGroupsCollection();
-
-      //this function should only be called when the m_firstItem is null.
-      if( m_groupsCollection != null )
-      {
-        newItemNode = this.CreateGroupListFromCollection( m_groupsCollection, null );
-      }
-      else
-      {
-        newItemNode = this.CreateStandaloneItemsNode();
-      }
-
-      //if the node is non-null, then that's because there was items in the collection
-      if( newItemNode != null )
-      {
-        m_firstItem = newItemNode;
-
-        int chainLength;
-        GeneratorNodeHelper.EvaluateChain( m_firstItem, out addCount, out chainLength );
-
-        //find the appropriate point to inject the Items nodes...
-        if( m_startNode != null )
-        {
-          //if there is a footer node, then the insertion point is just before the footer node (if there is anything before!)
-          if( m_firstFooter != null )
-          {
-            var originalPrevious = m_firstFooter.Previous;
-            var nodeHelper = new GeneratorNodeHelper( m_firstFooter, 0, 0 ); //do not care about index!
-
-            nodeHelper.InsertBefore( m_firstItem );
-
-            if( originalPrevious == null ) //that means that the first footer is the first item
-            {
-              m_startNode = newItemNode;
-            }
-          }
-          else if( m_firstHeader != null ) //if there is no footer but some headers, add it at the end.
-          {
-            var nodeHelper = new GeneratorNodeHelper( m_firstHeader, 0, 0 ); //do not care about index!
-
-            nodeHelper.MoveToEnd();
-            nodeHelper.InsertAfter( m_firstItem );
-          }
-          else
-          {
-            //this case should not be possible: no header, no footers but there is a startNode
-            throw DataGridException.Create<DataGridInternalException>( "No start node found for the current GeneratorNode.", m_dataGridControl );
-          }
-        }
-        else
-        {
-          m_startNode = m_firstItem;
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_SetupInitialItemsNodes, DataGridTraceMessages.NewStartNode, DataGridTraceArgs.Node( m_startNode ) );
-        }
-
-        this.InvalidateNodeTree();
-      }
-
-      return newItemNode;
-    }
-
-    private void RefreshGroupsCollection()
-    {
-      var groupsCollection = m_collectionView.Groups;
-      if( m_groupsCollection == groupsCollection )
-        return;
-
-      if( m_groupsCollection != null )
-      {
-        CollectionChangedEventManager.RemoveListener( m_groupsCollection, this );
-      }
-
-      m_groupsCollection = groupsCollection;
-
-      if( m_groupsCollection != null )
-      {
-        CollectionChangedEventManager.AddListener( m_groupsCollection, this );
-      }
-    }
-
-    private GeneratorNode CreateStandaloneItemsNode()
-    {
-      var list = CustomItemContainerGenerator.GetList( m_collectionView );
-
-      return this.NodeFactory.CreateItemsGeneratorNode( list, null, null, null );
-    }
-
-    private GeneratorNode CreateGroupListFromCollection( IList collection, GeneratorNode parentNode )
-    {
-      if( collection.Count == 0 )
-        return null;
-
-      var rootNode = default( GeneratorNode );
-      var previousNode = default( GeneratorNode );
-      var actualNode = default( GroupGeneratorNode );
-      var childNode = default( GeneratorNode );
-      var level = ( parentNode == null ) ? 0 : parentNode.Level + 1;
-
-      GroupConfiguration groupConfig;
-      bool initiallyExpanded;
-
-      var groupDescriptions = DataGridContext.GetGroupDescriptionsHelper( m_collectionView );
-      var groupConfigurationSelector = m_dataGridContext.GroupConfigurationSelector;
-      var lateGroupLevelDescription = this.CreateOrGetLateGroupLevelDescription( level, groupDescriptions );
-
-      foreach( CollectionViewGroup group in collection )
-      {
-        groupConfig = GroupConfiguration.GetGroupConfiguration( m_dataGridContext, groupDescriptions, groupConfigurationSelector, level, group );
-        Debug.Assert( groupConfig != null );
-
-        if( groupConfig.UseDefaultHeadersFooters )
-        {
-          groupConfig.AddDefaultHeadersFooters();
-        }
-
-        initiallyExpanded = groupConfig.InitiallyExpanded;
-
-        actualNode = ( GroupGeneratorNode )this.NodeFactory.CreateGroupGeneratorNode( group, parentNode, previousNode, null, groupConfig );
-        actualNode.UIGroup = new Group( actualNode, group, lateGroupLevelDescription, m_dataGridContext );
-
-        m_groupNodeMappingCache.Add( group, actualNode );
-
-        if( rootNode == null )
-        {
-          rootNode = actualNode;
-        }
-
-        previousNode = actualNode;
-
-        //Independently if the Group is the bottom level or not, we need to setup GroupHeaders
-        childNode = this.SetupGroupHeaders( groupConfig, actualNode );
-        actualNode.Child = childNode;
-
-        var childNodeHelper = new GeneratorNodeHelper( childNode, 0, 0 ); //do not care about index.
-        childNodeHelper.MoveToEnd(); //extensibility, just in case SetupGroupHeaders() ever return a node list.
-
-        var subItems = group.GetItems();
-
-        //if the node newly created is not the bottom level
-        if( !group.IsBottomLevel )
-        {
-          if( ( subItems != null ) && ( subItems.Count > 0 ) )
-          {
-            var subGroupsNode = this.CreateGroupListFromCollection( subItems as IList, actualNode );
-            if( subGroupsNode != null )
-            {
-              childNodeHelper.InsertAfter( subGroupsNode );
-            }
-          }
-        }
-        else
-        {
-          //this is the bottom level, create an Items node
-          var itemsNode = this.NodeFactory.CreateItemsGeneratorNode( subItems as IList, actualNode, null, null );
-          if( itemsNode != null )
-          {
-            childNodeHelper.InsertAfter( itemsNode );
-          }
-        }
-
-        childNodeHelper.InsertAfter( this.SetupGroupFooters( groupConfig, actualNode ) );
-      }
-
-      return rootNode;
-    }
-
-    private LateGroupLevelDescription CreateOrGetLateGroupLevelDescription( int level, IList<GroupDescription> groupDescriptions )
-    {
-      Debug.Assert( groupDescriptions != null );
-
-      if( ( m_groupLevelDescriptionCache == null ) || ( level >= m_groupLevelDescriptionCache.Length ) )
-      {
-        var newSize = Math.Max( level + 1, groupDescriptions.Count );
-        Array.Resize<LateGroupLevelDescription>( ref m_groupLevelDescriptionCache, newSize );
-      }
-
-      var item = m_groupLevelDescriptionCache[ level ];
-      if( item == null )
-      {
-        var groupDescription = groupDescriptions[ level ];
-        Debug.Assert( groupDescription != null );
-
-        item = new LateGroupLevelDescription( groupDescription, m_dataGridContext.GroupLevelDescriptions );
-        m_groupLevelDescriptionCache[ level ] = item;
-      }
-
-      return item;
-    }
-
-    private void ClearLateGroupLevelDescriptions()
-    {
-      if( m_groupLevelDescriptionCache == null )
-        return;
-
-      for( int i = 0; i < m_groupLevelDescriptionCache.Length; i++ )
-      {
-        var item = m_groupLevelDescriptionCache[ i ];
-        if( item == null )
-          continue;
-
-        item.Clear();
-      }
-
-      m_groupLevelDescriptionCache = null;
-    }
-
-    private GeneratorNode SetupGroupFooters( GroupConfiguration groupConfig, GeneratorNode actualNode )
-    {
-      if( groupConfig == null )
-        return new GeneratorNode( actualNode );
-
-      return this.NodeFactory.CreateHeadersFootersGeneratorNode( groupConfig.Footers, actualNode, null, null );
-    }
-
-    private GeneratorNode SetupGroupHeaders( GroupConfiguration groupConfig, GeneratorNode actualNode )
-    {
-      if( groupConfig == null )
-        return new GeneratorNode( actualNode );
-
-      return this.NodeFactory.CreateHeadersFootersGeneratorNode( groupConfig.Headers, actualNode, null, null );
-    }
-
-    private void HandleParentGroupRemove( GeneratorNode parent, out int countRemoved, NotifyCollectionChangedEventArgs e, IList<DependencyObject> removedContainers )
-    {
-      var nodeHelper = new GeneratorNodeHelper( parent, 0, 0 ); //do not care about index (for now).
-
-      // start by moving to the first child... of the node (GroupHeaders node, most probably).
-      // false parameter is to prevent skipping over a collapsed node (item count 0 )
-      if( !nodeHelper.MoveToChild( false ) )
-        //could not advance to the child item so there is no items to be removed...
-        throw DataGridException.Create<DataGridInternalException>( "No child item in the group to remove.", m_dataGridControl );
-
-      this.HandleSameLevelGroupRemove( nodeHelper.CurrentNode, out countRemoved, e, removedContainers );
-    }
-
-    private void HandleSameLevelGroupRemove( GeneratorNode firstChild, out int countRemoved, NotifyCollectionChangedEventArgs e, IList<DependencyObject> removedContainers )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupRemove ) )
-      {
-        countRemoved = 0;
-
-        var nodeHelper = new GeneratorNodeHelper( firstChild, 0, 0 );
-        nodeHelper.ReverseCalculateIndex();
-
-        //Advance to the first "Group" node (skip the GroupHeaders)
-        while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
-        {
-          if( !nodeHelper.MoveToNext() )
-            throw DataGridException.Create<DataGridInternalException>( "Unable to move to next GeneratorNode.", m_dataGridControl );
-        }
-
-        //then move up to the removal start point.
-        if( !nodeHelper.MoveToNextBy( e.OldStartingIndex ) )
-          throw DataGridException.Create<DataGridInternalException>( "Unable to move to the requested generator index.", m_dataGridControl );
-
-        var startNode = nodeHelper.CurrentNode as GroupGeneratorNode;
-        var removeIndex = -1;
-
-        //Only fetch the index if the group itself is not "collapsed" or under a collapsed group already
-        if( ( startNode.IsExpanded == startNode.IsComputedExpanded ) && ( startNode.ItemCount > 0 ) )
-        {
-          removeIndex = nodeHelper.Index;
-        }
-
-        //retrieve the generator position for the first item to remove.
-        this.ProcessGroupRemoval( startNode, e.OldItems.Count, true, out countRemoved );
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupRemove, DataGridTraceMessages.GroupNodeRemoved, DataGridTraceArgs.Node( startNode ), DataGridTraceArgs.ItemCount( countRemoved ) );
-
-        //Clean the chain "isolated" previously
-        this.NodeFactory.CleanGeneratorNodeTree( startNode );
-
-        if( removeIndex >= 0 )
-        {
-          this.RemoveGeneratedItems( removeIndex, removeIndex + countRemoved - 1, removedContainers );
-        }
-      }
-    }
-
-    private GroupGeneratorNode ProcessGroupRemoval( GeneratorNode startNode, int removeCount, bool updateGroupNodeMappingCache, out int countRemoved )
-    {
-      countRemoved = 0;
-
-      var nodeHelper = new GeneratorNodeHelper( startNode, 0, 0 ); //index not important.
-      var parentGroup = startNode.Parent as GroupGeneratorNode;
-      var i = 0;
-
-      do
-      {
-        var group = nodeHelper.CurrentNode as GroupGeneratorNode;
-        if( group == null )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_ProcessGroupRemoval, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( nodeHelper.CurrentNode ) );
-        }
-        else
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ProcessGroupRemoval, DataGridTraceMessages.GroupNodeRemoved, DataGridTraceArgs.Node( group ), DataGridTraceArgs.ItemCount( group.ItemCount ) );
-        }
-
-        if( updateGroupNodeMappingCache )
-        {
-          m_groupNodeMappingCache.Remove( group.CollectionViewGroup );
-        }
-
-        //add the total number of child to the count of items removed.
-        countRemoved += group.ItemCount;
-
-        i++;
-
-        if( i < removeCount )
-        {
-          if( !nodeHelper.MoveToNext() )
-            throw DataGridException.Create<DataGridInternalException>( "Could not move to the last node to be removed.", m_dataGridControl );
-        }
-      }
-      while( i < removeCount );
-
-      //disconnect the node chain to be removed from the linked list.
-      var previous = startNode.Previous;
-      var next = nodeHelper.CurrentNode.Next;
-
-      if( next != null )
-      {
-        next.Previous = previous;
-      }
-
-      if( previous != null )
-      {
-        previous.Next = next;
-      }
-
-      //if the first node removed was the first child of its parent
-      if( ( parentGroup != null ) && ( parentGroup.Child == startNode ) )
-      {
-        //set the next in line after the chain to be removed as the first child
-        parentGroup.Child = next;
-      }
-
-      //break the link between the chain and its same-level siblings.
-      nodeHelper.CurrentNode.Next = null;
-      startNode.Previous = null;
-
-      //Here, I need a special handling case... If I remove the first group node, I need to set a new firstItem
-      if( startNode == m_firstItem )
-      {
-        if( next != m_firstFooter )
-        {
-          m_firstItem = next;
-        }
-        else
-        {
-          m_firstItem = null;
-        }
-
-        if( m_startNode == startNode )
-        {
-          m_startNode = next;
-        }
-
-        this.InvalidateNodeTree();
-      }
-
-      if( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
-      {
-        this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_ProcessGroupRemoval, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.LastNode( nodeHelper.CurrentNode ) );
-      }
-
-      return ( GroupGeneratorNode )nodeHelper.CurrentNode;
-    }
-
-    private void HandleSameLevelGroupReset( GeneratorNode node )
-    {
-      Debug.Assert( node != null );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupReset ) )
-      {
-        var parentNode = node.Parent as GroupGeneratorNode;
-        var oldGroups = new List<CollectionViewGroup>();
-        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
-
-        do
-        {
-          var groupNode = nodeHelper.CurrentNode as GroupGeneratorNode;
-          if( groupNode != null )
-          {
-            Debug.Assert( groupNode.CollectionViewGroup != null );
-            oldGroups.Add( groupNode.CollectionViewGroup );
-          }
-        }
-        while( nodeHelper.MoveToNext() );
-
-        var newGroups = ( parentNode != null )
-                          ? parentNode.CollectionViewGroup.GetItems().Cast<CollectionViewGroup>().ToList()
-                          : m_groupsCollection.Cast<CollectionViewGroup>().ToList();
-
-        // If nothing has changed, avoid the heavy process of finding out which groups have been added,
-        // removed and moved.
-        if( newGroups.Count == oldGroups.Count )
-        {
-          if( newGroups.SequenceEqual( oldGroups ) )
-            return;
-        }
-
-        var groupsAdded = new HashSet<CollectionViewGroup>();
-        var groupsRemoved = new HashSet<CollectionViewGroup>();
-        var groupsMoved = new HashSet<CollectionViewGroup>();
-
-        CustomItemContainerGenerator.FindChanges( oldGroups, newGroups, groupsAdded, groupsRemoved, groupsMoved );
-        this.ApplyGroupChanges( node, oldGroups, newGroups, groupsAdded, groupsRemoved, groupsMoved );
-      }
-    }
-
-    private void ApplyGroupChanges(
-      GeneratorNode node,
-      IList<CollectionViewGroup> oldGroups,
-      IList<CollectionViewGroup> newGroups,
-      ICollection<CollectionViewGroup> groupsAdded,
-      ICollection<CollectionViewGroup> groupsRemoved,
-      ICollection<CollectionViewGroup> groupsMoved )
-    {
-      Debug.Assert( node != null );
-
-      var parentNode = node.Parent as GroupGeneratorNode;
-      var insertAfter = !( node is GroupGeneratorNode );
-
-      if( ( groupsRemoved.Count > 0 ) || ( groupsMoved.Count > 0 ) )
-      {
-        var removeNodeHelper = new GeneratorNodeHelper( m_groupNodeMappingCache[ oldGroups.Last() ], 0, 0 );
-        removeNodeHelper.ReverseCalculateIndex();
-
-        for( int i = oldGroups.Count - 1; i >= 0; i-- )
-        {
-          var group = oldGroups[ i ];
-          var removed = groupsRemoved.Contains( group );
-          var moved = ( !removed && groupsMoved.Contains( group ) );
-
-          if( removed || moved )
-          {
-            var groupNode = removeNodeHelper.CurrentNode;
-            Debug.Assert( ( groupNode != null ) && ( groupNode == m_groupNodeMappingCache[ group ] ) );
-
-            if( groupNode == node )
-            {
-              Debug.Assert( !( groupNode.Previous is GroupGeneratorNode ), "How come the node was not the first GroupGeneratorNode." );
-
-              node = groupNode.Next;
-              insertAfter = false;
-            }
-
-            var startIndex = removeNodeHelper.Index;
-            int count;
-
-            removeNodeHelper.MoveToPrevious();
-
-            if( removed )
-            {
-              this.ProcessGroupRemoval( groupNode, 1, true, out count );
-              this.NodeFactory.CleanGeneratorNodeTree( groupNode );
-            }
-            else
-            {
-              this.ProcessGroupRemoval( groupNode, 1, false, out count );
-            }
-
-            if( count > 0 )
-            {
-              this.RemoveGeneratedItems( startIndex, startIndex + count - 1, null );
-            }
-          }
-          else
-          {
-            removeNodeHelper.MoveToPrevious();
-          }
-        }
-      }
-
-      if( ( groupsAdded.Count > 0 ) || ( groupsMoved.Count > 0 ) )
-      {
-        var firstGroup = newGroups[ 0 ];
-        var added = groupsAdded.Contains( firstGroup );
-        var moved = ( !added && groupsMoved.Contains( firstGroup ) );
-
-        if( added || moved )
-        {
-          var groupNode = default( GeneratorNode );
-
-          if( added )
-          {
-            groupNode = this.CreateGroupListFromCollection( new object[] { firstGroup }, parentNode );
-          }
-          else
-          {
-            groupNode = m_groupNodeMappingCache[ firstGroup ];
-          }
-
-          Debug.Assert( groupNode != null );
-
-          if( node != null )
-          {
-            var addNodeHelper = new GeneratorNodeHelper( node, 0, 0 );
-
-            if( insertAfter )
-            {
-              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.PreviousNode( addNodeHelper.CurrentNode ) );
-              addNodeHelper.InsertAfter( groupNode );
-            }
-            else
-            {
-              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.NextNode( addNodeHelper.CurrentNode ) );
-              addNodeHelper.InsertBefore( groupNode );
-              insertAfter = true;
-            }
-
-            if( parentNode == null )
-            {
-              if( m_startNode == m_firstItem )
-              {
-                m_startNode = groupNode;
-              }
-
-              m_firstItem = groupNode;
-
-              this.InvalidateNodeTree();
-            }
-          }
-          else
-          {
-            if( parentNode == null )
-            {
-              m_firstItem = groupNode;
-
-              if( m_startNode != null )
-              {
-                if( m_firstFooter != null )
-                {
-                  var addNodeHelper = new GeneratorNodeHelper( m_firstFooter, 0, 0 );
-
-                  this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.NextNode( addNodeHelper.CurrentNode ) );
-                  addNodeHelper.InsertBefore( groupNode );
-                }
-                else if( m_firstHeader != null )
-                {
-                  var addNodeHelper = new GeneratorNodeHelper( m_firstHeader, 0, 0 );
-                  addNodeHelper.MoveToEnd();
-
-                  this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.PreviousNode( addNodeHelper.CurrentNode ) );
-                  addNodeHelper.InsertAfter( groupNode );
-                }
-                else
-                {
-                  throw DataGridException.Create<DataGridInternalException>( "No start node found for the current GeneratorNode.", m_dataGridControl );
-                }
-              }
-              else
-              {
-                m_startNode = groupNode;
-              }
-
-              this.InvalidateNodeTree();
-            }
-            else
-            {
-              Debug.Assert( parentNode.Child != null );
-
-              var addNodeHelper = new GeneratorNodeHelper( parentNode.Child, 0, 0 );
-              addNodeHelper.MoveToEnd();
-
-              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.PreviousNode( addNodeHelper.CurrentNode ) );
-              addNodeHelper.InsertAfter( groupNode );
-            }
-          }
-
-          node = groupNode;
-        }
-
-        for( var i = 1; i < newGroups.Count; i++ )
-        {
-          var group = newGroups[ i ];
-
-          added = groupsAdded.Contains( group );
-          moved = ( !added && groupsMoved.Contains( group ) );
-
-          if( !added && !moved )
-            continue;
-
-          var groupNode = default( GeneratorNode );
-
-          if( added )
-          {
-            groupNode = this.CreateGroupListFromCollection( new object[] { group }, parentNode );
-          }
-          else
-          {
-            groupNode = m_groupNodeMappingCache[ group ];
-          }
-
-          Debug.Assert( groupNode != null );
-
-          var addNodeHelper = new GeneratorNodeHelper( m_groupNodeMappingCache[ newGroups[ i - 1 ] ], 0, 0 );
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_ApplyGroupChanges, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( groupNode ), DataGridTraceArgs.PreviousNode( addNodeHelper.CurrentNode ) );
-          addNodeHelper.InsertAfter( groupNode );
-        }
-      }
-
-      this.IncrementCurrentGenerationCount();
-      this.SendResetEvent();
-    }
-
-    private void HandleSameLevelGroupMove( GeneratorNode node, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupMove ) )
-      {
-        var parentGroup = node.Parent as GroupGeneratorNode;
-
-        //Start a NodeHelper on the first child of the node where the move occured.
-        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 );
-        nodeHelper.ReverseCalculateIndex(); //determine index of the node.
-
-        //Advance to the first "Group" node (skip the GroupHEaders)
-        while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
-        {
-          if( !nodeHelper.MoveToNext() )
-            throw DataGridException.Create<DataGridInternalException>( "Unable to move to next GeneratorNode.", m_dataGridControl );
-        }
-
-        //then move up to the removal start point.
-        if( !nodeHelper.MoveToNextBy( e.OldStartingIndex ) )
-          throw DataGridException.Create<DataGridInternalException>( "Unable to move to the requested generator index.", m_dataGridControl );
-
-        //remember the current node as the start point of the move (will be used when "extracting the chain")
-        var startNode = nodeHelper.CurrentNode;
-        //also remember the index of the node, to calculate range of elements to remove (containers )
-        var startIndex = nodeHelper.Index;
-
-        //then, cumulate the total number of items in the groups concerned
-        var totalCountRemoved = 0;
-
-        node = this.ProcessGroupRemoval( startNode, e.OldItems.Count, false, out totalCountRemoved );
-
-        //send a message to the panel to remove the visual elements concerned 
-        var containers = new List<DependencyObject>();
-
-        this.RemoveGeneratedItems( startIndex, startIndex + totalCountRemoved - 1, containers );
-        this.SendRemoveEvent( totalCountRemoved, containers );
-
-        //reset the node parameter for the "re-addition"
-        node = ( parentGroup != null ) ? parentGroup.Child : m_firstItem;
-
-        if( node == null )
-          throw DataGridException.Create<DataGridInternalException>( "No node found to move.", m_dataGridControl );
-
-        //Once the chain was pulled out, re-insert it at the appropriate location.
-        nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //do not care about the index for what I need
-
-        //Advance to the first "Group" node (skip the GroupHEaders)
-        while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
-        {
-          if( !nodeHelper.MoveToNext() )
-            throw DataGridException.Create<DataGridInternalException>( "Unable to move to next GeneratorNode.", m_dataGridControl );
-        }
-
-        bool insertBefore = nodeHelper.MoveToNextBy( e.NewStartingIndex );
-
-        if( insertBefore )
-        {
-          if( nodeHelper.CurrentNode == m_firstItem )
-          {
-            if( m_startNode == m_firstItem )
-            {
-              m_startNode = startNode;
-            }
-
-            m_firstItem = startNode;
-
-            this.InvalidateNodeTree();
-          }
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupMove, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( startNode ), DataGridTraceArgs.NextNode( nodeHelper.CurrentNode ), DataGridTraceArgs.ItemCount( totalCountRemoved ) );
-          nodeHelper.InsertBefore( startNode );
-        }
-        else
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupMove, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( startNode ), DataGridTraceArgs.PreviousNode( nodeHelper.CurrentNode ), DataGridTraceArgs.ItemCount( totalCountRemoved ) );
-          nodeHelper.InsertAfter( startNode );
-        }
-
-        //and finally, call to increment the generation count for the generator content
-        this.IncrementCurrentGenerationCount();
-      }
-    }
-
-    private void HandleSameLevelGroupAddition( GeneratorNode firstChild, out int countAdded, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupAddition ) )
-      {
-        if( ( firstChild.Parent != null ) && !( firstChild.Parent is GroupGeneratorNode ) )
-        {
-          this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupAddition, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( firstChild.Parent ) );
-        }
-
-        var newNodeChain = this.CreateGroupListFromCollection( e.NewItems, firstChild.Parent );
-
-        countAdded = 0;
-        if( newNodeChain != null )
-        {
-          int chainLength;
-          GeneratorNodeHelper.EvaluateChain( newNodeChain, out countAdded, out chainLength );
-
-          var nodeHelper = default( GeneratorNodeHelper );
-          var insertAfter = false;
-
-          // Instead of counting groups to insert the group chain, we may locate right away the GroupGeneratorNode that
-          // preceed the insertion point.  This will give us a performance boost when there are lots of groups.
-          if( e.NewStartingIndex > 0 )
-          {
-            IList groups;
-
-            if( firstChild.Parent != null )
-            {
-              var parentGroup = ( ( GroupGeneratorNode )firstChild.Parent ).CollectionViewGroup;
-
-              groups = ( parentGroup != null ) ? parentGroup.Items : null;
-            }
-            else
-            {
-              groups = m_groupsCollection;
-            }
-
-            if( ( groups != null ) && ( groups.Count > 0 ) )
-            {
-              Debug.Assert( e.NewStartingIndex <= groups.Count );
-
-              var previousGroup = ( CollectionViewGroup )groups[ e.NewStartingIndex - 1 ];
-              var previousGroupNode = default( GroupGeneratorNode );
-
-              if( m_groupNodeMappingCache.TryGetValue( previousGroup, out previousGroupNode ) )
-              {
-                nodeHelper = new GeneratorNodeHelper( previousGroupNode, 0, 0 ); //do not care about index.
-                insertAfter = true;
-              }
-            }
-          }
-
-          // We could not find the insertion point efficiently, use a fallback strategy.
-          if( nodeHelper == null )
-          {
-            nodeHelper = new GeneratorNodeHelper( firstChild, 0, 0 ); //do not care about index.
-
-            while( !( nodeHelper.CurrentNode is GroupGeneratorNode ) )
-            {
-              if( !nodeHelper.MoveToNext() )
-              {
-                //if there are no items and no groups in the Group Node, then we will never find a GroupGeneratorNode...
-                //However, the structure of the group/headers/footers/group headers/groups footers makes it so 
-                //that inserting before the last item (footer/group footer) will place the group at the appropriate location.
-                break;
-              }
-            }
-
-            //If there is 0 group in the parent group, then this loop will exit without executing the control block once...
-            for( int i = 0; i < e.NewStartingIndex; i++ )
-            {
-              if( !nodeHelper.MoveToNext() )
-              {
-                insertAfter = true;
-              }
-            }
-          }
-
-          Debug.Assert( nodeHelper != null );
-
-          //if we are inserting past the end of the linked list level.
-          if( insertAfter )
-          {
-            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupAddition, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( newNodeChain ), DataGridTraceArgs.PreviousNode( nodeHelper.CurrentNode ), DataGridTraceArgs.ItemCount( countAdded ) );
-            nodeHelper.InsertAfter( newNodeChain );
-          }
-          else
-          {
-            this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleSameLevelGroupAddition, DataGridTraceMessages.GroupNodeAdded, DataGridTraceArgs.Node( newNodeChain ), DataGridTraceArgs.NextNode( nodeHelper.CurrentNode ), DataGridTraceArgs.ItemCount( countAdded ) );
-            nodeHelper.InsertBefore( newNodeChain );
-          }
-
-
-          //If the insertion point is the beginning, check that the node pointers are updated properly
-          if( ( e.NewStartingIndex == 0 ) && ( ( firstChild.Parent == null ) ) )
-          {
-            if( m_startNode == m_firstItem )
-            {
-              m_startNode = newNodeChain;
-            }
-
-            m_firstItem = newNodeChain;
-
-            this.InvalidateNodeTree();
-          }
-        }
-      }
-    }
-
-    private void HandleParentGroupAddition( GeneratorNode parent, out int countAdded, NotifyCollectionChangedEventArgs e )
-    {
-      var nodeHelper = new GeneratorNodeHelper( parent, 0, 0 ); //do not care about index (for now).
-
-      //start by moving to the first child... of the node (GroupHeaders node, most probably).
-      if( !nodeHelper.MoveToChild( false ) ) 
-        throw DataGridException.Create<DataGridInternalException>( "Could not move to the child node to be removed.", m_dataGridControl );
-
-      this.HandleSameLevelGroupAddition( nodeHelper.CurrentNode, out countAdded, e );
-    }
-
-    private void HandleItemAddition( ItemsGeneratorNode node, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleItemAddition, DataGridTraceArgs.Node( node ) ) )
-      {
-        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //index not important for now.
-        var itemCount = e.NewItems.Count;
-
-        node.AdjustItemCount( itemCount );
-        node.AdjustLeafCount( itemCount );
-        this.OffsetDetails( node, e.NewStartingIndex, itemCount );
-
-        if( node.IsComputedExpanded )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleItemAddition, DataGridTraceMessages.ItemAdded, DataGridTraceArgs.ItemCount( itemCount ) );
-
-          this.IncrementCurrentGenerationCount();
-          this.SendAddEvent( itemCount );
-        }
-        else
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleItemAddition, DataGridTraceMessages.CollapsedItemAdded, DataGridTraceArgs.ItemCount( itemCount ) );
-        }
-      }
-    }
-
-    private void HandleItemRemoveMoveReplace( ItemsGeneratorNode node, NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action == NotifyCollectionChangedAction.Remove )
-      {
-        node.AdjustItemCount( -e.OldItems.Count );
-        node.AdjustLeafCount( -e.OldItems.Count );
-      }
-
-      var nodeStartIndex = e.OldStartingIndex;
-      var nodeEndIndex = nodeStartIndex + e.OldItems.Count - 1;
-      var detailCountToRemove = CustomItemContainerGenerator.ComputeDetailsCount( node, nodeStartIndex, nodeEndIndex );
-      var detailCountBeforeRemovedItems = 0;
-
-      if( nodeStartIndex > 0 )
-      {
-        detailCountBeforeRemovedItems = CustomItemContainerGenerator.ComputeDetailsCount( node, 0, nodeStartIndex - 1 );
-      }
-
-      var removeCount = e.OldItems.Count + detailCountToRemove;
-      var replaceCount = ( e.Action == NotifyCollectionChangedAction.Replace ) ? e.NewItems.Count : 0;
-      var startIndex = -1;
-      var endIndex = -1;
-
-      // We must memorize the range of items that we are going to remove before starting any action.
-      if( node.IsComputedExpanded )
-      {
-        var nodeHelper = new GeneratorNodeHelper( node, 0, 0 ); //index not important for now.
-        nodeHelper.ReverseCalculateIndex();
-
-        startIndex = nodeHelper.Index + e.OldStartingIndex + detailCountBeforeRemovedItems;
-        endIndex = startIndex + detailCountToRemove + e.OldItems.Count - 1;
-      }
-
-      //Remove the details from the ItemsGeneratorNode and re-index the other details appropriatly.
-      this.RemoveDetails( node, nodeStartIndex, nodeEndIndex, replaceCount );
-
-      //Try to remap the old item for detail remapping (will do nothing if item has no details )
-      foreach( var oldItem in e.OldItems )
-      {
-        this.QueueDetailItemForRemapping( oldItem );
-      }
-
-      var raiseEvent = false;
-      var removedContainers = default( List<DependencyObject> );
-
-      // Remove the matching realized containers.
-      if( node.IsComputedExpanded )
-      {
-        raiseEvent = true;
-        removedContainers = new List<DependencyObject>();
-
-        Debug.Assert( ( startIndex >= 0 ) && ( endIndex >= 0 ) );
-
-        this.RemoveGeneratedItems( startIndex, endIndex, removedContainers );
-      }
-
-      if( e.Action == NotifyCollectionChangedAction.Move )
-      {
-        this.OffsetDetails( node, e.NewStartingIndex, e.NewItems.Count );
-      }
-
-      if( raiseEvent )
-      {
-        Debug.Assert( removedContainers != null );
-
-        this.IncrementCurrentGenerationCount();
-        this.SendRemoveEvent( removeCount, removedContainers );
-
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Move:
-          case NotifyCollectionChangedAction.Replace:
-            {
-              this.SendAddEvent( e.NewItems.Count );
-            }
-            break;
-
-          case NotifyCollectionChangedAction.Remove:
-            // There is nothing to do.
-            break;
-
-          case NotifyCollectionChangedAction.Add:
-          case NotifyCollectionChangedAction.Reset:
-            throw DataGridException.Create<NotSupportedException>( "Add or Reset not supported at the moment on groups.", m_dataGridControl );
-        }
-      }
-    }
-
-    private void HandleHeadersFootersAddition( IEnumerable<HeadersFootersGeneratorNode> nodes, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleHeadersFootersAddition ) )
-      {
-        var itemCount = e.NewItems.Count;
-        var notify = false;
-
-        foreach( var node in nodes )
-        {
-          node.AdjustItemCount( itemCount );
-          notify = notify || node.IsComputedExpanded;
-        }
-
-        if( notify )
-        {
-          this.IncrementCurrentGenerationCount();
-
-          this.SendResetEvent();
-        }
-        else
-        {
-          //There is no need to regenerate the containers.  However, we still need to update the realized containers source index.
-          this.UpdateContainersIndex();
-        }
-      }
-    }
-
-    private void HandleHeadersFootersRemoveMoveReplace( IEnumerable<HeadersFootersGeneratorNode> nodes, NotifyCollectionChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleHeadersFootersRemoveMoveReplace ) )
-      {
-        Debug.Assert( e.OldItems != null );
-
-        var itemCount = ( ( e.NewItems != null ) ? e.NewItems.Count : 0 ) - e.OldItems.Count;
-        var notify = false;
-
-        foreach( var node in nodes )
-        {
-          node.AdjustItemCount( itemCount );
-
-          if( node.IsComputedExpanded )
-          {
-            notify = true;
-
-            var parentGroup = node.Parent as GroupGeneratorNode;
-
-            foreach( var item in e.OldItems )
-            {
-              var targetItem = ( parentGroup != null ) ? new GroupHeaderFooterItem( parentGroup.CollectionViewGroup, item ) : item;
-
-              this.RemoveGeneratedItems( node, targetItem, null );
-            }
-          }
-        }
-
-        if( notify )
-        {
-          this.IncrementCurrentGenerationCount();
-
-          this.SendResetEvent();
-        }
-        else
-        {
-          //There is no need to regenerate the containers.  However, we still need to update the realized containers source index.
-          this.UpdateContainersIndex();
-        }
-      }
-    }
-
-    private void UpdateContainersIndex()
-    {
-      if( ( m_startNode == null ) || ( m_genPosToItem.Count <= 0 ) )
-        return;
-
-      var collectionView = m_collectionView.SourceCollection as DataGridCollectionView;
-      if( collectionView != null )
-      {
-        for( int i = 0; i < m_genPosToItem.Count; i++ )
-        {
-          // If we're not on an ItemsGeneratorNode, it means we are not on a DataRow, so no need to process it (all ItemIndex == -1 in this case).
-          if( !( m_genPosToNode[ i ] is ItemsGeneratorNode ) )
-            continue;
-
-          // There is no need to find the node or the item within the node since it should match the CollectionView.
-          var sourceIndex = collectionView.GetGlobalSortedIndexFromDataItem( m_genPosToItem[ i ] );
-
-          DataGridVirtualizingPanel.SetItemIndex( m_genPosToContainer[ i ], sourceIndex );
-        }
-      }
-      else
-      {
-        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-        for( int i = 0; i < m_genPosToItem.Count; i++ )
-        {
-          // If we're not on an ItemsGeneratorNode, it means we are not on a DataRow, so no need to process it (all ItemIndex == -1 in this case).
-          var node = m_genPosToNode[ i ] as ItemsGeneratorNode;
-          if( node == null )
-            continue;
-
-          int offset = -1;
-
-          if( nodeHelper.FindNode( node ) && ( nodeHelper.FindItem( m_genPosToItem[ i ] ) >= 0 ) )
-          {
-            offset = node.IndexOf( m_genPosToItem[ i ] );
-          }
-
-          // If not a DGCV, it means there are no details, so this will work fine.
-          var sourceIndex = ( offset >= 0 )
-                              ? nodeHelper.SourceDataIndex + offset
-                              : -1;
-
-          DataGridVirtualizingPanel.SetItemIndex( m_genPosToContainer[ i ], sourceIndex );
-        }
-      }
-    }
-
-    private void OffsetDetails( ItemsGeneratorNode node, int startIndex, int addOffset )
-    {
-      if( ( node.Details == null ) || ( node.Details.Count == 0 ) )
-        return;
-
-      var detailsCount = node.Details.Count;
-      var keys = new int[ detailsCount ];
-      node.Details.Keys.CopyTo( keys, 0 );
-
-      Array.Sort<int>( keys );
-
-      for( int i = detailsCount - 1; i >= 0; i-- )
-      {
-        var key = keys[ i ];
-        if( key >= startIndex )
-        {
-          List<DetailGeneratorNode> details;
-          if( !node.Details.TryGetValue( key, out details ) )
-            throw DataGridException.Create<DataGridInternalException>( "Key not found in Details dictionary.", m_dataGridControl );
-
-          node.Details.Remove( key );
-          node.Details.Add( key + addOffset, details );
-        }
-      }
-    }
-
-    private void RemoveDetails( ItemsGeneratorNode node, int nodeStartIndex, int nodeEndIndex, int replaceCount )
-    {
-      if( ( node.Details == null ) || ( node.Details.Count == 0 ) )
-        return;
-
-      var removeCount = nodeEndIndex - nodeStartIndex + 1 - replaceCount;
-      //Note: If a replace was invoked, replace count will be greater than 0, and will be used to properly re-offset the 
-      //details beyond the initial remove range.
-
-      //Note2: for the case of a move or remove, the replace count must remain 0, so that the other details are correctly offseted.
-
-      var keys = new int[ node.Details.Count ];
-      node.Details.Keys.CopyTo( keys, 0 );
-
-      Array.Sort<int>( keys );
-
-      var countDetailsRemoved = 0;
-
-      foreach( int key in keys )
-      {
-        //if the key is below the remove range, do not do anything with the dictionary entry
-
-        //If the key match the remove range, remove the dictionary entry ( clear and queue remap )
-        if( ( key >= nodeStartIndex ) && ( key <= nodeEndIndex ) )
-        {
-          List<DetailGeneratorNode> details;
-          if( node.Details.TryGetValue( key, out details ) )
-          {
-            //sum them
-            foreach( var detailNode in details )
-            {
-              countDetailsRemoved += detailNode.ItemCount;
-            }
-            details.Clear(); //note: detail generators will be "closed" by another section of code (Remap floating details).
-
-            node.Details.Remove( key );
-
-            if( node.Details.Count == 0 )
-            {
-              node.Details = null;
-            }
-          }
-          else
-          {
-            //Key not found in the dictionary, something wrong is going on.
-            throw DataGridException.Create<DataGridInternalException>( "Key not found in Details dictionary within the remove range.", m_dataGridControl );
-          }
-        }
-        //If the key is above the remove range, re-key it appropriatly.
-        else if( key > nodeEndIndex )
-        {
-          List<DetailGeneratorNode> details;
-          if( node.Details.TryGetValue( key, out details ) )
-          {
-            node.Details.Remove( key );
-            node.Details.Add( key - removeCount, details );
-          }
-          else
-          {
-            //Key not found in the dictionary, something wrong is going on.
-            throw DataGridException.Create<DataGridInternalException>( "Key not found in Details dictionary above the remove range.", m_dataGridControl );
-          }
-        }
-      }
-
-      //if some details have been "disconnected"
-      if( countDetailsRemoved > 0 )
-      {
-        node.AdjustItemCount( -countDetailsRemoved );
-      }
-    }
-
-    private static int ComputeDetailsCount( ItemsGeneratorNode node, int startIndex, int endIndex )
-    {
-      int detailCount = 0;
-
-      if( node.Details != null )
-      {
-        //add the detail grids for the items into the calculation of what to remove.
-        for( int i = startIndex; i <= endIndex; i++ )
-        {
-          List<DetailGeneratorNode> details;
-          if( node.Details.TryGetValue( i, out details ) )
-          {
-            foreach( var detailNode in details )
-            {
-              detailCount += detailNode.ItemCount;
-            }
-          }
-        }
-      }
-
-      return detailCount;
-    }
-
-    private void HandleItemReset( ItemsGeneratorNode node )
-    {
-      Debug.Assert( node != null );
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleItemReset ) )
-      {
-        var oldItems = new List<object>();
-        var newItems = new IListWrapper( node.Items );
-        var oldItemsFound = new HashSet<object>();
-
-        for( int i = 0; i < m_genPosToNode.Count; i++ )
-        {
-          var currentNode = m_genPosToNode[ i ];
-          var currentItem = default( object );
-
-          if( currentNode == node )
-          {
-            currentItem = m_genPosToItem[ i ];
-          }
-          // Since some details of an unrealized item may be realized, we need to consider the unrealized
-          // item as if it was realized or the details containers may not be properly ordered in the
-          // internal data structure.
-          else if( currentNode is DetailGeneratorNode )
-          {
-            currentItem = ( ( DetailGeneratorNode )currentNode ).DetailContext.ParentItem;
-          }
-          else
-          {
-            continue;
-          }
-
-          Debug.Assert( currentItem != null );
-          if( !oldItemsFound.Add( currentItem ) )
-            continue;
-
-          oldItems.Add( currentItem );
-        }
-
-        ICollection<object> itemsRemoved;
-        ICollection<object> itemsMoved;
-
-        if( this.IsDataVirtualized( node ) )
-        {
-          // Since the items collection is doning data virtualization, we do not want to enumerate items.
-          // Instead, we will simply remove the containers that were linked to old items to requery the items
-          // on demand.
-          itemsRemoved = new HashSet<object>( oldItems );
-          itemsMoved = new HashSet<object>();
-        }
-        else
-        {
-          itemsRemoved = new HashSet<object>();
-          itemsMoved = new HashSet<object>();
-
-          // Since the old items collection contains only items that are realized, we must be aware
-          // that the collections for the items moved or removed are for realized items only.  Other
-          // items may have moved or were removed and we are not aware of it.
-          CustomItemContainerGenerator.FindChanges( oldItems, newItems, null, itemsRemoved, itemsMoved );
-        }
-
-        this.ApplyItemChanges( node, newItems, itemsRemoved, itemsMoved );
-      }
-    }
-
-    private void HandleGlobalItemsReset()
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleGlobalItemsReset ) )
-      {
-        this.ForceReset = false;
-
-        if( this.IsHandlingGlobalItemsResetLocally )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_HandleGlobalItemsReset, DataGridTraceMessages.CannotProcessOnReset );
-          return;
-        }
-
-        if( m_startNode == null )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_HandleGlobalItemsReset, DataGridTraceMessages.EmptyTree );
-          return;
-        }
-
-        using( this.SetIsHandlingGlobalItemsResetLocally() )
-        {
-          this.RemoveAllGeneratedItems();
-
-          //No need to clean any more Master/Detail stuff, effectivelly, the call to ClearItems() below will clean the nodes themselves...
-          //generator will then be able to remap.
-
-          //if there are items to start with!!!
-          if( m_firstItem != null )
-          {
-            m_dataGridControl.SaveDataGridContextState( m_dataGridContext, true, int.MaxValue );
-
-            //requeue all opened details for remapping!
-            foreach( object item in m_masterToDetails.Keys )
-            {
-              this.QueueDetailItemForRemapping( item );
-            }
-
-            //then clear the items nodes
-            this.ClearItems();
-            this.RefreshGroupsCollection();
-
-            //increment the generation count... to ensure that further calls to the index based functions are not messed up.
-            this.IncrementCurrentGenerationCount();
-
-            //Note: There is no need to Clear the recyclingManager since this only represents a reset of the Items (not the headers and footers nodes)
-            //and that the list of containers to be recycled is not "invalidated"
-
-          }
-
-          this.SendResetEvent();
-        }
-      }
-    }
-
-    private void ApplyItemChanges(
-      ItemsGeneratorNode node,
-      IList<object> newItems,
-      ICollection<object> itemsRemoved,
-      ICollection<object> itemsMoved )
-    {
-      Debug.Assert( node != null );
-      Debug.Assert( newItems != null );
-      Debug.Assert( itemsRemoved != null );
-      Debug.Assert( itemsMoved != null );
-
-      // IMPORTANT: The items removed and moved collection contains realized items that have moved
-      //            or have been removed.  It is possible that some of the items that were not
-      //            realized have moved or have been removed and we are unaware of it.  We must
-      //            consider this possibility in the following algorithm.
-
-      var detailEntries = node.Details;
-      var detailNodes = new HashSet<GeneratorNode>();
-      var detailNodesByItem = new Dictionary<object, List<DetailGeneratorNode>>();
-      var isDataVirtualized = this.IsDataVirtualized( node );
-
-      // The first thing to do is to remove all details that are linked to items that are not in the final result set.
-      if( detailEntries != null )
-      {
-        var itemCount = 0;
-
-        foreach( var detailEntry in detailEntries.ToList() )
-        {
-          var i = 0;
-          var detailList = detailEntry.Value;
-
-          while( i < detailList.Count )
-          {
-            var detailNode = detailList[ i ];
-            var masterItem = detailNode.DetailContext.ParentItem;
-
-            // Since the items removed collection is for realized item only, we must take a look
-            // at the final result set in case the item was unrealized and removed.
-            if( isDataVirtualized || itemsRemoved.Contains( masterItem ) || !newItems.Contains( masterItem ) )
-            {
-              itemCount += detailNode.ItemCount;
-              detailList.RemoveAt( i );
-
-              // Put the detail aside and close it properly later.
-              this.RemoveGeneratedItems( detailNode, null );
-              this.QueueDetailItemForRemapping( masterItem );
-            }
-            else
-            {
-              // Keep a list of active detail nodes and their order.  We will need those later in the algorithm.
-              detailNodes.Add( detailNode );
-
-              var detailNodesList = default( List<DetailGeneratorNode> );
-              if( !detailNodesByItem.TryGetValue( masterItem, out detailNodesList ) )
-              {
-                detailNodesList = new List<DetailGeneratorNode>( 1 );
-                detailNodesByItem.Add( masterItem, detailNodesList );
-              }
-
-              Debug.Assert( detailNodesList != null );
-              detailNodesList.Add( detailNode );
-
-              i++;
-            }
-          }
-
-          if( detailList.Count <= 0 )
-          {
-            detailEntries.Remove( detailEntry.Key );
-          }
-        }
-
-        if( detailEntries.Count <= 0 )
-        {
-          node.Details = null;
-        }
-
-        node.AdjustItemCount( -itemCount );
-      }
-
-      // The next thing to do is to remove the containers for the realized items that were removed.
-      if( itemsRemoved.Count > 0 )
-      {
-        for( int i = m_genPosToItem.Count - 1; i >= 0; i-- )
-        {
-          if( !itemsRemoved.Contains( m_genPosToItem[ i ] ) )
-            continue;
-
-          this.RemoveGeneratedItem( i, null );
-        }
-      }
-
-      // Now that everything that needed to be removed was removed, we will repair the collection
-      // that is used as a link between items and detail nodes.
-      if( detailNodes.Count > 0 )
-      {
-        Debug.Assert( detailEntries != null );
-        Debug.Assert( detailEntries == node.Details );
-        Debug.Assert( !isDataVirtualized );
-
-        detailEntries.Clear();
-
-        for( int i = 0; i < newItems.Count; i++ )
-        {
-          var masterItem = newItems[ i ];
-          var detailNodesList = default( List<DetailGeneratorNode> );
-
-          if( detailNodesByItem.TryGetValue( masterItem, out detailNodesList ) )
-          {
-            detailNodesByItem.Remove( masterItem );
-            detailEntries.Add( i, detailNodesList );
-          }
-        }
-
-        Debug.Assert( ( detailNodesByItem.Count == 0 ), "The detail nodes should have been reinserted properly." );
-      }
-      else
-      {
-        Debug.Assert( ( detailEntries == null ) || ( detailEntries.Count == 0 ) );
-        Debug.Assert( node.Details == null );
-      }
-
-      // The next thing to do is to reorder the containers within the internal data structure so it match
-      // the ordering of the realized items that have moved.
-      if( itemsMoved.Count > 0 )
-      {
-        Debug.Assert( !isDataVirtualized );
-
-        var insertionIndex = default( int? );
-        var itemGenPosEntries = new Dictionary<object, DependencyObject>();
-        var detailGenPosEntries = new Dictionary<GeneratorNode, IList<Tuple<object, DependencyObject>>>();
-
-        // Remove the entries within the data structure that are linked to the current node or one of its detail.
-        {
-          var i = 0;
-
-          while( i < m_genPosToNode.Count )
-          {
-            var currentNode = m_genPosToNode[ i ];
-
-            // We have found a container that is linked to one of the data item.
-            if( currentNode == node )
-            {
-              itemGenPosEntries.Add( m_genPosToItem[ i ], m_genPosToContainer[ i ] );
-            }
-            // We have found a container that is part of a detail that is linked to one of the data item.
-            else if( detailNodes.Contains( currentNode ) )
-            {
-              var detailInfos = default( IList<Tuple<object, DependencyObject>> );
-
-              if( !detailGenPosEntries.TryGetValue( currentNode, out detailInfos ) )
-              {
-                detailInfos = new List<Tuple<object, DependencyObject>>();
-                detailGenPosEntries.Add( currentNode, detailInfos );
-              }
-
-              Debug.Assert( detailInfos != null );
-              detailInfos.Add( new Tuple<object, DependencyObject>( m_genPosToItem[ i ], m_genPosToContainer[ i ] ) );
-            }
-            // The container as nothing to do with the node we are looking for or one of its detail.
-            else
-            {
-              i++;
-              continue;
-            }
-
-            // Remove the entries from the internal data structure.
-            this.GenPosArraysRemoveAt( i );
-
-            // Keep a reference on the first location a removal occurred.
-            if( !insertionIndex.HasValue )
-            {
-              insertionIndex = i;
-            }
-          }
-        }
-
-        // We must reinsert all entries that have been removed in the last step in appropriate order.
-        if( insertionIndex.HasValue )
-        {
-          var index = insertionIndex.Value;
-
-          for( int i = 0; i < newItems.Count; i++ )
-          {
-            var currentItem = newItems[ i ];
-            var currentContainer = default( DependencyObject );
-
-            if( itemGenPosEntries.TryGetValue( currentItem, out currentContainer ) )
-            {
-              itemGenPosEntries.Remove( currentItem );
-
-              // The value inserted as the index is not important and will be updated at the last step of the algorithmn.
-              m_genPosToContainer.Insert( index, currentContainer );
-              m_genPosToIndex.Insert( index, int.MinValue );
-              m_genPosToItem.Insert( index, currentItem );
-              m_genPosToNode.Insert( index, node );
-
-              index++;
-            }
-
-            if( ( detailEntries != null ) && ( detailEntries.Count > 0 ) )
-            {
-              var detailNodesList = default( List<DetailGeneratorNode> );
-
-              if( detailEntries.TryGetValue( i, out detailNodesList ) && ( detailNodesList != null ) )
-              {
-                foreach( var detailNode in detailNodesList )
-                {
-                  var detailInfos = default( IList<Tuple<object, DependencyObject>> );
-                  if( !detailGenPosEntries.TryGetValue( detailNode, out detailInfos ) )
-                    continue;
-
-                  detailGenPosEntries.Remove( detailNode );
-
-                  foreach( var detailInfo in detailInfos )
-                  {
-                    // The value inserted as the index is not important and will be updated at the last step of the algorithmn.
-                    m_genPosToContainer.Insert( index, detailInfo.Item2 );
-                    m_genPosToIndex.Insert( index, int.MinValue );
-                    m_genPosToItem.Insert( index, detailInfo.Item1 );
-                    m_genPosToNode.Insert( index, detailNode );
-
-                    index++;
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        Debug.Assert( ( itemGenPosEntries.Count == 0 ), "The containers should have been reinserted properly." );
-        Debug.Assert( ( detailGenPosEntries.Count == 0 ), "The detail containers should have been reinserted properly." );
-      }
-
-      // The last thing to do is to update the indexes and raise a notification.
-      this.IncrementCurrentGenerationCount();
-      this.SendResetEvent();
-    }
-
-    private void ApplyDetailChanges(
-      DetailGeneratorNode node,
-      IList<DependencyObject> newContainers,
-      ICollection<DependencyObject> containersRemoved,
-      ICollection<DependencyObject> containersMoved )
-    {
-      Debug.Assert( node != null );
-      Debug.Assert( newContainers != null );
-      Debug.Assert( containersRemoved != null );
-      Debug.Assert( containersMoved != null );
-
-      // The first thing to do is to remove the containers for the realized items that were removed.
-      if( containersRemoved.Count > 0 )
-      {
-        for( int i = m_genPosToContainer.Count - 1; i >= 0; i-- )
-        {
-          if( !containersRemoved.Contains( m_genPosToContainer[ i ] ) )
-            continue;
-
-          this.RemoveGeneratedItem( i, null );
-        }
-      }
-
-      // The next thing to do is to reorder the containers within the internal data structure so it match
-      // the ordering of the realized containers that have moved.
-      if( containersMoved.Count > 0 )
-      {
-        var insertionIndex = default( int? );
-        var entries = new Dictionary<DependencyObject, object>();
-
-        // Remove the entries within the data structure that are linked to the detail node.
-        {
-          var i = 0;
-
-          while( i < m_genPosToNode.Count )
-          {
-            var currentNode = m_genPosToNode[ i ];
-
-            // We have found a container that is linked to the desired node.
-            if( currentNode == node )
-            {
-              entries.Add( m_genPosToContainer[ i ], m_genPosToItem[ i ] );
-
-              // Remove the entries from the internal data structure.
-              this.GenPosArraysRemoveAt( i );
-
-              // Keep a reference on the first location a removal occurred.
-              if( !insertionIndex.HasValue )
-              {
-                insertionIndex = i;
-              }
-            }
-            // The container as nothing to do with the node we are looking.
-            else
-            {
-              i++;
-            }
-          }
-        }
-
-        // We must reinsert all entries that have been removed in the last step in appropriate order.
-        if( insertionIndex.HasValue )
-        {
-          var index = insertionIndex.Value;
-
-          for( int i = 0; i < newContainers.Count; i++ )
-          {
-            var currentContainer = newContainers[ i ];
-            var currentItem = default( object );
-
-            if( entries.TryGetValue( currentContainer, out currentItem ) )
-            {
-              entries.Remove( currentContainer );
-
-              // The value inserted as the index is not important and will be updated at the last step of the algorithmn.
-              m_genPosToContainer.Insert( index, currentContainer );
-              m_genPosToIndex.Insert( index, int.MinValue );
-              m_genPosToItem.Insert( index, currentItem );
-              m_genPosToNode.Insert( index, node );
-
-              index++;
-            }
-          }
-        }
-
-        Debug.Assert( ( entries.Count == 0 ), "The containers should have been reinserted properly." );
-      }
-
-      // The last thing to do is to update the indexes and raise a notification.
-      this.IncrementCurrentGenerationCount();
-      this.SendResetEvent();
-    }
-
-    internal void EnsureNodeTreeCreated()
-    {
-      //This is done to ensure that any public interface function called get an "up to date" generator content when being accessed.
-
-      // No reentrency is allowed for this method
-      // to avoid any problem.
-      if( this.IsNodeTreeValid || this.IsEnsuringNodeTreeCreated )
-        return;
-
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_EnsureNodeTreeCreated ) )
-      using( this.SetIsEnsuringNodeTreeCreated() )
-      {
-        if( m_startNode == null )
-        {
-          int addCount;
-
-          this.UpdateHeaders( m_dataGridContext.Headers );
-          this.SetupInitialItemsNodes( out addCount );
-          this.UpdateFooters( m_dataGridContext.Footers );
-
-          this.IncrementCurrentGenerationCount();
-        }
-        else if( m_firstItem == null )
-        {
-          this.HandleItemsRecreation();
-        }
-
-        this.EnsureDetailsNodeTreeCreated();
-        this.RemapFloatingDetails();
-
-        m_dataGridControl.RestoreDataGridContextState( m_dataGridContext );
-      }
-
-      // The current method will need to be called again.  The data source is most probably not set yet.
-      if( ( m_startNode == null ) || ( m_firstItem == null ) || ( m_floatingDetails.Count != 0 ) )
-      {
-        this.InvalidateNodeTree();
-      }
-    }
-
-    private void EnsureDetailsNodeTreeCreated()
-    {
-      if( m_masterToDetails.Count == 0 )
-        return;
-
-      Debug.Assert( this.IsEnsuringNodeTreeCreated, "The method EnsureDetailsNodeTreeCreated should have been called from EnsureNodeTreeCreated." );
-
-      foreach( var generator in this.GetDetailGenerators().ToList() )
-      {
-        generator.EnsureNodeTreeCreated();
-      }
-    }
-
-    private void HandleItemsRecreation()
-    {
-      //Then, since its a Reset, recreates the Items nodes.
-      int resetAddCount;
-
-      var addNode = this.SetupInitialItemsNodes( out resetAddCount );
-      if( addNode != null )
-      {
-        this.IncrementCurrentGenerationCount();
-      }
-    }
-
-    private void UpdateGenPosToIndexList()
-    {
-      if( m_startNode == null )
-        return;
-
-      //after the modification to have the item count stored "locally" in the DetailGeneratorNodes,
-      //it becomes important to have the nodes updated when the layout of the items changes.
-      foreach( var detailNode in this.GetDetailGeneratorNodes() )
-      {
-        detailNode.UpdateItemCount();
-      }
-
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      var cachedDetailNode = default( DetailGeneratorNode );
-      var cachedDetailNodeIndex = -1;
-      var previousDetailIndex = -1;
-
-      //loop through the realized items. By design they are present sequentially in the linked list, so I do not need to reset the GeneratorNodeHelper
-      for( int i = 0; i < m_genPosToItem.Count; i++ )
-      {
-        var item = m_genPosToItem[ i ];
-        var node = m_genPosToNode[ i ];
-        var detailNode = node as DetailGeneratorNode;
-
-        int index;
-
-        if( detailNode == null )
-        {
-          if( !nodeHelper.FindNode( node ) )
-            throw DataGridException.Create<DataGridInternalException>( "Realized item not found.", m_dataGridControl );
-
-          index = nodeHelper.FindItem( item );
-          if( index < 0 )
-            throw DataGridException.Create<DataGridInternalException>( "Realized item not found.", m_dataGridControl );
-
-          var itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
-          if( itemsNode != null )
-          {
-            index = nodeHelper.Index + itemsNode.IndexOf( item );
-          }
-        }
-        else
-        {
-          if( cachedDetailNode != detailNode )
-          {
-            cachedDetailNodeIndex = this.FindGlobalIndexForDetailNode( detailNode );
-            cachedDetailNode = detailNode;
-            previousDetailIndex = -1;
-          }
-
-          var detailIndex = detailNode.DetailGenerator.IndexFromRealizedItem( item, previousDetailIndex + 1, out previousDetailIndex );
-          if( detailIndex < 0 )
-            throw DataGridException.Create<DataGridInternalException>( "Realized item not found at detail level.", m_dataGridControl );
-
-          index = cachedDetailNodeIndex + detailIndex;
-        }
-
-        if( ( i > 0 ) && ( index <= m_genPosToIndex[ i - 1 ] ) )
-          throw DataGridException.Create<DataGridInternalException>( "Realized item re-indexed at wrong location.", m_dataGridControl );
-
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_UpdateGenPosToIndexList, DataGridTraceMessages.IndexUpdated, DataGridTraceArgs.Container( m_genPosToContainer[ i ] ), DataGridTraceArgs.Node( m_genPosToNode[ i ] ), DataGridTraceArgs.Item( m_genPosToItem[ i ] ), DataGridTraceArgs.GeneratorIndex( i ), DataGridTraceArgs.From( m_genPosToIndex[ i ] ), DataGridTraceArgs.To( index ) );
-
-        m_genPosToIndex[ i ] = index;
-      }
-    }
-
-    private int IndexFromRealizedItem( object referenceItem, int startIndex, out int foundIndex )
-    {
-      int retval = -1;
-      foundIndex = startIndex;
-
-      for( int i = startIndex; i < m_genPosToIndex.Count; i++ )
-      {
-        object item = m_genPosToItem[ i ];
-
-        if( item == referenceItem )
-        {
-          foundIndex = i;
-          retval = m_genPosToIndex[ i ];
-          break;
-        }
-      }
-
-      return retval;
-    }
-
-    private int FindGlobalIndexForDetailNode( DetailGeneratorNode detailNode )
-    {
-      foreach( var masterItemToDetails in m_masterToDetails )
-      {
-        var detailsNodes = masterItemToDetails.Value;
-        var detailIndex = detailsNodes.IndexOf( detailNode );
-        if( detailIndex < 0 )
-          continue;
-
-        var parentItem = masterItemToDetails.Key;
-        var offset = detailsNodes.Take( detailIndex ).Sum( item => item.ItemCount - 1 );
-
-        var index = m_genPosToItem.IndexOf( parentItem );
-
-        if( index >= 0 )
-        {
-          if( m_genPosToNode[ index ] is ItemsGeneratorNode )
-            return offset + detailIndex + m_genPosToIndex[ index ] + 1;
-        }
-
-        // Look for parent item index the old way.
-        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-        var parentItemIndex = nodeHelper.FindItem( parentItem );
-        if( parentItemIndex < 0 )
-          throw DataGridException.Create<DataGridInternalException>( "Master item index is out of bound.", m_dataGridControl );
-
-        return offset + detailIndex + parentItemIndex + 1;
-      }
-
-      return -1;
-    }
-
-    private void StartGenerator( GeneratorPosition startPos, GeneratorDirection direction )
-    {
-      if( this.Status == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<InvalidOperationException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-      m_generatorStatus = GeneratorStatus.GeneratingContainers;
-      m_generatorDirection = direction;
-      m_generatorCurrentGlobalIndex = this.IndexFromGeneratorPosition( startPos );
-
-      var itemCount = this.ItemCount;
-      if( ( m_generatorCurrentGlobalIndex < 0 ) || ( m_generatorCurrentGlobalIndex >= itemCount ) )
-        return;
-
-      //and create a node helper that will assist us during the Generation process...
-      m_generatorNodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 ); // start index is always 0
-
-      //position the GeneratorNodeHelper to the appropriate node
-      if( !m_generatorNodeHelper.FindNodeForIndex( m_generatorCurrentGlobalIndex ) ) //find index?!?!
-        //there was a problem moving the Node helper... 
-        throw DataGridException.Create<DataGridInternalException>( "Unable to move to the required generator node by using the current index.", m_dataGridControl );
-
-      //Calculate the offset
-      m_generatorCurrentOffset = m_generatorCurrentGlobalIndex - m_generatorNodeHelper.Index;
-
-      var itemsNode = m_generatorNodeHelper.CurrentNode as ItemsGeneratorNode;
-      if( itemsNode != null )
-      {
-        m_generatorCurrentDetail = itemsNode.GetDetailNodeForIndex( m_generatorCurrentOffset, out m_generatorCurrentOffset, out m_generatorCurrentDetailIndex, out m_generatorCurrentDetailNodeIndex );
-      }
-
-      if( m_generatorCurrentDetail != null )
-      {
-        // No detail generator should be started already.
-        if( m_generatorCurrentDetailDisposable != null )
-          throw DataGridException.Create<DataGridInternalException>( "The detail generator is already started.", m_dataGridControl );
-
-        m_generatorCurrentDetailDisposable = ( ( IItemContainerGenerator )m_generatorCurrentDetail.DetailGenerator ).StartAt( m_generatorCurrentDetail.DetailGenerator.GeneratorPositionFromIndex( m_generatorCurrentDetailIndex ), direction, true );
-      }
-    }
-
-    private void StopGenerator()
-    {
-      if( this.Status != GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<DataGridInternalException>( "Cannot perform this operation while the generator is busy generating items.", m_dataGridControl );
-
-      m_generatorNodeHelper = null;
-      m_generatorCurrentOffset = -1;
-      m_generatorCurrentGlobalIndex = -1;
-
-      m_generatorCurrentDetailIndex = -1;
-      m_generatorCurrentDetailNodeIndex = -1;
-
-      m_generatorCurrentDetail = null;
-
-      if( m_generatorCurrentDetailDisposable != null )
-      {
-        try
-        {
-          m_generatorCurrentDetailDisposable.Dispose();
-          m_generatorCurrentDetailDisposable = null;
-        }
-        catch( Exception e )
-        {
-          m_generatorStatus = GeneratorStatus.Error;
-
-          throw new DataGridInternalException( "The generator failed to stop.", e, m_dataGridControl );
-        }
-      }
-
-      m_generatorStatus = GeneratorStatus.ContainersGenerated;
-    }
-
-    private GeneratorPosition FindNextUnrealizedGeneratorPosition( GeneratorPosition position )
-    {
-      var retval = position;
-      var index = this.IndexFromGeneratorPosition( position ) + 1;
-
-      while( index < this.ItemCount )
-      {
-        if( m_genPosToIndex.Contains( index ) )
-        {
-          retval.Index++;
-        }
-        else
-        {
-          retval.Offset++;
-          break;
-        }
-
-        index++;
-      }
-
-      return retval;
-    }
-
-    private GeneratorPosition FindPreviousUnrealizedGeneratorPosition( GeneratorPosition position )
-    {
-      var index = this.IndexFromGeneratorPosition( position ) - 1;
-      while( index >= 0 )
-      {
-        if( !m_genPosToIndex.Contains( index ) )
-          break;
-
-        index--;
-      }
-
-      return this.GeneratorPositionFromIndex( index );
-    }
-
-    private DependencyObject CreateContainerForItem( object dataItem, GeneratorNode node )
-    {
-      var container = default( DependencyObject );
-
-      if( node is HeadersFootersGeneratorNode )
-      {
-        container = this.CreateHeaderFooterContainer( dataItem );
-
-        if( node.Parent == null )
-        {
-          GroupLevelIndicatorPane.SetGroupLevel( container, -1 );
-        }
-        else
-        {
-          GroupLevelIndicatorPane.SetGroupLevel( container, node.Level );
-        }
-
-        this.SetStatContext( container, node );
-      }
-      else if( node is ItemsGeneratorNode )
-      {
-        //ensure that item is not its own container...
-        if( !this.IsItemItsOwnContainer( dataItem ) )
-        {
-          container = this.CreateNextItemContainer( dataItem );
-        }
-        else
-        {
-          container = dataItem as DependencyObject;
-        }
-
-        GroupLevelIndicatorPane.SetGroupLevel( container, node.Level );
-      }
-      else
-      {
-        throw DataGridException.Create<DataGridInternalException>( "Cannot create container for the GeneratorNode, as it is not of a valid type.", m_dataGridControl );
-      }
-
-      if( container == null )
-        throw DataGridException.Create<DataGridInternalException>( "A container could not be created or recycled for the GeneratorNode.", m_dataGridControl );
-
-      var dataItemStore = container.ReadLocalValue( CustomItemContainerGenerator.DataItemPropertyProperty ) as DataItemDataProviderBase;
-      if( dataItemStore != null )
-      {
-        dataItemStore.SetDataItem( dataItem );
-      }
-      else
-      {
-        dataItemStore = new DataItemDataProvider();
-        dataItemStore.SetDataItem( dataItem );
-
-        CustomItemContainerGenerator.SetDataItemProperty( container, dataItemStore );
-      }
-
-      DataGridControl.SetDataGridContext( container, m_dataGridContext );
-
-      return container;
-    }
-
-    private void SetStatContext( DependencyObject container, GeneratorNode node )
-    {
-      var parentGroup = node.Parent as GroupGeneratorNode;
-      var collectionViewGroup = default( DataGridCollectionViewGroup );
-
-      if( parentGroup != null )
-      {
-        collectionViewGroup = parentGroup.CollectionViewGroup as DataGridCollectionViewGroup;
-      }
-      else if( m_dataGridContext != null )
-      {
-        var collectionView = m_dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-        if( collectionView != null )
-        {
-          collectionViewGroup = collectionView.RootGroup as DataGridCollectionViewGroup;
-        }
-      }
-
-      if( collectionViewGroup != null )
-      {
-        container.SetValue( DataGridControl.StatContextPropertyKey, collectionViewGroup );
-      }
-    }
-
-    private void ClearStatContext( DependencyObject container )
-    {
-      if( GroupLevelIndicatorPane.GetGroupLevel( container ) == -1 )
-      {
-        container.ClearValue( GroupLevelIndicatorPane.GroupLevelProperty );
-      }
-
-      if( container is HeaderFooterItem )
-      {
-        container.ClearValue( DataGridControl.StatContextPropertyKey );
-      }
-    }
-
-    private bool IsItemItsOwnContainer( object dataItem )
-    {
-      return m_dataGridControl.IsItemItsOwnContainer( dataItem );
-    }
-
-    private DependencyObject CreateHeaderFooterContainer( object dataItem )
-    {
-      if( this.IsRecyclingEnabled )
-      {
-        var recycledContainer = this.DequeueHeaderFooterContainer( dataItem );
-        if( recycledContainer != null )
-          return recycledContainer;
-      }
-
-      //If the container cannot be recycled, then create a new one.
-      var realDataItem = dataItem;
-      if( dataItem.GetType() == typeof( GroupHeaderFooterItem ) )
-      {
-        realDataItem = ( ( GroupHeaderFooterItem )dataItem ).Template;
-      }
-
-      var template = realDataItem as DataTemplate;
-      if( template == null )
-      {
-        var vwc = realDataItem as GroupHeaderFooterItemTemplate;
-        if( vwc != null )
-        {
-          vwc.Seal();
-          template = vwc.Template;
-        }
-
-        if( template == null )
-          throw DataGridException.Create<DataGridInternalException>( "No template found for the creation of a header or footer container.", m_dataGridControl );
-      }
-
-      var newItem = new HeaderFooterItem();
-
-      BindingOperations.SetBinding( newItem, HeaderFooterItem.ContentProperty, m_headerFooterDataContextBinding );
-      newItem.ContentTemplate = template;
-
-      return newItem;
-    }
-
-    private int FindInsertionPoint( int itemIndex )
-    {
-      var count = m_genPosToIndex.Count;
-
-      for( var i = 0; i < count; i++ )
-      {
-        //if the item is larger in index, then I want to insert before it!
-        if( m_genPosToIndex[ i ] > itemIndex )
-          return i;
-      }
-
-      return count;
-    }
-
-    private void RemapFloatingDetails()
-    {
-      if( m_floatingDetails.Count == 0 )
-        return;
-
-      if( this.IsDetailsRemapDeferred )
-      {
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.CannotRemapDetails );
-        return;
-      }
-
-      Debug.Assert( m_startNode != null, "Generator structure should already be created." );
-
-      while( m_floatingDetails.Count > 0 )
-      {
-        var closeDetail = true; //using this approach to have a default behavior or closing the details, if something inconsistent occur (see Debug Asserts).
-        var itemToCheck = m_floatingDetails[ 0 ];
-        m_floatingDetails.RemoveAt( 0 );
-
-        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        if( nodeHelper.AbsoluteFindItem( itemToCheck ) )
-        {
-          var itemsNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
-          if( itemsNode != null )
-          {
-            var insertionIndex = itemsNode.Items.IndexOf( itemToCheck );
-            if( insertionIndex < 0 )
-            {
-              this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.ItemNotBelongingToNode, DataGridTraceArgs.Item( itemToCheck ), DataGridTraceArgs.Node( itemsNode ) );
-            }
-
-            if( itemsNode.Details == null )
-            {
-              itemsNode.Details = new SortedDictionary<int, List<DetailGeneratorNode>>();
-            }
-
-            try
-            {
-              this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.RemapDetailNodes, DataGridTraceArgs.Item( itemToCheck ) );
-
-              var oldItemCount = this.ItemCount;
-
-              itemsNode.Details.Add( insertionIndex, new List<DetailGeneratorNode>( m_masterToDetails[ itemToCheck ] ) );
-
-              var addCount = 0;
-              foreach( var detailNode in m_masterToDetails[ itemToCheck ] )
-              {
-                // Refresh the item count in case it changed while the detail was floating.
-                detailNode.UpdateItemCount();
-
-                addCount += detailNode.ItemCount;
-              }
-              itemsNode.AdjustItemCount( addCount );
-
-              this.IncrementCurrentGenerationCount();
-
-              // The ItemsChanged event should not be raised if the new items are hidden under a collapsed group, or else the master node's ItemCount will become unbalanced.
-              var newItemCount = this.ItemCount;
-              if( oldItemCount != newItemCount )
-              {
-                //ensure that no add event is sent when the generator is currently processing a Reset.
-                if( !this.IsHandlingGlobalItemsReset )
-                {
-                  this.SendAddEvent( addCount );
-                }
-              }
-
-              closeDetail = false;
-            }
-            catch( Exception e )
-            {
-              //both the "Add" and the " [] " could throw if the key is already present or if its not...
-              throw new DataGridInternalException( e.Message, e, m_dataGridControl );
-            }
-          }
-          else
-          {
-            this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.UnexpectedNode, DataGridTraceArgs.Node( nodeHelper.CurrentNode ) );
-          }
-        }
-
-        if( closeDetail )
-        {
-          //The item was not located in the generator, then it's time to "close" the detail node/generator
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_RemapFloatingDetails, DataGridTraceMessages.CollapsingDetail, DataGridTraceArgs.Item( itemToCheck ) );
-          this.CloseDetailsForItem( itemToCheck, null );
-        }
-      }
-    }
-
-    private void QueueDetailItemForRemapping( object item )
-    {
-      if( item == null )
-        return;
-
-      if( !m_masterToDetails.ContainsKey( item ) || m_floatingDetails.Contains( item ) )
-        return;
-
-      m_floatingDetails.Add( item );
-
-      this.InvalidateNodeTree();
-    }
-
-    private void CloseDetails( DetailConfiguration detailConfiguration )
-    {
-      var details = new KeyValuePair<object, List<DetailGeneratorNode>>[ m_masterToDetails.Count ];
-      ( ( ICollection<KeyValuePair<object, List<DetailGeneratorNode>>> )m_masterToDetails ).CopyTo( details, 0 );
-
-      foreach( var detail in details )
-      {
-        this.CloseDetailsForItem( detail.Key, detailConfiguration );
-      }
-    }
-
-    private int CloseDetailsForItem( object dataItem, DetailConfiguration detailConfiguration )
-    {
-      if( m_generatorStatus == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<DataGridInternalException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
-
-      if( dataItem is EmptyDataItem )
-      {
-        this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_CloseDetailsForItem, DataGridTraceMessages.CannotCollapseDetail, DataGridTraceArgs.Item( dataItem ) );
-        return -1;
-      }
-
-      if( ( dataItem == null ) || ( !m_masterToDetails.ContainsKey( dataItem ) ) )
-        return -1; //the item is no longer present in the opened details list... or item is invalid (null)
-
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      var globalItemIndex = nodeHelper.FindItem( dataItem );
-      var dataItemFound = ( globalItemIndex >= 0 );
-      //Note: this function will only return index for items directly contained in this generator ( no details ).
-
-      ItemsGeneratorNode masterNode;
-
-      if( dataItemFound )
-      {
-        masterNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
-      }
-      else
-      {
-        nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        masterNode = ( nodeHelper.Contains( dataItem ) ) ? nodeHelper.CurrentNode as ItemsGeneratorNode : null;
-      }
-
-      List<DetailGeneratorNode> oldDetails;
-      if( !m_masterToDetails.TryGetValue( dataItem, out oldDetails ) )
-      {
-        this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_CloseDetailsForItem, DataGridTraceMessages.DetailNotFound, DataGridTraceArgs.Item( dataItem ) );
-        throw DataGridException.Create<DataGridInternalException>( "Detail not found", m_dataGridControl );
-      }
-
-      var count = 0;
-      var containers = new List<DependencyObject>();
-
-      for( int i = oldDetails.Count - 1; i >= 0; i-- )
-      {
-        var detailNode = oldDetails[ i ];
-
-        if( ( detailConfiguration == null ) || ( detailConfiguration == detailNode.DetailContext.SourceDetailConfiguration ) )
-        {
-          count += detailNode.ItemCount;
-
-          this.RemoveGeneratedItems( detailNode, containers );
-          this.ClearDetailGeneratorNode( detailNode );
-
-          oldDetails.RemoveAt( i );
-        }
-      }
-
-      if( oldDetails.Count == 0 )
-      {
-        m_masterToDetails.Remove( dataItem );
-        m_floatingDetails.Remove( dataItem );
-      }
-
-      if( ( masterNode != null ) && ( masterNode.Details != null ) )
-      {
-        var indexOfItem = masterNode.Items.IndexOf( dataItem );
-
-        if( !masterNode.Details.TryGetValue( indexOfItem, out oldDetails ) )
-        {
-          this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_CloseDetailsForItem, DataGridTraceMessages.DetailNotFound, DataGridTraceArgs.Item( dataItem ) );
-          throw DataGridException.Create<DataGridInternalException>( "Detail not found .. 2", m_dataGridControl );
-        }
-
-        for( int i = oldDetails.Count - 1; i >= 0; i-- )
-        {
-          var detailNode = oldDetails[ i ];
-
-          if( ( detailConfiguration == null ) || ( detailConfiguration == detailNode.DetailContext.SourceDetailConfiguration ) )
-          {
-            oldDetails.RemoveAt( i );
-          }
-        }
-
-        if( oldDetails.Count == 0 )
-        {
-          masterNode.Details.Remove( indexOfItem );
-        }
-
-        masterNode.AdjustItemCount( -count );
-
-        if( masterNode.Details.Count == 0 )
-        {
-          masterNode.Details = null;
-        }
-      }
-
-      this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CloseDetailsForItem, DataGridTraceMessages.DetailCollapsed, DataGridTraceArgs.Item( dataItem ) );
-
-      if( dataItemFound )
-      {
-        this.IncrementCurrentGenerationCount();
-        this.SendRemoveEvent( count, containers );
-      }
-
-      return globalItemIndex;
-    }
-
-    private DetailGeneratorNode CreateDetailGeneratorNode( object dataItem, DataGridCollectionViewBase collectionView, DetailConfiguration detailConfiguration )
-    {
-      var detailDataGridContext = new DataGridContext( m_dataGridContext, m_dataGridControl, dataItem, collectionView, detailConfiguration );
-      var detailGenerator = CustomItemContainerGenerator.CreateGenerator( m_dataGridControl, collectionView, detailDataGridContext, this );
-      detailGenerator.SetGenPosToIndexUpdateInhibiter( this );
-      detailGenerator.IsRecyclingEnabled = this.IsRecyclingEnabled;
-
-      if( m_dataGridControl.AreDetailsFlatten )
-      {
-        var updateColumnSortCommand = detailDataGridContext.UpdateColumnSortCommand;
-        if( updateColumnSortCommand.CanExecute() )
-        {
-          updateColumnSortCommand.Execute();
-        }
-      }
-
-      DetailsChangedEventManager.AddListener( detailGenerator, this );
-
-      var detailNode = new DetailGeneratorNode( detailDataGridContext, detailGenerator );
-
-      //register to the ItemsChanged only after the columns were updated (to avoid a reset being received without having completed the initialization ).
-      //Also wait after the creation of the DetailGeneratorNode, since messages could be issued before initialization completes.
-      detailGenerator.ItemsChanged += new CustomGeneratorChangedEventHandler( this.HandleDetailGeneratorContentChanged );
-      detailGenerator.ContainersRemoved += new ContainersRemovedEventHandler( this.OnDetailContainersRemoved );
-
-      return detailNode;
-    }
-
-    private void ClearDetailGeneratorNode( DetailGeneratorNode detailNode )
-    {
-      m_dataGridControl.SelectionChangerManager.Begin();
-
-      try
-      {
-        m_dataGridControl.SelectionChangerManager.UnselectAllItems( detailNode.DetailContext );
-        m_dataGridControl.SelectionChangerManager.UnselectAllCells( detailNode.DetailContext );
-      }
-      finally
-      {
-        m_dataGridControl.SelectionChangerManager.End( false, false );
-      }
-
-      m_dataGridControl.SaveDataGridContextState( detailNode.DetailContext, true, int.MaxValue );
-
-      var detailGenerator = detailNode.DetailGenerator;
-
-      detailNode.CleanGeneratorNode();
-
-      DetailsChangedEventManager.RemoveListener( detailGenerator, this );
-      detailGenerator.ItemsChanged -= new CustomGeneratorChangedEventHandler( this.HandleDetailGeneratorContentChanged );
-      detailGenerator.ContainersRemoved -= new ContainersRemovedEventHandler( this.OnDetailContainersRemoved );
-      detailGenerator.SetGenPosToIndexUpdateInhibiter( null );
-      detailGenerator.UnregisterEvents();
-      detailGenerator.ClearEvents();
-    }
-
-    private void RegisterEvents()
-    {
-      Debug.Assert( m_dataGridControl != null );
-      Debug.Assert( m_collectionView != null );
-      Debug.Assert( m_dataGridContext != null );
-
-      CollectionChangedEventManager.AddListener( m_collectionView, this );
-      GroupConfigurationSelectorChangedEventManager.AddListener( m_dataGridContext, this );
-      PropertyChangedEventManager.AddListener( m_collectionView, this, string.Empty );
-
-      // The top most generator must register to additional events.
-      if( m_dataGridContext.SourceDetailConfiguration == null )
-      {
-        ItemsSourceChangeCompletedEventManager.AddListener( m_dataGridControl, this );
-        ViewChangedEventManager.AddListener( m_dataGridControl, this );
-        ThemeChangedEventManager.AddListener( m_dataGridControl, this );
-
-        m_recyclingPools.ContainersRemoved += new ContainersRemovedEventHandler( this.OnRecyclingPoolsContainersRemoved );
-        m_recyclingPools.RecyclingCandidatesCleaned += new RecyclingCandidatesCleanedEventHandler( this.OnRecyclingCandidatesCleaned );
-      }
-    }
-
-    private void UnregisterEvents()
-    {
-      Debug.Assert( m_dataGridControl != null );
-      Debug.Assert( m_collectionView != null );
-      Debug.Assert( ( m_dataGridContext != null ) && ( m_dataGridContext.DetailConfigurations != null ) );
-
-      CollectionChangedEventManager.RemoveListener( m_collectionView, this );
-      GroupConfigurationSelectorChangedEventManager.RemoveListener( m_dataGridContext, this );
-      CollectionChangedEventManager.RemoveListener( m_dataGridContext.DetailConfigurations, this );
-      PropertyChangedEventManager.RemoveListener( m_collectionView, this, string.Empty );
-
-      // The top most generator must unregister from additional events.
-      if( m_dataGridContext.SourceDetailConfiguration == null )
-      {
-        ItemsSourceChangeCompletedEventManager.RemoveListener( m_dataGridControl, this );
-        ViewChangedEventManager.RemoveListener( m_dataGridControl, this );
-        ThemeChangedEventManager.RemoveListener( m_dataGridControl, this );
-
-        m_recyclingPools.ContainersRemoved -= new ContainersRemovedEventHandler( this.OnRecyclingPoolsContainersRemoved );
-        m_recyclingPools.RecyclingCandidatesCleaned -= new RecyclingCandidatesCleanedEventHandler( this.OnRecyclingCandidatesCleaned );
-      }
-    }
-
-    private void ClearEvents()
-    {
-      this.ContainersRemoved = null;
-      this.DetailsChanged = null;
-      this.ItemsChanged = null;
-      this.PropertyChanged = null;
-    }
-
-    internal int CreateDetailsHelper( ItemsGeneratorNode masterNode, object dataItem )
-    {
-      var dataGridCollectionViewBase = ( m_dataGridContext != null ) ? m_dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase
-                                                                     : default( DataGridCollectionViewBase );
-
-      if( dataGridCollectionViewBase == null )
-      {
-        this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.DetailNotSupported,
-                         DataGridTraceArgs.DataSource( dataGridCollectionViewBase ) );
-      }
-
-      var totalAddCount = 0;
-      var newDetails = default( List<DetailGeneratorNode> );
-      var detailsAlreadyExist = m_floatingDetails.Contains( dataItem );
-
-      if( detailsAlreadyExist )
-      {
-        this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.RemapDetailNodes,
-                         DataGridTraceArgs.Item( dataItem ) );
-
-        newDetails = new List<DetailGeneratorNode>( m_masterToDetails[ dataItem ] );
-        m_floatingDetails.Remove( dataItem );
-      }
-
-      var detailConfigurations = m_dataGridContext.DetailConfigurations;
-
-      //If the master item was not found in the list of details pending requeuing, then create a new set of detail nodes
-      if( newDetails == null )
-      {
-        newDetails = new List<DetailGeneratorNode>( detailConfigurations.Count );
-
-        foreach( DetailConfiguration detailConfig in detailConfigurations )
-        {
-          if( detailConfig.IsAutoCreated )
-          {
-            var defaultDetailConfig = m_dataGridContext.DefaultDetailConfiguration;
-            if( defaultDetailConfig == null )
-            {
-              defaultDetailConfig = m_dataGridContext.GetDefaultDetailConfigurationForContext();
-            }
-
-            if( defaultDetailConfig != null )
-            {
-              //if the default headers footers shall be used, add then to the detail config ( internally, it ensures that it is added only once ).
-              if( defaultDetailConfig.UseDefaultHeadersFooters )
-              {
-                defaultDetailConfig.AddDefaultHeadersFooters();
-                detailConfig.AddDefaultHeadersFooters();
-              }
-            }
-            else
-            {
-              //if the default headers footers shall be used, add then to the detail config ( internally, it ensures that it is added only once ).
-              if( detailConfig.UseDefaultHeadersFooters )
-              {
-                detailConfig.AddDefaultHeadersFooters();
-              }
-            }
-          }
-          else
-          {
-            //if the default headers footers shall be used, add then to the detail config ( internally, it ensures that it is added only once ).
-            if( detailConfig.UseDefaultHeadersFooters )
-            {
-              detailConfig.AddDefaultHeadersFooters();
-            }
-          }
-
-          // If the DetailConfiguration is not meant to be visible, then skip next section (creation of detail) and continue looping on other detail configurations
-          if( !detailConfig.Visible )
-            continue;
-
-          var newDetailCollectionViewBase = default( DataGridCollectionViewBase );
-          var detailDataSource = default( IEnumerable );
-
-          // If the data source returned by the detailDescription is null ( or if there was no detail description ), then create an empty data source for the detail data.
-          if( detailDataSource == null )
-          {
-            detailDataSource = new object[] { };
-          }
-
-          newDetailCollectionViewBase = dataGridCollectionViewBase.CreateDetailDataGridCollectionViewBase( detailDataSource, null, dataGridCollectionViewBase );
-
-          Debug.Assert( newDetailCollectionViewBase != null );
-
-          using( detailConfig.ColumnManager.DeferUpdate( new ColumnHierarchyManager.UpdateOptions( TableView.GetFixedColumnCount( detailConfig ), true ) ) )
-          {
-            if( detailConfig.AutoCreateForeignKeyConfigurations && !detailConfig.ForeignKeysUpdatedOnAutoCreate )
-            {
-              // Ensure to update the foreign key related properties before expanding detail
-              ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView( detailConfig.Columns,
-                                                                                                       newDetailCollectionViewBase.ItemProperties,
-                                                                                                       detailConfig.AutoCreateForeignKeyConfigurations );
-              detailConfig.ForeignKeysUpdatedOnAutoCreate = true;
-            }
-          }
-
-          var newDetailNode = this.CreateDetailGeneratorNode( dataItem, newDetailCollectionViewBase, detailConfig );
-          newDetails.Add( newDetailNode );
-
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.DetailNodeAdded,
-                           DataGridTraceArgs.Node( newDetailNode ), DataGridTraceArgs.Item( dataItem ) );
-
-          totalAddCount += newDetailNode.ItemCount;
-        }
-      }
-      else // there was details for the master item in the list to be requeued
-      {
-        // count the items from the details.
-        foreach( var detailNode in newDetails )
-        {
-          totalAddCount += detailNode.ItemCount;
-        }
-      }
-
-      // Plug details in the master items node.
-      var indexOfItem = masterNode.Items.IndexOf( dataItem );
-      var details = masterNode.Details;
-
-      if( details == null )
-      {
-        details = new SortedDictionary<int, List<DetailGeneratorNode>>();
-        masterNode.Details = details;
-      }
-
-      details.Add( indexOfItem, newDetails );
-
-      masterNode.AdjustItemCount( totalAddCount );
-
-      if( !detailsAlreadyExist )
-      {
-        m_masterToDetails.Add( dataItem, new List<DetailGeneratorNode>( newDetails ) );
-
-        for( int i = 0; i < newDetails.Count; i++ )
-        {
-          m_dataGridControl.RestoreDataGridContextState( newDetails[ i ].DetailContext );
-        }
-      }
-      else
-      {
-        var detailsMapped = m_masterToDetails.ContainsKey( dataItem );
-        Debug.Assert( detailsMapped, "Item not found on master level." );
-
-        if( !detailsMapped )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.RemapZombieDetail,
-                           DataGridTraceArgs.Item( dataItem ) );
-        }
-      }
-
-      this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsHelper, DataGridTraceMessages.DetailExpanded,
-                       DataGridTraceArgs.Item( dataItem ) );
-
-      return totalAddCount;
-    }
-
-    private void CreateDetailsForItem( object dataItem )
-    {
-      if( m_generatorStatus == GeneratorStatus.GeneratingContainers )
-        throw DataGridException.Create<DataGridInternalException>( "Cannot perform this operation while the generator is busy generating items", m_dataGridControl );
-
-      if( ( dataItem == null ) || ( dataItem is EmptyDataItem ) )
-      {
-        this.TraceEvent( TraceEventType.Error, DataGridTraceEventId.CustomItemContainerGenerator_CreateDetailsForItem, DataGridTraceMessages.CannotExpandDetail, DataGridTraceArgs.Item( dataItem ) );
-        return;
-      }
-
-      if( m_masterToDetails.ContainsKey( dataItem ) )
-      {
-        //before throwing, verify if the item is not currently pending requeue
-        if( !m_floatingDetails.Contains( dataItem ) )
-          throw DataGridException.Create<InvalidOperationException>( "An attempt was made to create details for an item whose details are already mapped.", m_dataGridControl );
-      }
-
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      var dataItemFound = ( nodeHelper.FindItem( dataItem ) >= 0 );
-
-      //means either that the item is not present in the Generator or that a parent group of the item is collapsed...
-      if( !dataItemFound )
-      {
-        //make sure it is the later, else throw an exception.
-        nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        if( !nodeHelper.Contains( dataItem ) )
-          throw DataGridException.Create<InvalidOperationException>( "An attempt was made to create details for an item that does not belong to the generator.", m_dataGridControl );
-      }
-
-      var masterNode = nodeHelper.CurrentNode as ItemsGeneratorNode;
-      if( masterNode == null )
-        throw DataGridException.Create<InvalidOperationException>( "An attempt was made to create details for an item that does not map to an item node.", m_dataGridControl );
-
-      try
-      {
-        var count = this.CreateDetailsHelper( masterNode, dataItem );
-
-        this.IncrementCurrentGenerationCount();
-
-        if( dataItemFound )
-        {
-          this.SendAddEvent( count );
-        }
-      }
-      catch( Exception e )
-      {
-        throw new DataGridException( e.Message, e, m_dataGridControl );
-      }
-    }
-
-    private void HandleDetailGeneratorContentChanged( object sender, CustomGeneratorChangedEventArgs e )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_OnDetailGeneratorContentChanged, DataGridTraceArgs.Node( sender ) ) )
-      {
-        if( this.IsHandlingGlobalItemsResetLocally )
-        {
-          this.TraceEvent( TraceEventType.Warning, DataGridTraceEventId.CustomItemContainerGenerator_OnDetailGeneratorContentChanged, DataGridTraceMessages.CannotProcessOnReset );
-          return;
-        }
-
-        var detailGenerator = sender as CustomItemContainerGenerator;
-
-        Debug.Assert( detailGenerator != null );
-        Debug.Assert( m_startNode != null );
-
-        object masterItem;
-        var detailNode = this.FindDetailGeneratorNodeForGenerator( detailGenerator, out masterItem );
-
-        Debug.Assert( masterItem != null );
-        Debug.Assert( detailNode != null );
-
-        if( ( detailNode != null ) && ( masterItem != null ) )
-        {
-          this.TraceEvent( TraceEventType.Verbose, DataGridTraceEventId.CustomItemContainerGenerator_OnDetailGeneratorContentChanged, DataGridTraceArgs.Action( e.Action ), DataGridTraceArgs.Node( detailNode ), DataGridTraceArgs.Item( masterItem ) );
-
-          switch( e.Action )
-          {
-            case NotifyCollectionChangedAction.Add:
-              this.HandleDetailAddition( masterItem, detailNode, e );
-              break;
-
-            case NotifyCollectionChangedAction.Move:
-            case NotifyCollectionChangedAction.Remove:
-              this.HandleDetailMoveRemove( masterItem, detailNode, e );
-              break;
-
-            case NotifyCollectionChangedAction.Replace: //CustomItemContainerGenreator never issues a Replace!
-              throw DataGridException.Create<DataGridInternalException>( "CustomItemContainerGenerator never notifies a Replace action.", m_dataGridControl );
-
-            case NotifyCollectionChangedAction.Reset:
-              this.HandleDetailReset( masterItem, detailNode );
-              break;
-
-            default:
-              break;
-          }
-        }
-      }
-    }
-
-    private void HandleDetailAddition( object masterItem, DetailGeneratorNode detailNode, CustomGeneratorChangedEventArgs e )
-    {
-      if( m_floatingDetails.Contains( masterItem ) )
-        return;
-
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-      // The master item has been found.
-      if( nodeHelper.FindItem( masterItem ) >= 0 )
-      {
-        var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
-
-        masterNode.AdjustItemCount( e.Count );
-        detailNode.UpdateItemCount();
-
-        this.IncrementCurrentGenerationCount();
-        this.SendAddEvent( e.Count );
-      }
-      // The master item could be located inside a collapsed group.
-      else
-      {
-        //in that case, I need to determine the appropriate masterNode another way
-        nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        if( !nodeHelper.Contains( masterItem ) )
-          throw DataGridException.Create<InvalidOperationException>( "An attempt was made to add a detail for an item that does not belong to the generator.", m_dataGridControl );
-
-        var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
-
-        masterNode.AdjustItemCount( e.Count );
-        detailNode.UpdateItemCount();
-
-        this.IncrementCurrentGenerationCount();
-      }
-    }
-
-    private void HandleDetailMoveRemove( object masterItem, DetailGeneratorNode detailNode, CustomGeneratorChangedEventArgs e )
-    {
-      if( m_floatingDetails.Contains( masterItem ) )
-        return;
-
-      var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-
-      // The master item has been found.
-      if( nodeHelper.FindItem( masterItem ) >= 0 )
-      {
-        this.RemoveDetailContainers( e.Containers );
-
-        if( e.Action == NotifyCollectionChangedAction.Remove )
-        {
-          var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
-
-          masterNode.AdjustItemCount( -e.Count );
-          detailNode.UpdateItemCount();
-        }
-
-        this.IncrementCurrentGenerationCount();
-        this.SendRemoveEvent( e.Count, e.Containers );
-      }
-      // The master item could be located inside a collapsed group.
-      else
-      {
-        //in that case, I need to determine the appropriate masterNode another way
-        nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        if( !nodeHelper.Contains( masterItem ) )
-          throw DataGridException.Create<InvalidOperationException>( "An attempt was made to move or remove a detail for an item that does not belong to the generator.", m_dataGridControl );
-
-        if( e.Action == NotifyCollectionChangedAction.Remove )
-        {
-          var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
-
-          masterNode.AdjustItemCount( -e.Count );
-          detailNode.UpdateItemCount();
-        }
-
-        this.IncrementCurrentGenerationCount();
-      }
-    }
-
-    private void HandleDetailReset( object masterItem, DetailGeneratorNode detailNode )
-    {
-      using( this.TraceBlock( DataGridTraceEventId.CustomItemContainerGenerator_HandleDetailReset ) )
-      {
-        if( m_floatingDetails.Contains( masterItem ) )
-        {
-          this.TraceEvent( TraceEventType.Information, DataGridTraceEventId.CustomItemContainerGenerator_HandleDetailReset, DataGridTraceMessages.DetailIsFloating );
-          return;
-        }
-
-        var nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-        var masterItemFound = ( nodeHelper.FindItem( masterItem ) >= 0 );
-
-        // The master item could be located inside a collapsed group.
-        if( !masterItemFound )
-        {
-          nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-          if( !nodeHelper.Contains( masterItem ) )
-          {
-            this.TraceEvent( TraceEventType.Critical, DataGridTraceEventId.CustomItemContainerGenerator_HandleDetailReset, DataGridTraceMessages.ItemNotBelongingToGenerator );
-            throw DataGridException.Create<InvalidOperationException>( "An attempt was made to reset a detail for an item that does not belong to the generator.", m_dataGridControl );
-          }
-
-          this.TraceEvent( TraceEventType.Information, DataGridTraceEventId.CustomItemContainerGenerator_HandleDetailReset, DataGridTraceMessages.ItemNotFoundOrCollapsed );
-        }
-
-        var masterNode = ( ItemsGeneratorNode )nodeHelper.CurrentNode;
-        var oldDetailCount = detailNode.ItemCount;
-        var oldContainers = m_genPosToContainer.Where( ( c, i ) => m_genPosToNode[ i ] == detailNode ).ToList();
-
-        using( detailNode.DetailGenerator.InhibitItemsChanged() )
-        {
-          detailNode.UpdateItemCount();
-        }
-
-        var newDetailCount = detailNode.ItemCount;
-        var newContainers = detailNode.DetailGenerator.m_genPosToContainer;
-
-        masterNode.AdjustItemCount( newDetailCount - oldDetailCount );
-
-        var containersRemoved = new HashSet<DependencyObject>();
-        var containersMoved = new HashSet<DependencyObject>();
-
-        CustomItemContainerGenerator.FindChanges( oldContainers, newContainers, null, containersRemoved, containersMoved );
-        this.ApplyDetailChanges( detailNode, newContainers, containersRemoved, containersMoved );
-      }
-    }
-
-    private DetailGeneratorNode FindDetailGeneratorNodeForGenerator( CustomItemContainerGenerator detailGenerator, out object masterItem )
-    {
-      foreach( var detailsForItem in m_masterToDetails )
-      {
-        foreach( var detailNode in detailsForItem.Value )
-        {
-          if( detailNode.DetailGenerator == detailGenerator )
-          {
-            masterItem = detailsForItem.Key;
-            return detailNode;
-          }
-        }
-      }
-
-      masterItem = null;
-      return null;
-    }
-
-    internal void SetGenPosToIndexUpdateInhibiter( IInhibitGenPosToIndexUpdating inhibiter )
-    {
-      m_genPosToIndexInhibiter = inhibiter;
-    }
-
-    private IDisposable InhibitParentGenPosToIndexUpdate()
-    {
-      if( m_genPosToIndexInhibiter != null )
-        return m_genPosToIndexInhibiter.InhibitGenPosToIndexUpdates();
-
-      return null;
-    }
-
-    private int FindFirstGeneratedIndexForLocalItem( object item )
-    {
-      //this function will find an item in the m_genPosToItem, but will filter out those that belongs to details.
-      //This is to avoid the problem caused by Detail items that belongs also to a master.
-      var retval = -1;
-      var runningIndex = 0;
-      var itemCount = m_genPosToItem.Count;
-
-      while( runningIndex < itemCount )
-      {
-        retval = m_genPosToItem.IndexOf( item, runningIndex );
-
-        //No item found past the current runningIndex
-        if( retval == -1 )
-          break;
-
-        //check if the item belongs to a Detail or not.
-        var detailNode = m_genPosToNode[ retval ] as DetailGeneratorNode;
-        if( detailNode == null )
-          break; //the item is not a detail and therefore qualifies as a return value.
-
-        //Item is from a detail
-        runningIndex = retval + 1;
-      }
-
-      return retval;
-    }
-
-    private bool EnqueueContainer( DependencyObject container, object item )
-    {
-      if( container is HeaderFooterItem )
-      {
-        if( item is GroupHeaderFooterItem )
-        {
-          //If the group does not exist anymore (i.e. all its rows have been deleted), do not recycle it.
-          var groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-          var collectionViewGroup = groupHeaderFooterItem.Group;
-          if( collectionViewGroup == null )
-            return false;
-
-          string groupBy = null;
-          if( collectionViewGroup is DataGridCollectionViewGroup )
-          {
-            groupBy = ( ( DataGridCollectionViewGroup )collectionViewGroup ).GroupByName;
-          }
-
-          if( string.IsNullOrEmpty( groupBy ) )
-          {
-            var group = this.GetGroupFromCollectionViewGroupCore( collectionViewGroup );
-            if( group == null )
-              return false;
-
-            groupBy = group.GroupBy;
-            if( string.IsNullOrEmpty( groupBy ) )
-              return false;
-          }
-
-          m_recyclingPools.GetGroupHeaderFooterItemContainerPool( m_dataGridContext.SourceDetailConfiguration, true ).Enqueue( groupBy, groupHeaderFooterItem.Template, container );
-        }
-        else
-        {
-          m_recyclingPools.GetHeaderFooterItemContainerPool( m_dataGridContext.SourceDetailConfiguration, true ).Enqueue( item, container );
-        }
-      }
-      else
-      {
-        m_recyclingPools.GetItemContainerPool( m_dataGridContext.SourceDetailConfiguration, true ).Enqueue( item, container );
-      }
-
-      return true;
-    }
-
-    private DependencyObject DequeueItemContainer( object item )
-    {
-      var pool = m_recyclingPools.GetItemContainerPool( m_dataGridContext.SourceDetailConfiguration );
-      if( pool == null )
-        return null;
-
-      return pool.Dequeue( item );
-    }
-
-    private DependencyObject DequeueHeaderFooterContainer( object item )
-    {
-      if( !( item is GroupHeaderFooterItem ) )
-      {
-        var pool = m_recyclingPools.GetHeaderFooterItemContainerPool( m_dataGridContext.SourceDetailConfiguration );
-        if( pool == null )
-          return null;
-
-        return pool.Dequeue( item );
-      }
-      else
-      {
-        var pool = m_recyclingPools.GetGroupHeaderFooterItemContainerPool( m_dataGridContext.SourceDetailConfiguration );
-        if( pool == null )
-          return null;
-
-        var groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-        var collectionViewGroup = groupHeaderFooterItem.Group;
-        if( collectionViewGroup == null )
-          return null;
-
-        string groupBy = null;
-        if( collectionViewGroup is DataGridCollectionViewGroup )
-        {
-          groupBy = ( ( DataGridCollectionViewGroup )collectionViewGroup ).GroupByName;
-        }
-
-        if( string.IsNullOrEmpty( groupBy ) )
-        {
-          var group = this.GetGroupFromCollectionViewGroupCore( collectionViewGroup );
-          if( group == null )
-            return null;
-
-          groupBy = group.GroupBy;
-          if( string.IsNullOrEmpty( groupBy ) )
-            return null;
-        }
-
-        return pool.Dequeue( groupBy, groupHeaderFooterItem.Template );
-      }
-    }
-
-    internal void CleanRecyclingCandidates()
-    {
-      m_recyclingPools.CleanRecyclingCandidates();
-    }
-
-    private void OnDetailContainersRemoved( object sender, ContainersRemovedEventArgs e )
-    {
-      Debug.Assert( !this.IsRecyclingEnabled );
-
-      this.OnContainersRemoved( e.RemovedContainers );
-    }
-
-    private DependencyObject CreateNextItemContainer( object item )
-    {
-      DependencyObject container = null;
-
-      if( this.IsRecyclingEnabled )
-      {
-        container = this.DequeueItemContainer( item );
-      }
-
-      if( container == null )
-      {
-        container = m_dataGridControl.CreateContainerForItem();
-      }
-
-      return container;
-    }
-
-    private IEnumerable<DataGridContext> GetDetailContexts()
-    {
-      return ( from node in this.GetDetailGeneratorNodes()
-               select node.DetailContext );
-    }
-
-    private IEnumerable<CustomItemContainerGenerator> GetDetailGenerators()
-    {
-      return ( from node in this.GetDetailGeneratorNodes()
-               select node.DetailGenerator );
-    }
-
-    private IEnumerable<DetailGeneratorNode> GetDetailGeneratorNodes()
-    {
-      foreach( List<DetailGeneratorNode> details in m_masterToDetails.Values )
-      {
-        foreach( DetailGeneratorNode detailNode in details )
-        {
-          yield return detailNode;
-        }
-      }
-    }
-
-    private static IList GetList( CollectionView collectionView )
-    {
-      if( collectionView == null )
-        return null;
-
-      var list = collectionView as IList;
-      if( list != null )
-        return list;
-
-      return collectionView.SourceCollection as IList;
-    }
-
-    private static void FindChanges<T>(
-      IList<T> source,
-      IList<T> destination,
-      ICollection<T> itemsAdded,
-      ICollection<T> itemsRemoved,
-      ICollection<T> itemsMoved )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( destination == null )
-        throw new ArgumentNullException( "destination" );
-
-      // There is nothing to do since the caller is not interested by the result.
-      if( ( itemsAdded == null ) && ( itemsRemoved == null ) && ( itemsMoved == null ) )
-        return;
-
-      var sourceCount = source.Count;
-      var sourcePositions = new Dictionary<T, int>( sourceCount );
-      var sequence = new List<int>( Math.Min( sourceCount, destination.Count ) );
-      var isAlive = new BitArray( sourceCount, false );
-      var hasNotMoved = default( BitArray );
-
-      for( var i = 0; i < sourceCount; i++ )
-      {
-        sourcePositions.Add( source[ i ], i );
-      }
-
-      foreach( var item in destination )
-      {
-        int index;
-
-        if( sourcePositions.TryGetValue( item, out index ) )
-        {
-          isAlive[ index ] = true;
-          sequence.Add( index );
-        }
-        else if( itemsAdded != null )
-        {
-          itemsAdded.Add( item );
-        }
-      }
-
-      // We may omit this part of the algorithm if the caller is not interested by the items that have moved.
-      if( itemsMoved != null )
-      {
-        hasNotMoved = new BitArray( sourceCount, false );
-
-        // The subsequence contains the position of the item that are in the destination collection and that have not moved.
-        foreach( var index in LongestIncreasingSubsequence.Find( sequence ) )
-        {
-          hasNotMoved[ index ] = true;
-        }
-      }
-
-      // We may omit this part of the algorithm if the caller is not interested by the items that have moved or were removed.
-      if( ( itemsRemoved != null ) || ( itemsMoved != null ) )
-      {
-        for( var i = 0; i < sourceCount; i++ )
-        {
-          if( isAlive[ i ] )
-          {
-            // We check if the move collection is not null first because the bit array is null when the move collection is null.
-            if( ( itemsMoved != null ) && !hasNotMoved[ i ] )
-            {
-              itemsMoved.Add( source[ i ] );
-            }
-          }
-          else if( itemsRemoved != null )
-          {
-            itemsRemoved.Add( source[ i ] );
-          }
-        }
-      }
-    }
-
-    public void Skip()
-    {
-      if( m_generatorDirection == GeneratorDirection.Forward )
-      {
-        this.MoveGeneratorForward();
-      }
-      else
-      {
-        this.MoveGeneratorBackward();
-      }
-    }
-
-    #region Private Fields
-
-    private BitVector32 m_flags = new BitVector32();
-
-    //This list is used to map from a Realized Item generator position to an actual index. Index in list is the GenPos Index.
-    private readonly List<int> m_genPosToIndex = new List<int>();
-    private readonly List<object> m_genPosToItem = new List<object>();
-    private readonly List<DependencyObject> m_genPosToContainer = new List<DependencyObject>();
-    private readonly List<GeneratorNode> m_genPosToNode = new List<GeneratorNode>();
-
-    private readonly Dictionary<object, List<DetailGeneratorNode>> m_masterToDetails = new Dictionary<object, List<DetailGeneratorNode>>();
-    private readonly List<object> m_floatingDetails = new List<object>();
-
-    private GeneratorNode m_startNode;
-    private GeneratorNode m_firstItem;
-
-    private ReadOnlyObservableCollection<object> m_groupsCollection;
-
-    private readonly DataGridControl m_dataGridControl;
-    private readonly DataGridContext m_dataGridContext;
-    private readonly CollectionView m_collectionView;
-
-    private readonly CustomItemContainerGeneratorRecyclingPools m_recyclingPools;
-
-    private int m_lastValidItemCountGeneration = 0;
-
-    private int m_cachedItemCount = 0;
-
-    private GeneratorDirection m_generatorDirection;
-    private int m_generatorCurrentOffset;
-    private int m_generatorCurrentGlobalIndex = -1;
-    private GeneratorNodeHelper m_generatorNodeHelper; // = null
-
-    private readonly Dictionary<CollectionViewGroup, GroupGeneratorNode> m_groupNodeMappingCache = new Dictionary<CollectionViewGroup, GroupGeneratorNode>();
-    private LateGroupLevelDescription[] m_groupLevelDescriptionCache; // = null
-
-    private IDisposable m_generatorCurrentDetailDisposable; // = null
-    private DetailGeneratorNode m_generatorCurrentDetail; // = null
-    private int m_generatorCurrentDetailIndex = -1;
-    private int m_generatorCurrentDetailNodeIndex = -1;
-
-    private int m_genPosToIndexUpdateInhibitCount = 0;
-
-    private IInhibitGenPosToIndexUpdating m_genPosToIndexInhibiter; // = null
-    private IDisposable m_currentGenPosToIndexInhibiterDisposable; // = null
-
-    private Binding m_headerFooterDataContextBinding;
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        var eventArgs = ( ( NotifyCollectionChangedEventArgs )e ).GetRangeActionOrSelf();
-
-        if( sender == m_collectionView )
-        {
-          this.OnItemsChanged( sender, eventArgs );
-        }
-        else if( sender == m_groupsCollection )
-        {
-          this.OnGroupsChanged( sender, eventArgs );
-        }
-        else if( sender == m_dataGridContext.DetailConfigurations )
-        {
-          this.OnDetailConfigurationsChanged( sender, eventArgs );
-        }
-      }
-      else if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        var eventArgs = ( PropertyChangedEventArgs )e;
-
-        if( sender == m_collectionView )
-        {
-          this.OnCollectionViewPropertyChanged( eventArgs );
-        }
-        else
-        {
-          //this is only registered on the DataGridContext, this has the effect of forwarding property changes for all properties of the DataGridContext
-          this.OnNotifyPropertyChanged( eventArgs );
-        }
-      }
-      else if( ( managerType == typeof( ViewChangedEventManager ) ) || ( managerType == typeof( ThemeChangedEventManager ) ) )
-      {
-        this.OnViewThemeChanged( sender, e );
-      }
-      else if( managerType == typeof( DetailsChangedEventManager ) )
-      {
-        if( this.DetailsChanged != null )
-        {
-          this.DetailsChanged( sender, e );
-        }
-      }
-      else if( managerType == typeof( ItemsSourceChangeCompletedEventManager ) )
-      {
-        this.OnItemsSourceChanged( sender, e );
-      }
-      else if( managerType == typeof( GroupConfigurationSelectorChangedEventManager ) )
-      {
-        this.OnGroupConfigurationSelectorChanged();
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void OnNotifyPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region IInhibitGenPosToIndexUpdating Members
-
-    IDisposable IInhibitGenPosToIndexUpdating.InhibitGenPosToIndexUpdates()
-    {
-      return new GenPosToIndexInhibitionDisposable( this );
-    }
-
-    #endregion
-
-    #region IDataGridContextVisitable Members
-
-    void IDataGridContextVisitable.AcceptVisitor( IDataGridContextVisitor visitor, out bool visitWasStopped )
-    {
-      IDataGridContextVisitable visitable = this as IDataGridContextVisitable;
-
-      visitable.AcceptVisitor( 0, int.MaxValue, visitor, DataGridContextVisitorType.All, true, out visitWasStopped );
-    }
-
-    void IDataGridContextVisitable.AcceptVisitor( int minIndex, int maxIndex, IDataGridContextVisitor visitor, out bool visitWasStopped )
-    {
-      IDataGridContextVisitable visitable = this as IDataGridContextVisitable;
-
-      visitable.AcceptVisitor( minIndex, maxIndex, visitor, DataGridContextVisitorType.All, true, out visitWasStopped );
-    }
-
-    void IDataGridContextVisitable.AcceptVisitor( int minIndex, int maxIndex, IDataGridContextVisitor visitor, DataGridContextVisitorType visitorType, out bool visitWasStopped )
-    {
-      IDataGridContextVisitable visitable = this as IDataGridContextVisitable;
-
-      visitable.AcceptVisitor( minIndex, maxIndex, visitor, visitorType, true, out visitWasStopped );
-    }
-
-    void IDataGridContextVisitable.AcceptVisitor( int minIndex, int maxIndex, IDataGridContextVisitor visitor, DataGridContextVisitorType visitorType, bool visitDetails, out bool visitWasStopped )
-    {
-      visitWasStopped = false;
-
-      if( m_startNode == null )
-        return;
-
-      GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( m_startNode, 0, 0 );
-      nodeHelper.ProcessVisit( m_dataGridContext, minIndex, maxIndex, visitor, visitorType, visitDetails, out visitWasStopped );
-    }
-
-    #endregion
-
-    #region InheritAutoResetFlag Private Class
-
-    private sealed class InheritAutoResetFlag : AutoResetFlag
-    {
-      internal InheritAutoResetFlag()
-        : this( null )
-      {
-      }
-
-      internal InheritAutoResetFlag( AutoResetFlag parent )
-      {
-        m_parent = parent;
-        m_current = AutoResetFlagFactory.Create();
-      }
-
-      public override bool IsSet
-      {
-        get
-        {
-          return ( this.IsSetLocal )
-              || ( ( m_parent != null ) && m_parent.IsSet );
-        }
-      }
-
-      public bool IsSetLocal
-      {
-        get
-        {
-          return m_current.IsSet;
-        }
-      }
-
-      public override IDisposable Set()
-      {
-        return m_current.Set();
-      }
-
-      public IDisposable SetLocal()
-      {
-        return this.Set();
-      }
-
-      private readonly AutoResetFlag m_parent;
-      private readonly AutoResetFlag m_current;
-    }
-
-    #endregion
-
-    #region LeveledAutoResetFlag Private Class
-
-    private sealed class LeveledAutoResetFlag : AutoResetFlag
-    {
-      internal LeveledAutoResetFlag()
-        : this( new List<WeakReference>( 3 ), 0 )
-      {
-      }
-
-      private LeveledAutoResetFlag( IList<WeakReference> levels, int index )
-      {
-        Debug.Assert( levels != null );
-        Debug.Assert( ( index >= 0 ) && ( index <= levels.Count ) );
-
-        m_levels = levels;
-        m_flag = AutoResetFlagFactory.Create();
-        m_index = index;
-
-        var self = new WeakReference( this );
-        if( m_index == m_levels.Count )
-        {
-          m_levels.Add( self );
-        }
-        else
-        {
-          m_levels[ m_index ] = self;
-        }
-      }
-
-      public override bool IsSet
-      {
-        get
-        {
-          if( m_flag.IsSet )
-            return true;
-
-          var parent = this.GetFlag( m_index - 1 );
-          if( parent != null )
-            return parent.IsSet;
-
-          return false;
-        }
-      }
-
-      public override IDisposable Set()
-      {
-        return m_flag.Set();
-      }
-
-      internal LeveledAutoResetFlag GetChild()
-      {
-        var index = m_index + 1;
-        var flag = this.GetFlag( index );
-
-        if( flag != null )
-          return flag;
-
-        return new LeveledAutoResetFlag( m_levels, index );
-      }
-
-      private LeveledAutoResetFlag GetFlag( int index )
-      {
-        if( ( index < 0 ) || ( index >= m_levels.Count ) )
-          return null;
-
-        return ( LeveledAutoResetFlag )m_levels[ index ].Target;
-      }
-
-      private readonly IList<WeakReference> m_levels;
-      private readonly AutoResetFlag m_flag;
-      private readonly int m_index;
-    }
-
-    #endregion
-
-    #region BubbleDirtyFlag Private Class
-
-    private sealed class BubbleDirtyFlag
-    {
-      internal BubbleDirtyFlag( bool isSet )
-        : this( null, isSet )
-      {
-      }
-
-      internal BubbleDirtyFlag( BubbleDirtyFlag parent, bool isSet )
-      {
-        m_parent = parent;
-
-        this.IsSet = isSet;
-      }
-
-      internal bool IsSet
-      {
-        get
-        {
-          return m_isSet;
-        }
-        set
-        {
-          if( value == m_isSet )
-            return;
-
-          m_isSet = value;
-
-          if( value && ( m_parent != null ) )
-          {
-            m_parent.IsSet = true;
-          }
-        }
-      }
-
-      private readonly BubbleDirtyFlag m_parent;
-      private bool m_isSet;
-    }
-
-    #endregion
-
-    #region CustomItemContainerGeneratorDisposableDisposer Private Class
-
-    private sealed class CustomItemContainerGeneratorDisposableDisposer : IDisposable
-    {
-      public CustomItemContainerGeneratorDisposableDisposer( CustomItemContainerGenerator generator, GeneratorPosition startGenPos, GeneratorDirection direction )
-      {
-        if( generator == null )
-          throw new ArgumentNullException( "generator" );
-
-        try
-        {
-          generator.StartGenerator( startGenPos, direction );
-        }
-        catch( Exception e )
-        {
-          try
-          {
-            generator.StopGenerator();
-          }
-          catch
-          {
-            // We swallow all exceptions thrown here because the actual exception we want to raise to the user
-            // is the one that has been thrown in the call to StartGenerator.
-          }
-
-          throw new DataGridInternalException( "The generator failed to start.", e, generator.m_dataGridControl );
-        }
-
-        m_generator = generator;
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        // Prevent this method from being called more than once.
-        var generator = Interlocked.Exchange( ref m_generator, null );
-        if( generator == null )
-          return;
-
-        generator.StopGenerator();
-      }
-
-      ~CustomItemContainerGeneratorDisposableDisposer()
-      {
-        this.Dispose( false );
-      }
-
-      private CustomItemContainerGenerator m_generator; //null
-    }
-
-    #endregion
-
-    #region GenPosToIndexInhibitionDisposable Private Class
-
-    private sealed class GenPosToIndexInhibitionDisposable : IDisposable
-    {
-      internal GenPosToIndexInhibitionDisposable( CustomItemContainerGenerator generator )
-      {
-        if( generator == null )
-          throw new ArgumentNullException( "generator" );
-
-        m_generator = generator;
-
-        Interlocked.Increment( ref m_generator.m_genPosToIndexUpdateInhibitCount );
-
-        if( m_generator.m_genPosToIndexInhibiter != null )
-        {
-          m_nestedDisposable = m_generator.m_genPosToIndexInhibiter.InhibitGenPosToIndexUpdates();
-        }
-      }
-
-      private void Dispose( bool disposing )
-      {
-        var generator = Interlocked.Exchange( ref m_generator, null );
-        if( generator == null )
-          return;
-
-        if( Interlocked.Decrement( ref generator.m_genPosToIndexUpdateInhibitCount ) == 0 )
-        {
-          if( generator.GenPosToIndexNeedsUpdate )
-          {
-            generator.IncrementCurrentGenerationCount();
-          }
-        }
-
-        if( m_nestedDisposable != null )
-        {
-          m_nestedDisposable.Dispose();
-          m_nestedDisposable = null;
-        }
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      ~GenPosToIndexInhibitionDisposable()
-      {
-        this.Dispose( false );
-      }
-
-      private CustomItemContainerGenerator m_generator; // = null
-      private IDisposable m_nestedDisposable; // = null
-    }
-
-    #endregion
-
-    #region CustomItemContainerGeneratorFlags Private Enum
-
-    [Flags]
-    private enum CustomItemContainerGeneratorFlags
-    {
-      RecyclingEnabled = 1 << 0,
-      InUse = 1 << 1,
-      GenPosToIndexNeedsUpdate = 1 << 2,
-      ForceReset = 1 << 3,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGeneratorRecyclingPools.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGeneratorRecyclingPools.cs
deleted file mode 100644
index 79678e3d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGeneratorRecyclingPools.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class CustomItemContainerGeneratorRecyclingPools
-  {
-    #region ContainersRemoved Event
-
-    internal event ContainersRemovedEventHandler ContainersRemoved;
-
-    private void OnContainersRemoved()
-    {
-      if( ( m_containersRemoved == null ) || ( m_deferCount != 0 ) )
-        return;
-
-      var containers = m_containersRemoved;
-      m_containersRemoved = null;
-
-      if( containers.Count <= 0 )
-        return;
-
-      var handler = this.ContainersRemoved;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new ContainersRemovedEventArgs( containers ) );
-    }
-
-    #endregion
-
-    #region RecyclingCandidateCleaned Event
-
-    internal event RecyclingCandidatesCleanedEventHandler RecyclingCandidatesCleaned;
-
-    private void OnRecyclingCandidatesCleaned( List<DependencyObject> recyclingCandidates )
-    {
-      if( recyclingCandidates.Count == 0 )
-        return;
-
-      var handler = this.RecyclingCandidatesCleaned;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new RecyclingCandidatesCleanedEventArgs( recyclingCandidates ) );
-    }
-
-    #endregion
-
-    internal IDisposable DeferContainersRemoved()
-    {
-      return new DeferredDisposable( new DeferContainersRemovedState( this ) );
-    }
-
-    internal void Clear()
-    {
-      m_containersRemoved = m_containersRemoved ?? new List<DependencyObject>();
-
-      this.ClearPools( m_itemContainerPools, m_containersRemoved, pool => pool.Clear() );
-      this.ClearPools( m_headerFooterItemContainerPools, m_containersRemoved, pool => pool.Clear() );
-      this.ClearPools( m_groupHeaderFooterItemContainerPools, m_containersRemoved, pool => pool.Clear() );
-
-      this.OnContainersRemoved();
-    }
-
-    internal void Clear( DetailConfiguration detailConfiguration )
-    {
-      m_containersRemoved = m_containersRemoved ?? new List<DependencyObject>();
-
-      var key = CustomItemContainerGeneratorRecyclingPools.GetKey( detailConfiguration );
-
-      var itemContainerPool = default( ItemContainerRecyclingPool );
-      if( m_itemContainerPools.TryGetValue( key, out itemContainerPool ) )
-      {
-        m_itemContainerPools.Remove( key );
-
-        this.ClearPool( itemContainerPool, m_containersRemoved, pool => pool.Clear() );
-      }
-
-      var headerFooterItemContainerPool = default( HeaderFooterItemContainerRecyclingPool );
-      if( m_headerFooterItemContainerPools.TryGetValue( key, out headerFooterItemContainerPool ) )
-      {
-        m_headerFooterItemContainerPools.Remove( key );
-
-        this.ClearPool( headerFooterItemContainerPool, m_containersRemoved, pool => pool.Clear() );
-      }
-
-      var groupHeaderFooterItemContainerPool = default( GroupHeaderFooterItemContainerRecyclingPool );
-      if( m_groupHeaderFooterItemContainerPools.TryGetValue( key, out groupHeaderFooterItemContainerPool ) )
-      {
-        m_groupHeaderFooterItemContainerPools.Remove( key );
-
-        this.ClearPool( groupHeaderFooterItemContainerPool, m_containersRemoved, pool => pool.Clear() );
-      }
-
-      this.OnContainersRemoved();
-    }
-
-    internal void CleanRecyclingCandidates()
-    {
-      var recyclingCandidates = new List<DependencyObject>( 4 );
-
-      foreach( var pool in m_itemContainerPools.Values )
-      {
-        foreach( var container in pool )
-        {
-          var dataGridItemContainer = container as IDataGridItemContainer;
-          if( dataGridItemContainer != null && dataGridItemContainer.IsRecyclingCandidate )
-          {
-            dataGridItemContainer.IsRecyclingCandidate = false;
-            dataGridItemContainer.CleanRecyclingCandidate();
-            recyclingCandidates.Add( container );
-          }
-        }
-      }
-
-      foreach( var pool in m_headerFooterItemContainerPools.Values )
-      {
-        foreach( var container in pool )
-        {
-          var dataGridItemContainer = container as IDataGridItemContainer;
-          if( dataGridItemContainer != null && dataGridItemContainer.IsRecyclingCandidate )
-          {
-            dataGridItemContainer.IsRecyclingCandidate = false;
-            dataGridItemContainer.CleanRecyclingCandidate();
-            recyclingCandidates.Add( container );
-          }
-        }
-      }
-
-      foreach( var pool in m_groupHeaderFooterItemContainerPools.Values )
-      {
-        foreach( var container in pool )
-        {
-          var dataGridItemContainer = container as IDataGridItemContainer;
-          if( dataGridItemContainer != null && dataGridItemContainer.IsRecyclingCandidate )
-          {
-            dataGridItemContainer.IsRecyclingCandidate = false;
-            dataGridItemContainer.CleanRecyclingCandidate();
-            recyclingCandidates.Add( container );
-          }
-        }
-      }
-
-      this.OnRecyclingCandidatesCleaned( recyclingCandidates );
-    }
-
-    internal ItemContainerRecyclingPool GetItemContainerPool( DetailConfiguration detailConfiguration )
-    {
-      return this.GetPool( m_itemContainerPools, detailConfiguration, false );
-    }
-
-    internal ItemContainerRecyclingPool GetItemContainerPool( DetailConfiguration detailConfiguration, bool create )
-    {
-      return this.GetPool( m_itemContainerPools, detailConfiguration, create );
-    }
-
-    internal HeaderFooterItemContainerRecyclingPool GetHeaderFooterItemContainerPool( DetailConfiguration detailConfiguration )
-    {
-      return this.GetPool( m_headerFooterItemContainerPools, detailConfiguration, false );
-    }
-
-    internal HeaderFooterItemContainerRecyclingPool GetHeaderFooterItemContainerPool( DetailConfiguration detailConfiguration, bool create )
-    {
-      return this.GetPool( m_headerFooterItemContainerPools, detailConfiguration, create );
-    }
-
-    internal GroupHeaderFooterItemContainerRecyclingPool GetGroupHeaderFooterItemContainerPool( DetailConfiguration detailConfiguration )
-    {
-      return this.GetPool( m_groupHeaderFooterItemContainerPools, detailConfiguration, false );
-    }
-
-    internal GroupHeaderFooterItemContainerRecyclingPool GetGroupHeaderFooterItemContainerPool( DetailConfiguration detailConfiguration, bool create )
-    {
-      return this.GetPool( m_groupHeaderFooterItemContainerPools, detailConfiguration, create );
-    }
-
-    private T GetPool<T>( Dictionary<object, T> pools, DetailConfiguration detailConfiguration, bool create ) where T : class, new()
-    {
-      if( pools == null )
-        throw new ArgumentNullException( "pools" );
-
-      var key = CustomItemContainerGeneratorRecyclingPools.GetKey( detailConfiguration );
-      var pool = default( T );
-
-      if( !pools.TryGetValue( key, out pool ) )
-      {
-        if( create )
-        {
-          pool = new T();
-          pools.Add( key, pool );
-        }
-        else
-        {
-          pool = null;
-        }
-      }
-
-      return pool;
-    }
-
-    private void ClearPools<T>(
-      Dictionary<object, T> pools,
-      ICollection<DependencyObject> containers,
-      Action<T> clearPool ) where T : IEnumerable<DependencyObject>
-    {
-      Debug.Assert( pools != null );
-
-      foreach( var pool in pools.Values )
-      {
-        this.ClearPool( pool, containers, clearPool );
-      }
-
-      pools.Clear();
-    }
-
-    private void ClearPool<T>(
-      T pool,
-      ICollection<DependencyObject> containers,
-      Action<T> clearPool ) where T : IEnumerable<DependencyObject>
-    {
-      Debug.Assert( pool != null );
-      Debug.Assert( clearPool != null );
-
-      foreach( var container in pool )
-      {
-        containers.Add( container );
-      }
-
-      clearPool.Invoke( pool );
-    }
-
-    private static object GetKey( DetailConfiguration detailConfiguration )
-    {
-      return detailConfiguration ?? CustomItemContainerGeneratorRecyclingPools.MasterConfiguration;
-    }
-
-    private static readonly object MasterConfiguration = new object();
-
-    private int m_deferCount; //0
-    private List<DependencyObject> m_containersRemoved; //null
-
-    private readonly Dictionary<object, ItemContainerRecyclingPool> m_itemContainerPools = new Dictionary<object, ItemContainerRecyclingPool>();
-    private readonly Dictionary<object, HeaderFooterItemContainerRecyclingPool> m_headerFooterItemContainerPools = new Dictionary<object, HeaderFooterItemContainerRecyclingPool>();
-    private readonly Dictionary<object, GroupHeaderFooterItemContainerRecyclingPool> m_groupHeaderFooterItemContainerPools = new Dictionary<object, GroupHeaderFooterItemContainerRecyclingPool>();
-
-    #region DeferContainersRemovedState Private Class
-
-    private sealed class DeferContainersRemovedState : DeferredDisposableState
-    {
-      internal DeferContainersRemovedState( CustomItemContainerGeneratorRecyclingPools target )
-      {
-        if( target == null )
-          throw new ArgumentNullException( "target" );
-
-        m_target = target;
-      }
-
-      protected override bool IsDeferred
-      {
-        get
-        {
-          return ( m_target.m_deferCount != 0 );
-        }
-      }
-
-      protected override void Increment()
-      {
-        m_target.m_deferCount++;
-      }
-
-      protected override void Decrement()
-      {
-        m_target.m_deferCount--;
-      }
-
-      protected override void OnDeferEnded( bool disposing )
-      {
-        m_target.OnContainersRemoved();
-      }
-
-      private readonly CustomItemContainerGeneratorRecyclingPools m_target;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProvider.cs
deleted file mode 100644
index 5e24629e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProvider.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataItemDataProvider : DataItemDataProviderBase
-  {
-    #region Static Fields
-
-    private static readonly object EmptyDataItem = new object();
-
-    #endregion
-
-    #region IsEmpty Property
-
-    public override bool IsEmpty
-    {
-      get
-      {
-        return m_isEmpty;
-      }
-    }
-
-    private void SetIsEmpty( bool value )
-    {
-      if( m_isEmpty == value )
-        return;
-
-      m_isEmpty = value;
-
-      this.OnPropertyChanged( new PropertyChangedEventArgs( "IsEmpty" ) );
-    }
-
-    private bool m_isEmpty = true;
-
-    #endregion
-
-    public override void SetDataItem( object dataItem )
-    {
-      if( m_dataItem == dataItem )
-        return;
-
-      m_dataItem = dataItem;
-
-      if( this.IsRefreshDeferred )
-        return;
-
-      this.Refresh();
-    }
-
-    public override void ClearDataItem()
-    {
-      if( m_dataItem == DataItemDataProvider.EmptyDataItem )
-        return;
-
-      m_dataItem = DataItemDataProvider.EmptyDataItem;
-
-      if( this.IsRefreshDeferred )
-        return;
-
-      this.Refresh();
-    }
-
-    protected override void BeginQuery()
-    {
-      if( this.IsRefreshDeferred )
-        return;
-
-      base.BeginQuery();
-
-      if( m_dataItem == DataItemDataProvider.EmptyDataItem )
-      {
-        this.OnQueryFinished( null, null, this.OnDataChanged, true );
-      }
-      else
-      {
-        this.OnQueryFinished( m_dataItem, null, this.OnDataChanged, false );
-      }
-    }
-
-    private object OnDataChanged( object arg )
-    {
-      this.SetIsEmpty( ( bool )arg );
-
-      return null;
-    }
-
-    #region Private Fields
-
-    private object m_dataItem = DataItemDataProvider.EmptyDataItem;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProviderBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProviderBase.cs
deleted file mode 100644
index 83187b67..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DataItemDataProviderBase.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class DataItemDataProviderBase : DataSourceProvider
-  {
-    internal static readonly string DataPropertyName = PropertyHelper.GetPropertyName( ( DataItemDataProviderBase s ) => s.Data );
-
-    #region IsEmpty Property
-
-    public abstract bool IsEmpty
-    {
-      get;
-    }
-
-    #endregion
-
-    public abstract void SetDataItem( object dataItem );
-    public abstract void ClearDataItem();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs
deleted file mode 100644
index e2e791fa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal partial class DetailGeneratorNode : GeneratorNode
-  {
-    internal DetailGeneratorNode( DataGridContext dataGridContext, CustomItemContainerGenerator generator )
-      : base( null )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      if( generator == null )
-        throw new ArgumentNullException( "generator" );
-
-      m_dataGridContext = dataGridContext;
-      m_generator = generator;
-      m_itemCount = generator.ItemCount;
-    }
-
-    public CustomItemContainerGenerator DetailGenerator
-    {
-      get
-      {
-        return m_generator;
-      }
-    }
-
-    public DataGridContext DetailContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-    }
-
-    internal override int ItemCount
-    {
-      get
-      {
-        return m_itemCount;
-      }
-    }
-
-    internal override void CleanGeneratorNode()
-    {
-      base.CleanGeneratorNode();
-
-      m_generator.CleanupGenerator( true );
-      m_dataGridContext.CleanDataGridContext();
-
-      m_generator = null;
-    }
-
-    public void UpdateItemCount()
-    {
-      m_itemCount = m_generator.ItemCount;
-    }
-
-    private readonly DataGridContext m_dataGridContext;
-    private CustomItemContainerGenerator m_generator;
-    private int m_itemCount;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/EmptyDataItemDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/EmptyDataItemDataProvider.cs
deleted file mode 100644
index 0b9c4af9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/EmptyDataItemDataProvider.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class EmptyDataItemDataProvider : DataItemDataProviderBase
-  {
-    #region Constructor
-
-    private EmptyDataItemDataProvider()
-    {
-    }
-
-    #endregion
-
-    #region Instance Static Property
-
-    internal static EmptyDataItemDataProvider Instance
-    {
-      get
-      {
-        if( m_instance == null )
-        {
-          Interlocked.CompareExchange<EmptyDataItemDataProvider>( ref EmptyDataItemDataProvider.m_instance, new EmptyDataItemDataProvider(), null );
-        }
-
-        return m_instance;
-      }
-    }
-
-    private static EmptyDataItemDataProvider m_instance;
-
-    #endregion
-
-    #region IsEmpty Property
-
-    public override bool IsEmpty
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    public override void SetDataItem( object dataItem )
-    {
-    }
-
-    public override void ClearDataItem()
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ExpansionStateEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ExpansionStateEventArgs.cs
deleted file mode 100644
index dcad5454..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ExpansionStateEventArgs.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class ExpansionStateChangedEventArgs : EventArgs
-  {
-    public ExpansionStateChangedEventArgs( bool newExpansionState, int nodeIndexOffset, int itemCount )
-    {
-      m_expansionState = newExpansionState;
-      m_offset = nodeIndexOffset;
-      m_count = itemCount;
-    }
-
-    public bool NewExpansionState
-    {
-      get
-      {
-        return m_expansionState;
-      }
-    }
-
-    public int IndexOffset
-    {
-      get
-      {
-        return m_offset;
-      }
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_count;
-      }
-    }
-
-    private readonly bool m_expansionState;
-    private readonly int m_offset;
-    private readonly int m_count;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs
deleted file mode 100644
index 193cde13..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal partial class GeneratorNode
-  {
-    internal GeneratorNode( GeneratorNode parent )
-    {
-      this.Parent = parent;
-    }
-
-    //-------------
-    // Events
-    internal event EventHandler<ExpansionStateChangedEventArgs> ExpansionStateChanged;
-
-    //-------------
-    // Properties 
-
-    internal GeneratorNode Previous;
-
-    internal GeneratorNode Next;
-
-    internal GeneratorNode Parent;
-
-    internal int Level
-    {
-      get
-      {
-        int count = 0;
-
-        GeneratorNode runningPtr = this;
-
-        while( runningPtr.Parent != null )
-        {
-          runningPtr = runningPtr.Parent;
-          count++;
-        }
-
-        return count;
-      }
-    }
-
-    internal virtual int ItemCount
-    {
-      get
-      {
-        return 0;
-      }
-    }
-
-    internal bool IsComputedExpanded
-    {
-      get
-      {
-        bool expanded = true;
-
-        GeneratorNode runningPtr = this;
-
-        while( runningPtr != null )
-        {
-          expanded = runningPtr.IsComputedExpandedOverride;
-          if( expanded == false )
-          {
-            break;
-          }
-
-          runningPtr = runningPtr.Parent;
-        }
-
-        return expanded;
-      }
-    }
-
-    protected virtual bool IsComputedExpandedOverride
-    {
-      get
-      {
-        //default implementation... 
-        return true;
-      }
-    }
-
-    //-------------
-    // Methods
-
-    internal virtual void CleanGeneratorNode()
-    {
-      this.Previous = null;
-      this.Parent = null;
-      this.Next = null;
-    }
-
-    internal void AdjustItemCount( int delta )
-    {
-      delta = this.AdjustItemCountOverride( delta );
-
-      if( ( this.Parent != null ) && ( delta != 0 ) )
-      {
-        this.Parent.AdjustItemCount( delta );
-      }
-    }
-
-    internal void AdjustLeafCount( int delta )
-    {
-      delta = this.AdjustLeafCountOverride( delta );
-
-      if( ( this.Parent != null ) && ( delta != 0 ) )
-      {
-        this.Parent.AdjustLeafCount( delta );
-      }
-    }
-
-    protected virtual int AdjustItemCountOverride( int delta )
-    {
-      return delta;
-    }
-
-    protected virtual int AdjustLeafCountOverride( int delta )
-    {
-      return delta;
-    }
-
-    internal virtual void NotifyExpansionStateChanged( bool isParentExpanded )
-    {
-    }
-
-    protected void OnExpansionStateChanged( bool newExpansionState, int itemOffset, int count )
-    {
-      var handler = this.ExpansionStateChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new ExpansionStateChangedEventArgs( newExpansionState, itemOffset, count ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs
deleted file mode 100644
index be0703fc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class GeneratorNodeFactory : IWeakEventListener
-  {
-    public GeneratorNodeFactory( NotifyCollectionChangedEventHandler itemsChangedHandler,
-                                 NotifyCollectionChangedEventHandler groupsChangedHandler,
-                                 NotifyCollectionChangedEventHandler headersFootersChangedHandler,
-                                 EventHandler<ExpansionStateChangedEventArgs> expansionStateChangedHandler,
-                                 EventHandler isExpandedChangingHandler,
-                                 EventHandler isExpandedChangedHandler,
-                                 DataGridControl dataGridControl )
-    {
-      if( itemsChangedHandler == null )
-        throw new ArgumentNullException( "itemsChangedHandler" );
-
-      if( groupsChangedHandler == null )
-        throw new ArgumentNullException( "groupsChangedHandler" );
-
-      if( headersFootersChangedHandler == null )
-        throw new ArgumentNullException( "headersFootersChangedHandler" );
-
-      if( expansionStateChangedHandler == null )
-        throw new ArgumentNullException( "expansionStateChangedHandler" );
-
-      if( isExpandedChangingHandler == null )
-        throw new ArgumentNullException( "isExpandedChangingHandler" );
-
-      if( isExpandedChangedHandler == null )
-        throw new ArgumentNullException( "isExpandedChangedHandler" );
-
-      m_itemsChangedHandler = itemsChangedHandler;
-      m_groupsChangedHandler = groupsChangedHandler;
-      m_headersFootersChangedHandler = headersFootersChangedHandler;
-      m_expansionStateChangedHandler = expansionStateChangedHandler;
-      m_isExpandedChangingHandler = isExpandedChangingHandler;
-      m_isExpandedChangedHandler = isExpandedChangedHandler;
-
-      if( dataGridControl != null )
-      {
-        m_dataGridControl = new WeakReference( dataGridControl );
-      }
-    }
-
-    #region DataGridControl Private Property
-
-    private DataGridControl DataGridControl
-    {
-      get
-      {
-        if( m_dataGridControl == null )
-          return null;
-
-        return m_dataGridControl.Target as DataGridControl;
-      }
-    }
-
-    //For exception purposes only.
-    private readonly WeakReference m_dataGridControl; //null
-
-    #endregion
-
-    public GeneratorNode CreateGroupGeneratorNode(
-      CollectionViewGroup collectionViewGroup,
-      GeneratorNode parent,
-      GeneratorNode previous,
-      GeneratorNode next,
-      GroupConfiguration groupConfig )
-    {
-      Debug.Assert( collectionViewGroup != null, "collectionViewGroup cannot be null for CreateGroupGeneratorNode()" );
-
-      GroupGeneratorNode node = new GroupGeneratorNode( collectionViewGroup, parent, groupConfig );
-
-      if( previous != null )
-      {
-        previous.Next = node;
-      }
-      node.Previous = previous;
-
-      if( next != null )
-      {
-        next.Previous = node;
-      }
-      node.Next = next;
-
-      node.SetIsExpandedAtInitialization( groupConfig.InitiallyExpanded );
-
-      if( !collectionViewGroup.IsBottomLevel )
-      {
-        this.RegisterNodeCollectionChanged(
-          ( INotifyCollectionChanged )collectionViewGroup.GetItems(),
-          new NotifyCollectionChangedEventHandler( node.OnCollectionChanged ) );
-
-        node.CollectionChanged += m_groupsChangedHandler;
-      }
-
-      node.ExpansionStateChanged += m_expansionStateChangedHandler;
-      node.IsExpandedChanging += m_isExpandedChangingHandler;
-      node.IsExpandedChanged += m_isExpandedChangedHandler;
-
-      node.AdjustItemCount( node.ItemCount );
-
-      node.BuildNamesTree();
-
-      return node;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "generator" )]
-    public GeneratorNode CreateItemsGeneratorNode(
-      IList collection,
-      GeneratorNode parent,
-      GeneratorNode previous,
-      GeneratorNode next )
-    {
-      Debug.Assert( collection != null, "collection cannot be null for CreateItemsGeneratorNode()" );
-
-      INotifyCollectionChanged notifyCollection = collection as INotifyCollectionChanged;
-
-      Debug.Assert( notifyCollection != null, "collection must be a INotifyCollectionChanged for CreateItemsGeneratorNode()" );
-
-      ItemCollection itemCollection = collection as ItemCollection;
-      if( itemCollection != null )
-      {
-        DataGridCollectionView dgcv = itemCollection.SourceCollection as DataGridCollectionView;
-        if( dgcv != null )
-        {
-          collection = dgcv;
-        }
-      }
-
-      ItemsGeneratorNode node = new ItemsGeneratorNode( collection, parent );
-
-      this.SetupCollectionGeneratorNode( node, parent, previous, next );
-
-      node.AdjustLeafCount( node.Items.Count );
-
-      return node;
-    }
-
-    public HeadersFootersGeneratorNode CreateHeadersFootersGeneratorNode(
-      IList collection,
-      GeneratorNode parent,
-      GeneratorNode previous,
-      GeneratorNode next )
-    {
-      Debug.Assert( collection != null, "collection cannot be null for CreateHeadersFootersGeneratorNode()" );
-
-      INotifyCollectionChanged notifyCollection = collection as INotifyCollectionChanged;
-
-      Debug.Assert( notifyCollection != null, "collection must be a INotifyCollectionChanged for CreateHeadersFootersGeneratorNode()" );
-
-      HeadersFootersGeneratorNode node = new HeadersFootersGeneratorNode( collection, parent );
-
-      if( previous != null )
-      {
-        previous.Next = node;
-      }
-      node.Previous = previous;
-
-      if( next != null )
-      {
-        next.Previous = node;
-      }
-      node.Next = next;
-
-      node.ExpansionStateChanged += m_expansionStateChangedHandler;
-
-      this.ConfigureHeadersFootersNotification( notifyCollection, node );
-
-      if( parent != null )
-      {
-        node.AdjustItemCount( node.ItemCount );
-      }
-
-      return node;
-    }
-
-    public void CleanGeneratorNodeTree( GeneratorNode node )
-    {
-      if( node.Parent != null )
-      {
-        node.Parent.AdjustItemCount( -node.ItemCount );
-
-        GroupGeneratorNode parentGroupNode = node.Parent as GroupGeneratorNode;
-        if( ( parentGroupNode != null ) && ( parentGroupNode.Child == node ) )
-        {
-          parentGroupNode.Child = null;
-        }
-      }
-
-      GeneratorNode child;
-      GeneratorNode next;
-
-      do
-      {
-        GroupGeneratorNode groupNode = node as GroupGeneratorNode;
-
-        next = node.Next;
-        child = ( groupNode != null ) ? groupNode.Child : null;
-
-        this.CleanGeneratorNode( node );
-
-        //this recursive function cleans up the tree of nodes
-        if( child != null )
-        {
-          this.CleanGeneratorNodeTree( child );
-        }
-
-        node = next;
-      }
-      while( node != null );
-    }
-
-    public void CleanGeneratorNode( GeneratorNode node )
-    {
-      HeadersFootersGeneratorNode headersFootersNode = node as HeadersFootersGeneratorNode;
-      if( headersFootersNode != null )
-      {
-        this.CleanHeadersFootersNotification( headersFootersNode );
-      }
-      else
-      {
-        ItemsGeneratorNode itemsNode = node as ItemsGeneratorNode;
-        if( itemsNode != null )
-        {
-          this.UnregisterNodeCollectionChanged( ( INotifyCollectionChanged )itemsNode.Items );
-          itemsNode.CollectionChanged -= m_itemsChangedHandler;
-        }
-        else
-        {
-          GroupGeneratorNode groupNode = node as GroupGeneratorNode;
-          if( groupNode != null )
-          {
-            IList<object> subItems = groupNode.CollectionViewGroup.GetItems();
-
-            this.UnregisterNodeCollectionChanged( ( INotifyCollectionChanged )subItems );
-
-            groupNode.CollectionChanged -= m_groupsChangedHandler;
-            groupNode.IsExpandedChanging -= m_isExpandedChangingHandler;
-            groupNode.IsExpandedChanged -= m_isExpandedChangedHandler;
-          }
-        }
-      }
-
-      node.ExpansionStateChanged -= m_expansionStateChangedHandler;
-
-      node.CleanGeneratorNode();
-    }
-
-    private void SetupCollectionGeneratorNode( CollectionGeneratorNode newNode, GeneratorNode parent, GeneratorNode previous, GeneratorNode next )
-    {
-      if( previous != null )
-      {
-        previous.Next = newNode;
-      }
-      newNode.Previous = previous;
-
-      if( next != null )
-      {
-        next.Previous = newNode;
-      }
-      newNode.Next = next;
-
-      this.RegisterNodeCollectionChanged( ( INotifyCollectionChanged )newNode.Items, new NotifyCollectionChangedEventHandler( newNode.OnCollectionChanged ) );
-
-      newNode.CollectionChanged += m_itemsChangedHandler;
-      newNode.ExpansionStateChanged += m_expansionStateChangedHandler;
-
-      if( parent != null )
-      {
-        newNode.AdjustItemCount( newNode.ItemCount );
-      }
-    }
-
-    private void ConfigureHeadersFootersNotification( INotifyCollectionChanged collection, HeadersFootersGeneratorNode node )
-    {
-      ICollection<HeadersFootersGeneratorNode> nodeList;
-      if( !m_headersFootersMapping.TryGetValue( collection, out nodeList ) )
-      {
-        nodeList = new HashSet<HeadersFootersGeneratorNode>();
-
-        m_headersFootersMapping.Add( collection, nodeList );
-        CollectionChangedEventManager.AddListener( collection, this );
-      }
-
-      nodeList.Add( node );
-    }
-
-    private void CleanHeadersFootersNotification( HeadersFootersGeneratorNode node )
-    {
-      var collection = node.Items as INotifyCollectionChanged;
-      if( collection == null )
-        return;
-
-      try
-      {
-        var nodeList = m_headersFootersMapping[ collection ];
-        nodeList.Remove( node );
-
-        if( nodeList.Count == 0 )
-        {
-          CollectionChangedEventManager.RemoveListener( collection, this );
-          m_headersFootersMapping.Remove( collection );
-        }
-      }
-      catch( Exception e )
-      {
-        throw new DataGridInternalException( e.Message, e, this.DataGridControl );
-      }
-    }
-
-    private void RegisterNodeCollectionChanged( INotifyCollectionChanged source, NotifyCollectionChangedEventHandler handler )
-    {
-      m_nodesCollectionChangedEventHandlers.Add( source, handler );
-      CollectionChangedEventManager.AddListener( source, this );
-    }
-
-    private void UnregisterNodeCollectionChanged( INotifyCollectionChanged source )
-    {
-      if( m_nodesCollectionChangedEventHandlers.Remove( source ) )
-      {
-        CollectionChangedEventManager.RemoveListener( source, this );
-      }
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.OnCollectionChanged( ( INotifyCollectionChanged )sender, ( NotifyCollectionChangedEventArgs )e );
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    private void OnCollectionChanged( INotifyCollectionChanged source, NotifyCollectionChangedEventArgs e )
-    {
-      NotifyCollectionChangedEventHandler handler;
-      ICollection<HeadersFootersGeneratorNode> nodeList;
-
-      if( m_nodesCollectionChangedEventHandlers.TryGetValue( source, out handler ) )
-      {
-        handler.Invoke( source, e );
-      }
-      else if( m_headersFootersMapping.TryGetValue( source, out nodeList ) )
-      {
-        Debug.Assert( nodeList.Count > 0 );
-
-        m_headersFootersChangedHandler.Invoke( nodeList, e );
-      }
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    private readonly NotifyCollectionChangedEventHandler m_itemsChangedHandler;
-    private readonly NotifyCollectionChangedEventHandler m_groupsChangedHandler;
-    private readonly NotifyCollectionChangedEventHandler m_headersFootersChangedHandler;
-    private readonly EventHandler<ExpansionStateChangedEventArgs> m_expansionStateChangedHandler;
-    private readonly EventHandler m_isExpandedChangedHandler;
-    private readonly EventHandler m_isExpandedChangingHandler;
-
-    private readonly Dictionary<INotifyCollectionChanged, ICollection<HeadersFootersGeneratorNode>> m_headersFootersMapping = new Dictionary<INotifyCollectionChanged, ICollection<HeadersFootersGeneratorNode>>( 32 );
-    private readonly Dictionary<object, NotifyCollectionChangedEventHandler> m_nodesCollectionChangedEventHandlers = new Dictionary<object, NotifyCollectionChangedEventHandler>( 32 );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs
deleted file mode 100644
index 1a448bf4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs
+++ /dev/null
@@ -1,1152 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class GeneratorNodeHelper
-  {
-    internal GeneratorNodeHelper( GeneratorNode startNode, int index, int sourceDataIndex )
-    {
-      if( startNode == null )
-        throw new ArgumentNullException( "startNode" );
-
-      m_state = new State( startNode, index, sourceDataIndex );
-    }
-
-    internal GeneratorNode CurrentNode
-    {
-      get
-      {
-        return m_state.Node;
-      }
-    }
-
-    internal int Index
-    {
-      get
-      {
-        return m_state.Index;
-      }
-    }
-
-    internal int SourceDataIndex
-    {
-      get
-      {
-        return m_state.DataIndex;
-      }
-    }
-
-    internal bool MoveToNext()
-    {
-      var success = GeneratorNodeHelper.MoveToNext( ref m_state );
-
-      this.EnsureState();
-
-      return success;
-    }
-
-    internal bool MoveToNextBy( int count )
-    {
-      var success = GeneratorNodeHelper.MoveToNext( ref m_state, count );
-
-      this.EnsureState();
-
-      return success;
-    }
-
-    internal bool MoveToPrevious()
-    {
-      var success = GeneratorNodeHelper.MoveToPrevious( ref m_state );
-
-      this.EnsureState();
-
-      return success;
-    }
-
-    internal bool MoveToFirst()
-    {
-      GeneratorNodeHelper.MoveToFirst( ref m_state );
-
-      this.EnsureState();
-
-      return true;
-    }
-
-    internal bool MoveToEnd()
-    {
-      // We call MoveToNext instead of MoveToEnd because MoveToEnd includes the indexes of the last node.
-      while( GeneratorNodeHelper.MoveToNext( ref m_state ) )
-      {
-      }
-
-      this.EnsureState();
-
-      return true;
-    }
-
-    internal bool MoveToChild( bool skipItemLessGroupNodes )
-    {
-      var success = GeneratorNodeHelper.MoveToChild( ref m_state, skipItemLessGroupNodes );
-
-      this.EnsureState();
-
-      return success;
-    }
-
-    internal bool MoveToParent()
-    {
-      var success = GeneratorNodeHelper.MoveToParent( ref m_state );
-
-      this.EnsureState();
-
-      return success;
-    }
-
-    internal bool InsertAfter( GeneratorNode insert )
-    {
-      if( insert == null )
-        throw new DataGridInternalException( "GeneratorNode is null." );
-
-      var insertionCount = default( int );
-      var chainLength = default( int );
-      var insertLast = GeneratorNodeHelper.EvaluateChain( insert, out insertionCount, out chainLength );
-
-      var nextNode = m_state.Node.Next;
-      if( nextNode != null )
-      {
-        nextNode.Previous = insertLast;
-      }
-
-      insertLast.Next = nextNode;
-      insert.Previous = m_state.Node;
-      m_state.Node.Next = insert;
-
-      // Move the current node to the last node inserted
-      if( !this.MoveToNextBy( chainLength ) )
-        throw new DataGridInternalException( "Unable to move to the requested generator index." );
-
-      return true;
-    }
-
-    internal bool InsertBefore( GeneratorNode insert )
-    {
-      if( insert == null )
-        throw new DataGridInternalException( "GeneratorNode is null" );
-
-      var insertionCount = default( int );
-      var chainLength = default( int );
-      var insertLast = GeneratorNodeHelper.EvaluateChain( insert, out insertionCount, out chainLength );
-
-      var previousNode = m_state.Node.Previous;
-      if( previousNode != null )
-      {
-        previousNode.Next = insert;
-      }
-
-      insert.Previous = previousNode;
-      m_state.Node.Previous = insertLast;
-      insertLast.Next = m_state.Node;
-
-      var parentGroup = insert.Parent as GroupGeneratorNode;
-      if( parentGroup != null )
-      {
-        if( parentGroup.Child == m_state.Node )
-        {
-          parentGroup.Child = insert;
-        }
-      }
-
-      // Move the current to the first item inserted.
-      // No need to update the indexes since they will still be with the correct value.
-      m_state.Node = insert;
-
-      this.EnsureState();
-
-      return true;
-    }
-
-    internal int FindItem( object item )
-    {
-      var current = m_state;
-
-      while( true )
-      {
-        var itemsNode = current.Node as ItemsGeneratorNode;
-        if( itemsNode != null )
-        {
-          var index = itemsNode.Items.IndexOf( item );
-          if( index >= 0 )
-          {
-            index += itemsNode.CountDetailsBeforeDataIndex( index );
-
-            // Item is directly from this items node... then return the appropriate index!
-            m_state = current;
-
-            this.EnsureState();
-
-            return index + current.Index;
-          }
-
-          // If the item is from a detail, then I don't want to "use" it!!!
-          // but continue looping.... to find occurances of this item somewhere else in the tree.
-        }
-        else
-        {
-          var collectionNode = current.Node as CollectionGeneratorNode;
-          if( collectionNode != null )
-          {
-            var index = collectionNode.IndexOf( item );
-            if( index >= 0 )
-            {
-              m_state = current;
-
-              this.EnsureState();
-
-              return index + current.Index;
-            }
-          }
-        }
-
-        // If we reach this point, it's because the item we are looking
-        // for is not in this node... Try to access the child
-        if( !GeneratorNodeHelper.MoveToChild( ref current ) )
-        {
-          // Try "advancing" to the next item.
-          if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
-            break;
-        }
-      }
-
-      return -1;
-    }
-
-    internal object FindIndex( int index )
-    {
-      var current = m_state;
-
-      while( true )
-      {
-        if( index < current.Index + current.Node.ItemCount )
-        {
-          var itemsNode = current.Node as CollectionGeneratorNode;
-          if( itemsNode != null )
-          {
-            m_state = current;
-
-            this.EnsureState();
-
-            return itemsNode.GetAt( index - current.Index );
-          }
-
-          if( !GeneratorNodeHelper.MoveToChild( ref current ) )
-            break;
-        }
-        else
-        {
-          // If we reach this point, it's because the item we are looking for is not in this node... Try to access the child.
-          // No need to check for childs, since the condition above would catch it (childs part of ItemCount).
-          if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
-            break;
-        }
-      }
-
-      return null;
-    }
-
-    internal bool FindNode( GeneratorNode node )
-    {
-      if( node == null )
-        throw new ArgumentNullException( "node" );
-
-      var success = GeneratorNodeHelper.FindNode( ref m_state, node );
-
-      this.EnsureState();
-
-      return success;
-    }
-
-    internal bool FindNodeForIndex( int index )
-    {
-      var success = GeneratorNodeHelper.FindNodeForIndex( ref m_state, index );
-
-      this.EnsureState();
-
-      return success;
-    }
-
-    //Note: this function will not check for the presence of the item in the details for Items nodes.
-    internal bool AbsoluteFindItem( object item )
-    {
-      // This method will search through nodes, even those collapsed for the item.
-      var current = m_state;
-
-      while( true )
-      {
-        var itemsNode = current.Node as CollectionGeneratorNode;
-        if( ( itemsNode != null ) && itemsNode.Items.Contains( item ) )
-          break;
-
-        // If we reach this point, it's because the item we are looking
-        // for is not in this node... Try to access the child
-        if( !GeneratorNodeHelper.MoveToChild( ref current, false ) )
-        {
-          // Try "advancing" to the next item.
-          if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
-            return false;
-        }
-      }
-
-      m_state = current;
-
-      this.EnsureState();
-
-      return true;
-    }
-
-    //Note: this function will not check for the presence of the group in the details for Items nodes.
-    internal bool FindGroup( CollectionViewGroup group )
-    {
-      if( group == null )
-        return false;
-
-      var current = m_state;
-
-      while( true )
-      {
-        var groupNode = current.Node as GroupGeneratorNode;
-        if( groupNode != null )
-        {
-          if( groupNode.CollectionViewGroup == group )
-            break;
-
-          if( !groupNode.CollectionViewGroup.IsBottomLevel )
-          {
-            if( !GeneratorNodeHelper.MoveToChild( ref current, false ) )
-              return false;
-          }
-          else
-          {
-            if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
-              return false;
-          }
-        }
-        else
-        {
-          // There is nothing under a non GroupGeneratorNode, try to move Next node in the list.
-          if( !GeneratorNodeHelper.MoveToFollowing( ref current ) )
-            return false;
-        }
-      }
-
-      m_state = current;
-
-      this.EnsureState();
-
-      return true;
-    }
-
-    internal void ReverseCalculateIndex()
-    {
-      m_state = GeneratorNodeHelper.FindNodeLocation( m_state.Node );
-
-      this.EnsureState();
-    }
-
-    internal bool MoveForward()
-    {
-      var startNode = m_state.Node;
-
-      while( true )
-      {
-        if( !( m_state.Node is GroupGeneratorNode ) && ( m_state.Node != startNode ) && ( m_state.Node.ItemCount != 0 ) )
-          break;
-
-        if( !GeneratorNodeHelper.MoveToChild( ref m_state ) )
-        {
-          if( !GeneratorNodeHelper.MoveToFollowing( ref m_state ) )
-            return false;
-        }
-      }
-
-      this.EnsureState();
-
-      return true;
-    }
-
-    internal bool MoveBackward()
-    {
-      var startNode = m_state.Node;
-
-      while( true )
-      {
-        if( !( m_state.Node is GroupGeneratorNode ) && ( m_state.Node != startNode ) && ( m_state.Node.ItemCount != 0 ) )
-          break;
-
-        if( !GeneratorNodeHelper.MoveToChild( ref m_state ) )
-        {
-          if( !GeneratorNodeHelper.MoveToPreceding( ref m_state ) )
-            return false;
-        }
-        else
-        {
-          GeneratorNodeHelper.MoveToEnd( ref m_state );
-        }
-      }
-
-      this.EnsureState();
-
-      return true;
-    }
-
-    // This method cannot be used for groups.
-    // This method will search for items independently of the Expanded/Collapsed status of GroupGeneratorNodes.
-    internal bool Contains( object item )
-    {
-      var current = m_state;
-      var found = false;
-      var skipCollectionGeneratorNodeCheck = false;
-
-      while( true )
-      {
-        skipCollectionGeneratorNodeCheck = false;
-
-        var headersFootersNode = current.Node as HeadersFootersGeneratorNode;
-        if( ( headersFootersNode != null ) && ( item is GroupHeaderFooterItem ) )
-        {
-          var groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-          var parentGroup = headersFootersNode.Parent as GroupGeneratorNode;
-
-          if( ( parentGroup != null ) && ( parentGroup.CollectionViewGroup == groupHeaderFooterItem.Group ) && headersFootersNode.Items.Contains( groupHeaderFooterItem.Template ) )
-          {
-            found = true;
-            break;
-          }
-
-          // If there is no parent node, then its because the current HeadersFootersGeneratorNode is not a GroupHeaders/Footers node (FixedHeaders/Footers or Headers/Footers).
-          skipCollectionGeneratorNodeCheck = true; // force skip CollectionGeneratorNode verification, this is to limit amount of job done by loop body.
-        }
-
-        if( !skipCollectionGeneratorNodeCheck )
-        {
-          var collectionNode = current.Node as CollectionGeneratorNode;
-          if( collectionNode != null )
-          {
-            // When dealing with a DataView, the DataView's IList's Contains implementation will return false 
-            // for a dataRowView which is in edition and was modified even though it is really part of the collection.
-            // Therefore, we must use a for loop of Object.Equals method calls.
-            var dataRowViewItem = item as System.Data.DataRowView;
-            if( dataRowViewItem != null )
-            {
-              var items = collectionNode.Items;
-              var itemsCount = items.Count;
-              var itemDataRow = dataRowViewItem.Row;
-
-              for( int i = 0; i < itemsCount; i++ )
-              {
-                var currentDataRowView = items[ i ] as System.Data.DataRowView;
-                if( ( currentDataRowView != null ) && ( itemDataRow == currentDataRowView.Row ) )
-                {
-                  found = true;
-                  break;
-                }
-              }
-
-              if( found )
-                break;
-            }
-            else
-            {
-              // Since the GetAt() methods can be overriden to compensate for the Expand/Collapse status of Groups
-              // AND the details features, accessing the collection directly prevent pre-processing of the content of the collection node.
-              if( collectionNode.Items.Contains( item ) )
-              {
-                found = true;
-                break;
-              }
-            }
-          }
-        }
-
-        if( GeneratorNodeHelper.MoveToChild( ref current, false ) )
-          continue;
-
-        if( GeneratorNodeHelper.MoveToFollowing( ref current ) )
-          continue;
-
-        break;
-      }
-
-      m_state = current;
-
-      this.EnsureState();
-
-      return found;
-    }
-
-    internal void ProcessVisit(
-      DataGridContext sourceContext,
-      int minIndex,
-      int maxIndex,
-      IDataGridContextVisitor visitor,
-      DataGridContextVisitorType visitorType,
-      bool visitDetails,
-      out bool visitWasStopped )
-    {
-      visitWasStopped = false;
-
-      // This is used only for DataGridContextVisitorType.ItemsBlock
-      var startSourceDataItemIndex = -1;
-      var endSourceDataItemIndex = -1;
-
-      if( minIndex < 0 )
-        throw DataGridException.Create<ArgumentException>( "The minimum index must be greater than or equal to zero.", sourceContext.DataGridControl, "minIndex" );
-
-      if( ( visitorType & DataGridContextVisitorType.DataGridContext ) == DataGridContextVisitorType.DataGridContext )
-      {
-        visitor.Visit( sourceContext, ref visitWasStopped );
-
-        if( visitWasStopped )
-          return;
-      }
-
-      //Take a shortcut, if the visit is made only for contexts, and there is no child contexts
-      //return right away.
-      var containsDetails = false;
-
-      foreach( var childContext in sourceContext.GetChildContextsCore() )
-      {
-        containsDetails = true;
-        break;
-      }
-
-      var processed = false;
-      var current = m_state;
-
-      while( true )
-      {
-        processed = false;
-
-        var itemCount = current.Node.ItemCount;
-
-        //If the whole current node is below the minIndex, jump over it.
-        if( ( current.Index + ( itemCount - 1 ) ) < minIndex )
-        {
-          processed = true;
-        }
-
-        //when the index to visit exceeds the range defined, exit the loop.
-        if( current.Index > maxIndex )
-          break;
-
-        var minForNode = Math.Max( 0, minIndex - current.Index ); // this will give the base offset within the node where to start the visitating!
-        var maxForNode = Math.Min( itemCount - 1, maxIndex - current.Index ); //this will five the max offset within this node to visit (protected against overlfow )
-
-        if( !processed )
-        {
-          var headersNode = current.Node as HeadersFootersGeneratorNode;
-          if( headersNode != null )
-          {
-            var isHeaderFooter = ( headersNode.Parent == null );
-
-            //If the node is a Headers or Footers node AND the visitorType does not contain HeadersFooters
-            if( ( isHeaderFooter ) && ( ( visitorType & DataGridContextVisitorType.HeadersFooters ) == DataGridContextVisitorType.HeadersFooters ) )
-            {
-              GeneratorNodeHelper.ProcessHeadersNodeVisit( headersNode, sourceContext, minForNode, maxForNode, visitor, ref visitWasStopped );
-            }
-            else if( ( !isHeaderFooter ) && ( ( visitorType & DataGridContextVisitorType.GroupHeadersFooters ) == DataGridContextVisitorType.GroupHeadersFooters ) )
-            {
-              GeneratorNodeHelper.ProcessHeadersNodeVisit( headersNode, sourceContext, minForNode, maxForNode, visitor, ref visitWasStopped );
-            }
-
-            processed = true;
-          }
-        }
-
-        if( !processed )
-        {
-          var itemsNode = current.Node as ItemsGeneratorNode;
-          if( itemsNode != null )
-          {
-            if( ( visitorType & DataGridContextVisitorType.ItemsBlock ) == DataGridContextVisitorType.ItemsBlock )
-            {
-              GeneratorNodeHelper.ProcessItemsNodeBlockVisit(
-                itemsNode, sourceContext,
-                minForNode, maxForNode,
-                visitor, visitorType, visitDetails, containsDetails, current.DataIndex,
-                ref startSourceDataItemIndex, ref endSourceDataItemIndex, ref visitWasStopped );
-            }
-            else if( ( ( visitDetails ) && ( containsDetails ) )
-              || ( ( visitorType & DataGridContextVisitorType.Items ) == DataGridContextVisitorType.Items ) )
-            {
-              GeneratorNodeHelper.ProcessItemsNodeVisit(
-                itemsNode, sourceContext,
-                minForNode, maxForNode,
-                visitor, visitorType, visitDetails, current.DataIndex, ref visitWasStopped );
-            }
-
-            processed = true;
-          }
-        }
-
-        if( !processed )
-        {
-          var groupNode = current.Node as GroupGeneratorNode;
-          if( groupNode != null )
-          {
-            if( ( visitorType & DataGridContextVisitorType.Groups ) == DataGridContextVisitorType.Groups )
-            {
-              visitor.Visit(
-                sourceContext,
-                groupNode.CollectionViewGroup,
-                groupNode.NamesTree,
-                groupNode.Level,
-                groupNode.IsExpanded,
-                groupNode.IsComputedExpanded,
-                ref visitWasStopped );
-            }
-
-            processed = true;
-          }
-        }
-
-        if( !processed )
-          throw DataGridException.Create<DataGridInternalException>( "Unable to process the visit.", sourceContext.DataGridControl );
-
-        if( visitWasStopped )
-          break;
-
-        if( GeneratorNodeHelper.MoveToChild( ref current ) )
-          continue;
-
-        if( GeneratorNodeHelper.MoveToFollowing( ref current ) )
-          continue;
-
-        break;
-      }
-
-      if( ( visitorType & DataGridContextVisitorType.ItemsBlock ) == DataGridContextVisitorType.ItemsBlock )
-      {
-        if( startSourceDataItemIndex != -1 )
-        {
-          var stopVisit = false;
-          visitor.Visit( sourceContext, startSourceDataItemIndex, endSourceDataItemIndex, ref stopVisit );
-          visitWasStopped = visitWasStopped || stopVisit;
-        }
-      }
-
-      m_state = current;
-
-      this.EnsureState();
-    }
-
-    internal static GeneratorNode EvaluateChain( GeneratorNode startNode, out int totalChildCount, out int chainLength )
-    {
-      if( startNode == null )
-        throw new ArgumentNullException( "startNode" );
-
-      var current = new State( startNode, 0, 0 );
-
-      totalChildCount = startNode.ItemCount;
-      chainLength = 1;
-
-      while( true )
-      {
-        if( !GeneratorNodeHelper.MoveToNext( ref current ) )
-          break;
-
-        totalChildCount += current.Node.ItemCount;
-        chainLength++;
-      }
-
-      return current.Node;
-    }
-
-    private void EnsureState()
-    {
-      if( m_state.Node == null )
-        throw new DataGridInternalException();
-    }
-
-    private static void ProcessItemsNodeBlockVisit(
-      ItemsGeneratorNode itemsNode,
-      DataGridContext sourceContext,
-      int minIndex,
-      int maxIndex,
-      IDataGridContextVisitor visitor,
-      DataGridContextVisitorType visitorType,
-      bool visitDetails,
-      bool containsDetails,
-      int sourceDataItemIndex,
-      ref int startSourceDataItemIndex,
-      ref int endSourceDataItemIndex,
-      ref bool stopVisit )
-    {
-      if( maxIndex < minIndex )
-        return;
-
-      int runningIndex = minIndex;
-      sourceDataItemIndex += minIndex - itemsNode.CountDetailsBeforeGlobalIndex( minIndex );
-
-      if( !containsDetails )
-      {
-        // If we contains no detail, we take a quick way out of it.
-        if( startSourceDataItemIndex == -1 )
-        {
-          startSourceDataItemIndex = sourceDataItemIndex;
-        }
-        else
-        {
-          if( ( endSourceDataItemIndex + 1 ) != sourceDataItemIndex )
-          {
-            visitor.Visit( sourceContext, startSourceDataItemIndex, endSourceDataItemIndex, ref stopVisit );
-
-            if( stopVisit )
-              return;
-
-            startSourceDataItemIndex = sourceDataItemIndex;
-          }
-        }
-
-        endSourceDataItemIndex = sourceDataItemIndex + Math.Min( maxIndex - minIndex, itemsNode.Items.Count - 1 );
-        return;
-      }
-
-      int masterIndex;
-      int detailStartIndex;
-      int detailNodeIndex;
-
-      while( runningIndex <= maxIndex )
-      {
-        DetailGeneratorNode detailNode = itemsNode.GetDetailNodeForIndex( runningIndex, out masterIndex, out detailStartIndex, out detailNodeIndex );
-
-        if( detailNode != null )
-        {
-          int detailEndIndex = Math.Min( detailNode.ItemCount - 1, detailStartIndex + ( maxIndex - runningIndex ) );
-          sourceDataItemIndex -= detailStartIndex;
-          bool visitWasStopped;
-
-          ( ( IDataGridContextVisitable )detailNode.DetailGenerator ).AcceptVisitor(
-            detailStartIndex, detailEndIndex, visitor, visitorType, visitDetails, out visitWasStopped );
-
-          stopVisit = stopVisit || visitWasStopped;
-
-          if( stopVisit )
-            break;
-
-          runningIndex += detailNode.ItemCount - detailStartIndex - 1;
-        }
-        else
-        {
-          // set the first data index that will be visited for that items block
-          if( startSourceDataItemIndex == -1 )
-          {
-            startSourceDataItemIndex = sourceDataItemIndex;
-            endSourceDataItemIndex = sourceDataItemIndex;
-          }
-          else
-          {
-            if( ( endSourceDataItemIndex + 1 ) != sourceDataItemIndex )
-            {
-              visitor.Visit( sourceContext, startSourceDataItemIndex, endSourceDataItemIndex, ref stopVisit );
-
-              if( stopVisit )
-                break;
-
-              startSourceDataItemIndex = sourceDataItemIndex;
-            }
-
-            endSourceDataItemIndex = sourceDataItemIndex;
-          }
-
-          sourceDataItemIndex++;
-        }
-
-        runningIndex++;
-      }
-    }
-
-    private static void ProcessItemsNodeVisit(
-      ItemsGeneratorNode itemsNode,
-      DataGridContext sourceContext,
-      int minIndex,
-      int maxIndex,
-      IDataGridContextVisitor visitor,
-      DataGridContextVisitorType visitorType,
-      bool visitDetails,
-      int sourceDataItemIndex,
-      ref bool stopVisit )
-    {
-      var runningIndex = minIndex;
-      sourceDataItemIndex += minIndex;
-
-      int masterIndex;
-      int detailStartIndex;
-      int detailNodeIndex;
-
-      while( runningIndex <= maxIndex )
-      {
-        var detailNode = itemsNode.GetDetailNodeForIndex( runningIndex, out masterIndex, out detailStartIndex, out detailNodeIndex );
-
-        if( detailNode != null )
-        {
-          var detailEndIndex = Math.Min( detailNode.ItemCount - 1, detailStartIndex + ( maxIndex - runningIndex ) );
-          sourceDataItemIndex -= detailStartIndex;
-
-          if( visitDetails )
-          {
-            bool visitWasStopped;
-
-            ( ( IDataGridContextVisitable )detailNode.DetailGenerator ).AcceptVisitor( detailStartIndex, detailEndIndex, visitor, visitorType, visitDetails, out visitWasStopped );
-
-            stopVisit = stopVisit || visitWasStopped;
-
-            if( stopVisit )
-              break;
-
-            runningIndex += detailNode.ItemCount - detailStartIndex - 1;
-          }
-        }
-        else
-        {
-          if( ( visitorType & DataGridContextVisitorType.Items ) == DataGridContextVisitorType.Items )
-          {
-            object dataItem = itemsNode.GetAt( runningIndex );
-            visitor.Visit( sourceContext, sourceDataItemIndex, dataItem, ref stopVisit );
-
-            if( stopVisit )
-              break;
-          }
-
-          sourceDataItemIndex++;
-        }
-
-        runningIndex++;
-      }
-    }
-
-    private static void ProcessHeadersNodeVisit( HeadersFootersGeneratorNode headersNode, DataGridContext sourceContext, int minIndex, int maxIndex, IDataGridContextVisitor visitor, ref bool stopVisit )
-    {
-      for( int i = minIndex; i <= maxIndex; i++ )
-      {
-        var template = headersNode.GetAt( i );
-
-        var groupNode = headersNode.Parent as GroupGeneratorNode;
-        if( groupNode != null )
-        {
-          visitor.Visit( sourceContext, ( GroupHeaderFooterItem )template, ref stopVisit );
-        }
-        else
-        {
-          visitor.Visit( sourceContext, ( DataTemplate )template, ref stopVisit );
-        }
-
-        if( stopVisit )
-          break;
-      }
-    }
-
-    private static bool MoveToNext( ref State state )
-    {
-      return GeneratorNodeHelper.MoveToNext( ref state, 1 );
-    }
-
-    private static bool MoveToNext( ref State state, int count )
-    {
-      if( count <= 0 )
-        return true;
-
-      var node = state.Node;
-      var index = state.Index;
-      var dataIndex = state.DataIndex;
-
-      for( int i = 0; i < count; i++ )
-      {
-        var nextNode = node.Next;
-        if( nextNode == null )
-          return false;
-
-        var groupNode = node as GroupGeneratorNode;
-        if( groupNode != null )
-        {
-          dataIndex += groupNode.TotalLeafCount;
-        }
-
-        index += node.ItemCount;
-        node = nextNode;
-      }
-
-      state.Node = node;
-      state.Index = index;
-      state.DataIndex = dataIndex;
-
-      return true;
-    }
-
-    private static bool MoveToPrevious( ref State state )
-    {
-      var node = state.Node.Previous;
-      if( node == null )
-        return false;
-
-      state.Node = node;
-      state.Index -= node.ItemCount;
-
-      var groupNode = node as GroupGeneratorNode;
-      if( groupNode != null )
-      {
-        state.DataIndex -= groupNode.TotalLeafCount;
-      }
-
-      return true;
-    }
-
-    private static void MoveToFirst( ref State state )
-    {
-      var node = state.Node.Previous;
-      if( node == null )
-        return;
-
-      var index = state.Index;
-      var dataIndex = state.DataIndex;
-
-      while( true )
-      {
-        var groupNode = node as GroupGeneratorNode;
-        if( groupNode != null )
-        {
-          dataIndex -= groupNode.TotalLeafCount;
-        }
-
-        index -= node.ItemCount;
-
-        var target = node.Previous;
-        if( target == null )
-          break;
-
-        node = target;
-      }
-
-      state.Node = node;
-      state.Index = index;
-      state.DataIndex = dataIndex;
-    }
-
-    private static void MoveToEnd( ref State state )
-    {
-      var node = state.Node;
-      if( node.Next == null )
-        return;
-
-      var index = state.Index;
-      var dataIndex = state.DataIndex;
-
-      while( true )
-      {
-        var groupNode = node as GroupGeneratorNode;
-        if( groupNode != null )
-        {
-          dataIndex += groupNode.TotalLeafCount;
-        }
-
-        index += node.ItemCount;
-
-        var target = node.Next;
-        if( target == null )
-          break;
-
-        node = target;
-      }
-
-      state.Node = node;
-      state.Index = index;
-      state.DataIndex = dataIndex;
-    }
-
-    private static bool MoveToChild( ref State state )
-    {
-      return GeneratorNodeHelper.MoveToChild( ref state, true );
-    }
-
-    private static bool MoveToChild( ref State state, bool skipItemLessGroupNodes )
-    {
-      var groupNode = state.Node as GroupGeneratorNode;
-      if( ( groupNode == null ) || ( groupNode.Child == null ) )
-        return false;
-
-      if( ( skipItemLessGroupNodes ) && ( groupNode.ItemCount <= 0 ) )
-        return false;
-
-      state.Node = groupNode.Child;
-
-      return true;
-    }
-
-    private static bool MoveToParent( ref State state )
-    {
-      if( state.Node.Level == 0 )
-        return false;
-
-      GeneratorNodeHelper.MoveToFirst( ref state );
-
-      state.Node = state.Node.Parent;
-      Debug.Assert( state.Node != null );
-
-      return true;
-    }
-
-    private static bool MoveToFollowing( ref State state )
-    {
-      while( !GeneratorNodeHelper.MoveToNext( ref state ) )
-      {
-        if( !GeneratorNodeHelper.MoveToParent( ref state ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    private static bool MoveToPreceding( ref State state )
-    {
-      while( !GeneratorNodeHelper.MoveToPrevious( ref state ) )
-      {
-        if( !GeneratorNodeHelper.MoveToParent( ref state ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    private static State FindNodeLocation( GeneratorNode node )
-    {
-      var state = new State( node, 0, 0 );
-
-      while( true )
-      {
-        GeneratorNodeHelper.MoveToFirst( ref state );
-
-        if( !GeneratorNodeHelper.MoveToParent( ref state ) )
-          break;
-      }
-
-      Debug.Assert( state.Index <= 0 );
-      Debug.Assert( state.DataIndex <= 0 );
-
-      return new State( node, -state.Index, -state.DataIndex );
-    }
-
-    private static bool FindNode( ref State state, GeneratorNode node )
-    {
-      if( state.Node == node )
-        return true;
-
-      var from = state;
-      var fromLevel = state.Node.Level;
-      var to = new State( node, 0, 0 );
-      var toLevel = node.Level;
-
-      while( from.Node != to.Node )
-      {
-        if( fromLevel > toLevel )
-        {
-          if( !GeneratorNodeHelper.MoveToParent( ref from ) )
-            return false;
-
-          fromLevel = from.Node.Level;
-        }
-        else
-        {
-          if( !GeneratorNodeHelper.MoveToPrevious( ref to ) )
-          {
-            if( !GeneratorNodeHelper.MoveToParent( ref to ) )
-              return false;
-
-            toLevel = to.Node.Level;
-          }
-        }
-      }
-
-      state.Node = node;
-      state.Index = from.Index - to.Index;
-      state.DataIndex = from.DataIndex - to.DataIndex;
-
-      return true;
-    }
-
-    private static bool FindNodeForIndex( ref State state, int index )
-    {
-      var current = state;
-
-      // The algo is a single drill-down... for optimized performance..
-      // It first tries to go horizontally in the tree and then drills-down if it can.
-      while( true )
-      {
-        var itemCount = current.Node.ItemCount;
-
-        // Verify if the current node contains ( directly or its children ) the required index
-        if( index < current.Index + itemCount )
-        {
-          // A Group node is the only node that can have children is by definition empty... let's dig deeper.
-          // If we cannot travel deeper, then this node is the closest we get.
-          if( !GeneratorNodeHelper.MoveToChild( ref current ) )
-            break;
-        }
-        else if( ( index == current.Index ) && ( itemCount != 0 ) )
-        {
-          break;
-        }
-        else
-        {
-          if( !GeneratorNodeHelper.MoveToNext( ref current ) )
-            return false;
-        }
-      }
-
-      state.Node = current.Node;
-      state.Index = current.Index;
-      state.DataIndex = current.DataIndex;
-
-      return true;
-    }
-
-    private State m_state;
-
-    #region State Private Struct
-
-    private struct State
-    {
-      internal State( GeneratorNode node, int index, int dataIndex )
-      {
-        Debug.Assert( node != null );
-
-        this.Node = node;
-        this.Index = index;
-        this.DataIndex = dataIndex;
-      }
-
-      internal GeneratorNode Node;
-      internal int Index;
-      internal int DataIndex;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs
deleted file mode 100644
index a0b3ce6a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs
+++ /dev/null
@@ -1,328 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal partial class GroupGeneratorNode : NotifyCollectionChangedGeneratorNode
-  {
-    public GroupGeneratorNode( CollectionViewGroup group, GeneratorNode parent, GroupConfiguration groupConfig )
-      : base( parent )
-    {
-      Debug.Assert( group != null, "group cannot be null for GroupGeneratorNode" );
-      Debug.Assert( groupConfig != null );
-
-      m_group = group;
-      m_groupConfig = groupConfig;
-    }
-
-    public event EventHandler TotalLeafCountChanged;
-    public event EventHandler IsExpandedChanged;
-    public event EventHandler IsExpandedChanging;
-
-    #region CollectionViewGroup Property
-
-    public CollectionViewGroup CollectionViewGroup
-    {
-      get
-      {
-        return m_group;
-      }
-    }
-
-    #endregion
-
-    #region UIGroup Property
-
-    public Group UIGroup
-    {
-      get
-      {
-        return m_uiGroup;
-      }
-      set
-      {
-        m_uiGroup = value;
-      }
-    }
-
-    #endregion
-
-    #region GroupConfiguration Property
-
-    public GroupConfiguration GroupConfiguration
-    {
-      get
-      {
-        return m_groupConfig;
-      }
-    }
-
-    #endregion
-
-    #region TotalLeafCount Property
-
-    public int TotalLeafCount
-    {
-      get
-      {
-        return m_leafCount;
-      }
-    }
-
-    #endregion
-
-    #region ItemCount Property
-
-    internal override int ItemCount
-    {
-      get
-      {
-        GroupGeneratorNode parentGroup = this.Parent as GroupGeneratorNode;
-        if( parentGroup != null )
-        {
-          return ( parentGroup.IsExpanded == true ) ? m_itemCount : 0;
-        }
-        return m_itemCount;
-      }
-    }
-
-    #endregion
-
-    #region IsExpanded Property
-
-    public bool IsExpanded
-    {
-      get
-      {
-        return m_isExpanded;
-      }
-      set
-      {
-        //if the expanded status changed
-        if( m_isExpanded != value )
-        {
-          var dataGridContext = m_uiGroup.DataGridContext;
-          var groupExpansionChangingEventArgs = default( GroupExpansionChangingEventArgs );
-          if( value )
-          {
-            groupExpansionChangingEventArgs = new GroupExpansionChangingEventArgs( DataGridControl.GroupExpandingEvent, m_uiGroup, m_group, dataGridContext, true );
-            dataGridContext.DataGridControl.RaiseGroupExpanding( groupExpansionChangingEventArgs );
-          }
-          else
-          {
-            groupExpansionChangingEventArgs = new GroupExpansionChangingEventArgs( DataGridControl.GroupCollapsingEvent, m_uiGroup, m_group, dataGridContext, false );
-            dataGridContext.DataGridControl.RaiseGroupCollapsing( groupExpansionChangingEventArgs );
-          }
-
-          if( groupExpansionChangingEventArgs.Cancel )
-            return;
-
-          var handler = this.IsExpandedChanging;
-          if( handler != null )
-          {
-            handler.Invoke( this, EventArgs.Empty );
-          }
-
-          this.NotifyImmediateChildren( value );
-
-          m_isExpanded = value;
-
-          handler = this.IsExpandedChanged;
-          if( handler != null )
-          {
-            handler.Invoke( this, EventArgs.Empty );
-          }
-
-          if( m_isExpanded )
-          {
-            dataGridContext.DataGridControl.RaiseGroupExpanded( new GroupExpansionChangedEventArgs( DataGridControl.GroupExpandedEvent, m_uiGroup, m_group, dataGridContext, true ) );
-          }
-          else
-          {
-            dataGridContext.DataGridControl.RaiseGroupCollapsed( new GroupExpansionChangedEventArgs( DataGridControl.GroupCollapsedEvent, m_uiGroup, m_group, dataGridContext, false ) );
-          }
-        }
-      }
-    }
-
-    internal void SetIsExpandedAtInitialization( bool isExpanded )
-    {
-      m_isExpanded = isExpanded;
-    }
-
-    #endregion
-
-    #region NamesTree Property
-
-    public object[] NamesTree
-    {
-      get
-      {
-        return m_namesTree;
-      }
-    }
-
-    #endregion
-
-    #region Child Property
-
-    public GeneratorNode Child
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region IsComputedExpandedOverride Property
-
-    protected override bool IsComputedExpandedOverride
-    {
-      get
-      {
-        return this.IsExpanded;
-      }
-    }
-
-    #endregion
-
-    public HeadersFootersGeneratorNode GetHeaderNode()
-    {
-      return this.Child as HeadersFootersGeneratorNode;
-    }
-
-    public HeadersFootersGeneratorNode GetFooterNode()
-    {
-      GeneratorNode generatorNode = this.Child;
-      HeadersFootersGeneratorNode footerGeneratorNode = null;
-
-      if( generatorNode == null )
-        return null;
-
-      do
-      {
-        generatorNode = generatorNode.Next;
-        footerGeneratorNode = generatorNode as HeadersFootersGeneratorNode;
-      } while( ( footerGeneratorNode == null ) && ( generatorNode != null ) );
-
-      return footerGeneratorNode;
-    }
-
-    protected override int AdjustItemCountOverride( int delta )
-    {
-      delta = base.AdjustItemCountOverride( delta );
-
-      m_itemCount += delta;
-
-      GroupGeneratorNode parentGroup = this.Parent as GroupGeneratorNode;
-      if( ( parentGroup != null ) && ( parentGroup.IsExpanded == false ) )
-      {
-        return 0;
-      }
-
-      return delta;
-    }
-
-    protected override int AdjustLeafCountOverride( int delta )
-    {
-      delta = base.AdjustLeafCountOverride( delta );
-
-      if( delta != 0 )
-      {
-        m_leafCount += delta;
-
-        if( this.TotalLeafCountChanged != null )
-        {
-          this.TotalLeafCountChanged( this, EventArgs.Empty );
-        }
-      }
-
-      return delta;
-    }
-
-    internal override void NotifyExpansionStateChanged( bool isParentExpanded )
-    {
-      base.NotifyExpansionStateChanged( isParentExpanded );
-
-      if( this.Parent != null )
-      {
-        this.OnExpansionStateChanged( isParentExpanded, 0, m_itemCount );
-
-        if( isParentExpanded == true )
-        {
-          this.Parent.AdjustItemCount( m_itemCount );
-        }
-        else
-        {
-          this.Parent.AdjustItemCount( -m_itemCount );
-        }
-      }
-    }
-
-    internal override void CleanGeneratorNode()
-    {
-      base.CleanGeneratorNode();
-
-      this.Child = null;
-      this.UIGroup.ClearGroup();
-      this.UIGroup = null;
-
-      m_group = null;
-    }
-
-    internal void BuildNamesTree()
-    {
-      int level = this.Level;
-
-      m_namesTree = new object[ level + 1 ];
-
-      m_namesTree[ level ] = this.CollectionViewGroup.Name;
-
-      GroupGeneratorNode parentNode = this.Parent as GroupGeneratorNode;
-      for( int i = level - 1; i >= 0; i-- )
-      {
-        m_namesTree[ i ] = parentNode.CollectionViewGroup.Name;
-        parentNode = parentNode.Parent as GroupGeneratorNode;
-      }
-    }
-
-    private void NotifyImmediateChildren( bool value )
-    {
-      if( this.Child != null )
-      {
-        GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( this.Child, 0, 0 ); //index not important
-        nodeHelper.MoveToEnd();
-        do
-        {
-          nodeHelper.CurrentNode.NotifyExpansionStateChanged( value );
-        }
-        while( nodeHelper.MoveToPrevious() == true );
-      }
-    }
-
-    private GroupConfiguration m_groupConfig;
-    private bool m_isExpanded = true;
-    private int m_leafCount; //this is the storage for the total number of "leaf" items that are child of this group. (no counting the groups, headers and footers)
-    private int m_itemCount; //this is the storage for the total number of items that are "child" of this group node.
-    private CollectionViewGroup m_group;
-    private Group m_uiGroup;
-    private object[] m_namesTree;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs
deleted file mode 100644
index 55f73cfb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public struct GroupHeaderFooterItem
-  {
-    #region Static Fields
-
-    public static readonly GroupHeaderFooterItem Empty = new GroupHeaderFooterItem();
-
-    #endregion
-
-    public GroupHeaderFooterItem( CollectionViewGroup collectionViewGroup, object template )
-    {
-      if( !( template is DataTemplate ) && !( template is GroupHeaderFooterItemTemplate ) )
-        throw new ArgumentException( "A GroupHeaderFooterItem can only be created with a DataTemplate or VisibleWhenCollapsed objects.", "template" );
-
-      Debug.Assert( template != null );
-
-      m_template = template;
-      m_group = new WeakReference( collectionViewGroup );
-
-      m_hashCode = template.GetHashCode();
-      if( collectionViewGroup != null )
-      {
-        m_hashCode ^= collectionViewGroup.GetHashCode();
-      }
-    }
-
-    #region Template Property
-
-    public object Template
-    {
-      get
-      {
-        return m_template;
-      }
-    }
-
-    private readonly object m_template;
-
-    #endregion
-
-    #region Group Property
-
-    public CollectionViewGroup Group
-    {
-      get
-      {
-        if( m_group != null )
-          return m_group.Target as CollectionViewGroup;
-
-        return null;
-      }
-    }
-
-    private readonly WeakReference m_group;
-
-    #endregion
-
-    public static bool Equals( GroupHeaderFooterItem item1, GroupHeaderFooterItem item2 )
-    {
-      return ( item1.m_hashCode == item2.m_hashCode )
-          && ( item1.m_template == item2.m_template )
-          && ( item1.Group == item2.Group );
-    }
-
-    public static bool operator ==( GroupHeaderFooterItem item1, GroupHeaderFooterItem item2 )
-    {
-      return GroupHeaderFooterItem.Equals( item1, item2 );
-    }
-
-    public static bool operator !=( GroupHeaderFooterItem item1, GroupHeaderFooterItem item2 )
-    {
-      return !GroupHeaderFooterItem.Equals( item1, item2 );
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( ( obj == null ) || !( obj is GroupHeaderFooterItem ) )
-        return false;
-
-      return this.Equals( ( GroupHeaderFooterItem )obj );
-    }
-
-    public bool Equals( GroupHeaderFooterItem item )
-    {
-      return GroupHeaderFooterItem.Equals( this, item );
-    }
-
-    public override int GetHashCode()
-    {
-      return m_hashCode;
-    }
-
-    private readonly int m_hashCode;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemContainerRecyclingPool.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemContainerRecyclingPool.cs
deleted file mode 100644
index 18defb54..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemContainerRecyclingPool.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class GroupHeaderFooterItemContainerRecyclingPool : IEnumerable<DependencyObject>
-  {
-    internal int Count
-    {
-      get
-      {
-        return m_count;
-      }
-    }
-
-    internal void Clear()
-    {
-      m_collection.Clear();
-      m_count = 0;
-    }
-
-    internal void Enqueue( string groupBy, object template, DependencyObject container )
-    {
-      if( groupBy == null )
-        throw new ArgumentNullException( "groupBy" );
-
-      if( template == null )
-        throw new ArgumentNullException( "template" );
-
-      var pool = default( HeaderFooterItemContainerRecyclingPool );
-      if( m_collection.TryGetValue( groupBy, out pool ) )
-      {
-        pool.Enqueue( template, container );
-      }
-      else
-      {
-        pool = new HeaderFooterItemContainerRecyclingPool();
-        pool.Enqueue( template, container );
-
-        m_collection.Add( groupBy, pool );
-      }
-
-      m_count++;
-    }
-
-    internal DependencyObject Dequeue( string groupBy, object template )
-    {
-      if( groupBy == null )
-        throw new ArgumentNullException( "groupBy" );
-
-      if( template == null )
-        throw new ArgumentNullException( "template" );
-
-      var pool = default( HeaderFooterItemContainerRecyclingPool );
-      if( !m_collection.TryGetValue( groupBy, out pool ) )
-        return null;
-
-      var container = pool.Dequeue( template );
-      if( container != null )
-      {
-        if( pool.Count == 0 )
-        {
-          m_collection.Remove( groupBy );
-        }
-
-        m_count--;
-      }
-
-      return container;
-    }
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<DependencyObject> GetEnumerator()
-    {
-      foreach( var pool in m_collection.Values )
-      {
-        foreach( var entry in pool )
-        {
-          yield return entry;
-        }
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private int m_count; //0
-    private readonly Dictionary<string, HeaderFooterItemContainerRecyclingPool> m_collection = new Dictionary<string, HeaderFooterItemContainerRecyclingPool>();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemTemplate.cs
deleted file mode 100644
index fac91861..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemTemplate.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Markup;
-using System;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [ContentProperty("Template")]
-  public class GroupHeaderFooterItemTemplate
-  {
-    public DataTemplate Template
-    {
-     get
-     {
-       return m_template;
-     }
-     set
-     {
-       if( m_isSealed == true )
-         throw new InvalidOperationException( "An attempt was made to modify a GroupHeaderFooterItemTemplate that is currently in use." );
-
-       m_template = value;
-     }
-    }
-
-    public bool VisibleWhenCollapsed
-    {
-      get
-      {
-        return m_visible;
-      }
-      set
-      {
-        if( m_isSealed == true )
-          throw new InvalidOperationException( "An attempt was made to modify a GroupHeaderFooterItemTemplate that is currently in use." );
-
-        m_visible = value;
-      }
-    }
-
-    internal void Seal()
-    {
-      m_isSealed = true;
-    }
-
-    private DataTemplate m_template;
-    private bool m_visible;
-    private bool m_isSealed;
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupNamesTreeKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupNamesTreeKey.cs
deleted file mode 100644
index 7712bf36..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupNamesTreeKey.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class GroupNamesTreeKey
-  {
-    public GroupNamesTreeKey( object[] namesTree )
-    {
-      m_namesTree = namesTree;
-
-      this.Initialize();
-    }
-
-    private void Initialize()
-    {
-      m_cachedHash = 0;
-
-      // We use this hashing algorithm in order to get a different hashCode
-      // when the same values are in a different order in the object array.
-      int namesTreeLength = m_namesTree.Length;
-      for( int i = 0; i < namesTreeLength; i++ )
-      {
-        object groupName = m_namesTree[ i ];
-
-        if( groupName == null )
-        {
-          m_cachedHash ^= DBNull.Value.GetHashCode();
-        }
-        else
-        {
-          m_cachedHash ^= groupName.GetHashCode();
-        }
-
-        m_cachedHash += ( m_cachedHash << 10 );
-        m_cachedHash ^= ( m_cachedHash >> 6 );
-      }
-    }
-
-    public override int GetHashCode()
-    {
-      return m_cachedHash;
-    }
-
-    public override bool Equals( object obj )
-    {
-      GroupNamesTreeKey groupStatusKey = obj as GroupNamesTreeKey;
-
-      if( groupStatusKey == null )
-        return false;
-
-      if( m_cachedHash != groupStatusKey.m_cachedHash )
-        return false;
-
-      int groupStatusKeyNamesTreeLength = groupStatusKey.m_namesTree.Length;
-
-      if( m_namesTree.Length != groupStatusKeyNamesTreeLength )
-        return false;
-
-      for( int i = 0; i < groupStatusKeyNamesTreeLength; i++ )
-      {
-        if( !Object.Equals( m_namesTree[ i ], groupStatusKey.m_namesTree[ i ] ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    #region PRIVATE FIELDS
-
-    private object[] m_namesTree;
-    private int m_cachedHash;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeaderFooterItemContainerRecyclingPool.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeaderFooterItemContainerRecyclingPool.cs
deleted file mode 100644
index 0968de47..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeaderFooterItemContainerRecyclingPool.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class HeaderFooterItemContainerRecyclingPool : IEnumerable<DependencyObject>
-  {
-    internal int Count
-    {
-      get
-      {
-        return m_count;
-      }
-    }
-
-    internal void Clear()
-    {
-      if( m_count <= 0 )
-        return;
-
-      m_collection.Clear();
-      m_count = 0;
-      m_version++;
-    }
-
-    internal void Enqueue( object item, DependencyObject container )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      if( container == null )
-        throw new ArgumentNullException( "container" );
-
-      var entry = default( Entry );
-
-      if( !m_collection.TryGetValue( item, out entry ) )
-      {
-        entry = new Entry();
-      }
-
-      entry.Push( container );
-
-      m_collection[ item ] = entry;
-      m_count++;
-      m_version++;
-    }
-
-    internal DependencyObject Dequeue( object item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      if( m_collection.Count <= 0 )
-        return null;
-
-      var entry = default( Entry );
-
-      if( !m_collection.TryGetValue( item, out entry ) )
-        return null;
-
-      Debug.Assert( entry.Count > 0 );
-      var container = entry.Pop();
-      Debug.Assert( container != null );
-
-      if( entry.Count == 0 )
-      {
-        m_collection.Remove( item );
-      }
-      else
-      {
-        m_collection[ item ] = entry;
-      }
-
-      m_count--;
-      m_version++;
-
-      return container;
-    }
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<DependencyObject> GetEnumerator()
-    {
-      var version = m_version;
-
-      foreach( var entry in m_collection.Values )
-      {
-        for( int i = entry.Count - 1; i >= 0; i-- )
-        {
-          if( version != m_version )
-            throw new InvalidOperationException();
-
-          yield return entry[ i ];
-        }
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private int m_count; //0
-    private int m_version; //0
-    private readonly Dictionary<object, Entry> m_collection = new Dictionary<object, Entry>();
-
-    #region Entry Private Struct
-
-    private struct Entry
-    {
-      internal int Count
-      {
-        get
-        {
-          return m_count;
-        }
-      }
-
-      internal DependencyObject this[ int index ]
-      {
-        get
-        {
-          Debug.Assert( ( index >= 0 ) && ( index < m_count ) );
-          return m_containers[ index ];
-        }
-      }
-
-      internal void Push( DependencyObject container )
-      {
-        Debug.Assert( container != null );
-
-        if( m_containers == null )
-        {
-          Array.Resize( ref m_containers, 1 );
-        }
-        else if( m_count == m_containers.Length )
-        {
-          Debug.Assert( m_containers.Length > 0 );
-          Array.Resize( ref m_containers, m_containers.Length * 2 );
-        }
-
-        m_containers[ m_count ] = container;
-        m_count++;
-      }
-
-      internal DependencyObject Pop()
-      {
-        Debug.Assert( m_count > 0 );
-        Debug.Assert( m_containers != null );
-
-        m_count--;
-
-        var container = m_containers[ m_count ];
-        m_containers[ m_count ] = default( DependencyObject );
-
-        return container;
-      }
-
-      private int m_count; //0
-      private DependencyObject[] m_containers; //null
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs
deleted file mode 100644
index 91849d2c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs
+++ /dev/null
@@ -1,354 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal partial class HeadersFootersGeneratorNode : CollectionGeneratorNode
-  {
-    #region STATIC MEMBERS
-
-    internal static HeadersFootersGeneratorNode GetSameLevelFirstHeaderNode( GroupGeneratorNode generatorNode )
-    {
-      HeadersFootersGeneratorNode headerGeneratorNode = null;
-
-      GroupGeneratorNode parentGroupGeneratorNode = generatorNode.Parent as GroupGeneratorNode;
-
-      if( parentGroupGeneratorNode == null )
-      {
-        GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( generatorNode, 0, 0 ); //index is not important
-
-        if( nodeHelper.MoveToFirst() )
-          headerGeneratorNode = nodeHelper.CurrentNode as HeadersFootersGeneratorNode;
-      }
-      else
-      {
-        headerGeneratorNode = parentGroupGeneratorNode.Child as HeadersFootersGeneratorNode;
-      }
-
-      return headerGeneratorNode;
-    }
-
-    #endregion STATIC MEMBERS
-
-    public HeadersFootersGeneratorNode( IList list, GeneratorNode parent )
-      : base( list, parent )
-    {
-    }
-
-    internal override int ItemCount
-    {
-      get
-      {
-        GroupGeneratorNode parentGroup = this.Parent as GroupGeneratorNode;
-        if( parentGroup == null || parentGroup.IsExpanded == true )
-        {
-          return this.Items.Count;
-        }
-        else
-        {
-          return this.ComputeCollapsedItemCount();
-        }
-      }
-    }
-
-    internal override void NotifyExpansionStateChanged( bool isParentExpanded )
-    {
-      base.NotifyExpansionStateChanged( isParentExpanded );
-
-      bool sequenceStarted = false;
-
-      int startIndex = 0;
-      int sequenceCount = 0;
-      int totalCount = 0;
-
-      GroupHeaderFooterItemTemplate groupHeaderTemplate;
-
-      //cycle through all of the items of the node
-      for( int i = 0; i < this.Items.Count; i++ )
-      {
-        //determine if the DataTemplate for the node is a GroupHeaderFooterTemplate 
-        groupHeaderTemplate = this.Items[ i ] as GroupHeaderFooterItemTemplate;
-
-        //if the Node represent a GroupHeader of GroupFooter and the template is a GroupHeaderFooterTemplate which
-        //is VisibleWhenCollapsed
-        if( ( groupHeaderTemplate != null ) && ( groupHeaderTemplate.VisibleWhenCollapsed == true ) )
-        {
-          groupHeaderTemplate.Seal();
-          //send any pending message to the Generator
-          if( sequenceStarted == true )
-          {
-            this.OnExpansionStateChanged( isParentExpanded, startIndex, sequenceCount );
-
-            //cumulate the total number of items collapsed/expanded
-            totalCount += sequenceCount;
-
-            //reset the sequence variables.
-            startIndex = 0;
-            sequenceCount = 0;
-            sequenceStarted = false;
-          }
-        }
-        //the node is to be collapsed/expanded
-        else
-        {
-          //if no sequence were started yet
-          if( sequenceStarted == false )
-          {
-            //start it.
-            sequenceCount = 0;
-            startIndex = i;
-            sequenceStarted = true;
-          }
-
-          //cumulate the sequence count
-          sequenceCount++;
-
-        }
-
-      }
-
-      //if a sequence was started but not completed (event sent), then terminate it
-      if( sequenceStarted == true )
-      {
-        this.OnExpansionStateChanged( isParentExpanded, startIndex, sequenceCount );
-
-        //cumulate the total number of items collapsed/expanded
-        totalCount += sequenceCount;
-      }
-
-      //finally, adjust the ItemCount
-      this.Parent.AdjustItemCount( ( isParentExpanded == true ) ? totalCount : -totalCount );
-    }
-
-    public override int IndexOf( object item )
-    {
-      int retval = -1;
-
-      if( item != null )
-      {
-        GroupGeneratorNode parentGroup = this.Parent as GroupGeneratorNode;
-
-        //if the node is the child of a GroupGeneratorNode (then its a GroupHeader or GroupFooter).
-        if( parentGroup != null )
-        {
-          //Debug.Assert( ( item.GetType() == typeof( GroupHeaderFooterItem ) ), "item must be a GroupHeaderFooterItem for HeadersFootersGeneratorNode whose parent is a GroupGeneratorNode" );
-
-          if( item.GetType() == typeof( GroupHeaderFooterItem ) )
-          {
-            //only process further is the ParentGroup match the requested group.
-            GroupHeaderFooterItem ghf = ( GroupHeaderFooterItem )item;
-            if( ghf.Group == parentGroup.CollectionViewGroup )
-            {
-              retval = this.IndexOfHelper( parentGroup, ghf.Template );
-            }
-          }
-          else
-          {
-            retval = this.IndexOfHelper( parentGroup, item );
-          }
-
-        }
-        else
-        {
-          //if there is no parent group (or no parent at all), then process the item directly!
-          retval = this.IndexOfHelper( parentGroup, item );
-        }
-      }
-
-      return retval;
-
-    }
-
-    public override object GetAt( int index )
-    {
-      var parentGroup = this.Parent as GroupGeneratorNode;
-      object item;
-
-      if( ( parentGroup != null ) && !parentGroup.IsExpanded )
-      {
-        item = this.ComputeCollapsedGetAt( index );
-      }
-      else
-      {
-        item = base.GetAt( index );
-      }
-
-      if( ( parentGroup != null ) && ( item != null ) )
-        return new GroupHeaderFooterItem( parentGroup.CollectionViewGroup, item );
-
-      return item;
-    }
-
-    #region ImmediateUIGroups
-
-    internal ReadOnlyCollection<Group> GetImmediateUIGroups( int generatorCurrentGeneration )
-    {
-      if( ( m_cachedGeneratorCurrentGeneration != generatorCurrentGeneration )
-        || ( m_readOnlyImmediateUIGroups == null ) )
-      {
-        Debug.WriteLineIf( ( ( m_cachedGeneratorCurrentGeneration != generatorCurrentGeneration ) && ( m_readOnlyImmediateUIGroups == null ) ),
-          "Creating Groups collection since generator version differs AND ReadOnlyCollection is null." );
-
-        Debug.WriteLineIf( ( ( m_cachedGeneratorCurrentGeneration != generatorCurrentGeneration ) && ( m_readOnlyImmediateUIGroups != null ) ),
-          "Creating Groups collection since generator version differs." );
-
-        Debug.WriteLineIf( ( ( m_cachedGeneratorCurrentGeneration == generatorCurrentGeneration ) && ( m_readOnlyImmediateUIGroups == null ) ),
-          "Creating Groups collection even if generator version is the same, since ReadOnlyCollection is null." );
-
-        m_cachedGeneratorCurrentGeneration = generatorCurrentGeneration;
-
-        // Ensure collections.
-        if( m_immediateUIGroups == null )
-        {
-          Debug.Assert( m_readOnlyImmediateUIGroups == null );
-          m_immediateUIGroups = new Collection<Group>();
-          m_readOnlyImmediateUIGroups = new ReadOnlyCollection<Group>( m_immediateUIGroups );
-        }
-        else
-        {
-          Debug.Assert( m_readOnlyImmediateUIGroups != null );
-          m_immediateUIGroups.Clear();
-        }
-
-        // Recalculate.
-        GeneratorNodeHelper nodeHelper = new GeneratorNodeHelper( this, 0, 0 ); //index is not important
-
-        while( nodeHelper.MoveToNext() )
-        {
-          GroupGeneratorNode groupGeneratorNode = nodeHelper.CurrentNode as GroupGeneratorNode;
-
-          if( groupGeneratorNode == null )
-            continue;
-
-          m_immediateUIGroups.Add( groupGeneratorNode.UIGroup );
-        }
-      }
-
-      return m_readOnlyImmediateUIGroups;
-    }
-
-    private int m_cachedGeneratorCurrentGeneration;
-    private Collection<Group> m_immediateUIGroups;
-    private ReadOnlyCollection<Group> m_readOnlyImmediateUIGroups;
-
-    #endregion ImmediateUIGroups
-
-    private int ComputeCollapsedItemCount()
-    {
-      int retval = 0;
-
-      GroupHeaderFooterItemTemplate groupHeaderTemplate;
-
-      for( int i = 0; i < this.Items.Count; i++ )
-      {
-        //determine if the DataTemplate for the node is a GroupHeaderFooterTemplate 
-        groupHeaderTemplate = this.Items[ i ] as GroupHeaderFooterItemTemplate;
-
-        //if the Node represent a GroupHeader of GroupFooter and the template is a GroupHeaderFooterTemplate which
-        //is VisibleWhenCollapsed
-        if( ( groupHeaderTemplate != null ) && ( groupHeaderTemplate.VisibleWhenCollapsed == true ) )
-        {
-          groupHeaderTemplate.Seal();
-          retval++;
-        }
-      }
-
-      return retval;
-    }
-
-    private int ComputeCollapsedIndexOf( object item )
-    {
-      int retval = -1;
-      int count = -1;
-
-      GroupHeaderFooterItemTemplate groupHeaderTemplate;
-
-      for( int i = 0; i < this.Items.Count; i++ )
-      {
-        //determine if the DataTemplate for the node is a GroupHeaderFooterTemplate 
-        groupHeaderTemplate = this.Items[ i ] as GroupHeaderFooterItemTemplate;
-
-        //if the Node represent a GroupHeader of GroupFooter and the template is a GroupHeaderFooterTemplate which
-        //is VisibleWhenCollapsed
-        if( ( groupHeaderTemplate != null ) && ( groupHeaderTemplate.VisibleWhenCollapsed == true ) )
-        {
-          groupHeaderTemplate.Seal();
-          count++;
-        }
-
-        if( this.Items[ i ] == item )
-        {
-          retval = count;
-          break;
-        }
-      }
-
-      return retval;
-    }
-
-    private object ComputeCollapsedGetAt( int index )
-    {
-      object retval = null;
-
-      GroupHeaderFooterItemTemplate groupHeaderTemplate;
-      int count = -1;
-
-      for( int i = 0; i < this.Items.Count; i++ )
-      {
-        //determine if the DataTemplate for the node is a GroupHeaderFooterTemplate 
-        groupHeaderTemplate = this.Items[ i ] as GroupHeaderFooterItemTemplate;
-
-        //if the Node represent a GroupHeader of GroupFooter and the template is a GroupHeaderFooterTemplate which
-        //is VisibleWhenCollapsed
-        if( ( groupHeaderTemplate != null ) && ( groupHeaderTemplate.VisibleWhenCollapsed == true ) )
-        {
-          groupHeaderTemplate.Seal();
-          count++;
-        }
-
-        if( count == index )
-        {
-          retval = this.Items[ i ];
-          break;
-        }
-      }
-
-      return retval;
-    }
-
-    private int IndexOfHelper( GroupGeneratorNode parentGroup, object template )
-    {
-      int retval = -1;
-
-      if( parentGroup != null && parentGroup.IsExpanded == false )
-      {
-        retval = this.ComputeCollapsedIndexOf( template );
-      }
-      else
-      {
-        retval = base.IndexOf( template );
-      }
-
-      return retval;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs
deleted file mode 100644
index 60a172bd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls.Primitives;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public interface ICustomItemContainerGenerator : IItemContainerGenerator
-  {
-    int ItemCount
-    {
-      get;
-    }
-
-    bool IsRecyclingEnabled
-    {
-      get;
-      set;
-    }
-
-    DependencyObject ContainerFromIndex( int index );
-    DependencyObject GetRealizedContainerForIndex( int index );
-    int GetRealizedIndexForContainer( DependencyObject container );
-
-    void SetCurrentIndex( int newCurrentIndex );
-    int GetCurrentIndex();
-
-    void RestoreFocus( DependencyObject container );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/IInhibitGenPosToIndexUpdating.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/IInhibitGenPosToIndexUpdating.cs
deleted file mode 100644
index 41bf41d2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/IInhibitGenPosToIndexUpdating.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal interface IInhibitGenPosToIndexUpdating
-  {
-    IDisposable InhibitGenPosToIndexUpdates();
-  } 
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContainerRecyclingPool.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContainerRecyclingPool.cs
deleted file mode 100644
index 0d40ba07..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContainerRecyclingPool.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ItemContainerRecyclingPool : IEnumerable<DependencyObject>
-  {
-    internal int Count
-    {
-      get
-      {
-        return m_count;
-      }
-    }
-
-    internal void Clear()
-    {
-      if( m_count <= 0 )
-        return;
-
-      m_collection.Clear();
-      m_count = 0;
-      m_version++;
-    }
-
-    internal void Enqueue( object hint, DependencyObject container )
-    {
-      if( container == null )
-        throw new ArgumentNullException( "container" );
-
-      var key = ( hint != null ) ? hint.GetHashCode() : 0;
-      var entry = default( Entry );
-
-      if( !m_collection.TryGetValue( key, out entry ) )
-      {
-        entry = new Entry();
-      }
-
-      entry.Push( container );
-
-      m_collection[ key ] = entry;
-      m_count++;
-      m_version++;
-    }
-
-    internal DependencyObject Dequeue( object hint )
-    {
-      if( m_collection.Count <= 0 )
-        return null;
-
-      var key = ( hint != null ) ? hint.GetHashCode() : 0;
-      var entry = default( Entry );
-
-      if( !m_collection.TryGetValue( key, out entry ) )
-      {
-        var pair = m_collection.First();
-
-        key = pair.Key;
-        entry = pair.Value;
-      }
-
-      Debug.Assert( entry.Count > 0 );
-      var container = entry.Pop();
-      Debug.Assert( container != null );
-
-      if( entry.Count == 0 )
-      {
-        m_collection.Remove( key );
-      }
-      else
-      {
-        m_collection[ key ] = entry;
-      }
-
-      m_count--;
-      m_version++;
-
-      return container;
-    }
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<DependencyObject> GetEnumerator()
-    {
-      var version = m_version;
-
-      foreach( var entry in m_collection.Values )
-      {
-        for( int i = entry.Count - 1; i >= 0; i-- )
-        {
-          if( version != m_version )
-            throw new InvalidOperationException();
-
-          yield return entry[ i ];
-        }
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private int m_count; //0
-    private int m_version; //0
-    private readonly Dictionary<int, Entry> m_collection = new Dictionary<int, Entry>();
-
-    #region Entry Private Struct
-
-    private struct Entry
-    {
-      internal int Count
-      {
-        get
-        {
-          return m_count;
-        }
-      }
-
-      internal DependencyObject this[ int index ]
-      {
-        get
-        {
-          Debug.Assert( ( index >= 0 ) && ( index < m_count ) );
-          return m_containers[ index ];
-        }
-      }
-
-      internal void Push( DependencyObject container )
-      {
-        Debug.Assert( container != null );
-
-        if( m_containers == null )
-        {
-          Array.Resize( ref m_containers, 1 );
-        }
-        else if( m_count == m_containers.Length )
-        {
-          Debug.Assert( m_containers.Length > 0 );
-          Array.Resize( ref m_containers, m_containers.Length * 2 );
-        }
-
-        m_containers[ m_count ] = container;
-        m_count++;
-      }
-
-      internal DependencyObject Pop()
-      {
-        Debug.Assert( m_count > 0 );
-        Debug.Assert( m_containers != null );
-
-        m_count--;
-
-        var container = m_containers[ m_count ];
-        m_containers[ m_count ] = default( DependencyObject );
-
-        return container;
-      }
-
-      private int m_count; //0
-      private DependencyObject[] m_containers; //null
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs
deleted file mode 100644
index ebd0e1c8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ItemContextVisitor : IDataGridContextVisitor
-  {
-    internal ItemContextVisitor( TableflowViewItemsHost itemsHost, double firstItemHiddenRatio )
-    {
-      m_itemsHost = itemsHost;
-      m_firstItemHiddenRatio = firstItemHiddenRatio;
-    }
-
-    #region ParentDataGridContext
-
-    public DataGridContext ParentDataGridContext
-    {
-      get
-      {
-        return m_parentDataGridContext;
-      }
-    }
-
-    private DataGridContext m_parentDataGridContext;
-
-    #endregion
-
-    #region Item Property
-
-    public object Item
-    {
-      get
-      {
-        return m_item;
-      }
-    }
-
-    private object m_item;
-
-    #endregion
-
-    #region VisitSuccessful Property
-
-    public bool VisitSuccessful
-    {
-      get
-      {
-        return m_success;
-      }
-    }
-
-    private bool m_success; //false;
-
-    #endregion
-
-    #region IDataGridContextVisitor Members
-
-    public void Visit( DataGridContext sourceContext, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The ItemAndDataGridContextVisitor is only capable of handling data items." );
-    }
-
-    public void Visit( DataGridContext sourceContext, int startSourceDataItemIndex, int endSourceDataItemIndex, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The ItemAndDataGridContextVisitor is only capable of handling data items." );
-    }
-
-    public void Visit( DataGridContext sourceContext, int sourceDataItemIndex, object item, ref bool stopVisit )
-    {
-      // In TableflowView, we must consider that sticky headers may hide the item.
-      if( m_itemsHost != null )
-      {
-        if( m_isFirstItem )
-        {
-          m_isFirstItem = false;
-
-          // At least half the item is hidden.
-          if( m_firstItemHiddenRatio > 0.5d )
-            return;
-        }
-
-        var areHeadersSticky = TableflowView.GetAreHeadersSticky( sourceContext );
-        var areGroupHeadersSticky = TableflowView.GetAreGroupHeadersSticky( sourceContext );
-        var areParentRowsSticky = TableflowView.GetAreParentRowsSticky( sourceContext );
-
-        if( areHeadersSticky || areGroupHeadersSticky || areParentRowsSticky )
-        {
-          var stickyHeadersCount = sourceContext.CustomItemContainerGenerator.GetStickyHeaderCountForIndex( sourceDataItemIndex, areHeadersSticky, areGroupHeadersSticky, areParentRowsSticky );
-
-          if( stickyHeadersCount > m_stickyHeadersSkipped )
-          {
-            m_stickyHeadersSkipped++;
-            return;
-          }
-        }
-      }
-
-      m_item = item;
-      m_parentDataGridContext = sourceContext;
-      m_success = true;
-      stopVisit = true;
-    }
-
-    public void Visit( DataGridContext sourceContext, CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The ItemAndDataGridContextVisitor is only capable of handling data items." );
-    }
-
-    public void Visit( DataGridContext sourceContext, DataTemplate headerFooter, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The ItemAndDataGridContextVisitor is only capable of handling data items." );
-    }
-
-    public void Visit( DataGridContext sourceContext, GroupHeaderFooterItem groupHeaderFooter, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The ItemAndDataGridContextVisitor is only capable of handling data items." );
-    }
-
-    #endregion
-
-    private readonly TableflowViewItemsHost m_itemsHost;
-    private readonly double m_firstItemHiddenRatio;
-    private bool m_isFirstItem = true;
-    private int m_stickyHeadersSkipped; //0
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs
deleted file mode 100644
index 5a107b4f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal partial class ItemsGeneratorNode : CollectionGeneratorNode
-  {
-    internal ItemsGeneratorNode( IList list, GeneratorNode parent )
-      : base( list, parent )
-    {
-    }
-
-    internal override int ItemCount
-    {
-      get
-      {
-        var parentGroup = this.Parent as GroupGeneratorNode;
-        if( ( parentGroup == null ) || parentGroup.IsExpanded )
-          return this.Items.Count + this.ComputeDetailsCount();
-
-        return 0;
-      }
-    }
-
-    internal override void NotifyExpansionStateChanged( bool isParentExpanded )
-    {
-      base.NotifyExpansionStateChanged( isParentExpanded );
-
-      if( this.Parent != null )
-      {
-        this.OnExpansionStateChanged( isParentExpanded, 0, this.Items.Count + this.ComputeDetailsCount() );
-
-        if( isParentExpanded )
-        {
-          this.Parent.AdjustItemCount( this.Items.Count + this.ComputeDetailsCount() );
-        }
-        else
-        {
-          this.Parent.AdjustItemCount( -( this.Items.Count + this.ComputeDetailsCount() ) );
-        }
-      }
-    }
-
-    protected override int AdjustItemCountOverride( int delta )
-    {
-      base.AdjustItemCountOverride( delta );
-
-      var parentGroup = this.Parent as GroupGeneratorNode;
-      if( ( parentGroup == null ) || parentGroup.IsExpanded )
-        return delta;
-
-      return 0;
-    }
-
-    public override object GetAt( int index )
-    {
-      if( index < 0 )
-        return null;
-
-      //If there are no details, call base (quicker)
-      if( ( m_detailsMapping == null ) || ( m_detailsMapping.Count == 0 ) )
-        return base.GetAt( index );
-
-      int masterIndex;
-      int detailIndex;
-      int detailNodeIndex;
-
-      var detailNode = this.GetDetailNodeForIndex( index, out masterIndex, out detailIndex, out detailNodeIndex );
-      if( detailNode == null )
-        return this.Items[ masterIndex ];
-
-      return detailNode.DetailGenerator.ItemFromIndex( detailIndex );
-    }
-
-    public override int IndexOf( object item )
-    {
-      if( ( m_detailsMapping == null ) || ( m_detailsMapping.Count == 0 ) )
-        return base.IndexOf( item );
-
-      var tmpIndex = this.Items.IndexOf( item );
-      if( tmpIndex >= 0 )
-        return tmpIndex + this.CountDetailsBeforeDataIndex( tmpIndex );
-
-      int runningDetailCount = 0;
-
-      foreach( KeyValuePair<int, List<DetailGeneratorNode>> pair in m_detailsMapping )
-      {
-        var detailNodeList = pair.Value;
-        var currentIndex = pair.Key;
-        var runningIndex = ( currentIndex + runningDetailCount );
-
-        var count = detailNodeList.Count;
-        for( int i = 0; i < count; i++ )
-        {
-          var detailNode = detailNodeList[ i ];
-          var detailIndex = detailNode.DetailGenerator.IndexFromItem( item );
-
-          if( detailIndex >= 0 )
-            return runningIndex + detailIndex + 1;
-
-          var detailItemCount = detailNode.ItemCount;
-
-          runningDetailCount += detailItemCount;
-          runningIndex += detailItemCount;
-        }
-      }
-
-      return -1;
-    }
-
-    internal override void CleanGeneratorNode()
-    {
-      base.CleanGeneratorNode();
-
-      if( m_detailsMapping != null )
-      {
-        foreach( var detail in m_detailsMapping.Values )
-        {
-          detail.Clear();
-        }
-
-        m_detailsMapping.Clear();
-        m_detailsMapping = null;
-      }
-    }
-
-    #region Master/Detail Specific Stuff
-
-    public SortedDictionary<int, List<DetailGeneratorNode>> Details
-    {
-      get
-      {
-        return m_detailsMapping;
-      }
-      set
-      {
-        m_detailsMapping = value;
-      }
-    }
-
-    private int ComputeDetailsCount()
-    {
-      if( m_detailsMapping == null )
-        return 0;
-
-      var count = 0;
-
-      foreach( var detailsList in m_detailsMapping.Values )
-      {
-        foreach( var detail in detailsList )
-        {
-          count += detail.ItemCount;
-        }
-      }
-
-      return count;
-    }
-
-    internal int CountDetailsBeforeDataIndex( int dataIndex )
-    {
-      if( m_detailsMapping == null )
-        return 0;
-
-      var count = 0;
-
-      foreach( KeyValuePair<int, List<DetailGeneratorNode>> indexToDetails in m_detailsMapping )
-      {
-        if( indexToDetails.Key < dataIndex )
-        {
-          foreach( var node in indexToDetails.Value )
-          {
-            count += node.ItemCount;
-          }
-
-          continue;
-        }
-
-        // Since the details list is now a SortedDictionary, we can assume
-        // that if the key is greater or equal than the reference index,
-        // there will be no more entry after this.
-        break;
-      }
-
-      return count;
-    }
-
-    internal int CountDetailsBeforeGlobalIndex( int globalIndex )
-    {
-      if( ( m_detailsMapping == null ) || ( globalIndex == 0 ) )
-        return 0;
-
-      var retval = 0;
-
-      foreach( KeyValuePair<int, List<DetailGeneratorNode>> indexToDetails in m_detailsMapping )
-      {
-        var key = indexToDetails.Key;
-
-        // Since the details list is now a SortedDictionary, we can assume
-        // that if the key is greater or equal than the reference index,
-        // there will be no more entry after this.
-        if( key >= globalIndex )
-          break;
-
-        foreach( var node in indexToDetails.Value )
-        {
-          var itemCount = node.ItemCount;
-          globalIndex -= itemCount;
-
-          if( key >= globalIndex )
-            break;
-
-          retval += itemCount;
-        }
-      }
-
-      return retval;
-    }
-
-    public DetailGeneratorNode GetDetailNodeForIndex( int targetIndex )
-    {
-      int masterIndex;
-      int detailIndex;
-      int detailNodeIndex;
-
-      return this.GetDetailNodeForIndex( targetIndex, out masterIndex, out detailIndex, out detailNodeIndex );
-    }
-
-    public DetailGeneratorNode GetDetailNodeForIndex( int targetIndex, out int masterIndex, out int detailIndex, out int detailNodeIndex )
-    {
-      masterIndex = -1;
-      detailIndex = -1;
-      detailNodeIndex = -1;
-
-      if( ( m_detailsMapping == null ) || ( m_detailsMapping.Count == 0 ) )
-      {
-        masterIndex = targetIndex;
-        return null;
-      }
-
-      var runningDetailCount = 0;
-
-      foreach( KeyValuePair<int, List<DetailGeneratorNode>> pair in m_detailsMapping )
-      {
-        var detailNodeList = pair.Value;
-        var currentIndex = pair.Key;
-        var runningIndex = ( currentIndex + runningDetailCount );
-
-        if( targetIndex < runningIndex )
-        {
-          masterIndex = targetIndex - runningDetailCount;
-          return null;
-        }
-
-        if( runningIndex == targetIndex )
-        {
-          masterIndex = currentIndex;
-          return null;
-        }
-
-        var count = detailNodeList.Count;
-        for( int i = 0; i < count; i++ )
-        {
-          var detailNode = detailNodeList[ i ];
-          var detailItemCount = detailNode.ItemCount;
-
-          if( targetIndex <= ( runningIndex + detailItemCount ) )
-          {
-            masterIndex = currentIndex;
-            detailIndex = targetIndex - runningIndex - 1;
-            detailNodeIndex = i;
-            return detailNode;
-          }
-          else
-          {
-            runningDetailCount += detailItemCount;
-            runningIndex += detailItemCount;
-          }
-        }
-      }
-
-      masterIndex = targetIndex - runningDetailCount;
-      return null;
-    }
-
-    private SortedDictionary<int, List<DetailGeneratorNode>> m_detailsMapping; // null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs
deleted file mode 100644
index c6e09415..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class NotifyCollectionChangedGeneratorNode : GeneratorNode, INotifyCollectionChanged
-  {
-    internal NotifyCollectionChangedGeneratorNode( GeneratorNode parent )
-      : base( parent )
-    {
-    }
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    public void OnCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      var handler = this.CollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs
deleted file mode 100644
index aab7e77d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RangeSelectionVisitor : IDataGridContextVisitor
-  {
-    public RangeSelectionVisitor( SelectionRange[] selectedColumns, bool unselect )
-    {
-      m_selectedColumns = selectedColumns;
-      m_unselect = unselect;
-    }
-
-    #region IDataGridContextVisitor Members
-
-    public void Visit( DataGridContext sourceContext, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The RangeSelectionVisitor is only capable of handling data items block." );
-    }
-
-    public void Visit( DataGridContext sourceContext, int startSourceDataItemIndex, int endSourceDataItemIndex, ref bool stopVisit )
-    {
-      SelectionManager selectionChangerManager = sourceContext.DataGridControl.SelectionChangerManager;
-
-      if( m_selectedColumns != null )
-      {
-        int columnCount = sourceContext.Columns.Count;
-
-        if( columnCount == 0 )
-          return;
-
-        SelectionRange contextColumnMaxRange = new SelectionRange( 0, columnCount - 1 );
-
-        for( int i = 0; i < m_selectedColumns.Length; i++ )
-        {
-          SelectionRange selectionRange = m_selectedColumns[ i ];
-          SelectionRange intersectionSelectionRange = selectionRange.Intersect( contextColumnMaxRange );
-
-          if( intersectionSelectionRange.IsEmpty )
-            continue;
-
-
-          var cellRange = new SelectionCellRangeWithItems( new SelectionRange( startSourceDataItemIndex, endSourceDataItemIndex ), null, intersectionSelectionRange );
-
-          if( m_unselect )
-          {
-            selectionChangerManager.UnselectCells( sourceContext, cellRange );
-          }
-          else
-          {
-            selectionChangerManager.SelectCells( sourceContext, cellRange );
-          }
-        }
-      }
-      else
-      {
-        var itemRange = new SelectionRangeWithItems( new SelectionRange( startSourceDataItemIndex, endSourceDataItemIndex ), null );
-
-        if( m_unselect )
-        {
-          selectionChangerManager.UnselectItems( sourceContext, itemRange );
-        }
-        else
-        {
-          selectionChangerManager.SelectItems( sourceContext, itemRange );
-        }
-      }
-    }
-
-    public void Visit( DataGridContext sourceContext, int sourceDataItemIndex, object item, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The RangeSelectionVisitor is only capable of handling data items block." );
-    }
-
-    public void Visit( DataGridContext sourceContext, System.Windows.Data.CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The RangeSelectionVisitor is only capable of handling data items block." );
-    }
-
-    public void Visit( DataGridContext sourceContext, System.Windows.DataTemplate headerFooter, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The RangeSelectionVisitor is only capable of handling data items block." );
-    }
-
-    public void Visit( DataGridContext sourceContext, GroupHeaderFooterItem groupHeaderFooter, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The RangeSelectionVisitor is only capable of handling data items block." );
-    }
-
-    #endregion
-
-    private SelectionRange[] m_selectedColumns;
-    private bool m_unselect;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RecyclingCandidateCleanedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RecyclingCandidateCleanedEvent.cs
deleted file mode 100644
index 6c4beb1d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RecyclingCandidateCleanedEvent.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal delegate void RecyclingCandidatesCleanedEventHandler( object sender, RecyclingCandidatesCleanedEventArgs e );
-
-  internal class RecyclingCandidatesCleanedEventArgs : EventArgs
-  {
-    public RecyclingCandidatesCleanedEventArgs( IList<DependencyObject> recyclingCandidates )
-    {
-      if( recyclingCandidates == null )
-        throw new ArgumentNullException( "recyclingCandidates" );
-
-      m_recyclingCandidates = recyclingCandidates;
-    }
-
-    public IList<DependencyObject> RecyclingCandidates
-    {
-      get
-      {
-        return m_recyclingCandidates;
-      }
-    }
-
-    private IList<DependencyObject> m_recyclingCandidates;
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs
deleted file mode 100644
index 7c385052..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  /// <summary>
-  /// This visitor saves and restores a DataGridContext's Expanded Groups and Expanded Items.
-  /// 
-  /// It will not handle the dataGridContext's details, beside expanding this dataGridContext's items
-  /// which were expanded.
-  /// 
-  /// It will handle has many group levels as needed, or as specified.
-  /// </summary>
-  internal class SaveRestoreDataGridContextStateVisitor : SaveRestoreStateVisitor
-  {
-    #region CONSTRUCTORS
-
-    public SaveRestoreDataGridContextStateVisitor()
-      : this( true, int.MaxValue, false )
-    {
-    }
-
-    public SaveRestoreDataGridContextStateVisitor( bool saveExpandedItems, int maxGroupLevel, bool stopAtFirstCollapsedGroup )
-    {
-      if( maxGroupLevel < 0 )
-        throw new ArgumentOutOfRangeException( "maxGroupLevel" );
-
-      m_saveExpandedItems = saveExpandedItems;
-      m_maxGroupLevel = maxGroupLevel;
-      m_stopAtFirstCollapsedGroup = stopAtFirstCollapsedGroup;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region MaxGroupLevel Property
-
-    private int m_maxGroupLevel;
-
-    public int MaxGroupLevel
-    {
-      get
-      {
-        return m_maxGroupLevel;
-      }
-    }
-
-    #endregion MaxGroupLevel Property
-
-    #region SaveExpandedItems Property
-
-    private bool m_saveExpandedItems;
-
-    public bool SaveExpandedItems
-    {
-      get
-      {
-        return m_saveExpandedItems;
-      }
-    }
-
-    #endregion SaveExpandedItems Property
-
-    #region StopAtFirstCollapsedGroup Property
-
-    private bool m_stopAtFirstCollapsedGroup;
-
-    public bool StopAtFirstCollapsedGroup
-    {
-      get
-      {
-        return m_stopAtFirstCollapsedGroup;
-      }
-    }
-
-    #endregion StopAtFirstCollapsedGroup Property
-
-    #region PROTECTED METHODS
-
-    protected override void InitializeCore()
-    {
-      m_rootDataGridContext = null;
-      m_itemsToExpand = new List<WeakReference>();
-      m_groupsStateDictionary = new Dictionary<GroupNamesTreeKey, bool>();
-    }
-
-    protected override void SaveStateCore( IDataGridContextVisitable dataGridContextVisitable )
-    {
-      try
-      {
-        bool visitWasStopped;
-        m_rootDataGridContext = SaveRestoreStateVisitor.GetDataGridContextFromVisitable( dataGridContextVisitable );
-
-        if( m_saveExpandedItems )
-          dataGridContextVisitable.AcceptVisitor( 0, int.MaxValue, this, DataGridContextVisitorType.DataGridContext, true, out visitWasStopped );
-
-        dataGridContextVisitable.AcceptVisitor( 0, int.MaxValue, this, DataGridContextVisitorType.Groups, false, out visitWasStopped );
-      }
-      finally
-      {
-        m_rootDataGridContext = null;
-      }
-    }
-
-    protected override void RestoreStateCore( IDataGridContextVisitable dataGridContextVisitable )
-    {
-      try
-      {
-        m_rootDataGridContext = SaveRestoreDataGridContextStateVisitor.GetDataGridContextFromVisitable( dataGridContextVisitable );
-
-        if( m_saveExpandedItems )
-        {
-          for( int i = 0; i < m_itemsToExpand.Count; i++ )
-          {
-            var dataItemToExpand = m_itemsToExpand[ i ].Target;
-            if( dataItemToExpand == null )
-              continue;
-
-            // Verify if we have a System.Data.DataView as ItemsSource to 
-            // ensure to restore the System.Data.DataRowView that represents
-            // the System.Data.DataRow saved previously
-            System.Data.DataView dataView = ItemsSourceHelper.TryGetDataViewFromDataGridContext( m_rootDataGridContext );
-
-            if( ( dataView != null ) && ( dataItemToExpand is System.Data.DataRow ) )
-            {
-              foreach( System.Data.DataRowView dataRowView in dataView )
-              {
-                if( dataRowView.Row == dataItemToExpand )
-                {
-                  dataItemToExpand = dataRowView;
-                  break;
-                }
-              }
-            }
-          }
-        }
-
-        bool visitWasStopped;
-        dataGridContextVisitable.AcceptVisitor( 0, int.MaxValue, this, DataGridContextVisitorType.Groups, false, out visitWasStopped );
-      }
-      finally
-      {
-        m_itemsToExpand = null;
-        m_rootDataGridContext = null;
-      }
-    }
-
-    protected override void SavingVisit( DataGridContext sourceContext )
-    {
-      if( sourceContext.ParentDataGridContext == m_rootDataGridContext )
-      {
-        // Ensure to get a reference to the System.Data.DataRow when doing a 
-        // save/restore of a System.Data.DataRowView since the view is recreated
-        // for every detail views
-        object parentItem = ItemsSourceHelper.TryGetDataRowFromDataItem( sourceContext.ParentItem );
-
-        m_itemsToExpand.Add( new WeakReference( parentItem ) );
-      }
-    }
-
-    protected override void SavingVisit( DataGridContext sourceContext, CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded )
-    {
-      if( sourceContext != m_rootDataGridContext )
-        throw new InvalidOperationException( "Group does not belong to the root DataGridContext." );
-
-      if( groupLevel > m_maxGroupLevel )
-        return;
-
-      if( ( m_stopAtFirstCollapsedGroup ) && ( !isComputedExpanded ) )
-        return;
-
-      GroupNamesTreeKey groupNamesTreeKey = new GroupNamesTreeKey( namesTree );
-
-      m_groupsStateDictionary.Add( groupNamesTreeKey, isExpanded );
-    }
-
-    protected override void RestoringVisit( DataGridContext sourceContext, CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded )
-    {
-      if( sourceContext != m_rootDataGridContext )
-        throw new InvalidOperationException( "Group does not belong to the root DataGridContext." );
-
-      if( groupLevel > m_maxGroupLevel )
-        return;
-
-      GroupNamesTreeKey groupNamesTreeKey = new GroupNamesTreeKey( namesTree );
-
-      bool wasExpanded;
-      if( m_groupsStateDictionary.TryGetValue( groupNamesTreeKey, out wasExpanded ) )
-      {
-        if( wasExpanded )
-        {
-          sourceContext.ExpandGroup( group, true );
-        }
-        else
-        {
-          sourceContext.CollapseGroup( group, true );
-        }
-      }
-      else if( m_stopAtFirstCollapsedGroup )
-      {
-        sourceContext.CollapseGroup( group, true );
-      }
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region PRIVATE FIELDS
-
-    private DataGridContext m_rootDataGridContext;
-    private List<WeakReference> m_itemsToExpand;
-    private Dictionary<GroupNamesTreeKey, bool> m_groupsStateDictionary;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs
deleted file mode 100644
index edb805a2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class SaveRestoreGlobalStateVisitor : SaveRestoreStateVisitor
-  {
-    internal SaveRestoreGlobalStateVisitor( bool stopAtFirstCollapsedGroup )
-    {
-      m_stopAtFirstCollapsedGroup = stopAtFirstCollapsedGroup;
-    }
-
-    #region StopAtFirstCollapsedGroup Property
-
-    internal bool StopAtFirstCollapsedGroup
-    {
-      get
-      {
-        return m_stopAtFirstCollapsedGroup;
-      }
-      set
-      {
-        m_stopAtFirstCollapsedGroup = value;
-      }
-    }
-
-    private bool m_stopAtFirstCollapsedGroup;
-
-    #endregion
-
-    protected override void InitializeCore()
-    {
-      m_dataGridContextsStateDictionary = new Dictionary<WeakDataGridContextKey, SaveRestoreDataGridContextStateVisitor>();
-    }
-
-    protected override void SaveStateCore( IDataGridContextVisitable dataGridContextVisitable )
-    {
-      var dataGridContext = SaveRestoreStateVisitor.GetDataGridContextFromVisitable( dataGridContextVisitable );
-
-      this.RecursiveSaveDataGridContextsState( dataGridContext );
-    }
-
-    protected override void RestoreStateCore( IDataGridContextVisitable dataGridContextVisitable )
-    {
-      var dataGridContext = SaveRestoreStateVisitor.GetDataGridContextFromVisitable( dataGridContextVisitable );
-
-      this.RecursiveRestoreDataGridContextsState( dataGridContext );
-    }
-
-    private void RecursiveSaveDataGridContextsState( DataGridContext dataGridContext )
-    {
-      var saveRestoreDataGridContextStateVisitor = new SaveRestoreDataGridContextStateVisitor( true, int.MaxValue, m_stopAtFirstCollapsedGroup );
-
-      saveRestoreDataGridContextStateVisitor.SaveState( dataGridContext as IDataGridContextVisitable );
-
-      m_dataGridContextsStateDictionary.Add( new WeakDataGridContextKey( dataGridContext ), saveRestoreDataGridContextStateVisitor );
-
-      foreach( var subDataGridContext in dataGridContext.GetChildContextsCore() )
-      {
-        this.RecursiveSaveDataGridContextsState( subDataGridContext );
-      }
-    }
-
-    private void RecursiveRestoreDataGridContextsState( DataGridContext dataGridContext )
-    {
-      var weakDataGridContextKey = new WeakDataGridContextKey( dataGridContext );
-      var saveRestoreDataGridContextStateVisitor = default( SaveRestoreDataGridContextStateVisitor );
-
-      if( m_dataGridContextsStateDictionary.TryGetValue( weakDataGridContextKey, out saveRestoreDataGridContextStateVisitor ) )
-      {
-        try
-        {
-          saveRestoreDataGridContextStateVisitor.RestoreState( dataGridContext as IDataGridContextVisitable );
-        }
-        finally
-        {
-          m_dataGridContextsStateDictionary.Remove( weakDataGridContextKey );
-        }
-      }
-
-      foreach( var subDataGridContext in dataGridContext.GetChildContextsCore() )
-      {
-        this.RecursiveRestoreDataGridContextsState( subDataGridContext );
-      }
-    }
-
-    private Dictionary<WeakDataGridContextKey, SaveRestoreDataGridContextStateVisitor> m_dataGridContextsStateDictionary;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreStateVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreStateVisitor.cs
deleted file mode 100644
index 34abfd3a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreStateVisitor.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  abstract internal class SaveRestoreStateVisitor : IDataGridContextVisitor
-  {
-    #region STATIC MEMBERS
-
-    public static DataGridContext GetDataGridContextFromVisitable( IDataGridContextVisitable dataGridContextVisitable )
-    {
-      DataGridContext dataGridContext = dataGridContextVisitable as DataGridContext;
-
-      if( dataGridContext == null )
-      {
-        DataGridControl dataGridControl = dataGridContextVisitable as DataGridControl;
-
-        if( dataGridControl != null )
-          dataGridContext = dataGridControl.DataGridContext;
-      }
-
-      if( dataGridContext == null )
-        throw new InvalidOperationException( "A dataGridContext could not be extracted from the IDataGridContextVisitable object." );
-
-      return dataGridContext;
-    }
-
-    #endregion STATIC MEMBERS
-
-    #region CONSTRUCTORS
-
-    public SaveRestoreStateVisitor()
-    {
-      this.Initialize();
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region SaveRestoreStateVisitorStatus
-
-    private SaveRestoreStateVisitorStatus m_status;
-
-    public SaveRestoreStateVisitorStatus SaveRestoreStateVisitorStatus
-    {
-      get { return m_status; }
-    }
-
-    #endregion SaveRestoreStateVisitorStatus
-
-    #region PUBLIC METHODS
-
-    public void Initialize()
-    {
-      this.InitializeCore();
-      m_status = SaveRestoreStateVisitorStatus.Ready;
-    }
-
-    public void SaveState( IDataGridContextVisitable dataGridContextVisitable )
-    {
-      if( m_status != SaveRestoreStateVisitorStatus.Ready )
-        throw new InvalidOperationException( "An attempt was made to save the state of a visitor that is not ready." );
-
-      m_status = SaveRestoreStateVisitorStatus.Saving;
-      try
-      {
-        this.SaveStateCore( dataGridContextVisitable );
-        m_status = SaveRestoreStateVisitorStatus.RestorePending;
-      }
-      catch
-      {
-        m_status = SaveRestoreStateVisitorStatus.Error;
-        throw;
-      }
-    }
-
-    public void RestoreState( IDataGridContextVisitable dataGridContextVisitable )
-    {
-      if( m_status != SaveRestoreStateVisitorStatus.RestorePending )
-        throw new InvalidOperationException( "An attempt was made to restore the state of a visitor that does not have a pending restorable state." );
-
-      m_status = SaveRestoreStateVisitorStatus.Restoring;
-      try
-      {
-        this.RestoreStateCore( dataGridContextVisitable );
-        m_status = SaveRestoreStateVisitorStatus.Restored;
-      }
-      catch
-      {
-        m_status = SaveRestoreStateVisitorStatus.Error;
-        throw;
-      }
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region PROTECTED METHODS
-
-    protected abstract void SaveStateCore( IDataGridContextVisitable dataGridContextVisitable );
-
-    protected abstract void RestoreStateCore( IDataGridContextVisitable dataGridContextVisitable );
-
-    protected abstract void InitializeCore();
-
-    protected virtual void SavingVisit( DataGridContext sourceContext )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void RestoringVisit( DataGridContext sourceContext )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void SavingVisit( DataGridContext sourceContext, object item )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void RestoringVisit( DataGridContext sourceContext, object item )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void SavingVisit( DataGridContext sourceContext, 
-      CollectionViewGroup group, 
-      object[] namesTree, 
-      int groupLevel, 
-      bool isExpanded, 
-      bool isComputedExpanded )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void RestoringVisit( DataGridContext sourceContext,
-      CollectionViewGroup group,
-      object[] namesTree,
-      int groupLevel,
-      bool isExpanded,
-      bool isComputedExpanded )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void SavingVisit( DataGridContext sourceContext, System.Windows.DataTemplate headerFooter )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void RestoringVisit( DataGridContext sourceContext, System.Windows.DataTemplate headerFooter )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void SavingVisit( DataGridContext sourceContext, GroupHeaderFooterItem groupHeaderFooter )
-    {
-      throw new NotImplementedException();
-    }
-
-    protected virtual void RestoringVisit( DataGridContext sourceContext, GroupHeaderFooterItem groupHeaderFooter )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region IDataGridContextVisitor Members
-
-    void IDataGridContextVisitor.Visit( DataGridContext sourceContext, ref bool stopVisit )
-    {
-      switch( m_status )
-      {
-        case SaveRestoreStateVisitorStatus.Saving:
-          {
-            this.SavingVisit( sourceContext );
-            break;
-          }
-
-        case SaveRestoreStateVisitorStatus.Restoring:
-          {
-            this.RestoringVisit( sourceContext );
-            break;
-          }
-
-        default:
-          {
-            throw new InvalidOperationException( "An attempt was made to visit using a method other than the SaveRestoreStateVisitor's Save and Restore methods." );
-          }
-      }
-    }
-
-    void IDataGridContextVisitor.Visit( DataGridContext sourceContext, int startSourceDataItemIndex, int endSourceDataItemIndex, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "The SaveRestoreStateVisitor is not handling of data items block." );
-    }
-
-    void IDataGridContextVisitor.Visit( DataGridContext sourceContext, int sourceDataItemIndex, object item, ref bool stopVisit )
-    {
-      switch( m_status )
-      {
-        case SaveRestoreStateVisitorStatus.Saving:
-          {
-            this.SavingVisit( sourceContext, item );
-            break;
-          }
-
-        case SaveRestoreStateVisitorStatus.Restoring:
-          {
-            this.RestoringVisit( sourceContext, item );
-            break;
-          }
-
-        default:
-          {
-            throw new InvalidOperationException( "An attempt was made to visit using a method other than the SaveRestoreStateVisitor's Save and Restore methods." );
-          }
-      }
-    }
-
-    void IDataGridContextVisitor.Visit( DataGridContext sourceContext, System.Windows.Data.CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded, ref bool stopVisit )
-    {
-      switch( m_status )
-      {
-        case SaveRestoreStateVisitorStatus.Saving:
-          {
-            this.SavingVisit( sourceContext, group, namesTree, groupLevel, isExpanded, isComputedExpanded );
-            break;
-          }
-
-        case SaveRestoreStateVisitorStatus.Restoring:
-          {
-            this.RestoringVisit( sourceContext, group, namesTree, groupLevel, isExpanded, isComputedExpanded );
-            break;
-          }
-
-        default:
-          {
-            throw new InvalidOperationException( "An attempt was made to visit using a method other than the SaveRestoreStateVisitor's Save and Restore methods." );
-          }
-      }
-    }
-
-    void IDataGridContextVisitor.Visit( DataGridContext sourceContext, System.Windows.DataTemplate headerFooter, ref bool stopVisit )
-    {
-      switch( m_status )
-      {
-        case SaveRestoreStateVisitorStatus.Saving:
-          {
-            this.SavingVisit( sourceContext, headerFooter );
-            break;
-          }
-
-        case SaveRestoreStateVisitorStatus.Restoring:
-          {
-            this.RestoringVisit( sourceContext, headerFooter );
-            break;
-          }
-
-        default:
-          {
-            throw new InvalidOperationException( "An attempt was made to visit using a method other than the SaveRestoreStateVisitor's Save and Restore methods." );
-          }
-      }
-    }
-
-    void IDataGridContextVisitor.Visit( DataGridContext sourceContext, GroupHeaderFooterItem groupHeaderFooter, ref bool stopVisit )
-    {
-      switch( m_status )
-      {
-        case SaveRestoreStateVisitorStatus.Saving:
-          {
-            this.SavingVisit( sourceContext, groupHeaderFooter );
-            break;
-          }
-
-        case SaveRestoreStateVisitorStatus.Restoring:
-          {
-            this.RestoringVisit( sourceContext, groupHeaderFooter );
-            break;
-          }
-
-        default:
-          {
-            throw new InvalidOperationException( "An attempt was made to visit using a method other than the SaveRestoreStateVisitor's Save and Restore methods." );
-          }
-      }
-    }
-
-    #endregion
-  }
-
-  internal enum SaveRestoreStateVisitorStatus
-  {
-    Ready = 0,
-    Saving = 1,
-    RestorePending = 2,
-    Restoring = 3,
-    Restored = 4,
-    Error = 5
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SelectAllVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SelectAllVisitor.cs
deleted file mode 100644
index 48a52128..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SelectAllVisitor.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelectAllVisitor : IDataGridContextVisitor
-  {
-    #region CONSTRUCTORS
-
-    public SelectAllVisitor()
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region IDataGridContextVisitor Members
-
-    public void Visit( DataGridContext sourceContext, ref bool stopVisit )
-    {
-      object[] items;
-      CollectionView itemsCollection = sourceContext.Items;
-      int count = itemsCollection.Count;
-
-      if( count == 0 )
-        return;
-
-      if( sourceContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase )
-      {
-        items = null;
-      }
-      else
-      {
-        items = new object[ count ];
-
-        for( int i = 0; i < count; i++ )
-        {
-          items[ i ] = itemsCollection.GetItemAt( i );
-        }
-      }
-
-      SelectionRange itemRange = new SelectionRange( 0, count - 1 );
-
-      if( sourceContext.DataGridControl.SelectionUnit == SelectionUnit.Row )
-      {
-        sourceContext.DataGridControl.SelectionChangerManager.SelectItems(
-          sourceContext,
-          new SelectionRangeWithItems( itemRange, items ) );
-      }
-      else
-      {
-        HashedLinkedList<ColumnBase> columnsByVisiblePosition = sourceContext.ColumnsByVisiblePosition;
-        SelectedItemsStorage selectedColumnStore = new SelectedItemsStorage( null );
-        SelectionRange fullColumnRange = new SelectionRange( 0, columnsByVisiblePosition.Count - 1 );
-        selectedColumnStore.Add( new SelectionRangeWithItems( fullColumnRange, null ) );
-        int index = 0;
-
-        foreach( ColumnBase column in columnsByVisiblePosition )
-        {
-          if( !column.Visible )
-          {
-            selectedColumnStore.Remove( new SelectionRangeWithItems( new SelectionRange( index ), null ) );
-          }
-
-          index++;
-        }
-
-        int columnRangeCount = selectedColumnStore.Count;
-
-        for( int i = 0; i < columnRangeCount; i++ )
-        {
-          sourceContext.DataGridControl.SelectionChangerManager.SelectCells(
-            sourceContext,
-            new SelectionCellRangeWithItems( itemRange, items, selectedColumnStore[ i ].Range ) );
-        }
-      }
-    }
-
-    public void Visit( DataGridContext sourceContext, int startSourceDataItemIndex, int endSourceDataItemIndex, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "Only DataGridContexts can be visited by this visitor." );
-    }
-
-    public void Visit( DataGridContext sourceContext, int sourceDataItemIndex, object item, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "Only DataGridContexts can be visited by this visitor." );
-    }
-
-    public void Visit( DataGridContext sourceContext, System.Windows.Data.CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "Only DataGridContexts can be visited by this visitor." );
-    }
-
-    public void Visit( DataGridContext sourceContext, System.Windows.DataTemplate headerFooter, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "Only DataGridContexts can be visited by this visitor." );
-    }
-
-    public void Visit( DataGridContext sourceContext, GroupHeaderFooterItem groupHeaderFooter, ref bool stopVisit )
-    {
-      throw new NotSupportedException( "Only DataGridContexts can be visited by this visitor." );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedComparer.cs
deleted file mode 100644
index 54c16ac2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedComparer.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class StickyContainerGeneratedComparer : IComparer<StickyContainerGenerated>
-  {
-    #region Singleton Property
-
-    public static StickyContainerGeneratedComparer Singleton
-    {
-      get
-      {
-        if( _singleton == null )
-          _singleton = new StickyContainerGeneratedComparer();
-
-        return _singleton;
-      }
-    }
-
-    private static StickyContainerGeneratedComparer _singleton;
-
-    #endregion Singleton Property
-
-    #region IComparer<StickyContainerGenerated> Members
-
-    public int Compare( StickyContainerGenerated x, StickyContainerGenerated y )
-    {
-      return x.Index.CompareTo( y.Index );
-    }
-
-    #endregion IComparer<StickyContainerGenerated> Members
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedReverseComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedReverseComparer.cs
deleted file mode 100644
index bf9e4af7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedReverseComparer.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class StickyContainerGeneratedReverseComparer : IComparer<StickyContainerGenerated>
-  {
-    #region Singleton Property
-
-    public static StickyContainerGeneratedReverseComparer Singleton
-    {
-      get
-      {
-        if( _singleton == null )
-          _singleton = new StickyContainerGeneratedReverseComparer();
-
-        return _singleton;
-      }
-    }
-
-    private static StickyContainerGeneratedReverseComparer _singleton;
-
-    #endregion Singleton Property
-
-    #region IComparer<StickyContainerGenerated> Members
-
-    public int Compare( StickyContainerGenerated x, StickyContainerGenerated y )
-    {
-      return y.Index.CompareTo( x.Index );
-    }
-
-    #endregion IComparer<StickyContainerGenerated> Members
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedStruct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedStruct.cs
deleted file mode 100644
index 141b848d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedStruct.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal struct StickyContainerGenerated
-  {
-    #region CONSTRUCTORS
-
-    public StickyContainerGenerated( DependencyObject container, int index, bool isNewlyRealized )
-      : this()
-    {
-      this.StickyContainer = container;
-      this.Index = index;
-      this.IsNewlyRealized = isNewlyRealized;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region StickyContainer Property
-
-    public DependencyObject StickyContainer
-    {
-      get;
-      private set;
-    }
-
-    #endregion StickyContainer Property
-
-    #region IsNewlyRealized Property
-
-    public bool IsNewlyRealized
-    {
-      get;
-      private set;
-    }
-
-    #endregion IsNewlyRealized Property
-
-    #region Index Property
-
-    public int Index
-    {
-      get;
-      set;
-    }
-
-    #endregion Index Property
-
-    #region Overrides
-
-    public override bool Equals( object obj )
-    {
-      return object.Equals( obj, this.StickyContainer );
-    }
-
-    public override int GetHashCode()
-    {
-      return this.StickyContainer.GetHashCode();
-    }
-
-    #endregion Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs
deleted file mode 100644
index 7467129b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class WeakDataGridContextKey
-  {
-    internal WeakDataGridContextKey( DataGridContext dataGridContext )
-    {
-      var parentDataGridContext = dataGridContext.ParentDataGridContext;
-      var level = 0;
-
-      while( parentDataGridContext != null )
-      {
-        level++;
-        parentDataGridContext = parentDataGridContext.ParentDataGridContext;
-      }
-
-      Debug.Assert( ( ( level == 0 ) || ( dataGridContext.SourceDetailConfiguration != null ) ), "A child dataGridContext must have a SourceDetailConfiguration." );
-
-      m_sourceDetailConfigurationRelationName = ( dataGridContext.SourceDetailConfiguration != null ) ? dataGridContext.SourceDetailConfiguration.RelationName : string.Empty;
-
-      if( level > 0 )
-      {
-        // We are NOT dealing with the root DataGridContext.
-
-        // Build the tree of master items.
-        m_weakItemsTree = new WeakReference[ level ];
-
-        var tempDataGridContext = dataGridContext;
-        for( int i = level - 1; i >= 0; i-- )
-        {
-          // Ensure to get a reference to the System.Data.DataRow when doing a 
-          // save/restore of a System.Data.DataRowView since the view is recreated
-          // for every detail views
-          var parentItem = ItemsSourceHelper.TryGetDataRowFromDataItem( tempDataGridContext.ParentItem );
-
-          m_weakItemsTree[ i ] = new WeakReference( parentItem );
-
-          tempDataGridContext = tempDataGridContext.ParentDataGridContext;
-        }
-      }
-
-      m_hashCode = WeakDataGridContextKey.CalculateHashCode( m_sourceDetailConfigurationRelationName, m_weakItemsTree );
-    }
-
-    public override int GetHashCode()
-    {
-      return m_hashCode;
-    }
-
-    public override bool Equals( object obj )
-    {
-      var target = obj as WeakDataGridContextKey;
-      if( ( target == null ) || ( m_hashCode != target.m_hashCode ) )
-        return false;
-
-      if( m_sourceDetailConfigurationRelationName != target.m_sourceDetailConfigurationRelationName )
-        return false;
-
-      var dataGridContextStatusKeyLength = ( target.m_weakItemsTree == null ) ? 0 : target.m_weakItemsTree.Length;
-      var myLength = ( m_weakItemsTree == null ) ? 0 : m_weakItemsTree.Length;
-
-      if( myLength != dataGridContextStatusKeyLength )
-        return false;
-
-      for( var i = 0; i < dataGridContextStatusKeyLength; i++ )
-      {
-        var sourceItem = m_weakItemsTree[ i ].Target;
-        var targetItem = target.m_weakItemsTree[ i ].Target;
-
-        if( !object.Equals( sourceItem, targetItem ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    private static int CalculateHashCode( string relationName, WeakReference[] items )
-    {
-      var hashCode = ( !string.IsNullOrEmpty( relationName ) ) ? relationName.GetHashCode() : 0;
-
-      if( items != null )
-      {
-        // We use this hashing algorithm in order to get a different hashCode
-        // when the same values are in a different order in the object array.
-        for( var i = 0; i < items.Length; i++ )
-        {
-          var item = items[ i ].Target;
-          Debug.Assert( item != null, "Item should still be referenced by the Child DataGridContext at this point!." );
-
-          if( item == null )
-            continue;
-
-          hashCode ^= item.GetHashCode();
-          hashCode += ( hashCode << 10 );
-          hashCode ^= ( hashCode >> 6 );
-        }
-      }
-
-      return hashCode;
-    }
-
-    private readonly WeakReference[] m_weakItemsTree;
-    private readonly string m_sourceDetailConfigurationRelationName;
-    private readonly int m_hashCode;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoScrollCurrentItemSourceTriggersEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoScrollCurrentItemSourceTriggersEnum.cs
deleted file mode 100644
index 423ac4c1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoScrollCurrentItemSourceTriggersEnum.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  [Flags]
-  internal enum AutoScrollCurrentItemSourceTriggers
-  {
-    None = 0x0000,
-    Navigation = 0x0001,
-    Editing = 0x0002,
-    FocusChanged = 0x0004,
-    SelectionChanged = 0x0008,
-    SortChanged = 0x0010,
-    GroupChanged = 0x0020,
-    CurrentItemChanged = 0x0040,
-    CurrentColumnChanged = 0x0080,
-    CollectionViewCurrentItemChanged = 0x0100,
-    ColumnsCollectionChanged = 0x0200,
-    ItemsSourceChanged = 0x0400,
-    ViewChanged = 0x0800,
-    ThemeChanged = 0x1000,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoScrollCurrentItemTriggersEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoScrollCurrentItemTriggersEnum.cs
deleted file mode 100644
index 535c7a13..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoScrollCurrentItemTriggersEnum.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  // Defines the events that trigger the bring into view for the current item.
-  [Flags]
-  public enum AutoScrollCurrentItemTriggers
-  {
-    None = 0x00,
-
-    CurrentChanged = 0x01,
-    ItemsSourceChanged = 0x02,
-    FocusChanged = 0x04,
-    SortChanged = 0x08,
-    GroupChanged = 0x10,
-    ViewChanged = 0x20,
-    ThemeChanged = 0x40,
-
-    All = ~0x00
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CellEditorDisplayConditionsEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CellEditorDisplayConditionsEnum.cs
deleted file mode 100644
index c5942354..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CellEditorDisplayConditionsEnum.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Flags]
-  public enum CellEditorDisplayConditions
-  {
-    None = 0x00,
-    RowIsBeingEdited = 0x01,
-    MouseOverCell = 0x02,
-    MouseOverRow = 0x04,
-    RowIsCurrent = 0x08,
-    CellIsCurrent = 0x10,
-    Always = 0x20
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnDraggableStatusEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnDraggableStatusEnum.cs
deleted file mode 100644
index 96f85cfe..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnDraggableStatusEnum.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  public enum ColumnDraggableStatus
-  {
-    Draggable = 0,
-    FirstUndraggable,
-    LastUndraggable,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnWidthUnitTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnWidthUnitTypeEnum.cs
deleted file mode 100644
index 19b926a7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnWidthUnitTypeEnum.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum ColumnWidthUnitType
-  {
-    Pixel,
-    Star
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CommitModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CommitModeEnum.cs
deleted file mode 100644
index 5b7711f4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CommitModeEnum.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public enum CommitMode
-  {
-    PageReleasedFromMemory = 0,
-    EditCommitted = 1
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CompareResultEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CompareResultEnum.cs
deleted file mode 100644
index 1f941bb7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CompareResultEnum.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal enum CompareResult
-  {
-    DifferentThan,
-    EqualsTo,
-    LessThan,
-    GreaterThan
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ConnectionLineAlignmentEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ConnectionLineAlignmentEnum.cs
deleted file mode 100644
index 9402538a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ConnectionLineAlignmentEnum.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public enum ConnectionLineAlignment
-  {
-    RightToBottom = 0,
-    LeftToBottom = 1,
-    RightToTop = 2,
-    LeftToTop = 3,
-    CenterToCenter = 4,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridConnectionStateEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridConnectionStateEnum.cs
deleted file mode 100644
index 05c4a35a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridConnectionStateEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public enum DataGridConnectionState
-  {
-    Idle,
-    Loading,
-    Committing,
-    Error
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridContextVisitorTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridContextVisitorTypeEnum.cs
deleted file mode 100644
index 37a7bd31..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridContextVisitorTypeEnum.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Flags]
-  internal enum DataGridContextVisitorType
-  {
-    Groups = 1,
-    HeadersFooters = 2,
-    GroupHeadersFooters = 4,
-    Items = 8,
-    DataGridContext = 16,
-    ItemsBlock = 32,
-    All = 63, //combine all the values together
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridDragBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridDragBehaviorEnum.cs
deleted file mode 100644
index f0783ca8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridDragBehaviorEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum DataGridDragBehavior
-  {
-    DragDrop = 0,
-    Select
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridUpdateSourceTriggerEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridUpdateSourceTriggerEnum.cs
deleted file mode 100644
index a5096c01..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridUpdateSourceTriggerEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum DataGridUpdateSourceTrigger
-  {
-    RowEndingEdit = 0,
-    CellEndingEdit = 1,
-    CellContentChanged = 2
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DeletingSelectedItemErrorActionEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DeletingSelectedItemErrorActionEnum.cs
deleted file mode 100644
index 70379485..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DeletingSelectedItemErrorActionEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum DeletingSelectedItemErrorAction
-  {
-    Abort,
-    Retry,
-    Skip,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesConstraintEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesConstraintEnum.cs
deleted file mode 100644
index 17d43d29..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesConstraintEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public enum DistinctValuesConstraint
-  {
-    All,
-    Filtered,
-    FilteredWithAllFilters
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesUpdateModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesUpdateModeEnum.cs
deleted file mode 100644
index 9cf96663..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesUpdateModeEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum DistinctValuesUpdateMode
-  {
-    Manual,
-    Auto
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DropMarkAlignmentEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DropMarkAlignmentEnum.cs
deleted file mode 100644
index 094d8898..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DropMarkAlignmentEnum.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal enum DropMarkAlignment
-  {
-    Near,
-    Far,
-    ExplicitPosition
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/EditTriggersEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/EditTriggersEnum.cs
deleted file mode 100644
index 0e0560b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/EditTriggersEnum.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Flags]
-  public enum EditTriggers
-  {
-    None = 0x00,
-    BeginEditCommand = 0x01,
-    ClickOnCurrentCell = 0x02,
-    SingleClick = 0x04,
-    CellIsCurrent = 0x08,
-    ActivationGesture = 0x10,
-    RowIsCurrent = 0x20,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/GeneratorNodeTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/GeneratorNodeTypeEnum.cs
deleted file mode 100644
index b71c66b9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/GeneratorNodeTypeEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal enum GeneratorNodeType
-  {
-    HeadersOrFooters,
-    Group,
-    Items,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ItemScrollingBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ItemScrollingBehaviorEnum.cs
deleted file mode 100644
index 35ebd279..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ItemScrollingBehaviorEnum.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum ItemScrollingBehavior
-  {
-    Deferred,
-    Immediate
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/LocationTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/LocationTypeEnum.cs
deleted file mode 100644
index 93651a88..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/LocationTypeEnum.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  internal enum LocationType
-  {
-    Column,
-    Start,
-    End,
-    Splitter,
-    Orphan,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/NavigationBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/NavigationBehaviorEnum.cs
deleted file mode 100644
index f6e03068..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/NavigationBehaviorEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public enum NavigationBehavior
-  {
-    None,
-    RowOnly,
-    CellOnly,
-    RowOrCell
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PagingBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PagingBehaviorEnum.cs
deleted file mode 100644
index 6c2f5a81..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PagingBehaviorEnum.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum PagingBehavior
-  {
-    TopToBottom,
-    LeftToRight
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PrimaryAxisEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PrimaryAxisEnum.cs
deleted file mode 100644
index 84c37689..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PrimaryAxisEnum.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum PrimaryAxis
-  {
-    Vertical,
-    Horizontal,
-    Both,
-    None
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PropertyRouteSegmentTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PropertyRouteSegmentTypeEnum.cs
deleted file mode 100644
index 506316aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PropertyRouteSegmentTypeEnum.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  internal enum PropertyRouteSegmentType : byte
-  {
-    Self,
-    Property,
-    Indexer,
-    Other,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollDirectionEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollDirectionEnum.cs
deleted file mode 100644
index 082fdf90..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollDirectionEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal enum ScrollDirection
-  {
-    None,
-    Backward,
-    Forward
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollOrientationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollOrientationEnum.cs
deleted file mode 100644
index cddd4165..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollOrientationEnum.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  [Flags]
-  public enum ScrollOrientation
-  {
-    None = 0,
-    Horizontal = 1,
-    Vertical = 2,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionBehaviorEnum.cs
deleted file mode 100644
index 5cec2603..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionBehaviorEnum.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  public enum SelectionBehavior
-  {
-    Default,
-    None,
-    All
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionUnitEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionUnitEnum.cs
deleted file mode 100644
index de69a0bd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionUnitEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum SelectionUnit
-  {
-    Row = 0,
-    Cell = 1 
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SortDirectionEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SortDirectionEnum.cs
deleted file mode 100644
index f1d536cd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SortDirectionEnum.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum SortDirection
-  {
-    None,
-    Ascending,
-    Descending,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ValidationModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ValidationModeEnum.cs
deleted file mode 100644
index 83d94ce6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ValidationModeEnum.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public enum ValidationMode
-  {
-    CellEndingEdit,
-    RowEndingEdit
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGesture.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGesture.cs
deleted file mode 100644
index 999bbed8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGesture.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public abstract class ActivationGesture : Freezable
-  {
-    internal ActivationGesture()
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGestureCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGestureCollection.cs
deleted file mode 100644
index 13062af9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGestureCollection.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.ObjectModel;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class ActivationGestureCollection: FreezableCollection<ActivationGesture>
-  {
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
deleted file mode 100644
index 819c4664..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-#region Using directives
-
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Windows;
-using System.Windows.Markup;
-
-#endregion
-
-// 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 Toolkit for WPF - DataGrid")]
-[assembly: AssemblyDescription("This assembly implements the Xceed.Wpf.DataGrid namespace, a data grid control for the Windows Presentation Framework.")]
-
-[assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct("Xceed Toolkit for WPF - DataGrid")]
-[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
-
-
-[assembly: CLSCompliant(true)]
-[assembly: ComVisible(false)]
-
-[assembly: XmlnsPrefix("http://schemas.xceed.com/wpf/xaml/datagrid", "xcdg")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Converters")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Markup")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.Views")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/datagrid", "Xceed.Wpf.DataGrid.ValidationRules")]
-
-
-[assembly: SecurityRules(SecurityRuleSet.Level1)]
-[assembly: AllowPartiallyTrustedCallers]
-
-//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)
-)]
-
-#pragma warning disable 1699
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile(@"sn.snk")]
-[assembly: AssemblyKeyName("")]
-#pragma warning restore 1699
-
-internal static class _XceedVersionInfo
-{
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-    public const string BaseVersion = "3.4";
-    [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";
-
-    public const string FrameworkVersion = "4.0.0.0";
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-    public const string DesignFullName =
-      "Xceed.Wpf.DataGrid,Version=" +
-      Version +
-      ",Culture=neutral,PublicKeyToken=" + PublicKeyToken;
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-    public const string CurrentAssemblyPackUri =
-      "pack://application:,,,/Xceed.Wpf.DataGrid,Version=" + Version;
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfoCommon.cs
deleted file mode 100644
index 3316fb13..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfoCommon.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid/AutoResetFlag.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoResetFlag.cs
deleted file mode 100644
index 412e166e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoResetFlag.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal abstract class AutoResetFlag
-  {
-    #region IsSet Property
-
-    public abstract bool IsSet
-    {
-      get;
-    }
-
-    #endregion
-
-    public abstract IDisposable Set();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoResetFlagFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoResetFlagFactory.cs
deleted file mode 100644
index 29221f10..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoResetFlagFactory.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class AutoResetFlagFactory
-  {
-    public static AutoResetFlag Create()
-    {
-      return AutoResetFlagFactory.Create( true );
-    }
-
-    public static AutoResetFlag Create( bool singleSet )
-    {
-      if( singleSet )
-        return new SingleAutoResetFlag();
-
-      return new MultiAutoResetFlag();
-    }
-
-    #region IAutoResetFlag Private Interface
-
-    private interface IAutoResetFlag
-    {
-      void Set();
-      void Unset();
-    }
-
-    #endregion
-
-    #region ResetFlagDisposable Private Class
-
-    private sealed class ResetFlagDisposable : IDisposable
-    {
-      internal ResetFlagDisposable( IAutoResetFlag target )
-      {
-        Debug.Assert( target != null );
-
-        m_target = target;
-        m_target.Set();
-      }
-
-      private void Dispose( bool disposing )
-      {
-        // The disposed method has already been called at least once.
-        var target = Interlocked.Exchange( ref m_target, null );
-        if( target == null )
-          return;
-
-        Debug.Assert( m_target == null );
-        Debug.Assert( target != null );
-
-        // We can only get here if this is the first call to Dispose.
-        target.Unset();
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      ~ResetFlagDisposable()
-      {
-        this.Dispose( false );
-      }
-
-      private IAutoResetFlag m_target;
-    }
-
-    #endregion
-
-    #region SingleAutoResetFlag Private Class
-
-    private sealed class SingleAutoResetFlag : AutoResetFlag, IAutoResetFlag
-    {
-      public override bool IsSet
-      {
-        get
-        {
-          return ( Interlocked.CompareExchange( ref m_isSet, null, null ) == this );
-        }
-      }
-
-      public override IDisposable Set()
-      {
-        return new ResetFlagDisposable( this );
-      }
-
-      void IAutoResetFlag.Set()
-      {
-        if( Interlocked.CompareExchange( ref m_isSet, this, null ) != null )
-          throw new InvalidOperationException( "The flag is already set." );
-      }
-
-      void IAutoResetFlag.Unset()
-      {
-        Interlocked.CompareExchange( ref m_isSet, null, this );
-      }
-
-      private object m_isSet; //null
-    }
-
-    #endregion
-
-    #region MultiAutoResetFlag Private Class
-
-    private sealed class MultiAutoResetFlag : AutoResetFlag, IAutoResetFlag
-    {
-      public override bool IsSet
-      {
-        get
-        {
-          return ( m_count > 0 );
-        }
-      }
-
-      public override IDisposable Set()
-      {
-        return new ResetFlagDisposable( this );
-      }
-
-      void IAutoResetFlag.Set()
-      {
-        Interlocked.Increment( ref m_count );
-      }
-
-      void IAutoResetFlag.Unset()
-      {
-        Interlocked.Decrement( ref m_count );
-      }
-
-      private int m_count; //0
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoScrollCurrentItemSourceTriggersRestrictions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoScrollCurrentItemSourceTriggersRestrictions.cs
deleted file mode 100644
index 0b95cf24..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AutoScrollCurrentItemSourceTriggersRestrictions.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal sealed class AutoScrollCurrentItemSourceTriggersRestrictions
-  {
-    #region Restrictions Property
-
-    internal AutoScrollCurrentItemSourceTriggers Restrictions
-    {
-      get
-      {
-        var result = AutoScrollCurrentItemSourceTriggers.None;
-
-        for( int i = m_restrictions.Count - 1; i >= 0; i-- )
-        {
-          var item = m_restrictions[ i ].Target as SingleRestriction;
-
-          if( item != null )
-          {
-            result |= item.Value;
-          }
-          else
-          {
-            m_restrictions.RemoveAt( i );
-          }
-        }
-
-        return result;
-      }
-    }
-
-    #endregion
-
-    internal IDisposable SetRestriction( AutoScrollCurrentItemSourceTriggers value )
-    {
-      var disposable = new SingleRestriction( value );
-
-      m_restrictions.Add( new WeakReference( disposable ) );
-
-      return disposable;
-    }
-
-    #region Private Fields
-
-    private readonly List<WeakReference> m_restrictions = new List<WeakReference>();
-
-    #endregion
-
-    #region SingleRestriction Private Class
-
-    private sealed class SingleRestriction : IDisposable
-    {
-      internal SingleRestriction( AutoScrollCurrentItemSourceTriggers value )
-      {
-        m_value = value;
-      }
-
-      internal AutoScrollCurrentItemSourceTriggers Value
-      {
-        get
-        {
-          return m_value;
-        }
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        m_value = AutoScrollCurrentItemSourceTriggers.None;
-      }
-
-      ~SingleRestriction()
-      {
-        this.Dispose( false );
-      }
-
-      private AutoScrollCurrentItemSourceTriggers m_value;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/BindingProxy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/BindingProxy.cs
deleted file mode 100644
index d8d3dd82..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/BindingProxy.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public class BindingProxy : Freezable
-  {
-    #region Value Property
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-      "Value",
-      typeof( object ),
-      typeof( BindingProxy ),
-      new UIPropertyMetadata( null ) );
-
-    public object Value
-    {
-      get
-      {
-        return this.GetValue( BindingProxy.ValueProperty );
-      }
-      set
-      {
-        this.SetValue( BindingProxy.ValueProperty, value );
-      }
-    }
-
-    #endregion
-
-    protected override Freezable CreateInstanceCore()
-    {
-      return new BindingProxy();
-    }
-
-    protected sealed override bool FreezeCore( bool isChecking )
-    {
-      // Only derived from Freezable to have DataContext and ElementName binding.
-      // So we don't want to be freezable.
-      return false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs
deleted file mode 100644
index 64490444..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs
+++ /dev/null
@@ -1,4568 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
-using System.Security;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Utils.Wpf;
-using Xceed.Wpf.DataGrid.Utils;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_CellContentPresenter", Type = typeof( ContentPresenter ) )]
-  public class Cell : ContentControl, INotifyPropertyChanged, IWeakEventListener
-  {
-    internal static readonly string FieldNamePropertyName = PropertyHelper.GetPropertyName( ( Cell c ) => c.FieldName );
-
-    // This validation rule is meant to be used as the rule in error set in a Cell's ValidationError when the CellEditor's HasError attached property returns true.
-    private static readonly CellEditorErrorValidationRule CellEditorErrorValidationRule = new CellEditorErrorValidationRule();
-
-    // This validation rule is meant to be used as the rule in error set in a Cell's ValidationError when
-    // we want to flag a validation error even though no binding's ValidationRules or CellValidationRules are invalid.
-    // ie: Cell EditEnding event throws or returns with e.Cancel set to True.
-    private static readonly PassthroughCellValidationRule CustomCellValidationExceptionValidationRule = new PassthroughCellValidationRule( new ExceptionValidationRule() );
-
-    static Cell()
-    {
-      Cell.ContentProperty.OverrideMetadata( typeof( Cell ),
-          new FrameworkPropertyMetadata( new PropertyChangedCallback( OnContentChanged ), new CoerceValueCallback( OnCoerceContent ) ) );
-
-      //This configures the TAB key to go trough the controls of the cell once... then continue with other controls
-      KeyboardNavigation.TabNavigationProperty.OverrideMetadata( typeof( Cell ), new FrameworkPropertyMetadata( KeyboardNavigationMode.None ) );
-
-      //This configures the directional keys to go trough the controls of the cell once... then continue with other controls
-      KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata( typeof( Cell ), new FrameworkPropertyMetadata( KeyboardNavigationMode.None ) );
-
-      ContentControl.HorizontalContentAlignmentProperty.OverrideMetadata( typeof( Cell ), new FrameworkPropertyMetadata( HorizontalAlignment.Stretch ) );
-
-      ContentControl.VerticalContentAlignmentProperty.OverrideMetadata( typeof( Cell ), new FrameworkPropertyMetadata( VerticalAlignment.Stretch ) );
-
-      Cell.ContentTemplateProperty.OverrideMetadata( typeof( Cell ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnContentTemplateChanged ) ) );
-
-      Cell.ContentTemplateSelectorProperty.OverrideMetadata( typeof( Cell ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnContentTemplateSelectorChanged ) ) );
-
-      Cell.IsCurrentProperty = Cell.IsCurrentPropertyKey.DependencyProperty;
-      Cell.IsSelectedProperty = Cell.IsSelectedPropertyKey.DependencyProperty;
-      Cell.ParentCellProperty = Cell.ParentCellPropertyKey.DependencyProperty;
-      Cell.ParentColumnProperty = Cell.ParentColumnPropertyKey.DependencyProperty;
-      Cell.ParentRowProperty = Cell.ParentRowPropertyKey.DependencyProperty;
-      Cell.CoercedContentTemplateProperty = Cell.CoercedContentTemplatePropertyKey.DependencyProperty;
-
-      //Editing stuff
-      DataGridControl.CellEditorDisplayConditionsProperty.OverrideMetadata( typeof( Cell ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( OnCellEditorDisplayConditionsChanged ) ) );
-
-      Cell.IsBeingEditedProperty = Cell.IsBeingEditedPropertyKey.DependencyProperty;
-      Cell.IsDirtyProperty = Cell.IsDirtyPropertyKey.DependencyProperty;
-
-      // We do this last to ensure all the Static content of the cell is done before using 
-      // any static read-only field of the row.
-      Cell.RowDisplayEditorMatchingConditionsProperty =
-        Row.RowDisplayEditorMatchingConditionsProperty.AddOwner( typeof( Cell ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( OnMatchingDisplayEditorChanged ) ) );
-
-      Cell.CellEditorContextProperty = Cell.CellEditorContextPropertyKey.DependencyProperty;
-
-      // Animated Column reordering Binding
-      Cell.ParentColumnTranslationBinding = new Binding();
-      Cell.ParentColumnTranslationBinding.Path = new PropertyPath( "ParentColumn.(0)", ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
-      Cell.ParentColumnTranslationBinding.Mode = BindingMode.OneWay;
-      Cell.ParentColumnTranslationBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      Cell.ParentColumnIsBeingDraggedBinding = new Binding();
-      Cell.ParentColumnIsBeingDraggedBinding.Path = new PropertyPath( "ParentColumn.(0)", TableflowView.IsBeingDraggedAnimatedProperty );
-      Cell.ParentColumnIsBeingDraggedBinding.Mode = BindingMode.OneWay;
-      Cell.ParentColumnIsBeingDraggedBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      Cell.ParentColumnReorderingDragSourceManagerBinding = new Binding();
-      Cell.ParentColumnReorderingDragSourceManagerBinding.Path = new PropertyPath( "ParentColumn.(0)", TableflowView.ColumnReorderingDragSourceManagerProperty );
-      Cell.ParentColumnReorderingDragSourceManagerBinding.Mode = BindingMode.OneWay;
-      Cell.ParentColumnReorderingDragSourceManagerBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      Cell.ParentRowCellContentOpacityBinding = new Binding();
-      Cell.ParentRowCellContentOpacityBinding.Path = new PropertyPath( "(0).(1)", Cell.ParentRowProperty, Row.CellContentOpacityProperty );
-      Cell.ParentRowCellContentOpacityBinding.Mode = BindingMode.OneWay;
-      Cell.ParentRowCellContentOpacityBinding.RelativeSource = new RelativeSource( RelativeSourceMode.TemplatedParent );
-
-      Row.IsTemplateCellProperty.OverrideMetadata( typeof( Cell ), new FrameworkPropertyMetadata( new PropertyChangedCallback( Cell.OnIsTemplateCellChanged ) ) );
-
-      EventManager.RegisterClassHandler( typeof( Cell ), FrameworkElement.RequestBringIntoViewEvent, new RequestBringIntoViewEventHandler( Cell.Cell_RequestBringIntoView ) );
-    }
-
-    public Cell()
-    {
-      this.SetParentCell();
-
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.BeginEdit,
-                                                      new ExecutedRoutedEventHandler( OnBeginEditExecuted ),
-                                                      new CanExecuteRoutedEventHandler( OnBeginEditCanExecute ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.CancelEdit,
-                                              new ExecutedRoutedEventHandler( OnCancelEditExecuted ),
-                                              new CanExecuteRoutedEventHandler( OnCancelEditCanExecute ) ) );
-
-      // Remove the error template by default.
-      this.SetValue( Validation.ErrorTemplateProperty, null );
-
-      Validation.AddErrorHandler( this, Cell.OnContentBindingNotifyValidationError );
-      this.TargetUpdated += new EventHandler<DataTransferEventArgs>( this.OnContentBindingTargetUpdated );
-      this.LayoutUpdated += new EventHandler( this.Cell_LayoutUpdated );
-    }
-
-    #region IsCellFocusScope Attached Property
-
-
-    public static readonly DependencyProperty IsCellFocusScopeProperty =
-        DependencyProperty.RegisterAttached( "IsCellFocusScope", typeof( bool ), typeof( Cell ), new UIPropertyMetadata( false ) );
-
-
-    public static bool GetIsCellFocusScope( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( Cell.IsCellFocusScopeProperty );
-    }
-
-
-    public static void SetIsCellFocusScope( DependencyObject obj, bool value )
-    {
-      obj.SetValue( Cell.IsCellFocusScopeProperty, value );
-    }
-
-    #endregion IsCellFocusScope Attached Property
-
-    #region ReadOnly Property
-
-    public static readonly DependencyProperty ReadOnlyProperty = DataGridControl.ReadOnlyProperty.AddOwner( typeof( Cell ) );
-
-    public bool ReadOnly
-    {
-      get
-      {
-        return ( bool )this.GetValue( Cell.ReadOnlyProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.ReadOnlyProperty, value );
-      }
-    }
-
-    #endregion ReadOnly Property
-
-    #region IsCurrent Read-Only Property
-
-    private static readonly DependencyPropertyKey IsCurrentPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsCurrent", typeof( bool ), typeof( Cell ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsCurrentProperty;
-
-    public bool IsCurrent
-    {
-      get
-      {
-        return ( bool )this.GetValue( Cell.IsCurrentProperty );
-      }
-    }
-
-    internal void SetIsCurrent( bool value )
-    {
-      if( value )
-      {
-        this.SetValue( Cell.IsCurrentPropertyKey, true );
-      }
-      else
-      {
-        this.SetValue( Cell.IsCurrentPropertyKey, DependencyProperty.UnsetValue );
-      }
-    }
-
-    #endregion IsCurrent Read-Only Property
-
-    #region IsSelected Read-Only Property
-
-    private static readonly DependencyPropertyKey IsSelectedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsSelected", typeof( bool ), typeof( Cell ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsSelectedProperty;
-
-    public bool IsSelected
-    {
-      get
-      {
-        return ( bool )this.GetValue( Cell.IsSelectedProperty );
-      }
-    }
-
-    internal void SetIsSelected( bool value )
-    {
-      if( this.IsSelected != value )
-      {
-        if( value )
-        {
-          this.SetValue( Cell.IsSelectedPropertyKey, value );
-        }
-        else
-        {
-          this.ClearValue( Cell.IsSelectedPropertyKey );
-        }
-      }
-    }
-
-    #endregion IsSelected Read-Only Property
-
-    #region IsBeingEdited Read-Only Property
-
-    private static readonly DependencyPropertyKey IsBeingEditedPropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsBeingEdited",
-      typeof( bool ),
-      typeof( Cell ),
-      new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsBeingEditedProperty;
-
-    internal static readonly RoutedEvent IsBeingEditedEvent = EventManager.RegisterRoutedEvent( "IsBeingEdited", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Cell ) );
-
-    public bool IsBeingEdited
-    {
-      get
-      {
-        return this.IsBeingEditedCache;
-      }
-    }
-
-    private void SetIsBeingEdited( bool value )
-    {
-      if( value != this.IsBeingEdited )
-      {
-        this.FocusEditor = false;
-        this.IsBeingEditedCache = value;
-
-        if( value )
-        {
-          this.SetValue( Cell.IsBeingEditedPropertyKey, true );
-        }
-        else
-        {
-          this.SetValue( Cell.IsBeingEditedPropertyKey, DependencyProperty.UnsetValue );
-        }
-
-        CellState cellState = this.GetEditCachedState();
-
-        if( cellState != null )
-        {
-          cellState.SetIsBeingEdited( value );
-        }
-
-        if( this.ParentRow.IsClearingContainer )
-          return;
-
-        //If cell is being edited
-        if( value )
-        {
-          //Raise the RoutedEvent that notifies any Row that the cell is being edited.
-          RoutedEventArgs eventArgs = new RoutedEventArgs( Cell.IsBeingEditedEvent );
-          this.RaiseEvent( eventArgs );
-          this.FocusEditor = true;
-        }
-
-        this.RefreshDisplayedTemplate();
-      }
-    }
-
-    #endregion IsBeingEdited Read-Only Property
-
-    #region IsDirty Read-Only Property
-
-    private static readonly DependencyPropertyKey IsDirtyPropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsDirty",
-      typeof( bool ),
-      typeof( Cell ),
-      new PropertyMetadata( false, new PropertyChangedCallback( Cell.OnIsDirtyChanged ) ) );
-
-    public static readonly DependencyProperty IsDirtyProperty;
-
-    internal static readonly RoutedEvent IsDirtyEvent = EventManager.RegisterRoutedEvent( "IsDirty", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Cell ) );
-
-    public bool IsDirty
-    {
-      get
-      {
-        return ( bool )this.GetValue( Cell.IsDirtyProperty );
-      }
-    }
-
-    internal void SetIsDirty( bool value )
-    {
-      if( value != this.IsDirty )
-      {
-        if( value )
-        {
-          this.SetValue( Cell.IsDirtyPropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Cell.IsDirtyPropertyKey, DependencyProperty.UnsetValue );
-        }
-
-        CellState cellState = this.GetEditCachedState();
-
-        if( cellState != null )
-        {
-          cellState.SetIsDirty( value );
-        }
-      }
-    }
-
-    #endregion IsDirty Read-Only Property
-
-    #region IsCellEditorDisplayed Read-Only Property
-
-    public bool IsCellEditorDisplayed
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsCellEditorDisplayed ];
-      }
-    }
-
-    private void SetIsCellEditorDisplayed( bool value )
-    {
-      if( value != this.IsCellEditorDisplayed )
-      {
-        m_flags[ ( int )CellFlags.IsCellEditorDisplayed ] = value;
-        this.OnPropertyChanged( "IsCellEditorDisplayed" );
-      }
-    }
-
-    #endregion IsCellEditorDisplayed Read-Only Property
-
-    #region CurrentBackground Property
-
-    public static readonly DependencyProperty CurrentBackgroundProperty = DependencyProperty.Register(
-      "CurrentBackground",
-      typeof( Brush ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public Brush CurrentBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Cell.CurrentBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.CurrentBackgroundProperty, value );
-      }
-    }
-
-    #endregion CurrentBackground Property
-
-    #region CurrentForeground Property
-
-    public static readonly DependencyProperty CurrentForegroundProperty =
-      DependencyProperty.Register( "CurrentForeground",
-      typeof( Brush ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public Brush CurrentForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Cell.CurrentForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.CurrentForegroundProperty, value );
-      }
-    }
-
-    #endregion CurrentForeground Property
-
-    #region CellValidationRules Property
-
-    public Collection<CellValidationRule> CellValidationRules
-    {
-      get
-      {
-        if( m_cellValidationRules == null )
-          m_cellValidationRules = new Collection<CellValidationRule>();
-
-        return m_cellValidationRules;
-      }
-    }
-
-    private Collection<CellValidationRule> m_cellValidationRules; // = null
-
-    #endregion CellValidationRules Property
-
-    #region CellErrorStyle Property
-
-    public static readonly DependencyProperty CellErrorStyleProperty = DataGridControl.CellErrorStyleProperty.AddOwner( typeof( Cell ) );
-
-    public Style CellErrorStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( Cell.CellErrorStyleProperty );
-      }
-
-      set
-      {
-        this.SetValue( Cell.CellErrorStyleProperty, value );
-      }
-    }
-
-    #endregion CellErrorStyle Property
-
-    #region HasValidationError Read-Only Property
-
-    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
-      "HasValidationError",
-      typeof( bool ),
-      typeof( Cell ),
-      new UIPropertyMetadata( false, new PropertyChangedCallback( Cell.OnHasValidationErrorChanged ) ) );
-
-    public static readonly DependencyProperty HasValidationErrorProperty = HasValidationErrorPropertyKey.DependencyProperty;
-
-    public bool HasValidationError
-    {
-      get
-      {
-        return ( bool )this.GetValue( Cell.HasValidationErrorProperty );
-      }
-    }
-
-    private void SetHasValidationError( bool value )
-    {
-      if( value != this.HasValidationError )
-      {
-        if( value )
-        {
-          this.SetValue( Cell.HasValidationErrorPropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Cell.HasValidationErrorPropertyKey, DependencyProperty.UnsetValue );
-        }
-      }
-    }
-
-    private static void OnHasValidationErrorChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      Cell cell = ( Cell )sender;
-
-      // If we are in the process of clearing the cell, don't refresh the error style.
-      // It is imperative to take care of resetting all the flags used by the DelayedRefreshErrorStyle architecture in the Cell's ClearContainer method though.
-      var parentRow = cell.ParentRow;
-      if( ( parentRow != null ) && parentRow.IsClearingContainer )
-        return;
-
-      // This flag is used to optimize the synchronization of error flags on the parent row/column so that it is done only once at the end of the UpdateHasErrorFlags method.
-      cell.HasPendingSyncParentErrorFlags = true;
-
-      if( cell.HasPendingErrorStyleRefresh )
-        return;
-
-      cell.HasPendingErrorStyleRefresh = true;
-
-      if( !cell.IsLoaded )
-      {
-        // If the cell isn't loaded, wait for the loaded event to dispatch the change of style.
-        System.Diagnostics.Debug.Assert( cell.m_loadedRoutedEventHandler == null );
-
-        cell.m_loadedRoutedEventHandler = new RoutedEventHandler( cell.Cell_Loaded );
-        cell.Loaded += cell.m_loadedRoutedEventHandler;
-        return;
-      }
-
-      cell.DelayRefreshErrorStyle();
-    }
-
-    private void DelayRefreshErrorStyle()
-    {
-      if( m_delayedRefreshErrorStyleDispatcherOperation != null )
-        return;
-
-      // Push on the dispatcher so that we prevent multiple affectation of Style when the binding is re-evaluated.
-      // Re-evaluating a binding causes it to clear all errors, then validate and finally sets the errors.
-      // By using the following strategy, we make sure of not affecting Style when it will change right afterward.
-      m_delayedRefreshErrorStyleDispatcherOperation = this.Dispatcher.BeginInvoke( DispatcherPriority.Render, new Action( this.DelayedRefreshErrorStyle ) );
-    }
-
-    private void AbortRefreshErrorStyle()
-    {
-      if( m_delayedRefreshErrorStyleDispatcherOperation == null )
-        return;
-
-      Debug.Assert( m_delayedRefreshErrorStyleDispatcherOperation.Status == DispatcherOperationStatus.Pending );
-      m_delayedRefreshErrorStyleDispatcherOperation.Abort();
-      m_delayedRefreshErrorStyleDispatcherOperation = null;
-    }
-
-    private void DelayedRefreshErrorStyle()
-    {
-      m_delayedRefreshErrorStyleDispatcherOperation = null;
-      System.Diagnostics.Debug.Assert( this.HasPendingErrorStyleRefresh, "The operation should have been aborted." );
-      System.Diagnostics.Debug.Assert( ( ( this.ParentRow != null ) && !this.ParentRow.IsClearingContainer ), "The operation should have been aborted." );
-
-      if( !this.IsLoaded )
-      {
-        // Such a sitation can occur when the cell is Loaded when OnHasErrorChanged is raised but unloaded without a ClearContainer afterward.
-        // Therefore, we need to push back the refreshing of the style to the cell's Loaded event.
-        System.Diagnostics.Debug.Assert( m_loadedRoutedEventHandler == null );
-
-        m_loadedRoutedEventHandler = new RoutedEventHandler( this.Cell_Loaded );
-        this.Loaded += m_loadedRoutedEventHandler;
-        return;
-      }
-
-      try
-      {
-        bool hasValidationError = this.HasValidationError;
-        bool shouldChangeStyle = ( this.IsErrorStyleApplied != hasValidationError );
-
-        if( shouldChangeStyle )
-        {
-          if( hasValidationError )
-          {
-            // Cache the normal style.
-            m_styleBeforeError = this.ReadLocalValue( Cell.StyleProperty );
-
-            //Apply the style.
-            Style errorStyle = this.GetInheritedErrorStyle();
-
-            if( errorStyle != null )
-            {
-              this.Style = errorStyle;
-              this.IsErrorStyleApplied = true;
-            }
-          }
-          else
-          {
-            // Revert to the normal style.
-            if( m_styleBeforeError == DependencyProperty.UnsetValue )
-            {
-              this.ClearValue( Cell.StyleProperty );
-            }
-            else
-            {
-              this.Style = m_styleBeforeError as Style;
-            }
-
-            this.IsErrorStyleApplied = false;
-          }
-        }
-      }
-      finally
-      {
-        this.HasPendingErrorStyleRefresh = false;
-      }
-    }
-
-    #endregion HasValidationError Read-Only Property
-
-    #region IsValidationErrorRestrictive Read-Only Property
-
-    private static readonly DependencyPropertyKey IsValidationErrorRestrictivePropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsValidationErrorRestrictive",
-      typeof( bool ),
-      typeof( Cell ),
-      new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsValidationErrorRestrictiveProperty = Cell.IsValidationErrorRestrictivePropertyKey.DependencyProperty;
-
-    public bool IsValidationErrorRestrictive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Cell.IsValidationErrorRestrictiveProperty );
-      }
-    }
-
-    private void SetIsValidationErrorRestrictive( bool value )
-    {
-      if( value != this.IsValidationErrorRestrictive )
-      {
-        if( value )
-        {
-          this.SetValue( Cell.IsValidationErrorRestrictivePropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Cell.IsValidationErrorRestrictivePropertyKey, DependencyProperty.UnsetValue );
-        }
-      }
-    }
-
-    private static void OnIsValidationErrorRestrictiveChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      Cell cell = ( Cell )sender;
-      cell.HasPendingSyncParentErrorFlags = true;
-    }
-
-    #endregion IsValidationErrorRestrictive Read-Only Property
-
-    #region ValidationError Read-Only Property
-
-    public static readonly RoutedEvent ValidationErrorChangingEvent =
-                  EventManager.RegisterRoutedEvent( "ValidationErrorChanging", RoutingStrategy.Bubble, typeof( CellValidationErrorRoutedEventHandler ), typeof( Cell ) );
-
-    public event CellValidationErrorRoutedEventHandler ValidationErrorChanging
-    {
-      add
-      {
-        base.AddHandler( Cell.ValidationErrorChangingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Cell.ValidationErrorChangingEvent, value );
-      }
-    }
-
-    protected virtual void OnValidationErrorChanging( CellValidationErrorRoutedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    private static readonly DependencyPropertyKey ValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ValidationError",
-      typeof( CellValidationError ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( Cell.OnValidationErrorChanged ), new CoerceValueCallback( Cell.OnCoerceValidationError ) ) );
-
-    public static readonly DependencyProperty ValidationErrorProperty = ValidationErrorPropertyKey.DependencyProperty;
-
-    public CellValidationError ValidationError
-    {
-      get
-      {
-        return ( CellValidationError )this.GetValue( Cell.ValidationErrorProperty );
-      }
-    }
-
-    private static object OnCoerceValidationError( DependencyObject sender, object value )
-    {
-      if( value == null )
-        return value;
-
-      Cell cell = ( Cell )sender;
-
-      CellValidationErrorRoutedEventArgs cellValidationErrorRoutedEventArgs =
-        new CellValidationErrorRoutedEventArgs( Cell.ValidationErrorChangingEvent, cell, ( CellValidationError )value );
-
-      cell.OnValidationErrorChanging( cellValidationErrorRoutedEventArgs );
-
-      return cellValidationErrorRoutedEventArgs.CellValidationError;
-    }
-
-    private static void OnValidationErrorChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      Cell cell = ( Cell )sender;
-
-      CellValidationError newCellValidationError = e.NewValue as CellValidationError;
-
-      // Update the flags telling us wether or not the current validation error is CellEditor error, or a UI error and update the HasValidationError dependency property.
-      cell.UpdateHasErrorFlags( newCellValidationError );
-
-      // Refresh which content template is displayed (editTemplate or not) in case there was a CellEditor validation error on the cell and now there isn't one anymore.
-      cell.RefreshDisplayedTemplate();
-    }
-
-    private void UpdateHasErrorFlags( CellValidationError cellValidationError )
-    {
-      bool hasValidationError = ( cellValidationError != null );
-
-      try
-      {
-        if( hasValidationError )
-        {
-          this.HasCellEditorError = Cell.GetIsCellEditorError( cellValidationError );
-          this.HasUIValidationError = Cell.GetIsUIValidationError( cellValidationError );
-          this.HasContentBindingValidationError = Cell.GetIsContentBindingValidationError( cellValidationError );
-
-          this.SetIsValidationErrorRestrictive( Cell.GetIsValidationErrorRestrictive( cellValidationError ) );
-
-          this.SetHasValidationError( true );
-        }
-        else
-        {
-          this.HasCellEditorError = false;
-          this.HasUIValidationError = false;
-          this.HasContentBindingValidationError = false;
-
-          this.SetIsValidationErrorRestrictive( false );
-
-          this.SetHasValidationError( false );
-        }
-
-        // This flag is raised in the PropertyChanged callbacks of the Has_X_Error properties in order to
-        // minimize the calls to the cell's parent row's UpdateHasErrorFlags method.
-        if( this.HasPendingSyncParentErrorFlags )
-        {
-          ColumnBase column = this.ParentColumn;
-
-          if( column != null )
-          {
-            column.SetHasValidationError( hasValidationError );
-          }
-
-          Row row = this.ParentRow;
-
-          if( row != null )
-          {
-            row.UpdateHasErrorFlags( this );
-          }
-        }
-      }
-      finally
-      {
-        this.HasPendingSyncParentErrorFlags = false;
-      }
-    }
-
-    internal void SetValidationError( CellValidationError value )
-    {
-      if( value != this.ValidationError )
-      {
-        if( value != null )
-        {
-          this.SetValue( Cell.ValidationErrorPropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Cell.ValidationErrorPropertyKey, DependencyProperty.UnsetValue );
-        }
-
-        CellState cellState = this.GetEditCachedState();
-
-        if( cellState != null )
-        {
-          cellState.SetCellValidationError( value );
-        }
-      }
-    }
-
-    #endregion ValidationError Read-Only Property
-
-    #region RowDisplayEditorMatchingConditions Property
-
-    private static readonly DependencyProperty RowDisplayEditorMatchingConditionsProperty;
-
-    #endregion RowDisplayEditorMatchingConditions Property
-
-    #region CellDisplayEditorMatchingConditions Property
-
-    private static readonly DependencyProperty CellDisplayEditorMatchingConditionsProperty = DependencyProperty.Register(
-      "CellDisplayEditorMatchingConditions",
-      typeof( CellEditorDisplayConditions ),
-      typeof( Cell ),
-      new UIPropertyMetadata( CellEditorDisplayConditions.None, new PropertyChangedCallback( OnMatchingDisplayEditorChanged ) ) );
-
-    internal void SetDisplayEditorMatchingCondition( CellEditorDisplayConditions condition )
-    {
-      CellEditorDisplayConditions previousValue = ( CellEditorDisplayConditions )this.GetValue( Cell.CellDisplayEditorMatchingConditionsProperty );
-
-      previousValue = previousValue | condition;
-
-      this.SetValue( Cell.CellDisplayEditorMatchingConditionsProperty, previousValue );
-    }
-
-    internal void RemoveDisplayEditorMatchingCondition( CellEditorDisplayConditions condition )
-    {
-      CellEditorDisplayConditions previousValue = ( CellEditorDisplayConditions )this.GetValue( Cell.CellDisplayEditorMatchingConditionsProperty );
-
-      previousValue = previousValue & ~condition;
-
-      this.SetValue( Cell.CellDisplayEditorMatchingConditionsProperty, previousValue );
-    }
-
-    #endregion CellDisplayEditorMatchingConditions Property
-
-    #region ShouldDisplayEditor Property
-
-    private bool ShouldDisplayEditor
-    {
-      get
-      {
-        if( this.GetRealDataContext() is EmptyDataItem )
-          return false;
-
-        // If the cell is considered read-only, the EditTemplate should never be displayed.
-        if( this.GetInheritedReadOnly() )
-          return false;
-
-        // If the cell currently has a restrictive error, the EditTemplate should always be displayed.
-        if( Cell.GetIsValidationErrorRestrictive( this.ValidationError ) )
-          return true;
-
-        CellEditor cellEditor = this.GetCellEditor();
-
-        // If no cell editor is retrieved, we don't even have an edit template to display.
-        if( cellEditor == null )
-          return false;
-
-        //Retrieve the matching display conditions from both the Row and the Cell
-        CellEditorDisplayConditions rowValue = ( CellEditorDisplayConditions )this.GetValue( Cell.RowDisplayEditorMatchingConditionsProperty );
-        CellEditorDisplayConditions cellValue = ( CellEditorDisplayConditions )this.GetValue( Cell.CellDisplayEditorMatchingConditionsProperty );
-
-        //If there is at least one "matching conditions"
-        if( ( rowValue | cellValue ) != CellEditorDisplayConditions.None )
-          return true;
-
-        CellEditorDisplayConditions cellEditorDisplayConditions = this.CellEditorDisplayConditions;
-
-        // We always want to display the editor if it is set on the ParentColumn.CellEditorDisplayConditions are Always
-        if( ( cellEditorDisplayConditions & CellEditorDisplayConditions.Always ) == CellEditorDisplayConditions.Always )
-          return true;
-
-        Row parentRow = this.ParentRow;
-
-        if( parentRow == null )
-          return false;
-
-        // this.CellEditorDisplayConditions will get the value set on ParentColumn if any in case it was explicitly set
-        if( parentRow.IsMouseOver && ( ( cellEditorDisplayConditions & CellEditorDisplayConditions.MouseOverRow ) == CellEditorDisplayConditions.MouseOverRow ) )
-          return true;
-
-        if( parentRow.IsBeingEdited && ( ( cellEditorDisplayConditions & CellEditorDisplayConditions.RowIsBeingEdited ) == CellEditorDisplayConditions.RowIsBeingEdited ) )
-          return true;
-
-        if( parentRow.IsCurrent && ( ( cellEditorDisplayConditions & CellEditorDisplayConditions.RowIsCurrent ) == CellEditorDisplayConditions.RowIsCurrent ) )
-          return true;
-
-        // If the cell is being edited, the edit template should be displayed.
-        return this.IsBeingEdited;
-      }
-    }
-
-    #endregion
-
-    #region CellEditorDisplayConditions Property
-
-    internal CellEditorDisplayConditions CellEditorDisplayConditions
-    {
-      get
-      {
-
-        //Read the Value of the Parent column
-        object propertyValue = DependencyProperty.UnsetValue;
-        ColumnBase parentColumn = this.ParentColumn;
-
-        if( parentColumn != null )
-        {
-          propertyValue = parentColumn.ReadLocalValue( DataGridControl.CellEditorDisplayConditionsProperty );
-
-          // In case we have a BindingExpression, we need to get the resulting value.
-          if( propertyValue is BindingExpressionBase )
-            propertyValue = parentColumn.CellEditorDisplayConditions;
-        }
-
-        //If the ParentColumn has no value defined for the CellEditorDisplayConditions DP,
-        if( propertyValue == DependencyProperty.UnsetValue )
-        {
-          //Then interrogate the ParentRow
-          propertyValue = this.GetValue( DataGridControl.CellEditorDisplayConditionsProperty );
-        }
-
-        return ( CellEditorDisplayConditions )propertyValue;
-      }
-    }
-
-    #endregion
-
-    #region ParentCell Property
-
-    private static readonly DependencyPropertyKey ParentCellPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "ParentCell",
-      typeof( Cell ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static readonly DependencyProperty ParentCellProperty;
-
-    private void SetParentCell()
-    {
-      this.SetValue( Cell.ParentCellPropertyKey, this );
-    }
-
-    #endregion ParentCell Property
-
-    #region ParentColumn Read-Only Property
-
-    private static readonly DependencyPropertyKey ParentColumnPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ParentColumn",
-      typeof( ColumnBase ),
-      typeof( Cell ),
-      new PropertyMetadata( null, new PropertyChangedCallback( Cell.OnParentColumnChanged ) ) );
-
-    public static readonly DependencyProperty ParentColumnProperty;
-
-    public ColumnBase ParentColumn
-    {
-      get
-      {
-        return ( ColumnBase )this.GetValue( Cell.ParentColumnProperty );
-      }
-      private set
-      {
-        this.SetValue( Cell.ParentColumnPropertyKey, value );
-      }
-    }
-
-    internal virtual void OnParentColumnChanged( ColumnBase oldColumn, ColumnBase newColumn )
-    {
-      if( oldColumn != null )
-      {
-        PropertyChangedEventManager.RemoveListener( oldColumn, this, string.Empty );
-      }
-
-      if( newColumn != null )
-      {
-        PropertyChangedEventManager.AddListener( newColumn, this, string.Empty );
-      }
-
-      this.UpdateFocusable();
-    }
-
-    private static void OnParentColumnChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as Cell;
-      if( self == null )
-        return;
-
-      self.OnParentColumnChanged( ( ColumnBase )e.OldValue, ( ColumnBase )e.NewValue );
-
-      // Since Cell.FieldName in fact returns Cell.ParentColumn.FieldName, a PropertyChanged corresponding to FieldName must be raised when the ParentColumn has changed.
-      self.OnPropertyChanged( Cell.FieldNamePropertyName );
-    }
-
-    #endregion
-
-    #region ParentRow Read-Only Property
-
-    private static readonly DependencyPropertyKey ParentRowPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ParentRow",
-      typeof( Row ),
-      typeof( Cell ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty ParentRowProperty;
-
-    public Row ParentRow
-    {
-      get
-      {
-        return ( Row )this.GetValue( Cell.ParentRowProperty );
-      }
-      private set
-      {
-        this.SetValue( Cell.ParentRowPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region FieldName Property
-
-    public string FieldName
-    {
-      get
-      {
-        ColumnBase parentColumn = this.ParentColumn;
-
-        if( parentColumn != null )
-          return parentColumn.FieldName;
-
-        return m_fieldName;
-      }
-      set
-      {
-        ColumnBase parentColumn = this.ParentColumn;
-
-        if( parentColumn != null )
-          throw new InvalidOperationException( "An attempt was made to change the FieldName of a cell already associated with a column." );
-
-        m_fieldName = value;
-        this.OnPropertyChanged( Cell.FieldNamePropertyName );
-      }
-    }
-
-    private void SetFieldName( string fieldName )
-    {
-      m_fieldName = fieldName;
-    }
-
-    #endregion FieldName Property
-
-    #region CoercedContentTemplate Property
-
-    private static readonly DependencyPropertyKey CoercedContentTemplatePropertyKey = DependencyProperty.RegisterReadOnly(
-      "CoercedContentTemplate",
-      typeof( DataTemplate ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty CoercedContentTemplateProperty;
-
-    public DataTemplate CoercedContentTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( Cell.CoercedContentTemplateProperty );
-      }
-    }
-
-    private void SetCoercedContentTemplate( DataTemplate viewerTemplate, DataTemplate editorTemplate )
-    {
-      var contentTemplate = this.CoercedContentTemplate;
-      var editorDataTemplate = contentTemplate as EditorDataTemplate;
-
-      if( editorDataTemplate != null )
-      {
-        if( ( editorDataTemplate.Viewer == viewerTemplate ) && ( editorDataTemplate.Editor == editorTemplate ) )
-          return;
-      }
-      else if( editorTemplate == null )
-      {
-        if( contentTemplate == viewerTemplate )
-          return;
-      }
-
-      var newContentTemplate = ( editorTemplate != null )
-                                 ? EditorDataTemplate.Create( viewerTemplate, editorTemplate )
-                                 : viewerTemplate;
-
-      this.SetValue( Cell.CoercedContentTemplatePropertyKey, newContentTemplate );
-    }
-
-    private void UpdateCoercedContentTemplate( bool force )
-    {
-      if( force || this.IsContainerPrepared )
-      {
-        this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), null );
-      }
-    }
-
-    #endregion
-
-    #region ContentTemplateInternal Property (private)
-
-    private DataTemplate ContentTemplateInternal
-    {
-      get
-      {
-        if( m_contentTemplateCache == Cell.NotInitializedDataTemplate )
-        {
-          m_contentTemplateCache = this.GetValue( Cell.ContentTemplateProperty ) as DataTemplate;
-        }
-        return m_contentTemplateCache;
-      }
-    }
-
-    private static readonly DataTemplate NotInitializedDataTemplate = new DataTemplate();
-
-    private DataTemplate m_contentTemplateCache = Cell.NotInitializedDataTemplate;
-
-    #endregion
-
-    #region ContentTemplateSelectorInternal Property (private)
-
-    private DataTemplateSelector ContentTemplateSelectorInternal
-    {
-      get
-      {
-        if( m_contentTemplateSelectorCache == NotInitializedSelector )
-        {
-          m_contentTemplateSelectorCache = this.GetValue( Cell.ContentTemplateSelectorProperty ) as DataTemplateSelector;
-        }
-        return m_contentTemplateSelectorCache;
-      }
-    }
-
-    private static readonly DataTemplateSelector NotInitializedSelector = new DataTemplateSelector();
-
-    private DataTemplateSelector m_contentTemplateSelectorCache = Cell.NotInitializedSelector;
-
-    #endregion
-
-    #region OverrideColumnCellContentTemplate Property (protected virtual)
-
-    protected virtual bool OverrideColumnCellContentTemplate
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region CellEditorContext Attached Property
-
-    private static readonly DependencyPropertyKey CellEditorContextPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "CellEditorContext", typeof( CellEditorContext ), typeof( Cell ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static readonly DependencyProperty CellEditorContextProperty;
-
-    public static CellEditorContext GetCellEditorContext( DependencyObject obj )
-    {
-      return ( CellEditorContext )obj.GetValue( Cell.CellEditorContextProperty );
-    }
-
-    private static void SetCellEditorContext( DependencyObject obj, CellEditorContext value )
-    {
-      obj.SetValue( Cell.CellEditorContextPropertyKey, value );
-    }
-
-    internal static void ClearCellEditorContext( DependencyObject obj )
-    {
-      obj.ClearValue( Cell.CellEditorContextPropertyKey );
-    }
-
-    #endregion
-
-    #region ParentColumnIsBeingDragged Private Property
-
-    private static readonly DependencyProperty ParentColumnIsBeingDraggedProperty = DependencyProperty.Register(
-      "ParentColumnIsBeingDragged",
-      typeof( bool ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata(
-        ( bool )false,
-        new PropertyChangedCallback( Cell.OnParentColumnIsBeingDraggedChanged ),
-        new CoerceValueCallback( Cell.OnCoerceParentColumnIsBeingDragged ) ) );
-
-    private bool ParentColumnIsBeingDragged
-    {
-      get
-      {
-        return ( bool )this.GetValue( Cell.ParentColumnIsBeingDraggedProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.ParentColumnIsBeingDraggedProperty, value );
-      }
-    }
-
-    private static void OnParentColumnIsBeingDraggedChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = ( Cell )sender;
-      Debug.Assert( self != null );
-
-      var row = self.ParentRow;
-      if( row == null )
-        return;
-
-      var fixedCellPanel = row.CellsHostPanel as FixedCellPanel;
-      if( fixedCellPanel == null )
-        return;
-
-      if( ( bool )e.NewValue )
-      {
-        fixedCellPanel.ChangeCellZOrder( self, fixedCellPanel.Children.Count );
-      }
-      else
-      {
-        fixedCellPanel.ClearCellZOrder( self );
-      }
-    }
-
-    private static object OnCoerceParentColumnIsBeingDragged( DependencyObject sender, object newValue )
-    {
-      var self = ( Cell )sender;
-      Debug.Assert( self != null );
-
-      var parentColumn = self.ParentColumn;
-      if( parentColumn == null )
-        return newValue;
-
-      var manager = TableflowView.GetColumnReorderingDragSourceManager( parentColumn );
-      if( manager == null )
-        return newValue;
-
-      if( ( bool )newValue )
-      {
-        self.AddDraggedColumnGhost( manager, true );
-      }
-      else
-      {
-        self.RemoveDraggedColumnGhost( manager );
-      }
-
-      return newValue;
-    }
-
-    #endregion
-
-    #region ParentColumnReorderingDragSourceManager Property
-
-    internal static readonly DependencyProperty ParentColumnReorderingDragSourceManagerProperty = DependencyProperty.Register(
-      "ParentColumnReorderingDragSourceManager",
-      typeof( ColumnReorderingDragSourceManager ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( Cell.OnParentColumnReorderingDragSourceManagerChanged ) ) );
-
-    internal ColumnReorderingDragSourceManager ParentColumnReorderingDragSourceManager
-    {
-      get
-      {
-        return ( ColumnReorderingDragSourceManager )this.GetValue( Cell.ParentColumnReorderingDragSourceManagerProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.ParentColumnReorderingDragSourceManagerProperty, value );
-      }
-    }
-
-    private static void OnParentColumnReorderingDragSourceManagerChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as Cell;
-      Debug.Assert( self != null );
-
-      var oldManager = ( ColumnReorderingDragSourceManager )e.OldValue;
-      var newManager = ( ColumnReorderingDragSourceManager )e.NewValue;
-
-      if( ( oldManager != null ) && ( newManager != null ) )
-      {
-        self.RemoveDraggedColumnGhost( oldManager );
-        self.AddDraggedColumnGhost( newManager, self.ParentColumnIsBeingDragged );
-      }
-    }
-
-    #endregion
-
-    #region SelectionBackground Property
-
-    public static readonly DependencyProperty SelectionBackgroundProperty = DependencyProperty.Register(
-      "SelectionBackground",
-      typeof( Brush ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public Brush SelectionBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Cell.SelectionBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.SelectionBackgroundProperty, value );
-      }
-    }
-
-    #endregion SelectionBackground Property
-
-    #region SelectionForeground Property
-
-    public static readonly DependencyProperty SelectionForegroundProperty = DependencyProperty.Register(
-      "SelectionForeground",
-      typeof( Brush ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public Brush SelectionForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Cell.SelectionForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.SelectionForegroundProperty, value );
-      }
-    }
-
-    #endregion SelectionForeground Property
-
-    #region InactiveSelectionBackground Property
-
-    public static readonly DependencyProperty InactiveSelectionBackgroundProperty = DependencyProperty.Register(
-      "InactiveSelectionBackground",
-      typeof( Brush ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public Brush InactiveSelectionBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Cell.InactiveSelectionBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.InactiveSelectionBackgroundProperty, value );
-      }
-    }
-
-    #endregion InactiveSelectionBackground Property
-
-    #region InactiveSelectionForeground Property
-
-    public static readonly DependencyProperty InactiveSelectionForegroundProperty = DependencyProperty.Register(
-      "InactiveSelectionForeground",
-      typeof( Brush ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public Brush InactiveSelectionForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Cell.InactiveSelectionForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.InactiveSelectionForegroundProperty, value );
-      }
-    }
-
-    #endregion InactiveSelectionForeground Property
-
-    #region ParentForeground Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty ParentForegroundProperty = DependencyProperty.Register(
-      "ParentForeground",
-      typeof( Brush ),
-      typeof( Cell ),
-      new FrameworkPropertyMetadata( TextElement.ForegroundProperty.DefaultMetadata.DefaultValue ) );
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public Brush ParentForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Cell.ParentForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( Cell.ParentForegroundProperty, value );
-      }
-    }
-
-    private void UpdateParentForeground()
-    {
-      // Use the visual parent when there is no logical parent.
-      var parent = LogicalTreeHelper.GetParent( this ) ?? VisualTreeHelper.GetParent( this );
-
-      if( parent != null )
-      {
-        var binding = new Binding();
-        binding.Path = new PropertyPath( TextElement.ForegroundProperty );
-        binding.Source = parent;
-
-        this.SetBinding( Cell.ParentForegroundProperty, binding );
-      }
-      else
-      {
-        this.ClearValue( Cell.ParentForegroundProperty );
-      }
-    }
-
-    #endregion ParentForeground Property
-
-    #region IsInternalyInitialized Property
-
-    internal bool IsInternalyInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsInternalyInitialized ];
-      }
-      private set
-      {
-        m_flags[ ( int )CellFlags.IsInternalyInitialized ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsContainerPrepared Property
-
-    internal bool IsContainerPrepared
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsContainerPrepared ];
-      }
-      private set
-      {
-        m_flags[ ( int )CellFlags.IsContainerPrepared ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsContainerVirtualized Property
-
-    internal bool IsContainerVirtualized
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsContainerVirtualized ];
-      }
-      private set
-      {
-        m_flags[ ( int )CellFlags.IsContainerVirtualized ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsContainerRecycled Property
-
-    internal bool IsContainerRecycled
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsContainerRecycled ];
-      }
-      private set
-      {
-        m_flags[ ( int )CellFlags.IsContainerRecycled ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsContainerPartiallyCleared Property
-
-    internal bool IsContainerPartiallyCleared
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsContainerPartiallyCleared ];
-      }
-      private set
-      {
-        m_flags[ ( int )CellFlags.IsContainerPartiallyCleared ] = value;
-      }
-    }
-
-    #endregion
-
-    #region CanBeRecycled Property
-
-    protected internal virtual bool CanBeRecycled
-    {
-      get
-      {
-        if( !this.IsErrorStyleApplied )
-        {
-          // We should not recycle the cell if the user has set a style or template explicitly.
-          if( Cell.IsValueSourceHazardingCellRecycling( DependencyPropertyHelper.GetValueSource( this, Cell.StyleProperty ) )
-            || Cell.IsValueSourceHazardingCellRecycling( DependencyPropertyHelper.GetValueSource( this, Cell.TemplateProperty ) ) )
-            return false;
-        }
-        else if( m_styleBeforeError != DependencyProperty.UnsetValue )
-        {
-          // The regular style has been set by the user.
-          return false;
-        }
-
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region CanBeCollapsed Property
-
-    internal virtual bool CanBeCollapsed
-    {
-      get
-      {
-        if( this.IsCurrent || this.IsDirty || this.HasValidationError || this.IsBeingEdited || this.IsKeyboardFocused || this.IsKeyboardFocusWithin )
-          return false;
-
-        var parentColumn = this.ParentColumn;
-        if( parentColumn == null )
-          return true;
-
-        return !TableflowView.GetIsBeingDraggedAnimated( parentColumn );
-      }
-    }
-
-    #endregion
-
-    #region FocusEditor Property
-
-    private bool FocusEditor
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.FocusEditor ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.FocusEditor ] = value;
-      }
-    }
-
-    #endregion
-
-    #region PreventValidateAndSetAllErrors Property
-
-    private bool PreventValidateAndSetAllErrors
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.PreventValidateAndSetAllErrors ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.PreventValidateAndSetAllErrors ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsBeingEditedCache Property
-
-    private bool IsBeingEditedCache
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsBeingEdited ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.IsBeingEdited ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasCellEditorError Property
-
-    internal bool HasCellEditorError
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.HasCellEditorError ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.HasCellEditorError ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasUIValidationError Property
-
-    private bool HasUIValidationError
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.HasUIValidationError ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.HasUIValidationError ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasContentBindingValidationError Property
-
-    private bool HasContentBindingValidationError
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.HasContentBindingValidationError ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.HasContentBindingValidationError ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasPendingErrorStyleRefresh Property
-
-    private bool HasPendingErrorStyleRefresh
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.HasPendingErrorStyleRefresh ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.HasPendingErrorStyleRefresh ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsErrorStyleApplied Property
-
-    private bool IsErrorStyleApplied
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsErrorStyleApplied ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.IsErrorStyleApplied ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingContentBindingSource Property
-
-    private bool IsUpdatingContentBindingSource
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsUpdatingContentBindingSource ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.IsUpdatingContentBindingSource ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsInCascadingValidation Property
-
-    private bool IsInCascadingValidation
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsInCascadingValidation ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.IsInCascadingValidation ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasPendingSyncParentErrorFlags Property
-
-    private bool HasPendingSyncParentErrorFlags
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.HasPendingSyncParentErrorFlags ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.HasPendingSyncParentErrorFlags ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsRestoringEditionState Property
-
-    private bool IsRestoringEditionState
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.IsRestoringEditionState ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.IsRestoringEditionState ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AnimatedColumnReorderingBindingApplied Property
-
-    private bool AnimatedColumnReorderingBindingApplied
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.AnimatedColumnReorderingBindingApplied ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.AnimatedColumnReorderingBindingApplied ] = value;
-      }
-    }
-
-    #endregion
-
-    #region PreventMakeVisible Property
-
-    private bool PreventMakeVisible
-    {
-      get
-      {
-        return m_flags[ ( int )CellFlags.PreventMakeVisible ];
-      }
-      set
-      {
-        m_flags[ ( int )CellFlags.PreventMakeVisible ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ResetNonTransientFlags Property
-
-    private void ResetNonTransientFlags()
-    {
-      m_flags = new BitVector32( m_flags.Data & ( int )( CellFlags.IsInternalyInitialized ) );
-
-      if( !this.HasPendingErrorStyleRefresh )
-      {
-        this.AbortRefreshErrorStyle();
-      }
-    }
-
-    #endregion
-
-    #region HasAliveContentBinding
-
-    protected internal virtual bool HasAliveContentBinding
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    public static Cell FindFromChild( DependencyObject child )
-    {
-      return Cell.FindFromChild( ( DataGridContext )null, child );
-    }
-
-    public static Cell FindFromChild( DataGridContext dataGridContext, DependencyObject child )
-    {
-      // In this situation, the dataGridContext is the DataGridContext of the Cell to find.
-      // Useful when a grid is used as a Cell editor and want the Cell for a specific DataGridContext.
-      if( child == null )
-        return null;
-
-      Cell cell = null;
-
-      while( ( cell == null ) && ( child != null ) )
-      {
-        child = TreeHelper.GetParent( child );
-        cell = child as Cell;
-
-        if( ( cell != null )
-          && ( dataGridContext != null )
-          && ( dataGridContext != DataGridControl.GetDataGridContext( cell ) ) )
-        {
-          cell = null;
-        }
-      }
-
-      return cell;
-    }
-
-    public static Cell FindFromChild( DataGridControl dataGridControl, DependencyObject child )
-    {
-      // In this situation, the dataGridControl is the DataGridControl of the Cell to find.
-      // Useful when a grid is used as a Cell editor and want the Cell for a specific DataGridControl.
-      if( child == null )
-        return null;
-
-      Cell cell = null;
-
-      while( ( cell == null ) && ( child != null ) )
-      {
-        child = TreeHelper.GetParent( child );
-        cell = child as Cell;
-
-        if( ( cell != null ) && ( dataGridControl != null ) )
-        {
-          DataGridContext tempDataGridContext = DataGridControl.GetDataGridContext( cell );
-
-          if( ( tempDataGridContext == null ) || ( tempDataGridContext.DataGridControl != dataGridControl ) )
-          {
-            cell = null;
-          }
-        }
-      }
-
-      return cell;
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( m_cellContentPresenter != null )
-      {
-        BindingOperations.ClearBinding( m_cellContentPresenter, UIElement.OpacityProperty );
-      }
-
-      m_cellContentPresenter = this.GetTemplateChild( "PART_CellContentPresenter" ) as ContentPresenter;
-
-      if( m_cellContentPresenter != null )
-      {
-        BindingOperations.SetBinding( m_cellContentPresenter, UIElement.OpacityProperty, Cell.ParentRowCellContentOpacityBinding );
-      }
-    }
-
-    public override string ToString()
-    {
-      string fieldName = this.FieldName;
-      object content = this.Content;
-      string cellType = string.Empty;
-
-      Type type = this.GetType();
-
-      if( type != null )
-        cellType = type.ToString();
-
-      try
-      {
-        return String.Format( "{0} : FieldName = {1}, Content = {2}", cellType, ( fieldName != null ) ? fieldName : "", ( content != null ) ? content.ToString() : "null" );
-      }
-      catch( Exception )
-      {
-        return base.ToString();
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate" )]
-    public double GetFittedWidth()
-    {
-      if( !this.IsContainerPrepared || this.IsContainerVirtualized )
-        return -1d;
-
-      this.ApplyTemplate();
-
-      var child = ( this.VisualChildrenCount > 0 ) ? this.GetVisualChild( 0 ) as UIElement : null;
-      if( child == null )
-        return -1d;
-
-      child.Measure( new Size( double.PositiveInfinity, this.ActualHeight ) );
-
-      return child.DesiredSize.Width;
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      base.OnMouseLeftButtonDown( e );
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      dataGridContext.DataGridControl.ResetDragDataObject();
-
-      if( e.Handled )
-        return;
-
-      Row parentRow = this.ParentRow;
-      ColumnBase parentColumn = this.ParentColumn;
-
-      if( ( parentRow != null ) && ( parentColumn != null )
-        && ( parentRow.NavigationBehavior != NavigationBehavior.None )
-        && ( parentRow.NavigationBehavior != NavigationBehavior.RowOnly ) )
-      {
-        bool wasAlreadyCurrent = this.IsCurrent;
-
-        if( !this.GetCalculatedCanBeCurrent() )
-        {
-          if( ( this.ParentRow == dataGridContext.CurrentRow ) && ( this.ParentRow.NavigationBehavior == NavigationBehavior.RowOrCell ) )
-          {
-            try
-            {
-              dataGridContext.SetCurrentColumnCore( null, true, false, AutoScrollCurrentItemSourceTriggers.Navigation );
-            }
-            catch( DataGridException )
-            {
-              // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-              // any other GridException.
-            }
-          }
-
-          return;
-        }
-
-        bool focused = this.Focus();
-        e.Handled = true;
-
-        if( !focused )
-          return;
-
-        // Keep a reference to the mouse position so we can calculate when a drag operation is actually started.
-        dataGridContext.DataGridControl.InitializeDragPostion( e );
-
-        //only process the SingleClick and ClickOnCurrentCell edit triggers if the CTRL or the SHIFT key is not pressed.
-        if( ( ( Keyboard.Modifiers & ModifierKeys.Control ) != ModifierKeys.Control )
-          && ( ( Keyboard.Modifiers & ModifierKeys.Shift ) != ModifierKeys.Shift ) )
-        {
-          bool readOnly = this.GetInheritedReadOnly();
-
-          if( readOnly )
-            return;
-
-          //If grid is configured for SingleClickEdit, set edition status
-          if( ( parentRow.IsEditTriggerSet( EditTriggers.SingleClick ) )
-            || ( ( wasAlreadyCurrent ) && ( parentRow.IsEditTriggerSet( EditTriggers.ClickOnCurrentCell ) ) ) )
-          {
-            try
-            {
-              this.BeginEdit();
-            }
-            catch( DataGridException )
-            {
-              // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-              // any other GridException.
-            }
-          }
-        }
-      }
-    }
-
-    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
-    {
-      base.OnPreviewTextInput( e );
-
-      if( e.Handled )
-        return;
-
-      var parentRow = this.ParentRow;
-      if( parentRow == null )
-        return;
-
-      //Do not try to process the Activation Gesture if the Cell is readonly!
-      var readOnly = this.GetInheritedReadOnly();
-      if( readOnly )
-        return;
-
-      //This condition ensures that we process the TextInput against the editor only if the Grid is configured to answer to activation gestures.
-      if( !( parentRow.IsEditTriggerSet( EditTriggers.ActivationGesture ) ) )
-        return;
-
-      var editor = this.GetCellEditor();
-
-      //This condition is more complex and is used to filter cases were a TextInput is done and there is no need to process for activation keys...
-      //Condition is: Editor is not null, editor is not displaued and editor is not pending showing.
-      if( ( editor != null ) && ( this.IsBeingEdited == false ) && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
-      {
-
-        //If the Activation gestures for the editor includes TextInput
-        //Note that this condition also filters out TextInput which are other than Regular (non system or control) TextInput
-        if( ( !string.IsNullOrEmpty( e.Text ) ) && ( string.IsNullOrEmpty( e.SystemText ) ) && ( string.IsNullOrEmpty( e.ControlText ) )
-          && ( editor.IsTextInputActivation() ) )
-        {
-          m_textInputArgs = e;
-          e.Handled = true;
-
-          try
-          {
-            //enter edit mode for cell
-            this.BeginEdit();
-          }
-          catch( DataGridException )
-          {
-            // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-            // any other GridException.
-          }
-        }
-      }
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      base.OnPreviewKeyDown( e );
-
-      if( e.Handled )
-        return;
-
-      Row parentRow = this.ParentRow;
-
-      if( parentRow == null )
-        return;
-
-      //This condition ensures that we process the KeyDown against the editor only if the Grid is configured to answer to activation gestures.
-      if( !( parentRow.IsEditTriggerSet( EditTriggers.ActivationGesture ) ) )
-        return;
-
-      CellEditor editor = this.GetCellEditor();
-
-      //This condition is more complex and is used to filter cases were a KeyDown is done and there is no need to process for activation keys...
-      //Condition is: Editor is not null, editor is not displaued and editor is not pending showing.
-
-      if( ( editor != null ) && ( !this.IsBeingEdited ) && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
-      {
-        KeyActivationGesture gesture = editor.GetMatchingKeyActivationGesture( e.Key, e.SystemKey, Keyboard.Modifiers );
-
-        //Check if the key stroke received corresponds to one matching one of the KeyActivationGesture of the editor
-        if( gesture == null )
-          return;
-
-        //preserve the keystroke so it can be "resent" to the editor once layout is updated.
-        m_keyGesture = gesture;
-
-        e.Handled = true;
-
-        try
-        {
-          //If the key match, then enter edit mode.
-          this.BeginEdit();
-        }
-        catch( DataGridException )
-        {
-          // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-          // any other GridException.
-        }
-      }
-    }
-
-    protected override void OnVisualParentChanged( DependencyObject oldParent )
-    {
-      base.OnVisualParentChanged( oldParent );
-
-      // Since the parent property isn't a DP, we must update the binding ourself.
-      this.UpdateParentForeground();
-    }
-
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-      this.OnPropertyChanged( e.Property.Name );
-    }
-
-    protected virtual void InitializeCore( DataGridContext dataGridContext, Row parentRow, ColumnBase parentColumn )
-    {
-      this.ParentRow = parentRow;
-      this.ParentColumn = parentColumn;
-
-      this.UpdateAnimatedColumnReorderingBindings( dataGridContext, Row.GetIsTemplateCell( this ) );
-
-      if( !this.IsInternalyInitialized )
-      {
-        Binding rowMatchingConditionsBinding = new Binding();
-        rowMatchingConditionsBinding.Path = new PropertyPath( "(0).(1)", Cell.ParentRowProperty, Row.RowDisplayEditorMatchingConditionsProperty );
-        rowMatchingConditionsBinding.Source = this;
-        rowMatchingConditionsBinding.Mode = BindingMode.OneWay;
-
-        //Initialize the RowDisplayEditorMatchingConditions binding to the ParentRow
-        BindingOperations.SetBinding( this, Cell.RowDisplayEditorMatchingConditionsProperty, rowMatchingConditionsBinding );
-
-        // Clear the FieldName since it will be taken from the column instead of directly from the Cell.
-        this.SetFieldName( string.Empty );
-      }
-    }
-
-    protected virtual CellEditor GetCellEditor()
-    {
-      if( !this.IsInternalyInitialized )
-        return null;
-
-      var parentColumnBase = this.ParentColumn;
-
-      if( parentColumnBase == null )
-        return null;
-
-      //Since the CellEditor property is set by default, first verify if the CelLEditorSelector property has been explicitly set.
-      if( parentColumnBase.CellEditorSelector != null )
-        return parentColumnBase.CellEditorSelector.SelectCellEditor( parentColumnBase, this.DataContext );
-
-      if( parentColumnBase.CellEditor != null )
-        return parentColumnBase.CellEditor;
-
-      var parentColumn = parentColumnBase as Column;
-
-      if( parentColumn != null )
-      {
-        // Try to get a CellEditor from the ParentColumn.ForeignKeyConfiguration
-        var foreignKeyConfiguration = parentColumn.ForeignKeyConfiguration;
-
-        if( foreignKeyConfiguration != null )
-        {
-          return foreignKeyConfiguration.DefaultCellEditor;
-        }
-      }
-
-      var content = this.Content;
-
-      if( content == null )
-        return null;
-
-      var contentType = content.GetType();
-
-      var cellEditor = DefaultCellEditorSelector.SelectCellEditor( contentType );
-
-      if( cellEditor != null )
-        return cellEditor;
-
-      var typeConverter = TypeDescriptor.GetConverter( contentType );
-
-      if( typeConverter == null )
-        return null;
-
-      if( typeConverter.CanConvertFrom( typeof( string ) ) && typeConverter.CanConvertTo( typeof( string ) ) )
-      {
-        return DefaultCellEditorSelector.TextBoxEditor;
-      }
-
-      return null;
-    }
-
-    protected internal void Initialize( DataGridContext dataGridContext, Row parentRow, ColumnBase parentColumn )
-    {
-      //Check that both parameters are valid.
-      if( parentRow == null )
-        throw new ArgumentNullException( "parentRow" );
-
-      if( parentColumn == null )
-        throw new ArgumentNullException( "parentColumn" );
-
-      if( ( this.IsInternalyInitialized )
-        && ( this.IsContainerPrepared )
-        && ( parentColumn == this.ParentColumn )
-        && ( parentRow == this.ParentRow ) )
-        return;
-
-      //Mark the cell has being recycled to prevent some check to occur.
-      this.IsContainerRecycled = this.IsInternalyInitialized;
-
-      try
-      {
-        //A cell that hasn't been prepare once or that has a new parent column
-        //due to recycling needs to be prepared again.
-        this.IsContainerPrepared = false;
-
-        this.InitializeCore( dataGridContext, parentRow, parentColumn );
-
-        this.IsInternalyInitialized = true;
-
-        this.PostInitialize();
-      }
-      finally
-      {
-        //From here, there is no difference between a fresh new cell and
-        //a recycled cell.
-        this.IsContainerRecycled = false;
-      }
-    }
-
-    protected internal virtual void PostInitialize()
-    {
-      if( this.ParentRow.IsBeingEdited )
-      {
-        // Cell was added to the row's CreatedCells.  Update the parentColumn's cell in edition state.
-        var parentColumn = this.ParentColumn;
-
-        if( ( parentColumn != null ) && ( parentColumn.CurrentRowInEditionCellState == null ) )
-        {
-          CellState cellState = new CellState();
-          cellState.SetContentBeforeRowEdition( this.Content );
-          parentColumn.CurrentRowInEditionCellState = cellState;
-        }
-      }
-    }
-
-    protected internal virtual void PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      this.IsContainerPartiallyCleared = false;
-
-      // If the container is already prepared and not virtualized and the DataContext is the same, just ignore this call.
-      // For example, a cell generated through the xaml parser can already be prepared (went through this method once) but
-      // still have its DataContext set only after it has been prepared, thus the need to excute this method once more.
-      var dataContext = this.DataContext;
-      if( this.IsContainerPrepared && !this.IsContainerVirtualized &&
-        ( ( dataContext == item ) || ( ( dataContext is UnboundDataItem ) && this.IsSameUnboundItem( dataContext, item ) ) ) )
-        return;
-
-      //Make sure that the DataGridContext is set appropriatly on the cells that are already created.
-      //This is to ensure that the value is appropriate when the container is recycled within another DataGridContext ( another detail on the same level ).
-      DataGridControl.SetDataGridContext( this, dataGridContext );
-
-      var parentColumn = this.ParentColumn;
-      var isSameDataContext = Cell.AssignDataContext( this, item, null, parentColumn );
-
-      // In some scenarios, there may be validation errors on the content binding that is not reflected on the cell or the row, so make sure it is.
-      if( isSameDataContext && ( item is IDataErrorInfo ) && ( Validation.GetErrors( this ).Count > 0 ) && !this.HasValidationError
-          && !this.IsDirty)
-      {
-        this.NotifyContentBindingValidationError();
-      }
-
-      // If there is a current column on the DataGridContext, try to restore the currency of the cell
-      var parentRow = this.ParentRow;
-      var currentColumn = dataGridContext.CurrentColumn;
-      if( ( parentRow != null ) && ( parentRow.IsCurrent ) && ( currentColumn != null ) && ( currentColumn == parentColumn ) )
-      {
-        this.SetIsCurrent( true );
-      }
-
-      // This will force invalidation of the CoercedContentTemplate, only if the content is null after the prepare
-      // and if the content template is set to something else than default. However, when binded to an EmptyDataItem,
-      // our content will always be null but a CellContentTemplate will be applied. In this case, we do NOT want to  reapplied the template every time.
-      if( ( this.Content == null ) && ( !( this.GetRealDataContext() is EmptyDataItem ) ) )
-      {
-        this.ClearValue( Cell.CoercedContentTemplatePropertyKey );
-      }
-
-      this.UpdateCoercedContentTemplate( true );
-      this.UpdateMatchingDisplayConditions();
-
-      // Ensure to reset both container recycling flags
-      this.IsContainerPrepared = true;
-      this.IsContainerVirtualized = false;
-
-      // Force a refresh of the displayed template in case the display conditions where initially matched (e.g. Always).
-      this.RefreshDisplayedTemplate();
-    }
-
-    protected internal virtual void ClearContainer()
-    {
-      // If the container is not prepared just ignore this call.
-      if( !this.IsContainerPrepared )
-        return;
-
-      this.IsContainerPrepared = false;
-      this.IsContainerPartiallyCleared = false;
-
-      this.AbortRefreshErrorStyle();
-      this.AbortHideEditTemplate();
-
-      if( m_loadedRoutedEventHandler != null )
-      {
-        this.Loaded -= m_loadedRoutedEventHandler;
-        m_loadedRoutedEventHandler = null;
-      }
-
-      // In DP's PropertyChanged Callbacks, for the sake of performance, you could return immediatly if the cell is in process of being cleared.
-
-      this.ClearValue( Cell.StyleProperty );
-      this.ClearValue( Cell.IsCurrentPropertyKey );
-      this.ClearValue( Cell.IsSelectedPropertyKey );
-      this.ClearValue( Cell.IsBeingEditedPropertyKey );
-      this.ClearValue( Cell.ValidationErrorPropertyKey );
-      this.ClearValue( Cell.HasValidationErrorPropertyKey );
-      this.ClearValue( Cell.IsValidationErrorRestrictivePropertyKey );
-
-      // We must not clear the IsDirty flag of the Cell here since its Content could have been edited and this flag is checked
-      // to determine if the new value is commited or not in the source
-
-      // No need to clear the Cell.CellDisplayEditorMatchingConditionsProperty neither DataGridControl.CellEditorDisplayConditionsProperty since
-      // both will be updated when Cell.PrepareContainer is called again
-
-      m_cellValidationRules = null;
-      m_styleBeforeError = DependencyProperty.UnsetValue;
-      this.CurrentEditorPendingDisplayState = EditorDisplayState.None;
-      this.IsContainerVirtualized = true;
-
-      this.SetIsCellEditorDisplayed( false );
-
-      // This will reset every flags maintained in m_flags
-      this.ResetNonTransientFlags();
-    }
-
-    protected internal virtual void PartialClearContainer()
-    {
-      // If the container is not prepared just ignore this call.
-      if( !this.IsContainerPrepared )
-        return;
-
-      this.IsContainerPartiallyCleared = true;
-
-      this.AbortRefreshErrorStyle();
-      this.AbortHideEditTemplate();
-
-      this.ClearValue( Cell.StyleProperty );
-      this.ClearValue( Cell.IsCurrentPropertyKey );
-      this.ClearValue( Cell.IsSelectedPropertyKey );
-      this.ClearValue( Cell.IsBeingEditedPropertyKey );
-      this.ClearValue( Cell.ValidationErrorPropertyKey );
-      this.ClearValue( Cell.HasValidationErrorPropertyKey );
-      this.ClearValue( Cell.IsValidationErrorRestrictivePropertyKey );
-
-      m_styleBeforeError = DependencyProperty.UnsetValue;
-      this.CurrentEditorPendingDisplayState = EditorDisplayState.None;
-
-      this.SetIsCellEditorDisplayed( false );
-
-      // This will reset every flags maintained in m_flags
-      this.ResetNonTransientFlags();
-    }
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      var newThemeKey = view.GetDefaultStyleKey( typeof( Cell ) );
-      if( object.Equals( this.DefaultStyleKey, newThemeKey ) )
-        return;
-
-      this.DefaultStyleKey = newThemeKey;
-    }
-
-    protected internal virtual void AddContentBinding( DataGridContext dataGridContext, Row parentRow, ColumnBase parentColumn )
-    {
-    }
-
-    protected internal virtual void RemoveContentBinding()
-    {
-    }
-
-    protected internal virtual void CleanUpOnRemove()
-    {
-      this.AbortRefreshErrorStyle();
-      this.AbortHideEditTemplate();
-
-      if( m_loadedRoutedEventHandler != null )
-      {
-        this.Loaded -= m_loadedRoutedEventHandler;
-        m_loadedRoutedEventHandler = null;
-      }
-
-      //This is done so the WeakEventListener on ParentColumn is removed.
-      this.ParentColumn = null;
-    }
-
-    internal static Cell FindFromChildOrSelf( DataGridControl dataGridControl, DependencyObject child )
-    {
-      var cell = child as Cell;
-      if( cell != null )
-      {
-        if( dataGridControl == null )
-          return cell;
-
-        var dataGridContext = DataGridControl.GetDataGridContext( cell );
-        if( ( dataGridContext != null ) && ( dataGridContext.DataGridControl == dataGridControl ) )
-          return cell;
-      }
-
-      return Cell.FindFromChild( dataGridControl, child );
-    }
-
-    internal static bool GetIsUIValidationError( CellValidationError validationError )
-    {
-      if( validationError == null )
-        return false;
-
-      return ( !Cell.GetIsContentBindingValidationError( validationError ) ) && ( !Cell.GetIsCellEditorError( validationError ) );
-    }
-
-    internal static bool GetIsCellEditorError( CellValidationError validationError )
-    {
-      if( validationError == null )
-        return false;
-
-      return validationError.RuleInError is CellEditorValidationRule;
-    }
-
-    internal static bool GetIsContentBindingValidationError( CellValidationError validationError )
-    {
-      if( validationError == null )
-        return false;
-
-      return validationError.RuleInError is CellContentBindingValidationRule;
-    }
-
-    internal static bool GetIsValidationErrorRestrictive( CellValidationError cellValidationError )
-    {
-      if( cellValidationError == null )
-        return false;
-
-      return Cell.GetIsRuleInErrorRestrictive( cellValidationError.RuleInError );
-    }
-
-    internal static bool GetIsValidationErrorRestrictive( ValidationError validationError )
-    {
-      if( validationError == null )
-        return false;
-
-      return Cell.GetIsRuleInErrorRestrictive( validationError.RuleInError );
-    }
-
-    internal static bool GetIsRuleInErrorRestrictive( CellValidationRule ruleInError )
-    {
-      if( ruleInError == null )
-        return false;
-
-      CellContentBindingValidationRule cellContentBindingValidationRule = ruleInError as CellContentBindingValidationRule;
-
-      if( cellContentBindingValidationRule != null )
-        return Cell.GetIsRuleInErrorRestrictive( cellContentBindingValidationRule.ValidationRule );
-
-      return true;
-    }
-
-    internal static bool GetIsRuleInErrorRestrictive( ValidationRule ruleInError )
-    {
-      if( ruleInError == null )
-        return false;
-
-      return !( ruleInError is DataErrorValidationRule );
-    }
-
-    internal static bool IsCellEditorDisplayConditionsSet( Cell cell, CellEditorDisplayConditions condition )
-    {
-      if( ( cell.CellEditorDisplayConditions & condition ) == condition )
-        return true;
-
-      return false;
-    }
-
-    internal static UIElement GetCellFocusScope( UIElement reference )
-    {
-      if( reference == null )
-        return null;
-
-      if( Cell.GetIsCellFocusScope( reference ) )
-      {
-        return reference;
-      }
-
-      UIElement cellFocusScope = null;
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( reference ); i++ )
-      {
-        cellFocusScope = Cell.GetCellFocusScope( VisualTreeHelper.GetChild( reference, i ) as UIElement );
-
-        if( cellFocusScope != null )
-        {
-          return cellFocusScope;
-        }
-      }
-
-      return null;
-    }
-
-    internal static bool IsValueSourceHazardingCellRecycling( ValueSource valueSource )
-    {
-      switch( valueSource.BaseValueSource )
-      {
-        case BaseValueSource.Local:
-        case BaseValueSource.ParentTemplate:
-        case BaseValueSource.ParentTemplateTrigger:
-        case BaseValueSource.Unknown:
-          return true;
-
-        default:
-          return false;
-      }
-    }
-
-    internal static bool AssignDataContext( Cell cell, object dataContext, UnboundDataItem unboundDataItemContext, ColumnBase parentColumn )
-    {
-      var column = parentColumn as Column;
-      if( ( column != null ) && ( column.IsBoundToDataGridUnboundItemProperty ) )
-      {
-        dataContext = unboundDataItemContext ?? UnboundDataItem.GetUnboundDataItem( dataContext );
-      }
-
-      // Read the LocalValue of the DataContext to avoid getting the one inherited from the ParentRow.
-      // This prevent the DataContext to become null when the Cell is virtualized.
-      object localDataContext = cell.ReadLocalValue( Cell.DataContextProperty );
-
-      if( localDataContext != dataContext )
-      {
-        // The system will call Equals instead of RefEquals on the DataContext change.  If Equals has been overriden and returns true, the DataContext will not be updated.
-        // Hence setting it to null will make sure the right DataContext is used by the cell, and thus the cell content will be correctly updated.
-        // This would not have to be done if a reference to the old DataItem was not keeped, which DataItem may not be part of the source anymore.
-        if( object.Equals( localDataContext, dataContext ) )
-        {
-          cell.DataContext = null;
-        }
-        cell.DataContext = dataContext;
-
-        return false;
-      }
-
-      return true;
-    }
-
-    //This ensures the CellEditorContext is set on the Cell to avoid problems with RelativeSource causing undesired behaviors when ComboBox is used as default CellEditor
-    internal void EnsureCellEditorContext()
-    {
-      ForeignKeyConfiguration configuration = null;
-
-      var parentColumn = this.ParentColumn as Column;
-
-      if( parentColumn != null )
-      {
-        configuration = parentColumn.ForeignKeyConfiguration;
-        CellEditorContext context = new CellEditorContext( parentColumn, configuration );
-        Cell.SetCellEditorContext( this, context );
-      }
-    }
-
-    internal void RefreshDisplayedTemplate()
-    {
-      // Never refresh any templates when the Cell is not prepared or virtualized
-      if( !this.IsContainerPrepared || this.IsContainerVirtualized )
-        return;
-
-      Row parentRow = this.ParentRow;
-
-      // Never refresh template while clearing container
-      if( ( parentRow == null ) || parentRow.IsClearingContainer )
-        return;
-
-      if( this.ShouldDisplayEditor )
-      {
-        this.EnsureCellEditorContext();
-        this.ShowEditTemplate();
-      }
-      else
-      {
-        this.DelayHideEditTemplate();
-      }
-    }
-
-    internal void RevertEditedValue()
-    {
-      CellState cellState = this.GetEditCachedState();
-
-      if( cellState != null )
-      {
-        Debug.Assert( ( cellState.ContentBeforeRowEdition != DependencyProperty.UnsetValue ), "It seems the column was recreated or the cellstate overwritten while the row/cell was in edition." );
-
-        if( cellState.ContentBeforeRowEdition != DependencyProperty.UnsetValue )
-        {
-          this.PreventValidateAndSetAllErrors = true;
-          try
-          {
-            if( ( this.GetInheritedReadOnly() ) || ( !this.GetIsContentBindingSupportingSourceUpdate() ) )
-            {
-              this.UpdateContentBindingTarget();
-            }
-            else
-            {
-              this.Content = cellState.ContentBeforeRowEdition;
-            }
-          }
-          finally
-          {
-            this.PreventValidateAndSetAllErrors = false;
-          }
-
-          // Since it is impossible to leave edition on a row containing restrictive errors, there's no need to re-validate the UI Rules.
-          // The Validation.Error handler on the Content Binding will take care of updating the ValidationError property if it need to,
-          // which will in turn synch the HasValidationError property and refresh the Cell's style either to its normal style or
-          // to its error style.
-          Exception exception;
-          CellValidationRule ruleInErrorWrapper;
-
-          // We always want to update the content binding source.
-          this.ClearAllErrors();
-          this.ValidateAndSetAllErrors( false, false, true, true, out exception, out ruleInErrorWrapper );
-        }
-      }
-
-      this.SetIsDirty( false );
-    }
-
-    internal void UpdateContentBindingTarget()
-    {
-      // Never update the target of a binding to a an item if the Cell is dirty
-      if( ( !this.IsDirty ) )
-      {
-        // We need to refresh the Cell.Content target binding in case the dataObject value was coerced to something else.
-        BindingExpressionBase bindingExpression = this.GetContentBindingExpression();
-
-        if( bindingExpression != null )
-        {
-          bindingExpression.UpdateTarget();
-        }
-      }
-    }
-
-    internal void RestoreEditionState( ColumnBase currentColumn )
-    {
-      Debug.Assert( ( this.ParentRow != null ) && ( this.ParentRow.IsBeingEdited ) && ( this.ParentColumn != null ) );
-
-      ColumnBase parentColumn = this.ParentColumn;
-
-      if( parentColumn == null )
-        return;
-
-      CellState savedState = parentColumn.CurrentRowInEditionCellState;
-
-      Debug.Assert( savedState != null );
-
-      if( savedState == null )
-        return;
-
-      bool wasDirty = savedState.IsDirty;
-      this.SetIsDirty( wasDirty );
-
-      if( wasDirty )
-      {
-        if( ( savedState.Content != DependencyProperty.UnsetValue )
-          && ( !object.Equals( this.Content, savedState.Content ) )
-          && ( this.GetIsContentBindingSupportingSourceUpdate() ) )
-        {
-          this.IsRestoringEditionState = true;
-
-          try
-          {
-            this.Content = savedState.Content;
-          }
-          finally
-          {
-            this.IsRestoringEditionState = false;
-          }
-        }
-      }
-
-      if( ( savedState.IsBeingEdited ) && ( parentColumn == currentColumn ) )
-        this.BeginEdit();
-
-
-      this.SetValidationError( savedState.CellValidationError );
-    }
-
-    internal void OnIsTemplateCellChanged( bool newValue )
-    {
-      this.UpdateAnimatedColumnReorderingBindings( DataGridControl.GetDataGridContext( this ), newValue );
-    }
-
-    internal ValidationResult UpdateContentBindingSource( out Exception exception, out CellValidationRule ruleInErrorWrapper )
-    {
-      Debug.Assert( ( ( this.IsDirty ) || ( this.IsInCascadingValidation ) ),
-        "UpdateContentBindingSource should not be called when the cell isn't dirty beside when cascading validation.  Call ValidateContentBindingRules instead." );
-
-      exception = null;
-      ruleInErrorWrapper = null;
-
-      var validationResult = ValidationResult.ValidResult;
-      var contentBindingExpression = this.GetContentBindingExpression();
-
-      if( contentBindingExpression != null )
-      {
-        // The caller of UpdateContentBindingSource will take care of setting the errors.
-        this.PreventValidateAndSetAllErrors = true;
-        this.IsUpdatingContentBindingSource = true;
-        try
-        {
-          contentBindingExpression.UpdateSource();
-        }
-        finally
-        {
-          this.PreventValidateAndSetAllErrors = false;
-          this.IsUpdatingContentBindingSource = false;
-        }
-
-        validationResult = this.ValidateContentBindingRules( out exception, out ruleInErrorWrapper );
-      }
-
-      // Only consider the content committed if the source was correctly updated.
-      if( ( validationResult.IsValid ) || ( !( Cell.GetIsRuleInErrorRestrictive( ruleInErrorWrapper ) ) ) )
-      {
-        this.ContentCommitted();
-      }
-
-      // The dirty flag will only be lowered when the row ends or cancels edition, or if the cell cancels edition and it wasn't dirty when begining edition.
-      return validationResult;
-    }
-
-    internal CellState GetEditCachedState()
-    {
-      var cellState = default( CellState );
-      var parentRow = this.ParentRow;
-
-      if( ( parentRow != null ) && ( ( parentRow.IsBeingEdited ) || ( parentRow.IsBeginningEdition ) ) )
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        if( dataGridContext != null )
-        {
-          var dataGridControl = dataGridContext.DataGridControl;
-
-          if( ( dataGridControl != null ) && ( dataGridControl.CurrentRowInEditionState != null ) )
-          {
-            var parentColumn = this.ParentColumn;
-
-            if( parentColumn != null )
-            {
-              cellState = parentColumn.CurrentRowInEditionCellState;
-            }
-          }
-        }
-      }
-
-      return cellState;
-    }
-
-    internal Nullable<DataGridUpdateSourceTrigger> GetContentBindingUpdateSourceTrigger()
-    {
-      BindingExpressionBase contentBindingExpression = this.GetContentBindingExpression();
-
-      if( contentBindingExpression != null )
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        if( dataGridContext != null )
-        {
-          DataGridControl parentDataGridControl = dataGridContext.DataGridControl;
-
-          if( parentDataGridControl != null )
-            return parentDataGridControl.UpdateSourceTrigger;
-        }
-      }
-
-      return null;
-    }
-
-    internal IDisposable InhibitMakeVisible()
-    {
-      return new PreventMakeVisibleDisposable( this );
-    }
-
-    internal virtual bool GetCalculatedCanBeCurrent()
-    {
-      var column = this.ParentColumn;
-      if( ( column == null ) || ( this.ParentRow == null ) )
-        return false;
-
-      if( column.CanBeCurrentWhenReadOnly )
-        return true;
-
-      return !this.GetInheritedReadOnly();
-    }
-
-    internal virtual void ContentCommitted()
-    {
-    }
-
-    internal void EnsureInVisualTree()
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return;
-
-      TableView view = dataGridContext.DataGridControl.GetView() as TableView;
-      if( view == null )
-        return;
-
-      Row parentRow = this.ParentRow;
-      if( parentRow == null )
-        return;
-
-      FixedCellPanel fixedCellPanel = parentRow.CellsHostPanel as FixedCellPanel;
-      if( fixedCellPanel == null )
-        return;
-
-      var columnVirtualizationManager = ColumnVirtualizationManager.GetColumnVirtualizationManager( dataGridContext ) as TableViewColumnVirtualizationManagerBase;
-      if( columnVirtualizationManager == null )
-        return;
-
-      if( columnVirtualizationManager.GetFixedFieldNames( this.ParentRow.LevelCache ).Contains( this.FieldName ) )
-        return;
-
-      if( !fixedCellPanel.ForceScrollingCellToLayout( this ) )
-        return;
-
-      UIElement container = dataGridContext.GetContainerFromItem( this.GetRealDataContext() ) as UIElement;
-      if( container == null )
-        return;
-
-      // We must Call UpdateLayout on the container when a cell is 
-      // added to VisualTree to ensure the offset relative to this 
-      // container are correctly returned
-      container.UpdateLayout();
-    }
-
-    internal virtual DataTemplate GetForeignKeyDataTemplate()
-    {
-      return null;
-    }
-
-    internal virtual DataTemplate GetCellStringFormatDataTemplate( DataTemplate contentTemplate )
-    {
-      return null;
-    }
-
-    private static object OnCoerceContent( DependencyObject sender, object value )
-    {
-      var cell = sender as Cell;
-
-      // If we are updating the Content binding source and content is refreshed as a result, hold-on.
-      // We will manually update Content from the source by calling UpdateTarget on the binding later.
-      if( ( cell != null ) && cell.IsUpdatingContentBindingSource )
-        return DependencyProperty.UnsetValue;
-
-      return value;
-    }
-
-    private static void OnContentChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var cell = sender as Cell;
-      if( cell == null )
-        return;
-
-      var parentRow = cell.ParentRow;
-      if( parentRow == null )
-        return;
-
-      var doCellValidation = false;
-      var parentColumn = cell.ParentColumn;
-
-      var changeDuringRowIsInEdit = ( cell.IsInternalyInitialized )
-        && ( !cell.IsContainerRecycled )
-        && ( !parentRow.IsBeginningEdition )
-        && ( !cell.IsUpdatingContentBindingSource )
-        && ( !cell.IsRestoringEditionState )
-        && ( parentRow.IsBeingEdited );
-
-      if( changeDuringRowIsInEdit )
-      {
-        if( parentColumn != null )
-        {
-          if( parentColumn.CurrentRowInEditionCellState == null )
-          {
-#pragma warning disable 618
-            Debug.Assert( false, "Should only happen with MultiSurfaceView. Unless there is a new template assigned to the Row in a trigger?" );
-#pragma warning restore 618
-            parentColumn.CurrentRowInEditionCellState = new CellState();
-          }
-
-          parentColumn.CurrentRowInEditionCellState.SetContent( cell.Content );
-        }
-      }
-
-      if( changeDuringRowIsInEdit )
-      {
-        if( !object.Equals( e.OldValue, e.NewValue ) )
-        {
-          cell.SetIsDirty( true );
-        }
-
-        if( !cell.PreventValidateAndSetAllErrors )
-        {
-          if( cell.GetContentBindingUpdateSourceTrigger() == DataGridUpdateSourceTrigger.CellContentChanged )
-          {
-            doCellValidation = true;
-          }
-        }
-      }
-
-      if( doCellValidation )
-      {
-        // This method is called to make sure we are not calling ValidateAndSetAllErrors at all nor triggering a cascade validation
-        // as a side-effect of updating a cell's content binding source while another cell is bound to the very same source.
-        // We would be surprised of such a usage, but this fail-safe will take care of this possibility.
-        if( !cell.GetIsSiblingUpdatingContentBindingSource() )
-        {
-          // The CellEditorRules must not be ckecked when UpdateSourceTrigger is set to CellContentChanged because the editor's HasValidationError property
-          // changes only AFTER the new cell value is commited.  It would thus result in nothing being processed here if it were to be checked.
-
-          Exception exception;
-          CellValidationRule ruleInError;
-          var validationResult = cell.ValidateCellRules( out exception, out ruleInError );
-          if( validationResult.IsValid )
-          {
-            cell.ValidateAndSetAllErrors( false, false, true, true, out exception, out ruleInError );
-          }
-        }
-      }
-
-      //When the content changes, check if the CellContentTemplateSelector needs to be updated.
-      //This depdends on several factor, including if a Selector is present and if the editor is not displayed
-      if( cell.ShouldInvalidateCellContentTemplateSelector( parentColumn ) )
-      {
-        cell.UpdateCoercedContentTemplate( false );
-      }
-    }
-
-    private static void OnIsDirtyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var cell = sender as Cell;
-      if( cell == null )
-        return;
-
-      if( ( bool )e.NewValue )
-      {
-        //Raise the RoutedEvent that notifies any Row that the cell is becoming dirty.
-        RoutedEventArgs eventArgs = new RoutedEventArgs( Cell.IsDirtyEvent );
-        cell.RaiseEvent( eventArgs );
-      }
-    }
-
-    private static void OnMatchingDisplayEditorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var cell = sender as Cell;
-      if( cell == null )
-        return;
-
-      //performing this check because at the end of the Initializing function, I will call this explicitelly, to ensure 
-      //proper display of the Editor if the appropriate conditions are met.
-      if( cell.IsInternalyInitialized )
-      {
-        cell.RefreshDisplayedTemplate();
-      }
-    }
-
-    private static void OnCellEditorDisplayConditionsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var cell = sender as Cell;
-      if( cell == null )
-        return;
-
-      // The cell.ParentRow can be null if this Cell is a TemplateCell
-      var parentRow = cell.ParentRow;
-      if( ( parentRow != null ) && parentRow.IsClearingContainer )
-        return;
-
-      cell.UpdateMatchingDisplayConditions();
-    }
-
-    private static void OnContentTemplateChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var cell = sender as Cell;
-      if( cell == null )
-        return;
-
-      cell.m_contentTemplateCache = e.NewValue as DataTemplate;
-
-      if( ( cell.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) && ( !cell.IsCellEditorDisplayed ) )
-      {
-        cell.UpdateCoercedContentTemplate( false );
-      }
-    }
-
-    private static void OnContentTemplateSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var cell = sender as Cell;
-      if( cell == null )
-        return;
-
-      cell.m_contentTemplateSelectorCache = e.NewValue as DataTemplateSelector;
-
-      if( ( cell.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) && ( !cell.IsCellEditorDisplayed ) )
-      {
-        cell.UpdateCoercedContentTemplate( false );
-      }
-    }
-
-    private static void OnIsTemplateCellChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var cell = sender as Cell;
-      if( cell == null )
-        return;
-
-      cell.OnIsTemplateCellChanged( ( bool )e.NewValue );
-    }
-
-    private bool GetInheritedReadOnly()
-    {
-      var isReadOnly = false;
-      var parentRow = this.ParentRow;
-      var parentColumn = this.ParentColumn;
-
-      if( m_readOnlyIsInternalySet )
-      {
-        this.ClearValue( Cell.ReadOnlyProperty );
-        m_readOnlyIsInternalySet = false;
-      }
-
-      var readOnlyPropertyValueSource = DependencyPropertyHelper.GetValueSource( this, Cell.ReadOnlyProperty );
-      var isDataBound = readOnlyPropertyValueSource.BaseValueSource > BaseValueSource.Inherited;
-
-      //If a value is set in any way (explicitly or implicitly) by the user on the cell, use that value.
-      if( isDataBound )
-      {
-        isReadOnly = this.ReadOnly;
-      }
-
-      //If a value is set in any way (explicitly or implicitly) by the user on the row, use that value.
-      if( !isDataBound && ( parentRow != null ) )
-      {
-        readOnlyPropertyValueSource = DependencyPropertyHelper.GetValueSource( parentRow, Row.ReadOnlyProperty );
-        isDataBound = readOnlyPropertyValueSource.BaseValueSource > BaseValueSource.Inherited;
-
-        if( isDataBound )
-        {
-          isReadOnly = parentRow.ReadOnly;
-          this.ReadOnly = isReadOnly;
-          m_readOnlyIsInternalySet = true;
-        }
-      }
-
-      //If a value is set in any way (explicitly or implicitly) by the user on the column, use that value.
-      if( !isDataBound && ( parentColumn != null ) )
-      {
-        readOnlyPropertyValueSource = DependencyPropertyHelper.GetValueSource( parentColumn, ColumnBase.ReadOnlyProperty );
-        isDataBound = readOnlyPropertyValueSource.BaseValueSource > BaseValueSource.Inherited;
-
-        if( isDataBound )
-        {
-          isReadOnly = parentColumn.ReadOnly;
-          this.ReadOnly = isReadOnly;
-          m_readOnlyIsInternalySet = true;
-        }
-      }
-
-      //If no value set by the user at any level, use the one set by the framework on the cell.
-      if( !isDataBound )
-      {
-        isReadOnly = this.ReadOnly;
-      }
-
-      if( isReadOnly )
-        return true;
-
-      var contentBindingExpression = this.GetContentBindingExpression();
-      if( contentBindingExpression == null )
-        return false;
-
-      Nullable<BindingMode> contentBindingMode = null;
-      if( contentBindingExpression is BindingExpression )
-      {
-        contentBindingMode = ( ( Binding )contentBindingExpression.ParentBindingBase ).Mode;
-      }
-      else if( contentBindingExpression is MultiBindingExpression )
-      {
-        contentBindingMode = ( ( MultiBinding )contentBindingExpression.ParentBindingBase ).Mode;
-      }
-
-      return ( contentBindingMode.HasValue ) && ( contentBindingMode.Value != BindingMode.TwoWay );
-    }
-
-    private bool ShouldInvalidateCellContentTemplateSelector( ColumnBase parentColumn )
-    {
-      if( parentColumn == null )
-        return false;
-
-      var onlyInternalContentTemplateSelectorAvailable = ( ( this.ContentTemplateInternal == null ) && ( this.ContentTemplateSelectorInternal != null ) );
-      var onlyColumnContentTemplateSelectorAvailable = ( ( parentColumn.CellContentTemplate == null ) && ( parentColumn.CellContentTemplateSelector != null ) );
-      var onlyTemplateSelectorAvailable = onlyColumnContentTemplateSelectorAvailable || onlyInternalContentTemplateSelectorAvailable;
-      var editorHiddenAndNotPendingShow = !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow );
-
-      // Only TemplateSelectors are available and editor is not hidden and pending showing
-      return ( onlyTemplateSelectorAvailable && editorHiddenAndNotPendingShow );
-    }
-
-    private bool GetIsContentBindingSupportingSourceUpdate()
-    {
-      var binding = this.GetContentBindingExpression();
-      if( binding == null )
-        return false;
-
-      BindingMode mode;
-      var singleBinding = binding.ParentBindingBase as Binding;
-
-      if( singleBinding == null )
-      {
-        var multiBinding = binding.ParentBindingBase as MultiBinding;
-        if( multiBinding == null )
-          return false;
-
-        mode = multiBinding.Mode;
-      }
-      else
-      {
-        mode = singleBinding.Mode;
-      }
-
-      return ( mode == BindingMode.OneWayToSource ) || ( mode == BindingMode.TwoWay );
-    }
-
-    private bool GetIsSiblingUpdatingContentBindingSource()
-    {
-      // This method is called to make sure we are not calling ValidateAndSetAllErrors at all nor triggering a cascade validation
-      // as a side-effect of updating a cell's content binding source while another cell is bound to the very same source.
-      // We would be surprised of such a usage, but this fail-safe will take care of this possibility.
-      var parentRow = this.ParentRow;
-      if( parentRow != null )
-      {
-        foreach( Cell siblingCell in parentRow.CreatedCells )
-        {
-          if( ( siblingCell != this ) && ( siblingCell.IsUpdatingContentBindingSource ) )
-          {
-            // Such a situation should only occur when one of the two (or more) cells sharing the exact same source as their content binding.
-            return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
-    private DataTemplate GetCoercedCellContentTemplate()
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return null;
-
-      var contentTemplate = this.ContentTemplateInternal;
-      var content = this.Content;
-
-      if( contentTemplate == null )
-      {
-        //If none, check if there is a ContentTemplateSelector directly assigned on cell.
-        var contentTemplateSelector = this.ContentTemplateSelectorInternal;
-        if( contentTemplateSelector != null )
-        {
-          //If there is one, the query it for a ContentTemplate.
-          contentTemplate = contentTemplateSelector.SelectTemplate( content, this );
-        }
-      }
-
-      var parentColumn = this.ParentColumn;
-
-      //If there was no ContentTemplateSelector on Cell or if the output of the selector was Null.
-      if( ( !this.OverrideColumnCellContentTemplate ) && ( contentTemplate == null ) && ( parentColumn != null ) )
-      {
-        contentTemplate = this.GetForeignKeyDataTemplate();
-        if( contentTemplate != null )
-          return contentTemplate;
-
-        if( contentTemplate == null )
-        {
-          //If the parent Column defines a CellContentTemplate, then use it
-          contentTemplate = parentColumn.CellContentTemplate;
-
-          //if it doesn't, then check for a selector on Column
-          if( contentTemplate == null )
-          {
-            var contentTemplateSelector = parentColumn.CellContentTemplateSelector;
-            if( contentTemplateSelector != null )
-            {
-              //If a selector exists on Column, then use it.
-              contentTemplate = contentTemplateSelector.SelectTemplate( content, this );
-            }
-          }
-        }
-      }
-
-      //After all of this, if there is still no ContentTemplate found, then use the default basic one.
-      if( contentTemplate == null )
-      {
-        contentTemplate = GenericContentTemplateSelector.Instance.SelectTemplate( content, this );
-      }
-
-      if( ( contentTemplate != null ) && ( parentColumn != null ) && !string.IsNullOrEmpty( parentColumn.CellContentStringFormat ) )
-      {
-        var newContentTemplate = this.GetCellStringFormatDataTemplate( contentTemplate );
-        if( newContentTemplate != null )
-        {
-          contentTemplate = newContentTemplate;
-        }
-      }
-
-      return contentTemplate;
-    }
-
-    private Style GetInheritedErrorStyle()
-    {
-      object style = this.ReadLocalValue( Cell.CellErrorStyleProperty );
-
-      // In case we have a BindingExpression, we need to get the resulting value.
-      if( style is BindingExpressionBase )
-        style = this.CellErrorStyle;
-
-      if( style == DependencyProperty.UnsetValue )
-      {
-        ColumnBase column = this.ParentColumn;
-
-        if( column != null )
-        {
-          style = column.ReadLocalValue( Column.CellErrorStyleProperty );
-
-          // In case we have a BindingExpression, we need to get the resulting value.
-          if( style is BindingExpressionBase )
-            style = column.CellErrorStyle;
-        }
-      }
-
-      if( style == DependencyProperty.UnsetValue )
-        style = this.CellErrorStyle;
-
-      return style as Style;
-    }
-
-    private BindingExpressionBase GetContentBindingExpression()
-    {
-      return BindingOperations.GetBindingExpressionBase( this, Cell.ContentProperty );
-    }
-
-    private EditorDisplayState CurrentEditorPendingDisplayState
-    {
-      get;
-      set;
-    }
-
-    private object GetRealDataContext()
-    {
-      object dataContext = this.DataContext;
-      UnboundDataItem unboundDataItem = dataContext as UnboundDataItem;
-
-      if( unboundDataItem == null )
-        return dataContext;
-
-      return unboundDataItem.DataItem;
-    }
-
-    private bool IsSameUnboundItem( object dataContext, object item )
-    {
-      UnboundDataItem unboundDataItem = dataContext as UnboundDataItem;
-
-      return unboundDataItem.DataItem == item;
-    }
-
-    private void UpdateAnimatedColumnReorderingBindings( DataGridContext dataGridContext, bool isTemplateCell )
-    {
-      // Only set the Binding if the view is a TableflowView.
-      var setBindings = ( !isTemplateCell )
-                     && ( dataGridContext != null )
-                     && ( dataGridContext.DataGridControl.GetView() is TableflowView );
-
-      if( setBindings == this.AnimatedColumnReorderingBindingApplied )
-        return;
-
-      if( setBindings )
-      {
-        BindingOperations.SetBinding( this, Cell.RenderTransformProperty, Cell.ParentColumnTranslationBinding );
-        BindingOperations.SetBinding( this, Cell.ParentColumnIsBeingDraggedProperty, Cell.ParentColumnIsBeingDraggedBinding );
-        BindingOperations.SetBinding( this, Cell.ParentColumnReorderingDragSourceManagerProperty, Cell.ParentColumnReorderingDragSourceManagerBinding );
-      }
-      else
-      {
-        BindingOperations.ClearBinding( this, Cell.RenderTransformProperty );
-        BindingOperations.ClearBinding( this, Cell.ParentColumnIsBeingDraggedProperty );
-        BindingOperations.ClearBinding( this, Cell.ParentColumnReorderingDragSourceManagerProperty );
-      }
-
-      this.AnimatedColumnReorderingBindingApplied = setBindings;
-    }
-
-    private void ShowEditTemplate()
-    {
-      this.AbortHideEditTemplate();
-
-      // The editor is not pending showing
-      if( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow )
-      {
-        // If it is not displayed or pending hiding
-        if( !this.IsCellEditorDisplayed || ( this.CurrentEditorPendingDisplayState == EditorDisplayState.PendingHide ) || m_forceEditorRefresh )
-        {
-          var cellEditor = this.GetCellEditor();
-          if( cellEditor != null )
-          {
-            this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), cellEditor.EditTemplate );
-
-            // Force the editor to update its editor state on next layout pass
-            this.CurrentEditorPendingDisplayState = EditorDisplayState.PendingShow;
-          }
-        }
-        else
-        {
-          // This will force re-layout of the control, raising the LayoutUpdated event
-          // and correctly update the display state for this editor
-          this.InvalidateArrange();
-        }
-      }
-    }
-
-    private void DelayHideEditTemplate()
-    {
-      if( m_delayedHideEditTemplateDispatcherOperation != null )
-        return;
-
-      if( ( !this.IsCellEditorDisplayed ) && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
-        return;
-
-      m_delayedHideEditTemplateDispatcherOperation = this.Dispatcher.BeginInvoke( new Action( this.HideEditTemplate ), DispatcherPriority.DataBind );
-    }
-
-    private void AbortHideEditTemplate()
-    {
-      if( m_delayedHideEditTemplateDispatcherOperation == null )
-        return;
-
-      Debug.Assert( m_delayedHideEditTemplateDispatcherOperation.Status == DispatcherOperationStatus.Pending );
-      m_delayedHideEditTemplateDispatcherOperation.Abort();
-      m_delayedHideEditTemplateDispatcherOperation = null;
-    }
-
-    private void HideEditTemplate()
-    {
-      m_delayedHideEditTemplateDispatcherOperation = null;
-
-      // The Cell is not prepared or virtualized, no need to 
-      // hide the edit template since it will be refreshed
-      // the the Cell is prepared again.
-      if( !this.IsContainerPrepared || this.IsContainerVirtualized )
-        return;
-
-      if( !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
-        return;
-
-      this.SetCoercedContentTemplate( this.GetCoercedCellContentTemplate(), null );
-      this.CurrentEditorPendingDisplayState = EditorDisplayState.PendingHide;
-
-      // We must clear the CellEditorContext when the Template is hidden
-      // to avoid side effects of the CellEditorBinding affecting null
-      // in the source. The reason is that the CellEditorContext is the
-      // binding source of the default foreign key CellEditor Template
-      Cell.ClearCellEditorContext( this );
-    }
-
-    private void AddDraggedColumnGhost( ColumnReorderingDragSourceManager manager, bool isBeingDraggedAnimated )
-    {
-      if( !isBeingDraggedAnimated || !this.IsContainerPrepared || manager.ContainsDraggedColumnGhost( this ) )
-        return;
-
-      this.ClearValue( Cell.OpacityProperty );
-
-      manager.AddDraggedColumnGhost( this );
-    }
-
-    private void RemoveDraggedColumnGhost( ColumnReorderingDragSourceManager manager )
-    {
-      if( !manager.ContainsDraggedColumnGhost( this ) )
-        return;
-
-      manager.RemoveDraggedColumnGhost( this );
-
-      this.ClearValue( Cell.OpacityProperty );
-    }
-
-    private void UpdateMatchingDisplayConditions()
-    {
-      CellEditorDisplayConditions newEffectiveValue = CellEditorDisplayConditions.None;
-
-      if( ( Cell.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.MouseOverCell ) ) &&
-        ( this.IsMouseOver ) )
-      {
-        newEffectiveValue |= CellEditorDisplayConditions.MouseOverCell;
-      }
-
-      if( ( Cell.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.CellIsCurrent ) ) &&
-        ( this.IsCurrent ) )
-      {
-        newEffectiveValue |= CellEditorDisplayConditions.CellIsCurrent;
-      }
-
-      if( Cell.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.Always ) )
-      {
-        newEffectiveValue |= CellEditorDisplayConditions.Always;
-      }
-
-      // No need to call RefreshDisplayedTemplate since 
-      // this method is called when the CellDisplayEditorMatchingConditions
-      // property changes on Cell or ParentColumn 
-      // OR
-      // when PrepareContainer is called on Cell
-      this.SetValue( Cell.CellDisplayEditorMatchingConditionsProperty, newEffectiveValue );
-    }
-
-    private void UpdateFocusable()
-    {
-      var isFocusable = false;
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext != null )
-      {
-        var column = this.ParentColumn;
-        var dataGridControl = dataGridContext.DataGridControl;
-
-        Debug.Assert( dataGridControl != null );
-
-        if( ( !this.GetCalculatedCanBeCurrent() ) && ( column != null ) && ( column == dataGridContext.CurrentColumn ) )
-        {
-          try
-          {
-            dataGridContext.SetCurrentColumnCore( null, false, dataGridControl.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CurrentColumnChanged );
-          }
-          catch( DataGridException )
-          {
-            // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-            // any other GridException.
-          }
-        }
-
-        isFocusable = true;
-
-        if( !this.IsBeingEdited )
-        {
-          var row = this.ParentRow;
-          if( row != null )
-          {
-            switch( row.NavigationBehavior )
-            {
-              case NavigationBehavior.None:
-              case NavigationBehavior.RowOnly:
-                isFocusable = false;
-                break;
-            }
-          }
-        }
-      }
-
-      //force an update of the NavigationBehavior characteristics
-      this.Focusable = isFocusable && this.GetCalculatedCanBeCurrent();
-    }
-
-    private void OnBeginEditExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      try
-      {
-        this.BeginEdit();
-      }
-      catch( DataGridException )
-      {
-        // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-        // any other GridException.
-      }
-    }
-
-    private void OnBeginEditCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext != null )
-      {
-        DataGridControl parentGrid = dataGridContext.DataGridControl;
-
-        if( parentGrid == null || this.ParentRow == null )
-        {
-          e.CanExecute = false;
-        }
-        else
-        {
-          e.CanExecute = ( !this.IsBeingEdited )
-                      && ( !this.GetInheritedReadOnly() )
-                      && ( this.ParentRow.IsEditTriggerSet( EditTriggers.BeginEditCommand ) );
-        }
-      }
-    }
-
-    private void OnCancelEditExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.CancelEdit();
-    }
-
-    private void OnCancelEditCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = this.IsBeingEdited;
-    }
-
-    private void Cell_Loaded( object sender, RoutedEventArgs e )
-    {
-      System.Diagnostics.Debug.Assert( this.HasPendingErrorStyleRefresh, "The cell should have unsubcribed from the event." );
-      System.Diagnostics.Debug.Assert( m_loadedRoutedEventHandler != null );
-
-      this.Loaded -= m_loadedRoutedEventHandler;
-      m_loadedRoutedEventHandler = null;
-
-      this.DelayRefreshErrorStyle();
-    }
-
-    private void Cell_LayoutUpdated( object sender, EventArgs e )
-    {
-      if( !this.IsContainerPrepared || this.IsContainerVirtualized )
-        return;
-
-      if( this.CurrentEditorPendingDisplayState == EditorDisplayState.PendingShow )
-      {
-        //If the Cell is marked to be pending the display of the editor, then
-        //this LayoutUpdated means that Editor has been effectively displayed
-
-
-
-        //Change the IsCellEditorDisplayed flag accordingly
-        this.SetIsCellEditorDisplayed( true );
-      }
-      else if( this.CurrentEditorPendingDisplayState == EditorDisplayState.PendingHide )
-      {
-        //If the Cell is marked to be pending the Display of the viewer, then
-        //this LayoutUpdated means that Editor has been effectively hidden
-
-
-
-        //Change the IsCellEditorDisplayed flag accordingly
-        this.SetIsCellEditorDisplayed( false );
-      }
-
-      // Reset the Editor/Viewer displaying flag.
-      this.CurrentEditorPendingDisplayState = EditorDisplayState.None;
-
-      // This condition allows detecting if the focus needs to be changed 
-      // after having displayed the editor.
-      if( !this.IsCellEditorDisplayed || !this.FocusEditor )
-        return;
-
-      // Reset the flag that indicates if the focus needs to be set in the template
-      this.FocusEditor = false;
-      bool editorFocused = false;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
-
-      if( dataGridControl != null )
-      {
-        //Focus need to be changed.
-        editorFocused = dataGridControl.SetFocusHelper( this.ParentRow, this.ParentColumn, false, true );
-      }
-
-      if( !editorFocused )
-      {
-        m_keyGesture = null;
-        m_textInputArgs = null;
-      }
-      else
-      {
-        //If a keystroke was recorded for "resend" upon layout update
-        if( m_keyGesture != null )
-        {
-          //Generate an EventArgs for the PreviewKeyDown for the KeyStroke
-          Key realKey;
-          if( ( m_keyGesture.Key == Key.None ) && ( m_keyGesture.SystemKey != Key.None ) )
-          {
-            realKey = m_keyGesture.SystemKey;
-          }
-          else
-          {
-            realKey = m_keyGesture.Key;
-          }
-
-          try
-          {
-            KeyEventArgs kea = new KeyEventArgs( Keyboard.PrimaryDevice, Keyboard.PrimaryDevice.ActiveSource, 0, realKey );
-            kea.RoutedEvent = Keyboard.PreviewKeyDownEvent;
-
-            //send the event
-            Keyboard.PrimaryDevice.FocusedElement.RaiseEvent( kea );
-
-            if( kea.Handled == false )
-            {
-              //Generate an EventArgs for the KeyDown event Args for the preserved KeyStroke
-              kea = new KeyEventArgs( Keyboard.PrimaryDevice, Keyboard.PrimaryDevice.ActiveSource, 0, realKey );
-              kea.RoutedEvent = Keyboard.KeyDownEvent;
-
-              //Send the Event to the Input Manager
-              Keyboard.PrimaryDevice.FocusedElement.RaiseEvent( kea );
-            }
-          }
-          catch( SecurityException ex )
-          {
-            //if the exception is for the UIPermission, then we want to suppress it
-            if( !( ex.PermissionType.FullName == "System.Security.Permissions.UIPermission" ) )
-            {
-              //not correct type, then rethrow the exception
-              throw;
-            }
-          }
-
-          //clear the KeyStroke preserved.
-          m_keyGesture = null;
-        }
-
-        //If TextInput was preserved for resend
-        if( m_textInputArgs != null )
-        {
-          //Generate new TextInput Event Args
-          TextCompositionEventArgs new_event = new TextCompositionEventArgs( m_textInputArgs.Device, m_textInputArgs.TextComposition );
-          new_event.RoutedEvent = UIElement.PreviewTextInputEvent;
-
-          //Send the event to the InputManager.
-          Keyboard.PrimaryDevice.FocusedElement.RaiseEvent( new_event );
-
-          if( !new_event.Handled )
-          {
-            new_event = new TextCompositionEventArgs( m_textInputArgs.Device, m_textInputArgs.TextComposition );
-            new_event.RoutedEvent = UIElement.TextInputEvent;
-
-            //Send the event to the InputManager.
-            Keyboard.PrimaryDevice.FocusedElement.RaiseEvent( new_event );
-          }
-        }
-
-        //Clear the TextInput preserved.
-        m_textInputArgs = null;
-      }
-    }
-
-    #region EDITION
-
-    public static readonly RoutedEvent EditBeginningEvent = EventManager.RegisterRoutedEvent( "EditBeginning", RoutingStrategy.Bubble, typeof( CancelRoutedEventHandler ), typeof( Cell ) );
-    public static readonly RoutedEvent EditBegunEvent = EventManager.RegisterRoutedEvent( "EditBegun", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Cell ) );
-    public static readonly RoutedEvent EditEndingEvent = EventManager.RegisterRoutedEvent( "EditEnding", RoutingStrategy.Bubble, typeof( CancelRoutedEventHandler ), typeof( Cell ) );
-    public static readonly RoutedEvent EditEndedEvent = EventManager.RegisterRoutedEvent( "EditEnded", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Cell ) );
-    public static readonly RoutedEvent EditCancelingEvent = EventManager.RegisterRoutedEvent( "EditCanceling", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Cell ) );
-    public static readonly RoutedEvent EditCanceledEvent = EventManager.RegisterRoutedEvent( "EditCanceled", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Cell ) );
-
-    public event CancelRoutedEventHandler EditBeginning
-    {
-      add
-      {
-        base.AddHandler( Cell.EditBeginningEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Cell.EditBeginningEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler EditBegun
-    {
-      add
-      {
-        base.AddHandler( Cell.EditBegunEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Cell.EditBegunEvent, value );
-      }
-    }
-
-    public event CancelRoutedEventHandler EditEnding
-    {
-      add
-      {
-        base.AddHandler( Cell.EditEndingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Cell.EditEndingEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler EditEnded
-    {
-      add
-      {
-        base.AddHandler( Cell.EditEndedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Cell.EditEndedEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler EditCanceling
-    {
-      add
-      {
-        base.AddHandler( Cell.EditCancelingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Cell.EditCancelingEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler EditCanceled
-    {
-      add
-      {
-        base.AddHandler( Cell.EditCanceledEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Cell.EditCanceledEvent, value );
-      }
-    }
-
-    public void BeginEdit()
-    {
-      if( this.IsBeingEdited )
-        return;
-
-      var readOnly = this.GetInheritedReadOnly();
-      if( readOnly )
-        throw new DataGridException( "An attempt was made to edit a read-only cell or the cell content is not bound using two way binding." );
-
-      // If there is no dataItem mapped to this container, we don't want to
-      // enter in edition
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext != null )
-      {
-        var dataItem = dataGridContext.GetItemFromContainer( this );
-        if( dataItem == null )
-          return;
-      }
-
-      Debug.Assert( this.IsContainerPrepared, "Can't edit a cell that has not been prepared." );
-
-      var parentRow = this.ParentRow;
-
-      try
-      {
-        if( !parentRow.IsBeingEdited )
-        {
-          // Prevent the Row Beginning and Begun events from being raised.  The cell will handle them in order
-          // to maintain the same logical order as in other scenarios.
-          parentRow.IsBeginningEditFromCell = true;
-
-          CancelRoutedEventArgs rowCancelEventArgs = new CancelRoutedEventArgs( Row.EditBeginningEvent, parentRow );
-          parentRow.OnEditBeginning( rowCancelEventArgs );
-
-          if( rowCancelEventArgs.Cancel )
-            throw new DataGridException( "BeginEdit was canceled." );
-        }
-
-        CancelRoutedEventArgs e = new CancelRoutedEventArgs( Cell.EditBeginningEvent, this );
-        this.OnEditBeginning( e );
-
-        if( e.Cancel )
-          throw new DataGridException( "BeginEdit was canceled." );
-
-        if( !this.IsCurrent )
-        {
-          dataGridContext.SetCurrent(
-            dataGridContext.GetItemFromContainer( parentRow ),
-            parentRow,
-            DataGridVirtualizingPanel.GetItemIndex( parentRow ),
-            this.ParentColumn,
-            false,
-            true,
-            dataGridContext.DataGridControl.SynchronizeSelectionWithCurrent,
-            AutoScrollCurrentItemSourceTriggers.Editing );
-        }
-
-        if( ( !parentRow.IsBeingEdited ) && ( !parentRow.IsBeginningEdition ) )
-        {
-          parentRow.BeginEdit();
-        }
-
-        this.SetIsBeingEdited( true );
-        var cellState = this.GetEditCachedState();
-
-        if( cellState != null )
-        {
-          if( cellState.ContentBeforeCellEdition == DependencyProperty.UnsetValue )
-          {
-            cellState.SetContentBeforeCellEdition( this.Content );
-          }
-
-          cellState.SetIsDirtyBeforeEdition( this.IsDirty );
-        }
-
-        this.OnEditBegun();
-
-        if( parentRow.IsBeginningEditFromCell )
-        {
-          parentRow.OnEditBegun();
-        }
-      }
-      finally
-      {
-        parentRow.IsBeginningEditFromCell = false;
-      }
-    }
-
-    public void EndEdit()
-    {
-      if( !this.IsBeingEdited )
-        return;
-
-      var dataGridUpdateSourceTrigger = this.GetContentBindingUpdateSourceTrigger();
-      var updateContentBindingSource = ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellEndingEdit )
-                                        || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged );
-
-      this.EndEdit( true, true, updateContentBindingSource );
-    }
-
-    public void CancelEdit()
-    {
-      if( !this.IsBeingEdited )
-        return;
-
-      this.OnEditCanceling();
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      //There is an identified weakness with the IsKeyboardFocusWithin property where it cannot tell if the focus is within a Popup which is within the element
-      //This has been identified, and only the places where it caused problems were fixed... This comment is only here to remind developpers of the flaw
-      if( ( !this.IsKeyboardFocused ) && ( this.IsKeyboardFocusWithin ) )
-      {
-        // We delay the set focus on the cell to prevent the lost focus from being raised for the editor.
-        // This is to prevent execution of some validation code that may be in the LostFocus of the editor.
-        if( dataGridContext != null )
-        {
-          dataGridContext.DelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers.Editing );
-        }
-      }
-
-      CellState cellState = this.GetEditCachedState();
-
-      Debug.Assert( cellState != null );
-
-      if( cellState != null )
-      {
-        Debug.Assert( ( cellState.ContentBeforeCellEdition != DependencyProperty.UnsetValue ) && ( cellState.IsDirtyBeforeEdition.HasValue ), "It seems the column was recreated or the cellstate overwritten while the row/cell was in edition." );
-
-        if( cellState.ContentBeforeCellEdition != DependencyProperty.UnsetValue )
-        {
-
-          // Prevent ValidateAndSetAllErrors since we will call it later.
-          this.PreventValidateAndSetAllErrors = true;
-
-          try
-          {
-            Debug.Assert( !this.GetInheritedReadOnly() );
-            this.Content = cellState.ContentBeforeCellEdition;
-          }
-          finally
-          {
-            this.PreventValidateAndSetAllErrors = false;
-          }
-
-          var dataGridUpdateSourceTrigger = this.GetContentBindingUpdateSourceTrigger();
-          var updateContentBindingSource = ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellEndingEdit )
-                                           || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged );
-
-          Exception exception;
-          CellValidationRule ruleInError;
-          this.ValidateAndSetAllErrors( true, true, updateContentBindingSource, true, out exception, out ruleInError );
-
-          cellState.SetContentBeforeCellEdition( DependencyProperty.UnsetValue );
-        }
-
-        if( cellState.IsDirtyBeforeEdition.HasValue )
-        {
-          this.SetIsDirty( cellState.IsDirtyBeforeEdition.Value );
-          cellState.SetIsDirtyBeforeEdition( null );
-        }
-      }
-
-      this.SetIsBeingEdited( false );
-      this.OnEditCanceled();
-    }
-
-    protected virtual void OnEditBeginning( CancelRoutedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    protected virtual void OnEditBegun()
-    {
-      RoutedEventArgs e = new RoutedEventArgs( Cell.EditBegunEvent, this );
-      this.RaiseEvent( e );
-    }
-
-    protected virtual void OnEditEnding( CancelRoutedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    protected virtual void OnEditEnded()
-    {
-      RoutedEventArgs e = new RoutedEventArgs( Cell.EditEndedEvent, this );
-      this.RaiseEvent( e );
-    }
-
-    protected virtual void OnEditCanceling()
-    {
-      RoutedEventArgs e = new RoutedEventArgs( Cell.EditCancelingEvent, this );
-      this.RaiseEvent( e );
-    }
-
-    protected virtual void OnEditCanceled()
-    {
-      RoutedEventArgs e = new RoutedEventArgs( Cell.EditCanceledEvent, this );
-      this.RaiseEvent( e );
-    }
-
-    internal void EndEdit( bool validateCellEditorRules, bool validateUIRules, bool updateContentBindingSource )
-    {
-      if( !this.IsBeingEdited )
-        return;
-
-      try
-      {
-        var e = new CancelRoutedEventArgs( Cell.EditEndingEvent, this );
-
-        this.OnEditEnding( e );
-
-        // Throwing a DataGridValidationException will be caught by the grid and will make the cell stay in edition.
-        if( e.Cancel )
-          throw new DataGridValidationException( "EndEdit was canceled." );
-
-        //There is an identified weakness with the IsKeyboardFocusWithin property where it cannot tell if the focus is within a Popup which is within the element
-        //This has been identified, and only the places where it caused problems were fixed... This comment is only here to remind developpers of the flaw
-        if( ( !this.IsKeyboardFocused ) && ( this.IsKeyboardFocusWithin ) )
-        {
-          var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          if( ( dataGridContext != null ) && ( !dataGridContext.DataGridControl.IsSetFocusInhibited ) )
-          {
-            // Prevent the focus to make a RequestBringIntoView
-            using( this.InhibitMakeVisible() )
-            {
-              // We want to try to focus the Cell before we continue the EndEdit to ensure  any validation or process in the lost focus is done
-              if( !dataGridContext.DataGridControl.SetFocusHelper( this.ParentRow, this.ParentColumn, false, false ) )
-                throw new DataGridFocusException( "Unable to set focus on the Cell." );
-            }
-          }
-        }
-      }
-      catch( Exception exception )
-      {
-        if( exception is TargetInvocationException )
-        {
-          exception = exception.InnerException;
-        }
-
-        // In the case it's the focus that failed, we don't want to make that a ValidationError since it 
-        // must be retained by the editor itself with his own error mechanic.
-        //
-        // Also, for example, clicking on another cell will trigger the lost focus first and editor 
-        // will retain focus without any EndEdit being called and without any error displayed by the grid.  
-        // So with that focus exception we make sure the behaviour is uniform.
-        if( exception is DataGridFocusException )
-          throw;
-
-        this.SetValidationError( new CellValidationError( Cell.CustomCellValidationExceptionValidationRule, this, exception.Message, exception ) );
-
-        // Throwing a DataGridValidationException will be caught by the grid and will make the cell stay in edition.
-        throw new DataGridValidationException( "An error occurred while attempting to end the edit process.", exception );
-      }
-
-      Exception notUsed;
-      CellValidationRule ruleInError;
-      var result = this.ValidateAndSetAllErrors( validateCellEditorRules, validateUIRules, updateContentBindingSource, true, out notUsed, out ruleInError );
-
-      var cellState = this.GetEditCachedState();
-      if( cellState != null )
-      {
-        if( result.IsValid )
-        {
-          cellState.SetContentBeforeCellEdition( DependencyProperty.UnsetValue );
-        }
-
-        cellState.SetIsDirtyBeforeEdition( null );
-      }
-
-      this.SetIsBeingEdited( false );
-      this.OnEditEnded();
-    }
-
-    internal FrameworkElement CellEditorBoundControl
-    {
-      get
-      {
-        return this.GetCellEditorBoundControl( this );
-      }
-    }
-
-    private static void Cell_RequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-    {
-      Cell cell = sender as Cell;
-
-      if( cell.PreventMakeVisible )
-      {
-        e.Handled = true;
-      }
-    }
-
-    private FrameworkElement GetCellEditorBoundControl( FrameworkElement frameworkElement )
-    {
-      int childrenCount = System.Windows.Media.VisualTreeHelper.GetChildrenCount( frameworkElement );
-
-      for( int i = 0; i < childrenCount; i++ )
-      {
-        FrameworkElement child = System.Windows.Media.VisualTreeHelper.GetChild( frameworkElement, i ) as FrameworkElement;
-
-        if( child != null )
-        {
-          if( child.Name == "PART_CellEditorBoundControl" )
-            return child;
-
-          FrameworkElement matchingPart = this.GetCellEditorBoundControl( child );
-
-          if( matchingPart != null )
-            return matchingPart;
-        }
-      }
-
-      return null;
-    }
-
-    #endregion EDITION
-
-    #region VALIDATION
-
-    internal ValidationResult ValidateAndSetAllErrors(
-      bool validateCellEditorRules,
-      bool validateUIRules,
-      bool updateContentBindingSource,
-      bool cascadeValidate,
-      out Exception exception,
-      out CellValidationRule ruleInError )
-    {
-      System.Diagnostics.Debug.Assert( !this.PreventValidateAndSetAllErrors,
-        "We should not have called this method while in this state." );
-
-      System.Diagnostics.Debug.Assert( !( cascadeValidate && this.IsInCascadingValidation ),
-        "We should never be calling ValidateAndSetAllErrors with a request to start cascade validation if we are currently cascading validation." );
-
-      if( this.IsInCascadingValidation && cascadeValidate )
-      {
-        throw new DataGridInternalException(
-              "We should never be calling ValidateAndSetAllErrors with a request to start cascade validation if we are currently cascading validation.",
-              DataGridControl.GetDataGridContext( this ).DataGridControl );
-      }
-
-      var result = ValidationResult.ValidResult;
-      exception = null;
-      ruleInError = null;
-
-      // Validate that the CellEditor isn't in error.
-      if( validateCellEditorRules )
-      {
-        result = this.ValidateCellEditorRules( out exception, out ruleInError );
-
-        // If the CellEditor is in error, it must be shown, no matter what.
-        if( !result.IsValid )
-        {
-          this.SetAllError( result, exception, ruleInError );
-          return result;
-        }
-      }
-
-      // Validate CellValidationRules against the cell's Content property.
-      if( validateUIRules )
-      {
-        result = this.ValidateCellRules( out exception, out ruleInError );
-      }
-
-      if( result.IsValid )
-      {
-        // Only need to update the Content binding source if the cell is dirty or if we are cascading the validation.
-        if( ( updateContentBindingSource )
-          && ( ( this.IsDirty ) || ( this.IsInCascadingValidation ) ) )
-        {
-          // Update the Content binding's source and check for errors.
-          result = this.UpdateContentBindingSource( out exception, out ruleInError );
-        }
-        else
-        {
-          // Just check for errors. We must validate even if the cell isn't dirty since its value might have been in error even before entering edit on the row. 
-          // ie: DataErrorInfo or any other non-restrictive validation error.
-          result = this.ValidateContentBindingRules( out exception, out ruleInError );
-        }
-      }
-
-      // Only refresh ValidationError property, HasValidationError property, and the cell's style
-      // if if we are in a validating the UI Rules or if there wasn't any UI error before this validation pass.
-      if( ( validateUIRules ) || ( !this.HasUIValidationError ) )
-      {
-        this.SetAllError( result, exception, ruleInError );
-
-        if( cascadeValidate )
-        {
-          this.CascadeValidation();
-        }
-      }
-
-      return result;
-    }
-
-    internal ValidationResult ValidateCellEditorRules( out Exception validationException, out CellValidationRule ruleInError )
-    {
-      validationException = null;
-      ruleInError = null;
-
-      FrameworkElement cellEditorBoundControl = this.CellEditorBoundControl;
-
-      ValidationResult validationResult =
-        Cell.CellEditorErrorValidationRule.Validate( this.Content,
-        CultureInfo.CurrentCulture,
-        new CellValidationContext( this.GetRealDataContext(), this ),
-        cellEditorBoundControl );
-
-      if( !validationResult.IsValid )
-      {
-        ruleInError = Cell.CellEditorErrorValidationRule;
-        validationException = new DataGridException( "An invalid or incomplete value was provided." );
-      }
-
-      return validationResult;
-    }
-
-    internal void ClearAllErrors()
-    {
-      this.SetAllError( ValidationResult.ValidResult, null, null );
-    }
-
-    private static void OnContentBindingNotifyValidationError( object sender, ValidationErrorEventArgs e )
-    {
-      Cell cell = ( Cell )sender;
-
-      cell.NotifyContentBindingValidationError();
-    }
-
-    internal void NotifyContentBindingValidationError()
-    {
-      if( this.PreventValidateAndSetAllErrors )
-        return;
-
-      // Proceed only if the isn't any UI ValidationRules error flagged since last UI validation pass.
-      if( this.HasUIValidationError )
-        return;
-
-      var validationError = this.GetContentBindingValidationError();
-
-      // In order to minimize switching of styles when we need to update the Content Binding's source, the SetAllError method will not do anything while it is being prevented.
-      // e.g. : When we need to update the ContentBinding's source manually through EndEdit.
-      if( validationError != null )
-      {
-        this.SetAllError( new ValidationResult( false, validationError.ErrorContent ), validationError.Exception,
-                          new CellContentBindingValidationRule( validationError.RuleInError ) );
-      }
-      else
-      {
-        this.SetAllError( ValidationResult.ValidResult, null, null );
-      }
-    }
-
-    private void OnContentBindingTargetUpdated( object sender, DataTransferEventArgs e )
-    {
-      if( e.Property != Cell.ContentProperty )
-        return;
-
-      var cell = e.TargetObject as Cell;
-
-      // Under certain circumstances which have not yet been clearly identified, the TargetObject is the ContentPresenter of the ScrollTip.
-      // This would raise a NullReferenceException when trying to access cell's members, as the previous cast would return null.
-      if( cell == null )
-        return;
-
-      var parentRow = cell.ParentRow;
-
-      if( ( cell.IsUpdatingContentBindingSource ) || ( cell.PreventValidateAndSetAllErrors )
-        || ( parentRow == null ) || ( !parentRow.IsBeingEdited ) || ( !parentRow.IsDirty ) )
-      {
-        return;
-      }
-
-      // This method is called to make sure we are not calling ValidateAndSetAllErrors at all nor triggering a cascade validation
-      // as a side-effect of updating a cell's content binding source while another cell is bound to the very same source.
-      // We would be surprised of such a usage, but this fail-safe will take care of this possibility.
-      if( cell.GetIsSiblingUpdatingContentBindingSource() )
-        return;
-
-      Exception exception;
-      CellValidationRule ruleInError;
-      cell.ValidateAndSetAllErrors( false, true, false, true, out exception, out ruleInError );
-    }
-
-    private void CascadeValidation()
-    {
-      var parentRow = this.ParentRow;
-
-      if( parentRow == null )
-        return;
-
-      var dataGridUpdateSourceTrigger = this.GetContentBindingUpdateSourceTrigger();
-      var updateContentBindingSource = ( parentRow.IsEndingEdition || parentRow.IsCancelingEdition )
-                                        || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellEndingEdit )
-                                        || ( dataGridUpdateSourceTrigger == DataGridUpdateSourceTrigger.CellContentChanged );
-
-      // Create a clone of the list to avoid concurrent access when iterating and a Cell is added to CreatedCells because of ColumnVirtualization
-      var createdCells = new List<Cell>( parentRow.CreatedCells );
-
-      foreach( Cell siblingCell in createdCells )
-      {
-        if( ( siblingCell == this ) || ( siblingCell.ReadOnly ) || ( siblingCell.IsBeingEdited ) )
-          continue;
-
-        CellValidationError siblingValidationError = siblingCell.ValidationError;
-
-        if( ( siblingValidationError == null ) || ( Cell.GetIsCellEditorError( siblingValidationError ) ) )
-          continue;
-
-        siblingCell.IsInCascadingValidation = true;
-        try
-        {
-          Exception exception;
-          CellValidationRule ruleInError;
-          siblingCell.ValidateAndSetAllErrors( false, true, updateContentBindingSource, false, out exception, out ruleInError );
-        }
-        finally
-        {
-          siblingCell.IsInCascadingValidation = false;
-        }
-      }
-    }
-
-    private void SetAllError( ValidationResult result, Exception validationException, CellValidationRule ruleInError )
-    {
-      bool invalid = ( !result.IsValid );
-
-      if( invalid )
-      {
-        CellValidationError validationError = new CellValidationError( ruleInError, this, result.ErrorContent, validationException );
-
-        this.SetValidationError( validationError );
-      }
-      else
-      {
-        this.SetValidationError( null );
-      }
-    }
-
-    private ValidationResult ValidateCellRules( out Exception validationException, out CellValidationRule ruleInError )
-    {
-      ValidationResult result = ValidationResult.ValidResult;
-      ruleInError = null;
-      validationException = null;
-
-      CellValidationContext cellValidationContext = new CellValidationContext( this.GetRealDataContext(), this );
-
-      CultureInfo culture = this.Language.GetSpecificCulture();
-
-      foreach( CellValidationRule cellValidationRule in this.CellValidationRules )
-      {
-        try
-        {
-          result = cellValidationRule.Validate( this.Content, culture, cellValidationContext );
-        }
-        catch( Exception exception )
-        {
-          validationException = exception;
-          result = new ValidationResult( false, exception.Message );
-        }
-
-        if( !result.IsValid )
-        {
-          ruleInError = cellValidationRule;
-          break;
-        }
-      }
-
-      ColumnBase parentColumn = this.ParentColumn;
-
-      if( ( parentColumn != null ) && ( result.IsValid ) )
-      {
-        foreach( CellValidationRule cellValidationRule in parentColumn.CellValidationRules )
-        {
-          try
-          {
-            result = cellValidationRule.Validate( this.Content, culture, cellValidationContext );
-          }
-          catch( Exception exception )
-          {
-            validationException = exception;
-            result = new ValidationResult( false, exception.Message );
-          }
-
-          if( !result.IsValid )
-          {
-            ruleInError = cellValidationRule;
-            break;
-          }
-        }
-      }
-
-      return result;
-    }
-
-    private ValidationResult ValidateContentBindingRules( out Exception validationException, out CellValidationRule ruleInErrorWrapper )
-    {
-      validationException = null;
-      ruleInErrorWrapper = null;
-
-      ValidationError cellContentBindingValidationError = this.GetContentBindingValidationError();
-
-      if( cellContentBindingValidationError == null )
-        return ValidationResult.ValidResult;
-
-      ruleInErrorWrapper = new CellContentBindingValidationRule( cellContentBindingValidationError.RuleInError );
-      validationException = cellContentBindingValidationError.Exception;
-
-      return new ValidationResult( false, cellContentBindingValidationError.ErrorContent );
-    }
-
-    private ValidationError GetContentBindingValidationError()
-    {
-      BindingExpressionBase contentBindingExpression = this.GetContentBindingExpression();
-
-      return ( contentBindingExpression != null ) ? contentBindingExpression.ValidationError : null;
-    }
-
-    private delegate void ClearAllErrorsDelegate();
-
-    #endregion VALIDATION
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        var column = sender as ColumnBase;
-        if( ( column != null ) && ( column == this.ParentColumn ) )
-        {
-          this.OnParentColumnPropertyChanged( ( PropertyChangedEventArgs )e );
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    internal virtual void OnParentColumnPropertyChanged( PropertyChangedEventArgs e )
-    {
-      if( !this.IsContainerPrepared || this.IsContainerVirtualized )
-        return;
-
-      var propertyName = e.PropertyName;
-
-      if( string.IsNullOrEmpty( propertyName ) )
-      {
-        if( !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
-        {
-          this.UpdateCoercedContentTemplate( false );
-        }
-
-        this.UpdateFocusable();
-        this.UpdateMatchingDisplayConditions();
-      }
-      else if( propertyName == ColumnBase.CanBeCurrentWhenReadOnlyProperty.Name )
-      {
-        this.UpdateFocusable();
-      }
-      else if( propertyName == ColumnBase.CellEditorDisplayConditionsProperty.Name )
-      {
-        this.UpdateMatchingDisplayConditions();
-      }
-      else if( ( propertyName == ColumnBase.CellContentTemplateProperty.Name )
-            || ( propertyName == ColumnBase.CellContentTemplateSelectorProperty.Name ) )
-      {
-        if( !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
-        {
-          if( ( this.ContentTemplateInternal == null ) && ( this.ContentTemplateSelectorInternal == null ) )
-          {
-            this.UpdateCoercedContentTemplate( false );
-          }
-        }
-      }
-      else if( ( propertyName == ColumnBase.CellContentStringFormatProperty.Name )
-            || ( propertyName == ColumnBase.DefaultCultureProperty.Name )
-            || ( propertyName == Column.ForeignKeyConfigurationProperty.Name ) )
-      {
-        if( !this.IsCellEditorDisplayed && ( this.CurrentEditorPendingDisplayState != EditorDisplayState.PendingShow ) )
-        {
-          this.UpdateCoercedContentTemplate( false );
-        }
-      }
-      else if( propertyName == ColumnBase.CellEditorSelectorProperty.Name )
-      {
-        //Make sure the editor is refreshed even if it is currently displayed.
-        m_forceEditorRefresh = true;
-        this.RefreshDisplayedTemplate();
-        m_forceEditorRefresh = false;
-      }
-    }
-
-    #endregion
-
-    private KeyActivationGesture m_keyGesture; // = null
-    private TextCompositionEventArgs m_textInputArgs; // = null
-    private string m_fieldName; // = string.Empty
-    private object m_styleBeforeError = DependencyProperty.UnsetValue;
-
-    private RoutedEventHandler m_loadedRoutedEventHandler; // = null;
-    private DispatcherOperation m_delayedRefreshErrorStyleDispatcherOperation; // = null
-    private DispatcherOperation m_delayedHideEditTemplateDispatcherOperation;
-
-    private BitVector32 m_flags = new BitVector32();
-    private bool m_forceEditorRefresh;
-
-    // Binding used by the animated Column reordering feature
-    private static Binding ParentColumnTranslationBinding;
-    private static Binding ParentColumnIsBeingDraggedBinding;
-    private static Binding ParentColumnReorderingDragSourceManagerBinding;
-
-    private static Binding ParentRowCellContentOpacityBinding;
-    private ContentPresenter m_cellContentPresenter;
-
-    private int m_preventMakeVisibleCount; // = 0;
-    private bool m_readOnlyIsInternalySet;
-
-    #region CellFlags Private Type
-
-    [Flags]
-    private enum CellFlags
-    {
-      IsInternalyInitialized = 1,
-      IsContainerPrepared = 2,
-      FocusEditor = 4,
-      IsBeingEdited = 8,
-      IsCellEditorDisplayed = 16,
-      PreventValidateAndSetAllErrors = 32,
-      HasCellEditorError = 64,
-      HasUIValidationError = 128,
-      HasContentBindingValidationError = 256,
-      HasPendingErrorStyleRefresh = 512,
-      IsErrorStyleApplied = 1024,
-      HasPendingSyncParentErrorFlags = 2048,
-      IsUpdatingContentBindingSource = 4096,
-      IsInCascadingValidation = 8192,
-      IsRestoringEditionState = 16384,
-      IsContainerVirtualized = 32768,
-      AnimatedColumnReorderingBindingApplied = 65536,
-      PreventMakeVisible = 131072,
-      IsContainerRecycled = 262144,
-      IsContainerPartiallyCleared = 524288
-    }
-
-    #endregion
-
-    #region EditorDisplayState Private Type
-
-    private enum EditorDisplayState
-    {
-      None = 0,
-      PendingShow,
-      PendingHide
-    }
-
-    #endregion
-
-    #region PreventMakeVisibleDisposable Private Class
-
-    private class PreventMakeVisibleDisposable : IDisposable
-    {
-      public PreventMakeVisibleDisposable( Cell cell )
-      {
-        if( cell == null )
-          throw new ArgumentNullException( "cell" );
-
-        m_cell = cell;
-        m_cell.PreventMakeVisible = true;
-        m_cell.m_preventMakeVisibleCount++;
-      }
-
-      public void Dispose()
-      {
-        if( m_cell == null )
-          return;
-
-        m_cell.m_preventMakeVisibleCount--;
-
-        if( m_cell.m_preventMakeVisibleCount == 0 )
-          m_cell.PreventMakeVisible = false;
-
-        m_cell = null;
-      }
-
-      private Cell m_cell;
-    }
-
-    #endregion
-
-    #region EditorDataTemplate Private Class
-
-    private sealed class EditorDataTemplate : DataTemplate
-    {
-      private EditorDataTemplate( DataTemplate viewer, DataTemplate editor )
-      {
-        Debug.Assert( editor != null );
-
-        m_viewer = viewer;
-        m_editor = editor;
-      }
-
-      internal DataTemplate Viewer
-      {
-        get
-        {
-          return m_viewer;
-        }
-      }
-
-      internal DataTemplate Editor
-      {
-        get
-        {
-          return m_editor;
-        }
-      }
-
-      internal static EditorDataTemplate Create( DataTemplate viewer, DataTemplate editor )
-      {
-        var viewerContent = new FrameworkElementFactory( typeof( InnerCellContentPresenter ) );
-        viewerContent.SetValue( InnerCellContentPresenter.VisibilityProperty, Visibility.Hidden );
-        viewerContent.SetValue( InnerCellContentPresenter.ContentTemplateProperty, viewer );
-
-        var editorContent = new FrameworkElementFactory( typeof( InnerCellContentPresenter ) );
-        editorContent.SetValue( InnerCellContentPresenter.ContentTemplateProperty, editor );
-
-        var grid = new FrameworkElementFactory( typeof( Grid ) );
-        grid.AppendChild( viewerContent );
-        grid.AppendChild( editorContent );
-
-        var template = new EditorDataTemplate( viewer, editor );
-        template.VisualTree = grid;
-        template.Seal();
-
-        return template;
-      }
-
-      private readonly DataTemplate m_viewer;
-      private readonly DataTemplate m_editor;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellCollection.cs
deleted file mode 100644
index d8a519d0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellCollection.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class CellCollection : Collection<Cell>
-  {
-    public CellCollection()
-    {
-    }
-
-    internal CellCollection( IList<Cell> cells )
-      : base( cells )
-    {
-    }
-
-    public virtual Cell this[ ColumnBase column ]
-    {
-      get
-      {
-        int count = this.Count;
-
-        for( int i = 0; i < count; i++ )
-        {
-          Cell cell = this[ i ];
-
-          if( cell.ParentColumn == column )
-            return cell;
-        }
-
-        return null;
-      }
-    }
-
-    public virtual Cell this[ string fieldName ]
-    {
-      get
-      {
-        int count = this.Count;
-
-        for( int i = 0; i < count; i++ )
-        {
-          Cell cell = this[ i ];
-
-          if( string.Equals( cell.FieldName, fieldName ) )
-            return cell;
-        }
-
-        return null;
-      }
-    }
-
-    protected override void InsertItem( int index, Cell item )
-    {
-      base.InsertItem( index, item );
-    }
-
-    protected override void RemoveItem( int index )
-    {
-      base.RemoveItem( index );
-    }
-
-    protected override void SetItem( int index, Cell item )
-    {
-      base.SetItem( index, item );
-    }
-
-
-    protected override void ClearItems()
-    {
-      base.ClearItems();
-    }
-
-    internal virtual void InternalAdd( Cell cell )
-    {
-      this.Items.Add( cell );
-    }
-
-    internal virtual void InternalClear()
-    {
-      this.Items.Clear();
-    }
-
-    internal virtual void InternalInsert( int index, Cell cell )
-    {
-      this.Items.Insert( index, cell );
-    }
-
-    internal virtual void InternalRemove( Cell cell )
-    {
-      this.Items.Remove( cell );
-    }
-
-    internal virtual void InternalRemoveAt( int index )
-    {
-      this.Items.RemoveAt( index );
-    }
-
-    internal virtual void InternalSetCell( int index, Cell cell )
-    {
-      this.Items[ index ] = cell;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs
deleted file mode 100644
index e0bd4aff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class CellContentPresenter : ContentPresenter
-  {
-    static CellContentPresenter()
-    {
-      CellContentPresenter.MinHeightProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( null, new CoerceValueCallback( CellContentPresenter.CoerceMinHeight ) ) );
-      TextElement.FontFamilyProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
-      TextElement.FontSizeProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
-      TextElement.FontStretchProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
-      TextElement.FontStyleProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
-      TextElement.FontWeightProperty.OverrideMetadata( typeof( CellContentPresenter ), new FrameworkPropertyMetadata( new PropertyChangedCallback( CellContentPresenter.InvalidateMinHeight ) ) );
-
-      m_sContentBinding = new Binding();
-      m_sContentBinding.RelativeSource = RelativeSource.TemplatedParent;
-      m_sContentBinding.Mode = BindingMode.OneWay;
-      m_sContentBinding.Path = new PropertyPath( Cell.ContentProperty );
-
-      m_sContentTemplateBinding = new Binding();
-      m_sContentTemplateBinding.RelativeSource = RelativeSource.TemplatedParent;
-      m_sContentTemplateBinding.Mode = BindingMode.OneWay;
-      m_sContentTemplateBinding.Path = new PropertyPath( Cell.CoercedContentTemplateProperty );
-
-      Binding trimmingBinding = new Binding();
-      trimmingBinding.Path = new PropertyPath( "(0).(1).(2)",
-        Cell.ParentCellProperty,
-        Cell.ParentColumnProperty,
-        ColumnBase.TextTrimmingProperty );
-      trimmingBinding.Mode = BindingMode.OneWay;
-      trimmingBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      Binding wrappingBinding = new Binding();
-      wrappingBinding.Path = new PropertyPath( "(0).(1).(2)",
-        Cell.ParentCellProperty,
-        Cell.ParentColumnProperty,
-        ColumnBase.TextWrappingProperty );
-      wrappingBinding.Mode = BindingMode.OneWay;
-      wrappingBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      m_sTextBlockStyle = new Style( typeof( TextBlock ) );
-      m_sTextBlockStyle.Setters.Add( new Setter( TextBlock.TextTrimmingProperty, trimmingBinding ) );
-      m_sTextBlockStyle.Setters.Add( new Setter( TextBlock.TextWrappingProperty, wrappingBinding ) );
-      m_sTextBlockStyle.Seal();
-    }
-
-    public CellContentPresenter()
-    {
-      this.Resources.Add( typeof( TextBlock ), m_sTextBlockStyle );
-      this.DataContext = null;
-
-      this.SetCurrentValue( CellContentPresenter.MinHeightProperty, 0d );
-    }
-
-    public override void EndInit()
-    {
-      base.EndInit();
-
-      BindingOperations.SetBinding( this, CellContentPresenter.ContentProperty, m_sContentBinding );
-      BindingOperations.SetBinding( this, CellContentPresenter.ContentTemplateProperty, m_sContentTemplateBinding );
-    }
-
-    private static object CoerceMinHeight( DependencyObject sender, object value )
-    {
-      var self = sender as CellContentPresenter;
-      if( self == null )
-        return value;
-
-      return self.CoerceMinHeight( new Thickness(), value );
-    }
-
-    private static void InvalidateMinHeight( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as CellContentPresenter;
-      if( self == null )
-        return;
-
-      self.CoerceValue( CellContentPresenter.MinHeightProperty );
-    }
-
-    private static Binding m_sContentTemplateBinding;
-    private static Binding m_sContentBinding;
-    private static Style m_sTextBlockStyle;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditor.cs
deleted file mode 100644
index 6be35cc3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditor.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Input;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class CellEditor: Freezable
-  {
-    static CellEditor()
-    {
-      CellEditor.ActivationGesturesProperty = CellEditor.ActivationGesturesPropertyKey.DependencyProperty;
-    }
-
-    public CellEditor()
-    {
-      this.SetActivationGestures( new ActivationGestureCollection() );
-    }
-
-    public static CellEditor TextBoxEditor
-    {
-      get
-      {
-        return DefaultCellEditorSelector.TextBoxEditor;
-      }
-    }
-
-    public static CellEditor CheckBoxEditor
-    {
-      get
-      {
-        return DefaultCellEditorSelector.CheckBoxEditor;
-      }
-    }
-
-    public static CellEditor DatePickerEditor
-    {
-      get
-      {
-        return DefaultCellEditorSelector.DateTimeEditor;
-      }
-    }
-
-    #region EditTemplate Property
-
-    public static readonly DependencyProperty EditTemplateProperty =
-        DependencyProperty.Register( "EditTemplate", typeof( DataTemplate ), typeof( CellEditor ), new UIPropertyMetadata( null ) );
-
-    public DataTemplate EditTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( CellEditor.EditTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( CellEditor.EditTemplateProperty, value );
-      }
-    }
-
-    #endregion EditTemplate Property
-
-    #region ActivationGestures Property
-
-    private static readonly DependencyPropertyKey ActivationGesturesPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ActivationGestures",
-      typeof( ActivationGestureCollection ), 
-      typeof( CellEditor ), 
-      new FrameworkPropertyMetadata( ( ActivationGestureCollection )null ) );
-
-    public static readonly DependencyProperty ActivationGesturesProperty;
-
-    public ActivationGestureCollection ActivationGestures
-    {
-      get 
-      { 
-        return (ActivationGestureCollection)this.GetValue( CellEditor.ActivationGesturesProperty ); 
-      }
-    }
-
-    private void SetActivationGestures( ActivationGestureCollection value )
-    {
-      this.SetValue( CellEditor.ActivationGesturesPropertyKey, value );
-    }
-
-    #endregion
-
-    #region HasError Attached Property
-
-    public static readonly DependencyProperty HasErrorProperty =
-        DependencyProperty.RegisterAttached( "HasError", typeof( bool ), typeof( CellEditor ), new UIPropertyMetadata( false ) );
-
-    public static bool GetHasError( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( HasErrorProperty );
-    }
-
-    public static void SetHasError( DependencyObject obj, bool value )
-    {
-      obj.SetValue( HasErrorProperty, value );
-    }
-
-    #endregion HasError Attached Property
-
-    protected override Freezable CreateInstanceCore()
-    {
-      CellEditor editorClone = new CellEditor();
-
-      foreach( ActivationGesture gesture in this.ActivationGestures )
-      {
-        editorClone.ActivationGestures.Add( gesture.Clone() as ActivationGesture );
-      }
-
-      return editorClone;
-    }
-
-    internal KeyActivationGesture GetMatchingKeyActivationGesture( Key key, Key systemKey, ModifierKeys modifier)
-    {
-      foreach( ActivationGesture gesture in this.ActivationGestures )
-      {
-        KeyActivationGesture keyGesture = gesture as KeyActivationGesture;
-
-        if( keyGesture != null )
-        {
-          if( keyGesture.IsActivationKey( key, systemKey, modifier ) == true )
-          {
-            return keyGesture;
-          }
-        }
-      }
-
-      return null; 
-    }
-
-    internal virtual bool IsTextInputActivation()
-    {
-      foreach( ActivationGesture gesture in this.ActivationGestures )
-      {
-        if( gesture is TextInputActivationGesture )
-        {
-          return true;
-        }
-      }
-      return false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorContext.cs
deleted file mode 100644
index b24a929c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorContext.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class CellEditorContext : DependencyObject
-  {
-    #region Constructors
-
-    static CellEditorContext()
-    {
-      CellEditorContext.ForeignKeyConfigurationProperty = CellEditorContext.ForeignKeyConfigurationPropertyKey.DependencyProperty;
-      CellEditorContext.ParentColumnProperty = CellEditorContext.ParentColumnPropertyKey.DependencyProperty;
-    }
-
-    internal CellEditorContext( ColumnBase parentColumn, ForeignKeyConfiguration configuration )
-    {
-      this.SetParentColumn( parentColumn );
-      this.SetForeignKeyConfiguration( configuration );
-    } 
-
-    #endregion
-
-    #region ForeignKeyConfiguration Property
-
-    private static readonly DependencyPropertyKey ForeignKeyConfigurationPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ForeignKeyConfiguration",
-      typeof( ForeignKeyConfiguration ),
-      typeof( CellEditorContext ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty ForeignKeyConfigurationProperty;
-
-    public ForeignKeyConfiguration ForeignKeyConfiguration
-    {
-      get
-      {
-        return ( ForeignKeyConfiguration )this.GetValue( CellEditorContext.ForeignKeyConfigurationProperty );
-      }
-    }
-
-    private void SetForeignKeyConfiguration( ForeignKeyConfiguration value )
-    {
-      this.SetValue( CellEditorContext.ForeignKeyConfigurationPropertyKey, value );
-    }
-
-    private void ClearForeignKeyConfiguration()
-    {
-      this.ClearValue( CellEditorContext.ForeignKeyConfigurationPropertyKey );
-    }
-
-    #endregion
-
-    #region ParentColumn Property
-
-    private static readonly DependencyPropertyKey ParentColumnPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ParentColumn",
-      typeof( ColumnBase ),
-      typeof( CellEditorContext ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty ParentColumnProperty;
-
-    public ColumnBase ParentColumn
-    {
-      get
-      {
-        return ( ColumnBase )this.GetValue( CellEditorContext.ParentColumnProperty );
-      }
-    }
-
-    private void SetParentColumn( ColumnBase value )
-    {
-      this.SetValue( CellEditorContext.ParentColumnPropertyKey, value );
-    }
-
-    private void ClearParentColumn()
-    {
-      this.ClearValue( CellEditorContext.ParentColumnPropertyKey );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorSelector.cs
deleted file mode 100644
index 39d6984a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorSelector.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  public abstract class CellEditorSelector
-  {
-    public virtual CellEditor SelectCellEditor( ColumnBase column, object item )
-    {
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellState.cs
deleted file mode 100644
index d91a2e9e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellState.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class CellState
-  {
-    public CellState()
-    {
-      m_contentBeforeRowEdition = DependencyProperty.UnsetValue;
-      m_contentBeforeCellEdition = DependencyProperty.UnsetValue;
-    }
-
-    public CellValidationError CellValidationError
-    {
-      get
-      {
-        return m_cellValidationError;
-      }
-    }
-
-    public bool IsBeingEdited
-    {
-      get
-      {
-        return m_isBeingEdited;
-      }
-    }
-
-    public bool IsDirty
-    {
-      get
-      {
-        return m_isDirty;
-      }
-    }
-
-    #region ContentBeforeRowEdition Read-Only Property
-
-    public object ContentBeforeRowEdition
-    {
-      get { return m_contentBeforeRowEdition; }
-    }
-
-    internal void SetContentBeforeRowEdition( object value )
-    {
-      m_contentBeforeRowEdition = value;
-    }
-
-    private object m_contentBeforeRowEdition = DependencyProperty.UnsetValue;
-
-    #endregion ContentBeforeRowEdition Read-Only Property
-
-    #region ContentBeforeCellEdition Read-Only Property
-
-    public object ContentBeforeCellEdition
-    {
-      get { return m_contentBeforeCellEdition; }
-    }
-
-    internal void SetContentBeforeCellEdition( object value )
-    {
-      m_contentBeforeCellEdition = value;
-    }
-
-    private object m_contentBeforeCellEdition = DependencyProperty.UnsetValue;
-
-    #endregion ContentBeforeCellEdition Read-Only Property
-
-    #region Content
-
-    public object Content
-    {
-      get { return m_content; }
-    }
-
-    internal void SetContent( object value )
-    {
-      m_content = value;
-    }
-
-    private object m_content = DependencyProperty.UnsetValue;
-
-    #endregion Content
-
-    #region IsDirtyBeforeEdition Property
-
-    public Nullable<bool> IsDirtyBeforeEdition 
-    {
-      get
-      {
-        return m_isDirtyBeforeEdition;
-      }
-    }
-
-    internal void SetIsDirtyBeforeEdition( Nullable<bool> value )
-    {
-      m_isDirtyBeforeEdition = value;
-    }
-
-    private Nullable<bool> m_isDirtyBeforeEdition;
-
-    #endregion IsDirtyBeforeEdition Property
-
-    public CellState Clone()
-    {
-      CellState cellState = new CellState();
-
-      cellState.m_content = m_content;
-      cellState.m_contentBeforeRowEdition = m_contentBeforeRowEdition;
-      cellState.m_contentBeforeCellEdition = m_contentBeforeCellEdition;
-      cellState.m_isDirtyBeforeEdition = m_isDirtyBeforeEdition;
-
-      cellState.m_cellValidationError = m_cellValidationError;
-      cellState.m_isBeingEdited = m_isBeingEdited;
-      cellState.m_isDirty = m_isDirty;
-
-      return cellState;
-    }
-
-    internal void SetCellValidationError( CellValidationError value )
-    {
-      m_cellValidationError = value;
-    }
-
-    internal void SetIsBeingEdited( bool value )
-    {
-      m_isBeingEdited = value;
-    }
-
-    internal void SetIsDirty( bool value )
-    {
-      m_isDirty = value;
-    }
-
-    private CellValidationError m_cellValidationError; // = null
-    private bool m_isBeingEdited; // = false
-    private bool m_isDirty; // = false
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationContext.cs
deleted file mode 100644
index f4f32c91..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationContext.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class CellValidationContext
-  {
-    public CellValidationContext( object dataItem, Cell cell )
-    {
-      m_cell = cell;
-      m_dataItem = dataItem;
-    }
-
-    public object DataItem
-    {
-      get
-      {
-        return m_dataItem;
-      }
-    }
-
-    public Cell Cell
-    {
-      get
-      {
-        return m_cell;
-      }
-    }
-
-    private object m_dataItem;
-    private Cell m_cell;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationError.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationError.cs
deleted file mode 100644
index 2f215386..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationError.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.ValidationRules;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class CellValidationError
-  {
-    public CellValidationError( 
-      CellValidationRule ruleInError, 
-      Cell cellInError, 
-      object errorContent, 
-      Exception exception )
-    {
-      m_ruleInError = ruleInError;
-      m_cellInError = cellInError;
-      m_errorContent = errorContent;
-      m_exception = exception;
-    }
-
-    public CellValidationRule RuleInError
-    {
-      get
-      {
-        return m_ruleInError;
-      }
-    }
-
-    public Cell CellInError
-    {
-      get
-      {
-        return m_cellInError;
-      }
-    }
-
-    public object ErrorContent
-    {
-      get
-      {
-        return m_errorContent;
-      }
-      set
-      {
-        m_errorContent = value;
-      }
-    }
-
-    public Exception Exception
-    {
-      get
-      {
-        return m_exception;
-      }
-    }
-
-    private CellValidationRule m_ruleInError;
-    private Cell m_cellInError;
-    private object m_errorContent;
-    private Exception m_exception;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CheckBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CheckBox.cs
deleted file mode 100644
index bf6b17ca..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CheckBox.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Security;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Automation;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_ChildCheckBox", Type = typeof( System.Windows.Controls.CheckBox ) )]
-  public class DataGridCheckBox : ContentControl
-  {
-    static DataGridCheckBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DataGridCheckBox ), new FrameworkPropertyMetadata( typeof( DataGridCheckBox ) ) );
-
-      AutomationProperties.AutomationIdProperty.OverrideMetadata( typeof( DataGridCheckBox ), new UIPropertyMetadata( "CheckBox" ) );
-
-      CheckedEvent = System.Windows.Controls.CheckBox.CheckedEvent.AddOwner( typeof( DataGridCheckBox ) );
-      UncheckedEvent = System.Windows.Controls.CheckBox.UncheckedEvent.AddOwner( typeof( DataGridCheckBox ) );
-      IndeterminateEvent = System.Windows.Controls.CheckBox.IndeterminateEvent.AddOwner( typeof( DataGridCheckBox ) );
-
-      EventManager.RegisterClassHandler( typeof( DataGridCheckBox ), CheckedEvent, new RoutedEventHandler( CheckBoxEventHandler ) );
-      EventManager.RegisterClassHandler( typeof( DataGridCheckBox ), UncheckedEvent, new RoutedEventHandler( CheckBoxEventHandler ) );
-      EventManager.RegisterClassHandler( typeof( DataGridCheckBox ), IndeterminateEvent, new RoutedEventHandler( CheckBoxEventHandler ) );
-    }
-
-    #region IsChecked Property
-
-    public static readonly DependencyProperty IsCheckedProperty =
-      System.Windows.Controls.CheckBox.IsCheckedProperty.AddOwner( typeof( DataGridCheckBox ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnIsCheckedChanged ) ) );
-
-    [TypeConverter( typeof( NullableBoolConverter ) )]
-    public Nullable<bool> IsChecked
-    {
-      get
-      {
-        return ( Nullable<bool> )this.GetValue( DataGridCheckBox.IsCheckedProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridCheckBox.IsCheckedProperty, value );
-      }
-    }
-
-    #endregion IsChecked Property
-
-    #region IsThreeState Property
-
-    public static readonly DependencyProperty IsThreeStateProperty = System.Windows.Controls.CheckBox.IsThreeStateProperty.AddOwner( typeof( DataGridCheckBox ) );
-
-    public bool IsThreeState
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridCheckBox.IsThreeStateProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridCheckBox.IsThreeStateProperty, value );
-      }
-    }
-
-    #endregion IsThreeState Property
-
-    public static readonly RoutedEvent CheckedEvent;
-    public static readonly RoutedEvent UncheckedEvent;
-    public static readonly RoutedEvent IndeterminateEvent;
-
-    public event RoutedEventHandler Checked
-    {
-      add
-      {
-        base.AddHandler( DataGridCheckBox.CheckedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridCheckBox.CheckedEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler Unchecked
-    {
-      add
-      {
-        base.AddHandler( DataGridCheckBox.UncheckedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridCheckBox.UncheckedEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler Indeterminate
-    {
-      add
-      {
-        base.AddHandler( DataGridCheckBox.IndeterminateEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridCheckBox.IndeterminateEvent, value );
-      }
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      base.OnPreviewKeyDown( e );
-
-      if( e.Handled == false )
-      {
-        //if this item is the source of the PreviewKeyDown event
-        if( e.OriginalSource == this && e.IsRepeat == false )
-        {
-          e.Handled = this.ProcessKeyEventArgs( e, this.ChildCheckBox );
-        }
-      }
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      base.OnKeyDown( e );
-
-      if( e.Handled == false )
-      {
-        if( e.OriginalSource == this && e.IsRepeat == false )
-        {
-          e.Handled = this.ProcessKeyEventArgs( e, this.ChildCheckBox );
-        }
-      }
-    }
-
-    protected override void OnPreviewKeyUp( KeyEventArgs e )
-    {
-      base.OnPreviewKeyUp( e );
-
-      if( e.Handled == false )
-      {
-        if( e.OriginalSource == this && e.IsRepeat == false )
-        {
-          e.Handled = this.ProcessKeyEventArgs( e, this.ChildCheckBox );
-        }
-      }
-    }
-
-    protected override void OnKeyUp( KeyEventArgs e )
-    {
-      base.OnKeyUp( e );
-
-      if( e.Handled == false )
-      {
-        if( e.OriginalSource == this && e.IsRepeat == false )
-        {
-          e.Handled = this.ProcessKeyEventArgs( e, this.ChildCheckBox );
-        }
-      }
-    }
-
-    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      base.OnPreviewMouseLeftButtonDown( e );
-
-      if( e.Handled == false )
-      {
-        this.Focus();
-
-        //do not set the e.Handled to true, we want the mouse down event to go as far as possible (true checkbox)
-      }
-    }
-
-    private System.Windows.Controls.CheckBox ChildCheckBox
-    {
-      get
-      {
-        return this.GetTemplateChild( "PART_ChildCheckBox" ) as System.Windows.Controls.CheckBox;
-      }
-    }
-
-    private bool ProcessKeyEventArgs( KeyEventArgs e, IInputElement target )
-    {
-      bool retval = false;
-
-      if( target != null )
-      {
-        //foward the event to the child check box
-        Key realKey;
-        if( ( e.Key == Key.None ) && ( e.SystemKey != Key.None ) )
-        {
-          realKey = e.SystemKey;
-        }
-        else
-        {
-          realKey = e.Key;
-        }
-
-        //in XBAP the Keyboard.PrimaryDevice.ActiveSource will throw ,therefore, protect against the throw and suppress the exception
-        //if its the one we expect.
-        try
-        {
-          KeyEventArgs kea = new KeyEventArgs( Keyboard.PrimaryDevice, Keyboard.PrimaryDevice.ActiveSource, 0, realKey );
-          kea.RoutedEvent = e.RoutedEvent;
-
-          //send the event
-          target.RaiseEvent( kea );
-
-          retval = kea.Handled;
-        }
-        catch( SecurityException ex )
-        {
-          //if the exception is for the UIPermission, then we want to suppress it
-          if( ( ex.PermissionType.FullName == "System.Security.Permissions.UIPermission" ) == false )
-          {
-            //not correct type, then rethrow the exception
-            throw;
-          }
-          else //this means that we are in XBAP
-          {
-            //we want to handle speciallly the case where the space was pressed (so that checkbox works in XBAP)
-            //condition taken from the System ChecckBox
-            if( ( e.RoutedEvent == Keyboard.KeyDownEvent )
-                && ( e.Key == Key.Space )
-                && ( ( Keyboard.Modifiers & ( ModifierKeys.Control | ModifierKeys.Alt ) ) != ModifierKeys.Alt )
-                && ( this.IsMouseCaptured == false ) )
-            {
-              if( this.IsChecked.HasValue == true )
-              {
-                if( this.IsChecked.Value == false )
-                {
-                  this.IsChecked = true;
-                }
-                else if( this.IsThreeState == false )
-                {
-                  this.IsChecked = false;
-                }
-                else
-                {
-                  this.IsChecked = null;
-                }
-              }
-              else
-              {
-                this.IsChecked = false;
-              }
-
-              retval = true;
-            }
-          }
-        }
-      }
-
-      return retval;
-    }
-
-    private static void CheckBoxEventHandler( object sender, RoutedEventArgs e )
-    {
-      //this condition detects that the event does not originates from himself and suppress the event if it does...
-      if( sender != e.OriginalSource )
-      {
-        e.Handled = true;
-      }
-    }
-
-    private static void OnIsCheckedChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridCheckBox obj = ( DataGridCheckBox )sender;
-      Nullable<bool> newValue = ( Nullable<bool> )e.NewValue;
-
-      if( newValue.HasValue == true )
-      {
-        if( newValue.GetValueOrDefault() == true )
-        {
-          obj.RaiseEvent( new RoutedEventArgs( DataGridCheckBox.CheckedEvent ) );
-        }
-        else
-        {
-          obj.RaiseEvent( new RoutedEventArgs( DataGridCheckBox.UncheckedEvent ) );
-        }
-      }
-      else
-      {
-        obj.RaiseEvent( new RoutedEventArgs( DataGridCheckBox.IndeterminateEvent ) );
-      }
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.cs
deleted file mode 100644
index 448cb17a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal partial class GenericContentTemplateSelectorResources : ResourceDictionary
-	{
-	}
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.xaml
deleted file mode 100644
index 7ced3878..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 x:Class="Xceed.Wpf.DataGrid.GenericContentTemplateSelectorResources"
-                    x:ClassModifier="internal"
-                    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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:s="clr-namespace:System;assembly=mscorlib">
-
-   <conv:ImageConverter x:Key="imageConverter" />
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-
-   <DataTemplate x:Key="imageDefaultContentTemplate">
-
-      <Image Source="{Binding Converter={StaticResource imageConverter}, Mode=OneWay}" />
-
-   </DataTemplate>
-
-   <DataTemplate x:Key="booleanDefaultContentTemplate">
-
-      <CheckBox IsHitTestVisible="False"
-                IsChecked="{Binding Mode=OneWay}" />
-
-   </DataTemplate>
-
-   <DataTemplate x:Key="foreignKeyDefaultContentTemplate">
-
-      <!-- Binding to the properties of the Cell's ParentColumn-->
-      <local:ForeignKeyContentControl Key="{Binding Mode=OneWay}"
-                                      ForeignKeyConfiguration="{Binding RelativeSource={RelativeSource self}, Path=(local:Cell.ParentCell).ParentColumn.ForeignKeyConfiguration, Mode=OneWay}"
-                                      ContentTemplate="{Binding RelativeSource={RelativeSource self}, Path=(local:Cell.ParentCell).ParentColumn.CellContentTemplate, Mode=OneWay}"
-                                      ContentTemplateSelector="{Binding RelativeSource={RelativeSource self}, Path=(local:Cell.ParentCell).ParentColumn.CellContentTemplateSelector, Mode=OneWay}" />
-
-   </DataTemplate>
-
-   <DataTemplate x:Key="foreignKeyGroupValueDefaultContentTemplate">
-
-      <local:ForeignKeyGroupContentControl />
-
-   </DataTemplate>
-
-   <DataTemplate x:Key="foreignKeyScrollTipDefaultContentTemplate">
-
-      <!-- Bind to the properties on MainColumn of the ScrollTip DataGridContext -->
-      <local:ForeignKeyScrollTipContentControl Key="{Binding Mode=OneWay}"
-                                               ForeignKeyConfiguration="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).Columns.MainColumn.ForeignKeyConfiguration, Mode=OneWay}" />
-
-   </DataTemplate>
-
-   <DataTemplate x:Key="commonDefaultContentTemplate">
-
-      <TextBlock Text="{Binding Mode=OneWay}" />
-
-   </DataTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs
deleted file mode 100644
index 48b7010d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [DebuggerDisplay( "FieldName = {FieldName}" )]
-  public class Column : ColumnBase
-  {
-    #region Static Fields
-
-    internal static readonly string AllowSortPropertyName = PropertyHelper.GetPropertyName( ( Column c ) => c.AllowSort );
-    internal static readonly string AllowGroupPropertyName = PropertyHelper.GetPropertyName( ( Column c ) => c.AllowGroup );
-#pragma warning disable 618
-    internal static readonly string DisplayMemberBindingPropertyName = PropertyHelper.GetPropertyName( ( Column c ) => c.DisplayMemberBinding );
-#pragma warning restore 618
-    internal static readonly string DisplayMemberBindingInfoPropertyName = PropertyHelper.GetPropertyName( ( Column c ) => c.DisplayMemberBindingInfo );
-
-    #endregion
-
-    public Column()
-    {
-    }
-
-    [Obsolete( "The DisplayMemberBinding property is obsolete and has been replaced by the DisplayMemberBindingInfo property.", false )]
-    public Column( string fieldName, object title, BindingBase displayMemberBinding )
-      : base( fieldName, title )
-    {
-      this.SetDisplayMemberBinding( displayMemberBinding );
-    }
-
-    internal static Column Create( string fieldName, object title, BindingBase displayMemberBinding )
-    {
-      // Disable warning for DisplayMemberBinding when internaly used
-#pragma warning disable 618
-      var column = new Column( fieldName, title, displayMemberBinding );
-#pragma warning restore 618
-
-      return column;
-    }
-
-    #region DisplayMemberBinding Property
-
-    private BindingBase m_displayMemberBinding; // = null
-
-    [Obsolete( "The DisplayMemberBinding property is obsolete and has been replaced by the DisplayMemberBindingInfo property.", false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public BindingBase DisplayMemberBinding
-    {
-      get
-      {
-        return m_displayMemberBinding;
-      }
-
-      set
-      {
-        if( value == m_displayMemberBinding )
-          return;
-
-        m_displayMemberBinding = value;
-
-        this.OnPropertyChanged( new PropertyChangedEventArgs( Column.DisplayMemberBindingPropertyName ) );
-      }
-    }
-
-    internal BindingBase GetDisplayMemberBinding()
-    {
-      // Disable warning for DisplayMemberBinding when internaly used
-#pragma warning disable 618
-      var value = this.DisplayMemberBinding;
-#pragma warning restore 618
-
-      return value;
-    }
-
-    internal void SetDisplayMemberBinding( BindingBase value )
-    {
-      // Disable warning for DisplayMemberBinding when internaly used
-#pragma warning disable 618
-      this.DisplayMemberBinding = value;
-#pragma warning restore 618
-    }
-
-    #endregion DisplayMemberBinding Property
-
-    #region DisplayMemberBindingInfo Property
-
-    private DataGridBindingInfo m_displayMemberBindingInfo;
-
-    public DataGridBindingInfo DisplayMemberBindingInfo
-    {
-      get
-      {
-        return m_displayMemberBindingInfo;
-      }
-
-      set
-      {
-        if( value != m_displayMemberBindingInfo )
-        {
-          m_displayMemberBindingInfo = value;
-          m_displayMemberBinding = m_displayMemberBindingInfo.GetBinding();
-
-          this.OnPropertyChanged( new PropertyChangedEventArgs( Column.DisplayMemberBindingInfoPropertyName ) );
-        }
-      }
-    }
-
-    #endregion DisplayMemberBindingInfo Property
-
-    #region AllowSort Property
-
-    public override bool AllowSort
-    {
-      get
-      {
-        return m_allowSort;
-      }
-      set
-      {
-        if( m_allowSort == value )
-          return;
-
-        m_allowSort = value;
-        this.OnPropertyChanged( new PropertyChangedEventArgs( Column.AllowSortPropertyName ) );
-      }
-    }
-
-    private bool m_allowSort = true;
-
-    #endregion AllowSort Property
-
-    #region AllowGroup Property
-
-    public override bool AllowGroup
-    {
-      get
-      {
-        return m_allowGroup;
-      }
-      set
-      {
-        if( m_allowGroup == value )
-          return;
-
-        m_allowGroup = value;
-        this.OnPropertyChanged( new PropertyChangedEventArgs( Column.AllowGroupPropertyName ) );
-      }
-    }
-
-    private bool m_allowGroup = true;
-
-    #endregion AllowGroup Property
-
-    #region IsAutoCreated Property
-
-    public bool IsAutoCreated
-    {
-      get;
-      internal set;
-    }
-
-    #endregion IsAutoCreated Property
-
-    #region DistinctValues Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The DistinctValues property is obsolete and has been replaced by the DataGridCollectionView.DistinctValues and DataGridContext.DistinctValues properties.", true )]
-    public ICollection DistinctValues
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    #endregion DistinctValues Property
-
-    #region ParentGrid Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The ParentDataGridControl property is obsolete.", true )]
-    protected DataGridControl ParentDataGridControl
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    #endregion ParentGrid Property
-
-    #region ForeignKeyConfiguration Property
-
-    internal event EventHandler ForeignKeyConfigurationChanged;
-
-    public static readonly DependencyProperty ForeignKeyConfigurationProperty = DependencyProperty.Register(
-      "ForeignKeyConfiguration",
-      typeof( ForeignKeyConfiguration ),
-      typeof( Column ),
-      new FrameworkPropertyMetadata(
-        null,
-        new PropertyChangedCallback( Column.OnForeignKeyConfigurationChanged ) ) );
-
-    public ForeignKeyConfiguration ForeignKeyConfiguration
-    {
-      get
-      {
-        return ( ForeignKeyConfiguration )this.GetValue( Column.ForeignKeyConfigurationProperty );
-      }
-      set
-      {
-        this.SetValue( Column.ForeignKeyConfigurationProperty, value );
-      }
-    }
-
-    private static void OnForeignKeyConfigurationChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var column = ( Column )sender;
-
-      column.RaiseForeignKeyConfigurationChanged();
-
-      if( column.ParentDetailConfiguration != null )
-      {
-        column.ParentDetailConfiguration.SynchronizeForeignKeyConfigurations();
-      }
-      else if( column.DataGridControl != null )
-      {
-        column.DataGridControl.SynchronizeForeignKeyConfigurations();
-      }
-    }
-
-    private void RaiseForeignKeyConfigurationChanged()
-    {
-      var handler = this.ForeignKeyConfigurationChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    #endregion
-
-    #region IsBindingAutoCreated Property
-
-    internal bool IsBindingAutoCreated
-    {
-      get
-      {
-        return m_isBindingAutoCreated;
-      }
-      set
-      {
-        m_isBindingAutoCreated = value;
-      }
-    }
-
-    private bool m_isBindingAutoCreated; //false
-
-    #endregion
-
-    #region IsBoundToDataGridUnboundItemProperty Property
-
-    internal bool IsBoundToDataGridUnboundItemProperty
-    {
-      get
-      {
-        return m_isBoundToDataGridUnboundItemProperty;
-      }
-      set
-      {
-        if( value == m_isBoundToDataGridUnboundItemProperty )
-          return;
-
-        m_isBoundToDataGridUnboundItemProperty = value;
-        this.ResetDefaultCellRecyclingGroup();
-      }
-    }
-
-    private bool m_isBoundToDataGridUnboundItemProperty; //false
-
-    #endregion
-
-#if DEBUG
-    public override string ToString()
-    {
-      string toString = base.ToString();
-
-      if( string.IsNullOrEmpty( this.FieldName ) == false )
-        toString += " " + this.FieldName;
-
-      return toString;
-    }
-#endif
-
-    internal override object CreateDefaultCellRecyclingGroup()
-    {
-      var key = base.CreateDefaultCellRecyclingGroup();
-
-      if( !this.IsBoundToDataGridUnboundItemProperty )
-        return key;
-
-      return new UnboundColumnCellRecyclingGroupKey( key );
-    }
-
-    #region UnboundColumnCellRecyclingGroupKey Private Nested Type
-
-    private sealed class UnboundColumnCellRecyclingGroupKey
-    {
-      internal UnboundColumnCellRecyclingGroupKey( object key )
-      {
-        m_key = key;
-      }
-
-      public override int GetHashCode()
-      {
-        if( m_key != null )
-          return m_key.GetHashCode();
-
-        return 0;
-      }
-
-      public override bool Equals( object obj )
-      {
-        UnboundColumnCellRecyclingGroupKey key = obj as UnboundColumnCellRecyclingGroupKey;
-        if( key == null )
-          return false;
-
-        if( key == this )
-          return true;
-
-        return object.Equals( key.m_key, m_key );
-      }
-
-      private readonly object m_key;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnAddGroupCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnAddGroupCommand.cs
deleted file mode 100644
index 9b4660e5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnAddGroupCommand.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ObjectModel;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class ColumnAddGroupCommand : ColumnGroupCommand
-  {
-    #region GroupDescriptions Protected Property
-
-    protected abstract ObservableCollection<GroupDescription> GroupDescriptions
-    {
-      get;
-    }
-
-    #endregion
-
-    public bool CanExecute( ColumnBase column )
-    {
-      return this.CanExecute( column, -1 );
-    }
-
-    public bool CanExecute( ColumnBase column, int index )
-    {
-      return ( column != null )
-          && ( this.CanExecuteCore( column, index ) );
-    }
-
-    public void Execute( ColumnBase column )
-    {
-      this.Execute( column, -1 );
-    }
-
-    public void Execute( ColumnBase column, int index )
-    {
-      if( !this.CanExecute( column, index ) )
-        return;
-
-      this.ExecuteCore( column, index );
-    }
-
-    protected virtual string GetColumnName( ColumnBase column )
-    {
-      return column.FieldName;
-    }
-
-    protected virtual GroupDescription GetGroupDescription( ColumnBase column )
-    {
-      return column.GroupDescription;
-    }
-
-    protected virtual GroupConfiguration GetGroupConfiguration( ColumnBase column )
-    {
-      return column.GroupConfiguration;
-    }
-
-    protected virtual bool CanExecuteCore( ColumnBase column, int index )
-    {
-      return ( this.GroupDescriptions != null )
-          && ( !string.IsNullOrEmpty( this.GetColumnName( column ) ) );
-    }
-
-    protected virtual void ExecuteCore( ColumnBase column, int index )
-    {
-      var groupDescriptions = this.GroupDescriptions;
-      if( groupDescriptions == null )
-        return;
-
-      GroupDescription groupDescription = this.GetGroupDescription( column );
-      if( groupDescription == null )
-      {
-        groupDescription = new DataGridGroupDescription( this.GetColumnName( column ) );
-      }
-
-      var dataGridGroupDescription = groupDescription as DataGridGroupDescription;
-      if( ( dataGridGroupDescription != null ) && ( dataGridGroupDescription.GroupConfiguration == null ) )
-      {
-        dataGridGroupDescription.GroupConfiguration = this.GetGroupConfiguration( column );
-      }
-
-      if( index < 0 )
-      {
-        groupDescriptions.Add( groupDescription );
-      }
-      else
-      {
-        groupDescriptions.Insert( index, groupDescription );
-      }
-    }
-
-    protected sealed override bool CanExecuteImpl( object parameter )
-    {
-      return this.CanExecute( parameter as ColumnBase );
-    }
-
-    protected sealed override void ExecuteImpl( object parameter )
-    {
-      this.Execute( parameter as ColumnBase );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs
deleted file mode 100644
index a9968741..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs
+++ /dev/null
@@ -1,1873 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Utils;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [DebuggerDisplay( "FieldName = {FieldName}" )]
-  public abstract class ColumnBase : Freezable, INotifyPropertyChanged, IWeakEventListener
-  {
-    static ColumnBase()
-    {
-      ColumnBase.IsFirstVisibleProperty = ColumnBase.IsFirstVisiblePropertyKey.DependencyProperty;
-      ColumnBase.IsLastVisibleProperty = ColumnBase.IsLastVisiblePropertyKey.DependencyProperty;
-    }
-
-    protected ColumnBase()
-    {
-      // Set the ActualWidth "default" value.
-      this.UpdateActualWidth();
-    }
-
-    protected ColumnBase( string fieldName, object title )
-      : this()
-    {
-      this.FieldName = fieldName;
-      this.Title = title;
-    }
-
-    #region Description Property
-
-    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
-      "Description",
-      typeof( string ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( null ) );
-
-    public string Description
-    {
-      get
-      {
-        return ( string )this.GetValue( ColumnBase.DescriptionProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.DescriptionProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CellContentTemplate Property
-
-    public static readonly DependencyProperty CellContentTemplateProperty = DependencyProperty.Register(
-      "CellContentTemplate",
-      typeof( DataTemplate ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( ColumnBase.OnCellContentTemplateChanged ) ) );
-
-    public DataTemplate CellContentTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ColumnBase.CellContentTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellContentTemplateProperty, value );
-      }
-    }
-
-    private static void OnCellContentTemplateChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as ColumnBase;
-      if( self == null )
-        return;
-
-      //Make sure cells pertaining to this group are assigned to the correct recycle bin.
-      //The recycle bin based on the previous key value will be clean up later by the FixedCellPanel, if no other column uses it.
-      self.ResetDefaultCellRecyclingGroup();
-    }
-
-    #endregion
-
-    #region CellContentTemplateSelector Property
-
-    public static readonly DependencyProperty CellContentTemplateSelectorProperty = DependencyProperty.Register(
-      "CellContentTemplateSelector",
-      typeof( DataTemplateSelector ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( GenericContentTemplateSelector.Instance, new PropertyChangedCallback( ColumnBase.OnCellContentTemplateSelectorChanged ) ) );
-
-    public DataTemplateSelector CellContentTemplateSelector
-    {
-      get
-      {
-        return ( DataTemplateSelector )this.GetValue( ColumnBase.CellContentTemplateSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellContentTemplateSelectorProperty, value );
-      }
-    }
-
-    private static void OnCellContentTemplateSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as ColumnBase;
-      if( self == null )
-        return;
-
-      //Make sure cells pertaining to this group are assigned to the correct recycle bin.
-      //The recycle bin based on the previous key value will be clean up later by the FixedCellPanel, if no other column uses it.
-      self.ResetDefaultCellRecyclingGroup();
-    }
-
-    #endregion
-
-    #region CellHorizontalContentAlignment Property
-
-    public static readonly DependencyProperty CellHorizontalContentAlignmentProperty = DependencyProperty.Register(
-      "CellHorizontalContentAlignment",
-      typeof( HorizontalAlignment ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( HorizontalAlignment.Stretch ) );
-
-    public HorizontalAlignment CellHorizontalContentAlignment
-    {
-      get
-      {
-        return ( HorizontalAlignment )this.GetValue( ColumnBase.CellHorizontalContentAlignmentProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellHorizontalContentAlignmentProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CellVerticalContentAlignment Property
-
-    public static readonly DependencyProperty CellVerticalContentAlignmentProperty = DependencyProperty.Register(
-      "CellVerticalContentAlignment",
-      typeof( VerticalAlignment ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( VerticalAlignment.Stretch ) );
-
-    public VerticalAlignment CellVerticalContentAlignment
-    {
-      get
-      {
-        return ( VerticalAlignment )this.GetValue( ColumnBase.CellVerticalContentAlignmentProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellVerticalContentAlignmentProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CellContentStringFormat Property
-
-    public static readonly DependencyProperty CellContentStringFormatProperty = DependencyProperty.Register(
-      "CellContentStringFormat",
-      typeof( string ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public string CellContentStringFormat
-    {
-      get
-      {
-        return ( string )this.GetValue( ColumnBase.CellContentStringFormatProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellContentStringFormatProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Title Property
-
-    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register(
-      "Title",
-      typeof( object ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( null ) );
-
-    public object Title
-    {
-      get
-      {
-        return this.GetValue( ColumnBase.TitleProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.TitleProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TitleTemplate Property
-
-    public static readonly DependencyProperty TitleTemplateProperty = DependencyProperty.Register(
-      "TitleTemplate",
-      typeof( DataTemplate ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( null ) );
-
-    public DataTemplate TitleTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ColumnBase.TitleTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.TitleTemplateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TitleTemplateSelector Property
-
-    public static readonly DependencyProperty TitleTemplateSelectorProperty = DependencyProperty.Register(
-      "TitleTemplateSelector",
-      typeof( DataTemplateSelector ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( null ) );
-
-    public DataTemplateSelector TitleTemplateSelector
-    {
-      get
-      {
-        return ( DataTemplateSelector )this.GetValue( ColumnBase.TitleTemplateSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.TitleTemplateSelectorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ActualWidth Property
-
-    private static readonly DependencyPropertyKey ActualWidthPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ActualWidth",
-      typeof( double ),
-      typeof( ColumnBase ),
-      new PropertyMetadata( ColumnBase.OnActualWidthChanged ) );
-
-    public static readonly DependencyProperty ActualWidthProperty = ColumnBase.ActualWidthPropertyKey.DependencyProperty;
-
-    public double ActualWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( ColumnBase.ActualWidthProperty );
-      }
-    }
-
-    private static void OnActualWidthChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var column = o as ColumnBase;
-      if( column == null )
-        return;
-
-      var handler = column.ActualWidthChanged;
-      if( handler != null )
-      {
-        handler.Invoke( column, new ColumnActualWidthChangedEventArgs( column, ( double )e.OldValue, ( double )e.NewValue ) );
-      }
-    }
-
-    private void UpdateActualWidth()
-    {
-      var width = this.Width;
-      var actualWidth = ( ( width.UnitType == ColumnWidthUnitType.Pixel ) ? width.Value : ( ( ColumnWidth )ColumnBase.WidthProperty.DefaultMetadata.DefaultValue ).Value );
-      var maxWidth = this.MaxWidth;
-      var minWidth = this.MinWidth;
-      var useDesiredWidth = false;
-
-      if( this.DesiredWidth >= 0d )
-      {
-        actualWidth = this.DesiredWidth;
-        useDesiredWidth = true;
-      }
-
-      if( actualWidth > maxWidth )
-      {
-        actualWidth = maxWidth;
-      }
-
-      // If Width is set to a value lesser than MinWidth or, if MaxWidth is inferior to
-      // MinWidth, ActualWidth will become equal to MinWidth.
-      if( actualWidth < minWidth )
-      {
-        actualWidth = minWidth;
-      }
-
-      this.SetValue( ColumnBase.ActualWidthPropertyKey, actualWidth );
-
-      if( ( minWidth >= maxWidth ) || ( useDesiredWidth ) )
-      {
-        this.HasFixedWidth = true;
-      }
-      else
-      {
-        this.ClearValue( ColumnBase.HasFixedWidthPropertyKey );
-      }
-    }
-
-    #endregion
-
-    #region Width Property
-
-    public static readonly DependencyProperty WidthProperty = DependencyProperty.Register(
-      "Width",
-      typeof( ColumnWidth ),
-      typeof( ColumnBase ),
-      new PropertyMetadata( new ColumnWidth( 125d ), new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
-
-    public ColumnWidth Width
-    {
-      get
-      {
-        return ( ColumnWidth )this.GetValue( ColumnBase.WidthProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.WidthProperty, value );
-      }
-    }
-
-    private static void WidthChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var column = ( ColumnBase )sender;
-
-      if( e.Property == ColumnBase.WidthProperty )
-      {
-        var oldValue = ( ColumnWidth )e.OldValue;
-        var newValue = ( ColumnWidth )e.NewValue;
-
-        if( ( oldValue.UnitType == ColumnWidthUnitType.Star ) &&
-            ( newValue.UnitType == ColumnWidthUnitType.Pixel ) )
-        {
-          // If the old width was a star, reset the desired width before updating the 
-          // ActualWidth. Otherwise, ActualWidth would still return the old desired width.
-          column.ClearValue( ColumnBase.DesiredWidthProperty );
-        }
-        else if( newValue.UnitType == ColumnWidthUnitType.Star )
-        {
-          // Assign a temporary value to DesiredWidth (different from ActualWidth) 
-          // to force a new Measure pass. Mandatory, for instance, when the old star
-          // value was limited by a MaxValue and the new star value would give a 
-          // smaller value to DesiredWidth.
-          var oldActualWidth = column.ActualWidth;
-
-          if( column.ActualWidth > column.MinWidth )
-          {
-            column.DesiredWidth = column.MinWidth;
-          }
-          else
-          {
-            column.DesiredWidth = column.ActualWidth + 1d;
-          }
-        }
-      }
-
-      column.UpdateActualWidth();
-    }
-
-    #endregion
-
-    #region MinWidth Property
-
-    public static readonly DependencyProperty MinWidthProperty = FrameworkElement.MinWidthProperty.AddOwner( typeof( ColumnBase ), new PropertyMetadata( new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
-
-    public double MinWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( ColumnBase.MinWidthProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.MinWidthProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region MaxWidth Property
-
-    public static readonly DependencyProperty MaxWidthProperty = FrameworkElement.MaxWidthProperty.AddOwner( typeof( ColumnBase ), new PropertyMetadata( new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
-
-    public double MaxWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( ColumnBase.MaxWidthProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.MaxWidthProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DesiredWidth Property
-
-    internal static readonly DependencyProperty DesiredWidthProperty = DependencyProperty.Register( "DesiredWidth", typeof( double ), typeof( ColumnBase ), new PropertyMetadata( -1d, new PropertyChangedCallback( ColumnBase.WidthChanged ) ) );
-
-    internal double DesiredWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( ColumnBase.DesiredWidthProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.DesiredWidthProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TextTrimming Property
-
-    public static readonly DependencyProperty TextTrimmingProperty = DependencyProperty.Register(
-      "TextTrimming",
-      typeof( TextTrimming ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( TextTrimming.CharacterEllipsis ) );
-
-    public TextTrimming TextTrimming
-    {
-      get
-      {
-        return ( TextTrimming )this.GetValue( ColumnBase.TextTrimmingProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.TextTrimmingProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TextWrapping Property
-
-    public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register(
-      "TextWrapping",
-      typeof( TextWrapping ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( TextWrapping.NoWrap ) );
-
-    public TextWrapping TextWrapping
-    {
-      get
-      {
-        return ( TextWrapping )this.GetValue( ColumnBase.TextWrappingProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.TextWrappingProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region HasFixedWidth Read-Only Property
-
-    private static readonly DependencyPropertyKey HasFixedWidthPropertyKey = DependencyProperty.RegisterReadOnly(
-      "HasFixedWidth",
-      typeof( bool ),
-      typeof( ColumnBase ),
-      new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasFixedWidthProperty = ColumnBase.HasFixedWidthPropertyKey.DependencyProperty;
-
-    public bool HasFixedWidth
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnBase.HasFixedWidthProperty );
-      }
-      private set
-      {
-        this.SetValue( ColumnBase.HasFixedWidthPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region VisiblePosition Property
-
-    public static readonly DependencyProperty VisiblePositionProperty = DependencyProperty.Register(
-      "VisiblePosition",
-      typeof( int ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( int.MaxValue, new PropertyChangedCallback( ColumnBase.OnVisiblePositionChanged ), new CoerceValueCallback( ColumnBase.OnCoerceVisiblePosition ) ) );
-
-    public int VisiblePosition
-    {
-      get
-      {
-        return ( int )this.GetValue( ColumnBase.VisiblePositionProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.VisiblePositionProperty, value );
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    private static object OnCoerceVisiblePosition( DependencyObject sender, object value )
-    {
-      var newValue = ( int )value;
-      if( newValue < 0 )
-        throw new ArgumentOutOfRangeException( "VisiblePosition", "VisiblePosition must be greater than or equal to zero." );
-
-      var column = ( ColumnBase )sender;
-
-      if( !column.m_inhibitVisiblePositionChanging.IsSet )
-      {
-        var oldValue = column.VisiblePosition;
-
-        if( newValue != oldValue )
-        {
-          var handler = column.VisiblePositionChanging;
-          if( handler != null )
-          {
-            handler.Invoke( sender, EventArgs.Empty );
-          }
-        }
-      }
-
-      return value;
-    }
-
-    private static void OnVisiblePositionChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var column = ( ColumnBase )sender;
-      var oldValue = ( int )e.OldValue;
-      var newValue = ( int )e.NewValue;
-
-      var handler = column.VisiblePositionChanged;
-      if( handler != null )
-      {
-        handler.Invoke( column, new ColumnVisiblePositionChangedEventArgs( column, oldValue, newValue ) );
-      }
-
-      // Invalidate own PreviousVisibleColumnProperty
-      column.InvalidatePreviousVisibleColumnProperty();
-
-      // Also invalidate next visible column's PreviousVisibleColumnProperty
-      var nextVisibleColumn = column.NextVisibleColumn;
-
-      if( nextVisibleColumn != null )
-      {
-        nextVisibleColumn.InvalidatePreviousVisibleColumnProperty();
-      }
-    }
-
-    internal IDisposable InhibitVisiblePositionChanging()
-    {
-      return m_inhibitVisiblePositionChanging.Set();
-    }
-
-    internal event EventHandler VisiblePositionChanging;
-    internal event EventHandler VisiblePositionChanged;
-
-    private readonly AutoResetFlag m_inhibitVisiblePositionChanging = AutoResetFlagFactory.Create( false );
-
-    #endregion
-
-    #region IsFirstVisible Read-Only Property
-
-    private static readonly DependencyPropertyKey IsFirstVisiblePropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsFirstVisible",
-      typeof( bool ),
-      typeof( ColumnBase ),
-      new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsFirstVisibleProperty;
-
-    public bool IsFirstVisible
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnBase.IsFirstVisibleProperty );
-      }
-    }
-
-    internal void SetIsFirstVisible( bool value )
-    {
-      this.SetValue( ColumnBase.IsFirstVisiblePropertyKey, value );
-    }
-
-    internal void ClearIsFirstVisible()
-    {
-      this.ClearValue( ColumnBase.IsFirstVisiblePropertyKey );
-    }
-
-    #endregion
-
-    #region IsLastVisible Read-Only Property
-
-    private static readonly DependencyPropertyKey IsLastVisiblePropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsLastVisible",
-      typeof( bool ),
-      typeof( ColumnBase ),
-      new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsLastVisibleProperty;
-
-    public bool IsLastVisible
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnBase.IsLastVisibleProperty );
-      }
-    }
-
-    internal void SetIsLastVisible( bool value )
-    {
-      this.SetValue( ColumnBase.IsLastVisiblePropertyKey, value );
-    }
-
-    internal void ClearIsLastVisible()
-    {
-      this.ClearValue( ColumnBase.IsLastVisiblePropertyKey );
-    }
-
-    #endregion
-
-    #region FieldName Property
-
-    public static readonly DependencyProperty FieldNameProperty = DependencyProperty.Register(
-      "FieldName",
-      typeof( string ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata(
-        null,
-        null,
-        new CoerceValueCallback( ColumnBase.OnCoerceFieldName ) ) );
-
-    public string FieldName
-    {
-      get
-      {
-        return ( string )this.GetValue( ColumnBase.FieldNameProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.FieldNameProperty, value );
-      }
-    }
-
-    private static object OnCoerceFieldName( DependencyObject sender, object requestedValue )
-    {
-      var column = sender as ColumnBase;
-      if( ( column.m_containingCollection != null ) && ( !DesignerProperties.GetIsInDesignMode( column ) ) )
-        throw new InvalidOperationException( "An attempt was made to change the FieldName of a column that is contained in a grid." );
-
-      return requestedValue;
-    }
-
-    #endregion
-
-    #region Visible Property
-
-    public static readonly DependencyProperty VisibleProperty = DependencyProperty.Register(
-      "Visible",
-      typeof( bool ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( true ) );
-
-    public bool Visible
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnBase.VisibleProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.VisibleProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Index Property
-
-    public int Index
-    {
-      get
-      {
-        if( m_containingCollection == null )
-          return -1;
-
-        return m_containingCollection.IndexOf( this );
-      }
-    }
-
-    #endregion
-
-    #region DataGridControl Property
-
-    public DataGridControl DataGridControl
-    {
-      get
-      {
-        if( m_containingCollection == null )
-          return null;
-
-        return m_containingCollection.DataGridControl;
-      }
-    }
-
-    internal void NotifyDataGridControlChanged()
-    {
-      this.OnPropertyChanged( new PropertyChangedEventArgs( ColumnBase.DataGridControlPropertyName ) );
-    }
-
-    internal static readonly string DataGridControlPropertyName = PropertyHelper.GetPropertyName( ( ColumnBase c ) => c.DataGridControl );
-
-    #endregion
-
-    #region ParentDetailConfiguration Property
-
-    internal DetailConfiguration ParentDetailConfiguration
-    {
-      get
-      {
-        if( m_containingCollection == null )
-          return null;
-
-        return m_containingCollection.ParentDetailConfiguration;
-      }
-    }
-
-    #endregion
-
-    #region ContainingCollection Property
-
-    internal ColumnCollection ContainingCollection
-    {
-      get
-      {
-        return m_containingCollection;
-      }
-    }
-
-    private ColumnCollection m_containingCollection; //null
-
-    #endregion
-
-    #region AllowSort Property
-
-    public virtual bool AllowSort
-    {
-      get
-      {
-        return false;
-      }
-      set
-      {
-        throw new NotSupportedException( "An attempt was made to set the AllowSort property of a column that does not support sorting." );
-      }
-    }
-
-    #endregion
-
-    #region AllowGroup Property
-
-    public virtual bool AllowGroup
-    {
-      get
-      {
-        return false;
-      }
-      set
-      {
-        throw new NotSupportedException( "An attempt was made to set the AllowGroup property of a column that does not support grouping." );
-      }
-    }
-
-    #endregion
-
-    #region GroupValueTemplate Property
-
-    public static readonly DependencyProperty GroupValueTemplateProperty = DependencyProperty.Register(
-      "GroupValueTemplate",
-      typeof( DataTemplate ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate GroupValueTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ColumnBase.GroupValueTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.GroupValueTemplateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region GroupValueTemplateSelector Property
-
-    public static readonly DependencyProperty GroupValueTemplateSelectorProperty = DependencyProperty.Register(
-      "GroupValueTemplateSelector",
-      typeof( DataTemplateSelector ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplateSelector GroupValueTemplateSelector
-    {
-      get
-      {
-        return ( DataTemplateSelector )this.GetValue( ColumnBase.GroupValueTemplateSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.GroupValueTemplateSelectorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region GroupValueStringFormat Property
-
-    public static readonly DependencyProperty GroupValueStringFormatProperty = DependencyProperty.Register(
-      "GroupValueStringFormat",
-      typeof( string ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public string GroupValueStringFormat
-    {
-      get
-      {
-        return ( string )this.GetValue( ColumnBase.GroupValueStringFormatProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.GroupValueStringFormatProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CellEditor Property
-
-    public static readonly DependencyProperty CellEditorProperty = DependencyProperty.Register(
-      "CellEditor",
-      typeof( CellEditor ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( null ) );
-
-    public CellEditor CellEditor
-    {
-      get
-      {
-        return ( CellEditor )this.GetValue( ColumnBase.CellEditorProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellEditorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CellEditorSelector Property
-
-    public static readonly DependencyProperty CellEditorSelectorProperty = DependencyProperty.Register(
-      "CellEditorSelector",
-      typeof( CellEditorSelector ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public CellEditorSelector CellEditorSelector
-    {
-      get
-      {
-        return ( CellEditorSelector )this.GetValue( ColumnBase.CellEditorSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellEditorSelectorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CellEditorDisplayConditions Property
-
-    public static readonly DependencyProperty CellEditorDisplayConditionsProperty = DataGridControl.CellEditorDisplayConditionsProperty.AddOwner( typeof( ColumnBase ) );
-
-    public CellEditorDisplayConditions CellEditorDisplayConditions
-    {
-      get
-      {
-        return ( CellEditorDisplayConditions )this.GetValue( ColumnBase.CellEditorDisplayConditionsProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellEditorDisplayConditionsProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CellValidationRules Property
-
-    public Collection<CellValidationRule> CellValidationRules
-    {
-      get
-      {
-        if( m_cellValidationRules == null )
-        {
-          m_cellValidationRules = new Collection<CellValidationRule>();
-        }
-
-        return m_cellValidationRules;
-      }
-    }
-
-    private Collection<CellValidationRule> m_cellValidationRules; // = null
-
-    #endregion
-
-    #region CellErrorStyle Property
-
-    public static readonly DependencyProperty CellErrorStyleProperty = DataGridControl.CellErrorStyleProperty.AddOwner( typeof( ColumnBase ) );
-
-    public Style CellErrorStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( ColumnBase.CellErrorStyleProperty );
-      }
-
-      set
-      {
-        this.SetValue( ColumnBase.CellErrorStyleProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CanBeCurrentWhenReadOnly Property
-
-    public static readonly DependencyProperty CanBeCurrentWhenReadOnlyProperty = DependencyProperty.Register(
-      "CanBeCurrentWhenReadOnly",
-      typeof( bool ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool CanBeCurrentWhenReadOnly
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnBase.CanBeCurrentWhenReadOnlyProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CanBeCurrentWhenReadOnlyProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region HasValidationError Property
-
-    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
-      "HasValidationError",
-      typeof( bool ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasValidationErrorProperty = ColumnBase.HasValidationErrorPropertyKey.DependencyProperty;
-
-    public bool HasValidationError
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnBase.HasValidationErrorProperty );
-      }
-    }
-
-    internal void SetHasValidationError( bool value )
-    {
-      if( value != this.HasValidationError )
-      {
-        if( value )
-        {
-          this.SetValue( ColumnBase.HasValidationErrorPropertyKey, value );
-        }
-        else
-        {
-          this.ClearValue( ColumnBase.HasValidationErrorPropertyKey );
-        }
-      }
-    }
-
-    #endregion
-
-    #region SortDirection Property
-
-    private static readonly DependencyPropertyKey SortDirectionPropertyKey = DependencyProperty.RegisterReadOnly(
-      "SortDirection",
-      typeof( SortDirection ),
-      typeof( ColumnBase ),
-      new PropertyMetadata( SortDirection.None ) );
-
-    public static readonly DependencyProperty SortDirectionProperty = ColumnBase.SortDirectionPropertyKey.DependencyProperty;
-
-    public SortDirection SortDirection
-    {
-      get
-      {
-        return ( SortDirection )this.GetValue( ColumnBase.SortDirectionProperty );
-      }
-    }
-
-    internal void SetSortDirection( SortDirection value )
-    {
-      if( value == SortDirection.None )
-      {
-        this.ClearValue( ColumnBase.SortDirectionPropertyKey );
-      }
-      else
-      {
-        this.SetValue( ColumnBase.SortDirectionPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region SortDirectionCycle Property
-
-    private static readonly SortDirectionCycleCollection DefaultSortDirectionCycle = new SortDirectionCycleCollection(
-                                                                                       new ReadOnlyCollection<SortDirection>(
-                                                                                         new List<SortDirection>()
-                                                                                           {
-                                                                                             SortDirection.Ascending,
-                                                                                             SortDirection.Descending,
-                                                                                             SortDirection.None,
-                                                                                           } ) );
-
-    public static readonly DependencyProperty SortDirectionCycleProperty = DependencyProperty.Register(
-      "SortDirectionCycle",
-      typeof( SortDirectionCycleCollection ),
-      typeof( ColumnBase ),
-      new PropertyMetadata( ColumnBase.DefaultSortDirectionCycle ) );
-
-    public SortDirectionCycleCollection SortDirectionCycle
-    {
-      get
-      {
-        return ( SortDirectionCycleCollection )this.GetValue( ColumnBase.SortDirectionCycleProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.SortDirectionCycleProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SortIndex Read-Only Property
-
-    private static readonly DependencyPropertyKey SortIndexPropertyKey = DependencyProperty.RegisterReadOnly(
-      "SortIndex",
-      typeof( int ),
-      typeof( ColumnBase ),
-      new PropertyMetadata( -1 ) );
-
-    public static readonly DependencyProperty SortIndexProperty = ColumnBase.SortIndexPropertyKey.DependencyProperty;
-
-    public int SortIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( ColumnBase.SortIndexProperty );
-      }
-    }
-
-    internal void SetSortIndex( int value )
-    {
-      if( value == -1 )
-      {
-        this.ClearValue( ColumnBase.SortIndexPropertyKey );
-      }
-      else
-      {
-        this.SetValue( ColumnBase.SortIndexPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region GroupDescription Property
-
-    public static readonly DependencyProperty GroupDescriptionProperty = DependencyProperty.Register(
-      "GroupDescription",
-      typeof( GroupDescription ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( null ) );
-
-    public GroupDescription GroupDescription
-    {
-      get
-      {
-        return ( GroupDescription )GetValue( ColumnBase.GroupDescriptionProperty );
-      }
-      set
-      {
-        SetValue( ColumnBase.GroupDescriptionProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region GroupConfiguration Property
-
-    public static readonly DependencyProperty GroupConfigurationProperty = DependencyProperty.Register(
-      "GroupConfiguration",
-      typeof( GroupConfiguration ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( null ) );
-
-    public GroupConfiguration GroupConfiguration
-    {
-      get
-      {
-        return ( GroupConfiguration )this.GetValue( ColumnBase.GroupConfigurationProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.GroupConfigurationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsMainColumn Property
-
-    public virtual bool IsMainColumn
-    {
-      get
-      {
-        var containingCollection = this.ContainingCollection;
-        if( containingCollection == null )
-          return ( m_isMainColumn.HasValue ? m_isMainColumn.Value : false );
-
-        return ( containingCollection.MainColumn == this );
-      }
-      set
-      {
-        var containingCollection = this.ContainingCollection;
-        if( containingCollection == null )
-        {
-          if( m_isMainColumn == value )
-            return;
-
-          m_isMainColumn = value;
-
-          this.RaiseIsMainColumnChanged();
-        }
-        else if( value )
-        {
-          containingCollection.MainColumn = this;
-        }
-        else
-        {
-          if( containingCollection.MainColumn != this )
-            return;
-
-          containingCollection.MainColumn = null;
-        }
-      }
-    }
-
-    internal void RaiseIsMainColumnChanged()
-    {
-      this.RefreshDraggableStatus();
-      this.OnPropertyChanged( new PropertyChangedEventArgs( ColumnBase.IsMainColumnPropertyName ) );
-    }
-
-    internal static readonly string IsMainColumnPropertyName = PropertyHelper.GetPropertyName( ( ColumnBase c ) => c.IsMainColumn );
-
-    private Nullable<bool> m_isMainColumn = null;
-
-    #endregion
-
-    #region ReadOnly Property
-
-    public static readonly DependencyProperty ReadOnlyProperty = DependencyProperty.Register(
-      "ReadOnly",
-      typeof( bool ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( false ) );
-
-    public virtual bool ReadOnly
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnBase.ReadOnlyProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.ReadOnlyProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region OverrideReadOnlyForInsertion Property
-
-    public static readonly DependencyProperty OverrideReadOnlyForInsertionProperty = DependencyProperty.Register(
-      "OverrideReadOnlyForInsertion",
-      typeof( bool ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( false ) );
-
-    public bool OverrideReadOnlyForInsertion
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnBase.OverrideReadOnlyForInsertionProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.OverrideReadOnlyForInsertionProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region PreviousVisibleColumn Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public virtual ColumnBase PreviousVisibleColumn
-    {
-      get
-      {
-        // Column is being initialized.
-        if( this.DataGridControl == null )
-          return null;
-
-        var columnsByVisiblePosition = ( this.ParentDetailConfiguration != null )
-                                         ? this.ParentDetailConfiguration.ColumnsByVisiblePosition
-                                         : this.DataGridControl.ColumnsByVisiblePosition;
-        var previousColumnNode = columnsByVisiblePosition.Find( this ).Previous;
-
-        while( previousColumnNode != null )
-        {
-          var previousColumn = previousColumnNode.Value;
-
-          if( previousColumn.Visible )
-            return previousColumn;
-
-          previousColumnNode = previousColumnNode.Previous;
-        }
-
-        return null;
-      }
-    }
-
-    internal void InvalidatePreviousVisibleColumnProperty()
-    {
-      this.OnPropertyChanged( new PropertyChangedEventArgs( ColumnBase.PreviousVisibleColumnPropertyName ) );
-    }
-
-    internal static readonly string PreviousVisibleColumnPropertyName = PropertyHelper.GetPropertyName( ( ColumnBase c ) => c.PreviousVisibleColumn );
-
-    #endregion
-
-    #region NextVisibleColumn Property
-
-    internal virtual ColumnBase NextVisibleColumn
-    {
-      get
-      {
-        // Column is being initialized.
-        if( this.DataGridControl == null )
-          return null;
-
-        var columnsByVisiblePosition = ( this.ParentDetailConfiguration != null )
-                                         ? this.ParentDetailConfiguration.ColumnsByVisiblePosition
-                                         : this.DataGridControl.ColumnsByVisiblePosition;
-
-        var nextColumnNode = columnsByVisiblePosition.Find( this );
-
-        if( nextColumnNode != null )
-        {
-          nextColumnNode = nextColumnNode.Next;
-        }
-
-        while( nextColumnNode != null )
-        {
-          var previousColumn = nextColumnNode.Value;
-
-          if( previousColumn.Visible )
-            return previousColumn;
-
-          nextColumnNode = nextColumnNode.Next;
-        }
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region CellRecyclingGroup Property
-
-    public static readonly DependencyProperty CellRecyclingGroupProperty = DependencyProperty.Register(
-      "CellRecyclingGroup",
-      typeof( object ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public object CellRecyclingGroup
-    {
-      get
-      {
-        return this.GetValue( ColumnBase.CellRecyclingGroupProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.CellRecyclingGroupProperty, value );
-      }
-    }
-
-    internal object GetCellRecyclingGroupOrDefault()
-    {
-      //Always return the one assigned by the client application
-      var recyclingGroup = this.CellRecyclingGroup;
-      if( recyclingGroup != null )
-        return recyclingGroup;
-
-      var defaultCellRecyclingGroup = this.DefaultCellRecyclingGroup;
-      Debug.Assert( defaultCellRecyclingGroup != null );
-
-      return defaultCellRecyclingGroup;
-    }
-
-    #endregion
-
-    #region DefaultCellRecyclingGroupDataType Internal Property
-
-    internal Type DefaultCellRecyclingGroupDataType
-    {
-      get
-      {
-        return m_defaultCellRecyclingGroupDataType;
-      }
-      set
-      {
-        if( value == m_defaultCellRecyclingGroupDataType )
-          return;
-
-        Debug.Assert( value != null );
-
-        m_defaultCellRecyclingGroupDataType = value;
-
-        this.ResetDefaultCellRecyclingGroup();
-      }
-    }
-
-    private Type m_defaultCellRecyclingGroupDataType = typeof( object );
-
-    #endregion
-
-    #region DefaultCellRecyclingGroup Private Property
-
-    private object DefaultCellRecyclingGroup
-    {
-      get
-      {
-        if( m_defaultCellRecyclingGroup == null )
-        {
-          m_defaultCellRecyclingGroup = this.CreateDefaultCellRecyclingGroup();
-          if( m_defaultCellRecyclingGroup == null )
-            throw new InvalidOperationException( "CreateDefaultCellRecyclingGroup must return a non-null value." );
-        }
-
-        return m_defaultCellRecyclingGroup;
-      }
-    }
-
-    internal virtual object CreateDefaultCellRecyclingGroup()
-    {
-      return new CellRecyclingGroupKey( this.CellContentTemplate, this.DefaultCellRecyclingGroupDataType );
-    }
-
-    internal void ResetDefaultCellRecyclingGroup()
-    {
-      m_defaultCellRecyclingGroup = null;
-    }
-
-    private object m_defaultCellRecyclingGroup;
-
-    #endregion
-
-    #region CurrentRowInEditionCellState Property
-
-    internal CellState CurrentRowInEditionCellState
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region DisplayedValueConverter Property
-
-    public IValueConverter DisplayedValueConverter
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region DisplayedValueConverterParameter Property
-
-    public object DisplayedValueConverterParameter
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region DisplayedValueConverterCulture Property
-
-    public CultureInfo DisplayedValueConverterCulture
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region DefaultCulture Property
-
-    public static readonly DependencyProperty DefaultCultureProperty = DependencyProperty.Register(
-      "DefaultCulture",
-      typeof( CultureInfo ),
-      typeof( ColumnBase ),
-      new FrameworkPropertyMetadata( CultureInfo.CurrentCulture ) );
-
-    public CultureInfo DefaultCulture
-    {
-      get
-      {
-        return ( CultureInfo )this.GetValue( ColumnBase.DefaultCultureProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.DefaultCultureProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DraggableStatus Property
-
-    public static readonly DependencyProperty DraggableStatusProperty = DependencyProperty.Register(
-      "DraggableStatus",
-      typeof( ColumnDraggableStatus ),
-      typeof( ColumnBase ),
-      new UIPropertyMetadata( ColumnDraggableStatus.Draggable, null, new CoerceValueCallback( ColumnBase.CoerceDraggableStatus ) ) );
-
-    public ColumnDraggableStatus DraggableStatus
-    {
-      get
-      {
-        return ( ColumnDraggableStatus )this.GetValue( ColumnBase.DraggableStatusProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnBase.DraggableStatusProperty, value );
-      }
-    }
-
-    internal void RefreshDraggableStatus()
-    {
-      this.CoerceValue( ColumnBase.DraggableStatusProperty );
-    }
-
-    private static object CoerceDraggableStatus( DependencyObject sender, object value )
-    {
-      var self = sender as ColumnBase;
-      var collection = ( self != null ) ? self.ContainingCollection : null;
-      if( collection == null )
-        return value;
-
-      var dataGridControl = collection.DataGridControl;
-      if( ( dataGridControl == null ) || !dataGridControl.AreDetailsFlatten || !self.IsMainColumn )
-        return value;
-
-      // The main column is always locked in first position when details are flatten.
-      return ColumnDraggableStatus.FirstUndraggable;
-    }
-
-    #endregion
-
-    #region RealizedContainersRequested Event
-
-    internal event RealizedContainersRequestedEventHandler RealizedContainersRequested;
-
-    #endregion
-
-    #region ActualWidthChanged Event
-
-    internal event ColumnActualWidthChangedEventHandler ActualWidthChanged;
-
-    #endregion
-
-    #region DistinctValuesRequested Event
-
-    internal event DistinctValuesRequestedEventHandler DistinctValuesRequested;
-
-    #endregion
-
-    #region FittedWidthRequested Event
-
-    internal event FittedWidthRequestedEventHandler FittedWidthRequested;
-
-    private Nullable<double> RequestFittedWidth()
-    {
-      var handler = this.FittedWidthRequested;
-      if( handler == null )
-        return null;
-
-      var e = new FittedWidthRequestedEventArgs();
-      handler.Invoke( this, e );
-
-      return e.Value;
-    }
-
-    #endregion
-
-#if DEBUG
-    public override string ToString()
-    {
-      string toString = base.ToString();
-
-      if( !string.IsNullOrEmpty( this.FieldName ) )
-      {
-        toString += " " + this.FieldName;
-      }
-
-      return toString;
-    }
-#endif
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate" )]
-    public virtual double GetFittedWidth()
-    {
-      var fittedWidth = this.RequestFittedWidth().GetValueOrDefault( -1d );
-      var e = new RealizedContainersRequestedEventArgs();
-
-      var handler = this.RealizedContainersRequested;
-      if( handler != null )
-      {
-        handler.Invoke( this, e );
-      }
-
-      var realizedContainers = e.RealizedContainers;
-      if( realizedContainers.Count > 0 )
-      {
-        fittedWidth = Math.Max( fittedWidth, this.GetElementCollectionFittedWidth( realizedContainers ) );
-      }
-
-      return fittedWidth;
-    }
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-      this.OnPropertyChanged( new PropertyChangedEventArgs( e.Property.Name ) );
-    }
-
-    protected override Freezable CreateInstanceCore()
-    {
-      // Only derived from Freezable to have DataContext and ElementName binding.
-      // So we have not implemented the Clone.
-      throw new NotImplementedException();
-    }
-
-    protected override bool FreezeCore( bool isChecking )
-    {
-      // Only derived from Freezable to have DataContext and ElementName binding.
-      // So we don't want to be freezable.
-      return false;
-    }
-
-    internal virtual void SetIsBeingDraggedAnimated( bool value )
-    {
-      TableflowView.SetIsBeingDraggedAnimated( this, value );
-    }
-
-    internal virtual void SetColumnReorderingDragSourceManager( ColumnReorderingDragSourceManager value )
-    {
-      TableflowView.SetColumnReorderingDragSourceManager( this, value );
-    }
-
-    internal virtual void ClearColumnReorderingDragSourceManager()
-    {
-      TableflowView.ClearColumnReorderingDragSourceManager( this );
-    }
-
-    internal void AttachToContainingCollection( ColumnCollection columnCollection )
-    {
-      if( columnCollection == null )
-        throw new ArgumentNullException( "columnCollection" );
-
-      if( m_containingCollection != null )
-        throw new InvalidOperationException( "An attempt was made to add a column to a grid while it already exists in another grid." );
-
-      if( m_containingCollection == columnCollection )
-        return;
-
-      this.AttachToContainingCollectionCore( columnCollection );
-    }
-
-    internal void DetachFromContainingCollection()
-    {
-      if( m_containingCollection == null )
-        return;
-
-      this.DetachFromContainingCollectionCore();
-    }
-
-    internal void OnDistinctValuesRequested( object sender, DistinctValuesRequestedEventArgs e )
-    {
-      var handler = this.DistinctValuesRequested;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    internal CultureInfo GetCulture( CultureInfo value )
-    {
-      if( value != null )
-        return value;
-
-      return this.GetCulture();
-    }
-
-    internal CultureInfo GetCulture()
-    {
-      var culture = this.DefaultCulture;
-      if( culture != null )
-        return culture;
-
-      return CultureInfo.CurrentCulture;
-    }
-
-    private void AttachToContainingCollectionCore( ColumnCollection columnCollection )
-    {
-      m_containingCollection = columnCollection;
-      m_isMainColumn = null;
-
-      this.NotifyDataGridControlChanged();
-    }
-
-    private void DetachFromContainingCollectionCore()
-    {
-      m_containingCollection = null;
-
-      this.NotifyDataGridControlChanged();
-    }
-
-    private double GetElementCollectionFittedWidth( IEnumerable collection )
-    {
-      if( collection == null )
-        throw new ArgumentNullException( "collection" );
-
-      // Ensure to use the FieldName of the Cell instead of the visible position since a lookup dictionary is used underneath
-      // and if the Indexer is used, the Cells are returned in the order they were added, not visible position.
-      double fittedWidth = -1;
-
-      foreach( object item in collection )
-      {
-        var row = item as Row;
-        if( row == null )
-        {
-          var headerFooter = item as HeaderFooterItem;
-          if( headerFooter != null )
-          {
-            row = headerFooter.AsVisual() as Row;
-          }
-        }
-
-        double cellFittedWidth;
-        if( !this.TryGetCellFittedWidth( row, out cellFittedWidth ) )
-          continue;
-
-        fittedWidth = Math.Max( fittedWidth, cellFittedWidth );
-      }
-
-      return fittedWidth;
-    }
-
-    private bool TryGetCellFittedWidth( Row row, out double fittedWidth )
-    {
-      fittedWidth = -1d;
-
-      if( row == null )
-        return false;
-
-      Cell cell;
-      var cells = row.Cells;
-      var virtualCells = cells as VirtualizingCellCollection;
-      bool releaseCell = false;
-
-      if( virtualCells != null )
-      {
-        if( !virtualCells.TryGetBindedCell( this, out cell ) )
-        {
-          releaseCell = true;
-          cell = virtualCells[ this ];
-
-          if( cell == null )
-            return false;
-
-          // A created cell doesn't have a template applied yet.
-          // The call to Cell.GetFittedWidth will fail unless we force the creation of the child element by measuring the cell.
-          if( !cell.IsMeasureValid )
-          {
-            cell.Measure( Size.Empty );
-          }
-        }
-      }
-      else
-      {
-        cell = cells[ this ];
-      }
-
-      Debug.Assert( cell != null );
-      fittedWidth = cell.GetFittedWidth();
-
-      // A cell that was created or recycled to calculate the fitted width must be released in order to minimize the number of cells created overall.
-      if( releaseCell )
-      {
-        Debug.Assert( virtualCells != null );
-        virtualCells.Release( cell );
-      }
-
-      return true;
-    }
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected virtual void OnPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      Debug.Assert( e != null );
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return false;
-    }
-
-    #endregion
-
-    #region CellRecyclingGroupKey Private Class
-
-    private sealed class CellRecyclingGroupKey
-    {
-      internal CellRecyclingGroupKey( DataTemplate contentTemplate, Type dataType )
-      {
-        //This is a value that is cached at the cell level and that is costly to update, thus basing the recycling on it optimizes performance.
-        m_contentTemplate = contentTemplate;
-        m_dataType = dataType;
-      }
-
-      public override int GetHashCode()
-      {
-        if( m_contentTemplate != null )
-          return m_contentTemplate.GetHashCode();
-
-        if( m_dataType != null )
-          return m_dataType.GetHashCode();
-
-        return 0;
-      }
-
-      public override bool Equals( object obj )
-      {
-        var key = obj as CellRecyclingGroupKey;
-        if( key == null )
-          return false;
-
-        if( key == this )
-          return true;
-
-        if( ( key.m_contentTemplate == null ) && ( m_contentTemplate == null ) )
-          return ( key.m_dataType == m_dataType );
-
-        return ( key.m_contentTemplate == m_contentTemplate );
-      }
-
-      private readonly DataTemplate m_contentTemplate;
-      private readonly Type m_dataType;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs
deleted file mode 100644
index e599683f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs
+++ /dev/null
@@ -1,289 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class ColumnCollection : ObservableColumnCollection
-  {
-    #region Static Fields
-
-    internal static readonly string MainColumnPropertyName = PropertyHelper.GetPropertyName( ( ColumnCollection c ) => c.MainColumn );
-
-    #endregion
-
-
-    internal ColumnCollection( DataGridControl dataGridControl, DetailConfiguration parentDetailConfiguration )
-    {
-      m_dataGridControl = dataGridControl;
-      m_parentDetailConfiguration = parentDetailConfiguration;
-    }
-
-    #region MainColumn Property
-
-    public virtual ColumnBase MainColumn
-    {
-      get
-      {
-        return m_mainColumn;
-      }
-      set
-      {
-        if( value == m_mainColumn )
-          return;
-
-        if( ( value != null ) && !this.Contains( value ) )
-          throw new ArgumentException( "The column was not found in the collection." );
-
-        using( this.DeferColumnsUpdate() )
-        {
-          var oldMainColumn = m_mainColumn;
-          m_mainColumn = value;
-
-          if( m_mainColumn != null )
-          {
-            m_mainColumn.RaiseIsMainColumnChanged();
-          }
-
-          if( oldMainColumn != null )
-          {
-            oldMainColumn.RaiseIsMainColumnChanged();
-          }
-        }
-
-        this.OnPropertyChanged( new PropertyChangedEventArgs( ColumnCollection.MainColumnPropertyName ) );
-      }
-    }
-
-    private ColumnBase m_mainColumn;
-
-    #endregion
-
-    #region DataGridControl Internal Property
-
-    internal DataGridControl DataGridControl
-    {
-      get
-      {
-        return m_dataGridControl;
-      }
-      set
-      {
-        if( value == m_dataGridControl )
-          return;
-
-        m_dataGridControl = value;
-
-        foreach( var column in this )
-        {
-          column.NotifyDataGridControlChanged();
-        }
-      }
-    }
-
-    private DataGridControl m_dataGridControl;
-
-    #endregion
-
-    #region ParentDetailConfiguration Internal Property
-
-    internal DetailConfiguration ParentDetailConfiguration
-    {
-      get
-      {
-        return m_parentDetailConfiguration;
-      }
-      set
-      {
-        m_parentDetailConfiguration = value;
-      }
-    }
-
-    private DetailConfiguration m_parentDetailConfiguration;
-
-    #endregion
-
-    #region RealizedContainersRequested Internal Event
-
-    internal event RealizedContainersRequestedEventHandler RealizedContainersRequested;
-
-    private void OnRealizedContainersRequested( RealizedContainersRequestedEventArgs e )
-    {
-      var handler = this.RealizedContainersRequested;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region DistinctValuesRequested Internal Event
-
-    internal event DistinctValuesRequestedEventHandler DistinctValuesRequested;
-
-    private void OnDistinctValuesRequested( DistinctValuesRequestedEventArgs e )
-    {
-      var handler = this.DistinctValuesRequested;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region ActualWidthChanged Internal Event
-
-    internal event ColumnActualWidthChangedEventHandler ActualWidthChanged;
-
-    private void OnActualWidthChanged( ColumnActualWidthChangedEventArgs e )
-    {
-      var handler = this.ActualWidthChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    protected override void OnItemAdding( ColumnBase item )
-    {
-      base.OnItemAdding( item );
-
-      Debug.Assert( item != null );
-
-      if( item.IsMainColumn )
-      {
-        m_nextMainColumn = item;
-      }
-
-      item.AttachToContainingCollection( this );
-
-      item.PropertyChanged += new PropertyChangedEventHandler( this.OnColumnPropertyChanged );
-      item.RealizedContainersRequested += new RealizedContainersRequestedEventHandler( this.OnColumnRealizedContainersRequested );
-      item.ActualWidthChanged += new ColumnActualWidthChangedEventHandler( this.OnColumnActualWidthChanged );
-      item.DistinctValuesRequested += new DistinctValuesRequestedEventHandler( this.OnColumnDistinctValuesRequested );
-    }
-
-    protected override void OnItemAdded( ColumnBase item )
-    {
-      base.OnItemAdded( item );
-
-      this.UpdateMainColumn();
-    }
-
-    protected override void OnItemRemoving( ColumnBase item )
-    {
-      Debug.Assert( item != null );
-
-      item.PropertyChanged -= new PropertyChangedEventHandler( this.OnColumnPropertyChanged );
-      item.RealizedContainersRequested -= new RealizedContainersRequestedEventHandler( this.OnColumnRealizedContainersRequested );
-      item.ActualWidthChanged -= new ColumnActualWidthChangedEventHandler( this.OnColumnActualWidthChanged );
-      item.DistinctValuesRequested -= new DistinctValuesRequestedEventHandler( this.OnColumnDistinctValuesRequested );
-
-      item.DetachFromContainingCollection();
-
-      base.OnItemRemoving( item );
-    }
-
-    protected override void OnItemRemoved( ColumnBase item )
-    {
-      base.OnItemRemoved( item );
-
-      this.UpdateMainColumn();
-    }
-
-    private void UpdateMainColumn()
-    {
-      switch( this.Count )
-      {
-        case 0:
-          this.MainColumn = null;
-          break;
-
-        case 1:
-          this.MainColumn = this[ 0 ];
-          break;
-
-        default:
-          {
-            var column = m_nextMainColumn ?? m_mainColumn;
-
-            m_nextMainColumn = null;
-
-            if( ( column != null ) && this.Contains( column ) )
-            {
-              this.MainColumn = column;
-            }
-            else
-            {
-              this.MainColumn = null;
-            }
-          }
-          break;
-      }
-    }
-
-    private IDisposable DeferColumnsUpdate()
-    {
-      if( m_parentDetailConfiguration != null )
-        return m_parentDetailConfiguration.DeferColumnsUpdate();
-
-      if( m_dataGridControl != null )
-        return m_dataGridControl.DeferColumnsUpdate();
-
-      return new EmptyDisposable();
-    }
-
-    private void OnColumnPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-    }
-
-    private void OnColumnRealizedContainersRequested( object sender, RealizedContainersRequestedEventArgs e )
-    {
-      this.OnRealizedContainersRequested( e );
-    }
-
-    private void OnColumnDistinctValuesRequested( object sender, DistinctValuesRequestedEventArgs e )
-    {
-      this.OnDistinctValuesRequested( e );
-    }
-
-    private void OnColumnActualWidthChanged( object sender, ColumnActualWidthChangedEventArgs e )
-    {
-      this.OnActualWidthChanged( e );
-    }
-
-    private ColumnBase m_nextMainColumn; //null
-
-    #region EmptyDisposable Private Class
-
-    private sealed class EmptyDisposable : IDisposable
-    {
-      void IDisposable.Dispose()
-      {
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCommand.cs
deleted file mode 100644
index a8ce1c39..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCommand.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class ColumnCommand : ICommand
-  {
-    #region Validation Methods
-
-    protected static void ThrowIfNull( object value, string paramName )
-    {
-      if( value == null )
-        throw new ArgumentNullException( paramName );
-    }
-
-    #endregion
-
-    protected abstract bool CanExecuteImpl( object parameter );
-    protected abstract void ExecuteImpl( object parameter );
-
-    #region ICommand Members
-
-    event EventHandler ICommand.CanExecuteChanged
-    {
-      add
-      {
-      }
-      remove
-      {
-      }
-    }
-
-    bool ICommand.CanExecute( object parameter )
-    {
-      return this.CanExecuteImpl( parameter );
-    }
-
-    void ICommand.Execute( object parameter )
-    {
-      this.ExecuteImpl( parameter );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnGroupCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnGroupCommand.cs
deleted file mode 100644
index 676448be..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnGroupCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class ColumnGroupCommand : ColumnCommand
-  {
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManager.cs
deleted file mode 100644
index 0406cdc6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManager.cs
+++ /dev/null
@@ -1,2916 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ColumnHierarchyManager : IWeakEventListener
-  {
-    internal ColumnHierarchyManager( ColumnCollection columns)
-    {
-      if( columns == null )
-        throw new ArgumentNullException( "columns" );
-
-      m_columns = columns;
-      m_visibleColumns = new ReadOnlyColumnCollection( new ObservableColumnCollection() );
-      m_columnsByVisiblePosition = new HashedLinkedList<ColumnBase>();
-
-      m_model.LayoutChanging += new EventHandler<ColumnHierarchyModel.LayoutChangingEventArgs>( this.OnViewLayoutChanging );
-      m_model.LayoutChanged += new EventHandler<ColumnHierarchyModel.LayoutChangedEventArgs>( this.OnViewLayoutChanged );
-      m_model.StatusChanged += new EventHandler<ColumnHierarchyModel.StatusChangedEventArgs>( this.OnViewStatusChanged );
-    }
-
-    #region Columns Property
-
-    internal ColumnCollection Columns
-    {
-      get
-      {
-        return m_columns;
-      }
-    }
-
-    private readonly ColumnCollection m_columns;
-
-    #endregion
-
-    #region VisibleColumns Property
-
-    internal ReadOnlyColumnCollection VisibleColumns
-    {
-      get
-      {
-        return m_visibleColumns;
-      }
-    }
-
-    private readonly ReadOnlyColumnCollection m_visibleColumns;
-
-    #endregion
-
-    #region ColumnsByVisiblePosition Property
-
-    internal HashedLinkedList<ColumnBase> ColumnsByVisiblePosition
-    {
-      get
-      {
-        return m_columnsByVisiblePosition;
-      }
-    }
-
-    private readonly HashedLinkedList<ColumnBase> m_columnsByVisiblePosition;
-
-    #endregion
-
-    #region IsUpdateDeferred Property
-
-    internal bool IsUpdateDeferred
-    {
-      get
-      {
-        lock( this.SyncRoot )
-        {
-          return ( m_deferUpdateCount != 0 );
-        }
-      }
-    }
-
-    #endregion
-
-    #region SyncRoot Private Property
-
-    private object SyncRoot
-    {
-      get
-      {
-        return m_model;
-      }
-    }
-
-    #endregion
-
-    #region LayoutChanging Event
-
-    internal event EventHandler LayoutChanging;
-
-    private void OnLayoutChanging()
-    {
-      var handler = this.LayoutChanging;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    #endregion
-
-    #region LayoutChanged Event
-
-    internal event EventHandler LayoutChanged;
-
-    private void OnLayoutChanged()
-    {
-      var handler = this.LayoutChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    #endregion
-
-    internal void Initialize( DataGridControl dataGridControl )
-    {
-      if( dataGridControl == null )
-        throw new ArgumentNullException( "dataGridControl" );
-
-      if( m_dataGridControl == dataGridControl )
-        return;
-
-      if( m_dataGridControl != null )
-        throw new InvalidOperationException( "The current object is already initialized." );
-
-      m_dataGridControl = dataGridControl;
-      m_columns.DataGridControl = dataGridControl;
-
-      this.PrepareInitialLayout();
-    }
-
-    internal void Clear()
-    {
-      if( m_dataGridControl == null )
-        return;
-
-      this.ClearLayout();
-
-      m_columns.DataGridControl = null;
-
-      m_dataGridControl = null;
-      m_desiredFixedColumnCount = null;
-      m_synchronizeChildColumnNamesWithChildColumns = false;
-    }
-
-    internal IDisposable DeferUpdate()
-    {
-      return this.DeferUpdate( new UpdateOptions() );
-    }
-
-    internal IDisposable DeferUpdate( UpdateOptions options )
-    {
-      return new DeferredDisposable( new DeferUpdateState( this, options ) );
-    }
-
-    internal ILevelMarkers GetLevelMarkersFor( ColumnCollection collection )
-    {
-      if( collection == null )
-        return null;
-
-      var level = int.MinValue;
-
-      if( collection == m_columns )
-      {
-        level = 0;
-      }
-
-      if( ( level < 0 ) || ( level >= m_model.LevelCount ) )
-        return null;
-
-      return this.WrapLevelMarkers( m_model.GetLevelMarkers( level ) );
-    }
-
-    internal IColumnLocation GetColumnLocationFor( ColumnBase column )
-    {
-      return ( IColumnLocation )this.WrapLocation( m_model[ column ] );
-    }
-
-    internal int GetFixedColumnCount()
-    {
-      var levelCount = m_model.LevelCount;
-      if( levelCount == 0 )
-        return 0;
-
-      // Get the top-most level.
-      var markers = m_model.GetLevelMarkers( levelCount - 1 );
-
-      var splitterLocation = markers.Splitter;
-      if( splitterLocation == null )
-        return 0;
-
-      var count = 0;
-      var location = splitterLocation.GetPreviousSiblingOrCousin();
-
-      // Count the number of visibile columns that are located before the splitter.
-      while( location != null )
-      {
-        if( location.Type == LocationType.Column )
-        {
-          var columnLocation = ( ColumnHierarchyModel.IColumnLocation )location;
-          if( columnLocation.Column.Visible )
-          {
-            count++;
-          }
-        }
-
-        location = location.GetPreviousSiblingOrCousin();
-      }
-
-      return count;
-    }
-
-    internal void SetFixedColumnCount( int count )
-    {
-      this.Update( new UpdateOptions( count ) );
-    }
-
-    private static int ConvertLevelToMergedHeaderIndex( int level, int mergedHeaderCount )
-    {
-      if( level <= 0 )
-        throw new ArgumentException( "The level must be greater than or equal to 1.", "level" );
-
-      if( mergedHeaderCount <= 0 )
-        throw new ArgumentException( "The number of merged headers is expected to be greater than or equal to 1.", "mergedHeaderCount" );
-
-      if( level > mergedHeaderCount )
-        throw new ArgumentException( "The level must be less than or equal to the number of merged headers.", "level" );
-
-      return ( mergedHeaderCount - level );
-    }
-
-    private static int ConvertMergedHeaderIndexToLevel( int index, int mergedHeaderCount )
-    {
-      if( index < 0 )
-        throw new ArgumentException( "The index must be greater than or equal to zero.", "index" );
-
-      if( mergedHeaderCount <= 0 )
-        throw new ArgumentException( "The number of merged headers is expected to be greater than or equal to 1.", "mergedHeaderCount" );
-
-      if( index >= mergedHeaderCount )
-        throw new ArgumentException( "The index must be less than the number of merged headers.", "index" );
-
-      return ( mergedHeaderCount - index );
-    }
-
-    private void PrepareInitialLayout()
-    {
-      Debug.Assert( m_model.LevelCount == 0 );
-
-      this.RegisterEvents( m_columns );
-
-      m_model.AddLevel( 0 );
-
-      this.SetColumnsInView( 0 );    
-
-      this.UpdateLevelsInView();
-      this.Update();
-    }
-
-    private void ClearLayout()
-    {
-      for( int i = m_model.LevelCount - 1; i > 0; i-- )
-      {
-        this.RemoveLevelInView( i );
-      }
-
-      Debug.Assert( m_model.LevelCount == 1 );
-
-      foreach( var column in this.GetColumns( 0 ) )
-      {
-        this.UnregisterEvents( column );
-      }
-
-      m_model.RemoveLevel( 0 );
-
-      Debug.Assert( m_model.LevelCount == 0 );
-
-      this.UnregisterEvents( m_columns );
-    }
-
-    private void Update()
-    {
-      this.Update( new UpdateOptions() );
-    }
-
-    private void Update( UpdateOptions options )
-    {
-      lock( this.SyncRoot )
-      {
-        try
-        {
-          // The current object has not been initialized yet.
-          if( m_dataGridControl == null )
-            return;
-
-          // The update is deferred and must not be applied yet.
-          if( m_deferUpdateCount != 0 )
-            return;
-        }
-        finally
-        {
-          if( options.DesiredFixedColumnCount.HasValue )
-          {
-            m_desiredFixedColumnCount = Math.Max( 0, options.DesiredFixedColumnCount.Value );
-          }
-
-          if( !m_synchronizeChildColumnNamesWithChildColumns && ( options.SynchronizeChildColumnNamesWithChildColumns == true ) )
-          {
-            m_synchronizeChildColumnNamesWithChildColumns = true;
-
-            for( int i = m_model.LevelCount - 1; i > 0; i-- )
-            {
-              foreach( var columnLocation in this.GetColumnsLocation( this.GetLocationsOnLevelFromFirstToLast( i ) ) )
-              {
-                this.SetPosition( columnLocation, columnLocation.Status.Position.SetChildrenTimestamp( this.GetTimestamp() ) );
-              }
-            }
-
-            this.InvalidateLayout();
-          }
-        }
-      }
-
-      // Prevent reentrancy.
-      if( m_isApplyingChanges.IsSet )
-        return;
-
-      this.UpdateLayout();
-    }
-
-    private void UpdateLayout()
-    {
-      Debug.Assert( !m_isApplyingChanges.IsSet );
-
-      if( ( m_positionVersion == m_modelPositionVersion ) && ( m_visibilityVersion == m_modelVisibilityVersion ) && ( m_layoutVersion == m_modelLayoutVersion ) )
-      {
-        // Nothing has changed, so nothing to do.
-        if( ( !m_desiredFixedColumnCount.HasValue ) || ( m_desiredFixedColumnCount == this.GetFixedColumnCount() ) )
-        {
-          m_desiredFixedColumnCount = null;
-
-          this.ResetTimestamp();
-          return;
-        }
-      }
-
-      this.OnLayoutChanging();
-
-      this.ResetMainColumn();
-
-      while( true )
-      {
-        if( m_positionVersion != m_modelPositionVersion )
-        {
-          m_positionVersion = m_modelPositionVersion;
-          this.ApplyPosition();
-        }
-        else if( m_visibilityVersion != m_modelVisibilityVersion )
-        {
-          m_visibilityVersion = m_modelVisibilityVersion;
-          this.ApplyVisibility();
-        }
-        else if( m_desiredFixedColumnCount.HasValue )
-        {
-          var fixedColumnCount = m_desiredFixedColumnCount.Value;
-          m_desiredFixedColumnCount = null;
-
-          this.ApplyFixedColumnCount( fixedColumnCount );
-        }
-        else if( m_layoutVersion != m_modelLayoutVersion )
-        {
-          m_layoutVersion = m_modelLayoutVersion;
-          this.ApplyLayout();
-        }
-        else
-        {
-          this.ResetTimestamp();
-          break;
-        }
-      }
-
-      Debug.Assert( m_timestamp == 0u );
-      Debug.Assert( !m_desiredFixedColumnCount.HasValue );
-      Debug.Assert( m_positionVersion == m_modelPositionVersion );
-      Debug.Assert( m_visibilityVersion == m_modelVisibilityVersion );
-      Debug.Assert( m_layoutVersion == m_modelLayoutVersion );
-
-      this.OnLayoutChanged();
-    }
-
-    private void ApplyLayout()
-    {
-      if( m_isApplyingChanges.IsSet )
-        throw new InvalidOperationException( "The columns' layout is already being applied." );
-
-      using( m_isApplyingChanges.Set() )
-      {
-        for( int i = m_model.LevelCount - 1; i >= 0; i-- )
-        {
-          this.ApplyColumnsLayoutFromView( i );
-
-          if( i == 0 )
-          {
-            this.SetVisibleColumnsFromView( i, m_visibleColumns, m_columnsByVisiblePosition );
-          }
-        }
-      }
-    }
-
-    private void ApplyPosition()
-    {
-      if( m_isApplyingChanges.IsSet )
-        throw new InvalidOperationException( "The columns' relations are already being applied." );
-
-      var levelCount = m_model.LevelCount;
-      if( levelCount <= 0 )
-        return;
-
-      using( m_isApplyingChanges.Set() )
-      {
-        this.UpdateLevelsInView();
-      }
-    }
-
-    private void ApplyVisibility()
-    {
-      if( m_isApplyingChanges.IsSet )
-        throw new InvalidOperationException( "The columns' visibility is already being applied." );
-
-      var levelCount = m_model.LevelCount;
-      if( levelCount <= 0 )
-        return;
-
-      using( m_isApplyingChanges.Set() )
-      {
-        foreach( var location in this.GetLocationsOnLevel( levelCount - 1 ) )
-        {
-          // We must redo a visibility pass if the layout has changed while applying the visiblity.
-          if( !this.ApplyColumnsVisibilityFromView( location ) )
-            return;
-        }
-      }
-    }
-
-    private void ApplyFixedColumnCount( int count )
-    {
-      Debug.Assert( count >= 0 );
-
-      // There is no level or the splitter is already at the proper location.
-      var levelCount = m_model.LevelCount;
-      if( ( levelCount == 0 ) || ( count == this.GetFixedColumnCount() ) )
-        return;
-
-      // Get the top-most level.
-      var markers = m_model.GetLevelMarkers( levelCount - 1 );
-
-      var startLocation = markers.Start;
-      Debug.Assert( startLocation != null );
-      Debug.Assert( startLocation.Type == LocationType.Start );
-
-      var splitterLocation = markers.Splitter;
-      Debug.Assert( splitterLocation != null );
-      Debug.Assert( splitterLocation.Type == LocationType.Splitter );
-
-      var targetLocation = default( ColumnHierarchyModel.ILocation );
-      var moveBefore = false;
-
-      if( count <= 0 )
-      {
-        targetLocation = startLocation;
-      }
-      else
-      {
-        var remaining = count;
-        var currentLocation = startLocation;
-        var found = false;
-
-        while( !found )
-        {
-          currentLocation = currentLocation.GetNextSiblingOrCousin();
-          if( currentLocation == null )
-            throw new InvalidOperationException( "Unexpected location." );
-
-          switch( currentLocation.Type )
-          {
-            case LocationType.Column:
-              {
-                var column = ( ( ColumnHierarchyModel.IColumnLocation )currentLocation ).Column;
-                Debug.Assert( column != null );
-
-                if( column.Visible )
-                {
-                  remaining--;
-
-                  if( remaining == 0 )
-                  {
-                    targetLocation = currentLocation;
-                    found = true;
-                    break;
-                  }
-                }
-              }
-              break;
-
-            // The splitter cannot be set past the orphan section.
-            case LocationType.Orphan:
-              {
-                targetLocation = currentLocation;
-                moveBefore = true;
-                found = true;
-              }
-              break;
-          }
-        }
-      }
-
-      Debug.Assert( targetLocation != null );
-
-      if( moveBefore )
-      {
-        if( !splitterLocation.CanMoveBefore( targetLocation ) )
-          throw new InvalidOperationException( "The fixed-column splitter cannot be moved." );
-
-        splitterLocation.MoveBefore( targetLocation );
-      }
-      else
-      {
-        if( !splitterLocation.CanMoveAfter( targetLocation ) )
-          throw new InvalidOperationException( "The fixed-column splitter cannot be moved." );
-
-        splitterLocation.MoveAfter( targetLocation );
-      }
-    }
-
-    private void ResetStatus()
-    {
-      if( ( m_timestamp == 0u ) || ( m_model.LevelCount <= 0 ) )
-        return;
-
-      foreach( var location in this.GetLocationsOnLevel( m_model.LevelCount - 1 ) )
-      {
-        this.ResetStatusOnLocation( location );
-      }
-    }
-
-    private void ResetStatusOnLocation( ColumnHierarchyModel.ILocation location )
-    {
-      if( location == null )
-        return;
-
-      var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
-      if( columnLocation != null )
-      {
-        this.SetStatus( columnLocation, new ColumnStatus( ColumnPositionStatus.Default, ColumnVisibilityStatus.Create( columnLocation.Column.Visible ) ) );
-      }
-
-      foreach( var childLocation in this.GetChildLocations( location ) )
-      {
-        this.ResetStatusOnLocation( childLocation );
-      }
-    }
-
-    private void InsertLevelInView( int level )
-    {
-      Debug.Assert( ( level > 0 ) && ( level <= m_model.LevelCount ) );
-
-      m_model.AddLevel( level );
-
-      this.SetColumnsInView( level );
-    }
-
-    private void RemoveLevelInView( int level )
-    {
-      Debug.Assert( ( level > 0 ) && ( level < m_model.LevelCount ) );
-
-      foreach( var location in this.GetLocationsOnLevel( level ) )
-      {
-        var parentColumnLocation = location.GetParent() as ColumnHierarchyModel.IColumnLocation;
-        if( parentColumnLocation != null )
-        {
-          this.UpdateVisibility( parentColumnLocation );
-        }
-
-        var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
-        if( columnLocation != null )
-        {
-          this.UnregisterEvents( columnLocation.Column );
-        }
-      }
-
-      m_model.RemoveLevel( level );
-    }
-
-    private void UpdateLevelsInView()
-    {
-      var levelCount = m_model.LevelCount;
-      if( levelCount == 0 )
-        return;
-
-      if( levelCount > 1 )
-      {
-        var movedLocations = new HashSet<ColumnHierarchyModel.IColumnLocation>();
-        var childLocationsToMove = new Queue<ColumnHierarchyModel.IColumnLocation>();
-        var parentLocationsToInspect = new Queue<ColumnHierarchyModel.IColumnLocation>();
-        var relationsHistory = new List<ParentChildRelationshipSnapshot>[ levelCount ];
-        var relationsHistoryComparer = new ParentChildRelationshipSnapshotComparer();
-
-        for( int i = 0; i < levelCount; i++ )
-        {
-          relationsHistory[ i ] = new List<ParentChildRelationshipSnapshot>();
-
-          foreach( var columnLocation in this.GetColumnsLocation( this.GetLocationsOnLevel( i ) ) )
-          {
-            var positionStatus = columnLocation.Status.Position;
-
-            if( ( positionStatus.ParentTimestamp != 0u ) && ( i < levelCount - 1 ) )
-            {
-              childLocationsToMove.Enqueue( columnLocation );
-            }
-
-            if( ( positionStatus.ChildrenTimestamp != 0u ) && ( i > 0 ) )
-            {
-              parentLocationsToInspect.Enqueue( columnLocation );
-
-              foreach( var childColumnLocation in this.GetColumnsLocation( this.GetChildLocations( columnLocation ) ) )
-              {
-                childLocationsToMove.Enqueue( childColumnLocation );
-              }
-
-              var entry = new ParentChildRelationshipSnapshot( columnLocation, positionStatus.ChildrenTimestamp );
-              var history = relationsHistory[ i ];
-
-              // Insert the entries in a specific order to meet the GetChildColumnLocationDestination method needs.
-              var index = history.BinarySearch( entry, relationsHistoryComparer );
-
-              if( index < 0 )
-              {
-                index = ~index;
-              }
-
-              if( index >= history.Count )
-              {
-                history.Add( entry );
-              }
-              else
-              {
-                history.Insert( index, entry );
-              }
-            }
-          }
-        }
-      }
-
-      var isAFlattenDetail = ( m_columns.ParentDetailConfiguration != null )
-                          && ( m_dataGridControl != null )
-                          && ( m_dataGridControl.AreDetailsFlatten );
-
-      // Reorder the columns on each level.
-      for( int i = 0; i < levelCount; i++ )
-      {
-        // Reorder one of the child level.
-        if( i < levelCount - 1 )
-        {
-          foreach( var parentLocation in this.GetLocationsOnLevel( i + 1 ) )
-          {
-            ColumnLocationOrderer.Reorder( this.GetColumnsLocation( this.GetChildLocationsFromFirstToLast( parentLocation ) ).ToList(), !isAFlattenDetail );
-          }
-        }
-        // Reorder the top level.
-        else
-        {
-          ColumnLocationOrderer.Reorder( this.GetColumnsLocation( this.GetLocationsOnLevelFromFirstToLast( i ) ).ToList(), !isAFlattenDetail );
-        }
-      }
-    }
-
-    private Tuple<bool, bool> SetColumnsInView( int level )
-    {
-      var columns = m_columns;
-      var addAny = false;
-
-      Debug.Assert( columns != null );
-
-      var columnsToRemove = new HashSet<ColumnBase>( this.GetColumns( level ) );
-
-      // Add the missing columns into the view.
-      foreach( var column in columns )
-      {
-        if( !columnsToRemove.Remove( column ) )
-        {
-          var propagation = PropagationMode.None;
-
-          if( level > 0 )
-          {
-            var visibilitySource = DependencyPropertyHelper.GetValueSource( column, ColumnBase.VisibleProperty );
-
-            propagation = ( visibilitySource.BaseValueSource == BaseValueSource.Default ) ? PropagationMode.BottomUp : PropagationMode.TopDown;
-          }
-
-          this.AddColumnInView( column, propagation, level );
-          addAny = true;
-        }
-      }
-
-      var removedAny = false;
-
-      // Remove the columns that should no longer be in the view.
-      foreach( var column in columnsToRemove )
-      {
-        this.RemoveColumnInView( column );
-        removedAny = true;
-      }
-
-      return new Tuple<bool, bool>( addAny, removedAny );
-    }
-
-    private void ResetMainColumn()
-    {
-      // The main column must only be reset when details are flatten because it impact column positioning.
-      if( ( m_dataGridControl == null ) || !m_dataGridControl.AreDetailsFlatten )
-        return;
-
-      if( m_isApplyingChanges.IsSet )
-        throw new InvalidOperationException( "The columns' relations are already being applied." );
-
-      var levelCount = m_model.LevelCount;
-      if( levelCount <= 0 )
-        return;
-
-      using( m_isApplyingChanges.Set() )
-      {
-        var mainColumn = m_columns.MainColumn;
-        if( mainColumn != null )
-        {
-          // We must not reset the main column if it was set explicitly.
-          var mainColumnLocation = m_model[ mainColumn ];
-          if( ( mainColumnLocation == null ) || ( mainColumnLocation.Status.Position.MainColumnTimestamp != 0u ) )
-            return;
-
-          m_columns.MainColumn = null;
-        }
-      }
-    }
-
-    private ColumnHierarchyModel.IColumnLocation AddColumnInView( ColumnBase column, PropagationMode mode, int level )
-    {
-      Debug.Assert( column != null );
-      Debug.Assert( ( level >= 0 ) && ( level < m_model.LevelCount ) );
-
-      var location = m_model[ column ];
-      if( location == null )
-      {
-        var timestamp = this.GetTimestamp();
-        var visibilityStatus = ColumnVisibilityStatus.Create( column.Visible, mode, timestamp );
-        var positionStatus = ColumnPositionStatus.Default;
-
-        if( level > 0 )
-        {
-          positionStatus = positionStatus.SetChildrenTimestamp( timestamp );
-        }
-
-        switch( DependencyPropertyHelper.GetValueSource( column, ColumnBase.VisiblePositionProperty ).BaseValueSource )
-        {
-          case BaseValueSource.Default:
-          case BaseValueSource.Inherited:
-          case BaseValueSource.Unknown:
-            break;
-
-          default:
-            positionStatus = positionStatus.SetVisiblePositionTimestamp( timestamp );
-            break;
-        }
-
-        var columnStatus = new ColumnStatus( positionStatus, visibilityStatus );
-
-        location = m_model.Add( column, columnStatus, level );
-        Debug.Assert( location != null );
-
-        this.RegisterEvents( column );
-      }
-
-      return location;
-    }
-
-    private void RemoveColumnInView( ColumnBase column )
-    {
-      Debug.Assert( column != null );
-
-      var location = m_model[ column ];
-      if( location == null )
-        return;
-
-      var parentColumnLocation = location.GetParent() as ColumnHierarchyModel.IColumnLocation;
-      if( parentColumnLocation != null )
-      {
-        this.UpdateVisibility( parentColumnLocation );
-      }
-
-      m_model.Remove( column );
-
-      this.UnregisterEvents( column );
-    }
-
-    private ColumnHierarchyModel.IColumnLocation ReplaceColumnInView( ColumnBase oldColumn, ColumnBase newColumn )
-    {
-      Debug.Assert( ( oldColumn != null ) && ( newColumn != null ) );
-
-      var oldColumnLocation = m_model[ oldColumn ];
-      if( ( oldColumn == newColumn ) || ( oldColumnLocation == null ) )
-        return oldColumnLocation;
-
-      var newColumnLocation = m_model[ newColumn ];
-      if( newColumnLocation == null )
-      {
-        newColumnLocation = this.AddColumnInView( newColumn, PropagationMode.BottomUp, oldColumnLocation.Level );
-        Debug.Assert( newColumnLocation != null );
-      }
-      else if( newColumnLocation.Level != oldColumnLocation.Level )
-      {
-        throw new InvalidOperationException( "The replaced column is not on the same level." );
-      }
-
-      Debug.Assert( newColumnLocation.CanMoveAfter( oldColumnLocation ) );
-      newColumnLocation.MoveAfter( oldColumnLocation );
-
-      // Update the location timestamp to keep the column under the parent column.
-      this.SetPosition( newColumnLocation, newColumnLocation.Status.Position.SetLocationTimestamp( this.GetTimestamp() ) );
-      this.SetPosition( newColumnLocation, newColumnLocation.Status.Position.SetDraggableStatusTimestamp( this.GetTimestamp() ) );
-
-      var lastChildColumnLocation = this.GetColumnsLocation( this.GetChildLocationsFromFirstToLast( newColumnLocation ) ).FirstOrDefault();
-      var childColumnLocations = this.GetColumnsLocation( this.GetChildLocationsFromFirstToLast( oldColumnLocation ) ).ToList();
-
-      // Move the columns under the new column and keep them in the same order.
-      foreach( var childColumnLocation in childColumnLocations )
-      {
-        if( lastChildColumnLocation != null )
-        {
-          Debug.Assert( childColumnLocation.CanMoveAfter( lastChildColumnLocation ) );
-          childColumnLocation.MoveAfter( lastChildColumnLocation );
-        }
-        else
-        {
-          Debug.Assert( childColumnLocation.CanMoveUnder( newColumnLocation ) );
-          childColumnLocation.MoveUnder( newColumnLocation );
-        }
-
-        lastChildColumnLocation = childColumnLocation;
-      }
-
-      // Reserve a timestamp that is going to be used to keep child columns under their new parent column.
-      // We want that timestamp to be of "lower priority" than any visible position timestamp update
-      // on the child columns so a reordering may be done.
-      var locationTimestamp = this.GetTimestamp();
-
-      // Update the timestamps on the transfered child columns to keep them under their new parent column.
-      foreach( var entry in ( from childColumnLocation in childColumnLocations
-                              let positionStatus = childColumnLocation.Status.Position
-                              orderby positionStatus.VisiblePositionTimestamp
-                              select new
-                              {
-                                Location = childColumnLocation,
-                                Status = positionStatus
-                              } ) )
-      {
-        var positionStatus = entry.Status.SetLocationTimestamp( locationTimestamp );
-
-        if( positionStatus.VisiblePositionTimestamp != 0u )
-        {
-          // Since a visible position reordering was scheduled before the parent column was replaced,
-          // we must update the visible position timestamp to apply the reordering in the same order
-          // under the new parent column.
-          positionStatus = positionStatus.SetVisiblePositionTimestamp( this.GetTimestamp() );
-        }
-
-        this.SetPosition( entry.Location, positionStatus );
-      }
-
-      this.RemoveColumnInView( oldColumn );
-
-      return newColumnLocation;
-    }
-
-    private bool MoveChildColumnUnderLocationInView( ColumnHierarchyModel.IColumnLocation location, ColumnHierarchyModel.ILocation pivot )
-    {
-      if( ( location == null ) || ( pivot == null ) )
-        return false;
-
-      // The column is already at the proper location.
-      if( object.Equals( location.GetParent(), pivot ) )
-        return false;
-
-      Debug.Assert( location.CanMoveUnder( pivot ) );
-      location.MoveUnder( pivot );
-
-      var positionStatus = location.Status.Position;
-      if( positionStatus.VisiblePositionTimestamp == 0u )
-      {
-        // Update the child column status to move it at the right place under its new parent location.
-        this.SetPosition( location, positionStatus.SetVisiblePositionTimestamp( this.GetTimestamp() ) );
-      }
-
-      return true;
-    }
-
-    private ColumnHierarchyModel.ILocation GetChildColumnLocationDestination( ColumnHierarchyModel.IColumnLocation location, IList<ParentChildRelationshipSnapshot> relationsHistory )
-    {
-      Debug.Assert( location != null );
-      Debug.Assert( ( location.Level >= 0 ) && ( location.Level < m_model.LevelCount - 1 ) );
-
-
-      var column = location.Column;
-      var positionStatus = location.Status.Position;
-      var orphanLocation = m_model.GetLevelMarkers( location.Level + 1 ).Orphan;
-      Debug.Assert( orphanLocation != null );
-
-      var fallbackParentLocation = location.GetParent();
-      var fallbackTimestamp = 0u;
-
-      // Since the target column wants to be under a specific column (or orphan), we must consider the new parent location
-      // as a possible candidate if it is not one already.
-      if( ( positionStatus.ParentTimestamp != 0u ) || ( positionStatus.LocationTimestamp != 0u ) )
-      {
-        if( positionStatus.ParentTimestamp > positionStatus.LocationTimestamp )
-        {         
-          fallbackParentLocation = orphanLocation;
-          fallbackTimestamp = positionStatus.ParentTimestamp;
-        }
-        else
-        {
-
-          fallbackParentLocation = location.GetParent();
-          fallbackTimestamp = positionStatus.LocationTimestamp;
-
-          Debug.Assert( object.Equals( fallbackParentLocation, location.GetParent() ) );
-        }
-      }
-
-      // Figure out if one of the candidates wants the column.
-      foreach( var relationHistory in relationsHistory )
-      {
-        // Since the fallback parent location wants the column and it has an higher priority than any remaining
-        // candidates, there is no need to look for a candidate.
-        if( relationHistory.Timestamp < fallbackTimestamp )
-          break;
-
-        // Since the fallback location is the candidate and it does not want the child column anymore,
-        // the column should become orphan.
-        if( object.Equals( fallbackParentLocation, relationHistory.Location ) )
-          return orphanLocation;
-      }
-
-      Debug.Assert( fallbackParentLocation != null );
-      return fallbackParentLocation;
-    }
-
-    private void ApplyColumnsLayoutFromView( int level )
-    {
-      var location = this.GetLocationsOnLevelFromFirstToLast( level ).FirstOrDefault();
-      var position = 0;
-
-      while( location != null )
-      {
-        var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
-        if( columnLocation == null )
-        {
-          location = location.GetNextSiblingOrCousin();
-          continue;
-        }
-
-        var parentColumnLocation = columnLocation.GetParent() as ColumnHierarchyModel.IColumnLocation;
-        var column = columnLocation.Column;
-
-        column.VisiblePosition = position;
-
-        if( position == 0 )
-        {
-          var columns = column.ContainingCollection;
-          if( columns != null )
-          {
-            if( ( columns.MainColumn == null ) || ( ( m_dataGridControl != null ) && m_dataGridControl.AreDetailsFlatten ) )
-            {
-              columns.MainColumn = column;
-            }
-          }
-        }
-
-        location = location.GetNextSiblingOrCousin();
-        position++;
-      }
-    }
-
-    private bool ApplyColumnsVisibilityFromView( ColumnHierarchyModel.ILocation location )
-    {
-      Debug.Assert( location != null );
-
-      var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
-      var childrenLocation = this.GetChildLocations( location ).ToList();
-      var visibilityStatus = this.GetStatus( location ).Visibility;
-
-      // Apply visibility changes top-down.
-      if( childrenLocation.Count > 0 )
-      {
-        if( visibilityStatus.Mode == PropagationMode.TopDown )
-        {
-          var childVisibilityStatus = visibilityStatus.SetMode( PropagationMode.TopDown );
-
-          foreach( var childLocation in ( from l in childrenLocation
-                                          let cl = l as ColumnHierarchyModel.IColumnLocation
-                                          where ( cl != null )
-                                             && ( cl.Status.Visibility.Timestamp <= childVisibilityStatus.Timestamp )
-                                          select cl ) )
-          {
-            this.SetVisibility( childLocation, childVisibilityStatus );
-          }
-
-          // The current column will need to query its child column visibility to determine its visibility.
-          if( columnLocation != null )
-          {
-            this.SetVisibility( columnLocation, visibilityStatus.SetMode( PropagationMode.BottomUp ) );
-          }
-        }
-
-        // Apply the child columns visibility.
-        foreach( var childLocation in childrenLocation )
-        {
-          // The layout has been modified while we were updating a child column's visibility.
-          // A new visibility pass must be done.
-          if( !this.ApplyColumnsVisibilityFromView( childLocation ) )
-            return false;
-        }
-
-        // Refresh the status in case it changed while applying the child columns visibility.
-        visibilityStatus = this.GetStatus( location ).Visibility;
-      }
-
-      // Update the current column's visibility based on its children.
-      if( columnLocation != null )
-      {
-        if( childrenLocation.Count > 0 )
-        {
-          // Make sure the child columns visible state is not dirty because a user did some changes while we were updating
-          // the child columns visibility.
-          if( visibilityStatus.Mode == PropagationMode.BottomUp )
-          {
-            // One of the children is not up-to-date.  We need redo the visibility pass.
-            // We return true because the layout is still the same.
-            if( !childrenLocation.All( l => this.GetStatus( l ).Visibility.Mode == PropagationMode.None ) )
-              return true;
-
-            visibilityStatus = ColumnVisibilityStatus.Create( childrenLocation.Any( l => this.GetStatus( l ).Visibility.Visible ) );
-            this.SetVisibility( columnLocation, visibilityStatus );
-          }
-        }
-        else
-        {
-          // A merged column must be hidden when it contains no child column.
-          visibilityStatus = ColumnVisibilityStatus.Create( visibilityStatus.Visible && ( location.Level == 0 ) );
-          this.SetVisibility( columnLocation, visibilityStatus );
-        }
-      }
-
-      // A new visibility pass is required when the visibility needs to be progagated.
-      if( ( visibilityStatus.Mode != PropagationMode.None ) || ( columnLocation == null ) )
-        return true;
-
-      var column = columnLocation.Column;
-      Debug.Assert( column != null );
-
-      // Nothing to do.
-      if( column.Visible == visibilityStatus.Visible )
-        return true;
-
-      // The layout is no longer the same since the columns is now hidden or displayed.
-      this.InvalidateLayout();
-
-      var layoutVersion = m_modelLayoutVersion;
-
-      column.Visible = visibilityStatus.Visible;
-
-      // The versions will be different if the user altered the layout while we were updating the column's visibility.
-      return ( layoutVersion == m_modelLayoutVersion );
-    }
-
-    private void SetVisibleColumnsFromView( int level, ReadOnlyColumnCollection visibleColumns, HashedLinkedList<ColumnBase> columnsByVisiblePosition )
-    {
-      Debug.Assert( visibleColumns != null );
-      Debug.Assert( columnsByVisiblePosition != null );
-
-      using( visibleColumns.DeferNotifications() )
-      {
-        // Prevent a Reset event for nothing.
-        if( visibleColumns.Count != 0 )
-        {
-          visibleColumns.InternalClear();
-        }
-
-        columnsByVisiblePosition.Clear();
-
-        foreach( var column in this.GetColumns( this.GetColumnsLocation( this.GetLocationsOnLevelFromFirstToLast( level ) ) ) )
-        {
-          columnsByVisiblePosition.AddLast( column );
-
-          using( column.InhibitVisiblePositionChanging() )
-          {
-            if( column.Visible )
-            {
-              visibleColumns.InternalAdd( column );
-            }
-          }
-        }
-      }
-
-      var firstVisibleColumn = default( ColumnBase );
-      var lastVisibleColumn = default( ColumnBase );
-
-      foreach( var column in columnsByVisiblePosition )
-      {
-        if( column.Visible )
-        {
-          if( firstVisibleColumn == null )
-          {
-            firstVisibleColumn = column;
-          }
-          else
-          {
-            column.ClearIsFirstVisible();
-          }
-
-          if( lastVisibleColumn != null )
-          {
-            lastVisibleColumn.ClearIsLastVisible();
-          }
-
-          lastVisibleColumn = column;
-        }
-        else
-        {
-          column.ClearIsFirstVisible();
-          column.ClearIsLastVisible();
-        }
-      }
-
-      if( firstVisibleColumn != null )
-      {
-        firstVisibleColumn.SetIsFirstVisible( true );
-      }
-
-      if( lastVisibleColumn != null )
-      {
-        lastVisibleColumn.SetIsLastVisible( true );
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetLocationsOnLevelFromFirstToLast( int level )
-    {
-      var location = ( ColumnHierarchyModel.ILocation )m_model.GetLevelMarkers( level ).Start;
-      Debug.Assert( location.GetPreviousSiblingOrCousin() == null );
-
-      while( location != null )
-      {
-        yield return location;
-
-        location = location.GetNextSiblingOrCousin();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetLocationsOnLevelFromLastToFirst( int level )
-    {
-      var location = ( ColumnHierarchyModel.ILocation )m_model.GetLevelMarkers( level ).End;
-      Debug.Assert( location.GetNextSiblingOrCousin() == null );
-
-      while( location != null )
-      {
-        yield return location;
-
-        location = location.GetPreviousSiblingOrCousin();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetLocationsOnLevel( int level )
-    {
-      return this.GetLocationsOnLevelFromFirstToLast( level );
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetChildLocationsFromFirstToLast( ColumnHierarchyModel.ILocation parentLocation )
-    {
-      if( parentLocation != null )
-      {
-        var location = parentLocation.GetFirstChild();
-
-        while( location != null )
-        {
-          yield return location;
-
-          location = location.GetNextSibling();
-        }
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetChildLocationsFromLastToFirst( ColumnHierarchyModel.ILocation parentLocation )
-    {
-      return this.GetChildLocationsFromFirstToLast( parentLocation ).Reverse();
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetChildLocations( ColumnHierarchyModel.ILocation parentLocation )
-    {
-      return this.GetChildLocationsFromFirstToLast( parentLocation );
-    }
-
-    private IEnumerable<ColumnHierarchyModel.IColumnLocation> GetColumnsLocation( IEnumerable<ColumnHierarchyModel.ILocation> locations )
-    {
-      return ( from location in locations
-               let columnLocation = location as ColumnHierarchyModel.IColumnLocation
-               where ( columnLocation != null )
-               select columnLocation );
-    }
-
-    private IEnumerable<ColumnBase> GetColumns( IEnumerable<ColumnHierarchyModel.IColumnLocation> locations )
-    {
-      return ( from location in locations
-               select location.Column );
-    }
-
-    private IEnumerable<ColumnBase> GetColumns( int level )
-    {
-      return this.GetColumns( this.GetColumnsLocation( this.GetLocationsOnLevel( level ) ) );
-    }
-
-    private ColumnStatus GetStatus( ColumnHierarchyModel.ILocation location )
-    {
-      var columnLocation = location as ColumnHierarchyModel.IColumnLocation;
-      if( columnLocation != null )
-        return columnLocation.Status;
-
-      return new ColumnStatus( ColumnVisibilityStatus.Create( false ) );
-    }
-
-    private void InvalidateLayout()
-    {
-      unchecked
-      {
-        m_modelLayoutVersion++;
-      }
-    }
-
-    private void InvalidatePosition()
-    {
-      unchecked
-      {
-        m_modelPositionVersion++;
-      }
-    }
-
-    private void InvalidateVisibility()
-    {
-      unchecked
-      {
-        m_modelVisibilityVersion++;
-      }
-    }
-
-    private uint GetTimestamp()
-    {
-      checked
-      {
-        m_timestamp++;
-      }
-
-      return m_timestamp;
-    }
-
-    private void ResetTimestamp()
-    {
-      if( m_timestamp == 0u )
-        return;
-
-      this.ResetStatus();
-
-      // The position and visibility counter are reset here since a call to ResetStatus may update them.  These updates may be safely ignored.
-      m_positionVersion = m_modelPositionVersion;
-      m_visibilityVersion = m_modelVisibilityVersion;
-
-      // The counter is reset to lower the chance of an overflow.
-      m_timestamp = 0u;
-    }
-
-    private void UpdateVisibility( ColumnHierarchyModel.IColumnLocation location )
-    {
-      if( location == null )
-        return;
-
-      // An update is already scheduled.
-      var visibilityStatus = location.Status.Visibility;
-      if( visibilityStatus.Mode != PropagationMode.None )
-        return;
-
-      this.SetVisibility( location, visibilityStatus.SetMode( PropagationMode.BottomUp ) );
-    }
-
-    private void SetVisibility( ColumnHierarchyModel.IColumnLocation location, ColumnVisibilityStatus visibilityStatus )
-    {
-      if( location == null )
-        return;
-
-      var status = location.Status;
-
-      this.SetStatus( location, status.SetVisibilityStatus( visibilityStatus ) );
-    }
-
-    private void SetPosition( ColumnHierarchyModel.IColumnLocation location, ColumnPositionStatus positionStatus )
-    {
-      if( location == null )
-        return;
-
-      var status = location.Status;
-
-      this.SetStatus( location, status.SetPositionStatus( positionStatus ) );
-    }
-
-    private void SetStatus( ColumnHierarchyModel.IColumnLocation location, ColumnStatus status )
-    {
-      if( ( location == null ) || object.Equals( location.Status, status ) )
-        return;
-
-      location.Status = status;
-    }
-
-    private ILevelMarkers WrapLevelMarkers( ColumnHierarchyModel.IMarkers markers )
-    {
-      if( markers == null )
-        return null;
-
-      return new Markers( this, markers );
-    }
-
-    private ILocation WrapLocation( ColumnHierarchyModel.ILocation location )
-    {
-      if( location == null )
-        return null;
-
-      if( location.Type == LocationType.Column )
-      {
-        Debug.Assert( location is ColumnHierarchyModel.IColumnLocation );
-        return new ColumnLocation( this, ( ColumnHierarchyModel.IColumnLocation )location );
-      }
-
-      return new Location( this, location );
-    }
-
-    private void RegisterEvents( ColumnCollection collection )
-    {
-      Debug.Assert( collection != null );
-
-      CollectionChangedEventManager.AddListener( collection, this );
-      PropertyChangedEventManager.AddListener( collection, this, string.Empty );
-    }
-
-    private void UnregisterEvents( ColumnCollection collection )
-    {
-      Debug.Assert( collection != null );
-
-      CollectionChangedEventManager.RemoveListener( collection, this );
-      PropertyChangedEventManager.RemoveListener( collection, this, string.Empty );
-    }
-
-    private void RegisterEvents( ColumnBase column )
-    {
-      Debug.Assert( column != null );
-      PropertyChangedEventManager.AddListener( column, this, string.Empty );
-    }
-
-    private void UnregisterEvents( ColumnBase column )
-    {
-      Debug.Assert( column != null );
-
-      PropertyChangedEventManager.RemoveListener( column, this, string.Empty );
-    }
-
-    private void OnColumnsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      Debug.Assert( m_model.LevelCount > 0 );
-
-      var resetFixedRegions = false;
-      var resetItemContainerGenerator = false;
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          {
-            var items = e.NewItems;
-            if( ( items == null ) || ( items.Count <= 0 ) )
-              return;
-
-            Debug.Assert( m_model.LevelCount > 0 );
-
-            // Only reset the fixed headers/footers if columns are at the master level.
-            resetFixedRegions = ( m_columns.ParentDetailConfiguration == null );
-
-            foreach( ColumnBase column in items )
-            {
-              this.AddColumnInView( column, PropagationMode.None, 0 );
-            }
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          {
-            var items = e.OldItems;
-            if( ( items == null ) || ( items.Count <= 0 ) )
-              return;
-
-            resetItemContainerGenerator = true;
-
-            foreach( ColumnBase column in items )
-            {
-              this.RemoveColumnInView( column );
-            }
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Move:
-          // Nothing to do.
-          return;
-
-        case NotifyCollectionChangedAction.Replace:
-          {
-            var oldItems = e.OldItems;
-            if( ( oldItems == null ) || ( oldItems.Count <= 0 ) )
-              return;
-
-            var newItems = e.NewItems;
-            if( ( newItems == null ) || ( newItems.Count <= 0 ) )
-              return;
-
-            if( newItems.Count != oldItems.Count )
-              throw new NotSupportedException();
-
-            resetItemContainerGenerator = true;
-
-            for( int i = 0; i < oldItems.Count; i++ )
-            {
-              this.ReplaceColumnInView( ( ColumnBase )oldItems[ i ], ( ColumnBase )newItems[ i ] );
-            }
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-          {
-            var result = this.SetColumnsInView( 0 );
-            resetFixedRegions = result.Item1;
-            resetItemContainerGenerator = result.Item2;
-          }
-          break;
-
-        default:
-          throw new NotSupportedException();
-      }
-
-      this.Update();
-
-      if( resetFixedRegions )
-      {
-        m_dataGridControl.ResetFixedRegions();
-      }
-      // When a column is removed, we need to clear the generator from every container to avoid problem
-      // when a new instance of a column with the same field name is reinserted.
-      else if( resetItemContainerGenerator )
-      {
-        var itemContainerGenerator = m_dataGridControl.CustomItemContainerGenerator;
-        if( itemContainerGenerator != null )
-        {
-          itemContainerGenerator.RemoveAllAndNotify();
-        }
-
-        // Only reset the fixed headers/footers if columns are at the master level.
-        if( m_columns.ParentDetailConfiguration == null )
-        {
-          m_dataGridControl.ResetFixedRegions();
-        }
-      }
-    }
-
-    private void OnColumnCollectionPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var mayHaveChanged = string.IsNullOrEmpty( e.PropertyName );
-
-      if( mayHaveChanged || ( e.PropertyName == ColumnCollection.MainColumnPropertyName ) )
-      {
-        // We don't want to alter the layout while it is being applied.  Furthermore, it is most likely the
-        // new layout that triggered the change notification.
-        if( !m_isApplyingChanges.IsSet )
-        {
-          // The ColumnCollection.MainColumn (ColumnBase.IsMainColumn) property impacts the columns layout when details are flatten.
-          if( ( m_dataGridControl != null ) && m_dataGridControl.AreDetailsFlatten )
-          {
-            var mainColumn = m_columns.MainColumn;
-            var mainColumnLocation = ( mainColumn != null ) ? m_model[ mainColumn ] : null;
-
-            if( mainColumnLocation != null )
-            {
-              Debug.Assert( mainColumnLocation.Level == 0 );
-
-              var columnsToMove = new Stack<ColumnBase>();
-              columnsToMove.Push( mainColumnLocation.Column );
-
-              var parentLocation = mainColumnLocation.GetParent();
-              while( parentLocation != null )
-              {
-                var parentColumnLocation = parentLocation as ColumnHierarchyModel.IColumnLocation;
-                if( parentColumnLocation == null )
-                {
-                  // The desired main column is under one of the orphan section.
-                  // It is impossible to move the column and its parent to the first location.
-                  columnsToMove.Clear();
-                  break;
-                }
-
-                columnsToMove.Push( parentColumnLocation.Column );
-                parentLocation = parentLocation.GetParent();
-              }
-
-              while( columnsToMove.Count > 0 )
-              {
-                var column = columnsToMove.Pop();
-                var columnLocation = m_model[ column ];
-                Debug.Assert( columnLocation != null );
-
-                var pivotLocation = columnLocation;
-                var previousLocation = ( ColumnHierarchyModel.ILocation )pivotLocation;
-
-                while( previousLocation != null )
-                {
-                  if( previousLocation.Type == LocationType.Column )
-                  {
-                    pivotLocation = ( ColumnHierarchyModel.IColumnLocation )previousLocation;
-                  }
-
-                  previousLocation = previousLocation.GetPreviousSibling();
-                }
-
-                if( !object.Equals( columnLocation, pivotLocation ) )
-                {
-                  Debug.Assert( columnLocation.CanMoveBefore( pivotLocation ) );
-                  columnLocation.MoveBefore( pivotLocation );
-
-                  this.SetPosition( columnLocation, columnLocation.Status.Position.SetLocationTimestamp( this.GetTimestamp() ) );
-                }
-              }
-            }
-          }
-        }
-
-        this.InvalidateLayout();
-        this.Update();
-      }
-    }
-
-    private void OnColumnPropertyChanged( ColumnBase column, PropertyChangedEventArgs e )
-    {
-      var mayHaveChanged = string.IsNullOrEmpty( e.PropertyName );
-      var columnLocation = m_model[ column ];
-      var needUpdate = false;
-
-      Debug.Assert( columnLocation != null );
-
-      if( mayHaveChanged || ( e.PropertyName == ColumnBase.VisibleProperty.Name ) )
-      {
-        if( column.Visible != columnLocation.Status.Visibility.Visible )
-        {
-          this.SetVisibility( columnLocation, ColumnVisibilityStatus.Create( column.Visible, PropagationMode.TopDown, this.GetTimestamp() ) );
-        }
-
-        needUpdate = true;
-      }
-
-      if( mayHaveChanged || ( e.PropertyName == ColumnBase.VisiblePositionProperty.Name ) )
-      {
-        this.SetPosition( columnLocation, columnLocation.Status.Position.SetVisiblePositionTimestamp( this.GetTimestamp() ) );
-
-        // We must invalidate the layout no matter what to make sure the column's visible position is recalculated and reapplied.
-        this.InvalidateLayout();
-
-        needUpdate = true;
-      }
-
-      if( mayHaveChanged || ( e.PropertyName == ColumnBase.DraggableStatusProperty.Name ) )
-      {
-        this.SetPosition( columnLocation, columnLocation.Status.Position.SetDraggableStatusTimestamp( this.GetTimestamp() ) );
-
-        needUpdate = true;
-      }
-
-      if( mayHaveChanged || ( e.PropertyName == ColumnBase.IsMainColumnPropertyName ) )
-      {
-        this.SetPosition( columnLocation, columnLocation.Status.Position.SetMainColumnTimestamp( this.GetTimestamp() ) );
-
-        needUpdate = true;
-      }
-
-      if( mayHaveChanged)
-      {
-        ColumnHierarchyModel parentColumnLocation =  null;
-
-        if( !object.Equals( columnLocation.GetParent(), parentColumnLocation ) )
-        {
-          this.SetPosition( columnLocation, columnLocation.Status.Position.SetParentTimestamp( this.GetTimestamp() ) );
-        }
-
-        needUpdate = true;
-      }
-
-      if( needUpdate )
-      {
-        this.Update();
-      }
-    }
-
-    private void OnViewLayoutChanging( object sender, ColumnHierarchyModel.LayoutChangingEventArgs e )
-    {
-      switch( e.Action )
-      {
-        case ColumnHierarchyModel.LayoutChangingAction.ChangingParent:
-        case ColumnHierarchyModel.LayoutChangingAction.ChangingFirstChild:
-        case ColumnHierarchyModel.LayoutChangingAction.Removing:
-          {
-            var location = e.Location.GetParent() as ColumnHierarchyModel.IColumnLocation;
-            if( location != null )
-            {
-              this.UpdateVisibility( location );
-            }
-          }
-          break;
-      }
-
-      this.InvalidateLayout();
-    }
-
-    private void OnViewLayoutChanged( object sender, ColumnHierarchyModel.LayoutChangedEventArgs e )
-    {
-      switch( e.Action )
-      {
-        case ColumnHierarchyModel.LayoutChangedAction.ParentChanged:
-        case ColumnHierarchyModel.LayoutChangedAction.FirstChildChanged:
-          {
-            var location = e.Location.GetParent() as ColumnHierarchyModel.IColumnLocation;
-            if( location != null )
-            {
-              this.UpdateVisibility( location );
-            }
-          }
-          break;
-      }
-
-      this.InvalidateLayout();
-    }
-
-    private void OnViewStatusChanged( object sender, ColumnHierarchyModel.StatusChangedEventArgs e )
-    {
-      var oldStatus = e.OldValue;
-      var oldVisibilityStatus = oldStatus.Visibility;
-      var oldPositionStatus = oldStatus.Position;
-      var newStatus = e.NewValue;
-      var newVisibilityStatus = newStatus.Visibility;
-      var newPositionStatus = newStatus.Position;
-
-      if( oldVisibilityStatus.Visible != newVisibilityStatus.Visible )
-      {
-        var parentColumnLocation = e.Location.GetParent() as ColumnHierarchyModel.IColumnLocation;
-        if( parentColumnLocation != null )
-        {
-          this.UpdateVisibility( parentColumnLocation );
-        }
-
-        // The layout is no longer the same since a columns is now hidden or displayed.
-        this.InvalidateLayout();
-      }
-
-      if( !object.Equals( oldPositionStatus, newPositionStatus ) )
-      {
-        this.InvalidatePosition();
-      }
-
-      this.InvalidateVisibility();
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        Debug.Assert( m_dataGridControl != null, "The current object should be initialized." );
-
-        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
-
-        if( sender == m_columns )
-        {
-          this.OnColumnsChanged( eventArgs );
-        }
-      }
-      else if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        Debug.Assert( m_dataGridControl != null, "The current object should be initialized." );
-
-        var eventArgs = ( PropertyChangedEventArgs )e;
-
-        if( sender is ColumnBase )
-        {
-          this.OnColumnPropertyChanged( ( ColumnBase )sender, eventArgs );
-        }
-        else if( sender == m_columns )
-        {
-          this.OnColumnCollectionPropertyChanged( eventArgs );
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private readonly ColumnHierarchyModel m_model = new ColumnHierarchyModel();
-    private readonly AutoResetFlag m_isApplyingChanges = AutoResetFlagFactory.Create( true );
-    private DataGridControl m_dataGridControl;
-    private int m_deferUpdateCount; //0
-    private int? m_desiredFixedColumnCount; //null
-    private bool m_synchronizeChildColumnNamesWithChildColumns; //false
-    private uint m_timestamp; //0
-    private int m_modelLayoutVersion; //0
-    private int m_modelPositionVersion; //0
-    private int m_modelVisibilityVersion; //0
-    private int m_layoutVersion; //0
-    private int m_positionVersion; //0
-    private int m_visibilityVersion; //0
-
-    #region ILevelMarkers Internal Interface
-
-    internal interface ILevelMarkers
-    {
-      ILocation Start
-      {
-        get;
-      }
-
-      ILocation End
-      {
-        get;
-      }
-
-      ILocation Splitter
-      {
-        get;
-      }
-
-      ILocation Orphan
-      {
-        get;
-      }
-    }
-
-    #endregion
-
-    #region ILocation Internal Interface
-
-    internal interface ILocation
-    {
-      LocationType Type
-      {
-        get;
-      }
-
-      ILocation GetParent();
-      ILocation GetFirstChild();
-      ILocation GetLastChild();
-
-      ILocation GetPreviousSibling();
-      ILocation GetNextSibling();
-
-      ILocation GetPreviousSiblingOrCousin();
-      ILocation GetNextSiblingOrCousin();
-
-      bool CanMoveBefore( ILocation location );
-      bool CanMoveAfter( ILocation location );
-      bool CanMoveUnder( ILocation location );
-
-      void MoveBefore( ILocation location );
-      void MoveAfter( ILocation location );
-      void MoveUnder( ILocation location );
-    }
-
-    #endregion
-
-    #region IColumnLocation Internal Interface
-
-    internal interface IColumnLocation : ILocation
-    {
-      ColumnBase Column
-      {
-        get;
-      }
-    }
-
-    #endregion
-
-    #region UpdateOptions Internal Struct
-
-    internal struct UpdateOptions
-    {
-      internal UpdateOptions( int desiredFixedColumnCount )
-      {
-        m_desiredFixedColumnCount = desiredFixedColumnCount;
-        m_synchronizeChildColumnNamesWithChildColumns = default( bool? );
-      }
-
-      internal UpdateOptions( int desiredFixedColumnCount, bool synchronizeChildColumnNamesWithChildColumns )
-      {
-        m_desiredFixedColumnCount = desiredFixedColumnCount;
-        m_synchronizeChildColumnNamesWithChildColumns = synchronizeChildColumnNamesWithChildColumns;
-      }
-
-      internal int? DesiredFixedColumnCount
-      {
-        get
-        {
-          return m_desiredFixedColumnCount;
-        }
-        set
-        {
-          m_desiredFixedColumnCount = value;
-        }
-      }
-
-      internal bool? SynchronizeChildColumnNamesWithChildColumns
-      {
-        get
-        {
-          return m_synchronizeChildColumnNamesWithChildColumns;
-        }
-        set
-        {
-          m_synchronizeChildColumnNamesWithChildColumns = value;
-        }
-      }
-
-      private int? m_desiredFixedColumnCount;
-      private bool? m_synchronizeChildColumnNamesWithChildColumns;
-    }
-
-    #endregion
-
-    #region Markers Private Class
-
-    private sealed class Markers : ILevelMarkers
-    {
-      internal Markers( ColumnHierarchyManager owner, ColumnHierarchyModel.IMarkers markers )
-      {
-        Debug.Assert( owner != null );
-        Debug.Assert( markers != null );
-
-        m_owner = owner;
-        m_markers = markers;
-      }
-
-      public ILocation Start
-      {
-        get
-        {
-          return m_owner.WrapLocation( m_markers.Start );
-        }
-      }
-
-      public ILocation End
-      {
-        get
-        {
-          return m_owner.WrapLocation( m_markers.End );
-        }
-      }
-
-      public ILocation Splitter
-      {
-        get
-        {
-          return m_owner.WrapLocation( m_markers.Splitter );
-        }
-      }
-
-      public ILocation Orphan
-      {
-        get
-        {
-          return m_owner.WrapLocation( m_markers.Orphan );
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return m_markers.GetHashCode();
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as Markers;
-        if( target == null )
-          return false;
-
-        return ( m_owner == target.m_owner )
-            && ( object.Equals( m_markers, target.m_markers ) );
-      }
-
-      private readonly ColumnHierarchyManager m_owner;
-      private readonly ColumnHierarchyModel.IMarkers m_markers;
-    }
-
-    #endregion
-
-    #region Location Private Class
-
-    private class Location : ILocation
-    {
-      internal Location( ColumnHierarchyManager owner, ColumnHierarchyModel.ILocation location )
-      {
-        Debug.Assert( owner != null );
-        Debug.Assert( location != null );
-
-        m_owner = owner;
-        m_location = location;
-      }
-
-      protected ColumnHierarchyManager Owner
-      {
-        get
-        {
-          return m_owner;
-        }
-      }
-
-      protected ColumnHierarchyModel.ILocation LocationCache
-      {
-        get
-        {
-          return m_location;
-        }
-      }
-
-      LocationType ILocation.Type
-      {
-        get
-        {
-          return m_location.Type;
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return m_location.GetHashCode();
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as Location;
-        if( target == null )
-          return false;
-
-        return ( m_owner == target.m_owner )
-            && ( object.Equals( m_location, target.m_location ) );
-      }
-
-      protected virtual void OnMovedBefore( Location location )
-      {
-      }
-
-      protected virtual void OnMovedAfter( Location location )
-      {
-      }
-
-      protected virtual void OnMovedUnder( Location location )
-      {
-      }
-
-      ILocation ILocation.GetParent()
-      {
-        return m_owner.WrapLocation( m_location.GetParent() );
-      }
-
-      ILocation ILocation.GetFirstChild()
-      {
-        return m_owner.WrapLocation( m_location.GetFirstChild() );
-      }
-
-      ILocation ILocation.GetLastChild()
-      {
-        var location = m_location.GetFirstChild();
-        if( location == null )
-          return m_owner.WrapLocation( null );
-
-        var next = location.GetNextSibling();
-        while( next != null )
-        {
-          location = next;
-          next = next.GetNextSibling();
-        }
-
-        return m_owner.WrapLocation( location );
-      }
-
-      ILocation ILocation.GetPreviousSibling()
-      {
-        return m_owner.WrapLocation( m_location.GetPreviousSibling() );
-      }
-
-      ILocation ILocation.GetNextSibling()
-      {
-        return m_owner.WrapLocation( m_location.GetNextSibling() );
-      }
-
-      ILocation ILocation.GetPreviousSiblingOrCousin()
-      {
-        return m_owner.WrapLocation( m_location.GetPreviousSiblingOrCousin() );
-      }
-
-      ILocation ILocation.GetNextSiblingOrCousin()
-      {
-        return m_owner.WrapLocation( m_location.GetNextSiblingOrCousin() );
-      }
-
-      bool ILocation.CanMoveBefore( ILocation location )
-      {
-        var target = location as Location;
-        if( target == null )
-          return false;
-
-        return m_location.CanMoveBefore( target.m_location );
-      }
-
-      bool ILocation.CanMoveAfter( ILocation location )
-      {
-        var target = location as Location;
-        if( target == null )
-          return false;
-
-        return m_location.CanMoveAfter( target.m_location );
-      }
-
-      bool ILocation.CanMoveUnder( ILocation location )
-      {
-        var target = location as Location;
-        if( target == null )
-          return false;
-
-        return m_location.CanMoveUnder( target.m_location );
-      }
-
-      void ILocation.MoveBefore( ILocation location )
-      {
-        Debug.Assert( ( ( ILocation )this ).CanMoveBefore( location ) );
-
-        var pivot = ( Location )location;
-        Debug.Assert( pivot != null );
-
-        m_location.MoveBefore( pivot.m_location );
-        this.OnMovedBefore( pivot );
-
-        m_owner.Update();
-      }
-
-      void ILocation.MoveAfter( ILocation location )
-      {
-        Debug.Assert( ( ( ILocation )this ).CanMoveAfter( location ) );
-
-        var pivot = ( Location )location;
-        Debug.Assert( pivot != null );
-
-        m_location.MoveAfter( pivot.m_location );
-        this.OnMovedAfter( pivot );
-
-        m_owner.Update();
-      }
-
-      void ILocation.MoveUnder( ILocation location )
-      {
-        Debug.Assert( ( ( ILocation )this ).CanMoveUnder( location ) );
-
-        var pivot = ( Location )location;
-        Debug.Assert( pivot != null );
-
-        m_location.MoveUnder( pivot.m_location );
-        this.OnMovedUnder( pivot );
-
-        m_owner.Update();
-      }
-
-      private readonly ColumnHierarchyManager m_owner;
-      private readonly ColumnHierarchyModel.ILocation m_location;
-    }
-
-    #endregion
-
-    #region ColumnLocation Private Class
-
-    private sealed class ColumnLocation : Location, IColumnLocation
-    {
-      internal ColumnLocation( ColumnHierarchyManager owner, ColumnHierarchyModel.IColumnLocation location )
-        : base( owner, location )
-      {
-      }
-
-      private ColumnHierarchyModel.IColumnLocation TargetLocation
-      {
-        get
-        {
-          return ( ColumnHierarchyModel.IColumnLocation )this.LocationCache;
-        }
-      }
-
-      ColumnBase IColumnLocation.Column
-      {
-        get
-        {
-          return this.TargetLocation.Column;
-        }
-      }
-
-      protected override void OnMovedBefore( Location location )
-      {
-        base.OnMovedBefore( location );
-
-        this.InvalidatePosition();
-      }
-
-      protected override void OnMovedAfter( Location location )
-      {
-        base.OnMovedAfter( location );
-
-        this.InvalidatePosition();
-      }
-
-      protected override void OnMovedUnder( Location location )
-      {
-        base.OnMovedUnder( location );
-
-        this.InvalidatePosition();
-      }
-
-      private void InvalidatePosition()
-      {
-        var owner = this.Owner;
-        var columnLocation = this.TargetLocation;
-        var positionStatus = columnLocation.Status.Position.SetLocationTimestamp( owner.GetTimestamp() );
-
-        owner.SetPosition( columnLocation, positionStatus );
-      }
-    }
-
-    #endregion
-
-    #region ColumnHierarchyModel Private Class
-
-    private sealed class ColumnHierarchyModel : ColumnHierarchyModel<ColumnBase, ColumnStatus>
-    {
-    }
-
-    #endregion
-
-    #region ColumnLocationOrderer Private Class
-
-    private static class ColumnLocationOrderer
-    {
-      internal static void Reorder( IList<ColumnHierarchyModel.IColumnLocation> locations, bool useDraggableStatus )
-      {
-        if( ColumnLocationOrderer.IsUnchanged( locations ) )
-          return;
-
-        var lockedFirst = new List<int>();
-        var lockedLast = new List<int>();
-        var unlocked = new List<int>();
-
-        ColumnLocationOrderer.Split( locations, useDraggableStatus, lockedFirst, lockedLast, unlocked );
-
-        var lockedFirstStartIndex = 0;
-        var unlockedStartIndex = lockedFirstStartIndex + lockedFirst.Count;
-        var lockedLastStartIndex = unlockedStartIndex + unlocked.Count;
-
-        ColumnLocationOrderer.Reorder( locations, lockedFirst, lockedFirstStartIndex );
-        ColumnLocationOrderer.Reorder( locations, unlocked, unlockedStartIndex );
-        ColumnLocationOrderer.Reorder( locations, lockedLast, lockedLastStartIndex );
-
-        var newOrder = new int[ locations.Count ];
-
-        lockedFirst.CopyTo( newOrder, lockedFirstStartIndex );
-        unlocked.CopyTo( newOrder, unlockedStartIndex );
-        lockedLast.CopyTo( newOrder, lockedLastStartIndex );
-
-        // Move the locations to get them in the desired order.
-        ColumnLocationOrderer.Apply( locations, newOrder );
-      }
-
-      private static void Reorder( IList<ColumnHierarchyModel.IColumnLocation> locations, IList<int> indexes, int startingPosition )
-      {
-        Debug.Assert( locations != null );
-        Debug.Assert( indexes != null );
-
-        var count = indexes.Count;
-        if( count <= 1 )
-          return;
-
-        var positionsStatus = new ColumnPositionStatus[ count ];
-        var newOrder = new int[ count ];
-        var movableCount = 0;
-        var reorderCount = 0;
-
-        // Do a pass to check if a reordering is required.
-        for( int i = 0; i < positionsStatus.Length; i++ )
-        {
-          var index = indexes[ i ];
-          var positionStatus = locations[ index ].Status.Position;
-
-          positionsStatus[ i ] = positionStatus;
-
-          if( positionStatus.LocationTimestamp > positionStatus.VisiblePositionTimestamp )
-          {
-            // This location is considered fixed and will not be sorted.
-            newOrder[ i ] = index;
-          }
-          else
-          {
-            // This location is considered movable and may be sorted.
-            newOrder[ i ] = -1;
-            movableCount++;
-
-            // This location visible position has changed, so we will need to apply
-            // an algorithm to figure out where to put it.
-            if( positionStatus.VisiblePositionTimestamp != 0u )
-            {
-              reorderCount++;
-            }
-          }
-        }
-
-        // Nothing to do if all columns stay where they are.
-        if( ( reorderCount <= 0 ) || ( movableCount <= 1 ) )
-          return;
-
-        var visiblePositions = new List<int>( count );
-        var slots = new List<Slot>( movableCount );
-        var movables = new List<int>( movableCount );
-        var reorder = new List<Tuple<int, uint>>( reorderCount );
-
-        // Separate the movable locations that were updated from the ones that were not.
-        for( int i = 0; i < newOrder.Length; i++ )
-        {
-          visiblePositions.Add( locations[ indexes[ i ] ].Column.VisiblePosition );
-
-          // This location is fixed.
-          if( newOrder[ i ] >= 0 )
-            continue;
-
-          slots.Add( new Slot( i, startingPosition + i ) );
-
-          var timestamp = positionsStatus[ i ].VisiblePositionTimestamp;
-          if( timestamp == 0u )
-          {
-            movables.Add( i );
-          }
-          else
-          {
-            reorder.Add( new Tuple<int, uint>( i, timestamp ) );
-          }
-        }
-
-        var comparer = new MovableComparer( slots, visiblePositions );
-
-        // Reinsert the updated movable locations in a time fashion order into the not updated movable locations.
-        foreach( var i in ( from item in reorder
-                            orderby item.Item2, item.Item1
-                            select item.Item1 ) )
-        {
-          // This property is set to help the comparer identify the element the binary search is looking for.
-          // The algorithm is complex and need more information than the ones provided by the IComparer<>.Compare method.
-          comparer.LookFor = i;
-
-          var index = movables.BinarySearch( i, comparer );
-          if( index < 0 )
-          {
-            index = ~index;
-          }
-
-          if( index >= movables.Count )
-          {
-            movables.Add( i );
-          }
-          else
-          {
-            movables.Insert( index, i );
-          }
-        }
-
-        Debug.Assert( movables.Count == movableCount );
-
-        // Reinsert the movable locations into the fixed locations.
-        for( int i = 0; i < movables.Count; i++ )
-        {
-          newOrder[ slots[ i ].Index ] = indexes[ movables[ i ] ];
-        }
-
-        // Set the results.
-        for( int i = 0; i < newOrder.Length; i++ )
-        {
-          indexes[ i ] = newOrder[ i ];
-        }
-      }
-
-      private static void Apply( IList<ColumnHierarchyModel.IColumnLocation> locations, IList<int> indexes )
-      {
-        Debug.Assert( locations != null );
-        Debug.Assert( indexes != null );
-        Debug.Assert( locations.Count == indexes.Count );
-
-        for( int i = 0; i < indexes.Count - 1; i++ )
-        {
-          var pivot = locations[ indexes[ i ] ];
-          var target = locations[ indexes[ i + 1 ] ];
-          var next = pivot.GetNextSibling();
-
-          while( !object.Equals( next, target ) )
-          {
-            if( ( next == null ) || ( next.Type == LocationType.Column ) )
-            {
-              Debug.Assert( target.CanMoveAfter( pivot ) );
-              target.MoveAfter( pivot );
-              break;
-            }
-            // A splitter may be located between the columns.  Make sure not to move the column if it
-            // is the case or the splitter will go back next to the starting location.
-            else
-            {
-              next = next.GetNextSibling();
-            }
-          }
-        }
-      }
-
-      private static bool IsUnchanged( IList<ColumnHierarchyModel.IColumnLocation> locations )
-      {
-        if( ( locations == null ) || ( locations.Count <= 1 ) )
-          return true;
-
-        // Do a pass to check if a reordering is required.
-        foreach( var location in locations )
-        {
-          var positionStatus = location.Status.Position;
-
-          // This location's lock type may have changed, so does its position.
-          if( ( positionStatus.DraggableStatusTimestamp != 0u ) || ( positionStatus.MainColumnTimestamp != 0u ) )
-            return false;
-
-          if( location.Column.DraggableStatus != ColumnDraggableStatus.Draggable )
-          {
-            // This location may have change position, so we will need to apply an algorithm to figure out where to put it.
-            if( ( positionStatus.LocationTimestamp != 0u ) || ( positionStatus.VisiblePositionTimestamp != 0u ) )
-              return false;
-          }
-          else
-          {
-            // This location is considered fixed and will not be sorted.
-            if( positionStatus.LocationTimestamp > positionStatus.VisiblePositionTimestamp )
-              continue;
-
-            // This location visible position has changed, so we will need to apply
-            // an algorithm to figure out where to put it.
-            if( positionStatus.VisiblePositionTimestamp != 0u )
-              return false;
-          }
-        }
-
-        return true;
-      }
-
-      private static void Split( IList<ColumnHierarchyModel.IColumnLocation> locations, bool useDraggableStatus, IList<int> lockedFirst, IList<int> lockedLast, IList<int> unlocked )
-      {
-        Debug.Assert( locations != null );
-        Debug.Assert( lockedFirst != null );
-        Debug.Assert( lockedLast != null );
-        Debug.Assert( unlocked != null );
-
-        for( int i = 0; i < locations.Count; i++ )
-        {
-          var column = locations[ i ].Column;
-          var draggableStatus = column.DraggableStatus;
-
-          if( useDraggableStatus )
-          {
-            switch( draggableStatus )
-            {
-              case ColumnDraggableStatus.FirstUndraggable:
-                {
-                  lockedFirst.Add( i );
-                }
-                break;
-
-              case ColumnDraggableStatus.LastUndraggable:
-                {
-                  lockedLast.Add( i );
-                }
-                break;
-
-              case ColumnDraggableStatus.Draggable:
-                {
-                  unlocked.Add( i );
-                }
-                break;
-
-              default:
-                throw new NotImplementedException();
-            }
-          }
-          else
-          {
-            unlocked.Add( i );
-          }
-        }
-      }
-
-      private sealed class MovableComparer : IComparer<int>
-      {
-        private static readonly IComparer<Slot> SlotComparer = new VisiblePositionComparer();
-
-        internal MovableComparer( List<Slot> slots, IList<int> positions )
-        {
-          m_slots = slots;
-          m_positions = positions;
-        }
-
-        internal int LookFor
-        {
-          set
-          {
-            m_lookFor = value;
-          }
-        }
-
-        public int Compare( int x, int y )
-        {
-          if( x == m_lookFor )
-          {
-            var xPosition = m_positions[ x ];
-            var yPosition = m_positions[ y ];
-
-            // Since we are using this comparer to reinsert updated locations in time order,
-            // a visible position that is lesser than any other location should always be inserted before.
-            if( ( xPosition < yPosition ) )
-              return -1;
-
-            // For a visible position that is greater or equal, we must look at the available movables
-            // slots to insert the column in the slot that is the nearest to the desired target position.
-            var xSlot = this.FindSlot( xPosition );
-            var ySlot = this.FindSlot( yPosition );
-
-            var compare = xSlot.CompareTo( ySlot );
-            if( compare != 0 )
-              return compare;
-
-            var position = this.FindPosition( xSlot );
-
-            // The location is moving toward the end.
-            if( x < position )
-            {
-              if( y <= position )
-                return 1;
-
-              return -1;
-            }
-            // The location is moving toward the start.
-            else if( x > position )
-            {
-              if( y >= position )
-                return -1;
-
-              return 1;
-            }
-          }
-          else if( y == m_lookFor )
-          {
-            var xPosition = m_positions[ x ];
-            var yPosition = m_positions[ y ];
-
-            // Since we are using this comparer to reinsert updated locations in time order,
-            // a visible position that is lesser than any other location should always be inserted before.
-            if( ( yPosition < xPosition ) )
-              return 1;
-
-            // For a visible position that is greater or equal, we must look at the available movables
-            // slots to insert the column in the slot that is the nearest to the desired target position.
-            var xSlot = this.FindSlot( xPosition );
-            var ySlot = this.FindSlot( yPosition );
-
-            var compare = xSlot.CompareTo( ySlot );
-            if( compare != 0 )
-              return compare;
-
-            var position = this.FindPosition( ySlot );
-
-            // The location is moving toward the end.
-            if( y < position )
-            {
-              if( x <= position )
-                return -1;
-
-              return 1;
-            }
-            // The location is moving toward the start.
-            else if( y > position )
-            {
-              if( x >= position )
-                return 1;
-
-              return -1;
-            }
-          }
-
-          return x.CompareTo( y );
-        }
-
-        private int FindSlot( int position )
-        {
-          var index = m_slots.BinarySearch( new Slot( 0, position ), MovableComparer.SlotComparer );
-          if( index < 0 )
-            return ~index;
-
-          return index;
-        }
-
-        private int FindPosition( int slot )
-        {
-          Debug.Assert( ( slot >= 0 ) && ( slot <= m_slots.Count ) );
-
-          if( slot >= m_slots.Count )
-            return m_slots.Last().Index + 1;
-
-          return m_slots[ slot ].Index;
-        }
-
-        private readonly List<Slot> m_slots;
-        private readonly IList<int> m_positions;
-        private int m_lookFor;
-
-        private sealed class VisiblePositionComparer : IComparer<Slot>
-        {
-          public int Compare( Slot x, Slot y )
-          {
-            return x.VisiblePosition.CompareTo( y.VisiblePosition );
-          }
-        }
-      }
-
-      private struct Slot
-      {
-        internal Slot( int index, int visiblePosition )
-        {
-          Debug.Assert( index >= 0 );
-          Debug.Assert( visiblePosition >= 0 );
-
-          this.Index = index;
-          this.VisiblePosition = visiblePosition;
-        }
-
-        internal readonly int Index;
-        internal readonly int VisiblePosition;
-      }
-    }
-
-    #endregion
-
-    #region DeferUpdateState Private Class
-
-    private sealed class DeferUpdateState : DeferredDisposableState
-    {
-      internal DeferUpdateState( ColumnHierarchyManager target, UpdateOptions options )
-      {
-        if( target == null )
-          throw new ArgumentNullException( "target" );
-
-        m_target = target;
-        m_options = options;
-      }
-
-      protected override object SyncRoot
-      {
-        get
-        {
-          return m_target.SyncRoot;
-        }
-      }
-
-      protected override bool IsDeferred
-      {
-        get
-        {
-          return ( m_target.m_deferUpdateCount != 0 );
-        }
-      }
-
-      protected override void Increment()
-      {
-        m_target.m_deferUpdateCount++;
-      }
-
-      protected override void Decrement()
-      {
-        m_target.m_deferUpdateCount--;
-      }
-
-      protected override void OnDeferEnded( bool disposing )
-      {
-        if( !disposing )
-          return;
-
-        m_target.Update( m_options );
-      }
-
-      private readonly ColumnHierarchyManager m_target;
-      private readonly UpdateOptions m_options;
-    }
-
-    #endregion
-
-    #region ColumnStatus Private Struct
-
-    private struct ColumnStatus
-    {
-      internal ColumnStatus( ColumnVisibilityStatus visibility )
-        : this( default( ColumnPositionStatus ), visibility )
-      {
-      }
-
-      internal ColumnStatus( ColumnPositionStatus position, ColumnVisibilityStatus visibility )
-      {
-        this.Position = position;
-        this.Visibility = visibility;
-      }
-
-      internal ColumnStatus SetPositionStatus( ColumnPositionStatus status )
-      {
-        return new ColumnStatus( status, this.Visibility );
-      }
-
-      internal ColumnStatus SetVisibilityStatus( ColumnVisibilityStatus status )
-      {
-        return new ColumnStatus( this.Position, status );
-      }
-
-      internal readonly ColumnPositionStatus Position;
-      internal readonly ColumnVisibilityStatus Visibility;
-    }
-
-    #endregion
-
-    #region ColumnVisibilityStatus Private Struct
-
-    [DebuggerDisplay( "Visible = {Visible}, Mode = {Mode}" )]
-    private struct ColumnVisibilityStatus
-    {
-      private ColumnVisibilityStatus( bool visible, PropagationMode mode, uint timestamp )
-      {
-        m_visible = visible;
-        m_mode = mode;
-        m_timestamp = timestamp;
-      }
-
-      internal ColumnVisibilityStatus SetMode( PropagationMode mode )
-      {
-        return ColumnVisibilityStatus.Create( m_visible, mode, m_timestamp );
-      }
-
-      internal bool Visible
-      {
-        get
-        {
-          return m_visible;
-        }
-      }
-
-      internal PropagationMode Mode
-      {
-        get
-        {
-          return m_mode;
-        }
-      }
-
-      internal uint Timestamp
-      {
-        get
-        {
-          return m_timestamp;
-        }
-      }
-
-      internal static ColumnVisibilityStatus Create( bool visible )
-      {
-        return ColumnVisibilityStatus.Create( visible, PropagationMode.None, 0u );
-      }
-
-      internal static ColumnVisibilityStatus Create( bool visible, PropagationMode mode, uint timestamp )
-      {
-        return new ColumnVisibilityStatus( visible, mode, timestamp );
-      }
-
-      private readonly bool m_visible;
-      private readonly PropagationMode m_mode;
-      private readonly uint m_timestamp;
-    }
-
-    #endregion
-
-    #region ColumnPositionStatus Private Struct
-
-    private struct ColumnPositionStatus
-    {
-      internal static readonly ColumnPositionStatus Default = new ColumnPositionStatus();
-
-      private ColumnPositionStatus( uint parent, uint children, uint visiblePosition, uint location, uint draggableStatus, uint mainColumn )
-      {
-        m_parentTimestamp = parent;
-        m_childrenTimestamp = children;
-        m_visiblePositionTimestamp = visiblePosition;
-        m_locationTimestamp = location;
-        m_draggableStatusTimestamp = draggableStatus;
-        m_mainColumnTimestamp = mainColumn;
-      }
-
-      internal uint ParentTimestamp
-      {
-        get
-        {
-          return m_parentTimestamp;
-        }
-      }
-
-      internal uint ChildrenTimestamp
-      {
-        get
-        {
-          return m_childrenTimestamp;
-        }
-      }
-
-      internal uint VisiblePositionTimestamp
-      {
-        get
-        {
-          return m_visiblePositionTimestamp;
-        }
-      }
-
-      internal uint LocationTimestamp
-      {
-        get
-        {
-          return m_locationTimestamp;
-        }
-      }
-
-      internal uint DraggableStatusTimestamp
-      {
-        get
-        {
-          return m_draggableStatusTimestamp;
-        }
-      }
-
-      internal uint MainColumnTimestamp
-      {
-        get
-        {
-          return m_mainColumnTimestamp;
-        }
-      }
-
-      internal ColumnPositionStatus SetParentTimestamp( uint timestamp )
-      {
-        return new ColumnPositionStatus( timestamp, m_childrenTimestamp, m_visiblePositionTimestamp, m_locationTimestamp, m_draggableStatusTimestamp, m_mainColumnTimestamp );
-      }
-
-      internal ColumnPositionStatus SetChildrenTimestamp( uint timestamp )
-      {
-        return new ColumnPositionStatus( m_parentTimestamp, timestamp, m_visiblePositionTimestamp, m_locationTimestamp, m_draggableStatusTimestamp, m_mainColumnTimestamp );
-      }
-
-      internal ColumnPositionStatus SetVisiblePositionTimestamp( uint timestamp )
-      {
-        return new ColumnPositionStatus( m_parentTimestamp, m_childrenTimestamp, timestamp, m_locationTimestamp, m_draggableStatusTimestamp, m_mainColumnTimestamp );
-      }
-
-      internal ColumnPositionStatus SetLocationTimestamp( uint timestamp )
-      {
-        return new ColumnPositionStatus( m_parentTimestamp, m_childrenTimestamp, m_visiblePositionTimestamp, timestamp, m_draggableStatusTimestamp, m_mainColumnTimestamp );
-      }
-
-      internal ColumnPositionStatus SetDraggableStatusTimestamp( uint timestamp )
-      {
-        return new ColumnPositionStatus( m_parentTimestamp, m_childrenTimestamp, m_visiblePositionTimestamp, m_locationTimestamp, timestamp, m_mainColumnTimestamp );
-      }
-
-      internal ColumnPositionStatus SetMainColumnTimestamp( uint timestamp )
-      {
-        return new ColumnPositionStatus( m_parentTimestamp, m_childrenTimestamp, m_visiblePositionTimestamp, m_locationTimestamp, m_draggableStatusTimestamp, timestamp );
-      }
-
-      private readonly uint m_parentTimestamp;
-      private readonly uint m_childrenTimestamp;
-      private readonly uint m_visiblePositionTimestamp;
-      private readonly uint m_locationTimestamp;
-      private readonly uint m_draggableStatusTimestamp;
-      private readonly uint m_mainColumnTimestamp;
-    }
-
-    #endregion
-
-    #region ParentChildRelationshipSnapshot Private Struct
-
-    private struct ParentChildRelationshipSnapshot
-    {
-      internal ParentChildRelationshipSnapshot( ColumnHierarchyModel.IColumnLocation location, uint timestamp )
-      {
-        m_location = location;
-        m_timestamp = timestamp;
-      }
-
-      internal ColumnHierarchyModel.IColumnLocation Location
-      {
-        get
-        {
-          return m_location;
-        }
-      }
-
-      internal uint Timestamp
-      {
-        get
-        {
-          return m_timestamp;
-        }
-      }
-
-      private readonly ColumnHierarchyModel.IColumnLocation m_location;
-      private readonly uint m_timestamp;
-    }
-
-    #endregion
-
-    #region ParentChildRelationshipSnapshotComparer Private Class
-
-    private sealed class ParentChildRelationshipSnapshotComparer : IComparer<ParentChildRelationshipSnapshot>
-    {
-      public int Compare( ParentChildRelationshipSnapshot x, ParentChildRelationshipSnapshot y )
-      {
-        var compare = x.Timestamp.CompareTo( y.Timestamp );
-        if( compare != 0 )
-          return -compare;
-
-        return -string.CompareOrdinal( x.Location.Column.FieldName, y.Location.Column.FieldName );
-      }
-    }
-
-    #endregion
-
-    #region PropagationMode Private Enum
-
-    private enum PropagationMode : byte
-    {
-      None = 0,
-      BottomUp,
-      TopDown,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManagerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManagerHelper.cs
deleted file mode 100644
index 4d538c14..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyManagerHelper.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class ColumnHierarchyManagerHelper
-  {
-    internal static IDisposable DeferColumnsUpdate( DataGridContext dataGridContext )
-    {
-      Debug.Assert( dataGridContext != null );
-
-      return dataGridContext.ColumnManager.DeferUpdate();
-    }
-
-    internal static IDisposable DeferColumnsUpdate( DetailConfiguration detailConfiguration )
-    {
-      Debug.Assert( detailConfiguration != null );
-
-      return detailConfiguration.ColumnManager.DeferUpdate();
-    }
-
-    internal static bool MoveColumnBefore( DataGridContext dataGridContext, ColumnBase current, ColumnBase next )
-    {
-      Debug.Assert( dataGridContext != null );
-
-      return ColumnHierarchyManagerHelper.MoveColumnBefore( dataGridContext.ColumnManager, current, next );
-    }
-
-    internal static bool MoveColumnBefore( DetailConfiguration detailConfiguration, ColumnBase current, ColumnBase next )
-    {
-      Debug.Assert( detailConfiguration != null );
-
-      return ColumnHierarchyManagerHelper.MoveColumnBefore( detailConfiguration.ColumnManager, current, next );
-    }
-
-    internal static bool MoveColumnAfter( DataGridContext dataGridContext, ColumnBase current, ColumnBase previous )
-    {
-      Debug.Assert( dataGridContext != null );
-
-      return ColumnHierarchyManagerHelper.MoveColumnAfter( dataGridContext.ColumnManager, current, previous );
-    }
-
-    internal static bool MoveColumnAfter( DetailConfiguration detailConfiguration, ColumnBase current, ColumnBase previous )
-    {
-      Debug.Assert( detailConfiguration != null );
-
-      return ColumnHierarchyManagerHelper.MoveColumnAfter( detailConfiguration.ColumnManager, current, previous );
-    }
-
-    internal static bool MoveColumnUnder( DataGridContext dataGridContext, ColumnBase current, ColumnBase parent )
-    {
-      Debug.Assert( dataGridContext != null );
-
-      return ColumnHierarchyManagerHelper.MoveColumnUnder( dataGridContext.ColumnManager, dataGridContext.Columns, current, parent );
-    }
-
-    internal static bool MoveColumnUnder( DetailConfiguration detailConfiguration, ColumnBase current, ColumnBase parent )
-    {
-      Debug.Assert( detailConfiguration != null );
-
-      return ColumnHierarchyManagerHelper.MoveColumnUnder( detailConfiguration.ColumnManager, detailConfiguration.Columns, current, parent );
-    }
-
-    private static bool MoveColumnBefore( ColumnHierarchyManager columnsLayout, ColumnBase current, ColumnBase next )
-    {
-      Debug.Assert( columnsLayout != null );
-
-      var currentLocation = columnsLayout.GetColumnLocationFor( current );
-      if( currentLocation == null )
-        return false;
-
-      var pivotLocation = columnsLayout.GetColumnLocationFor( next );
-      if( pivotLocation == null )
-        return false;
-
-      if( !currentLocation.CanMoveBefore( pivotLocation ) )
-        return false;
-
-      currentLocation.MoveBefore( pivotLocation );
-      return true;
-    }
-
-    private static bool MoveColumnAfter( ColumnHierarchyManager columnsLayout, ColumnBase current, ColumnBase previous )
-    {
-      Debug.Assert( columnsLayout != null );
-
-      var currentLocation = columnsLayout.GetColumnLocationFor( current );
-      if( currentLocation == null )
-        return false;
-
-      var pivotLocation = columnsLayout.GetColumnLocationFor( previous );
-      if( pivotLocation == null )
-        return false;
-
-      if( !currentLocation.CanMoveAfter( pivotLocation ) )
-        return false;
-
-      currentLocation.MoveAfter( pivotLocation );
-      return true;
-    }
-
-    private static bool MoveColumnUnder( ColumnHierarchyManager columnsLayout, ColumnCollection columns, ColumnBase current, ColumnBase parent )
-    {
-      Debug.Assert( columnsLayout != null );
-
-      var currentLocation = columnsLayout.GetColumnLocationFor( current );
-      if( currentLocation == null )
-        return false;
-
-      var pivotLocation = default( ColumnHierarchyManager.ILocation );
-
-      // Move the column under the orphan section.
-      if( parent == null )
-      {
-        var columnCollection = current.ContainingCollection;
-        if( columnCollection == null )
-          return false;
-
-        var mergedColumnCollection = default( ColumnCollection );
-
-        if( columnCollection == columns )
-        {
-          mergedColumnCollection =  null;
-        }
-
-        if( mergedColumnCollection == null )
-          return false;
-
-        var levelMarkers = columnsLayout.GetLevelMarkersFor( mergedColumnCollection );
-        if( levelMarkers == null )
-          return false;
-
-        pivotLocation = levelMarkers.Orphan;
-      }
-      else
-      {
-        pivotLocation = columnsLayout.GetColumnLocationFor( parent );
-      }
-
-      if( pivotLocation == null )
-        return false;
-
-      if( !currentLocation.CanMoveUnder( pivotLocation ) )
-        return false;
-
-      currentLocation.MoveUnder( pivotLocation );
-      return true;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyModel.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyModel.Generic.cs
deleted file mode 100644
index 2179ed22..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnHierarchyModel.Generic.cs
+++ /dev/null
@@ -1,3122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ColumnHierarchyModel<TColumn, TStatus> where TColumn : class
-  {
-    #region Static Fields
-
-    private const int None = -1;
-
-    #endregion
-
-    #region LevelCount Property
-
-    internal int LevelCount
-    {
-      get
-      {
-        return m_level;
-      }
-    }
-
-    #endregion
-
-    #region [] Property
-
-    internal IColumnLocation this[ TColumn column ]
-    {
-      get
-      {
-        if( object.ReferenceEquals( column, null ) )
-          throw new ArgumentNullException( "column" );
-
-        if( m_capacity <= 0 )
-          return null;
-
-        var hashCode = column.GetHashCode();
-        var index = this.FindColumn( column, hashCode );
-        if( index == ColumnHierarchyModel<TColumn, TStatus>.None )
-          return null;
-
-        var entry = m_columns[ index ];
-        return new ColumnLocation( this, entry.Column, entry.HashCode, index );
-      }
-    }
-
-    #endregion
-
-    #region LayoutChanging Event
-
-    internal event EventHandler<LayoutChangingEventArgs> LayoutChanging;
-
-    private void OnLayoutChanging( LayoutChangingEventArgs e )
-    {
-      var handler = this.LayoutChanging;
-      if( handler == null )
-        return;
-
-      try
-      {
-        m_preventLayoutChanged = true;
-        handler.Invoke( this, e );
-      }
-      finally
-      {
-        m_preventLayoutChanged = false;
-      }
-    }
-
-    #endregion
-
-    #region LayoutChanged Event
-
-    internal event EventHandler<LayoutChangedEventArgs> LayoutChanged;
-
-    private void OnLayoutChanged( LayoutChangedEventArgs e )
-    {
-      var handler = this.LayoutChanged;
-      if( handler == null )
-        return;
-
-      try
-      {
-        m_preventLayoutChanged = true;
-        handler.Invoke( this, e );
-      }
-      finally
-      {
-        m_preventLayoutChanged = false;
-      }
-    }
-
-    #endregion
-
-    #region StatusChanged Event
-
-    internal event EventHandler<StatusChangedEventArgs> StatusChanged;
-
-    private void OnStatusChanged( StatusChangedEventArgs e )
-    {
-      var handler = this.StatusChanged;
-      if( handler == null )
-        return;
-
-      try
-      {
-        m_preventLayoutChanged = true;
-        handler.Invoke( this, e );
-      }
-      finally
-      {
-        m_preventLayoutChanged = false;
-      }
-    }
-
-    #endregion
-
-    internal IMarkers AddLevel( int level )
-    {
-      if( level < 0 )
-        throw new ArgumentException( "The level must be greater than or equal to zero.", "level" );
-
-      if( level > m_level )
-        throw new ArgumentException( "Only one level can be inserted at a time.", "level" );
-
-      if( m_preventLayoutChanged )
-        throw new InvalidOperationException( "The layout cannot be updated." );
-
-      // Resize the array to make space for a new level.
-      if( ( m_marks == null ) || ( m_marks.Length < m_level + 1 ) )
-      {
-        var currentSize = ( m_marks != null ) ? m_marks.Length : 0;
-        var desizedSize = ( int )Math.Min( Math.Max( m_level + 1, currentSize * 2L ), int.MaxValue );
-
-        Array.Resize( ref m_marks, desizedSize );
-        Debug.Assert( m_marks != null );
-
-        for( int i = currentSize; i < m_marks.Length; i++ )
-        {
-          m_marks[ i ] = MarkEntry.Default;
-        }
-
-        // This should only happen when the array is of size int.MaxValue.  Technically, this should never happen.
-        if( !object.Equals( m_marks.Last(), MarkEntry.Default ) )
-          throw new InvalidOperationException( "No more levels could be created." );
-      }
-
-      return this.AddLevelCore( level );
-    }
-
-    internal void RemoveLevel( int level )
-    {
-      if( level < 0 )
-        throw new ArgumentException( "The level must be greater than or equal to zero.", "level" );
-
-      if( level >= m_level )
-        throw new ArgumentException( "The level does not exist.", "level" );
-
-      if( m_preventLayoutChanged )
-        throw new InvalidOperationException( "The layout cannot be updated." );
-
-      this.RemoveLevelCore( level );
-    }
-
-    internal IColumnLocation Add( TColumn column, int level )
-    {
-      return this.Add( column, default( TStatus ), level );
-    }
-
-    internal IColumnLocation Add( TColumn column, TStatus status, int level )
-    {
-      if( object.ReferenceEquals( column, null ) )
-        throw new ArgumentNullException( "column" );
-
-      if( level < 0 )
-        throw new ArgumentException( "The level must be greater than or equal to zero.", "level" );
-
-      if( level >= m_level )
-        throw new ArgumentException( "The level is not available.", "level" );
-
-      if( m_preventLayoutChanged )
-        throw new InvalidOperationException( "The layout cannot be updated." );
-
-      var hashCode = column.GetHashCode();
-
-      if( m_size > 0 )
-      {
-        if( this.FindColumn( column, hashCode ) != ColumnHierarchyModel<TColumn, TStatus>.None )
-          throw new ArgumentException( "The column is already in the collection.", "column" );
-      }
-
-      var orphan = this.FindMark( level ).Orphan;
-      Debug.Assert( orphan != ColumnHierarchyModel<TColumn, TStatus>.None );
-
-      var index = this.AddCore( column, status, hashCode );
-      var location = new ColumnLocation( this, column, hashCode, index );
-
-      this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.Added ) );
-
-      if( !object.Equals( status, default( TStatus ) ) )
-      {
-        this.OnStatusChanged( new StatusChangedEventArgs( location, default( TStatus ), status ) );
-      }
-
-      this.ConnectBefore( index, orphan );
-
-      return location;
-    }
-
-    internal bool Remove( TColumn column )
-    {
-      if( object.ReferenceEquals( column, null ) )
-        throw new ArgumentNullException( "column" );
-
-      if( m_preventLayoutChanged )
-        throw new InvalidOperationException( "The layout cannot be updated." );
-
-      if( m_size <= 0 )
-        return false;
-
-      var index = this.FindColumn( column );
-      if( index == ColumnHierarchyModel<TColumn, TStatus>.None )
-        return false;
-
-      var level = this.GetLevel( index );
-      var relations = m_relations[ index ];
-
-      // Move all children under the level's orphan entry.
-      if( relations.FirstChild != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        var orphan = this.FindMark( level ).Orphan;
-        Debug.Assert( orphan != ColumnHierarchyModel<TColumn, TStatus>.None );
-
-        var current = relations.FirstChild;
-        var next = this.GetNextSibling( current );
-
-        Debug.Assert( this.IsColumn( current ) );
-        this.Disconnect( current );
-        this.ConnectUnder( current, orphan );
-
-        var previous = current;
-        current = next;
-
-        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
-        {
-          next = this.GetNextSibling( current );
-
-          Debug.Assert( this.IsColumn( current ) );
-          this.Disconnect( current );
-          this.ConnectAfter( current, previous );
-
-          previous = current;
-          current = next;
-        }
-      }
-
-      Debug.Assert( this.GetFirstChild( index ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-
-      this.OnLayoutChanging( new LayoutChangingEventArgs( this.GetTargetLocation( index ), LayoutChangingAction.Removing ) );
-      this.Disconnect( index );
-      this.RemoveCore( index );
-
-      return true;
-    }
-
-    internal bool Contains( TColumn column )
-    {
-      if( ( m_size <= 0 ) || object.ReferenceEquals( column, null ) )
-        return false;
-
-      return ( this.FindColumn( column ) != ColumnHierarchyModel<TColumn, TStatus>.None );
-    }
-
-    internal void Clear()
-    {
-      if( m_preventLayoutChanged )
-        throw new InvalidOperationException( "The layout cannot be updated." );
-
-      if( m_size <= 0 )
-        return;
-
-      this.OnLayoutChanging( new LayoutChangingEventArgs( null, LayoutChangingAction.Clearing ) );
-
-      Debug.Assert( m_buckets != null );
-      Debug.Assert( m_columns != null );
-      Debug.Assert( m_status != null );
-      Debug.Assert( m_relations != null );
-      Debug.Assert( m_marks != null );
-
-      for( int i = 0; i < m_level; i++ )
-      {
-        m_marks[ i ] = MarkEntry.Default;
-      }
-
-      for( int i = 0; i < m_capacity; i++ )
-      {
-        m_buckets[ i ] = ColumnHierarchyModel<TColumn, TStatus>.None;
-        m_columns[ i ] = new ColumnEntry( ( i < m_capacity - 1 ) ? i + 1 : ColumnHierarchyModel<TColumn, TStatus>.None );
-        m_status[ i ] = default( TStatus );
-        m_relations[ i ] = RelationEntry.Default;
-      }
-
-      m_level = 0;
-      m_free = 0;
-      m_size = 0;
-
-      this.OnLayoutChanged( new LayoutChangedEventArgs( null, LayoutChangedAction.Cleared ) );
-    }
-
-    internal IMarkers GetLevelMarkers( int level )
-    {
-      if( level < 0 )
-        throw new ArgumentException( "The level must be greater than or equal to zero.", "level" );
-
-      if( level >= m_level )
-        throw new ArgumentException( "The level must be less than LevelCount.", "level" );
-
-      var entry = this.FindMark( level );
-
-      return new Markers( this, level, entry );
-    }
-
-    private Markers AddLevelCore( int level )
-    {
-      Debug.Assert( ( level >= 0 ) && ( level <= m_level ) );
-      Debug.Assert( m_marks != null );
-      Debug.Assert( level < m_marks.Length );
-      Debug.Assert( object.Equals( m_marks.Last(), MarkEntry.Default ) );
-
-      // Offset the marks to insert a entry that will deal with the new level.
-      for( int i = m_marks.Length - 1; i > level; i-- )
-      {
-        m_marks[ i ] = m_marks[ i - 1 ];
-      }
-
-      var start = this.AddCore( default( TStatus ) );
-      var end = this.AddCore( default( TStatus ) );
-      var splitter = this.AddCore( default( TStatus ) );
-      var orphan = this.AddCore( default( TStatus ) );
-      var markEntry = new MarkEntry( start, end, splitter, orphan );
-      var markers = new Markers( this, level, markEntry );
-
-      m_marks[ level ] = markEntry;
-      m_level++;
-
-      this.OnLayoutChanged( new LayoutChangedEventArgs( markers.Start, LayoutChangedAction.Added ) );
-      this.OnLayoutChanged( new LayoutChangedEventArgs( markers.End, LayoutChangedAction.Added ) );
-      this.OnLayoutChanged( new LayoutChangedEventArgs( markers.Splitter, LayoutChangedAction.Added ) );
-      this.OnLayoutChanged( new LayoutChangedEventArgs( markers.Orphan, LayoutChangedAction.Added ) );
-
-      var parentStart = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var parentEnd = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var parentSplitter = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var parentOrphan = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var childStart = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var childEnd = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var childSplitter = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var childOrphan = ColumnHierarchyModel<TColumn, TStatus>.None;
-
-      if( level + 1 < m_marks.Length )
-      {
-        var entry = m_marks[ level + 1 ];
-
-        parentStart = entry.Start;
-        parentEnd = entry.End;
-        parentSplitter = entry.Splitter;
-        parentOrphan = entry.Orphan;
-      }
-
-      if( level > 0 )
-      {
-        var entry = m_marks[ level - 1 ];
-
-        childStart = entry.Start;
-        childEnd = entry.End;
-        childSplitter = entry.Splitter;
-        childOrphan = entry.Orphan;
-      }
-
-      // Move the entries on the child level under the new level entries.
-      if( childStart != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        Debug.Assert( childStart != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( childEnd != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( childSplitter != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( childOrphan != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( childOrphan == this.GetPreviousSiblingOrCousin( childEnd ) );
-        Debug.Assert( this.GetNextSiblingOrCousin( childEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-
-        var next = childOrphan;
-        var current = this.GetPreviousSiblingOrCousin( next );
-
-        // Move the child orphan entry under the new level's orphan entry.
-        this.Disconnect( childOrphan );
-        this.ConnectUnder( childOrphan, orphan );
-
-        // Move the columns under the new level's orphan entry.
-        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
-        {
-          var previous = this.GetPreviousSiblingOrCousin( current );
-
-          if( this.IsColumn( current ) )
-          {
-            this.Disconnect( current );
-            this.ConnectBefore( current, next );
-
-            next = current;
-          }
-
-          current = previous;
-        }
-
-        // Move the remaining marker entries under the new level's related marker entries.
-        this.Disconnect( childStart );
-        this.Disconnect( childEnd );
-        this.Disconnect( childSplitter );
-
-        this.ConnectUnder( childStart, start );
-        this.ConnectUnder( childEnd, end );
-        this.ConnectUnder( childSplitter, splitter );
-
-        Debug.Assert( this.GetFirstChild( start ) != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( end ) != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( splitter ) != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( orphan ) != ColumnHierarchyModel<TColumn, TStatus>.None );
-      }
-
-      // Move the new level's marker entries under the parent level's related marker entries.
-      if( parentStart != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        Debug.Assert( parentStart != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( parentEnd != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( parentSplitter != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( parentOrphan != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( parentOrphan == this.GetPreviousSiblingOrCousin( parentEnd ) );
-        Debug.Assert( this.GetNextSiblingOrCousin( parentEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-
-        Debug.Assert( this.GetFirstChild( parentStart ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( parentEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( parentSplitter ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( parentOrphan ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-
-        this.ConnectUnder( start, parentStart );
-        this.ConnectUnder( end, parentEnd );
-        this.ConnectUnder( splitter, parentSplitter );
-        this.ConnectUnder( orphan, parentOrphan );
-      }
-      // Order the new level's marker entries.
-      else
-      {
-        this.ConnectAfter( splitter, start );
-        this.ConnectAfter( orphan, splitter );
-        this.ConnectAfter( end, orphan );
-      }
-
-      return markers;
-    }
-
-    private void RemoveLevelCore( int level )
-    {
-      var markers = this.FindMark( level );
-      var start = markers.Start;
-      var end = markers.End;
-      var splitter = markers.Splitter;
-      var orphan = markers.Orphan;
-      Debug.Assert( start != ColumnHierarchyModel<TColumn, TStatus>.None );
-      Debug.Assert( end != ColumnHierarchyModel<TColumn, TStatus>.None );
-      Debug.Assert( splitter != ColumnHierarchyModel<TColumn, TStatus>.None );
-      Debug.Assert( orphan != ColumnHierarchyModel<TColumn, TStatus>.None );
-
-      var parentStart = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var parentEnd = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var parentSplitter = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var parentOrphan = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var childStart = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var childEnd = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var childSplitter = ColumnHierarchyModel<TColumn, TStatus>.None;
-      var childOrphan = ColumnHierarchyModel<TColumn, TStatus>.None;
-
-      if( level + 1 < m_marks.Length )
-      {
-        var entry = m_marks[ level + 1 ];
-
-        parentStart = entry.Start;
-        parentEnd = entry.End;
-        parentSplitter = entry.Splitter;
-        parentOrphan = entry.Orphan;
-      }
-
-      if( level > 0 )
-      {
-        var entry = m_marks[ level - 1 ];
-
-        childStart = entry.Start;
-        childEnd = entry.End;
-        childSplitter = entry.Splitter;
-        childOrphan = entry.Orphan;
-      }
-
-      if( childStart != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        Debug.Assert( childStart != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( childEnd != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( childSplitter != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( childOrphan != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( childOrphan == this.GetPreviousSiblingOrCousin( childEnd ) );
-        Debug.Assert( this.GetNextSiblingOrCousin( childEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-
-        // Link all entries on the child level together.  They will be rearrange later if necessary.
-        var next = ColumnHierarchyModel<TColumn, TStatus>.None;
-        var current = childEnd;
-
-        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
-        {
-          var previous = this.GetPreviousSiblingOrCousin( current );
-
-          this.Disconnect( current );
-
-          if( next != ColumnHierarchyModel<TColumn, TStatus>.None )
-          {
-            this.ConnectBefore( current, next );
-          }
-          else
-          {
-            this.SetRelations( current, new RelationEntry( ColumnHierarchyModel<TColumn, TStatus>.None, this.GetFirstChild( current ), ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None ) );
-          }
-
-          next = current;
-          current = previous;
-        }
-      }
-
-      // Remove any relation to entries of the removed level.
-      {
-        var current = end;
-        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
-        {
-          var previous = this.GetPreviousSiblingOrCousin( current );
-
-          this.OnLayoutChanging( new LayoutChangingEventArgs( this.GetTargetLocation( current ), LayoutChangingAction.Removing ) );
-          this.Disconnect( current );
-          this.RemoveCore( current );
-
-          current = previous;
-        }
-      }
-
-      // Offset the marks to remove the level that was removed.
-      for( int i = level; i < m_level - 1; i++ )
-      {
-        m_marks[ i ] = m_marks[ i + 1 ];
-      }
-
-      m_level--;
-      m_marks[ m_level ] = MarkEntry.Default;
-
-      // Reconnect the entries on the child level under the parent level's related entries.
-      if( ( childStart != ColumnHierarchyModel<TColumn, TStatus>.None ) && ( parentStart != ColumnHierarchyModel<TColumn, TStatus>.None ) )
-      {
-        Debug.Assert( parentStart != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( parentEnd != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( parentSplitter != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( parentOrphan != ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( parentOrphan == this.GetPreviousSibling( parentEnd ) );
-        Debug.Assert( this.GetFirstChild( parentStart ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( parentEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( parentSplitter ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetFirstChild( parentOrphan ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-        Debug.Assert( this.GetNextSiblingOrCousin( parentEnd ) == ColumnHierarchyModel<TColumn, TStatus>.None );
-
-        var next = childOrphan;
-        var current = this.GetPreviousSibling( next );
-
-        // Move the child orphan entry under the parent level's orphan entry.
-        this.Disconnect( childOrphan );
-        this.ConnectUnder( childOrphan, parentOrphan );
-
-        // Move the columns under the parent level's orphan entry.
-        while( current != ColumnHierarchyModel<TColumn, TStatus>.None )
-        {
-          var previous = this.GetPreviousSibling( current );
-
-          if( this.IsColumn( current ) )
-          {
-            this.Disconnect( current );
-            this.ConnectBefore( current, next );
-
-            next = current;
-          }
-
-          current = previous;
-        }
-
-        // Move the remaining marker entries under the parent level's related marker entries.
-        this.Disconnect( childStart );
-        this.Disconnect( childEnd );
-        this.Disconnect( childSplitter );
-
-        this.ConnectUnder( childStart, parentStart );
-        this.ConnectUnder( childEnd, parentEnd );
-        this.ConnectUnder( childSplitter, parentSplitter );
-
-        Debug.Assert( this.GetFirstChild( parentStart ) == childStart );
-        Debug.Assert( this.GetFirstChild( parentEnd ) == childEnd );
-        Debug.Assert( this.GetFirstChild( parentSplitter ) == childSplitter );
-        Debug.Assert( this.GetFirstChild( parentOrphan ) != ColumnHierarchyModel<TColumn, TStatus>.None );
-      }
-    }
-
-    private int AddCore( TStatus status )
-    {
-      this.EnsureCapacity();
-
-      Debug.Assert( m_columns != null );
-      Debug.Assert( m_status != null );
-      Debug.Assert( m_relations != null );
-
-      var free = m_free;
-
-      m_free = m_columns[ m_free ].Next;
-      m_columns[ free ] = new ColumnEntry( ColumnHierarchyModel<TColumn, TStatus>.None );
-      m_status[ free ] = status;
-      m_relations[ free ] = RelationEntry.Default;
-
-      m_size++;
-
-      return free;
-    }
-
-    private int AddCore( TColumn column, TStatus status, int hashCode )
-    {
-      var index = this.AddCore( status );
-
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-      Debug.Assert( m_buckets != null );
-      Debug.Assert( m_columns != null );
-      Debug.Assert( m_status != null );
-
-      var bucket = this.GetBucket( hashCode );
-      Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
-
-      var collision = m_buckets[ bucket ];
-
-      m_buckets[ bucket ] = index;
-      m_columns[ index ] = new ColumnEntry( column, hashCode, collision );
-
-      return index;
-    }
-
-    private void RemoveCore( int index )
-    {
-      Debug.Assert( m_buckets != null );
-      Debug.Assert( m_columns != null );
-      Debug.Assert( m_status != null );
-      Debug.Assert( m_relations != null );
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-
-      m_status[ index ] = default( TStatus );
-      m_relations[ index ] = RelationEntry.Default;
-
-      var entry = m_columns[ index ];
-
-      // Only column entry needs to adjust the buckets.
-      if( this.IsColumn( entry ) )
-      {
-        var bucket = this.GetBucket( entry.HashCode );
-        Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
-        Debug.Assert( m_buckets[ bucket ] != ColumnHierarchyModel<TColumn, TStatus>.None );
-
-        if( m_buckets[ bucket ] == index )
-        {
-          m_buckets[ bucket ] = entry.Next;
-        }
-        else
-        {
-          // Repair the linked list.
-          var previous = m_buckets[ bucket ];
-          var next = m_columns[ previous ].Next;
-
-          while( next != index )
-          {
-            Debug.Assert( next != ColumnHierarchyModel<TColumn, TStatus>.None );
-            previous = next;
-            next = m_columns[ next ].Next;
-          }
-
-          Debug.Assert( next == index );
-
-          m_columns[ previous ] = m_columns[ previous ].SetNext( entry.Next );
-        }
-      }
-
-      m_columns[ index ] = new ColumnEntry( m_free );
-      m_free = index;
-
-      m_size--;
-    }
-
-    private void Disconnect( int index )
-    {
-      var relations = m_relations[ index ];
-
-      if( relations.Previous != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        this.SetRelations( relations.Previous, m_relations[ relations.Previous ].SetNext( relations.Next ) );
-      }
-      else if( relations.Parent != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        Debug.Assert( m_relations[ relations.Parent ].FirstChild == index );
-
-        this.SetRelations( relations.Parent, m_relations[ relations.Parent ].SetFirstChild( relations.Next ) );
-      }
-
-      if( relations.Next != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        this.SetRelations( relations.Next, m_relations[ relations.Next ].SetPrevious( relations.Previous ) );
-      }
-    }
-
-    private void ConnectBefore( int index, int pivot )
-    {
-      var sourceRelations = m_relations[ index ];
-      var pivotRelations = m_relations[ pivot ];
-
-      if( pivotRelations.Previous != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        Debug.Assert( pivotRelations.Previous != index );
-
-        this.SetRelations( pivotRelations.Previous, m_relations[ pivotRelations.Previous ].SetNext( index ) );
-      }
-      else if( pivotRelations.Parent != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        Debug.Assert( m_relations[ pivotRelations.Parent ].FirstChild == pivot );
-
-        this.SetRelations( pivotRelations.Parent, m_relations[ pivotRelations.Parent ].SetFirstChild( index ) );
-      }
-
-      this.SetRelations( index, new RelationEntry( pivotRelations.Parent, sourceRelations.FirstChild, pivotRelations.Previous, pivot ) );
-      this.SetRelations( pivot, pivotRelations.SetPrevious( index ) );
-    }
-
-    private void ConnectAfter( int index, int pivot )
-    {
-      var sourceRelations = m_relations[ index ];
-      var pivotRelations = m_relations[ pivot ];
-
-      if( pivotRelations.Next != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        Debug.Assert( pivotRelations.Next != index );
-
-        this.SetRelations( pivotRelations.Next, m_relations[ pivotRelations.Next ].SetPrevious( index ) );
-      }
-
-      this.SetRelations( index, new RelationEntry( pivotRelations.Parent, sourceRelations.FirstChild, pivot, pivotRelations.Next ) );
-      this.SetRelations( pivot, pivotRelations.SetNext( index ) );
-    }
-
-    private void ConnectUnder( int index, int pivot )
-    {
-      var sourceRelations = m_relations[ index ];
-      var pivotRelations = m_relations[ pivot ];
-
-      if( pivotRelations.FirstChild != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        Debug.Assert( pivotRelations.FirstChild != index );
-        Debug.Assert( m_relations[ pivotRelations.FirstChild ].Previous == ColumnHierarchyModel<TColumn, TStatus>.None );
-
-        this.SetRelations( pivotRelations.FirstChild, m_relations[ pivotRelations.FirstChild ].SetPrevious( index ) );
-      }
-
-      this.SetRelations( index, new RelationEntry( pivot, sourceRelations.FirstChild, ColumnHierarchyModel<TColumn, TStatus>.None, pivotRelations.FirstChild ) );
-      this.SetRelations( pivot, pivotRelations.SetFirstChild( index ) );
-    }
-
-    private void MoveBefore( int source, int pivot )
-    {
-      if( m_preventLayoutChanged )
-        throw new InvalidOperationException( "The layout cannot be updated." );
-
-      Debug.Assert( ( source >= 0 ) && ( source < m_capacity ) );
-      Debug.Assert( ( pivot >= 0 ) && ( pivot < m_capacity ) );
-
-      // The entry is already at the proper location.
-      if( m_relations[ pivot ].Previous == source )
-        return;
-
-      if( source == pivot )
-        throw new ArgumentException( "Cannot move the entry before itself.", "source" );
-
-      Debug.Assert( this.GetAncestorCount( source ) == this.GetAncestorCount( pivot ), "Cannot move entries on different level." );
-      Debug.Assert( !this.IsStart( pivot ), "No entry can be moved before the start." );
-      Debug.Assert( !this.IsStart( source ) && !this.IsEnd( source ) && !this.IsOrphan( source ), "The entry cannot be moved." );
-      Debug.Assert( !this.IsSplitter( source ) || ( this.GetLevel( source ) == m_level - 1 ), "Only the topmost splitter can be moved." );
-      Debug.Assert( !this.IsSplitter( pivot ) || ( this.GetLevel( pivot ) == m_level - 1 ), "An entry cannot be moved before the splitter on this level." );
-
-      this.Disconnect( source );
-      this.ConnectBefore( source, pivot );
-    }
-
-    private void MoveAfter( int source, int pivot )
-    {
-      if( m_preventLayoutChanged )
-        throw new InvalidOperationException( "The layout cannot be updated." );
-
-      Debug.Assert( ( source >= 0 ) && ( source < m_capacity ) );
-      Debug.Assert( ( pivot >= 0 ) && ( pivot < m_capacity ) );
-
-      // The entry is already at the proper location.
-      if( m_relations[ pivot ].Next == source )
-        return;
-
-      if( source == pivot )
-        throw new ArgumentException( "Cannot move the entry after itself.", "source" );
-
-      Debug.Assert( this.GetAncestorCount( source ) == this.GetAncestorCount( pivot ), "Cannot move entries on different level." );
-      Debug.Assert( !this.IsEnd( pivot ), "No entry can be moved after the end." );
-      Debug.Assert( !this.IsOrphan( pivot ), "No entry can be moved after an orphan entry." );
-      Debug.Assert( !this.IsStart( source ) && !this.IsEnd( source ) && !this.IsOrphan( source ), "The entry cannot be moved." );
-      Debug.Assert( !this.IsSplitter( source ) || ( this.GetLevel( source ) == m_level - 1 ), "Only the topmost splitter can be move." );
-      Debug.Assert( !this.IsSplitter( pivot ) || ( this.GetLevel( pivot ) == m_level - 1 ), "An entry cannot be moved after the splitter on this level." );
-
-      this.Disconnect( source );
-      this.ConnectAfter( source, pivot );
-    }
-
-    private void MoveUnder( int source, int pivot )
-    {
-      if( m_preventLayoutChanged )
-        throw new InvalidOperationException( "The layout cannot be updated." );
-
-      Debug.Assert( ( source >= 0 ) && ( source < m_capacity ) );
-      Debug.Assert( ( pivot >= 0 ) && ( pivot < m_capacity ) );
-
-      // The entry is already at the proper location.
-      if( m_relations[ source ].Parent == pivot )
-        return;
-
-      if( source == pivot )
-        throw new ArgumentException( "Cannot move the entry under itself.", "source" );
-
-      Debug.Assert( this.GetAncestorCount( source ) == ( this.GetAncestorCount( pivot ) + 1 ), "The entry must be a location on the previous level." );
-      Debug.Assert( !this.IsStart( source ) && !this.IsEnd( source ) && !this.IsOrphan( source ), "The entry cannot be moved." );
-      Debug.Assert( !this.IsSplitter( source ), "A splitter cannot be moved under another entry." );
-      Debug.Assert( !this.IsSplitter( pivot ), "An entry cannot be moved under a splitter." );
-
-      this.Disconnect( source );
-      this.ConnectUnder( source, pivot );
-    }
-
-    private void SetRelations( int index, RelationEntry relations )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-
-      var current = m_relations[ index ];
-      var location = this.GetTargetLocation( index );
-      Debug.Assert( location != null );
-
-      if( current.Parent != relations.Parent )
-      {
-        this.OnLayoutChanging( new LayoutChangingEventArgs( location, LayoutChangingAction.ChangingParent ) );
-      }
-
-      if( current.FirstChild != relations.FirstChild )
-      {
-        this.OnLayoutChanging( new LayoutChangingEventArgs( location, LayoutChangingAction.ChangingFirstChild ) );
-      }
-
-      if( current.Previous != relations.Previous )
-      {
-        this.OnLayoutChanging( new LayoutChangingEventArgs( location, LayoutChangingAction.ChangingPrevious ) );
-      }
-
-      if( current.Next != relations.Next )
-      {
-        this.OnLayoutChanging( new LayoutChangingEventArgs( location, LayoutChangingAction.ChangingNext ) );
-      }
-
-      m_relations[ index ] = relations;
-
-      if( current.Parent != relations.Parent )
-      {
-        this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.ParentChanged ) );
-      }
-
-      if( current.FirstChild != relations.FirstChild )
-      {
-        this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.FirstChildChanged ) );
-      }
-
-      if( current.Previous != relations.Previous )
-      {
-        this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.PreviousChanged ) );
-      }
-
-      if( current.Next != relations.Next )
-      {
-        this.OnLayoutChanged( new LayoutChangedEventArgs( location, LayoutChangedAction.NextChanged ) );
-      }
-    }
-
-    private TStatus GetStatus( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-
-      return m_status[ index ];
-    }
-
-    private void SetStatus( int index, TStatus value )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-
-      var oldValue = m_status[ index ];
-      if( object.Equals( oldValue, value ) )
-        return;
-
-      var columnLocation = this.GetTargetLocation( index ) as IColumnLocation;
-      Debug.Assert( columnLocation != null );
-
-      m_status[ index ] = value;
-
-      this.OnStatusChanged( new StatusChangedEventArgs( columnLocation, oldValue, value ) );
-    }
-
-    private bool IsStart( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_capacity ) || this.IsColumn( index ) )
-        return false;
-
-      for( int level = m_level - 1; level >= 0; level-- )
-      {
-        if( index == this.FindMark( level ).Start )
-          return true;
-      }
-
-      return false;
-    }
-
-    private bool IsEnd( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_capacity ) || this.IsColumn( index ) )
-        return false;
-
-      for( int level = m_level - 1; level >= 0; level-- )
-      {
-        if( index == this.FindMark( level ).End )
-          return true;
-      }
-
-      return false;
-    }
-
-    private bool IsSplitter( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_capacity ) || this.IsColumn( index ) )
-        return false;
-
-      for( int level = m_level - 1; level >= 0; level-- )
-      {
-        if( index == this.FindMark( level ).Splitter )
-          return true;
-      }
-
-      return false;
-    }
-
-    private bool IsOrphan( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_capacity ) || this.IsColumn( index ) )
-        return false;
-
-      for( int level = m_level - 1; level >= 0; level-- )
-      {
-        if( index == this.FindMark( level ).Orphan )
-          return true;
-      }
-
-      return false;
-    }
-
-    private bool IsColumn( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_capacity ) )
-        return false;
-
-      return this.IsColumn( m_columns[ index ] );
-    }
-
-    private bool IsColumn( ColumnEntry entry )
-    {
-      return !object.ReferenceEquals( entry.Column, null );
-    }
-
-    private MarkEntry FindMark( int level )
-    {
-      Debug.Assert( ( level >= 0 ) && ( level < m_level ) );
-      Debug.Assert( m_marks != null );
-      Debug.Assert( level < m_marks.Length );
-
-      return m_marks[ level ];
-    }
-
-    private int FindColumn( TColumn column )
-    {
-      Debug.Assert( !object.ReferenceEquals( column, null ) );
-
-      return this.FindColumn( column, column.GetHashCode() );
-    }
-
-    private int FindColumn( TColumn column, int hashCode )
-    {
-      Debug.Assert( !object.ReferenceEquals( column, null ) );
-      Debug.Assert( m_buckets != null );
-      Debug.Assert( m_columns != null );
-
-      var bucket = this.GetBucket( hashCode );
-      Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
-
-      var index = m_buckets[ bucket ];
-
-      while( index != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        var entry = m_columns[ index ];
-        if( ( entry.HashCode == hashCode ) && object.Equals( entry.Column, column ) )
-          return index;
-
-        index = entry.Next;
-      }
-
-      return ColumnHierarchyModel<TColumn, TStatus>.None;
-    }
-
-    private StartLocation CreateStartLocation( int level, int index )
-    {
-      Debug.Assert( this.IsStart( index ) );
-
-      return new StartLocation( this, level, index );
-    }
-
-    private EndLocation CreateEndLocation( int level, int index )
-    {
-      Debug.Assert( this.IsEnd( index ) );
-
-      return new EndLocation( this, level, index );
-    }
-
-    private SplitterLocation CreateSplitterLocation( int level, int index )
-    {
-      Debug.Assert( this.IsSplitter( index ) );
-
-      return new SplitterLocation( this, level, index );
-    }
-
-    private OrphanLocation CreateOrphanLocation( int level, int index )
-    {
-      Debug.Assert( this.IsOrphan( index ) );
-
-      return new OrphanLocation( this, level, index );
-    }
-
-    private ColumnLocation CreateColumnLocation( int index )
-    {
-      Debug.Assert( this.IsColumn( index ) );
-
-      var entry = m_columns[ index ];
-
-      return new ColumnLocation( this, entry.Column, entry.HashCode, index );
-    }
-
-    private int GetParent( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-      Debug.Assert( m_relations != null );
-
-      return m_relations[ index ].Parent;
-    }
-
-    private int GetFirstChild( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-      Debug.Assert( m_relations != null );
-
-      return m_relations[ index ].FirstChild;
-    }
-
-    private int GetPreviousSibling( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-      Debug.Assert( m_relations != null );
-
-      return m_relations[ index ].Previous;
-    }
-
-    private int GetNextSibling( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-      Debug.Assert( m_relations != null );
-
-      return m_relations[ index ].Next;
-    }
-
-    private int GetPreviousSiblingOrCousin( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-
-      var relations = m_relations[ index ];
-      var target = relations.Previous;
-
-      if( target != ColumnHierarchyModel<TColumn, TStatus>.None )
-        return target;
-
-      var parent = relations.Parent;
-      if( parent != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        var oncle = parent;
-
-        while( true )
-        {
-          oncle = this.GetPreviousSiblingOrCousin( oncle );
-          if( oncle == ColumnHierarchyModel<TColumn, TStatus>.None )
-            break;
-
-          target = this.GetFirstChild( oncle );
-          if( target != ColumnHierarchyModel<TColumn, TStatus>.None )
-          {
-            while( this.GetNextSibling( target ) != ColumnHierarchyModel<TColumn, TStatus>.None )
-            {
-              target = this.GetNextSibling( target );
-            }
-
-            return target;
-          }
-        }
-      }
-
-      // No more sibling.
-      return ColumnHierarchyModel<TColumn, TStatus>.None;
-    }
-
-    private int GetNextSiblingOrCousin( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-
-      var relations = m_relations[ index ];
-      var target = relations.Next;
-
-      if( target != ColumnHierarchyModel<TColumn, TStatus>.None )
-        return target;
-
-      var parent = relations.Parent;
-      if( parent != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        var oncle = parent;
-
-        while( true )
-        {
-          oncle = this.GetNextSiblingOrCousin( oncle );
-          if( oncle == ColumnHierarchyModel<TColumn, TStatus>.None )
-            break;
-
-          target = this.GetFirstChild( oncle );
-          if( target != ColumnHierarchyModel<TColumn, TStatus>.None )
-            return target;
-        }
-      }
-
-      // No more sibling.
-      return ColumnHierarchyModel<TColumn, TStatus>.None;
-    }
-
-    private ILocation GetTargetLocation( int index )
-    {
-      if( index == ColumnHierarchyModel<TColumn, TStatus>.None )
-        return null;
-
-      if( this.IsColumn( index ) )
-        return this.CreateColumnLocation( index );
-
-      for( int level = m_level - 1; level >= 0; level-- )
-      {
-        var entry = this.FindMark( level );
-        if( entry.Start == index )
-          return this.CreateStartLocation( level, index );
-
-        if( entry.End == index )
-          return this.CreateEndLocation( level, index );
-
-        if( entry.Splitter == index )
-          return this.CreateSplitterLocation( level, index );
-
-        if( entry.Orphan == index )
-          return this.CreateOrphanLocation( level, index );
-      }
-
-      throw new InvalidOperationException();
-    }
-
-    private int GetLevel( int index )
-    {
-      Debug.Assert( m_level > 0 );
-
-      var ancestors = this.GetAncestorCount( index );
-      Debug.Assert( ancestors < m_level );
-
-      return m_level - ancestors - 1;
-    }
-
-    private int GetAncestorCount( int index )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < m_capacity ) );
-
-      var count = -1;
-
-      while( index != ColumnHierarchyModel<TColumn, TStatus>.None )
-      {
-        index = this.GetParent( index );
-        count++;
-      }
-
-      Debug.Assert( count >= 0 );
-
-      return count;
-    }
-
-    private int GetBucket( int hashCode )
-    {
-      return ColumnHierarchyModel<TColumn, TStatus>.GetBucket( hashCode, m_capacity );
-    }
-
-    private void EnsureMarks( int level, MarkEntry entry )
-    {
-      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || !object.Equals( entry, m_marks[ level ] ) )
-        throw new InvalidOperationException( "The markers are no longer valid." );
-    }
-
-    private int EnsureStart( int level, int index )
-    {
-      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || ( index != m_marks[ level ].Start ) )
-        throw new InvalidOperationException( "The location is no longer valid." );
-
-      return level;
-    }
-
-    private int EnsureEnd( int level, int index )
-    {
-      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || ( index != m_marks[ level ].End ) )
-        throw new InvalidOperationException( "The location is no longer valid." );
-
-      return level;
-    }
-
-    private int EnsureSplitter( int level, int index )
-    {
-      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || ( index != m_marks[ level ].Splitter ) )
-        throw new InvalidOperationException( "The location is no longer valid." );
-
-      return level;
-    }
-
-    private int EnsureOrphan( int level, int index )
-    {
-      if( ( m_marks == null ) || ( level < 0 ) || ( level >= m_marks.Length ) || ( index != m_marks[ level ].Orphan ) )
-        throw new InvalidOperationException( "The location is no longer valid." );
-
-      return level;
-    }
-
-    private int EnsureColumn( TColumn column, int hashCode, int index )
-    {
-      if( ( index < 0 ) || ( index >= m_capacity ) )
-        throw new InvalidOperationException( "The column location is no longer valid." );
-
-      var entry = m_columns[ index ];
-      if( ( hashCode != entry.HashCode ) || !object.Equals( column, entry.Column ) )
-        throw new InvalidOperationException( "The column location is no longer valid." );
-
-      return this.GetLevel( index );
-    }
-
-    private void EnsureCapacity()
-    {
-      // Make sure the collection is not full.
-      if( m_size != m_capacity )
-        return;
-
-      Debug.Assert( m_free == ColumnHierarchyModel<TColumn, TStatus>.None );
-      this.EnsureCapacity( m_capacity * 2L );
-      Debug.Assert( m_free != ColumnHierarchyModel<TColumn, TStatus>.None );
-      Debug.Assert( m_size != m_capacity );
-    }
-
-    private void EnsureCapacity( long min )
-    {
-      if( ( m_capacity >= min ) && ( m_capacity > 0 ) )
-        return;
-
-      var capacity = ColumnHierarchyModel<TColumn, TStatus>.FindNextSize( min );
-      Debug.Assert( capacity > 0 );
-
-      m_buckets = new int[ capacity ];
-
-      Array.Resize( ref m_columns, capacity );
-      Array.Resize( ref m_status, capacity );
-      Array.Resize( ref m_relations, capacity );
-
-      for( int i = 0; i < m_buckets.Length; i++ )
-      {
-        m_buckets[ i ] = ColumnHierarchyModel<TColumn, TStatus>.None;
-      }
-
-      for( int i = m_capacity; i < capacity; i++ )
-      {
-        m_columns[ i ] = new ColumnEntry( ( i < capacity - 1 ) ? i + 1 : ColumnHierarchyModel<TColumn, TStatus>.None );
-        m_status[ i ] = default( TStatus );
-        m_relations[ i ] = RelationEntry.Default;
-      }
-
-      // Rehash the elements to initialize the buckets.
-      for( int i = 0; i < m_capacity; i++ )
-      {
-        var entry = m_columns[ i ];
-
-        // Only column entry needs to adjust the buckets.
-        if( this.IsColumn( entry ) )
-        {
-          var bucket = ColumnHierarchyModel<TColumn, TStatus>.GetBucket( entry.HashCode, capacity );
-          Debug.Assert( ( bucket >= 0 ) && ( bucket < capacity ) );
-
-          var index = m_buckets[ bucket ];
-
-          m_buckets[ bucket ] = i;
-          m_columns[ i ] = entry.SetNext( index );
-        }
-      }
-
-      m_free = m_capacity;
-      m_capacity = capacity;
-    }
-
-    private static int FindNextSize( long min )
-    {
-      var sizes = ArrayHelper.Sizes;
-
-      for( int i = 0; i < sizes.Length; i++ )
-      {
-        var size = sizes[ i ];
-
-        if( size >= min )
-          return size;
-      }
-
-      throw new InvalidOperationException( "Cannot find a larger size." );
-    }
-
-    private static int GetBucket( int hashCode, int capacity )
-    {
-      Debug.Assert( capacity > 0 );
-
-      // Remove the negative sign without using Math.Abs to handle the case of int.MinValue.
-      return ( hashCode & 0x7fffffff ) % capacity;
-    }
-
-    private int[] m_buckets;
-    private ColumnEntry[] m_columns;
-    private TStatus[] m_status;
-    private RelationEntry[] m_relations;
-    private MarkEntry[] m_marks;
-    private int m_level; //0
-    private int m_capacity; //0
-    private int m_size; //0
-    private bool m_preventLayoutChanged; //false
-    private int m_free = ColumnHierarchyModel<TColumn, TStatus>.None;
-
-    #region IMarkers Internal Interface
-
-    internal interface IMarkers
-    {
-      ILocation Start
-      {
-        get;
-      }
-
-      ILocation End
-      {
-        get;
-      }
-
-      ILocation Splitter
-      {
-        get;
-      }
-
-      ILocation Orphan
-      {
-        get;
-      }
-    }
-
-    #endregion
-
-    #region ILocation Internal Interface
-
-    internal interface ILocation
-    {
-      LocationType Type
-      {
-        get;
-      }
-
-      int Level
-      {
-        get;
-      }
-
-      ILocation GetParent();
-      ILocation GetFirstChild();
-
-      ILocation GetPreviousSibling();
-      ILocation GetNextSibling();
-
-      ILocation GetPreviousSiblingOrCousin();
-      ILocation GetNextSiblingOrCousin();
-
-      bool CanMoveBefore( ILocation location );
-      bool CanMoveAfter( ILocation location );
-      bool CanMoveUnder( ILocation location );
-
-      void MoveBefore( ILocation location );
-      void MoveAfter( ILocation location );
-      void MoveUnder( ILocation location );
-    }
-
-    #endregion
-
-    #region IColumnLocation Internal Interface
-
-    internal interface IColumnLocation : ILocation
-    {
-      TColumn Column
-      {
-        get;
-      }
-
-      TStatus Status
-      {
-        get;
-        set;
-      }
-    }
-
-    #endregion
-
-    #region LayoutChangingEventArgs Internal Class
-
-    internal sealed class LayoutChangingEventArgs : EventArgs
-    {
-      internal LayoutChangingEventArgs( ILocation location, LayoutChangingAction action )
-      {
-        m_location = location;
-        m_action = action;
-      }
-
-      internal ILocation Location
-      {
-        get
-        {
-          return m_location;
-        }
-      }
-
-      internal LayoutChangingAction Action
-      {
-        get
-        {
-          return m_action;
-        }
-      }
-
-      private readonly ILocation m_location;
-      private readonly LayoutChangingAction m_action;
-    }
-
-    #endregion
-
-    #region LayoutChangedEventArgs Internal Class
-
-    internal sealed class LayoutChangedEventArgs : EventArgs
-    {
-      internal LayoutChangedEventArgs( ILocation location, LayoutChangedAction action )
-      {
-        m_location = location;
-        m_action = action;
-      }
-
-      internal ILocation Location
-      {
-        get
-        {
-          return m_location;
-        }
-      }
-
-      internal LayoutChangedAction Action
-      {
-        get
-        {
-          return m_action;
-        }
-      }
-
-      private readonly ILocation m_location;
-      private readonly LayoutChangedAction m_action;
-    }
-
-    #endregion
-
-    #region StatusChangedEventArgs Internal Class
-
-    internal sealed class StatusChangedEventArgs : EventArgs
-    {
-      internal StatusChangedEventArgs( IColumnLocation location, TStatus oldValue, TStatus newValue )
-      {
-        m_location = location;
-        m_oldValue = oldValue;
-        m_newValue = newValue;
-      }
-
-      internal IColumnLocation Location
-      {
-        get
-        {
-          return m_location;
-        }
-      }
-
-      internal TStatus OldValue
-      {
-        get
-        {
-          return m_oldValue;
-        }
-      }
-
-      internal TStatus NewValue
-      {
-        get
-        {
-          return m_newValue;
-        }
-      }
-
-      private readonly IColumnLocation m_location;
-      private readonly TStatus m_oldValue;
-      private readonly TStatus m_newValue;
-    }
-
-    #endregion
-
-    #region LayoutChangingAction Internal Enum
-
-    internal enum LayoutChangingAction
-    {
-      Clearing,
-      Removing,
-      ChangingParent,
-      ChangingFirstChild,
-      ChangingPrevious,
-      ChangingNext,
-    }
-
-    #endregion
-
-    #region LayoutChangedAction Internal Enum
-
-    internal enum LayoutChangedAction
-    {
-      Cleared,
-      Added,
-      ParentChanged,
-      FirstChildChanged,
-      PreviousChanged,
-      NextChanged,
-    }
-
-    #endregion
-
-    #region IPivotLocation Private Interface
-
-    private interface IPivotLocation
-    {
-      bool CanBeNextSiblingOf( IMovableLocation location );
-      bool CanBePreviousSiblingOf( IMovableLocation location );
-      bool CanBeParentOf( IMovableLocation location );
-
-      void SetHasNextSiblingOf( IMovableLocation location );
-      void SetHasPreviousSiblingOf( IMovableLocation location );
-      void SetHasParentOf( IMovableLocation location );
-    }
-
-    #endregion
-
-    #region IMovableLocation Private Interface
-
-    private interface IMovableLocation
-    {
-      bool CanMoveBefore( StartLocation location );
-      bool CanMoveBefore( EndLocation location );
-      bool CanMoveBefore( SplitterLocation location );
-      bool CanMoveBefore( OrphanLocation location );
-      bool CanMoveBefore( ColumnLocation location );
-
-      bool CanMoveAfter( StartLocation location );
-      bool CanMoveAfter( EndLocation location );
-      bool CanMoveAfter( SplitterLocation location );
-      bool CanMoveAfter( OrphanLocation location );
-      bool CanMoveAfter( ColumnLocation location );
-
-      bool CanMoveUnder( StartLocation location );
-      bool CanMoveUnder( EndLocation location );
-      bool CanMoveUnder( SplitterLocation location );
-      bool CanMoveUnder( OrphanLocation location );
-      bool CanMoveUnder( ColumnLocation location );
-
-      void MoveBefore( StartLocation location );
-      void MoveBefore( EndLocation location );
-      void MoveBefore( SplitterLocation location );
-      void MoveBefore( OrphanLocation location );
-      void MoveBefore( ColumnLocation location );
-
-      void MoveAfter( StartLocation location );
-      void MoveAfter( EndLocation location );
-      void MoveAfter( SplitterLocation location );
-      void MoveAfter( OrphanLocation location );
-      void MoveAfter( ColumnLocation location );
-
-      void MoveUnder( StartLocation location );
-      void MoveUnder( EndLocation location );
-      void MoveUnder( SplitterLocation location );
-      void MoveUnder( OrphanLocation location );
-      void MoveUnder( ColumnLocation location );
-    }
-
-    #endregion
-
-    #region Markers Private Class
-
-    private sealed class Markers : IMarkers
-    {
-      internal Markers( ColumnHierarchyModel<TColumn, TStatus> owner, int level, MarkEntry entry )
-      {
-        Debug.Assert( owner != null );
-
-        m_owner = owner;
-        m_level = level;
-        m_entry = entry;
-      }
-
-      public ILocation Start
-      {
-        get
-        {
-          this.EnsureMarks();
-
-          return m_owner.CreateStartLocation( m_level, m_entry.Start );
-        }
-      }
-
-      public ILocation End
-      {
-        get
-        {
-          this.EnsureMarks();
-
-          return m_owner.CreateEndLocation( m_level, m_entry.End );
-        }
-      }
-
-      public ILocation Splitter
-      {
-        get
-        {
-          this.EnsureMarks();
-
-          return m_owner.CreateSplitterLocation( m_level, m_entry.Splitter );
-        }
-      }
-
-      public ILocation Orphan
-      {
-        get
-        {
-          this.EnsureMarks();
-
-          return m_owner.CreateOrphanLocation( m_level, m_entry.Orphan );
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return m_level;
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as Markers;
-        if( target == null )
-          return false;
-
-        return ( m_level == target.m_level )
-            && ( object.Equals( m_entry, target.m_entry ) )
-            && ( m_owner == target.m_owner );
-      }
-
-      private void EnsureMarks()
-      {
-        m_owner.EnsureMarks( m_level, m_entry );
-      }
-
-      private readonly ColumnHierarchyModel<TColumn, TStatus> m_owner;
-      private readonly int m_level;
-      private readonly MarkEntry m_entry;
-    }
-
-    #endregion
-
-    #region Location Private Class
-
-    private abstract class Location : ILocation, IMovableLocation, IPivotLocation
-    {
-      protected Location( ColumnHierarchyModel<TColumn, TStatus> owner, int index )
-      {
-        Debug.Assert( owner != null );
-
-        m_owner = owner;
-        m_index = index;
-      }
-
-      protected abstract LocationType Type
-      {
-        get;
-      }
-
-      protected int Level
-      {
-        get
-        {
-          return this.EnsureLocation();
-        }
-      }
-
-      internal int Index
-      {
-        get
-        {
-          return m_index;
-        }
-      }
-
-      internal ColumnHierarchyModel<TColumn, TStatus> Owner
-      {
-        get
-        {
-          return m_owner;
-        }
-      }
-
-      LocationType ILocation.Type
-      {
-        get
-        {
-          return this.Type;
-        }
-      }
-
-      int ILocation.Level
-      {
-        get
-        {
-          return this.Level;
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return m_index;
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as Location;
-        if( target == null )
-          return false;
-
-        return ( m_index == target.m_index )
-            && ( m_owner == target.m_owner );
-      }
-
-      protected TStatus GetStatus()
-      {
-        this.EnsureLocation();
-
-        return m_owner.GetStatus( m_index );
-      }
-
-      protected void SetStatus( TStatus status )
-      {
-        this.EnsureLocation();
-
-        m_owner.SetStatus( m_index, status );
-      }
-
-      protected void MoveBeforeCore( Location location )
-      {
-        m_owner.MoveBefore( m_index, location.m_index );
-      }
-
-      protected void MoveAfterCore( Location location )
-      {
-        m_owner.MoveAfter( m_index, location.m_index );
-      }
-
-      protected void MoveUnderCore( Location location )
-      {
-        m_owner.MoveUnder( m_index, location.m_index );
-      }
-
-      protected virtual bool CanMoveBefore( StartLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveBefore( EndLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveBefore( SplitterLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveBefore( OrphanLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveBefore( ColumnLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveAfter( StartLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveAfter( EndLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveAfter( SplitterLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveAfter( OrphanLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveAfter( ColumnLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveUnder( StartLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveUnder( EndLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveUnder( SplitterLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveUnder( OrphanLocation location )
-      {
-        return false;
-      }
-
-      protected virtual bool CanMoveUnder( ColumnLocation location )
-      {
-        return false;
-      }
-
-      protected virtual void MoveBefore( StartLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveBefore( EndLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveBefore( SplitterLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveBefore( OrphanLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveBefore( ColumnLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveAfter( StartLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveAfter( EndLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveAfter( SplitterLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveAfter( OrphanLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveAfter( ColumnLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveUnder( StartLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveUnder( EndLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveUnder( SplitterLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveUnder( OrphanLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected virtual void MoveUnder( ColumnLocation location )
-      {
-        throw new NotSupportedException();
-      }
-
-      protected abstract bool CanBeNextSiblingOf( IMovableLocation location );
-      protected abstract bool CanBePreviousSiblingOf( IMovableLocation location );
-      protected abstract bool CanBeParentOf( IMovableLocation location );
-      protected abstract void SetHasNextSiblingOf( IMovableLocation location );
-      protected abstract void SetHasPreviousSiblingOf( IMovableLocation location );
-      protected abstract void SetHasParentOf( IMovableLocation location );
-
-      internal abstract int EnsureLocation();
-
-      private int EnsureLocation( ILocation location )
-      {
-        if( location == null )
-          throw new ArgumentNullException( "location" );
-
-        var target = location as Location;
-        if( target == null )
-          throw new ArgumentException( "The location must derive from Location.", "location" );
-
-        if( target.Owner != m_owner )
-          throw new ArgumentException( "The location must share the same owner.", "location" );
-
-        return target.EnsureLocation();
-      }
-
-      private void EnsureSiblingLocation( ILocation location )
-      {
-        var sourceLevel = this.EnsureLocation();
-        var targetLevel = this.EnsureLocation( location );
-
-        if( sourceLevel != targetLevel )
-          throw new ArgumentException( "The location must be on the same level.", "location" );
-      }
-
-      private void EnsureParentLocation( ILocation location )
-      {
-        var sourceLevel = this.EnsureLocation();
-        var targetLevel = this.EnsureLocation( location );
-
-        if( sourceLevel != targetLevel - 1 )
-          throw new ArgumentException( "The location must be on the parent level.", "location" );
-      }
-
-      ILocation ILocation.GetParent()
-      {
-        this.EnsureLocation();
-        return m_owner.GetTargetLocation( m_owner.GetParent( m_index ) );
-      }
-
-      ILocation ILocation.GetFirstChild()
-      {
-        this.EnsureLocation();
-        return m_owner.GetTargetLocation( m_owner.GetFirstChild( m_index ) );
-      }
-
-      ILocation ILocation.GetPreviousSibling()
-      {
-        this.EnsureLocation();
-        return m_owner.GetTargetLocation( m_owner.GetPreviousSibling( m_index ) );
-      }
-
-      ILocation ILocation.GetNextSibling()
-      {
-        this.EnsureLocation();
-        return m_owner.GetTargetLocation( m_owner.GetNextSibling( m_index ) );
-      }
-
-      ILocation ILocation.GetPreviousSiblingOrCousin()
-      {
-        this.EnsureLocation();
-        return m_owner.GetTargetLocation( m_owner.GetPreviousSiblingOrCousin( m_index ) );
-      }
-
-      ILocation ILocation.GetNextSiblingOrCousin()
-      {
-        this.EnsureLocation();
-        return m_owner.GetTargetLocation( m_owner.GetNextSiblingOrCousin( m_index ) );
-      }
-
-      bool ILocation.CanMoveBefore( ILocation location )
-      {
-        if( location == null )
-          return false;
-
-        if( object.Equals( location, this ) )
-          return false;
-
-        var currentLevel = this.EnsureLocation();
-        var targetLevel = this.EnsureLocation( location );
-
-        if( currentLevel != targetLevel )
-          return false;
-
-        Debug.Assert( location is IPivotLocation );
-
-        return ( ( IPivotLocation )location ).CanBeNextSiblingOf( this );
-      }
-
-      bool ILocation.CanMoveAfter( ILocation location )
-      {
-        if( location == null )
-          return false;
-
-        if( object.Equals( location, this ) )
-          return false;
-
-        var currentLevel = this.EnsureLocation();
-        var targetLevel = this.EnsureLocation( location );
-
-        if( currentLevel != targetLevel )
-          return false;
-
-        Debug.Assert( location is IPivotLocation );
-
-        return ( ( IPivotLocation )location ).CanBePreviousSiblingOf( this );
-      }
-
-      bool ILocation.CanMoveUnder( ILocation location )
-      {
-        if( location == null )
-          return false;
-
-        if( object.Equals( location, this ) )
-          return false;
-
-        var currentLevel = this.EnsureLocation();
-        var targetLevel = this.EnsureLocation( location );
-
-        if( currentLevel != targetLevel - 1 )
-          return false;
-
-        Debug.Assert( location is IPivotLocation );
-
-        return ( ( IPivotLocation )location ).CanBeParentOf( this );
-      }
-
-      void ILocation.MoveBefore( ILocation location )
-      {
-        this.EnsureSiblingLocation( location );
-
-        Debug.Assert( ( ( ILocation )this ).CanMoveBefore( location ) );
-        Debug.Assert( location is IPivotLocation );
-
-        ( ( IPivotLocation )location ).SetHasNextSiblingOf( this );
-      }
-
-      void ILocation.MoveAfter( ILocation location )
-      {
-        this.EnsureSiblingLocation( location );
-
-        Debug.Assert( ( ( ILocation )this ).CanMoveAfter( location ) );
-        Debug.Assert( location is IPivotLocation );
-
-        ( ( IPivotLocation )location ).SetHasPreviousSiblingOf( this );
-      }
-
-      void ILocation.MoveUnder( ILocation location )
-      {
-        this.EnsureParentLocation( location );
-
-        Debug.Assert( ( ( ILocation )this ).CanMoveUnder( location ) );
-        Debug.Assert( location is IPivotLocation );
-
-        ( ( IPivotLocation )location ).SetHasParentOf( this );
-      }
-
-      bool IMovableLocation.CanMoveBefore( StartLocation location )
-      {
-        return this.CanMoveBefore( location );
-      }
-
-      bool IMovableLocation.CanMoveBefore( EndLocation location )
-      {
-        return this.CanMoveBefore( location );
-      }
-
-      bool IMovableLocation.CanMoveBefore( SplitterLocation location )
-      {
-        return this.CanMoveBefore( location );
-      }
-
-      bool IMovableLocation.CanMoveBefore( OrphanLocation location )
-      {
-        return this.CanMoveBefore( location );
-      }
-
-      bool IMovableLocation.CanMoveBefore( ColumnLocation location )
-      {
-        return this.CanMoveBefore( location );
-      }
-
-      bool IMovableLocation.CanMoveAfter( StartLocation location )
-      {
-        return this.CanMoveAfter( location );
-      }
-
-      bool IMovableLocation.CanMoveAfter( EndLocation location )
-      {
-        return this.CanMoveAfter( location );
-      }
-
-      bool IMovableLocation.CanMoveAfter( SplitterLocation location )
-      {
-        return this.CanMoveAfter( location );
-      }
-
-      bool IMovableLocation.CanMoveAfter( OrphanLocation location )
-      {
-        return this.CanMoveAfter( location );
-      }
-
-      bool IMovableLocation.CanMoveAfter( ColumnLocation location )
-      {
-        return this.CanMoveAfter( location );
-      }
-
-      bool IMovableLocation.CanMoveUnder( StartLocation location )
-      {
-        return this.CanMoveUnder( location );
-      }
-
-      bool IMovableLocation.CanMoveUnder( EndLocation location )
-      {
-        return this.CanMoveUnder( location );
-      }
-
-      bool IMovableLocation.CanMoveUnder( SplitterLocation location )
-      {
-        return this.CanMoveUnder( location );
-      }
-
-      bool IMovableLocation.CanMoveUnder( OrphanLocation location )
-      {
-        return this.CanMoveUnder( location );
-      }
-
-      bool IMovableLocation.CanMoveUnder( ColumnLocation location )
-      {
-        return this.CanMoveUnder( location );
-      }
-
-      void IMovableLocation.MoveBefore( StartLocation location )
-      {
-        this.MoveBefore( location );
-      }
-
-      void IMovableLocation.MoveBefore( EndLocation location )
-      {
-        this.MoveBefore( location );
-      }
-
-      void IMovableLocation.MoveBefore( SplitterLocation location )
-      {
-        this.MoveBefore( location );
-      }
-
-      void IMovableLocation.MoveBefore( OrphanLocation location )
-      {
-        this.MoveBefore( location );
-      }
-
-      void IMovableLocation.MoveBefore( ColumnLocation location )
-      {
-        this.MoveBefore( location );
-      }
-
-      void IMovableLocation.MoveAfter( StartLocation location )
-      {
-        this.MoveAfter( location );
-      }
-
-      void IMovableLocation.MoveAfter( EndLocation location )
-      {
-        this.MoveAfter( location );
-      }
-
-      void IMovableLocation.MoveAfter( SplitterLocation location )
-      {
-        this.MoveAfter( location );
-      }
-
-      void IMovableLocation.MoveAfter( OrphanLocation location )
-      {
-        this.MoveAfter( location );
-      }
-
-      void IMovableLocation.MoveAfter( ColumnLocation location )
-      {
-        this.MoveAfter( location );
-      }
-
-      void IMovableLocation.MoveUnder( StartLocation location )
-      {
-        this.MoveUnder( location );
-      }
-
-      void IMovableLocation.MoveUnder( EndLocation location )
-      {
-        this.MoveUnder( location );
-      }
-
-      void IMovableLocation.MoveUnder( SplitterLocation location )
-      {
-        this.MoveUnder( location );
-      }
-
-      void IMovableLocation.MoveUnder( OrphanLocation location )
-      {
-        this.MoveUnder( location );
-      }
-
-      void IMovableLocation.MoveUnder( ColumnLocation location )
-      {
-        this.MoveUnder( location );
-      }
-
-      bool IPivotLocation.CanBeNextSiblingOf( IMovableLocation location )
-      {
-        return this.CanBeNextSiblingOf( location );
-      }
-
-      bool IPivotLocation.CanBePreviousSiblingOf( IMovableLocation location )
-      {
-        return this.CanBePreviousSiblingOf( location );
-      }
-
-      bool IPivotLocation.CanBeParentOf( IMovableLocation location )
-      {
-        return this.CanBeParentOf( location );
-      }
-
-      void IPivotLocation.SetHasNextSiblingOf( IMovableLocation location )
-      {
-        this.SetHasNextSiblingOf( location );
-      }
-
-      void IPivotLocation.SetHasPreviousSiblingOf( IMovableLocation location )
-      {
-        this.SetHasPreviousSiblingOf( location );
-      }
-
-      void IPivotLocation.SetHasParentOf( IMovableLocation location )
-      {
-        this.SetHasParentOf( location );
-      }
-
-      private readonly ColumnHierarchyModel<TColumn, TStatus> m_owner;
-      private readonly int m_index;
-    }
-
-    #endregion
-
-    #region StartLocation Private Class
-
-    private sealed class StartLocation : Location
-    {
-      internal StartLocation( ColumnHierarchyModel<TColumn, TStatus> owner, int level, int index )
-        : base( owner, index )
-      {
-        m_level = level;
-      }
-
-      protected override LocationType Type
-      {
-        get
-        {
-          return LocationType.Start;
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return base.GetHashCode();
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as StartLocation;
-        if( target == null )
-          return false;
-
-        return ( m_level == target.m_level )
-            && ( base.Equals( target ) );
-      }
-
-      protected override bool CanBeNextSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveBefore( this );
-      }
-
-      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveAfter( this );
-      }
-
-      protected override bool CanBeParentOf( IMovableLocation location )
-      {
-        return location.CanMoveUnder( this );
-      }
-
-      protected override void SetHasNextSiblingOf( IMovableLocation location )
-      {
-        location.MoveBefore( this );
-      }
-
-      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
-      {
-        location.MoveAfter( this );
-      }
-
-      protected override void SetHasParentOf( IMovableLocation location )
-      {
-        location.MoveUnder( this );
-      }
-
-      internal override int EnsureLocation()
-      {
-        return this.Owner.EnsureStart( m_level, this.Index );
-      }
-
-      private readonly int m_level;
-    }
-
-    #endregion
-
-    #region EndLocation Private Class
-
-    private sealed class EndLocation : Location
-    {
-      internal EndLocation( ColumnHierarchyModel<TColumn, TStatus> owner, int level, int index )
-        : base( owner, index )
-      {
-        m_level = level;
-      }
-
-      protected override LocationType Type
-      {
-        get
-        {
-          return LocationType.End;
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return base.GetHashCode();
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as EndLocation;
-        if( target == null )
-          return false;
-
-        return ( m_level == target.m_level )
-            && ( base.Equals( target ) );
-      }
-
-      protected override bool CanBeNextSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveBefore( this );
-      }
-
-      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveAfter( this );
-      }
-
-      protected override bool CanBeParentOf( IMovableLocation location )
-      {
-        return location.CanMoveUnder( this );
-      }
-
-      protected override void SetHasNextSiblingOf( IMovableLocation location )
-      {
-        location.MoveBefore( this );
-      }
-
-      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
-      {
-        location.MoveAfter( this );
-      }
-
-      protected override void SetHasParentOf( IMovableLocation location )
-      {
-        location.MoveUnder( this );
-      }
-
-      internal override int EnsureLocation()
-      {
-        return this.Owner.EnsureEnd( m_level, this.Index );
-      }
-
-      private readonly int m_level;
-    }
-
-    #endregion
-
-    #region SplitterLocation Private Class
-
-    private sealed class SplitterLocation : Location
-    {
-      internal SplitterLocation( ColumnHierarchyModel<TColumn, TStatus> owner, int level, int index )
-        : base( owner, index )
-      {
-        m_level = level;
-      }
-
-      protected override LocationType Type
-      {
-        get
-        {
-          return LocationType.Splitter;
-        }
-      }
-
-      internal bool IsMovable
-      {
-        get
-        {
-          return ( m_level == this.Owner.LevelCount - 1 );
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return base.GetHashCode();
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as SplitterLocation;
-        if( target == null )
-          return false;
-
-        return ( m_level == target.m_level )
-            && ( base.Equals( target ) );
-      }
-
-      protected override bool CanMoveBefore( ColumnLocation location )
-      {
-        return this.CanMoveSplitterBefore( location );
-      }
-
-      protected override bool CanMoveBefore( OrphanLocation location )
-      {
-        return this.CanMoveSplitterBefore( location );
-      }
-
-      protected override bool CanMoveAfter( ColumnLocation location )
-      {
-        return this.CanMoveSplitterAfter( location );
-      }
-
-      protected override bool CanMoveAfter( StartLocation location )
-      {
-        return this.CanMoveSplitterAfter( location );
-      }
-
-      protected override void MoveBefore( ColumnLocation location )
-      {
-        this.MoveSplitterBefore( location );
-      }
-
-      protected override void MoveBefore( OrphanLocation location )
-      {
-        this.MoveSplitterBefore( location );
-      }
-
-      protected override void MoveAfter( ColumnLocation location )
-      {
-        this.MoveSplitterAfter( location );
-      }
-
-      protected override void MoveAfter( StartLocation location )
-      {
-        this.MoveSplitterAfter( location );
-      }
-
-      protected override bool CanBeNextSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveBefore( this );
-      }
-
-      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveAfter( this );
-      }
-
-      protected override bool CanBeParentOf( IMovableLocation location )
-      {
-        return location.CanMoveUnder( this );
-      }
-
-      protected override void SetHasNextSiblingOf( IMovableLocation location )
-      {
-        location.MoveBefore( this );
-      }
-
-      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
-      {
-        location.MoveAfter( this );
-      }
-
-      protected override void SetHasParentOf( IMovableLocation location )
-      {
-        location.MoveUnder( this );
-      }
-
-      internal override int EnsureLocation()
-      {
-        return this.Owner.EnsureSplitter( m_level, this.Index );
-      }
-
-      private bool CanMoveSplitterBefore( ILocation location )
-      {
-        if( this.IsMovable )
-          return true;
-
-        // The current and target locations should not be on the top-most level.
-        Debug.Assert( m_level < this.Owner.LevelCount - 1 );
-
-        // The splitter may not move or a merged column is going to be splitted.
-        if( location.GetPreviousSibling() != null )
-          return false;
-
-        var parentLocation = ( ( ILocation )this ).GetParent();
-        Debug.Assert( parentLocation != null );
-
-        return parentLocation.CanMoveBefore( location.GetParent() );
-      }
-
-      private bool CanMoveSplitterAfter( ILocation location )
-      {
-        if( this.IsMovable )
-          return true;
-
-        // The current and target locations should not be on the top-most level.
-        Debug.Assert( m_level < this.Owner.LevelCount - 1 );
-
-        // The splitter may not move or a merged column is going to be splitted.
-        if( location.GetNextSibling() != null )
-          return false;
-
-        var parentLocation = ( ( ILocation )this ).GetParent();
-        Debug.Assert( parentLocation != null );
-
-        return parentLocation.CanMoveAfter( location.GetParent() );
-      }
-
-      private void MoveSplitterBefore( Location location )
-      {
-        if( this.IsMovable )
-        {
-          this.MoveBeforeCore( location );
-        }
-        else
-        {
-          var parentLocation = ( ( ILocation )this ).GetParent();
-          Debug.Assert( parentLocation != null );
-
-          parentLocation.MoveBefore( ( ( ILocation )location ).GetParent() );
-        }
-      }
-
-      private void MoveSplitterAfter( Location location )
-      {
-        if( this.IsMovable )
-        {
-          this.MoveAfterCore( location );
-        }
-        else
-        {
-          var parentLocation = ( ( ILocation )this ).GetParent();
-          Debug.Assert( parentLocation != null );
-
-          parentLocation.MoveAfter( ( ( ILocation )location ).GetParent() );
-        }
-      }
-
-      private readonly int m_level;
-    }
-
-    #endregion
-
-    #region OrphanLocation Private Class
-
-    private sealed class OrphanLocation : Location
-    {
-      internal OrphanLocation( ColumnHierarchyModel<TColumn, TStatus> owner, int level, int index )
-        : base( owner, index )
-      {
-        m_level = level;
-      }
-
-      protected override LocationType Type
-      {
-        get
-        {
-          return LocationType.Orphan;
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return base.GetHashCode();
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as OrphanLocation;
-        if( target == null )
-          return false;
-
-        return ( m_level == target.m_level )
-            && ( base.Equals( target ) );
-      }
-
-      protected override bool CanBeNextSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveBefore( this );
-      }
-
-      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveAfter( this );
-      }
-
-      protected override bool CanBeParentOf( IMovableLocation location )
-      {
-        return location.CanMoveUnder( this );
-      }
-
-      protected override void SetHasNextSiblingOf( IMovableLocation location )
-      {
-        location.MoveBefore( this );
-      }
-
-      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
-      {
-        location.MoveAfter( this );
-      }
-
-      protected override void SetHasParentOf( IMovableLocation location )
-      {
-        location.MoveUnder( this );
-      }
-
-      internal override int EnsureLocation()
-      {
-        return this.Owner.EnsureOrphan( m_level, this.Index );
-      }
-
-      private readonly int m_level;
-    }
-
-    #endregion
-
-    #region ColumnLocation Private Class
-
-    private sealed class ColumnLocation : Location, IColumnLocation
-    {
-      internal ColumnLocation( ColumnHierarchyModel<TColumn, TStatus> owner, TColumn column, int hashCode, int index )
-        : base( owner, index )
-      {
-        m_column = column;
-        m_hashCode = hashCode;
-      }
-
-      protected override LocationType Type
-      {
-        get
-        {
-          return LocationType.Column;
-        }
-      }
-
-      TColumn IColumnLocation.Column
-      {
-        get
-        {
-          return m_column;
-        }
-      }
-
-      TStatus IColumnLocation.Status
-      {
-        get
-        {
-          return this.GetStatus();
-        }
-        set
-        {
-          this.SetStatus( value );
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return base.GetHashCode();
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as ColumnLocation;
-        if( target == null )
-          return false;
-
-        return ( object.Equals( m_column, target.m_column ) )
-            && ( base.Equals( target ) );
-      }
-
-      protected override bool CanMoveBefore( ColumnLocation location )
-      {
-        return true;
-      }
-
-      protected override bool CanMoveBefore( SplitterLocation location )
-      {
-        // The column may move only next to the the top-most splitter.
-        return location.IsMovable;
-      }
-
-      protected override bool CanMoveBefore( OrphanLocation location )
-      {
-        return true;
-      }
-
-      protected override bool CanMoveAfter( ColumnLocation location )
-      {
-        return true;
-      }
-
-      protected override bool CanMoveAfter( SplitterLocation location )
-      {
-        // The column may move only next to the the top-most splitter.
-        return location.IsMovable;
-      }
-
-      protected override bool CanMoveAfter( StartLocation location )
-      {
-        return true;
-      }
-
-      protected override bool CanMoveUnder( ColumnLocation location )
-      {
-        return true;
-      }
-
-      protected override bool CanMoveUnder( OrphanLocation location )
-      {
-        return true;
-      }
-
-      protected override void MoveBefore( ColumnLocation location )
-      {
-        this.MoveBeforeCore( location );
-      }
-
-      protected override void MoveBefore( SplitterLocation location )
-      {
-        this.MoveBeforeCore( location );
-      }
-
-      protected override void MoveBefore( OrphanLocation location )
-      {
-        this.MoveBeforeCore( location );
-      }
-
-      protected override void MoveAfter( ColumnLocation location )
-      {
-        this.MoveAfterCore( location );
-      }
-
-      protected override void MoveAfter( SplitterLocation location )
-      {
-        this.MoveAfterCore( location );
-      }
-
-      protected override void MoveAfter( StartLocation location )
-      {
-        this.MoveAfterCore( location );
-      }
-
-      protected override void MoveUnder( ColumnLocation location )
-      {
-        this.MoveUnderCore( location );
-      }
-
-      protected override void MoveUnder( OrphanLocation location )
-      {
-        this.MoveUnderCore( location );
-      }
-
-      protected override bool CanBeNextSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveBefore( this );
-      }
-
-      protected override bool CanBePreviousSiblingOf( IMovableLocation location )
-      {
-        return location.CanMoveAfter( this );
-      }
-
-      protected override bool CanBeParentOf( IMovableLocation location )
-      {
-        return location.CanMoveUnder( this );
-      }
-
-      protected override void SetHasNextSiblingOf( IMovableLocation location )
-      {
-        location.MoveBefore( this );
-      }
-
-      protected override void SetHasPreviousSiblingOf( IMovableLocation location )
-      {
-        location.MoveAfter( this );
-      }
-
-      protected override void SetHasParentOf( IMovableLocation location )
-      {
-        location.MoveUnder( this );
-      }
-
-      internal override int EnsureLocation()
-      {
-        return this.Owner.EnsureColumn( m_column, m_hashCode, this.Index );
-      }
-
-      private readonly TColumn m_column;
-      private readonly int m_hashCode;
-    }
-
-    #endregion
-
-    #region ColumnEntry Private Struct
-
-    [DebuggerDisplay( "Column = {Column}, Next = {Next}" )]
-    private struct ColumnEntry
-    {
-      internal ColumnEntry( TColumn column, int hashCode, int next )
-      {
-        m_column = column;
-        m_hashCode = hashCode;
-        m_next = next;
-      }
-
-      internal ColumnEntry( int next )
-        : this( default( TColumn ), 0, next )
-      {
-      }
-
-      internal TColumn Column
-      {
-        get
-        {
-          return m_column;
-        }
-      }
-
-      internal int HashCode
-      {
-        get
-        {
-          return m_hashCode;
-        }
-      }
-
-      internal int Next
-      {
-        get
-        {
-          return m_next;
-        }
-      }
-
-      internal ColumnEntry SetNext( int next )
-      {
-        return new ColumnEntry( m_column, m_hashCode, next );
-      }
-
-      private readonly TColumn m_column;
-      private readonly int m_hashCode;
-      private readonly int m_next;
-    }
-
-    #endregion
-
-    #region MarkEntry Private Struct
-
-    [DebuggerDisplay( "Start = {Start}, End = {End}, Splitter = {Splitter}, Orphan = {Orphan}" )]
-    private struct MarkEntry
-    {
-      internal static readonly MarkEntry Default = new MarkEntry( ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None );
-
-      internal MarkEntry( int start, int end, int splitter, int orphan )
-      {
-        m_start = start;
-        m_end = end;
-        m_splitter = splitter;
-        m_orphan = orphan;
-      }
-
-      internal int Start
-      {
-        get
-        {
-          return m_start;
-        }
-      }
-
-      internal int End
-      {
-        get
-        {
-          return m_end;
-        }
-      }
-
-      internal int Splitter
-      {
-        get
-        {
-          return m_splitter;
-        }
-      }
-
-      internal int Orphan
-      {
-        get
-        {
-          return m_orphan;
-        }
-      }
-
-      private readonly int m_start;
-      private readonly int m_end;
-      private readonly int m_splitter;
-      private readonly int m_orphan;
-    }
-
-    #endregion
-
-    #region RelationEntry Private Struct
-
-    [DebuggerDisplay( "Parent = {Parent}, FirstChild = {FirstChild}, Previous = {Previous}, Next = {Next}" )]
-    private struct RelationEntry
-    {
-      internal static readonly RelationEntry Default = new RelationEntry( ColumnHierarchyModel<TColumn, TStatus>.None, ColumnHierarchyModel<TColumn, TStatus>.None );
-
-      internal RelationEntry( int parent, int child, int previous, int next )
-      {
-        m_previous = previous;
-        m_next = next;
-        m_parent = parent;
-        m_child = child;
-      }
-
-      internal RelationEntry( int child, int previous, int next )
-        : this( ColumnHierarchyModel<TColumn, TStatus>.None, child, previous, next )
-      {
-      }
-
-      internal RelationEntry( int previous, int next )
-        : this( ColumnHierarchyModel<TColumn, TStatus>.None, previous, next )
-      {
-      }
-
-      internal int Parent
-      {
-        get
-        {
-          return m_parent;
-        }
-      }
-
-      internal int FirstChild
-      {
-        get
-        {
-          return m_child;
-        }
-      }
-
-      internal int Previous
-      {
-        get
-        {
-          return m_previous;
-        }
-      }
-
-      internal int Next
-      {
-        get
-        {
-          return m_next;
-        }
-      }
-
-      internal RelationEntry SetParent( int parent )
-      {
-        return new RelationEntry( parent, m_child, m_previous, m_next );
-      }
-
-      internal RelationEntry SetFirstChild( int child )
-      {
-        return new RelationEntry( m_parent, child, m_previous, m_next );
-      }
-
-      internal RelationEntry SetPrevious( int previous )
-      {
-        return new RelationEntry( m_parent, m_child, previous, m_next );
-      }
-
-      internal RelationEntry SetNext( int next )
-      {
-        return new RelationEntry( m_parent, m_child, m_previous, next );
-      }
-
-      private readonly int m_previous;
-      private readonly int m_next;
-      private readonly int m_parent;
-      private readonly int m_child;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs
deleted file mode 100644
index 3704d7fb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs
+++ /dev/null
@@ -1,1026 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_ColumnResizerThumb", Type = typeof( Thumb ) )]
-  [TemplatePart( Name = "PART_ColumnResizerThumbLeft", Type = typeof( Thumb ) )]
-  public class ColumnManagerCell : Cell, IDropTarget
-  {
-    static ColumnManagerCell()
-    {
-      UIElement.FocusableProperty.OverrideMetadata( typeof( ColumnManagerCell ), new FrameworkPropertyMetadata( false ) );
-      Cell.ReadOnlyProperty.OverrideMetadata( typeof( ColumnManagerCell ), new FrameworkPropertyMetadata( true ) );
-
-      ColumnManagerCell.IsPressedProperty = ColumnManagerCell.IsPressedPropertyKey.DependencyProperty;
-
-      ColumnManagerCell.IsBeingDraggedProperty = ColumnManagerCell.IsBeingDraggedPropertyKey.DependencyProperty;
-    }
-
-    public ColumnManagerCell()
-    {
-      this.ReadOnly = true;
-    }
-
-    #region IsPressed Read-Only Property
-
-    private static readonly DependencyPropertyKey IsPressedPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsPressed", typeof( bool ), typeof( ColumnManagerCell ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsPressedProperty;
-
-    public bool IsPressed
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnManagerCell.IsPressedProperty );
-      }
-    }
-
-    private void SetIsPressed( bool value )
-    {
-      this.SetValue( ColumnManagerCell.IsPressedPropertyKey, value );
-    }
-
-    #endregion IsPressed Read-Only Property
-
-    #region IsBeingDragged Read-Only Property
-
-    private static readonly DependencyPropertyKey IsBeingDraggedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsBeingDragged", typeof( bool ), typeof( ColumnManagerCell ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsBeingDraggedProperty;
-
-    public bool IsBeingDragged
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnManagerCell.IsBeingDraggedProperty );
-      }
-    }
-
-    private void SetIsBeingDragged( bool value )
-    {
-      this.SetValue( ColumnManagerCell.IsBeingDraggedPropertyKey, value );
-    }
-
-    #endregion IsBeingDragged Read-Only Property
-
-    #region DataGridContext Internal Read-Only Property
-
-    internal DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-    }
-
-    #endregion
-
-    #region DragSourceManager Property
-
-    // This property is required by the ColumnManagerRow when performing AnimatedColumnReordering since it must
-    // handle the Commit when the DraggedCell is dropped over the space already reserved for it in the ColumnManagerRow
-    internal DragSourceManager DragSourceManager
-    {
-      get
-      {
-        return m_dragSourceManager;
-      }
-    }
-
-    #endregion
-
-    #region ShowResizeCursor Property
-
-    internal bool ShowResizeCursor
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region AllowResize Internal Read-Only Property
-
-    internal virtual bool AllowResize
-    {
-      get
-      {
-        if( this.ParentColumn == null )
-          return false;
-
-        var dataGridContext = this.DataGridContext;
-        if( dataGridContext == null )
-          return false;
-
-        // When details are flatten, only the column at the master level may be resized.
-        if( dataGridContext.IsAFlattenDetail )
-          return false;
-
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region CanBeCollapsed Property
-
-    internal override bool CanBeCollapsed
-    {
-      get
-      {
-        // A ColumnManagerCell is always collapsible (except when it, or it's parent column, is being dragged), since it can't be edited.
-        if( ( bool )this.GetValue( ColumnManagerCell.IsBeingDraggedProperty ) )
-        {
-          return false;
-        }
-
-        var parentColumn = this.ParentColumn;
-        if( parentColumn == null )
-          return true;
-
-        return !TableflowView.GetIsBeingDraggedAnimated( parentColumn );
-
-      }
-    }
-
-    #endregion
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      this.SetupColumnResizerThumb();
-    }
-
-    protected override void InitializeCore( DataGridContext dataGridContext, Row parentRow, ColumnBase parentColumn )
-    {
-      base.InitializeCore( dataGridContext, parentRow, parentColumn );
-
-      this.SetColumnBinding( ColumnManagerCell.ContentProperty, "ParentColumn.Title" );
-      this.SetColumnBinding( ColumnManagerCell.ContentTemplateProperty, "ParentColumn.TitleTemplate" );
-      this.SetColumnBinding( ColumnManagerCell.ContentTemplateSelectorProperty, "ParentColumn.TitleTemplateSelector" );
-    }
-
-
-    protected internal override void PrepareDefaultStyleKey( ViewBase view )
-    {
-      var newThemeKey = view.GetDefaultStyleKey( typeof( ColumnManagerCell ) );
-      if( object.Equals( this.DefaultStyleKey, newThemeKey ) )
-        return;
-
-      this.DefaultStyleKey = newThemeKey;
-    }
-
-    protected internal override void PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      base.PrepareContainer( dataGridContext, item );
-      m_dataGridContext = dataGridContext;
-    }
-
-    protected internal override void ClearContainer()
-    {
-      m_dataGridContext = null;
-      base.ClearContainer();
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( this.CaptureMouse() )
-      {
-        this.SetIsPressed( true );
-
-        // Ensure the DragSourceManager is created
-        if( m_dragSourceManager == null )
-        {
-          this.SetupDragManager();
-          Debug.Assert( m_dragSourceManager != null );
-        }
-
-        if( m_dragSourceManager != null )
-        {
-          if( dataGridContext != null )
-          {
-            // Update the DropOutsideCursor since it is defined on the View
-            UIViewBase uiViewBase = dataGridContext.DataGridControl.GetView() as UIViewBase;
-
-            m_dragSourceManager.DropOutsideCursor = ( uiViewBase != null ) ? uiViewBase.CannotDropDraggedElementCursor : UIViewBase.DefaultCannotDropDraggedElementCursor;
-            m_dragSourceManager.DragStart( e );
-          }
-        }
-
-        e.Handled = true;
-      }
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      if( ( this.IsMouseCaptured ) && ( e.LeftButton == MouseButtonState.Pressed ) )
-      {
-        if( m_dragSourceManager != null )
-        {
-          m_dragSourceManager.DragMove( e );
-        }
-
-        if( !this.IsBeingDragged )
-        {
-          Rect bounds = new Rect( 0d, 0d, this.ActualWidth, this.ActualHeight );
-          this.SetIsPressed( bounds.Contains( e.GetPosition( this ) ) );
-        }
-        else
-        {
-          this.SetIsPressed( false );
-        }
-
-        e.Handled = true;
-      }
-
-      base.OnMouseMove( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      // m_dragSourceManager.ProcessMouseLeftButtonUp() will release the capture, so we need to check the IsMouseCaptured and IsPressed states before calling it.
-      bool isMouseCaptured = this.IsMouseCaptured;
-      bool isPressed = this.IsPressed;
-
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.Drop( e );
-      }
-
-      if( isMouseCaptured )
-      {
-        bool click = isPressed;
-
-        this.ReleaseMouseCapture();
-        this.SetIsPressed( false );
-
-        if( click )
-        {
-          this.DoSort( ( ( Keyboard.Modifiers & ModifierKeys.Shift ) != ModifierKeys.Shift ) );
-        }
-
-        e.Handled = true;
-      }
-
-      // Focus must be done only on mouse up ( after the sort is done ... etc )
-      // we have to focus the grid.
-
-      // We don't need to set PreserveEditorFocus to true since clicking on another element will automatically
-      // set the Cell/Row IsBeingEdited to false and try to make it leave edition.
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext != null )
-      {
-        DataGridControl dataGridControl = dataGridContext.DataGridControl;
-
-        if( ( dataGridControl != null ) && ( !dataGridControl.IsKeyboardFocusWithin ) )
-        {
-          dataGridControl.Focus();
-        }
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-
-    protected override void OnLostMouseCapture( MouseEventArgs e )
-    {
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.DragCancel( e );
-      }
-
-      if( this.IsPressed )
-      {
-        this.SetIsPressed( false );
-      }
-
-      base.OnLostMouseCapture( e );
-    }
-
-    internal bool CanDoSort()
-    {
-      ColumnManagerRow parentRow = this.ParentRow as ColumnManagerRow;
-      if( parentRow != null )
-      {
-        if( !parentRow.AllowSort )
-          return false;
-      }
-
-      DataGridContext dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return false;
-
-      // When details are flatten, only the ColumnManagerCell at the master level may do the sort.
-      if( dataGridContext.IsAFlattenDetail )
-        return false;
-
-      if( dataGridContext.SourceDetailConfiguration == null )
-      {
-        if( !dataGridContext.Items.CanSort )
-          return false;
-      }
-
-      if( !this.IsEnabled )
-        return false;
-
-      ColumnBase parentColumn = this.ParentColumn;
-      if( ( parentColumn == null ) || ( !parentColumn.AllowSort ) )
-        return false;
-
-      return true;
-    }
-
-    internal void DoSort( bool shiftUnpressed )
-    {
-      if( !this.CanDoSort() )
-        return;
-
-      DataGridContext dataGridContext = this.DataGridContext;
-      ColumnBase column = this.ParentColumn;
-
-      Debug.Assert( dataGridContext != null );
-
-      var toggleColumnSortCommand = dataGridContext.ToggleColumnSortCommand;
-
-      toggleColumnSortCommand.Execute( column, shiftUnpressed );
-    }
-
-    internal void DoResize( double newWidth, ColumnBase parentColumn )
-    {
-      if( !this.IsEnabled )
-        return;
-
-      if( !parentColumn.HasFixedWidth )
-      {
-        if( newWidth < MIN_WIDTH )
-        {
-          newWidth = MIN_WIDTH;
-        }
-
-        if( newWidth < parentColumn.MinWidth )
-        {
-          newWidth = parentColumn.MinWidth;
-        }
-
-        if( newWidth > parentColumn.MaxWidth )
-        {
-          newWidth = parentColumn.MaxWidth;
-        }
-
-        parentColumn.Width = newWidth;
-      }
-    }
-
-    internal virtual void OnColumnResizerThumbDragStarted( DragStartedEventArgs e )
-    {
-      var parentColumn = this.ParentColumn;
-      Debug.Assert( parentColumn != null );
-
-      var dataGridContext = this.DataGridContext;
-      Debug.Assert( dataGridContext != null );
-
-      m_originalWidth = parentColumn.ActualWidth;
-
-      if( TableView.GetRemoveColumnStretchingOnResize( dataGridContext ) )
-      {
-        dataGridContext.ColumnStretchingManager.DisableColumnStretching();
-      }
-    }
-
-    internal virtual void OnColumnResizerThumbDragDelta( DragDeltaEventArgs e )
-    {
-      var parentColumn = this.ParentColumn;
-      Debug.Assert( parentColumn != null );
-
-      this.DoResize( parentColumn.ActualWidth + e.HorizontalChange, parentColumn );
-    }
-
-    internal virtual void OnColumnResizerThumbDragCompleted( DragCompletedEventArgs e )
-    {
-      if( e.Canceled )
-      {
-        this.ParentColumn.Width = m_originalWidth;
-      }
-
-      m_originalWidth = -1d;
-    }
-
-    internal void ShowDropMark( RelativePoint mousePosition )
-    {
-      if( m_dropMarkAdorner == null )
-      {
-        var dataGridContext = this.DataGridContext;
-        var grid = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
-
-        Pen pen = UIViewBase.GetDropMarkPen( this );
-
-        if( ( pen == null ) && ( grid != null ) )
-        {
-          UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-          pen = uiViewBase.DefaultDropMarkPen;
-        }
-
-        DropMarkOrientation orientation = UIViewBase.GetDropMarkOrientation( this );
-
-        if( ( orientation == DropMarkOrientation.Default ) && ( grid != null ) )
-        {
-          UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-          orientation = uiViewBase.DefaultDropMarkOrientation;
-        }
-
-        m_dropMarkAdorner = new DropMarkAdorner( this, pen, orientation );
-
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-        if( adornerLayer != null )
-        {
-          adornerLayer.Add( m_dropMarkAdorner );
-        }
-      }
-
-      m_dropMarkAdorner.UpdateAlignment( mousePosition );
-    }
-
-    internal void HideDropMark()
-    {
-      if( m_dropMarkAdorner != null )
-      {
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-        if( adornerLayer != null )
-        {
-          adornerLayer.Remove( m_dropMarkAdorner );
-        }
-
-        m_dropMarkAdorner = null;
-      }
-    }
-
-    private void SetupColumnResizerThumb()
-    {
-      if( m_columnResizerThumb != null )
-      {
-        m_columnResizerThumb.DragStarted -= new DragStartedEventHandler( this.ColumnResizerThumb_DragStarted );
-        m_columnResizerThumb.DragDelta -= new DragDeltaEventHandler( this.ColumnResizerThumb_DragDelta );
-        m_columnResizerThumb.DragCompleted -= new DragCompletedEventHandler( this.ColumnResizerThumb_DragCompleted );
-        m_columnResizerThumb.QueryCursor -= new QueryCursorEventHandler( this.ColumnResizerThumb_QueryCursor );
-        m_columnResizerThumb.MouseDoubleClick -= new MouseButtonEventHandler( this.ColumnResizerThumb_MouseDoubleClick );
-
-        m_columnResizerThumb = null;
-      }
-
-      if( m_columnResizerThumbLeft != null )
-      {
-        m_columnResizerThumbLeft.DragStarted -= new DragStartedEventHandler( this.ColumnResizerThumbLeft_DragStarted );
-        m_columnResizerThumbLeft.DragDelta -= new DragDeltaEventHandler( this.ColumnResizerThumbLeft_DragDelta );
-        m_columnResizerThumbLeft.DragCompleted -= new DragCompletedEventHandler( this.ColumnResizerThumbLeft_DragCompleted );
-        m_columnResizerThumbLeft.QueryCursor -= new QueryCursorEventHandler( this.ColumnResizerThumbLeft_QueryCursor );
-        m_columnResizerThumbLeft.MouseDoubleClick -= new MouseButtonEventHandler( this.ColumnResizerThumbLeft_MouseDoubleClick );
-
-        m_columnResizerThumbLeft = null;
-      }
-
-      m_columnResizerThumb = this.GetTemplateChild( "PART_ColumnResizerThumb" ) as Thumb;
-      m_columnResizerThumbLeft = this.GetTemplateChild( "PART_ColumnResizerThumbLeft" ) as Thumb;
-
-      if( m_columnResizerThumb != null )
-      {
-        m_columnResizerThumb.DragStarted += new DragStartedEventHandler( this.ColumnResizerThumb_DragStarted );
-        m_columnResizerThumb.DragDelta += new DragDeltaEventHandler( this.ColumnResizerThumb_DragDelta );
-        m_columnResizerThumb.DragCompleted += new DragCompletedEventHandler( this.ColumnResizerThumb_DragCompleted );
-        m_columnResizerThumb.QueryCursor += new QueryCursorEventHandler( this.ColumnResizerThumb_QueryCursor );
-        m_columnResizerThumb.MouseDoubleClick += new MouseButtonEventHandler( this.ColumnResizerThumb_MouseDoubleClick );
-      }
-
-      if( m_columnResizerThumbLeft != null )
-      {
-        m_columnResizerThumbLeft.DragStarted += new DragStartedEventHandler( this.ColumnResizerThumbLeft_DragStarted );
-        m_columnResizerThumbLeft.DragDelta += new DragDeltaEventHandler( this.ColumnResizerThumbLeft_DragDelta );
-        m_columnResizerThumbLeft.DragCompleted += new DragCompletedEventHandler( this.ColumnResizerThumbLeft_DragCompleted );
-        m_columnResizerThumbLeft.QueryCursor += new QueryCursorEventHandler( this.ColumnResizerThumbLeft_QueryCursor );
-        m_columnResizerThumbLeft.MouseDoubleClick += new MouseButtonEventHandler( this.ColumnResizerThumbLeft_MouseDoubleClick );
-      }
-    }
-
-    private void SetupDragManager()
-    {
-      // Prevent any drag operation if columns layout is changing.
-      var dataGridContext = this.DataGridContext;
-      if( ( dataGridContext == null ) || ( dataGridContext.ColumnManager.IsUpdateDeferred ) )
-        return;
-
-      // We do not support DragDrop when there are no AdornerLayer because there wouldn't be any visual feedback for the operation.
-      AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-      if( adornerLayer == null )
-      {
-        // When virtualizing, the Cell is not yet in the VisualTree because it is the ParentRow's CellsHost which
-        // is reponsible of putting them in the VisualTree. We try to get the adorner from the ParentRow instead
-        if( this.ParentRow != null )
-        {
-          adornerLayer = AdornerLayer.GetAdornerLayer( this.ParentRow );
-        }
-
-        if( adornerLayer == null )
-          return;
-      }
-
-      var dataGridControl = dataGridContext.DataGridControl;
-      Debug.Assert( dataGridControl != null );
-
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.PropertyChanged -= this.DragSourceManager_PropertyChanged;
-      }
-
-      // The DataGridControl's AdornerDecoratorForDragAndDrop must be used for dragging in order to include the RenderTransform
-      // the DataGridControl may performs. This AdornerDecorator is defined in the ControlTemplate as PART_DragDropAdornerDecorator
-      if( ( dataGridControl.DragDropAdornerDecorator != null ) && ( dataGridControl.DragDropAdornerDecorator.AdornerLayer != null ) )
-      {
-        m_dragSourceManager = new ColumnReorderingDragSourceManager( this, dataGridControl.DragDropAdornerDecorator.AdornerLayer, dataGridControl, this.ParentRow.LevelCache );
-      }
-      else
-      {
-        m_dragSourceManager = new ColumnReorderingDragSourceManager( this, null, dataGridControl, this.ParentRow.LevelCache );
-      }
-
-      m_dragSourceManager.PropertyChanged += this.DragSourceManager_PropertyChanged;
-
-      // Create bindings to ViewProperties for AutoScroll Properties
-      Binding binding = new Binding();
-      binding.Path = new PropertyPath( "(0).(1)", DataGridControl.DataGridContextProperty, TableView.AutoScrollIntervalProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.Source = this;
-      binding.Converter = new MillisecondsConverter();
-      BindingOperations.SetBinding( m_dragSourceManager, DragSourceManager.AutoScrollIntervalProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( "(0).(1)", DataGridControl.DataGridContextProperty, TableView.AutoScrollThresholdProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.Source = this;
-      BindingOperations.SetBinding( m_dragSourceManager, DragSourceManager.AutoScrollThresholdProperty, binding );
-    }
-
-    private void DragSourceManager_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName == "IsDragging" )
-      {
-        this.SetIsBeingDragged( m_dragSourceManager.IsDragging );
-      }
-    }
-
-    private void ColumnResizerThumb_DragStarted( object sender, DragStartedEventArgs e )
-    {
-      if( !this.ShowResizeCursor || !this.AllowResize )
-        return;
-
-      this.OnColumnResizerThumbDragStarted( e );
-    }
-
-    private void ColumnResizerThumb_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      if( !this.ShowResizeCursor || !this.AllowResize )
-        return;
-
-      this.OnColumnResizerThumbDragDelta( e );
-    }
-
-    private void ColumnResizerThumb_DragCompleted( object sender, DragCompletedEventArgs e )
-    {
-      if( !this.ShowResizeCursor || !this.AllowResize )
-        return;
-
-      this.OnColumnResizerThumbDragCompleted( e );
-    }
-
-    private void ColumnResizerThumb_MouseDoubleClick( object sender, MouseButtonEventArgs e )
-    {
-      var parentColumn = this.ParentColumn;
-      if( ( parentColumn == null ) || !this.ShowResizeCursor || !this.AllowResize )
-        return;
-
-      e.Handled = true;
-
-      double fittedWidth = parentColumn.GetFittedWidth();
-      if( fittedWidth != -1 )
-      {
-        parentColumn.Width = fittedWidth;
-      }
-    }
-
-    private void ColumnResizerThumb_QueryCursor( object sender, QueryCursorEventArgs e )
-    {
-      var parentColumn = this.ParentColumn;
-      if( parentColumn == null )
-        return;
-
-      var dataGridContext = this.DataGridContext;
-
-      bool showResizeCursor = false;
-      if( this.AllowResize )
-      {
-        // Don't disable resizing if ColumnStretching can be disabled by an end-user resize.
-        showResizeCursor = ( !parentColumn.HasFixedWidth )
-                        || ( ( dataGridContext != null ) && TableView.GetRemoveColumnStretchingOnResize( dataGridContext ) );
-      }
-
-      this.ShowResizeCursor = showResizeCursor;
-      if( this.ShowResizeCursor )
-      {
-        UIViewBase viewBase = ( dataGridContext != null ) ? dataGridContext.DataGridControl.GetView() as UIViewBase : null;
-
-        e.Cursor = ( viewBase != null ) ? viewBase.ColumnResizeWestEastCursor : UIViewBase.DefaultColumnResizeWestEastCursor;
-        e.Handled = true;
-      }
-    }
-
-    private ColumnManagerCell GetPreviousVisibleColumnManagerCell()
-    {
-      var parentColumn = this.ParentColumn;
-      if( parentColumn == null )
-        return null;
-
-      var previousVisibleColumn = parentColumn.PreviousVisibleColumn;
-      if( previousVisibleColumn == null )
-        return null;
-
-      return ( ColumnManagerCell )this.ParentRow.Cells[ previousVisibleColumn ];
-    }
-
-    private void ColumnResizerThumbLeft_QueryCursor( object sender, QueryCursorEventArgs e )
-    {
-      var previousColumnManagerCell = this.GetPreviousVisibleColumnManagerCell();
-      if( previousColumnManagerCell == null )
-        return;
-
-      previousColumnManagerCell.ColumnResizerThumb_QueryCursor( previousColumnManagerCell, e );
-    }
-
-    private void ColumnResizerThumbLeft_DragStarted( object sender, DragStartedEventArgs e )
-    {
-      var previousColumnManagerCell = this.GetPreviousVisibleColumnManagerCell();
-      if( previousColumnManagerCell == null )
-        return;
-
-      previousColumnManagerCell.ColumnResizerThumb_DragStarted( previousColumnManagerCell, e );
-    }
-
-    private void ColumnResizerThumbLeft_MouseDoubleClick( object sender, MouseButtonEventArgs e )
-    {
-      var previousColumnManagerCell = this.GetPreviousVisibleColumnManagerCell();
-      if( previousColumnManagerCell == null )
-        return;
-
-      previousColumnManagerCell.ColumnResizerThumb_MouseDoubleClick( previousColumnManagerCell, e );
-    }
-
-    private void ColumnResizerThumbLeft_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      var previousColumnManagerCell = this.GetPreviousVisibleColumnManagerCell();
-      if( previousColumnManagerCell == null )
-        return;
-
-      previousColumnManagerCell.ColumnResizerThumb_DragDelta( previousColumnManagerCell, e );
-    }
-
-    private void ColumnResizerThumbLeft_DragCompleted( object sender, DragCompletedEventArgs e )
-    {
-      var previousColumnManagerCell = this.GetPreviousVisibleColumnManagerCell();
-      if( previousColumnManagerCell == null )
-        return;
-
-      previousColumnManagerCell.ColumnResizerThumb_DragCompleted( previousColumnManagerCell, e );
-    }
-
-    private void SetColumnBinding( DependencyProperty targetProperty, string sourceProperty )
-    {
-      if( BindingOperations.GetBinding( this, targetProperty ) != null )
-        return;
-
-      var binding = ColumnManagerCell.CreateColumnBinding( sourceProperty );
-      if( binding != null )
-      {
-        BindingOperations.SetBinding( this, targetProperty, binding );
-      }
-      else
-      {
-        BindingOperations.ClearBinding( this, targetProperty );
-      }
-    }
-
-    private static Binding CreateColumnBinding( string sourceProperty )
-    {
-      var binding = new Binding();
-      binding.Path = new PropertyPath( sourceProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-      binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-
-      return binding;
-    }
-
-    #region IDropTarget Members
-
-    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var draggedCell = draggedElement as ColumnManagerCell;
-      if( ( draggedCell == null ) || ( this == draggedCell ) )
-        return false;
-
-      var parentRow = this.ParentRow as ColumnManagerRow;
-      if( ( parentRow == null ) || !parentRow.AllowColumnReorder )
-        return false;
-
-      var draggedDetailContext = draggedCell.DataGridContext;
-      var sourceDetailContext = this.DataGridContext;
-      Debug.Assert( ( draggedDetailContext != null ) && ( sourceDetailContext != null ) );
-
-      if( ( sourceDetailContext.SourceDetailConfiguration != draggedDetailContext.SourceDetailConfiguration ) ||
-          ( sourceDetailContext.GroupLevelDescriptions != draggedDetailContext.GroupLevelDescriptions ) )
-        return false;
-
-      if( !ColumnManagerCell.CanMove( draggedCell ) )
-        return false;
-
-      var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
-      if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
-      {
-        if( !manager.CanReorder( draggedCell, this, mousePosition ) )
-          return false;
-      }
-      else
-      {
-        var relativePosition = mousePosition.GetPoint( this );
-        var moveBefore = ( relativePosition.X <= this.ActualWidth / 2d );
-
-        if( moveBefore )
-        {
-          if( !draggedCell.CanMoveBefore( this.ParentColumn ) )
-            return false;
-        }
-        else
-        {
-          if( !draggedCell.CanMoveAfter( this.ParentColumn ) )
-            return false;
-        }
-      }
-
-      return true;
-    }
-
-    void IDropTarget.DragEnter( UIElement draggedElement )
-    {
-    }
-
-    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var draggedCell = draggedElement as ColumnManagerCell;
-      if( draggedCell != null )
-      {
-        var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
-
-        // No need for drop mark when performing animated Column reordering
-        if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
-          return;
-      }
-
-      this.ShowDropMark( mousePosition );
-    }
-
-    void IDropTarget.DragLeave( UIElement draggedElement )
-    {
-      var draggedCell = draggedElement as ColumnManagerCell;
-      if( draggedCell != null )
-      {
-        var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
-
-        // No need for drop mark when performing animated Column reordering
-        if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
-          return;
-      }
-
-      this.HideDropMark();
-    }
-
-    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var draggedCell = draggedElement as ColumnManagerCell;
-      if( draggedCell == null )
-        return;
-
-      this.ProcessDrop( draggedCell, mousePosition );
-    }
-
-    internal void ProcessDrop( ColumnManagerCell draggedCell, RelativePoint mousePosition )
-    {
-      var manager = default( ColumnReorderingDragSourceManager );
-
-      if( draggedCell != null )
-      {
-        manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
-      }
-
-      if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
-      {
-        manager.CommitReordering();
-      }
-      else
-      {
-        this.HideDropMark();
-
-        var dataGridContext = this.DataGridContext;
-        Debug.Assert( dataGridContext != null );
-
-        if( dataGridContext != null )
-        {
-          var targetColumn = draggedCell.ParentColumn;
-          var pivotColumn = this.ParentColumn;
-
-          Debug.Assert( targetColumn != null );
-          Debug.Assert( pivotColumn != null );
-
-          var relativePosition = mousePosition.GetPoint( this );
-          var offset = Point.Subtract( mousePosition.GetPoint( draggedCell ), relativePosition );
-          var moveBefore = true;
-
-          // We assumme the cells are layouted horizontally.
-          if( Math.Abs( offset.X ) >= Math.Abs( offset.Y ) )
-          {
-            // Consider the case where the columns are layouted from left to right in reverse order.
-            var reverse = ( ( offset.X > 0d ) == ( targetColumn.VisiblePosition >= pivotColumn.VisiblePosition ) );
-
-            moveBefore = ( ( relativePosition.X < this.ActualWidth / 2d ) != reverse );
-          }
-          // We assume the cells are layouted vertically.
-          else
-          {
-            // Consider the case where the columns are layouted from top to bottom in reverse order.
-            var reverse = ( ( offset.Y > 0d ) == ( targetColumn.VisiblePosition >= pivotColumn.VisiblePosition ) );
-
-            moveBefore = ( ( relativePosition.Y < this.ActualHeight / 2d ) != reverse );
-          }
-
-          var success = ( moveBefore )
-                          ? dataGridContext.MoveColumnBefore( targetColumn, pivotColumn )
-                          : dataGridContext.MoveColumnAfter( targetColumn, pivotColumn );
-
-          Debug.Assert( success );
-        }
-      }
-    }
-
-    internal bool CanMoveBefore( ColumnBase column )
-    {
-      // A column that is locked cannot move.
-      var parentColumn = this.ParentColumn;
-      if( ( parentColumn == null ) || ( parentColumn.DraggableStatus != ColumnDraggableStatus.Draggable ) )
-        return false;
-
-      // The cell cannot move before a column that is locked in the first position.
-      if( ( column == null ) || ( column.DraggableStatus == ColumnDraggableStatus.FirstUndraggable ) )
-        return false;
-
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return false;
-
-      if( dataGridContext.AreDetailsFlatten )
-      {
-        // Column reordering is not allowed for a ColumnManagerCell that is located at a detail level
-        // when details are flatten.
-        if( dataGridContext.SourceDetailConfiguration != null )
-          return false;
-
-        // The main column is always the first column when details are flatten.
-        if( column.IsMainColumn )
-          return false;
-      }
-
-      return true;
-    }
-
-    internal bool CanMoveAfter( ColumnBase column )
-    {
-      // A column that is locked cannot move.
-      var parentColumn = this.ParentColumn;
-      if( ( parentColumn == null ) || ( parentColumn.DraggableStatus != ColumnDraggableStatus.Draggable ) )
-        return false;
-
-      // The cell cannot move after a column that is locked in the last position.
-      if( ( column == null ) || ( column.DraggableStatus == ColumnDraggableStatus.LastUndraggable ) )
-        return false;
-
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return false;
-
-      if( dataGridContext.AreDetailsFlatten )
-      {
-        // Column reordering is not allowed for a ColumnManagerCell that is located at a detail level
-        // when details are flatten.
-        if( dataGridContext.SourceDetailConfiguration != null )
-          return false;
-
-        // The main column is not allowed to be reordered when details are flatten.
-        if( column.IsMainColumn )
-          return false;
-      }
-
-      return true;
-    }
-
-    internal static bool CanMove( ColumnManagerCell cell )
-    {
-      if( cell == null )
-        return false;
-
-      var dataGridContext = cell.DataGridContext;
-      if( dataGridContext == null )
-        return false;
-
-      // A column that is locked cannot move.
-      var parentColumn = cell.ParentColumn;
-      if( ( parentColumn == null ) || ( parentColumn.DraggableStatus != ColumnDraggableStatus.Draggable ) )
-        return false;
-
-      if( dataGridContext.AreDetailsFlatten )
-      {
-        // Column reordering is not allowed for a ColumnManagerCell that is located at a detail level
-        // when details are flatten.
-        if( dataGridContext.SourceDetailConfiguration != null )
-          return false;
-
-        // The main column is not allowed to be reordered when details are flatten.
-        if( parentColumn.IsMainColumn )
-          return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    // Will remain null when no AdornerLayer is found.
-    private ColumnReorderingDragSourceManager m_dragSourceManager;
-
-    private DropMarkAdorner m_dropMarkAdorner;
-
-    private DataGridContext m_dataGridContext; // = null;
-
-    private const double MIN_WIDTH = 8d;
-    private double m_originalWidth = -1d;
-    private Thumb m_columnResizerThumb; // = null
-    private Thumb m_columnResizerThumbLeft; // null
-
-    #region MillisecondsConverter Private Class
-
-    private sealed class MillisecondsConverter : IValueConverter
-    {
-      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        return TimeSpan.FromMilliseconds( System.Convert.ToDouble( value ) );
-      }
-
-      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs
deleted file mode 100644
index 9f19429b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs
+++ /dev/null
@@ -1,346 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Utils.Wpf;
-using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class ColumnManagerRow : Row, IDropTarget
-  {
-    static ColumnManagerRow()
-    {
-      Row.NavigationBehaviorProperty.OverrideMetadata( typeof( ColumnManagerRow ), new FrameworkPropertyMetadata( NavigationBehavior.None ) );
-      FrameworkElement.ContextMenuProperty.OverrideMetadata( typeof( ColumnManagerRow ), new FrameworkPropertyMetadata( null, new CoerceValueCallback( ColumnManagerRow.CoerceContextMenu ) ) );
-    }
-
-    public ColumnManagerRow()
-    {
-      //ensure that all ColumnManagerRows are ReadOnly
-      this.ReadOnly = true; //This is safe to perform since there is nowhere a callback installed on the DP... 
-
-      //ensure that all ColumnManagerRows are not navigable
-      this.NavigationBehavior = NavigationBehavior.None; //This is safe to perform since there is nowhere a callback installed on the DP...
-    }
-
-    #region AllowColumnReorder Property
-
-    public static readonly DependencyProperty AllowColumnReorderProperty = DependencyProperty.Register(
-      "AllowColumnReorder",
-      typeof( bool ),
-      typeof( ColumnManagerRow ),
-      new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( ColumnManagerRow.OnAllowColumnReorderChanged ) ) );
-
-    public bool AllowColumnReorder
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnManagerRow.AllowColumnReorderProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnManagerRow.AllowColumnReorderProperty, value );
-      }
-    }
-
-    private static void OnAllowColumnReorderChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as ColumnManagerRow;
-      if( self == null )
-        return;
-
-      var configuration = self.Configuration;
-      if( configuration == null )
-        return;
-
-      configuration.AllowColumnReorder = ( bool )e.NewValue;
-    }
-
-    #endregion
-
-    #region AllowColumnResize Property
-
-    public static readonly DependencyProperty AllowColumnResizeProperty = DependencyProperty.Register(
-      "AllowColumnResize",
-      typeof( bool ),
-      typeof( ColumnManagerRow ),
-      new UIPropertyMetadata( true ) );
-
-    public bool AllowColumnResize
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnManagerRow.AllowColumnResizeProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnManagerRow.AllowColumnResizeProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AllowSort Property
-
-    public static readonly DependencyProperty AllowSortProperty = DependencyProperty.Register(
-      "AllowSort",
-      typeof( bool ),
-      typeof( ColumnManagerRow ),
-      new UIPropertyMetadata( true ) );
-
-    public bool AllowSort
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnManagerRow.AllowSortProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnManagerRow.AllowSortProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsUnfocusable Property
-
-    internal override bool IsUnfocusable
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region Configuration Internal Property
-
-    internal ColumnManagerRowConfiguration Configuration
-    {
-      get
-      {
-        return m_configuration;
-      }
-      set
-      {
-        if( value == m_configuration )
-          return;
-
-        if( m_configuration != null )
-        {
-          PropertyChangedEventManager.RemoveListener( m_configuration, this, string.Empty );
-        }
-
-        m_configuration = value;
-
-        this.PushAllowColumnReorder();
-
-        if( m_configuration != null )
-        {
-          PropertyChangedEventManager.AddListener( m_configuration, this, string.Empty );
-        }
-
-        this.UpdateAllowColumnReorder();
-      }
-    }
-
-    private ColumnManagerRowConfiguration m_configuration;
-
-    #endregion
-
-
-    protected override Cell CreateCell( ColumnBase column )
-    {
-      return new ColumnManagerCell();
-    }
-
-    protected override bool IsValidCellType( Cell cell )
-    {
-      return ( cell is ColumnManagerCell );
-    }
-
-    protected internal override void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      var currentThemeKey = view.GetDefaultStyleKey( typeof( ColumnManagerRow ) );
-      if( currentThemeKey.Equals( this.DefaultStyleKey ) )
-        return;
-
-      this.DefaultStyleKey = currentThemeKey;
-    }
-
-    protected override void PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      base.PrepareContainer( dataGridContext, item );
-
-      this.Configuration = dataGridContext.ColumnManagerRowConfiguration;
-    }
-
-    protected override void ClearContainer()
-    {
-      this.Configuration = null;
-
-      base.ClearContainer();
-    }
-
-    protected override void OnPreviewMouseLeftButtonDown( System.Windows.Input.MouseButtonEventArgs e )
-    {
-      //Do not call the base class implementation to prevent SetCurrent from being called... 
-      //This is because we do not want the ColumnManager Row to be selectable through the Mouse
-    }
-
-    protected override void OnMouseRightButtonUp( MouseButtonEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      base.OnMouseRightButtonUp( e );
-    }
-
-    private static object CoerceContextMenu( DependencyObject sender, object value )
-    {
-      if( value == null )
-        return value;
-
-      var self = sender as ColumnManagerRow;
-      if( ( self == null ) )
-        return value;
-
-      return null;
-    }
-
-    private void PushAllowColumnReorder()
-    {
-      var configuration = this.Configuration;
-      if( configuration == null )
-        return;
-
-      if( DependencyPropertyHelper.GetValueSource( this, ColumnManagerRow.AllowColumnReorderProperty ).BaseValueSource == BaseValueSource.Default )
-        return;
-
-      configuration.AllowColumnReorder = this.AllowColumnReorder;
-    }
-
-    private void UpdateAllowColumnReorder()
-    {
-      var configuration = this.Configuration;
-      if( configuration == null )
-        return;
-
-      this.AllowColumnReorder = configuration.AllowColumnReorder;
-    }
-
-    private void OnConfigurationPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var propertyName = e.PropertyName;
-
-      if( string.IsNullOrEmpty( propertyName ) || propertyName == ColumnManagerRow.AllowColumnReorderProperty.Name )
-      {
-        this.UpdateAllowColumnReorder();
-      }
-    }
-
-    #region IDropTarget Members
-
-    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var draggedCell = draggedElement as ColumnManagerCell;
-      if( draggedCell == null )
-        return false;
-
-      var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
-      if( ( manager != null ) && manager.IsAnimatedColumnReorderingEnabled && draggedCell.IsBeingDragged )
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-        if( ( dataGridContext == null ) || !dataGridContext.Columns.Contains( draggedCell.ParentColumn ) )
-          return false;
-
-        // We are not interested by the y-axis.
-        var relativePoint = mousePosition.GetPoint( this );
-        var xPosition = new RelativePoint( this, new Point( relativePoint.X, this.ActualHeight / 2d ) );
-
-        var targetCell = ( from dropTarget in manager.GetDropTargetsAtPoint( xPosition )
-                           let dropCell = dropTarget as ColumnManagerCell
-                           where ( dropCell != null )
-                           select dropCell ).FirstOrDefault();
-        if( ( targetCell == null ) || ( targetCell == draggedCell ) || ( ( IDropTarget )targetCell ).CanDropElement( draggedElement, xPosition ) )
-          return true;
-      }
-
-      return false;
-    }
-
-    void IDropTarget.DragEnter( UIElement draggedElement )
-    {
-    }
-
-    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
-    {
-    }
-
-    void IDropTarget.DragLeave( UIElement draggedElement )
-    {
-    }
-
-    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var draggedCell = draggedElement as ColumnManagerCell;
-      if( draggedCell == null )
-        return;
-
-      var manager = draggedCell.DragSourceManager as ColumnReorderingDragSourceManager;
-      if( ( manager != null ) && ( manager.IsAnimatedColumnReorderingEnabled ) )
-      {
-        manager.CommitReordering();
-      }
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    protected override bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      var result = base.OnReceiveWeakEvent( managerType, sender, e );
-
-      if( typeof( PropertyChangedEventManager ) == managerType )
-      {
-        if( sender == m_configuration )
-        {
-          this.OnConfigurationPropertyChanged( ( PropertyChangedEventArgs )e );
-        }
-      }
-      else
-      {
-        return result;
-      }
-
-      return true;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRowConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRowConfiguration.cs
deleted file mode 100644
index 81fbab68..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRowConfiguration.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ColumnManagerRowConfiguration : DependencyObject, INotifyPropertyChanged
-  {
-    #region AllowColumnReorder Property
-
-    public static readonly DependencyProperty AllowColumnReorderProperty = DependencyProperty.Register(
-      "AllowColumnReorder",
-      typeof( bool ),
-      typeof( ColumnManagerRowConfiguration ),
-      new UIPropertyMetadata( true ) );
-
-    public bool AllowColumnReorder
-    {
-      get
-      {
-        return ( bool )this.GetValue( ColumnManagerRowConfiguration.AllowColumnReorderProperty );
-      }
-      set
-      {
-        this.SetValue( ColumnManagerRowConfiguration.AllowColumnReorderProperty, value );
-      }
-    }
-
-    #endregion
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-      this.OnPropertyChanged( e.Property.Name );
-    }
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected virtual void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSortCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSortCommand.cs
deleted file mode 100644
index 10ebae03..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSortCommand.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class ColumnSortCommand : ColumnCommand
-  {
-    protected SynchronizationContext StartSynchronizing( SortDescriptionsSyncContext context )
-    {
-      return new SynchronizationContext( context );
-    }
-
-    protected bool TryDeferResort( DetailConfiguration detailConfiguration, out IDisposable defer )
-    {
-      defer = null;
-
-      return ( detailConfiguration != null )
-          && ( this.TryDeferResort( detailConfiguration.SortDescriptions, out defer ) );
-    }
-
-    protected bool TryDeferResort( SortDescriptionCollection sortDescriptions, out IDisposable defer )
-    {
-      var dataGridSortDescriptions = sortDescriptions as DataGridSortDescriptionCollection;
-      if( dataGridSortDescriptions != null )
-      {
-        defer = dataGridSortDescriptions.DeferResort();
-      }
-      else
-      {
-        defer = null;
-      }
-
-      return ( defer != null );
-    }
-
-    protected IDisposable DeferResortHelper(
-      IEnumerable itemsSourceCollection,
-      CollectionView collectionView )
-    {
-      var dataGridCollectionView = itemsSourceCollection as DataGridCollectionViewBase;
-      if( dataGridCollectionView != null )
-        return dataGridCollectionView.DataGridSortDescriptions.DeferResort();
-
-      ColumnSortCommand.ThrowIfNull( collectionView, "collectionView" );
-
-      return collectionView.DeferRefresh();
-    }
-
-    #region SynchronizationContext Protected Class
-
-    protected sealed class SynchronizationContext : IDisposable
-    {
-      #region Constructor
-
-      internal SynchronizationContext( SortDescriptionsSyncContext context )
-      {
-        if( context == null )
-          throw new ArgumentNullException( "context" );
-
-        m_context = context;
-        m_isOwner = !context.ProcessingSortSynchronization;
-
-        context.ProcessingSortSynchronization = true;
-      }
-
-      #endregion
-
-      #region Own Property
-
-      public bool Own
-      {
-        get
-        {
-          var context = m_context;
-
-          return ( m_isOwner )
-              && ( context != null )
-              && ( context.ProcessingSortSynchronization );
-        }
-      }
-
-      #endregion
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        var context = m_context;
-        if( context == null )
-          return;
-
-        m_context = null;
-
-        if( m_isOwner )
-        {
-          context.ProcessingSortSynchronization = false;
-        }
-      }
-
-      ~SynchronizationContext()
-      {
-        this.Dispose( false );
-      }
-
-      #endregion
-
-      #region Private Fields
-
-      private SortDescriptionsSyncContext m_context;
-      private bool m_isOwner;
-
-      #endregion
-    }
-
-    #endregion
-
-    #region Disposer Protected Class
-
-    protected sealed class Disposer : IDisposable
-    {
-      #region Constants
-
-      private static readonly int DisposableTypeCount = Enum.GetValues( typeof( DisposableType ) ).Length;
-
-      #endregion
-
-      public Disposer()
-      {
-        m_disposable = new Stack<IDisposable>[ Disposer.DisposableTypeCount ];
-      }
-
-      public void Add( IDisposable disposable, DisposableType disposableType )
-      {
-        if( m_disposed )
-          throw new ObjectDisposedException( "Disposer" );
-
-        if( !Enum.IsDefined( typeof( DisposableType ), disposableType ) )
-          throw new ArgumentException( "disposableType" );
-
-        if( disposable == null )
-          return;
-
-        int index = Disposer.GetIndex( disposableType );
-        var collection = m_disposable[ index ];
-
-        if( collection == null )
-        {
-          collection = new Stack<IDisposable>();
-          m_disposable[ index ] = collection;
-        }
-
-        collection.Push( disposable );
-      }
-
-      private static int GetIndex( DisposableType value )
-      {
-        int index = System.Convert.ToInt32( value );
-        Debug.Assert( ( index >= 0 ) && ( index < Disposer.DisposableTypeCount ) );
-
-        return index;
-      }
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        if( m_disposed )
-          return;
-
-        m_disposed = true;
-
-        Exception exception = null;
-
-        for( int i = m_disposable.Length - 1; i >= 0; i-- )
-        {
-          var disposable = m_disposable[ i ];
-          if( disposable == null )
-            continue;
-
-          while( disposable.Count > 0 )
-          {
-            try
-            {
-              disposable.Pop().Dispose();
-            }
-            catch( Exception e )
-            {
-              if( exception == null )
-              {
-                exception = e;
-              }
-            }
-          }
-
-          m_disposable[ i ] = null;
-        }
-
-        if( exception != null )
-          throw new DataGridInternalException( exception );
-      }
-
-      ~Disposer()
-      {
-        this.Dispose( false );
-      }
-
-      #endregion
-
-      #region Private Fields
-
-      private readonly Stack<IDisposable>[] m_disposable;
-      private bool m_disposed;
-
-      #endregion
-    }
-
-    #endregion
-
-    #region DisposableType Protected Nested Type
-
-    protected enum DisposableType
-    {
-      DeferRestoreState = 0,
-      DeferResort = 1,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSynchronizationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSynchronizationManager.cs
deleted file mode 100644
index 8e8ded1f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnSynchronizationManager.cs
+++ /dev/null
@@ -1,1126 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Data;
-using Xceed.Utils.Wpf;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ColumnSynchronizationManager : IWeakEventListener
-  {
-    #region Constructor
-
-    internal ColumnSynchronizationManager( DetailConfiguration configuration )
-    {
-      if( configuration == null )
-        throw new ArgumentNullException( "configuration" );
-
-      m_detailConfiguration = configuration;
-      m_itemPropertyMap = configuration.ItemPropertyMap;
-
-      PropertyChangedEventManager.AddListener( configuration, this, string.Empty );
-      MappingChangedEventManager.AddListener( m_itemPropertyMap, this );
-
-      using( this.DeferSynchronization() )
-      {
-        this.DataGridControl = configuration.DataGridControl;
-        this.DetailColumnManager = configuration.ColumnManager;
-
-        Debug.Assert( m_detailColumnManager != null );
-      }
-    }
-
-    #endregion
-
-    #region DataGridControl Private Property
-
-    private DataGridControl DataGridControl
-    {
-      get
-      {
-        return m_dataGridControl;
-      }
-      set
-      {
-        if( value == m_dataGridControl )
-          return;
-
-        using( this.DeferSynchronization() )
-        {
-          if( m_dataGridControl != null )
-          {
-            ViewChangedEventManager.RemoveListener( m_dataGridControl, this );
-          }
-
-          m_dataGridControl = value;
-
-          if( m_dataGridControl != null )
-          {
-            ViewChangedEventManager.AddListener( m_dataGridControl, this );
-
-            this.MasterColumnManager = m_dataGridControl.DataGridContext.ColumnManager;
-          }
-          else
-          {
-            this.MasterColumnManager = null;
-          }
-
-          m_isSynchronizationValid = false;
-        }
-      }
-    }
-
-    private DataGridControl m_dataGridControl;
-
-    #endregion
-
-    #region MasterColumnManager Private Property
-
-    private ColumnHierarchyManager MasterColumnManager
-    {
-      get
-      {
-        return m_masterColumnManager;
-      }
-      set
-      {
-        if( value == m_masterColumnManager )
-          return;
-
-        if( m_masterColumnManager != null )
-        {
-          ColumnsLayoutChangedEventManager.RemoveListener( m_masterColumnManager, this );
-          CollectionChangedEventManager.RemoveListener( m_masterColumnManager.Columns, this );
-          PropertyChangedEventManager.RemoveListener( m_masterColumnManager.Columns, this, ColumnCollection.MainColumnPropertyName );
-        }
-
-        m_masterColumnManager = value;
-
-        if( m_masterColumnManager != null )
-        {
-          ColumnsLayoutChangedEventManager.AddListener( m_masterColumnManager, this );
-          CollectionChangedEventManager.AddListener( m_masterColumnManager.Columns, this );
-          PropertyChangedEventManager.AddListener( m_masterColumnManager.Columns, this, ColumnCollection.MainColumnPropertyName );
-        }
-      }
-    }
-
-    private ColumnHierarchyManager m_masterColumnManager;
-
-    #endregion
-
-    #region DetailColumnManager Private Property
-
-    private ColumnHierarchyManager DetailColumnManager
-    {
-      get
-      {
-        return m_detailColumnManager;
-      }
-      set
-      {
-        if( value == m_detailColumnManager )
-          return;
-
-        if( m_detailColumnManager != null )
-        {
-          ColumnsLayoutChangedEventManager.RemoveListener( m_detailColumnManager, this );
-          CollectionChangedEventManager.RemoveListener( m_detailColumnManager.Columns, this );
-        }
-
-        m_detailColumnManager = value;
-
-        if( m_detailColumnManager != null )
-        {
-          ColumnsLayoutChangedEventManager.AddListener( m_detailColumnManager, this );
-          CollectionChangedEventManager.AddListener( m_detailColumnManager.Columns, this );
-        }
-      }
-    }
-
-    private ColumnHierarchyManager m_detailColumnManager;
-
-    #endregion
-
-    #region IsSynchronizationReady Private Property
-
-    private bool IsSynchronizationReady
-    {
-      get
-      {
-        return ( m_masterColumnManager != null )
-            && ( m_detailConfiguration.DetailDescription != null );
-      }
-    }
-
-    #endregion
-
-    #region AreDetailsFlatten Private Property
-
-    private bool AreDetailsFlatten
-    {
-      get
-      {
-        return ( m_dataGridControl != null )
-            && ( m_dataGridControl.AreDetailsFlatten );
-      }
-    }
-
-    #endregion
-
-    #region DeferSynchronization Methods
-
-    private IDisposable DeferSynchronization()
-    {
-      return new DeferredDisposable( new DeferState( this ) );
-    }
-
-    private bool IsSynchronizationDeferred
-    {
-      get
-      {
-        return ( m_deferSynchronizationCount != 0 );
-      }
-    }
-
-    private int m_deferSynchronizationCount; //0
-    private bool m_isSynchronizationValid = true;
-
-    #endregion
-
-    internal void Refresh()
-    {
-      if( m_isUpdatingColumns )
-        return;
-
-      m_isSynchronizationValid = false;
-
-      this.UpdateColumns();
-    }
-
-    private void UpdateColumns()
-    {
-      if( this.IsSynchronizationDeferred || m_isSynchronizationValid || m_isUpdatingColumns )
-        return;
-
-      try
-      {
-        m_isUpdatingColumns = true;
-        m_isSynchronizationValid = true;
-
-        if( this.IsSynchronizationReady && this.AreDetailsFlatten )
-        {
-          Debug.Assert( m_detailColumnManager != null );
-
-          using( m_detailColumnManager.DeferUpdate() )
-          {
-            var keys = new HashSet<SynchronizationKey>( this.GetNewKeys() );
-
-            foreach( var key in m_pairedColumns.Keys.Except( keys ).ToArray() )
-            {
-              this.Desynchronize( key );
-            }
-
-            foreach( var key in keys.OrderBy( item => item.OrderKey ) )
-            {
-              this.Synchronize( key );
-            }
-
-            this.SetMainColumn();
-          }
-        }
-        else
-        {
-          this.Desynchronize();
-        }
-      }
-      finally
-      {
-        m_isUpdatingColumns = false;
-      }
-    }
-
-    private void Synchronize( SynchronizationKey key )
-    {
-      if( key == null )
-        return;
-
-      var collection = m_pairedColumns;
-
-      SynchronizationEntry pair;
-      if( !collection.TryGetValue( key, out pair ) )
-      {
-        if( key.MasterColumn != null )
-        {
-          pair = new BoundColumn( this, key );
-        }
-        else
-        {
-          pair = new UnboundColumn( this, key );
-        }
-
-        collection.Add( key, pair );
-      }
-
-      pair.Synchronize();
-    }
-
-    private void Desynchronize( SynchronizationKey key )
-    {
-      if( key == null )
-        return;
-
-      var collection = m_pairedColumns;
-
-      SynchronizationEntry pair;
-      if( !collection.TryGetValue( key, out pair ) )
-        return;
-
-      collection.Remove( key );
-      pair.Desynchronize();
-    }
-
-    private void Desynchronize()
-    {
-      var collection = m_pairedColumns;
-      while( collection.Count > 0 )
-      {
-        this.Desynchronize( collection.First().Key );
-      }
-    }
-
-    private void SetMainColumn()
-    {
-      if( !this.IsSynchronizationReady || !this.AreDetailsFlatten )
-        return;
-
-      Debug.Assert( m_detailColumnManager != null );
-
-      var detailColumns = m_detailColumnManager.Columns;
-      var detailColumn = default( ColumnBase );
-
-      var mainColumn = m_masterColumnManager.Columns.MainColumn;
-      if( mainColumn != null )
-      {
-        if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( m_itemPropertyMap, detailColumns, mainColumn, out detailColumn ) )
-        {
-          detailColumn = null;
-        }
-      }
-
-      detailColumns.MainColumn = detailColumn;
-    }
-
-    private IEnumerable<SynchronizationKey> GetNewKeys()
-    {
-      foreach( var detailColumn in m_detailColumnManager.Columns )
-      {
-        var masterColumn = default( ColumnBase );
-
-        if( !DataGridItemPropertyMapHelper.TryGetMasterColumn( m_itemPropertyMap, m_masterColumnManager.Columns, detailColumn, out masterColumn ) )
-        {
-          masterColumn = null;
-        }
-
-        yield return new SynchronizationKey( masterColumn, detailColumn, m_detailConfiguration );
-      }
-    }
-
-    private void OnViewChanged()
-    {
-      this.Refresh();
-    }
-
-    private void OnMasterColumnsPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var propertyName = e.PropertyName;
-      bool mayHaveChanged = string.IsNullOrEmpty( propertyName );
-
-      if( mayHaveChanged || ( propertyName == ColumnCollection.MainColumnPropertyName ) )
-      {
-        this.SetMainColumn();
-      }
-    }
-
-    private void OnDetailConfigurationPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var propertyName = e.PropertyName;
-      bool mayHaveChanged = string.IsNullOrEmpty( propertyName );
-
-      if( mayHaveChanged || ( propertyName == DetailConfiguration.DataGridControlPropertyName ) )
-      {
-        this.DataGridControl = m_detailConfiguration.DataGridControl;
-      }
-    }
-
-    private void OnItemPropertyMapMappingChanged( EventArgs e )
-    {
-      this.Refresh();
-    }
-
-    private void OnMasterColumnsCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action == NotifyCollectionChangedAction.Move )
-        return;
-
-      this.Refresh();
-    }
-
-    private void OnDetailColumnsCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action == NotifyCollectionChangedAction.Move )
-        return;
-
-      this.Refresh();
-    }
-
-    private void OnMasterVisibleColumnsUpdated( EventArgs e )
-    {
-      this.Refresh();
-    }
-
-    private void OnDetailVisibleColumnsUpdated( EventArgs e )
-    {
-      this.Refresh();
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      Debug.Assert( sender != null );
-
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        if( ( m_masterColumnManager != null ) && ( sender == m_masterColumnManager.Columns ) )
-        {
-          this.OnMasterColumnsCollectionChanged( ( NotifyCollectionChangedEventArgs )e );
-        }
-        else if( ( m_detailColumnManager != null ) && ( sender == m_detailColumnManager.Columns ) )
-        {
-          this.OnDetailColumnsCollectionChanged( ( NotifyCollectionChangedEventArgs )e );
-        }
-      }
-      else if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        if( ( m_masterColumnManager != null ) && ( sender == m_masterColumnManager.Columns ) )
-        {
-          this.OnMasterColumnsPropertyChanged( ( PropertyChangedEventArgs )e );
-        }
-        else if( sender == m_detailConfiguration )
-        {
-          this.OnDetailConfigurationPropertyChanged( ( PropertyChangedEventArgs )e );
-        }
-      }
-      else if( managerType == typeof( ColumnsLayoutChangedEventManager ) )
-      {
-        if( sender == m_masterColumnManager )
-        {
-          this.OnMasterVisibleColumnsUpdated( e );
-        }
-        else if( sender == m_detailColumnManager )
-        {
-          this.OnDetailVisibleColumnsUpdated( e );
-        }
-      }
-      else if( managerType == typeof( MappingChangedEventManager ) )
-      {
-        if( sender == m_itemPropertyMap )
-        {
-          this.OnItemPropertyMapMappingChanged( e );
-        }
-      }
-      else if( managerType == typeof( ViewChangedEventManager ) )
-      {
-        if( sender == m_dataGridControl )
-        {
-          this.OnViewChanged();
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private readonly DetailConfiguration m_detailConfiguration;
-    private readonly DataGridItemPropertyMap m_itemPropertyMap;
-    private readonly Dictionary<SynchronizationKey, SynchronizationEntry> m_pairedColumns = new Dictionary<SynchronizationKey, SynchronizationEntry>( 0 );
-
-    private bool m_isUpdatingColumns;
-
-    #region DeferState Private Class
-
-    private sealed class DeferState : DeferredDisposableState
-    {
-      internal DeferState( ColumnSynchronizationManager target )
-      {
-        Debug.Assert( target != null );
-        m_target = target;
-      }
-
-      protected override bool IsDeferred
-      {
-        get
-        {
-          return m_target.IsSynchronizationDeferred;
-        }
-      }
-
-      protected override void Increment()
-      {
-        m_target.m_deferSynchronizationCount++;
-      }
-
-      protected override void Decrement()
-      {
-        m_target.m_deferSynchronizationCount--;
-      }
-
-      protected override void OnDeferEnded( bool disposing )
-      {
-        m_target.UpdateColumns();
-      }
-
-      private readonly ColumnSynchronizationManager m_target;
-    }
-
-    #endregion
-
-    #region SynchronizationKey Private Class
-
-    private sealed class SynchronizationKey
-    {
-      internal SynchronizationKey(
-        ColumnBase masterColumn,
-        ColumnBase detailColumn,
-        DetailConfiguration detailConfig )
-      {
-        if( detailColumn == null )
-          throw new ArgumentNullException( "detailColumn" );
-
-        if( detailConfig == null )
-          throw new ArgumentNullException( "detailConfig" );
-
-        m_masterColumn = masterColumn;
-        m_detailColumn = detailColumn;
-        m_detailConfiguration = detailConfig;
-      }
-
-      #region MasterColumn Property
-
-      internal ColumnBase MasterColumn
-      {
-        get
-        {
-          return m_masterColumn;
-        }
-      }
-
-      private readonly ColumnBase m_masterColumn;
-
-      #endregion
-
-      #region DetailColumn Property
-
-      internal ColumnBase DetailColumn
-      {
-        get
-        {
-          return m_detailColumn;
-        }
-      }
-
-      private readonly ColumnBase m_detailColumn;
-
-      #endregion
-
-      #region DetailConfiguration Property
-
-      internal DetailConfiguration DetailConfiguration
-      {
-        get
-        {
-          return m_detailConfiguration;
-        }
-      }
-
-      private readonly DetailConfiguration m_detailConfiguration;
-
-      #endregion
-
-      #region OrderKey Property
-
-      internal int OrderKey
-      {
-        get
-        {
-          var column = this.MasterColumn;
-          if( column != null )
-            return column.VisiblePosition;
-
-          return int.MaxValue;
-        }
-      }
-
-      #endregion
-
-      public override int GetHashCode()
-      {
-        if( m_masterColumn == null )
-          return m_detailColumn.GetHashCode();
-
-        return ( m_masterColumn.GetHashCode() )
-             ^ ( m_detailColumn.GetHashCode() );
-      }
-
-      public override bool Equals( object obj )
-      {
-        var key = obj as SynchronizationKey;
-        if( key == null )
-          return false;
-
-        if( key == this )
-          return true;
-
-        return ( key.m_masterColumn == m_masterColumn )
-            && ( key.m_detailColumn == m_detailColumn )
-            && ( key.m_detailConfiguration == m_detailConfiguration );
-      }
-    }
-
-    #endregion
-
-    #region SynchronizationEntry Private Class
-
-    private abstract class SynchronizationEntry
-    {
-      protected SynchronizationEntry( ColumnSynchronizationManager owner, SynchronizationKey key )
-      {
-        if( owner == null )
-          throw new ArgumentNullException( "owner" );
-
-        if( key == null )
-          throw new ArgumentNullException( "key" );
-
-        m_owner = owner;
-        m_key = key;
-      }
-
-      #region Owner Protected Property
-
-      protected ColumnSynchronizationManager Owner
-      {
-        get
-        {
-          return m_owner;
-        }
-      }
-
-      private readonly ColumnSynchronizationManager m_owner;
-
-      #endregion
-
-      #region MasterColumn Protected Property
-
-      protected ColumnBase MasterColumn
-      {
-        get
-        {
-          return m_key.MasterColumn;
-        }
-      }
-
-      #endregion
-
-      #region DetailColumn Protected Property
-
-      protected ColumnBase DetailColumn
-      {
-        get
-        {
-          return m_key.DetailColumn;
-        }
-      }
-
-      #endregion
-
-      #region DetailConfiguration Protected Property
-
-      protected DetailConfiguration DetailConfiguration
-      {
-        get
-        {
-          return m_key.DetailConfiguration;
-        }
-      }
-
-      #endregion
-
-      #region Key Private Property
-
-      private SynchronizationKey Key
-      {
-        get
-        {
-          return m_key;
-        }
-      }
-
-      private readonly SynchronizationKey m_key;
-
-      #endregion
-
-      public abstract void Synchronize();
-      public abstract void Desynchronize();
-    }
-
-    #endregion
-
-    #region BoundColumn Private Class
-
-    private sealed class BoundColumn : SynchronizationEntry
-    {
-      internal BoundColumn( ColumnSynchronizationManager owner, SynchronizationKey key )
-        : base( owner, key )
-      {
-        if( key.MasterColumn == null )
-          throw new ArgumentException( "The master column is not set.", "key" );
-      }
-
-      public override void Synchronize()
-      {
-        var masterColumn = this.MasterColumn;
-        var detailColumn = this.DetailColumn;
-
-        if( m_localValues == null )
-        {
-          m_localValues = new Dictionary<DependencyProperty, object>( 8 );
-
-          masterColumn.PropertyChanged += new PropertyChangedEventHandler( this.OnMasterColumnPropertyChanged );
-          masterColumn.FittedWidthRequested += new FittedWidthRequestedEventHandler( this.OnMasterColumnFittedWidthRequested );
-
-          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.WidthProperty );
-          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.MinWidthProperty );
-          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.MaxWidthProperty );
-          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.DesiredWidthProperty );
-          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnBase.VisibleProperty );
-          BoundColumn.StoreLocalValue( m_localValues, detailColumn, ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
-          BoundColumn.StoreLocalValue( m_localValues, detailColumn, TableflowView.IsBeingDraggedAnimatedProperty );
-          BoundColumn.StoreLocalValue( m_localValues, detailColumn, TableflowView.ColumnReorderingDragSourceManagerProperty );
-        }
-
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.WidthProperty );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.MinWidthProperty );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.MaxWidthProperty );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.DesiredWidthProperty );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.VisibleProperty );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
-        BoundColumn.SetValue( masterColumn, detailColumn, TableflowView.IsBeingDraggedAnimatedProperty );
-        BoundColumn.SetValue( masterColumn, detailColumn, TableflowView.ColumnReorderingDragSourceManagerProperty );
-
-        this.UpdateTargetPosition();
-      }
-
-      public override void Desynchronize()
-      {
-        if( m_localValues == null )
-          return;
-
-        var localValues = m_localValues;
-        m_localValues = null;
-
-        var masterColumn = this.MasterColumn;
-        masterColumn.PropertyChanged -= new PropertyChangedEventHandler( this.OnMasterColumnPropertyChanged );
-        masterColumn.FittedWidthRequested -= new FittedWidthRequestedEventHandler( this.OnMasterColumnFittedWidthRequested );
-
-        var detailColumn = this.DetailColumn;
-        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.WidthProperty );
-        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.MinWidthProperty );
-        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.MaxWidthProperty );
-        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.DesiredWidthProperty );
-        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnBase.VisibleProperty );
-        BoundColumn.RestoreLocalValue( localValues, detailColumn, ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
-        BoundColumn.RestoreLocalValue( localValues, detailColumn, TableflowView.IsBeingDraggedAnimatedProperty );
-        BoundColumn.RestoreLocalValue( localValues, detailColumn, TableflowView.ColumnReorderingDragSourceManagerProperty );
-
-        detailColumn.ClearValue( ColumnBase.VisiblePositionProperty );
-      }
-
-      private static void StoreLocalValue( Dictionary<DependencyProperty, object> store, ColumnBase column, DependencyProperty property )
-      {
-        Debug.Assert( store != null );
-        Debug.Assert( column != null );
-        Debug.Assert( property != null );
-
-        var binding = BindingOperations.GetBindingBase( column, property );
-        if( binding != null )
-        {
-          store[ property ] = binding;
-        }
-        else
-        {
-          var value = column.ReadLocalValue( property );
-          if( value != DependencyProperty.UnsetValue )
-          {
-            store[ property ] = value;
-          }
-          else
-          {
-            store.Remove( property );
-          }
-        }
-      }
-
-      private static void RestoreLocalValue( Dictionary<DependencyProperty, object> store, ColumnBase column, DependencyProperty property )
-      {
-        Debug.Assert( store != null );
-        Debug.Assert( column != null );
-        Debug.Assert( property != null );
-
-        object value;
-        if( !store.TryGetValue( property, out value ) || ( value == DependencyProperty.UnsetValue ) )
-        {
-          column.ClearValue( property );
-        }
-        else if( value is BindingBase )
-        {
-          BindingOperations.SetBinding( column, property, ( BindingBase )value );
-        }
-        else
-        {
-          column.SetValue( property, value );
-        }
-      }
-
-      private static void SetValue( ColumnBase source, ColumnBase destination, DependencyProperty property, string propertyName )
-      {
-        Debug.Assert( property != null );
-
-        if( string.IsNullOrEmpty( propertyName ) || ( propertyName == property.Name ) )
-        {
-          BoundColumn.SetValue( source, destination, property );
-        }
-      }
-
-      private static void SetValue( ColumnBase source, ColumnBase destination, DependencyProperty property )
-      {
-        Debug.Assert( source != null );
-        Debug.Assert( destination != null );
-        Debug.Assert( property != null );
-
-        destination.SetValue( property, source.GetValue( property ) );
-      }
-
-      private void UpdateTargetPosition()
-      {
-        var detailConfig = this.DetailConfiguration;
-        var dataGridControl = detailConfig.DataGridControl;
-
-        if( dataGridControl == null )
-          return;
-
-        var masterColumn = this.MasterColumn;
-        var masterColumnManager = DataGridControl.GetDataGridContext( dataGridControl ).ColumnManager;
-        var masterColumnLocation = masterColumnManager.GetColumnLocationFor( masterColumn );
-
-        if( masterColumnLocation == null )
-          return;
-
-        var detailColumn = this.DetailColumn;
-        var detailColumnManager = detailConfig.ColumnManager;
-        var detailColumnLocation = detailColumnManager.GetColumnLocationFor( detailColumn );
-
-        if( detailColumnLocation == null )
-          return;
-
-        var map = detailConfig.ItemPropertyMap;
-        var previousMasterLocation = masterColumnLocation.GetPreviousSiblingOrCousin();
-        Debug.Assert( previousMasterLocation != null );
-
-        switch( previousMasterLocation.Type )
-        {
-          case LocationType.Start:
-          case LocationType.Splitter:
-            {
-              for( var previousDetailLocation = detailColumnLocation.GetPreviousSiblingOrCousin(); previousDetailLocation != null; previousDetailLocation = previousDetailLocation.GetPreviousSiblingOrCousin() )
-              {
-                // The detail column is at the appropriate location.
-                if( previousDetailLocation.Type == previousMasterLocation.Type )
-                  return;
-
-                if( previousDetailLocation.Type != LocationType.Column )
-                  break;
-
-                ColumnBase unused;
-                if( DataGridItemPropertyMapHelper.TryGetMasterColumn( map, masterColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )previousDetailLocation ).Column, out unused ) )
-                  break;
-              }
-            }
-            break;
-
-          case LocationType.Column:
-            {
-              var previousMasterColumn = ( ( ColumnHierarchyManager.IColumnLocation )previousMasterLocation ).Column;
-
-              for( var previousDetailLocation = detailColumnLocation.GetPreviousSiblingOrCousin(); previousDetailLocation != null; previousDetailLocation = previousDetailLocation.GetPreviousSiblingOrCousin() )
-              {
-                if( previousDetailLocation.Type != LocationType.Column )
-                  break;
-
-                ColumnBase targetMasterColumn;
-                if( DataGridItemPropertyMapHelper.TryGetMasterColumn( map, masterColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )previousDetailLocation ).Column, out targetMasterColumn ) )
-                {
-                  // The detail column is at the appropriate location.
-                  if( previousMasterColumn == targetMasterColumn )
-                    return;
-                }
-              }
-            }
-            break;
-
-          default:
-            // Unexpected location.
-            throw new NotSupportedException();
-        }
-
-        var nextMasterLocation = masterColumnLocation.GetNextSiblingOrCousin();
-        Debug.Assert( nextMasterLocation != null );
-
-        switch( nextMasterLocation.Type )
-        {
-          case LocationType.Splitter:
-          case LocationType.Orphan:
-            {
-              for( var nextDetailLocation = detailColumnLocation.GetNextSiblingOrCousin(); nextDetailLocation != null; nextDetailLocation = nextDetailLocation.GetNextSiblingOrCousin() )
-              {
-                // The detail column is at the appropriate location.
-                if( nextDetailLocation.Type == nextMasterLocation.Type )
-                  return;
-
-                if( nextDetailLocation.Type != LocationType.Column )
-                  break;
-
-                ColumnBase unused;
-                if( DataGridItemPropertyMapHelper.TryGetMasterColumn( map, masterColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )nextDetailLocation ).Column, out unused ) )
-                  break;
-              }
-            }
-            break;
-
-          case LocationType.Column:
-            {
-              var nextMasterColumn = ( ( ColumnHierarchyManager.IColumnLocation )nextMasterLocation ).Column;
-
-              for( var nextDetailLocation = detailColumnLocation.GetNextSiblingOrCousin(); nextDetailLocation != null; nextDetailLocation = nextDetailLocation.GetNextSiblingOrCousin() )
-              {
-                if( nextDetailLocation.Type != LocationType.Column )
-                  break;
-
-                ColumnBase targetMasterColumn;
-                if( DataGridItemPropertyMapHelper.TryGetMasterColumn( map, masterColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )nextDetailLocation ).Column, out targetMasterColumn ) )
-                {
-                  // The detail column is at the appropriate location.
-                  if( nextMasterColumn == targetMasterColumn )
-                    return;
-                }
-              }
-            }
-            break;
-
-          default:
-            // Unexpected location.
-            throw new NotSupportedException();
-        }
-
-        // If we get here, it means that the column is really not at the appropriate location.
-        for( var pivotMasterLocation = previousMasterLocation; pivotMasterLocation != null; pivotMasterLocation = pivotMasterLocation.GetPreviousSiblingOrCousin() )
-        {
-          if( pivotMasterLocation.Type == LocationType.Column )
-          {
-            ColumnBase pivotDetailColumn;
-            if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( map, detailColumnManager.Columns, ( ( ColumnHierarchyManager.IColumnLocation )pivotMasterLocation ).Column, out pivotDetailColumn ) )
-              continue;
-
-            var pivotDetailLocation = ( pivotDetailColumn != null ) ? detailColumnManager.GetColumnLocationFor( pivotDetailColumn ) : null;
-            if( pivotDetailLocation == null )
-              continue;
-
-            Debug.Assert( detailColumnLocation.CanMoveAfter( pivotDetailLocation ) );
-            detailColumnLocation.MoveAfter( pivotDetailLocation );
-          }
-          else
-          {
-            switch( pivotMasterLocation.Type )
-            {
-              case LocationType.Start:
-                {
-                  var pivotDetailLocation = detailColumnManager.GetLevelMarkersFor( detailColumnManager.Columns ).Start;
-
-                  if( !detailColumnLocation.CanMoveAfter( pivotDetailLocation ) )
-                    throw new NotSupportedException();
-
-                  detailColumnLocation.MoveAfter( pivotDetailLocation );
-                }
-                break;
-
-              case LocationType.Splitter:
-                {
-                  var pivotDetailLocation = detailColumnManager.GetLevelMarkersFor( detailColumnManager.Columns ).Splitter;
-
-                  if( !detailColumnLocation.CanMoveAfter( pivotDetailLocation ) )
-                    throw new NotSupportedException();
-
-                  detailColumnLocation.MoveAfter( pivotDetailLocation );
-                }
-                break;
-
-              default:
-                // Unexpected location.
-                throw new NotSupportedException();
-            }
-          }
-
-          // The detail column is now at the appropriate location.
-          return;
-        }
-      }
-
-      private void OnMasterColumnPropertyChanged( object sender, PropertyChangedEventArgs e )
-      {
-        var masterColumn = sender as ColumnBase;
-        if( masterColumn == null )
-          return;
-
-        Debug.Assert( masterColumn == this.MasterColumn );
-
-        var masterColumnManager = this.Owner.MasterColumnManager;
-        if( ( masterColumnManager == null ) || masterColumnManager.IsUpdateDeferred )
-          return;
-
-        var detailColumn = this.DetailColumn;
-        var propertyName = e.PropertyName;
-
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.WidthProperty, propertyName );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.MinWidthProperty, propertyName );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.MaxWidthProperty, propertyName );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.DesiredWidthProperty, propertyName );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnBase.VisibleProperty, propertyName );
-        BoundColumn.SetValue( masterColumn, detailColumn, ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty, propertyName );
-        BoundColumn.SetValue( masterColumn, detailColumn, TableflowView.IsBeingDraggedAnimatedProperty, propertyName );
-        BoundColumn.SetValue( masterColumn, detailColumn, TableflowView.ColumnReorderingDragSourceManagerProperty, propertyName );
-      }
-
-      private void OnMasterColumnFittedWidthRequested( object sender, FittedWidthRequestedEventArgs e )
-      {
-        Debug.Assert( ( ColumnBase )sender == this.MasterColumn );
-
-        var fittedWidth = this.DetailColumn.GetFittedWidth();
-        if( fittedWidth < 0d )
-          return;
-
-        e.SetValue( fittedWidth );
-      }
-
-      private Dictionary<DependencyProperty, object> m_localValues;
-    }
-
-    #endregion
-
-    #region UnboundColumn Private Class
-
-    private sealed class UnboundColumn : SynchronizationEntry
-    {
-      internal UnboundColumn( ColumnSynchronizationManager owner, SynchronizationKey key )
-        : base( owner, key )
-      {
-        if( key.MasterColumn != null )
-          throw new ArgumentException( "The master column should not be set.", "key" );
-      }
-
-      public override void Synchronize()
-      {
-        var targetColumn = this.DetailColumn;
-        var dp = ColumnBase.VisibleProperty;
-
-        var currentBinding = BindingOperations.GetBindingBase( targetColumn, dp );
-        if( currentBinding != null )
-        {
-          m_localValue = currentBinding;
-          BindingOperations.ClearBinding( targetColumn, dp );
-        }
-        else
-        {
-          var localValue = targetColumn.ReadLocalValue( dp );
-
-          // The appropriate value is still in place.
-          if( object.Equals( localValue, false ) )
-            return;
-
-          m_localValue = localValue;
-        }
-
-        // Hide the column.
-        targetColumn.SetValue( dp, false );
-      }
-
-      public override void Desynchronize()
-      {
-        var targetColumn = this.DetailColumn;
-        var dp = ColumnBase.VisibleProperty;
-        var oldLocalValue = m_localValue;
-
-        m_localValue = DependencyProperty.UnsetValue;
-
-        if( BindingOperations.GetBindingBase( targetColumn, dp ) != null )
-          return;
-
-        if( !object.Equals( targetColumn.ReadLocalValue( dp ), false ) )
-          return;
-
-        var oldBinding = oldLocalValue as BindingBase;
-        if( oldBinding != null )
-        {
-          BindingOperations.SetBinding( targetColumn, dp, oldBinding );
-        }
-        else if( oldLocalValue != DependencyProperty.UnsetValue )
-        {
-          targetColumn.SetValue( dp, oldLocalValue );
-        }
-        else
-        {
-          targetColumn.ClearValue( dp );
-        }
-      }
-
-      private object m_localValue = DependencyProperty.UnsetValue;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnWidth.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnWidth.cs
deleted file mode 100644
index 07f853e4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnWidth.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Windows;
-
-using Xceed.Wpf.DataGrid.Converters;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TypeConverter( typeof( ColumnWidthConverter ) )]
-  public struct ColumnWidth
-  {
-    public ColumnWidth( double pixels )
-      : this( pixels, ColumnWidthUnitType.Pixel )
-    {
-    }
-
-    public ColumnWidth( double value, ColumnWidthUnitType type )
-    {
-      if( double.IsNaN( value ) )
-        throw new ArgumentException( "NaN is not a valid value.", "value" ); 
-
-      if( double.IsInfinity( value ) )
-        throw new ArgumentException( "Infinity is not a valid value.", "value" );
-
-      if( ( type != ColumnWidthUnitType.Pixel ) && ( type != ColumnWidthUnitType.Star ) )
-        throw new InvalidEnumArgumentException( "type", ( int )type, typeof( ColumnWidthUnitType ) ); 
-
-      if( value < 0d )
-        throw new ArgumentException( "Negative values are not valid.", "value" );
-
-      if( ( Xceed.Utils.Math.DoubleUtil.AreClose( value, 0d ) ) && ( type == ColumnWidthUnitType.Star ) )
-        throw new ArgumentException( "Zero star (0*) is not a valid value.", "value" );
-
-      m_unitValue = value;
-      m_unitType = type;
-    }
-
-    public double Value
-    {
-      get
-      {
-        return m_unitValue;
-      }
-    }
-
-    public ColumnWidthUnitType UnitType
-    {
-      get
-      {
-        return m_unitType;
-      }
-    }
-
-    public static implicit operator double( ColumnWidth columnWidth )
-    {
-      return ( ( columnWidth.UnitType == ColumnWidthUnitType.Pixel ) ? columnWidth.Value : double.NaN );
-    }
-
-    public static implicit operator ColumnWidth( double columnWidth )
-    {
-      return new ColumnWidth( columnWidth, ColumnWidthUnitType.Pixel );
-    }
-
-    public static bool operator ==( ColumnWidth columnWidth1, ColumnWidth columnWidth2 )
-    {
-      return 
-        ( ( columnWidth1.UnitType == columnWidth2.UnitType ) && 
-          ( Xceed.Utils.Math.DoubleUtil.AreClose( columnWidth1.Value, columnWidth2.Value ) ) );
-    }
-
-    public static bool operator !=( ColumnWidth columnWidth1, ColumnWidth columnWidth2 )
-    {
-      if( columnWidth1.UnitType == columnWidth2.UnitType )
-        return !Xceed.Utils.Math.DoubleUtil.AreClose( columnWidth1.Value, columnWidth2.Value );
-
-      return true;
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( obj is ColumnWidth )
-        return ( this == ( ColumnWidth )obj );
-
-      return false;
-    }
-
-    public bool Equals( ColumnWidth columnWidth )
-    {
-      return ( this == columnWidth );
-    }
-
-    public override int GetHashCode()
-    {
-      return ( Convert.ToInt32( m_unitValue ) + ( int )m_unitType );
-    }
-
-    public override string ToString()
-    {
-      return ColumnWidthConverter.ToString( this, CultureInfo.InvariantCulture );
-    }
-
-    private double m_unitValue;
-    private ColumnWidthUnitType m_unitType;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ContainerSizeState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ContainerSizeState.cs
deleted file mode 100644
index c5fa02fe..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ContainerSizeState.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal struct ContainerSizeState
-  {
-    public ContainerSizeState( FrameworkElement container )
-    {
-      m_width = container.ReadLocalValue( FrameworkElement.WidthProperty );
-      m_minWidth = container.ReadLocalValue( FrameworkElement.MinWidthProperty );
-      m_maxWidth = container.ReadLocalValue( FrameworkElement.MaxWidthProperty );
-      m_height = container.ReadLocalValue( FrameworkElement.HeightProperty );
-      m_minHeight = container.ReadLocalValue( FrameworkElement.MinHeightProperty );
-      m_maxHeight = container.ReadLocalValue( FrameworkElement.MaxHeightProperty );
-    }
-
-    public bool IsEmpty()
-    {
-      return ( ( this.Height == DependencyProperty.UnsetValue ) &&  
-               ( this.Width == DependencyProperty.UnsetValue ) &&  
-               ( this.MinHeight == DependencyProperty.UnsetValue ) &&  
-               ( this.MinWidth == DependencyProperty.UnsetValue ) &&  
-               ( this.MaxHeight == DependencyProperty.UnsetValue ) &&  
-               ( this.MaxWidth == DependencyProperty.UnsetValue ) );
-    }
-
-    public object Width
-    {
-      get
-      {
-        return m_width;
-      }
-    }
-
-    public object MinWidth
-    {
-      get
-      {
-        return m_minWidth;
-      }
-    }
-
-    public object MaxWidth
-    {
-      get
-      {
-        return m_maxWidth;
-      }
-    }
-
-    public object Height
-    {
-      get
-      {
-        return m_height;
-      }
-    }
-
-    public object MinHeight
-    {
-      get
-      {
-        return m_minHeight;
-      }
-    }
-
-    public object MaxHeight
-    {
-      get
-      {
-        return m_maxHeight;
-      }
-    }
-
-    private object m_width;
-    private object m_minWidth;
-    private object m_maxWidth;
-    private object m_height;
-    private object m_minHeight;
-    private object m_maxHeight;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ColumnWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ColumnWidthConverter.cs
deleted file mode 100644
index 4cbf812c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ColumnWidthConverter.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel.Design.Serialization;
-using System.Globalization;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  public class ColumnWidthConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext context, Type sourceType )
-    {
-      switch( Type.GetTypeCode( sourceType ) )
-      {
-        case TypeCode.Int16:
-        case TypeCode.UInt16:
-        case TypeCode.Int32:
-        case TypeCode.UInt32:
-        case TypeCode.Int64:
-        case TypeCode.UInt64:
-        case TypeCode.Single:
-        case TypeCode.Double:
-        case TypeCode.Decimal:
-        case TypeCode.String:
-          return true;
-      }
-
-      if( typeof( ColumnWidth ).IsAssignableFrom( sourceType ) )
-        return true;
-
-      return false;
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext context, Type destinationType )
-    {
-      return ( destinationType == typeof( string ) );
-    }
-
-    public override object ConvertFrom( ITypeDescriptorContext context, CultureInfo culture, object value )
-    {
-      ColumnWidthUnitType unitType;
-
-      if( value == null )
-        throw new ArgumentNullException( "value" );
-
-      if( value is ColumnWidth )
-        return value;
-
-      if( value is string )
-        return ColumnWidthConverter.FromString( ( string )value, culture );
-
-      double doubleValue = Convert.ToDouble( value, culture );
-
-      unitType = ColumnWidthUnitType.Pixel;
-
-      return new ColumnWidth( doubleValue, unitType );
-    }
-
-    public override object ConvertTo( ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType )
-    {
-      if( destinationType == null )
-        throw new ArgumentNullException( "destinationType" );
-
-      if( ( value != null ) && ( value is ColumnWidth ) )
-      {
-        ColumnWidth columnWidth = ( ColumnWidth )value;
-
-        if( destinationType == typeof( string ) )
-        {
-          return ColumnWidthConverter.ToString( columnWidth, culture );
-        }
-
-        // If we ever want to add InstanceDescriptor in the list of supported destination 
-        // type, we will have to implement it in another method and surround the call
-        // with a try/catch. Otherwise, the call to Type.GetConstructor() will fail if 
-        // the application does not have reflection permission (typically XBAP).
-      }
-
-      throw new ArgumentException( "Cannot convert to type " + destinationType.FullName + ".", "value" ); 
-    }
-
-    internal static ColumnWidth FromString( string stringValue, CultureInfo cultureInfo )
-    {
-      stringValue = stringValue.Trim().ToLowerInvariant();
-      double value = 0.0;
-      ColumnWidthUnitType unit = ColumnWidthUnitType.Pixel;
-      int stringValueLength = stringValue.Length;
-      int unitStringLength = 0;
-      double factorValue = 1.0;
-      int index = 0;
-
-      for( index = 0; index < ColumnWidthConverter.UnitStrings.Length; index++ )
-      {
-        if( stringValue.EndsWith( ColumnWidthConverter.UnitStrings[ index ], StringComparison.Ordinal ) )
-        {
-          unitStringLength = ColumnWidthConverter.UnitStrings[ index ].Length;
-          unit = ( ColumnWidthUnitType )index;
-          break;
-        }
-      }
-
-      if( index >= ColumnWidthConverter.UnitStrings.Length )
-      {
-        // The unit type was not recognized so far. Search for pixel unit types.
-        for( index = 0; index < ColumnWidthConverter.PixelUnitStrings.Length; index++ )
-        {
-          if( stringValue.EndsWith( ColumnWidthConverter.PixelUnitStrings[ index ], StringComparison.Ordinal ) )
-          {
-            unitStringLength = ColumnWidthConverter.PixelUnitStrings[ index ].Length;
-            factorValue = ColumnWidthConverter.PixelUnitFactors[ index ];
-            break;
-          }
-        }
-      }
-
-      if( ( stringValueLength == unitStringLength ) && ( unit == ColumnWidthUnitType.Star ) )
-      {
-        // * was specified alone. Use the default value of 1.
-        value = 1.0;
-      }
-      else
-      {
-        // Extract the numeric part of the string.
-        string valuePartString = stringValue.Substring( 0, stringValueLength - unitStringLength );
-        value = Convert.ToDouble( valuePartString, cultureInfo ) * factorValue;
-      }
-
-      return new ColumnWidth( value, unit );
-    }
-
-    internal static string ToString( ColumnWidth columnWidth, CultureInfo cultureInfo )
-    {
-      if( columnWidth.UnitType == ColumnWidthUnitType.Star )
-      {
-        if( columnWidth.Value != 1d )
-          return ( Convert.ToString( columnWidth.Value, cultureInfo ) + "*" );
-
-        return "*";
-      }
-
-      return Convert.ToString( columnWidth.Value, cultureInfo );
-    }
-
-    private static string[] UnitStrings = new string[] { "px", "*" };
-    private static string[] PixelUnitStrings = new string[] { "in", "cm", "pt" };
-    private static double[] PixelUnitFactors = new double[] { 96.0, 37.795275590551178, 1.3333333333333333 };
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/CurrencyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/CurrencyConverter.cs
deleted file mode 100644
index 15d5cce1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/CurrencyConverter.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Globalization;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( double ), typeof( string ) )]
-  public class CurrencyConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( value != null ) && ( !object.Equals( string.Empty, value ) ) )
-      {
-        Type valueType = value.GetType();
-
-        // Only Decimal or Double values can be converted
-        if( ( valueType.IsAssignableFrom( typeof( decimal ) ) == false ) && ( valueType.IsAssignableFrom( typeof( double ) ) == false ) )
-        {
-          return Binding.DoNothing;
-        }
-
-        try
-        {
-          // Convert the string value provided by an editor to a double before formatting. 
-          double tempDouble = System.Convert.ToDouble( value, CultureInfo.CurrentCulture );
-          return string.Format( CultureInfo.CurrentCulture, "{0:C}", tempDouble );
-        }
-        catch
-        {
-          return Binding.DoNothing;
-        }
-      }
-
-      return string.Format( CultureInfo.CurrentCulture, "{0}", value );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      double result;
-
-      if( double.TryParse( value as string, NumberStyles.Currency, CultureInfo.CurrentCulture, out result ) )
-        return result;
-
-      return Binding.DoNothing;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/DefaultDataConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/DefaultDataConverter.cs
deleted file mode 100644
index c3198de9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/DefaultDataConverter.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Windows;
-using System.Globalization;
-using System.ComponentModel;
-using System.Windows.Controls;
-using System.Diagnostics;
-using System.Collections;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  internal class DefaultDataConverter : IValueConverter
-  {
-    public DefaultDataConverter()
-    {
-    }
-
-    public object Convert( object sourceValue, Type targetType, object parameter, CultureInfo targetCulture )
-    {
-      Exception exception;
-      return DefaultDataConverter.TryConvert( sourceValue, targetType, CultureInfo.InvariantCulture, targetCulture, out exception );
-    }
-
-    public object ConvertBack(
-      object targetValue,
-      Type sourceType,
-      object parameter,
-      CultureInfo targetCulture )
-    {
-      Exception exception;
-      return DefaultDataConverter.TryConvert( targetValue, sourceType, targetCulture, CultureInfo.InvariantCulture, out exception );
-    }
-
-    internal static object TryConvert(
-      object sourceValue,
-      Type targetType,
-      CultureInfo sourceCulture,
-      CultureInfo targetCulture,
-      out Exception exception )
-    {
-      if( targetCulture == null )
-        targetCulture = CultureInfo.CurrentCulture;
-
-      if( sourceCulture == null )
-        sourceCulture = CultureInfo.InvariantCulture;
-
-      exception = null;
-      Type valueType = null;
-
-      try
-      {
-        if( sourceValue != null )
-        {
-          valueType = sourceValue.GetType();
-
-          if( targetType.IsAssignableFrom( valueType ) )
-            return sourceValue;
-        }
-        else
-        {
-          if( !targetType.IsValueType )
-            return sourceValue;
-        }
-
-        if( targetType == typeof( string ) )
-          return string.Format( targetCulture, "{0}", sourceValue );
-
-        if( sourceValue != null )
-        {
-          bool targetTypeIsNullable = false;
-          Type targetConversionType = targetType;
-          object resultValue;
-
-          if( ( targetType.IsGenericType ) && ( targetType.GetGenericTypeDefinition() == typeof( Nullable<> ) ) )
-          {
-            targetTypeIsNullable = true;
-            targetConversionType = targetType.GetGenericArguments()[ 0 ];
-          }
-
-          if( DefaultDataConverter.IsConvertibleToAndFrom( valueType, targetConversionType ) )
-          {
-            resultValue = System.Convert.ChangeType( sourceValue, targetConversionType, sourceCulture );
-
-            if( !targetTypeIsNullable )
-              return resultValue;
-
-            sourceValue = resultValue;
-          }
-        }
-
-        TypeConverter cachedTypeConverter;
-
-        lock( mg_cachedTypeConverter )
-        {
-          cachedTypeConverter = mg_cachedTypeConverter[ targetType ] as TypeConverter;
-
-          if( cachedTypeConverter == null )
-          {
-            cachedTypeConverter = TypeDescriptor.GetConverter( targetType );
-            mg_cachedTypeConverter[ targetType ] = cachedTypeConverter;
-          }
-        }
-
-        return cachedTypeConverter.ConvertFrom( null, sourceCulture, sourceValue );
-      }
-      catch( Exception localException )
-      {
-        exception = localException;
-        return DependencyProperty.UnsetValue;
-      }
-    }
-
-    private static bool IsConvertibleToAndFrom( Type sourceType, Type targetType )
-    {
-      if( sourceType == typeof( DateTime ) )
-        return ( targetType == typeof( string ) );
-
-      if( targetType == typeof( DateTime ) )
-        return ( sourceType == typeof( string ) );
-
-      if( sourceType == typeof( char ) )
-        return DefaultDataConverter.IsConvertibleFromAndToChar( targetType );
-
-      if( targetType == typeof( char ) )
-        return DefaultDataConverter.IsConvertibleFromAndToChar( sourceType );
-
-      bool sourceTypeFound = false;
-      bool targetTypeFound = false;
-
-      for( int i = 0; i < ConvertibleTypes.Length; i++ )
-      {
-        if( ( !sourceTypeFound ) && ( sourceType == ConvertibleTypes[ i ] ) )
-        {
-          if( targetTypeFound )
-            return true;
-
-          sourceTypeFound = true;
-        }
-        else if( ( !targetTypeFound ) && ( targetType == ConvertibleTypes[ i ] ) )
-        {
-          if( sourceTypeFound )
-            return true;
-
-          targetTypeFound = true;
-        }
-      }
-
-      return false;
-    }
-
-    private static bool IsConvertibleFromAndToChar( Type type )
-    {
-      for( int i = 0; i < CharConvertibleTypes.Length; i++ )
-      {
-        if( type == CharConvertibleTypes[ i ] )
-          return true;
-      }
-
-      return false;
-    }
-
-    private static readonly Type[] ConvertibleTypes = new Type[] 
-      {
-        typeof(string), typeof(int), typeof(long),
-        typeof(float), typeof(double), typeof(decimal),
-        typeof(bool), typeof(byte), typeof(short),
-        typeof(uint), typeof(ulong), typeof(ushort), typeof(sbyte)
-      };
-
-    private static readonly Type[] CharConvertibleTypes = new Type[] 
-      { 
-        typeof(string), typeof(int), typeof(long), 
-        typeof(byte), typeof(short), typeof(uint), 
-        typeof(ulong), typeof(ushort), typeof(sbyte) 
-      };
-
-    private static Hashtable mg_cachedTypeConverter = new Hashtable();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs
deleted file mode 100644
index 65111d45..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Converters
-{
-  [ValueConversion( typeof( string ), typeof( bool ) )]
-  public class EmptyStringToBooleanConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return string.IsNullOrWhiteSpace( value as string );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/GreaterThanZeroConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/GreaterThanZeroConverter.cs
deleted file mode 100644
index 7a4ead6f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/GreaterThanZeroConverter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Text;
-using System.Windows.Data;
-using System.Globalization;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( object ), typeof( bool ) )]
-  public class GreaterThanZeroConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( !targetType.IsAssignableFrom( typeof( bool ) ) )
-        return DependencyProperty.UnsetValue;
-
-      if( value == null )
-        return false;
-
-      double number = 0d;
-
-      try
-      {
-        number = System.Convert.ToDouble( value );
-      }
-      catch
-      {
-        return false;
-      }
-
-      return number > 0d;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ImageConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ImageConverter.cs
deleted file mode 100644
index 84727d24..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ImageConverter.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    [ValueConversion(typeof(object), typeof(ImageSource))]
-    public class ImageConverter : IValueConverter
-    {
-        #region IValueConverter Members
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (!targetType.IsAssignableFrom(typeof(ImageSource)))
-                return DependencyProperty.UnsetValue;
-
-            if ((value == null) || (value is ImageSource))
-                return value;
-
-            ImageSource imageSource = null;
-
-            //System.Drawing.Image image = value as System.Drawing.Image;
-
-            //if (image != null)
-            //{
-            //    imageSource = ImageConverter.ConvertFromWinFormsImage(image);
-            //}
-            //else
-            //{
-            byte[] byteArray = value as byte[];
-
-            if (byteArray != null)
-            {
-                imageSource = ImageConverter.ConvertFromByteArray(byteArray);
-            }
-            //}
-
-            return imageSource;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            return Binding.DoNothing;
-        }
-
-        #endregion
-
-        #region PRIVATE METHODS
-
-        //private static ImageSource ConvertFromWinFormsImage(System.Drawing.Image image)
-        //{
-        //    ImageSource imageSource = null;
-
-        //    try
-        //    {
-        //        System.Drawing.ImageConverter imageConverter = new System.Drawing.ImageConverter();
-
-        //        byte[] imageBytes = (byte[])imageConverter.ConvertTo(image, typeof(byte[]));
-
-        //        if (imageBytes != null)
-        //            imageSource = ImageConverter.ConvertFromByteArray(imageBytes);
-        //    }
-        //    catch { }
-
-        //    return imageSource;
-        //}
-
-        private static ImageSource ConvertFromByteArray(byte[] imageBytes)
-        {
-            ImageSource imageSource = null;
-
-            try
-            {
-                ImageSourceConverter imageSourceConverter = new ImageSourceConverter();
-                imageSource = imageSourceConverter.ConvertFrom(imageBytes) as ImageSource;
-            }
-            catch
-            {
-            }
-
-            return imageSource;
-        }
-
-        #endregion PRIVATE METHODS
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IndexToOddConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IndexToOddConverter.cs
deleted file mode 100644
index 60c0425d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IndexToOddConverter.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( int ), typeof( bool ) )]
-  public class IndexToOddConverter : IValueConverter
-  {
-    #region Singleton Property
-
-    public static IndexToOddConverter Singleton
-    {
-      get
-      {
-        if( mg_singleton == null )
-          mg_singleton = new IndexToOddConverter();
-
-        return mg_singleton;
-      }
-    }
-
-    private static IndexToOddConverter mg_singleton;
-
-    #endregion Singleton Property
-
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( !targetType.IsAssignableFrom( typeof( bool ) ) )
-        || ( value == null )
-        || ( value.GetType() != typeof( int ) ) )
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      int index = ( int )value;
-
-      return ( ( index % 2 ) == 1 );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IntAdditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IntAdditionConverter.cs
deleted file mode 100644
index c87ab350..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IntAdditionConverter.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( int ), typeof( int ) )]
-  public class IntAdditionConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( 
-      object value, 
-      Type targetType, 
-      object parameter, 
-      CultureInfo culture )
-    {
-      if( ( !targetType.IsAssignableFrom( typeof( int ) ) )
-        || ( value == null )
-        || ( value.GetType() != typeof( int ) )
-        || ( parameter == null ) )
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      int myParameter;
-
-      Type parameterType = parameter.GetType();
-      if( parameterType == typeof( int ) )
-      {
-        myParameter = ( int )parameter;
-      }
-      else if( parameterType == typeof( string ) )
-      {
-        string stringParameter = ( string )parameter;
-        try
-        {
-          myParameter = int.Parse( stringParameter, CultureInfo.InvariantCulture );
-        }
-        catch
-        {
-          return DependencyProperty.UnsetValue;
-        }
-      }
-      else
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      int myValue = ( int )value;
-
-      myValue = myValue + myParameter;
-
-      return myValue;
-    }
-
-    public object ConvertBack( 
-      object value, 
-      Type targetType, 
-      object parameter, 
-      CultureInfo culture )
-    {
-      if( ( targetType != typeof( int ) )
-        || ( value == null )
-        || ( value.GetType() != typeof( int ) )
-        || ( parameter == null ) )
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      int myParameter;
-
-      Type parameterType = parameter.GetType();
-      if( parameterType == typeof( int ) )
-      {
-        myParameter = ( int )parameter;
-      }
-      else if( parameterType == typeof( string ) )
-      {
-        string stringParameter = ( string )parameter;
-        try
-        {
-          myParameter = int.Parse( stringParameter, CultureInfo.InvariantCulture );
-        }
-        catch
-        {
-          return DependencyProperty.UnsetValue;
-        }
-      }
-      else
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      int myValue = ( int )value;
-
-      myValue = myValue - myParameter;
-
-      return myValue;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/InverseBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/InverseBooleanConverter.cs
deleted file mode 100644
index 19ecb5e4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/InverseBooleanConverter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( bool ), typeof( bool ) )]
-  public class InverseBooleanConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value is bool )
-        return !( bool )value;
-
-      return value;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value is bool )
-        return !( bool )value;
-
-      return value;
-    }
-
-    #endregion IValueConverter Members
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/LevelToOpacityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/LevelToOpacityConverter.cs
deleted file mode 100644
index 7a50af56..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/LevelToOpacityConverter.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion(typeof(int), typeof(double))]
-  public class LevelToOpacityConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( 
-      object value, 
-      Type targetType, 
-      object parameter, 
-      CultureInfo culture )
-    {
-      if( ( value == null )
-        || ( value.GetType() != typeof( int ) )
-        || ( !targetType.IsAssignableFrom( typeof( double ) ) )
-        || ( parameter == null ) )
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      double step;
-
-      Type parameterType = parameter.GetType();
-      if( parameterType == typeof( double ) )
-      {
-        step = ( double )parameter;
-      }
-      else if( parameterType == typeof( string ) )
-      {
-        string strParam = (string)parameter;
-        try
-        {
-          step = Double.Parse( strParam, CultureInfo.InvariantCulture );
-        }
-        catch
-        {
-          return DependencyProperty.UnsetValue;
-        }
-      }
-      else
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      int level = ( int )value - 1;
-      double opacity = 1.0d;
-
-      //subtract 'step' opacity for each level
-      opacity -= level * step;
-
-      if( opacity < MinOpacity )
-      {
-        opacity = MinOpacity;
-      }
-
-      if( opacity > 1.0d )
-      {
-        opacity = 1.0d;
-      }
-
-      return opacity;
-
-    }
-
-    public object ConvertBack( 
-      object value, 
-      Type targetType, 
-      object parameter, 
-      CultureInfo culture )
-    {
-      if( ( value.GetType() != typeof( double ) )
-        || ( targetType != typeof( int ) )
-        || ( parameter == null ) )
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      double step;
-
-      Type parameterType = parameter.GetType();
-      if( parameterType == typeof( double ) )
-      {
-        step = ( double )parameter;
-      }
-      else if( parameterType == typeof( string ) )
-      {
-        string strParam = ( string )parameter;
-        try
-        {
-          step = Double.Parse( strParam, CultureInfo.InvariantCulture );
-        }
-        catch
-        {
-          return DependencyProperty.UnsetValue;
-        }
-      }
-      else
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      double opacity = ( double )value;
-      int level = 1;
-
-      level += ( int )Math.Ceiling( ( 1.0d - opacity ) / step );
-
-      return level;
-    }
-
-    #endregion
-
-    private const double MinOpacity = 0.2d;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/MultimodalResultConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/MultimodalResultConverter.cs
deleted file mode 100644
index 4efb2ec7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/MultimodalResultConverter.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Text;
-using System.Windows.Data;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( object[] ), typeof( string ) )]
-  public class MultimodalResultConverter : IValueConverter
-  {
-    private string m_separator = ", ";
-
-    public string Separator
-    {
-      get
-      {
-        return m_separator;
-      }
-      set
-      {
-        m_separator = value;
-      }
-    }
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      object[] values = value as object[];
-
-      if( values == null )
-        return DependencyProperty.UnsetValue;
-
-      StringBuilder result = new StringBuilder();
-
-      if( values.Length > 0 )
-      {
-        for( int i = 0; i < values.Length - 1; i++ )
-        {
-          result.Append( values[ i ].ToString() + m_separator );
-        }
-
-        result.Append( values[ values.Length - 1 ].ToString() );
-      }
-
-      return result.ToString();
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      // Stat values come from read-only properties.
-      return Binding.DoNothing;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NegativeDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NegativeDoubleConverter.cs
deleted file mode 100644
index dbc8eb5d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NegativeDoubleConverter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( double ), typeof( double ) )]
-  public class NegativeDoubleConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( 
-      object value, 
-      Type targetType, 
-      object parameter, 
-      CultureInfo culture )
-    {
-      if( ( value == null )
-        || ( value.GetType() != typeof( double ) )
-        || ( !targetType.IsAssignableFrom( typeof( double ) ) ) )
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      double doubleValue = ( double )value;
-      return ( doubleValue * -1d );
-    }
-
-    public object ConvertBack( 
-      object value, 
-      Type targetType, 
-      object parameter, 
-      CultureInfo culture )
-    {
-      return this.Convert( value, targetType, parameter, culture );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NullToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NullToBooleanConverter.cs
deleted file mode 100644
index ddf9cc58..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NullToBooleanConverter.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( object ), typeof( bool ) )]
-  public class NullToBooleanConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      // If value is null and no parameter is passed to converter, return true by default
-      bool defaultNullReturnValue = true;
-
-      if( parameter != null )
-      {
-        // Define the bool value to return if a null value is passed to the converter
-        // this allows a NullToTrue or NullToFalse converter
-        Boolean.TryParse( parameter.ToString(), out defaultNullReturnValue );
-      }
-
-      if( !targetType.IsAssignableFrom( typeof( bool ) ) )
-        return DependencyProperty.UnsetValue;
-
-      if( value == null )
-      {
-        return defaultNullReturnValue;
-      }
-      else
-      {
-        return !defaultNullReturnValue;
-      }
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SortingDirectionToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SortingDirectionToBooleanConverter.cs
deleted file mode 100644
index 0d00a3c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SortingDirectionToBooleanConverter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ EditorBrowsable( EditorBrowsableState.Never ) ]
-  public class SortingDirectionToBooleanConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      SortDirection direction = ( SortDirection )value;
-      return direction != SortDirection.None;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SourceDataConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SourceDataConverter.cs
deleted file mode 100644
index 22044920..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SourceDataConverter.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Windows;
-using System.Globalization;
-using System.ComponentModel;
-using System.Windows.Controls;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  public class SourceDataConverter : IValueConverter
-  {
-    public SourceDataConverter()
-      : this( false, null )
-    {
-    }
-
-    public SourceDataConverter( bool sourceSupportsDBNull )
-      : this( sourceSupportsDBNull, null )
-    {
-    }
-
-    internal SourceDataConverter( bool sourceSupportsDBNull, CultureInfo sourceCulture )
-    {
-      m_sourceSupportsDBNull = sourceSupportsDBNull;
-      m_sourceCulture = sourceCulture;
-
-      if( m_sourceCulture == null )
-        m_sourceCulture = CultureInfo.InvariantCulture;
-    }
-
-    public object Convert( object sourceValue, Type targetType, object parameter, CultureInfo targetCulture )
-    {
-      if( ( sourceValue == DBNull.Value ) || ( sourceValue == null ) )
-        return null;
-
-      Exception exception;
-      return DefaultDataConverter.TryConvert( sourceValue, targetType, CultureInfo.InvariantCulture, targetCulture, out exception );
-    }
-
-    public object ConvertBack( 
-      object targetValue, 
-      Type sourceType,
-      object parameter, 
-      CultureInfo targetCulture )
-    {
-      Exception exception;
-      return this.TryConvertBack( targetValue, sourceType, m_sourceCulture, targetCulture, out exception );
-    }
-
-    internal object TryConvertBack( 
-      object targetValue, 
-      Type sourceType,
-      CultureInfo sourceCulture,
-      CultureInfo targetCulture,
-      out Exception exception )
-    {
-      exception = null;
-
-      if( ( targetValue == null ) || ( targetValue == DBNull.Value ) 
-        || ( ( sourceType != typeof( string ) ) && ( string.Empty.Equals( targetValue ) ) ) )
-      {
-        if( m_sourceSupportsDBNull )
-        {
-          return DBNull.Value;
-        }
-        else
-        {
-          return null;
-        }
-      }
-
-      return DefaultDataConverter.TryConvert( targetValue, sourceType, targetCulture, sourceCulture, out exception );
-    }
-
-    public bool SourceSupportsDBNull
-    {
-      get
-      {
-        return m_sourceSupportsDBNull;
-      }
-
-      set
-      {
-        m_sourceSupportsDBNull = value;
-      }
-    }
-
-    bool m_sourceSupportsDBNull; // = false
-    CultureInfo m_sourceCulture;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatConverter.cs
deleted file mode 100644
index fdfa4f0d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatConverter.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( object ), typeof( string ) )]
-  public class StringFormatConverter : IValueConverter
-  {
-    #region FormatProvider Property
-
-    private IFormatProvider m_formatProvider;
-
-    public IFormatProvider FormatProvider
-    {
-      get
-      {
-        return m_formatProvider;
-      }
-      set
-      {
-        m_formatProvider = value;
-      }
-    }
-
-    #endregion FormatProvider Property
-
-    #region IValueConverter Members
-
-    public virtual object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( ( value == null ) || ( value is DBNull ) )
-        return string.Empty;
-
-      string format = StringFormatConverter.GetFormat( parameter as string );
-
-      if( format == null )
-      {
-        return value;
-      }
-      else
-      {
-        if( m_formatProvider == null )
-        {
-          return string.Format( culture, format, value );
-        }
-        else
-        {
-          return string.Format( m_formatProvider, format, value );
-        }
-      }
-    }
-
-    public virtual object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion
-
-    private static string GetFormat( string format )
-    {
-      if( format == null )
-        return null;
-
-      int formatLength = format.Length;
-      StringBuilder workingFormat = new StringBuilder( formatLength );
-      char character;
-      bool previousIsOpenBracket = false;
-
-      for( int i = 0; i < formatLength; i++ )
-      {
-        character = format[ i ];
-
-        if( character == '[' )
-        {
-          if( previousIsOpenBracket )
-          {
-            workingFormat.Append( '[' );
-            previousIsOpenBracket = false;
-          }
-          else
-          {
-            previousIsOpenBracket = true;
-          }
-        }
-        else if( character == ']' )
-        {
-          if( previousIsOpenBracket )
-          {
-            workingFormat.Append( ']' );
-            previousIsOpenBracket = false;
-          }
-          else
-          {
-            workingFormat.Append( '}' );
-          }
-        }
-        else
-        {
-          if( previousIsOpenBracket )
-          {
-            workingFormat.Append( "{0:" );
-            previousIsOpenBracket = false;
-          }
-
-          workingFormat.Append( character );
-        }
-      }
-
-      string resultingFormat = workingFormat.ToString();
-
-      if( ( !resultingFormat.Contains( "{0:" ) ) && ( !resultingFormat.Contains( "{0}" ) ) )
-      {
-        workingFormat.Insert( 0, "{0:" );
-        workingFormat.Append( '}' );
-        resultingFormat = workingFormat.ToString();
-      }
-
-      return resultingFormat;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatMultiConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatMultiConverter.cs
deleted file mode 100644
index 288849a7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatMultiConverter.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Converters
-{
-  public class StringFormatMultiConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( values == null ) || ( values.Length <= 0 ) )
-        return null;
-
-      var data = values[ 0 ];
-
-      var format = ( values.Length > 1 ) ? values[ 1 ] as string : null;
-      if( string.IsNullOrEmpty( format ) )
-        return data;
-
-      var currentCulture = ( values.Length > 2 ) ? values[ 2 ] as CultureInfo : null;
-      if( currentCulture == null )
-      {
-        currentCulture = culture ?? CultureInfo.CurrentCulture;
-      }
-
-      return string.Format( currentCulture, format, data );
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SynchronizedScrollViewerMultiConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SynchronizedScrollViewerMultiConverter.cs
deleted file mode 100644
index ee65aba9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SynchronizedScrollViewerMultiConverter.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Converters
-{
-  internal class SynchronizedScrollViewerMultiConverter : IMultiValueConverter
-  {
-    #region IMultiValueConverter Members
-
-    public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      double largestValue = 0d;
-
-      foreach( double value in values )
-      {
-        if( value > largestValue )
-        {
-          largestValue = value;
-        }
-      }
-
-      return largestValue;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return null;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ThicknessConverter.cs
deleted file mode 100644
index b2ad2c19..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ThicknessConverter.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [ValueConversion( typeof( double ), typeof( Thickness ) )]
-  public class ThicknessConverter : IValueConverter
-  {
-    private bool m_inverseValue;
-
-    public bool InverseValue
-    {
-      get
-      {
-        return m_inverseValue;
-      }
-      set
-      {
-        m_inverseValue = value;
-      }
-    }
-
-
-    #region IValueConverter Members
-
-    public object Convert( 
-      object value, 
-      Type targetType, 
-      object parameter, 
-      CultureInfo culture )
-    {
-      if( ( !targetType.IsAssignableFrom( typeof( Thickness ) ) )
-        || ( value == null )
-        || ( value.GetType() != typeof( double ) ) )
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      ThicknessSides sides = ThicknessSides.All; // Defaults to All when no parameter is present;
-      if(parameter != null)
-      {
-        Type parameterType = parameter.GetType();
-        if( parameterType == typeof(ThicknessSides) )
-        {
-          sides = ( ThicknessSides )parameter;
-        }
-        else if( parameterType == typeof( string ) )
-        {
-          string stringParameter = (string)parameter;
-          if( !string.IsNullOrEmpty( stringParameter ) )
-          {
-            try
-            {
-              sides = ( ThicknessSides )Enum.Parse( typeof( ThicknessSides ), stringParameter );
-            }
-            catch
-            {
-              return DependencyProperty.UnsetValue;
-            }
-          }
-        }
-        else
-        {
-          return DependencyProperty.UnsetValue;
-        }
-      }
-
-      double doubleValue = ( double )value;
-
-      if( this.InverseValue == true )
-      {
-        doubleValue *= -1;
-      }
-
-      Thickness thickness = new Thickness();
-
-      if( IsSideSet( sides, ThicknessSides.Left ) )
-        thickness.Left = doubleValue;
-
-      if( IsSideSet( sides, ThicknessSides.Top ) )
-        thickness.Top = doubleValue;
-
-      if( IsSideSet( sides, ThicknessSides.Right ) )
-        thickness.Right = doubleValue;
-
-      if( IsSideSet( sides, ThicknessSides.Bottom ) )
-        thickness.Bottom = doubleValue;
-
-      return thickness;
-    }
-
-    public object ConvertBack( 
-      object value, 
-      Type targetType, 
-      object parameter, 
-      CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion
-
-    private static bool IsSideSet( ThicknessSides sides, ThicknessSides sideToTest )
-    {
-      return ( ( sides & sideToTest ) == sideToTest );
-    }
-
-    [Flags]
-    public enum ThicknessSides
-    {
-      Left = 0x01,
-      Top = 0x02,
-      Right = 0x04,
-      Bottom = 0x08,
-      All = 0x0F
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TreeViewLineConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TreeViewLineConverter.cs
deleted file mode 100644
index d5db71b8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TreeViewLineConverter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Windows.Controls;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public class TreeViewLineConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      TreeViewItem item = ( TreeViewItem )value;
-      ItemsControl ic = ItemsControl.ItemsControlFromItemContainer( item );
-
-      return ic.ItemContainerGenerator.IndexFromContainer( item ) == ic.Items.Count - 1;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-  }
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToBooleanConverter.cs
deleted file mode 100644
index f47fd34f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToBooleanConverter.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Converters
-{
-  public class TypeToBooleanConverter : IValueConverter
-  {
-    #region Singleton Property
-
-    public static TypeToBooleanConverter Singleton
-    {
-      get
-      {
-        if( mg_singleton == null )
-          mg_singleton = new TypeToBooleanConverter();
-
-        return mg_singleton;
-      }
-    }
-
-    private static TypeToBooleanConverter mg_singleton;
-
-    #endregion Singleton Property
-
-    #region IValueConverter Implementation
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( value == null ) || ( parameter == null ) )
-        return false;
-
-      Type typeToVerify = (Type)parameter;
-
-      Type valueType = value.GetType();
-
-      if( typeof(Type).IsAssignableFrom( valueType ) == true )
-      {
-        valueType = (Type) value;
-      }
-
-      bool retval = typeToVerify.IsAssignableFrom( valueType );
-
-      return retval;
-    }
-
-    public object ConvertBack(
-      object value,
-      Type targetType,
-      object parameter,
-      CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion IValueConverter Implementation
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToVisibilityConverter.cs
deleted file mode 100644
index 4ae5b69d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToVisibilityConverter.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Converters
-{
-  public class TypeToVisibilityConverter : IValueConverter
-  {
-    #region Visibility Property
-
-    public Visibility Visibility
-    {
-      get
-      {
-        return m_visibility;
-      }
-      set
-      {
-        m_visibility = value;
-      }
-    }
-
-    private Visibility m_visibility = Visibility.Visible;
-
-    #endregion
-
-    #region SetVisibilityWhenTrue Property
-
-    public bool SetVisibilityWhenTrue
-    {
-      get
-      {
-        return m_setVisibilityWhenTrue;
-      }
-      set
-      {
-        m_setVisibilityWhenTrue = value;
-      }
-    }
-
-    private bool m_setVisibilityWhenTrue = false;
-
-    #endregion
-
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      Type toCompareWith = parameter as Type;
-
-      if( ( toCompareWith == null )
-        || ( value == null ) )
-      {
-        return DependencyProperty.UnsetValue;
-      }
-
-      if( toCompareWith.IsAssignableFrom( value.GetType() ) == m_setVisibilityWhenTrue )
-        return m_visibility;
-
-      return DependencyProperty.UnsetValue;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ValueToMaskedTextConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ValueToMaskedTextConverter.cs
deleted file mode 100644
index 675ac832..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ValueToMaskedTextConverter.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Data;
-using System.ComponentModel;
-using System.Reflection;
-using Xceed.Wpf.Toolkit;
-
-namespace Xceed.Wpf.DataGrid.Converters
-{
-  public class ValueToMaskedTextConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1800:DoNotCastUnnecessarily" )]
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( !targetType.IsAssignableFrom( typeof( string ) ) )
-        return DependencyProperty.UnsetValue;
-
-      string workingText = ( value == null ) ? string.Empty : value.ToString();
-
-      string mask = null; // Defaults to no mask when no parameter is specified.
-
-      if( parameter != null )
-      {
-        Type parameterType = parameter.GetType();
-        if( parameterType == typeof( string ) )
-        {
-          string stringParameter = ( string )parameter;
-
-          if( !string.IsNullOrEmpty( stringParameter ) )
-            mask = stringParameter;
-        }
-        else
-        {
-          return DependencyProperty.UnsetValue;
-        }
-      }
-
-      if( !string.IsNullOrEmpty( mask ) )
-      {
-        try
-        {
-          string rawText = string.Empty;
-
-          CultureInfo currentCulture = CultureInfo.CurrentCulture;
-
-          if( value != null )
-          {
-            try
-            {
-              Type valueDataType = value.GetType();
-
-              MethodInfo valueToStringMethodInfo =
-                valueDataType.GetMethod( "ToString", new Type[] { typeof( string ), typeof( IFormatProvider ) } );
-
-              string formatSpecifier = MaskedTextBox.GetFormatSpecifierFromMask( mask, currentCulture );
-
-              if( valueToStringMethodInfo != null )
-              {
-                rawText = ( string )valueToStringMethodInfo.Invoke( value, new object[] { formatSpecifier, currentCulture } );
-              }
-              else
-              {
-                rawText = value.ToString();
-              }
-            }
-            catch
-            {
-              rawText = value.ToString();
-            }
-          }
-
-          MaskedTextProvider maskedTextProvider = new MaskedTextProvider( mask, currentCulture );
-
-          maskedTextProvider.Set( rawText );
-
-          return maskedTextProvider.ToString( false, true );
-        }
-        catch
-        {
-        }
-      }
-
-      return value.ToString();
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return Binding.DoNothing;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs
deleted file mode 100644
index ea7925d2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class CurrencyManager : IWeakEventListener
-  {
-    internal CurrencyManager( DataGridContext dataGridContext, CollectionView collectionView )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      if( collectionView == null )
-        throw new ArgumentNullException( "collectionView" );
-
-      m_dataGridContext = dataGridContext;
-      m_collectionView = collectionView;
-
-      Debug.Assert( m_dataGridContext.CurrentItem == m_collectionView.CurrentItem );
-
-      this.RegisterListeners();
-    }
-
-    #region IsSetCurrentInProgress Private Property
-
-    private bool IsSetCurrentInProgress
-    {
-      get
-      {
-        return m_dataGridContext.DataGridControl.IsSetCurrentInProgress;
-      }
-    }
-
-    #endregion
-
-    #region ShouldSynchronizeCurrentItem Private Property
-
-    private bool ShouldSynchronizeCurrentItem
-    {
-      get
-      {
-        return m_dataGridContext.DataGridControl.ShouldSynchronizeCurrentItem;
-      }
-    }
-
-    #endregion
-
-    #region ShouldSynchronizeSelectionWithCurrent Private Property
-
-    private bool ShouldSynchronizeSelectionWithCurrent
-    {
-      get
-      {
-        // #case 158670 
-        // When using DataGridVirtualizingCollectionViewBase, the synchronization between
-        // currentItem and Selection will only be done if currentItem is modified in code-behind.
-        var dgvcvb = m_collectionView.SourceCollection as DataGridVirtualizingCollectionViewBase;
-        if( ( dgvcvb != null ) && !dgvcvb.CanSynchronizeSelectionWithCurrent )
-          return false;
-
-        return m_dataGridContext.DataGridControl.SynchronizeSelectionWithCurrent;
-      }
-    }
-
-    #endregion
-
-    internal void CleanManager()
-    {
-      this.UnregisterListeners();
-    }
-
-    private void ChangeCollectionViewCurrentItem()
-    {
-      if( m_isCurrentChanging || !this.ShouldSynchronizeCurrentItem )
-        return;
-
-      m_isCurrentChanging = true;
-
-      try
-      {
-        // Synchronize the CurrentItem of the CollecitonView with the one of the DataGridContext.
-        m_collectionView.MoveCurrentToPosition( m_dataGridContext.CurrentItemIndex );
-      }
-      finally
-      {
-        m_isCurrentChanging = false;
-      }
-    }
-
-    private void ChangeDataGridContextCurrentItem()
-    {
-      // Prevent when a SetCurrent is in progress
-      if( this.IsSetCurrentInProgress )
-        return;
-
-      if( m_isCurrentChanging || !this.ShouldSynchronizeCurrentItem )
-        return;
-
-      m_isCurrentChanging = true;
-
-      try
-      {
-        // Synchronize the CurrentItem of the DataGridContext
-        // with the one of the CollecitonView.
-        m_dataGridContext.SetCurrent(
-          m_collectionView.CurrentItem,
-          null,
-          m_collectionView.CurrentPosition,
-          m_dataGridContext.CurrentColumn,
-          false,
-          false,
-          this.ShouldSynchronizeSelectionWithCurrent,
-          AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
-
-        if( m_collectionView.CurrentItem == null )
-        {
-          this.ChangeCurrentDataGridContext();
-        }
-      }
-      catch( DataGridException )
-      {
-        // When we deleted an item in edit that contain invalid data, we don't want a throw to go all the way up to the end user.
-        // We try to abort the edit in that case.
-
-        if( ( m_dataGridContext.IsCurrent ) && ( m_dataGridContext.DataGridControl.IsBeingEdited ) && ( !m_dataGridContext.Items.Contains( m_dataGridContext.CurrentItem ) ) )
-        {
-          m_dataGridContext.CancelEdit();
-
-          m_dataGridContext.SetCurrent(
-            m_collectionView.CurrentItem,
-            null,
-            m_collectionView.CurrentPosition,
-            m_dataGridContext.CurrentColumn,
-            false,
-            false,
-            this.ShouldSynchronizeSelectionWithCurrent,
-            AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
-
-          if( m_collectionView.CurrentItem == null )
-          {
-            this.ChangeCurrentDataGridContext();
-          }
-        }
-      }
-      finally
-      {
-        m_isCurrentChanging = false;
-      }
-    }
-
-    private void ChangeCurrentDataGridContext()
-    {
-      var parentDataGridContext = m_dataGridContext.ParentDataGridContext;
-      var parentItem = m_dataGridContext.ParentItem;
-
-      if( ( parentDataGridContext == null ) || ( parentItem == null ) )
-        return;
-
-      var childContexts = CurrencyManager.GetChildContexts( parentDataGridContext, parentItem ).ToList();
-
-      if( childContexts.Count > 1 )
-      {
-        var currentContextIndex = childContexts.IndexOf( m_dataGridContext );
-        int lookForwardFrom;
-        int lookBackwardFrom;
-
-        if( currentContextIndex < 0 )
-        {
-          lookForwardFrom = 0;
-          lookBackwardFrom = -1;
-        }
-        else
-        {
-          lookForwardFrom = currentContextIndex + 1;
-          lookBackwardFrom = currentContextIndex - 1;
-        }
-
-        for( int i = lookForwardFrom; i < childContexts.Count; i++ )
-        {
-          var childContext = childContexts[ i ];
-          if( childContext.Items.Count <= 0 )
-            continue;
-
-          childContext.SetCurrentItemCore( childContext.Items.GetItemAt( 0 ), false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
-          return;
-        }
-
-        for( int i = lookBackwardFrom; i >= 0; i-- )
-        {
-          var childContext = childContexts[ i ];
-
-          var itemsCount = childContext.Items.Count;
-          if( itemsCount <= 0 )
-            continue;
-
-          childContext.SetCurrentItemCore( childContext.Items.GetItemAt( itemsCount - 1 ), false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
-          return;
-        }
-      }
-
-      // No context after or before us have been found, we will set the CurrentItem to our ParentItem.
-      parentDataGridContext.SetCurrentItemCore( parentItem, false, this.ShouldSynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
-    }
-
-    private void RegisterListeners()
-    {
-      // We are not checking this.ShouldSynchronizeCurrentItem since it might return the wrong value if the grid
-      // is still in the process of being instantiated.
-      CurrentItemChangedEventManager.AddListener( m_dataGridContext, this );
-      CurrentChangedEventManager.AddListener( m_collectionView, this );
-    }
-
-    private void UnregisterListeners()
-    {
-      // We are not checking this.ShouldSynchronizeCurrentItem since it might have returned the wrong value 
-      // when RegisterListeners was called if the grid was still in the process of being instantiated.
-      CurrentItemChangedEventManager.RemoveListener( m_dataGridContext, this );
-      CurrentChangedEventManager.RemoveListener( m_collectionView, this );
-    }
-
-    private static IEnumerable<DataGridContext> GetChildContexts( DataGridContext dataGridContext, object item )
-    {
-      Debug.Assert( dataGridContext != null );
-      Debug.Assert( item != null );
-
-      return ( from detailConfig in dataGridContext.DetailConfigurations
-               let childContext = dataGridContext.GetChildContext( item, detailConfig )
-               where ( childContext != null )
-               select childContext );
-    }
-
-    private void OnDataGridContextCurrentItemChanged( object sender, EventArgs e )
-    {
-      Debug.Assert( sender == m_dataGridContext );
-
-      this.ChangeCollectionViewCurrentItem();
-    }
-
-    private void OnCollectionViewCurrentChanged( object sender, EventArgs e )
-    {
-      Debug.Assert( sender == m_collectionView );
-
-      this.ChangeDataGridContextCurrentItem();
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CurrentItemChangedEventManager ) )
-      {
-        this.OnDataGridContextCurrentItemChanged( sender, e );
-      }
-      else if( managerType == typeof( CurrentChangedEventManager ) )
-      {
-        this.OnCollectionViewCurrentChanged( sender, e );
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private readonly DataGridContext m_dataGridContext;
-    private readonly CollectionView m_collectionView;
-    private bool m_isCurrentChanging;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs
deleted file mode 100644
index 6d83fceb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Xml;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataCell : Cell
-  {
-    static DataCell()
-    {
-    }
-
-    public DataCell()
-    {
-    }
-
-    public DataCell( string fieldName, object content )
-    {
-      this.FieldName = fieldName;
-      this.Content = content;
-    }
-
-    #region CanBeRecycled Property
-
-    protected internal override bool CanBeRecycled
-    {
-      get
-      {
-        return ( m_canBeRecycled )
-            && ( base.CanBeRecycled );
-      }
-    }
-
-    private bool m_canBeRecycled; //= false
-
-    #endregion
-
-    #region OverrideColumnCellContentTemplate Property
-
-    protected override bool OverrideColumnCellContentTemplate
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    #endregion
-
-
-    protected override void OnMouseEnter( MouseEventArgs e )
-    {
-      //If the current CellEditorDisplayConditions requires display when mouse is over the Cell 
-      if( Cell.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.MouseOverCell ) )
-      {
-        //Display the editors for the Row
-        this.SetDisplayEditorMatchingCondition( CellEditorDisplayConditions.MouseOverCell );
-      }
-
-      base.OnMouseEnter( e );
-    }
-
-    protected override void OnMouseLeave( MouseEventArgs e )
-    {
-      //If the current CellEditorDisplayConditions requires display when mouse is over the Cell 
-      if( Cell.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.MouseOverCell ) )
-      {
-        //Display the editors for the Row
-        this.RemoveDisplayEditorMatchingCondition( CellEditorDisplayConditions.MouseOverCell );
-      }
-
-      base.OnMouseLeave( e );
-    }
-
-    protected override void InitializeCore( DataGridContext dataGridContext, Row parentRow, ColumnBase parentColumn )
-    {
-      ColumnBase oldParentColumn = this.ParentColumn;
-
-      base.InitializeCore( dataGridContext, parentRow, parentColumn );
-
-      //
-      // For an unknown reason, when a recycled DataCell was added back to the VisualTree (added
-      // to the CellsHostPanel in its ParentRow), the binding would fail to update when the XPath
-      // expression contained a namespace prefix, even if the XmlNamespaceManager property is inherited
-      // and querying for the value of this property after adding the DataCell to the VTree would return
-      // a valid, non-null XmlNamespaceManager.
-      //
-      // Forcing a local value for the XmlNamespaceManager property solves this problem, but it is
-      // not the best thing to do as we are effectively bypassing the inheritance behavior for this
-      // property...
-      this.SetValue( Binding.XmlNamespaceManagerProperty, dataGridContext.DataGridControl.GetValue( Binding.XmlNamespaceManagerProperty ) );
-
-      //prevent the setup of the display member binding more than once on the same column!
-      if( ( !this.IsInternalyInitialized ) || ( oldParentColumn != parentColumn ) )
-      {
-        //call the helper function to setup the Cell's binding.
-        this.SetupDisplayMemberBinding( dataGridContext );
-      }
-    }
-
-    protected internal override void PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      base.PrepareContainer( dataGridContext, item );
-
-      if( dataGridContext.SelectedCellsStore.Contains( DataGridVirtualizingPanel.GetItemIndex( this.ParentRow ), this.ParentColumn.VisiblePosition ) )
-      {
-        this.SetIsSelected( true );
-      }
-    }
-
-    protected internal override void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      var newThemeKey = view.GetDefaultStyleKey( typeof( DataCell ) );
-      if( object.Equals( this.DefaultStyleKey, newThemeKey ) )
-        return;
-
-      this.DefaultStyleKey = newThemeKey;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters" )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    protected internal virtual void SetupDisplayMemberBinding( DataGridContext dataGridContext )
-    {
-      // Bind the cell content.
-      var column = this.ParentColumn as Column;
-
-      if( column != null )
-      {
-        var displayMemberBinding = default( BindingBase );
-        var dataItem = this.ParentRow.DataContext;
-
-        // If the dataContext is our ParentRow, we do not create any binding
-        if( dataItem != this.ParentRow )
-        {
-          displayMemberBinding = column.GetDisplayMemberBinding();
-
-          if( displayMemberBinding == null )
-          {
-            if( dataGridContext == null )
-              throw new InvalidOperationException( "An attempt was made to create a DisplayMemberBinding before the DataGridContext has been initialized." );
-
-            if( !DesignerProperties.GetIsInDesignMode( this ) )
-            {
-              var propertyDescription = ItemsSourceHelper.CreateOrGetPropertyDescriptionFromColumn( dataGridContext, column, ( dataItem != null ) ? dataItem.GetType() : null );
-              ItemsSourceHelper.UpdateColumnFromPropertyDescription( column, dataGridContext.DataGridControl.DefaultCellEditors, dataGridContext.AutoCreateForeignKeyConfigurations, propertyDescription );
-
-              displayMemberBinding = column.GetDisplayMemberBinding();
-            }
-
-            column.IsBindingAutoCreated = true;
-          }
-        }
-
-        if( displayMemberBinding != null )
-        {
-          m_canBeRecycled = DataCell.VerifyDisplayMemberBinding( displayMemberBinding );
-
-          BindingOperations.SetBinding( this, Cell.ContentProperty, displayMemberBinding );
-
-          var xmlElement = this.GetValue( Cell.ContentProperty ) as XmlElement;
-          if( xmlElement != null )
-          {
-
-
-            // Convert binding to an InnerXML binding in the case we are bound on a XmlElement
-            // to be able to refresh the data in the XML.
-
-            //under any circumstances, a cell that is bound to XML cannot be recycled
-            m_canBeRecycled = false;
-
-            this.ClearDisplayMemberBinding();
-
-            var xmlElementBinding = new Binding( "InnerXml" );
-            xmlElementBinding.Source = xmlElement;
-            xmlElementBinding.Mode = BindingMode.TwoWay;
-            xmlElementBinding.UpdateSourceTrigger = UpdateSourceTrigger.Explicit;
-
-            BindingOperations.SetBinding( this, Cell.ContentProperty, xmlElementBinding );
-          }
-        }
-        else
-        {
-          this.ClearDisplayMemberBinding();
-        }
-      }
-      else
-      {
-        this.ClearDisplayMemberBinding();
-      }
-    }
-
-    internal virtual void ClearDisplayMemberBinding()
-    {
-      if( BindingOperations.IsDataBound( this, Cell.ContentProperty ) )
-      {
-        BindingOperations.ClearBinding( this, Cell.ContentProperty );
-      }
-      else
-      {
-        this.ClearValue( Cell.ContentProperty );
-      }
-    }
-
-    internal override void ContentCommitted()
-    {
-      base.ContentCommitted();
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      DataRow parentRow = this.ParentRow as DataRow;
-
-      if( ( dataGridContext != null ) && ( parentRow != null ) )
-        parentRow.EnsurePosition( dataGridContext, this );
-    }
-
-    internal override DataTemplate GetForeignKeyDataTemplate()
-    {
-      var column = this.ParentColumn as Column;
-      if( column == null )
-        return null;
-
-      // If a foreignKey CellContentTemplate was found by the configuration, it must be used even if a CellContentTemplate is defined
-      // because the CellContentTemplate will be used by this template
-      var configuration = column.ForeignKeyConfiguration;
-      if( configuration == null )
-        return null;
-
-      return configuration.DefaultCellContentTemplate;
-    }
-
-    internal override DataTemplate GetCellStringFormatDataTemplate( DataTemplate contentTemplate )
-    {
-      // parentColumn is verified to be not null in the calling method
-      var parentColumn = this.ParentColumn;
-
-      var format = parentColumn.CellContentStringFormat;
-      Debug.Assert( !string.IsNullOrEmpty( format ) );
-
-      return StringFormatDataTemplate.Get( contentTemplate, format, parentColumn.GetCulture() );
-    }
-
-    private static bool VerifyDisplayMemberBinding( BindingBase binding )
-    {
-      bool retval = false;
-      //a DataCell can only be recycled if the DisplayMemberBinding is of type Binding
-      //and have no source, relativesource, elementname
-
-      Binding displayMemberBinding = binding as Binding;
-
-      if( displayMemberBinding != null )
-      {
-        if( ( ( displayMemberBinding.Source == null ) || ( displayMemberBinding.Source == DependencyProperty.UnsetValue ) )
-          && ( ( displayMemberBinding.RelativeSource == null ) || ( displayMemberBinding.Source == DependencyProperty.UnsetValue ) )
-          && ( string.IsNullOrEmpty( displayMemberBinding.ElementName ) == true ) )
-        {
-          retval = true;
-        }
-      }
-
-      return retval;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs
deleted file mode 100644
index becf2ff1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs
+++ /dev/null
@@ -1,279 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataGridBindingInfo
-  {
-    public DataGridBindingInfo()
-    {
-      m_binding = new Binding();
-
-      m_binding.Mode = BindingMode.TwoWay;
-      m_binding.UpdateSourceTrigger = UpdateSourceTrigger.Explicit;
-      m_binding.ConverterCulture = CultureInfo.CurrentCulture;
-
-      m_binding.ValidatesOnDataErrors = true;
-      m_binding.ValidatesOnExceptions = true;
-
-      m_binding.NotifyOnTargetUpdated = true;
-      m_binding.NotifyOnValidationError = true;
-    }
-
-    #region BindsDirectlyToSource Property
-
-    public bool BindsDirectlyToSource
-    {
-      get
-      {
-        return m_binding.BindsDirectlyToSource;
-      }
-
-      set
-      {
-        m_binding.BindsDirectlyToSource = value;
-      }
-    }
-
-    #endregion BindsDirectlyToSource Property
-
-    #region Converter Property
-
-    public IValueConverter Converter
-    {
-      get
-      {
-        return m_binding.Converter;
-      }
-
-      set
-      {
-        m_binding.Converter = value;
-      }
-    }
-
-    #endregion Converter Property
-
-    #region ConverterCulture Property
-
-    public CultureInfo ConverterCulture
-    {
-      get
-      {
-        return m_binding.ConverterCulture;
-      }
-
-      set
-      {
-        m_binding.ConverterCulture = value;
-      }
-    }
-
-    #endregion ConverterCulture Property
-
-    #region ConverterParameter Property
-
-    public object ConverterParameter
-    {
-      get
-      {
-        return m_binding.ConverterParameter;
-      }
-
-      set
-      {
-        m_binding.ConverterParameter = value;
-      }
-    }
-
-    #endregion ConverterParameter Property
-
-    #region ElementName Property
-
-    public string ElementName
-    {
-      get
-      {
-        return m_binding.ElementName;
-      }
-
-      set
-      {
-        m_binding.ElementName = value;
-      }
-    }
-
-    #endregion ElementName Property
-
-    #region FallbackValue Property
-
-    public object FallbackValue
-    {
-      get
-      {
-        return m_binding.FallbackValue;
-      }
-
-      set
-      {
-        m_binding.FallbackValue = value;
-      }
-    }
-
-    #endregion FallbackValue Property
-
-    #region IsAsync Property
-
-    public bool IsAsync
-    {
-      get
-      {
-        return m_binding.IsAsync;
-      }
-
-      set
-      {
-        m_binding.IsAsync = value;
-      }
-    }
-
-    #endregion IsAsync Property
-
-    #region NotifyOnSourceUpdated Property
-
-    public bool NotifyOnSourceUpdated
-    {
-      get
-      {
-        return m_binding.NotifyOnSourceUpdated;
-      }
-
-      set
-      {
-        m_binding.NotifyOnSourceUpdated = value;
-      }
-    }
-
-    #endregion NotifyOnSourceUpdated Property
-
-    #region Path Property
-
-    public PropertyPath Path
-    {
-      get
-      {
-        return m_binding.Path;
-      }
-
-      set
-      {
-        m_binding.Path = value;
-      }
-    }
-
-    #endregion Path Property
-
-    #region ReadOnly Property
-
-    public bool ReadOnly
-    {
-      get
-      {
-        return ( m_binding.Mode == BindingMode.OneWay );
-      }
-
-      set
-      {
-        if( value )
-        {
-          m_binding.Mode = BindingMode.OneWay;
-        }
-        else
-        {
-          m_binding.Mode = BindingMode.TwoWay;
-        }
-      }
-    }
-
-    #endregion ReadOnly Property
-
-    #region UpdateSourceExceptionFilter Property
-
-    public UpdateSourceExceptionFilterCallback UpdateSourceExceptionFilter
-    {
-      get
-      {
-        return m_binding.UpdateSourceExceptionFilter;
-      }
-
-      set
-      {
-        m_binding.UpdateSourceExceptionFilter = value;
-      }
-    }
-
-    #endregion UpdateSourceExceptionFilter Property
-
-    #region ValidationRules Property
-
-    public Collection<ValidationRule> ValidationRules
-    {
-      get
-      {
-        return m_binding.ValidationRules;
-      }
-    }
-
-    #endregion ValidationRules Property
-
-    #region XPath Property
-
-    public string XPath
-    {
-      get
-      {
-        return m_binding.XPath;
-      }
-
-      set
-      {
-        m_binding.XPath = value;
-      }
-    }
-
-    #endregion Path Property
-
-    internal Binding GetBinding()
-    {
-      return m_binding;
-    }
-
-    private Binding m_binding;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCommands.cs
deleted file mode 100644
index 59b1d6b0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCommands.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public static class DataGridCommands
-  {
-    static DataGridCommands()
-    {
-      DataGridCommands.BeginEdit.InputGestures.Add( new KeyGesture( Key.F2, ModifierKeys.None ) );
-      DataGridCommands.EndEdit.InputGestures.Add( new KeyGesture( Key.Enter, ModifierKeys.None ) );
-      DataGridCommands.CancelEdit.InputGestures.Add( new KeyGesture( Key.Escape, ModifierKeys.None ) );
-
-      DataGridCommands.Refresh.InputGestures.Add( new KeyGesture( Key.F5, ModifierKeys.None ) );
-
-      DataGridCommands.ApplyFilter.InputGestures.Add( new KeyGesture( Key.Enter, ModifierKeys.None ) );
-    }
-
-    public static readonly RoutedCommand ExpandGroup =
-      new RoutedCommand( "ExpandGroup", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand CollapseGroup = 
-      new RoutedCommand( "CollapseGroup", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand ToggleGroupExpansion = 
-      new RoutedCommand( "ToggleGroupExpansion", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand ExpandDetails =
-      new RoutedCommand( "ExpandDetails", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand CollapseDetails =
-      new RoutedCommand( "CollapseDetails", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand ToggleDetailExpansion =
-      new RoutedCommand( "ToggleDetailExpansion", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand BeginEdit = 
-      new RoutedCommand( "BeginEdit", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand EndEdit = 
-      new RoutedCommand( "EndEdit", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand CancelEdit = 
-      new RoutedCommand( "CancelEdit", typeof( DataGridCommands ) );
-
-    [ Obsolete( "This command is obsolete and should no longer be used." ) ]
-    public static readonly RoutedCommand SelectRow = 
-      new RoutedCommand( "SelectRow", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand Refresh =
-      new RoutedCommand( "Refresh", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand ApplyFilter =
-      new RoutedCommand( "ApplyFilter", typeof( DataGridCommands ) );
-
-    public static readonly RoutedCommand ClearFilter =
-      new RoutedCommand( "ClearFilter", typeof( DataGridCommands ) );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs
deleted file mode 100644
index d5cdbd17..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs
+++ /dev/null
@@ -1,4317 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Media;
-using Xceed.Utils.Collections;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-    public sealed class DataGridContext : DependencyObject, INotifyPropertyChanged, IWeakEventListener, IDataGridContextVisitable, ICustomTypeDescriptor
-    {
-        internal DataGridContext(
-          DataGridContext parentDataGridContext,
-          DataGridControl dataGridControl,
-          object parentItem,
-          CollectionView collectionView,
-          DetailConfiguration detailConfiguration)
-        {
-            if (dataGridControl == null)
-                throw new ArgumentNullException("dataGridControl");
-
-            if (collectionView == null)
-                throw new ArgumentNullException("collectionView");
-
-            // ParentItem cannot be null except when dealing with the root DataGridContext.
-            if ((parentDataGridContext != null) && (parentItem == null))
-                throw new ArgumentNullException("parentItem");
-
-            m_parentDataGridContext = parentDataGridContext; //voluntarily not validating if not null... this will be null for master level.
-            m_dataGridControl = dataGridControl;
-            m_dataGridControlItemsSource = m_dataGridControl.ItemsSource;
-            m_parentItem = parentItem;
-            m_items = collectionView;
-            m_detailConfig = detailConfiguration; //voluntarily not validating if not null... this will be null for master level.
-
-            m_currencyManager = new CurrencyManager(this, m_items);
-
-            m_selectedItemsStore = new SelectedItemsStorage(this);
-            m_selectedCellsStore = new SelectedCellsStorage(this);
-            m_selectedItemsRanges = new SelectionItemRangeCollection(m_selectedItemsStore);
-            m_selectedCellRanges = new SelectionCellRangeCollection(m_selectedCellsStore);
-            m_selectedItems = new SelectionItemCollection(m_selectedItemsStore);
-
-            CollectionChangedEventManager.AddListener(m_items, this);
-
-            var dataGridCollectionViewBase = m_items as DataGridCollectionViewBase;
-            if (dataGridCollectionViewBase != null)
-            {
-                PreBatchCollectionChangedEventManager.AddListener(dataGridCollectionViewBase, this);
-                PostBatchCollectionChangedEventManager.AddListener(dataGridCollectionViewBase, this);
-            }
-
-            //if this is a DataGridCollectionView
-            var dataGridCollectionView = m_items as DataGridCollectionView;
-            if (dataGridCollectionView != null)
-            {
-                //Set its dataGridContext so it can propagate a DeferRefresh to details' DataGridCollectionView's
-                dataGridCollectionView.PrepareRootContextForDeferRefresh(this);
-            }
-
-            //If the detailConfiguration is null then we are in the master...
-            if (m_detailConfig == null)
-            {
-                var columns = new ColumnCollection(dataGridControl, null);
-
-                m_columnManager = new ColumnHierarchyManager(columns);
-                m_itemsSourcePropertyDescriptions = dataGridControl.ItemsSourcePropertyDescriptions;
-                m_itemPropertyMap = dataGridControl.ItemPropertyMap;
-                m_groupLevelDescriptions = new GroupLevelDescriptionCollection();
-
-                //in this particular case, I need to create a SortDescriptionsSyncContext to ensure I will be able to synchronize access to the sort descriptions collection.
-                m_sortDescriptionsSyncContext = new SortDescriptionsSyncContext();
-
-                //Register to the Columns Collection's CollectionChanged event to manage the Removal of the CurrentColumn.
-                CollectionChangedEventManager.AddListener(m_columnManager.Columns, this);
-
-                // Register to the VisibleColumnsChanged to update, if need be, the columns desired width when column stretching is active and there's a column reordering.
-                CollectionChangedEventManager.AddListener(m_columnManager.VisibleColumns, this);
-
-                CollectionChangedEventManager.AddListener(m_items.SortDescriptions, this);
-                CollectionChangedEventManager.AddListener(m_items.GroupDescriptions, this);
-
-                GroupConfigurationSelectorChangedEventManager.AddListener(m_dataGridControl, this);
-                AllowDetailToggleChangedEventManager.AddListener(m_dataGridControl, this);
-                MaxGroupLevelsChangedEventManager.AddListener(m_dataGridControl, this);
-                MaxSortLevelsChangedEventManager.AddListener(m_dataGridControl, this);
-                ItemsSourceChangeCompletedEventManager.AddListener(m_dataGridControl, this);
-
-                this.HookToItemPropertiesChanged();
-            }
-            //Detail DataGridContext
-            else
-            {
-                m_detailConfig.AddDataGridContext(this);
-
-                m_columnManager = m_detailConfig.ColumnManager;
-                m_itemsSourcePropertyDescriptions = m_detailConfig.ItemsSourcePropertyDescriptions;
-                m_itemPropertyMap = m_detailConfig.ItemPropertyMap;
-
-                //only listen to the detail grid config current column changed if the detail grid config is synchronized.
-                CurrentColumnChangedEventManager.AddListener(m_detailConfig, this);
-
-                GroupConfigurationSelectorChangedEventManager.AddListener(m_detailConfig, this);
-                AllowDetailToggleChangedEventManager.AddListener(m_detailConfig, this);
-
-                // Register to the VisibleColumnsChanged to update, if need be, the columns desired width
-                // when column stretching is active and there's a column reordering.
-                CollectionChangedEventManager.AddListener(m_detailConfig.VisibleColumns, this);
-
-                MaxGroupLevelsChangedEventManager.AddListener(m_detailConfig, this);
-                MaxSortLevelsChangedEventManager.AddListener(m_detailConfig, this);
-
-                m_detailConfig.DetailConfigurations.DataGridControl = dataGridControl;
-            }
-
-            Debug.Assert(m_columnManager != null);
-            Debug.Assert(m_itemsSourcePropertyDescriptions != null);
-            Debug.Assert(m_itemPropertyMap != null);
-
-            ColumnsLayoutChangingEventManager.AddListener(m_columnManager, this);
-            ColumnsLayoutChangedEventManager.AddListener(m_columnManager, this);
-            DetailVisibilityChangedEventManager.AddListener(this.DetailConfigurations, this);
-            RealizedContainersRequestedEventManager.AddListener(this.Columns, this);
-            DistinctValuesRequestedEventManager.AddListener(this.Columns, this);
-
-            this.SetupViewProperties();
-            this.InitializeViewProperties();
-
-            ViewChangedEventManager.AddListener(m_dataGridControl, this);
-
-            GroupLevelDescriptionCollection groupLevelDescriptions = this.GroupLevelDescriptions;
-            ObservableCollection<GroupDescription> groupDescriptions = m_items.GroupDescriptions;
-            if (groupLevelDescriptions.Count != groupDescriptions.Count)
-            {
-                DataGridContext.UpdateGroupLevelDescriptions(groupLevelDescriptions, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset), groupDescriptions, this.Columns);
-            }
-
-            // Set the value of DetailLevel property
-            DataGridContext tempDataGridContext = this.ParentDataGridContext;
-            while (tempDataGridContext != null)
-            {
-                this.DetailLevel++;
-                tempDataGridContext = tempDataGridContext.ParentDataGridContext;
-            }
-        }
-
-        private void Items_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (m_deferSelectionChangedOnItemsCollectionChanged != null)
-            {
-                m_deferSelectionChangedOnItemsCollectionChanged.Queue(e);
-            }
-            else
-            {
-                this.UpdateSelectionAfterSourceCollectionChanged(e);
-            }
-        }
-
-        private void UpdateSelectionAfterSourceCollectionChanged(NotifyCollectionChangedEventArgs e)
-        {
-            if (m_dataGridControl.SelectedIndexPropertyNeedCoerce)
-            {
-                m_dataGridControl.CoerceValue(DataGridControl.SelectedIndexProperty);
-            }
-
-            if (m_dataGridControl.SelectedItemPropertyNeedCoerce)
-            {
-                m_dataGridControl.CoerceValue(DataGridControl.SelectedItemProperty);
-            }
-
-            m_dataGridControl.SelectionChangerManager.UpdateSelectionAfterSourceCollectionChanged(this, e);
-
-        }
-
-        internal void CleanDataGridContext()
-        {
-            m_currencyManager.CleanManager();
-
-            if (m_items != null)
-            {
-                CollectionChangedEventManager.RemoveListener(m_items, this);
-
-                var dataGridCollectionViewBase = this.ItemsSourceCollection as DataGridCollectionViewBase;
-                if (dataGridCollectionViewBase != null)
-                {
-                    dataGridCollectionViewBase.Dispose();
-                }
-            }
-
-            if (m_detailConfig == null)
-            {
-                GroupConfigurationSelectorChangedEventManager.RemoveListener(m_dataGridControl, this);
-                AllowDetailToggleChangedEventManager.RemoveListener(m_dataGridControl, this);
-                MaxGroupLevelsChangedEventManager.RemoveListener(m_dataGridControl, this);
-                MaxSortLevelsChangedEventManager.RemoveListener(m_dataGridControl, this);
-                ItemsSourceChangeCompletedEventManager.RemoveListener(m_dataGridControl, this);
-
-                CollectionChangedEventManager.RemoveListener(m_items.SortDescriptions, this);
-                CollectionChangedEventManager.RemoveListener(m_items.GroupDescriptions, this);
-
-                this.UnhookToItemPropertiesChanged(m_dataGridControlItemsSource as DataGridCollectionViewBase);
-            }
-            else
-            {
-                CurrentColumnChangedEventManager.RemoveListener(m_detailConfig, this);
-                GroupConfigurationSelectorChangedEventManager.RemoveListener(m_detailConfig, this);
-                AllowDetailToggleChangedEventManager.RemoveListener(m_detailConfig, this);
-                CollectionChangedEventManager.RemoveListener(m_detailConfig.VisibleColumns, this);
-                MaxGroupLevelsChangedEventManager.RemoveListener(m_detailConfig, this);
-                MaxSortLevelsChangedEventManager.RemoveListener(m_detailConfig, this);
-
-                m_detailConfig.RemoveDataGridContext(this);
-            }
-
-            this.ClearSizeStates();
-
-            ColumnsLayoutChangingEventManager.RemoveListener(m_columnManager, this);
-            ColumnsLayoutChangedEventManager.RemoveListener(m_columnManager, this);
-            CollectionChangedEventManager.RemoveListener(this.DetailConfigurations, this);
-            DetailVisibilityChangedEventManager.RemoveListener(this.DetailConfigurations, this);
-            RealizedContainersRequestedEventManager.RemoveListener(this.Columns, this);
-            DistinctValuesRequestedEventManager.RemoveListener(this.Columns, this);
-
-            ViewChangedEventManager.RemoveListener(m_dataGridControl, this);
-
-            var columnVirtualizationManager = this.ColumnVirtualizationManager;
-            if (columnVirtualizationManager != null)
-            {
-                columnVirtualizationManager.CleanManager();
-                ColumnVirtualizationManager.ClearColumnVirtualizationManager(this);
-            }
-
-            this.ClearViewPropertyBindings();
-
-            if (m_defaultDetailConfiguration != null)
-            {
-                GroupConfigurationSelectorChangedEventManager.RemoveListener(m_defaultDetailConfiguration, this);
-                m_defaultDetailConfiguration = null;
-            }
-        }
-
-        //---------- PUBLIC PROPERTIES ----------
-
-        #region ParentDataGridContext Read-Only Property
-
-        public DataGridContext ParentDataGridContext
-        {
-            get
-            {
-                return m_parentDataGridContext;
-            }
-        }
-
-        private readonly DataGridContext m_parentDataGridContext; // = null
-
-        #endregion
-
-        #region ParentItem Read-Only Property
-
-        public object ParentItem
-        {
-            get
-            {
-                return m_parentItem;
-            }
-        }
-
-        private readonly object m_parentItem;
-
-        #endregion
-
-        #region AllowDetailToggle Property
-
-        public bool AllowDetailToggle
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.AllowDetailToggle;
-
-                    return m_detailConfig.AllowDetailToggle;
-                }
-
-                return m_dataGridControl.AllowDetailToggle;
-            }
-        }
-
-        #endregion
-
-        #region DistinctValues Property
-
-        public IDictionary<string, ReadOnlyObservableHashList> DistinctValues
-        {
-            get
-            {
-                var dataGridCollectionViewBase = this.ItemsSourceCollection as DataGridCollectionViewBase;
-                if (dataGridCollectionViewBase == null)
-                    return null;
-
-                return null;
-            }
-        }
-
-        #endregion
-
-        #region Columns Read-Only Property
-
-        public ColumnCollection Columns
-        {
-            get
-            {
-                return m_columnManager.Columns;
-            }
-        }
-
-        #endregion
-
-        #region Items Property
-
-        public CollectionView Items
-        {
-            get
-            {
-                return m_items;
-            }
-        }
-
-        private readonly CollectionView m_items;
-
-        #endregion
-
-        #region OriginalItems Property
-
-        internal IEnumerable ItemsSourceCollection
-        {
-            get
-            {
-                if (m_parentDataGridContext != null)
-                    return m_items;
-
-                return m_dataGridControl.ItemsSource;
-            }
-        }
-
-        #endregion
-
-        #region CurrentColumn Property
-
-        public ColumnBase CurrentColumn
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                    return m_detailConfig.CurrentColumn;
-
-                return m_currentColumn;
-            }
-            set
-            {
-                if (m_currentColumn == value)
-                    return;
-
-                this.SetCurrentColumnCore(value, true, m_dataGridControl.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CurrentColumnChanged);
-            }
-        }
-
-        internal void SetCurrentColumnCore(ColumnBase column, bool isCancelable, bool synchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers trigger)
-        {
-            this.SetCurrent(this.InternalCurrentItem, null, null, column, false, isCancelable, synchronizeSelectionWithCurrent, trigger);
-        }
-
-        private ColumnBase m_currentColumn; // = null
-
-        private void SetCurrentColumnHelper(ColumnBase value)
-        {
-            if (m_detailConfig != null)
-            {
-                m_detailConfig.CurrentColumn = value;
-            }
-            else
-            {
-                m_currentColumn = value;
-            }
-        }
-
-        #endregion
-
-        #region CurrentItem Properties
-
-        public object CurrentItem
-        {
-            get
-            {
-                return m_currentItem;
-            }
-            set
-            {
-                if (value == m_currentItem)
-                    return;
-
-                this.SetCurrentItemCore(value, true, m_dataGridControl.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CurrentItemChanged);
-            }
-        }
-
-        internal void SetCurrentItemCore(object item, bool isCancelable, bool synchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers trigger)
-        {
-            this.SetCurrent(item, null, null, this.CurrentColumn, false, isCancelable, synchronizeSelectionWithCurrent, trigger);
-        }
-
-        public int CurrentItemIndex
-        {
-            get
-            {
-                return m_currentItemIndex;
-            }
-            set
-            {
-                if (value == m_currentItemIndex)
-                    return;
-
-                this.SetCurrentItemIndexCore(value, true, m_dataGridControl.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CurrentItemChanged);
-            }
-        }
-
-        internal void SetCurrentItemIndexCore(int index, bool isCancelable, bool synchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers trigger)
-        {
-            this.SetCurrent(this.Items.GetItemAt(index), null, index, this.CurrentColumn, false, isCancelable, synchronizeSelectionWithCurrent, trigger);
-        }
-
-        private void SetCurrentItem(object dataItem, int sourceDataItemIndex)
-        {
-            // This is called only for DataItem
-            if ((m_currentItem == dataItem) && (m_currentItemIndex == sourceDataItemIndex))
-                return;
-
-            m_currentItem = dataItem;
-            m_currentItemIndex = sourceDataItemIndex;
-            this.OnCurrentItemChanged();
-        }
-
-        internal event EventHandler CurrentItemChanged;
-
-        private void OnCurrentItemChanged()
-        {
-            var handler = this.CurrentItemChanged;
-            if (handler == null)
-                return;
-
-            handler.Invoke(this, EventArgs.Empty);
-        }
-
-        private object m_currentItem; // = null
-        private int m_currentItemIndex = -1;
-
-        #endregion
-
-        #region DefaultGroupConfiguration Read-Only Property
-
-        public GroupConfiguration DefaultGroupConfiguration
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.DefaultGroupConfiguration;
-
-                    return m_detailConfig.DefaultGroupConfiguration;
-                }
-
-                return m_dataGridControl.DefaultGroupConfiguration;
-            }
-        }
-
-        #endregion
-
-        #region DetailConfigurations Read-Only Property
-
-        internal DetailConfigurationCollection DetailConfigurations
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                    return m_detailConfig.DetailConfigurations;
-
-                return null;
-            }
-        }
-
-        #endregion
-
-        #region Footers Read-Only Property
-
-        public ObservableCollection<DataTemplate> Footers
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.Footers;
-
-                    return m_detailConfig.Footers;
-                }
-
-                var view = m_dataGridControl.GetView();
-                if (view == null)
-                    return new ObservableCollection<DataTemplate>();
-
-                return view.Footers;
-            }
-        }
-
-        #endregion
-
-        #region GroupLevelDescriptions Read-Only Property
-
-        public GroupLevelDescriptionCollection GroupLevelDescriptions
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                    return m_detailConfig.GroupLevelDescriptions;
-
-                return m_groupLevelDescriptions;
-            }
-        }
-
-        private readonly GroupLevelDescriptionCollection m_groupLevelDescriptions; //null
-
-        #endregion
-
-        #region GroupConfigurationSelector Property
-
-        public GroupConfigurationSelector GroupConfigurationSelector
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.GroupConfigurationSelector;
-
-                    return m_detailConfig.GroupConfigurationSelector;
-                }
-
-                return m_dataGridControl.GroupConfigurationSelector;
-            }
-        }
-
-        private void OnGroupConfigurationSelectorChanged()
-        {
-            var handler = this.GroupConfigurationSelectorChanged;
-            if (handler == null)
-                return;
-
-            handler.Invoke(this, EventArgs.Empty);
-        }
-
-        internal event EventHandler GroupConfigurationSelectorChanged;
-
-        #endregion
-
-        #region HasDetails Read-Only Property
-
-        public bool HasDetails
-        {
-            get
-            {
-                return false;
-            }
-        }
-
-        #endregion
-
-        #region Headers Read-Only property
-
-        public ObservableCollection<DataTemplate> Headers
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.Headers;
-
-                    return m_detailConfig.Headers;
-                }
-
-                var view = m_dataGridControl.GetView();
-                if (view == null)
-                    return new ObservableCollection<DataTemplate>();
-
-                return view.Headers;
-            }
-        }
-
-        #endregion
-
-        #region IsCurrent Read-Only Property
-
-        public bool IsCurrent
-        {
-            get
-            {
-                return m_flags[(int)DataGridContextFlags.IsCurrent];
-            }
-        }
-
-        internal void SetIsCurrent(bool value)
-        {
-            m_flags[(int)DataGridContextFlags.IsCurrent] = value;
-        }
-
-        #endregion
-
-        #region ItemContainerStyle
-
-        public Style ItemContainerStyle
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.ItemContainerStyle;
-
-                    return m_detailConfig.ItemContainerStyle;
-                }
-
-                return m_dataGridControl.ItemContainerStyle;
-            }
-        }
-
-        #endregion
-
-        #region ItemContainerStyleSelector
-
-        public StyleSelector ItemContainerStyleSelector
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.ItemContainerStyleSelector;
-
-                    return m_detailConfig.ItemContainerStyleSelector;
-                }
-
-                return m_dataGridControl.ItemContainerStyleSelector;
-            }
-        }
-
-        #endregion
-
-        #region DataGridControl Read-Only Property
-
-        public DataGridControl DataGridControl
-        {
-            get
-            {
-                return m_dataGridControl;
-            }
-        }
-
-        private readonly DataGridControl m_dataGridControl;
-
-        #endregion
-
-        #region SelectedItems Read-Only Property
-
-        public IList<object> SelectedItems
-        {
-            get
-            {
-                return m_selectedItems;
-            }
-        }
-
-        private readonly SelectionItemCollection m_selectedItems;
-
-        #endregion
-
-        #region SelectedItemRanges Read-Only Property
-
-        public IList<SelectionRange> SelectedItemRanges
-        {
-            get
-            {
-                return m_selectedItemsRanges;
-            }
-        }
-
-        private readonly SelectionItemRangeCollection m_selectedItemsRanges;
-
-        #endregion
-
-        #region SelectedCellRanges Read-Only Property
-
-        public IList<SelectionCellRange> SelectedCellRanges
-        {
-            get
-            {
-                return m_selectedCellRanges;
-            }
-        }
-
-        private readonly SelectionCellRangeCollection m_selectedCellRanges;
-
-        #endregion
-
-        #region SourceDetailConfiguration Read-Only Property
-
-        internal DetailConfiguration SourceDetailConfiguration
-        {
-            get
-            {
-                return m_detailConfig;
-            }
-        }
-
-        private readonly DetailConfiguration m_detailConfig;
-
-        #endregion
-
-        #region VisibleColumns Read-Only Property
-
-        public ReadOnlyObservableCollection<ColumnBase> VisibleColumns
-        {
-            get
-            {
-                return m_columnManager.VisibleColumns;
-            }
-        }
-
-        #endregion
-
-        #region AutoCreateForeignKeyConfigurations Internal Property
-
-        internal bool AutoCreateForeignKeyConfigurations
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                    return m_detailConfig.AutoCreateForeignKeyConfigurations;
-
-                return m_dataGridControl.AutoCreateForeignKeyConfigurations;
-            }
-        }
-
-        #endregion
-
-        #region MaxSortLevels Property
-
-        public int MaxSortLevels
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.MaxSortLevels;
-
-                    return m_detailConfig.MaxSortLevels;
-                }
-
-                return m_dataGridControl.MaxSortLevels;
-            }
-        }
-
-        #endregion
-
-        #region MaxGroupLevels Property
-
-        public int MaxGroupLevels
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                {
-                    var defaultDetailConfig = this.GetDefaultDetailConfigurationForContext();
-                    if (defaultDetailConfig != null)
-                        return defaultDetailConfig.MaxGroupLevels;
-
-                    return m_detailConfig.MaxGroupLevels;
-                }
-
-                return m_dataGridControl.MaxGroupLevels;
-            }
-        }
-
-        #endregion
-
-        //--------- INTERNAL PROPERTIES ---------
-
-        #region RootDataGridContext Read-Only Property
-
-        internal DataGridContext RootDataGridContext
-        {
-            get
-            {
-                return this.DataGridControl.DataGridContext;
-            }
-        }
-
-        #endregion
-
-        #region SelectedItemsStore Read-Only Property
-
-        internal SelectedItemsStorage SelectedItemsStore
-        {
-            get
-            {
-                return m_selectedItemsStore;
-            }
-        }
-
-        private readonly SelectedItemsStorage m_selectedItemsStore;
-
-        #endregion
-
-        #region SelectedItemsStore Read-Only Property
-
-        internal SelectedCellsStorage SelectedCellsStore
-        {
-            get
-            {
-                return m_selectedCellsStore;
-            }
-        }
-
-        private readonly SelectedCellsStorage m_selectedCellsStore;
-
-        #endregion
-
-        #region ColumnsByVisiblePosition Read-Only Property
-
-        internal HashedLinkedList<ColumnBase> ColumnsByVisiblePosition
-        {
-            get
-            {
-                return m_columnManager.ColumnsByVisiblePosition;
-            }
-        }
-
-        #endregion
-
-        #region ColumnStretchingManager Property
-
-        internal ColumnStretchingManager ColumnStretchingManager
-        {
-            get
-            {
-                if (m_columnStretchingManager == null)
-                {
-                    m_columnStretchingManager = new ColumnStretchingManager(this);
-                }
-
-                return m_columnStretchingManager;
-            }
-        }
-
-        private ColumnStretchingManager m_columnStretchingManager;
-
-        #endregion
-
-        #region CurrentCell Read-Only Property
-
-        internal Cell CurrentCell
-        {
-            get
-            {
-                var currentRow = this.CurrentRow;
-                if (currentRow == null)
-                    return null;
-
-                return currentRow.Cells[this.CurrentColumn];
-            }
-        }
-
-        #endregion
-
-        #region CurrentRow Read-Only Property
-
-        internal Row CurrentRow
-        {
-            get
-            {
-                if (this.InternalCurrentItem == null)
-                    return null;
-
-                return Row.FromContainer(this.GetContainerFromItem(this.InternalCurrentItem));
-            }
-        }
-
-        #endregion
-
-        #region CustomItemContainerGenerator Read-Only Property
-
-        internal CustomItemContainerGenerator CustomItemContainerGenerator
-        {
-            get
-            {
-                return m_generator;
-            }
-        }
-
-        internal void SetGenerator(CustomItemContainerGenerator generator)
-        {
-            if (m_generator != null)
-                throw new InvalidOperationException("An attempt was made to reset the generator after it has already been set.");
-
-            if (generator == null)
-                throw new ArgumentNullException("generator");
-
-            m_generator = generator;
-        }
-
-        private CustomItemContainerGenerator m_generator;
-
-        #endregion
-
-        #region InternalCurrentItem Read-Only Property
-
-        internal object InternalCurrentItem
-        {
-            get
-            {
-                return m_internalCurrentItem;
-            }
-        }
-
-        private void SetInternalCurrentItem(object value)
-        {
-            m_internalCurrentItem = value;
-        }
-
-        private object m_internalCurrentItem; //null
-
-        #endregion
-
-        #region ItemsSourcePropertyDescriptions Property
-
-        internal PropertyDescriptionRouteDictionary ItemsSourcePropertyDescriptions
-        {
-            get
-            {
-                return m_itemsSourcePropertyDescriptions;
-            }
-        }
-
-        private readonly PropertyDescriptionRouteDictionary m_itemsSourcePropertyDescriptions;
-
-        #endregion
-
-        #region ItemPropertyMap Internal Property
-
-        internal DataGridItemPropertyMap ItemPropertyMap
-        {
-            get
-            {
-                return m_itemPropertyMap;
-            }
-        }
-
-        private readonly DataGridItemPropertyMap m_itemPropertyMap;
-
-        #endregion
-
-        #region ToggleColumnSortCommand Internal Property
-
-        internal ToggleColumnSortCommand ToggleColumnSortCommand
-        {
-            get
-            {
-                if (m_toggleColumnSortCommand == null)
-                {
-                    m_toggleColumnSortCommand = new DataGridContextToggleColumnSortCommand(this);
-                }
-
-                Debug.Assert(m_toggleColumnSortCommand != null);
-
-                return m_toggleColumnSortCommand;
-            }
-        }
-
-        private ToggleColumnSortCommand m_toggleColumnSortCommand;
-
-        #endregion
-
-        #region UpdateColumnSortCommand Internal Property
-
-        internal UpdateColumnSortCommand UpdateColumnSortCommand
-        {
-            get
-            {
-                if (m_updateColumnSortCommand == null)
-                {
-                    m_updateColumnSortCommand = new DataGridContextUpdateColumnSortCommand(this);
-                }
-
-                Debug.Assert(m_updateColumnSortCommand != null);
-
-                return m_updateColumnSortCommand;
-            }
-        }
-
-        private UpdateColumnSortCommand m_updateColumnSortCommand;
-
-        #endregion
-
-        #region AddGroupCommand Internal Property
-
-        internal ColumnAddGroupCommand AddGroupCommand
-        {
-            get
-            {
-                if (m_addGroupCommand == null)
-                {
-                    m_addGroupCommand = new DataGridContextAddGroupCommand(this);
-                }
-
-                Debug.Assert(m_addGroupCommand != null);
-
-                return m_addGroupCommand;
-            }
-        }
-
-        private ColumnAddGroupCommand m_addGroupCommand;
-
-        #endregion
-
-        #region SortDescriptionsSyncContext Read-Only Property
-
-        internal SortDescriptionsSyncContext SortDescriptionsSyncContext
-        {
-            get
-            {
-                var dataGridCollectionViewBase = this.ItemsSourceCollection as DataGridCollectionViewBase;
-                if (dataGridCollectionViewBase != null)
-                    return dataGridCollectionViewBase.DataGridSortDescriptions.SyncContext;
-
-                Debug.Assert(m_sortDescriptionsSyncContext != null);
-                return m_sortDescriptionsSyncContext;
-            }
-        }
-
-        private readonly SortDescriptionsSyncContext m_sortDescriptionsSyncContext; //null
-
-        #endregion
-
-        #region DefaultDetailConfiguration Property
-
-        internal DefaultDetailConfiguration DefaultDetailConfiguration
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                    return m_detailConfig.DefaultDetailConfiguration;
-
-                return m_dataGridControl.DefaultDetailConfiguration;
-            }
-        }
-
-        #endregion
-
-        #region ColumnVirtualizationManager Property
-
-        internal ColumnVirtualizationManager ColumnVirtualizationManager
-        {
-            get
-            {
-                var columnVirtualizationManager = this.GetColumnVirtualizationManagerOrNull();
-                if (columnVirtualizationManager == null)
-                {
-                    columnVirtualizationManager = this.DataGridControl.GetView().CreateColumnVirtualizationManager(this);
-                }
-
-                // We must ensure the manager is up to date before using it
-                columnVirtualizationManager.Update();
-
-                return columnVirtualizationManager;
-            }
-        }
-
-        internal ColumnVirtualizationManager GetColumnVirtualizationManagerOrNull()
-        {
-            return ColumnVirtualizationManager.GetColumnVirtualizationManager(this);
-        }
-
-        #endregion
-
-        #region ColumnManagerRowConfiguration Read-Only Internal Property
-
-        internal ColumnManagerRowConfiguration ColumnManagerRowConfiguration
-        {
-            get
-            {
-                if (m_detailConfig != null)
-                    return m_detailConfig.ColumnManagerRowConfiguration;
-
-                return this.DataGridControl.ColumnManagerRowConfiguration;
-            }
-        }
-
-        #endregion
-
-        #region FixedHeaderFooterViewPortSize Property
-
-        internal Size FixedHeaderFooterViewPortSize
-        {
-            get
-            {
-                return m_fixedHeaderFooterViewPortSize;
-            }
-            set
-            {
-                if (Size.Equals(value, m_fixedHeaderFooterViewPortSize))
-                    return;
-
-                m_fixedHeaderFooterViewPortSize = value;
-
-                this.OnPropertyChanged("FixedHeaderFooterViewPortSize");
-            }
-        }
-
-        private Size m_fixedHeaderFooterViewPortSize = new Size();
-
-        #endregion
-
-        #region IsDeleteCommandEnabled Property
-
-        internal bool IsDeleteCommandEnabled
-        {
-            get
-            {
-                return this.FindIsDeletedCommandEnabledAmbient(this);
-            }
-        }
-
-        private bool FindIsDeletedCommandEnabledAmbient(DataGridContext dataGridContext)
-        {
-            if (dataGridContext == null)
-                return false;
-
-            if (dataGridContext.SourceDetailConfiguration == null)
-            {
-                if (dataGridContext.DataGridControl == null)
-                    return false;
-
-                return dataGridContext.DataGridControl.IsDeleteCommandEnabled;
-            }
-
-            var defaultDetailConfig = dataGridContext.GetDefaultDetailConfigurationForContext();
-            if (defaultDetailConfig != null)
-            {
-                if (defaultDetailConfig.ReadLocalValue(DefaultDetailConfiguration.IsDeleteCommandEnabledProperty) != DependencyProperty.UnsetValue)
-                    return defaultDetailConfig.IsDeleteCommandEnabled;
-            }
-            else
-            {
-                if (dataGridContext.SourceDetailConfiguration.ReadLocalValue(DetailConfiguration.IsDeleteCommandEnabledProperty) != DependencyProperty.UnsetValue)
-                    return dataGridContext.SourceDetailConfiguration.IsDeleteCommandEnabled;
-            }
-
-            return this.FindIsDeletedCommandEnabledAmbient(dataGridContext.ParentDataGridContext);
-        }
-
-        #endregion
-
-        #region SelectionChanged Event
-
-        internal event EventHandler<SelectionChangedInternalEventArgs> SelectionChangedInternal;
-
-        internal void InvokeSelectionChanged(SelectionInfo selectionInfo)
-        {
-
-            if (this.SelectionChangedInternal != null)
-            {
-                this.SelectionChangedInternal(this, new SelectionChangedInternalEventArgs(selectionInfo));
-            }
-
-            Debug.Assert(selectionInfo.DataGridContext == this);
-
-            if ((selectionInfo.RemovedItems.Count == 0) && (selectionInfo.AddedItems.Count == 0))
-                return;
-
-        }
-
-        #endregion
-
-        #region DetailLevel Property
-
-        // Represents the detail level from the master item
-        internal int DetailLevel
-        {
-            get;
-            private set;
-        }
-
-        #endregion
-
-        #region IsSavingState Property
-
-        internal bool IsSavingState
-        {
-            get
-            {
-                return m_flags[(int)DataGridContextFlags.IsSavingState];
-            }
-            set
-            {
-                m_flags[(int)DataGridContextFlags.IsSavingState] = value;
-            }
-        }
-
-        #endregion
-
-        #region IsRestoringState Property
-
-        internal bool IsRestoringState
-        {
-            get
-            {
-                return m_flags[(int)DataGridContextFlags.IsRestoringState];
-            }
-            set
-            {
-                m_flags[(int)DataGridContextFlags.IsRestoringState] = value;
-            }
-        }
-
-        #endregion
-
-        #region IsDeferRestoringState Internal Property
-
-        internal bool IsDeferRestoringState
-        {
-            get
-            {
-                return (m_deferRestoreStateCount > 0);
-            }
-        }
-
-        #endregion
-
-        #region IsAFlattenDetail Internal Property
-
-        internal bool IsAFlattenDetail
-        {
-            get
-            {
-                return (m_detailConfig != null)
-                    && (this.AreDetailsFlatten);
-            }
-        }
-
-        #endregion
-
-        #region AreDetailsFlatten Internal Property
-
-        internal bool AreDetailsFlatten
-        {
-            get
-            {
-                return this.DataGridControl.AreDetailsFlatten;
-            }
-        }
-
-        #endregion
-
-        #region AlreadySearchedForDefaultDetailConfig Private Property
-
-        private bool AlreadySearchedForDefaultDetailConfig
-        {
-            get
-            {
-                return m_flags[(int)DataGridContextFlags.AlreadySearchedForDetailConfig];
-            }
-            set
-            {
-                m_flags[(int)DataGridContextFlags.AlreadySearchedForDetailConfig] = value;
-            }
-        }
-
-        #endregion
-
-        #region DefaultImageColumnDetermined Private Property
-
-        private bool DefaultImageColumnDetermined
-        {
-            get
-            {
-                return m_flags[(int)DataGridContextFlags.DefaultImageColumnDetermined];
-            }
-            set
-            {
-                m_flags[(int)DataGridContextFlags.DefaultImageColumnDetermined] = value;
-            }
-        }
-
-        #endregion
-
-        #region ColumnManager Internal Property
-
-        internal ColumnHierarchyManager ColumnManager
-        {
-            get
-            {
-                return m_columnManager;
-            }
-        }
-
-        private readonly ColumnHierarchyManager m_columnManager;
-
-        #endregion
-
-        #region CanIncreaseColumnWidth Property
-
-        internal bool CanIncreaseColumnWidth
-        {
-            get
-            {
-                return m_canIncreaseColumnWidth;
-            }
-            set
-            {
-                m_canIncreaseColumnWidth = value;
-            }
-        }
-
-        private bool m_canIncreaseColumnWidth = true;
-
-        #endregion
-
-        internal void SetCurrentColumnAndChangeSelection(ColumnBase newCurrentColumn)
-        {
-            // Since SetCurrentColumnCore can be aborted, we do it before changing the selection.
-            this.SetCurrentColumnCore(newCurrentColumn, true, false, AutoScrollCurrentItemSourceTriggers.Navigation);
-
-            if (m_dataGridControl != null)
-            {
-                Row row = this.CurrentRow;
-                object item = this.InternalCurrentItem;
-
-                int dataRowIndex;
-                bool rowIsBeingEdited;
-
-                if (row == null)
-                {
-                    dataRowIndex = -1;
-                    rowIsBeingEdited = false;
-                }
-                else
-                {
-                    dataRowIndex = DataGridVirtualizingPanel.GetItemIndex(row);
-                    rowIsBeingEdited = row.IsBeingEdited;
-                }
-
-                var oldPosition = SelectionRangePoint.TryCreateFromCurrent(this);
-                var newPosition = SelectionRangePoint.TryCreateRangePoint(this, item, dataRowIndex, newCurrentColumn.VisiblePosition);
-
-                m_dataGridControl.SelectionChangerManager.UpdateSelection(oldPosition, newPosition, true, rowIsBeingEdited, SelectionManager.UpdateSelectionSource.Navigation);
-            }
-        }
-
-        //---------- PUBLIC METHODS ----------
-
-        public void BeginEdit()
-        {
-            this.BeginEdit(this.InternalCurrentItem);
-        }
-
-        public void BeginEdit(object item)
-        {
-            DataGridControl.BeginEditHelper(this, item);
-        }
-
-        public void EndEdit()
-        {
-            DataGridControl.EndEditHelper(this);
-        }
-
-        public void CancelEdit()
-        {
-            DataGridControl.CancelEditHelper(this);
-        }
-
-        internal bool IsContainingItem(object item)
-        {
-            DataTemplate itemTemplate = item as DataTemplate;
-
-            if ((this.ParentItem == null) && (itemTemplate != null))
-            {
-                if (m_dataGridControl.View.FixedHeaders.Contains(itemTemplate)
-                  || m_dataGridControl.View.FixedFooters.Contains(itemTemplate))
-                {
-                    return true;
-                }
-            }
-
-            return m_generator.Contains(item);
-        }
-
-        public bool IsGroupExpanded(CollectionViewGroup group)
-        {
-            return (this.CustomItemContainerGenerator.IsGroupExpanded(group) == true);
-        }
-
-        internal bool? IsGroupExpanded(CollectionViewGroup group, bool recurseDetails)
-        {
-            return this.CustomItemContainerGenerator.IsGroupExpanded(group, recurseDetails);
-        }
-
-        public bool ToggleGroupExpansion(CollectionViewGroup group)
-        {
-            return this.CustomItemContainerGenerator.ToggleGroupExpansion(group);
-        }
-
-        public bool ExpandGroup(CollectionViewGroup group)
-        {
-            return this.CustomItemContainerGenerator.ExpandGroup(group);
-        }
-
-        internal bool ExpandGroup(CollectionViewGroup group, bool recurseDetails)
-        {
-            return this.CustomItemContainerGenerator.ExpandGroup(group, recurseDetails);
-        }
-
-        public bool CollapseGroup(CollectionViewGroup group)
-        {
-            return this.CustomItemContainerGenerator.CollapseGroup(group);
-        }
-
-        internal bool CollapseGroup(CollectionViewGroup group, bool recurseDetails)
-        {
-            return this.CustomItemContainerGenerator.CollapseGroup(group, recurseDetails);
-        }
-
-        public bool AreDetailsExpanded(object dataItem)
-        {
-            return this.CustomItemContainerGenerator.AreDetailsExpanded(dataItem);
-        }
-
-        public Group GetGroupFromCollectionViewGroup(CollectionViewGroup collectionViewGroup)
-        {
-            if (collectionViewGroup == null)
-                return null;
-
-            Group group = this.CustomItemContainerGenerator.GetGroupFromCollectionViewGroup(collectionViewGroup);
-
-            return group;
-        }
-
-        public DependencyObject GetContainerFromItem(object item)
-        {
-            if (item == null)
-                return null;
-
-            var container = default(DependencyObject);
-
-            if ((m_detailConfig == null) && (item is DataTemplate))
-            {
-                //If the container was not found in the DataGridContext's Generator and the DataGridContext does not have a source DetailConfig ( master context )
-                //then check in the DataGridControl's Fixed Items
-                container = m_dataGridControl.GetContainerForFixedItem(item);
-            }
-
-            if (container == null)
-            {
-                container = this.CustomItemContainerGenerator.ContainerFromItem(item);
-            }
-
-            return container;
-        }
-
-        public object GetItemFromContainer(DependencyObject container)
-        {
-            object item = null;
-
-            if (m_detailConfig == null)
-            {
-                //If the item was not found in the DataGridContext's Generator and the DataGridContext does not have a source DetailConfig ( master context )
-                //then check in the DataGridControl's Fixed Items
-                item = DataGridControl.GetFixedItemFromContainer(container);
-            }
-
-            if (item == null)
-            {
-                item = this.CustomItemContainerGenerator.ItemFromContainer(container);
-            }
-
-            return item;
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public DependencyObject GetContainerFromIndex(int index)
-        {
-            return this.CustomItemContainerGenerator.GetRealizedContainerForIndex(index);
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public int GetIndexFromContainer(DependencyObject container)
-        {
-            return this.CustomItemContainerGenerator.GetRealizedIndexForContainer(container);
-        }
-
-        public CollectionViewGroup GetParentGroupFromItem(object item)
-        {
-            return this.GetParentGroupFromItemCore(item, false);
-        }
-
-        internal CollectionViewGroup GetParentGroupFromItemCore(object item, bool recurseDetails)
-        {
-            CollectionViewGroup retval = null;
-
-            DataTemplate dataTemplate = item as DataTemplate;
-
-            //For the master level, before interrogating the Generator, I need to check for the items presence in the Fixed regions.
-            if ((m_detailConfig == null) && (dataTemplate != null))
-            {
-                Views.ViewBase view = m_dataGridControl.GetView();
-
-                //Fixed header cannot have a Parent Group.
-                if (view.FixedHeaders.Contains(dataTemplate) == true)
-                    return null;
-
-                //Fixed header cannot have a Parent Group.
-                if (view.FixedFooters.Contains(dataTemplate) == true)
-                    return null;
-            }
-
-            if (this.CustomItemContainerGenerator.IsInUse == true)
-            {
-                retval = this.CustomItemContainerGenerator.GetParentGroupFromItem(item, recurseDetails);
-            }
-
-            return retval;
-        }
-
-        internal DataGridContext GetChildContext(object parentItem, DetailConfiguration detailConfiguration)
-        {
-            if (detailConfiguration == null)
-                throw new ArgumentNullException("detailConfiguration");
-
-            return this.GetChildContext(parentItem, detailConfiguration.RelationName);
-        }
-
-        public DataGridContext GetChildContext(object parentItem, string relationName)
-        {
-            return this.CustomItemContainerGenerator.GetChildContext(parentItem, relationName);
-        }
-
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
-        public IEnumerable<DataGridContext> GetChildContexts()
-        {
-            return this.CustomItemContainerGenerator.GetChildContexts();
-        }
-
-        internal IEnumerable<DataGridContext> GetChildContextsCore()
-        {
-            return this.CustomItemContainerGenerator.GetChildContextsCore();
-        }
-
-        internal BindingPathValueExtractor GetBindingPathExtractorForColumn(Column column, object dataItem)
-        {
-            if (column == null)
-                throw new ArgumentNullException("column");
-
-            if (dataItem == null)
-                return null;
-
-            if (column == null)
-                throw new ArgumentNullException("column");
-
-            var xPath = default(string);
-            var propertyPath = default(PropertyPath);
-
-            // Disable warning for DisplayMemberBinding when internaly used
-#pragma warning disable 618
-            var displayMemberBinding = column.DisplayMemberBinding as Binding;
-#pragma warning restore 618
-
-            if (displayMemberBinding == null)
-            {
-                displayMemberBinding = ItemsSourceHelper.CreateDefaultBinding(
-                                         ItemsSourceHelper.CreateOrGetPropertyDescriptionFromColumn(this, column, dataItem.GetType()));
-            }
-
-            if (displayMemberBinding == null)
-                throw new DataGridInternalException("DisplayMemberBinding is null.", m_dataGridControl);
-
-            xPath = displayMemberBinding.XPath;
-            propertyPath = displayMemberBinding.Path;
-
-            var converter = new Xceed.Wpf.DataGrid.Converters.SourceDataConverter(ItemsSourceHelper.IsItemSupportingDBNull(dataItem), CultureInfo.InvariantCulture);
-
-            return new BindingPathValueExtractor(xPath, propertyPath, false, typeof(object), converter, null, CultureInfo.InvariantCulture);
-        }
-
-        public IDisposable DeferColumnsUpdate()
-        {
-            return ColumnHierarchyManagerHelper.DeferColumnsUpdate(this);
-        }
-
-        public bool MoveColumnBefore(ColumnBase current, ColumnBase next)
-        {
-            return ColumnHierarchyManagerHelper.MoveColumnBefore(this, current, next);
-        }
-
-        public bool MoveColumnAfter(ColumnBase current, ColumnBase previous)
-        {
-            return ColumnHierarchyManagerHelper.MoveColumnAfter(this, current, previous);
-        }
-
-        public bool MoveColumnUnder(ColumnBase current, ColumnBase parent)
-        {
-            return ColumnHierarchyManagerHelper.MoveColumnUnder(this, current, parent);
-        }
-
-        //---------- INTERNAL METHODS -----------
-
-        internal IDisposable DeferRestoreState()
-        {
-            return new DeferRestoreStateDisposable(this);
-        }
-
-        internal void UpdatePublicSelectionProperties()
-        {
-            if ((m_selectedItemsStore.Count > 0) || (m_selectedCellsStore.Count > 0))
-            {
-                m_dataGridControl.AddToSelectedContexts(this);
-            }
-            else
-            {
-                m_dataGridControl.RemoveFromSelectedContexts(this);
-            }
-
-
-            if (m_parentItem == null)
-            {
-                // We are the root context ( GridControl )
-                int newSelectedItemIndex;
-                object newSelectedItem;
-                int newSelectedColumnIndex;
-                this.GetFirstSelectedItemFromStore(false, out newSelectedItemIndex, out newSelectedItem, out newSelectedColumnIndex);
-
-                if (m_dataGridControl.SelectedIndex != newSelectedItemIndex)
-                {
-                    m_dataGridControl.SelectedIndex = newSelectedItemIndex;
-                }
-
-                // Calculate the new SelectedItem
-                if (!object.Equals(m_dataGridControl.SelectedItem, newSelectedItem))
-                {
-                    m_dataGridControl.SetSkipCoerceSelectedItemCheck(true);
-
-                    try
-                    {
-                        m_dataGridControl.SelectedItem = newSelectedItem;
-                    }
-                    finally
-                    {
-                        m_dataGridControl.SetSkipCoerceSelectedItemCheck(false);
-                    }
-                }
-            }
-        }
-
-        internal void GetFirstSelectedItemFromStore(bool checkCellsStore, out int selectedItemIndex, out object selectedItem, out int selectedColumnIndex)
-        {
-            var newSelectedRangeWithItems = (m_selectedItemsStore.Count == 0) ? SelectionRangeWithItems.Empty : m_selectedItemsStore[0];
-
-            try
-            {
-                if (newSelectedRangeWithItems.IsEmpty)
-                {
-                    if (checkCellsStore)
-                    {
-                        var newSelectionCellRangeWithItems = (m_selectedCellsStore.Count == 0) ? SelectionCellRangeWithItems.Empty : m_selectedCellsStore[0];
-
-                        if (newSelectionCellRangeWithItems.ItemRange.IsEmpty)
-                        {
-                            selectedColumnIndex = -1;
-                            selectedItemIndex = -1;
-                            selectedItem = null;
-                        }
-                        else
-                        {
-                            selectedColumnIndex = newSelectionCellRangeWithItems.ColumnRange.StartIndex;
-                            selectedItemIndex = newSelectionCellRangeWithItems.ItemRange.StartIndex;
-                            selectedItem = newSelectionCellRangeWithItems.ItemRangeWithItems.GetItem(this, 0);
-                        }
-                    }
-                    else
-                    {
-                        selectedColumnIndex = -1;
-                        selectedItemIndex = -1;
-                        selectedItem = null;
-                    }
-                }
-                else
-                {
-                    selectedColumnIndex = -1;
-                    selectedItemIndex = newSelectedRangeWithItems.Range.StartIndex;
-                    selectedItem = newSelectedRangeWithItems.GetItem(this, 0);
-                }
-            }
-            catch (ArgumentOutOfRangeException)
-            {
-                selectedColumnIndex = -1;
-                selectedItemIndex = -1;
-                selectedItem = null;
-            }
-        }
-
-        internal ColumnBase GetMatchingColumn(DataGridContext sourceContext, ColumnBase sourceColumn)
-        {
-            if ((sourceContext == null) || (sourceColumn == null))
-                return null;
-
-            if (sourceContext == this)
-                return sourceColumn;
-
-            var collectionView = sourceContext.ItemsSourceCollection as DataGridCollectionViewBase;
-            if (collectionView == null)
-                return null;
-
-            var sourceItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty(collectionView.ItemProperties, sourceColumn.FieldName);
-            if (sourceItemProperty == null)
-                return null;
-
-            var masterContext = sourceContext.RootDataGridContext;
-            var masterItemProperty = sourceItemProperty;
-
-            if (masterContext != sourceContext)
-            {
-                if (!sourceContext.ItemPropertyMap.TryGetMasterItemProperty(sourceItemProperty, out masterItemProperty))
-                    return null;
-            }
-
-            Debug.Assert(masterItemProperty != null);
-            if (masterItemProperty == null)
-                return null;
-
-            var currentItemProperty = masterItemProperty;
-            if (masterContext != this)
-            {
-                if (!this.ItemPropertyMap.TryGetDetailItemProperty(masterItemProperty, out currentItemProperty))
-                    return null;
-            }
-
-            Debug.Assert(currentItemProperty != null);
-            if (currentItemProperty == null)
-                return null;
-
-            var columnName = PropertyRouteParser.Parse(currentItemProperty);
-            if (string.IsNullOrEmpty(columnName))
-                return null;
-
-            return this.Columns[columnName];
-        }
-
-        internal ColumnBase GetDefaultImageColumn()
-        {
-            if (!this.DefaultImageColumnDetermined)
-            {
-                if (this.Items.Count > 0)
-                {
-                    this.DefaultImageColumnDetermined = true;
-
-                    var dataItem = this.Items.GetItemAt(0);
-
-                    foreach (var column in this.VisibleColumns)
-                    {
-                        var key = PropertyRouteParser.Parse(column.FieldName);
-                        if (key == null)
-                            continue;
-
-                        var propertyDescriptionRoute = default(PropertyDescriptionRoute);
-                        if (!m_itemsSourcePropertyDescriptions.TryGetValue(key, out propertyDescriptionRoute))
-                            continue;
-
-                        var propertyDescription = propertyDescriptionRoute.Current;
-                        var dataType = propertyDescription.DataType;
-
-                        if (typeof(ImageSource).IsAssignableFrom(dataType))
-                        {
-                            m_defaultImageColumn = column;
-                            break;
-                        }
-                        else if ((typeof(byte[]).IsAssignableFrom(dataType)) /*|| (typeof(System.Drawing.Image).IsAssignableFrom(dataType))*/)
-                        {
-                            var converter = new Xceed.Wpf.DataGrid.Converters.ImageConverter();
-                            var convertedValue = default(object);
-                            var rawValue = default(object);
-
-                            try
-                            {
-                                if (propertyDescription.PropertyDescriptor == null)
-                                {
-                                    var dataRow = dataItem as System.Data.DataRow;
-                                    if (dataRow == null)
-                                    {
-                                        var dataRowView = dataItem as System.Data.DataRowView;
-                                        if (dataRowView != null)
-                                        {
-                                            rawValue = dataRowView[propertyDescription.Name];
-                                        }
-                                    }
-                                    else
-                                    {
-                                        rawValue = dataRow[propertyDescription.Name];
-                                    }
-                                }
-                                else
-                                {
-                                    rawValue = propertyDescription.PropertyDescriptor.GetValue(dataItem);
-                                }
-
-                                if (rawValue != null)
-                                {
-                                    convertedValue = converter.Convert(rawValue, typeof(ImageSource), null, CultureInfo.CurrentCulture);
-                                }
-                            }
-                            catch (NotSupportedException)
-                            {
-                                //suppress the exception, the byte[] is not an image. convertedValue will remain null
-                            }
-
-                            if (convertedValue != null)
-                            {
-                                m_defaultImageColumn = column;
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            return m_defaultImageColumn;
-        }
-
-        internal void EnsureResort()
-        {
-            if ((!ItemsSourceHelper.IsDataView(this.Items)) && (this.Items.SortDescriptions.Count > 0))
-            {
-                SortDescriptionCollection sortDescriptions = this.Items.SortDescriptions;
-                SortDescription[] sortDescriptionsCopy = new SortDescription[sortDescriptions.Count];
-
-                sortDescriptions.CopyTo(sortDescriptionsCopy, 0);
-                sortDescriptions.Clear();
-
-                foreach (SortDescription sortDescription in sortDescriptionsCopy)
-                {
-                    sortDescriptions.Add(sortDescription);
-                }
-            }
-        }
-
-        internal void EnsureRegroup()
-        {
-
-            if (this.Items.GroupDescriptions.Count > 0)
-            {
-                ObservableCollection<GroupDescription> groupDescriptions = this.Items.GroupDescriptions;
-                GroupDescription[] groupDescriptionsCopy = new GroupDescription[groupDescriptions.Count];
-
-                groupDescriptions.CopyTo(groupDescriptionsCopy, 0);
-                groupDescriptions.Clear();
-
-                foreach (GroupDescription groupDescription in groupDescriptionsCopy)
-                {
-                    groupDescriptions.Add(groupDescription);
-                }
-            }
-        }
-
-        internal static string GetColumnNameFromGroupDescription(GroupDescription groupDescription)
-        {
-            PropertyGroupDescription propertyGroupDescription =
-              groupDescription as PropertyGroupDescription;
-
-            if (propertyGroupDescription != null)
-                return propertyGroupDescription.PropertyName;
-
-            DataGridGroupDescription dataGridGroupDescription =
-              groupDescription as DataGridGroupDescription;
-
-            if (dataGridGroupDescription != null)
-                return dataGridGroupDescription.PropertyName;
-
-            throw new NotSupportedException("Group descriptions other than PropertyGroupDescription or DataGridGroupDescription are not supported.");
-        }
-
-        internal static ObservableCollection<GroupDescription> GetGroupDescriptionsHelper(CollectionView collectionView)
-        {
-            ObservableCollection<GroupDescription> retval = collectionView.GroupDescriptions;
-
-            ItemCollection itemCollection = collectionView as ItemCollection;
-
-            if (itemCollection != null)
-            {
-                CollectionView sourceCollectionView = itemCollection.SourceCollection as CollectionView;
-
-                if (sourceCollectionView != null)
-                {
-                    if (sourceCollectionView.GroupDescriptions != null)
-                        retval = sourceCollectionView.GroupDescriptions;
-                }
-                else
-                {
-                    sourceCollectionView = CollectionViewSource.GetDefaultView(itemCollection.SourceCollection) as CollectionView;
-
-                    if ((sourceCollectionView != null) && (sourceCollectionView.GroupDescriptions != null))
-                        retval = sourceCollectionView.GroupDescriptions;
-                }
-            }
-
-            return retval;
-        }
-
-        internal Group GetGroupFromItem(object dataItem)
-        {
-            return this.CustomItemContainerGenerator.GetGroupFromItem(dataItem);
-        }
-
-        internal IDisposable SetQueueBringIntoViewRestrictions(AutoScrollCurrentItemSourceTriggers trigger)
-        {
-            return m_dataGridControl.SetQueueBringIntoViewRestrictions(trigger);
-        }
-
-        internal IDisposable InhibitQueueBringIntoView()
-        {
-            return m_dataGridControl.InhibitQueueBringIntoView();
-        }
-
-        internal IDisposable InhibitSetFocus()
-        {
-            return m_dataGridControl.InhibitSetFocus();
-        }
-
-        internal void NotifyItemsSourceChanged()
-        {
-            this.OnPropertyChanged("HasDetails");
-        }
-
-        internal void DelayBringIntoViewAndFocusCurrent(AutoScrollCurrentItemSourceTriggers trigger)
-        {
-            m_dataGridControl.DelayBringIntoViewAndFocusCurrent(trigger);
-        }
-
-        internal void ResetViewProperties()
-        {
-            //Used only for the Print DataGridControl
-            this.SetupViewProperties();
-            this.InitializeViewProperties();
-        }
-
-        internal void SetCurrent(
-          object item,
-          Row containerRow,
-          Nullable<int> sourceDataItemIndex,
-          ColumnBase column,
-          bool forceFocus,
-          bool isCancelable,
-          bool synchronizeSelectionWithCurrent,
-          AutoScrollCurrentItemSourceTriggers trigger)
-        {
-            // sourceDataItemIndex 
-            //  null = item have to be checked if it is a dataItem
-            //  -1   = the item it's not a dataItem
-            //  ?    = then index of the item in the source collection.
-
-            //verify that SetCurrent is not called successively caused by actions performed within, this is to prevent
-            //exceptions caused by the accessing of resources that could be "locked" (e.g., ItemsControl.Items.DeferRefresh)
-            if (m_dataGridControl.IsSetCurrentInProgress)
-                throw new DataGridException("SetCurrent cannot be invoked while another SetCurrent is in progress.", m_dataGridControl);
-
-            try
-            {
-                //set the flag that indicates that we are already processing a SetCurrent
-                m_dataGridControl.IsSetCurrentInProgress = true;
-
-                var oldCurrentContext = m_dataGridControl.CurrentContext;
-                var newCurrentContext = this;
-
-                //store the previous public current item, so I can detect a change and lift the PropertyChanged for this properties
-                var oldCurrentItem = oldCurrentContext.InternalCurrentItem;
-                var oldPublicCurrentItem = oldCurrentContext.CurrentItem;
-                var oldCurrentColumn = oldCurrentContext.CurrentColumn;
-                var oldCurrentRow = oldCurrentContext.CurrentRow;
-
-                //if item is not realized or if the item passed is not a Data Item (header, footer or group), then the old current cell will be null
-                var oldCurrentCell = (oldCurrentRow == null) ? null : oldCurrentRow.Cells[oldCurrentColumn];
-
-                var newCurrentRow = (containerRow != null) ? containerRow : Row.FromContainer(this.GetContainerFromItem(item));
-                var newCurrentCell = default(Cell);
-
-                //verify that set Current is not called on a column that cannot be current
-                if (newCurrentRow != null)
-                {
-                    newCurrentCell = newCurrentRow.Cells[column];
-                    if ((column != null) && column.ReadOnly && (newCurrentCell != null) && !newCurrentCell.GetCalculatedCanBeCurrent())
-                        throw new DataGridException("SetCurrent cannot be invoked if the column cannot be current.", m_dataGridControl);
-                }
-
-                var currentCellChanged = (newCurrentCell != oldCurrentCell);
-
-                if (((item != oldCurrentItem) || (oldCurrentContext != newCurrentContext)) && (oldCurrentRow != null))
-                {
-                    if (Row.IsCellEditorDisplayConditionsSet(oldCurrentRow, CellEditorDisplayConditions.RowIsCurrent))
-                    {
-                        oldCurrentRow.RemoveDisplayEditorMatchingCondition(CellEditorDisplayConditions.RowIsCurrent);
-                    }
-
-                    oldCurrentRow.SetIsCurrent(false);
-
-                    try
-                    {
-                        oldCurrentRow.EndEdit();
-                    }
-                    //an error occurred in the end edit
-                    catch (DataGridException)
-                    {
-                        //restore the Cell and the Row's IsCurrent Flag
-                        if (oldCurrentCell != null)
-                        {
-                            oldCurrentCell.SetIsCurrent(true);
-                        }
-
-                        oldCurrentRow.SetIsCurrent(true);
-                        throw;
-                    }
-                }
-
-                //For this if, the assumption is that current item hasn't changed, but current column has... (previous if will have caught the case where current item changed).
-
-                //if the currentCell has changed and the old current cell still exists.
-                if ((currentCellChanged) && (oldCurrentCell != null))
-                {
-                    //clear the CellIsCurrent editor display conditions
-                    if (Cell.IsCellEditorDisplayConditionsSet(oldCurrentCell, CellEditorDisplayConditions.CellIsCurrent))
-                    {
-                        oldCurrentCell.RemoveDisplayEditorMatchingCondition(CellEditorDisplayConditions.CellIsCurrent);
-                    }
-
-                    oldCurrentCell.SetIsCurrent(false);
-
-                    try
-                    {
-                        //cancel any ongoing editing on the cell. (this has no effect if row or cell is not being edited. This line can throw but no action is to be done.
-                        oldCurrentCell.EndEdit();
-                    }
-                    catch (DataGridException)
-                    {
-                        oldCurrentCell.SetIsCurrent(true);
-                        throw;
-                    }
-                }
-
-                if ((item != oldCurrentItem) || (oldCurrentContext != newCurrentContext))
-                {
-                    var currentChangingEventArgs = new DataGridCurrentChangingEventArgs(oldCurrentContext, oldCurrentItem, newCurrentContext, item, isCancelable);
-                    m_dataGridControl.RaiseCurrentChanging(currentChangingEventArgs);
-
-                    if (isCancelable && currentChangingEventArgs.Cancel)
-                    {
-                        // We restore the currentness on the previous row and cell.
-                        if (oldCurrentRow != null)
-                        {
-                            if (oldCurrentCell != null)
-                            {
-                                oldCurrentCell.SetIsCurrent(true);
-                            }
-
-                            oldCurrentRow.SetIsCurrent(true);
-                        }
-
-                        throw new DataGridException("The operation has been canceled.", m_dataGridControl);
-                    }
-                }
-
-                //If they are different, clean the previously current DataGridContext
-                if (oldCurrentContext != newCurrentContext)
-                {
-                    oldCurrentContext.SetCurrentItem(null, -1);
-                    oldCurrentContext.SetInternalCurrentItem(null);
-                    //preserve current column on the old DataGridContext
-
-                    oldCurrentContext.SetIsCurrent(false);
-                }
-
-                if (!sourceDataItemIndex.HasValue)
-                {
-                    sourceDataItemIndex = this.Items.IndexOf(item);
-                }
-
-                // All the stuff that can throw is done
-                newCurrentContext.SetInternalCurrentItem(item);
-                newCurrentContext.SetIsCurrent(true);
-
-                // change the CurrentRow and CurentColumn
-                if ((item != null) && (sourceDataItemIndex.Value != -1))
-                {
-                    newCurrentContext.SetCurrentItem(item, sourceDataItemIndex.Value);
-                }
-                else
-                {
-                    newCurrentContext.SetCurrentItem(null, -1);
-                }
-
-                newCurrentContext.SetCurrentColumnHelper(column);
-                m_dataGridControl.SetCurrentDataGridContextHelper(this);
-
-                // We must refetch the container for the current item in case EndEdit triggers a reset on the 
-                // CustomItemContainerGenerator and remap this item to a container other than the one previously fetched
-                newCurrentRow = Row.FromContainer(newCurrentContext.GetContainerFromItem(item));
-                newCurrentCell = (newCurrentRow == null) ? null : newCurrentRow.Cells[column];
-
-                bool currentRowChanged = (newCurrentRow != oldCurrentRow);
-
-                //If there is a container for the new Row.
-                if (newCurrentRow != null)
-                {
-                    Debug.Assert(newCurrentRow.IsContainerPrepared, "The container must be prepared to be set as current and call BeginEdit.");
-
-                    //update the RowIsCurrent display condition
-                    if (Row.IsCellEditorDisplayConditionsSet(newCurrentRow, CellEditorDisplayConditions.RowIsCurrent))
-                    {
-                        newCurrentRow.SetDisplayEditorMatchingCondition(CellEditorDisplayConditions.RowIsCurrent);
-                    }
-
-                    //Update the IsCurrent flag
-                    newCurrentRow.SetIsCurrent(true);
-
-                    //if the current row changed, make sure to check the appropriate edition triggers.
-                    if (currentRowChanged == true)
-                    {
-                        //if EditTriggers tells to enter editing mode AND no current cell is set on the new current row
-                        if ((newCurrentRow.IsEditTriggerSet(EditTriggers.RowIsCurrent)) && (newCurrentCell == null))
-                        {
-                            //To prevent re-entrancy of the SetCurrent fonction (since Row.BeginEdit will call Cell.BeginEdit which will call SetCurrent if not current already)
-                            if (this.VisibleColumns.Count > 0)
-                            {
-                                var firstFocusableColumn = NavigationHelper.GetFirstVisibleFocusableColumnIndex(this, newCurrentRow);
-                                if (firstFocusableColumn < 0)
-                                    throw new DataGridException("Trying to edit while no cell is focusable. ", m_dataGridControl);
-
-                                this.SetCurrentColumnHelper(this.VisibleColumns[firstFocusableColumn]);
-                                newCurrentCell = newCurrentRow.Cells[m_currentColumn];
-                                currentCellChanged = true;
-                            }
-                        }
-                    }
-                }
-
-                //If current cell exists.
-                if (newCurrentCell != null)
-                {
-                    //update the CellIsCurrent display condition
-                    if (Cell.IsCellEditorDisplayConditionsSet(newCurrentCell, CellEditorDisplayConditions.CellIsCurrent))
-                    {
-                        newCurrentCell.SetDisplayEditorMatchingCondition(CellEditorDisplayConditions.CellIsCurrent);
-                    }
-
-                    newCurrentCell.SetIsCurrent(true);
-
-                    //Then, if the Current Cell has changed or not currently in edition, process the edition conditions.
-                    if (currentCellChanged || !newCurrentCell.IsBeingEdited)
-                    {
-                        //if the EditTriggers dictate that we should enter edition, do it.
-                        if ((newCurrentRow.IsEditTriggerSet(EditTriggers.CellIsCurrent))
-                           || ((newCurrentRow.IsEditTriggerSet(EditTriggers.RowIsCurrent)) && (currentRowChanged)))
-                        {
-                            try
-                            {
-                                newCurrentCell.BeginEdit();
-                            }
-                            catch (DataGridException)
-                            {
-                                // We swallow the exception if it occurs because the Cell was read-only.
-
-                                // Try to begin edit only on the row
-                                try
-                                {
-                                    newCurrentRow.BeginEdit();
-                                }
-                                catch (DataGridException)
-                                {
-                                    // We swallow the exception if it occurs because the Row was read-only.
-                                }
-                            }
-                        }
-                    }
-                }
-
-                //if there is a new CurrentItem 
-                if (item != null)
-                {
-                    //if the container from the new Current item is realized
-                    if (newCurrentRow != null)
-                    {
-                        if (m_dataGridControl.IsBringIntoViewAllowed(trigger))
-                        {
-                            if (!m_dataGridControl.IsBringIntoViewDelayed)
-                            {
-                                if (newCurrentCell != null)
-                                {
-                                    newCurrentCell.BringIntoView();
-                                }
-                                else
-                                {
-                                    // Ensure the item is visible visible
-                                    newCurrentRow.BringIntoView();
-                                }
-                            }
-                            else
-                            {
-                                m_dataGridControl.DelayBringIntoViewAndFocusCurrent(trigger);
-                            }
-                        }
-
-                        using (m_dataGridControl.SelectionChangerManager.PushUpdateSelectionSource(SelectionManager.UpdateSelectionSource.None))
-                        {
-                            // Call this to update the Focus to the correct location
-                            m_dataGridControl.SetFocusHelper(newCurrentRow, column, forceFocus, true);
-                        }
-                    }
-                    else
-                    {
-                        m_dataGridControl.DelayBringIntoViewAndFocusCurrent(trigger);
-                    }
-                }
-
-                //Send notification at the end (as much as possible) to ensure that no code bound on the property changed handler will interrupt this sequence 
-
-                if ((synchronizeSelectionWithCurrent) && (!m_dataGridControl.SelectionChangerManager.IsActive))
-                {
-                    m_dataGridControl.SelectionChangerManager.Begin();
-
-                    try
-                    {
-                        if (m_dataGridControl.SelectionUnit == SelectionUnit.Row)
-                        {
-                            if (newCurrentContext.CurrentItemIndex == -1)
-                            {
-                                m_dataGridControl.SelectionChangerManager.UnselectAll();
-                            }
-                            else
-                            {
-                                m_dataGridControl.SelectionChangerManager.SelectJustThisItem(this, newCurrentContext.CurrentItemIndex, newCurrentContext.CurrentItem);
-                            }
-                        }
-                        else
-                        {
-                            int currentColumnVisibleIndex = (newCurrentContext.CurrentColumn == null) ? -1 : newCurrentContext.CurrentColumn.VisiblePosition;
-
-                            if ((currentColumnVisibleIndex == -1) || (newCurrentContext.CurrentItemIndex == -1))
-                            {
-                                m_dataGridControl.SelectionChangerManager.UnselectAll();
-                            }
-                            else
-                            {
-                                m_dataGridControl.SelectionChangerManager.SelectJustThisCell(this, newCurrentContext.CurrentItemIndex, newCurrentContext.CurrentItem, currentColumnVisibleIndex);
-                            }
-                        }
-                    }
-                    finally
-                    {
-                        m_dataGridControl.SelectionChangerManager.End(false, false);
-                    }
-                }
-
-                if (this.CurrentItem != oldPublicCurrentItem)
-                {
-                    this.OnPropertyChanged("CurrentItem");
-                }
-
-                if (column != oldCurrentColumn)
-                {
-                    this.OnPropertyChanged("CurrentColumn");
-                }
-
-                if ((item != oldCurrentItem) || (oldCurrentContext != newCurrentContext))
-                {
-                    var currentChangedEventArgs = new DataGridCurrentChangedEventArgs(oldCurrentContext, oldCurrentItem, newCurrentContext, item);
-                    m_dataGridControl.RaiseCurrentChanged(currentChangedEventArgs);
-                }
-            }
-            finally
-            {
-                m_dataGridControl.IsSetCurrentInProgress = false;
-            }
-        }
-
-        internal void SetupTitleBindingForGroupLevelDescriptions()
-        {
-            foreach (GroupLevelDescription gld in this.GroupLevelDescriptions)
-            {
-                Binding titleBinding = BindingOperations.GetBinding(gld, GroupLevelDescription.TitleProperty);
-
-                if (titleBinding == null)
-                {
-                    ColumnBase column = this.Columns[gld.FieldName];
-
-                    if (column != null)
-                    {
-                        DataGridContext.SetupGroupLevelDescriptionBindings(gld, column);
-                    }
-                }
-            }
-        }
-
-        internal static void UpdateGroupLevelDescriptions(GroupLevelDescriptionCollection groupLevelDescriptions,
-          NotifyCollectionChangedEventArgs e, ObservableCollection<GroupDescription> groupDescriptions, ColumnCollection columns)
-        {
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    //add all the items added into the GroupLevelDescriptions collection
-                    for (int i = 0; i < e.NewItems.Count; i++)
-                    {
-                        GroupLevelDescription newInfo = DataGridContext.CreateGroupLevelDescription(columns, (GroupDescription)e.NewItems[i]);
-
-                        groupLevelDescriptions.Insert(i + e.NewStartingIndex, newInfo);
-                    }
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                    foreach (GroupDescription desc in e.OldItems)
-                    {
-                        GroupLevelDescription oldInfo = DataGridContext.GetGroupLevelDescription(groupLevelDescriptions, desc);
-
-                        if (oldInfo != null)
-                        {
-                            groupLevelDescriptions.Remove(oldInfo);
-                        }
-                    }
-                    break;
-
-                case NotifyCollectionChangedAction.Reset:
-
-                    groupLevelDescriptions.Clear();
-
-                    foreach (GroupDescription desc in groupDescriptions)
-                    {
-                        GroupLevelDescription newInfo = DataGridContext.CreateGroupLevelDescription(columns, desc);
-
-                        groupLevelDescriptions.Add(newInfo);
-                    }
-
-                    break;
-
-                case NotifyCollectionChangedAction.Move:
-
-                    GroupLevelDescription movedGroupLevelDescription = groupLevelDescriptions[e.OldStartingIndex];
-                    groupLevelDescriptions.RemoveAt(e.OldStartingIndex);
-                    groupLevelDescriptions.Insert(e.NewStartingIndex, movedGroupLevelDescription);
-
-                    break;
-
-                case NotifyCollectionChangedAction.Replace:
-
-                    groupLevelDescriptions.RemoveAt(e.OldStartingIndex);
-                    GroupLevelDescription replaceInfo = DataGridContext.CreateGroupLevelDescription(columns, (GroupDescription)e.NewItems[0]);
-
-                    groupLevelDescriptions.Insert(e.NewStartingIndex, replaceInfo);
-
-                    break;
-            }
-        }
-
-        internal static DataGridContext SafeGetDataGridContextForDataGridCollectionView(
-          DataGridContext rootDataGridContext,
-          DataGridCollectionViewBase targetDataGridCollectionViewBase)
-        {
-            DataGridContext matchingDataGridContext = null;
-
-            DataGridCollectionViewBase rootDataGridCollectionViewBase = rootDataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-            if (rootDataGridCollectionViewBase != null)
-            {
-                if (rootDataGridCollectionViewBase == targetDataGridCollectionViewBase)
-                {
-                    matchingDataGridContext = rootDataGridContext;
-                }
-                else
-                {
-                    matchingDataGridContext = DataGridContext.SafeRecursiveGetDataGridContextForDataGridCollectionViewBase(
-                      rootDataGridContext.GetChildContexts(),
-                      targetDataGridCollectionViewBase);
-                }
-            }
-
-            return matchingDataGridContext;
-        }
-
-        private static DataGridContext SafeRecursiveGetDataGridContextForDataGridCollectionViewBase(
-          IEnumerable<DataGridContext> childDataGridContexts,
-          DataGridCollectionViewBase targetDataGridCollectionViewBase)
-        {
-            foreach (DataGridContext childDataGridContext in childDataGridContexts)
-            {
-                // Child DataGridContext's Items cannot be anything else than a DataGridCollectionView.
-                DataGridCollectionViewBase dataGridCollectionViewBase = (DataGridCollectionViewBase)childDataGridContext.Items;
-
-                if (dataGridCollectionViewBase == targetDataGridCollectionViewBase)
-                    return childDataGridContext;
-
-                // Deep down.
-                DataGridContext matchingDataGridContext = DataGridContext.SafeRecursiveGetDataGridContextForDataGridCollectionViewBase(
-                  childDataGridContext.GetChildContexts(),
-                  targetDataGridCollectionViewBase);
-
-                if (matchingDataGridContext != null)
-                    return matchingDataGridContext;
-            }
-
-            return null;
-        }
-
-        private static void UnselectAllCells(DataGridContext dataGridContext)
-        {
-            if (dataGridContext == null)
-                return;
-
-            var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-            selectionManager.Begin();
-
-            try
-            {
-                selectionManager.UnselectAllCells(dataGridContext);
-            }
-            finally
-            {
-                selectionManager.End(false, false);
-            }
-        }
-
-        internal void SaveContainerSizeState(object item, FrameworkElement container)
-        {
-            if (item == null)
-                return;
-
-            ContainerSizeState containerSizeState = new ContainerSizeState(container);
-
-            if (containerSizeState.IsEmpty() == false)
-            {
-                m_sizeStateDictionary[item] = containerSizeState;
-
-                DataGridContext.CleanContainerSizeState(container, containerSizeState);
-            }
-            else
-            {
-                m_sizeStateDictionary.Remove(item);
-            }
-        }
-
-        internal void RestoreContainerSizeState(object item, FrameworkElement container)
-        {
-            if (item == null)
-                return;
-
-            ContainerSizeState containerSizeState;
-            if (m_sizeStateDictionary.TryGetValue(item, out containerSizeState) == true)
-            {
-                DataGridContext.RestoreContainerSizeWorker(container, containerSizeState);
-            }
-        }
-
-        internal void ClearSizeStates()
-        {
-            m_sizeStateDictionary.Clear();
-        }
-
-        /// <summary>
-        /// Gets the current View property value for this DataGridContext. It can either come
-        /// from a local (attached) value or the value on the view (if the property is "routed").
-        /// </summary>
-        /// <typeparam name="T">The return value type of the requested property.</typeparam>
-        /// <param name="propertyName">The property name on the View.</param>
-        /// <param name="returnValue">The value of the property if found. Will be ignored if the property is not found.</param>
-        /// <returns>Returns true if the returnValue has been set. False otherwise.</returns>
-        internal bool GetViewPropertyValue<T>(string propertyName, ref T returnValue)
-        {
-            object value = null;
-
-            if (m_viewPropertiesDescriptors != null)
-            {
-                PropertyDescriptor descriptor = m_viewPropertiesDescriptors[propertyName];
-
-                if (descriptor != null)
-                    value = descriptor.GetValue(this);
-            }
-
-            if (value != null)
-            {
-                returnValue = (T)value;
-                return true;
-            }
-
-            return false;
-        }
-
-
-
-        //---------- PRIVATE METHODS ----------
-
-        private void ClearViewPropertyBindings()
-        {
-            foreach (Views.ViewBase.ViewPropertyStruct viewProperty in m_viewProperties)
-            {
-                BindingOperations.ClearBinding(this, viewProperty.DependencyProperty);
-                this.ClearValue(viewProperty.DependencyProperty);
-            }
-
-            m_viewProperties.Clear();
-
-            //Empty the list of ViewBindingPropertyDescriptor as well.
-            if (m_viewPropertiesDescriptors != null)
-            {
-                m_viewPropertiesDescriptors.Clear();
-                m_viewPropertiesDescriptors = null;
-            }
-        }
-
-        private static GroupLevelDescription CreateGroupLevelDescription(ColumnCollection columns, GroupDescription group)
-        {
-            GroupLevelDescription retval = null;
-            string columnName = DataGridContext.GetColumnNameFromGroupDescription(group);
-
-            if (!string.IsNullOrEmpty(columnName))
-            {
-                retval = new GroupLevelDescription(group, columnName);
-
-                //find the column for that property name
-                ColumnBase column = columns[columnName];
-
-                if (column != null)
-                {
-                    DataGridContext.SetupGroupLevelDescriptionBindings(retval, column);
-                }
-                else
-                {
-                    //if no column exists for that name, then use the name as the Title for the GroupLevelDescription
-                    retval.SetTitle(columnName);
-                }
-            }
-
-            return retval;
-        }
-
-        private Binding CreateViewPropertyBinding(Views.ViewBase view, Views.ViewBase.ViewPropertyStruct viewProperty)
-        {
-            var dependencyProperty = viewProperty.DependencyProperty;
-
-            if (this.IsAFlattenDetail)
-            {
-                switch (viewProperty.FlattenDetailBindingMode)
-                {
-                    case FlattenDetailBindingMode.None:
-                        return null;
-
-                    case FlattenDetailBindingMode.MasterOneWay:
-                        {
-                            var rootDataGridContext = this.RootDataGridContext;
-                            Debug.Assert((rootDataGridContext != null) && (this != rootDataGridContext));
-                            return DataGridContext.CreateViewPropertyBindingForSource(rootDataGridContext, dependencyProperty, BindingMode.OneWay);
-                        }
-
-                    default:
-                        break;
-                }
-            }
-
-            if (viewProperty.ViewPropertyMode == ViewPropertyMode.ViewOnly)
-                return DataGridContext.CreateViewPropertyBindingForSource(view, dependencyProperty);
-
-            var detailConfiguration = this.SourceDetailConfiguration;
-            if (detailConfiguration != null)
-            {
-                var defaultDetailConfiguration = this.GetDefaultDetailConfigurationForContext();
-                if (defaultDetailConfiguration != null)
-                    return DataGridContext.CreateViewPropertyBindingForSource(defaultDetailConfiguration, dependencyProperty);
-
-                return DataGridContext.CreateViewPropertyBindingForSource(detailConfiguration, dependencyProperty);
-            }
-
-            return DataGridContext.CreateViewPropertyBindingForSource(view, dependencyProperty);
-        }
-
-        private static Binding CreateViewPropertyBindingForSource(object source, DependencyProperty property)
-        {
-            return DataGridContext.CreateViewPropertyBindingForSource(source, property, BindingMode.TwoWay);
-        }
-
-        private static Binding CreateViewPropertyBindingForSource(object source, DependencyProperty property, BindingMode bindingMode)
-        {
-            Binding binding = new Binding();
-            binding.Source = source;
-            binding.Path = new PropertyPath(property);
-            binding.Mode = bindingMode;
-
-            return binding;
-        }
-
-        private static GroupLevelDescription GetGroupLevelDescription(GroupLevelDescriptionCollection groupLevelDescriptions, GroupDescription group)
-        {
-            GroupLevelDescription retval = null;
-            string columnName = DataGridContext.GetColumnNameFromGroupDescription(group);
-
-            if (string.IsNullOrEmpty(columnName) == false)
-            {
-                foreach (GroupLevelDescription info in groupLevelDescriptions)
-                {
-                    if (info.FieldName == columnName)
-                    {
-                        retval = info;
-                        break;
-                    }
-                }
-            }
-
-            return retval;
-        }
-
-        internal DefaultDetailConfiguration GetDefaultDetailConfigurationForContext()
-        {
-            if (this.AlreadySearchedForDefaultDetailConfig)
-                return m_defaultDetailConfiguration;
-
-            m_defaultDetailConfiguration = null;
-            //start the loop with the current instance.
-            if ((this.SourceDetailConfiguration != null) && (this.SourceDetailConfiguration.IsAutoCreated == true))
-            {
-                DataGridContext currentContext = this;
-
-                do
-                {
-                    DefaultDetailConfiguration defaultDetailConfig = currentContext.DefaultDetailConfiguration;
-                    if (defaultDetailConfig != null)
-                    {
-                        m_defaultDetailConfiguration = defaultDetailConfig;
-                        break;
-                    }
-
-                    currentContext = currentContext.ParentDataGridContext;
-                }
-                while (currentContext != null);
-            }
-
-            this.AlreadySearchedForDefaultDetailConfig = true;
-            return m_defaultDetailConfiguration;
-        }
-
-        internal void GetRealizedItems(List<object> containers)
-        {
-            lock (containers)
-            {
-                //obtain the IItemContainerGenerator interface of the ItemContainerGenerator (since called many places and it's bothering to always cast).
-                IItemContainerGenerator generator = this.CustomItemContainerGenerator;
-                //exception case, I wan to ask for the Generator Interface
-
-                //obtain the GeneratorPosition from the last item in the items collection of the Itemscontrol, this will give me the number of items that are realized.
-                int itemCount = this.CustomItemContainerGenerator.ItemCount;
-
-                GeneratorPosition lastItemGenPos = generator.GeneratorPositionFromIndex(itemCount - 1);
-
-                //the index of the generator position of the last item will indicate the number of realized items.
-                for (int i = 0; i <= lastItemGenPos.Index; i++)
-                {
-                    //To obtain the Container from the Generator, I need and Index, I can obtain an index from a GeneratorPosition
-                    GeneratorPosition itemGenPos = new GeneratorPosition(i, 0); //items with offset == 0 are "realized items"
-                    int itemIndex = generator.IndexFromGeneratorPosition(itemGenPos);
-
-                    object item = this.CustomItemContainerGenerator.ContainerFromIndex(itemIndex);
-
-                    //add the container the the enumerable collection
-                    containers.Add(item);
-                }
-
-                //exception case for the master DataGridContext, take the Fixed regions as well
-                if (m_detailConfig == null)
-                {
-                    Panel fixedPanel = m_dataGridControl.FixedHeadersHostPanel;
-                    if (fixedPanel != null)
-                    {
-                        foreach (object container in fixedPanel.Children)
-                        {
-                            containers.Add(container);
-                        }
-                    }
-
-                    fixedPanel = m_dataGridControl.FixedFootersHostPanel;
-                    if (fixedPanel != null)
-                    {
-                        foreach (object container in fixedPanel.Children)
-                        {
-                            containers.Add(container);
-                        }
-                    }
-                } //end if Master DataGridContext
-
-            }
-        }
-
-        internal static void InsertColumnByVisiblePosition(HashedLinkedList<ColumnBase> linkedList, ColumnBase columnToInsert)
-        {
-            int requestedPosition = columnToInsert.VisiblePosition;
-            LinkedListNode<ColumnBase> columnNode = linkedList.First;
-
-            LinkedListNode<ColumnBase> insertBeforeNode = null;
-            ColumnBase column = null;
-
-            // Append columns which VisiblePosition haven't explicitly set
-            if (columnToInsert.VisiblePosition == int.MaxValue)
-            {
-                linkedList.AddLast(columnToInsert);
-                return;
-            }
-
-            if (linkedList.Count == 0)
-            {
-                linkedList.AddFirst(columnToInsert);
-            }
-            else
-            {
-                while (columnNode != null)
-                {
-                    column = columnNode.Value;
-
-                    if (column != null)
-                    {
-                        if (column.VisiblePosition > requestedPosition)
-                        {
-                            // Insertion point found
-                            insertBeforeNode = columnNode;
-                            break;
-                        }
-
-                        columnNode = columnNode.Next;
-                    }
-                }
-
-                if (insertBeforeNode != null)
-                {
-                    linkedList.AddBefore(insertBeforeNode, columnToInsert);
-                    insertBeforeNode = null;
-                }
-                else
-                {
-                    linkedList.AddLast(columnToInsert);
-                }
-            }
-        }
-
-        private void MergeDistinctValues(DistinctValuesRequestedEventArgs args)
-        {
-            Debug.Assert(this.Columns[args.AutoFilterColumnFieldName] != null);
-
-            var distinctValues = this.DistinctValues;
-            if (distinctValues == null)
-                return;
-
-            var readOnlyObservableHashList = default(ReadOnlyObservableHashList);
-
-            // We force the creation of DistinctValues for this field in every DataGridCollectionView
-            if (distinctValues.TryGetValue(args.AutoFilterColumnFieldName, out readOnlyObservableHashList))
-            {
-                foreach (var item in readOnlyObservableHashList)
-                {
-                    args.DistinctValues.Add(item);
-                }
-            }
-        }
-
-        private void OnGroupDescriptionsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            this.DelayBringIntoViewAndFocusCurrent(AutoScrollCurrentItemSourceTriggers.GroupChanged);
-
-            DataGridContext.UpdateGroupLevelDescriptions(this.GroupLevelDescriptions, e, this.Items.GroupDescriptions, this.Columns);
-        }
-
-        private void OnSortDescriptionsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            this.DelayBringIntoViewAndFocusCurrent(AutoScrollCurrentItemSourceTriggers.SortChanged);
-
-            var updateColumnSortCommand = this.UpdateColumnSortCommand;
-            if (updateColumnSortCommand.CanExecute())
-            {
-                updateColumnSortCommand.Execute();
-            }
-        }
-
-        private static void SetupGroupLevelDescriptionBindings(GroupLevelDescription groupLevelDescription, ColumnBase column)
-        {
-            //Bind the column title to the GroupLevelDescription title
-            Binding titleBinding = new Binding();
-            titleBinding.Path = new PropertyPath(ColumnBase.TitleProperty);
-            titleBinding.Source = column;
-            titleBinding.Mode = BindingMode.OneWay;
-
-            //Bind the column title template to the GroupLevelDescription title template
-            Binding titleTemplateBinding = new Binding();
-            titleTemplateBinding.Path =
-              new PropertyPath(ColumnBase.TitleTemplateProperty);
-            titleTemplateBinding.Source = column;
-            titleTemplateBinding.Mode = BindingMode.OneWay;
-
-            //Bind the column title template selector to the GroupLevelDescription title template selector
-            Binding titleTemplateSelectorBinding = new Binding();
-            titleTemplateSelectorBinding.Path =
-              new PropertyPath(ColumnBase.TitleTemplateSelectorProperty);
-            titleTemplateSelectorBinding.Source = column;
-            titleTemplateSelectorBinding.Mode = BindingMode.OneWay;
-
-            Binding valueTemplateBinding = null;
-            Binding valueTemplateSelectorBinding = null;
-            Binding valueStringFormatBinding = null;
-            Binding valueStringFormatCultureBinding = null;
-
-            Column dataColumn = column as Column;
-
-            // If we have a Column and a ForeignKey is defined
-            if ((dataColumn != null) && (dataColumn.ForeignKeyConfiguration != null))
-            {
-                //Bind the column GroupValueTemplate to the GroupLevelDescription value template
-                valueTemplateBinding = new Binding();
-                valueTemplateBinding.Source = dataColumn;
-                valueTemplateBinding.Path = new PropertyPath("(0).(1)",
-                  Column.ForeignKeyConfigurationProperty,
-                  ForeignKeyConfiguration.DefaultGroupValueTemplateProperty);
-                valueTemplateBinding.Mode = BindingMode.OneWay;
-            }
-            else
-            {
-                //Bind the column GroupValueTemplate to the GroupLevelDescription value template
-                valueTemplateBinding = new Binding();
-                valueTemplateBinding.Path = new PropertyPath(ColumnBase.GroupValueTemplateProperty);
-                valueTemplateBinding.Source = column;
-                valueTemplateBinding.Mode = BindingMode.OneWay;
-
-                //Bind the column GroupValueTemplateSelector to the GroupLevelDescription value template selector
-                valueTemplateSelectorBinding = new Binding();
-                valueTemplateSelectorBinding.Path = new PropertyPath(ColumnBase.GroupValueTemplateSelectorProperty);
-                valueTemplateSelectorBinding.Source = column;
-                valueTemplateSelectorBinding.Mode = BindingMode.OneWay;
-
-                //Bind the column GroupValueStringFormat to the GroupLevelDescription string format
-                valueStringFormatBinding = new Binding();
-                valueStringFormatBinding.Path = new PropertyPath(ColumnBase.GroupValueStringFormatProperty);
-                valueStringFormatBinding.Source = column;
-                valueStringFormatBinding.Mode = BindingMode.OneWay;
-
-                //Bind the column DefaultCulture to the GroupLevelDescription string format culture
-                valueStringFormatCultureBinding = new Binding();
-                valueStringFormatCultureBinding.Path = new PropertyPath(ColumnBase.DefaultCultureProperty);
-                valueStringFormatCultureBinding.Source = column;
-                valueStringFormatCultureBinding.Mode = BindingMode.OneWay;
-                valueStringFormatCultureBinding.TargetNullValue = CultureInfo.CurrentCulture;
-            }
-
-            BindingOperations.SetBinding(groupLevelDescription, GroupLevelDescription.TitleProperty, titleBinding);
-            BindingOperations.SetBinding(groupLevelDescription, GroupLevelDescription.TitleTemplateProperty, titleTemplateBinding);
-            BindingOperations.SetBinding(groupLevelDescription, GroupLevelDescription.TitleTemplateSelectorProperty, titleTemplateSelectorBinding);
-            BindingOperations.SetBinding(groupLevelDescription, GroupLevelDescription.ValueTemplateProperty, valueTemplateBinding);
-
-            if (valueStringFormatBinding != null)
-            {
-                BindingOperations.SetBinding(groupLevelDescription, GroupLevelDescription.ValueStringFormatProperty, valueStringFormatBinding);
-            }
-
-            if (valueStringFormatCultureBinding != null)
-            {
-                BindingOperations.SetBinding(groupLevelDescription, GroupLevelDescription.ValueStringFormatCultureProperty, valueStringFormatCultureBinding);
-            }
-
-            if (valueTemplateSelectorBinding != null)
-            {
-                BindingOperations.SetBinding(groupLevelDescription, GroupLevelDescription.ValueTemplateSelectorProperty, valueTemplateSelectorBinding);
-            }
-        }
-
-        private void HandleMasterColumnsCollectionChanged(NotifyCollectionChangedEventArgs e)
-        {
-            var removeCurrentColumn = false;
-            var needGeneratorHardReset = false;
-            var currentColumn = this.CurrentColumn;
-
-            //If( e.Action == Add ), there is nothing to do.
-
-            if (e.Action == NotifyCollectionChangedAction.Reset)
-            {
-                var columns = this.Columns;
-
-                removeCurrentColumn = (columns == null) || (!columns.Contains(currentColumn));
-                needGeneratorHardReset = true;
-            }
-            else if (e.Action == NotifyCollectionChangedAction.Remove)
-            {
-                //Remove of at least the current column
-                if (e.OldItems.Contains(currentColumn))
-                {
-                    removeCurrentColumn = true;
-                    needGeneratorHardReset = true;
-                }
-            }
-            else if (e.Action == NotifyCollectionChangedAction.Replace)
-            {
-                //Replace in which at least the current column was "replaced" by another (current column not present in new items )
-                if ((e.OldItems.Contains(currentColumn)) && (!e.NewItems.Contains(currentColumn)))
-                {
-                    removeCurrentColumn = true;
-                    needGeneratorHardReset = true;
-                }
-            }
-            //Nothing to do because the way to change the visible position of a column is through its VisiblePosition property.
-            else if (e.Action == NotifyCollectionChangedAction.Move)
-            {
-                return;
-            }
-
-            var closestColumn = default(ColumnBase);
-
-            //Select the current column's closest visible column while its possible
-            if (removeCurrentColumn)
-            {
-                closestColumn = DataGridContext.GetClosestColumn(currentColumn, this.ColumnsByVisiblePosition);
-            }
-
-            // When a column is removed, we need to clear the Generator from every container to avoid problems
-            // if the column is added again, but using a different instance (i.e. a new column with the same fieldname).
-            if (needGeneratorHardReset)
-            {
-                // We only reset the fixed region if the column is part of the master context 
-                if (this.SourceDetailConfiguration == null)
-                {
-                    this.DataGridControl.ResetFixedRegions();
-                }
-
-                this.DataGridControl.CustomItemContainerGenerator.RemoveAllAndNotify();
-            }
-
-            this.DefaultImageColumnDetermined = false;
-
-            var updateColumnSortCommand = this.UpdateColumnSortCommand;
-            if (updateColumnSortCommand.CanExecute())
-            {
-                this.UpdateColumnSortCommand.Execute();
-            }
-
-            if (removeCurrentColumn)
-            {
-                // Now that the columns collections have been updated, it is time to set the new current column if necessary.
-                // The new current column that was identified earlier may have been removed from the visible columns after the collections update.
-                if ((closestColumn != null) && !this.Columns.Contains(closestColumn))
-                {
-                    closestColumn = null;
-                }
-
-                this.SetCurrentColumnCore(closestColumn, false, m_dataGridControl.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.ColumnsCollectionChanged);
-            }
-
-            ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurations(this.Columns,
-                                                                           this.ItemsSourceCollection,
-                                                                           m_itemsSourcePropertyDescriptions,
-                                                                           this.AutoCreateForeignKeyConfigurations);
-        }
-
-        internal static ColumnBase GetClosestColumn(ColumnBase reference, HashedLinkedList<ColumnBase> columnsByVisiblePosition)
-        {
-            LinkedListNode<ColumnBase> oldColumnNode = columnsByVisiblePosition.Find(reference);
-
-            ColumnBase newColumn = null;
-
-            if (oldColumnNode != null)
-            {
-                LinkedListNode<ColumnBase> newColumnNode = oldColumnNode.Previous;
-
-                if (newColumnNode == null)
-                {
-                    newColumnNode = oldColumnNode.Next;
-                }
-
-                if (newColumnNode != null)
-                {
-                    newColumn = newColumnNode.Value;
-                }
-            }
-
-            return newColumn;
-        }
-
-        private void SetupViewProperties()
-        {
-            this.ClearViewPropertyBindings();
-
-            Views.ViewBase view = m_dataGridControl.GetView();
-            if (view == null)
-                return;
-
-            var viewProperties = view.GetViewProperties()
-                                   .Concat(view.GetSharedProperties())
-                                   .Concat(view.GetSharedNoFallbackProperties());
-
-            foreach (var viewProperty in viewProperties)
-            {
-                var dependencyProperty = viewProperty.DependencyProperty;
-                Debug.Assert(!dependencyProperty.ReadOnly);
-
-                Binding binding = this.CreateViewPropertyBinding(view, viewProperty);
-                if (binding != null)
-                {
-                    BindingOperations.SetBinding(this, dependencyProperty, binding);
-                }
-
-                //Note: we place the shared and non-shared properties in the same pool (makes no differences beyond this point ).
-                m_viewProperties.Add(viewProperty);
-
-                this.OnPropertyChanged(dependencyProperty.Name);
-            }
-        }
-
-        private void InitializeViewProperties()
-        {
-            if (!this.IsAFlattenDetail)
-            {
-                TableflowView.SetFixedColumnSplitterTranslation(this, new TranslateTransform());
-            }
-        }
-
-        private void HookToItemPropertiesChanged()
-        {
-            var collectionView = this.ItemsSourceCollection as DataGridCollectionViewBase;
-            if (collectionView == null)
-                return;
-
-            this.RegisterItemProperties(collectionView.ItemProperties);
-        }
-
-        private void UnhookToItemPropertiesChanged(DataGridCollectionViewBase collectionView)
-        {
-            if (collectionView == null)
-                return;
-
-            this.UnregisterItemProperties(collectionView.ItemProperties);
-        }
-
-        private void UpdateColumns()
-        {
-            Debug.Assert(m_detailConfig == null);
-
-            ItemsSourceHelper.ResetPropertyDescriptions(m_itemsSourcePropertyDescriptions, m_itemPropertyMap, m_dataGridControl, m_dataGridControlItemsSource);
-
-            if (m_dataGridControl.AutoCreateColumns)
-            {
-                ItemsSourceHelper.UpdateColumnsFromPropertyDescriptions(m_columnManager, m_dataGridControl.DefaultCellEditors, m_itemsSourcePropertyDescriptions, this.AutoCreateForeignKeyConfigurations);
-            }
-        }
-
-        private void RegisterItemProperties(DataGridItemPropertyCollection itemProperties)
-        {
-            if (itemProperties == null)
-                return;
-
-            CollectionChangedEventManager.AddListener(itemProperties, this);
-
-            foreach (var itemProperty in itemProperties)
-            {
-                this.RegisterItemProperty(itemProperty);
-            }
-        }
-
-        private void UnregisterItemProperties(DataGridItemPropertyCollection itemProperties)
-        {
-            if (itemProperties == null)
-                return;
-
-            foreach (var itemProperty in itemProperties)
-            {
-                this.UnregisterItemProperty(itemProperty);
-            }
-
-            CollectionChangedEventManager.RemoveListener(itemProperties, this);
-        }
-
-        private void RegisterItemProperty(DataGridItemPropertyBase itemProperty)
-        {
-            if (itemProperty == null)
-                return;
-
-            PropertyChangedEventManager.AddListener(itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName);
-            this.RegisterItemProperties(itemProperty.ItemPropertiesInternal);
-        }
-
-        private void UnregisterItemProperty(DataGridItemPropertyBase itemProperty)
-        {
-            if (itemProperty == null)
-                return;
-
-            this.UnregisterItemProperties(itemProperty.ItemPropertiesInternal);
-            PropertyChangedEventManager.RemoveListener(itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName);
-        }
-
-        private void OnItemPropertiesCollectionChanged(DataGridItemPropertyCollection collection, NotifyCollectionChangedEventArgs e)
-        {
-            Debug.Assert(m_detailConfig == null);
-
-            var rootCollection = ItemsSourceHelper.GetRootCollection(collection);
-            if (rootCollection == null)
-                return;
-
-            if (rootCollection == ((DataGridCollectionViewBase)m_dataGridControlItemsSource).ItemProperties)
-            {
-                if (e.Action == NotifyCollectionChangedAction.Reset)
-                    throw new NotSupportedException();
-
-                if (e.Action == NotifyCollectionChangedAction.Move)
-                    return;
-
-                if (e.OldItems != null)
-                {
-                    foreach (DataGridItemPropertyBase itemProperty in e.OldItems)
-                    {
-                        this.UnregisterItemProperty(itemProperty);
-                    }
-                }
-
-                if (e.NewItems != null)
-                {
-                    foreach (DataGridItemPropertyBase itemProperty in e.NewItems)
-                    {
-                        this.RegisterItemProperty(itemProperty);
-                    }
-                }
-
-                this.UpdateColumns();
-            }
-            else
-            {
-                Debug.Fail("The collection is not linked to the collection view's item properties.");
-                this.UnregisterItemProperties(collection);
-            }
-        }
-
-        private void OnItemPropertyPropertyChanged(DataGridItemPropertyBase itemProperty, PropertyChangedEventArgs e)
-        {
-            Debug.Assert(m_detailConfig == null);
-
-            var rootCollection = ItemsSourceHelper.GetRootCollection(itemProperty);
-            if (rootCollection == null)
-                return;
-
-            if (rootCollection != ((DataGridCollectionViewBase)m_dataGridControlItemsSource).ItemProperties)
-            {
-                Debug.Fail("The collection is not linked to the detail configuration's item properties.");
-                this.UnregisterItemProperty(itemProperty);
-                return;
-            }
-
-            if (string.IsNullOrEmpty(e.PropertyName) || (e.PropertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName))
-            {
-                var itemProperties = itemProperty.ItemPropertiesInternal;
-                if (itemProperties != null)
-                {
-                    this.UnregisterItemProperties(itemProperties);
-                    this.RegisterItemProperties(itemProperties);
-                    this.UpdateColumns();
-                }
-            }
-        }
-
-        private void OnDetailConfigRequestingDelayBringIntoViewAndFocusCurrent(object sender, RequestingDelayBringIntoViewAndFocusCurrentEventArgs e)
-        {
-            if (!this.IsCurrent)
-                return;
-
-            this.DelayBringIntoViewAndFocusCurrent(e.Trigger);
-        }
-
-        private static void CleanContainerSizeState(FrameworkElement container, ContainerSizeState containerSizeState)
-        {
-            if (containerSizeState.Height != DependencyProperty.UnsetValue)
-                container.ClearValue(FrameworkElement.HeightProperty);
-
-            if (containerSizeState.Width != DependencyProperty.UnsetValue)
-                container.ClearValue(FrameworkElement.WidthProperty);
-
-            if (containerSizeState.MinHeight != DependencyProperty.UnsetValue)
-                container.ClearValue(FrameworkElement.MinHeightProperty);
-
-            if (containerSizeState.MinWidth != DependencyProperty.UnsetValue)
-                container.ClearValue(FrameworkElement.MinWidthProperty);
-
-            if (containerSizeState.MaxHeight != DependencyProperty.UnsetValue)
-                container.ClearValue(FrameworkElement.MaxHeightProperty);
-
-            if (containerSizeState.MaxWidth != DependencyProperty.UnsetValue)
-                container.ClearValue(FrameworkElement.MaxWidthProperty);
-        }
-
-        private static void RestoreContainerSizeWorker(FrameworkElement container, ContainerSizeState sizeState)
-        {
-            if (sizeState.Height != DependencyProperty.UnsetValue)
-                container.SetValue(FrameworkElement.HeightProperty, sizeState.Height);
-
-            if (sizeState.Width != DependencyProperty.UnsetValue)
-                container.SetValue(FrameworkElement.WidthProperty, sizeState.Width);
-
-            if (sizeState.MinHeight != DependencyProperty.UnsetValue)
-                container.SetValue(FrameworkElement.MinHeightProperty, sizeState.MinHeight);
-
-            if (sizeState.MinWidth != DependencyProperty.UnsetValue)
-                container.SetValue(FrameworkElement.MinWidthProperty, sizeState.MinWidth);
-
-            if (sizeState.MaxHeight != DependencyProperty.UnsetValue)
-                container.SetValue(FrameworkElement.MaxHeightProperty, sizeState.MaxHeight);
-
-            if (sizeState.MaxWidth != DependencyProperty.UnsetValue)
-                container.SetValue(FrameworkElement.MaxWidthProperty, sizeState.MaxWidth);
-        }
-
-        //---------- OVERRIDES ----------
-
-        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-            this.OnPropertyChanged(e.Property.Name);
-        }
-
-        //---------- INTERFACES ----------
-
-        #region INotifyPropertyChanged Members
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        private void OnPropertyChanged(string propertyName)
-        {
-            var handler = this.PropertyChanged;
-            if (handler == null)
-                return;
-
-            handler.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        #endregion
-
-        #region IWeakEventListener Members
-
-        bool IWeakEventListener.ReceiveWeakEvent(Type managerType, object sender, EventArgs e)
-        {
-            return this.OnReceiveWeakEvent(managerType, sender, e);
-        }
-
-        private bool OnReceiveWeakEvent(Type managerType, object sender, EventArgs e)
-        {
-            if (managerType == typeof(CollectionChangedEventManager))
-            {
-                var eventArgs = (NotifyCollectionChangedEventArgs)e;
-
-                if (sender == m_items)
-                {
-                    var args = eventArgs.GetRangeActionOrSelf();
-
-                    this.Items_CollectionChanged(sender, args);
-                }
-                if (sender == this.DetailConfigurations)
-                {
-                    this.OnPropertyChanged("HasDetails");
-                }
-                else if (sender == m_columnManager.Columns)
-                {
-                    //Master Level columns collection changed
-                    this.HandleMasterColumnsCollectionChanged(eventArgs);
-                }
-                else if (sender == this.VisibleColumns)
-                {
-                    var mode = ColumnStretchMode.None;
-
-                    if (this.GetViewPropertyValue<ColumnStretchMode>("ColumnStretchMode", ref mode))
-                    {
-                        if ((mode == ColumnStretchMode.First) || (mode == ColumnStretchMode.Last))
-                        {
-                            if (eventArgs.NewItems != null)
-                            {
-                                foreach (ColumnBase column in eventArgs.NewItems)
-                                {
-                                    column.ClearValue(ColumnBase.DesiredWidthProperty);
-                                }
-                            }
-                        }
-                    }
-                }
-                else if (sender == m_items.SortDescriptions)
-                {
-                    this.OnSortDescriptionsChanged(sender, eventArgs);
-                }
-                else if (sender == m_items.GroupDescriptions)
-                {
-                    this.OnGroupDescriptionsChanged(sender, eventArgs);
-                }
-                else if (sender is DataGridItemPropertyCollection)
-                {
-                    this.OnItemPropertiesCollectionChanged((DataGridItemPropertyCollection)sender, eventArgs);
-                }
-            }
-            else if (managerType == typeof(PropertyChangedEventManager))
-            {
-                var eventArgs = (PropertyChangedEventArgs)e;
-
-                if (sender is DataGridItemPropertyBase)
-                {
-                    this.OnItemPropertyPropertyChanged((DataGridItemPropertyBase)sender, eventArgs);
-                }
-            }
-            else if (managerType == typeof(ColumnsLayoutChangingEventManager))
-            {
-                DataGridContext.UnselectAllCells(this);
-            }
-            else if (managerType == typeof(ColumnsLayoutChangedEventManager))
-            {
-                // Only force a reset if at least one Row has not used an IVirtualizingCellsHost as PART_CellsHost
-                if (m_dataGridControl.ForceGeneratorReset)
-                {
-                    //forces the collection view to refresh (therefore, regenerates all the items ).
-                    this.CustomItemContainerGenerator.RemoveAllAndNotify();
-
-                    if (this.SourceDetailConfiguration == null) // not linked to a DetailConfiguration (master level)
-                    {
-                        //also notify the DataGridControl so it can clear the fixed regions
-                        m_dataGridControl.ResetFixedRegions();
-                    }
-                }
-
-                this.DefaultImageColumnDetermined = false;
-            }
-            else if (managerType == typeof(PreBatchCollectionChangedEventManager))
-            {
-                Debug.Assert(m_deferSelectionChangedOnItemsCollectionChanged == null);
-
-                // When using DataGridVirtualizingCollectionViewBase, we should keep the "Replace" action
-                // in order to call UpdateSelectionAfterSourceCollectionChanged with a Replace instead of a Reset.
-                if (m_deferSelectionChangedOnItemsCollectionChanged == null && !(sender is DataGridVirtualizingCollectionViewBase))
-                {
-                    m_deferSelectionChangedOnItemsCollectionChanged = new DeferSelectionChangedOnItemsCollectionChangedDisposable(this);
-                }
-            }
-            else if (managerType == typeof(PostBatchCollectionChangedEventManager))
-            {
-                var disposable = m_deferSelectionChangedOnItemsCollectionChanged;
-                if (disposable != null)
-                {
-                    m_deferSelectionChangedOnItemsCollectionChanged = null;
-                    disposable.Dispose();
-                }
-            }
-            else if (managerType == typeof(RealizedContainersRequestedEventManager))
-            {
-                var eventArgs = (RealizedContainersRequestedEventArgs)e;
-                this.GetRealizedItems(eventArgs.RealizedContainers);
-            }
-            else if (managerType == typeof(DistinctValuesRequestedEventManager))
-            {
-                var eventArgs = (DistinctValuesRequestedEventArgs)e;
-                this.MergeDistinctValues(eventArgs);
-            }
-            else if (managerType == typeof(AllowDetailToggleChangedEventManager))
-            {
-                this.OnPropertyChanged("AllowDetailToggle");
-            }
-            else if (managerType == typeof(ViewChangedEventManager))
-            {
-                this.SetupViewProperties();
-                this.InitializeViewProperties();
-            }
-            else if (managerType == typeof(CurrentColumnChangedEventManager))
-            {
-                this.OnPropertyChanged("CurrentColumn");
-            }
-            else if (managerType == typeof(GroupConfigurationSelectorChangedEventManager))
-            {
-                this.OnGroupConfigurationSelectorChanged();
-            }
-            else if (managerType == typeof(DetailVisibilityChangedEventManager))
-            {
-                this.OnPropertyChanged("HasDetails");
-            }
-            else if (managerType == typeof(MaxGroupLevelsChangedEventManager))
-            {
-                this.OnPropertyChanged("MaxGroupLevels");
-            }
-            else if (managerType == typeof(MaxSortLevelsChangedEventManager))
-            {
-                this.OnPropertyChanged("MaxSortLevels");
-            }
-            else if (managerType == typeof(ItemsSourceChangeCompletedEventManager))
-            {
-                var dataGridCollectionViewBase = m_dataGridControlItemsSource as DataGridCollectionViewBase;
-
-                // GenerateColumnsFromItemsSourceFields is already done in DataGridControl.ProcessDelayedItemsSourceChanged no need to do it here.
-                this.UnhookToItemPropertiesChanged(dataGridCollectionViewBase);
-
-                if (dataGridCollectionViewBase != null)
-                {
-                    PreBatchCollectionChangedEventManager.RemoveListener(dataGridCollectionViewBase, this);
-                    PostBatchCollectionChangedEventManager.RemoveListener(dataGridCollectionViewBase, this);
-                }
-
-                m_dataGridControlItemsSource = m_dataGridControl.ItemsSource;
-
-                dataGridCollectionViewBase = m_dataGridControlItemsSource as DataGridCollectionViewBase;
-                if (dataGridCollectionViewBase != null)
-                {
-                    PreBatchCollectionChangedEventManager.AddListener(dataGridCollectionViewBase, this);
-                    PostBatchCollectionChangedEventManager.AddListener(dataGridCollectionViewBase, this);
-                }
-
-                this.HookToItemPropertiesChanged();
-
-                //If this is the master level DataGridContext
-                if (m_parentDataGridContext == null)
-                {
-                    //And if this is a DataGridCollectionView
-                    DataGridCollectionView collectionView = m_dataGridControlItemsSource as DataGridCollectionView;
-                    if (collectionView != null)
-                    {
-                        //Set its dataGridContext so it can propagate a DeferRefresh to details' DataGridCollectionViews
-                        collectionView.PrepareRootContextForDeferRefresh(this);
-                    }
-                }
-            }
-            else
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        #endregion
-
-        #region Private Fields
-
-        private BitVector32 m_flags = new BitVector32();
-        private readonly CurrencyManager m_currencyManager;
-        private readonly ICollection<Views.ViewBase.ViewPropertyStruct> m_viewProperties = new List<Views.ViewBase.ViewPropertyStruct>();
-        private PropertyDescriptorCollection m_viewPropertiesDescriptors; // = null
-        private DefaultDetailConfiguration m_defaultDetailConfiguration; // = null
-        private ColumnBase m_defaultImageColumn; // = null
-        private int m_deferRestoreStateCount; // = 0;
-        private readonly Dictionary<object, ContainerSizeState> m_sizeStateDictionary = new Dictionary<object, ContainerSizeState>();
-        private IEnumerable m_dataGridControlItemsSource;
-        private DeferSelectionChangedOnItemsCollectionChangedDisposable m_deferSelectionChangedOnItemsCollectionChanged; // = null
-
-        #endregion
-
-        #region IDataGridContextVisitable Members
-
-        void IDataGridContextVisitable.AcceptVisitor(IDataGridContextVisitor visitor, out bool visitWasStopped)
-        {
-            ((IDataGridContextVisitable)this.CustomItemContainerGenerator).AcceptVisitor(visitor, out visitWasStopped);
-        }
-
-        void IDataGridContextVisitable.AcceptVisitor(int minIndex, int maxIndex, IDataGridContextVisitor visitor, out bool visitWasStopped)
-        {
-            ((IDataGridContextVisitable)this.CustomItemContainerGenerator).AcceptVisitor(minIndex, maxIndex, visitor, out visitWasStopped);
-        }
-
-        void IDataGridContextVisitable.AcceptVisitor(int minIndex, int maxIndex, IDataGridContextVisitor visitor, DataGridContextVisitorType visitorType, out bool visitWasStopped)
-        {
-            ((IDataGridContextVisitable)this.CustomItemContainerGenerator).AcceptVisitor(minIndex, maxIndex, visitor, visitorType, out visitWasStopped);
-        }
-
-        void IDataGridContextVisitable.AcceptVisitor(int minIndex, int maxIndex, IDataGridContextVisitor visitor, DataGridContextVisitorType visitorType, bool visitDetails, out bool visitWasStopped)
-        {
-            ((IDataGridContextVisitable)this.CustomItemContainerGenerator).AcceptVisitor(minIndex, maxIndex, visitor, visitorType, visitDetails, out visitWasStopped);
-        }
-
-        #endregion
-
-        #region ICustomTypeDescriptor Members
-
-        AttributeCollection ICustomTypeDescriptor.GetAttributes()
-        {
-            return AttributeCollection.Empty;
-        }
-
-        string ICustomTypeDescriptor.GetClassName()
-        {
-            return null;
-        }
-
-        string ICustomTypeDescriptor.GetComponentName()
-        {
-            return null;
-        }
-
-        TypeConverter ICustomTypeDescriptor.GetConverter()
-        {
-            return null;
-        }
-
-        EventDescriptor ICustomTypeDescriptor.GetDefaultEvent()
-        {
-            return null;
-        }
-
-        PropertyDescriptor ICustomTypeDescriptor.GetDefaultProperty()
-        {
-            return null;
-        }
-
-        object ICustomTypeDescriptor.GetEditor(Type editorBaseType)
-        {
-            return null;
-        }
-
-        EventDescriptorCollection ICustomTypeDescriptor.GetEvents(Attribute[] attributes)
-        {
-            return EventDescriptorCollection.Empty;
-        }
-
-        EventDescriptorCollection ICustomTypeDescriptor.GetEvents()
-        {
-            return EventDescriptorCollection.Empty;
-        }
-
-        PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties(Attribute[] attributes)
-        {
-            if (attributes == null)
-            {
-                // We only cache the full property list.
-                if (m_viewPropertiesDescriptors == null)
-                {
-                    var view = m_dataGridControl.GetView();
-                    Debug.Assert(view != null);
-
-                    if (view == null)
-                        return PropertyDescriptorCollection.Empty;
-
-                    var properties = new ViewBindingPropertyDescriptor[m_viewProperties.Count];
-                    var defaultDetailConfiguration = this.GetDefaultDetailConfigurationForContext();
-                    var index = 0;
-
-                    foreach (var property in m_viewProperties)
-                    {
-                        properties[index] = new ViewBindingPropertyDescriptor(m_detailConfig, defaultDetailConfiguration, view, property.DependencyProperty, property.ViewPropertyMode);
-                        index++;
-                    }
-
-                    m_viewPropertiesDescriptors = new PropertyDescriptorCollection(properties);
-                }
-
-                return m_viewPropertiesDescriptors;
-            }
-
-            return PropertyDescriptorCollection.Empty;
-        }
-
-        PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties()
-        {
-            return ((ICustomTypeDescriptor)this).GetProperties(null);
-        }
-
-        object ICustomTypeDescriptor.GetPropertyOwner(PropertyDescriptor pd)
-        {
-            return this;
-        }
-
-        #endregion
-
-        //---------- SUB CLASSES ----------
-
-        #region DeferRestoreStateDisposable Private Class
-
-        private sealed class DeferRestoreStateDisposable : IDisposable
-        {
-            internal DeferRestoreStateDisposable(DataGridContext dataGridContext)
-            {
-                if (dataGridContext == null)
-                    throw new ArgumentNullException("dataGridContext");
-
-                m_dataGridContext = new WeakReference(dataGridContext);
-
-                Interlocked.Increment(ref dataGridContext.m_deferRestoreStateCount);
-            }
-
-            void IDisposable.Dispose()
-            {
-                this.Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            private void Dispose(bool disposing)
-            {
-                var wr = Interlocked.Exchange(ref m_dataGridContext, null);
-                if (wr == null)
-                    return;
-
-                var dataGridContext = (DataGridContext)wr.Target;
-                if (dataGridContext == null)
-                    return;
-
-                if (Interlocked.Decrement(ref dataGridContext.m_deferRestoreStateCount) != 0)
-                    return;
-
-                Debug.Assert(disposing);
-
-                var dataGridControl = dataGridContext.DataGridControl;
-                dataGridControl.RestoreDataGridContextState(dataGridContext);
-            }
-
-            ~DeferRestoreStateDisposable()
-            {
-                this.Dispose(false);
-            }
-
-            private WeakReference m_dataGridContext;
-        }
-
-        #endregion
-
-        #region DeferSelectionChangedOnItemsCollectionChangedDisposable Private Class
-
-        private sealed class DeferSelectionChangedOnItemsCollectionChangedDisposable : IDisposable
-        {
-            internal DeferSelectionChangedOnItemsCollectionChangedDisposable(DataGridContext dataGridContext)
-            {
-                if (dataGridContext == null)
-                    throw new ArgumentNullException("dataGridContext");
-
-                m_dataGridContext = new WeakReference(dataGridContext);
-            }
-
-            internal void Queue(NotifyCollectionChangedEventArgs e)
-            {
-                if (e == null)
-                    return;
-
-                if (m_eventArgs != null)
-                {
-                    m_eventArgs = NotifyBatchCollectionChangedEventArgs.Combine(m_eventArgs, e);
-                }
-                else
-                {
-                    m_eventArgs = e;
-                }
-            }
-
-            public void Dispose()
-            {
-                this.Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            private void Dispose(bool disposing)
-            {
-                if (!disposing)
-                    return;
-
-                var wr = Interlocked.Exchange(ref m_dataGridContext, null);
-                if (wr == null)
-                    return;
-
-                var eventArgs = m_eventArgs;
-                if (eventArgs == null)
-                    return;
-
-                var dataGridContext = (DataGridContext)wr.Target;
-                if (dataGridContext == null)
-                    return;
-
-                dataGridContext.UpdateSelectionAfterSourceCollectionChanged(eventArgs);
-            }
-
-            private WeakReference m_dataGridContext;
-            private NotifyCollectionChangedEventArgs m_eventArgs; //null
-        }
-
-        #endregion
-
-        #region ViewBindingPropertyDescriptor Private Class
-
-        private class ViewBindingPropertyDescriptor : PropertyDescriptor
-        {
-            public ViewBindingPropertyDescriptor(DetailConfiguration detailConfig, DefaultDetailConfiguration defaultDetailConfig, Views.ViewBase view, DependencyProperty dp, ViewPropertyMode viewPropertyMode)
-              : base(dp.Name, null)
-            {
-                if (dp == null)
-                    throw new ArgumentNullException("dp");
-
-                if (view == null)
-                    throw new ArgumentNullException("view");
-
-                if (viewPropertyMode == ViewPropertyMode.None)
-                    throw new ArgumentException("viewPropertyMode cannot be ViewPropertyMode.None", "mode");
-
-                m_dp = dp;
-                m_detailConfig = detailConfig;
-                m_defaultDetailConfig = defaultDetailConfig;
-                m_view = view;
-                m_viewPropertyMode = viewPropertyMode;
-            }
-
-            #region DependencyProperty Read-Only Property
-
-            public DependencyProperty DependencyProperty
-            {
-                get
-                {
-                    return m_dp;
-                }
-            }
-
-            private DependencyProperty m_dp; // = null
-
-            #endregion
-
-            #region DetailConfig Read-Only Property
-
-            public DetailConfiguration DetailConfig
-            {
-                get
-                {
-                    return m_detailConfig;
-                }
-            }
-
-            private DetailConfiguration m_detailConfig;
-
-            #endregion
-
-            #region DefaultDetailConfig Read-Only Property
-
-            public DefaultDetailConfiguration DefaultDetailConfig
-            {
-                get
-                {
-                    return m_defaultDetailConfig;
-                }
-            }
-
-            private DefaultDetailConfiguration m_defaultDetailConfig;
-
-            #endregion
-
-            #region View Read-Only Property
-
-            public Views.ViewBase View
-            {
-                get
-                {
-                    return m_view;
-                }
-            }
-
-            private Views.ViewBase m_view;
-
-            #endregion
-
-            #region ViewPropertyMode Read-Only Property
-
-            public ViewPropertyMode ViewPropertyMode
-            {
-                get
-                {
-                    return m_viewPropertyMode;
-                }
-            }
-
-            private ViewPropertyMode m_viewPropertyMode;
-
-            #endregion
-
-            public override bool CanResetValue(object component)
-            {
-                return false; //stubbing this so that value cannot be reset through the PropertyDescriptor
-            }
-
-            public override Type ComponentType
-            {
-                get
-                {
-                    return typeof(DataGridContext);
-                }
-            }
-
-            public override object GetValue(object component)
-            {
-                if (m_viewPropertyMode == ViewPropertyMode.Routed)
-                {
-                    var source = (DependencyObject)m_defaultDetailConfig ?? m_detailConfig;
-
-                    //If there is a DefaultDetailConfig, process it in precedence to the DetailConfig.
-                    if (source != null)
-                    {
-                        var valueSource = DependencyPropertyHelper.GetValueSource(source, m_dp);
-
-                        switch (valueSource.BaseValueSource)
-                        {
-                            // Pick the value on the view.
-                            case BaseValueSource.Default:
-                            case BaseValueSource.Inherited:
-                            case BaseValueSource.Unknown:
-                                return m_view.GetValue(m_dp);
-
-                            // Pick the value on the source component itself.
-                            default:
-                                break;
-                        }
-                    }
-                }
-
-                var dependencyObject = component as DependencyObject;
-                if (dependencyObject != null)
-                    return dependencyObject.GetValue(m_dp);
-
-                return null;
-            }
-
-            public override bool IsReadOnly
-            {
-                get
-                {
-                    return m_dp.ReadOnly;
-                }
-            }
-
-            public override Type PropertyType
-            {
-                get
-                {
-                    return m_dp.PropertyType;
-                }
-            }
-
-            public override void ResetValue(object component)
-            {
-                throw new InvalidOperationException();
-            }
-
-            public override void SetValue(object component, object value)
-            {
-                var dependencyObject = component as DependencyObject;
-                if (dependencyObject == null)
-                    throw new ArgumentException("SetValue was called for an object which is not a DependencyObject.", component.ToString());
-
-                dependencyObject.SetValue(m_dp, value);
-            }
-
-            public override bool ShouldSerializeValue(object component)
-            {
-                return false;
-            }
-        }
-
-        #endregion
-
-        #region DataGridContextToggleColumnSortCommand Private Class
-
-        private sealed class DataGridContextToggleColumnSortCommand : ToggleColumnSortCommand
-        {
-            #region Constructor
-
-            internal DataGridContextToggleColumnSortCommand(DataGridContext dataGridContext)
-              : base()
-            {
-                ToggleColumnSortCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-
-                m_dataGridContext = new WeakReference(dataGridContext);
-            }
-
-            #endregion
-
-            #region Properties
-
-            #region CanSort Protected Property
-
-            protected override bool CanSort
-            {
-                get
-                {
-                    var dataGridContext = this.DataGridContext;
-                    if (this.DataGridContext == null)
-                        return false;
-
-                    return this.DataGridContext.Items.CanSort;
-                }
-            }
-
-            #endregion
-
-            #region Columns Protected Property
-
-            protected override ColumnCollection Columns
-            {
-                get
-                {
-                    return this.DataGridContext.Columns;
-                }
-            }
-
-            #endregion
-
-            #region DataGridContext Protected Property
-
-            protected override DataGridContext DataGridContext
-            {
-                get
-                {
-                    return (m_dataGridContext != null) ? m_dataGridContext.Target as DataGridContext : null;
-                }
-            }
-
-            private readonly WeakReference m_dataGridContext;
-
-            #endregion
-
-            #region MaxSortLevels Protected Property
-
-            protected override int MaxSortLevels
-            {
-                get
-                {
-                    return this.DataGridContext.MaxSortLevels;
-                }
-            }
-
-            #endregion
-
-            #region SortDescriptions Protected Property
-
-            protected override SortDescriptionCollection SortDescriptions
-            {
-                get
-                {
-                    return this.DataGridContext.Items.SortDescriptions;
-                }
-            }
-
-            #endregion
-
-            #endregion
-
-            #region Methods Override
-
-            protected override bool CanExecuteCore(ColumnBase column, bool resetSort)
-            {
-                var dataGridContext = this.DataGridContext;
-                if (dataGridContext == null)
-                    return false;
-
-                return base.CanExecuteCore(column, resetSort);
-            }
-
-            protected override void ValidateToggleColumnSort()
-            {
-                var dataGridContext = this.DataGridContext;
-                if (dataGridContext == null)
-                    return;
-
-                Debug.Assert(!dataGridContext.IsAFlattenDetail, "A flatten detail should not be able to toggle the column sort direction.");
-            }
-
-            protected override SortDescriptionsSyncContext GetSortDescriptionsSyncContext()
-            {
-                var dataGridContext = this.DataGridContext;
-
-                ToggleColumnSortCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-                return dataGridContext.SortDescriptionsSyncContext;
-            }
-
-            protected override void ValidateSynchronizationContext(SynchronizationContext synchronizationContext)
-            {
-                var dataGridContext = this.DataGridContext;
-                ToggleColumnSortCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-
-                if (!synchronizationContext.Own)
-                    throw new DataGridInternalException("The column is already being processed.", dataGridContext.DataGridControl);
-            }
-
-            protected override void DeferRestoreStateOnLevel(Disposer disposer)
-            {
-                var dataGridContext = this.DataGridContext;
-                ToggleColumnSortCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-
-                ToggleColumnSortCommand.DeferRestoreStateOnLevel(disposer, dataGridContext);
-            }
-
-            protected override IDisposable SetQueueBringIntoViewRestrictions(AutoScrollCurrentItemSourceTriggers triggers)
-            {
-                var dataGridContext = this.DataGridContext;
-                if (dataGridContext == null)
-                    return null;
-
-                return this.DataGridContext.SetQueueBringIntoViewRestrictions(triggers);
-            }
-
-            protected override bool TryDeferResortSourceDetailConfiguration(out IDisposable defer)
-            {
-                var dataGridContext = this.DataGridContext;
-                ToggleColumnSortCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-
-                return this.TryDeferResort(dataGridContext.SourceDetailConfiguration, out defer);
-            }
-
-            protected override IDisposable DeferResortHelperItemsSourceCollection()
-            {
-                var dataGridContext = this.DataGridContext;
-                ToggleColumnSortCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-
-                return this.DeferResortHelper(dataGridContext.ItemsSourceCollection, dataGridContext.Items);
-            }
-
-            protected override void UpdateColumnSort()
-            {
-                var dataGridContext = this.DataGridContext;
-                Debug.Assert(dataGridContext != null);
-
-                base.UpdateColumnSort();
-            }
-
-            #endregion
-        }
-
-        #endregion
-
-        #region DataGridContextUpdateColumnSortCommand Private Class
-
-        private sealed class DataGridContextUpdateColumnSortCommand : UpdateColumnSortCommand
-        {
-            #region Validation Methods
-
-            private static void ThrowIfDetailDataGridContext(DataGridContext dataGridContext, string paramName)
-            {
-                Debug.Assert(dataGridContext != null);
-
-                if (dataGridContext.ParentDataGridContext != null)
-                    throw new ArgumentException("The DataGridContext is not the topmost DataGridContext.", paramName);
-            }
-
-            #endregion
-
-            #region Constructor
-
-            internal DataGridContextUpdateColumnSortCommand(DataGridContext dataGridContext)
-            {
-                DataGridContextUpdateColumnSortCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-
-                m_dataGridContext = new WeakReference(dataGridContext);
-            }
-
-            #endregion
-
-            #region SortDescriptionsSyncContext Protected Property
-
-            protected override SortDescriptionsSyncContext SortDescriptionsSyncContext
-            {
-                get
-                {
-                    var dataGridContext = this.DataGridContext;
-                    if (dataGridContext == null)
-                        return null;
-
-                    return dataGridContext.SortDescriptionsSyncContext;
-                }
-            }
-
-            #endregion
-
-            #region DataGridContext Private Property
-
-            private DataGridContext DataGridContext
-            {
-                get
-                {
-                    return m_dataGridContext.Target as DataGridContext;
-                }
-            }
-
-            private readonly WeakReference m_dataGridContext;
-
-            #endregion
-
-            protected override bool CanExecuteCore()
-            {
-                return (this.DataGridContext != null);
-            }
-
-            protected override void ExecuteCore()
-            {
-                var dataGridContext = this.DataGridContext;
-                if (dataGridContext == null)
-                    return;
-
-                var detailConfiguration = dataGridContext.SourceDetailConfiguration;
-                if (detailConfiguration != null)
-                {
-                    this.Update(detailConfiguration);
-                }
-                // The current DataGridContext is the top most DataGridContext;
-                else
-                {
-                    this.Update(dataGridContext);
-                }
-            }
-
-            private void Update(DataGridContext dataGridContext)
-            {
-                ColumnSortCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-                DataGridContextUpdateColumnSortCommand.ThrowIfDetailDataGridContext(dataGridContext, "dataGridContext");
-
-                // The sort order of the flatten details is driven by the master.  A sort order change
-                // on the master must be reflected in the details.
-                if (dataGridContext.AreDetailsFlatten)
-                {
-                    foreach (var detailConfiguration in dataGridContext.DetailConfigurations)
-                    {
-                        this.Update(detailConfiguration, true);
-                    }
-                }
-
-                using (var synchronizationContext = this.StartSynchronizing(dataGridContext.SortDescriptionsSyncContext))
-                {
-                    this.SynchronizeColumnSort(
-                      synchronizationContext,
-                      dataGridContext.Items.SortDescriptions,
-                      dataGridContext.Columns);
-                }
-            }
-
-            private void Update(DetailConfiguration detailConfiguration)
-            {
-                this.Update(detailConfiguration, false);
-            }
-
-            private void Update(DetailConfiguration detailConfiguration, bool recursive)
-            {
-                ColumnSortCommand.ThrowIfNull(detailConfiguration, "detailConfiguration");
-
-                if (recursive)
-                {
-                    foreach (var children in detailConfiguration.DetailConfigurations)
-                    {
-                        this.Update(children, true);
-                    }
-                }
-
-                var command = detailConfiguration.UpdateColumnSortCommand;
-                if (command.CanExecute())
-                {
-                    command.Execute();
-                }
-            }
-        }
-
-        #endregion
-
-        #region DataGridContextAddGroupCommand Private Class
-
-        private sealed class DataGridContextAddGroupCommand : ColumnAddGroupCommand
-        {
-            #region Constructor
-
-            internal DataGridContextAddGroupCommand(DataGridContext dataGridContext)
-            {
-                DataGridContextAddGroupCommand.ThrowIfNull(dataGridContext, "dataGridContext");
-
-                m_dataGridContext = new WeakReference(dataGridContext);
-            }
-
-            #endregion
-
-            #region GroupDescriptions Protected Property
-
-            protected override ObservableCollection<GroupDescription> GroupDescriptions
-            {
-                get
-                {
-                    var dataGridContext = this.DataGridContext;
-                    if (dataGridContext == null)
-                        return null;
-
-                    return dataGridContext.Items.GroupDescriptions;
-                }
-            }
-
-            #endregion
-
-            #region DataGridContext Private Property
-
-            private DataGridContext DataGridContext
-            {
-                get
-                {
-                    return m_dataGridContext.Target as DataGridContext;
-                }
-            }
-
-            private readonly WeakReference m_dataGridContext;
-
-            #endregion
-
-            protected override string GetColumnName(ColumnBase column)
-            {
-                var dataGridContext = this.DataGridContext;
-                if ((dataGridContext == null) || (column == null))
-                    return null;
-
-                var itemPropertyMap = dataGridContext.ItemPropertyMap;
-                if ((itemPropertyMap != null) && itemPropertyMap.IsMapping)
-                {
-                    string fieldName;
-                    if (DataGridItemPropertyMapHelper.TryGetDetailColumnName(itemPropertyMap, column.FieldName, out fieldName))
-                        return fieldName;
-                }
-                else
-                {
-                    return column.FieldName;
-                }
-
-                return null;
-            }
-
-            protected override GroupDescription GetGroupDescription(ColumnBase column)
-            {
-                if (this.DataGridContext == null)
-                    return null;
-
-                return base.GetGroupDescription(column);
-            }
-
-            protected override GroupConfiguration GetGroupConfiguration(ColumnBase column)
-            {
-                if (this.DataGridContext == null)
-                    return null;
-
-                return base.GetGroupConfiguration(column);
-            }
-
-            protected override bool CanExecuteCore(ColumnBase column, int index)
-            {
-                if (this.DataGridContext == null)
-                    return false;
-
-                return base.CanExecuteCore(column, index);
-            }
-
-            protected override void ExecuteCore(ColumnBase column, int index)
-            {
-                var dataGridContext = this.DataGridContext;
-                if (dataGridContext == null)
-                    return;
-
-                using (dataGridContext.SetQueueBringIntoViewRestrictions(AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged))
-                {
-                    base.ExecuteCore(column, index);
-                }
-            }
-        }
-
-        #endregion
-
-        #region DataGridContextFlags Private Enum
-
-        [Flags]
-        private enum DataGridContextFlags
-        {
-            AlreadySearchedForDetailConfig = 1,
-            DefaultImageColumnDetermined = 2,
-            IsCurrent = 4,
-            IsRestoringState = 8,
-            IsSavingState = 16,
-        }
-
-        #endregion
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs
deleted file mode 100644
index 50d4c3dd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs
+++ /dev/null
@@ -1,6850 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Data;
-using System.Diagnostics;
-using System.Linq;
-using System.Printing;
-using System.Security;
-using System.Security.Permissions;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Utils.Wpf;
-using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Wpf.DataGrid.Export;
-using Xceed.Wpf.DataGrid.Utils;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_ScrollViewer", Type = typeof( ScrollViewer ) )]
-  [StyleTypedProperty( Property = "ItemContainerStyle", StyleTargetType = typeof( DataRow ) )] // Blend has to be able to create an instance of this for the style edition so it can't be typeof( Row )
-  [StyleTypedProperty( Property = "CellErrorStyle", StyleTargetType = typeof( Cell ) )]
-  public partial class DataGridControl : ItemsControl, INotifyPropertyChanged, IDocumentPaginatorSource, IWeakEventListener
-  {
-    #region Static Fields
-
-    internal static readonly string SelectionModeToUsePropertyName = PropertyHelper.GetPropertyName( ( DataGridControl d ) => d.SelectionModeToUse );
-
-    #endregion
-
-    static DataGridControl()
-    {
-      FrameworkElement.DefaultStyleKeyProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( TableflowView.GetDefaultStyleKey( typeof( TableflowView ), typeof( DataGridControl ) ) ) );
-
-      ItemsControl.ItemsSourceProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( null, new CoerceValueCallback( DataGridControl.ItemsSourceCoerceCallback ) ) );
-      ItemsControl.GroupStyleSelectorProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnGroupStyleSelectorChanged ) ) );
-
-      KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( KeyboardNavigationMode.Contained ) );
-      KeyboardNavigation.TabNavigationProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( KeyboardNavigationMode.None ) );
-
-      FrameworkElement.FlowDirectionProperty.OverrideMetadata( typeof( DataGridControl ), new FrameworkPropertyMetadata( new PropertyChangedCallback( DataGridControl.OnFlowDirectionPropertyChanged ) ) );
-
-      DataGridControl.ColumnsProperty = DataGridControl.ColumnsPropertyKey.DependencyProperty;
-      DataGridControl.VisibleColumnsProperty = DataGridControl.VisibleColumnsPropertyKey.DependencyProperty;
-      DataGridControl.SelectedItemsProperty = DataGridControl.SelectedItemsPropertyKey.DependencyProperty;
-      DataGridControl.SelectedItemRangesProperty = DataGridControl.SelectedItemRangesPropertyKey.DependencyProperty;
-      DataGridControl.SelectedCellRangesProperty = DataGridControl.SelectedCellRangesPropertyKey.DependencyProperty;
-      DataGridControl.ParentDataGridControlProperty = DataGridControl.ParentDataGridControlPropertyKey.DependencyProperty;
-      DataGridControl.DataGridContextProperty = DataGridControl.DataGridContextPropertyKey.DependencyProperty;
-      DataGridControl.StatContextProperty = DataGridControl.StatContextPropertyKey.DependencyProperty;
-      DataGridControl.GroupLevelDescriptionsProperty = DataGridControl.GroupLevelDescriptionsPropertyKey.DependencyProperty;
-      DataGridControl.HasExpandedDetailsProperty = DataGridControl.HasExpandedDetailsPropertyKey.DependencyProperty;
-    }
-
-    public DataGridControl()
-    {
-      m_selectionChangerManager = new SelectionManager( this );
-      m_columnManagerRowConfiguration = new ColumnManagerRowConfiguration();
-
-      this.SetValue( DataGridControl.ParentDataGridControlPropertyKey, this );
-
-      //set the FixedItem for the gridControl to NotSet, this is to prevent problems with nested DataGridControls
-      DataGridControl.SetFixedItem( this, DataGridControl.NotSet );
-
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.ExpandGroup, this.OnExpandGroupExecuted, this.OnExpandGroupCanExecute ) );
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.CollapseGroup, this.OnCollapseGroupExecuted, this.OnCollapseGroupCanExecute ) );
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.ToggleGroupExpansion, this.OnToggleGroupExecuted, this.OnToggleGroupCanExecute ) );
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.SelectAll, this.OnSelectAllExecuted, this.OnSelectAllCanExecute ) );
-
-      // We keep a references to be able to remove the CommandBindings when they are not required (feature disabled)
-      m_refreshCommandBinding = new CommandBinding( DataGridCommands.Refresh, this.OnRefreshExecuted, this.OnRefreshCanExecute );
-      this.CommandBindings.Add( m_refreshCommandBinding );
-
-      // We keep a references to be able to remove the CommandBindings when they are not required (feature disabled)
-      m_copyCommandBinding = new CommandBinding( ApplicationCommands.Copy, this.OnCopyExecuted, this.OnCopyCanExecute );
-      this.CommandBindings.Add( m_copyCommandBinding );
-
-      // The delete command is not enabled by default, so don't add it to CommandBindings
-      m_deleteCommandBinding = new CommandBinding( ApplicationCommands.Delete, this.OnDeleteExecuted, this.OnDeleteCanExecute );
-
-      DataGridContext dataGridContext = new DataGridContext( null, this, null, this.Items, null );
-      m_customItemContainerGenerator = CustomItemContainerGenerator.CreateGenerator( this, this.Items, dataGridContext );
-      m_customItemContainerGenerator.DetailsChanged += OnDetailsChanged;
-
-      DataGridControl.SetDataGridContext( this, dataGridContext );
-      m_localDataGridContext = dataGridContext;
-
-      //so that at least one DataGridContext is always current
-      dataGridContext.SetIsCurrent( true );
-      this.SetCurrentDataGridContextHelper( dataGridContext );
-
-      this.SetValue( DataGridControl.ColumnsPropertyKey, dataGridContext.Columns );
-      this.SetValue( DataGridControl.VisibleColumnsPropertyKey, dataGridContext.VisibleColumns );
-      this.SetValue( DataGridControl.GroupLevelDescriptionsPropertyKey, dataGridContext.GroupLevelDescriptions );
-      this.SetValue( DataGridControl.SelectedItemsPropertyKey, dataGridContext.SelectedItems );
-      this.SetValue( DataGridControl.SelectedItemRangesPropertyKey, new SelectionItemRangeCollection( dataGridContext.SelectedItemsStore ) );
-      this.SetValue( DataGridControl.SelectedCellRangesPropertyKey, new SelectionCellRangeCollection( dataGridContext.SelectedCellsStore ) );
-
-      // Apparently, we don't need to unsubscribe from these event handlers. These event 
-      // subscriptions do not "root" the grid and we observed no leak cause be these.
-      // We did not investigate why that is and we should keep an eye on it.
-      this.GroupStyle.CollectionChanged += new NotifyCollectionChangedEventHandler( GroupStyle_CollectionChanged );
-
-
-      if( DesignerProperties.GetIsInDesignMode( this ) )
-      {
-        // Workaround for VS2008's know issue (the DataGrid's Template is not active).
-        this.ClipToBounds = true;
-      }
-
-      this.Loaded += new RoutedEventHandler( DataGridControl_Loaded );
-    }
-
-    #region INITIALIZATION
-
-    public override void BeginInit()
-    {
-      m_initCount++;
-      if( m_initCount != 1 )
-        return;
-
-      Debug.Assert( m_deferColumnsUpdate == null );
-      m_deferColumnsUpdate = this.DataGridContext.DeferColumnsUpdate();
-      Debug.Assert( m_deferColumnsUpdate != null );
-
-      m_deferColumnsNotifications = this.Columns.DeferNotifications();
-
-      var dataGridCollectionViewBase = this.DataGridContext.Items as DataGridCollectionViewBase;
-      if( dataGridCollectionViewBase != null )
-      {
-        m_deferItemPropertiesUpdate = dataGridCollectionViewBase.ItemProperties.DeferCollectionChanged();
-      }
-
-      base.BeginInit();
-    }
-
-    public override void EndInit()
-    {
-      m_initCount--;
-      if( m_initCount != 0 )
-        return;
-
-      // Set a view if none is set at this point.  This will also make sure that eventual implicit style declarations for the default View in user applications will work.
-      if( this.View == null )
-      {
-        this.View = this.GetDefaultView() as UIViewBase;
-      }
-
-      if( this.ItemsSourceChangedDelayed )
-      {
-        this.ItemsSourceChangedDelayed = false;
-        this.ProcessDelayedItemsSourceChanged();
-      }
-
-      var dataGridContext = this.DataGridContext;
-      var columnManager = dataGridContext.ColumnManager;
-
-      columnManager.Initialize( this );
-      columnManager.SetFixedColumnCount( TableView.GetFixedColumnCount( dataGridContext ) );
-
-      //see if any of the GroupLevelDescriptions are matched to a column but aren't bound ( case 102437 ) and update then (bind them) if necessary
-      dataGridContext.SetupTitleBindingForGroupLevelDescriptions();
-
-      if( m_deferItemPropertiesUpdate != null )
-      {
-        var collectionViewDisposable = m_deferItemPropertiesUpdate;
-        m_deferItemPropertiesUpdate = null;
-        collectionViewDisposable.Dispose();
-      }
-
-      var columnsNotificationsDisposable = m_deferColumnsNotifications;
-      m_deferColumnsNotifications = null;
-      columnsNotificationsDisposable.Dispose();
-
-      Debug.Assert( m_deferColumnsUpdate != null );
-      var columnsUpdateDisposable = m_deferColumnsUpdate;
-      m_deferColumnsUpdate = null;
-      columnsUpdateDisposable.Dispose();
-
-      m_customItemContainerGenerator.ForceReset = true;
-
-      base.EndInit();
-    }
-
-    private void DataGridControl_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.InvalidateViewStyle();
-
-      // Always set this as ParentDataGridControl to stop inheritance
-      // when a grid is inside a another grid
-      this.SetValue( ParentDataGridControlPropertyKey, this );
-      this.HookToUnloaded();
-
-      // The layout pass was inhibited while the DataGridControl was unloaded
-      // to make the parent control load faster.  A new layout pass
-      // must be forced to render the datagrid content correctly.  The layout
-      // pass isn't inhibited when the grid is use for printing purpose.
-      if( ( this.DeferInitialLayoutPass ) && ( m_isFirstTimeLoaded )  )
-      {
-        m_isFirstTimeLoaded = false;
-
-        this.Dispatcher.BeginInvoke( new Action( this.InvalidateMeasure ) );
-      }
-    }
-
-    private void HookToUnloaded()
-    {
-      this.UnhookToUnloaded();
-
-      m_parentWindow = null;
-      FrameworkElement parentWindow;
-      DependencyObject parent = this;
-
-      do
-      {
-        parent = TreeHelper.GetParent( parent );
-        parentWindow = parent as Window;
-
-        if( parentWindow == null )
-        {
-          parentWindow = parent as Page;
-        }
-      } while( ( parent != null ) && ( parentWindow == null ) );
-
-      if( parentWindow == null )
-      {
-        parentWindow = this;
-      }
-      else
-      {
-        m_parentWindow = new WeakReference( parentWindow );
-      }
-
-      FrameworkElementUnloadedEventManager.AddListener( parentWindow, this );
-    }
-
-    private void UnhookToUnloaded()
-    {
-      var parentWindow = ( m_parentWindow != null ) ? m_parentWindow.Target as FrameworkElement : this;
-      if( parentWindow == null )
-        return;
-
-      FrameworkElementUnloadedEventManager.RemoveListener( parentWindow, this );
-    }
-
-    private int m_initCount; //0
-    private IDisposable m_deferColumnsUpdate; //null
-    private IDisposable m_deferColumnsNotifications; //null
-    private IDisposable m_deferItemPropertiesUpdate; //null
-
-    #endregion
-
-    #region ParentDataGridControl Attached Property
-
-    internal static readonly DependencyPropertyKey ParentDataGridControlPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "ParentDataGridControl",
-      typeof( DataGridControl ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static readonly DependencyProperty ParentDataGridControlProperty;
-
-    [Obsolete( "GetParentDataGridControl is obsolete. Use DataGridContext.DataGridControl instead" )]
-    public static DataGridControl GetParentDataGridControl( DependencyObject obj )
-    {
-      return ( DataGridControl )obj.GetValue( DataGridControl.ParentDataGridControlProperty );
-    }
-
-    #endregion
-
-    #region DataGridContext Attached Property
-
-    internal static readonly DependencyPropertyKey DataGridContextPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "DataGridContext",
-      typeof( DataGridContext ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static readonly DependencyProperty DataGridContextProperty;
-
-    public static DataGridContext GetDataGridContext( DependencyObject obj )
-    {
-      return ( DataGridContext )obj.GetValue( DataGridControl.DataGridContextProperty );
-    }
-
-    internal static void SetDataGridContext( DependencyObject obj, DataGridContext value )
-    {
-      obj.SetValue( DataGridControl.DataGridContextPropertyKey, value );
-    }
-
-    private readonly DataGridContext m_localDataGridContext; // = null
-
-    #endregion
-
-    #region Container Attached Property
-
-    private static readonly DependencyPropertyKey ContainerPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "Container",
-      typeof( FrameworkElement ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static readonly DependencyProperty ContainerProperty = DataGridControl.ContainerPropertyKey.DependencyProperty;
-
-    public static FrameworkElement GetContainer( DependencyObject obj )
-    {
-      return ( FrameworkElement )obj.GetValue( DataGridControl.ContainerProperty );
-    }
-
-    internal static void SetContainer( DependencyObject obj, object value )
-    {
-      obj.SetValue( DataGridControl.ContainerPropertyKey, value );
-    }
-
-    internal static void ClearContainer( DependencyObject obj )
-    {
-      obj.ClearValue( DataGridControl.ContainerPropertyKey );
-    }
-
-    #endregion
-
-    #region IsContainerPrepared Attached Property
-
-    private static readonly DependencyPropertyKey IsContainerPreparedPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "IsContainerPrepared",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( false ) );
-
-    private static readonly DependencyProperty IsContainerPreparedProperty = DataGridControl.IsContainerPreparedPropertyKey.DependencyProperty;
-
-    internal static bool GetIsContainerPrepared( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( DataGridControl.IsContainerPreparedProperty );
-    }
-
-    private static void SetIsContainerPrepared( DependencyObject obj, bool value )
-    {
-      obj.SetValue( DataGridControl.IsContainerPreparedPropertyKey, value );
-    }
-
-    private static void ClearIsContainerPrepared( DependencyObject obj )
-    {
-      obj.ClearValue( DataGridControl.IsContainerPreparedPropertyKey );
-    }
-
-    #endregion
-
-    #region StatContext Attached Property
-
-    internal static readonly DependencyPropertyKey StatContextPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "StatContext",
-      typeof( object ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static readonly DependencyProperty StatContextProperty;
-
-    public static object GetStatContext( DependencyObject obj )
-    {
-      return obj.GetValue( DataGridControl.StatContextProperty );
-    }
-
-    internal static void SetStatContext( DependencyObject obj, object statContext )
-    {
-      obj.SetValue( DataGridControl.StatContextPropertyKey, statContext );
-    }
-
-    #endregion
-
-    #region HasExpandedDetails Attached Property
-
-    internal static readonly DependencyPropertyKey HasExpandedDetailsPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "HasExpandedDetails",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static readonly DependencyProperty HasExpandedDetailsProperty;
-
-    public static bool GetHasExpandedDetails( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( DataGridControl.HasExpandedDetailsProperty );
-    }
-
-    internal static void SetHasExpandedDetails( DependencyObject obj, bool value )
-    {
-      obj.SetValue( DataGridControl.HasExpandedDetailsPropertyKey, value );
-    }
-
-    #endregion
-
-    #region Columns Read-Only Property
-
-    private static readonly DependencyPropertyKey ColumnsPropertyKey = DependencyProperty.RegisterReadOnly(
-      "Columns",
-      typeof( ColumnCollection ),
-      typeof( DataGridControl ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty ColumnsProperty;
-
-    public ColumnCollection Columns
-    {
-      get
-      {
-        return ( ColumnCollection )this.GetValue( DataGridControl.ColumnsProperty );
-      }
-    }
-
-    #endregion
-
-    #region VisibleColumns Read-Only Property
-
-    private static readonly DependencyPropertyKey VisibleColumnsPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "VisibleColumns",
-      typeof( ReadOnlyObservableCollection<ColumnBase> ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static readonly DependencyProperty VisibleColumnsProperty;
-
-    // VisibleColumns is a ReadOnlyObservableCollection because it would be too confusing to 
-    // have a ColumnCollection. For instance, if somebody would have set the VisiblePosition
-    // of some columns and then used VisibleColumns.Insert to add them in the collection
-    // at the right place, what should hold the real visible index value? The VisiblePosition
-    // property or the index in the VisibleColumns collection?
-    public ReadOnlyObservableCollection<ColumnBase> VisibleColumns
-    {
-      get
-      {
-        return ( ReadOnlyObservableCollection<ColumnBase> )this.GetValue( DataGridControl.VisibleColumnsProperty );
-      }
-    }
-
-    #endregion
-
-    #region ColumnsByVisiblePosition Read-Only Property
-
-    internal HashedLinkedList<ColumnBase> ColumnsByVisiblePosition
-    {
-      get
-      {
-        return this.DataGridContext.ColumnsByVisiblePosition;
-      }
-    }
-
-    #endregion
-
-    #region CellEditorDisplayConditions Property
-
-    public static readonly DependencyProperty CellEditorDisplayConditionsProperty = DependencyProperty.RegisterAttached(
-      "CellEditorDisplayConditions",
-      typeof( CellEditorDisplayConditions ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( CellEditorDisplayConditions.None, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public CellEditorDisplayConditions CellEditorDisplayConditions
-    {
-      get
-      {
-        return ( CellEditorDisplayConditions )this.GetValue( DataGridControl.CellEditorDisplayConditionsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.CellEditorDisplayConditionsProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DefaultCellEditors Property
-
-    public Dictionary<Type, CellEditor> DefaultCellEditors
-    {
-      get
-      {
-        return m_defaultCellEditors;
-      }
-    }
-
-    private readonly Dictionary<Type, CellEditor> m_defaultCellEditors = new Dictionary<Type, CellEditor>();
-
-    #endregion
-
-    #region CellErrorStyle Property
-
-    public static readonly DependencyProperty CellErrorStyleProperty = DependencyProperty.RegisterAttached(
-      "CellErrorStyle",
-      typeof( Style ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public Style CellErrorStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( DataGridControl.CellErrorStyleProperty );
-      }
-
-      set
-      {
-        this.SetValue( DataGridControl.CellErrorStyleProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region HasValidationError Property
-
-    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
-      "HasValidationError",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasValidationErrorProperty = DataGridControl.HasValidationErrorPropertyKey.DependencyProperty;
-
-    public bool HasValidationError
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.HasValidationErrorProperty );
-      }
-    }
-
-    internal void SetHasValidationError( bool value )
-    {
-      if( value != this.HasValidationError )
-      {
-        if( value )
-        {
-          this.SetValue( DataGridControl.HasValidationErrorPropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( DataGridControl.HasValidationErrorPropertyKey, DependencyProperty.UnsetValue );
-        }
-      }
-    }
-
-    #endregion
-
-    #region ValidationMode Property
-
-    [Obsolete( "The ValidationMode is obsolete. Refer to the Editing and Validating Data topic in the documentation.", true )]
-    public static readonly DependencyProperty ValidationModeProperty = DependencyProperty.Register(
-      "ValidationMode",
-      typeof( ValidationMode ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( ValidationMode.RowEndingEdit ) );
-
-    [Obsolete( "The ValidationMode is obsolete. Refer to the Editing and Validating Data topic in the documentation.", true )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public ValidationMode ValidationMode
-    {
-      get
-      {
-        return ValidationMode.RowEndingEdit;
-      }
-      set
-      {
-      }
-    }
-
-    #endregion
-
-    #region SelectedItems Read-Only Property
-
-    private static readonly DependencyPropertyKey SelectedItemsPropertyKey = DependencyProperty.RegisterReadOnly(
-      "SelectedItems",
-      typeof( IList ),
-      typeof( DataGridControl ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty SelectedItemsProperty;
-
-    public IList SelectedItems
-    {
-      get
-      {
-        return ( IList )this.GetValue( DataGridControl.SelectedItemsProperty );
-      }
-    }
-
-    #endregion
-
-    #region SelectedRanges Read-Only Property
-
-    private static readonly DependencyPropertyKey SelectedItemRangesPropertyKey = DependencyProperty.RegisterReadOnly(
-      "SelectedItemRanges",
-      typeof( IList<SelectionRange> ),
-      typeof( DataGridControl ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty SelectedItemRangesProperty;
-
-    public IList<SelectionRange> SelectedItemRanges
-    {
-      get
-      {
-        return ( IList<SelectionRange> )this.GetValue( DataGridControl.SelectedItemRangesProperty );
-      }
-    }
-
-    #endregion
-
-    #region SelectedCellRanges Read-Only Property
-
-    private static readonly DependencyPropertyKey SelectedCellRangesPropertyKey = DependencyProperty.RegisterReadOnly(
-      "SelectedCellRanges",
-      typeof( IList<SelectionCellRange> ),
-      typeof( DataGridControl ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty SelectedCellRangesProperty;
-
-    public IList<SelectionCellRange> SelectedCellRanges
-    {
-      get
-      {
-        return ( IList<SelectionCellRange> )this.GetValue( DataGridControl.SelectedCellRangesProperty );
-      }
-    }
-
-    #endregion
-
-    #region SelectedItem Property
-
-    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register(
-      "SelectedItem",
-      typeof( object ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( DataGridControl.OnSelectedItemChanged ), new CoerceValueCallback( DataGridControl.OnCoerceSelectedItem ) ) );
-
-    public object SelectedItem
-    {
-      get
-      {
-        return this.GetValue( DataGridControl.SelectedItemProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.SelectedItemProperty, value );
-      }
-    }
-
-    internal void SetSkipCoerceSelectedItemCheck( bool value )
-    {
-      m_skipCoerceSelectedItemCheck = value;
-    }
-
-    private static object OnCoerceSelectedItem( DependencyObject sender, object value )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return value;
-
-      if( ( value != null ) && ( !self.m_skipCoerceSelectedItemCheck ) )
-      {
-        if( !self.Items.Contains( value ) )
-        {
-          self.SelectedItemPropertyNeedCoerce = true;
-          return DependencyProperty.UnsetValue;
-        }
-      }
-
-      self.SelectedItemPropertyNeedCoerce = false;
-      return value;
-    }
-
-    private static void OnSelectedItemChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( ( self == null ) || self.m_selectionChangerManager.IsActive )
-        return;
-
-      self.m_selectionChangerManager.Begin();
-
-      try
-      {
-        if( e.NewValue == null )
-        {
-          self.m_selectionChangerManager.UnselectAll();
-        }
-        else
-        {
-          self.m_selectionChangerManager.SelectJustThisItem( self.DataGridContext, self.Items.IndexOf( e.NewValue ), e.NewValue );
-        }
-      }
-      finally
-      {
-        self.m_selectionChangerManager.End( false, true );
-      }
-    }
-
-    private bool m_skipCoerceSelectedItemCheck;
-
-    #endregion
-
-    #region SelectedIndex Property
-
-    public static readonly DependencyProperty SelectedIndexProperty = DependencyProperty.Register(
-      "SelectedIndex",
-      typeof( int ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( -1, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( DataGridControl.OnSelectedIndexChanged ), new CoerceValueCallback( DataGridControl.OnCoerceSelectedIndex ) ) );
-
-    public int SelectedIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( DataGridControl.SelectedIndexProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.SelectedIndexProperty, value );
-      }
-    }
-
-    private static object OnCoerceSelectedIndex( DependencyObject sender, object value )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return value;
-
-      var newValue = ( int )value;
-
-      if( ( newValue < -1 ) || ( newValue >= self.Items.Count ) )
-      {
-        self.SelectedIndexPropertyNeedCoerce = true;
-        return DependencyProperty.UnsetValue;
-      }
-
-      self.SelectedIndexPropertyNeedCoerce = false;
-      return value;
-    }
-
-    private static void OnSelectedIndexChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( ( self == null ) || self.m_selectionChangerManager.IsActive )
-        return;
-
-      var newValue = ( int )e.NewValue;
-
-      self.m_selectionChangerManager.Begin();
-
-      try
-      {
-        if( ( newValue >= 0 ) && ( newValue < self.Items.Count ) )
-        {
-          //affect the item as the new selection
-          self.m_selectionChangerManager.SelectJustThisItem( self.DataGridContext, newValue, self.Items[ newValue ] );
-        }
-        else
-        {
-          //clear the selection.
-          self.m_selectionChangerManager.UnselectAll();
-        }
-      }
-      finally
-      {
-        self.m_selectionChangerManager.End( false, true );
-      }
-    }
-
-    #endregion
-
-    #region GlobalSelectedItems Read-Only Property
-
-    public IEnumerable GlobalSelectedItems
-    {
-      get
-      {
-        foreach( var context in this.SelectedContexts )
-        {
-          foreach( var selectedItem in context.SelectedItems )
-          {
-            yield return selectedItem;
-          }
-        }
-      }
-    }
-
-    internal void NotifyGlobalSelectedItemsChanged()
-    {
-      this.OnPropertyChanged( "GlobalSelectedItems" );
-    }
-
-    #endregion
-
-    #region SelectedContexts Read-Only Property
-
-    public ReadOnlyCollection<DataGridContext> SelectedContexts
-    {
-      get
-      {
-        if( m_readOnlySelectedContexts == null )
-        {
-          m_readOnlySelectedContexts = new ReadOnlyCollection<DataGridContext>( m_selectedContexts );
-        }
-
-        return m_readOnlySelectedContexts;
-      }
-    }
-
-    private readonly List<DataGridContext> m_selectedContexts = new List<DataGridContext>();
-    private ReadOnlyCollection<DataGridContext> m_readOnlySelectedContexts;
-
-    #endregion
-
-    #region SelectionMode Property
-
-    public static readonly DependencyProperty SelectionModeProperty = DependencyProperty.Register(
-      "SelectionMode",
-      typeof( SelectionMode ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( SelectionMode.Extended, new PropertyChangedCallback( DataGridControl.OnSelectionModeChanged ) ) );
-
-    public SelectionMode SelectionMode
-    {
-      get
-      {
-        return ( SelectionMode )this.GetValue( DataGridControl.SelectionModeProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.SelectionModeProperty, value );
-      }
-    }
-
-    internal SelectionMode SelectionModeToUse
-    {
-      get
-      {
-        return this.SelectionMode;
-      }
-    }
-
-    private static void OnSelectionModeChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-    }
-
-    #endregion
-
-    #region SelectionUnit Property
-
-    public static readonly DependencyProperty SelectionUnitProperty = DependencyProperty.Register(
-      "SelectionUnit",
-      typeof( SelectionUnit ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( SelectionUnit.Row, new PropertyChangedCallback( DataGridControl.OnSelectionUnitChanged ) ) );
-
-    public SelectionUnit SelectionUnit
-    {
-      get
-      {
-        return ( SelectionUnit )this.GetValue( DataGridControl.SelectionUnitProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.SelectionUnitProperty, value );
-      }
-    }
-
-    private static void OnSelectionUnitChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      var selectionUnit = ( SelectionUnit )e.NewValue;
-
-      self.m_selectionChangerManager.Begin();
-
-      try
-      {
-        switch( selectionUnit )
-        {
-          case SelectionUnit.Row:
-            {
-              self.m_selectionChangerManager.UnselectAllCells();
-              break;
-            }
-          case SelectionUnit.Cell:
-            {
-              self.m_selectionChangerManager.UnselectAllItems();
-              break;
-            }
-        }
-      }
-      finally
-      {
-        self.m_selectionChangerManager.End( false, true );
-      }
-    }
-
-    #endregion
-
-    #region CurrentItem Property
-
-    public object CurrentItem
-    {
-      get
-      {
-        return this.DataGridContext.CurrentItem;
-      }
-      set
-      {
-        if( value == this.DataGridContext.CurrentItem )
-          return;
-
-        this.DataGridContext.SetCurrent( value, null, null, this.DataGridContext.CurrentColumn, false, true, this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CurrentItemChanged );
-      }
-    }
-
-    internal bool ShouldSynchronizeCurrentItem
-    {
-      get
-      {
-        return ( this.SynchronizeCurrent );
-      }
-    }
-
-    #endregion
-
-    #region CurrentColumn Property
-
-    public ColumnBase CurrentColumn
-    {
-      get
-      {
-        return this.DataGridContext.CurrentColumn;
-      }
-      set
-      {
-        if( value == this.DataGridContext.CurrentColumn )
-          return;
-
-        this.DataGridContext.SetCurrent( this.DataGridContext.InternalCurrentItem, null, null, value, false, true, this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.CurrentColumnChanged );
-      }
-    }
-
-    #endregion
-
-    #region CurrentContext Property
-
-    public DataGridContext CurrentContext
-    {
-      get
-      {
-        Debug.Assert( m_currentDataGridContext != null );
-
-        return m_currentDataGridContext;
-      }
-    }
-
-    internal void SetCurrentDataGridContextHelper( DataGridContext value )
-    {
-      m_currentDataGridContext = value;
-
-      this.OnPropertyChanged( "CurrentContext" );
-      this.OnPropertyChanged( "CurrentColumn" );
-      this.OnPropertyChanged( "CurrentItem" );
-      this.OnPropertyChanged( "GlobalCurrentItem" );
-      this.OnPropertyChanged( "GlobalCurrentColumn" );
-    }
-
-    private DataGridContext m_currentDataGridContext; // = null
-
-    #endregion
-
-    #region GlobalCurrentItem Read-Only Property
-
-    public object GlobalCurrentItem
-    {
-      get
-      {
-        return this.CurrentContext.CurrentItem;
-      }
-    }
-
-    #endregion
-
-    #region GlobalCurrentColumn Read-Only Property
-
-    public ColumnBase GlobalCurrentColumn
-    {
-      get
-      {
-        return this.CurrentContext.CurrentColumn;
-      }
-    }
-
-    #endregion
-
-    #region DragDropAdornerDecorator Property
-
-    internal AdornerDecorator DragDropAdornerDecorator
-    {
-      get
-      {
-        return m_dragDropAdornerDecorator;
-      }
-    }
-
-    private AdornerDecorator m_dragDropAdornerDecorator;
-
-    #endregion
-
-    #region AutoCreateColumns Property
-
-    public static readonly DependencyProperty AutoCreateColumnsProperty = DependencyProperty.Register(
-      "AutoCreateColumns",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( true ) );
-
-    public bool AutoCreateColumns
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.AutoCreateColumnsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.AutoCreateColumnsProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AutoCreateForeignKeyConfigurations Property
-
-    public static readonly DependencyProperty AutoCreateForeignKeyConfigurationsProperty = DependencyProperty.Register(
-      "AutoCreateForeignKeyConfigurations",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata(
-        ( bool )false,
-        new PropertyChangedCallback( DataGridControl.OnAutoCreateForeignKeyConfigurationsChanged ) ) );
-
-    public bool AutoCreateForeignKeyConfigurations
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.AutoCreateForeignKeyConfigurationsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.AutoCreateForeignKeyConfigurationsProperty, value );
-      }
-    }
-
-    private static void OnAutoCreateForeignKeyConfigurationsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( ( self == null ) || !self.AutoCreateForeignKeyConfigurations )
-        return;
-
-      self.SynchronizeForeignKeyConfigurations();
-    }
-
-    #endregion
-
-    #region HideSelection Property
-
-    public static readonly DependencyProperty HideSelectionProperty = DependencyProperty.Register(
-      "HideSelection",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false ) );
-
-    public bool HideSelection
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.HideSelectionProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.HideSelectionProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ReadOnly Property
-
-    public static readonly DependencyProperty ReadOnlyProperty = DependencyProperty.RegisterAttached(
-      "ReadOnly",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public bool ReadOnly
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.ReadOnlyProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.ReadOnlyProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AutoScrollCurrentItem Property
-
-    public static readonly DependencyProperty AutoScrollCurrentItemProperty = DependencyProperty.Register(
-      "AutoScrollCurrentItem",
-      typeof( AutoScrollCurrentItemTriggers ),
-      typeof( DataGridControl ),
-      new PropertyMetadata( AutoScrollCurrentItemTriggers.All ) );
-
-    public AutoScrollCurrentItemTriggers AutoScrollCurrentItem
-    {
-      get
-      {
-        return ( AutoScrollCurrentItemTriggers )this.GetValue( DataGridControl.AutoScrollCurrentItemProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.AutoScrollCurrentItemProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EditTriggers Property
-
-    public static readonly DependencyProperty EditTriggersProperty = DependencyProperty.RegisterAttached(
-      "EditTriggers",
-      typeof( EditTriggers ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( EditTriggers.BeginEditCommand | EditTriggers.ClickOnCurrentCell | EditTriggers.ActivationGesture, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public EditTriggers EditTriggers
-    {
-      get
-      {
-        return ( EditTriggers )this.GetValue( DataGridControl.EditTriggersProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.EditTriggersProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ScrollViewer Property
-
-    internal ScrollViewer ScrollViewer
-    {
-      get
-      {
-        return m_scrollViewer;
-      }
-    }
-
-    private ScrollViewer m_scrollViewer;
-
-    #endregion
-
-    #region ItemsHost Property
-
-    internal FrameworkElement ItemsHost
-    {
-      get
-      {
-        if( m_itemsHost == null )
-        {
-          var scrollViewer = this.ScrollViewer;
-          if( scrollViewer == null )
-            return null;
-
-          //this can be either a ItemsPresenter (which implements IScrollInfo and reforwards it to the ItemsPanel instantiated from the
-          //ItemsPanelTemplate or the DataGridItemsHost used for the Container Recycling.
-          var scrollViewerContent = default( FrameworkElement );
-
-          var itemsPresenter = scrollViewer.Content as ItemsPresenter;
-          if( itemsPresenter != null )
-          {
-            if( VisualTreeHelper.GetChildrenCount( itemsPresenter ) > 0 )
-            {
-              scrollViewerContent = VisualTreeHelper.GetChild( itemsPresenter, 0 ) as FrameworkElement;
-            }
-          }
-          else
-          {
-            scrollViewerContent = scrollViewer.Content as DataGridItemsHost;
-
-            if( scrollViewerContent == null )
-            {
-              scrollViewerContent = scrollViewer.Content as Panel;
-            }
-          }
-
-          if( scrollViewerContent == null )
-            throw new InvalidOperationException( "An attempt was made to use a ScrollViewer that does not have an ItemsPresenter, Panel, or DataGridItemsHost as its content." );
-
-          m_itemsHost = scrollViewerContent;
-        }
-
-        return m_itemsHost;
-      }
-    }
-
-    #endregion
-
-    #region ItemsPanel override
-
-    [Obsolete( "The ItemsPanel property is obsolete and has been replaced by the DataGridItemsHost (and derived) classes.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public new ItemsPanelTemplate ItemsPanel
-    {
-      get
-      {
-        return base.ItemsPanel;
-      }
-      set
-      {
-        base.ItemsPanel = value;
-      }
-    }
-
-    #endregion
-
-    #region FixedHeadersHostPanel Property
-
-    internal Panel FixedHeadersHostPanel
-    {
-      get
-      {
-        return m_fixedHeadersHostPanel;
-      }
-    }
-
-    private void SetFixedHeadersHostPanel( Panel panel )
-    {
-      if( m_fixedHeadersHostPanel == panel )
-        return;
-
-      m_fixedHeadersHostPanel = panel;
-
-      if( m_fixedHeadersHostPanel != null )
-      {
-        DataGridControl.RefreshFixedHeaderFooter( this, m_fixedHeadersHostPanel, this.GetView().FixedHeaders );
-      }
-    }
-
-    private Panel m_fixedHeadersHostPanel;
-
-    #endregion
-
-    #region FixedFootersHostPanel Property
-
-    internal Panel FixedFootersHostPanel
-    {
-      get
-      {
-        return m_fixedFootersHostPanel;
-      }
-    }
-
-    private void SetFixedFootersHostPanel( Panel panel )
-    {
-      if( m_fixedFootersHostPanel == panel )
-        return;
-
-      m_fixedFootersHostPanel = panel;
-
-      if( m_fixedFootersHostPanel != null )
-      {
-        DataGridControl.RefreshFixedHeaderFooter( this, m_fixedFootersHostPanel, this.GetView().FixedFooters );
-      }
-    }
-
-    private Panel m_fixedFootersHostPanel;
-
-    #endregion
-
-    #region IsFixedHeadersHost Attached Property
-
-    public static readonly DependencyProperty IsFixedHeadersHostProperty = DependencyProperty.RegisterAttached(
-      "IsFixedHeadersHost",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnIsFixedHeadersHost_Changed ) ) );
-
-    public static bool GetIsFixedHeadersHost( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( DataGridControl.IsFixedHeadersHostProperty );
-    }
-
-    public static void SetIsFixedHeadersHost( DependencyObject obj, bool value )
-    {
-      obj.SetValue( DataGridControl.IsFixedHeadersHostProperty, value );
-    }
-
-    private static void OnIsFixedHeadersHost_Changed( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( !( bool )e.NewValue )
-        return;
-
-      var panel = sender as Panel;
-      if( panel == null )
-        return;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( sender );
-      var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
-
-      if( dataGridControl != null )
-      {
-        dataGridControl.SetFixedHeadersHostPanel( panel );
-      }
-    }
-
-    #endregion
-
-    #region IsFixedFootersHost Attached Property
-
-    public static readonly DependencyProperty IsFixedFootersHostProperty = DependencyProperty.RegisterAttached(
-      "IsFixedFootersHost",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnIsFixedFootersHost_Changed ) ) );
-
-    public static bool GetIsFixedFootersHost( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( DataGridControl.IsFixedFootersHostProperty );
-    }
-
-    public static void SetIsFixedFootersHost( DependencyObject obj, bool value )
-    {
-      obj.SetValue( DataGridControl.IsFixedFootersHostProperty, value );
-    }
-
-    private static void OnIsFixedFootersHost_Changed( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( !( bool )e.NewValue )
-        return;
-
-      var panel = sender as Panel;
-      if( panel == null )
-        return;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( sender );
-      var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
-
-      if( dataGridControl != null )
-      {
-        dataGridControl.SetFixedFootersHostPanel( panel );
-      }
-    }
-
-    #endregion
-
-    #region ItemsPrimaryAxis Property
-
-    public static readonly DependencyProperty ItemsPrimaryAxisProperty = DependencyProperty.Register(
-      "ItemsPrimaryAxis",
-      typeof( PrimaryAxis ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( PrimaryAxis.Vertical ) );
-
-    public PrimaryAxis ItemsPrimaryAxis
-    {
-      get
-      {
-        return ( PrimaryAxis )this.GetValue( DataGridControl.ItemsPrimaryAxisProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.ItemsPrimaryAxisProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region View Property
-
-    public static readonly DependencyProperty ViewProperty = DependencyProperty.Register(
-      "View",
-      typeof( UIViewBase ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( DataGridControl.OnViewChanged ), new CoerceValueCallback( DataGridControl.ViewCoerceValueCallback ) ) );
-
-    [TypeConverter( typeof( Markup.ViewConverter ) )]
-    public UIViewBase View
-    {
-      get
-      {
-        return ( UIViewBase )this.GetValue( DataGridControl.ViewProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.ViewProperty, value );
-      }
-    }
-
-    internal event EventHandler ViewChanged;
-    internal event EventHandler ThemeChanged;
-
-    private static object ViewCoerceValueCallback( DependencyObject sender, object value )
-    {
-      var view = value as UIViewBase;
-      var dataGridControl = sender as DataGridControl;
-
-      if( ( view == null ) && ( dataGridControl != null ) )
-        return dataGridControl.GetDefaultView();
-
-      if( view != null )
-      {
-        if( ( view.Parent != null ) && ( view.Parent != sender ) )
-          throw new InvalidOperationException( "An attempt was made to associate a view with more than one grid." );
-      }
-
-      return value;
-    }
-
-    private static void OnViewChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      // Cannot stay in editing mode when the view is changed
-      self.CancelEdit();
-
-      var oldView = e.OldValue as Views.ViewBase;
-      var newView = e.NewValue as Views.ViewBase;
-
-      self.OnViewChanged( oldView, newView );
-    }
-
-    private void OnViewChanged( Views.ViewBase oldView, Views.ViewBase newView )
-    {
-      if( oldView != null )
-      {
-        oldView.ThemeChanged -= new DependencyPropertyChangedEventHandler( this.View_ThemeChanged );
-        oldView.FixedHeaders.CollectionChanged -= new NotifyCollectionChangedEventHandler( this.View_FixedHeadersCollectionChanged );
-        oldView.FixedFooters.CollectionChanged -= new NotifyCollectionChangedEventHandler( this.View_FixedFootersCollectionChanged );
-      }
-
-      object newDefaultStyleKey = null;
-
-      if( newView != null )
-      {
-        newView.ThemeChanged += new DependencyPropertyChangedEventHandler( this.View_ThemeChanged );
-        newView.FixedHeaders.CollectionChanged += new NotifyCollectionChangedEventHandler( this.View_FixedHeadersCollectionChanged );
-        newView.FixedFooters.CollectionChanged += new NotifyCollectionChangedEventHandler( this.View_FixedFootersCollectionChanged );
-
-        newDefaultStyleKey = newView.GetDefaultStyleKey( typeof( DataGridControl ) );
-      }
-
-      // Cache if the view requires to preserve container size
-      this.ViewPreservesContainerSize = ( newView != null ) ? newView.PreserveContainerSize : true;
-
-      if( !object.Equals( newDefaultStyleKey, this.DefaultStyleKey ) )
-      {
-        this.ClearValue( FrameworkElement.DefaultStyleKeyProperty );
-
-        if( !object.Equals( newDefaultStyleKey, this.DefaultStyleKey ) )
-        {
-          this.DefaultStyleKey = newDefaultStyleKey;
-        }
-      }
-
-      this.InvalidateViewStyle();
-
-      // We cannot be sure that the grid elements default style key are different with this new View/Theme (for instance, if the new View/Theme are of the same type 
-      // as the old ones). So, we have to force the new templates. This is mainly to setup the new ViewBindings.
-      this.ReapplyTemplate();
-
-      if( this.ViewChanged != null )
-      {
-        this.ViewChanged( this, EventArgs.Empty );
-      }
-
-      // Reset the size states since we do not want to apply old size states to a new view/new container style.
-      this.DataGridContext.ClearSizeStates();
-
-      // Reset the flag
-      this.ForceGeneratorReset = false;
-
-      // Make sure the current item is into view.
-      this.DelayBringIntoViewAndFocusCurrent( DispatcherPriority.Render, AutoScrollCurrentItemSourceTriggers.ViewChanged );
-    }
-
-    private UIViewBase m_defaultView;
-
-    #endregion
-
-    #region GroupLevelDescriptions Read-Only Property
-
-    private static readonly DependencyPropertyKey GroupLevelDescriptionsPropertyKey = DependencyProperty.RegisterReadOnly(
-      "GroupLevelDescriptions",
-      typeof( GroupLevelDescriptionCollection ),
-      typeof( DataGridControl ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty GroupLevelDescriptionsProperty;
-
-    public GroupLevelDescriptionCollection GroupLevelDescriptions
-    {
-      get
-      {
-        return ( GroupLevelDescriptionCollection )this.GetValue( DataGridControl.GroupLevelDescriptionsProperty );
-      }
-    }
-
-    #endregion
-
-    #region NavigationBehavior Property
-
-    public static readonly DependencyProperty NavigationBehaviorProperty = DependencyProperty.RegisterAttached(
-      "NavigationBehavior",
-      typeof( NavigationBehavior ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( NavigationBehavior.CellOnly, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public NavigationBehavior NavigationBehavior
-    {
-      get
-      {
-        return ( NavigationBehavior )this.GetValue( DataGridControl.NavigationBehaviorProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.NavigationBehaviorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region PagingBehavior Property
-
-    public static readonly DependencyProperty PagingBehaviorProperty = DependencyProperty.Register(
-      "PagingBehavior",
-      typeof( PagingBehavior ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( PagingBehavior.TopToBottom ) );
-
-    public PagingBehavior PagingBehavior
-    {
-      get
-      {
-        return ( PagingBehavior )this.GetValue( DataGridControl.PagingBehaviorProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.PagingBehaviorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ItemScrollingBehavior Property
-
-    public static readonly DependencyProperty ItemScrollingBehaviorProperty = DependencyProperty.Register(
-      "ItemScrollingBehavior",
-      typeof( ItemScrollingBehavior ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( ItemScrollingBehavior.Deferred ) );
-
-    public ItemScrollingBehavior ItemScrollingBehavior
-    {
-      get
-      {
-        return ( ItemScrollingBehavior )this.GetValue( DataGridControl.ItemScrollingBehaviorProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.ItemScrollingBehaviorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CurrentRowInEditionState Read-Only Property
-
-    internal RowState CurrentRowInEditionState
-    {
-      get
-      {
-        return m_currentRowInEditionState;
-      }
-    }
-
-    #endregion
-
-    #region CurrentItemInEdition Read-Only Property
-
-    internal object CurrentItemInEdition
-    {
-      get
-      {
-        return m_currentItemInEdition;
-      }
-    }
-
-    #endregion
-
-    #region FixedItem Attached Property
-
-    private static readonly object NotSet = new object();
-
-    // The ownerType is set to FrameworkElement to make the inheritance works for all grid elements.
-    private static readonly DependencyProperty FixedItemProperty = DependencyProperty.RegisterAttached(
-      "FixedItem",
-      typeof( object ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( DataGridControl.NotSet, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    private static object GetFixedItem( DependencyObject obj )
-    {
-      return obj.GetValue( DataGridControl.FixedItemProperty );
-    }
-
-    private static void SetFixedItem( DependencyObject obj, object value )
-    {
-      obj.SetValue( DataGridControl.FixedItemProperty, value );
-    }
-
-    #endregion
-
-    #region Hidden Properties
-
-    // We want to hide these inherited properties because they have no impact on the DataGridControl behavior.
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public new DataTemplate ItemTemplate
-    {
-      get
-      {
-        return base.ItemTemplate;
-      }
-      set
-      {
-        base.ItemTemplate = value;
-      }
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public new DataTemplateSelector ItemTemplateSelector
-    {
-      get
-      {
-        return base.ItemTemplateSelector;
-      }
-      set
-      {
-        base.ItemTemplateSelector = value;
-      }
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public new ObservableCollection<GroupStyle> GroupStyle
-    {
-      get
-      {
-        return base.GroupStyle;
-      }
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public new GroupStyleSelector GroupStyleSelector
-    {
-      get
-      {
-        return base.GroupStyleSelector;
-      }
-
-      set
-      {
-        base.GroupStyleSelector = value;
-      }
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public new bool IsGrouping
-    {
-      get
-      {
-        return base.IsGrouping;
-      }
-    }
-
-    #endregion
-
-    #region ItemContainerGenerator Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The ItemContainerGenerator is obsolete and has been replaced by the GetContainerFromItem and GetItemFromContainer methods.", true )]
-    public new ItemContainerGenerator ItemContainerGenerator
-    {
-      get
-      {
-        return base.ItemContainerGenerator;
-      }
-    }
-
-    #endregion
-
-    #region CustomItemContainerGenerator Property
-
-    internal CustomItemContainerGenerator CustomItemContainerGenerator
-    {
-      get
-      {
-        return m_customItemContainerGenerator;
-      }
-    }
-
-    #endregion
-
-    #region IsBeingEdited Property
-
-    private static readonly DependencyPropertyKey IsBeingEditedPropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsBeingEdited",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsBeingEditedProperty = IsBeingEditedPropertyKey.DependencyProperty;
-
-    public bool IsBeingEdited
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.IsBeingEditedProperty );
-      }
-    }
-
-    private void UpdateIsBeingEdited()
-    {
-      var isBeingEdited = ( m_currentItemInEdition != null );
-      if( isBeingEdited == this.IsBeingEdited )
-        return;
-
-      if( isBeingEdited )
-      {
-        this.SetValue( DataGridControl.IsBeingEditedPropertyKey, isBeingEdited );
-      }
-      else
-      {
-        this.ClearValue( DataGridControl.IsBeingEditedPropertyKey );
-      }
-    }
-
-    #endregion
-
-    #region DataGridContext Read-Only Property
-
-    internal DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_localDataGridContext;
-      }
-    }
-
-    #endregion
-
-    #region GroupConfigurationSelector Property
-
-    public static readonly DependencyProperty GroupConfigurationSelectorProperty = DependencyProperty.Register(
-      "GroupConfigurationSelector",
-      typeof( GroupConfigurationSelector ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( OnGroupConfigurationSelectorChanged ) ) );
-
-    public GroupConfigurationSelector GroupConfigurationSelector
-    {
-      get
-      {
-        return ( GroupConfigurationSelector )this.GetValue( DataGridControl.GroupConfigurationSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.GroupConfigurationSelectorProperty, value );
-      }
-    }
-
-    internal event EventHandler GroupConfigurationSelectorChanged;
-
-    private static void OnGroupConfigurationSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      var handler = self.GroupConfigurationSelectorChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( self, EventArgs.Empty );
-    }
-
-    #endregion
-
-    #region AllowDetailToggle Property
-
-    public static readonly DependencyProperty AllowDetailToggleProperty = DependencyProperty.Register(
-      "AllowDetailToggle",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( true, new PropertyChangedCallback( DataGridControl.OnAllowDetailToggleChanged ) ) );
-
-    public bool AllowDetailToggle
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.AllowDetailToggleProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.AllowDetailToggleProperty, value );
-      }
-    }
-
-    internal event EventHandler AllowDetailToggleChanged;
-
-    private static void OnAllowDetailToggleChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      var handler = self.AllowDetailToggleChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( self, EventArgs.Empty );
-    }
-
-    #endregion
-
-    #region DefaultDetailConfiguration Property
-
-    public static readonly DependencyProperty DefaultDetailConfigurationProperty = DependencyProperty.Register(
-      "DefaultDetailConfiguration",
-      typeof( DefaultDetailConfiguration ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DefaultDetailConfiguration DefaultDetailConfiguration
-    {
-      get
-      {
-        return ( DefaultDetailConfiguration )this.GetValue( DataGridControl.DefaultDetailConfigurationProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.DefaultDetailConfigurationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DefaultGroupConfiguration Property
-
-    public static readonly DependencyProperty DefaultGroupConfigurationProperty = DependencyProperty.Register(
-      "DefaultGroupConfiguration",
-      typeof( GroupConfiguration ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public GroupConfiguration DefaultGroupConfiguration
-    {
-      get
-      {
-        return ( GroupConfiguration )this.GetValue( DataGridControl.DefaultGroupConfigurationProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.DefaultGroupConfigurationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ContainerGroupConfiguration Attached Property
-
-    internal static readonly DependencyProperty ContainerGroupConfigurationProperty = DependencyProperty.RegisterAttached(
-      "ContainerGroupConfiguration",
-      typeof( GroupConfiguration ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( null ) );
-
-    internal static GroupConfiguration GetContainerGroupConfiguration( DependencyObject obj )
-    {
-      return ( GroupConfiguration )obj.GetValue( DataGridControl.ContainerGroupConfigurationProperty );
-    }
-
-    internal static void SetContainerGroupConfiguration( DependencyObject obj, GroupConfiguration value )
-    {
-      obj.SetValue( DataGridControl.ContainerGroupConfigurationProperty, value );
-    }
-
-    #endregion
-
-    #region ItemsSourceName Property
-
-    public object ItemsSourceName
-    {
-      get
-      {
-        if( m_itemsSourceName == null )
-          return m_detectedName;
-
-        return m_itemsSourceName;
-      }
-      set
-      {
-        if( value == m_itemsSourceName )
-          return;
-
-        m_itemsSourceName = value;
-
-        this.OnPropertyChanged( "ItemsSourceName" );
-      }
-    }
-
-    private object m_itemsSourceName;
-    private object m_detectedName;
-
-    #endregion
-
-    #region ItemsSourceNameTemplate Property
-
-    public static readonly DependencyProperty ItemsSourceNameTemplateProperty = DependencyProperty.Register(
-      "ItemsSourceNameTemplate",
-      typeof( DataTemplate ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( null ) );
-
-    public DataTemplate ItemsSourceNameTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( DataGridControl.ItemsSourceNameTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.ItemsSourceNameTemplateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region UpdateSourceTrigger Property
-
-    public static readonly DependencyProperty UpdateSourceTriggerProperty = DependencyProperty.Register(
-      "UpdateSourceTrigger",
-      typeof( DataGridUpdateSourceTrigger ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( DataGridUpdateSourceTrigger.RowEndingEdit ) );
-
-    public DataGridUpdateSourceTrigger UpdateSourceTrigger
-    {
-      get
-      {
-        return ( DataGridUpdateSourceTrigger )this.GetValue( DataGridControl.UpdateSourceTriggerProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.UpdateSourceTriggerProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ForceGeneratorReset Property
-
-    // This property is used to avoid a reset when Column Virtualization is on and all Row instances are using FixedCellPanel as PART_CellsHost
-    internal bool ForceGeneratorReset
-    {
-      get
-      {
-        return m_forceGeneratorReset;
-      }
-      set
-      {
-        m_forceGeneratorReset = value;
-      }
-    }
-
-    private bool m_forceGeneratorReset; // = false;
-
-    #endregion
-
-    #region ClipboardExporters Property
-
-    public Dictionary<string, ClipboardExporterBase> ClipboardExporters
-    {
-      get
-      {
-        if( m_clipboardExporters == null )
-        {
-          m_clipboardExporters = new Dictionary<string, ClipboardExporterBase>();
-
-          if( !DesignerProperties.GetIsInDesignMode( this ) )
-          {
-            // Configure CSV ClipboardExporter
-            CsvClipboardExporter csvClipboardExporter = new CsvClipboardExporter();
-            csvClipboardExporter.FormatSettings.Separator = ',';
-            csvClipboardExporter.FormatSettings.TextQualifier = '"';
-            m_clipboardExporters.Add( DataFormats.CommaSeparatedValue, csvClipboardExporter );
-
-            // Configure tab separated value ClipboardExporter
-            csvClipboardExporter = new CsvClipboardExporter();
-            csvClipboardExporter.FormatSettings.Separator = '\t';
-            csvClipboardExporter.FormatSettings.TextQualifier = '"';
-            m_clipboardExporters.Add( DataFormats.Text, csvClipboardExporter );
-
-            // Configure HTML exporter
-            m_clipboardExporters.Add( DataFormats.Html, new HtmlClipboardExporter() );
-
-            // Configure Unicode ClipboardExporter 
-            m_clipboardExporters.Add( DataFormats.UnicodeText, new UnicodeCsvClipboardExporter() );
-          }
-        }
-
-        return m_clipboardExporters;
-      }
-    }
-
-    private Dictionary<string, ClipboardExporterBase> m_clipboardExporters; // = null;
-
-    #endregion
-
-    #region IsDeleteCommandEnabled Property
-
-    public static readonly DependencyProperty IsDeleteCommandEnabledProperty = DependencyProperty.Register(
-      "IsDeleteCommandEnabled",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnIsDeleteCommandEnabledChanged ) ) );
-
-    public bool IsDeleteCommandEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.IsDeleteCommandEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.IsDeleteCommandEnabledProperty, value );
-      }
-    }
-
-    private static void OnIsDeleteCommandEnabledChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      // On keep the command binding active if it is required
-      if( ( bool )e.NewValue )
-      {
-        if( !self.CommandBindings.Contains( self.m_deleteCommandBinding ) )
-        {
-          self.CommandBindings.Add( self.m_deleteCommandBinding );
-        }
-      }
-      else
-      {
-        self.CommandBindings.Remove( self.m_deleteCommandBinding );
-      }
-
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    #endregion
-
-    #region IsCopyCommandEnabled Property
-
-    public static readonly DependencyProperty IsCopyCommandEnabledProperty = DependencyProperty.Register(
-      "IsCopyCommandEnabled",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( true, new PropertyChangedCallback( OnIsCopyCommandEnabledChanged ) ) );
-
-    public bool IsCopyCommandEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.IsCopyCommandEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.IsCopyCommandEnabledProperty, value );
-      }
-    }
-
-    private static void OnIsCopyCommandEnabledChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      // On keep the command binding active if it is required
-      if( ( bool )e.NewValue )
-      {
-        if( !self.CommandBindings.Contains( self.m_copyCommandBinding ) )
-        {
-          self.CommandBindings.Add( self.m_copyCommandBinding );
-        }
-      }
-      else
-      {
-        self.CommandBindings.Remove( self.m_copyCommandBinding );
-      }
-
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    #endregion
-
-    #region IsRefreshCommandEnabled Property
-
-    public static readonly DependencyProperty IsRefreshCommandEnabledProperty = DependencyProperty.Register(
-      "IsRefreshCommandEnabled",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( true, new PropertyChangedCallback( DataGridControl.OnIsRefreshCommandEnabledChanged ) ) );
-
-    public bool IsRefreshCommandEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.IsRefreshCommandEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.IsRefreshCommandEnabledProperty, value );
-      }
-    }
-
-    private static void OnIsRefreshCommandEnabledChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      // On keep the command binding active if it is required
-      if( ( bool )e.NewValue )
-      {
-        if( !self.CommandBindings.Contains( self.m_refreshCommandBinding ) )
-        {
-          self.CommandBindings.Add( self.m_refreshCommandBinding );
-        }
-      }
-      else
-      {
-        self.CommandBindings.Remove( self.m_refreshCommandBinding );
-      }
-
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    #endregion
-
-    #region MaxSortLevels Property
-
-    public static readonly DependencyProperty MaxSortLevelsProperty = DependencyProperty.Register(
-      "MaxSortLevels",
-      typeof( int ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( -1, new PropertyChangedCallback( DataGridControl.OnMaxSortLevelsChanged ) ) );
-
-    public int MaxSortLevels
-    {
-      get
-      {
-        return ( int )this.GetValue( DataGridControl.MaxSortLevelsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.MaxSortLevelsProperty, value );
-      }
-    }
-
-    internal event EventHandler MaxSortLevelsChanged;
-
-    private static void OnMaxSortLevelsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      var handler = self.MaxSortLevelsChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( self, EventArgs.Empty );
-    }
-
-    #endregion
-
-    #region MaxGroupLevels Property
-
-    public static readonly DependencyProperty MaxGroupLevelsProperty = DependencyProperty.Register(
-      "MaxGroupLevels",
-      typeof( int ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( -1, new PropertyChangedCallback( DataGridControl.OnMaxGroupLevelsChanged ) ) );
-
-    public int MaxGroupLevels
-    {
-      get
-      {
-        return ( int )this.GetValue( DataGridControl.MaxGroupLevelsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.MaxGroupLevelsProperty, value );
-      }
-    }
-
-    internal event EventHandler MaxGroupLevelsChanged;
-
-    private static void OnMaxGroupLevelsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      var handler = self.MaxGroupLevelsChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( self, EventArgs.Empty );
-    }
-
-    #endregion
-
-    #region SynchronizeSelectionWithCurrent Property
-
-    public static readonly DependencyProperty SynchronizeSelectionWithCurrentProperty = DependencyProperty.Register(
-      "SynchronizeSelectionWithCurrent",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false ) );
-
-    public bool SynchronizeSelectionWithCurrent
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.SynchronizeSelectionWithCurrentProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.SynchronizeSelectionWithCurrentProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SynchronizeCurrent Property
-
-    public static readonly DependencyProperty SynchronizeCurrentProperty = DependencyProperty.Register(
-      "SynchronizeCurrent",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( true ) );
-
-    public bool SynchronizeCurrent
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.SynchronizeCurrentProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.SynchronizeCurrentProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region PreserveExtendedSelection Property
-
-    [Obsolete( "The PreserveExtendedSelection dependency property is obsolete.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty PreserveExtendedSelectionProperty = DependencyProperty.Register(
-      "PreserveExtendedSelection",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false ) );
-
-    [Obsolete( "The PreserveExtendedSelection property is obsolete.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public bool PreserveExtendedSelection
-    {
-      get
-      {
-#pragma warning disable 618
-        return ( bool )this.GetValue( DataGridControl.PreserveExtendedSelectionProperty );
-#pragma warning restore 618
-      }
-      set
-      {
-#pragma warning disable 618
-        this.SetValue( DataGridControl.PreserveExtendedSelectionProperty, value );
-#pragma warning restore 618
-      }
-    }
-
-    #endregion
-
-    #region PreserveSelectionWhenEnteringEdit Property
-
-    [Obsolete( "The PreserveSelectionWhenEnteringEdit dependency property is obsolete.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty PreserveSelectionWhenEnteringEditProperty = DependencyProperty.Register(
-      "PreserveSelectionWhenEnteringEdit",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false ) );
-
-    [Obsolete( "The PreserveSelectionWhenEnteringEdit property is obsolete.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public bool PreserveSelectionWhenEnteringEdit
-    {
-      get
-      {
-#pragma warning disable 618
-        return ( bool )this.GetValue( DataGridControl.PreserveSelectionWhenEnteringEditProperty );
-#pragma warning restore 618
-      }
-      set
-      {
-#pragma warning disable 618
-        this.SetValue( DataGridControl.PreserveSelectionWhenEnteringEditProperty, value );
-#pragma warning restore 618
-      }
-    }
-
-    #endregion
-
-    #region ItemsSourceChangedDelayed Private Property
-
-    private bool ItemsSourceChangedDelayed
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.ItemsSourceChangedDelayed ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridControlFlags.ItemsSourceChangedDelayed ] = value;
-      }
-    }
-
-    #endregion
-
-    #region SelectedIndexPropertyNeedCoerce Internal Property
-
-    internal bool SelectedIndexPropertyNeedCoerce
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.SelectedIndexPropertyNeedCoerce ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridControlFlags.SelectedIndexPropertyNeedCoerce ] = value;
-      }
-    }
-
-    #endregion
-
-    #region SelectedItemPropertyNeedCoerce Internal Property
-
-    internal bool SelectedItemPropertyNeedCoerce
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.SelectedItemPropertyNeedCoerce ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridControlFlags.SelectedItemPropertyNeedCoerce ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ColumnManagerRowConfiguration Internal Property
-
-    internal ColumnManagerRowConfiguration ColumnManagerRowConfiguration
-    {
-      get
-      {
-        return m_columnManagerRowConfiguration;
-      }
-    }
-
-    private readonly ColumnManagerRowConfiguration m_columnManagerRowConfiguration;
-
-    #endregion
-
-    #region IsBoundToDataGridVirtualizingCollectionViewBase Private Property
-
-    private bool IsBoundToDataGridVirtualizingCollectionViewBase
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.IsBoundToDataGridVirtualizingCollectionViewBase ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridControlFlags.IsBoundToDataGridVirtualizingCollectionViewBase ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ViewPreservesContainerSize Private Property
-
-    private bool ViewPreservesContainerSize
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.ViewPreservesContainerSize ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridControlFlags.ViewPreservesContainerSize ] = value;
-      }
-    }
-
-    #endregion
-
-    #region DebugSaveRestore Private Property
-
-    private bool DebugSaveRestore
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.DebugSaveRestore ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridControlFlags.DebugSaveRestore ] = value;
-      }
-    }
-
-    #endregion
-
-    #region SelectionChangerManager Property
-
-    internal SelectionManager SelectionChangerManager
-    {
-      get
-      {
-        return m_selectionChangerManager;
-      }
-    }
-
-    #endregion
-
-    #region MouseDownSelectionRangePoint Property
-
-    internal SelectionRangePoint MouseDownSelectionRangePoint
-    {
-      get
-      {
-        return m_mouseDownSelectionRangePoint;
-      }
-    }
-
-    #endregion
-
-    #region HandlesScrolling Property
-
-    protected override bool HandlesScrolling
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region ConnectionState ReadOnly Dependency Property
-
-    private static readonly DependencyPropertyKey ConnectionStatePropertyKey = DependencyProperty.RegisterReadOnly(
-      "ConnectionState",
-      typeof( DataGridConnectionState ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( DataGridConnectionState.Idle ) );
-
-    public static readonly DependencyProperty ConnectionStateProperty = DataGridControl.ConnectionStatePropertyKey.DependencyProperty;
-
-    public DataGridConnectionState ConnectionState
-    {
-      get
-      {
-        return ( DataGridConnectionState )this.GetValue( DataGridControl.ConnectionStateProperty );
-      }
-    }
-
-    private void SetConnectionState( DataGridConnectionState value )
-    {
-      if( value == DataGridConnectionState.Idle )
-      {
-        this.ClearValue( DataGridControl.ConnectionStatePropertyKey );
-      }
-      else
-      {
-        this.SetValue( DataGridControl.ConnectionStatePropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region ConnectionError ReadOnly Dependency Property
-
-    private static readonly DependencyPropertyKey ConnectionErrorPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ConnectionError",
-      typeof( object ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty ConnectionErrorProperty = DataGridControl.ConnectionErrorPropertyKey.DependencyProperty;
-
-    public object ConnectionError
-    {
-      get
-      {
-        return this.GetValue( DataGridControl.ConnectionErrorProperty );
-      }
-    }
-
-    private void SetConnectionError( object value )
-    {
-      if( value == null )
-      {
-        this.ClearValue( DataGridControl.ConnectionErrorPropertyKey );
-      }
-      else
-      {
-        this.SetValue( DataGridControl.ConnectionErrorPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region DeferInitialLayoutPass Property
-
-    public static readonly DependencyProperty DeferInitialLayoutPassProperty = DependencyProperty.Register(
-      "DeferInitialLayoutPass",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new FrameworkPropertyMetadata( ( bool )false ) );
-
-    public bool DeferInitialLayoutPass
-    {
-      get
-      {
-        return ( bool )this.GetValue( DataGridControl.DeferInitialLayoutPassProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.DeferInitialLayoutPassProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ItemsSourcePropertyDescriptions Internal Property
-
-    internal PropertyDescriptionRouteDictionary ItemsSourcePropertyDescriptions
-    {
-      get
-      {
-        return m_itemsSourcePropertyDescriptions;
-      }
-    }
-
-    private readonly PropertyDescriptionRouteDictionary m_itemsSourcePropertyDescriptions = new PropertyDescriptionRouteDictionary();
-
-    #endregion
-
-    #region ItemPropertyMap Internal Property
-
-    internal DataGridItemPropertyMap ItemPropertyMap
-    {
-      get
-      {
-        return m_itemPropertyMap;
-      }
-    }
-
-    private readonly DataGridItemPropertyMap m_itemPropertyMap = new DataGridItemPropertyMap();
-
-    #endregion
-
-    #region AreDetailsFlatten Internal Property
-
-    internal bool AreDetailsFlatten
-    {
-      get
-      {
-        var view = this.GetView();
-        if( view == null )
-          return false;
-
-        var viewType = view.GetType();
-        if( viewType != m_areDetailsFlattenCache.Key )
-        {
-          var attributes = viewType.GetCustomAttributes( typeof( MasterDetailLayoutAttribute ), true );
-          var flatten = ( attributes != null )
-                     && ( attributes.Length > 0 )
-                     && ( ( ( MasterDetailLayoutAttribute )attributes[ 0 ] ).MasterDetailLayoutMode == MasterDetailLayoutMode.Flatten );
-
-          m_areDetailsFlattenCache = new KeyValuePair<Type, bool>( viewType, flatten );
-        }
-
-        return m_areDetailsFlattenCache.Value;
-      }
-    }
-
-    private KeyValuePair<Type, bool> m_areDetailsFlattenCache;
-
-    #endregion
-
-    #region GridUniqueName Property
-
-    internal string GridUniqueName
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region TemplateApplied Event
-
-    internal event EventHandler TemplateApplied;
-
-    #endregion
-
-    #region DetailsChanged Event
-
-    internal event EventHandler DetailsChanged;
-
-    private void OnDetailsChanged( object sender, EventArgs e )
-    {
-      var handler = this.DetailsChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( sender, e );
-    }
-
-    #endregion
-
-    #region DeletingSelectedItems Event
-
-    public static readonly RoutedEvent DeletingSelectedItemsEvent = EventManager.RegisterRoutedEvent(
-      "DeletingSelectedItems",
-      RoutingStrategy.Bubble,
-      typeof( CancelRoutedEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event CancelRoutedEventHandler DeletingSelectedItems
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.DeletingSelectedItemsEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.DeletingSelectedItemsEvent, value );
-      }
-    }
-
-    protected virtual void OnDeletingSelectedItems( CancelRoutedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    #endregion
-
-    #region SelectedItemsDeleted Event
-
-    public static readonly RoutedEvent SelectedItemsDeletedEvent = EventManager.RegisterRoutedEvent(
-      "SelectedItemsDeleted",
-      RoutingStrategy.Bubble,
-      typeof( RoutedEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event RoutedEventHandler SelectedItemsDeleted
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.SelectedItemsDeletedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.SelectedItemsDeletedEvent, value );
-      }
-    }
-
-    protected virtual void OnSelectedItemsDeleted()
-    {
-      this.RaiseEvent( new RoutedEventArgs( DataGridControl.SelectedItemsDeletedEvent, this ) );
-    }
-
-    #endregion
-
-    #region SelectionChanged Event
-
-    public static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(
-      "SelectionChanged",
-      RoutingStrategy.Bubble,
-      typeof( DataGridSelectionChangedEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event DataGridSelectionChangedEventHandler SelectionChanged
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.SelectionChangedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.SelectionChangedEvent, value );
-      }
-    }
-
-    protected virtual void OnSelectionChanged( DataGridSelectionChangedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseSelectionChanged( DataGridSelectionChangedEventArgs e )
-    {
-      this.OnSelectionChanged( e );
-    }
-
-    #endregion
-
-    #region SelectionChanging Event
-
-    public static readonly RoutedEvent SelectionChangingEvent = EventManager.RegisterRoutedEvent(
-      "SelectionChanging",
-      RoutingStrategy.Bubble,
-      typeof( DataGridSelectionChangingEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event DataGridSelectionChangingEventHandler SelectionChanging
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.SelectionChangingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.SelectionChangingEvent, value );
-      }
-    }
-
-    protected virtual void OnSelectionChanging( DataGridSelectionChangingEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseSelectionChanging( DataGridSelectionChangingEventArgs e )
-    {
-      using( m_inhibitPreviewGotKeyboardFocus.Set() )
-      {
-        this.OnSelectionChanging( e );
-      }
-    }
-
-    #endregion
-
-    #region DeletingSelectedItemError Event
-
-    public static readonly RoutedEvent DeletingSelectedItemErrorEvent = EventManager.RegisterRoutedEvent(
-      "DeletingSelectedItemError",
-      RoutingStrategy.Bubble,
-      typeof( DeletingSelectedItemErrorRoutedEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event DeletingSelectedItemErrorRoutedEventHandler DeletingSelectedItemError
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.DeletingSelectedItemErrorEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.DeletingSelectedItemErrorEvent, value );
-      }
-    }
-
-    protected virtual void OnDeletingSelectedItemError( DeletingSelectedItemErrorRoutedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    #endregion
-
-    #region CurrentChanging Event
-
-    public static readonly RoutedEvent CurrentChangingEvent = EventManager.RegisterRoutedEvent(
-      "CurrentChanging",
-      RoutingStrategy.Bubble,
-      typeof( DataGridCurrentChangingEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event DataGridCurrentChangingEventHandler CurrentChanging
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.CurrentChangingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.CurrentChangingEvent, value );
-      }
-    }
-
-    protected virtual void OnCurrentChanging( DataGridCurrentChangingEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseCurrentChanging( DataGridCurrentChangingEventArgs e )
-    {
-      this.OnCurrentChanging( e );
-    }
-
-    #endregion
-
-    #region CurrentChanged Event
-
-    public static readonly RoutedEvent CurrentChangedEvent = EventManager.RegisterRoutedEvent(
-      "CurrentChanged",
-      RoutingStrategy.Bubble,
-      typeof( DataGridCurrentChangedEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event DataGridCurrentChangedEventHandler CurrentChanged
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.CurrentChangedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.CurrentChangedEvent, value );
-      }
-    }
-
-    protected virtual void OnCurrentChanged( DataGridCurrentChangedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseCurrentChanged( DataGridCurrentChangedEventArgs e )
-    {
-      this.OnCurrentChanged( e );
-    }
-
-    #endregion
-
-    #region SortDirectionChanging Event
-
-    public static readonly RoutedEvent SortDirectionChangingEvent = EventManager.RegisterRoutedEvent(
-      "SortDirectionChanging",
-      RoutingStrategy.Bubble,
-      typeof( ColumnSortDirectionChangingEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event ColumnSortDirectionChangingEventHandler SortDirectionChanging
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.SortDirectionChangingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.SortDirectionChangingEvent, value );
-      }
-    }
-
-    protected virtual void OnSortDirectionChanging( ColumnSortDirectionChangingEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseSortDirectionChanging( ColumnSortDirectionChangingEventArgs e )
-    {
-      this.OnSortDirectionChanging( e );
-    }
-
-    #endregion
-
-    #region GroupCollapsing Event
-
-    public static readonly RoutedEvent GroupCollapsingEvent = EventManager.RegisterRoutedEvent(
-      "GroupCollapsing",
-      RoutingStrategy.Bubble,
-      typeof( GroupExpansionChangingEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event GroupExpansionChangingEventHandler GroupCollapsing
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.GroupCollapsingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.GroupCollapsingEvent, value );
-      }
-    }
-
-    protected virtual void OnGroupCollapsing( GroupExpansionChangingEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseGroupCollapsing( GroupExpansionChangingEventArgs e )
-    {
-      this.OnGroupCollapsing( e );
-    }
-
-    #endregion
-
-    #region GroupCollapsed Event
-
-    public static readonly RoutedEvent GroupCollapsedEvent = EventManager.RegisterRoutedEvent(
-      "GroupCollapsed",
-      RoutingStrategy.Bubble,
-      typeof( GroupExpansionChangedEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event GroupExpansionChangedEventHandler GroupCollapsed
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.GroupCollapsedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.GroupCollapsedEvent, value );
-      }
-    }
-
-    protected virtual void OnGroupCollapsed( GroupExpansionChangedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseGroupCollapsed( GroupExpansionChangedEventArgs e )
-    {
-      this.OnGroupCollapsed( e );
-    }
-
-    #endregion
-
-    #region GroupExpanding Event
-
-    public static readonly RoutedEvent GroupExpandingEvent = EventManager.RegisterRoutedEvent(
-      "GroupExpanding",
-      RoutingStrategy.Bubble,
-      typeof( GroupExpansionChangingEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event GroupExpansionChangingEventHandler GroupExpanding
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.GroupExpandingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.GroupExpandingEvent, value );
-      }
-    }
-
-    protected virtual void OnGroupExpanding( GroupExpansionChangingEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseGroupExpanding( GroupExpansionChangingEventArgs e )
-    {
-      this.OnGroupExpanding( e );
-    }
-
-    #endregion
-
-    #region GroupExpanded Event
-
-    public static readonly RoutedEvent GroupExpandedEvent = EventManager.RegisterRoutedEvent(
-      "GroupExpanded",
-      RoutingStrategy.Bubble,
-      typeof( GroupExpansionChangedEventHandler ),
-      typeof( DataGridControl ) );
-
-    public event GroupExpansionChangedEventHandler GroupExpanded
-    {
-      add
-      {
-        base.AddHandler( DataGridControl.GroupExpandedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( DataGridControl.GroupExpandedEvent, value );
-      }
-    }
-
-    protected virtual void OnGroupExpanded( GroupExpansionChangedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    internal void RaiseGroupExpanded( GroupExpansionChangedEventArgs e )
-    {
-      this.OnGroupExpanded( e );
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    private static void OnFlowDirectionPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( self == null )
-        return;
-
-      self.CustomItemContainerGenerator.ResetGeneratorContent();
-    }
-
-    private void OnDataGridCollectionView_PropertyChanged( DataGridCollectionViewBase sender, PropertyChangedEventArgs e )
-    {
-      Debug.Assert( sender != null );
-      Debug.Assert( e != null );
-
-      var propertyName = e.PropertyName;
-
-      if( string.IsNullOrEmpty( propertyName ) || ( propertyName == DataGridCollectionViewBase.RootGroupPropertyName ) )
-      {
-        this.SetValue( DataGridControl.StatContextPropertyKey, sender.RootGroup );
-      }
-    }
-
-    private void OnDataGridDetailDescriptionsChanged( DataGridDetailDescriptionCollection sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( sender == null )
-        return;
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Reset:
-        case NotifyCollectionChangedAction.Replace:
-        case NotifyCollectionChangedAction.Remove:
-        case NotifyCollectionChangedAction.Add:
-         break;
-
-        case NotifyCollectionChangedAction.Move:
-          //Don't care about the move. 
-          break;
-
-        default:
-          break;
-      }
-    }
-
-    private static void OnGroupStyleSelectorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      throw new NotSupportedException( "GroupStyles are not supported by the DataGridControl." );
-    }
-
-    private static void GroupStyle_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action == NotifyCollectionChangedAction.Add )
-      {
-        throw new NotSupportedException( "GroupStyles are not supported by the DataGridControl." );
-      }
-    }
-
-    #endregion
-
-    #region Drag Management
-
-    public static readonly DependencyProperty AllowDragProperty = DependencyProperty.Register(
-      "AllowDrag",
-      typeof( bool ),
-      typeof( DataGridControl ),
-      new UIPropertyMetadata( false, new PropertyChangedCallback( DataGridControl.OnAllowDragPropertyChanged ) ) );
-
-    public bool AllowDrag
-    {
-      get
-      {
-        return ( bool )GetValue( DataGridControl.AllowDragProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.AllowDragProperty, value );
-      }
-    }
-
-    private static void OnAllowDragPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DataGridControl;
-      if( ( self == null ) || ( ( bool )e.NewValue ) )
-        return;
-    }
-
-    internal bool UseDragBehavior
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    internal void InitializeDragPostion( MouseEventArgs e )
-    {
-      if( !this.UseDragBehavior )
-        return;
-
-      m_initialDragPosition = e.GetPosition( this );
-    }
-
-    internal void DoDrag( MouseEventArgs e )
-    {
-      return;
-    }
-
-    internal void ResetDragDataObject()
-    {
-      m_dragDataObject = null;
-      m_initialDragPosition = null;
-    }
-
-    internal IDisposable InhibitDrag()
-    {
-      return m_inhibitDrag.Set();
-    }
-
-    private void PrepareDragDataObject( MouseEventArgs e )
-    {
-      if( !this.UseDragBehavior )
-        return;
-
-      try
-      {
-        new UIPermission( UIPermissionClipboard.AllClipboard ).Demand();
-
-        m_dragDataObject = ClipboardExporterBase.CreateDataObject( this );
-      }
-      catch( SecurityException )
-      {
-        throw;
-      }
-    }
-
-    private IDataObject m_dragDataObject; // = null;
-    private Nullable<Point> m_initialDragPosition; // = null;
-    private readonly AutoResetFlag m_inhibitDrag = AutoResetFlagFactory.Create( false );
-
-    #endregion
-
-    #region VIEWBASE METHODS
-
-    private void View_FixedHeadersCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      ObservableCollection<DataTemplate> collection = ( ObservableCollection<DataTemplate> )sender;
-      Panel panel = this.FixedHeadersHostPanel;
-
-      if( panel != null )
-      {
-        DataGridControl.RefreshFixedHeaderFooter( this, panel, collection );
-      }
-    }
-    private void View_FixedFootersCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      ObservableCollection<DataTemplate> collection = ( ObservableCollection<DataTemplate> )sender;
-      Panel panel = this.FixedFootersHostPanel;
-
-      if( panel != null )
-      {
-        DataGridControl.RefreshFixedHeaderFooter( this, panel, collection );
-      }
-    }
-
-    private void View_ThemeChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-
-      // We need to reevaluate the CurrentContext when it is a detail context since the details are cleared and recreated when the theme changes and no update is
-      // made to the current item itself. We dispatch it with a high priority in order to be sure it is executed before a potential BringIntoView of the current item.
-      if( this.CurrentContext != this.DataGridContext )
-      {
-        this.Dispatcher.BeginInvoke( new Action( delegate ()
-        {
-          this.UpdateCurrentContextOnThemeChanged( this.CurrentContext );
-        } ), DispatcherPriority.Normal );
-      }
-
-      var view = this.GetView();
-
-      this.SaveDataGridContextState( this.DataGridContext, true, int.MaxValue );
-
-      this.ClearFixedHostPanels();
-
-      if( this.ThemeChanged != null )
-      {
-        this.ThemeChanged( this, EventArgs.Empty );
-      }
-
-      // Reset the size states since we do not want to apply old size states to a new view/new container style.
-      this.DataGridContext.ClearSizeStates();
-
-      // Reset the flag
-      this.ForceGeneratorReset = false;
-
-      var oldTemplate = this.Template;
-
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( DataGridControl ) );
-
-      var newTemplate = this.Template;
-
-      this.ClearValue( DataGridControl.ParentDataGridControlPropertyKey );
-      this.SetValue( DataGridControl.ParentDataGridControlPropertyKey, this );
-
-      // When a null Theme is set or the new Theme is the already the applied System Theme, we detect if the
-      // template changed after setting the DefaultStyleKey to refresh the FixedHeaders and FixedFooters
-      if( oldTemplate == newTemplate )
-      {
-        this.ResetFixedRegions();
-      }
-
-      // Make sure the current item is into view.
-      this.DelayBringIntoViewAndFocusCurrent( DispatcherPriority.Render, AutoScrollCurrentItemSourceTriggers.ThemeChanged );
-    }
-
-    /// <summary>
-    /// Calling this method will enable the grid's current view to be styled.
-    /// If any implicit Style exits, it will be immediately applied.
-    /// </summary>
-    private void InvalidateViewStyle()
-    {
-      this.AddLogicalChild( this.View );
-    }
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The ViewBindingContext property is obsolete and has been replaced by the DataGridControl.DataGridContext attached property.", false )]
-    public object ViewBindingContext
-    {
-      get
-      {
-        return this.GetView();
-      }
-    }
-
-    internal Views.ViewBase GetView()
-    {
-      return this.View;
-    }
-
-    private Views.ViewBase GetDefaultView()
-    {
-      if( m_defaultView == null )
-      {
-        m_defaultView = new TableflowView();
-      }
-
-      return m_defaultView;
-    }
-
-    #endregion
-
-    #region FOCUS
-
-    internal bool IsSetFocusInhibited
-    {
-      get
-      {
-        return m_inhibitSetFocus.IsSet;
-      }
-    }
-
-    internal bool SettingFocusOnCell
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.SettingFocusOnCell ];
-      }
-      private set
-      {
-        m_flags[ ( int )DataGridControlFlags.SettingFocusOnCell ] = value;
-      }
-    }
-
-    internal static bool SetFocusUIElementHelper( UIElement toFocus )
-    {
-      if( toFocus == null )
-        return false;
-
-      try
-      {
-        if( toFocus.Focus() )
-          return true;
-      }
-      catch
-      {
-      }
-
-      if( toFocus.IsKeyboardFocusWithin )
-        return true;
-
-      UIElement childToFocus = DataGridControl.FindFirstFocusableChild( toFocus );
-
-      if( childToFocus == null )
-        return false;
-
-      try
-      {
-        return childToFocus.Focus();
-      }
-      catch
-      {
-        return false;
-      }
-    }
-
-    internal static UIElement FindFirstFocusableChild( UIElement reference )
-    {
-      UIElement retval = null;
-
-      int childCount = VisualTreeHelper.GetChildrenCount( reference );
-
-      for( int i = 0; i < childCount; i++ )
-      {
-        UIElement element = VisualTreeHelper.GetChild( reference, i ) as UIElement;
-
-        if( ( element != null ) && ( element.Visibility == Visibility.Visible ) )
-        {
-          if( ( element.Focusable == true ) && ( KeyboardNavigation.GetIsTabStop( element ) == true ) )
-          {
-            retval = element;
-          }
-
-          if( retval == null )
-          {
-            retval = FindFirstFocusableChild( element );
-          }
-        }
-
-        if( retval != null )
-        {
-          break;
-        }
-      }
-
-      return retval;
-    }
-
-    internal void QueueSetFocusHelper( bool forceFocus )
-    {
-      if( m_queueSetFocus != null )
-        return;
-
-      m_queueSetFocus = this.Dispatcher.BeginInvoke( DispatcherPriority.Loaded,
-        new DelayedSetFocusHelperHandler( this.DelayedSetFocusHelper ), forceFocus, new object[] { true } );
-    }
-
-    internal bool SetFocusHelper( UIElement itemContainer, ColumnBase column, bool forceFocus, bool preserveEditorFocus )
-    {
-      return this.SetFocusHelper( itemContainer, column, forceFocus, preserveEditorFocus, false );
-    }
-
-    internal bool SetFocusHelper( UIElement itemContainer, ColumnBase column, bool forceFocus, bool preserveEditorFocus, bool preventMakeVisibleIfCellFocused )
-    {
-      if( ( itemContainer == null ) || m_inhibitSetFocus.IsSet )
-        return false;
-
-      //There is an identified weakness with the IsKeyboardFocusWithin property where it cannot tell if the focus is within a Popup which is within the element
-      //This has been identified, and only the places where it caused problems were fixed... This comment is only here to remind developpers of the flaw
-      if( ( !this.IsKeyboardFocusWithin ) && ( !this.IsKeyboardFocused ) && ( !forceFocus ) )
-        return false;
-
-#if DEBUG
-      DataGridContext itemContainerDataGridContext = DataGridControl.GetDataGridContext( itemContainer );
-      Debug.Assert( itemContainerDataGridContext != null );
-      Debug.Assert( ( column == null ) || ( itemContainerDataGridContext.Columns.Contains( column ) ) );
-#endif
-
-      var toFocus = default( UIElement );
-
-      var row = Row.FromContainer( itemContainer );
-      var preventMakeVisibleDisposable = default( IDisposable );
-
-      try
-      {
-        if( row != null )
-        {
-          //ColumnManagerRow and derived classes should not be focused
-          if( row.IsUnfocusable )
-            return false;
-
-          var cell = default( Cell );
-          if( column != null )
-          {
-            cell = row.Cells[ column ];
-
-            // The cell must be in VisualTree to be able to get the focus, else, .Focus() will always return false
-            if( cell != null )
-            {
-              cell.EnsureInVisualTree();
-
-              if( preventMakeVisibleIfCellFocused )
-              {
-                preventMakeVisibleDisposable = cell.InhibitMakeVisible();
-              }
-            }
-          }
-
-          if( ( row.IsBeingEdited ) && ( cell != null ) )
-          {
-            if( ( cell.IsBeingEdited ) && ( preserveEditorFocus ) )
-            {
-              //Obtain the CellEditor's Focus Scope
-              toFocus = Cell.GetCellFocusScope( cell );
-
-              //If there was none defined
-              if( toFocus == null )
-              {
-                //obtain the first focusable child into the template
-                toFocus = DataGridControl.FindFirstFocusableChild( cell );
-              }
-            }
-
-            if( toFocus == null )
-            {
-              toFocus = cell;
-            }
-
-            var currentFocusIsInsideCell = ( cell != Keyboard.FocusedElement ) && ( TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, cell ) );
-
-            // If the focus is already within the Cell to focus, there is noting to do.  The item to focus should be the Keyboard focused element - hence, already focused.
-            // Verify cell.IsBeingEdited to prevent the focus to stay on the editor when in fact the editing process is being canceled (pressing ESC).
-            if( ( currentFocusIsInsideCell ) && ( preserveEditorFocus ) && ( cell.IsBeingEdited ) )
-              return true;
-          }
-          else if( ( row.NavigationBehavior == NavigationBehavior.RowOnly ) || ( cell == null ) )
-          {
-            toFocus = row.RowFocusRoot;
-
-            if( toFocus == null )
-            {
-              toFocus = row;
-            }
-
-            if( ( row.NavigationBehavior == NavigationBehavior.RowOrCell ) && ( row.IsSelected ) )
-            {
-              toFocus.Focusable = true;
-            }
-          }
-          else
-          {
-            toFocus = cell;
-
-            var currentFocusIsInsideCell = ( cell != Keyboard.FocusedElement ) && ( TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, cell ) );
-
-            //If the focus is already within the Cell to focus, then don't touch a thing.  It means the item to focus should be the Keyboard focused element - Already focused
-            if( ( currentFocusIsInsideCell ) && ( preserveEditorFocus ) )
-              return true;
-          }
-        }
-        else
-        {
-          toFocus = itemContainer;
-
-          if( TreeHelper.IsDescendantOf( Keyboard.FocusedElement as DependencyObject, toFocus ) )
-            return true;
-        }
-
-        // If setting the focus on a row fails, we must try to focus the item container in case the target row is not the topmost container,
-        // i.e. a StatRow that is contained in a a GroupHeaderControl.
-        if( ( toFocus != itemContainer ) && DataGridControl.SetFocusUIElementHelper( toFocus ) )
-          return true;
-
-        return DataGridControl.SetFocusUIElementHelper( itemContainer );
-      }
-      finally
-      {
-        if( preventMakeVisibleDisposable != null )
-        {
-          preventMakeVisibleDisposable.Dispose();
-          preventMakeVisibleDisposable = null;
-        }
-      }
-    }
-
-    private void DelayedSetFocusHelper( bool forceFocus, bool preserveEditorFocus )
-    {
-      DataGridContext currentContext = this.CurrentContext;
-
-      if( currentContext == null )
-        return;
-
-      this.SettingFocusOnCell = ( currentContext.CurrentCell != null );
-
-      try
-      {
-        UIElement element = currentContext.GetContainerFromItem( currentContext.InternalCurrentItem ) as UIElement;
-
-        using( m_selectionChangerManager.PushUpdateSelectionSource( SelectionManager.UpdateSelectionSource.None ) )
-        {
-          this.SetFocusHelper( element, currentContext.CurrentColumn, forceFocus, preserveEditorFocus );
-        }
-      }
-      finally
-      {
-        this.SettingFocusOnCell = false;
-        m_queueSetFocus = null;
-      }
-    }
-
-    #endregion
-
-    #region BRING INTO VIEW
-
-    internal bool IsBringIntoViewDelayed
-    {
-      get
-      {
-        var itemsHost = this.ItemsHost as DataGridItemsHost;
-
-        return ( itemsHost != null )
-            && ( itemsHost.DelayBringIntoView );
-      }
-    }
-
-    internal IDisposable SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers trigger )
-    {
-      return m_inhibitAutoScroll.SetRestriction( trigger );
-    }
-
-    internal IDisposable InhibitQueueBringIntoView()
-    {
-      return m_inhibitBringIntoView.Set();
-    }
-
-    internal IDisposable InhibitSetFocus()
-    {
-      return m_inhibitSetFocus.Set();
-    }
-
-    internal void DelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers trigger )
-    {
-      this.DelayBringIntoViewAndFocusCurrent( DispatcherPriority.DataBind, trigger );
-    }
-
-    private void DelayBringIntoViewAndFocusCurrent( DispatcherPriority priority, AutoScrollCurrentItemSourceTriggers trigger )
-    {
-      if( ( m_queueBringIntoView != null ) || m_inhibitBringIntoView.IsSet || m_inhibitSetFocus.IsSet || !this.IsBringIntoViewAllowed( trigger ) )
-        return;
-
-      m_queueBringIntoView = this.QueueBringIntoView( priority );
-
-      //if the operation is not inhibited
-      if( m_queueBringIntoView != null )
-      {
-        //register to the DispatcherOperation completed event
-        m_queueBringIntoView.Completed += new EventHandler( BringIntoView_Completed );
-      }
-    }
-
-    private DispatcherOperation QueueBringIntoView( DispatcherPriority priority )
-    {
-      Debug.Assert( !m_inhibitBringIntoView.IsSet );
-
-      return this.Dispatcher.BeginInvoke( priority, new GenericHandler( this.QueueBringIntoViewHelper ) );
-    }
-
-    private bool QueueBringIntoViewHelper()
-    {
-      var dataGridContext = this.CurrentContext;
-      if( dataGridContext == null )
-        return false;
-
-      var currentItem = dataGridContext.InternalCurrentItem;
-      if( currentItem == null )
-        return false;
-
-      return this.BringItemIntoViewHelper( dataGridContext, currentItem );
-    }
-
-    public bool BringItemIntoView( object item )
-    {
-      return this.BringItemIntoViewHelper( this.DataGridContext, item );
-    }
-
-    internal bool BringItemIntoViewHelper( DataGridContext dataGridContext, object item )
-    {
-      //this is a protection in case the Template is incomplete or not realized yet.
-      var itemsHost = this.ItemsHost;
-      if( itemsHost == null )
-        return false;
-
-      // It is possible that a BringIntoView was queued before an operation that will
-      // detach the ItemsHost of the DataGridControl and we want to avoid to call 
-      // ICustomVirtualizingPanel.BringIntoView in this situation.
-      var itemsHostDataGridContext = DataGridControl.GetDataGridContext( itemsHost );
-      if( itemsHostDataGridContext == null )
-        return false;
-
-      // We don't want to call BringIntoView directly on the container if a layout pass
-      // is scheduled.
-      if( !this.IsBringIntoViewDelayed )
-      {
-        // If a container exists, call bring into view on it!
-        var container = dataGridContext.GetContainerFromItem( item ) as FrameworkElement;
-        if( container != null )
-        {
-          container.BringIntoView();
-
-          //flag the function as being successful
-          return true;
-        }
-      }
-
-      // The container does not exist, it is not yet realized or the action is delayed.
-
-      // If we are not virtualizing any items, return.
-      // The call to SetFocusHelper when the BringIntoView completes will call a FrameworkElement BringIntoView
-      // which will cause the ScrollViewer to bring the item into view approprietly.
-      if( ( this.ScrollViewer != null ) && ( !this.ScrollViewer.CanContentScroll ) )
-        return false;
-
-      var customPanel = itemsHost as ICustomVirtualizingPanel;
-      if( customPanel == null )
-        return false;
-
-
-      int index = this.GetGlobalGeneratorIndexFromItem( null, item );
-
-      if( index != -1 )
-      {
-        //call the special function to bring an index into view.
-        customPanel.BringIntoView( index );
-        return true;
-      }
-
-      return false;
-    }
-
-    internal bool IsBringIntoViewAllowed( AutoScrollCurrentItemSourceTriggers trigger )
-    {
-      if( trigger == AutoScrollCurrentItemSourceTriggers.None )
-        return false;
-
-      var source = ( ~m_inhibitAutoScroll.Restrictions & trigger );
-      if( source == AutoScrollCurrentItemSourceTriggers.None )
-        return false;
-
-      var options = this.AutoScrollCurrentItem;
-
-      switch( source )
-      {
-        case AutoScrollCurrentItemSourceTriggers.Editing:
-        case AutoScrollCurrentItemSourceTriggers.Navigation:
-          return true;
-
-        case AutoScrollCurrentItemSourceTriggers.CurrentItemChanged:
-        case AutoScrollCurrentItemSourceTriggers.CurrentColumnChanged:
-        case AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged:
-        case AutoScrollCurrentItemSourceTriggers.SelectionChanged:
-        case AutoScrollCurrentItemSourceTriggers.ColumnsCollectionChanged:
-          return DataGridControl.IsSet( options, AutoScrollCurrentItemTriggers.CurrentChanged );
-
-        case AutoScrollCurrentItemSourceTriggers.SortChanged:
-          return DataGridControl.IsSet( options, AutoScrollCurrentItemTriggers.SortChanged );
-
-        case AutoScrollCurrentItemSourceTriggers.GroupChanged:
-          return DataGridControl.IsSet( options, AutoScrollCurrentItemTriggers.GroupChanged );
-
-        case AutoScrollCurrentItemSourceTriggers.FocusChanged:
-          return DataGridControl.IsSet( options, AutoScrollCurrentItemTriggers.FocusChanged );
-
-        case AutoScrollCurrentItemSourceTriggers.ItemsSourceChanged:
-          return DataGridControl.IsSet( options, AutoScrollCurrentItemTriggers.ItemsSourceChanged );
-
-        case AutoScrollCurrentItemSourceTriggers.ViewChanged:
-          return DataGridControl.IsSet( options, AutoScrollCurrentItemTriggers.ViewChanged );
-
-        case AutoScrollCurrentItemSourceTriggers.ThemeChanged:
-          return DataGridControl.IsSet( options, AutoScrollCurrentItemTriggers.ThemeChanged );
-      }
-
-      return false;
-    }
-
-    private void BringIntoView_Completed( object sender, EventArgs e )
-    {
-      m_queueBringIntoView.Completed -= new EventHandler( BringIntoView_Completed );
-      bool successful = ( bool )m_queueBringIntoView.Result;
-      m_queueBringIntoView = null;
-
-      if( successful )
-      {
-        this.QueueSetFocusHelper( false );
-      }
-      else if( this.IsKeyboardFocusWithin )
-      {
-        //The restore current and the bringintoview failed, give the focus back to the DataGridControl (safe handling of focus).
-        this.ForceFocus( this.ScrollViewer );
-      }
-    }
-
-    private static bool IsSet( AutoScrollCurrentItemTriggers source, AutoScrollCurrentItemTriggers comparand )
-    {
-      return ( ( source & comparand ) == comparand );
-    }
-
-    #endregion
-
-    #region COMMANDS
-
-    private void OnExpandGroupCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-
-      var group = e.Parameter as CollectionViewGroup;
-      if( group == null )
-        return;
-
-      if( this.DataGridContext.IsGroupExpanded( group, false ) == false )
-      {
-        e.CanExecute = true;
-      }
-    }
-
-    protected virtual void OnExpandGroupExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      var group = e.Parameter as CollectionViewGroup;
-      if( group == null )
-        return;
-
-      this.DataGridContext.ExpandGroup( group );
-    }
-
-    private void OnCollapseGroupCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-
-      var group = e.Parameter as CollectionViewGroup;
-      if( group == null )
-        return;
-
-      if( this.DataGridContext.IsGroupExpanded( group, false ) == true )
-      {
-        e.CanExecute = true;
-      }
-    }
-
-    protected virtual void OnCollapseGroupExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      var group = e.Parameter as CollectionViewGroup;
-      if( group == null )
-        return;
-
-      this.DataGridContext.CollapseGroup( group );
-    }
-
-    private void OnToggleGroupCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-
-      var group = e.Parameter as CollectionViewGroup;
-      if( group == null )
-        return;
-
-      e.CanExecute = this.DataGridContext.IsGroupExpanded( group, false ).HasValue;
-    }
-
-    protected virtual void OnToggleGroupExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      var group = e.Parameter as CollectionViewGroup;
-      if( group == null )
-        return;
-
-      this.DataGridContext.ToggleGroupExpansion( group );
-    }
-
-    private void OnSelectAllCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.SelectionModeToUse != SelectionMode.Single );
-    }
-
-    private void OnSelectAllExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      if( this.SelectionModeToUse == SelectionMode.Single )
-        return;
-
-      this.UpdateLayout();
-
-      SelectAllVisitor selectAllVisitor = new SelectAllVisitor();
-      DataGridContext originContext = e.Parameter as DataGridContext;
-
-      if( originContext == null )
-      {
-        originContext = this.DataGridContext;
-      }
-
-      this.SelectionChangerManager.Begin();
-
-      try
-      {
-        bool visitWasStopped;
-
-        ( ( IDataGridContextVisitable )originContext ).AcceptVisitor(
-          0, int.MaxValue, selectAllVisitor, DataGridContextVisitorType.DataGridContext, out visitWasStopped );
-      }
-      finally
-      {
-        this.SelectionChangerManager.End( true, false );
-      }
-    }
-
-    private bool CopyCanExecute()
-    {
-      try
-      {
-        new UIPermission( UIPermissionClipboard.AllClipboard ).Demand();
-        return ( this.ClipboardExporters.Count > 0 ) && ( this.SelectedContexts.Count > 0 );
-      }
-      catch( SecurityException )
-      {
-        return false;
-      }
-    }
-
-    private void OnCopyCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = this.CopyCanExecute();
-    }
-
-    protected virtual void OnCopyExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      if( !this.CopyCanExecute() )
-        return;
-
-      try
-      {
-        IDataObject copyDataObject = ClipboardExporterBase.CreateDataObject( this );
-
-        if( copyDataObject != null )
-          Clipboard.SetDataObject( copyDataObject, true );
-      }
-      catch( SecurityException )
-      {
-      }
-    }
-
-    private void OnDeleteCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      foreach( DataGridContext dataGridContext in this.SelectedContexts )
-      {
-        if( ( !dataGridContext.IsDeleteCommandEnabled ) || ( dataGridContext.SelectedItems.Count == 0 ) )
-          continue;
-
-        DataGridCollectionViewBase dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-        // If we already have a DataGridCollectionView, no need to look for an IList source.
-        IList list = ( dataGridCollectionViewBase == null ) ? ItemsSourceHelper.TryGetIList( dataGridContext.ItemsSourceCollection ) : null;
-
-        if( ( dataGridCollectionViewBase != null ) || ( ( list != null ) && DataGridControl.IsRemoveAllowedForDeleteCommand( list ) ) )
-        {
-          // Ensure that at least on item can be deleted.
-          foreach( object item in dataGridContext.SelectedItems )
-          {
-            if( dataGridCollectionViewBase != null )
-            {
-              if( dataGridCollectionViewBase.Contains( item ) )
-              {
-                e.CanExecute = true;
-                return;
-              }
-            }
-            else if( list != null )
-            {
-              if( list.Contains( item ) )
-              {
-                e.CanExecute = true;
-                return;
-              }
-            }
-          }
-        }
-      }
-
-      e.CanExecute = false;
-    }
-
-    protected virtual void OnDeleteExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      CancelRoutedEventArgs args = new CancelRoutedEventArgs( DataGridControl.DeletingSelectedItemsEvent, this );
-      this.OnDeletingSelectedItems( args );
-
-      if( args.Cancel )
-        return;
-
-      // Copy the selected item in a temp hashtable.
-      List<KeyValuePair<DataGridContext, object[]>> selectedItemList = new List<KeyValuePair<DataGridContext, object[]>>();
-
-      for( int i = m_selectedContexts.Count - 1; i >= 0; i-- )
-      {
-        DataGridContext selectedContext = m_selectedContexts[ i ];
-        IList<object> sourceSelectedItems = selectedContext.SelectedItems;
-        object[] clonedSelectedItems = new object[ sourceSelectedItems.Count ];
-        sourceSelectedItems.CopyTo( clonedSelectedItems, 0 );
-        selectedItemList.Add( new KeyValuePair<DataGridContext, object[]>( selectedContext, clonedSelectedItems ) );
-      }
-
-      bool raiseItemDeleted = false;
-
-      // Delete the selected item
-      foreach( KeyValuePair<DataGridContext, object[]> keyValuePair in selectedItemList )
-      {
-        DataGridContext dataGridContext = keyValuePair.Key;
-        object[] selectedItems = keyValuePair.Value;
-
-        if( ( !dataGridContext.IsDeleteCommandEnabled ) || ( selectedItems.Length == 0 ) )
-          continue;
-
-        DataGridCollectionViewBase dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-        // If we already have a DataGridCollectionView, no need to look for an IList source.
-        IList list = ( dataGridCollectionViewBase == null ) ? ItemsSourceHelper.TryGetIList( dataGridContext.ItemsSourceCollection ) : null;
-
-        if( ( dataGridCollectionViewBase != null ) || ( ( list != null ) && DataGridControl.IsRemoveAllowedForDeleteCommand( list ) ) )
-        {
-          foreach( object item in selectedItems )
-          {
-            bool retry = false;
-
-            do
-            {
-              try
-              {
-                int itemIndex;
-
-                if( dataGridCollectionViewBase != null )
-                {
-                  itemIndex = dataGridCollectionViewBase.IndexOf( item );
-
-                  if( itemIndex != -1 )
-                  {
-                    dataGridCollectionViewBase.RemoveAt( itemIndex );
-                  }
-                }
-                else if( list != null )
-                {
-                  itemIndex = list.IndexOf( item );
-
-                  if( itemIndex != -1 )
-                  {
-                    list.RemoveAt( itemIndex );
-                  }
-                }
-
-                retry = false;
-                raiseItemDeleted = true;
-              }
-              catch( Exception ex )
-              {
-                DeletingSelectedItemErrorRoutedEventArgs deletingItemErrorArgs =
-                    new DeletingSelectedItemErrorRoutedEventArgs( item, ex, DataGridControl.DeletingSelectedItemErrorEvent, this );
-
-                this.OnDeletingSelectedItemError( deletingItemErrorArgs );
-
-                switch( deletingItemErrorArgs.Action )
-                {
-                  case DeletingSelectedItemErrorAction.Abort:
-                    return;
-
-                  default:
-                    retry = ( deletingItemErrorArgs.Action == DeletingSelectedItemErrorAction.Retry );
-                    break;
-                }
-              }
-            }
-            while( retry );
-          }
-        }
-      }
-
-      if( raiseItemDeleted )
-      {
-        this.OnSelectedItemsDeleted();
-      }
-    }
-
-    private void OnRefreshCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.IsRefreshCommandEnabled ) && ( this.Items != null ) && ( this.Items.SourceCollection is ICollectionView );
-    }
-
-    protected virtual void OnRefreshExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      Debug.Assert( this.IsRefreshCommandEnabled );
-
-      if( this.Items != null )
-      {
-        ICollectionView collectionView = this.Items.SourceCollection as ICollectionView;
-
-        if( collectionView != null )
-        {
-          collectionView.Refresh();
-        }
-      }
-    }
-
-    #endregion
-
-    #region SOURCE HANDLING
-
-    private void ProcessDelayedItemsSourceChanged()
-    {
-      var dataGridContext = this.DataGridContext;
-
-      if( this.ShouldSynchronizeCurrentItem )
-      {
-        var currentItem = this.Items.CurrentItem;
-        var currentItemIndex = this.Items.CurrentPosition;
-
-        if( ( this.Items.IsCurrentAfterLast ) || ( this.Items.IsCurrentBeforeFirst ) )
-        {
-          currentItemIndex = -1;
-        }
-
-        dataGridContext.SetCurrent( currentItem, null, currentItemIndex, null, false, false, this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.ItemsSourceChanged );
-
-        if( !this.SynchronizeSelectionWithCurrent )
-        {
-          m_selectionChangerManager.Begin();
-
-          try
-          {
-            if( ( this.SelectionUnit == SelectionUnit.Row ) && ( !this.Items.IsCurrentAfterLast ) && ( !this.Items.IsCurrentBeforeFirst ) && ( currentItemIndex != -1 ) )
-            {
-              m_selectionChangerManager.SelectJustThisItem( dataGridContext, currentItemIndex, currentItem );
-            }
-            else
-            {
-              m_selectionChangerManager.UnselectAll();
-            }
-          }
-          finally
-          {
-            m_selectionChangerManager.End( false, false );
-          }
-        }
-      }
-
-      var columnManager = dataGridContext.ColumnManager;
-
-      using( columnManager.DeferUpdate( new ColumnHierarchyManager.UpdateOptions( TableView.GetFixedColumnCount( dataGridContext ), true ) ) )
-      {
-        ItemsSourceHelper.ResetPropertyDescriptions( m_itemsSourcePropertyDescriptions, m_itemPropertyMap, this, this.ItemsSource );
-        ItemsSourceHelper.CleanUpColumns( this.Columns, false );
-
-        if( this.AutoCreateColumns )
-        {
-          ItemsSourceHelper.CreateColumnsFromPropertyDescriptions( this.DataGridContext.ColumnManager,
-                                                                   this.DefaultCellEditors,
-                                                                   m_itemsSourcePropertyDescriptions,
-                                                                   this.AutoCreateForeignKeyConfigurations );
-        }
-
-        var dataGridCollectionView = this.ItemsSource as DataGridCollectionView;
-        if( dataGridCollectionView != null )
-        {
-          PropertyChangedEventManager.AddListener( dataGridCollectionView, this, string.Empty );
-          this.SetValue( DataGridControl.StatContextPropertyKey, dataGridCollectionView.RootGroup );
-
-          ProxyCollectionRefreshEventManager.AddListener( dataGridCollectionView, this );
-          ProxyGroupDescriptionsChangedEventManager.AddListener( dataGridCollectionView, this );
-          ProxySortDescriptionsChangedEventManager.AddListener( dataGridCollectionView, this );
-        }
-        else
-        {
-          this.ClearValue( DataGridControl.StatContextPropertyKey );
-        }
-
-        var virtualizingCollectionView = this.ItemsSource as DataGridVirtualizingCollectionViewBase;
-
-        // Keep if the source is bound to DataGridVirtualizingCollectionView to avoid preserving ContainerSizeState to avoid memory leaks
-        this.IsBoundToDataGridVirtualizingCollectionViewBase = ( virtualizingCollectionView != null );
-
-        if( this.IsBoundToDataGridVirtualizingCollectionViewBase )
-        {
-          ConnectionStateChangedEventManager.AddListener( virtualizingCollectionView, this );
-          ConnectionErrorChangedEventManager.AddListener( virtualizingCollectionView, this );
-        }
-
-        columnManager.Initialize( this );
-      }
-
-      dataGridContext.NotifyItemsSourceChanged();
-      this.OnItemsSourceChangeCompleted();
-    }
-
-    [Obsolete( "The AddingNewDataItem event is obsolete and has been replaced by the DataGridCollectionView.CreatingNewItem and InitializingNewItem events.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public event EventHandler<AddingNewDataItemEventArgs> AddingNewDataItem;
-
-    [Obsolete( "The AddingNewDataItem event is obsolete and has been replaced by the DataGridCollectionView.CreatingNewItem and InitializingNewItem events.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    protected internal virtual void OnAddingNewDataItem( AddingNewDataItemEventArgs e )
-    {
-      if( this.AddingNewDataItem != null )
-      {
-        this.AddingNewDataItem( this, e );
-      }
-    }
-
-    public event EventHandler ItemsSourceChangeCompleted;
-
-    private void OnItemsSourceChangeCompleted()
-    {
-      var handler = this.ItemsSourceChangeCompleted;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    protected override void OnItemsSourceChanged( IEnumerable oldValue, IEnumerable newValue )
-    {
-      base.OnItemsSourceChanged( oldValue, newValue );
-
-      if( m_inhibitItemsCollectionChanged != null )
-      {
-        m_inhibitItemsCollectionChanged.Dispose();
-        m_inhibitItemsCollectionChanged = null;
-      }
-
-      ScrollViewer scrollViewer = this.ScrollViewer;
-      if( scrollViewer != null )
-      {
-        ScrollViewerHelper.ResetScrollPositions( scrollViewer );
-      }
-
-      //This section is to detect automatically the ItemsSourceName
-      DataView dataView = newValue as DataView;
-      if( dataView == null )
-      {
-        CollectionView colView = newValue as CollectionView;
-        if( colView != null )
-        {
-          dataView = colView.SourceCollection as DataView;
-        }
-      }
-
-      //Refresh the detectedName
-      //If the DataSource is directly or indirectly a DataView, then use the TableName.
-      object oldItemsSourceName = this.ItemsSourceName;
-      m_detectedName = ( dataView != null ) ? dataView.Table.TableName : null;
-
-      if( !object.Equals( this.ItemsSourceName, oldItemsSourceName ) )
-      {
-        this.OnPropertyChanged( "ItemsSourceName" );
-      }
-
-      DataGridContext localContext = this.DataGridContext;
-      this.UpdateCurrentRowInEditionCellStates( null, null );
-      localContext.ClearSizeStates();
-
-      if( m_initCount != 0 )
-      {
-        this.ItemsSourceChangedDelayed = true;
-      }
-      else
-      {
-        this.ProcessDelayedItemsSourceChanged();
-      }
-
-      DataGridCollectionView dataGridCollectionView = oldValue as DataGridCollectionView;
-
-      if( dataGridCollectionView != null )
-      {
-        PropertyChangedEventManager.RemoveListener( dataGridCollectionView, this, string.Empty );
-
-        ProxyCollectionRefreshEventManager.RemoveListener( dataGridCollectionView, this );
-        ProxyGroupDescriptionsChangedEventManager.RemoveListener( dataGridCollectionView, this );
-        ProxySortDescriptionsChangedEventManager.RemoveListener( dataGridCollectionView, this );
-
-        m_dataGridContextsStateDictionary = null;
-      }
-
-      DataGridVirtualizingCollectionViewBase virtualizingCollectionView = oldValue as DataGridVirtualizingCollectionViewBase;
-
-      if( virtualizingCollectionView != null )
-      {
-        ConnectionStateChangedEventManager.RemoveListener( virtualizingCollectionView, this );
-        ConnectionErrorChangedEventManager.RemoveListener( virtualizingCollectionView, this );
-      }
-
-      // We must refresh the FixedRegions to call Clear/Prepare Container for IDataGridItemContainer elements
-      this.ResetFixedRegions();
-
-      // Reset the flag
-      this.ForceGeneratorReset = false;
-    }
-
-    private object OnCoerceItemsSource( object value )
-    {
-      // Ensure to EndEdit the currently edited container
-      var currentContext = this.CurrentContext;
-      var currentItem = currentContext.InternalCurrentItem;
-      if( currentItem != null )
-      {
-        // Use Row.FromContainer to ensure Rows in Header/Footers are returned correctly
-        var row = Row.FromContainer( currentContext.GetContainerFromItem( currentItem ) );
-        if( ( row != null ) && ( row.IsBeingEdited ) )
-        {
-          row.CancelEdit();
-        }
-      }
-
-      if( this.ItemsSource != value )
-      {
-        if( m_inhibitItemsCollectionChanged == null )
-        {
-          m_inhibitItemsCollectionChanged = this.Items.DeferRefresh();
-        }
-      }
-      else if( m_inhibitItemsCollectionChanged != null )
-      {
-        m_inhibitItemsCollectionChanged.Dispose();
-        m_inhibitItemsCollectionChanged = null;
-      }
-
-      return value;
-    }
-
-    private static object ItemsSourceCoerceCallback( DependencyObject sender, object value )
-    {
-      return ( ( DataGridControl )sender ).OnCoerceItemsSource( value );
-    }
-
-    #endregion
-
-    #region SAVE/RESTORE STATE
-
-    internal void SaveDataGridContextState( DataGridContext dataGridContext, bool handleExpandedItems, int maxGroupLevel )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      Debug.Assert( !dataGridContext.IsRestoringState );
-
-      if( dataGridContext.IsSavingState )
-        return;
-
-      dataGridContext.IsSavingState = true;
-
-      try
-      {
-        WeakDataGridContextKey weakDataGridContextKey = new WeakDataGridContextKey( dataGridContext );
-
-        if( m_dataGridContextsStateDictionary == null )
-        {
-          m_dataGridContextsStateDictionary = new Dictionary<WeakDataGridContextKey, SaveRestoreDataGridContextStateVisitor>();
-        }
-        else if( m_dataGridContextsStateDictionary.ContainsKey( weakDataGridContextKey ) )
-        {
-          // Already a state saved for this context.  Don't overwrite it.
-          Debug.WriteLineIf( this.DebugSaveRestore, "Already a state saved for WeakDataGridContextKey: " + weakDataGridContextKey.GetHashCode().ToString() );
-          return;
-        }
-
-        SaveRestoreDataGridContextStateVisitor saveRestoreDataGridContextStateVisitor = new SaveRestoreDataGridContextStateVisitor( handleExpandedItems, maxGroupLevel, false );
-
-        try
-        {
-          saveRestoreDataGridContextStateVisitor.SaveState( ( IDataGridContextVisitable )dataGridContext );
-
-          m_dataGridContextsStateDictionary.Add( weakDataGridContextKey, saveRestoreDataGridContextStateVisitor );
-
-          Debug.WriteLineIf( this.DebugSaveRestore, "SAVING DataGridContext state for WeakDataGridContextKey: " + weakDataGridContextKey.GetHashCode().ToString() + " SAVED!" );
-        }
-        catch
-        {
-          Debug.WriteLineIf( this.DebugSaveRestore, "SAVING DataGridContext state for WeakDataGridContextKey: " + weakDataGridContextKey.GetHashCode().ToString() + " FAILED!" );
-        }
-      }
-      finally
-      {
-        dataGridContext.IsSavingState = false;
-      }
-    }
-
-    internal void RestoreDataGridContextState( DataGridContext dataGridContext )
-    {
-      if( ( m_dataGridContextsStateDictionary == null ) || ( m_dataGridContextsStateDictionary.Count == 0 ) )
-        return;
-
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      // A call to RestoreDataGridContextState can be made while processing a save or a restore
-      // of a DataGridContext because the Generator forces the call in EnsureNodeTreeCreated
-      // when public methods are accessed. If we are saving, already restoring or pending restoring
-      // we ignore this call
-      if( dataGridContext.IsSavingState
-          || dataGridContext.IsDeferRestoringState
-          || dataGridContext.IsRestoringState )
-        return;
-
-      WeakDataGridContextKey weakDataGridContextKey = new WeakDataGridContextKey( dataGridContext );
-      SaveRestoreDataGridContextStateVisitor saveRestoreDataGridContextStateVisitor;
-
-      if( m_dataGridContextsStateDictionary.TryGetValue( weakDataGridContextKey, out saveRestoreDataGridContextStateVisitor ) )
-      {
-        try
-        {
-          dataGridContext.IsRestoringState = true;
-
-          // Restoring this dataGridContext state's will expand sub items that should be expanded.
-          // Their expansion will make the customItemGenerator generate sub detailNodes, which in turn will try 
-          // to be restored to their previous state.
-          saveRestoreDataGridContextStateVisitor.RestoreState( ( IDataGridContextVisitable )dataGridContext );
-          Debug.WriteLineIf( this.DebugSaveRestore, "RESTORING DataGridContext state for WeakDataGridContextKey: " + weakDataGridContextKey.GetHashCode().ToString() + " RESTORED!" );
-        }
-        catch
-        {
-          Debug.WriteLineIf( this.DebugSaveRestore, "RESTORING DataGridContext state for WeakDataGridContextKey: " + weakDataGridContextKey.GetHashCode().ToString() + " FAILED!" );
-        }
-        finally
-        {
-          m_dataGridContextsStateDictionary.Remove( weakDataGridContextKey );
-          dataGridContext.IsRestoringState = false;
-        }
-      }
-      else
-      {
-        Debug.WriteLineIf( this.DebugSaveRestore, "Cannot Restore. No state saved for WeakDataGridContextKey: " + weakDataGridContextKey.GetHashCode().ToString() );
-      }
-    }
-
-    private void OnDataGridCollectionView_ProxyCollectionRefresh( DataGridCollectionView sender, EventArgs e )
-    {
-      if( ( sender == null ) || ( sender.GroupDescriptions.Count <= 0 ) )
-        return;
-
-      var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
-      if( targetDataGridContext != null )
-      {
-        this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
-      }
-    }
-
-    private void OnDataGridCollectionView_ProxyGroupDescriptionsChanged( DataGridCollectionView sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( sender == null )
-        return;
-
-      var maxGroupLevelToSave = -1;
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          {
-            // Only save/restore group states when there was already at least one GroupDescription.
-            maxGroupLevelToSave = e.NewStartingIndex - 1;
-            break;
-          }
-
-        case NotifyCollectionChangedAction.Move:
-          {
-            // Only save/restore the state if there's other groups located before the moved group old/new index.
-            // Else, do not save, since we already know that we won't be able to find any match when restoring.
-            maxGroupLevelToSave = Math.Min( e.OldStartingIndex, e.NewStartingIndex ) - 1;
-            break;
-          }
-
-        case NotifyCollectionChangedAction.Remove:
-          {
-            // No need to save/restore groups states if there won't be any group left.
-            maxGroupLevelToSave = e.OldStartingIndex - 1;
-            break;
-          }
-
-        case NotifyCollectionChangedAction.Replace:
-          {
-            maxGroupLevelToSave = e.NewStartingIndex - 1;
-            break;
-          }
-
-        case NotifyCollectionChangedAction.Reset:
-          {
-            // Don't save.
-            break;
-          }
-      }
-
-      if( maxGroupLevelToSave > -1 )
-      {
-        var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
-        if( targetDataGridContext != null )
-        {
-          this.SaveDataGridContextState( targetDataGridContext, false, maxGroupLevelToSave );
-        }
-      }
-    }
-
-    private void OnDataGridCollectionView_ProxySortDescriptionsChanged( DataGridCollectionView sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( ( sender == null ) || ( sender.GroupDescriptions.Count <= 0 ) )
-        return;
-
-      var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
-      if( targetDataGridContext != null )
-      {
-        this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
-      }
-    }
-
-    private void OnDataGridCollectionView_ProxyAutoFilterValuesChanged( DataGridCollectionView sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( ( sender == null ) || ( sender.GroupDescriptions.Count <= 0 ) )
-        return;
-
-      var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
-      if( targetDataGridContext != null )
-      {
-        this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
-      }
-    }
-
-    private void OnDataGridCollectionView_ProxyApplyingFilterCriterias( DataGridCollectionView sender, EventArgs e )
-    {
-      if( ( sender == null ) || ( sender.GroupDescriptions.Count <= 0 ) )
-        return;
-
-      var targetDataGridContext = DataGridContext.SafeGetDataGridContextForDataGridCollectionView( this.DataGridContext, sender );
-      if( targetDataGridContext != null )
-      {
-        this.SaveDataGridContextState( targetDataGridContext, false, int.MaxValue );
-      }
-    }
-
-    #endregion
-
-    #region VIRTUALIZING COLLECTION VIEW SUPPORT
-
-    private void OnDataGridVirtualizingCollectionViewBase_ConnectionStateChanged( DataGridVirtualizingCollectionViewBase sender, EventArgs e )
-    {
-      if( sender == null )
-        return;
-
-      this.SetConnectionState( sender.ConnectionState );
-    }
-
-    private void OnDataGridVirtualizingCollectionViewBase_ConnectionErrorChanged( DataGridVirtualizingCollectionViewBase sender, EventArgs e )
-    {
-      if( sender == null )
-        return;
-
-      this.SetConnectionError( sender.ConnectionError );
-    }
-
-    #endregion
-
-    #region EDITING
-
-    public void BeginEdit()
-    {
-      this.BeginEdit( this.CurrentContext.InternalCurrentItem );
-    }
-
-    public void BeginEdit( object item )
-    {
-      DataGridControl.BeginEditHelper( this.DataGridContext, item );
-    }
-
-    internal static void BeginEditHelper( DataGridContext dataGridContext, object item )
-    {
-      if( item == null )
-        return;
-
-      var dataGridControl = dataGridContext.DataGridControl;
-      if( dataGridControl.IsBeingEdited )
-        return;
-
-      if( !dataGridContext.IsContainingItem( item ) )
-        throw new InvalidOperationException( "An attempt was made to call the BeginEdit method of an item that is not part of the specified context." );
-
-      var container = dataGridContext.GetContainerFromItem( item );
-
-      //if the item is realized, then I could call the BeginEdit() directly on the container.
-      if( container != null )
-      {
-        var row = Row.FromContainer( container );
-        if( row != null )
-        {
-          row.BeginEdit();
-        }
-
-        //not a row, then not editable.
-      }
-      //if the container is not realized, then I need to set things up so that when the container is realized, it's gonna resume edition.
-      else
-      {
-        dataGridContext.DataGridControl.UpdateCurrentRowInEditionCellStates( null, item );
-        dataGridContext.DataGridControl.BringItemIntoView( item );
-      }
-    }
-
-    public void EndEdit()
-    {
-      DataGridControl.EndEditHelper( this.DataGridContext );
-    }
-
-    internal static void EndEditHelper( DataGridContext dataGridContext )
-    {
-      var dataGridControl = dataGridContext.DataGridControl;
-      if( !dataGridControl.IsBeingEdited )
-        return;
-
-      if( !dataGridContext.IsContainingItem( dataGridContext.DataGridControl.CurrentItemInEdition ) )
-        throw new InvalidOperationException( "An attempt was made to call the EndEdit method of an item that is not part of the specified context." );
-
-      var container = dataGridContext.GetContainerFromItem( dataGridControl.m_currentItemInEdition );
-
-      //if the item is realized, then I could call the EndEdit() directly on the container.
-      if( container != null )
-      {
-        var row = Row.FromContainer( container );
-        if( row != null )
-        {
-          row.EndEdit();
-        }
-
-        //not a row, then not editable.
-      }
-      //if the container is not realized, then set things up so that when the container is realized, editing will resume.
-      else
-      {
-        DataGridControl.ProcessUnrealizedEndEdit( dataGridContext );
-      }
-    }
-
-    public void CancelEdit()
-    {
-      DataGridControl.CancelEditHelper( this.DataGridContext );
-    }
-
-    internal static void CancelEditHelper( DataGridContext dataGridContext )
-    {
-      var dataGridControl = dataGridContext.DataGridControl;
-      if( !dataGridControl.IsBeingEdited )
-        return;
-
-      if( !dataGridContext.IsCurrent )
-        throw new InvalidOperationException( "An attempt was made to call the CancelEdit method on a DataGridContext that is not current." );
-
-      var container = dataGridContext.GetContainerFromItem( dataGridControl.m_currentItemInEdition );
-
-      //if the item is realized, then I could call the CancelEdit() directly on the container.
-      if( container != null )
-      {
-        var row = Row.FromContainer( container );
-        if( row != null )
-        {
-          row.CancelEdit();
-        }
-
-        //not a row, then not editable.
-      }
-      //if the container is not realized, then I need to clear the parameters that indicate that the row is being edited.
-      else
-      {
-        dataGridControl.UpdateCurrentRowInEditionCellStates( null, null );
-      }
-    }
-
-    private static void ProcessUnrealizedEndEdit( DataGridContext dataGridContext )
-    {
-      Row row;
-
-      object currentItemInEdition = dataGridContext.DataGridControl.m_currentItemInEdition;
-
-      //first, determine if the item currently in edition is an Item or a [Group]Header/Footer
-      if( dataGridContext.Items.Contains( currentItemInEdition ) )
-      {
-        //the item currently in edition is a data item.
-        DependencyObject container = dataGridContext.DataGridControl.CreateContainerForItem();
-        Debug.Assert( container != null, "CreateContainerForItem() returned null" );
-
-        row = container as Row;
-      }
-      else
-      {
-        DataTemplate template = DataGridControl.GetTemplateForItem( currentItemInEdition );
-        Debug.Assert( template != null, "DataTemplate for [Group]Header/Footer is null" );
-
-        HeaderFooterItem headerFooterItem = new HeaderFooterItem();
-        headerFooterItem.ContentTemplate = template;
-        headerFooterItem.Measure( new Size( double.PositiveInfinity, double.PositiveInfinity ) );
-
-        row = headerFooterItem.AsVisual() as Row;
-      }
-
-      if( row != null )
-      {
-        // Ensure to set the DataGridContext on the Container for the 
-        // PrepareItemContainer to correctly fetch the DataGridContext
-        DataGridControl.SetDataGridContext( row, dataGridContext );
-        dataGridContext.DataGridControl.PrepareItemContainer( row, currentItemInEdition );
-
-        try
-        {
-          row.EndEdit();
-        }
-        finally
-        {
-          dataGridContext.DataGridControl.ClearItemContainer( row, currentItemInEdition );
-        }
-      }
-    }
-
-    // Used to initialize/clear Column.CurrentRowInEditionCellState for each cell in the row passed as parameter
-    internal void UpdateCurrentRowInEditionCellStates( Row newCurrentItemContainer, object newCurrentItemInEdition )
-    {
-      if( newCurrentItemInEdition != m_currentItemInEdition )
-      {
-        var currentRowInEdition = default( Row );
-
-        if( m_currentItemInEdition != null )
-        {
-          // Get the container for m_currentItemInEdition
-          currentRowInEdition = Row.FromContainer( this.CurrentContext.GetContainerFromItem( m_currentItemInEdition ) );
-
-          if( newCurrentItemInEdition != null )
-          {
-            if( ( currentRowInEdition != null ) && ( currentRowInEdition.IsBeingEdited ) )
-              throw new InvalidOperationException( "An attempt was made to place a row in edit mode while another row is being edited." );
-          }
-        }
-
-        // The newCurrentItemContainer is null
-        if( newCurrentItemContainer == null )
-        {
-          if( currentRowInEdition != null )
-          {
-            // We must clear the edition state of the old Row in edition
-            foreach( Cell cell in currentRowInEdition.CreatedCells )
-            {
-              var parentColumn = cell.ParentColumn;
-              if( parentColumn == null )
-                continue;
-
-              parentColumn.CurrentRowInEditionCellState = null;
-            }
-          }
-        }
-
-        m_currentItemInEdition = newCurrentItemInEdition;
-        m_currentRowInEditionState = new RowState();
-
-        this.UpdateIsBeingEdited();
-      }
-
-      // It may occur that the newCurrentItemInEdition was set for a
-      // Container that is currently out of view, so the newCurrentItemContainer
-      // was null at this time. We must then ensure the CellStates are 
-      // create for the newCurrentItemContainer when not null even if 
-      // newCurrentItemInEdition == m_currentItemInEdition
-      if( newCurrentItemContainer != null )
-      {
-        foreach( Cell cell in newCurrentItemContainer.CreatedCells )
-        {
-          var parentColumn = cell.ParentColumn;
-          if( parentColumn == null )
-            continue;
-
-          var cellState = new CellState();
-          cellState.SetContentBeforeRowEdition( cell.Content );
-
-          parentColumn.CurrentRowInEditionCellState = cellState;
-        }
-      }
-    }
-
-    #endregion
-
-    #region SELECTION/CURRENT
-
-    internal bool UseDragToSelectBehavior
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    internal bool IsSetCurrentInProgress
-    {
-      get
-      {
-        return m_flags[ ( int )DataGridControlFlags.IsSetCurrentInProgress ];
-      }
-      set
-      {
-        m_flags[ ( int )DataGridControlFlags.IsSetCurrentInProgress ] = value;
-      }
-    }
-
-    internal void QueueClearCurrentColumn( object currentItem )
-    {
-      if( m_queueClearCurrentColumn != null )
-      {
-        m_queueClearCurrentColumn.Abort();
-        m_queueClearCurrentColumn = null;
-      }
-
-      m_queueClearCurrentColumn = this.Dispatcher.BeginInvoke( System.Windows.Threading.DispatcherPriority.DataBind,
-                                                               new ParametrizedGenericHandler( ClearCurrentColumnHandler ), currentItem );
-    }
-
-    internal void AddToSelectedContexts( DataGridContext context )
-    {
-      if( !m_selectedContexts.Contains( context ) )
-        m_selectedContexts.Add( context );
-    }
-
-    internal void RemoveFromSelectedContexts( DataGridContext context )
-    {
-      m_selectedContexts.Remove( context );
-    }
-
-    private void ClearCurrentColumnHandler( object oldCurrentItem )
-    {
-      try
-      {
-        DataGridContext currentDataGridContext = this.CurrentContext;
-
-        //the old data item was nescessarily the current item since only the current item can be in edit mode.
-        if( currentDataGridContext.InternalCurrentItem == oldCurrentItem )
-        {
-          try
-          {
-            currentDataGridContext.SetCurrent( oldCurrentItem, null, null, null, false, false,
-                                               this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.Editing );
-          }
-          catch( DataGridException )
-          {
-            // We swallow the exception if it occurs because of a validation error or Cell was read-only or any other GridException.
-          }
-        }
-      }
-      finally
-      {
-        m_queueClearCurrentColumn = null;
-      }
-    }
-
-    private void UpdateCurrentContextOnThemeChanged( DataGridContext currentContext )
-    {
-      CustomItemContainerGenerator generator = this.CustomItemContainerGenerator;
-
-      // the CurrentContext is the master DataGridContext, and this one will never change
-      if( currentContext == this.DataGridContext )
-        return;
-
-      object newCurrentItem = currentContext.CurrentItem;
-
-      // Try to get the new DataGridContext mathing the old one (containing the old CurrentItem).
-      DataGridContext newCurrentContext = this.UpdateCurrentContextRecursive( this.DataGridContext, currentContext, out newCurrentItem );
-
-      // If it none was found, affect the master DataGridContext
-      if( newCurrentContext == null )
-      {
-        Debug.WriteLine( "Unable to find a matching DataGridContext" );
-        this.SetCurrentDataGridContextHelper( this.DataGridContext );
-      }
-      else
-      {
-        // Affect the newly found DataGridContext
-        this.SetCurrentDataGridContextHelper( newCurrentContext );
-
-        // Set it as current using the old context CurrentItem, CurrentColumn
-        newCurrentContext.SetCurrent( newCurrentItem, null, null, currentContext.CurrentColumn, false, false,
-                                      this.SynchronizeSelectionWithCurrent, AutoScrollCurrentItemSourceTriggers.ThemeChanged );
-      }
-    }
-
-    private DataGridContext UpdateCurrentContextRecursive( DataGridContext parentDataGridContext, DataGridContext oldCurrentDataGridContext, out object newCurrentItem )
-    {
-      if( parentDataGridContext == null )
-      {
-        newCurrentItem = null;
-        return null;
-      }
-
-      foreach( DataGridContext childContext in parentDataGridContext.GetChildContexts() )
-      {
-        if( childContext.SourceDetailConfiguration == oldCurrentDataGridContext.SourceDetailConfiguration )
-        {
-          object oldCurrentItem = oldCurrentDataGridContext.CurrentItem;
-
-          System.Data.DataView dataView = ItemsSourceHelper.TryGetDataViewFromDataGridContext( childContext );
-
-          System.Data.DataRowView oldCurrentDataRowView = oldCurrentItem as System.Data.DataRowView;
-
-          if( ( dataView != null ) && ( oldCurrentDataRowView != null ) )
-          {
-            System.Data.DataRow oldDataRow = oldCurrentDataRowView.Row;
-
-            foreach( System.Data.DataRowView dataRowView in dataView )
-            {
-              if( dataRowView.Row == oldDataRow )
-              {
-                newCurrentItem = dataRowView;
-                return childContext;
-              }
-            }
-          }
-          else
-          {
-            if( childContext.Items.Contains( oldCurrentItem ) )
-            {
-              newCurrentItem = oldCurrentItem;
-              return childContext;
-            }
-          }
-        }
-
-        DataGridContext foundContext = this.UpdateCurrentContextRecursive( childContext, oldCurrentDataGridContext, out newCurrentItem );
-
-        if( foundContext != null )
-          return foundContext;
-      }
-
-      newCurrentItem = null;
-      return null;
-    }
-
-    #endregion
-
-    #region DRAG TO SELECT
-
-    private AutoScrollManager AutoScrollManager
-    {
-      get
-      {
-        return m_autoScrollManager;
-      }
-      set
-      {
-        if( m_autoScrollManager != null )
-        {
-          m_autoScrollManager.AutoScrolled -= this.OnAutoScrollManagerAutoScrolled;
-        }
-
-        m_autoScrollManager = value;
-
-        if( m_autoScrollManager != null )
-        {
-          m_autoScrollManager.AutoScrolled += this.OnAutoScrollManagerAutoScrolled;
-        }
-      }
-    }
-
-    private void OnPreviewMouseDown_DragToSelect( MouseButtonEventArgs e )
-    {
-      if( !this.UseDragToSelectBehavior )
-        return;
-
-      if( e.LeftButton != MouseButtonState.Pressed )
-        return;
-
-      var source = e.OriginalSource as DependencyObject;
-      if( source == null )
-        return;
-
-      var container = DataGridControl.GetContainer( source );
-      var itemContainer = container as IDataGridItemContainer;
-      if( itemContainer == null )
-        return;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( container );
-      if( ( dataGridContext == null ) || ( dataGridContext.DataGridControl != this ) )
-        return;
-
-      m_startDragSelection = false;
-
-      if( container is Row )
-      {
-        m_startDragSelection = ( DataGridVirtualizingPanel.GetItemIndex( container ) >= 0 );
-      }
-    }
-
-    private void OnMouseLeftButtonUp_DragToSelect( MouseButtonEventArgs e )
-    {
-      this.AbortDragSelection();
-    }
-
-    private void OnLostMouseCapture_DragToSelect( MouseEventArgs e )
-    {
-      this.AbortDragSelection();
-    }
-
-    private void OnMouseMove_DragToSelect( MouseEventArgs e )
-    {
-      // Verify if the "Excel like drag selection" should be handled.
-      if( !this.UseDragToSelectBehavior )
-        return;
-
-      if( e.LeftButton != MouseButtonState.Pressed )
-        return;
-
-      if( !this.IsKeyboardFocusWithin )
-        return;
-
-      var autoScrollManager = this.AutoScrollManager;
-      if( autoScrollManager != null )
-      {
-        m_startDragSelection = false;
-
-        // This should happen only on the second mouse move after the mouse down.
-        // The mouse is capture so "MouseMove" and "ButtonUp" events can be handled outside the DataGridControl.
-        if( !this.IsMouseCaptured )
-        {
-          this.CaptureMouse();
-        }
-
-        autoScrollManager.HandleMouseMove( e );
-        e.Handled = this.SelectMouseOverElement();
-      }
-      // This should happen only on the first mouse move after the mouse down, if it was detected that DragSelection should be processed.
-      else if( m_startDragSelection )
-      {
-        m_startDragSelection = false;
-
-        // Before starting the AutoScrollManager, make sure all the conditions that apply in OnPreviewMouseDown_DragToSelect are still valid here.
-        var source = e.OriginalSource as DependencyObject;
-        if( source == null )
-          return;
-
-        var container = DataGridControl.GetContainer( source );
-        var itemContainer = container as IDataGridItemContainer;
-        if( itemContainer == null )
-          return;
-
-        var dataGridContext = DataGridControl.GetDataGridContext( container );
-        if( ( dataGridContext == null ) || ( dataGridContext.DataGridControl != this ) )
-          return;
-
-        autoScrollManager = new AutoScrollManager( this.ScrollViewer );
-        autoScrollManager.Start();
-        this.AutoScrollManager = autoScrollManager;
-      }
-    }
-
-    private void OnAutoScrollManagerAutoScrolled( object sender, EventArgs e )
-    {
-      Debug.Assert( this.UseDragToSelectBehavior );
-      this.SelectMouseOverElement();
-    }
-
-    private void AbortDragSelection()
-    {
-      var autoScrollManager = this.AutoScrollManager;
-      if( autoScrollManager != null )
-      {
-        autoScrollManager.Stop();
-        this.AutoScrollManager = null;
-        this.ReleaseMouseCapture();
-      }
-    }
-
-    private bool SelectMouseOverElement()
-    {
-      var itemsHost = this.ItemsHost;
-      var mousePosition = Mouse.GetPosition( itemsHost );
-      var hitPosition = new Point();
-
-      var width = itemsHost.ActualWidth;
-      var height = itemsHost.ActualHeight;
-
-      //Here, Since we are auto scrolling, the mouse position may be 
-      // out of the bounds of the datagrid. Get the mouse's nearest row or cell.
-      hitPosition.Y = Math.Min( Math.Max( 0d, mousePosition.Y ), height - 1 );
-      hitPosition.X = Math.Min( Math.Max( 0d, mousePosition.X ), width - 1 );
-
-      var targetItem = itemsHost.InputHitTest( hitPosition ) as DependencyObject;
-      if( targetItem == null )
-        return false;
-
-      var container = DataGridControl.GetContainer( targetItem );
-      if( container == null )
-        return false;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( container );
-      if( ( dataGridContext == null ) || ( DataGridContext.DataGridControl != this ) )
-        return false;
-
-      var newPosition = default( SelectionRangePoint );
-
-      var row = container as Row;
-      if( row != null )
-      {
-        var sourceDataItemIndex = DataGridVirtualizingPanel.GetItemIndex( row );
-        if( sourceDataItemIndex < 0 )
-          return false;
-
-        var columnIndex = -1;
-
-        // Dont border finding the cell if we are not in cell selection mode.
-        if( this.SelectionUnit == DataGrid.SelectionUnit.Cell )
-        {
-          var cell = targetItem as Cell;
-          if( ( cell == null ) || ( cell.ParentColumn.DataGridControl != this ) )
-          {
-            cell = Cell.FindFromChild( this, targetItem );
-          }
-
-          if( cell == null )
-          {
-            // If the cell is still null, It may be because the X mouse position was out of bounds
-            // an thus, we should take the first or last visible cell in screen
-            if( mousePosition.X >= 0d && mousePosition.X < itemsHost.Width )
-              return false;
-
-            var columnManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
-            if( columnManager == null )
-              return false;
-
-            var columns = columnManager.GetVisibleFieldNames();
-            if( columns.Count <= 0 )
-              return false;
-
-            var index = ( mousePosition.X < 0 ) ? 0 : columns.Count - 1;
-
-            columnIndex = dataGridContext.Columns[ columns[ index ] ].VisiblePosition;
-          }
-          else
-          {
-            columnIndex = cell.ParentColumn.VisiblePosition;
-          }
-        }
-
-        var item = dataGridContext.GetItemFromContainer( row );
-
-        newPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, item, sourceDataItemIndex, columnIndex );
-      }
-      else
-      {
-        return false;
-      }
-
-      if( newPosition == null )
-        return false;
-
-      m_selectionChangerManager.UpdateSelection( null, newPosition, true, false, SelectionManager.UpdateSelectionSource.MouseMove );
-      return true;
-    }
-
-    #endregion
-
-    public override void OnApplyTemplate()
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl parentGrid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      if( parentGrid == null )
-      {
-        this.SetValue( ParentDataGridControlPropertyKey, this );
-      }
-
-      base.OnApplyTemplate();
-
-      m_scrollViewer = this.Template.FindName( "PART_ScrollViewer", this ) as ScrollViewer;
-      m_dragDropAdornerDecorator = this.Template.FindName( "PART_DragDropAdornerDecorator", this ) as AdornerDecorator;
-
-      this.CustomItemContainerGenerator.InvalidateIsInUse();
-
-      m_itemsHost = null;
-
-      Views.ViewBase view = this.GetView();
-
-      if( view.UseDefaultHeadersFooters )
-      {
-        view.InvokeAddDefaultHeadersFooters();
-      }
-
-      // Cache if the view requires to preserve container size
-      this.ViewPreservesContainerSize = view.PreserveContainerSize;
-
-      // Notify the template was reapplied
-      if( this.TemplateApplied != null )
-      {
-        this.TemplateApplied( this, EventArgs.Empty );
-      }
-    }
-
-    public bool ExpandGroup( CollectionViewGroup group )
-    {
-      if( group == null )
-        throw new ArgumentNullException( "group" );
-
-      return this.DataGridContext.ExpandGroup( group );
-    }
-
-    public bool CollapseGroup( CollectionViewGroup group )
-    {
-      if( group == null )
-        throw new ArgumentNullException( "group" );
-
-      return this.DataGridContext.CollapseGroup( group );
-    }
-
-    public bool ToggleGroupExpansion( CollectionViewGroup group )
-    {
-      if( group == null )
-        throw new ArgumentNullException( "group" );
-
-      return this.DataGridContext.ToggleGroupExpansion( group );
-    }
-
-    public bool IsGroupExpanded( CollectionViewGroup group )
-    {
-      if( group == null )
-        throw new ArgumentNullException( "group" );
-
-      return this.DataGridContext.IsGroupExpanded( group );
-    }
-
-    public bool AreDetailsExpanded( object dataItem )
-    {
-      //This function will work only for master items.
-      //In the cases where a Detail item is passed to the function, the function will return false.
-      return this.DataGridContext.AreDetailsExpanded( dataItem );
-    }
-
-    public DataGridContext GetChildContext( object parentItem, string relationName )
-    {
-      return this.DataGridContext.GetChildContext( parentItem, relationName );
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate" )]
-    public IEnumerable<DataGridContext> GetChildContexts()
-    {
-      return this.DataGridContext.GetChildContexts();
-    }
-
-    public DependencyObject GetContainerFromItem( object item )
-    {
-      return this.DataGridContext.GetContainerFromItem( item );
-    }
-
-    public Group GetGroupFromCollectionViewGroup( CollectionViewGroup collectionViewGroup )
-    {
-      return this.DataGridContext.GetGroupFromCollectionViewGroup( collectionViewGroup );
-    }
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public DependencyObject GetContainerFromIndex( int index )
-    {
-      return this.DataGridContext.GetContainerFromIndex( index );
-    }
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public int GetIndexFromContainer( DependencyObject container )
-    {
-      return this.DataGridContext.GetIndexFromContainer( container );
-    }
-
-    public object GetItemFromContainer( DependencyObject container )
-    {
-      return this.DataGridContext.GetItemFromContainer( container );
-    }
-
-    public CollectionViewGroup GetParentGroupFromItem( object item )
-    {
-      return this.DataGridContext.GetParentGroupFromItem( item );
-    }
-
-    public IDisposable DeferColumnsUpdate()
-    {
-      return this.DataGridContext.DeferColumnsUpdate();
-    }
-
-    public bool MoveColumnBefore( ColumnBase current, ColumnBase next )
-    {
-      return this.DataGridContext.MoveColumnBefore( current, next );
-    }
-
-    public bool MoveColumnAfter( ColumnBase current, ColumnBase previous )
-    {
-      return this.DataGridContext.MoveColumnAfter( current, previous );
-    }
-
-    public bool MoveColumnUnder( ColumnBase current, ColumnBase parent )
-    {
-      return this.DataGridContext.MoveColumnUnder( current, parent );
-    }
-
-    [Obsolete( "MoveMergedColumn is obsolete. Use MoveColumnUnder instead." )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public void MoveMergedColumn( ColumnBase columnToMove, ColumnBase parentMergedColumn )
-    {
-      if( !this.MoveColumnUnder( columnToMove, parentMergedColumn ) )
-        throw new InvalidOperationException( "Failed to move the column." );
-    }
-
-    [Obsolete( "MoveMergedColumn is obsolete. Use MoveColumnUnder instead." )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public void MoveMergedColumn( string columnToMove, string parentMergedColumn )
-    {
-      var level = -1;
-      var parentColumn = default( ColumnBase );
-
-      if( level == -1 )
-        throw new ArgumentException( "An attempt was made to use a column that is not part of a MergedHeader.", "parentMergedColumn" );
-
-      ColumnBase childColumn = null;
-      childColumn = this.Columns[ columnToMove ];
-      if( childColumn == null )
-        throw new ArgumentException( "An attempt was made to move an invalid child column to a parent merged column.", "childColumn" );
-
-      if( !this.MoveColumnUnder( childColumn, parentColumn ) )
-        throw new InvalidOperationException( "Failed to move the column." );
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      //By default the measure pass must not be delayed, or if the grid is already loaded or if we are printing.
-      if( ( !this.DeferInitialLayoutPass ) || ( this.IsLoaded )|| ( !m_isFirstTimeLoaded ) )
-        return base.MeasureOverride( constraint );
-
-      return this.GetStartUpSize( constraint );
-    }
-
-    protected override Size ArrangeOverride( Size arrangeBounds )
-    {
-      //By default the measure pass must not be delayed, or if the grid is already loaded or if we are printing.
-      if( ( !this.DeferInitialLayoutPass ) || ( this.IsLoaded ) || ( !m_isFirstTimeLoaded ) )
-        return base.ArrangeOverride( arrangeBounds );
-
-      return arrangeBounds;
-    }
-
-    protected override DependencyObject GetContainerForItemOverride()
-    {
-      return new DataRow();
-    }
-
-    protected override bool IsItemItsOwnContainerOverride( object item )
-    {
-      return ( item is DataRow );
-    }
-
-    protected override void ClearContainerForItemOverride( DependencyObject element, object item )
-    {
-      base.ClearContainerForItemOverride( element, item );
-      FrameworkElement feContainer = element as FrameworkElement;
-
-      if( ( ( feContainer.IsKeyboardFocused ) || ( feContainer.IsKeyboardFocusWithin ) )
-        && ( !this.IsSetFocusInhibited ) )
-      {
-        // If the cleared element contain focus, move the focus on the scrollViewer        
-        this.ForceFocus( this.ScrollViewer );
-      }
-
-      var dataGridItemContainer = element as IDataGridItemContainer;
-      var row = element as Row;
-
-      // Only preserve ContainerSizeState if necessary
-      if( !this.IsBoundToDataGridVirtualizingCollectionViewBase
-          && this.ViewPreservesContainerSize )
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( element );
-
-        //Save the size state of the container (this will do nothing if no size has been set on the item ).
-        dataGridContext.SaveContainerSizeState( item, feContainer );
-      }
-
-      // Try to get the element as a HeaderFooterItem to avoid
-      // calling ClearContainer on a Row inside a HeaderFooterItem.
-      // HeaderFooterItem implements IDataGridItemContainer and we call
-      // ClearContainer on it if not null.
-      var hfi = element as HeaderFooterItem;
-
-      // If element is a HeaderFooterItem, then it cannot be a Row
-      if( hfi != null )
-      {
-        row = Row.FromContainer( hfi );
-      }
-
-      // Special handling case for the Row class when it is not in a HeaderFooterItem
-      if( row != null )
-      {
-        //cancel edit if applicable and preserve state of the row.
-        if( row.IsBeingEdited )
-        {
-          var oldRowEditionState = m_currentRowInEditionState.Clone();
-          var oldColumnsStates = new Dictionary<ColumnBase, CellState>();
-
-          //Debug.Assert( item == m_currentItemInEdition, "The current item being edited on the DataGridControl differs from the one of the currently edited container." );
-
-          // We can use row because there is only one row in edition in the DataGridControl
-          foreach( Cell cell in row.CreatedCells )
-          {
-            var parentColumn = cell.ParentColumn;
-            if( parentColumn == null )
-              continue;
-
-            oldColumnsStates.Add( parentColumn, parentColumn.CurrentRowInEditionCellState.Clone() );
-          }
-
-          try
-          {
-            row.CancelEdit();
-          }
-          catch( InvalidOperationException )
-          {
-            // CancelEdit can throw if we call it when we are in the state of ending the edit process.
-          }
-
-          // We do not clear any thing when the item is its own container.
-          if( !this.IsItemItsOwnContainerOverride( item ) )
-          {
-            // Call the ClearContainer on the correct HeaderFooterItem if not null
-            // to correctly unregister the HeaderFooterItem from the Loaded event 
-            // else directly on the Row
-            if( hfi != null )
-            {
-              ( ( IDataGridItemContainer )hfi ).ClearContainer();
-            }
-            else
-            {
-              ( ( IDataGridItemContainer )row ).ClearContainer();
-            }
-          }
-
-          m_currentRowInEditionState = oldRowEditionState;
-
-          foreach( ColumnBase column in oldColumnsStates.Keys )
-          {
-            column.CurrentRowInEditionCellState = oldColumnsStates[ column ];
-          }
-
-          // Though the row state is preserved, the DataGridControl is not in editing anymore.
-          m_currentItemInEdition = null;
-          this.UpdateIsBeingEdited();
-        }
-        else
-        {
-          // We do not clear any thing when the item is its own container.
-          if( !this.IsItemItsOwnContainerOverride( item ) )
-          {
-            // Call the ClearContainer on the correct HeaderFooterItem if not null
-            // to correctly unregister the HeaderFooterItem from the Loaded event 
-            // else directly on the Row
-            if( hfi != null )
-            {
-              ( ( IDataGridItemContainer )hfi ).ClearContainer();
-            }
-            else
-            {
-              ( ( IDataGridItemContainer )row ).ClearContainer();
-            }
-          }
-        }
-      }
-      else if( dataGridItemContainer != null )
-      {
-        //If the Container is not directly a Row (data item) or if the first visual child of HFI is not a Row ( row header or footer).
-        //then call the ClearContainer on the interface (will catch cases such as GroupHeaderControl ).
-        dataGridItemContainer.ClearContainer();
-      }
-
-      var uiElement = element as UIElement;
-      if( ( uiElement != null ) && ( ( uiElement.IsKeyboardFocusWithin ) || ( uiElement.IsKeyboardFocused ) ) )
-      {
-        // If the element we are cleaning up contains the focus, we ensure to refocus the ScrollViewer to have
-        // the focus on a valid element of the grid.
-        this.DelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers.FocusChanged );
-      }
-    }
-
-    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
-    {
-      base.PrepareContainerForItemOverride( element, item );
-
-      //this is specific to the DataRows from the Original items list... do not want to do that in the Row.PrepareContainer()
-
-      IDataGridItemContainer dataGridItemContainer = element as IDataGridItemContainer;
-      Row row = element as Row;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( element );
-      Debug.Assert( dataGridContext != null );
-
-      if( dataGridItemContainer != null )
-      {
-        dataGridItemContainer.PrepareContainer( dataGridContext, item );
-      }
-
-      //Note: the ItemContainerStyle and ItemContainerStyleSelector will only be applied if the container is a Row or Row-derived object.
-      // Headers, Footers, Group Headers and Group Footers, even if they contains row types will not be affected since its only the "root" container
-      // that matters ( headers and the such are enclosed within a HeaderFooterItem container ).
-
-      if( row != null )
-      {
-        //First, Check if the GroupConfiguration for the container has an ItemContainerStyle defined.
-        GroupConfiguration groupConfig = DataGridControl.GetContainerGroupConfiguration( row );
-        Style itemContainerStyle = null;
-
-        //If there is a GroupConfiguration present, try to use its ItemContainerStyle
-        if( groupConfig != null )
-        {
-          //If an ItemContainerStyle is applied on the GroupConfiguration, I want to force it onto the Container.
-          if( groupConfig.ItemContainerStyle != null )
-          {
-            itemContainerStyle = groupConfig.ItemContainerStyle;
-          }
-          //if no Style but a Selector is present, the same is done.
-          else if( groupConfig.ItemContainerStyleSelector != null )
-          {
-            itemContainerStyle = groupConfig.ItemContainerStyleSelector.SelectStyle( item, row );
-          }
-        }
-
-        //If there is no GroupConfiguration or if there is no ItemContainerStyle defined on it, go look in the DataGridContext
-        if( itemContainerStyle == null )
-        {
-          //If not, Use the DataGridContext to determine the appropriate ItemContainerStyle to be applied to the container
-          DataGridContext containerContext = DataGridControl.GetDataGridContext( row );
-          if( containerContext == null )
-          {
-            //container did not pass by the CustomItemContainerGenerator
-            containerContext = this.DataGridContext;
-          }
-
-          if( containerContext != null )
-          {
-            //If an ItemContainerStyle is applied on the DataGridContext, I want to force it onto the Container.
-            if( containerContext.ItemContainerStyle != null )
-            {
-              itemContainerStyle = containerContext.ItemContainerStyle;
-            }
-            //if no Style but a Selector is present, the same is done.
-            else if( containerContext.ItemContainerStyleSelector != null )
-            {
-              itemContainerStyle = containerContext.ItemContainerStyleSelector.SelectStyle( item, row );
-            }
-          }
-        }
-
-        //If an ItemContainerStyle was found anywhere (GroupConfig or Context), assign it to the container.
-        if( itemContainerStyle != null )
-        {
-          row.Style = itemContainerStyle;
-        }
-        else
-        {
-          //this condition is for Rows that are recycled from an environment where they had and item container style to one that doesn't...
-          if( row.ReadLocalValue( Row.StyleProperty ) != DependencyProperty.UnsetValue )
-          {
-            row.ClearValue( Row.StyleProperty );
-          }
-        }
-
-      } // end if row != null ( data items only)
-
-      //The goal of the next section is to ensure that focus is moved to the appropriate element of the visual tree when the container is being prepared.
-      //This is to ensure that focus will not be left on a control that has been recycled ( and which is no longer the one we want ).
-
-      //This next section I want to perform independently of wether the container is for a [Fixed]Header/Footer, DataItem, Group Header/Footer
-      //as such, I will re-determine if the item is a Row ( this time digging beyond HeaderFooterItem
-
-      // Only restore ContainerSizeState if necessary
-      if( !this.IsBoundToDataGridVirtualizingCollectionViewBase && this.ViewPreservesContainerSize )
-      {
-        //Restore the Size of the item (if there was some special size assigned to the item container previously
-        dataGridContext.RestoreContainerSizeState( item, element as FrameworkElement );
-      }
-
-      // We restore the edit state during the OnApplyTemplate of the Row since the cells are not created before that.
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      base.OnKeyDown( e );
-
-      if( e.Handled )
-        return;
-
-      //Only perform the BringItemIntoView if the item focused is within the host panel! 
-      if( ScrollViewerHelper.IsFocusInElement( this.ItemsHost as FrameworkElement ) )
-      {
-        var currentDataGridContext = this.CurrentContext;
-
-        //ensure that the key pressed is a Keyboard Navigation key
-        switch( e.Key )
-        {
-          //if any of the directional key
-          case Key.Up:
-          case Key.Down:
-          case Key.Left:
-          case Key.Right:
-          case Key.Tab:
-            // Those keys will be handled by Children of the DataGridControl 
-            // if required
-            break;
-
-
-          case Key.Space:
-            {
-              var originalSource = e.OriginalSource as DependencyObject;
-              if( originalSource == null )
-                break;
-
-              var container = DataGridControl.GetContainer( originalSource );
-              if( container == null )
-                break;
-
-              var dataGridContext = DataGridControl.GetDataGridContext( container );
-              if( ( dataGridContext == null ) || ( dataGridContext.DataGridControl != this ) )
-                break;
-
-              var row = container as Row;
-              var newPosition = default( SelectionRangePoint );
-
-              if( row != null )
-              {
-                if( row.IsBeingEdited )
-                  break;
-
-                var cell = Cell.FindFromChildOrSelf( this, originalSource );
-                var item = dataGridContext.GetItemFromContainer( row );
-                var itemIndex = DataGridVirtualizingPanel.GetItemIndex( row );
-                var column = ( cell != null ) ? cell.ParentColumn : null;
-                var columnIndex = ( column != null ) ? column.VisiblePosition : -1;
-
-                newPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, item, itemIndex, columnIndex );
-              }
-              else
-              {
-                break;
-              }
-
-              if( newPosition != null )
-              {
-                var oldPosition = SelectionRangePoint.TryCreateFromCurrent( DataGridControl.GetDataGridContext( container ) );
-
-                m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, true, false, SelectionManager.UpdateSelectionSource.SpaceDown );
-
-                e.Handled = true;
-              }
-            }
-
-            break;
-
-          case Key.LWin:
-          case Key.RWin:
-          case Key.MediaNextTrack:
-          case Key.MediaPlayPause:
-          case Key.MediaPreviousTrack:
-          case Key.MediaStop:
-          case Key.System:
-          case Key.F1:
-          case Key.F2:  // Should be processed as DataGridCommands.BeginEdit
-          case Key.F3:
-          case Key.F4:
-          case Key.F5:
-          case Key.F6:
-          case Key.F7:
-          case Key.F8:
-          case Key.F9:
-          case Key.F10:
-          case Key.F11:
-          case Key.F12:
-          case Key.F13:
-          case Key.F14:
-          case Key.F15:
-          case Key.F16:
-          case Key.F17:
-          case Key.F18:
-          case Key.F19:
-          case Key.F20:
-          case Key.F21:
-          case Key.F22:
-          case Key.F23:
-          case Key.F24:
-          case Key.BrowserBack:
-          case Key.BrowserFavorites:
-          case Key.BrowserForward:
-          case Key.BrowserHome:
-          case Key.BrowserRefresh:
-          case Key.BrowserSearch:
-          case Key.BrowserStop:
-          case Key.CapsLock:
-          case Key.NumLock:
-          case Key.Scroll:
-          case Key.SelectMedia:
-          case Key.PrintScreen:
-          case Key.Pause:
-          case Key.Play:
-          case Key.Apps:
-          case Key.Sleep:
-          case Key.VolumeDown:
-          case Key.VolumeMute:
-          case Key.VolumeUp:
-          case Key.Zoom:
-          case Key.LaunchApplication1:
-          case Key.LaunchApplication2:
-          case Key.LaunchMail:
-          case Key.LeftAlt:
-          case Key.RightAlt:
-          case Key.RightCtrl:
-          case Key.LeftCtrl:
-          case Key.RightShift:
-          case Key.LeftShift:
-          case Key.Delete: // Should be processed by the ApplicationCommands.Delete
-            //do not bring into view in those conditions
-            break;
-
-          //by default, if not a special key, then bring into view the item.
-          default:
-            DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-            break;
-        }
-      }
-    }
-
-    protected override void OnPreviewMouseDown( MouseButtonEventArgs e )
-    {
-      if( m_mouseDownUpdateSelectionSource == null )
-      {
-        m_mouseDownUpdateSelectionSource = this.SelectionChangerManager.PushUpdateSelectionSource( SelectionManager.UpdateSelectionSource.MouseDown );
-      }
-
-      var currentColumn = this.CurrentColumn;
-
-      m_mouseDownSelectionRangePoint = SelectionRangePoint.TryCreateFromCurrent( this.CurrentContext );
-
-      base.OnPreviewMouseDown( e );
-
-      if( e.Handled )
-        return;
-
-      var oldDataGridContext = this.CurrentContext;
-      var oldRow = ( oldDataGridContext == null ) ? null : oldDataGridContext.CurrentRow;
-
-      var source = e.OriginalSource as DependencyObject;
-      if( source == null )
-        return;
-
-      var container = DataGridControl.GetContainer( source );
-      if( container == null )
-        return;
-
-      var newDataGridContext = DataGridControl.GetDataGridContext( container );
-      if( ( newDataGridContext == null ) || ( newDataGridContext.DataGridControl != this ) )
-        return;
-
-      var newRow = Row.FromContainer( container );
-
-      this.OnPreviewMouseDown_DragToSelect( e );
-
-      if( ( oldRow == null ) || ( !oldRow.IsBeingEdited ) || ( newRow == oldRow ) )
-        return;
-
-      var oldCurrentColumn = oldDataGridContext.CurrentColumn;
-
-      bool mouseDownHandled;
-      Row newFocusedRow;
-      ColumnBase newFocusedColumn;
-
-      try
-      {
-        // If the source is reset during the EndEdit, we move the focus temporarely on the ScrollViewer to prevent some issue
-        // when the EndEdit cause a Reset (The ScrollViewer was trying to bring into view the old editing Cell).
-        var focused = this.ForceFocus( this.ScrollViewer );
-        if( !focused )
-          return;
-
-        using( this.InhibitSetFocus() )
-        {
-          oldRow.EndEdit();
-
-          // If the source was reset during the EndEdit, Ensure to relayout right away.
-          // So the mouse down will continue on the new layouted element.
-          this.UpdateLayout();
-
-          IInputElement visualHit = this.InputHitTest( e.GetPosition( this ) );
-          mouseDownHandled = ( visualHit == null ) || ( !object.ReferenceEquals( visualHit, e.OriginalSource ) );
-          newFocusedRow = newRow;
-          newFocusedColumn = currentColumn;
-        }
-      }
-      catch( DataGridException )
-      {
-        // We swallow exception if it occurs because of a validation error or Cell was read-only or any other GridException.
-        mouseDownHandled = true;
-        newFocusedRow = oldRow;
-        newFocusedColumn = oldCurrentColumn;
-      }
-
-      if( mouseDownHandled )
-      {
-        if( m_mouseDownUpdateSelectionSource != null )
-        {
-          m_mouseDownUpdateSelectionSource.Dispose();
-          m_mouseDownUpdateSelectionSource = null;
-        }
-
-        this.SetFocusHelper( newFocusedRow, newFocusedColumn, false, true );
-        e.Handled = true;
-      }
-    }
-
-    protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
-    {
-      if( m_mouseDownUpdateSelectionSource != null )
-      {
-        m_mouseDownUpdateSelectionSource.Dispose();
-        m_mouseDownUpdateSelectionSource = null;
-      }
-
-      base.OnPreviewMouseUp( e );
-
-      if( e.ChangedButton != MouseButton.Left )
-        return;
-
-      var source = e.OriginalSource as DependencyObject;
-      if( source == null )
-        return;
-
-      var container = DataGridControl.GetContainer( source );
-      if( ( container == null ) || ( !container.IsKeyboardFocused && !container.IsKeyboardFocusWithin ) )
-        return;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( container );
-      if( ( dataGridContext == null ) || ( dataGridContext.DataGridControl != this ) )
-        return;
-
-      var row = container as Row;
-      var newPosition = default( SelectionRangePoint );
-      var rowIsBeingEdited = false;
-
-      if( row != null )
-      {
-        var cell = Cell.FindFromChildOrSelf( this, source );
-        if( ( cell != null ) && ( this.SelectionUnit == SelectionUnit.Cell ) && ( !cell.IsKeyboardFocused ) && ( !cell.IsKeyboardFocusWithin ) )
-          return;
-
-        var item = dataGridContext.GetItemFromContainer( row );
-        var itemIndex = DataGridVirtualizingPanel.GetItemIndex( row );
-        var column = ( cell != null ) ? cell.ParentColumn : null;
-        var columnIndex = ( column != null ) ? column.VisiblePosition : -1;
-
-        // If we have an error during the EndEdit that prevent the PreviewMouseDown from occuring  (since we put e.Handled = true if an exception occurs), 
-        // the PreviewMouseUp will not occur, so it is safe to call UpdateSelection().
-        newPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, item, itemIndex, columnIndex );
-        rowIsBeingEdited = row.IsBeingEdited;
-      }
-      else
-      {
-        return;
-      }
-
-      if( newPosition != null )
-      {
-        m_selectionChangerManager.UpdateSelection( m_mouseDownSelectionRangePoint, newPosition, true, rowIsBeingEdited, SelectionManager.UpdateSelectionSource.MouseUp );
-      }
-    }
-
-    protected override void OnMouseLeave( MouseEventArgs e )
-    {
-      if( m_mouseDownUpdateSelectionSource != null )
-      {
-        m_mouseDownUpdateSelectionSource.Dispose();
-        m_mouseDownUpdateSelectionSource = null;
-      }
-
-      base.OnMouseLeave( e );
-    }
-
-    protected override void OnIsKeyboardFocusWithinChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnIsKeyboardFocusWithinChanged( e );
-
-      KeyboardNavigation.SetIsTabStop( this, !( bool )e.NewValue );
-    }
-
-    protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      base.OnPreviewGotKeyboardFocus( e );
-
-      if( e.Handled || m_inhibitPreviewGotKeyboardFocus.IsSet )
-        return;
-
-      var newFocus = e.NewFocus as DependencyObject;
-
-      if( this.NavigationBehavior == NavigationBehavior.None )
-      {
-        if( newFocus != this.ScrollViewer )
-        {
-          e.Handled = true;
-          this.ForceFocus( this.ScrollViewer );
-        }
-        return;
-      }
-
-      if( ( newFocus == this ) || ( newFocus == this.ScrollViewer ) )
-      {
-        var currentDataGridContext = this.CurrentContext;
-        var internalCurrentItem = currentDataGridContext.InternalCurrentItem;
-        var itemUIElement = default( UIElement );
-
-        if( ( internalCurrentItem == null ) && ( currentDataGridContext.Items.Count > 0 ) )
-        {
-          //if InternalCurrentItem is null, then soft-select the first item.
-          internalCurrentItem = currentDataGridContext.Items.GetItemAt( 0 );
-
-          if( internalCurrentItem != null )
-          {
-            using( this.InhibitSetFocus() )
-            {
-              currentDataGridContext.SetCurrent( internalCurrentItem, null, 0, currentDataGridContext.CurrentColumn, false, false, this.SynchronizeSelectionWithCurrent,
-                                                 AutoScrollCurrentItemSourceTriggers.FocusChanged );
-            }
-          }
-        }
-
-        if( internalCurrentItem != null )
-        {
-          //try to fetch the Container for the Internal current item
-          itemUIElement = currentDataGridContext.GetContainerFromItem( internalCurrentItem ) as UIElement;
-
-          //  Special case when the previous element with the focus is now collapsed, the focus must be moved to the ScrollViewer, so the grid is kept focusable. 
-          var focusScrollViewer = ( itemUIElement == null );
-          if( !focusScrollViewer )
-          {
-            var headerFooterItem = itemUIElement as HeaderFooterItem;
-            if( headerFooterItem != null )
-            {
-              focusScrollViewer = headerFooterItem.Visibility == Visibility.Collapsed;
-              if( !focusScrollViewer )
-              {
-                var container = headerFooterItem.Container as UIElement;
-                if( container != null )
-                {
-                  focusScrollViewer = container.Visibility == Visibility.Collapsed;
-                }
-              }
-            }
-          }
-
-          //if container exists, then it's visible (or close to it), try to focus it 
-          if( focusScrollViewer )
-          {
-            currentDataGridContext.DelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers.FocusChanged );
-
-            if( newFocus != this.ScrollViewer )
-            {
-              e.Handled = true;
-              this.ForceFocus( this.ScrollViewer );
-            }
-          }
-          else
-          {
-            e.Handled = true;
-            this.SetFocusHelper( itemUIElement, currentDataGridContext.CurrentColumn, true, true );
-          }
-        }
-        else if( newFocus != this.ScrollViewer )
-        {
-          e.Handled = true;
-          this.ForceFocus( this.ScrollViewer );
-        }
-
-        return;
-      }
-
-      // If the focus was in a popup menu, we don't want to change the selection, so we consider the focus to be outside the grid in that situation.      
-      var oldFocusWasInTheGrid = ( e.OldFocus != null ) && ( TreeHelper.IsDescendantOf( e.OldFocus as DependencyObject, this, false ) );
-      var oldCurrentDataGridContext = this.CurrentContext;
-      var oldRow = default( Row );
-      var oldPosition = default( SelectionRangePoint );
-
-      if( oldCurrentDataGridContext != null )
-      {
-        oldRow = oldCurrentDataGridContext.CurrentRow;
-        oldPosition = SelectionRangePoint.TryCreateFromCurrent( oldCurrentDataGridContext );
-        m_oldColumn = oldCurrentDataGridContext.CurrentCell != null ? new WeakReference( oldCurrentDataGridContext.CurrentCell.ParentColumn ) : m_oldColumn;
-      }
-
-      var newContainer = this.GetLocalContainer( newFocus );
-      var newDataGridContext = ( newContainer == null ) ? null : DataGridControl.GetDataGridContext( newContainer );
-      var newRow = Row.FromContainer( newContainer );
-      var newCell = newFocus as Cell;
-
-      if( ( newCell == null ) || ( newCell.ParentColumn.DataGridControl != this ) )
-      {
-        newCell = Cell.FindFromChild( this, newFocus );
-      }
-
-      var newColumn = ( newCell == null ) ? null : newCell.ParentColumn;
-      var item = ( newContainer == null ) ? null : newDataGridContext.GetItemFromContainer( newContainer );
-      var containerChangedDuringEndEdit = false;
-
-      // Prevent the focus to be moved during the EndEdit since we are changing focus at the moment
-      using( this.InhibitSetFocus() )
-      {
-        if( ( oldRow != null ) && ( oldRow.IsBeingEdited ) )
-        {
-          var oldCell = ( oldCurrentDataGridContext == null ) ? null : oldCurrentDataGridContext.CurrentCell;
-
-          if( oldRow != newRow )
-          {
-            try
-            {
-              var previousNewContainer = newContainer;
-              oldRow.EndEdit();
-
-              // We must refetch the container for the current item in case EndEdit triggers a reset on the CustomItemContainerGenerator
-              // and remap this item to a container other than the one previously fetched
-              this.UpdateLayout();
-
-              newContainer = ( item == null ) ? null : newDataGridContext.GetContainerFromItem( item ) as FrameworkElement;
-              newRow = Row.FromContainer( newContainer );
-              newCell = ( newRow == null ) ? null : newRow.Cells[ newColumn ];
-
-              if( previousNewContainer != newContainer )
-              {
-                e.Handled = true;
-                containerChangedDuringEndEdit = true;
-              }
-              else
-              {
-                // If the newFocus is not in the grid anymore, stop the focus.
-                if( DataGridControl.GetDataGridContext( newFocus ) == null )
-                {
-                  e.Handled = true;
-                  newFocus = null;
-                }
-              }
-            }
-            catch( DataGridException )
-            {
-              e.Handled = true;
-              return;
-            }
-          }
-          else if( ( oldCell != null ) && ( oldCell != newCell ) )
-          {
-            try
-            {
-              oldCell.EndEdit();
-            }
-            catch( DataGridException )
-            {
-              e.Handled = true;
-              return;
-            }
-          }
-        }
-      }
-
-      if( item == null )
-        return;
-
-      if( newCell != null && newRow != null )
-      {
-        IDisposable inhibitSetFocus = null;
-
-        if( !containerChangedDuringEndEdit )
-        {
-          // Prevent the focus to be moved during the EndEdit since we are changing focus at the moment
-          inhibitSetFocus = this.InhibitSetFocus();
-        }
-
-        try
-        {
-          var oldFocusedCell = e.OldFocus as Cell;
-          var newFocusedElement = e.NewFocus as UIElement;
-
-          // here we check if the oldFocus is the parent of the new focused element because the OnPreviewGotKeyboardFocus
-          // is called twice if it's the case which give twice the focus and then endsup unselecting the element during the mouseUp 
-          // because during the second updateSelection, the element is already contained then m_updateSelectionOnNextMouseUp set to true
-          var isNewFocusParentTheOldFocusedCell = ( ( oldFocusedCell != null ) && ( newFocusedElement != null ) ) ?
-                                                    ( oldFocusedCell != Cell.FindFromChild( this, newFocusedElement ) ) : true;
-          var sourceDataItemIndex = DataGridVirtualizingPanel.GetItemIndex( newRow );
-
-          // newCell != newFocus is in fact a way to test if newFocus is a child of the cell.
-          if( ( newFocus != null ) && ( newCell != newFocus ) && ( !newCell.IsBeingEdited ) && ( newCell.IsCellEditorDisplayed ) )
-          {
-            newCell.BeginEdit();
-          }
-          else if( !newCell.IsCurrent )
-          {
-            //set the current row/column as this cell's
-            newDataGridContext.SetCurrent( item, newRow, sourceDataItemIndex, newColumn, false, true, false, AutoScrollCurrentItemSourceTriggers.FocusChanged );
-          }
-
-          if( isNewFocusParentTheOldFocusedCell )
-          {
-            var rowIsBeingEditedAndCurrentRowNotChanged = this.IsRowBeingEditedAndCurrentRowNotChanged( newRow, oldRow );
-
-            var newPosition = SelectionRangePoint.TryCreateRangePoint( newDataGridContext, item, sourceDataItemIndex, newCell.ParentColumn.VisiblePosition );
-            m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, oldFocusWasInTheGrid, rowIsBeingEditedAndCurrentRowNotChanged, null );
-          }
-        }
-        catch( DataGridException )
-        {
-          e.Handled = true;
-        }
-        finally
-        {
-          if( inhibitSetFocus != null )
-          {
-            inhibitSetFocus.Dispose();
-          }
-        }
-
-        return;
-      }
-
-      if( newRow != null )
-      {
-        if( newRow.IsCurrent )
-          return;
-
-        try
-        {
-          var currentColumn = default( ColumnBase );
-
-          //  The current column may need to be propagated, unless the focus is being moved to a GroupHeaderControl
-          // Special case for a row that is always set to NavigationBehavior.CellOnly (like FilterRow), as it needs a current column for the navigation to work propertly.
-          if( ( ( this.NavigationBehavior == NavigationBehavior.CellOnly ) || ( newRow.NavigationBehavior == NavigationBehavior.CellOnly ) )
-              && !( item is GroupHeaderFooterItem ) )
-          {
-            if( ( newDataGridContext != oldCurrentDataGridContext ) && this.AreDetailsFlatten )
-            {
-              currentColumn = newDataGridContext.GetMatchingColumn( oldCurrentDataGridContext, m_oldColumn.Target as ColumnBase );
-            }
-
-            if( currentColumn == null )
-            {
-              currentColumn = newDataGridContext.CurrentColumn;
-            }
-
-            //if there is no current column,
-            if( currentColumn == null )
-            {
-              //Check what was the last currentColumn before navigating in Row mode, in the case it's navigating again towards a cell (as for the FilterRow for instance).
-              var oldColumn = m_oldColumn.Target as ColumnBase;
-              if( ( oldColumn != null ) && ( newDataGridContext == oldCurrentDataGridContext ) )
-              {
-                var fixedCellPanel = newRow.CellsHostPanel as FixedCellPanel;
-                if( fixedCellPanel != null )
-                {
-                  var cell = default( Cell );
-                  var virtualizingCellCollection = fixedCellPanel.ParentRowCells;
-                  if( virtualizingCellCollection.TryGetBindedCell( oldColumn, out cell ) )
-                  {
-                    currentColumn = oldColumn;
-                  }
-                }
-              }
-            }
-
-            //If there is no last currentColumn, or it is not available for navigation.
-            if( currentColumn == null )
-            {
-              //Then use the first visible column
-              var columns = newDataGridContext.VisibleColumns;
-              if( columns.Count > 0 )
-              {
-                //First try to find the first navigable column that is visible in the viewport.
-                var firstFocusableColumn = NavigationHelper.GetFirstVisibleFocusableInViewportColumnIndex( newDataGridContext, newRow );
-                if( firstFocusableColumn == -1 )
-                {
-                  //If none is found, find the first navigable one.  This will make the grid scroll if one is found, since it's currently out-of-view.
-                  firstFocusableColumn = NavigationHelper.GetFirstVisibleFocusableColumnIndex( newDataGridContext, newRow );
-                }
-                if( firstFocusableColumn < 0 )
-                  throw new DataGridException( "Trying to edit while no cell is focusable. ", this );
-
-                currentColumn = columns[ firstFocusableColumn ];
-              }
-            }
-          }
-
-          int sourceDataItemIndex = DataGridVirtualizingPanel.GetItemIndex( newRow );
-
-          if( currentColumn == null )
-          {
-            IDisposable inhibitSetFocus = null;
-
-            if( !containerChangedDuringEndEdit )
-            {
-              inhibitSetFocus = this.InhibitSetFocus();
-            }
-
-            try
-            {
-              newDataGridContext.SetCurrent( item, newRow, sourceDataItemIndex, null, true, true, false, AutoScrollCurrentItemSourceTriggers.FocusChanged );
-            }
-            finally
-            {
-              if( inhibitSetFocus != null )
-              {
-                inhibitSetFocus.Dispose();
-              }
-            }
-          }
-          else
-          {
-            e.Handled = true; // We prevent the focus to go on the row since we will move it on a cell
-            newDataGridContext.SetCurrent( item, newRow, sourceDataItemIndex, currentColumn, true, true, false, AutoScrollCurrentItemSourceTriggers.FocusChanged );
-          }
-
-          var columnIndex = ( currentColumn == null ) ? -1 : currentColumn.VisiblePosition;
-          var rowIsBeingEditedAndCurrentRowNotChanged = this.IsRowBeingEditedAndCurrentRowNotChanged( newRow, oldRow );
-
-          var newPosition = SelectionRangePoint.TryCreateRangePoint( newDataGridContext, item, sourceDataItemIndex, columnIndex );
-          m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, oldFocusWasInTheGrid, rowIsBeingEditedAndCurrentRowNotChanged, null );
-        }
-        catch( DataGridException )
-        {
-          e.Handled = true;
-        }
-
-        return;
-      }
-
-      if( newContainer is HeaderFooterItem )
-      {
-        var headerFooterItem = ( HeaderFooterItem )newContainer;
-
-        var inhibitSetFocus = default( IDisposable );
-
-        if( !containerChangedDuringEndEdit )
-        {
-          inhibitSetFocus = this.InhibitSetFocus();
-        }
-
-        try
-        {
-          SelectionRangePoint newPosition;
-
-          var currentColumn = newDataGridContext.CurrentColumn;
-          newDataGridContext.SetCurrent( item, null, -1, currentColumn, true, true, false, AutoScrollCurrentItemSourceTriggers.FocusChanged );
-
-          var columnIndex = ( currentColumn == null ) ? -1 : currentColumn.VisiblePosition;
-
-          newPosition = SelectionRangePoint.TryCreateRangePoint( newDataGridContext, item, -1, columnIndex );
-
-          m_selectionChangerManager.UpdateSelection( oldPosition, newPosition, oldFocusWasInTheGrid, false, null );
-        }
-        catch( DataGridException )
-        {
-          e.Handled = true;
-          return;
-        }
-        finally
-        {
-          if( inhibitSetFocus != null )
-          {
-            inhibitSetFocus.Dispose();
-          }
-        }
-      }
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      base.OnMouseLeftButtonDown( e );
-
-      if( !e.Handled )
-      {
-        e.Handled = true;
-        this.Focus();
-      }
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      base.OnMouseLeftButtonUp( e );
-
-      if( e.Handled )
-        return;
-
-      this.OnMouseLeftButtonUp_DragToSelect( e );
-    }
-
-    protected override void OnLostMouseCapture( MouseEventArgs e )
-    {
-      base.OnLostMouseCapture( e );
-
-      this.OnLostMouseCapture_DragToSelect( e );
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      base.OnMouseMove( e );
-
-      if( e.Handled )
-        return;
-
-      this.OnMouseMove_DragToSelect( e );
-    }
-
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-      this.OnPropertyChanged( e.Property.Name );
-    }
-
-    internal static object GetFixedItemFromContainer( DependencyObject container )
-    {
-      object fixedItem = DataGridControl.GetFixedItem( container );
-      if( fixedItem != DataGridControl.NotSet )
-      {
-        return fixedItem;
-      }
-      return null;
-    }
-
-    internal bool ForceFocus( UIElement element )
-    {
-      if( element == null )
-        return false;
-
-      using( m_inhibitPreviewGotKeyboardFocus.Set() )
-      {
-        return element.Focus();
-      }
-    }
-
-    internal DependencyObject GetContainerForFixedItem( object item )
-    {
-      Panel fixedHeaderPanel = this.FixedHeadersHostPanel;
-      if( fixedHeaderPanel != null )
-      {
-        foreach( DependencyObject headerContainer in fixedHeaderPanel.Children )
-        {
-          object containerItem = DataGridControl.GetFixedItem( headerContainer );
-          if( containerItem == item )
-          {
-            return headerContainer;
-          }
-        }
-      }
-
-      Panel fixedFooterPanel = this.FixedFootersHostPanel;
-      if( fixedFooterPanel != null )
-      {
-        foreach( DependencyObject footerContainer in fixedFooterPanel.Children )
-        {
-          object containerItem = DataGridControl.GetFixedItem( footerContainer );
-          if( containerItem == item )
-          {
-            return footerContainer;
-          }
-        }
-      }
-
-      return null;
-    }
-
-    internal void PrepareItemContainer( DependencyObject container, object item )
-    {
-      //this function is called by the CustomItemContainerGenerator to prepare both the ActualDataItems and the custom items (e.g., Headers and Footers)
-      DataGridControl.SetContainer( container, container );
-      DataGridControl.SetIsContainerPrepared( container, true );
-      this.PrepareContainerForItemOverride( container, item );
-    }
-
-    internal void ClearItemContainer( DependencyObject container, object item )
-    {
-      // For performance reason, it is useless to clear the ContainerProperty. The value is set in DataGridControl.PrepareItemContainer and it contains the 
-      // container itself.  Clearing it here to set it back later is pointless.  Furthermore, setting and clearing the property cost more than usual since the
-      // DependencyProperty is inherited.  To determine if the container is in use, the DataGridControl.IsContainerPrepared attached property should be use instead.
-      //DataGridControl.ClearContainer( container );
-      DataGridControl.ClearIsContainerPrepared( container );
-      this.ClearContainerForItemOverride( container, item );
-    }
-
-    internal DependencyObject CreateContainerForItem()
-    {
-      DependencyObject container = this.GetContainerForItemOverride();
-
-      if( container != null )
-      {
-
-        // Set a local value for containers to ensure the DefaultStyleKey is correctly applied on this container
-        container.SetValue( DataGridControl.ParentDataGridControlPropertyKey, this );
-      }
-
-      return container;
-    }
-
-    internal bool IsItemItsOwnContainer( object dataItem )
-    {
-      return this.IsItemItsOwnContainerOverride( dataItem );
-    }
-
-    internal void ClearFixedHostPanels()
-    {
-      Panel fixedHeaderHostPanel = this.FixedHeadersHostPanel;
-      if( fixedHeaderHostPanel != null )
-      {
-        DataGridControl.ClearFixedHostPanelHelper( this, fixedHeaderHostPanel.Children );
-      }
-
-      Panel fixedFooterHostPanel = this.FixedFootersHostPanel;
-      if( fixedFooterHostPanel != null )
-      {
-        DataGridControl.ClearFixedHostPanelHelper( this, fixedFooterHostPanel.Children );
-      }
-    }
-
-    internal void ResetFixedRegions()
-    {
-      if( m_fixedHeadersHostPanel != null )
-      {
-        DataGridControl.RefreshFixedHeaderFooter( this, m_fixedHeadersHostPanel, this.GetView().FixedHeaders );
-      }
-
-      if( m_fixedFootersHostPanel != null )
-      {
-        DataGridControl.RefreshFixedHeaderFooter( this, m_fixedFootersHostPanel, this.GetView().FixedFooters );
-      }
-    }
-
-    internal int GetGlobalGeneratorIndexFromItem( DataGridContext dataGridContext, object item )
-    {
-      return this.CustomItemContainerGenerator.FindIndexForItem( item, dataGridContext );
-    }
-
-    internal void ShowWaitCursor()
-    {
-      if( m_waitCursorCount == 0 )
-      {
-        Cursor oldCursor = this.ReadLocalValue( FrameworkElement.CursorProperty ) as Cursor;
-        object oldForceCursor = this.ReadLocalValue( FrameworkElement.ForceCursorProperty );
-
-        if( oldCursor != DependencyProperty.UnsetValue )
-          m_oldCursor = oldCursor;
-
-        if( oldForceCursor != DependencyProperty.UnsetValue )
-          m_oldForceCursor = ( bool )oldForceCursor;
-      }
-
-      UIViewBase uiViewBase = this.GetView() as UIViewBase;
-
-      this.ForceCursor = true;
-
-      this.Cursor = ( uiViewBase != null )
-        ? uiViewBase.BusyCursor
-        : Cursors.Wait;
-
-      m_waitCursorCount++;
-    }
-
-    internal void HideWaitCursor()
-    {
-      m_waitCursorCount--;
-      Debug.Assert( m_waitCursorCount >= 0 );
-
-      if( m_waitCursorCount == 0 )
-      {
-        if( m_oldCursor != null )
-        {
-          this.Cursor = m_oldCursor;
-          m_oldCursor = null;
-        }
-        else
-        {
-          this.ClearValue( FrameworkElement.CursorProperty );
-        }
-
-        if( m_oldForceCursor != null )
-        {
-          this.ForceCursor = m_oldForceCursor.Value;
-          m_oldForceCursor = null;
-        }
-        else
-        {
-          this.ClearValue( FrameworkElement.ForceCursorProperty );
-        }
-      }
-    }
-
-    internal void CleanUpAfterUnload()
-    {
-      m_customItemContainerGenerator.CleanupGenerator();
-      this.SetValue( ParentDataGridControlPropertyKey, null );
-    }
-
-    internal void SynchronizeForeignKeyConfigurations()
-    {
-      ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurations( this.Columns,
-                                                                     this.ItemsSource,
-                                                                     m_itemsSourcePropertyDescriptions,
-                                                                     this.AutoCreateForeignKeyConfigurations );
-    }
-
-
-    private static bool IsRemoveAllowedForDeleteCommand( IList list )
-    {
-      // If the list has a fixed sized or if it's read only, we won't allow remove.
-      bool allowRemove = ( !list.IsFixedSize && !list.IsReadOnly );
-
-      IBindingList bindingList = list as IBindingList;
-
-      // Even if the list does not have a fixed size and is not read only,
-      // we don't want to allow remove if the list implements IBindingList
-      // and does not allow remove.
-      if( ( allowRemove )
-        && ( bindingList != null ) )
-      {
-        allowRemove = bindingList.AllowRemove;
-      }
-
-      // Finally, we won't support remove if the list does support change notifications
-      // because we need the grid to be notified of the changes to reflect and adjust
-      // the displayed items.
-      if( allowRemove )
-      {
-        allowRemove = ItemsSourceHelper.IsSourceSupportingChangeNotification( list );
-      }
-
-      return allowRemove;
-    }
-
-    private static DataTemplate GetTemplateForItem( object item )
-    {
-      DataTemplate retval = item as DataTemplate;
-      if( retval == null )
-      {
-        if( item.GetType() == typeof( GroupHeaderFooterItem ) )
-        {
-          GroupHeaderFooterItem groupHeaderFooterItem = ( GroupHeaderFooterItem )item;
-
-          retval = groupHeaderFooterItem.Template as DataTemplate;
-          if( retval == null )
-          {
-            GroupHeaderFooterItemTemplate headerFooterItemTemplate = groupHeaderFooterItem.Template as GroupHeaderFooterItemTemplate;
-            if( headerFooterItemTemplate != null )
-            {
-              headerFooterItemTemplate.Seal();
-              retval = headerFooterItemTemplate.Template;
-            }
-          }
-        }
-      }
-      return retval;
-    }
-
-    private static void ClearFixedHostPanelHelper( DataGridControl dataGrid, UIElementCollection collection )
-    {
-      TableViewScrollViewer tableViewScrollViewer = dataGrid.ScrollViewer as TableViewScrollViewer;
-      RowSelectorPane rowSelectorPane = ( tableViewScrollViewer != null ) ? tableViewScrollViewer.RowSelectorPane : null;
-
-      foreach( DependencyObject headerFooterItem in collection )
-      {
-        if( rowSelectorPane != null )
-        {
-          rowSelectorPane.FreeRowSelector( headerFooterItem );
-        }
-
-        dataGrid.ClearItemContainer( headerFooterItem, GetFixedItem( headerFooterItem ) );
-        DataGridControl.SetDataGridContext( headerFooterItem, null );
-      }
-
-      collection.Clear();
-
-    }
-
-    private static void RefreshFixedHeaderFooter( DataGridControl dataGrid, Panel targetPanel, ObservableCollection<DataTemplate> collection )
-    {
-      TableViewScrollViewer tableViewScrollViewer = dataGrid.ScrollViewer as TableViewScrollViewer;
-      RowSelectorPane rowSelectorPane = ( tableViewScrollViewer != null ) ? tableViewScrollViewer.RowSelectorPane : null;
-
-      foreach( HeaderFooterItem element in targetPanel.Children )
-      {
-        if( rowSelectorPane != null )
-        {
-          rowSelectorPane.FreeRowSelector( element );
-        }
-
-        dataGrid.ClearItemContainer( element, DataGridControl.GetFixedItem( element ) );
-        DataGridControl.SetDataGridContext( element, null );
-      }
-
-      targetPanel.Children.Clear();
-
-      var view = dataGrid.GetView();
-      DataGridContext dataGridContext = dataGrid.DataGridContext;
-
-      foreach( DataTemplate template in collection )
-      {
-        HeaderFooterItem control = new HeaderFooterItem();
-
-        control.Content = dataGrid.DataContext;
-        control.ContentTemplate = template;
-
-        DataGridControl.SetDataGridContext( control, dataGridContext );
-        dataGrid.PrepareItemContainer( control, template );
-
-        DataGridControl.SetFixedItem( control, template );
-        GroupLevelIndicatorPane.SetGroupLevel( control, -1 );
-
-        targetPanel.Children.Add( control );
-      }
-
-    }
-
-    private void ReapplyTemplate()
-    {
-      ControlTemplate template = this.Template;
-
-      if( template != null )
-      {
-        this.ClearFixedHostPanels();
-
-        bool localTemplate = ( this.ReadLocalValue( TemplateProperty ) != DependencyProperty.UnsetValue );
-        this.Template = new ControlTemplate();
-
-        if( localTemplate )
-        {
-          this.Template = template;
-        }
-        else
-        {
-          this.ClearValue( TemplateProperty );
-        }
-
-        m_scrollViewer = null;
-      }
-    }
-
-    private bool IsRowBeingEditedAndCurrentRowNotChanged( Row newRow, Row oldRow )
-    {
-      bool rowIsBeingEditedAndCurrentRowNotChanged = newRow.IsBeingEdited;
-
-      if( rowIsBeingEditedAndCurrentRowNotChanged )
-      {
-        rowIsBeingEditedAndCurrentRowNotChanged &= ( newRow == oldRow );
-      }
-
-      return rowIsBeingEditedAndCurrentRowNotChanged;
-    }
-
-    private FrameworkElement GetLocalContainer( DependencyObject container )
-    {
-      if( container == null )
-        return null;
-
-      var candidate = DataGridControl.GetContainer( container );
-      while( candidate != null )
-      {
-        if( ( candidate is IDataGridItemContainer ) && ( candidate is FrameworkElement ) )
-        {
-          var dataGridContext = DataGridControl.GetDataGridContext( candidate );
-          if( dataGridContext == null )
-            break;
-
-          var dataGridControl = dataGridContext.DataGridControl;
-          if( dataGridControl == this )
-            return ( FrameworkElement )candidate;
-
-          candidate = dataGridControl;
-        }
-
-        var parent = TreeHelper.GetParent( candidate );
-        if( parent == null )
-          break;
-
-        candidate = DataGridControl.GetContainer( parent );
-      }
-
-      return null;
-    }
-
-    private Size GetStartUpSize( Size constraint )
-    {
-      double width = this.Width;
-      double minWidth = this.MinWidth;
-      double maxWidth = this.MaxWidth;
-
-      double height = this.Height;
-      double minHeight = this.MinHeight;
-      double maxHeight = this.MaxHeight;
-
-      if( double.IsNaN( width ) )
-      {
-        width = constraint.Width;
-      }
-
-      if( double.IsNaN( height ) )
-      {
-        height = constraint.Height;
-      }
-
-      if( !double.IsPositiveInfinity( maxWidth ) )
-      {
-        width = Math.Min( maxWidth, width );
-      }
-
-      if( !double.IsPositiveInfinity( maxHeight ) )
-      {
-        height = Math.Min( maxHeight, height );
-      }
-
-      if( ( width < minWidth ) || ( double.IsPositiveInfinity( width ) ) )
-      {
-        width = minWidth;
-      }
-
-      if( ( height < minHeight ) || ( double.IsPositiveInfinity( height ) ) )
-      {
-        height = minHeight;
-      }
-
-      return new Size( width, height );
-    }
-
-    private delegate void ParametrizedGenericHandler( object param );
-    private delegate void DelayedSetFocusHelperHandler( bool forceFocus, bool preserveEditorFocus );
-    private delegate bool GenericHandler();
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected virtual void OnNotifyPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    private void OnPropertyChanged( string propertyName )
-    {
-      this.OnNotifyPropertyChanged( new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        var dataGridCollectionView = this.ItemsSource as DataGridCollectionViewBase;
-        var eventArgs = e as PropertyChangedEventArgs;
-
-        if( sender == dataGridCollectionView )
-        {
-          this.OnDataGridCollectionView_PropertyChanged( dataGridCollectionView, eventArgs );
-        }
-      }
-      else if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.OnDataGridDetailDescriptionsChanged( sender as DataGridDetailDescriptionCollection, ( NotifyCollectionChangedEventArgs )e );
-      }
-      else if( managerType == typeof( ProxyCollectionRefreshEventManager ) )
-      {
-        this.OnDataGridCollectionView_ProxyCollectionRefresh( sender as DataGridCollectionView, e );
-      }
-      else if( managerType == typeof( ProxyGroupDescriptionsChangedEventManager ) )
-      {
-        this.OnDataGridCollectionView_ProxyGroupDescriptionsChanged( sender as DataGridCollectionView, ( NotifyCollectionChangedEventArgs )e );
-      }
-      else if( managerType == typeof( ProxySortDescriptionsChangedEventManager ) )
-      {
-        this.OnDataGridCollectionView_ProxySortDescriptionsChanged( sender as DataGridCollectionView, ( NotifyCollectionChangedEventArgs )e );
-      }
-      else if( managerType == typeof( ConnectionStateChangedEventManager ) )
-      {
-        this.OnDataGridVirtualizingCollectionViewBase_ConnectionStateChanged( sender as DataGridVirtualizingCollectionViewBase, e );
-      }
-      else if( managerType == typeof( ConnectionErrorChangedEventManager ) )
-      {
-        this.OnDataGridVirtualizingCollectionViewBase_ConnectionErrorChanged( sender as DataGridVirtualizingCollectionViewBase, e );
-      }
-      else if( managerType == typeof( FrameworkElementUnloadedEventManager ) )
-      {
-        this.UnhookToUnloaded();
-        this.SaveDataGridContextState( this.DataGridContext, true, int.MaxValue );
-        this.CleanUpAfterUnload();
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region IDocumentPaginatorSource Members
-
-    DocumentPaginator IDocumentPaginatorSource.DocumentPaginator
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    #endregion
-
-    private IDisposable m_inhibitItemsCollectionChanged; // = null
-
-    private Cursor m_oldCursor; // = null;
-    private bool? m_oldForceCursor; // = null;
-    private int m_waitCursorCount; // = 0;
-
-    private FrameworkElement m_itemsHost; // = null
-    private readonly CustomItemContainerGenerator m_customItemContainerGenerator; // = null
-
-    private AutoScrollManager m_autoScrollManager;
-    private bool m_startDragSelection;
-
-    private object m_currentItemInEdition; // = null
-    private RowState m_currentRowInEditionState; // = null
-
-    private readonly AutoResetFlag m_inhibitBringIntoView = AutoResetFlagFactory.Create( false );
-    private readonly AutoResetFlag m_inhibitSetFocus = AutoResetFlagFactory.Create( false );
-    private readonly AutoResetFlag m_inhibitPreviewGotKeyboardFocus = AutoResetFlagFactory.Create( false );
-    private readonly AutoScrollCurrentItemSourceTriggersRestrictions m_inhibitAutoScroll = new AutoScrollCurrentItemSourceTriggersRestrictions();
-    private DispatcherOperation m_queueBringIntoView; // = null
-    private DispatcherOperation m_queueSetFocus; // = null
-    private DispatcherOperation m_queueClearCurrentColumn; // = null
-
-    private Dictionary<WeakDataGridContextKey, SaveRestoreDataGridContextStateVisitor> m_dataGridContextsStateDictionary;
-    private SelectionManager m_selectionChangerManager;
-
-    private CommandBinding m_copyCommandBinding; // = null;
-    private CommandBinding m_deleteCommandBinding; // = null;
-    private CommandBinding m_refreshCommandBinding; // = null;
-    private IDisposable m_mouseDownUpdateSelectionSource;
-
-    private SelectionRangePoint m_mouseDownSelectionRangePoint;
-
-    private bool m_isFirstTimeLoaded = true;
-
-    private WeakReference m_parentWindow;
-    private WeakReference m_oldColumn = new WeakReference( null );
-
-    private BitVector32 m_flags = new BitVector32();
-
-    [Flags]
-    private enum DataGridControlFlags
-    {
-      SettingFocusOnCell = 1,
-      IsSetCurrentInProgress = 2,
-      IsBoundToDataGridVirtualizingCollectionViewBase = 8,
-      ViewPreservesContainerSize = 16,
-      DebugSaveRestore = 32,
-      ItemsSourceChangedDelayed = 64,
-      SelectedIndexPropertyNeedCoerce = 128,
-      SelectedItemPropertyNeedCoerce = 256
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.icon.16x16.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.icon.16x16.bmp
deleted file mode 100644
index 1e169e75..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.icon.16x16.bmp and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs
deleted file mode 100644
index b96dfc5c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls.Primitives;
-using System.Globalization;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Input;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = PART_TextBox, Type = typeof( DatePickerTextBox ) )]
-  public class DataGridDatePicker : DatePicker, IValidateInput
-  {
-    private const string PART_TextBox = "PART_TextBox";
-    private Exception _commitException;
-
-    #region Method Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      DatePickerTextBox textBox = GetTemplateChild( PART_TextBox ) as DatePickerTextBox;
-      if( textBox != null )
-      {
-        textBox.Background = new SolidColorBrush( Colors.Transparent );
-      }
-    }
-
-    protected override void OnDateValidationError( DatePickerDateValidationErrorEventArgs e )
-    {
-      base.OnDateValidationError( e );
-
-      // This validation error may have been raised by the "CommitInput()" call.
-      // If this is the case, use the _commitException member.
-      if( InputValidationError != null )
-      {
-        InputValidationErrorEventArgs args = ( _commitException != null )
-          ? new InputValidationErrorEventArgs( _commitException )
-          : new InputValidationErrorEventArgs( e.Exception );
-
-        InputValidationError( this, args );
-        if( args.ThrowException )
-        {
-          throw args.Exception;
-        }
-      }
-    }
-
-    #endregion
-
-    #region Method
-
-    public bool CommitInput()
-    {
-      bool returnValue = true;
-      try
-      {
-        // Null or empty string is a null date;
-        DateTime? dateTime = ( !string.IsNullOrEmpty( Text ) )
-          ? DateTime.Parse( Text, DateTimeFormatInfo.GetInstance( CultureInfo.CurrentCulture ) )
-          : ( DateTime? )null;
-
-        // This may throw an exception if the typed date is 
-        // part of the blackout dates.
-        this.SelectedDate = dateTime;
-      }
-      catch( Exception e )
-      {
-        _commitException = e;
-        // Return the TextField to the appropritate value for the current SelectedDate.
-        // Setting the "Text" property to invalid content for a date was the
-        // observed behavior for the DatePicker. 
-        // "Invalid" is expected to be an invalid content.
-        // This will raise the "DateValidationError" event from the datepicker
-        Text = "Invalid";
-        _commitException = null;
-        returnValue = false;
-      }
-
-      return returnValue;
-    }
-
-    #endregion
-
-    #region Events
-
-    public event InputValidationErrorEventHandler InputValidationError;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs
deleted file mode 100644
index 592fa340..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Runtime.Serialization;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Serializable]
-  public class DataGridException : Exception
-  {
-    public DataGridException()
-      : base()
-    {
-    }
-
-    public DataGridException( string message )
-      : base( message )
-    {
-    }
-
-    public DataGridException( string message, DataGridControl dataGridControl )
-      : base( message )
-    {
-      this.DataGridControl = dataGridControl;
-    }
-
-    public DataGridException( string message, Exception innerException )
-      : base( message, innerException )
-    {
-    }
-
-    public DataGridException( string message, Exception innerException, DataGridControl dataGridControl )
-      : base( message, innerException )
-    {
-      this.DataGridControl = dataGridControl;
-    }
-
-    protected DataGridException( SerializationInfo info, StreamingContext context )
-      : base( info, context )
-    {
-    }
-
-    #region DataGridControl Property
-
-    public DataGridControl DataGridControl
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    internal static Exception Create<T>( string message, DataGridControl dataGridControl, string argument = "" )
-    {
-      Exception exception;
-
-      var exceptionType = typeof( T );
-
-      if( typeof( ArgumentException ) == exceptionType )
-      {
-        exception = new ArgumentException( message, argument );
-      }
-      else if( typeof( ArgumentNullException ) == exceptionType )
-      {
-        exception = new ArgumentNullException( message );
-      }
-      else if( typeof( ArgumentOutOfRangeException ) == exceptionType )
-      {
-        exception = new ArgumentOutOfRangeException( argument, message );
-      }
-      else if( typeof( IndexOutOfRangeException ) == exceptionType )
-      {
-        exception = new IndexOutOfRangeException( message );
-      }
-      else if( typeof( InvalidOperationException ) == exceptionType )
-      {
-        exception = new InvalidOperationException( message );
-      }
-      else if( typeof( NotSupportedException ) == exceptionType )
-      {
-        exception = new NotSupportedException( message );
-      }
-      else if( typeof( DataGridException ) == exceptionType )
-      {
-        return new DataGridException( message, dataGridControl );
-      }
-      else if( typeof( DataGridInternalException ) == exceptionType )
-      {
-        return new DataGridInternalException( message, dataGridControl );
-      }
-      else
-      {
-        exception = new Exception( message );
-      }
-
-      if( dataGridControl != null )
-      {
-        var name = dataGridControl.GridUniqueName;
-        if( string.IsNullOrEmpty( name ) )
-        {
-          name = dataGridControl.Name;
-        }
-
-        if( !string.IsNullOrEmpty( name ) )
-        {
-          exception.Source = name;
-        }
-      }
-
-      Debug.Assert( exception != null );
-
-      return exception;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridFocusException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridFocusException.cs
deleted file mode 100644
index cc448300..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridFocusException.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Serialization;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Serializable]
-  public class DataGridFocusException : DataGridException
-  {
-    public DataGridFocusException()
-      : base()
-    {
-    }
-
-    public DataGridFocusException( string message )
-      : base( message )
-    {
-    }
-
-    public DataGridFocusException( string message, Exception innerException )
-      : base( message, innerException )
-    {
-    }
-
-    protected DataGridFocusException( SerializationInfo info, StreamingContext context )
-      : base( info, context )
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridInternalException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridInternalException.cs
deleted file mode 100644
index ecdef1f6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridInternalException.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Runtime.Serialization;
-using Xceed.Wpf.DataGrid;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Serializable]
-  public class DataGridInternalException : DataGridException
-  {
-    public DataGridInternalException()
-      : this( DefaultMessage )
-    {
-    }
-
-    public DataGridInternalException( string message )
-      : base( message )
-    {
-    }
-
-    public DataGridInternalException( string message, DataGridControl dataGridControl )
-      : base( message, dataGridControl )
-    {
-    }
-
-    public DataGridInternalException( Exception innerException )
-      : this( DefaultMessage, innerException )
-    {
-    }
-
-    public DataGridInternalException( string message, Exception innerException )
-      : base( message, innerException )
-    {
-    }
-
-    public DataGridInternalException( string message, Exception innerException, DataGridControl dataGridControl )
-      : base( message, innerException, dataGridControl )
-    {
-    }
-
-    protected DataGridInternalException( SerializationInfo info, StreamingContext context )
-      : base( info, context )
-    {
-    }
-
-    private const string DefaultMessage = "An unexpected internal failure occurred in the Xceed WPF DataGrid control.";
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemContainerManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemContainerManager.cs
deleted file mode 100644
index a583c7ef..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemContainerManager.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataGridItemContainerManager
-  {
-    internal DataGridItemContainerManager( IDataGridItemContainer owner )
-    {
-      if( owner == null )
-        throw new ArgumentNullException( "owner" );
-
-      if( !( owner is FrameworkElement ) )
-        throw new ArgumentException( "The owner must derive from FrameworkElement.", "owner" );
-
-      m_owner = owner;
-    }
-
-    #region CanBeRecycled Property
-
-    internal bool CanBeRecycled
-    {
-      get
-      {
-        if( m_preparedContainers.Any( item => !item.CanBeRecycled ) )
-          return false;
-
-        if( m_unpreparedContainers.Any( item => !item.CanBeRecycled ) )
-          return false;
-
-        return true;
-      }
-    }
-
-    #endregion
-
-    internal void Prepare( DataGridContext dataGridContext, object dataItem )
-    {
-      m_containersPrepared = true;
-      m_dataGridContext = dataGridContext;
-      m_dataItem = dataItem;
-
-      this.Update();
-    }
-
-    internal void Clear( bool isRecyclingCandidate )
-    {
-      m_containersPrepared = false;
-      m_dataGridContext = null;
-      m_dataItem = null;
-
-      try
-      {
-        this.ClearContainers( isRecyclingCandidate );
-      }
-      finally
-      {
-        m_unpreparedContainers.Clear();
-        m_preparedContainers.Clear();
-      }
-    }
-
-    internal void CleanRecyclingCandidates()
-    {
-      var newContainers = m_owner.GetTemplatedChildDataGridItemContainers().ToList();
-
-      foreach( var container in newContainers )
-      {
-        container.IsRecyclingCandidate = false;
-        container.CleanRecyclingCandidate();
-      }
-    }
-
-    internal void Update()
-    {
-      var newContainers = m_owner.GetTemplatedChildDataGridItemContainers().ToList();
-
-      try
-      {
-        this.ClearContainers( newContainers, false );
-      }
-      finally
-      {
-        foreach( var container in newContainers )
-        {
-          if( m_preparedContainers.Contains( container ) || m_unpreparedContainers.Contains( container ) )
-            continue;
-
-          m_unpreparedContainers.Add( container );
-        }
-      }
-
-      this.PrepareContainers();
-    }
-
-    private void PrepareContainers()
-    {
-      if( !m_containersPrepared )
-        return;
-
-      foreach( var container in m_unpreparedContainers.ToList() )
-      {
-        m_unpreparedContainers.Remove( container );
-        m_preparedContainers.Add( container );
-
-        // Row based objects apply their template through their implementation of PrepareContainer.
-        // No need to call ApplyTemplate beforehand.
-        var row = container as Row;
-        if( row == null )
-        {
-          var fe = container as FrameworkElement;
-          if( fe != null )
-          {
-            fe.ApplyTemplate();
-          }
-        }
-
-        container.PrepareContainer( m_dataGridContext, m_dataItem );
-      }
-    }
-
-    private void ClearContainers( bool isRecyclingCandidate )
-    {
-      this.ClearContainers( new List<IDataGridItemContainer>( 0 ), isRecyclingCandidate );
-    }
-
-    private void ClearContainers( ICollection<IDataGridItemContainer> keep, bool isRecyclingCandidate )
-    {
-      foreach( var container in m_unpreparedContainers.Except( keep ).ToList() )
-      {
-        m_unpreparedContainers.Remove( container );
-
-        container.IsRecyclingCandidate = isRecyclingCandidate;
-
-        if( isRecyclingCandidate )
-          continue;
-
-        var row = container as Row;
-        if( row != null )
-        {
-          row.ClearCellsHost();
-        }
-      }
-
-      foreach( var container in m_preparedContainers.Except( keep ).ToList() )
-      {
-        m_preparedContainers.Remove( container );
-
-        container.IsRecyclingCandidate = isRecyclingCandidate;
-        container.ClearContainer();
-      }
-    }
-
-    private readonly IDataGridItemContainer m_owner;
-    private readonly ICollection<IDataGridItemContainer> m_unpreparedContainers = new HashSet<IDataGridItemContainer>();
-    private readonly ICollection<IDataGridItemContainer> m_preparedContainers = new HashSet<IDataGridItemContainer>();
-
-    private DataGridContext m_dataGridContext;
-    private object m_dataItem;
-    private bool m_containersPrepared; //false
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs
deleted file mode 100644
index 40cd5805..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs
+++ /dev/null
@@ -1,733 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public abstract class DataGridItemsHost : FrameworkElement, ICustomVirtualizingPanel
-  {
-    static DataGridItemsHost()
-    {
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata(
-        typeof( DataGridItemsHost ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( OnParentDataGridControlChanged ) ) );
-    }
-
-    #region ParentDataGridControl property
-
-    protected DataGridControl ParentDataGridControl
-    {
-      get
-      {
-        return ( this.CachedRootDataGridContext != null ) ? this.CachedRootDataGridContext.DataGridControl : null;
-      }
-    }
-
-    #endregion
-
-    #region CustomItemContainerGenerator property
-
-    private CustomItemContainerGenerator m_generator;
-    private bool m_generatorInitialized; // = false
-    protected ICustomItemContainerGenerator CustomItemContainerGenerator
-    {
-      get
-      {
-        if( !m_generatorInitialized )
-        {
-          this.InitializeGenerator();
-        }
-
-        return m_generator;
-      }
-    }
-
-    private void InitializeGenerator()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-
-      if( dataGridControl == null )
-        throw new DataGridInternalException( "No DataGridContext set on the DataGridItemsHost while trying to initalize the ItemContainerGenerator" );
-
-      if( m_generator == null )
-      {
-        m_generator = dataGridControl.CustomItemContainerGenerator;
-      }
-
-      Debug.Assert( m_generator != null );
-
-      m_generator.ItemsChanged += this.HandleGeneratorItemsChanged;
-      m_generator.ContainersRemoved += this.HandleGeneratorContainersRemoved;
-      m_generator.RecyclingCandidatesCleaned += this.HandleGeneratorRecyclingCandidatesCleaned;
-
-      m_generatorInitialized = true;
-    }
-
-    #endregion
-
-    #region CachedRootDataGridContext Internal property
-
-    internal DataGridContext CachedRootDataGridContext
-    {
-      get
-      {
-        // Ensure to get the DataGridContext of the ItemsHost
-        // if non was explicitly set
-        if( m_cachedRootDataGridContext == null )
-        {
-          m_cachedRootDataGridContext = DataGridControl.GetDataGridContext( this );
-        }
-
-        return m_cachedRootDataGridContext;
-      }
-    }
-
-    private DataGridContext m_cachedRootDataGridContext;
-
-    #endregion
-
-    #region DelayBringIntoView Internal Property
-
-    internal bool DelayBringIntoView
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region Children property
-
-    protected internal IList<UIElement> Children
-    {
-      get
-      {
-        if( m_children == null )
-        {
-          m_children = this.CreateChildCollection();
-        }
-
-        return m_children;
-      }
-    }
-
-    private IList<UIElement> m_children;
-
-    #endregion
-
-    #region Visual Tree Override
-
-    protected override IEnumerator LogicalChildren
-    {
-      get
-      {
-        if( m_children != null )
-          return m_children.GetEnumerator();
-
-        return null;
-      }
-    }
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        if( m_children == null )
-          return 0;
-
-        return m_children.Count;
-      }
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( m_children == null )
-        throw new InvalidOperationException( "An attempt was made to retrieve a visual child when none exists for this element." );
-
-
-      if( ( index < 0 ) || ( index >= m_children.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to the number of contained UI elements." );
-
-      return m_children[ index ];
-
-    }
-
-    #endregion
-
-    #region PreviewKeyDown and KeyDown handling overrides
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      switch( e.Key )
-      {
-        // Handle the System key definition (basically with ALT key pressed)
-        case Key.System:
-          this.HandlePreviewSystemKey( e );
-          break;
-
-        case Key.Tab:
-          this.HandlePreviewTabKey( e );
-          break;
-
-        case Key.PageUp:
-          this.HandlePreviewPageUpKey( e );
-          break;
-
-        case Key.PageDown:
-          this.HandlePreviewPageDownKey( e );
-          break;
-
-        case Key.Home:
-          this.HandlePreviewHomeKey( e );
-          break;
-
-        case Key.End:
-          this.HandlePreviewEndKey( e );
-          break;
-
-        case Key.Up:
-          this.HandlePreviewUpKey( e );
-          break;
-
-        case Key.Down:
-          this.HandlePreviewDownKey( e );
-          break;
-
-        case Key.Left:
-          this.HandlePreviewLeftKey( e );
-          break;
-
-        case Key.Right:
-          this.HandlePreviewRightKey( e );
-          break;
-
-        default:
-          base.OnPreviewKeyDown( e );
-          break;
-      }
-    }
-
-    protected virtual void HandlePreviewSystemKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewTabKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      DataGridContext currentDataGridContext = dataGridContext.DataGridControl.CurrentContext;
-
-      if( currentDataGridContext == null )
-        return;
-
-      DependencyObject container = currentDataGridContext.GetContainerFromItem( currentDataGridContext.InternalCurrentItem );
-
-      if( container != null )
-      {
-        KeyboardNavigationMode tabbingMode = KeyboardNavigation.GetTabNavigation( container );
-
-        if( tabbingMode != KeyboardNavigationMode.None )
-        {
-          if( ( Keyboard.Modifiers == ModifierKeys.None ) || ( Keyboard.Modifiers == ModifierKeys.Shift ) )
-          {
-            DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-
-            //Force the "inline" relayout of the panel
-            //This has no effect if the panel do not have to be updated.
-            this.UpdateLayout();
-          }
-        }
-      }
-    }
-
-    protected virtual void HandlePreviewLeftKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewRightKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewUpKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewDownKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewPageUpKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewPageDownKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewHomeKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewEndKey( KeyEventArgs e )
-    {
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      switch( e.Key )
-      {
-        // Handle the System key definition (basically with ALT key pressed)
-        case Key.System:
-          this.HandleSystemKey( e );
-          break;
-
-        case Key.Tab:
-          this.HandleTabKey( e );
-          break;
-
-        case Key.PageUp:
-          this.HandlePageUpKey( e );
-          break;
-
-        case Key.PageDown:
-          this.HandlePageDownKey( e );
-          break;
-
-        case Key.Home:
-          this.HandleHomeKey( e );
-          break;
-
-        case Key.End:
-          this.HandleEndKey( e );
-          break;
-
-        case Key.Up:
-          this.HandleUpKey( e );
-          break;
-
-        case Key.Down:
-          this.HandleDownKey( e );
-          break;
-
-        case Key.Left:
-          this.HandleLeftKey( e );
-          break;
-
-        case Key.Right:
-          this.HandleRightKey( e );
-          break;
-
-        default:
-          base.OnKeyDown( e );
-          break;
-      }
-    }
-
-    protected virtual void HandleSystemKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandleTabKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePageUpKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePageDownKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandleHomeKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandleEndKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandleUpKey( KeyEventArgs e )
-    {
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
-    }
-
-    protected virtual void HandleDownKey( KeyEventArgs e )
-    {
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
-    }
-
-    protected virtual void HandleLeftKey( KeyEventArgs e )
-    {
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
-    }
-
-    protected virtual void HandleRightKey( KeyEventArgs e )
-    {
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
-    }
-
-    #endregion
-
-    protected virtual IList<UIElement> CreateChildCollection()
-    {
-      return new ItemsHostUIElementCollection( this );
-    }
-
-    [Obsolete( "This OnItemsAdded method is obsolete and is no longer called." )]
-    protected virtual void OnItemsAdded( GeneratorPosition position, int index, int itemCount )
-    {
-    }
-
-    [Obsolete( "This OnItemsRemoved method is obsolete and is no longer called." )]
-    protected virtual void OnItemsRemoved( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers )
-    {
-    }
-
-    [Obsolete( "The OnItemsMoved method is obsolete and is no longer called." )]
-    protected virtual void OnItemsMoved( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers )
-    {
-    }
-
-    [Obsolete( "The OnItemsReplaced method is obsolete and is no longer called." )]
-    protected virtual void OnItemsReplaced( GeneratorPosition position, int index, GeneratorPosition oldPosition, int oldIndex, int itemCount, int itemUICount, IList<DependencyObject> affectedContainers )
-    {
-    }
-
-    protected abstract void OnItemsAdded();
-
-    protected abstract void OnItemsRemoved( IList<DependencyObject> affectedContainers );
-
-    protected abstract void OnItemsReset();
-
-    protected abstract void OnContainersRemoved( IList<DependencyObject> removedContainers );
-
-    protected virtual void OnRecyclingCandidatesCleaned( IList<DependencyObject> recyclingCandidates )
-    {
-    }
-
-    protected virtual void OnParentDataGridControlChanged( DataGridControl oldValue, DataGridControl newValue )
-    {
-      if( ( m_generator != null ) && ( newValue != null ) )
-      {
-        if( newValue.CustomItemContainerGenerator != m_generator )
-          throw new DataGridInternalException( "The custom generator is different on the parent DataGridControl.", newValue );
-      }
-
-      // We must ensure that the old ItemsHost clears the Content of the
-      // ItemContainerGenerator to avoid a container in the tree of the
-      // old panel is used into the new one.
-      //
-      // This also ensures to remove every link between the RowSelectorPane 
-      // and the containers of the old ItemsHost.
-      //
-      // This only occurs when not specifying a Theme on the View of the
-      // DataGridControl and when the System color scheme is changed.
-      if( ( oldValue != null ) && ( newValue == null ) )
-      {
-        oldValue.CustomItemContainerGenerator.CleanupGenerator();
-      }
-
-      if( newValue != null )
-      {
-        //In order to ensure that the ItemsHost has the latest geneartor content ( since we just [re]subscribed to the geneartor events ), 
-        //we invalidate the ItemsHost layout. If the grid was just loaded, then the measure pass that is triggered is bound to be of almost
-        //no significance (performance wise) since there will be no generation and no preparation of new containers (content does not change).
-        this.InvalidateMeasure();
-      }
-      else
-      {
-        this.ClearCachedRootDataGridContextAndGenerator();
-      }
-    }
-
-
-
-    internal static bool ProcessMoveFocus( Key key )
-    {
-      bool moveFocusSucceeded = false;
-
-      //1. Determine the direction in which the focus would navigate
-      FocusNavigationDirection navDirection;
-      switch( key )
-      {
-        case Key.Down:
-          navDirection = FocusNavigationDirection.Down;
-          break;
-        case Key.Left:
-          navDirection = FocusNavigationDirection.Left;
-          break;
-        case Key.Right:
-          navDirection = FocusNavigationDirection.Right;
-          break;
-        case Key.Up:
-          navDirection = FocusNavigationDirection.Up;
-          break;
-        default:
-          throw new DataGridInternalException( "An invalid key was processed to move the focus." );
-      }
-
-      //2. Call MoveFocus() on the currently focused keyboard element, 
-      // since this is call within the OnKeyDown of the DataGridControl, it would normally mean
-      // that the focused element is within the DataGridControl
-      DependencyObject element = Keyboard.FocusedElement as DependencyObject;
-      UIElement uiElement = element as UIElement;
-
-      // If the focused element is not a UIElement (e.g. : Hyperlink), we go up until we find one.
-      while( uiElement == null && element != null )
-      {
-        element = TreeHelper.GetParent( element );
-        uiElement = element as UIElement;
-      }
-
-      if( uiElement != null )
-      {
-        uiElement.MoveFocus( new TraversalRequest( navDirection ) );
-
-        moveFocusSucceeded = !( uiElement == Keyboard.FocusedElement );
-      }
-
-      return moveFocusSucceeded;
-    }
-
-    internal static void BringIntoViewKeyboardFocusedElement()
-    {
-      FrameworkElement frameworkElement = Keyboard.FocusedElement as FrameworkElement;
-
-      if( frameworkElement != null )
-        frameworkElement.BringIntoView();
-    }
-
-    internal static UIElement GetItemsHostContainerFromElement( DataGridItemsHost itemsHost, DependencyObject element )
-    {
-      UIElement uiElement = element as UIElement;
-
-      // If the focused element is not a UIElement (e.g. : Hyperlink), we go up until we find one.
-      while( ( uiElement == null ) && ( element != null ) )
-      {
-        element = TreeHelper.GetParent( element );
-        uiElement = element as UIElement;
-      }
-
-      if( uiElement == null )
-        return null;
-
-      // Try to do a Contains before enumerating
-      // to avoid manually enumerating if we
-      // already have a container
-      if( itemsHost.Children.Contains( uiElement ) )
-      {
-        return uiElement;
-      }
-      else
-      {
-        foreach( UIElement container in itemsHost.Children )
-        {
-          if( container.IsAncestorOf( uiElement ) )
-          {
-            return container;
-          }
-        }
-      }
-
-      return null;
-    }
-
-    internal bool ValidateTabKeyHandleIsWithin( FrameworkElement originalSource, KeyboardDevice keyboardDevice )
-    {
-      DependencyObject predictedNextVisual = null;
-
-      //If the original source is not a control (e.g. the cells panel instead of a cell), columns will be used to move focus.
-      //In the case of a ListBox set with Cycle or Contained navigation mode, we must move in the other direction if on the first or last item,
-      //since PedictFocus will throw is we use FocusNavigationDirection.First/Last.
-      if( originalSource != null )
-      {
-        if( ( keyboardDevice.Modifiers & ModifierKeys.Shift ) == ModifierKeys.Shift )
-        {
-          predictedNextVisual = originalSource.PredictFocus( FocusNavigationDirection.Left );
-          if( predictedNextVisual == null )
-          {
-            predictedNextVisual = originalSource.PredictFocus( FocusNavigationDirection.Up );
-            if( predictedNextVisual == null )
-            {
-              KeyboardNavigationMode navigationMode = ( KeyboardNavigationMode )originalSource.GetValue( KeyboardNavigation.TabNavigationProperty );
-              if( navigationMode == KeyboardNavigationMode.Cycle || navigationMode == KeyboardNavigationMode.Contained )
-              {
-                predictedNextVisual = originalSource.PredictFocus( FocusNavigationDirection.Right );
-                if( predictedNextVisual == null )
-                {
-                  predictedNextVisual = originalSource.PredictFocus( FocusNavigationDirection.Down );
-                }
-              }
-            }
-          }
-        }
-        else
-        {
-          predictedNextVisual = originalSource.PredictFocus( FocusNavigationDirection.Right );
-          if( predictedNextVisual == null )
-          {
-            predictedNextVisual = originalSource.PredictFocus( FocusNavigationDirection.Down );
-            if( predictedNextVisual == null )
-            {
-              KeyboardNavigationMode navigationMode = ( KeyboardNavigationMode )originalSource.GetValue( KeyboardNavigation.TabNavigationProperty );
-              if( navigationMode == KeyboardNavigationMode.Cycle || navigationMode == KeyboardNavigationMode.Contained )
-              {
-                predictedNextVisual = originalSource.PredictFocus( FocusNavigationDirection.Left );
-                if( predictedNextVisual == null )
-                {
-                  predictedNextVisual = originalSource.PredictFocus( FocusNavigationDirection.Up );
-                }
-              }
-            }
-          }
-        }
-      }
-
-      if( predictedNextVisual != null )
-      {
-        Cell ownerCell = Cell.FindFromChild( predictedNextVisual );
-
-        if( ( ownerCell != null ) && ( ownerCell.ParentColumn == this.ParentDataGridControl.CurrentColumn ) )
-        {
-          if( object.Equals( ownerCell.ParentRow.GetEditingDataContext(), this.ParentDataGridControl.CurrentItemInEdition ) )
-            return true;
-        }
-      }
-
-      return false;
-    }
-
-    internal bool CanRecycleContainer( DependencyObject container )
-    {
-      if( container == null )
-        return false;
-
-      var target = container as IDataGridItemContainer;
-      if( target != null )
-        return target.CanBeRecycled;
-
-      var element = container as UIElement;
-      if( ( element != null ) && ( element.IsKeyboardFocused || element.IsKeyboardFocusWithin ) )
-        return false;
-
-      return true;
-    }
-
-    private static void OnParentDataGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridItemsHost itemsHost = sender as DataGridItemsHost;
-
-      if( itemsHost != null )
-      {
-        DataGridControl newDataGridControl = e.NewValue as DataGridControl;
-        DataGridControl oldDataGridControl = e.OldValue as DataGridControl;
-        itemsHost.OnParentDataGridControlChanged( oldDataGridControl, newDataGridControl );
-      }
-    }
-
-    private void ClearCachedRootDataGridContextAndGenerator()
-    {
-      if( m_generator != null )
-      {
-        // Clean up the previous generator that was used by the ItemsHost
-        m_generator.ItemsChanged -= this.HandleGeneratorItemsChanged;
-        m_generator.ContainersRemoved -= this.HandleGeneratorContainersRemoved;
-        m_generator.RecyclingCandidatesCleaned -= this.HandleGeneratorRecyclingCandidatesCleaned;
-      }
-      m_generatorInitialized = false;
-      m_cachedRootDataGridContext = null;
-    }
-
-    private void HandleGeneratorRecyclingCandidatesCleaned( object sender, RecyclingCandidatesCleanedEventArgs e )
-    {
-      this.OnRecyclingCandidatesCleaned( e.RecyclingCandidates );
-    }
-
-    private void HandleGeneratorContainersRemoved( object sender, ContainersRemovedEventArgs e )
-    {
-      this.OnContainersRemoved( e.RemovedContainers );
-    }
-
-    private void HandleGeneratorItemsChanged( object sender, CustomGeneratorChangedEventArgs e )
-    {
-      // We set this flag to delay any bring into view until a layout pass occured if there is one.
-      // We don't want the bring into view to occur on a container that may move around during the layout pass.
-      this.DelayBringIntoView = true;
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          this.OnItemsAdded();
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          this.OnItemsRemoved( e.Containers );
-          break;
-
-        default:
-          this.OnItemsReset();
-          break;
-      }
-
-      this.Dispatcher.BeginInvoke( new Action( () => this.DelayBringIntoView = false ), DispatcherPriority.Loaded );
-    }
-
-    #region ICustomVirtualizingPanel Members
-
-    void ICustomVirtualizingPanel.BringIntoView( int index )
-    {
-      this.BringIntoViewCore( index );
-    }
-
-    protected virtual void BringIntoViewCore( int index )
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridValidationException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridValidationException.cs
deleted file mode 100644
index b1b3917a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridValidationException.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Runtime.Serialization;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Serializable]
-  internal class DataGridValidationException : DataGridException
-  {
-    public DataGridValidationException()
-      : base()
-    {
-    }
-
-    public DataGridValidationException( string message )
-      : base( message )
-    {
-    }
-
-    public DataGridValidationException( string message, Exception innerException )
-      : base( message, innerException )
-    {
-    }
-
-    protected DataGridValidationException( SerializationInfo info, StreamingContext context )
-      : base( info, context )
-    {
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs
deleted file mode 100644
index b579a8fb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public abstract class DataGridVirtualizingPanel : VirtualizingPanel
-  {
-    static DataGridVirtualizingPanel()
-    {
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata(
-        typeof( DataGridVirtualizingPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnParentDataGridControlChanged ) ) );
-    }
-
-    public IItemContainerGenerator CustomItemContainerGenerator
-    {
-      get
-      {
-        //when generator is "requested", initialize the VPanel.
-        if( m_initializedCustomGenerator == false )
-        {
-          this.InitializeDataGridVirtualizingPanel();
-        }
-
-        IItemContainerGenerator retval = null;
-
-        ItemsControl control1 = ItemsControl.GetItemsOwner( this );
-        if( ( control1 != null ) && ( m_customGenerator != null ) )
-        {
-          if( control1.IsGrouping == true )
-            throw new NotSupportedException( "GroupStyles are not supported by the DataGridVirtualizingPanel." );
-
-          retval = m_customGenerator;
-        }
-        else
-        {
-          retval = this.ItemContainerGenerator;
-        }
-
-        return retval;
-      }
-    }
-
-    #region ItemCount Property
-
-    public int ItemCount
-    {
-      get
-      {
-        CustomItemContainerGenerator generator = this.InternalCustomItemContainerGenerator;
-
-        if( generator != null )
-        {
-          return generator.ItemCount;
-        }
-        else
-        {
-          // See how many items there are
-          ItemsControl itemsControl = ItemsControl.GetItemsOwner( this );
-
-          int itemCount;
-
-          if( itemsControl != null )
-          {
-            itemCount = itemsControl.HasItems ? itemsControl.Items.Count : 0;
-          }
-          else
-          {
-            itemCount = this.Children.Count;
-          }
-
-          return itemCount;
-        }
-      }
-    }
-
-    #endregion
-
-    #region InternalCustomItemContainerGenerator Property
-
-    private CustomItemContainerGenerator InternalCustomItemContainerGenerator
-    {
-      get
-      {
-        if( m_initializedCustomGenerator == false )
-        {
-          this.InitializeDataGridVirtualizingPanel();
-
-        }
-
-        CustomItemContainerGenerator retval = null;
-        ItemsControl control1 = ItemsControl.GetItemsOwner( this );
-        if( ( control1 != null ) && ( control1.IsGrouping == false ) )
-        {
-          retval = m_customGenerator;
-        }
-
-        return retval;
-      }
-    }
-
-    #endregion
-
-    #region ItemIndex Attached Property
-
-    public static readonly DependencyProperty ItemIndexProperty =
-        DependencyProperty.RegisterAttached( "ItemIndex", typeof( int ), typeof( DataGridVirtualizingPanel ), new UIPropertyMetadata( -1 ) );
-
-    public static int GetItemIndex( DependencyObject obj )
-    {
-      return ( int )obj.GetValue( DataGridVirtualizingPanel.ItemIndexProperty );
-    }
-
-    public static void SetItemIndex( DependencyObject obj, int value )
-    {
-      obj.SetValue( DataGridVirtualizingPanel.ItemIndexProperty, value );
-    }
-
-    #endregion ItemIndex Attached Property
-
-    protected sealed override void OnItemsChanged( object sender, ItemsChangedEventArgs args )
-    {
-      //I don't want anybody to override this since we might be hooked to the CustomItemContainerGenerator
-      base.OnItemsChanged( sender, args );
-
-      //Ok, I only want to process this if i'm NOT hooked to the CustomItemContainerGenerator
-      if( this.InternalCustomItemContainerGenerator == null )
-      {
-        switch( args.Action )
-        {
-          //In case of a Reset, nothing to do since the Panel base class has cleared the internal children already!
-          case NotifyCollectionChangedAction.Reset:
-            break;
-
-          //If there was a removal (collapsing)
-          //or if there was a Move (edition of a Sorted field)
-          case NotifyCollectionChangedAction.Move:
-          case NotifyCollectionChangedAction.Remove:
-            //remove the concerned range
-            int index = args.OldPosition.Index;
-
-            Debug.Assert( index != -1 );
-
-            this.RemoveInternalChildRange( index, args.ItemCount );
-            break;
-
-          //if some items were added (expansion)
-          case NotifyCollectionChangedAction.Add:
-            //invalidate layout so that the items will be inserted in place!
-            this.InvalidateMeasure();
-            break;
-
-          case NotifyCollectionChangedAction.Replace:
-            Debug.Fail( "NotifyCollectionChangedAction.Replace" );
-            break;
-
-          default:
-            break;
-        }
-      }
-    }
-
-    protected override void OnClearChildren()
-    {
-      //Stop listening to the events of the System Generator if this one is not being used.
-      if( ( this.InternalCustomItemContainerGenerator == null ) && ( this.ItemContainerGenerator != null ) )
-      {
-        this.ItemContainerGenerator.RemoveAll();
-      }
-
-      base.OnClearChildren();
-    }
-
-    private void InitializeDataGridVirtualizingPanel()
-    {
-      DataGridControl dataGridControl = ItemsControl.GetItemsOwner( this ) as DataGridControl;
-
-      if( dataGridControl != null )
-      {
-        //Retrieve the Grouping Custom Generator
-        m_customGenerator = dataGridControl.CustomItemContainerGenerator;
-
-        //Remove all items from the generator, this is to ensure that the panel starts "fresh" with items.
-        if( this.InternalChildren.Count > 0 )
-        {
-          this.RemoveInternalChildRange( 0, this.InternalChildren.Count );
-        }
-        ( ( IItemContainerGenerator )m_customGenerator ).RemoveAll();
-
-        m_customGenerator.ItemsChanged += OnCustomGeneratorItemsChanged;
-
-        m_initializedCustomGenerator = true;
-      }
-    }
-
-    private void OnCustomGeneratorItemsChanged( object sender, CustomGeneratorChangedEventArgs e )
-    {
-
-      switch( e.Action )
-      {
-        //In case of a Reset, nothing to do since the Panel base class has cleared the internal children already!
-        case NotifyCollectionChangedAction.Reset:
-          {
-            if( this.InternalChildren.Count > 0 )
-            {
-              this.RemoveInternalChildRange( 0, this.InternalChildren.Count );
-            }
-            else
-            {
-              this.InvalidateMeasure();
-            }
-          }
-          break;
-
-        //If there was a removal (collapsing)
-        //or if there was a Move (edition of a Sorted field)
-        case NotifyCollectionChangedAction.Move:
-        case NotifyCollectionChangedAction.Remove:
-          {
-            var containers = new HashSet<DependencyObject>( e.Containers ?? new DependencyObject[ 0 ] );
-
-            if( containers.Count > 0 )
-            {
-              var children = this.InternalChildren;
-              var from = -1;
-              var removeCount = 0;
-              var i = 0;
-
-              while( i < children.Count )
-              {
-                var container = children[ i ];
-
-                if( containers.Contains( container ) )
-                {
-                  containers.Remove( container );
-
-                  if( from < 0 )
-                  {
-                    from = i;
-                  }
-
-                  removeCount++;
-                  i++;
-                }
-                else if( removeCount > 0 )
-                {
-                  Debug.Assert( from >= 0 );
-                  this.RemoveInternalChildRange( from, removeCount );
-
-                  from = -1;
-                  removeCount = 0;
-                }
-                else
-                {
-                  i++;
-                }
-              }
-
-              if( removeCount > 0 )
-              {
-                Debug.Assert( from >= 0 );
-                this.RemoveInternalChildRange( from, removeCount );
-              }
-            }
-            else
-            {
-              this.InvalidateMeasure();
-            }
-          }
-          break;
-
-        //if some items were added (expansion)
-        case NotifyCollectionChangedAction.Add:
-          {
-            //invalidate layout so that the items will be inserted in place!
-            this.InvalidateMeasure();
-          }
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          {
-            Debug.Fail( "NotifyCollectionChangedAction.Replace" );
-          }
-          break;
-
-        default:
-          break;
-      }
-    }
-
-    private static void OnParentDataGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridVirtualizingPanel panel = ( DataGridVirtualizingPanel )sender;
-
-      if( ( panel != null ) && ( e.NewValue == null ) && ( panel.m_customGenerator != null ) )
-      {
-        panel.m_customGenerator.ItemsChanged -= panel.OnCustomGeneratorItemsChanged;
-        panel.m_customGenerator = null;
-        panel.m_initializedCustomGenerator = false;
-      }
-    }
-
-    private bool m_initializedCustomGenerator = false;
-    private CustomItemContainerGenerator m_customGenerator = null;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptor.cs
deleted file mode 100644
index e7bdfb8c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptor.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataItemEventDescriptor : DataItemEventDescriptorBase
-  {
-    #region Constructor
-
-    internal DataItemEventDescriptor(
-      DataItemTypeDescriptor owner,
-      EventDescriptor parent,
-      Type componentType,
-      Type eventType,
-      Action<object, object> addHandler,
-      Action<object, object> removeHandler )
-      : base( owner, parent )
-    {
-      if( componentType == null )
-        throw new ArgumentNullException( "componentType" );
-
-      if( eventType == null )
-        throw new ArgumentNullException( "eventType" );
-
-      if( addHandler == null )
-        throw new ArgumentNullException( "addHandler" );
-
-      if( removeHandler == null )
-        throw new ArgumentNullException( "removeHandler" );
-
-      m_componentType = componentType;
-      m_eventType = eventType;
-      m_addHandler = addHandler;
-      m_removeHandler = removeHandler;
-    }
-
-    #endregion
-
-    #region ComponentType Property
-
-    public override Type ComponentType
-    {
-      get
-      {
-        return m_componentType;
-      }
-    }
-
-    private readonly Type m_componentType;
-
-    #endregion
-
-    #region EventType Property
-
-    public override Type EventType
-    {
-      get
-      {
-        return m_eventType;
-      }
-    }
-
-    private readonly Type m_eventType;
-
-    #endregion
-
-    public override void AddEventHandler( object component, Delegate value )
-    {
-      if( component == null )
-        return;
-
-      m_addHandler.Invoke( component, value );
-    }
-
-    public override void RemoveEventHandler( object component, Delegate value )
-    {
-      if( component == null )
-        return;
-
-      m_removeHandler.Invoke( component, value );
-    }
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      return ( obj is DataItemEventDescriptor )
-          && ( base.Equals( obj ) );
-    }
-
-    #region Private Fields
-
-    private readonly Action<object, object> m_addHandler;
-    private readonly Action<object, object> m_removeHandler;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorBase.cs
deleted file mode 100644
index 00179c25..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorBase.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class DataItemEventDescriptorBase : EventDescriptor
-  {
-    protected DataItemEventDescriptorBase( DataItemTypeDescriptor owner, EventDescriptor parent )
-      : base( parent )
-    {
-      if( owner == null )
-        throw new ArgumentNullException( "owner" );
-
-      m_owner = owner;
-    }
-
-    #region IsMulticast Property
-
-    public override bool IsMulticast
-    {
-      get
-      {
-        return typeof( MulticastDelegate ).IsAssignableFrom( this.EventType );
-      }
-    }
-
-    #endregion
-
-    #region Owner Protected Property
-
-    protected DataItemTypeDescriptor Owner
-    {
-      get
-      {
-        return m_owner;
-      }
-    }
-
-    private readonly DataItemTypeDescriptor m_owner;
-
-    #endregion
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      var descriptor = obj as DataItemEventDescriptorBase;
-      if( object.ReferenceEquals( descriptor, null ) )
-        return false;
-
-      return ( base.Equals( obj ) )
-          && ( descriptor.ComponentType == this.ComponentType )
-          && ( descriptor.EventType == this.EventType )
-          && ( descriptor.IsMulticast == this.IsMulticast );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorFactory.cs
deleted file mode 100644
index e5afde0b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemEventDescriptorFactory.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Globalization;
-using System.Reflection;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataItemEventDescriptorFactory
-  {
-    #region Static Fields
-
-    private static readonly Type s_reflectEventDescriptorType;
-
-    #endregion
-
-    static DataItemEventDescriptorFactory()
-    {
-      s_reflectEventDescriptorType = Assembly.GetAssembly( typeof( EventDescriptor ) ).GetType( "System.ComponentModel.ReflectEventDescriptor" );
-    }
-
-    internal DataItemEventDescriptorFactory( DataItemTypeDescriptor typeDescriptor )
-    {
-      if( typeDescriptor == null )
-        throw new ArgumentNullException( "typeDescriptor" );
-
-      m_typeDescriptor = typeDescriptor;
-    }
-
-    internal DataItemEventDescriptor CreateEventDescriptor( EventDescriptor source )
-    {
-      if( !DataItemEventDescriptorFactory.IsReflected( source ) )
-        return null;
-
-      var componentType = source.ComponentType;
-
-      EventInfo eventInfo;
-      try
-      {
-        eventInfo = componentType.GetEvent( source.Name, BindingFlags.Public | BindingFlags.Instance );
-        if( eventInfo == null )
-          return null;
-      }
-      catch( AmbiguousMatchException )
-      {
-        return null;
-      }
-
-      var handlerType = eventInfo.EventHandlerType;
-      Debug.Assert( handlerType == source.EventType );
-
-      var creatorHelper = DelegateCreatorHelperFactory.CreateHelper( componentType, handlerType );
-
-      var addHandler = DataItemEventDescriptorFactory.CreateAddHandler( eventInfo, creatorHelper );
-      if( addHandler == null )
-        return null;
-
-      var removeHandler = DataItemEventDescriptorFactory.CreateRemoveHandler( eventInfo, creatorHelper );
-      if( removeHandler == null )
-        return null;
-
-      return new DataItemEventDescriptor( m_typeDescriptor, source, componentType, handlerType, addHandler, removeHandler );
-    }
-
-    private static bool IsReflected( EventDescriptor descriptor )
-    {
-      return ( descriptor != null )
-          && ( descriptor.GetType() == s_reflectEventDescriptorType );
-    }
-
-    private static Action<object, object> CreateAddHandler( EventInfo eventInfo, IDelegateCreatorHelper helper )
-    {
-      var methodInfo = eventInfo.GetAddMethod();
-      if( methodInfo == null )
-        return null;
-
-      Debug.Assert( methodInfo.IsPublic );
-
-
-      return helper.CreateAddOrRemoveHandler( methodInfo );
-    }
-
-    private static Action<object, object> CreateRemoveHandler( EventInfo eventInfo, IDelegateCreatorHelper helper )
-    {
-      var methodInfo = eventInfo.GetRemoveMethod();
-      if( methodInfo == null )
-        return null;
-
-      Debug.Assert( methodInfo.IsPublic );
-
-
-      return helper.CreateAddOrRemoveHandler( methodInfo );
-    }
-
-    #region Private Fields
-
-    private readonly DataItemTypeDescriptor m_typeDescriptor;
-
-    #endregion
-
-    #region IDelegateCreatorHelper Private Interface
-
-    private interface IDelegateCreatorHelper
-    {
-      Action<object, object> CreateAddOrRemoveHandler( MethodInfo methodInfo );
-    }
-
-    #endregion
-
-    #region DelegateCreatorHelperFactory Private Class
-
-    private static class DelegateCreatorHelperFactory
-    {
-      internal static IDelegateCreatorHelper CreateHelper( Type componentType, Type handleType )
-      {
-        return ( IDelegateCreatorHelper )typeof( DelegateCreatorHelper<,> ).MakeGenericType( componentType, handleType ).GetConstructor( Type.EmptyTypes ).Invoke( null );
-      }
-    }
-
-    #endregion
-
-    #region DelegateCreatorHelper<> Private Class
-
-    private sealed class DelegateCreatorHelper<TSource, THandler> : IDelegateCreatorHelper
-    {
-      public Action<object, object> CreateAddOrRemoveHandler( MethodInfo methodInfo )
-      {
-        Debug.Assert( methodInfo != null );
-        Debug.Assert( methodInfo.IsPublic );
-        Debug.Assert( methodInfo.GetParameters().Length == 1 );
-        Debug.Assert( methodInfo.GetParameters()[ 0 ].ParameterType == typeof( THandler ) );
-
-        if( !typeof( TSource ).IsValueType )
-        {
-          var d = ( Action<TSource, THandler> )Delegate.CreateDelegate( typeof( Action<TSource, THandler> ), methodInfo, false );
-          if( d != null )
-            return ( source, handler ) =>
-              {
-                if( !( source is TSource ) )
-                  return;
-
-                d.Invoke( ( TSource )source, ( THandler )handler );
-              };
-        }
-
-        return ( source, handler ) =>
-          {
-            if( !( source is TSource ) )
-              return;
-
-            methodInfo.Invoke( source, new object[] { handler } );
-          };
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemIndexerDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemIndexerDescriptor.cs
deleted file mode 100644
index 430fab8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemIndexerDescriptor.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class DataItemIndexerDescriptor : DataItemPropertyDescriptorBase
-  {
-    internal DataItemIndexerDescriptor( DataItemTypeDescriptor owner, IndexerDescriptor parent )
-      : base( owner, parent, parent.GetValue, ( !parent.IsReadOnly ) ? parent.SetValue : default( Action<object, object> ), null )
-    {
-      m_descriptor = parent;
-    }
-
-    #region ComponentType Property
-
-    public sealed override Type ComponentType
-    {
-      get
-      {
-        return m_descriptor.ComponentType;
-      }
-    }
-
-    #endregion
-
-    #region PropertyType Property
-
-    public sealed override Type PropertyType
-    {
-      get
-      {
-        return m_descriptor.PropertyType;
-      }
-    }
-
-    #endregion
-
-    #region DisplayName Property
-
-    public override string DisplayName
-    {
-      get
-      {
-        return m_descriptor.DisplayName;
-      }
-    }
-
-    #endregion
-
-    #region IndexerParameters Internal Property
-
-    internal string IndexerParameters
-    {
-      get
-      {
-        return m_descriptor.IndexerParameters;
-      }
-    }
-
-    #endregion
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      return ( obj is DataItemIndexerDescriptor )
-          && ( base.Equals( obj ) );
-    }
-
-    protected override bool MustInhibitValueChanged( object component )
-    {
-      return false;
-    }
-
-    protected override bool IsValueChangedInhibited( object component )
-    {
-      return false;
-    }
-
-    protected override void InhibitValueChanged( object component )
-    {
-    }
-
-    protected override void ResetInhibitValueChanged( object component )
-    {
-    }
-
-    private readonly IndexerDescriptor m_descriptor;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptor.cs
deleted file mode 100644
index 3630874e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptor.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataItemPropertyDescriptor : DataItemPropertyDescriptorBase
-  {
-    #region Constructor
-
-    internal DataItemPropertyDescriptor(
-      DataItemTypeDescriptor owner,
-      PropertyDescriptor parent,
-      Type componentType,
-      Type propertyType,
-      Func<object, object> getter,
-      Action<object, object> setter,
-      Action<object> resetter )
-      : base( owner, parent, getter, setter, resetter )
-    {
-      if( componentType == null )
-        throw new ArgumentNullException( "componentType" );
-
-      if( propertyType == null )
-        throw new ArgumentNullException( "propertyType" );
-
-      m_componentType = componentType;
-      m_propertyType = propertyType;
-    }
-
-    #endregion
-
-    #region ComponentType Property
-
-    public sealed override Type ComponentType
-    {
-      get
-      {
-        return m_componentType;
-      }
-    }
-
-    private readonly Type m_componentType;
-
-    #endregion
-
-    #region PropertyType Property
-
-    public sealed override Type PropertyType
-    {
-      get
-      {
-        return m_propertyType;
-      }
-    }
-
-    private readonly Type m_propertyType;
-
-    #endregion
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      return ( obj is DataItemPropertyDescriptor )
-          && ( base.Equals( obj ) );
-    }
-
-    protected override bool MustInhibitValueChanged( object component )
-    {
-      return false;
-    }
-
-    protected override bool IsValueChangedInhibited( object component )
-    {
-      return false;
-    }
-
-    protected override void InhibitValueChanged( object component )
-    {
-    }
-
-    protected override void ResetInhibitValueChanged( object component )
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorBase.cs
deleted file mode 100644
index 0c3c9dfb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorBase.cs
+++ /dev/null
@@ -1,340 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class DataItemPropertyDescriptorBase : PropertyDescriptor
-  {
-    #region Static Fields
-
-    private static readonly object NotInitialized = new object();
-    private static readonly object NotSet = new object();
-
-    #endregion
-
-    protected DataItemPropertyDescriptorBase(
-      DataItemTypeDescriptor owner,
-      PropertyDescriptor parent,
-      Func<object, object> getter,
-      Action<object, object> setter,
-      Action<object> resetter )
-      : base( parent )
-    {
-      if( owner == null )
-        throw new ArgumentNullException( "owner" );
-
-      if( getter == null )
-        throw new ArgumentNullException( "getter" );
-
-      m_owner = owner;
-      m_getter = getter;
-      m_setter = setter;
-      m_resetter = resetter;
-    }
-
-    #region IsReadOnly Property
-
-    public sealed override bool IsReadOnly
-    {
-      get
-      {
-        if( m_setter == null )
-          return true;
-
-        var attribute = ( ReadOnlyAttribute )this.Attributes[ typeof( ReadOnlyAttribute ) ];
-
-        return ( attribute != null )
-            && ( attribute.IsReadOnly );
-      }
-    }
-
-    #endregion
-
-    #region Owner Protected Property
-
-    protected DataItemTypeDescriptor Owner
-    {
-      get
-      {
-        return m_owner;
-      }
-    }
-
-    private readonly DataItemTypeDescriptor m_owner;
-
-    #endregion
-
-    #region IsValueChangeEventEnabled Private Property
-
-    private bool IsValueChangeEventEnabled
-    {
-      get
-      {
-        return ( this.SupportsChangeEvents )
-            || ( !this.IsReadOnly );
-      }
-    }
-
-    #endregion
-
-    #region DefaultValue Private Property
-
-    private object DefaultValue
-    {
-      get
-      {
-        if( m_defaultValue == DataItemPropertyDescriptorBase.NotInitialized )
-        {
-          var attribute = ( DefaultValueAttribute )this.Attributes[ typeof( DefaultValueAttribute ) ];
-          if( attribute != null )
-          {
-            var propertyType = this.PropertyType;
-            var value = attribute.Value;
-
-            if( ( value != null ) && ( propertyType.IsEnum ) && ( Enum.GetUnderlyingType( propertyType ) == value.GetType() ) )
-            {
-              value = Enum.ToObject( propertyType, value );
-            }
-
-            m_defaultValue = value;
-          }
-          else
-          {
-            m_defaultValue = DataItemPropertyDescriptorBase.NotSet;
-          }
-        }
-
-        return m_defaultValue;
-      }
-    }
-
-    private object m_defaultValue = DataItemPropertyDescriptorBase.NotInitialized;
-
-    #endregion
-
-    #region AmbientValue Private Property
-
-    private object AmbientValue
-    {
-      get
-      {
-        if( m_ambientValue == DataItemPropertyDescriptorBase.NotInitialized )
-        {
-          var attribute = ( AmbientValueAttribute )this.Attributes[ typeof( AmbientValueAttribute ) ];
-          if( attribute != null )
-          {
-            m_ambientValue = attribute.Value;
-          }
-          else
-          {
-            m_ambientValue = DataItemPropertyDescriptorBase.NotSet;
-          }
-        }
-
-        return m_ambientValue;
-      }
-    }
-
-    private object m_ambientValue = DataItemPropertyDescriptorBase.NotInitialized;
-
-    #endregion
-
-    public override bool ShouldSerializeValue( object component )
-    {
-      if( this.IsReadOnly )
-        return this.Attributes.Contains( DesignerSerializationVisibilityAttribute.Content );
-
-      if( this.DefaultValue != DataItemPropertyDescriptorBase.NotSet )
-        return !object.Equals( this.GetValue( component ), this.DefaultValue );
-
-      return true;
-    }
-
-    public sealed override object GetValue( object component )
-    {
-      if( component == null )
-        return null;
-
-      return m_getter.Invoke( component );
-    }
-
-    public sealed override void SetValue( object component, object value )
-    {
-      if( ( component == null ) || this.IsReadOnly )
-        return;
-
-      Debug.Assert( m_setter != null );
-
-      bool inhibit;
-
-      lock( m_syncRoot )
-      {
-        inhibit = this.MustInhibitValueChanged( component );
-
-        if( inhibit )
-        {
-          this.InhibitValueChanged( component );
-        }
-      }
-
-      try
-      {
-        m_setter.Invoke( component, value );
-      }
-      finally
-      {
-        if( inhibit )
-        {
-          lock( m_syncRoot )
-          {
-            this.ResetInhibitValueChanged( component );
-          }
-        }
-      }
-
-      this.OnValueChanged( component, EventArgs.Empty );
-    }
-
-    public sealed override bool CanResetValue( object component )
-    {
-      if( this.IsReadOnly )
-        return false;
-
-      if( this.DefaultValue != DataItemPropertyDescriptorBase.NotSet )
-        return !object.Equals( this.GetValue( component ), this.DefaultValue );
-
-      if( m_resetter != null )
-        return true;
-
-      return ( this.AmbientValue != DataItemPropertyDescriptorBase.NotSet )
-          && ( this.ShouldSerializeValue( component ) );
-    }
-
-    public sealed override void ResetValue( object component )
-    {
-      if( ( component == null ) || this.IsReadOnly )
-        return;
-
-      if( this.DefaultValue != DataItemPropertyDescriptorBase.NotSet )
-      {
-        this.SetValue( component, this.DefaultValue );
-      }
-      else if( this.AmbientValue != DataItemPropertyDescriptorBase.NotSet )
-      {
-        this.SetValue( component, this.AmbientValue );
-      }
-      else if( m_resetter != null )
-      {
-        Debug.Assert( this.CanResetValue( component ) );
-        m_resetter.Invoke( component );
-      }
-    }
-
-    public sealed override void AddValueChanged( object component, EventHandler handler )
-    {
-      // There is no need to set the handler if the ValueChanged event will never be triggered.
-      if( !this.IsValueChangeEventEnabled )
-        return;
-
-      lock( m_syncRoot )
-      {
-        // We register only once on the target component.
-        if( this.SupportsChangeEvents && ( this.GetValueChangedHandler( component ) == null ) )
-        {
-          this.AddValueChangedCore( component );
-        }
-
-        base.AddValueChanged( component, handler );
-      }
-    }
-
-    public sealed override void RemoveValueChanged( object component, EventHandler handler )
-    {
-      // There is no need to remove the handler if it was never set in the first place.
-      if( !this.IsValueChangeEventEnabled )
-        return;
-
-      lock( m_syncRoot )
-      {
-        base.RemoveValueChanged( component, handler );
-
-        // We unregister only when there is no handler left for the target component.
-        if( this.SupportsChangeEvents && ( this.GetValueChangedHandler( component ) == null ) )
-        {
-          this.RemoveValueChangedCore( component );
-        }
-      }
-    }
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      var descriptor = obj as DataItemPropertyDescriptorBase;
-      if( object.ReferenceEquals( descriptor, null ) )
-        return false;
-
-      return ( base.Equals( descriptor ) )
-          && ( descriptor.ComponentType == this.ComponentType )
-          && ( descriptor.IsReadOnly == this.IsReadOnly )
-          && ( descriptor.SupportsChangeEvents == this.SupportsChangeEvents );
-    }
-
-    protected sealed override void OnValueChanged( object component, EventArgs e )
-    {
-      if( component == null )
-        return;
-
-      lock( m_syncRoot )
-      {
-        if( this.IsValueChangedInhibited( component ) )
-          return;
-      }
-
-      base.OnValueChanged( component, e );
-    }
-
-    protected abstract bool MustInhibitValueChanged( object component );
-    protected abstract bool IsValueChangedInhibited( object component );
-    protected abstract void InhibitValueChanged( object component );
-    protected abstract void ResetInhibitValueChanged( object component );
-
-    protected virtual void AddValueChangedCore( object component )
-    {
-    }
-
-    protected virtual void RemoveValueChangedCore( object component )
-    {
-    }
-
-    #region Private Fields
-
-    private readonly object m_syncRoot = new object();
-    private readonly Func<object, object> m_getter;
-    private readonly Action<object, object> m_setter;
-    private readonly Action<object> m_resetter;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorFactory.cs
deleted file mode 100644
index db7b91b5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemPropertyDescriptorFactory.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataItemPropertyDescriptorFactory
-  {
-    #region Static Fields
-
-    private static readonly Type s_reflectPropertyDescriptorType;
-
-    #endregion
-
-    #region Constructor
-
-    static DataItemPropertyDescriptorFactory()
-    {
-      s_reflectPropertyDescriptorType = Assembly.GetAssembly( typeof( PropertyDescriptor ) ).GetType( "System.ComponentModel.ReflectPropertyDescriptor" );
-    }
-
-    internal DataItemPropertyDescriptorFactory( DataItemTypeDescriptor typeDescriptor )
-    {
-      if( typeDescriptor == null )
-        throw new ArgumentNullException( "typeDescriptor" );
-
-      m_typeDescriptor = typeDescriptor;
-    }
-
-    #endregion
-
-    internal DataItemPropertyDescriptor CreatePropertyDescriptor( PropertyDescriptor source )
-    {
-      if( !DataItemPropertyDescriptorFactory.IsReflected( source ) )
-        return null;
-
-      var componentType = source.ComponentType;
-
-      PropertyInfo propertyInfo;
-      try
-      {
-        propertyInfo = componentType.GetProperty( source.Name, BindingFlags.Public | BindingFlags.Instance );
-        if( ( propertyInfo == null ) || DataItemPropertyDescriptorFactory.IsIndexed( propertyInfo ) )
-          return null;
-      }
-      catch( AmbiguousMatchException )
-      {
-        return null;
-      }
-
-      var propertyType = propertyInfo.PropertyType;
-      Debug.Assert( propertyType == source.PropertyType );
-
-      var creatorHelper = DelegateCreatorHelperFactory.CreateHelper( componentType, propertyType );
-
-      var getter = DataItemPropertyDescriptorFactory.CreateGetter( propertyInfo, creatorHelper );
-      if( getter == null )
-        return null;
-
-      var setter = DataItemPropertyDescriptorFactory.CreateSetter( propertyInfo, creatorHelper );
-      var resetter = DataItemPropertyDescriptorFactory.CreateResetter( componentType, propertyInfo, creatorHelper );
-
-      var propertyChangedEvent = this.GetPropertyChangedEvent( propertyInfo.Name );
-      if( propertyChangedEvent != null )
-        return new ValueChangeDataItemPropertyDescriptor( m_typeDescriptor, source, componentType, propertyType, getter, setter, resetter, propertyChangedEvent );
-
-      return new DataItemPropertyDescriptor( m_typeDescriptor, source, componentType, propertyType, getter, setter, resetter );
-    }
-
-    internal DataItemIndexerDescriptor CreateIndexerDescriptor( IndexerDescriptor source )
-    {
-      var propertyChangedEvent = this.GetPropertyChangedEvent( null );
-      if( propertyChangedEvent != null )
-        return new ValueChangeDataItemIndexerDescriptor( m_typeDescriptor, source, propertyChangedEvent );
-
-      return new DataItemIndexerDescriptor( m_typeDescriptor, source );
-    }
-
-    private void InitializeEvents()
-    {
-      if( m_eventDescriptors != null )
-        return;
-
-      m_eventDescriptors = m_typeDescriptor.GetEvents();
-      m_notifyPropertyChangedEventDescriptor = ( from ed in m_eventDescriptors.Cast<EventDescriptor>()
-                                                 where ( ed != null )
-                                                    && ( ed.Name == "PropertyChanged" )
-                                                    && ( typeof( INotifyPropertyChanged ).IsAssignableFrom( ed.ComponentType ) )
-                                                    && ( typeof( PropertyChangedEventHandler ).IsAssignableFrom( ed.EventType ) )
-                                                 select ed ).FirstOrDefault();
-    }
-
-    private EventDescriptor GetNotifyPropertyChangedEvent()
-    {
-      this.InitializeEvents();
-
-      return m_notifyPropertyChangedEventDescriptor;
-    }
-
-    private EventDescriptor GetSinglePropertyChangedEvent( string propertyName )
-    {
-      this.InitializeEvents();
-
-      if( string.IsNullOrEmpty( propertyName ) )
-        return null;
-
-      var eventName = string.Format( CultureInfo.InvariantCulture, "{0}Changed", propertyName );
-
-      return ( from ed in m_eventDescriptors.Cast<EventDescriptor>()
-               where ( ed != null )
-                  && ( ed.Name == eventName )
-                  && ( typeof( EventHandler ).IsAssignableFrom( ed.EventType ) )
-               select ed ).FirstOrDefault();
-    }
-
-    private EventDescriptor GetPropertyChangedEvent( string propertyName )
-    {
-      var descriptor = this.GetSinglePropertyChangedEvent( propertyName );
-      if( descriptor != null )
-        return descriptor;
-
-      return this.GetNotifyPropertyChangedEvent();
-    }
-
-    private static bool IsReflected( PropertyDescriptor descriptor )
-    {
-      return ( descriptor != null )
-          && ( descriptor.GetType() == s_reflectPropertyDescriptorType );
-    }
-
-    private static bool IsIndexed( PropertyInfo propertyInfo )
-    {
-      var parameters = propertyInfo.GetIndexParameters();
-
-      return ( parameters != null )
-          && ( parameters.Length > 0 );
-    }
-
-    private static Func<object, object> CreateGetter( PropertyInfo propertyInfo, IDelegateCreatorHelper helper )
-    {
-      if( !propertyInfo.CanRead )
-        return null;
-
-      var methodInfo = propertyInfo.GetGetMethod();
-      if( methodInfo == null )
-        return null;
-
-      Debug.Assert( methodInfo.IsPublic );
-
-
-      return helper.CreateGetter( methodInfo );
-    }
-
-    private static Action<object, object> CreateSetter( PropertyInfo propertyInfo, IDelegateCreatorHelper helper )
-    {
-      if( !propertyInfo.CanWrite )
-        return null;
-
-      var methodInfo = propertyInfo.GetSetMethod();
-      if( methodInfo == null )
-        return null;
-
-      Debug.Assert( methodInfo.IsPublic );
-
-
-      return helper.CreateSetter( methodInfo );
-    }
-
-    private static Action<object> CreateResetter( Type componentType, PropertyInfo propertyInfo, IDelegateCreatorHelper helper )
-    {
-      MethodInfo methodInfo;
-      try
-      {
-        methodInfo = componentType.GetMethod( string.Format( CultureInfo.InvariantCulture, "Reset{0}", propertyInfo.Name ), BindingFlags.Public | BindingFlags.Instance, null, Type.EmptyTypes, null );
-        if( ( methodInfo == null ) || methodInfo.IsGenericMethod )
-          return null;
-      }
-      catch( AmbiguousMatchException )
-      {
-        return null;
-      }
-
-      Debug.Assert( methodInfo.IsPublic );
-
-
-      return helper.CreateResetter( methodInfo );
-    }
-
-    #region Private Fields
-
-    private readonly DataItemTypeDescriptor m_typeDescriptor;
-    private EventDescriptorCollection m_eventDescriptors; //null
-    private EventDescriptor m_notifyPropertyChangedEventDescriptor; //null
-
-    #endregion
-
-    #region IDelegateCreatorHelper Private Interface
-
-    private interface IDelegateCreatorHelper
-    {
-      Func<object, object> CreateGetter( MethodInfo methodInfo );
-      Action<object, object> CreateSetter( MethodInfo methodInfo );
-      Action<object> CreateResetter( MethodInfo methodInfo );
-    }
-
-    #endregion
-
-    #region DelegateCreatorHelperFactory Private Class
-
-    private static class DelegateCreatorHelperFactory
-    {
-      internal static IDelegateCreatorHelper CreateHelper( Type componentType, Type propertyType )
-      {
-        return ( IDelegateCreatorHelper )typeof( DelegateCreatorHelper<,> ).MakeGenericType( componentType, propertyType ).GetConstructor( Type.EmptyTypes ).Invoke( null );
-      }
-    }
-
-    #endregion
-
-    #region DelegateCreatorHelper<> Private Class
-
-    private sealed class DelegateCreatorHelper<TSource, TProperty> : IDelegateCreatorHelper
-    {
-      public Func<object, object> CreateGetter( MethodInfo methodInfo )
-      {
-        Debug.Assert( methodInfo != null );
-        Debug.Assert( methodInfo.IsPublic );
-        Debug.Assert( methodInfo.GetParameters().Length == 0 );
-        Debug.Assert( methodInfo.ReturnType == typeof( TProperty ) );
-
-        if( typeof( TSource ).IsValueType )
-        {
-          var d = ( ValueTypeGetter )Delegate.CreateDelegate( typeof( ValueTypeGetter ), methodInfo, false );
-          if( d != null )
-            return ( source ) =>
-            {
-              if( !( source is TSource ) )
-                return default( TProperty );
-
-              var s = ( TSource )source;
-
-              return d.Invoke( ref s );
-            };
-        }
-        else
-        {
-          var d = ( Func<TSource, TProperty> )Delegate.CreateDelegate( typeof( Func<TSource, TProperty> ), methodInfo, false );
-          if( d != null )
-            return ( source ) =>
-            {
-              if( !( source is TSource ) )
-                return default( TProperty );
-
-              return d.Invoke( ( TSource )source );
-            };
-        }
-
-        return ( source ) =>
-        {
-          if( !( source is TSource ) )
-            return default( TProperty );
-
-          return methodInfo.Invoke( source, null );
-        };
-      }
-
-      public Action<object, object> CreateSetter( MethodInfo methodInfo )
-      {
-        Debug.Assert( methodInfo != null );
-        Debug.Assert( methodInfo.IsPublic );
-        Debug.Assert( methodInfo.GetParameters().Length == 1 );
-        Debug.Assert( methodInfo.GetParameters()[ 0 ].ParameterType == typeof( TProperty ) );
-
-        if( !typeof( TSource ).IsValueType )
-        {
-          var d = ( Action<TSource, TProperty> )Delegate.CreateDelegate( typeof( Action<TSource, TProperty> ), methodInfo );
-          if( d != null )
-            return ( source, value ) =>
-            {
-              if( !( source is TSource ) )
-                return;
-
-              d.Invoke( ( TSource )source, ( TProperty )value );
-            };
-        }
-
-        return ( source, value ) =>
-        {
-          if( !( source is TSource ) )
-            return;
-
-          methodInfo.Invoke( source, new object[] { value } );
-        };
-      }
-
-      public Action<object> CreateResetter( MethodInfo methodInfo )
-      {
-        Debug.Assert( methodInfo != null );
-        Debug.Assert( methodInfo.IsPublic );
-        Debug.Assert( methodInfo.GetParameters().Length == 0 );
-
-        if( !typeof( TSource ).IsValueType )
-        {
-          var d = ( Action<TSource> )Delegate.CreateDelegate( typeof( Action<TSource> ), methodInfo );
-          if( d != null )
-            return ( source ) =>
-            {
-              if( !( source is TSource ) )
-                return;
-
-              d.Invoke( ( TSource )source );
-            };
-        }
-
-        return ( source ) =>
-        {
-          if( !( source is TSource ) )
-            return;
-
-          methodInfo.Invoke( source, null );
-        };
-      }
-
-      private delegate TProperty ValueTypeGetter( ref TSource source );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptionProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptionProvider.cs
deleted file mode 100644
index 745a6f92..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptionProvider.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataItemTypeDescriptionProvider : TypeDescriptionProvider
-  {
-    #region Constructor
-
-    internal DataItemTypeDescriptionProvider( TypeDescriptionProvider parent )
-      : base( parent )
-    {
-    }
-
-    #endregion
-
-    public override ICustomTypeDescriptor GetTypeDescriptor( Type objectType, object instance )
-    {
-      var descriptor = base.GetTypeDescriptor( objectType, instance );
-
-      return DataItemTypeDescriptionProvider.GetTypeDescriptor( objectType, descriptor );
-    }
-
-    internal static ICustomTypeDescriptor GetTypeDescriptor( Type objectType, ICustomTypeDescriptor descriptor )
-    {
-      if( descriptor == null )
-        return null;
-
-      return new DataItemTypeDescriptor( descriptor, objectType );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptor.cs
deleted file mode 100644
index 3937ae65..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataItemTypeDescriptor.cs
+++ /dev/null
@@ -1,512 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DataItemTypeDescriptor : CustomTypeDescriptor
-  {
-    #region Static Fields
-
-    private static readonly List<WeakReference> s_entries = new List<WeakReference>();
-
-    #endregion
-
-    #region Constructors
-
-    internal DataItemTypeDescriptor( ICustomTypeDescriptor parent, Type objectType )
-      : base( parent )
-    {
-      if( parent == null )
-        throw new ArgumentNullException( "parent" );
-
-      m_targetType = objectType;
-      m_descriptorType = parent.GetType();
-    }
-
-    #endregion
-
-    public override EventDescriptorCollection GetEvents()
-    {
-      return this.GetEvents( null );
-    }
-
-    public override EventDescriptorCollection GetEvents( Attribute[] attributes )
-    {
-      var sourceEvents = base.GetEvents( attributes );
-      if( ( sourceEvents == null ) || ( sourceEvents.Count == 0 ) )
-        return sourceEvents;
-
-      var entry = this.GetEntry();
-      var replaceEvents = default( Dictionary<EventDescriptor, DataItemEventDescriptor> );
-
-      lock( entry )
-      {
-        replaceEvents = entry.Events;
-
-        if( replaceEvents == null )
-        {
-          replaceEvents = new Dictionary<EventDescriptor, DataItemEventDescriptor>();
-          entry.Events = replaceEvents;
-
-          var factory = new DataItemEventDescriptorFactory( this );
-
-          foreach( var sourceEvent in sourceEvents.Cast<EventDescriptor>() )
-          {
-            var descriptor = factory.CreateEventDescriptor( sourceEvent );
-            if( descriptor != null )
-            {
-              replaceEvents.Add( sourceEvent, descriptor );
-            }
-          }
-        }
-
-        if( replaceEvents.Count == 0 )
-          return sourceEvents;
-      }
-
-      var destinationEvents = new EventDescriptor[ sourceEvents.Count ];
-
-      for( int i = 0; i < sourceEvents.Count; i++ )
-      {
-        var sourceEvent = sourceEvents[ i ];
-
-        DataItemEventDescriptor destinationEvent;
-        if( replaceEvents.TryGetValue( sourceEvent, out destinationEvent ) )
-        {
-          destinationEvents[ i ] = destinationEvent;
-        }
-        else
-        {
-          destinationEvents[ i ] = sourceEvent;
-        }
-      }
-
-      return new EventDescriptorCollection( destinationEvents );
-    }
-
-    public override PropertyDescriptorCollection GetProperties()
-    {
-      return this.GetProperties( null );
-    }
-
-    public override PropertyDescriptorCollection GetProperties( Attribute[] attributes )
-    {
-      var sourceProperties = base.GetProperties( attributes );
-      if( ( sourceProperties == null ) || ( sourceProperties.Count == 0 ) )
-        return sourceProperties;
-
-      var entry = this.GetEntry();
-      var replaceProperties = default( Dictionary<PropertyDescriptor, DataItemPropertyDescriptor> );
-
-      lock( entry )
-      {
-        replaceProperties = entry.Properties;
-
-        if( replaceProperties == null )
-        {
-          replaceProperties = new Dictionary<PropertyDescriptor, DataItemPropertyDescriptor>();
-          entry.Properties = replaceProperties;
-
-          var factory = new DataItemPropertyDescriptorFactory( this );
-
-          foreach( var sourceProperty in sourceProperties.Cast<PropertyDescriptor>() )
-          {
-            var descriptor = factory.CreatePropertyDescriptor( sourceProperty );
-            if( descriptor != null )
-            {
-              replaceProperties.Add( sourceProperty, descriptor );
-            }
-          }
-        }
-
-        if( replaceProperties.Count == 0 )
-          return sourceProperties;
-      }
-
-      var destinationProperties = new PropertyDescriptor[ sourceProperties.Count ];
-
-      for( int i = 0; i < sourceProperties.Count; i++ )
-      {
-        var sourceProperty = sourceProperties[ i ];
-
-        DataItemPropertyDescriptor destinationProperty;
-        if( replaceProperties.TryGetValue( sourceProperty, out destinationProperty ) )
-        {
-          destinationProperties[ i ] = destinationProperty;
-        }
-        else
-        {
-          destinationProperties[ i ] = sourceProperty;
-        }
-      }
-
-      return new PropertyDescriptorCollection( destinationProperties );
-    }
-
-    internal DataItemIndexerDescriptor GetIndexer( object[] indexValues )
-    {
-      if( ( indexValues == null ) || ( indexValues.Length <= 0 ) || ( m_targetType == null ) )
-        return null;
-
-      var entry = this.GetEntry();
-
-      lock( entry )
-      {
-        var indexers = entry.Indexers;
-        var descriptor = default( DataItemIndexerDescriptor );
-        var key = new IndexerKey( indexValues );
-
-        if( ( indexers != null ) && ( indexers.TryGetValue( key, out descriptor ) ) )
-          return descriptor;
-
-        var indexer = this.CreateIndexerDescriptor( indexValues );
-        if( indexer == null )
-          return null;
-
-        var factory = new DataItemPropertyDescriptorFactory( this );
-
-        descriptor = factory.CreateIndexerDescriptor( indexer );
-        if( descriptor == null )
-          return null;
-
-        if( indexers == null )
-        {
-          indexers = new Dictionary<IndexerKey, DataItemIndexerDescriptor>();
-          entry.Indexers = indexers;
-        }
-
-        indexers.Add( key, descriptor );
-
-        return descriptor;
-      }
-    }
-
-    private IndexerDescriptor CreateIndexerDescriptor( object[] indexValues )
-    {
-      if( ( indexValues == null ) || ( indexValues.Length <= 0 ) || ( m_targetType == null ) )
-        return null;
-
-      var best = default( IndexerChoice );
-
-      foreach( var propertyInfo in m_targetType.GetProperties() )
-      {
-        var candidate = IndexerChoice.GetMatch( propertyInfo, indexValues );
-        if( candidate == null )
-          continue;
-
-        if( ( best == null ) || ( candidate.CompareTo( best ) > 0 ) )
-        {
-          best = candidate;
-        }
-      }
-
-      // No matching indexer was found.
-      if( best == null )
-        return null;
-
-      return IndexerDescriptor.Create( best.Property, indexValues, best.Values );
-    }
-
-    private Entry GetEntry()
-    {
-      if( m_entry == null )
-      {
-        m_entry = DataItemTypeDescriptor.GetEntry( m_targetType, m_descriptorType );
-      }
-
-      return m_entry;
-    }
-
-    private static Entry GetEntry( Type targetType, Type descriptorType )
-    {
-      Debug.Assert( targetType != null );
-      Debug.Assert( descriptorType != null );
-
-      lock( ( ( ICollection )s_entries ).SyncRoot )
-      {
-        for( int i = s_entries.Count - 1; i >= 0; i-- )
-        {
-          var entry = ( Entry )s_entries[ i ].Target;
-
-          if( entry != null )
-          {
-            if( object.Equals( targetType, entry.TargetType ) && object.Equals( descriptorType, entry.DescriptorType ) )
-              return entry;
-          }
-          else
-          {
-            s_entries.RemoveAt( i );
-          }
-        }
-
-        var result = new Entry( targetType, descriptorType );
-
-        s_entries.Add( new WeakReference( result ) );
-
-        return result;
-      }
-    }
-
-    private static bool IsNullableType( Type type )
-    {
-      return ( !type.IsValueType )
-          || ( type.IsGenericType && ( type.GetGenericTypeDefinition() == typeof( Nullable<> ) ) );
-    }
-
-    #region Private Fields
-
-    private readonly Type m_targetType;
-    private readonly Type m_descriptorType;
-    private Entry m_entry; //null
-
-    #endregion
-
-    #region Entry Private Class
-
-    private sealed class Entry
-    {
-      internal Entry( Type targetType, Type descriptorType )
-      {
-        Debug.Assert( targetType != null );
-        Debug.Assert( descriptorType != null );
-
-        this.TargetType = targetType;
-        this.DescriptorType = descriptorType;
-      }
-
-      internal Type TargetType
-      {
-        get;
-        private set;
-      }
-
-      internal Type DescriptorType
-      {
-        get;
-        private set;
-      }
-
-      internal Dictionary<EventDescriptor, DataItemEventDescriptor> Events
-      {
-        get;
-        set;
-      }
-
-      internal Dictionary<PropertyDescriptor, DataItemPropertyDescriptor> Properties
-      {
-        get;
-        set;
-      }
-
-      internal Dictionary<IndexerKey, DataItemIndexerDescriptor> Indexers
-      {
-        get;
-        set;
-      }
-    }
-
-    #endregion
-
-    #region IndexerKey Private Class
-
-    private sealed class IndexerKey
-    {
-      internal IndexerKey( object[] parameters )
-      {
-        Debug.Assert( ( parameters != null ) && ( parameters.Length > 0 ) );
-
-        m_parameters = parameters;
-      }
-
-      public override int GetHashCode()
-      {
-        var count = Math.Min( m_parameters.Length, 3 );
-        var hashCode = 0;
-
-        for( int i = 0; i < count; i++ )
-        {
-          unchecked
-          {
-            hashCode *= 13;
-            hashCode += m_parameters[ i ].GetHashCode();
-          }
-        }
-
-        return hashCode;
-      }
-
-      public override bool Equals( object obj )
-      {
-        var target = obj as IndexerKey;
-        if( target == null )
-          return false;
-
-        var targetParameters = target.m_parameters;
-        if( targetParameters.Length != m_parameters.Length )
-          return false;
-
-        for( int i = 0; i < m_parameters.Length; i++ )
-        {
-          if( !object.Equals( targetParameters[ i ], m_parameters[ i ] ) )
-            return false;
-        }
-
-        return true;
-      }
-
-      private readonly object[] m_parameters;
-    }
-
-    #endregion
-
-    #region IndexerChoice Private Class
-
-    private sealed class IndexerChoice
-    {
-      private IndexerChoice( PropertyInfo propertyInfo, object[] values, FitType[] fitTypes )
-      {
-        m_propertyInfo = propertyInfo;
-        m_values = values;
-        m_fitTypes = fitTypes;
-      }
-
-      internal PropertyInfo Property
-      {
-        get
-        {
-          return m_propertyInfo;
-        }
-      }
-
-      internal object[] Values
-      {
-        get
-        {
-          return m_values;
-        }
-      }
-
-      internal static IndexerChoice GetMatch( PropertyInfo propertyInfo, object[] parameterValues )
-      {
-        if( ( propertyInfo == null ) || ( parameterValues == null ) )
-          return null;
-
-        var parameters = propertyInfo.GetIndexParameters();
-        if( ( parameters == null ) || ( parameters.Length != parameterValues.Length ) )
-          return null;
-
-        var values = new object[ parameters.Length ];
-        var fitTypes = new FitType[ parameters.Length ];
-
-        for( int i = 0; i < parameters.Length; i++ )
-        {
-          var parameterType = parameters[ i ].ParameterType;
-          var parameterValue = parameterValues[ i ];
-          var parameterValueType = ( parameterValue != null ) ? parameterValue.GetType() : typeof( object );
-
-          if( parameterValue == null )
-          {
-            if( !DataItemTypeDescriptor.IsNullableType( parameterType ) )
-              return null;
-
-            fitTypes[ i ] = FitType.KeepAsType;
-          }
-          else if( !parameterType.IsAssignableFrom( parameterValueType ) )
-          {
-            var converter = TypeDescriptor.GetConverter( parameterType );
-            if( ( converter == null ) || !converter.CanConvertFrom( parameterValueType ) )
-              return null;
-
-            try
-            {
-              parameterValue = converter.ConvertFrom( null, CultureInfo.InvariantCulture, parameterValue );
-            }
-            catch
-            {
-              return null;
-            }
-
-            // An indexer that takes a parameter of any other type than string is considered a better candidate than
-            // an indexer that takes a parameter of type string.
-            fitTypes[ i ] = ( typeof( string ).IsAssignableFrom( parameterType ) ) ? FitType.ConvertToString : FitType.ConvertToType;
-          }
-          else
-          {
-            if( typeof( string ) == parameterType )
-            {
-              fitTypes[ i ] = FitType.KeepAsString;
-            }
-            else if( typeof( object ) == parameterType )
-            {
-              fitTypes[ i ] = FitType.KeepAsObject;
-            }
-            else
-            {
-              fitTypes[ i ] = FitType.KeepAsType;
-            }
-          }
-
-          values[ i ] = parameterValue;
-        }
-
-        return new IndexerChoice( propertyInfo, values, fitTypes );
-      }
-
-      internal int CompareTo( IndexerChoice comparand )
-      {
-        if( comparand == null )
-          throw new ArgumentNullException( "comparand" );
-
-        if( comparand.m_fitTypes.Length != m_fitTypes.Length )
-          throw new ArgumentException( "The indexer does not have the same number of parameters.", "comparand" );
-
-        for( int i = 0; i < m_fitTypes.Length; i++ )
-        {
-          var compare = m_fitTypes[ i ].CompareTo( comparand.m_fitTypes[ i ] );
-          if( compare != 0 )
-            return compare;
-        }
-
-        return 0;
-      }
-
-      private readonly PropertyInfo m_propertyInfo;
-      private readonly object[] m_values;
-      private readonly FitType[] m_fitTypes;
-
-      private enum FitType
-      {
-        None = 0,
-        ConvertToString,
-        KeepAsObject,
-        KeepAsString,
-        ConvertToType,
-        KeepAsType,
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs
deleted file mode 100644
index 122eb7ad..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs
+++ /dev/null
@@ -1,713 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Input;
-using System.Windows.Media.Animation;
-using System.Windows.Threading;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DataRow : Row, IEditableObject
-  {
-    public DataRow()
-    {
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.ExpandDetails,
-                                                    new ExecutedRoutedEventHandler( OnExpandDetailsExecuted ),
-                                                    new CanExecuteRoutedEventHandler( OnExpandDetailsCanExecute ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.CollapseDetails,
-                                                    new ExecutedRoutedEventHandler( OnCollapseDetailsExecuted ),
-                                                    new CanExecuteRoutedEventHandler( OnCollapseDetailsCanExecute ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.ToggleDetailExpansion,
-                                                    new ExecutedRoutedEventHandler( OnToggleDetailsExecuted ),
-                                                    new CanExecuteRoutedEventHandler( OnToggleDetailsCanExecute ) ) );
-    }
-
-    private void OnExpandDetailsExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-    }
-
-    private void OnExpandDetailsCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( ( dataGridContext != null ) && ( this.DataContext != null ) )
-      {
-        if( ( dataGridContext.AllowDetailToggle == true ) && ( dataGridContext.HasDetails == true ) && ( DataGridControl.GetHasExpandedDetails( this ) == false ) )
-        {
-          e.CanExecute = true;
-          return;
-        }
-      }
-      e.CanExecute = false;
-    }
-
-    private void OnCollapseDetailsExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-    }
-
-    private void OnCollapseDetailsCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( ( dataGridContext != null ) && ( this.DataContext != null ) )
-      {
-        if( ( dataGridContext.AllowDetailToggle == true ) && ( dataGridContext.HasDetails == true ) && ( DataGridControl.GetHasExpandedDetails( this ) == true ) )
-        {
-          e.CanExecute = true;
-          return;
-        }
-      }
-      e.CanExecute = false;
-    }
-
-    private void OnToggleDetailsExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( ( dataGridContext != null ) && ( this.DataContext != null ) )
-      {
-      }
-    }
-
-    private void OnToggleDetailsCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( ( dataGridContext != null ) && ( this.DataContext != null ) )
-      {
-        if( ( dataGridContext.AllowDetailToggle == true ) && ( dataGridContext.HasDetails == true ) )
-        {
-          e.CanExecute = true;
-          return;
-        }
-      }
-      e.CanExecute = false;
-    }
-
-    #region ItemIndex property
-
-    internal int ItemIndex
-    {
-      get
-      {
-        return DataGridVirtualizingPanel.GetItemIndex( this );
-      }
-    }
-
-    #endregion ItemIndex property
-
-    #region EditableObject property
-
-    private IEditableObject EditableObject
-    {
-      get
-      {
-        return ItemsSourceHelper.GetEditableObject( this.DataContext );
-      }
-    }
-
-    #endregion EditableObject property
-
-    #region TitleBarContent Private Property
-
-    internal static readonly DependencyProperty TitleBarContentProperty = DependencyProperty.Register(
-      "TitleBarContent",
-      typeof( object ),
-      typeof( DataRow ) );
-
-    #endregion TitleBarContent Private Property
-
-    #region ResortPending property
-
-    private bool ResortPending
-    {
-      get
-      {
-        return m_flags[ ( int )DataRowFlags.ResortPending ];
-      }
-      set
-      {
-        m_flags[ ( int )DataRowFlags.ResortPending ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RegroupPending property
-
-    private bool RegroupPending
-    {
-      get
-      {
-        return m_flags[ ( int )DataRowFlags.RegroupPending ];
-      }
-      set
-      {
-        m_flags[ ( int )DataRowFlags.RegroupPending ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RepositionPending property
-
-    private bool RepositionPending
-    {
-      get
-      {
-        return m_flags[ ( int )DataRowFlags.RepositionPending ];
-      }
-      set
-      {
-        m_flags[ ( int )DataRowFlags.RepositionPending ] = value;
-      }
-    }
-
-    #endregion
-
-
-    protected override void OnMouseEnter( MouseEventArgs e )
-    {
-      base.OnMouseEnter( e );
-
-      //If the current CellEditorDisplayConditions requires display when mouse is over the Row 
-      if( Row.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.MouseOverRow ) )
-      {
-        //Display the editors for the Row
-        this.SetDisplayEditorMatchingCondition( CellEditorDisplayConditions.MouseOverRow );
-      }
-
-      // In case a value was explicitly specified on the Cell's ParentColumn
-      this.RefreshCellsDisplayedTemplate();
-    }
-
-    protected override void OnMouseLeave( MouseEventArgs e )
-    {
-      base.OnMouseLeave( e );
-
-      //If the current CellEditorDisplayConditions requires display when mouse is over the Row 
-      if( Row.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.MouseOverRow ) )
-      {
-        //Display the editors for the Row
-        this.RemoveDisplayEditorMatchingCondition( CellEditorDisplayConditions.MouseOverRow );
-      }
-
-      // In case a value was explicitly specified on the Cell's ParentColumn
-      this.RefreshCellsDisplayedTemplate();
-    }
-
-    protected override void SetDataContext( object item )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      // When TableflowViewItemsHost is used and an EmptyDataItem is detected.  We also want to avoid getting an animation when the container is sticky
-      if( !( item is EmptyDataItem )
-          && ( dataGridContext != null )
-          && ( dataGridContext.DataGridControl.GetView() is TableflowView )
-          && !( TableflowViewItemsHost.GetIsSticky( this ) )
-          && TableflowViewItemsHost.GetShouldDelayDataContext( this ) )
-      {
-        this.ApplyAnimationClock( Row.CellContentOpacityProperty, null );
-        this.SetValue( Row.CellContentOpacityProperty, 0d );
-
-        // We set the DataContext to an EmptyDataItem to have the real data item set later on with an opacity animation.
-        this.DataContext = this.EmptyDataItem;
-        this.UpdateUnboundDataItemContext();
-
-        // Dispatch a call to SetDataContextDispatched that will update the DataContext of the Row and every CreatedCells to the
-        // DataItem the Row must display. We use a low priority to limit the impact on scrolling.
-        if( m_affectDataContextOperation == null )
-        {
-          m_affectDataContextOperation = this.Dispatcher.BeginInvoke( new Action<object>( this.SetDataContextDispatched ), DispatcherPriority.Background, item );
-        }
-      }
-      else
-      {
-        this.DataContext = item;
-        this.UpdateUnboundDataItemContext();
-
-        this.ApplyAnimationClock( Row.CellContentOpacityProperty, null );
-        this.ClearValue( Row.CellContentOpacityProperty );
-      }
-    }
-
-    protected override void BeginEditCore()
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      var dataGridCollectionViewBase = dataGridContext == null ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-      if( dataGridCollectionViewBase != null )
-      {
-        // We do not want to call EditItem when the item is the one in the insertionrow
-        if( dataGridCollectionViewBase.CurrentAddItem != this.DataContext )
-        {
-          dataGridCollectionViewBase.EditItem( this.DataContext );
-        }
-      }
-      else
-      {
-        IEditableObject editableObject = this.EditableObject;
-
-        // editableObject can be equal to this when the datarow is directly inserted as Item in the DataGridControl.
-        if( ( editableObject != null ) && ( editableObject != this ) )
-        {
-          editableObject.BeginEdit();
-        }
-      }
-
-      base.BeginEditCore();
-    }
-
-    protected override void EndEditCore()
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      base.EndEditCore();
-
-      var dataGridCollectionViewBase = dataGridContext == null ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-      try
-      {
-        if( dataGridCollectionViewBase != null )
-        {
-          if( dataGridCollectionViewBase.CurrentEditItem == this.DataContext )
-          {
-            dataGridCollectionViewBase.CommitEdit();
-          }
-        }
-        else
-        {
-          IEditableObject editableObject = this.EditableObject;
-
-          // editableObject can be equal to this when the datarow is directly inserted as Items in the DataGridControl.
-          if( ( editableObject != null ) && ( editableObject != this ) )
-          {
-            editableObject.EndEdit();
-          }
-        }
-      }
-      catch( Exception exception )
-      {
-        // Note that we do not update the created cell's Content from the source in case the IEditableObject EndEdit implementation
-        // throwed an exception.  This is mainly due because we want to make sure that we do not lose all of the edited cells values.
-        // This way, the end user will have the chance to correct the mistakes without loosing everything he typed.
-
-        // If EndEdit throwed, call BeginEdit on the IEditableObject to make sure that it stays in edit mode.
-        // We don't have to do this when bound to a DataGridCollectionView since it will take care of it.
-        if( dataGridCollectionViewBase == null )
-        {
-          IEditableObject editableObject = this.EditableObject;
-
-          // editableObject can be equal to this when the datarow is directly inserted as Items in the DataGridControl.
-          if( ( editableObject != null ) && ( editableObject != this ) )
-          {
-            editableObject.BeginEdit();
-          }
-        }
-
-        // This method will set a validation error on the row and throw back a DataGridValidationException so that  the row stays in edition.
-        Row.SetRowValidationErrorOnException( this, exception );
-      }
-
-      // Update the created cell's Content from the source in case the IEditableObject EndEdit implementation rectified some values.
-      this.UpdateCellsContentBindingTarget();
-    }
-
-    internal override void PreEditEnded()
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext != null )
-      {
-        if( !this.RepositionPending )
-        {
-          using( dataGridContext.InhibitQueueBringIntoView() )
-          {
-            if( this.ResortPending )
-              this.EnsureResort( dataGridContext );
-
-            if( this.RegroupPending )
-              this.EnsureRegroup( dataGridContext );
-          }
-        }
-        else
-        {
-          this.EnsurePosition( dataGridContext );
-        }
-      }
-
-      base.PreEditEnded();
-    }
-
-    protected override void CancelEditCore()
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      var dataGridCollectionViewBase = dataGridContext == null ? null : dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-      if( dataGridCollectionViewBase != null )
-      {
-        // We do not want to call EditItem when the item is the one in the insertionrow
-        if( dataGridCollectionViewBase.CurrentEditItem == this.DataContext )
-        {
-          dataGridCollectionViewBase.CancelEdit();
-        }
-      }
-      else
-      {
-        IEditableObject editableObject = this.EditableObject;
-
-        // editableObject can be equal to this when the datarow is directly inserted as Items in the DataGridControl.
-        if( ( editableObject != null ) && ( editableObject != this ) )
-        {
-          editableObject.CancelEdit();
-        }
-      }
-
-      base.CancelEditCore();
-    }
-
-    internal override void PreEditCanceled()
-    {
-      this.ResortPending = false;
-      this.RegroupPending = false;
-
-      base.PreEditCanceled();
-    }
-
-    protected override void PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      base.PrepareContainer( dataGridContext, item );
-
-      if( dataGridContext != null )
-      {
-        ( ( INotifyPropertyChanged )dataGridContext.Columns ).PropertyChanged += new PropertyChangedEventHandler( this.Columns_PropertyChanged );
-        this.SetTitleBarContentBinding( dataGridContext );
-        m_storedDataGridContext = dataGridContext;
-      }
-    }
-
-    protected override void ClearContainer()
-    {
-      if( m_affectDataContextOperation != null )
-      {
-        m_affectDataContextOperation.Abort();
-        m_affectDataContextOperation = null;
-      }
-
-      // Ensure to stop the opacity animation if it is currently active
-      if( ( m_opacityAnimationClock != null ) && ( m_opacityAnimationClock.CurrentState != ClockState.Stopped ) )
-      {
-        m_opacityAnimationClock.Completed -= this.OpacityAnimationClock_Completed;
-        m_opacityAnimationClock.Controller.Stop();
-        m_opacityAnimationClock = null;
-      }
-
-      base.ClearContainer();
-
-      if( m_storedDataGridContext != null )
-      {
-        ( ( INotifyPropertyChanged )m_storedDataGridContext.Columns ).PropertyChanged -= new PropertyChangedEventHandler( Columns_PropertyChanged );
-        m_storedDataGridContext = null;
-      }
-    }
-
-    protected override void PartialClearContainer()
-    {
-      if( m_affectDataContextOperation != null )
-      {
-        m_affectDataContextOperation.Abort();
-        m_affectDataContextOperation = null;
-      }
-
-      // Ensure to stop the opacity animation if it is currently active
-      if( ( m_opacityAnimationClock != null ) && ( m_opacityAnimationClock.CurrentState != ClockState.Stopped ) )
-      {
-        m_opacityAnimationClock.Completed -= this.OpacityAnimationClock_Completed;
-        m_opacityAnimationClock.Controller.Stop();
-        m_opacityAnimationClock = null;
-      }
-
-      if( m_storedDataGridContext != null )
-      {
-        ( ( INotifyPropertyChanged )m_storedDataGridContext.Columns ).PropertyChanged -= new PropertyChangedEventHandler( Columns_PropertyChanged );
-        m_storedDataGridContext = null;
-      }
-
-      base.PartialClearContainer();
-    }
-
-    protected override Cell CreateCell( ColumnBase column )
-    {
-      if( column == null )
-        throw new DataGridInternalException( "Column is null.", DataGridControl.GetDataGridContext( this ).DataGridControl );
-
-      return new DataCell();
-    }
-
-    protected override bool IsValidCellType( Cell cell )
-    {
-      return ( cell is DataCell );
-    }
-
-    private void EnsureResort( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      if( this.IsBeingEdited )
-      {
-        this.ResortPending = true;
-        return;
-      }
-
-      this.ResortPending = false;
-      dataGridContext.EnsureResort();
-    }
-
-    private void EnsureRegroup( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      if( this.IsBeingEdited )
-      {
-        this.RegroupPending = true;
-        return;
-      }
-
-      this.RegroupPending = false;
-      dataGridContext.EnsureRegroup();
-    }
-
-    private void EnsurePosition( DataGridContext dataGridContext )
-    {
-      // In the case the ItemsSource is a DataGridCollectionView
-      // we notify the item that correspond to the DataRow for the possible modification
-      // of his data, and should then check if is position is still the same.
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      if( this.IsBeingEdited )
-      {
-        this.RepositionPending = true;
-        return;
-      }
-
-      this.RepositionPending = false;
-
-      DataGridCollectionViewBase dataGridCollectionViewBase =
-        dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-      if( dataGridCollectionViewBase != null )
-      {
-        int globalSortedIndex = dataGridCollectionViewBase.IndexOf( this.DataContext );
-
-        if( globalSortedIndex == -1 )
-          return;
-
-        dataGridCollectionViewBase.EnsurePosition( globalSortedIndex );
-      }
-    }
-
-    internal void EnsurePosition( DataGridContext dataGridContext, Cell changedCell )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      DataGridCollectionViewBase dataGridCollectionViewBase =
-        dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-      if( dataGridCollectionViewBase != null )
-      {
-        this.EnsurePosition( dataGridContext );
-      }
-      else
-      {
-        string fieldName = changedCell.FieldName;
-
-        foreach( GroupLevelDescription groupInfo in dataGridContext.GroupLevelDescriptions )
-        {
-          if( groupInfo.FieldName == fieldName )
-          {
-            this.EnsureRegroup( dataGridContext );
-            break;
-          }
-        }
-
-        SortDescriptionCollection sortDescriptions = dataGridContext.Items.SortDescriptions;
-
-        foreach( SortDescription sortDescription in sortDescriptions )
-        {
-          if( sortDescription.PropertyName == fieldName )
-          {
-            this.EnsureResort( dataGridContext );
-            break;
-          }
-        }
-      }
-    }
-
-    private void Columns_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName == "MainColumn" )
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        this.SetTitleBarContentBinding( dataGridContext );
-      }
-    }
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    protected virtual void SetTitleBarContentBinding( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        return;
-
-      var view = dataGridContext.DataGridControl.GetView();
-      if( ( view is TableView ) || ( view is TableflowView ) )
-        return;
-
-      var headerColumn = dataGridContext.Columns.MainColumn as Column;
-      if( headerColumn == null )
-        return;
-
-      var displayMemberBinding = headerColumn.GetDisplayMemberBinding();
-      if( displayMemberBinding == null )
-      {
-        var dataItem = this.DataContext;
-        var itemType = ( dataItem != null ) ? dataItem.GetType() : null;
-
-        displayMemberBinding = ItemsSourceHelper.CreateDefaultBinding(
-                                 ItemsSourceHelper.CreateOrGetPropertyDescriptionFromColumn( dataGridContext, headerColumn, itemType ) );
-      }
-
-      if( displayMemberBinding == null )
-      {
-        Debug.Assert( false, "displayMemberBinding is null." );
-        this.ClearValue( DataRow.TitleBarContentProperty );
-      }
-      else
-      {
-        this.SetBinding( DataRow.TitleBarContentProperty, displayMemberBinding );
-      }
-    }
-
-    protected internal override void PrepareDefaultStyleKey( Views.ViewBase view )
-    {
-      object currentThemeKey = view.GetDefaultStyleKey( typeof( DataRow ) );
-
-      if( currentThemeKey.Equals( this.DefaultStyleKey ) == false )
-      {
-        this.DefaultStyleKey = currentThemeKey;
-      }
-    }
-
-    #region Delayed DataContext affectation
-
-    private DoubleAnimation m_fadeInAnimation = new DoubleAnimation();
-
-    private void SetDataContextDispatched( object dataItem )
-    {
-      try
-      {
-        if( this.DataContext is EmptyDataItem )
-        {
-          this.DataContext = dataItem;
-          this.UpdateUnboundDataItemContext();
-
-          this.SetCellDataContextAnimated( false );
-        }
-      }
-      finally
-      {
-        m_affectDataContextOperation = null;
-      }
-    }
-
-    private void OpacityAnimationClock_Completed( object sender, EventArgs e )
-    {
-      m_opacityAnimationClock.Completed -= this.OpacityAnimationClock_Completed;
-      m_opacityAnimationClock = null;
-    }
-
-    private void SetCellDataContextAnimated( bool hideContent )
-    {
-      object dataContext = this.DataContext;
-      UnboundDataItem unboundDataItemContext = this.UnboundDataItemContext;
-
-      foreach( Cell cell in this.CreatedCells )
-      {
-        Cell.AssignDataContext( cell, dataContext, unboundDataItemContext, cell.ParentColumn );
-
-        // We must refresh the Displayed template since ShouldDisplayEditor always return false when an EmptyDataItem is detected
-        cell.RefreshDisplayedTemplate();
-      }
-
-      if( hideContent )
-      {
-        this.ApplyAnimationClock( Row.CellContentOpacityProperty, null );
-        this.SetValue( Row.CellContentOpacityProperty, 0d );
-      }
-      else
-      {
-        m_fadeInAnimation.From = 0d;
-        m_fadeInAnimation.To = 1d;
-        m_fadeInAnimation.Duration = TimeSpan.FromMilliseconds( TableflowView.GetRowFadeInAnimationDuration( DataGridControl.GetDataGridContext( this ) ) );
-
-        if( m_opacityAnimationClock != null )
-        {
-          m_opacityAnimationClock.Controller.Pause();
-          m_opacityAnimationClock.Completed -= this.OpacityAnimationClock_Completed;
-          m_opacityAnimationClock = null;
-        }
-
-        m_opacityAnimationClock = ( AnimationClock )m_fadeInAnimation.CreateClock( true );
-        m_opacityAnimationClock.Completed += this.OpacityAnimationClock_Completed;
-
-        this.ApplyAnimationClock( Row.CellContentOpacityProperty, m_opacityAnimationClock );
-        m_opacityAnimationClock.Controller.Begin();
-      }
-    }
-
-    private AnimationClock m_opacityAnimationClock; // = null;
-
-    #endregion
-
-    private BitVector32 m_flags = new BitVector32();
-
-    private DataGridContext m_storedDataGridContext; // = null
-    private DispatcherOperation m_affectDataContextOperation; // = null;
-
-    #region Flags Enum
-
-    [Flags]
-    private enum DataRowFlags
-    {
-      ResortPending = 1,
-      RegroupPending = 2,
-      RepositionPending = 4,
-    }
-
-    #endregion Flags Enum
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRowEditableWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRowEditableWrapper.cs
deleted file mode 100644
index 55dadda3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRowEditableWrapper.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DataRowEditableWrapper : IEditableObject
-  {
-    public DataRowEditableWrapper( System.Data.DataRow dataRow )
-    {
-      m_dataRow = dataRow;
-    }
-
-    #region IEditableObject Members
-
-    public void BeginEdit()
-    {
-      m_dataRow.BeginEdit();
-    }
-
-    public void CancelEdit()
-    {
-      m_dataRow.CancelEdit();
-    }
-
-    public void EndEdit()
-    {
-      m_dataRow.EndEdit();
-    }
-
-    #endregion
-
-    private System.Data.DataRow m_dataRow;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
deleted file mode 100644
index 4fe53870..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
+++ /dev/null
@@ -1,302 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<FrameworkElement x:Class="Xceed.Wpf.DataGrid.DefaultCellEditorSelector"
-                  x:ClassModifier="internal"
-                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:xctk="clr-namespace:Xceed.Wpf.Toolkit;assembly=Xceed.Wpf.Toolkit"
-                  xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
-                  xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                  xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                  xmlns:s="clr-namespace:System;assembly=mscorlib">
-  <FrameworkElement.Resources>
-
-    <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-    <conv:EmptyStringToBooleanConverter x:Key="emptyStringToBooleanConverter" />
-
-    <ControlTemplate x:Key="scrollViewerTemplate"
-                     TargetType="{x:Type ScrollViewer}">
-      <ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}" />
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="textBoxTemplate"
-                     TargetType="{x:Type TextBox}">
-      <ScrollViewer  x:Name="PART_ContentHost"
-                     Template="{StaticResource scrollViewerTemplate}" />
-    </ControlTemplate>
-
-    <DataTemplate x:Key="textBoxEditorTemplate">
-      <xctk:AutoSelectTextBox Text="{markup:CellEditorBinding}"
-                              local:DataCell.IsCellFocusScope="True"
-                              VerticalAlignment="Stretch"
-                              Template="{StaticResource textBoxTemplate}"
-                              Margin="-2,0,-2,0"
-                              Background="Transparent"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                              AutoSelectBehavior="OnFocus"
-                              AutoMoveFocus="True"
-                              AutomationProperties.AutomationId="TextBoxEditor" />
-    </DataTemplate>
-
-    <!--Also used by CellEditor.TextBoxEditor-->
-    <local:CellEditor x:Key="System.String"
-                      EditTemplate="{StaticResource textBoxEditorTemplate}">
-      <local:CellEditor.ActivationGestures>
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <local:CellEditor x:Key="System.Int16">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate DataType="{x:Type s:Int16}">
-          <xctk:ShortUpDown Name="PART_CellEditorBoundControl"
-                            Value="{markup:CellEditorBinding}"
-                            local:DataCell.IsCellFocusScope="True"
-                            AllowSpin="False"
-                            ShowButtonSpinner="False"
-                            AutoMoveFocus="True"
-                            VerticalAlignment="Stretch"
-                            Margin="-2,0,-2,0"
-                            Background="Transparent"
-                            Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                            AutomationProperties.AutomationId="NumericTextBoxEditor" />
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-      <local:CellEditor.ActivationGestures>
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <local:CellEditor x:Key="System.Int32">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate DataType="{x:Type s:Int32}">
-          <xctk:IntegerUpDown Name="PART_CellEditorBoundControl"
-                              Value="{markup:CellEditorBinding}"
-                              local:DataCell.IsCellFocusScope="True"
-                              AllowSpin="False"
-                              ShowButtonSpinner="False"
-                              AutoMoveFocus="True"
-                              VerticalAlignment="Stretch"
-                              Margin="-2,0,-2,0"
-                              Background="Transparent"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                              AutomationProperties.AutomationId="NumericTextBoxEditor" />
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-
-      <local:CellEditor.ActivationGestures>
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <local:CellEditor x:Key="System.Int64">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate DataType="{x:Type s:Int64}">
-          <xctk:LongUpDown Name="PART_CellEditorBoundControl"
-                           Value="{markup:CellEditorBinding}"
-                           local:DataCell.IsCellFocusScope="True"
-                           AllowSpin="False"
-                           ShowButtonSpinner="False"
-                           AutoMoveFocus="True"
-                           VerticalAlignment="Stretch"
-                           Margin="-2,0,-2,0"
-                           Background="Transparent"
-                           Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                           AutomationProperties.AutomationId="NumericTextBoxEditor" />
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-      <local:CellEditor.ActivationGestures>
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <local:CellEditor x:Key="System.Single">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate DataType="{x:Type s:Single}">
-          <xctk:SingleUpDown Name="PART_CellEditorBoundControl"
-                             Value="{markup:CellEditorBinding}"
-                             local:DataCell.IsCellFocusScope="True"
-                             AllowSpin="False"
-                             ShowButtonSpinner="False"
-                             AutoMoveFocus="True"
-                             VerticalAlignment="Stretch"
-                             Margin="-2,0,-2,0"
-                             Background="Transparent"
-                             Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                             AutomationProperties.AutomationId="NumericTextBoxEditor" />
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-      <local:CellEditor.ActivationGestures>
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <local:CellEditor x:Key="System.Double">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate DataType="{x:Type s:Double}">
-          <xctk:DoubleUpDown Name="PART_CellEditorBoundControl"
-                             Value="{markup:CellEditorBinding}"
-                             local:DataCell.IsCellFocusScope="True"
-                             AllowSpin="False"
-                             ShowButtonSpinner="False"
-                             AutoMoveFocus="True"
-                             VerticalAlignment="Stretch"
-                             Margin="-2,0,-2,0"
-                             Background="Transparent"
-                             Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                             AutomationProperties.AutomationId="NumericTextBoxEditor" />
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-      <local:CellEditor.ActivationGestures>
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <local:CellEditor x:Key="System.Decimal">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate DataType="{x:Type s:Decimal}">
-          <xctk:DecimalUpDown Name="PART_CellEditorBoundControl"
-                              Value="{markup:CellEditorBinding}"
-                              local:DataCell.IsCellFocusScope="True"
-                              AllowSpin="False"
-                              ShowButtonSpinner="False"
-                              AutoMoveFocus="True"
-                              VerticalAlignment="Stretch"
-                              Margin="-2,0,-2,0"
-                              Background="Transparent"
-                              Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                              AutomationProperties.AutomationId="NumericTextBoxEditor" />
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-      <local:CellEditor.ActivationGestures>
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <!--Also used by CellEditor.CheckBoxEditor-->
-    <local:CellEditor x:Key="System.Boolean">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate DataType="{x:Type s:Boolean}">
-          <local:DataGridCheckBox IsChecked="{markup:CellEditorBinding}"
-                                  local:DataCell.IsCellFocusScope="True"
-                                  VerticalAlignment="Stretch"
-                                  Foreground="{Binding RelativeSource={RelativeSource TemplatedParent},  Path=(TextElement.Foreground)}"
-                                  AutomationProperties.AutomationId="CheckBoxEditor" />
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-      <local:CellEditor.ActivationGestures>
-        <local:KeyActivationGesture Key="Space" />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <local:CellEditor x:Key="System.Xml.XmlElement"
-                      EditTemplate="{StaticResource textBoxEditorTemplate}">
-
-      <local:CellEditor.ActivationGestures>
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <!--Also used by CellEditor.DatePickerEditor-->
-    <local:CellEditor x:Key="System.DateTime">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate DataType="{x:Type s:DateTime}">
-          <local:DataGridDatePicker SelectedDate="{markup:CellEditorBinding}"
-                                    x:Name="PART_CellEditorBoundControl"
-                                    VerticalAlignment="Top"
-                                    Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(TextElement.Foreground)}"
-                                    AutomationProperties.AutomationId="DatePickerEditor" />
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-      <local:CellEditor.ActivationGestures>
-        <local:KeyActivationGesture SystemKey="Down"
-                                    Modifiers="Alt" />
-        <local:KeyActivationGesture SystemKey="Up"
-                                    Modifiers="Alt" />
-        <local:TextInputActivationGesture />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-    <!-- ForeignKey CellEditor -->
-    <local:CellEditor x:Key="foreignKeyCellEditor">
-      <local:CellEditor.EditTemplate>
-        <DataTemplate>
-          <ComboBox x:Name="fkComboBox"
-                    local:Cell.IsCellFocusScope="True"
-                    BorderThickness="0"
-                    ItemContainerStyle="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyle, Mode=OneWay}"
-                    ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemsSource, Mode=OneWay}"
-                    SelectedValuePath="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ValuePath, Mode=OneWay}"
-                    DisplayMemberPath="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.DisplayMemberPath, Mode=OneWay}"
-                    SelectedValue="{markup:CellEditorBinding}"
-                    AutomationProperties.AutomationId="ForeignKeyCellEditor" />
-
-          <!-- Only set ItemTemplate if DisplayMemberPath is null, and only set Selector if both DisplayMemberPath and CellContentTemplate are null-->
-          <DataTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding ElementName=fkComboBox, Path=DisplayMemberPath, Converter={StaticResource emptyStringToBooleanConverter}, Mode=OneWay}"
-                           Value="True" />
-                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <MultiDataTrigger.Setters>
-                <Setter TargetName="fkComboBox"
-                        Property="ItemTemplate"
-                        Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Mode=OneWay}" />
-              </MultiDataTrigger.Setters>
-            </MultiDataTrigger>
-
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding ElementName=fkComboBox, Path=DisplayMemberPath, Converter={StaticResource emptyStringToBooleanConverter}, Mode=OneWay}"
-                           Value="True" />
-                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplate, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
-                           Value="True" />
-              </MultiDataTrigger.Conditions>
-              <MultiDataTrigger.Setters>
-                <Setter TargetName="fkComboBox"
-                        Property="ItemTemplateSelector"
-                        Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ParentColumn.CellContentTemplateSelector, Mode=OneWay}" />
-              </MultiDataTrigger.Setters>
-            </MultiDataTrigger>
-
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyle, Converter={StaticResource nullToBooleanConverter}, Mode=OneWay}"
-                         Value="True">
-              <Setter TargetName="fkComboBox"
-                      Property="ItemContainerStyleSelector"
-                      Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:Cell.CellEditorContext).ForeignKeyConfiguration.ItemContainerStyleSelector, Mode=OneWay}" />
-            </DataTrigger>
-          </DataTemplate.Triggers>
-        </DataTemplate>
-      </local:CellEditor.EditTemplate>
-      <local:CellEditor.ActivationGestures>
-        <local:KeyActivationGesture SystemKey="Down"
-                                    Modifiers="Alt" />
-
-        <local:KeyActivationGesture SystemKey="Up"
-                                    Modifiers="Alt" />
-
-        <local:KeyActivationGesture Key="F4" />
-
-        <local:KeyActivationGesture Key="Space" />
-      </local:CellEditor.ActivationGestures>
-    </local:CellEditor>
-
-  </FrameworkElement.Resources>
-
-</FrameworkElement>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs
deleted file mode 100644
index dfe27fa9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal partial class DefaultCellEditorSelector : FrameworkElement
-  {
-    #region Static Fields
-
-    private static DefaultCellEditorSelector s_instance = default( DefaultCellEditorSelector );
-    private static readonly List<WeakReference> s_instances = new List<WeakReference>( 1 );
-
-    #endregion
-
-    private DefaultCellEditorSelector()
-    {
-      this.InitializeComponent();
-    }
-
-    #region ForeignKeyCellEditor Public Static Property
-
-    public static CellEditor ForeignKeyCellEditor
-    {
-      get
-      {
-        return DefaultCellEditorSelector.GetCellEditor( "foreignKeyCellEditor" );
-      }
-    }
-
-    #endregion
-
-    #region TextBoxEditor Public Static Property
-
-    public static CellEditor TextBoxEditor
-    {
-      get
-      {
-        return DefaultCellEditorSelector.SelectCellEditor( typeof( string ) );
-      }
-    }
-
-    #endregion
-
-    #region CheckBoxEditor Public Static Property
-
-    public static CellEditor CheckBoxEditor
-    {
-      get
-      {
-        return DefaultCellEditorSelector.SelectCellEditor( typeof( bool ) );
-      }
-    }
-
-    #endregion
-
-    #region DateTimeEditor Public Static Editor
-
-    public static CellEditor DateTimeEditor
-    {
-      get
-      {
-        return DefaultCellEditorSelector.SelectCellEditor( typeof( DateTime ) );
-      }
-    }
-
-    #endregion
-
-    public static CellEditor SelectCellEditor( Type dataType )
-    {
-      if( dataType == null )
-        return null;
-
-      if( dataType.IsGenericType && ( dataType.GetGenericTypeDefinition() == typeof( Nullable<> ) ) )
-      {
-        dataType = Nullable.GetUnderlyingType( dataType );
-      }
-
-      var editor = default( CellEditor );
-      if( DefaultCellEditorSelector.TryGetCellEditor( dataType.FullName, out editor ) )
-        return editor;
-
-      return null;
-    }
-
-    private static DataTemplate GetDataTemplate( object key )
-    {
-      var resource = default( DataTemplate );
-      if( !DefaultCellEditorSelector.TryGetDataTemplate( key, out resource ) )
-        throw new KeyNotFoundException( "Resource not found" );
-
-      return resource;
-    }
-
-    private static bool TryGetDataTemplate( object key, out DataTemplate value )
-    {
-      var resource = default( object );
-      if( !DefaultCellEditorSelector.TryGetResource( key, out resource ) )
-      {
-        value = default( DataTemplate );
-        return false;
-      }
-      else
-      {
-        value = DefaultCellEditorSelector.TrySeal( resource as DataTemplate );
-        return ( value != null );
-      }
-    }
-
-    private static CellEditor GetCellEditor( object key )
-    {
-      var resource = default( CellEditor );
-      if( !DefaultCellEditorSelector.TryGetCellEditor( key, out resource ) )
-        throw new KeyNotFoundException( "Resource not found" );
-
-      return resource;
-    }
-
-    private static bool TryGetCellEditor( object key, out CellEditor value )
-    {
-      var resource = default( object );
-      if( !DefaultCellEditorSelector.TryGetResource( key, out resource ) )
-      {
-        value = default( CellEditor );
-        return false;
-      }
-      else
-      {
-        value = DefaultCellEditorSelector.TryFreeze( resource as CellEditor );
-        return ( value != null );
-      }
-    }
-
-    private static bool TryGetResource( object key, out object value )
-    {
-      value = null;
-
-      var dispatcher = Dispatcher.CurrentDispatcher;
-      if( dispatcher == null )
-        return false;
-
-      var target = default( DefaultCellEditorSelector );
-
-      lock( ( ( ICollection )s_instances ).SyncRoot )
-      {
-        for( int i = s_instances.Count - 1; i >= 0; i-- )
-        {
-          var instance = s_instances[ i ].Target as DefaultCellEditorSelector;
-
-          if( instance == null )
-          {
-            s_instances.RemoveAt( i );
-          }
-          else if( instance.Dispatcher == dispatcher )
-          {
-            target = instance;
-
-            // We could exit the loop but we don't because we want to clean up the list
-            // and keep it small.  We don't want it to become large with lots of empty
-            // WeakReference.
-            //break;
-          }
-        }
-
-        if( target == null )
-        {
-          target = new DefaultCellEditorSelector();
-          s_instances.Add( new WeakReference( target ) );
-        }
-
-        // We keep a strong reference on the target instance to prevent that instance
-        // from being garbage collected.  We assume that we will need that instance
-        // again for other calls.  We don't want to have to create a new instance to
-        // query for a single resource.
-        s_instance = target;
-      }
-
-      Debug.Assert( target != null );
-
-      value = target.TryFindResource( key );
-
-      return ( value != null );
-    }
-
-    private static DataTemplate TrySeal( DataTemplate template )
-    {
-      if( ( template != null ) && !template.IsSealed )
-      {
-        template.Seal();
-      }
-
-      return template;
-    }
-
-    private static CellEditor TryFreeze( CellEditor editor )
-    {
-      if( ( editor != null ) && !editor.IsFrozen )
-      {
-        DefaultCellEditorSelector.TrySeal( editor.EditTemplate );
-
-        if( editor.CanFreeze )
-        {
-          editor.Freeze();
-        }
-      }
-
-      return editor;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs
deleted file mode 100644
index 7701f8f0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Collections.ObjectModel;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class DefaultDetailConfiguration : DependencyObject
-  {
-    static DefaultDetailConfiguration()
-    {
-      HeadersProperty = HeadersPropertyKey.DependencyProperty;
-      FootersProperty = FootersPropertyKey.DependencyProperty;
-    }
-
-    public DefaultDetailConfiguration()
-    {
-      this.SetHeaders( new ObservableCollection<DataTemplate>() );
-      this.SetFooters( new ObservableCollection<DataTemplate>() );
-    }
-
-    #region AllowDetailToggle Property
-
-    public static readonly DependencyProperty AllowDetailToggleProperty = DataGridControl.AllowDetailToggleProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public bool AllowDetailToggle
-    {
-      get
-      {
-        return ( bool )this.GetValue( DefaultDetailConfiguration.AllowDetailToggleProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.AllowDetailToggleProperty, value );
-      }
-    }
-
-    #endregion AllowDetailToggle Property
-
-    #region DefaultGroupConfiguration Property
-
-    public static readonly DependencyProperty DefaultGroupConfigurationProperty = DataGridControl.DefaultGroupConfigurationProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public GroupConfiguration DefaultGroupConfiguration
-    {
-      get
-      {
-        return ( GroupConfiguration )this.GetValue( DefaultDetailConfiguration.DefaultGroupConfigurationProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.DefaultGroupConfigurationProperty, value );
-      }
-    }
-
-    #endregion DefaultGroupConfiguration Property
-
-    #region GroupConfigurationSelector Property
-
-    public static readonly DependencyProperty GroupConfigurationSelectorProperty = DataGridControl.GroupConfigurationSelectorProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public GroupConfigurationSelector GroupConfigurationSelector
-    {
-      get
-      {
-        return ( GroupConfigurationSelector )this.GetValue( DefaultDetailConfiguration.GroupConfigurationSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.GroupConfigurationSelectorProperty, value );
-      }
-    }
-
-    #endregion GroupConfigurationSelector Property
-
-    #region ItemContainerStyle Property
-
-    public static readonly DependencyProperty ItemContainerStyleProperty = DataGridControl.ItemContainerStyleProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public Style ItemContainerStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( DefaultDetailConfiguration.ItemContainerStyleProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.ItemContainerStyleProperty, value );
-      }
-    }
-
-    #endregion ItemContainerStyle Property
-
-    #region ItemContainerStyleSelector Property
-
-    public static readonly DependencyProperty ItemContainerStyleSelectorProperty = DataGridControl.ItemContainerStyleSelectorProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public StyleSelector ItemContainerStyleSelector
-    {
-      get
-      {
-        return ( StyleSelector )this.GetValue( DefaultDetailConfiguration.ItemContainerStyleSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.ItemContainerStyleSelectorProperty, value );
-      }
-    }
-
-    #endregion ItemContainerStyleSelector Property
-
-    #region DetailIndicatorStyle Property
-
-    public static readonly DependencyProperty DetailIndicatorStyleProperty = DetailConfiguration.DetailIndicatorStyleProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public Style DetailIndicatorStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( DefaultDetailConfiguration.DetailIndicatorStyleProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.DetailIndicatorStyleProperty, value );
-      }
-    }
-
-    #endregion DetailIndicatorStyle Property
-
-    #region Headers Property
-
-    private static readonly DependencyPropertyKey HeadersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Headers", typeof( ObservableCollection<DataTemplate> ), typeof( DefaultDetailConfiguration ), new FrameworkPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty HeadersProperty;
-
-    public ObservableCollection<DataTemplate> Headers
-    {
-      get
-      {
-        return ( ObservableCollection<DataTemplate> )this.GetValue( DefaultDetailConfiguration.HeadersProperty );
-      }
-    }
-
-    private void SetHeaders( ObservableCollection<DataTemplate> headers )
-    {
-      this.SetValue( DefaultDetailConfiguration.HeadersPropertyKey, headers );
-    }
-
-    #endregion Headers Property
-
-    #region Footers Property
-
-    private static readonly DependencyPropertyKey FootersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Footers", typeof( ObservableCollection<DataTemplate> ), typeof( DefaultDetailConfiguration ), new FrameworkPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty FootersProperty;
-
-    public ObservableCollection<DataTemplate> Footers
-    {
-      get
-      {
-        return ( ObservableCollection<DataTemplate> )this.GetValue( DefaultDetailConfiguration.FootersProperty );
-      }
-    }
-
-    private void SetFooters( ObservableCollection<DataTemplate> footers )
-    {
-      this.SetValue( DefaultDetailConfiguration.FootersPropertyKey, footers );
-    }
-
-    #endregion Footers Property
-
-    #region MaxSortLevels Property
-
-    public static readonly DependencyProperty MaxSortLevelsProperty = DataGridControl.MaxSortLevelsProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public int MaxSortLevels
-    {
-      get
-      {
-        return ( int )this.GetValue( DefaultDetailConfiguration.MaxSortLevelsProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.MaxSortLevelsProperty, value );
-      }
-    }
-
-    #endregion MaxSortLevels Property
-
-    #region MaxGroupLevels Property
-
-    public static readonly DependencyProperty MaxGroupLevelsProperty = DataGridControl.MaxGroupLevelsProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public int MaxGroupLevels
-    {
-      get
-      {
-        return ( int )this.GetValue( DefaultDetailConfiguration.MaxGroupLevelsProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.MaxGroupLevelsProperty, value );
-      }
-    }
-
-    #endregion MaxGroupLevels  Property
-
-    #region UseDefaultHeadersFooters Property
-
-    public static readonly DependencyProperty UseDefaultHeadersFootersProperty = DetailConfiguration.UseDefaultHeadersFootersProperty.AddOwner( typeof( DefaultDetailConfiguration ) );
-
-    public bool UseDefaultHeadersFooters
-    {
-      get
-      {
-        return ( bool )this.GetValue( DefaultDetailConfiguration.UseDefaultHeadersFootersProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.UseDefaultHeadersFootersProperty, value );
-      }
-    }
-
-    #endregion UseDefaultHeadersFooters Property
-
-    #region IsDeleteCommandEnabled Property
-
-    public static readonly DependencyProperty IsDeleteCommandEnabledProperty = DetailConfiguration.IsDeleteCommandEnabledProperty.AddOwner(
-      typeof( DefaultDetailConfiguration ),
-      new FrameworkPropertyMetadata( false, new PropertyChangedCallback( DefaultDetailConfiguration.OnIsDeleteCommandEnabledChanged ) ) );
-
-    public bool IsDeleteCommandEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( DefaultDetailConfiguration.IsDeleteCommandEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( DefaultDetailConfiguration.IsDeleteCommandEnabledProperty, value );
-      }
-    }
-
-    private static void OnIsDeleteCommandEnabledChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    #endregion IsDeleteCommandEnabled Property
-
-    internal void AddDefaultHeadersFooters()
-    {
-      if( m_defaultHeadersFootersAdded )
-        return;
-
-      m_defaultHeadersFootersAdded = true;
-    }
-
-    private bool m_defaultHeadersFootersAdded = false;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs
deleted file mode 100644
index 86423d25..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs
+++ /dev/null
@@ -1,2070 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.Utils;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DetailConfiguration : DependencyObject, IWeakEventListener, ISupportInitialize, INotifyPropertyChanged
-  {
-    #region Static Fields
-
-    internal static readonly string DataGridControlPropertyName = PropertyHelper.GetPropertyName( ( DetailConfiguration d ) => d.DataGridControl );
-    internal static readonly string DetailDescriptionPropertyName = PropertyHelper.GetPropertyName( ( DetailConfiguration d ) => d.DetailDescription );
-
-    #endregion
-
-    static DetailConfiguration()
-    {
-      DetailConfiguration.DetailConfigurationsProperty = DetailConfiguration.DetailConfigurationsPropertyKey.DependencyProperty;
-      DetailConfiguration.ColumnsProperty = DetailConfiguration.ColumnsPropertyKey.DependencyProperty;
-      DetailConfiguration.GroupLevelDescriptionsProperty = DetailConfiguration.GroupLevelDescriptionsPropertyKey.DependencyProperty;
-      DetailConfiguration.VisibleColumnsProperty = DetailConfiguration.VisibleColumnsPropertyKey.DependencyProperty;
-      DetailConfiguration.HeadersProperty = DetailConfiguration.HeadersPropertyKey.DependencyProperty;
-      DetailConfiguration.FootersProperty = DetailConfiguration.FootersPropertyKey.DependencyProperty;
-
-      DetailConfiguration.BuildDefaultTemplates();
-    }
-
-    public DetailConfiguration()
-    {
-      var columns = new ColumnCollection( null, this );
-
-      m_columnManager = new ColumnHierarchyManager( columns );
-
-      this.SetColumns( columns );
-      this.SetVisibleColumns( m_columnManager.VisibleColumns );
-
-      m_columnSynchronizationManager = new ColumnSynchronizationManager( this );
-      m_columnManagerRowConfiguration = new ColumnManagerRowConfiguration();
-
-      this.SetHeaders( new ObservableCollection<DataTemplate>() );
-      this.SetFooters( new ObservableCollection<DataTemplate>() );
-
-      this.SetGroupLevelDescriptions( new GroupLevelDescriptionCollection() );
-      this.SetDetailConfigurations( new DetailConfigurationCollection( null, this ) );
-
-      columns.CollectionChanged += new NotifyCollectionChangedEventHandler( this.OnColumnsCollectionChanged );
-      CollectionChangedEventManager.AddListener( this.DetailConfigurations, this );
-
-      this.BeginInit();
-    }
-
-    private static void BuildDefaultTemplates()
-    {
-      //Defining the FrameworkElementFactory variables I will use below.
-      FrameworkElementFactory hglip;
-      FrameworkElementFactory glip;
-      FrameworkElementFactory border;
-      FrameworkElementFactory contentPresenter;
-
-      //Defining the Converters, Bindings and ViewBindings I will use to build the templates below.
-      Converters.ThicknessConverter thicknessConverter = new Xceed.Wpf.DataGrid.Converters.ThicknessConverter();
-
-      ViewBindingExtension borderThicknessBinding = new ViewBindingExtension( "HorizontalGridLineThickness" );
-      borderThicknessBinding.Converter = thicknessConverter;
-      borderThicknessBinding.ConverterParameter = Converters.ThicknessConverter.ThicknessSides.Top;
-
-      //ViewBindingExtension borderBrushBinding = new ViewBindingExtension( "HorizontalGridLineBrush" );
-
-      Binding detailTitleBinding = new Binding();
-      detailTitleBinding.Path = new PropertyPath( "(0).SourceDetailConfiguration.Title", DataGridControl.DataGridContextProperty );
-      detailTitleBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      Binding detailTitleTemplateBinding = new Binding();
-      detailTitleTemplateBinding.Path = new PropertyPath( "(0).SourceDetailConfiguration.TitleTemplate", DataGridControl.DataGridContextProperty );
-      detailTitleTemplateBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      //Defining the Header Spacer template.
-      DefaultHeaderSpacerTemplate = new DataTemplate();
-      DefaultHeaderSpacerTemplate.VisualTree = new FrameworkElementFactory( typeof( DockPanel ) );
-      DefaultHeaderSpacerTemplate.VisualTree.SetValue( RowSelector.VisibleProperty, false );
-
-      hglip = new FrameworkElementFactory( typeof( HierarchicalGroupLevelIndicatorPane ) );
-      hglip.SetValue( DockPanel.DockProperty, Dock.Left );
-      hglip.SetValue( TableView.CanScrollHorizontallyProperty, false );
-      DefaultHeaderSpacerTemplate.VisualTree.AppendChild( hglip );
-
-      glip = new FrameworkElementFactory( typeof( GroupLevelIndicatorPane ) );
-      glip.SetValue( GroupLevelIndicatorPane.IndentedProperty, false );
-      glip.SetValue( DockPanel.DockProperty, Dock.Left );
-      glip.SetValue( GroupLevelIndicatorPane.ShowIndicatorsProperty, false );
-      glip.SetValue( GroupLevelIndicatorPane.ShowVerticalBorderProperty, false );
-      glip.SetValue( GroupLevelIndicatorPane.GroupLevelProperty, 0 );
-      glip.SetValue( TableView.CanScrollHorizontallyProperty, false );
-      DefaultHeaderSpacerTemplate.VisualTree.AppendChild( glip );
-
-      border = new FrameworkElementFactory( typeof( Border ) );
-      border.SetBinding( Border.BorderThicknessProperty, ( BindingBase )borderThicknessBinding.ProvideValue( null ) );
-      //border.SetBinding( Border.BorderBrushProperty, ( BindingBase )borderBrushBinding.ProvideValue( null ) );
-      border.SetValue( Border.MinHeightProperty, 5d );
-      border.SetValue( TableView.CanScrollHorizontallyProperty, false );
-
-      contentPresenter = new FrameworkElementFactory( typeof( ContentPresenter ) );
-      contentPresenter.SetBinding( ContentPresenter.ContentProperty, detailTitleBinding );
-      contentPresenter.SetBinding( ContentPresenter.ContentTemplateProperty, detailTitleTemplateBinding );
-      contentPresenter.SetValue( Control.FontSizeProperty, 14d );
-
-      border.AppendChild( contentPresenter );
-
-      DefaultHeaderSpacerTemplate.VisualTree.AppendChild( border );
-      DefaultHeaderSpacerTemplate.Seal();
-
-      //Defining the ColumnManagerRow template
-      DefaultColumnManagerRowTemplate = new DataTemplate();
-      DefaultColumnManagerRowTemplate.VisualTree = new FrameworkElementFactory( typeof( ColumnManagerRow ) );
-      //DefaultColumnManagerRowTemplate.VisualTree.SetValue( ColumnManagerRow.BackgroundProperty, null );
-      DefaultColumnManagerRowTemplate.Seal();
-
-      DefaultGroupByControlTemplate = new DataTemplate();
-      DefaultGroupByControlTemplate.VisualTree = new FrameworkElementFactory( typeof( HierarchicalGroupByControl ) );
-      DefaultGroupByControlTemplate.Seal();
-    }
-
-    private static DataTemplate DefaultHeaderSpacerTemplate;
-    private static DataTemplate DefaultColumnManagerRowTemplate;
-    private static DataTemplate DefaultGroupByControlTemplate;
-
-    internal static void AddDefaultHeadersFooters( ObservableCollection<DataTemplate> headersCollection, int mergedHeadersCount, bool areDetailsFlatten )
-    {
-      if( !areDetailsFlatten )
-      {
-        headersCollection.Insert( 0, DetailConfiguration.DefaultColumnManagerRowTemplate );
-        headersCollection.Insert( 0, DetailConfiguration.DefaultHeaderSpacerTemplate );
-      }
-    }
-
-    internal static void SynchronizeAddedConfigurations( IList addedDetailConfigs, DataGridDetailDescriptionCollection detailDescriptions )
-    {
-      foreach( DetailConfiguration detailConfig in addedDetailConfigs )
-      {
-        DataGridDetailDescription detailDesc = null;
-
-        if( detailDescriptions != null )
-        {
-          detailDesc = detailDescriptions[ detailConfig.RelationName ];
-        }
-
-        detailConfig.SynchronizeWithDetailDescription( detailDesc );
-      }
-    }
-
-    internal static void CleanupDetailConfigurations( DetailConfigurationCollection detailConfigurationCollection, bool autoRemoveUnassociated )
-    {
-      for( int i = detailConfigurationCollection.Count - 1; i >= 0; i-- )
-      {
-        DetailConfiguration detailConfiguration = detailConfigurationCollection[ i ];
-        detailConfiguration.DetachFromDetailDescription();
-        DetailConfiguration.CleanupDetailConfigurations( detailConfiguration.DetailConfigurations, autoRemoveUnassociated );
-
-        if( ( detailConfiguration.IsAutoCreated ) && ( autoRemoveUnassociated ) )
-        {
-          detailConfigurationCollection.RemoveAt( i );
-        }
-      }
-    }
-
-    #region RelationName Property
-
-    public static readonly DependencyProperty RelationNameProperty =
-        DependencyProperty.Register( "RelationName", typeof( string ), typeof( DetailConfiguration ), new FrameworkPropertyMetadata( string.Empty ) );
-
-    public string RelationName
-    {
-      get
-      {
-        return ( string )this.GetValue( DetailConfiguration.RelationNameProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.RelationNameProperty, value );
-      }
-    }
-
-    #endregion RelationName Property
-
-    #region AllowDetailToggle Property
-
-    public static readonly DependencyProperty AllowDetailToggleProperty = DataGridControl.AllowDetailToggleProperty.AddOwner( typeof( DetailConfiguration ), new FrameworkPropertyMetadata( true, new PropertyChangedCallback( OnAllowDetailToggleChanged ) ) );
-
-    public bool AllowDetailToggle
-    {
-      get
-      {
-        return ( bool )this.GetValue( DetailConfiguration.AllowDetailToggleProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.AllowDetailToggleProperty, value );
-      }
-    }
-
-    internal event EventHandler AllowDetailToggleChanged;
-
-    private static void OnAllowDetailToggleChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DetailConfiguration detailConfig = sender as DetailConfiguration;
-      if( detailConfig != null )
-      {
-        if( detailConfig.AllowDetailToggleChanged != null )
-        {
-          detailConfig.AllowDetailToggleChanged( detailConfig, EventArgs.Empty );
-        }
-      }
-    }
-
-    #endregion AllowDetailToggle Property
-
-    #region AutoCreateColumns Property
-
-    public static readonly DependencyProperty AutoCreateColumnsProperty = DataGridControl.AutoCreateColumnsProperty.AddOwner( typeof( DetailConfiguration ) );
-
-    public bool AutoCreateColumns
-    {
-      get
-      {
-        return ( bool )this.GetValue( DetailConfiguration.AutoCreateColumnsProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.AutoCreateColumnsProperty, value );
-      }
-    }
-
-    #endregion AutoCreateColumns Property
-
-    #region Columns Read-Only Property
-
-    internal static readonly DependencyPropertyKey ColumnsPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Columns", typeof( ColumnCollection ), typeof( DetailConfiguration ), new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty ColumnsProperty;
-
-    public ColumnCollection Columns
-    {
-      get
-      {
-        return ( ColumnCollection )this.GetValue( DetailConfiguration.ColumnsProperty );
-      }
-    }
-
-    internal void SetColumns( ColumnCollection value )
-    {
-      this.SetValue( DetailConfiguration.ColumnsPropertyKey, value );
-    }
-
-    #endregion
-
-    #region DefaultDetailConfiguration Property
-
-    public static readonly DependencyProperty DefaultDetailConfigurationProperty = DataGridControl.DefaultDetailConfigurationProperty.AddOwner( typeof( DetailConfiguration ) );
-
-    public DefaultDetailConfiguration DefaultDetailConfiguration
-    {
-      get
-      {
-        return ( DefaultDetailConfiguration )this.GetValue( DetailConfiguration.DefaultDetailConfigurationProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.DefaultDetailConfigurationProperty, value );
-      }
-    }
-
-    #endregion DefaultDetailConfiguration Property
-
-    #region DefaultGroupConfiguration Property
-
-    public static readonly DependencyProperty DefaultGroupConfigurationProperty = DataGridControl.DefaultGroupConfigurationProperty.AddOwner( typeof( DetailConfiguration ) );
-
-    public GroupConfiguration DefaultGroupConfiguration
-    {
-      get
-      {
-        return ( GroupConfiguration )this.GetValue( DetailConfiguration.DefaultGroupConfigurationProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.DefaultGroupConfigurationProperty, value );
-      }
-    }
-
-    #endregion DefaultGroupConfiguration Property
-
-    #region VisibleColumns Read-Only Property
-
-    internal static readonly DependencyPropertyKey VisibleColumnsPropertyKey =
-        DependencyProperty.RegisterReadOnly( "VisibleColumns", typeof( ReadOnlyObservableCollection<ColumnBase> ), typeof( DetailConfiguration ), new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty VisibleColumnsProperty;
-
-    public ReadOnlyObservableCollection<ColumnBase> VisibleColumns
-    {
-      get
-      {
-        return ( ReadOnlyObservableCollection<ColumnBase> )this.GetValue( DetailConfiguration.VisibleColumnsProperty );
-      }
-    }
-
-    private void SetVisibleColumns( ReadOnlyObservableCollection<ColumnBase> value )
-    {
-      this.SetValue( DetailConfiguration.VisibleColumnsPropertyKey, value );
-    }
-
-    #endregion VisibleColumns Read-Only Property
-
-    #region GroupLevelDescriptions Read-Only Property
-
-    internal static readonly DependencyPropertyKey GroupLevelDescriptionsPropertyKey =
-        DependencyProperty.RegisterReadOnly( "GroupLevelDescriptions", typeof( GroupLevelDescriptionCollection ), typeof( DetailConfiguration ), new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty GroupLevelDescriptionsProperty;
-
-    public GroupLevelDescriptionCollection GroupLevelDescriptions
-    {
-      get
-      {
-        return ( GroupLevelDescriptionCollection )this.GetValue( DetailConfiguration.GroupLevelDescriptionsProperty );
-      }
-    }
-
-    internal void SetGroupLevelDescriptions( GroupLevelDescriptionCollection value )
-    {
-      this.SetValue( DetailConfiguration.GroupLevelDescriptionsPropertyKey, value );
-    }
-
-    #endregion GroupLevelDescriptions Read-Only Property
-
-    #region GroupConfigurationSelector Property
-
-    public static readonly DependencyProperty GroupConfigurationSelectorProperty = DataGridControl.GroupConfigurationSelectorProperty.AddOwner( typeof( DetailConfiguration ) );
-
-    public GroupConfigurationSelector GroupConfigurationSelector
-    {
-      get
-      {
-        return ( GroupConfigurationSelector )this.GetValue( GroupConfigurationSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( GroupConfigurationSelectorProperty, value );
-      }
-    }
-
-
-
-    internal event EventHandler GroupConfigurationSelectorChanged;
-
-    #endregion
-
-    #region ItemContainerStyle Property
-
-    public static readonly DependencyProperty ItemContainerStyleProperty =
-        DependencyProperty.Register( "ItemContainerStyle", typeof( Style ), typeof( DetailConfiguration ), new UIPropertyMetadata( null ) );
-
-    public Style ItemContainerStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( DetailConfiguration.ItemContainerStyleProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.ItemContainerStyleProperty, value );
-      }
-    }
-
-    #endregion ItemContainerStyle Property
-
-    #region ItemContainerStyleSelector Property
-
-    public static readonly DependencyProperty ItemContainerStyleSelectorProperty =
-        DependencyProperty.Register( "ItemContainerStyleSelector", typeof( StyleSelector ), typeof( DetailConfiguration ), new UIPropertyMetadata( null ) );
-
-    public StyleSelector ItemContainerStyleSelector
-    {
-      get
-      {
-        return ( StyleSelector )this.GetValue( DetailConfiguration.ItemContainerStyleSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.ItemContainerStyleSelectorProperty, value );
-      }
-    }
-
-    #endregion ItemContainerStyleSelector Property
-
-    #region UseDefaultHeadersFooters Property
-
-    public static readonly DependencyProperty UseDefaultHeadersFootersProperty =
-        DependencyProperty.Register( "UseDefaultHeadersFooters", typeof( bool ), typeof( DetailConfiguration ), new PropertyMetadata( true ) );
-
-    public bool UseDefaultHeadersFooters
-    {
-      get
-      {
-        return ( bool )this.GetValue( DetailConfiguration.UseDefaultHeadersFootersProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.UseDefaultHeadersFootersProperty, value );
-      }
-    }
-
-    #endregion UseDefaultHeadersFooters Property
-
-    #region DetailConfigurations Read-Only Property
-
-    private static readonly DependencyPropertyKey DetailConfigurationsPropertyKey =
-        DependencyProperty.RegisterReadOnly( "DetailConfigurations", typeof( DetailConfigurationCollection ), typeof( DetailConfiguration ), new FrameworkPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty DetailConfigurationsProperty;
-
-    public DetailConfigurationCollection DetailConfigurations
-    {
-      get
-      {
-        return ( DetailConfigurationCollection )this.GetValue( DetailConfiguration.DetailConfigurationsProperty );
-      }
-    }
-
-    private void SetDetailConfigurations( DetailConfigurationCollection value )
-    {
-      this.SetValue( DetailConfiguration.DetailConfigurationsPropertyKey, value );
-    }
-
-    #endregion DetailConfigurations Read-Only Property
-
-    #region Headers Read-Only Property
-
-    private static readonly DependencyPropertyKey HeadersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Headers", typeof( ObservableCollection<DataTemplate> ), typeof( DetailConfiguration ), new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty HeadersProperty;
-
-    public ObservableCollection<DataTemplate> Headers
-    {
-      get
-      {
-        return ( ObservableCollection<DataTemplate> )this.GetValue( DetailConfiguration.HeadersProperty );
-      }
-    }
-
-    private void SetHeaders( ObservableCollection<DataTemplate> value )
-    {
-      this.SetValue( DetailConfiguration.HeadersPropertyKey, value );
-    }
-
-    #endregion Headers Read-Only Property
-
-    #region Footers Read-Only Property
-
-    private static readonly DependencyPropertyKey FootersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Footers", typeof( ObservableCollection<DataTemplate> ), typeof( DetailConfiguration ), new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty FootersProperty;
-
-    public ObservableCollection<DataTemplate> Footers
-    {
-      get
-      {
-        return ( ObservableCollection<DataTemplate> )this.GetValue( DetailConfiguration.FootersProperty );
-      }
-    }
-
-    private void SetFooters( ObservableCollection<DataTemplate> value )
-    {
-      this.SetValue( DetailConfiguration.FootersPropertyKey, value );
-    }
-
-    #endregion Footers Read-Only Property
-
-    #region DetailIndicatorStyle Property
-
-    public static readonly DependencyProperty DetailIndicatorStyleProperty =
-        DependencyProperty.Register( "DetailIndicatorStyle", typeof( Style ), typeof( DetailConfiguration ), new FrameworkPropertyMetadata( null ) );
-
-    public Style DetailIndicatorStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( DetailConfiguration.DetailIndicatorStyleProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.DetailIndicatorStyleProperty, value );
-      }
-    }
-
-    #endregion DetailIndicatorStyle Property
-
-    #region MaxSortLevels Property
-
-    public static readonly DependencyProperty MaxSortLevelsProperty = DataGridControl.MaxSortLevelsProperty.AddOwner( typeof( DetailConfiguration ),
-      new FrameworkPropertyMetadata( -1, new PropertyChangedCallback( DetailConfiguration.OnMaxSortLevelsChanged ) ) );
-
-    public int MaxSortLevels
-    {
-      get
-      {
-        return ( int )this.GetValue( DetailConfiguration.MaxSortLevelsProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.MaxSortLevelsProperty, value );
-      }
-    }
-
-    internal event EventHandler MaxSortLevelsChanged;
-
-    private static void OnMaxSortLevelsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DetailConfiguration detailConfig = sender as DetailConfiguration;
-      if( detailConfig != null )
-      {
-        if( detailConfig.MaxSortLevelsChanged != null )
-        {
-          detailConfig.MaxSortLevelsChanged( detailConfig, EventArgs.Empty );
-        }
-      }
-    }
-
-    #endregion MaxSortLevels Property
-
-    #region MaxGroupLevels Property
-
-    public static readonly DependencyProperty MaxGroupLevelsProperty = DataGridControl.MaxGroupLevelsProperty.AddOwner( typeof( DetailConfiguration ),
-      new FrameworkPropertyMetadata( -1, new PropertyChangedCallback( DetailConfiguration.OnMaxGroupLevelsChanged ) ) );
-
-    public int MaxGroupLevels
-    {
-      get
-      {
-        return ( int )this.GetValue( DetailConfiguration.MaxGroupLevelsProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.MaxGroupLevelsProperty, value );
-      }
-    }
-
-    internal event EventHandler MaxGroupLevelsChanged;
-
-    private static void OnMaxGroupLevelsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DetailConfiguration detailConfig = sender as DetailConfiguration;
-      if( detailConfig != null )
-      {
-        if( detailConfig.MaxGroupLevelsChanged != null )
-        {
-          detailConfig.MaxGroupLevelsChanged( detailConfig, EventArgs.Empty );
-        }
-      }
-    }
-
-    #endregion MaxGroupLevels Property
-
-    #region Title Property
-
-    public static readonly DependencyProperty TitleProperty =
-       DependencyProperty.Register( "Title", typeof( object ), typeof( DetailConfiguration ), new UIPropertyMetadata( null ) );
-
-    public object Title
-    {
-      get
-      {
-        return this.GetValue( DetailConfiguration.TitleProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.TitleProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TitleTemplate Property
-
-    public static readonly DependencyProperty TitleTemplateProperty =
-        DependencyProperty.Register( "TitleTemplate", typeof( DataTemplate ), typeof( DetailConfiguration ), new UIPropertyMetadata( null ) );
-
-    public DataTemplate TitleTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( DetailConfiguration.TitleTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.TitleTemplateProperty, value );
-      }
-    }
-
-    #endregion TitleTemplate Property
-
-    #region Visible Property
-
-    public static readonly DependencyProperty VisibleProperty =
-        DependencyProperty.Register( "Visible", typeof( bool ), typeof( DetailConfiguration ),
-            new FrameworkPropertyMetadata( ( bool )true, new PropertyChangedCallback( OnVisibilityChanged ) ) );
-
-    public bool Visible
-    {
-      get
-      {
-        return ( bool )this.GetValue( VisibleProperty );
-      }
-      set
-      {
-        this.SetValue( VisibleProperty, value );
-      }
-    }
-
-    private static void OnVisibilityChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DetailConfiguration detailConfig = sender as DetailConfiguration;
-      if( detailConfig != null )
-      {
-        if( detailConfig.VisibilityChanged != null )
-        {
-          detailConfig.VisibilityChanged( detailConfig, EventArgs.Empty );
-        }
-      }
-    }
-
-    internal event EventHandler VisibilityChanged;
-
-    #endregion
-
-    #region AutoCreateForeignKeyConfigurations Property
-
-    public static readonly DependencyProperty AutoCreateForeignKeyConfigurationsProperty = DependencyProperty.Register(
-      "AutoCreateForeignKeyConfigurations",
-      typeof( bool ),
-      typeof( DetailConfiguration ),
-      new FrameworkPropertyMetadata(
-        ( bool )false,
-        new PropertyChangedCallback( DetailConfiguration.OnAutoCreateForeignKeyConfigurationsChanged ) ) );
-
-    public bool AutoCreateForeignKeyConfigurations
-    {
-      get
-      {
-        return ( bool )this.GetValue( DetailConfiguration.AutoCreateForeignKeyConfigurationsProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.AutoCreateForeignKeyConfigurationsProperty, value );
-      }
-    }
-
-    private static void OnAutoCreateForeignKeyConfigurationsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DetailConfiguration configuration = sender as DetailConfiguration;
-
-      if( ( configuration == null ) || ( !configuration.AutoCreateForeignKeyConfigurations ) )
-        return;
-
-      configuration.SynchronizeForeignKeyConfigurations();
-    }
-
-    #endregion
-
-    #region ForeignKeysUpdatedOnAutoCreate Property
-
-    internal bool ForeignKeysUpdatedOnAutoCreate
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region CurrentColumn Property
-
-    internal ColumnBase CurrentColumn
-    {
-      get
-      {
-        return m_currentColumn;
-      }
-      set
-      {
-        if( m_currentColumn != value )
-        {
-          m_currentColumn = value;
-
-          if( this.CurrentColumnChanged != null )
-            this.CurrentColumnChanged( this, EventArgs.Empty );
-        }
-      }
-    }
-
-    internal event EventHandler CurrentColumnChanged;
-
-    private ColumnBase m_currentColumn; // = null
-
-    #endregion
-
-    #region ColumnsByVisiblePosition Read-Only Property
-
-    internal HashedLinkedList<ColumnBase> ColumnsByVisiblePosition
-    {
-      get
-      {
-        return m_columnManager.ColumnsByVisiblePosition;
-      }
-    }
-
-    #endregion
-
-    #region ItemsSourcePropertyDescriptions Internal Property
-
-    internal PropertyDescriptionRouteDictionary ItemsSourcePropertyDescriptions
-    {
-      get
-      {
-        return m_itemsSourcePropertyDescriptions;
-      }
-    }
-
-    private readonly PropertyDescriptionRouteDictionary m_itemsSourcePropertyDescriptions = new PropertyDescriptionRouteDictionary();
-
-    #endregion
-
-    #region ShouldCreateColumns Property
-
-    internal bool ShouldCreateColumns
-    {
-      get
-      {
-        return m_shouldCreateColumns;
-      }
-      set
-      {
-        m_shouldCreateColumns = value;
-      }
-    }
-
-    #endregion
-
-    #region SortDescriptionsSyncContext Read-Only Property
-
-    internal SortDescriptionsSyncContext SortDescriptionsSyncContext
-    {
-      get
-      {
-        DataGridSortDescriptionCollection dataGridSortDescriptions = m_sortDescriptions as DataGridSortDescriptionCollection;
-        if( dataGridSortDescriptions != null )
-          return dataGridSortDescriptions.SyncContext;
-
-        if( m_sortDescriptionsSyncContext == null )
-        {
-          m_sortDescriptionsSyncContext = new SortDescriptionsSyncContext();
-        }
-
-        return m_sortDescriptionsSyncContext;
-      }
-    }
-
-    private SortDescriptionsSyncContext m_sortDescriptionsSyncContext; // = null
-
-    #endregion
-
-    #region SortDescriptions Read-Only Property
-
-    internal SortDescriptionCollection SortDescriptions
-    {
-      get
-      {
-        return m_sortDescriptions;
-      }
-    }
-
-    private SortDescriptionCollection m_sortDescriptions; // = null
-
-    #endregion
-
-    #region GroupDescriptions Read-Only Property
-
-    internal ObservableCollection<GroupDescription> GroupDescriptions
-    {
-      get
-      {
-        return m_groupDescriptions;
-      }
-    }
-
-    private ObservableCollection<GroupDescription> m_groupDescriptions; // = null
-
-    #endregion
-
-    #region DataGridControl Internal Property
-
-    internal DataGridControl DataGridControl
-    {
-      get
-      {
-        return m_dataGridControl;
-      }
-      private set
-      {
-        if( value == m_dataGridControl )
-          return;
-
-        var oldDataGridControl = m_dataGridControl;
-
-        if( m_dataGridControl != null )
-        {
-          ViewChangedEventManager.RemoveListener( m_dataGridControl, this );
-        }
-
-        m_dataGridControl = value;
-
-        if( m_dataGridControl != null )
-        {
-          ViewChangedEventManager.AddListener( m_dataGridControl, this );
-        }
-
-        if( value != null )
-        {
-          m_columnManager.Initialize( value );
-          m_columnManager.SetFixedColumnCount( TableView.GetFixedColumnCount( this ) );
-        }
-        else
-        {
-          m_columnManager.Clear();
-        }
-
-        var detailConfigurations = this.DetailConfigurations;
-        if( detailConfigurations != null )
-        {
-          detailConfigurations.DataGridControl = value;
-        }
-
-        this.InitializeItemPropertyMap( this.DataGridControl, this.DetailDescription );
-        this.OnPropertyChanged( DetailConfiguration.DataGridControlPropertyName );
-
-        if( m_dataGridControl == null )
-        {
-          this.BeginInit();
-        }
-        else if( oldDataGridControl == null )
-        {
-          this.EndInit();
-        }
-      }
-    }
-
-    private DataGridControl m_dataGridControl;
-
-    #endregion
-
-    #region DataGridContext Property
-
-    internal DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContexts.FirstOrDefault();
-      }
-    }
-
-    internal void AddDataGridContext( DataGridContext dataGridContext )
-    {
-      Debug.Assert( dataGridContext != null );
-
-      m_dataGridContexts.Add( dataGridContext );
-    }
-
-    internal void RemoveDataGridContext( DataGridContext dataGridContext )
-    {
-      var oldCount = m_dataGridContexts.Count;
-      m_dataGridContexts.Remove( dataGridContext );
-      var newCount = m_dataGridContexts.Count;
-    }
-
-    private readonly ICollection<DataGridContext> m_dataGridContexts = new HashSet<DataGridContext>();
-
-    #endregion
-
-    #region ParentDetailConfiguration Internal Property
-
-    internal DetailConfiguration ParentDetailConfiguration
-    {
-      get
-      {
-        if( m_containingCollection == null )
-          return null;
-
-        return m_containingCollection.ParentDetailConfiguration;
-      }
-    }
-
-    #endregion
-
-    #region ColumnManagerRowConfiguration Internal Property
-
-    internal ColumnManagerRowConfiguration ColumnManagerRowConfiguration
-    {
-      get
-      {
-        return m_columnManagerRowConfiguration;
-      }
-    }
-
-    private readonly ColumnManagerRowConfiguration m_columnManagerRowConfiguration;
-
-    #endregion
-
-    #region IsAutoCreated Internal Property
-
-    internal bool IsAutoCreated
-    {
-      get
-      {
-        return m_isAutoCreated;
-      }
-      private set
-      {
-        m_isAutoCreated = value;
-      }
-    }
-
-    private bool m_isAutoCreated = false;
-
-    #endregion
-
-    #region IsCreatedFromSelector Property
-
-    private bool IsCreatedFromSelector
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ItemPropertyMap Internal Property
-
-    internal DataGridItemPropertyMap ItemPropertyMap
-    {
-      get
-      {
-        return m_itemPropertyMap;
-      }
-    }
-
-    private readonly DataGridItemPropertyMap m_itemPropertyMap = new DataGridItemPropertyMap();
-
-    #endregion
-
-    #region UpdateColumnSortCommand Internal Property
-
-    internal UpdateColumnSortCommand UpdateColumnSortCommand
-    {
-      get
-      {
-        if( m_updateColumnSortCommand == null )
-        {
-          m_updateColumnSortCommand = new DetailConfigurationUpdateColumnSortCommand( this );
-        }
-
-        Debug.Assert( m_updateColumnSortCommand != null );
-
-        return m_updateColumnSortCommand;
-      }
-    }
-
-    private UpdateColumnSortCommand m_updateColumnSortCommand;
-
-    #endregion
-
-    #region AddGroupCommand Internal Property
-
-    internal ColumnAddGroupCommand AddGroupCommand
-    {
-      get
-      {
-        if( m_addGroupCommand == null )
-        {
-          m_addGroupCommand = new DetailConfigurationAddGroupCommand( this );
-        }
-
-        Debug.Assert( m_addGroupCommand != null );
-
-        return m_addGroupCommand;
-      }
-    }
-
-    private ColumnAddGroupCommand m_addGroupCommand;
-
-    #endregion
-
-    #region IsDeleteCommandEnabled Property
-
-    public static readonly DependencyProperty IsDeleteCommandEnabledProperty = DependencyProperty.Register(
-      "IsDeleteCommandEnabled",
-      typeof( bool ),
-      typeof( DetailConfiguration ),
-      new FrameworkPropertyMetadata( false, new PropertyChangedCallback( DetailConfiguration.OnIsDeleteCommandEnabledChanged ) ) );
-
-    public bool IsDeleteCommandEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( DetailConfiguration.IsDeleteCommandEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( DetailConfiguration.IsDeleteCommandEnabledProperty, value );
-      }
-    }
-
-    private static void OnIsDeleteCommandEnabledChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    #endregion IsDeleteCommandEnabled Property
-
-    #region DetailDescription Internal Property
-
-    internal DataGridDetailDescription DetailDescription
-    {
-      get
-      {
-        return m_detailDescription;
-      }
-      private set
-      {
-        if( value == m_detailDescription )
-          return;
-
-        m_detailDescription = value;
-        this.OnPropertyChanged( DetailConfiguration.DetailDescriptionPropertyName );
-      }
-    }
-
-    private DataGridDetailDescription m_detailDescription; // = null 
-
-    #endregion
-
-    #region ContainingCollection Private Property
-
-    private DetailConfigurationCollection ContainingCollection
-    {
-      get
-      {
-        return m_containingCollection;
-      }
-      set
-      {
-        if( value == m_containingCollection )
-          return;
-
-        if( ( m_containingCollection != null ) && ( value != null ) )
-          throw new InvalidOperationException( "The DetailConfiguration is already contained in another DetailConfigurationCollection." );
-
-        if( m_containingCollection != null )
-        {
-          ( ( INotifyPropertyChanged )m_containingCollection ).PropertyChanged -= new PropertyChangedEventHandler( this.OnContainingCollectionPropertyChanged );
-        }
-
-        m_containingCollection = value;
-
-        if( m_containingCollection != null )
-        {
-          ( ( INotifyPropertyChanged )m_containingCollection ).PropertyChanged += new PropertyChangedEventHandler( this.OnContainingCollectionPropertyChanged );
-
-          this.DataGridControl = m_containingCollection.DataGridControl;
-        }
-        else
-        {
-          this.DataGridControl = null;
-        }
-      }
-    }
-
-    private void OnContainingCollectionPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      var containingCollection = ( DetailConfigurationCollection )sender;
-      Debug.Assert( containingCollection == this.ContainingCollection );
-
-      var propertyName = e.PropertyName;
-      bool mayHaveChanged = string.IsNullOrEmpty( propertyName );
-
-      if( mayHaveChanged || ( propertyName == "DataGridControl" ) )
-      {
-        this.DataGridControl = containingCollection.DataGridControl;
-      }
-    }
-
-    private DetailConfigurationCollection m_containingCollection; // = null
-
-    #endregion
-
-    #region ColumnSynchronizationManager Private Read-Only Property
-
-    private ColumnSynchronizationManager ColumnSynchronizationManager
-    {
-      get
-      {
-        return m_columnSynchronizationManager;
-      }
-    }
-
-    private readonly ColumnSynchronizationManager m_columnSynchronizationManager;
-
-    #endregion
-
-    #region ColumnManager Internal Property
-
-    internal ColumnHierarchyManager ColumnManager
-    {
-      get
-      {
-        return m_columnManager;
-      }
-    }
-
-    private readonly ColumnHierarchyManager m_columnManager;
-
-    #endregion
-
-    public IDisposable DeferColumnsUpdate()
-    {
-      return ColumnHierarchyManagerHelper.DeferColumnsUpdate( this );
-    }
-
-    public bool MoveColumnBefore( ColumnBase current, ColumnBase next )
-    {
-      return ColumnHierarchyManagerHelper.MoveColumnBefore( this, current, next );
-    }
-
-    public bool MoveColumnAfter( ColumnBase current, ColumnBase previous )
-    {
-      return ColumnHierarchyManagerHelper.MoveColumnAfter( this, current, previous );
-    }
-
-    public bool MoveColumnUnder( ColumnBase current, ColumnBase parent )
-    {
-      return ColumnHierarchyManagerHelper.MoveColumnUnder( this, current, parent );
-    }
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( e.Property == DetailConfiguration.GroupConfigurationSelectorProperty )
-      {
-        var handler = this.GroupConfigurationSelectorChanged;
-        if( handler != null )
-        {
-          handler.Invoke( this, EventArgs.Empty );
-        }
-      }
-
-      this.OnPropertyChanged( e.Property.Name );
-    }
-
-    internal void AddDefaultHeadersFooters()
-    {
-      if( m_defaultHeadersFootersAdded )
-        return;
-
-      m_defaultHeadersFootersAdded = true;
-
-      DetailConfiguration.AddDefaultHeadersFooters( this.Headers, 0, this.DataGridControl.AreDetailsFlatten );
-    }
-
-    internal void SynchronizeForeignKeyConfigurations()
-    {
-      var detailDescription = this.DetailDescription;
-      if( detailDescription == null )
-        return;
-
-      ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-        this.Columns,
-        detailDescription.ItemProperties,
-        this.AutoCreateForeignKeyConfigurations );
-    }
-
-    internal void AttachToContainingCollection( DetailConfigurationCollection detailConfigurationCollection )
-    {
-      if( detailConfigurationCollection == null )
-        throw new ArgumentNullException( "detailConfigurationCollection" );
-
-      this.ContainingCollection = detailConfigurationCollection;
-    }
-
-    internal void DetachFromContainingCollection()
-    {
-      this.ContainingCollection = null;
-    }
-
-    private void SynchronizeWithDetailDescription( DataGridDetailDescription detailDescription )
-    {
-      if( detailDescription == this.DetailDescription )
-        return;
-
-      this.DetachFromDetailDescription( false );
-
-      m_shouldCreateColumns = true;
-      this.DetailDescription = detailDescription;
-
-      DataGridSortDescriptionCollection dataGridSortDescriptionCollection;
-      ObservableCollection<GroupDescription> groupDescriptionCollection;
-
-      if( detailDescription != null )
-      {
-        groupDescriptionCollection = detailDescription.GroupDescriptions;
-
-        //register to the collectionchanged of the DataGridDetailDescription collection of the detailDescription matching this one.
-        dataGridSortDescriptionCollection = detailDescription.DataGridSortDescriptions;
-
-        this.RegisterItemProperties( detailDescription.ItemProperties );
-
-        CollectionChangedEventManager.AddListener( detailDescription.DetailDescriptions, this );
-      }
-      else
-      {
-        groupDescriptionCollection = new GroupDescriptionCollection();
-        dataGridSortDescriptionCollection = new DataGridSortDescriptionCollection();
-      }
-
-      m_groupDescriptions = groupDescriptionCollection;
-      m_sortDescriptions = dataGridSortDescriptionCollection;
-      m_sortDescriptionsSyncContext = null; //clear it, if it was ever set!
-
-      this.InitializeItemPropertyMap( this.DataGridControl, detailDescription );
-
-      //This update is required since there might be some columns in the columns collection after the XAML parsing of the DetailConfiguration
-      this.UpdateColumnSortOrder();
-
-      //This update is required since we want the GroupLevelDescriptions to be created if DetailConfiguration in XAML
-      //contains GroupDescriptions
-      DataGridContext.UpdateGroupLevelDescriptions( this.GroupLevelDescriptions,
-                                                    new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ),
-                                                    this.GroupDescriptions,
-                                                    this.Columns );
-
-      CollectionChangedEventManager.AddListener( m_sortDescriptions, this );
-      CollectionChangedEventManager.AddListener( m_groupDescriptions, this );
-
-      if( detailDescription != null )
-      {
-        if( this.ReadLocalValue( DetailConfiguration.TitleProperty ) == DependencyProperty.UnsetValue )
-        {
-          if( detailDescription.Title == null )
-          {
-            this.Title = detailDescription.RelationName;
-          }
-          else
-          {
-            this.Title = detailDescription.Title;
-          }
-        }
-
-        if( ( this.ReadLocalValue( DetailConfiguration.TitleTemplateProperty ) == DependencyProperty.UnsetValue )
-          && ( detailDescription.TitleTemplate != null ) )
-        {
-          this.TitleTemplate = detailDescription.TitleTemplate;
-        }
-      }
-
-      this.UpdateColumns();
-    }
-
-    private void DetachFromDetailDescription()
-    {
-      this.DetachFromDetailDescription( true );
-    }
-
-    private void DetachFromDetailDescription( bool synchronizeColumns )
-    {
-      var detailDescription = this.DetailDescription;
-      if( detailDescription != null )
-      {
-        this.UnregisterItemProperties( detailDescription.ItemProperties );
-
-        CollectionChangedEventManager.RemoveListener( detailDescription.DetailDescriptions, this );
-      }
-
-      if( m_sortDescriptions != null )
-      {
-        CollectionChangedEventManager.RemoveListener( m_sortDescriptions, this );
-      }
-
-      if( m_groupDescriptions != null )
-      {
-        CollectionChangedEventManager.RemoveListener( m_groupDescriptions, this );
-      }
-
-      m_sortDescriptions = null;
-      m_groupDescriptions = null;
-      m_itemsSourcePropertyDescriptions.Clear();
-
-      this.InitializeItemPropertyMap( this.DataGridControl, null );
-      this.DetailDescription = null;
-
-      if( synchronizeColumns )
-      {
-        m_columnSynchronizationManager.Refresh();
-      }
-    }
-
-    private void InitializeItemPropertyMap( DataGridControl dataGridControl, DataGridDetailDescription detailDescription )
-    {
-      using( m_itemPropertyMap.DeferMappingChanged() )
-      {
-        if( ( dataGridControl == null ) || ( detailDescription == null ) || !dataGridControl.AreDetailsFlatten )
-        {
-          m_itemPropertyMap.MasterItemProperties = null;
-          m_itemPropertyMap.DetailItemProperties = null;
-        }
-        else
-        {
-          var collectionView = dataGridControl.Items.SourceCollection as DataGridCollectionViewBase;
-          if( collectionView != null )
-          {
-            m_itemPropertyMap.MasterItemProperties = collectionView.ItemProperties;
-            m_itemPropertyMap.DetailItemProperties = detailDescription.ItemProperties;
-          }
-          else
-          {
-            m_itemPropertyMap.MasterItemProperties = null;
-            m_itemPropertyMap.DetailItemProperties = null;
-          }
-        }
-      }
-    }
-
-    private void UpdateColumns()
-    {
-      var detailDescription = this.DetailDescription;
-      var dataGridControl = this.DataGridControl;
-      var dataGridContext = this.DataGridContext;
-
-      if( ( detailDescription != null ) && ( dataGridControl != null ) && ( dataGridContext != null ) )
-      {
-        ItemsSourceHelper.ResetPropertyDescriptions( m_itemsSourcePropertyDescriptions, m_itemPropertyMap, dataGridControl, dataGridContext.Items );
-
-        if( this.AutoCreateColumns )
-        {
-          ItemsSourceHelper.UpdateColumnsFromPropertyDescriptions( m_columnManager, dataGridControl.DefaultCellEditors, m_itemsSourcePropertyDescriptions, this.AutoCreateForeignKeyConfigurations );
-        }
-      }
-      else
-      {
-        m_itemsSourcePropertyDescriptions.Clear();
-      }
-
-      if( detailDescription != null )
-      {
-        // Ensure to update ForeignKeyDescriptions and ForeignKeyConfigurations when ItemProperties change on DetailDescription.
-        ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-          this.Columns,
-          detailDescription.ItemProperties,
-          this.AutoCreateForeignKeyConfigurations );
-      }
-    }
-
-    private void RegisterItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      CollectionChangedEventManager.AddListener( itemProperties, this );
-
-      foreach( var itemProperty in itemProperties )
-      {
-        this.RegisterItemProperty( itemProperty );
-      }
-    }
-
-    private void UnregisterItemProperties( DataGridItemPropertyCollection itemProperties )
-    {
-      if( itemProperties == null )
-        return;
-
-      foreach( var itemProperty in itemProperties )
-      {
-        this.UnregisterItemProperty( itemProperty );
-      }
-
-      CollectionChangedEventManager.RemoveListener( itemProperties, this );
-    }
-
-    private void RegisterItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      PropertyChangedEventManager.AddListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
-      this.RegisterItemProperties( itemProperty.ItemPropertiesInternal );
-    }
-
-    private void UnregisterItemProperty( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        return;
-
-      this.UnregisterItemProperties( itemProperty.ItemPropertiesInternal );
-      PropertyChangedEventManager.RemoveListener( itemProperty, this, DataGridItemPropertyBase.ItemPropertiesInternalPropertyName );
-    }
-
-    private void UpdateColumnSortOrder()
-    {
-      var updateColumnSortCommand = this.UpdateColumnSortCommand;
-      if( updateColumnSortCommand.CanExecute() )
-      {
-        this.UpdateColumnSortCommand.Execute();
-      }
-    }
-
-    private void SortDescriptions_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.RequestDelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers.SortChanged );
-      this.UpdateColumnSortOrder();
-    }
-
-    private void GroupDescriptions_CollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.RequestDelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers.GroupChanged );
-      DataGridContext.UpdateGroupLevelDescriptions( this.GroupLevelDescriptions, e, m_groupDescriptions, this.Columns );
-    }
-
-    private void OnColumnsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      //call the method that will detect if the CurrentColumn should be removed based on the changes in the Columns collection.
-      this.HandleCurrentColumnRemove( e );
-
-      this.RequestDelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers.ColumnsCollectionChanged );
-      this.UpdateColumnSortOrder();
-
-      var detailDescription = this.DetailDescription;
-      if( detailDescription != null )
-      {
-        switch( e.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-          case NotifyCollectionChangedAction.Replace:
-          case NotifyCollectionChangedAction.Reset:
-            {
-              ForeignKeyConfiguration.UpdateColumnsForeignKeyConfigurationsFromDataGridCollectionView(
-                this.Columns,
-                detailDescription.ItemProperties,
-                this.AutoCreateForeignKeyConfigurations );
-            }
-            break;
-
-          default:
-            break;
-        }
-      }
-    }
-
-    private void OnItemPropertiesCollectionChanged( DataGridItemPropertyCollection collection, NotifyCollectionChangedEventArgs e )
-    {
-      var detailDescription = this.DetailDescription;
-      if( detailDescription == null )
-        return;
-
-      var rootCollection = ItemsSourceHelper.GetRootCollection( collection );
-      if( rootCollection == null )
-        return;
-
-      if( rootCollection == detailDescription.ItemProperties )
-      {
-        if( e.Action == NotifyCollectionChangedAction.Reset )
-          throw new NotSupportedException();
-
-        if( e.Action == NotifyCollectionChangedAction.Move )
-          return;
-
-        if( e.OldItems != null )
-        {
-          foreach( DataGridItemPropertyBase itemProperty in e.OldItems )
-          {
-            this.UnregisterItemProperty( itemProperty );
-          }
-        }
-
-        if( e.NewItems != null )
-        {
-          foreach( DataGridItemPropertyBase itemProperty in e.NewItems )
-          {
-            this.RegisterItemProperty( itemProperty );
-          }
-        }
-
-        this.UpdateColumns();
-      }
-      else
-      {
-        Debug.Fail( "The collection is not linked to the detail configuration's item properties." );
-        this.UnregisterItemProperties( collection );
-      }
-    }
-
-    private void OnItemPropertyPropertyChanged( DataGridItemPropertyBase itemProperty, PropertyChangedEventArgs e )
-    {
-      var detailDescription = this.DetailDescription;
-      if( detailDescription == null )
-        return;
-
-      var rootCollection = ItemsSourceHelper.GetRootCollection( itemProperty );
-      if( rootCollection == null )
-        return;
-
-      if( rootCollection != detailDescription.ItemProperties )
-      {
-        Debug.Fail( "The collection is not linked to the detail configuration's item properties." );
-        this.UnregisterItemProperty( itemProperty );
-        return;
-      }
-
-      if( string.IsNullOrEmpty( e.PropertyName ) || ( e.PropertyName == DataGridItemPropertyBase.ItemPropertiesInternalPropertyName ) )
-      {
-        var itemProperties = itemProperty.ItemPropertiesInternal;
-        if( itemProperties != null )
-        {
-          this.UnregisterItemProperties( itemProperties );
-          this.RegisterItemProperties( itemProperties );
-          this.UpdateColumns();
-        }
-      }
-    }
-
-    private void HandleCurrentColumnRemove( NotifyCollectionChangedEventArgs e )
-    {
-      var currentColumn = this.CurrentColumn;
-      if( currentColumn == null )
-        return;
-
-      var removeCurrentColumn = false;
-
-      if( e.Action == NotifyCollectionChangedAction.Reset )
-      {
-        removeCurrentColumn = !this.Columns.Contains( currentColumn );
-      }
-      else if( ( e.Action == NotifyCollectionChangedAction.Remove ) && ( e.OldItems.Contains( currentColumn ) ) )
-      {
-        //Remove of at least the current column
-        removeCurrentColumn = true;
-      }
-      else if( ( e.Action == NotifyCollectionChangedAction.Replace ) && ( e.OldItems.Contains( currentColumn ) ) && ( !e.NewItems.Contains( currentColumn ) ) )
-      {
-        //Replace in which at least the current column was "replaced" by another (current column not present in new items )
-        removeCurrentColumn = true;
-      }
-
-      //If we computed that current columns should be cleared
-      if( removeCurrentColumn )
-      {
-        //reset current column.
-        this.CurrentColumn = DataGridContext.GetClosestColumn( currentColumn, this.ColumnsByVisiblePosition );
-      }
-    }
-
-    private void OnDetailConfigurationsChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      var detailDescription = this.DetailDescription;
-      var detailDescriptions = ( detailDescription != null ) ? detailDescription.DetailDescriptions : null;
-
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Replace:
-        case NotifyCollectionChangedAction.Add:
-          DetailConfiguration.SynchronizeAddedConfigurations( e.NewItems, detailDescriptions );
-          break;
-        case NotifyCollectionChangedAction.Reset:
-        case NotifyCollectionChangedAction.Remove:
-        case NotifyCollectionChangedAction.Move:
-        default:
-          break;
-      }
-    }
-
-    private void RequestDelayBringIntoViewAndFocusCurrent( AutoScrollCurrentItemSourceTriggers trigger )
-    {
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      //check if the event comes from a INotifyCollectionChanged collection
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        var eventArgs = ( NotifyCollectionChangedEventArgs )e;
-
-        if( sender is DetailConfigurationCollection )
-        {
-          this.OnDetailConfigurationsChanged( sender, eventArgs );
-        }
-        else if( sender is SortDescriptionCollection )
-        {
-          this.SortDescriptions_CollectionChanged( sender, eventArgs );
-        }
-        else if( sender is ObservableCollection<GroupDescription> )
-        {
-          this.GroupDescriptions_CollectionChanged( sender, eventArgs );
-        }
-        else if( sender is DataGridDetailDescriptionCollection )
-        {
-        }
-        else if( sender is DataGridItemPropertyCollection )
-        {
-          this.OnItemPropertiesCollectionChanged( ( DataGridItemPropertyCollection )sender, eventArgs );
-        }
-      }
-      else if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        var eventArgs = ( PropertyChangedEventArgs )e;
-
-        if( sender is DataGridItemPropertyBase )
-        {
-          this.OnItemPropertyPropertyChanged( ( DataGridItemPropertyBase )sender, eventArgs );
-        }
-      }
-      else if( managerType == typeof( ViewChangedEventManager ) )
-      {
-        this.InitializeItemPropertyMap( this.DataGridControl, this.DetailDescription );
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region ISupportInitialize Members
-
-    public void BeginInit()
-    {
-      m_initCount++;
-      if( m_initCount != 1 )
-        return;
-
-      Debug.Assert( m_deferColumnsLayoutUpdate == null );
-      m_deferColumnsLayoutUpdate = m_columnManager.DeferUpdate();
-
-      m_deferColumnsNotifications = this.Columns.DeferNotifications();
-    }
-
-    public void EndInit()
-    {
-      m_initCount--;
-      if( m_initCount != 0 )
-        return;
-
-      var columnsNotificationsDisposable = m_deferColumnsNotifications;
-      m_deferColumnsNotifications = null;
-      columnsNotificationsDisposable.Dispose();
-
-      Debug.Assert( m_deferColumnsLayoutUpdate != null );
-      var columnsUpdateDisposable = m_deferColumnsLayoutUpdate;
-      m_deferColumnsLayoutUpdate = null;
-      columnsUpdateDisposable.Dispose();
-    }
-
-    private int m_initCount = 0;
-    private IDisposable m_deferColumnsLayoutUpdate; //null
-    private IDisposable m_deferColumnsNotifications; //null
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    private bool m_shouldCreateColumns = true;
-    private bool m_defaultHeadersFootersAdded; // = false
-
-    private sealed class DetailConfigurationUpdateColumnSortCommand : UpdateColumnSortCommand
-    {
-      private static void ThrowIfDetailsNotFlatten( DetailConfiguration detailConfiguration )
-      {
-        Debug.Assert( detailConfiguration != null );
-
-        var dataGridControl = detailConfiguration.DataGridControl;
-        if( ( dataGridControl != null ) && ( !dataGridControl.AreDetailsFlatten ) )
-          throw new InvalidOperationException( "This method cannot be invoked when details are not flattened." );
-      }
-
-      internal DetailConfigurationUpdateColumnSortCommand( DetailConfiguration detailConfiguration )
-      {
-        DetailConfigurationUpdateColumnSortCommand.ThrowIfNull( detailConfiguration, "detailConfiguration" );
-
-        m_detailConfiguration = new WeakReference( detailConfiguration );
-      }
-
-      #region SortDescriptionsSyncContext Protected Property
-
-      protected override SortDescriptionsSyncContext SortDescriptionsSyncContext
-      {
-        get
-        {
-          var detailConfiguration = this.DetailConfiguration;
-          if( detailConfiguration == null )
-            return null;
-
-          return detailConfiguration.SortDescriptionsSyncContext;
-        }
-      }
-
-      #endregion
-
-      #region DetailConfiguration Private Property
-
-      private DetailConfiguration DetailConfiguration
-      {
-        get
-        {
-          return m_detailConfiguration.Target as DetailConfiguration;
-        }
-      }
-
-      private readonly WeakReference m_detailConfiguration;
-
-      #endregion
-
-      protected override bool CanExecuteCore()
-      {
-        var detailConfiguration = this.DetailConfiguration;
-        if( detailConfiguration == null )
-          return false;
-
-        var dataGridControl = detailConfiguration.DataGridControl;
-        if( dataGridControl == null )
-          return false;
-
-        var detailDescription = detailConfiguration.DetailDescription;
-        if( detailDescription == null )
-          return false;
-
-        return true;
-      }
-
-      protected override void ExecuteCore()
-      {
-        DetailConfiguration detailConfiguration = this.DetailConfiguration;
-        if( detailConfiguration == null )
-          return;
-
-        var dataGridControl = detailConfiguration.DataGridControl;
-        if( dataGridControl == null )
-          return;
-
-        using( var synchronizationContext = this.StartSynchronizing( detailConfiguration.SortDescriptionsSyncContext ) )
-        {
-          // The SortDescription collection is already being updated.
-          if( !synchronizationContext.Own )
-            return;
-
-          // The sort order of the flatten details is driven by the master.  Flatten details are not
-          // allowed to modify the sort order at their level.
-          if( dataGridControl.AreDetailsFlatten )
-          {
-            this.SynchronizeDetailSortDescriptions( synchronizationContext, detailConfiguration );
-          }
-
-          this.SynchronizeColumnSort(
-            synchronizationContext,
-            detailConfiguration.SortDescriptions,
-            detailConfiguration.Columns );
-        }
-      }
-
-      private static IEnumerable<DataGridContext> GetDataGridContexts( DetailConfiguration detailConfiguration )
-      {
-        Debug.Assert( detailConfiguration != null );
-
-        var dataGridControl = detailConfiguration.DataGridControl;
-        Debug.Assert( dataGridControl != null );
-
-        var queue = new Queue<DataGridContext>();
-        queue.Enqueue( dataGridControl.DataGridContext );
-
-        while( queue.Count > 0 )
-        {
-          DataGridContext dataGridContext = queue.Dequeue();
-
-          if( dataGridContext.SourceDetailConfiguration == detailConfiguration )
-          {
-            yield return dataGridContext;
-          }
-          else
-          {
-            foreach( var childContext in dataGridContext.GetChildContexts() )
-            {
-              queue.Enqueue( childContext );
-            }
-          }
-        }
-      }
-
-      private IDisposable DeferResortHelper( DetailConfiguration detailConfiguration )
-      {
-        ColumnSortCommand.ThrowIfNull( detailConfiguration, "detailConfiguration" );
-
-        IDisposable defer;
-        if( this.TryDeferResort( detailConfiguration, out defer ) )
-          return defer;
-
-        var disposer = new Disposer();
-
-        foreach( var dataGridContext in DetailConfigurationUpdateColumnSortCommand.GetDataGridContexts( detailConfiguration ) )
-        {
-          disposer.Add( this.DeferResortHelper( dataGridContext.ItemsSourceCollection, dataGridContext.Items ), DisposableType.DeferResort );
-        }
-
-        return disposer;
-      }
-
-      private void SynchronizeDetailSortDescriptions( SynchronizationContext synchronizationContext, DetailConfiguration detailConfiguration )
-      {
-        ColumnSortCommand.ThrowIfNull( synchronizationContext, "synchronizationContext" );
-        ColumnSortCommand.ThrowIfNull( detailConfiguration, "detailConfiguration" );
-        DetailConfigurationUpdateColumnSortCommand.ThrowIfDetailsNotFlatten( detailConfiguration );
-
-        if( !synchronizationContext.Own )
-          return;
-
-        if( detailConfiguration.DetailDescription == null )
-          return;
-
-        var dataGridControl = detailConfiguration.DataGridControl;
-        if( dataGridControl == null )
-          return;
-
-        var rootDataGridContext = dataGridControl.DataGridContext;
-        var masterSortDescriptions = rootDataGridContext.Items.SortDescriptions;
-        var detailSortDescriptions = detailConfiguration.SortDescriptions;
-
-        // There is nothing to synchronize.
-        if( ( masterSortDescriptions.Count == 0 ) && ( detailSortDescriptions.Count == 0 ) )
-          return;
-
-        using( this.DeferResortHelper( detailConfiguration ) )
-        {
-          this.SynchronizeDetailSortDescriptions( masterSortDescriptions, detailSortDescriptions, detailConfiguration );
-        }
-      }
-
-      private void SynchronizeDetailSortDescriptions( SortDescriptionCollection masterSortDescriptions, SortDescriptionCollection detailSortDescriptions, DetailConfiguration detailConfiguration )
-      {
-        ColumnSortCommand.ThrowIfNull( masterSortDescriptions, "masterSortDescriptions" );
-        ColumnSortCommand.ThrowIfNull( detailSortDescriptions, "detailSortDescriptions" );
-
-        var itemPropertyMap = detailConfiguration.ItemPropertyMap;
-        ColumnSortCommand.ThrowIfNull( itemPropertyMap, "itemPropertyMap" );
-
-        var masterSortDescriptionsCount = masterSortDescriptions.Count;
-        if( masterSortDescriptionsCount > 0 )
-        {
-          var insertionIndex = 0;
-
-          for( int i = 0; i < masterSortDescriptionsCount; i++ )
-          {
-            var sortDescription = masterSortDescriptions[ i ];
-            var detailPropertyName = default( string );
-
-            if( !DataGridItemPropertyMapHelper.TryGetDetailColumnName( itemPropertyMap, sortDescription.PropertyName, out detailPropertyName ) )
-              continue;
-
-            var detailDirection = sortDescription.Direction;
-
-            if( insertionIndex < detailSortDescriptions.Count )
-            {
-              var detailSortDescription = detailSortDescriptions[ insertionIndex ];
-
-              if( ( detailSortDescription.PropertyName != detailPropertyName ) || ( detailSortDescription.Direction != detailDirection ) )
-              {
-                detailSortDescriptions[ insertionIndex ] = new SortDescription( detailPropertyName, detailDirection );
-              }
-            }
-            else
-            {
-              detailSortDescriptions.Add( new SortDescription( detailPropertyName, detailDirection ) );
-            }
-
-            insertionIndex++;
-          }
-
-          while( insertionIndex < detailSortDescriptions.Count )
-          {
-            detailSortDescriptions.RemoveAt( insertionIndex );
-          }
-        }
-        else if( detailSortDescriptions.Count > 0 )
-        {
-          detailSortDescriptions.Clear();
-        }
-      }
-    }
-
-    private sealed class DetailConfigurationAddGroupCommand : ColumnAddGroupCommand
-    {
-      internal DetailConfigurationAddGroupCommand( DetailConfiguration detailConfiguration )
-      {
-        DetailConfigurationAddGroupCommand.ThrowIfNull( detailConfiguration, "detailConfiguration" );
-
-        m_detailConfiguration = new WeakReference( detailConfiguration );
-      }
-
-      #region GroupDescriptions Protected Property
-
-      protected override ObservableCollection<GroupDescription> GroupDescriptions
-      {
-        get
-        {
-          var detailConfiguration = this.DetailConfiguration;
-          if( detailConfiguration == null )
-            return null;
-
-          return detailConfiguration.GroupDescriptions;
-        }
-      }
-
-      #endregion
-
-      #region DetailConfiguration Private Property
-
-      private DetailConfiguration DetailConfiguration
-      {
-        get
-        {
-          return m_detailConfiguration.Target as DetailConfiguration;
-        }
-      }
-
-      private readonly WeakReference m_detailConfiguration;
-
-      #endregion
-
-      protected override string GetColumnName( ColumnBase column )
-      {
-        var detailConfiguration = this.DetailConfiguration;
-        if( ( detailConfiguration == null ) || ( column == null ) )
-          return null;
-
-        var itemPropertyMap = detailConfiguration.ItemPropertyMap;
-        if( ( itemPropertyMap != null ) && itemPropertyMap.IsMapping )
-        {
-          string fieldName;
-          if( DataGridItemPropertyMapHelper.TryGetDetailColumnName( itemPropertyMap, column.FieldName, out fieldName ) )
-            return fieldName;
-        }
-        else
-        {
-          return column.FieldName;
-        }
-
-        return null;
-      }
-
-      protected override GroupDescription GetGroupDescription( ColumnBase column )
-      {
-        var detailConfiguration = this.DetailConfiguration;
-        if( detailConfiguration == null )
-          return null;
-
-        return base.GetGroupDescription( column );
-      }
-
-      protected override GroupConfiguration GetGroupConfiguration( ColumnBase column )
-      {
-        var detailConfiguration = this.DetailConfiguration;
-        if( detailConfiguration == null )
-          return null;
-
-        return base.GetGroupConfiguration( column );
-      }
-
-      protected override bool CanExecuteCore( ColumnBase column, int index )
-      {
-        if( this.DetailConfiguration == null )
-          return false;
-
-        return base.CanExecuteCore( column, index );
-      }
-
-      protected override void ExecuteCore( ColumnBase column, int index )
-      {
-        var detailConfig = this.DetailConfiguration;
-        if( detailConfig == null )
-          return;
-
-        var dataGridControl = detailConfig.DataGridControl;
-        IDisposable disposable = null;
-
-        try
-        {
-          if( dataGridControl != null )
-          {
-            disposable = dataGridControl.SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged );
-          }
-
-          base.ExecuteCore( column, index );
-        }
-        finally
-        {
-          if( disposable != null )
-          {
-            disposable.Dispose();
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs
deleted file mode 100644
index 22632842..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class DetailConfigurationCollection : ObservableCollection<DetailConfiguration>, IWeakEventListener
-  {
-    internal DetailConfigurationCollection( DataGridControl dataGridControl, DetailConfiguration parentDetailConfiguration )
-      : base()
-    {
-      this.DataGridControl = dataGridControl;
-      this.ParentDetailConfiguration = parentDetailConfiguration;
-    }
-
-    #region DataGridControl Property
-
-    internal DataGridControl DataGridControl
-    {
-      get
-      {
-        return m_dataGridControl;
-      }
-      set
-      {
-        if( m_dataGridControl == value )
-          return;
-
-        m_dataGridControl = value;
-
-        this.OnPropertyChanged( new PropertyChangedEventArgs( "DataGridControl" ) );
-      }
-    }
-
-    private DataGridControl m_dataGridControl;
-
-    #endregion
-
-    #region ParentDetailConfiguration Property
-
-    internal DetailConfiguration ParentDetailConfiguration
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    public DetailConfiguration this[ string relationName ]
-    {
-      get
-      {
-        foreach( DetailConfiguration config in this )
-        {
-          if( string.Equals( config.RelationName, relationName ) == true )
-          {
-            return config;
-          }
-        }
-
-        return null;
-      }
-    }
-
-    protected override void InsertItem( int index, DetailConfiguration item )
-    {
-      if( item != null )
-      {
-        item.AttachToContainingCollection( this );
-
-        DetailVisibilityChangedEventManager.AddListener( item, this );
-      }
-
-      base.InsertItem( index, item );
-    }
-
-    protected override void RemoveItem( int index )
-    {
-      DetailConfiguration detailConfig = this[ index ];
-
-      detailConfig.DetachFromContainingCollection();
-
-      DetailVisibilityChangedEventManager.RemoveListener( detailConfig, this );
-
-      base.RemoveItem( index );
-    }
-
-    protected override void ClearItems()
-    {
-      foreach( DetailConfiguration detailConfig in this )
-      {
-        detailConfig.DetachFromContainingCollection();
-
-        DetailVisibilityChangedEventManager.RemoveListener( detailConfig, this );
-      }
-
-      base.ClearItems();
-    }
-
-    protected override void SetItem( int index, DetailConfiguration item )
-    {
-      DetailConfiguration detailConfig = this[ index ];
-
-      if( ( detailConfig != null ) && ( detailConfig != item ) )
-      {
-        detailConfig.DetachFromContainingCollection();
-      }
-
-      if( ( item != null ) && ( item != detailConfig ) )
-      {
-        item.AttachToContainingCollection( this );
-      }
-
-      base.SetItem( index, item );
-    }
-
-    #region IWeakEventListener Members
-
-    internal event EventHandler DetailVisibilityChanged;
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( DetailVisibilityChangedEventManager ) )
-      {
-        if( this.DetailVisibilityChanged != null )
-        {
-          this.DetailVisibilityChanged( this, EventArgs.Empty );
-        }
-
-        return true;
-      }
-      return false;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationSelector.cs
deleted file mode 100644
index fca7f661..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationSelector.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  public abstract class DetailConfigurationSelector
-  {
-    internal virtual DetailConfiguration SelectDetailConfiguration( string relationName, DataGridDetailDescription dataGridDetailDescription )
-    {
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailIndicator.cs
deleted file mode 100644
index e4e7a52e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailIndicator.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public class DetailIndicator : GroupLevelIndicator
-  {
-    static DetailIndicator()
-    {
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( DetailIndicator ), new FrameworkPropertyMetadata( new PropertyChangedCallback( DetailIndicator.OnParentGridControlChanged ) ) );
-
-      FocusableProperty.OverrideMetadata(typeof(DetailIndicator), new FrameworkPropertyMetadata(false));
-    }
-
-    protected internal override void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( DetailIndicator ) );
-    }
-
-    private static void OnParentGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridControl grid = e.NewValue as DataGridControl;
-
-      if( grid != null )
-        ( ( DetailIndicator )sender ).PrepareDefaultStyleKey( grid.GetView() );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridControlTraceSources.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridControlTraceSources.cs
deleted file mode 100644
index 1e48c1d8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridControlTraceSources.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Threading;
-
-namespace Xceed.Wpf.DataGrid.Diagnostics
-{
-  internal static class DataGridControlTraceSources
-  {
-    #region CollectionViewSource Property
-
-    internal static DataGridTraceSource CollectionViewSource
-    {
-      get
-      {
-        return DataGridControlTraceSources.DataGridTraceSource;
-      }
-    }
-
-    #endregion
-
-    #region ItemContainerGeneratorSource Property
-
-    internal static DataGridTraceSource ItemContainerGeneratorSource
-    {
-      get
-      {
-        return DataGridControlTraceSources.DataGridTraceSource;
-      }
-    }
-
-    #endregion
-
-    #region DataSource Private Property
-
-    private static DataGridTraceSource DataGridTraceSource
-    {
-      get
-      {
-        if( s_traceSource == null )
-        {
-          var source = new DataGridTraceSource( new TraceSource( "Xceed.Wpf.DataGrid" ) );
-          Interlocked.CompareExchange<DataGridTraceSource>( ref s_traceSource, source, null );
-        }
-
-        return s_traceSource;
-      }
-    }
-
-    private static DataGridTraceSource s_traceSource; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.Generic.cs
deleted file mode 100644
index ffff83e2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.Generic.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Diagnostics
-{
-  internal class DataGridTraceArg<T> : DataGridTraceArg
-  {
-    internal DataGridTraceArg( T value )
-    {
-      m_value = value;
-    }
-
-    protected override string FormatOutput( CultureInfo culture )
-    {
-      if( object.ReferenceEquals( m_value, null ) )
-        return "<null>";
-
-      var formattable = m_value as IFormattable;
-      if( formattable != null )
-        return formattable.ToString( null, culture );
-
-      var valueType = m_value.GetType();
-      if( valueType.IsGenericType && ( valueType.GetGenericTypeDefinition() == typeof( Nullable<> ) ) )
-      {
-        valueType = Nullable.GetUnderlyingType( valueType );
-      }
-
-      if( valueType.IsEnum )
-        return m_value.ToString();
-
-      if( valueType.IsPrimitive || ( typeof( string ) == valueType ) )
-        return string.Format( culture, "{0}", m_value );
-
-      var hashCode = m_value.GetHashCode();
-      var name = default( string );
-
-      if( m_value is DataGridControl )
-      {
-        var dataGridControl = m_value as DataGridControl;
-
-        name = dataGridControl.GridUniqueName;
-
-        if( string.IsNullOrEmpty( name ) )
-        {
-          name = dataGridControl.Name;
-        }
-      }
-      else if( m_value is FrameworkElement )
-      {
-        var fe = m_value as FrameworkElement;
-
-        name = fe.Name;
-      }
-      else if( m_value is FrameworkContentElement )
-      {
-        var fce = m_value as FrameworkContentElement;
-
-        name = fce.Name;
-      }
-
-      if( !string.IsNullOrEmpty( name ) )
-        return string.Format( culture, "('{2}' -> {0}, <{1}>)", hashCode, valueType, name );
-
-      return string.Format( culture, "({0}, <{1}>)", hashCode, valueType );
-    }
-
-    private readonly T m_value;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.cs
deleted file mode 100644
index 328b0853..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArg.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid.Diagnostics
-{
-  internal abstract class DataGridTraceArg
-  {
-    protected abstract string FormatOutput( CultureInfo culture );
-
-    public sealed override string ToString()
-    {
-      var output = this.FormatOutput( CultureInfo.InvariantCulture );
-      if( string.IsNullOrEmpty( output ) )
-        return string.Empty;
-
-      return output;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArgs.cs
deleted file mode 100644
index 0297d39f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceArgs.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid.Diagnostics
-{
-  internal static class DataGridTraceArgs
-  {
-    internal static DataGridTraceArg Action<T>( T value )
-    {
-      return new TraceArg<T>( "Action", value );
-    }
-
-    internal static DataGridTraceArg DataSource<T>( T value )
-    {
-      return new TraceArg<T>( "DataSource", value );
-    }
-
-    internal static DataGridTraceArg DataGridControl<T>( T value )
-    {
-      return new TraceArg<T>( "DataGridControl", value );
-    }
-
-    internal static DataGridTraceArg Generator<T>( T value )
-    {
-      return new TraceArg<T>( "ItemContainerGenerator", value );
-    }
-
-    internal static DataGridTraceArg Count<T>( T value )
-    {
-      return new TraceArg<T>( "Count", value );
-    }
-
-    internal static DataGridTraceArg ItemCount<T>( T value )
-    {
-      return new TraceArg<T>( "ItemCount", value );
-    }
-
-    internal static DataGridTraceArg Container<T>( T value )
-    {
-      return new TraceArg<T>( "Container", value );
-    }
-
-    internal static DataGridTraceArg Group<T>( T value )
-    {
-      return new TraceArg<T>( "Group", value );
-    }
-
-    internal static DataGridTraceArg Index<T>( T value )
-    {
-      return new TraceArg<T>( "Index", value );
-    }
-
-    internal static DataGridTraceArg GeneratorIndex<T>( T value )
-    {
-      return new TraceArg<T>( "GIndex", value );
-    }
-
-    internal static DataGridTraceArg From<T>( T value )
-    {
-      return new TraceArg<T>( "From", value );
-    }
-
-    internal static DataGridTraceArg To<T>( T value )
-    {
-      return new TraceArg<T>( "To", value );
-    }
-
-    internal static DataGridTraceArg Item<T>( T value )
-    {
-      return new TraceArg<T>( "Item", value );
-    }
-
-    internal static DataGridTraceArg Node<T>( T value )
-    {
-      return new TraceArg<T>( "Node", value );
-    }
-
-    internal static DataGridTraceArg NextNode<T>( T value )
-    {
-      return new TraceArg<T>( "NNode", value );
-    }
-
-    internal static DataGridTraceArg PreviousNode<T>( T value )
-    {
-      return new TraceArg<T>( "PNode", value );
-    }
-
-    internal static DataGridTraceArg LastNode<T>( T value )
-    {
-      return new TraceArg<T>( "LNode", value );
-    }
-
-    internal static DataGridTraceArg Value<T>( T value )
-    {
-      return new TraceArg<T>( "Value", value );
-    }
-
-    #region TraceArg Private Class
-
-    private sealed class TraceArg<T> : DataGridTraceArg<T>
-    {
-      internal TraceArg( string label, T value )
-        : base( value )
-      {
-        m_label = label;
-      }
-
-      protected sealed override string FormatOutput( CultureInfo culture )
-      {
-        var label = m_label;
-        var value = base.FormatOutput( culture );
-
-        if( string.IsNullOrEmpty( label ) )
-          return value;
-
-        if( value == null )
-          return string.Format( "{0}: <null>", label );
-
-        if( value.Length == 0 )
-          return string.Format( "{0}: ''", label );
-
-        return string.Format( "{0}: {1}", label, value );
-      }
-
-      private readonly string m_label;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceEventIdEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceEventIdEnum.cs
deleted file mode 100644
index 3fd28a1e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceEventIdEnum.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid.Diagnostics
-{
-  internal enum DataGridTraceEventId
-  {
-    CustomItemContainerGenerator_ApplyGroupChanges = 0,
-    CustomItemContainerGenerator_CleanupGenerator,
-    CustomItemContainerGenerator_CloseDetailsForItem,
-    CustomItemContainerGenerator_CollapseDetails,
-    CustomItemContainerGenerator_CollapseGroup,
-    CustomItemContainerGenerator_ContainerFromIndex,
-    CustomItemContainerGenerator_ContainerFromItem,
-    CustomItemContainerGenerator_CreateDetailsForItem,
-    CustomItemContainerGenerator_CreateDetailsHelper,
-    CustomItemContainerGenerator_EnsureNodeTreeCreated,
-    CustomItemContainerGenerator_ExpandDetails,
-    CustomItemContainerGenerator_ExpandGroup,
-    CustomItemContainerGenerator_FindIndexForItem,
-    CustomItemContainerGenerator_GenerateNextLocalContainer,
-    CustomItemContainerGenerator_GenerateStickyFootersForDetail,
-    CustomItemContainerGenerator_GenerateStickyHeadersForDetail,
-    CustomItemContainerGenerator_GenPosArraysRemoveAt,
-    CustomItemContainerGenerator_GetGroupFromItem,
-    CustomItemContainerGenerator_GetGroupIndex,
-    CustomItemContainerGenerator_GetRealizedContainerForIndex,
-    CustomItemContainerGenerator_GetRealizedIndexForContainer,
-    CustomItemContainerGenerator_HandleDetailReset,
-    CustomItemContainerGenerator_HandleGlobalItemsReset,
-    CustomItemContainerGenerator_HandleHeadersFootersAddition,
-    CustomItemContainerGenerator_HandleHeadersFootersRemoveMoveReplace,
-    CustomItemContainerGenerator_HandleItemAddition,
-    CustomItemContainerGenerator_HandleItemReset,
-    CustomItemContainerGenerator_HandleSameLevelGroupAddition,
-    CustomItemContainerGenerator_HandleSameLevelGroupMove,
-    CustomItemContainerGenerator_HandleSameLevelGroupRemove,
-    CustomItemContainerGenerator_HandleSameLevelGroupReset,
-    CustomItemContainerGenerator_IItemContainerGenerator_GenerateNext,
-    CustomItemContainerGenerator_IItemContainerGenerator_Remove,
-    CustomItemContainerGenerator_IndexFromItem,
-    CustomItemContainerGenerator_IsGroupExpanded,
-    CustomItemContainerGenerator_ItemFromContainer,
-    CustomItemContainerGenerator_ItemFromIndex,
-    CustomItemContainerGenerator_MoveGeneratorBackward,
-    CustomItemContainerGenerator_MoveGeneratorForward,
-    CustomItemContainerGenerator_OnDetailConfigurationsChanged,
-    CustomItemContainerGenerator_OnDetailGeneratorContentChanged,
-    CustomItemContainerGenerator_OnGeneratorNodeExpansionStateChanged,
-    CustomItemContainerGenerator_OnGeneratorNodeGroupsCollectionChanged,
-    CustomItemContainerGenerator_OnGeneratorNodeHeadersFootersCollectionChanged,
-    CustomItemContainerGenerator_OnGeneratorNodeItemsCollectionChanged,
-    CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanged,
-    CustomItemContainerGenerator_OnGroupGeneratorNodeIsExpandedChanging,
-    CustomItemContainerGenerator_OnGroupsChanged,
-    CustomItemContainerGenerator_OnItemsChanged,
-    CustomItemContainerGenerator_ProcessGroupRemoval,
-    CustomItemContainerGenerator_RemapFloatingDetails,
-    CustomItemContainerGenerator_SetupInitialItemsNodes,
-    CustomItemContainerGenerator_ToggleDetails,
-    CustomItemContainerGenerator_ToggleGroupExpansion,
-    CustomItemContainerGenerator_UpdateFooters,
-    CustomItemContainerGenerator_UpdateGenPosToIndexList,
-    CustomItemContainerGenerator_UpdateHeaders,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceMessages.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceMessages.cs
deleted file mode 100644
index a1d04d9b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceMessages.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Diagnostics
-{
-  internal static class DataGridTraceMessages
-  {
-    internal const string CannotCollapseDetail = "Cannot collapse the detail.";
-    internal const string CannotExpandDetail = "Cannot expand the detail.";
-    internal const string CannotProcessOnReset = "Cannot process while resetting.";
-    internal const string CannotRemapDetails = "Cannot remap details when deferred.";
-    internal const string CollapsedItemAdded = "Item(s) added under a collapsed node.";
-    internal const string CollapsingDetail = "Collapsing a detail.";
-    internal const string ContainerAdded = "The container was added.";
-    internal const string ContainerFound = "The container was found.";
-    internal const string ContainerGenerated = "A container was generated.";
-    internal const string ContainerIsInDetail = "The container is located in a detail.";
-    internal const string ContainerNotFound = "The container was not found.";
-    internal const string ContainerRemoved = "The container was removed.";
-    internal const string DetailAlreadyCollapsed = "The detail is already collapsed.";
-    internal const string DetailAlreadyExpanded = "The detail is already expanded.";
-    internal const string DetailExpanded = "The detail was expanded.";
-    internal const string DetailCollapsed = "The detail was collapsed.";
-    internal const string DetailExpected = "Detail expected.";
-    internal const string DetailIsFloating = "The detail is floating.";
-    internal const string DetailNodeAdded = "Detail node(s) added.";
-    internal const string DetailNodeNotFound = "The detail node was not found.";
-    internal const string DetailNotFound = "The detail was not found.";
-    internal const string DetailNotSupported = "Details are not supported.";
-    internal const string EmptyTree = "There is no node.";
-    internal const string GroupFound = "The group was found.";
-    internal const string GroupNodeAdded = "Group node(s) added.";
-    internal const string GroupNodeRemoved = "Group node(s) removed.";
-    internal const string GroupNotFound = "The group was not found.";
-    internal const string InhibiterAlreadySet = "An inhibiter is already set.";
-    internal const string IndexFound = "The index was found.";
-    internal const string IndexUpdated = "The index was updated.";
-    internal const string ItemAdded = "Item(s) added.";
-    internal const string ItemFound = "The item was found.";
-    internal const string ItemNotBelongingToGenerator = "The item does not belong to the generator.";
-    internal const string ItemNotBelongingToNode = "The item does not belong to the node.";
-    internal const string ItemNotFound = "The item was not found.";
-    internal const string ItemNotFoundOrCollapsed = "The item was not found or is under a collapsed node.";
-    internal const string NewStartNode = "New start node.";
-    internal const string NewTreeCreated = "New tree node created.";
-    internal const string NodeFound = "The node was found.";
-    internal const string NodeIsCollapsed = "The node is collapsed.";
-    internal const string NodeIsNotTheCurrentNode = "Node is not the current one.";
-    internal const string RemapDetailNodes = "Remap details nodes.";
-    internal const string RemapZombieDetail = "Master item not found for detail.";
-    internal const string UnexpectedNode = "Unexpected node.";
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceSource.cs
deleted file mode 100644
index 647f3c32..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Diagnostics/DataGridTraceSource.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-
-namespace Xceed.Wpf.DataGrid.Diagnostics
-{
-  internal class DataGridTraceSource
-  {
-    #region Static Fields
-
-    internal readonly IDisposable NoTrace = new EmptyDisposable();
-
-    #endregion
-
-    internal DataGridTraceSource( TraceSource traceSource )
-    {
-      if( traceSource == null )
-        throw new ArgumentNullException( "traceSource" );
-
-      m_traceSource = traceSource;
-    }
-
-    internal bool ShouldTrace( TraceEventType eventType )
-    {
-#if TRACE
-      var listeners = m_traceSource.Listeners;
-      if( ( listeners == null ) || ( listeners.Count <= 0 ) )
-        return false;
-
-      var sourceSwitch = m_traceSource.Switch;
-
-      return ( sourceSwitch != null )
-          && ( sourceSwitch.ShouldTrace( eventType ) );
-#else
-      return false;
-#endif
-    }
-
-    internal bool ShouldTraceBlock()
-    {
-      return ( this.ShouldTrace( TraceEventType.Start ) )
-          || ( this.ShouldTrace( TraceEventType.Stop ) );
-    }
-
-    internal IDisposable TraceBlock( DataGridTraceEventId eventId, string message, IEnumerable<DataGridTraceArg> args )
-    {
-      if( this.ShouldTrace( TraceEventType.Start ) )
-      {
-        this.TraceEventCore( TraceEventType.Start, eventId, message, args );
-      }
-
-      if( this.ShouldTrace( TraceEventType.Stop ) )
-        return new TraceBlockEndDisposable( this, eventId, message, args );
-
-      return this.NoTrace;
-    }
-
-    [Conditional( "TRACE" )]
-    internal void TraceEvent( TraceEventType eventType, DataGridTraceEventId eventId, string message, IEnumerable<DataGridTraceArg> args )
-    {
-      if( !this.ShouldTrace( eventType ) )
-        return;
-
-      this.TraceEventCore( eventType, eventId, message, args );
-    }
-
-    private void TraceEventCore( TraceEventType eventType, DataGridTraceEventId eventId, string message, IEnumerable<DataGridTraceArg> args )
-    {
-      var format = DataGridTraceSource.Format( args );
-
-      if( string.IsNullOrEmpty( message ) )
-      {
-        if( string.IsNullOrEmpty( format ) )
-        {
-          DataGridTraceSource.TraceEvent( m_traceSource, eventType, ( int )eventId, null );
-        }
-        else
-        {
-          DataGridTraceSource.TraceEvent( m_traceSource, eventType, ( int )eventId, format );
-        }
-      }
-      else
-      {
-        if( string.IsNullOrEmpty( format ) )
-        {
-          DataGridTraceSource.TraceEvent( m_traceSource, eventType, ( int )eventId, message );
-        }
-        else
-        {
-          DataGridTraceSource.TraceEvent( m_traceSource, eventType, ( int )eventId, message + " | " + format );
-        }
-      }
-    }
-
-    private static void TraceEvent( TraceSource source, TraceEventType eventType, int eventId, string message )
-    {
-      if( string.IsNullOrEmpty( message ) )
-      {
-        source.TraceEvent( eventType, eventId );
-      }
-      else
-      {
-        source.TraceEvent( eventType, eventId, message );
-      }
-
-      if( Debugger.IsAttached )
-      {
-        source.Flush();
-      }
-    }
-
-    private static string Format( IEnumerable<DataGridTraceArg> args )
-    {
-      if( ( args == null ) || !args.Any() )
-        return null;
-
-      var sb = new StringBuilder( 128 );
-
-      foreach( var arg in args )
-      {
-        var value = arg.ToString();
-
-        if( string.IsNullOrEmpty( value ) )
-          continue;
-
-        if( sb.Length > 0 )
-        {
-          sb.Append( "; " );
-        }
-
-        sb.Append( value );
-      }
-
-      return sb.ToString();
-    }
-
-    private readonly TraceSource m_traceSource;
-
-    #region TraceBlockEndDisposable Private Class
-
-    private sealed class TraceBlockEndDisposable : IDisposable
-    {
-      internal TraceBlockEndDisposable( DataGridTraceSource owner, DataGridTraceEventId eventId, string message, IEnumerable<DataGridTraceArg> args )
-      {
-        if( owner == null )
-          throw new ArgumentNullException( "owner" );
-
-        m_owner = owner;
-        m_eventId = eventId;
-        m_message = message;
-        m_args = args;
-      }
-
-      void IDisposable.Dispose()
-      {
-        var owner = Interlocked.Exchange( ref m_owner, null );
-        if( owner == null )
-          return;
-
-        owner.TraceEventCore( TraceEventType.Stop, m_eventId, m_message, m_args );
-      }
-
-      private DataGridTraceSource m_owner;
-      private readonly DataGridTraceEventId m_eventId;
-      private readonly string m_message;
-      private readonly IEnumerable<DataGridTraceArg> m_args;
-    }
-
-    #endregion
-
-    #region EmptyDisposable Private Class
-
-    private sealed class EmptyDisposable : IDisposable
-    {
-      void IDisposable.Dispose()
-      {
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs
deleted file mode 100644
index a4707270..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Media;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class DropMarkAdorner : Adorner
-  {
-    // A null value for the pen parameter means that the adorner will not show any visual cue.
-    internal DropMarkAdorner( UIElement adornedElement, Pen pen, DropMarkOrientation orientation )
-      : base( adornedElement )
-    {
-      Debug.Assert( orientation != DropMarkOrientation.Default, "A DropMarkAdorner without a specific orientation should virtually never happen. The only known way to do this would be to have a grid element not hosted in a DataGridControl. The DropMarkAdorner should react well to this nonetheless." );
-      m_pen = pen;
-      m_orientation = orientation;
-      m_render = ( pen != null );
-
-      this.IsHitTestVisible = false;
-    }
-
-    #region HorizontalPosition Property
-
-    public static readonly DependencyProperty HorizontalPositionProperty = DependencyProperty.Register(
-      "HorizontalPosition",
-      typeof( double ),
-      typeof( DropMarkAdorner ),
-      new FrameworkPropertyMetadata( 0d, new PropertyChangedCallback( DropMarkAdorner.OnHorizontalPositionChanged ) ) );
-
-    public double HorizontalPosition
-    {
-      get
-      {
-        return ( double )this.GetValue( DropMarkAdorner.HorizontalPositionProperty );
-      }
-      set
-      {
-        this.SetValue( DropMarkAdorner.HorizontalPositionProperty, value );
-      }
-    }
-
-    private static void OnHorizontalPositionChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as DropMarkAdorner;
-      if( self == null )
-        return;
-
-      self.Update();
-    }
-
-    #endregion
-
-    #region Alignment Property
-
-    internal DropMarkAlignment Alignment
-    {
-      get
-      {
-        return m_alignment;
-      }
-      set
-      {
-        if( value == m_alignment )
-          return;
-
-        m_alignment = value;
-
-        this.Update();
-      }
-    }
-
-    private DropMarkAlignment m_alignment = DropMarkAlignment.ExplicitPosition;
-
-    #endregion
-
-    #region AdornerLayout Private Property
-
-    private AdornerLayer AdornerLayer
-    {
-      get
-      {
-        return ( this.Parent as AdornerLayer );
-      }
-    }
-
-    #endregion
-
-    protected override void OnRender( DrawingContext drawingContext )
-    {
-      base.OnRender( drawingContext );
-
-      if( !m_render || ( m_pen == null ) )
-        return;
-
-      var renderSize = this.AdornedElement.RenderSize;
-
-      Point startPoint = new Point( this.HorizontalPosition, 0d );
-      Point endPoint;
-
-      switch( m_orientation )
-      {
-        case DropMarkOrientation.Default:
-        case DropMarkOrientation.Vertical:
-          {
-            if( m_alignment == DropMarkAlignment.Far )
-            {
-              startPoint.X += renderSize.Width;
-            }
-
-            endPoint = new Point( startPoint.X, renderSize.Height );
-          }
-          break;
-        case DropMarkOrientation.Horizontal:
-          {
-            if( m_alignment == DropMarkAlignment.Far )
-            {
-              startPoint.Y += renderSize.Height;
-            }
-
-            endPoint = new Point( renderSize.Width, startPoint.Y );
-          }
-          break;
-        default:
-          return;
-      }
-
-      drawingContext.DrawLine( m_pen, startPoint, endPoint );
-    }
-
-    internal void UpdateAlignment( RelativePoint mousePosition )
-    {
-      var relativePosition = mousePosition.GetPoint( this.AdornedElement );
-      var elementSize = this.AdornedElement.RenderSize;
-
-      if( m_orientation == DropMarkOrientation.Horizontal )
-      {
-        this.Alignment = ( relativePosition.Y < elementSize.Height / 2d ) ? DropMarkAlignment.Near : DropMarkAlignment.Far;
-      }
-      else
-      {
-        this.Alignment = ( relativePosition.X < elementSize.Width / 2d ) ? DropMarkAlignment.Near : DropMarkAlignment.Far;
-      }
-    }
-
-    private void Update()
-    {
-      if( !m_render )
-        return;
-
-      if( !this.InvalidateAdornerLayer() )
-        return;
-
-      m_render = false;
-      this.LayoutUpdated += new EventHandler( this.OnLayoutUpdated );
-    }
-
-    private bool InvalidateAdornerLayer()
-    {
-      var adornerLayer = this.AdornerLayer;
-      if( adornerLayer == null )
-        return false;
-
-      adornerLayer.Update( this.AdornedElement );
-      return true;
-    }
-
-    private void OnLayoutUpdated( object sender, EventArgs e )
-    {
-      m_render = true;
-
-      this.LayoutUpdated -= new EventHandler( this.OnLayoutUpdated );
-      this.InvalidateVisual();
-      this.InvalidateAdornerLayer();
-    }
-
-    private readonly DropMarkOrientation m_orientation;
-    private readonly Pen m_pen;
-    private bool m_render;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CF_HtmlStream.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CF_HtmlStream.cs
deleted file mode 100644
index 13a6e738..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CF_HtmlStream.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Diagnostics;
-using System.Globalization;
-
-namespace Xceed.Wpf.DataGrid.Export
-{
-  // Class used to format data into the CF_HTML Clipbard Format
-  // http://msdn.microsoft.com/en-us/library/aa767917(VS.85).aspx
-  internal sealed class CF_HtmlStream : Stream
-  {
-    public CF_HtmlStream( Stream innerStream )
-    {
-      if( innerStream == null )
-        throw new ArgumentNullException( "innerStream" );
-
-      if( innerStream.CanWrite == false )
-        throw new InvalidOperationException( "An attempt was made to use a non-writable stream." );
-
-      if( innerStream.CanSeek == false )
-        throw new InvalidOperationException( "An attempt was made to use a non-seekable stream." );
-
-      m_innerStream = innerStream;
-
-      StringBuilder headerStringBuilder = new StringBuilder();
-      headerStringBuilder.Append( "Version:1.0" );
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "StartHTML:-1" ); // This is optional according to MSDN documentation
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "EndHTML:-1" ); // This is optional according to MSDN documentation
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "StartFragment:0000000109" ); // Always 109 bytes from start of Version to the end of <!--StartFragment--> tag
-      headerStringBuilder.Append( Environment.NewLine );
-
-      // Get the offset of the EndFragment: tag to be able to modify the 10 digits
-      m_endFragmentOffset = headerStringBuilder.ToString().Length;
-
-      Debug.Assert( m_endFragmentOffset == 65 );
-
-      headerStringBuilder.Append( "EndFragment:0000000000" ); // We write 0000000000 and we will update this field when the Stream is closed
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "<!--StartFragment-->" );
-
-      string headerString = headerStringBuilder.ToString();
-
-      byte[] tempBuffer = Encoding.UTF8.GetBytes( headerString );
-
-      m_headerBytesLength = headerStringBuilder.Length;
-
-      Debug.Assert( m_headerBytesLength == tempBuffer.Length );
-      Debug.Assert( tempBuffer.Length == 109 );
-
-      m_innerStream.Write( tempBuffer, 0, m_headerBytesLength );
-      m_HtmlContentByteCount = 0;
-    }
-
-    public override bool CanRead
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public override bool CanSeek
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public override bool CanWrite
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public override long Length
-    {
-      get
-      {
-        return m_headerBytesLength + m_HtmlContentByteCount + s_footerBytes.Length;
-      }
-    }
-
-    public override long Position
-    {
-      get
-      {
-        throw new NotSupportedException();
-      }
-      set
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    public override void Close()
-    {
-      // Already closed, nothing to do
-      if( m_closed )
-        return;
-
-      // Update the value of EndFragment field in the header
-      string endFragmentOffset = ( m_HtmlContentByteCount + m_headerBytesLength ).ToString( "0000000000", CultureInfo.InvariantCulture );
-
-      m_innerStream.Seek( m_endFragmentOffset, SeekOrigin.Begin );
-
-      byte[] tempBuffer = Encoding.UTF8.GetBytes( "EndFragment:" + endFragmentOffset );
-      Debug.Assert( tempBuffer.Length == 22 );
-      m_innerStream.Write( tempBuffer, 0, tempBuffer.Length );
-
-      // Append the final end line and EndFragment tag
-      m_innerStream.Seek( 0, SeekOrigin.End );
-      m_innerStream.Write( s_footerBytes, 0, s_footerBytes.Length );
-      m_innerStream.Flush();
-
-      m_closed = true;
-    }
-
-    protected override void Dispose( bool disposing )
-    {
-      this.Close();
-    }
-
-    public override void Flush()
-    {
-      m_innerStream.Flush();
-    }
-
-    public override int Read( byte[] buffer, int offset, int count )
-    {
-      throw new NotSupportedException();
-    }
-
-    public override int ReadByte()
-    {
-      throw new NotSupportedException();
-    }
-
-    public override long Seek( long offset, SeekOrigin origin )
-    {
-      throw new NotSupportedException();
-    }
-
-    public override void SetLength( long value )
-    {
-      throw new NotSupportedException();
-    }
-
-    public override void WriteByte( byte value )
-    {
-      this.CheckIfClosed();
-      m_HtmlContentByteCount++;
-      m_innerStream.WriteByte( value );
-    }
-
-    public override void Write( byte[] buffer, int offset, int count )
-    {
-      this.CheckIfClosed();
-      m_HtmlContentByteCount += count;
-      m_innerStream.Write( buffer, offset, count );
-    }
-
-    private void CheckIfClosed()
-    {
-      if( m_closed )
-        throw new InvalidOperationException( "An attempt was made to access a closed stream." );
-    }
-
-    private bool m_closed; // = false;
-    private int m_endFragmentOffset; // = 0;
-    private int m_headerBytesLength; // = 0;
-    private long m_HtmlContentByteCount; // = 0;
-    private Stream m_innerStream; // = null;
-
-    private static byte[] s_footerBytes = Encoding.UTF8.GetBytes( Environment.NewLine + "<!--EndFragment-->" );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs
deleted file mode 100644
index 0603d1b0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs
+++ /dev/null
@@ -1,751 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Export
-{
-  public abstract class ClipboardExporterBase
-  {
-    protected ClipboardExporterBase()
-    {
-      this.UseFieldNamesInHeader = false;
-    }
-
-    #region IncludeColumnHeaders Property
-
-    public bool IncludeColumnHeaders
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region UseFieldNamesInHeader Property
-
-    public bool UseFieldNamesInHeader
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ClipboardData Property
-
-    protected abstract object ClipboardData
-    {
-      get;
-    }
-
-    #endregion
-
-    protected virtual void Indent()
-    {
-    }
-
-    protected virtual void Unindent()
-    {
-    }
-
-    protected virtual void StartExporter( string dataFormat )
-    {
-    }
-
-    protected virtual void EndExporter( string dataFormat )
-    {
-    }
-
-    protected virtual void ResetExporter()
-    {
-    }
-
-    protected virtual void StartHeader( DataGridContext dataGridContext )
-    {
-    }
-
-    protected virtual void StartHeaderField( DataGridContext dataGridContext, Column column )
-    {
-    }
-
-    protected virtual void EndHeaderField( DataGridContext dataGridContext, Column column )
-    {
-    }
-
-    protected virtual void EndHeader( DataGridContext dataGridContext )
-    {
-    }
-
-    protected virtual void StartDataItem( DataGridContext dataGridContext, object dataItem )
-    {
-    }
-
-    protected virtual void StartDataItemField( DataGridContext dataGridContext, Column column, object fieldValue )
-    {
-    }
-
-    protected virtual void EndDataItemField( DataGridContext dataGridContext, Column column, object fieldValue )
-    {
-    }
-
-    protected virtual void EndDataItem( DataGridContext dataGridContext, object dataItem )
-    {
-    }
-
-    internal static IDataObject CreateDataObject( DataGridControl dataGridControl )
-    {
-      if( dataGridControl == null )
-        throw new ArgumentNullException( "dataGridControl" );
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( dataGridControl );
-
-      if( dataGridContext == null )
-        return null;
-
-      XceedDataObject dataObject = null;
-      bool containsData = false;
-
-      try
-      {
-        dataGridControl.ShowWaitCursor();
-
-        Dictionary<string, ClipboardExporterBase> exporters = dataGridControl.ClipboardExporters;
-
-        foreach( KeyValuePair<string, ClipboardExporterBase> keyPair in exporters )
-        {
-          if( keyPair.Value == null )
-            throw new DataGridException( "ClipboardExporterBase cannot be null." );
-
-          keyPair.Value.StartExporter( keyPair.Key );
-        }
-
-        using( ManualExporter exporter = new ManualExporter( exporters.Values as IEnumerable<ClipboardExporterBase> ) )
-        {
-          exporter.Export( dataGridContext );
-        }
-
-        foreach( KeyValuePair<string, ClipboardExporterBase> keyPair in exporters )
-        {
-          keyPair.Value.EndExporter( keyPair.Key );
-
-          if( dataObject == null )
-          {
-            dataObject = new XceedDataObject();
-          }
-
-          object clipboardExporterValue = keyPair.Value.ClipboardData;
-
-          // For other formats, we directly copy the content to the IDataObject
-          if( clipboardExporterValue != null )
-          {
-            ( ( IDataObject )dataObject ).SetData( keyPair.Key, clipboardExporterValue );
-            containsData = true;
-          }
-
-          keyPair.Value.ResetExporter();
-        }
-      }
-      finally
-      {
-        dataGridControl.HideWaitCursor();
-      }
-
-      // Only return dataObject some data was copied
-      if( containsData )
-        return dataObject as IDataObject;
-
-      return null;
-    }
-
-    private class ManualExporter : IDisposable
-    {
-      public ManualExporter( IEnumerable<ClipboardExporterBase> clipboardExporters )
-      {
-        m_columnToBindingPathExtractor = new Dictionary<Column, BindingPathValueExtractor>();
-        m_clipboardExporters = new List<ClipboardExporterBase>( clipboardExporters );
-        m_visitedDetailExportedVisiblePositions = new Dictionary<int, int[]>();
-        m_visitedDetailVisibleColumnsCache = new Dictionary<int, ColumnBase[]>();
-      }
-
-      #region HasItems Property
-
-      public bool HasItems
-      {
-        get;
-        set;
-      }
-
-      #endregion
-
-      internal void Export( DataGridContext dataGridContext )
-      {
-        if( dataGridContext == null )
-          return;
-
-        // Get the detail level for the current DataGridContext
-        int detailLevel = dataGridContext.DetailLevel;
-
-        // Update indentation of ClipboardExporters for this detail level
-        this.UpdateExporterIndentation( detailLevel );
-
-        // Get master indexes that have mapped expanded details
-        List<int> indexesToMasterItemList = dataGridContext.CustomItemContainerGenerator.GetMasterIndexesWithExpandedDetails();
-
-        // Get the index of the next detail to export in case
-        // it is expanded before the first selected index of the
-        // current dataGridContext
-        int nextDetailIndex = ( indexesToMasterItemList.Count > 0 ) ? indexesToMasterItemList[ 0 ] : -1;
-
-        // Get informations on columns, visible positions and selected item indexes
-        // for this dataGridContext
-        int[] exportedVisiblePositions = this.GetVisiblePositionsForContext( dataGridContext );
-        ColumnBase[] columnsByVisiblePosition = this.GetVisibleColumnsArrayForContext( dataGridContext );
-        SelectionRange[] selectedItemsRanges = this.GetSelectedItemsStoreForDataGridContext( dataGridContext );
-
-        Debug.Assert( exportedVisiblePositions != null );
-        Debug.Assert( columnsByVisiblePosition != null );
-        Debug.Assert( selectedItemsRanges != null );
-
-        int selectedItemsRangesCount = selectedItemsRanges.Length;
-
-        // Ensure to flag the exporter has items
-        this.HasItems = this.HasItems || ( selectedItemsRangesCount > 0 );
-
-        for( int i = 0; i < selectedItemsRangesCount; i++ )
-        {
-          // For the first level, ensure to export the headers
-          // before anything else
-          if( detailLevel == 0 )
-          {
-            this.ExportHeaders( dataGridContext, detailLevel, exportedVisiblePositions, columnsByVisiblePosition );
-          }
-
-          SelectionRange range = selectedItemsRanges[ i ];
-
-          int startIndex = range.StartIndex;
-          int endIndex = range.EndIndex;
-
-          // If range is inverted
-          if( startIndex > endIndex )
-          {
-            startIndex = range.EndIndex;
-            endIndex = range.StartIndex;
-          }
-
-          // For each index in the range
-          for( int itemIndex = startIndex; itemIndex <= endIndex; itemIndex++ )
-          {
-            // Export details that are before the itemIndex
-            while( ( nextDetailIndex != -1 ) && ( itemIndex > nextDetailIndex ) )
-            {
-              this.ExportDetailForMasterIndex( dataGridContext, detailLevel, nextDetailIndex );
-
-              // Remove it since the detail is processed
-              indexesToMasterItemList.Remove( nextDetailIndex );
-
-              nextDetailIndex = ( indexesToMasterItemList.Count > 0 ) ? indexesToMasterItemList[ 0 ] : -1;
-            }
-
-            // Ensure to re-export the headers if a detail was previously exported
-            this.ExportHeaders( dataGridContext, detailLevel, exportedVisiblePositions, columnsByVisiblePosition );
-
-            object exportedItem = dataGridContext.Items.GetItemAt( itemIndex );
-
-            this.ExportDataItem( dataGridContext, itemIndex, exportedItem, detailLevel, exportedVisiblePositions, columnsByVisiblePosition );
-          }
-        }
-
-        nextDetailIndex = ( indexesToMasterItemList.Count > 0 ) ? indexesToMasterItemList[ 0 ] : -1;
-
-        // Export all remaining details since none are before the context's
-        // selected index ranges
-        while( nextDetailIndex != -1 )
-        {
-          this.ExportDetailForMasterIndex( dataGridContext, detailLevel, nextDetailIndex );
-
-          // Remove it since the detail is processed
-          indexesToMasterItemList.Remove( nextDetailIndex );
-
-          nextDetailIndex = ( indexesToMasterItemList.Count > 0 ) ? indexesToMasterItemList[ 0 ] : -1;
-        }
-      }
-
-      private void ExportDataItemCore( DataGridContext dataGridContext, ClipboardExporterBase clipboardExporter, int itemIndex, object item,
-                                       int[] exportedVisiblePositions, ColumnBase[] columnsByVisiblePosition )
-      {
-        var dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-
-        clipboardExporter.StartDataItem( dataGridContext, item );
-
-        // Ensure the count does not exceeds the columns count
-        var exportedVisiblePositionsCount = exportedVisiblePositions.Length;
-        exportedVisiblePositionsCount = Math.Min( exportedVisiblePositionsCount, columnsByVisiblePosition.Length );
-
-        var intersectedIndexes = this.GetIntersectedRangesForIndex( dataGridContext, itemIndex, exportedVisiblePositions, exportedVisiblePositionsCount );
-
-        for( int i = 0; i < exportedVisiblePositionsCount; i++ )
-        {
-          var fieldValue = default( object );
-          var column = default( Column );
-          var visiblePosition = exportedVisiblePositions[ i ];
-
-          // Export null if not intersected by a SelectionRange
-          if( intersectedIndexes.Contains( visiblePosition ) )
-          {
-            // Only export visible data column
-            column = columnsByVisiblePosition[ visiblePosition ] as Column;
-
-            if( column == null )
-              continue;
-
-            // Use DataGridCollectionView directly since the DataGridItemProperty uses PropertyDescriptor which increase the read of the field value
-            var dataGridItemProperty = default( DataGridItemPropertyBase );
-
-            // Try to get a DataGridItemProperty matching the column FieldName and get the value from it
-            if( dataGridCollectionViewBase != null )
-            {
-              dataGridItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty( dataGridCollectionViewBase.ItemProperties, column.FieldName );
-
-              if( dataGridItemProperty != null )
-              {
-                fieldValue = ItemsSourceHelper.GetValueFromItemProperty( dataGridItemProperty, item );
-              }
-            }
-
-            // If none was found, create a BindingPathValueExtractor from this column
-            if( ( dataGridCollectionViewBase == null ) || ( dataGridItemProperty == null ) )
-            {
-              // We don't have a DataGridCollectionView, use a BindingPathValueExtractor to create a binding to help us get the value for the Column in the data item
-              var extractorForRead = default( BindingPathValueExtractor );
-
-              if( m_columnToBindingPathExtractor.TryGetValue( column, out extractorForRead ) == false )
-              {
-                extractorForRead = dataGridContext.GetBindingPathExtractorForColumn( column, item );
-                m_columnToBindingPathExtractor.Add( column, extractorForRead );
-              }
-
-              fieldValue = extractorForRead.GetValueFromItem( item );
-            }
-          }
-
-          if( fieldValue != null )
-          {
-            //Verify if the value should be converted to the displayed value for exporting.
-            var foreignKeyConfiguration = column.ForeignKeyConfiguration;
-            if( foreignKeyConfiguration != null && foreignKeyConfiguration.UseDisplayedValueWhenExporting )
-            {
-              fieldValue = foreignKeyConfiguration.GetDisplayMemberValue( fieldValue );
-            }
-            else
-            {
-              var valueConverter = column.DisplayedValueConverter;
-              if( valueConverter != null )
-              {
-                fieldValue = valueConverter.Convert( fieldValue, typeof( object ), column.DisplayedValueConverterParameter,
-                                                     column.GetCulture( column.DisplayedValueConverterCulture ) );
-              }
-              else
-              {
-                var valueFormat = column.CellContentStringFormat;
-                if( !string.IsNullOrEmpty( valueFormat ) )
-                {
-                  fieldValue = string.Format( column.GetCulture(), valueFormat, fieldValue );
-                }
-              }
-            }
-          }
-
-          clipboardExporter.StartDataItemField( dataGridContext, column, fieldValue );
-          clipboardExporter.EndDataItemField( dataGridContext, column, fieldValue );
-        }
-
-        clipboardExporter.EndDataItem( dataGridContext, item );
-      }
-
-      private void ExportHeadersCore( DataGridContext dataGridContext, ClipboardExporterBase clipboardExporter, int[] exportedVisiblePositions,
-                                      ColumnBase[] columnsByVisiblePosition )
-      {
-        clipboardExporter.StartHeader( dataGridContext );
-
-        // Ensure the count does not exceeds the columns count
-        int exportedVisiblePositionsCount = exportedVisiblePositions.Length;
-        exportedVisiblePositionsCount = Math.Min( exportedVisiblePositionsCount, columnsByVisiblePosition.Length );
-
-        for( int i = 0; i < exportedVisiblePositionsCount; i++ )
-        {
-          int visiblePosition = exportedVisiblePositions[ i ];
-
-          // Only export visible data column
-          Column column = columnsByVisiblePosition[ visiblePosition ] as Column;
-
-          if( column == null )
-            continue;
-
-          clipboardExporter.StartHeaderField( dataGridContext, column );
-          clipboardExporter.EndHeaderField( dataGridContext, column );
-        }
-
-        clipboardExporter.EndHeader( dataGridContext );
-      }
-
-      private HashSet<int> GetIntersectedRangesForIndex( DataGridContext dataGridContext, int itemIndex, int[] exportedVisiblePositions, int correctedExportedVisiblePositionsCount )
-      {
-        HashSet<int> intersectedIndexes = null;
-
-        if( correctedExportedVisiblePositionsCount == 0 )
-          return intersectedIndexes;
-
-        SelectionItemRangeCollection selectedRanges = dataGridContext.SelectedItemRanges as SelectionItemRangeCollection;
-
-        if( selectedRanges.Contains( itemIndex ) )
-        {
-          intersectedIndexes = new HashSet<int>( exportedVisiblePositions );
-        }
-        else
-        {
-          intersectedIndexes = new HashSet<int>();
-
-          SelectionCellRange columnsRange = new SelectionCellRange( itemIndex, exportedVisiblePositions[ 0 ], itemIndex,
-                                                                    exportedVisiblePositions[ correctedExportedVisiblePositionsCount - 1 ] );
-
-          IEnumerable<SelectionRange> intersectedRanges = dataGridContext.SelectedCellsStore.GetIntersectedColumnRanges( columnsRange );
-
-          foreach( SelectionRange range in intersectedRanges )
-          {
-            int startIndex = range.StartIndex;
-            int endIndex = range.EndIndex;
-
-            if( startIndex > endIndex )
-            {
-              startIndex = range.EndIndex;
-              endIndex = range.StartIndex;
-            }
-
-            for( int i = startIndex; i <= endIndex; i++ )
-            {
-              if( !intersectedIndexes.Contains( i ) )
-              {
-                intersectedIndexes.Add( i );
-              }
-            }
-          }
-        }
-
-        return intersectedIndexes;
-      }
-
-      private void GetAllVisibleColumnsVisiblePosition( DataGridContext dataGridContext, ref HashSet<int> exportedColumnPositions )
-      {
-        if( exportedColumnPositions == null )
-        {
-          exportedColumnPositions = new HashSet<int>();
-        }
-
-        if( dataGridContext == null )
-          return;
-
-        ReadOnlyObservableCollection<ColumnBase> visibleColumns = dataGridContext.VisibleColumns;
-
-        int visibleColumnsCount = visibleColumns.Count;
-
-        for( int i = 0; i < visibleColumnsCount; i++ )
-        {
-          ColumnBase column = dataGridContext.VisibleColumns[ i ];
-
-          if( column == null )
-            continue;
-
-          exportedColumnPositions.Add( column.VisiblePosition );
-        }
-      }
-
-      private void ExportDataItem( DataGridContext dataGridContext, int itemIndex, object item, int detailLevel, int[] exportedVisiblePositions,
-                                   ColumnBase[] columnsByVisiblePosition )
-      {
-
-        foreach( ClipboardExporterBase clipboardExporter in m_clipboardExporters )
-        {
-          this.ExportDataItemCore( dataGridContext, clipboardExporter, itemIndex, item, exportedVisiblePositions, columnsByVisiblePosition );
-        }
-      }
-
-      private void ExportHeaders( DataGridContext dataGridContext, int detailLevel, int[] exportedVisiblePositions, ColumnBase[] columnsByVisiblePosition )
-      {
-        // Master level was already exported, only update the lastExportedHeaderDetailLevel
-        if( ( m_lastExportedHeaderDetailLevel != -1 ) && ( detailLevel == 0 ) )
-        {
-          m_lastExportedHeaderDetailLevel = 0;
-          return;
-        }
-
-        // Headers are already exported for this detail level
-        if( m_lastExportedHeaderDetailLevel == detailLevel )
-          return;
-
-
-        foreach( ClipboardExporterBase clipboardExporter in m_clipboardExporters )
-        {
-          // We always add the headers for detail levels every time
-          if( clipboardExporter.IncludeColumnHeaders )
-          {
-            this.ExportHeadersCore( dataGridContext, clipboardExporter, exportedVisiblePositions, columnsByVisiblePosition );
-          }
-        }
-
-        m_lastExportedHeaderDetailLevel = detailLevel;
-      }
-
-      private void ExportDetailForMasterIndex( DataGridContext dataGridContext, int detailLevel, int masterIndexForDetail )
-      {
-        object item = dataGridContext.Items.GetItemAt( masterIndexForDetail );
-
-        IEnumerable<DataGridContext> dataGridContexts = dataGridContext.CustomItemContainerGenerator.GetChildContextsForMasterItem( item );
-
-        foreach( DataGridContext childContext in dataGridContexts )
-        {
-          this.Export( childContext );
-        }
-
-        this.UpdateExporterIndentation( detailLevel );
-      }
-
-      private ColumnBase[] GetVisibleColumnsArrayForContext( DataGridContext dataGridContext )
-      {
-        if( dataGridContext == null )
-          throw new ArgumentNullException( "sourceContext" );
-
-        int detailLevel = dataGridContext.DetailLevel;
-
-        if( m_visitedDetailVisibleColumnsCache.ContainsKey( detailLevel ) )
-          return m_visitedDetailVisibleColumnsCache[ detailLevel ];
-
-        int columnsByVisiblePositionCount = dataGridContext.ColumnsByVisiblePosition.Count;
-        ColumnBase[] columnsByVisiblePosition = new ColumnBase[ columnsByVisiblePositionCount ];
-        dataGridContext.ColumnsByVisiblePosition.CopyTo( columnsByVisiblePosition, 0 );
-
-        m_visitedDetailVisibleColumnsCache.Add( dataGridContext.DetailLevel, columnsByVisiblePosition );
-
-        return columnsByVisiblePosition;
-      }
-
-      private int[] GetVisiblePositionsForContext( DataGridContext dataGridContext )
-      {
-        if( dataGridContext == null )
-          throw new ArgumentNullException( "dataGridContext" );
-
-        int detailLevel = dataGridContext.DetailLevel;
-
-        if( m_visitedDetailExportedVisiblePositions.ContainsKey( detailLevel ) )
-          return m_visitedDetailExportedVisiblePositions[ detailLevel ];
-
-        // We must keep a list of VisiblePositions to export
-        HashSet<int> exportedColumnPositions = new HashSet<int>();
-
-        DataGridContext rootDataGridContext = dataGridContext.DataGridControl.DataGridContext;
-
-        this.GetVisiblePositionsForContextDetailLevel( rootDataGridContext, detailLevel, exportedColumnPositions );
-
-        int exportedColumnPositionsCount = exportedColumnPositions.Count;
-        int[] exportedVisiblePositionsArray = null;
-
-        exportedVisiblePositionsArray = new int[ exportedColumnPositionsCount ];
-        exportedColumnPositions.CopyTo( exportedVisiblePositionsArray );
-        Array.Sort( exportedVisiblePositionsArray );
-
-        m_visitedDetailExportedVisiblePositions.Add( detailLevel, exportedVisiblePositionsArray );
-
-        return exportedVisiblePositionsArray;
-      }
-
-      // Parse all the expanded details recursively
-      private void GetVisiblePositionsForContextDetailLevel( DataGridContext dataGridContext, int desiredDetailLevel, HashSet<int> exportedColumnPositions )
-      {
-        int dataGridContextDetailLevel = dataGridContext.DetailLevel;
-
-        // The detail level is too deep, return immediately
-        if( dataGridContextDetailLevel > desiredDetailLevel )
-          return;
-
-        // The desired detail level is reached get the exportedColumnPositions
-        if( dataGridContextDetailLevel == desiredDetailLevel )
-        {
-          DataGridContext parentDataGridContext = dataGridContext.ParentDataGridContext;
-
-          if( parentDataGridContext == null )
-          {
-            this.GetVisibleColumnsVisiblePositionForDataGridContext( dataGridContext, exportedColumnPositions );
-          }
-          else
-          {
-            foreach( DataGridContext childContext in parentDataGridContext.GetChildContexts() )
-            {
-              if( this.GetVisibleColumnsVisiblePositionForDataGridContext( childContext, exportedColumnPositions ) )
-              {
-                // All columns need to be exported, stop parsing child DataGridContexts
-                break;
-              }
-            }
-          }
-        }
-        else
-        {
-          // The detail level differs, parse the child contexts recursively
-          foreach( DataGridContext childContext in dataGridContext.GetChildContexts() )
-          {
-            this.GetVisiblePositionsForContextDetailLevel( childContext, desiredDetailLevel, exportedColumnPositions );
-          }
-        }
-      }
-
-      private SelectionRange[] GetSelectedItemsStoreForDataGridContext( DataGridContext dataGridContext )
-      {
-        if( dataGridContext == null )
-          return null;
-
-        SelectedItemsStorage itemStorage = new SelectedItemsStorage( null );
-
-        foreach( SelectionRange range in dataGridContext.SelectedItemRanges )
-        {
-          itemStorage.Add( new SelectionRangeWithItems( range, null ) );
-        }
-
-        foreach( SelectionCellRange range in dataGridContext.SelectedCellRanges )
-        {
-          SelectionRangeWithItems itemRange = new SelectionRangeWithItems( range.ItemRange, null );
-
-          if( !itemStorage.Contains( itemRange ) )
-          {
-            itemStorage.Add( itemRange );
-          }
-        }
-
-        SelectionRange[] itemStorageArray = itemStorage.ToSelectionRangeArray();
-        Array.Sort( itemStorageArray );
-
-        return itemStorageArray;
-      }
-
-      private bool GetVisibleColumnsVisiblePositionForDataGridContext( DataGridContext dataGridContext, HashSet<int> exportedColumnPositions )
-      {
-        if( dataGridContext == null )
-          return false;
-
-        if( exportedColumnPositions == null )
-        {
-          exportedColumnPositions = new HashSet<int>();
-        }
-
-        // At least 1 row was completely selected, add
-        // all VisibleColumns' VisiblePosition 
-        if( dataGridContext.SelectedItemRanges.Count > 0 )
-        {
-          this.GetAllVisibleColumnsVisiblePosition( dataGridContext, ref exportedColumnPositions );
-
-          // Ensure to set the allColumnExported
-          return true;
-        }
-
-        foreach( SelectionCellRange range in dataGridContext.SelectedCellRanges )
-        {
-          // If all columns were already exported, no need to 
-          // ensure visible positions in the exportedColumnPositions
-          SelectionRange columnRange = range.ColumnRange;
-
-          int startIndex = columnRange.StartIndex;
-          int endIndex = columnRange.EndIndex;
-
-          if( startIndex > endIndex )
-          {
-            startIndex = columnRange.EndIndex;
-            endIndex = columnRange.StartIndex;
-          }
-
-          for( int i = startIndex; i <= endIndex; i++ )
-          {
-            if( !exportedColumnPositions.Contains( i ) )
-            {
-              exportedColumnPositions.Add( i );
-            }
-          }
-        }
-
-        return false;
-      }
-
-      // Returns if the indentation changed
-      private bool UpdateExporterIndentation( int detailLevel )
-      {
-        // Indent / Unindent up to the desired detail level
-        if( m_currentIndentationLevel < detailLevel )
-        {
-          while( m_currentIndentationLevel < detailLevel )
-          {
-            foreach( ClipboardExporterBase clipboardExporter in m_clipboardExporters )
-            {
-              clipboardExporter.Indent();
-            }
-
-            Debug.Indent();
-            m_currentIndentationLevel++;
-          }
-
-          return true;
-        }
-        else if( m_currentIndentationLevel > detailLevel )
-        {
-          while( m_currentIndentationLevel > detailLevel )
-          {
-            foreach( ClipboardExporterBase clipboardExporter in m_clipboardExporters )
-            {
-              clipboardExporter.Unindent();
-            }
-
-            Debug.Unindent();
-            m_currentIndentationLevel--;
-          }
-
-          return true;
-        }
-
-        return false;
-      }
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        m_clipboardExporters.Clear();
-        m_columnToBindingPathExtractor.Clear();
-        m_visitedDetailExportedVisiblePositions.Clear();
-        m_visitedDetailVisibleColumnsCache.Clear();
-      }
-
-      #endregion IDisposable Members
-
-      private Dictionary<Column, BindingPathValueExtractor> m_columnToBindingPathExtractor; // = null;
-      private Dictionary<int, int[]> m_visitedDetailExportedVisiblePositions; // = null; 
-      private Dictionary<int, ColumnBase[]> m_visitedDetailVisibleColumnsCache; // = null; 
-      private List<ClipboardExporterBase> m_clipboardExporters; // = null;
-      private int m_currentIndentationLevel; // = 0;
-      private int m_lastExportedHeaderDetailLevel = -1;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CsvClipboardExporter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CsvClipboardExporter.cs
deleted file mode 100644
index 608f271e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CsvClipboardExporter.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid.Export
-{
-  public class CsvClipboardExporter : ClipboardExporterBase
-  {
-    #region PUBLIC CONSTRUCTORS
-
-    public CsvClipboardExporter()
-      : base()
-    {
-      this.IncludeColumnHeaders = true;
-      this.FormatSettings = new CsvFormatSettings();
-      m_indentationString = string.Empty;
-      m_baseStream = new ToStringMemoryStream();
-    }
-
-    #endregion
-
-    #region PUBLIC PROPERTIES
-
-    public CsvFormatSettings FormatSettings
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region PROTECTED OVERRIDES
-
-    protected override object ClipboardData
-    {
-      get
-      {
-        return m_baseStream;
-      }
-    }
-
-    protected override void Indent()
-    {
-      char separator = this.FormatSettings.Separator;
-      m_indentationString += separator;
-    }
-
-    protected override void Unindent()
-    {
-      char separator = this.FormatSettings.Separator;
-
-      if( m_indentationString == null )
-      {
-        Debug.Fail( "Indentation must at least be string.empty when unindenting." );
-        m_indentationString = string.Empty;
-      }
-      else
-      {
-        int separatorLength = 1;
-        int indentationLength = m_indentationString.Length;
-
-        // If there are less characters in indentationString than in the empty field, just set indentation
-        // as string.empty
-        if( indentationLength < separatorLength )
-        {
-          m_indentationString = string.Empty;
-        }
-        else
-        {
-          m_indentationString = m_indentationString.Substring( 0, indentationLength - separatorLength );
-        }
-      }
-    }
-
-    protected override void ResetExporter()
-    {
-      m_baseStream = new ToStringMemoryStream();
-      m_indentationString = string.Empty;
-    }
-
-    protected override void StartHeader( DataGridContext dataGridContext )
-    {
-      if( string.IsNullOrEmpty( m_indentationString ) == false )
-        this.WriteToBaseStream( m_indentationString );
-
-      // The next StartDataItemField will be considered as first column
-      m_isFirstColumn = true;
-    }
-
-    protected override void StartHeaderField( DataGridContext dataGridContext, Column column )
-    {
-      // We always insert the separator before the value except for the first item
-      if( !m_isFirstColumn )
-      {
-        this.WriteToBaseStream( this.FormatSettings.Separator );
-      }
-      else
-      {
-        m_isFirstColumn = false;
-      }
-
-      object columnHeader = ( ( this.UseFieldNamesInHeader ) || ( column.Title == null ) ) ? column.FieldName : column.Title;
-
-      string fieldValueString = FormatHelper.FormatCsvData( null, columnHeader, this.FormatSettings );
-
-      this.WriteToBaseStream( fieldValueString );
-    }
-
-    protected override void EndHeader( DataGridContext dataGridContext )
-    {
-      this.WriteToBaseStream( this.FormatSettings.NewLine );
-    }
-
-    protected override void StartDataItem( DataGridContext dataGridContext, object dataItem )
-    {
-      if( string.IsNullOrEmpty( m_indentationString ) == false )
-        this.WriteToBaseStream( m_indentationString );
-
-      // The next StartDataItemField will be considered as first column
-      m_isFirstColumn = true;
-    }
-
-    protected override void StartDataItemField( DataGridContext dataGridContext, Column column, object fieldValue )
-    {
-      // We always insert the separator before the value except for the first item
-      if( !m_isFirstColumn )
-      {
-        this.WriteToBaseStream( this.FormatSettings.Separator );
-      }
-      else
-      {
-        m_isFirstColumn = false;
-      }
-
-      string fieldValueString = FormatHelper.FormatCsvData( null, fieldValue, this.FormatSettings );
-
-      this.WriteToBaseStream( fieldValueString );
-    }
-
-    protected override void EndDataItem( DataGridContext dataGridContext, object dataItem )
-    {
-      this.WriteToBaseStream( this.FormatSettings.NewLine );
-    }
-
-    #endregion
-
-    #region PRIVATE METHODS
-
-    private void WriteToBaseStream( char value )
-    {
-      byte[] tempBuffer = Encoding.Default.GetBytes( new char[] { value } );
-      m_baseStream.Write( tempBuffer, 0, tempBuffer.Length );
-    }
-
-    private void WriteToBaseStream( string value )
-    {
-      if( string.IsNullOrEmpty( value ) )
-        return;
-
-      byte[] tempBuffer = Encoding.Default.GetBytes( value );
-      m_baseStream.Write( tempBuffer, 0, tempBuffer.Length );
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private string m_indentationString; // = null;
-    private MemoryStream m_baseStream; // = null;
-    private bool m_isFirstColumn; // = false;
-
-    #endregion
-
-    #region ToStringMemoryStream Private Class
-
-    // This class is used to force the ToString of the
-    // MemoryStream to return the content of the Stream
-    // instead of the name of the Type. 
-    private class ToStringMemoryStream : MemoryStream
-    {
-      public override string ToString()
-      {
-        if( this.Length == 0 )
-        {
-          return string.Empty;
-        }
-        else
-        {
-          try
-          {
-            return Encoding.Default.GetString( this.ToArray() );
-          }
-          catch( Exception )
-          {
-            return base.ToString();
-          }
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlClipboardExporter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlClipboardExporter.cs
deleted file mode 100644
index f8529bf1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlClipboardExporter.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.IO;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid.Export
-{
-  public class HtmlClipboardExporter : ClipboardExporterBase
-  {
-    #region PUBLIC CONSTRUCTORS
-
-    public HtmlClipboardExporter()
-      : base()
-    {
-      this.IncludeColumnHeaders = true;
-      this.FormatSettings = new HtmlFormatSettings();
-      m_indentationString = string.Empty;
-
-      // We keep a reference to the innerStream to return it when clipboard export is finished
-      m_memoryStream = new MemoryStream();
-      m_baseStream = new CF_HtmlStream( m_memoryStream );
-    }
-
-    #endregion
-
-    #region PUBLIC PROPERTIES
-
-    public HtmlFormatSettings FormatSettings
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region PROTECTED OVERRIDES
-
-    protected override object ClipboardData
-    {
-      get
-      {
-        // Return the innerStream of the CF_HtmlStream which contains the CF_HTML formatted data
-        return m_memoryStream;
-      }
-    }
-
-    protected override void Indent()
-    {
-      string startDelimiter = this.FormatSettings.FieldStartDelimiter;
-      string endDelimiter = this.FormatSettings.FieldEndDelimiter;
-
-      if( startDelimiter == null )
-        startDelimiter = string.Empty;
-
-      if( endDelimiter == null )
-        endDelimiter = string.Empty;
-
-      // By default, we suppose indentation as an empty field
-      m_indentationString += startDelimiter + endDelimiter;
-    }
-
-    protected override void Unindent()
-    {
-      string startDelimiter = this.FormatSettings.FieldStartDelimiter;
-      string endDelimiter = this.FormatSettings.FieldEndDelimiter;
-
-      if( startDelimiter == null )
-        startDelimiter = string.Empty;
-
-      if( endDelimiter == null )
-        endDelimiter = string.Empty;
-
-      if( m_indentationString == null )
-      {
-        Debug.Fail( "Indentation must at least be string.empty when unindenting." );
-
-        // We initalize the indentation string and return
-        m_indentationString = string.Empty;
-      }
-      else
-      {
-        int emptyFieldLength = startDelimiter.Length + endDelimiter.Length;
-        int indentationLength = m_indentationString.Length;
-
-        // If there are less characters in indentationString than in the empty field, just set indentation
-        // as string.empty
-        if( indentationLength < emptyFieldLength )
-        {
-          m_indentationString = string.Empty;
-        }
-        else
-        {
-          m_indentationString = m_indentationString.Substring( 0, indentationLength - emptyFieldLength );
-        }
-      }
-    }
-
-    protected override void ResetExporter()
-    {
-      m_tempBuffer = null;
-      m_indentationString = string.Empty;
-
-      // We must NOT close or dispose the previous MemoryStream since we pass this
-      // instance to the Clipboard directly and it becomes responsible of 
-      // closing/disposing it
-      m_memoryStream = new MemoryStream();
-      m_baseStream = new CF_HtmlStream( m_memoryStream );
-    }
-
-    protected override void StartExporter( string dataFormat )
-    {
-      this.WriteToBaseStream( this.FormatSettings.ExporterStartDelimiter );
-    }
-
-    protected override void EndExporter( string dataFormat )
-    {
-      this.WriteToBaseStream( this.FormatSettings.ExporterEndDelimiter );
-
-      // Force the header to be updated with length of HTML data and add the footer
-      m_baseStream.Close();
-    }
-
-    protected override void StartHeader( DataGridContext dataGridContext )
-    {
-      this.WriteToBaseStream( this.FormatSettings.HeaderDataStartDelimiter );
-
-      if( string.IsNullOrEmpty( m_indentationString ) == false )
-      {
-        this.WriteToBaseStream( m_indentationString );
-      }
-    }
-
-    protected override void StartHeaderField( DataGridContext dataGridContext, Column column )
-    {
-      this.WriteToBaseStream( this.FormatSettings.HeaderFieldStartDelimiter );
-
-      object columnHeader = ( ( this.UseFieldNamesInHeader ) || ( column.Title == null ) ) ? column.FieldName : column.Title;
-
-      string fieldValueString = FormatHelper.FormatHtmlFieldData( null, columnHeader, this.FormatSettings );
-
-      this.WriteToBaseStream( fieldValueString );
-      this.WriteToBaseStream( this.FormatSettings.HeaderFieldEndDelimiter );
-    }
-
-    protected override void EndHeader( DataGridContext dataGridContext )
-    {
-      this.WriteToBaseStream( this.FormatSettings.HeaderDataEndDelimiter );
-    }
-
-    protected override void StartDataItem( DataGridContext dataGridContext, object dataItem )
-    {
-      this.WriteToBaseStream( this.FormatSettings.DataStartDelimiter );
-
-      if( string.IsNullOrEmpty( m_indentationString ) == false )
-      {
-        this.WriteToBaseStream( m_indentationString );
-      }
-    }
-
-    protected override void StartDataItemField( DataGridContext dataGridContext, Column column, object fieldValue )
-    {
-      this.WriteToBaseStream( this.FormatSettings.FieldStartDelimiter );
-      string fieldValueString = FormatHelper.FormatHtmlFieldData( null, fieldValue, this.FormatSettings );
-      this.WriteToBaseStream( fieldValueString );
-      this.WriteToBaseStream( this.FormatSettings.FieldEndDelimiter );
-    }
-
-    protected override void EndDataItem( DataGridContext dataGridContext, object dataItem )
-    {
-      this.WriteToBaseStream( this.FormatSettings.DataEndDelimiter );
-    }
-
-    #endregion
-
-    #region PRIVATE METHODS
-
-    private void WriteToBaseStream( string value )
-    {
-      if( string.IsNullOrEmpty( value ) )
-        return;
-
-      m_tempBuffer = Encoding.UTF8.GetBytes( value );
-
-      m_baseStream.Write( m_tempBuffer, 0, m_tempBuffer.Length );
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private string m_indentationString; // = null;
-    private MemoryStream m_memoryStream; // = null;
-    private CF_HtmlStream m_baseStream; // = null;
-    private byte[] m_tempBuffer; // = null;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlFormatSettings.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlFormatSettings.cs
deleted file mode 100644
index 59bb495f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/HtmlFormatSettings.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Export
-{
-  public class HtmlFormatSettings : FormatSettingsBase
-  {
-    public HtmlFormatSettings()
-    {
-      this.ExporterStartDelimiter = "<TABLE>";
-      this.ExporterEndDelimiter = "</TABLE>";
-
-      this.HeaderFieldStartDelimiter = "<TH>";
-      this.HeaderFieldEndDelimiter = "</TH>";
-      this.HeaderDataStartDelimiter = "<TR>";
-      this.HeaderDataEndDelimiter = "</TR>";
-
-      this.FieldStartDelimiter = "<TD>";
-      this.FieldEndDelimiter = "</TD>";
-      this.DataStartDelimiter = "<TR>";
-      this.DataEndDelimiter = "</TR>";
-    }
-
-    #region PUBLIC PROPERTIES
-
-    public string ExporterStartDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string ExporterEndDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string HeaderFieldStartDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string HeaderFieldEndDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string HeaderDataStartDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string HeaderDataEndDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string FieldStartDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string FieldEndDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string DataStartDelimiter
-    {
-      get;
-      set;
-    }
-
-    public string DataEndDelimiter
-    {
-      get;
-      set;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/UnicodeCsvClipboardExporter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/UnicodeCsvClipboardExporter.cs
deleted file mode 100644
index 534d6db8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/UnicodeCsvClipboardExporter.cs
+++ /dev/null
@@ -1,338 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid.Export
-{
-  public class UnicodeCsvClipboardExporter : ClipboardExporterBase
-  {
-    public UnicodeCsvClipboardExporter()
-    {
-      this.IncludeColumnHeaders = true;
-      this.FormatSettings = new CsvFormatSettings();
-      m_indentationString = string.Empty;
-      m_baseStream = new ToStringMemoryStream();
-    }
-
-    #region PUBLIC PROPERTIES
-
-    public CsvFormatSettings FormatSettings
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region PROTECTED OVERRIDES
-
-    protected override object ClipboardData
-    {
-      get
-      {
-        return m_baseStream;
-      }
-    }
-
-    protected override void Indent()
-    {
-      char separator = this.FormatSettings.Separator;
-      m_indentationString += separator;
-    }
-
-    protected override void Unindent()
-    {
-      char separator = this.FormatSettings.Separator;
-
-      if( m_indentationString == null )
-      {
-        Debug.Fail( "Indentation must at least be string.empty when unindenting." );
-        m_indentationString = string.Empty;
-      }
-      else
-      {
-        int separatorLength = 1;
-        int indentationLength = m_indentationString.Length;
-
-        // If there are less characters in indentationString than in the empty field, just set indentation
-        // as string.empty
-        if( indentationLength < separatorLength )
-        {
-          m_indentationString = string.Empty;
-        }
-        else
-        {
-          m_indentationString = m_indentationString.Substring( 0, indentationLength - separatorLength );
-        }
-      }
-    }
-
-    protected override void ResetExporter()
-    {
-      m_baseStream = new ToStringMemoryStream();
-      m_indentationString = string.Empty;
-    }
-
-    protected override void StartHeader( DataGridContext dataGridContext )
-    {
-      if( string.IsNullOrEmpty( m_indentationString ) == false )
-        this.WriteToBaseStream( m_indentationString );
-
-      // The next StartDataItemField will be considered as first column
-      m_isFirstColumn = true;
-    }
-
-    protected override void StartHeaderField( DataGridContext dataGridContext, Column column )
-    {
-      // We always insert the separator before the value except for the first item
-      if( !m_isFirstColumn )
-      {
-        this.WriteToBaseStream( this.FormatSettings.Separator );
-      }
-      else
-      {
-        m_isFirstColumn = false;
-      }
-
-      object columnHeader = ( ( this.UseFieldNamesInHeader ) || ( column.Title == null ) ) ? column.FieldName : column.Title;
-      string fieldValueString = UnicodeCsvClipboardExporter.FormatCsvData( null, columnHeader, this.FormatSettings );
-
-      this.WriteToBaseStream( fieldValueString );
-    }
-
-    protected override void EndHeader( DataGridContext dataGridContext )
-    {
-      this.WriteToBaseStream( this.FormatSettings.NewLine );
-    }
-
-    protected override void StartDataItem( DataGridContext dataGridContext, object dataItem )
-    {
-      if( string.IsNullOrEmpty( m_indentationString ) == false )
-        this.WriteToBaseStream( m_indentationString );
-
-      // The next StartDataItemField will be considered as first column
-      m_isFirstColumn = true;
-    }
-
-    protected override void StartDataItemField( DataGridContext dataGridContext, Column column, object fieldValue )
-    {
-      // We always insert the separator before the value except for the first item
-      if( !m_isFirstColumn )
-      {
-        this.WriteToBaseStream( this.FormatSettings.Separator );
-      }
-      else
-      {
-        m_isFirstColumn = false;
-      }
-
-      string fieldValueString = UnicodeCsvClipboardExporter.FormatCsvData( null, fieldValue, this.FormatSettings );
-
-      this.WriteToBaseStream( fieldValueString );
-    }
-
-    protected override void EndDataItem( DataGridContext dataGridContext, object dataItem )
-    {
-      this.WriteToBaseStream( this.FormatSettings.NewLine );
-    }
-
-    #endregion
-
-    #region PRIVATE METHODS
-
-    private void WriteToBaseStream( char value )
-    {
-      byte[] tempBuffer = Encoding.Unicode.GetBytes( new char[] { value } );
-      m_baseStream.Write( tempBuffer, 0, tempBuffer.Length );
-    }
-
-    private void WriteToBaseStream( string value )
-    {
-      if( string.IsNullOrEmpty( value ) )
-        return;
-
-      byte[] tempBuffer = Encoding.Unicode.GetBytes( value );
-      m_baseStream.Write( tempBuffer, 0, tempBuffer.Length );
-    }
-
-    #endregion
-
-    #region Private Static Methods
-
-    private static string FormatCsvData( Type dataType, object dataValue, CsvFormatSettings formatSettings )
-    {
-      string outputString = null;
-      bool checkWhitespace = true;
-
-      if( ( dataValue != null ) && ( !Convert.IsDBNull( dataValue ) ) && ( !( dataValue is Array ) ) )
-      {
-        if( dataType == null )
-          dataType = dataValue.GetType();
-
-        if( dataType == typeof( string ) )
-        {
-          if( formatSettings.TextQualifier == '\0' )
-          {
-            outputString = ( string )dataValue;
-          }
-          else
-          {
-            outputString = formatSettings.TextQualifier + ( string )dataValue + formatSettings.TextQualifier;
-          }
-
-          checkWhitespace = false;
-        }
-        else if( dataType == typeof( DateTime ) )
-        {
-          if( !string.IsNullOrEmpty( formatSettings.DateTimeFormat ) )
-          {
-            if( formatSettings.Culture == null )
-            {
-              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, CultureInfo.InvariantCulture );
-            }
-            else
-            {
-              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, formatSettings.Culture );
-            }
-          }
-        }
-        else if( ( dataType == typeof( double ) ) ||
-                 ( dataType == typeof( decimal ) ) ||
-                 ( dataType == typeof( float ) ) ||
-                 ( dataType == typeof( int ) ) ||
-                 ( dataType == typeof( double ) ) ||
-                 ( dataType == typeof( decimal ) ) ||
-                 ( dataType == typeof( float ) ) ||
-                 ( dataType == typeof( short ) ) ||
-                 ( dataType == typeof( Single ) ) ||
-                 ( dataType == typeof( UInt16 ) ) ||
-                 ( dataType == typeof( UInt32 ) ) ||
-                 ( dataType == typeof( UInt64 ) ) ||
-                 ( dataType == typeof( Int16 ) ) ||
-                 ( dataType == typeof( Int64 ) ) )
-        {
-          string format = formatSettings.NumericFormat;
-
-          if( ( ( dataType == typeof( double ) ) ||
-                ( dataType == typeof( decimal ) ) ||
-                ( dataType == typeof( float ) ) ) &&
-              ( !string.IsNullOrEmpty( formatSettings.FloatingPointFormat ) ) )
-            format = formatSettings.FloatingPointFormat;
-
-          if( !string.IsNullOrEmpty( format ) )
-          {
-            if( formatSettings.Culture == null )
-            {
-              outputString = string.Format( CultureInfo.InvariantCulture, "{0:" + format + "}", dataValue );
-            }
-            else
-            {
-              outputString = string.Format( formatSettings.Culture, "{0:" + format + "}", dataValue );
-            }
-          }
-        }
-
-        if( outputString == null )
-        {
-          if( formatSettings.Culture == null )
-          {
-            outputString = string.Format( CultureInfo.InvariantCulture, "{0}", dataValue );
-          }
-          else
-          {
-            outputString = string.Format( formatSettings.Culture, "{0}", dataValue );
-          }
-        }
-
-        // For dates and numbers, as a rule, we never use the TextQualifier. However, the
-        // specified format can introduce whitespaces. To better support this case, we add
-        // the TextQualifier if needed.
-        if( ( checkWhitespace ) && ( formatSettings.TextQualifier != '\0' ) )
-        {
-          bool useTextQualifier = false;
-
-          // If the output string contains the character used to separate the fields, we
-          // don't bother checking for whitespace. TextQualifier will be used.
-          if( outputString.IndexOf( formatSettings.Separator ) < 0 )
-          {
-            for( int i = 0; i < outputString.Length; i++ )
-            {
-              if( char.IsWhiteSpace( outputString, i ) )
-              {
-                useTextQualifier = true;
-                break;
-              }
-            }
-          }
-          else
-          {
-            useTextQualifier = true;
-          }
-
-          if( useTextQualifier )
-            outputString = formatSettings.TextQualifier + outputString + formatSettings.TextQualifier;
-        }
-      }
-
-      return outputString;
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private string m_indentationString; // = null;
-    private MemoryStream m_baseStream; // = null;
-    private bool m_isFirstColumn; // = false;
-
-    #endregion
-
-    #region ToStringMemoryStream Private Class
-
-    // This class is used to force the ToString of the
-    // MemoryStream to return the content of the Stream
-    // instead of the name of the Type. 
-    private class ToStringMemoryStream : MemoryStream
-    {
-      public override string ToString()
-      {
-        if( this.Length == 0 )
-        {
-          return string.Empty;
-        }
-        else
-        {
-          try
-          {
-            return Encoding.Unicode.GetString( this.ToArray() );
-          }
-          catch( Exception )
-          {
-            return base.ToString();
-          }
-        }
-      }
-    }
-
-    #endregion
-  }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/XceedDataObject.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/XceedDataObject.cs
deleted file mode 100644
index 3400f3dd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/XceedDataObject.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Security;
-
-namespace Xceed.Wpf.DataGrid.Export
-{
-  [SecurityCritical]
-  [Serializable]
-  internal class XceedDataObject : IDataObject
-  {
-    public XceedDataObject()
-    {
-      m_formatToValue = new Dictionary<string, object>();
-    }
-
-    #region PRIVATE FIELDS
-
-    private Dictionary<string, object> m_formatToValue; // = null;
-
-    #endregion
-
-    #region IDataObject Members
-
-    object IDataObject.GetData( string format, bool autoConvert )
-    {
-      return ( ( IDataObject )this ).GetData( format );
-    }
-
-    object IDataObject.GetData( Type format )
-    {
-      throw new NotSupportedException();
-    }
-
-    object IDataObject.GetData( string format )
-    {
-      object value = null;
-
-      m_formatToValue.TryGetValue( format, out value );
-
-      return value;
-    }
-
-    bool IDataObject.GetDataPresent( string format, bool autoConvert )
-    {
-      return ( ( IDataObject )this ).GetDataPresent( format );
-    }
-
-    bool IDataObject.GetDataPresent( Type format )
-    {
-      throw new NotSupportedException();
-    }
-
-    bool IDataObject.GetDataPresent( string format )
-    {
-      return m_formatToValue.ContainsKey( format );
-    }
-
-    string[] IDataObject.GetFormats( bool autoConvert )
-    {
-      return ( ( IDataObject )this ).GetFormats();
-    }
-
-    string[] IDataObject.GetFormats()
-    {
-      return m_formatToValue.Keys.ToArray<string>();
-    }
-
-    void IDataObject.SetData( string format, object data, bool autoConvert )
-    {
-      ( ( IDataObject )this ).SetData( format, data );
-    }
-
-    void IDataObject.SetData( Type format, object data )
-    {
-      throw new NotSupportedException();
-    }
-
-    void IDataObject.SetData( string format, object data )
-    {
-      if( m_formatToValue.ContainsKey( format ) )
-      {
-        m_formatToValue[ format ] = data;
-      }
-      else
-      {
-        m_formatToValue.Add( format, data );
-      }
-    }
-
-    void IDataObject.SetData( object data )
-    {
-      throw new NotSupportedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/CsvFormatSettings.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/CsvFormatSettings.cs
deleted file mode 100644
index 8fa37464..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/CsvFormatSettings.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Export
-{
-  public class CsvFormatSettings : FormatSettingsBase
-  {
-    public CsvFormatSettings()
-    {
-      this.Separator = ',';
-      this.TextQualifier = '"';
-      this.NewLine = Environment.NewLine;
-    }
-
-    public char Separator
-    {
-      get;
-      set;
-    }
-
-    public char TextQualifier
-    {
-      get;
-      set;
-    }
-
-    public string NewLine
-    {
-      get;
-      set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs
deleted file mode 100644
index a8cfe398..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs
+++ /dev/null
@@ -1,328 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid.Export
-{
-  internal class FormatHelper
-  {
-
-    public static string FormatCsvData( Type dataType, object dataValue, CsvFormatSettings formatSettings )
-    {
-      string outputString = null;
-      bool checkWhitespace = true;
-
-      if( ( dataValue != null ) && ( !Convert.IsDBNull( dataValue ) ) && ( !( dataValue is Array ) ) )
-      {
-        if( dataType == null )
-          dataType = dataValue.GetType();
-
-        if( dataType == typeof( string ) )
-        {
-          string textQualifier = formatSettings.TextQualifier.ToString();
-
-          if( textQualifier == "\0" )
-          {
-            outputString = ( string )dataValue;
-          }
-          else
-          {
-            outputString = formatSettings.TextQualifier + ( ( string )dataValue ).Replace( textQualifier, textQualifier + textQualifier ) + formatSettings.TextQualifier;
-          }
-
-          checkWhitespace = false;
-        }
-        else if( dataType == typeof( DateTime ) )
-        {
-          if( !string.IsNullOrEmpty( formatSettings.DateTimeFormat ) )
-          {
-            if( formatSettings.Culture == null )
-            {
-              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, CultureInfo.InvariantCulture );
-            }
-            else
-            {
-              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, formatSettings.Culture );
-            }
-          }
-        }
-        else if( ( dataType == typeof( double ) ) ||
-                 ( dataType == typeof( decimal ) ) ||
-                 ( dataType == typeof( float ) ) ||
-                 ( dataType == typeof( int ) ) ||
-                 ( dataType == typeof( double ) ) ||
-                 ( dataType == typeof( decimal ) ) ||
-                 ( dataType == typeof( float ) ) ||
-                 ( dataType == typeof( short ) ) ||
-                 ( dataType == typeof( Single ) ) ||
-                 ( dataType == typeof( UInt16 ) ) ||
-                 ( dataType == typeof( UInt32 ) ) ||
-                 ( dataType == typeof( UInt64 ) ) ||
-                 ( dataType == typeof( Int16 ) ) ||
-                 ( dataType == typeof( Int64 ) ) )
-        {
-          string format = formatSettings.NumericFormat;
-
-          if( ( ( dataType == typeof( double ) ) ||
-                ( dataType == typeof( decimal ) ) ||
-                ( dataType == typeof( float ) ) ) &&
-              ( !string.IsNullOrEmpty( formatSettings.FloatingPointFormat ) ) )
-            format = formatSettings.FloatingPointFormat;
-
-          if( !string.IsNullOrEmpty( format ) )
-          {
-            if( formatSettings.Culture == null )
-            {
-              outputString = string.Format( CultureInfo.InvariantCulture, "{0:" + format + "}", dataValue );
-            }
-            else
-            {
-              outputString = string.Format( formatSettings.Culture, "{0:" + format + "}", dataValue );
-            }
-          }
-        }
-
-        if( outputString == null )
-        {
-          if( formatSettings.Culture == null )
-          {
-            outputString = string.Format( CultureInfo.InvariantCulture, "{0}", dataValue );
-          }
-          else
-          {
-            outputString = string.Format( formatSettings.Culture, "{0}", dataValue );
-          }
-        }
-
-        // For dates and numbers, as a rule, we never use the TextQualifier. However, the
-        // specified format can introduce whitespaces. To better support this case, we add
-        // the TextQualifier if needed.
-        if( ( checkWhitespace ) && ( formatSettings.TextQualifier != '\0' ) )
-        {
-          bool useTextQualifier = false;
-
-          // If the output string contains the character used to separate the fields, we
-          // don't bother checking for whitespace. TextQualifier will be used.
-          if( outputString.IndexOf( formatSettings.Separator ) < 0 )
-          {
-            for( int i = 0; i < outputString.Length; i++ )
-            {
-              if( char.IsWhiteSpace( outputString, i ) )
-              {
-                useTextQualifier = true;
-                break;
-              }
-            }
-          }
-          else
-          {
-            useTextQualifier = true;
-          }
-
-          if( useTextQualifier )
-            outputString = formatSettings.TextQualifier + outputString + formatSettings.TextQualifier;
-        }
-
-      }
-
-      return outputString;
-    }
-
-    public static string FormatHtmlFieldData( Type dataType, object dataValue, HtmlFormatSettings formatSettings )
-    {
-      string outputString = null;
-
-      if( ( dataValue != null ) && ( !Convert.IsDBNull( dataValue ) ) && ( !( dataValue is Array ) ) )
-      {
-        if( dataType == null )
-          dataType = dataValue.GetType();
-
-        if( dataType == typeof( string ) )
-        {
-          outputString = ( string )dataValue;
-        }
-        else if( dataType == typeof( DateTime ) )
-        {
-          if( !string.IsNullOrEmpty( formatSettings.DateTimeFormat ) )
-          {
-            if( formatSettings.Culture == null )
-            {
-              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, CultureInfo.InvariantCulture );
-            }
-            else
-            {
-              outputString = ( ( DateTime )dataValue ).ToString( formatSettings.DateTimeFormat, formatSettings.Culture );
-            }
-          }
-        }
-        else if( ( dataType == typeof( double ) ) ||
-                 ( dataType == typeof( decimal ) ) ||
-                 ( dataType == typeof( float ) ) ||
-                 ( dataType == typeof( int ) ) ||
-                 ( dataType == typeof( double ) ) ||
-                 ( dataType == typeof( decimal ) ) ||
-                 ( dataType == typeof( float ) ) ||
-                 ( dataType == typeof( short ) ) ||
-                 ( dataType == typeof( Single ) ) ||
-                 ( dataType == typeof( UInt16 ) ) ||
-                 ( dataType == typeof( UInt32 ) ) ||
-                 ( dataType == typeof( UInt64 ) ) ||
-                 ( dataType == typeof( Int16 ) ) ||
-                 ( dataType == typeof( Int64 ) ) )
-        {
-          string format = formatSettings.NumericFormat;
-
-          if( ( ( dataType == typeof( double ) ) ||
-                ( dataType == typeof( decimal ) ) ||
-                ( dataType == typeof( float ) ) ) &&
-              ( !string.IsNullOrEmpty( formatSettings.FloatingPointFormat ) ) )
-            format = formatSettings.FloatingPointFormat;
-
-          if( !string.IsNullOrEmpty( format ) )
-          {
-            if( formatSettings.Culture == null )
-            {
-              outputString = string.Format( CultureInfo.InvariantCulture, "{0:" + format + "}", dataValue );
-            }
-            else
-            {
-              outputString = string.Format( formatSettings.Culture, "{0:" + format + "}", dataValue );
-            }
-          }
-        }
-
-        if( outputString == null )
-        {
-          if( formatSettings.Culture == null )
-          {
-            outputString = string.Format( CultureInfo.InvariantCulture, "{0}", dataValue );
-          }
-          else
-          {
-            outputString = string.Format( formatSettings.Culture, "{0}", dataValue );
-          }
-        }
-      }
-
-      return FormatHelper.FormatPlainTextAsHtml( outputString );
-    }
-
-    public static void FormatHtmlData( StringBuilder htmlDataStringBuilder )
-    {
-      string htmlDataString = htmlDataStringBuilder.ToString();
-
-      StringBuilder headerStringBuilder = new StringBuilder();
-      headerStringBuilder.Append( "Version:1.0" );
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "StartHTML:-1" ); // This is optional according to MSDN documentation
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "EndHTML:-1" ); // This is optional according to MSDN documentation
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "StartFragment:0000000109" ); // Always 109 bytes from start of Version to the end of <!--StartFragment--> tag
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "EndFragment:{0}" ); // need + 7 to "emulate" the 10 digits ( "{x}" is already 3 of the 10 chars )
-      headerStringBuilder.Append( Environment.NewLine );
-      headerStringBuilder.Append( "<!--StartFragment-->" );
-
-      // We assure the StartFramgment offset is correct
-      string headerString = headerStringBuilder.ToString();
-      int startFragmentByteCounts = headerString.Length + 7; //  +7 chars as mentionned above
-      Debug.Assert( startFragmentByteCounts == 109 );
-
-      // Compute the EndFragment offset => header size + html data size + final end line (after data) length (\r\n)
-      int endFragmentByteCounts = startFragmentByteCounts + htmlDataString.Length + Environment.NewLine.Length;
-      string endFragmentOffset = endFragmentByteCounts.ToString( "0000000000", CultureInfo.InvariantCulture );
-      headerString = string.Format( CultureInfo.InvariantCulture, headerString, endFragmentOffset );
-
-      // Insert header at the beginning of the htmlDataStringBuilder
-      htmlDataStringBuilder.Insert( 0, headerString );
-
-      // Append the final end line and EndFragment tag
-      htmlDataStringBuilder.Append( Environment.NewLine );
-      htmlDataStringBuilder.Append( "<!--EndFragment-->" );
-    }
-
-    public static string FormatPlainTextAsHtml( string plainText )
-    {
-      StringBuilder htmlStringBuilder = new StringBuilder();
-      if( string.IsNullOrEmpty( plainText ) == false )
-      {
-        int length = plainText.Length;
-
-        for( int i = 0; i < length; i++ )
-        {
-          char currentChar = plainText[ i ];
-          switch( currentChar )
-          {
-            case '\n':
-              htmlStringBuilder.Append( "<br>" );
-              break;
-
-            case '\r':
-              break;
-
-            case '\u00A0':
-              htmlStringBuilder.Append( "&nbsp;" );
-              break;
-
-            case '"':
-              htmlStringBuilder.Append( "&quot;" );
-              break;
-
-            case '&':
-              htmlStringBuilder.Append( "&amp;" );
-              break;
-
-            case '<':
-              htmlStringBuilder.Append( "&lt;" );
-              break;
-
-            case '>':
-              htmlStringBuilder.Append( "&gt;" );
-              break;
-
-            default:
-              // For extended ascii table
-              if( ( currentChar >= 160 ) && ( currentChar < 256 ) )
-              {
-                htmlStringBuilder.Append( "&#" );
-                htmlStringBuilder.Append( ( ( int )currentChar ).ToString( NumberFormatInfo.InvariantInfo ) );
-                htmlStringBuilder.Append( ';' );
-              }
-              else
-              {
-                htmlStringBuilder.Append( currentChar );
-              }
-              break;
-          }
-        }
-      }
-      else
-      {
-        // Add blank space into field when null or empty
-        htmlStringBuilder.Append( "&nbsp;" );
-      }
-
-      return htmlStringBuilder.ToString();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatSettingsBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatSettingsBase.cs
deleted file mode 100644
index e3dad557..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatSettingsBase.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Export
-{
-  public abstract class FormatSettingsBase
-  {
-    public string DateTimeFormat
-    {
-      get;
-      set;
-    }
-
-    public string NumericFormat
-    {
-      get;
-      set;
-    }
-
-    public string FloatingPointFormat
-    {
-      get;
-      set;
-    }
-
-    public CultureInfo Culture
-    {
-      get;
-      set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelector.cs
deleted file mode 100644
index e03ae7ae..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelector.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.ObjectModel;
-using System.Windows.Data;
-using System.Windows.Markup;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [ContentProperty( "SelectorItems" )]
-  public class FieldNameGroupConfigurationSelector : GroupConfigurationSelector
-  {
-    private FieldNameGroupConfigurationSelectorItemCollection m_groupConfigurationSelectorItems = new FieldNameGroupConfigurationSelectorItemCollection();
-
-      public ObservableCollection<FieldNameGroupConfigurationSelectorItem> SelectorItems
-    {
-      get
-      {
-        return m_groupConfigurationSelectorItems;
-      }
-    }
-
-    public override GroupConfiguration SelectGroupConfiguration( int groupLevel, CollectionViewGroup collectionViewGroup, System.ComponentModel.GroupDescription groupDescription )
-    {
-      if( m_groupConfigurationSelectorItems.Count == 0 )
-        return base.SelectGroupConfiguration( groupLevel, collectionViewGroup, groupDescription );
-
-      string fieldName = string.Empty;
-
-      DataGridGroupDescription dataGridGroupDescription = groupDescription as DataGridGroupDescription;
-      if( dataGridGroupDescription != null )
-      {
-        fieldName = dataGridGroupDescription.PropertyName;
-      }
-      else
-      {
-        PropertyGroupDescription propertyGroupDescription = groupDescription as PropertyGroupDescription;
-        if( propertyGroupDescription != null )
-        {
-          fieldName = propertyGroupDescription.PropertyName;
-        }
-      }
-
-      if( String.IsNullOrEmpty( fieldName ) == true )
-        return base.SelectGroupConfiguration( groupLevel, collectionViewGroup, groupDescription );
-
-      FieldNameGroupConfigurationSelectorItem groupConfig = m_groupConfigurationSelectorItems.GetGroupConfigurationSelectorItem( fieldName );
-      if( groupConfig != null )
-      {
-        return groupConfig.GroupConfiguration;
-      }
-
-      return base.SelectGroupConfiguration( groupLevel, collectionViewGroup, groupDescription );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItem.cs
deleted file mode 100644
index 97ef71bb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItem.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Markup;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [ContentProperty( "GroupConfiguration" )]
-  public class FieldNameGroupConfigurationSelectorItem
-  {
-    #region FieldName Property
-
-    public string FieldName
-    {
-      get
-      {
-        return m_fieldName;
-      }
-      set
-      {
-        if( m_isSealed == true )
-          throw new InvalidOperationException( "An attempt was made to modify the FieldName property after the FieldNameGroupConfigurationSelectorItem has been added to a FieldNameGroupConfigurationSelector." );
-
-        m_fieldName = value;
-      }
-    }
-
-    private string m_fieldName;
-
-    #endregion
-
-    #region GroupConfiguration Property
-
-    public GroupConfiguration GroupConfiguration
-    {
-      get
-      {
-        return m_groupConfig;
-      }
-      set
-      {
-        m_groupConfig = value;
-      }
-    }
-
-    private GroupConfiguration m_groupConfig;
-
-    #endregion
-
-    #region IsSealed Property
-
-    private bool m_isSealed = false;
-
-    public bool IsSealed
-    {
-      get
-      {
-        return m_isSealed;
-      }
-    }
-
-    internal void Seal()
-    {
-      m_isSealed = true;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItemCollection.cs
deleted file mode 100644
index 733b1b36..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItemCollection.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class FieldNameGroupConfigurationSelectorItemCollection : ObservableCollection<FieldNameGroupConfigurationSelectorItem>
-  {
-    internal FieldNameGroupConfigurationSelectorItemCollection()
-      :base()
-    {
-    }
-
-    public FieldNameGroupConfigurationSelectorItem GetGroupConfigurationSelectorItem( string fieldName )
-    {
-      FieldNameGroupConfigurationSelectorItem retval = null;
-
-      foreach( FieldNameGroupConfigurationSelectorItem fieldNameGroupConfig in this )
-      {
-        if( fieldNameGroupConfig.FieldName == fieldName )
-        {
-          retval = fieldNameGroupConfig;
-          break;
-        }
-      }
-
-      return retval;
-    }
-
-    protected override void InsertItem( int index, FieldNameGroupConfigurationSelectorItem item )
-    {
-      if( this.GetGroupConfigurationSelectorItem( item.FieldName ) != null )
-        throw new InvalidOperationException( "An attempt was made to insert a FieldNameGroupConfigurationSelectorItem that has the same field name as an existing FieldNameGroupConfigurationSelectorItem." );
-
-      base.InsertItem( index, item );
-
-      item.Seal();
-    }
-
-    protected override void SetItem( int index, FieldNameGroupConfigurationSelectorItem item )
-    {
-      FieldNameGroupConfigurationSelectorItem oldGroupConfig = this[ index ];
-      FieldNameGroupConfigurationSelectorItem failingGroupConfig = this.GetGroupConfigurationSelectorItem( item.FieldName );
-
-      if( ( failingGroupConfig != null ) && ( oldGroupConfig != failingGroupConfig ) )
-        throw new InvalidOperationException( "An attempt was made to set a FieldNameGroupConfigurationSelectorItem that has the same field name as an existing FieldNameGroupConfigurationSelectorItem." );
-
-      base.SetItem( index, item );
-
-      item.Seal();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementExtensions.cs
deleted file mode 100644
index a2138730..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementExtensions.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Windows.Media.TextFormatting;
-using Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class FrameworkElementExtensions
-  {
-    #region Static Fields
-
-    private static readonly WeakDictionary<TextProperties, double> s_fontHeight = new WeakDictionary<TextProperties, double>();
-
-    #endregion
-
-    internal static object CoerceMinHeight( this FrameworkElement source, Thickness padding, object value )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      var newValue = ( double )value;
-      var minHeight = FrameworkElementExtensions.GetFontHeight( source ) + padding.Top + padding.Bottom;
-
-      if( newValue >= minHeight )
-        return value;
-
-      if( minHeight != source.MinHeight )
-        return minHeight;
-
-      return DependencyProperty.UnsetValue;
-    }
-
-    internal static double GetFontHeight( this FrameworkElement source )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      var textProperties = new TextProperties(
-                             TextOptions.GetTextFormattingMode( source ),
-                             TextElement.GetFontFamily( source ),
-                             TextElement.GetFontStyle( source ),
-                             TextElement.GetFontWeight( source ),
-                             TextElement.GetFontStretch( source ),
-                             TextElement.GetFontSize( source ) );
-
-      lock( ( ( ICollection )s_fontHeight ).SyncRoot )
-      {
-        double fontHeight;
-
-        if( !s_fontHeight.TryGetValue( textProperties, out fontHeight ) )
-        {
-          var formatter = TextFormatter.Create( textProperties.FormattingMode );
-          var typeface = new Typeface( textProperties.FontFamily, textProperties.FontStyle, textProperties.FontWeight, textProperties.FontStretch );
-          var textSource = new EmptyTextSource();
-          var textRunProperties = new EmptyTextRunProperties( typeface, textProperties.FontSize );
-          var textParagraphProperties = new EmptyTextParagraphProperties( textRunProperties );
-          var textLine = formatter.FormatLine( textSource, 0, 0d, textParagraphProperties, null );
-
-          fontHeight = textLine.Height;
-          s_fontHeight.Add( textProperties, fontHeight );
-        }
-
-        return fontHeight;
-      }
-    }
-
-    #region EmptyTextSource Private Class
-
-    private sealed class EmptyTextSource : TextSource
-    {
-      public override TextSpan<CultureSpecificCharacterBufferRange> GetPrecedingText( int textSourceCharacterIndexLimit )
-      {
-        return new TextSpan<CultureSpecificCharacterBufferRange>( 0, null );
-      }
-
-      public override int GetTextEffectCharacterIndexFromTextSourceCharacterIndex( int textSourceCharacterIndex )
-      {
-        return -1;
-      }
-
-      public override TextRun GetTextRun( int textSourceCharacterIndex )
-      {
-        return new TextEndOfParagraph( 1 );
-      }
-    }
-
-    #endregion
-
-    #region EmptyTextParagraphProperties Private Class
-
-    private sealed class EmptyTextParagraphProperties : TextParagraphProperties
-    {
-      internal EmptyTextParagraphProperties( TextRunProperties defaultTextRunProperties )
-      {
-        m_defaultTextRunProperties = defaultTextRunProperties;
-      }
-
-      public override TextRunProperties DefaultTextRunProperties
-      {
-        get
-        {
-          return m_defaultTextRunProperties;
-        }
-      }
-
-      public override bool FirstLineInParagraph
-      {
-        get
-        {
-          return true;
-        }
-      }
-
-      public override FlowDirection FlowDirection
-      {
-        get
-        {
-          return FlowDirection.LeftToRight;
-        }
-      }
-
-      public override double Indent
-      {
-        get
-        {
-          return 0d;
-        }
-      }
-
-      public override double LineHeight
-      {
-        get
-        {
-          return 0d;
-        }
-      }
-
-      public override TextAlignment TextAlignment
-      {
-        get
-        {
-          return TextAlignment.Left;
-        }
-      }
-
-      public override TextMarkerProperties TextMarkerProperties
-      {
-        get
-        {
-          return null;
-        }
-      }
-
-      public override TextWrapping TextWrapping
-      {
-        get
-        {
-          return TextWrapping.NoWrap;
-        }
-      }
-
-      private readonly TextRunProperties m_defaultTextRunProperties;
-    }
-
-    #endregion
-
-    #region EmptyTextRunProperties Private Class
-
-    private sealed class EmptyTextRunProperties : TextRunProperties
-    {
-      internal EmptyTextRunProperties( Typeface typeface, double fontSize )
-      {
-        m_typeface = typeface;
-        m_fontSize = fontSize;
-      }
-
-      public override Brush BackgroundBrush
-      {
-        get
-        {
-          return Brushes.Transparent;
-        }
-      }
-
-      public override CultureInfo CultureInfo
-      {
-        get
-        {
-          return CultureInfo.InvariantCulture;
-        }
-      }
-
-      public override double FontHintingEmSize
-      {
-        get
-        {
-          return m_fontSize;
-        }
-      }
-
-      public override double FontRenderingEmSize
-      {
-        get
-        {
-          return m_fontSize;
-        }
-      }
-
-      public override Brush ForegroundBrush
-      {
-        get
-        {
-          return Brushes.Transparent;
-        }
-      }
-
-      public override TextDecorationCollection TextDecorations
-      {
-        get
-        {
-          return null;
-        }
-      }
-
-      public override TextEffectCollection TextEffects
-      {
-        get
-        {
-          return null;
-        }
-      }
-
-      public override Typeface Typeface
-      {
-        get
-        {
-          return m_typeface;
-        }
-      }
-
-      private readonly Typeface m_typeface;
-      private readonly double m_fontSize;
-    }
-
-    #endregion
-
-    #region TextProperties Private Class
-
-    private sealed class TextProperties : IEquatable<TextProperties>
-    {
-      internal TextProperties( TextFormattingMode formattingMode, FontFamily fontFamily, FontStyle fontStyle, FontWeight fontWeight, FontStretch fontStretch, double fontSize )
-      {
-        this.FormattingMode = formattingMode;
-        this.FontFamily = fontFamily;
-        this.FontStyle = fontStyle;
-        this.FontWeight = fontWeight;
-        this.FontStretch = fontStretch;
-        this.FontSize = fontSize;
-      }
-
-      public override int GetHashCode()
-      {
-        unchecked
-        {
-          var hashCode = this.FontSize.GetHashCode();
-
-          if( this.FontFamily != null )
-          {
-            hashCode = hashCode * 13 + this.FontFamily.GetHashCode();
-          }
-
-          hashCode = hashCode * 13 + this.FontStyle.GetHashCode();
-          hashCode = hashCode * 13 + this.FontWeight.GetHashCode();
-          hashCode = hashCode * 13 + this.FontStretch.GetHashCode();
-          hashCode = hashCode * 13 + this.FormattingMode.GetHashCode();
-
-          return hashCode;
-        }
-      }
-
-      public override bool Equals( object obj )
-      {
-        return this.Equals( obj as TextProperties );
-      }
-
-      public bool Equals( TextProperties obj )
-      {
-        if( object.ReferenceEquals( obj, null ) )
-          return false;
-
-        return object.Equals( obj.FontSize, this.FontSize )
-            && object.Equals( obj.FontFamily, this.FontFamily )
-            && object.Equals( obj.FontStyle, this.FontStyle )
-            && object.Equals( obj.FontWeight, this.FontWeight )
-            && object.Equals( obj.FontStretch, this.FontStretch )
-            && object.Equals( obj.FormattingMode, this.FormattingMode );
-      }
-
-      internal readonly TextFormattingMode FormattingMode;
-      internal readonly FontFamily FontFamily;
-      internal readonly FontStyle FontStyle;
-      internal readonly FontWeight FontWeight;
-      internal readonly FontStretch FontStretch;
-      internal readonly double FontSize;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GenericContentTemplateSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GenericContentTemplateSelector.cs
deleted file mode 100644
index 92384ad0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GenericContentTemplateSelector.cs
+++ /dev/null
@@ -1,400 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Xml;
-using Xceed.Wpf.DataGrid.Converters;
-
-namespace Xceed.Wpf.DataGrid
-{
-    internal sealed class GenericContentTemplateSelector : DataTemplateSelector
-    {
-        #region Static Fields
-
-        internal static readonly DataTemplate ForeignKeyCellContentTemplate;
-        internal static readonly DataTemplate ForeignKeyGroupValueTemplate;
-        internal static readonly DataTemplate ForeignKeyScrollTipContentTemplate;
-
-        private static readonly DataTemplate BoolTemplate;
-        private static readonly DataTemplate CommonTemplate;
-        private static readonly DataTemplate ImageTemplate;
-
-        private static readonly List<KeyValuePair<Type, WeakReference>> DefaultTemplates = new List<KeyValuePair<Type, WeakReference>>(0);
-
-        private static readonly GenericContentTemplateSelectorResources GenericContentTemplateResources = new GenericContentTemplateSelectorResources();
-
-        private static Func<DependencyObject, object, Type, object> FindTemplateResource; //null
-
-        #endregion
-
-        #region Constructors
-
-        static GenericContentTemplateSelector()
-        {
-            // We need to initalize the ResourceDictionary before accessing since we access
-            // it in a static constructor and will be called before the Layout was performed
-            GenericContentTemplateSelector.GenericContentTemplateResources.InitializeComponent();
-
-            GenericContentTemplateSelector.BoolTemplate = GenericContentTemplateSelector.GenericContentTemplateResources["booleanDefaultContentTemplate"] as DataTemplate;
-            Debug.Assert(GenericContentTemplateSelector.BoolTemplate != null);
-            GenericContentTemplateSelector.BoolTemplate.Seal();
-
-            GenericContentTemplateSelector.CommonTemplate = GenericContentTemplateSelector.GenericContentTemplateResources["commonDefaultContentTemplate"] as DataTemplate;
-            Debug.Assert(GenericContentTemplateSelector.CommonTemplate != null);
-            GenericContentTemplateSelector.CommonTemplate.Seal();
-
-            GenericContentTemplateSelector.ImageTemplate = GenericContentTemplateSelector.GenericContentTemplateResources["imageDefaultContentTemplate"] as DataTemplate;
-            Debug.Assert(GenericContentTemplateSelector.ImageTemplate != null);
-            GenericContentTemplateSelector.ImageTemplate.Seal();
-
-            GenericContentTemplateSelector.ForeignKeyCellContentTemplate = GenericContentTemplateSelector.GenericContentTemplateResources["foreignKeyDefaultContentTemplate"] as DataTemplate;
-            Debug.Assert(GenericContentTemplateSelector.ForeignKeyCellContentTemplate != null);
-            GenericContentTemplateSelector.ForeignKeyCellContentTemplate.Seal();
-
-            GenericContentTemplateSelector.ForeignKeyGroupValueTemplate = GenericContentTemplateSelector.GenericContentTemplateResources["foreignKeyGroupValueDefaultContentTemplate"] as DataTemplate;
-            Debug.Assert(GenericContentTemplateSelector.ForeignKeyGroupValueTemplate != null);
-            GenericContentTemplateSelector.ForeignKeyGroupValueTemplate.Seal();
-
-            GenericContentTemplateSelector.ForeignKeyScrollTipContentTemplate = GenericContentTemplateSelector.GenericContentTemplateResources["foreignKeyScrollTipDefaultContentTemplate"] as DataTemplate;
-            Debug.Assert(GenericContentTemplateSelector.ForeignKeyScrollTipContentTemplate != null);
-            GenericContentTemplateSelector.ForeignKeyScrollTipContentTemplate.Seal();
-        }
-
-        private GenericContentTemplateSelector()
-        {
-        }
-
-        #endregion
-
-        #region Instance Static Property
-
-        public static GenericContentTemplateSelector Instance
-        {
-            get
-            {
-                return m_instance;
-            }
-        }
-
-        private static GenericContentTemplateSelector m_instance = new GenericContentTemplateSelector();
-
-        #endregion
-
-        public override DataTemplate SelectTemplate(object item, DependencyObject container)
-        {
-            if (item == null)
-                return base.SelectTemplate(item, container);
-
-            DataTemplate template = null;
-
-            if ((item is byte[]) /*|| (item is System.Drawing.Image)*/)
-            {
-                bool useImageTemplate = false;
-
-                try
-                {
-                    var converter = new ImageConverter();
-                    useImageTemplate = (converter.Convert(item, typeof(ImageSource), null, CultureInfo.CurrentCulture) != null);
-                }
-                catch (NotSupportedException)
-                {
-                    //suppress the exception, the byte[] is not an image. convertedValue will remain null
-                }
-
-                if (useImageTemplate)
-                {
-                    template = GenericContentTemplateSelector.GetImageTemplate(container);
-                }
-            }
-            else if (item is ImageSource)
-            {
-                template = GenericContentTemplateSelector.GetImageTemplate(container);
-            }
-            else if (item is bool)
-            {
-                template = GenericContentTemplateSelector.BoolTemplate;
-            }
-
-            if (template == null)
-            {
-                template = GenericContentTemplateSelector.GetCommonTemplate(item, container);
-            }
-
-            if (template != null)
-                return template;
-
-            return base.SelectTemplate(item, container);
-        }
-
-        private static DataTemplate GetImageTemplate(DependencyObject container)
-        {
-            return GenericContentTemplateSelector.ImageTemplate;
-        }
-
-        private static DataTemplate GetCommonTemplate(object item, DependencyObject container)
-        {
-            Debug.Assert(item != null);
-
-            var itemType = item.GetType();
-
-            // Do not provide a template for data types that are already optimized by the framework or
-            // for data types that have a default template.
-            if (GenericContentTemplateSelector.IsTypeOptimized(itemType)
-              || GenericContentTemplateSelector.HasImplicitTemplate(item, itemType, container))
-                return null;
-
-            return GenericContentTemplateSelector.GetDefaultTemplate(itemType);
-        }
-
-        private static DataTemplate GetDefaultTemplate(Type type)
-        {
-            Debug.Assert(type != null);
-
-            var converter = TypeDescriptor.GetConverter(type);
-            if ((converter == null) || (!converter.CanConvertTo(typeof(string))))
-                return GenericContentTemplateSelector.CommonTemplate;
-
-            var templates = GenericContentTemplateSelector.DefaultTemplates;
-            lock (((ICollection)templates).SyncRoot)
-            {
-                for (int i = templates.Count - 1; i >= 0; i--)
-                {
-                    var target = templates[i];
-                    var targetTemplate = target.Value.Target as DataTemplate;
-
-                    // We have found the desired template.
-                    if (target.Key == type)
-                    {
-                        if (targetTemplate != null)
-                            return targetTemplate;
-
-                        // Unfortunately, the template has been garbage collected.
-                        templates.RemoveAt(i);
-                        break;
-                    }
-                }
-
-                templates.TrimExcess();
-
-                var template = GenericContentTemplateSelector.CreateDefaultTemplate(type, converter);
-
-                templates.Add(new KeyValuePair<Type, WeakReference>(type, new WeakReference(template)));
-
-                return template;
-            }
-        }
-
-        private static DataTemplate CreateDefaultTemplate(Type type, TypeConverter converter)
-        {
-            Debug.Assert(type != null);
-            Debug.Assert(converter != null);
-
-            var template = new DataTemplate();
-            var factory = new FrameworkElementFactory(typeof(TextBlock));
-
-            var binding = new Binding();
-            binding.Mode = BindingMode.OneWay;
-            binding.Converter = new DefaultConverter(converter);
-            binding.ConverterCulture = CultureInfo.CurrentCulture;
-
-            factory.SetBinding(TextBlock.TextProperty, binding);
-
-            template.VisualTree = factory;
-            template.Seal();
-
-            return template;
-        }
-
-        private static bool IsTypeOptimized(Type type)
-        {
-            Debug.Assert(type != null);
-
-            if (typeof(string).IsAssignableFrom(type)
-              || typeof(UIElement).IsAssignableFrom(type)
-              || typeof(XmlNode).IsAssignableFrom(type))
-                return true;
-
-            if (!typeof(Inline).IsAssignableFrom(type))
-            {
-                var converter = TypeDescriptor.GetConverter(type);
-                if ((converter != null) && (converter.CanConvertTo(typeof(UIElement))))
-                    return true;
-            }
-
-            return false;
-        }
-
-        private static bool HasImplicitTemplate(object item, Type type, DependencyObject container)
-        {
-            Debug.Assert(type != null);
-
-            var finder = GenericContentTemplateSelector.FindTemplateResource;
-
-            if (finder == null)
-            {
-                finder = GenericContentTemplateSelector.GetFindTemplateResourceInternal();
-
-                if (finder == null)
-                {
-                    finder = GenericContentTemplateSelector.FindTemplateResourceFallback;
-                }
-
-                GenericContentTemplateSelector.FindTemplateResource = finder;
-            }
-
-            Debug.Assert(finder != null);
-
-            return (finder.Invoke(container, item, type) != null);
-        }
-
-        private static Func<DependencyObject, object, Type, object> GetFindTemplateResourceInternal()
-        {
-            try
-            {
-                var methodInfo = typeof(FrameworkElement).GetMethod(
-                                   "FindTemplateResourceInternal",
-                                   BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static,
-                                   null,
-                                   CallingConventions.Any,
-                                   new Type[] { typeof(DependencyObject), typeof(object), typeof(Type) },
-                                   null);
-
-                if (methodInfo != null)
-                {
-                    var finder = (Func<DependencyObject, object, Type, object>)Delegate.CreateDelegate(typeof(Func<DependencyObject, object, Type, object>), methodInfo);
-
-                    return (container, item, type) => finder.Invoke(container, item, typeof(DataTemplate));
-                }
-            }
-            catch (AmbiguousMatchException)
-            {
-                // We swallow the exception and use a fallback method instead.
-            }
-            catch (MethodAccessException)
-            {
-                // We swallow the exception and use a fallback method instead.
-            }
-
-            return null;
-        }
-
-        private static object FindTemplateResourceFallback(DependencyObject container, object item, Type type)
-        {
-            var fe = container as FrameworkElement;
-            if (fe == null)
-                return null;
-
-            return fe.TryFindResource(new DataTemplateKey(type));
-        }
-
-        #region DefaultConverter Private Class
-
-        private sealed class DefaultConverter : IValueConverter
-        {
-            internal DefaultConverter(TypeConverter converter)
-            {
-                if (converter == null)
-                    throw new ArgumentNullException("converter");
-
-                m_converter = converter;
-            }
-
-            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-            {
-                object result;
-
-                if (DefaultConverter.TryConvertTo(value, targetType, culture, m_converter, out result))
-                    return result;
-
-                if (value != null)
-                {
-                    var valueType = value.GetType();
-
-                    if (DefaultConverter.TryConvertTo(value, targetType, culture, TypeDescriptor.GetConverter(valueType), out result))
-                        return result;
-
-                    if (targetType.IsAssignableFrom(valueType))
-                        return value;
-                }
-                else if (DefaultConverter.IsNullableType(targetType))
-                {
-                    return value;
-                }
-
-                throw new ArgumentException("Cannot convert to type " + targetType.FullName + ".", "value");
-            }
-
-            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            {
-                throw new NotSupportedException();
-            }
-
-            private static bool TryConvertTo(object value, Type targetType, CultureInfo culture, TypeConverter converter, out object result)
-            {
-                if (converter != null)
-                {
-                    try
-                    {
-                        result = converter.ConvertTo(null, culture, value, targetType);
-                        return true;
-                    }
-                    catch
-                    {
-                        // We'll try to convert the value another way.
-                    }
-
-                    if ((value != null) && (converter.CanConvertFrom(value.GetType())))
-                    {
-                        try
-                        {
-                            var newValue = converter.ConvertFrom(null, culture, value);
-                            result = converter.ConvertTo(null, culture, newValue, targetType);
-
-                            return true;
-                        }
-                        catch
-                        {
-                        }
-                    }
-                }
-
-                result = null;
-                return false;
-            }
-
-            private static bool IsNullableType(Type type)
-            {
-                return (!type.IsValueType)
-                    || (type.IsGenericType && (type.GetGenericTypeDefinition() == typeof(Nullable<>)));
-            }
-
-            private readonly TypeConverter m_converter;
-        }
-
-        #endregion
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GlobalSuppressions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GlobalSuppressions.cs
deleted file mode 100644
index caef2c8a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GlobalSuppressions.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.CodeAnalysis;
-
-[assembly: SuppressMessage(
-  "Microsoft.Performance",
-  "CA1823:AvoidUnusedPrivateFields",
-  Scope = "member",
-  Target = "_XceedVersionInfoCommon.Build" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Performance",
-  "CA1823:AvoidUnusedPrivateFields",
-  Scope = "member",
-  Target = "_XceedVersionInfo.CurrentAssemblyPackUri" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Design", 
-  "CA1020:AvoidNamespacesWithFewTypes", 
-  Scope = "namespace", 
-  Target = "XamlGeneratedNamespace" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Usage", 
-  "CA2209:AssembliesShouldDeclareMinimumSecurity" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Design",
-  "CA1020:AvoidNamespacesWithFewTypes",
-  Scope = "namespace",
-  Target = "Xceed.Wpf.DataGrid.ValidationRules" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Usage", 
-  "CA2233:OperationsShouldNotOverflow", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.DataGridCollectionView.System.Collections.ICollection.CopyTo(System.Array,System.Int32):System.Void", 
-  MessageId = "index+1" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Design", 
-  "CA1020:AvoidNamespacesWithFewTypes", 
-  Scope = "namespace", 
-  Target = "Xceed.Utils.Wpf.Markup" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Design", 
-  "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.DataGridControl.System.Windows.Documents.IDocumentPaginatorSource.DocumentPaginator" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Design",
-  "CA1043:UseIntegralOrStringArgumentForIndexers",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.CellCollection.Item[Xceed.Wpf.DataGrid.Column]" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA1801:ReviewUnusedParameters",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DataGridCollectionView..ctor(System.Type)", MessageId = "itemType" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Performance",
-  "CA1805:DoNotInitializeUnnecessarily",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DetailConfiguration..ctor(Xceed.Wpf.DataGrid.DataGridContext)" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Performance",
-  "CA1800:DoNotCastUnnecessarily",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.GroupByControl.Xceed.Utils.Wpf.DragDrop.IDropTarget.CanDropElement(System.Windows.UIElement):System.Boolean" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Performance",
-  "CA1800:DoNotCastUnnecessarily",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.GroupByItem.Xceed.Utils.Wpf.DragDrop.IDropTarget.CanDropElement(System.Windows.UIElement):System.Boolean" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Design",
-  "CA1011:ConsiderPassingBaseTypesAsParameters",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.Views.Theme.IsViewSupported(System.Type,System.Type):System.Boolean" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Design", 
-  "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.GroupLevelIndicatorPane.System.Windows.IWeakEventListener.ReceiveWeakEvent(System.Type,System.Object,System.EventArgs):System.Boolean" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Design", 
-  "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.HierarchicalGroupLevelIndicatorPane.System.Windows.IWeakEventListener.ReceiveWeakEvent(System.Type,System.Object,System.EventArgs):System.Boolean" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Usage", 
-  "CA1801:ReviewUnusedParameters", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.DetailConfiguration.AddDefaultHeadersFooters(System.Collections.ObjectModel.ObservableCollection`1<System.Windows.DataTemplate>,System.Collections.ObjectModel.ObservableCollection`1<System.Windows.DataTemplate>):System.Void", MessageId = "footersCollection" )]
-
-#region CA2214:DoNotCallOverridableMethodsInConstructors
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.Cell..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.CellEditor..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.Column..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.Column..ctor(System.String,System.Object,System.Windows.Data.BindingBase)" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.ColumnManagerCell..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.ColumnManagerRow..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DataCell..ctor(System.String,System.Object)" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DataGridControl..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DropMarkAdorner..ctor(System.Windows.UIElement,System.Windows.Media.Pen,Xceed.Wpf.DataGrid.DropMarkOrientation)" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.Views.SynchronizedScrollViewer..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.Views.ViewBase..ctor()" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Usage", 
-  "CA2214:DoNotCallOverridableMethodsInConstructors", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.GroupHeaderControl..ctor(Xceed.Wpf.DataGrid.Group)" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Usage", 
-  "CA2214:DoNotCallOverridableMethodsInConstructors", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.Views.FixedCellPanel..ctor()" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Usage", 
-  "CA2214:DoNotCallOverridableMethodsInConstructors", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.Views.ScrollingCellsDecorator..ctor(Xceed.Wpf.DataGrid.Views.FixedCellPanel)" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Usage", 
-  "CA2214:DoNotCallOverridableMethodsInConstructors", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.Views.DataGridScrollViewer..ctor()" )]
-
-[assembly: SuppressMessage( 
-  "Microsoft.Usage", 
-  "CA2214:DoNotCallOverridableMethodsInConstructors", 
-  Scope = "member", 
-  Target = "Xceed.Wpf.DataGrid.GroupConfiguration..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DataGridContext..ctor(Xceed.Wpf.DataGrid.DataGridContext,Xceed.Wpf.DataGrid.DataGridControl,System.Object,System.Windows.Data.CollectionView,Xceed.Wpf.DataGrid.DetailConfiguration)" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DetailConfiguration..ctor(System.Boolean)" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DetailConfiguration..ctor(Xceed.Wpf.DataGrid.DataGridContext)" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.SaveRestoreStateVisitor..ctor()" )]
-
-[assembly: SuppressMessage(
-  "Microsoft.Usage",
-  "CA2214:DoNotCallOverridableMethodsInConstructors",
-  Scope = "member",
-  Target = "Xceed.Wpf.DataGrid.DefaultDetailConfiguration..ctor()" )]
-
-#endregion CA2214:DoNotCallOverridableMethodsInConstructors
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs
deleted file mode 100644
index 520278e3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs
+++ /dev/null
@@ -1,717 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public sealed class Group : IGroupLevelDescription, INotifyPropertyChanged, IWeakEventListener
-  {
-    #region Static Fields
-
-    internal static readonly string IsExpandedPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.IsExpanded );
-    internal static readonly string ItemCountPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ItemCount );
-    internal static readonly string GroupByPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.GroupBy );
-    internal static readonly string TitlePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.Title );
-    internal static readonly string TitleTemplatePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.TitleTemplate );
-    internal static readonly string TitleTemplateSelectorPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.TitleTemplateSelector );
-    internal static readonly string ValueTemplatePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueTemplate );
-    internal static readonly string ValueTemplateSelectorPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueTemplateSelector );
-    internal static readonly string ValueStringFormatPropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueStringFormat );
-    internal static readonly string ValueStringFormatCulturePropertyName = PropertyHelper.GetPropertyName( ( Group g ) => g.ValueStringFormatCulture );
-
-    #endregion
-
-    internal Group(
-      GroupGeneratorNode node,
-      CollectionViewGroup group,
-      LateGroupLevelDescription groupLevelDescription,
-      DataGridContext dataGridContext )
-    {
-      if( node == null )
-        throw new ArgumentNullException( "node" );
-
-      if( group == null )
-        throw new ArgumentNullException( "group" );
-
-      if( groupLevelDescription == null )
-        throw new ArgumentNullException( "groupLevelDescription" );
-
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      m_collectionViewGroup = group;
-
-      // Initialization is done through setters to register for events.
-      this.DataGridContext = dataGridContext;
-      this.GeneratorNode = node;
-      this.GroupLevelDescription = groupLevelDescription;
-    }
-
-    #region IsExpanded Property
-
-    public bool IsExpanded
-    {
-      get
-      {
-        if( m_generatorNode != null )
-          return m_generatorNode.IsExpanded;
-
-        return false;
-      }
-      set
-      {
-        if( m_generatorNode == null )
-          return;
-
-        m_generatorNode.IsExpanded = value;
-      }
-    }
-
-    internal bool IsComputedExpanded
-    {
-      get
-      {
-        if( m_generatorNode != null )
-          return m_generatorNode.IsComputedExpanded;
-
-        return false;
-      }
-    }
-
-    #endregion
-
-    #region Level Property
-
-    public int Level
-    {
-      get
-      {
-        if( m_generatorNode != null )
-          return m_generatorNode.Level;
-
-        return -1;
-      }
-    }
-
-    #endregion
-
-    #region ItemCount Property
-
-    public int ItemCount
-    {
-      get
-      {
-        if( m_generatorNode != null )
-          return m_generatorNode.TotalLeafCount;
-
-        return 0;
-      }
-    }
-
-    #endregion
-
-    #region ParentGroups Property
-
-    public ReadOnlyCollection<Group> ParentGroups
-    {
-      get
-      {
-        if( m_generatorNode == null )
-          return ( new List<Group>( 0 ) ).AsReadOnly();
-
-        var list = new List<Group>();
-        var nodeHelper = new GeneratorNodeHelper( m_generatorNode, 0, 0 ); //index is not important
-
-        while( nodeHelper.MoveToParent() )
-        {
-          GroupGeneratorNode parentGroup = nodeHelper.CurrentNode as GroupGeneratorNode;
-          if( parentGroup == null )
-            break;
-
-          list.Insert( 0, parentGroup.UIGroup );
-        }
-
-        return list.AsReadOnly();
-      }
-    }
-
-    #endregion
-
-    #region SiblingGroups Property
-
-    public ReadOnlyCollection<Group> SiblingGroups
-    {
-      get
-      {
-        if( m_generatorNode == null )
-          return null;
-
-        var headersFootersGeneratorNode = HeadersFootersGeneratorNode.GetSameLevelFirstHeaderNode( m_generatorNode );
-        if( headersFootersGeneratorNode == null )
-          return null;
-
-        var currentGeneratorContentGeneration = this.DataGridContext.CustomItemContainerGenerator.CurrentGeneratorContentGeneration;
-        return headersFootersGeneratorNode.GetImmediateUIGroups( currentGeneratorContentGeneration );
-      }
-    }
-
-    #endregion
-
-    #region Value Property
-
-    public object Value
-    {
-      get
-      {
-        if( m_collectionViewGroup != null )
-          return m_collectionViewGroup.Name;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region ValueStringFormat Property
-
-    public string ValueStringFormat
-    {
-      get
-      {
-        var description = this.GroupLevelDescription;
-        if( description != null )
-          return description.ValueStringFormat;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region ValueStringFormatCulture Property
-
-    public CultureInfo ValueStringFormatCulture
-    {
-      get
-      {
-        var description = this.GroupLevelDescription;
-        if( description != null )
-          return description.ValueStringFormatCulture;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region ValueTemplate Property
-
-    public DataTemplate ValueTemplate
-    {
-      get
-      {
-        var description = this.GroupLevelDescription;
-        if( description != null )
-          return description.ValueTemplate;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region ValueTemplateSelector Property
-
-    public DataTemplateSelector ValueTemplateSelector
-    {
-      get
-      {
-        var description = this.GroupLevelDescription;
-        if( description != null )
-          return description.ValueTemplateSelector;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region IsBottomLevel Property
-
-    public bool IsBottomLevel
-    {
-      get
-      {
-        if( m_collectionViewGroup != null )
-          return m_collectionViewGroup.IsBottomLevel;
-
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region Items Property [Obsoleted]
-
-    [Obsolete( "The Items property is obsolete and has been replaced by the GroupExtensions.GetItems extensibility method.", false )]
-    public ReadOnlyObservableCollection<object> Items
-    {
-      get
-      {
-        IList<object> items = this.GetItems();
-
-        if( items is ReadOnlyObservableCollection<object> )
-          return ( ReadOnlyObservableCollection<object> )items;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region Title Property
-
-    public object Title
-    {
-      get
-      {
-        var description = this.GroupLevelDescription;
-        if( description != null )
-          return description.Title;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region TitleTemplate Property
-
-    public DataTemplate TitleTemplate
-    {
-      get
-      {
-        var description = this.GroupLevelDescription;
-        if( description != null )
-          return description.TitleTemplate;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region TitleTemplateSelector Property
-
-    public DataTemplateSelector TitleTemplateSelector
-    {
-      get
-      {
-        var description = this.GroupLevelDescription;
-        if( description != null )
-          return description.TitleTemplateSelector;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region StatContext Property
-
-    public object StatContext
-    {
-      get
-      {
-        return m_collectionViewGroup as DataGridCollectionViewGroup;
-      }
-    }
-
-    #endregion
-
-    #region GroupConfiguration Property
-
-    public GroupConfiguration GroupConfiguration
-    {
-      get
-      {
-        if( m_generatorNode != null )
-          return m_generatorNode.GroupConfiguration;
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region GeneratorNode Internal Property
-
-    internal GroupGeneratorNode GeneratorNode
-    {
-      get
-      {
-        return m_generatorNode;
-      }
-      private set
-      {
-        if( value == m_generatorNode )
-          return;
-
-        if( m_generatorNode != null )
-        {
-          this.UnregisterItemCountEvent( m_generatorNode );
-          this.UnregisterIsExpandedEvent( m_generatorNode );
-        }
-
-        m_generatorNode = value;
-
-        if( m_generatorNode != null )
-        {
-          this.RegisterItemCountEvent( m_generatorNode, false );
-          this.RegisterIsExpandedEvent( m_generatorNode, false );
-        }
-      }
-    }
-
-    private GroupGeneratorNode m_generatorNode; // = null
-
-    #endregion
-
-    #region GroupBy Internal Property
-
-    internal string GroupBy
-    {
-      get
-      {
-        var description = this.GroupLevelDescription;
-        if( description != null )
-          return description.FieldName;
-
-        return string.Empty;
-      }
-    }
-
-    #endregion
-
-    #region DataGridContext Internal Property
-
-    internal DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-      private set
-      {
-        m_dataGridContext = value;
-      }
-    }
-
-    private DataGridContext m_dataGridContext;
-
-    #endregion
-
-    #region CollectionViewGroup Internal Property
-
-    internal CollectionViewGroup CollectionViewGroup
-    {
-      get
-      {
-        return m_collectionViewGroup;
-      }
-    }
-
-    private CollectionViewGroup m_collectionViewGroup;
-
-    #endregion
-
-    #region GroupDescription Private Property
-
-    private GroupDescription GroupDescription
-    {
-      get
-      {
-        return m_groupDescription;
-      }
-    }
-
-    private GroupDescription m_groupDescription;
-
-    #endregion
-
-    #region GroupLevelDescription Private Property
-
-    private LateGroupLevelDescription GroupLevelDescription
-    {
-      get
-      {
-        return m_groupLevelDescription;
-      }
-      set
-      {
-        if( value == m_groupLevelDescription )
-          return;
-
-        if( m_groupLevelDescription != null )
-        {
-          this.UnregisterGroupLevelDescriptionEvent( m_groupLevelDescription );
-        }
-
-        m_groupLevelDescription = value;
-
-        if( m_groupLevelDescription != null )
-        {
-          this.RegisterGroupLevelDescriptionEvent( m_groupLevelDescription, false );
-        }
-
-        this.OnGroupLevelDescriptionPropertyChanged();
-      }
-    }
-
-    private LateGroupLevelDescription m_groupLevelDescription;
-
-    #endregion
-
-    #region SyncRoot Private Property
-
-    private object SyncRoot
-    {
-      get
-      {
-        if( m_syncRoot == null )
-        {
-          Interlocked.CompareExchange( ref m_syncRoot, new object(), null );
-        }
-
-        return m_syncRoot;
-      }
-    }
-
-    private object m_syncRoot;
-
-    #endregion
-
-    #region ItemCount Event Handling
-
-    private void RegisterItemCountEvent( GroupGeneratorNode item, bool force )
-    {
-      if( item == null )
-        return;
-
-      lock( this.SyncRoot )
-      {
-        if( !force && ( m_propertyChanged == null ) )
-          return;
-
-        item.TotalLeafCountChanged += new EventHandler( this.OnItemCountChanged );
-      }
-    }
-
-    private void UnregisterItemCountEvent( GroupGeneratorNode item )
-    {
-      if( item == null )
-        return;
-
-      item.TotalLeafCountChanged -= new EventHandler( this.OnItemCountChanged );
-    }
-
-    private void OnItemCountChanged( object sender, EventArgs e )
-    {
-      this.OnPropertyChanged( Group.ItemCountPropertyName );
-    }
-
-    #endregion
-
-    #region IsExpanded Event Handling
-
-    private void RegisterIsExpandedEvent( GroupGeneratorNode item, bool force )
-    {
-      if( item == null )
-        return;
-
-      lock( this.SyncRoot )
-      {
-        if( !force && ( m_propertyChanged == null ) )
-          return;
-
-        item.IsExpandedChanged += new EventHandler( this.OnIsExpandedChanged );
-      }
-    }
-
-    private void UnregisterIsExpandedEvent( GroupGeneratorNode item )
-    {
-      if( item == null )
-        return;
-
-      item.IsExpandedChanged -= new EventHandler( this.OnIsExpandedChanged );
-    }
-
-    private void OnIsExpandedChanged( object sender, EventArgs e )
-    {
-      this.OnPropertyChanged( Group.IsExpandedPropertyName );
-    }
-
-    #endregion
-
-    #region GroupLevelDescription Event Handling
-
-    private void RegisterGroupLevelDescriptionEvent( LateGroupLevelDescription item, bool force )
-    {
-      if( item == null )
-        return;
-
-      lock( this.SyncRoot )
-      {
-        if( !force && ( m_propertyChanged == null ) )
-          return;
-
-        item.PropertyChanged += new PropertyChangedEventHandler( this.OnGroupLevelDescriptionChanged );
-      }
-    }
-
-    private void UnregisterGroupLevelDescriptionEvent( LateGroupLevelDescription item )
-    {
-      if( item == null )
-        return;
-
-      item.PropertyChanged -= new PropertyChangedEventHandler( this.OnGroupLevelDescriptionChanged );
-    }
-
-    private void OnGroupLevelDescriptionChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( string.IsNullOrEmpty( e.PropertyName ) )
-      {
-        this.OnGroupLevelDescriptionPropertyChanged();
-      }
-      else
-      {
-        // Simply relay this property changed to this Group instance.
-        this.OnPropertyChanged( e.PropertyName );
-      }
-    }
-
-    private void OnGroupLevelDescriptionPropertyChanged()
-    {
-      this.OnPropertyChanged( Group.GroupByPropertyName );
-      this.OnPropertyChanged( Group.TitlePropertyName );
-      this.OnPropertyChanged( Group.TitleTemplatePropertyName );
-      this.OnPropertyChanged( Group.TitleTemplateSelectorPropertyName );
-      this.OnPropertyChanged( Group.ValueTemplatePropertyName );
-      this.OnPropertyChanged( Group.ValueTemplateSelectorPropertyName );
-      this.OnPropertyChanged( Group.ValueStringFormatPropertyName );
-      this.OnPropertyChanged( Group.ValueStringFormatCulturePropertyName );
-    }
-
-    #endregion
-
-    internal void ClearGroup()
-    {
-      m_groupDescription = null;
-      m_collectionViewGroup = null;
-      m_propertyChanged = null;
-
-      this.DataGridContext = null;
-      this.GeneratorNode = null;
-      this.GroupLevelDescription = null;
-    }
-
-    #region IGroupLevelDescription Members
-
-    string IGroupLevelDescription.FieldName
-    {
-      get
-      {
-        return this.GroupBy;
-      }
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged
-    {
-      add
-      {
-        lock( this.SyncRoot )
-        {
-          if( m_propertyChanged == null )
-          {
-            this.RegisterItemCountEvent( this.GeneratorNode, true );
-            this.RegisterIsExpandedEvent( this.GeneratorNode, true );
-            this.RegisterGroupLevelDescriptionEvent( this.GroupLevelDescription, true );
-          }
-
-          m_propertyChanged += value;
-        }
-      }
-      remove
-      {
-        lock( this.SyncRoot )
-        {
-          m_propertyChanged -= value;
-
-          if( m_propertyChanged == null )
-          {
-            this.UnregisterItemCountEvent( this.GeneratorNode );
-            this.UnregisterIsExpandedEvent( this.GeneratorNode );
-            this.UnregisterGroupLevelDescriptionEvent( this.GroupLevelDescription );
-          }
-        }
-      }
-    }
-
-    private PropertyChangedEventHandler m_propertyChanged;
-
-    private void OnPropertyChanged( string propertyName )
-    {
-      var handler = m_propertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    private bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return false;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs
deleted file mode 100644
index b6f28807..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs
+++ /dev/null
@@ -1,428 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Media;
-using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class GroupByControl : ItemsControl, IDropTarget
-  {
-    static GroupByControl()
-    {
-      // This DefaultStyleKey will only be used in design-time.
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( GroupByControl ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( GroupByControl ) ) ) );
-
-      FrameworkElementFactory staircaseFactory = new FrameworkElementFactory( typeof( StaircasePanel ) );
-      ItemsPanelTemplate itemsPanelTemplate = new ItemsPanelTemplate( staircaseFactory );
-      RelativeSource ancestorSource = new RelativeSource( RelativeSourceMode.FindAncestor, typeof( GroupByControl ), 1 );
-
-      Binding binding = new Binding();
-      binding.Path = new PropertyPath( GroupByControl.ConnectionLineAlignmentProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLineAlignmentProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( GroupByControl.ConnectionLineOffsetProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLineOffsetProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( GroupByControl.ConnectionLinePenProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLinePenProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( GroupByControl.StairHeightProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.StairHeightProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( GroupByControl.StairSpacingProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.StairSpacingProperty, binding );
-
-      itemsPanelTemplate.Seal();
-
-      ItemsControl.ItemsPanelProperty.OverrideMetadata( typeof( GroupByControl ), new FrameworkPropertyMetadata( itemsPanelTemplate ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( GroupByControl ), new FrameworkPropertyMetadata( new PropertyChangedCallback( GroupByControl.ParentGridControlChangedCallback ) ) );
-      DataGridControl.DataGridContextPropertyKey.OverrideMetadata( typeof( GroupByControl ), new FrameworkPropertyMetadata( new PropertyChangedCallback( GroupByControl.DataGridContextChangedCallback ) ) );
-
-      FocusableProperty.OverrideMetadata( typeof( GroupByControl ), new FrameworkPropertyMetadata( false ) );
-    }
-
-    #region AllowGroupingModification Property
-
-    public static readonly DependencyProperty AllowGroupingModificationProperty =
-        DependencyProperty.Register( "AllowGroupingModification", typeof( bool ), typeof( GroupByControl ), new UIPropertyMetadata( true ) );
-
-    public bool AllowGroupingModification
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupByControl.AllowGroupingModificationProperty );
-      }
-      set
-      {
-        this.SetValue( GroupByControl.AllowGroupingModificationProperty, value );
-      }
-    }
-
-    #endregion AllowGroupingModification Property
-
-    #region AllowSort Property
-
-    public static readonly DependencyProperty AllowSortProperty =
-        ColumnManagerRow.AllowSortProperty.AddOwner( typeof( GroupByControl ), new UIPropertyMetadata( true ) );
-
-    public bool AllowSort
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupByControl.AllowSortProperty );
-      }
-      set
-      {
-        this.SetValue( GroupByControl.AllowSortProperty, value );
-      }
-    }
-
-    #endregion AllowSort Property
-
-    #region ConnectionLineAlignment Property
-
-    public static readonly DependencyProperty ConnectionLineAlignmentProperty =
-      StaircasePanel.ConnectionLineAlignmentProperty.AddOwner( typeof( GroupByControl ) );
-
-    public ConnectionLineAlignment ConnectionLineAlignment
-    {
-      get
-      {
-        return ( ConnectionLineAlignment )this.GetValue( GroupByControl.ConnectionLineAlignmentProperty );
-      }
-      set
-      {
-        this.SetValue( GroupByControl.ConnectionLineAlignmentProperty, value );
-      }
-    }
-
-    #endregion ConnectionLineAlignment Property
-
-    #region ConnectionLineOffset Property
-
-    public static readonly DependencyProperty ConnectionLineOffsetProperty =
-      StaircasePanel.ConnectionLineOffsetProperty.AddOwner( typeof( GroupByControl ) );
-
-    public double ConnectionLineOffset
-    {
-      get
-      {
-        return ( double )this.GetValue( GroupByControl.ConnectionLineOffsetProperty );
-      }
-      set
-      {
-        this.SetValue( GroupByControl.ConnectionLineOffsetProperty, value );
-      }
-    }
-
-    #endregion ConnectionLineOffset Property
-
-    #region ConnectionLinePen Property
-
-    public static readonly DependencyProperty ConnectionLinePenProperty =
-      StaircasePanel.ConnectionLinePenProperty.AddOwner( typeof( GroupByControl ) );
-
-    public Pen ConnectionLinePen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( GroupByControl.ConnectionLinePenProperty );
-      }
-      set
-      {
-        this.SetValue( GroupByControl.ConnectionLinePenProperty, value );
-      }
-    }
-
-    #endregion ConnectionLinePen Property
-
-    #region StairHeight Property
-
-    public static readonly DependencyProperty StairHeightProperty =
-      StaircasePanel.StairHeightProperty.AddOwner( typeof( GroupByControl ) );
-
-    public double StairHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( GroupByControl.StairHeightProperty );
-      }
-      set
-      {
-        this.SetValue( GroupByControl.StairHeightProperty, value );
-      }
-    }
-
-    #endregion StairHeight Property
-
-    #region StairSpacing Property
-
-    public static readonly DependencyProperty StairSpacingProperty =
-      StaircasePanel.StairSpacingProperty.AddOwner( typeof( GroupByControl ) );
-
-    public double StairSpacing
-    {
-      get
-      {
-        return ( double )this.GetValue( GroupByControl.StairSpacingProperty );
-      }
-      set
-      {
-        this.SetValue( GroupByControl.StairSpacingProperty, value );
-      }
-    }
-
-    #endregion StairSpacing Property
-
-    #region NoGroupContent Property
-
-    public static readonly DependencyProperty NoGroupContentProperty =
-      DependencyProperty.Register(
-        "NoGroupContent",
-        typeof( object ),
-        typeof( GroupByControl ),
-        new PropertyMetadata( "Drag a column header here to group by that column." ) );
-
-    public object NoGroupContent
-    {
-      get
-      {
-        return this.GetValue( GroupByControl.NoGroupContentProperty );
-      }
-      set
-      {
-        this.SetValue( GroupByControl.NoGroupContentProperty, value );
-      }
-    }
-
-    #endregion NoGroupContent Property
-
-    protected override DependencyObject GetContainerForItemOverride()
-    {
-      return new GroupByItem();
-    }
-
-    protected override bool IsItemItsOwnContainerOverride( object item )
-    {
-      return ( item is GroupByItem );
-    }
-
-    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl grid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      base.PrepareContainerForItemOverride( element, item );
-
-      if( grid != null )
-      {
-        GroupByItem groupByItem = ( GroupByItem )element;
-        groupByItem.PrepareDefaultStyleKey( grid.GetView() );
-      }
-    }
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( GroupByControl ) );
-    }
-
-    internal bool IsGroupingModificationAllowed
-    {
-      get
-      {
-        bool allowGroupingModification = this.AllowGroupingModification;
-
-        if( allowGroupingModification )
-        {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          if( dataGridContext == null )
-          {
-            allowGroupingModification = false;
-          }
-          else
-          {
-            allowGroupingModification = dataGridContext.Items.CanGroup;
-          }
-        }
-
-        return allowGroupingModification;
-      }
-    }
-
-    private void RegisterParentDataGridContext( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-      {
-        this.ItemsSource = null;
-      }
-      else
-      {
-        this.ItemsSource = dataGridContext.GroupLevelDescriptions;
-      }
-    }
-
-    private static void ParentGridControlChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridControl grid = e.NewValue as DataGridControl;
-      GroupByControl panel = ( GroupByControl )sender;
-
-      if( grid != null )
-        panel.PrepareDefaultStyleKey( grid.GetView() );
-    }
-
-    private static void DataGridContextChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridContext dataGridContext = e.NewValue as DataGridContext;
-      GroupByControl panel = ( GroupByControl )sender;
-
-      if( dataGridContext != null )
-        panel.RegisterParentDataGridContext( dataGridContext );
-    }
-
-    #region IDropTarget Members
-
-    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var isAlreadyGroupedBy = false;
-      var cell = draggedElement as ColumnManagerCell;
-
-      if( cell != null )
-      {
-        isAlreadyGroupedBy = GroupingHelper.IsAlreadyGroupedBy( cell );
-
-        var parentColumn = cell.ParentColumn;
-        if( ( parentColumn == null ) || ( !parentColumn.AllowGroup ) )
-          return false;
-      }
-
-      var sourceDetailContext = DataGridControl.GetDataGridContext( this );
-      Debug.Assert( sourceDetailContext != null );
-      var sourceDetailConfig = ( sourceDetailContext != null ) ? sourceDetailContext.SourceDetailConfiguration : null;
-
-      var draggedElementContext = DataGridControl.GetDataGridContext( draggedElement );
-      Debug.Assert( draggedElementContext != null );
-      var draggedDetailConfig = ( draggedElementContext != null ) ? draggedElementContext.SourceDetailConfiguration : null;
-
-
-      var canDrop = ( sourceDetailConfig == draggedDetailConfig ) &&
-                    ( sourceDetailContext != null ) &&
-                    ( draggedElementContext != null ) &&
-                    ( sourceDetailContext.GroupLevelDescriptions == draggedElementContext.GroupLevelDescriptions ) &&
-                    ( this.IsGroupingModificationAllowed ) &&
-                    ( ( draggedElement is ColumnManagerCell ) || ( draggedElement is GroupByItem ) ) &&
-                    ( !isAlreadyGroupedBy );
-
-      if( canDrop && ( cell != null ) )
-      {
-        canDrop = GroupingHelper.ValidateMaxGroupDescriptions( draggedElementContext );
-      }
-
-      return canDrop;
-    }
-
-    void IDropTarget.DragEnter( UIElement draggedElement )
-    {
-    }
-
-    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var cell = draggedElement as ColumnManagerCell;
-      if( cell == null )
-        return;
-
-      var draggedElementContext = DataGridControl.GetDataGridContext( draggedElement );
-      var lastIndex = draggedElementContext.GroupLevelDescriptions.Count - 1;
-      if( lastIndex < 0 )
-        return;
-
-      var groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
-      if( groupByItem == null )
-        throw new DataGridInternalException( "groupByItem is null." );
-
-      groupByItem.ShowDropMark( mousePosition );
-    }
-
-    void IDropTarget.DragLeave( UIElement draggedElement )
-    {
-      var cell = draggedElement as ColumnManagerCell;
-      if( cell == null )
-        return;
-
-      var draggedElementContext = DataGridControl.GetDataGridContext( draggedElement );
-      var lastIndex = draggedElementContext.GroupLevelDescriptions.Count - 1;
-      if( lastIndex < 0 )
-        return;
-
-      var groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
-      if( groupByItem == null )
-        throw new DataGridInternalException( "groupByItem is null." );
-
-      groupByItem.HideDropMark();
-    }
-
-    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var cell = draggedElement as ColumnManagerCell;
-      if( cell == null )
-        return;
-
-      var draggedElementContext = DataGridControl.GetDataGridContext( draggedElement );
-      var lastIndex = draggedElementContext.GroupLevelDescriptions.Count - 1;
-
-      if( lastIndex >= 0 )
-      {
-        var groupByItem = this.ItemContainerGenerator.ContainerFromIndex( lastIndex ) as GroupByItem;
-        if( groupByItem == null )
-          throw new DataGridInternalException( "groupByItem is null." );
-
-        groupByItem.HideDropMark();
-      }
-
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
-
-      GroupingHelper.AppendNewGroupFromColumnManagerCell( cell, dataGridControl );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs
deleted file mode 100644
index 6bb2ba89..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs
+++ /dev/null
@@ -1,547 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.ComponentModel;
-using System.Windows.Input;
-using System.Windows.Data;
-using System.Collections.ObjectModel;
-using System.Windows.Controls.Primitives;
-using System.Windows.Resources;
-using System.Security;
-using Xceed.Wpf.DataGrid.Views;
-
-using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class GroupByItem : ButtonBase, IDropTarget, INotifyPropertyChanged
-  {
-    #region PUBLIC CONSTRUCTORS
-
-    static GroupByItem()
-    {
-      // This DefaultStyleKey will only be used in design-time.
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( GroupByItem ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( GroupByItem ) ) ) );
-
-      GroupByItem.IsBeingDraggedProperty = GroupByItem.IsBeingDraggedPropertyKey.DependencyProperty;
-
-      FocusableProperty.OverrideMetadata( typeof( GroupByItem ), new FrameworkPropertyMetadata( false ) );
-    }
-
-    #endregion
-
-    #region SortDirection Property
-
-    // Only used to bind between Column and us, but we don't want to expose it publicly
-    private static readonly DependencyProperty SortDirectionInternalProperty =
-        DependencyProperty.Register( "SortDirectionInternal", typeof( SortDirection ), typeof( GroupByItem ), new PropertyMetadata( SortDirection.None, new PropertyChangedCallback( GroupByItem.OnSortDirectionInternalChanged ) ) );
-
-    public SortDirection SortDirection
-    {
-      get
-      {
-        return ( SortDirection )this.GetValue( GroupByItem.SortDirectionInternalProperty );
-      }
-    }
-
-    private static void OnSortDirectionInternalChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      GroupByItem groupByItem = ( GroupByItem )sender;
-      groupByItem.OnPropertyChanged( new PropertyChangedEventArgs( "SortDirection" ) );
-    }
-
-    #endregion SortDirection Property
-
-    #region IsBeingDragged Read-Only Property
-
-    private static readonly DependencyPropertyKey IsBeingDraggedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsBeingDragged", typeof( bool ), typeof( GroupByItem ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsBeingDraggedProperty;
-
-    public bool IsBeingDragged
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupByItem.IsBeingDraggedProperty );
-      }
-    }
-
-    private void SetIsBeingDragged( bool value )
-    {
-      this.SetValue( GroupByItem.IsBeingDraggedPropertyKey, value );
-    }
-
-    #endregion IsBeingDragged Read-Only Property
-
-    #region PUBLIC METHODS
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      this.InitSortDirection();
-      this.SetupDragManager();
-    }
-
-    #endregion
-
-    #region PROTECTED METHODS
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( GroupByItem ) );
-    }
-
-    #endregion
-
-    #region PRIVATE METHODS
-
-    private void InitSortDirection()
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return;
-
-      var groupInfo = this.Content as GroupLevelDescription;
-      if( groupInfo == null )
-        return;
-
-      var column = dataGridContext.Columns[ groupInfo.FieldName ];
-      if( column == null )
-        return;
-
-      var sortBinding = new Binding();
-      sortBinding.Path = new PropertyPath( ColumnBase.SortDirectionProperty );
-      sortBinding.Mode = BindingMode.OneWay;
-      sortBinding.NotifyOnSourceUpdated = true;
-      sortBinding.Source = column;
-      sortBinding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-
-      BindingOperations.SetBinding( this, GroupByItem.SortDirectionInternalProperty, sortBinding );
-    }
-
-    private GroupByControl GetParentGroupByControl()
-    {
-      DependencyObject parent = TreeHelper.GetParent( this );
-
-      while( parent != null )
-      {
-        if( parent is GroupByControl )
-          break;
-
-        parent = TreeHelper.GetParent( parent );
-      }
-
-      return parent as GroupByControl;
-    }
-
-    #endregion
-
-    #region Drag & Drop Manager
-
-    private void SetupDragManager()
-    {
-      // We do not support DragDrop when there are no AdornerLayer because there wouldn't 
-      // be any visual feedback for the operation.
-      if( AdornerLayer.GetAdornerLayer( this ) == null )
-        return;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl dataGridControl = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      // Can be null in design-time (edition of a style TargetType GroupByItem).
-      if( dataGridControl == null )
-        return;
-
-      Debug.Assert( m_dragSourceManager == null, "There might be problems when there is already a m_dragSourceManager." );
-
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.PropertyChanged -= new PropertyChangedEventHandler( m_dragSourceManager_PropertyChanged );
-        m_dragSourceManager.DragOutsideQueryCursor -= new QueryCursorEventHandler( m_dragSourceManager_DragOutsideQueryCursor );
-        m_dragSourceManager.DroppedOutside -= new EventHandler( m_dragSourceManager_DroppedOutside );
-      }
-
-      // The DataGridControl's AdornerDecoratorForDragAndDrop must be used for dragging in order to include the 
-      // RenderTransform the DataGridControl may performs. This AdornerDecorator is defined in the ControlTemplate
-      // as PART_DragDropAdornerDecorator
-      if( ( dataGridControl.DragDropAdornerDecorator != null )
-          && ( dataGridControl.DragDropAdornerDecorator.AdornerLayer != null ) )
-      {
-        m_dragSourceManager = new DragSourceManager( this, dataGridControl.DragDropAdornerDecorator.AdornerLayer, dataGridControl );
-      }
-      else
-      {
-        System.Diagnostics.Debug.Assert( false, "The drag and drop functionnality won't be fully working properly: PART_DragDropAdornerDecorator was not found" );
-        m_dragSourceManager = new DragSourceManager( this, null, dataGridControl );
-      }
-
-      m_dragSourceManager.PropertyChanged += new PropertyChangedEventHandler( m_dragSourceManager_PropertyChanged );
-      m_dragSourceManager.DragOutsideQueryCursor += new QueryCursorEventHandler( m_dragSourceManager_DragOutsideQueryCursor );
-      m_dragSourceManager.DroppedOutside += new EventHandler( m_dragSourceManager_DroppedOutside );
-    }
-
-    void m_dragSourceManager_DroppedOutside( object sender, EventArgs e )
-    {
-      bool allowGroupingModification = true;
-      GroupByControl parentGBC = this.GetParentGroupByControl();
-
-      if( parentGBC != null )
-        allowGroupingModification = parentGBC.IsGroupingModificationAllowed;
-
-      if( allowGroupingModification )
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-        Debug.Assert( dataGridContext != null );
-
-        if( dataGridContext != null )
-        {
-          GroupingHelper.RemoveGroupDescription(
-            dataGridContext.Items.GroupDescriptions,
-            this.Content as GroupLevelDescription,
-            dataGridContext.DataGridControl );
-        }
-      }
-    }
-
-    void m_dragSourceManager_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName == "IsDragging" )
-      {
-        this.SetIsBeingDragged( m_dragSourceManager.IsDragging );
-      }
-    }
-
-    private void m_dragSourceManager_DragOutsideQueryCursor( object sender, QueryCursorEventArgs e )
-    {
-      GroupByControl parentGBC = this.GetParentGroupByControl();
-
-      if( ( parentGBC == null ) || !parentGBC.IsGroupingModificationAllowed )
-        return;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( ( dataGridContext != null ) && ( dataGridContext.DataGridControl != null ) )
-      {
-        UIViewBase uiViewBase = dataGridContext.DataGridControl.GetView() as UIViewBase;
-
-        e.Cursor = ( uiViewBase != null )
-          ? uiViewBase.RemovingGroupCursor
-          : UIViewBase.DefaultGroupDraggedOutsideCursor;
-      }
-      else
-      {
-        e.Cursor = UIViewBase.DefaultGroupDraggedOutsideCursor;
-      }
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( this.CaptureMouse() )
-      {
-        if( m_dragSourceManager != null )
-        {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          if( dataGridContext != null )
-          {
-            // Update the DropOutsideCursor since it is defined on the View
-            UIViewBase uiViewBase = dataGridContext.DataGridControl.GetView() as UIViewBase;
-
-            m_dragSourceManager.DropOutsideCursor = ( uiViewBase != null )
-             ? uiViewBase.RemovingGroupCursor
-             : UIViewBase.DefaultGroupDraggedOutsideCursor;
-          }
-
-          m_dragSourceManager.DragStart( e );
-        }
-
-        e.Handled = true;
-      }
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      if( ( this.IsMouseCaptured ) && ( e.LeftButton == MouseButtonState.Pressed ) )
-      {
-        if( m_dragSourceManager != null )
-        {
-          m_dragSourceManager.DragMove( e );
-        }
-      }
-
-      base.OnMouseMove( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      bool isMouseCaptured = this.IsMouseCaptured;
-      bool isPressed = this.IsPressed;
-
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.Drop( e );
-      }
-
-      if( isMouseCaptured )
-      {
-        this.ReleaseMouseCapture();
-
-        bool click = isPressed;
-
-        if( click )
-        {
-          bool allowSort = true;
-          GroupByControl parentGBC = this.GetParentGroupByControl();
-
-          if( parentGBC != null )
-            allowSort = parentGBC.AllowSort;
-
-          if( allowSort )
-          {
-            DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-            GroupLevelDescription groupInfo = this.Content as GroupLevelDescription;
-            Debug.Assert( ( dataGridContext != null ) && ( groupInfo != null ) );
-
-            if( ( dataGridContext != null ) && ( groupInfo != null ) )
-            {
-              ColumnBase column = dataGridContext.Columns[ groupInfo.FieldName ];
-
-              if( ( column != null ) && ( column.AllowSort ) )
-              {
-                bool shiftUnpressed = ( ( Keyboard.Modifiers & ModifierKeys.Shift ) != ModifierKeys.Shift );
-
-                var toggleColumnSort = dataGridContext.ToggleColumnSortCommand;
-                if( toggleColumnSort.CanExecute( column, shiftUnpressed ) )
-                {
-                  toggleColumnSort.Execute( column, shiftUnpressed );
-                }
-
-                e.Handled = true;
-              }
-            }
-          }
-        }
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-
-    protected override void OnLostMouseCapture( MouseEventArgs e )
-    {
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.DragCancel( e );
-      }
-
-      base.OnLostMouseCapture( e );
-    }
-
-    internal void ShowDropMark( RelativePoint mousePosition )
-    {
-      if( m_dropMarkAdorner == null )
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-        var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
-        var pen = UIViewBase.GetDropMarkPen( this );
-
-        if( ( pen == null ) && ( dataGridControl != null ) )
-        {
-          var uiViewBase = dataGridControl.GetView() as UIViewBase;
-          if( uiViewBase != null )
-          {
-            pen = uiViewBase.DefaultDropMarkPen;
-          }
-        }
-
-        var orientation = UIViewBase.GetDropMarkOrientation( this );
-
-        if( ( orientation == DropMarkOrientation.Default ) && ( dataGridControl != null ) )
-        {
-          var uiViewBase = dataGridControl.GetView() as UIViewBase;
-          if( uiViewBase != null )
-          {
-            orientation = uiViewBase.DefaultDropMarkOrientation;
-          }
-        }
-
-        m_dropMarkAdorner = new DropMarkAdorner( this, pen, orientation );
-
-        var adornerLayer = AdornerLayer.GetAdornerLayer( this );
-        if( adornerLayer != null )
-        {
-          adornerLayer.Add( m_dropMarkAdorner );
-        }
-      }
-
-      m_dropMarkAdorner.UpdateAlignment( mousePosition );
-    }
-
-    internal void HideDropMark()
-    {
-      if( m_dropMarkAdorner == null )
-        return;
-
-      var adornerLayer = AdornerLayer.GetAdornerLayer( this );
-      if( adornerLayer != null )
-      {
-        adornerLayer.Remove( m_dropMarkAdorner );
-      }
-
-      m_dropMarkAdorner = null;
-    }
-
-    #endregion Drag & Drop Manager
-
-    #region IDropTarget Members
-
-    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      var allowGroupingModification = true;
-      var parentGBC = this.GetParentGroupByControl();
-
-      if( parentGBC != null )
-      {
-        allowGroupingModification = parentGBC.IsGroupingModificationAllowed;
-      }
-
-      // We don't accept any ColumnManagerCell from Details
-      var context = DataGridControl.GetDataGridContext( draggedElement );
-      var cell = draggedElement as ColumnManagerCell;
-      var isAlreadyGroupedBy = false;
-
-      if( cell != null )
-      {
-        isAlreadyGroupedBy = GroupingHelper.IsAlreadyGroupedBy( cell );
-
-        var parentColumn = cell.ParentColumn;
-        if( ( parentColumn == null ) || ( !parentColumn.AllowGroup ) )
-          return false;
-      }
-
-      var sourceDetailContext = DataGridControl.GetDataGridContext( this );
-      Debug.Assert( sourceDetailContext != null );
-      var sourceDetailConfig = ( sourceDetailContext != null ) ? sourceDetailContext.SourceDetailConfiguration : null;
-
-      var draggedDetailContext = DataGridControl.GetDataGridContext( draggedElement );
-      Debug.Assert( draggedDetailContext != null );
-      var draggedDetailConfig = ( draggedDetailContext != null ) ? draggedDetailContext.SourceDetailConfiguration : null;
-
-
-      var canDrop = ( sourceDetailConfig == draggedDetailConfig ) &&
-                    ( allowGroupingModification ) &&
-                    ( ( draggedElement is ColumnManagerCell ) || ( draggedElement is GroupByItem ) ) &&
-                    ( draggedElement != this ) &&
-                    ( isAlreadyGroupedBy == false );
-
-      if( canDrop && ( cell != null ) )
-      {
-        canDrop = GroupingHelper.ValidateMaxGroupDescriptions( draggedDetailContext );
-      }
-
-      return canDrop;
-    }
-
-    void IDropTarget.DragEnter( UIElement draggedElement )
-    {
-    }
-
-    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      this.ShowDropMark( mousePosition );
-    }
-
-    void IDropTarget.DragLeave( UIElement draggedElement )
-    {
-      this.HideDropMark();
-    }
-
-    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      if( m_dropMarkAdorner == null )
-        return;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return;
-
-      var draggedOverGroupLevelDescription = this.Content as GroupLevelDescription;
-      if( draggedOverGroupLevelDescription == null )
-        return;
-
-      var alignment = m_dropMarkAdorner.Alignment;
-
-      this.HideDropMark();
-
-      var draggedCell = draggedElement as ColumnManagerCell;
-      if( draggedCell != null )
-      {
-        GroupingHelper.AddNewGroupFromColumnManagerCell( draggedCell, draggedOverGroupLevelDescription, alignment, dataGridContext.DataGridControl );
-      }
-      else
-      {
-        var draggedGroupBy = draggedElement as GroupByItem;
-
-        Debug.Assert( draggedGroupBy != null );
-
-        if( draggedGroupBy != null )
-        {
-          var draggedGroupLevelDescription = draggedGroupBy.Content as GroupLevelDescription;
-
-          GroupingHelper.MoveGroupDescription( dataGridContext.Columns, dataGridContext.Items.GroupDescriptions, draggedOverGroupLevelDescription, alignment, draggedGroupLevelDescription, dataGridContext.DataGridControl );
-        }
-      }
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    protected virtual void OnPropertyChanged( PropertyChangedEventArgs e )
-    {
-      if( this.PropertyChanged != null )
-        this.PropertyChanged( this, e );
-    }
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    /// <summary>
-    /// Will remain null when no AdornerLayer is found.
-    /// </summary>
-    private DragSourceManager m_dragSourceManager;
-    private DropMarkAdorner m_dropMarkAdorner;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfiguration.cs
deleted file mode 100644
index db2f7812..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfiguration.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ObjectModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.ComponentModel;
-using System;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class GroupConfiguration : Freezable
-  {
-    static GroupConfiguration()
-    {
-      GroupConfiguration.HeadersProperty = GroupConfiguration.HeadersPropertyKey.DependencyProperty;
-      GroupConfiguration.FootersProperty = GroupConfiguration.FootersPropertyKey.DependencyProperty;
-
-      DefaultHeaderTemplate = new GroupHeaderFooterItemTemplate();
-      DefaultHeaderTemplate.VisibleWhenCollapsed = true;
-      DefaultHeaderTemplate.Template = new DataTemplate();
-      DefaultHeaderTemplate.Template.VisualTree = new FrameworkElementFactory( typeof( GroupHeaderControl ) );
-      DefaultHeaderTemplate.Template.Seal();
-      DefaultHeaderTemplate.Seal();
-
-      DefaultGroupConfiguration = new GroupConfiguration();
-      DefaultGroupConfiguration.AddDefaultHeadersFooters();
-      DefaultGroupConfiguration.Freeze();
-    }
-
-    internal static readonly GroupConfiguration DefaultGroupConfiguration;
-
-    public GroupConfiguration()
-    {
-      this.SetHeaders( new GroupHeaderFooterCollection() );
-      this.SetFooters( new GroupHeaderFooterCollection() );
-    }
-
-    #region Headers Read-Only Property
-
-    private static readonly DependencyPropertyKey HeadersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Headers", typeof( ObservableCollection<object> ), typeof( GroupConfiguration ), new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty HeadersProperty;
-
-    public ObservableCollection<object> Headers
-    {
-      get
-      {
-        return ( ObservableCollection<object> )this.GetValue( GroupConfiguration.HeadersProperty );
-      }
-    }
-
-    private void SetHeaders( ObservableCollection<object> value )
-    {
-      this.SetValue( GroupConfiguration.HeadersPropertyKey, value );
-    }
-
-    #endregion Headers Read-Only Property
-
-    #region Footers Read-Only Property
-
-    private static readonly DependencyPropertyKey FootersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Footers", typeof( ObservableCollection<object> ), typeof( GroupConfiguration ), new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty FootersProperty;
-
-    public ObservableCollection<object> Footers
-    {
-      get
-      {
-        return ( ObservableCollection<object> )this.GetValue( GroupConfiguration.FootersProperty );
-      }
-    }
-
-    private void SetFooters( ObservableCollection<object> value )
-    {
-      this.SetValue( GroupConfiguration.FootersPropertyKey, value );
-    }
-
-    #endregion Footers Read-Only Property
-
-    #region InitiallyExpanded Property
-
-    public static readonly DependencyProperty InitiallyExpandedProperty =
-        DependencyProperty.Register( "InitiallyExpanded", typeof( bool ), typeof( GroupConfiguration ), new UIPropertyMetadata( true ) );
-
-    public bool InitiallyExpanded
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupConfiguration.InitiallyExpandedProperty );
-      }
-      set
-      {
-        this.SetValue( GroupConfiguration.InitiallyExpandedProperty, value );
-      }
-    }
-
-    #endregion InitiallyExpanded Property
-
-    #region ItemContainerStyle Property
-
-    public static readonly DependencyProperty ItemContainerStyleProperty = DataGridControl.ItemContainerStyleProperty.AddOwner( typeof( GroupConfiguration ) );
-
-    public Style ItemContainerStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( GroupConfiguration.ItemContainerStyleProperty );
-      }
-      set
-      {
-        this.SetValue( GroupConfiguration.ItemContainerStyleProperty, value );
-      }
-    }
-
-    #endregion ItemContainerStyle Property
-
-    #region ItemContainerStyleSelector Property
-
-    public static readonly DependencyProperty ItemContainerStyleSelectorProperty = DataGridControl.ItemContainerStyleSelectorProperty.AddOwner( typeof( GroupConfiguration ) );
-
-    public StyleSelector ItemContainerStyleSelector
-    {
-      get
-      {
-        return ( StyleSelector )this.GetValue( GroupConfiguration.ItemContainerStyleSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( GroupConfiguration.ItemContainerStyleSelectorProperty, value );
-      }
-    }
-
-    #endregion ItemContainerStyleSelector Property
-
-    #region GroupLevelIndicatorStyle Property
-
-    public static readonly DependencyProperty GroupLevelIndicatorStyleProperty =
-        DependencyProperty.Register( "GroupLevelIndicatorStyle", typeof( Style ), typeof( GroupConfiguration ), new UIPropertyMetadata( null ) );
-
-    public Style GroupLevelIndicatorStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( GroupConfiguration.GroupLevelIndicatorStyleProperty );
-      }
-      set
-      {
-        this.SetValue( GroupConfiguration.GroupLevelIndicatorStyleProperty, value );
-      }
-    }
-
-    #endregion GroupLevelIndicatorStyle Property
-
-    #region UseDefaultHeadersFooters Property
-
-    public static readonly DependencyProperty UseDefaultHeadersFootersProperty =
-        DependencyProperty.Register( "UseDefaultHeadersFooters", typeof( bool ), typeof( GroupConfiguration ), new PropertyMetadata( true ) );
-
-    public bool UseDefaultHeadersFooters
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupConfiguration.UseDefaultHeadersFootersProperty );
-      }
-      set
-      {
-        this.SetValue( GroupConfiguration.UseDefaultHeadersFootersProperty, value );
-      }
-    }
-
-    #endregion UseDefaultHeadersFooters Property
-
-    internal void AddDefaultHeadersFooters()
-    {
-      if( m_defaultHeadersFootersAdded )
-        return;
-
-      m_defaultHeadersFootersAdded = true;
-      this.Headers.Insert( 0, GroupConfiguration.DefaultHeaderTemplate );
-    }
-
-    internal static GroupConfiguration GetGroupConfiguration( DataGridContext dataGridContext, ObservableCollection<GroupDescription> groupDescriptions, GroupConfigurationSelector groupConfigSelector, int groupLevel, CollectionViewGroup collectionViewGroup )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      if( groupDescriptions == null )
-        throw new ArgumentNullException( "groupDescriptions" );
-
-      if( groupLevel >= groupDescriptions.Count )
-        throw new ArgumentException( "The specified group level is greater than the number of GroupDescriptions in the DataGridContext.", "groupLevel" );
-
-      GroupDescription groupDescription = groupDescriptions[ groupLevel ];
-
-      GroupConfiguration retval = null;
-      DataGridGroupDescription dataGridGroupDescription = groupDescription as DataGridGroupDescription;
-
-      if( ( dataGridGroupDescription != null ) && ( dataGridGroupDescription.GroupConfiguration != null ) )
-      {
-        retval = dataGridGroupDescription.GroupConfiguration;
-      }
-      else if( groupConfigSelector != null )
-      {
-        retval = groupConfigSelector.SelectGroupConfiguration( groupLevel, collectionViewGroup, groupDescription );
-      }
-
-      if( retval == null )
-      {
-        retval = dataGridContext.DefaultGroupConfiguration;
-      }
-
-      if( retval == null )
-      {
-        retval = GroupConfiguration.DefaultGroupConfiguration;
-      }
-
-      return retval;
-    }
-
-    protected override Freezable CreateInstanceCore()
-    {
-      return new GroupConfiguration();
-    }
-
-
-    private bool m_defaultHeadersFootersAdded; // = false
-    private static readonly GroupHeaderFooterItemTemplate DefaultHeaderTemplate;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs
deleted file mode 100644
index 775b5718..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public abstract class GroupConfigurationSelector
-  {
-    public virtual GroupConfiguration SelectGroupConfiguration( int groupLevel, CollectionViewGroup collectionViewGroup, GroupDescription groupDescription )
-    {
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupExtensions.cs
deleted file mode 100644
index 62900b12..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupExtensions.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  public static class GroupExtensions
-  {
-    public static IList<object> GetItems( this Group group )
-    {
-      CollectionViewGroup collectionViewGroup = group.CollectionViewGroup;
-
-      if( collectionViewGroup == null )
-        return null;
-
-      return collectionViewGroup.GetItems();
-    }
-
-    public static IEnumerable<object> GetLeafItems( this Group group )
-    {
-      CollectionViewGroup collectionViewGroup = group.CollectionViewGroup;
-
-      if( collectionViewGroup == null )
-        return new object[0];
-
-      return collectionViewGroup.GetLeafItems();
-    }
-
-    public static SelectionRange GetRange( this Group group )
-    {
-      CollectionViewGroup collectionViewGroup = group.CollectionViewGroup;
-
-      if( collectionViewGroup == null )
-        return SelectionRange.Empty;
-
-      return collectionViewGroup.GetRange( group.DataGridContext );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs
deleted file mode 100644
index cb684215..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Utils.Wpf;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-    public class GroupHeaderControl : ContentControl, INotifyPropertyChanged, IDataGridItemContainer
-    {
-        #region Static Fields
-
-        internal static readonly string GroupPropertyName = PropertyHelper.GetPropertyName((GroupHeaderControl g) => g.Group);
-
-        #endregion
-
-        static GroupHeaderControl()
-        {
-            // This DefaultStyleKey will only be used in design-time.
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(GroupHeaderControl), new FrameworkPropertyMetadata(new Markup.ThemeKey(typeof(Views.TableView), typeof(GroupHeaderControl))));
-
-            DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata(typeof(GroupHeaderControl), new FrameworkPropertyMetadata(new PropertyChangedCallback(OnParentGridControlChanged)));
-
-            KeyboardNavigation.TabNavigationProperty.OverrideMetadata(
-              typeof(GroupHeaderControl), new FrameworkPropertyMetadata(KeyboardNavigationMode.None));
-        }
-
-        public GroupHeaderControl()
-        {
-            this.CommandBindings.Add(new CommandBinding(DataGridCommands.ExpandGroup,
-                                                          this.OnExpandExecuted,
-                                                          this.OnExpandCanExecute));
-
-            this.CommandBindings.Add(new CommandBinding(DataGridCommands.CollapseGroup,
-                                                          this.OnCollapseExecuted,
-                                                          this.OnCollapseCanExecute));
-
-            this.CommandBindings.Add(new CommandBinding(DataGridCommands.ToggleGroupExpansion,
-                                                          this.OnToggleExecuted,
-                                                          this.OnToggleCanExecute));
-
-            m_itemContainerManager = new DataGridItemContainerManager(this);
-        }
-
-        #region Group Internal Attached Property
-
-        internal static readonly DependencyProperty GroupProperty = DependencyProperty.RegisterAttached(
-          "Group", typeof(Group), typeof(GroupHeaderControl),
-          new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.Inherits));
-
-        internal static Group GetGroup(DependencyObject obj)
-        {
-            return (Group)obj.GetValue(GroupHeaderControl.GroupProperty);
-        }
-
-        internal static void SetGroup(DependencyObject obj, Group value)
-        {
-            obj.SetValue(GroupHeaderControl.GroupProperty, value);
-        }
-
-        #endregion
-
-        #region Group Property
-
-        public Group Group
-        {
-            get
-            {
-                return m_group;
-            }
-        }
-
-        internal void SetGroup(Group group)
-        {
-            m_group = group;
-            this.Content = m_group;
-            GroupHeaderControl.SetGroup(this, group);
-
-            this.RaisePropertyChanged(GroupHeaderControl.GroupPropertyName);
-        }
-
-        private Group m_group;
-
-        #endregion
-
-        #region SelectionBackground Property
-
-        public static readonly DependencyProperty SelectionBackgroundProperty = Cell.SelectionBackgroundProperty.AddOwner(typeof(GroupHeaderControl));
-
-        public Brush SelectionBackground
-        {
-            get
-            {
-                return (Brush)this.GetValue(GroupHeaderControl.SelectionBackgroundProperty);
-            }
-            set
-            {
-                this.SetValue(GroupHeaderControl.SelectionBackgroundProperty, value);
-            }
-        }
-
-        #endregion SelectionBackground Property
-
-        #region SelectionForeground Property
-
-        public static readonly DependencyProperty SelectionForegroundProperty = Cell.SelectionForegroundProperty.AddOwner(typeof(GroupHeaderControl));
-
-        public Brush SelectionForeground
-        {
-            get
-            {
-                return (Brush)this.GetValue(GroupHeaderControl.SelectionForegroundProperty);
-            }
-            set
-            {
-                this.SetValue(GroupHeaderControl.SelectionForegroundProperty, value);
-            }
-        }
-
-        #endregion SelectionForeground Property
-
-        #region InactiveSelectionBackground Property
-
-        public static readonly DependencyProperty InactiveSelectionBackgroundProperty = Cell.InactiveSelectionBackgroundProperty.AddOwner(typeof(GroupHeaderControl));
-
-        public Brush InactiveSelectionBackground
-        {
-            get
-            {
-                return (Brush)this.GetValue(GroupHeaderControl.InactiveSelectionBackgroundProperty);
-            }
-            set
-            {
-                this.SetValue(GroupHeaderControl.InactiveSelectionBackgroundProperty, value);
-            }
-        }
-
-        #endregion InactiveSelectionBackground Property
-
-        #region InactiveSelectionForeground Property
-
-        public static readonly DependencyProperty InactiveSelectionForegroundProperty = Cell.InactiveSelectionForegroundProperty.AddOwner(typeof(GroupHeaderControl));
-
-        public Brush InactiveSelectionForeground
-        {
-            get
-            {
-                return (Brush)this.GetValue(GroupHeaderControl.InactiveSelectionForegroundProperty);
-            }
-            set
-            {
-                this.SetValue(GroupHeaderControl.InactiveSelectionForegroundProperty, value);
-            }
-        }
-
-        #endregion InactiveSelectionForeground Property
-
-        #region CanBeRecycled Protected Property
-
-        protected virtual bool CanBeRecycled
-        {
-            get
-            {
-                if (this.IsKeyboardFocused || this.IsKeyboardFocusWithin)
-                    return false;
-
-                return m_itemContainerManager.CanBeRecycled;
-            }
-        }
-
-        #endregion
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            m_itemContainerManager.Update();
-        }
-
-
-        protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
-            base.OnPreviewMouseLeftButtonUp(e);
-            return;
-        }
-
-        protected override void OnIsKeyboardFocusWithinChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnIsKeyboardFocusWithinChanged(e);
-
-            bool newValue = (bool)e.NewValue;
-
-            if (newValue == true)
-            {
-                DataGridContext dataGridContext = DataGridControl.GetDataGridContext(this);
-
-                if (dataGridContext != null)
-                {
-                    object item = dataGridContext.GetItemFromContainer(this);
-
-                    if ((item != null) && (dataGridContext.InternalCurrentItem != item))
-                    {
-                        try
-                        {
-                            dataGridContext.SetCurrent(item, null, -1, dataGridContext.CurrentColumn, true, true, false, AutoScrollCurrentItemSourceTriggers.FocusChanged);
-                        }
-                        catch (DataGridException)
-                        {
-                            // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-                            // any other GridException.
-                        }
-                    }
-                }
-            }
-        }
-
-        protected virtual void PrepareContainer(DataGridContext dataGridContext, object item)
-        {
-            m_isRecyclingCandidate = false;
-
-            if (m_isContainerPrepared)
-                Debug.Fail("A GroupHeaderControl can't be prepared twice, it must be cleaned before PrepareContainer is called again");
-
-            Group group = null;
-            DataGridContext gridContext = DataGridControl.GetDataGridContext(this);
-
-            if (gridContext != null)
-            {
-                object dataItem = gridContext.GetItemFromContainer(this);
-                if (dataItem != null)
-                {
-                    group = gridContext.GetGroupFromItem(dataItem);
-                }
-            }
-
-            this.SetGroup(group);
-
-            m_itemContainerManager.Prepare(gridContext, item);
-
-            m_isContainerPrepared = true;
-        }
-
-        protected virtual void ClearContainer()
-        {
-            m_itemContainerManager.Clear(m_isRecyclingCandidate);
-            m_isContainerPrepared = false;
-        }
-
-        protected internal virtual void PrepareDefaultStyleKey(Xceed.Wpf.DataGrid.Views.ViewBase view)
-        {
-            this.DefaultStyleKey = view.GetDefaultStyleKey(typeof(GroupHeaderControl));
-        }
-
-        protected internal virtual bool ShouldHandleSelectionEvent(InputEventArgs eventArgs)
-        {
-            var targetChild = eventArgs.OriginalSource as DependencyObject;
-
-            // If the event is comming from a specific control inside the header (GroupNavigationControl or Collapsed button),
-            // ignore the event since it is not for selection purposes that the user targeted this control. 
-            var collapsedButtonParent = TreeHelper.FindParent<ToggleButton>(targetChild, true, null, this);
-            if (collapsedButtonParent != null)
-                return false;
-
-            var groupNavigationControlParent = TreeHelper.FindParent<GroupNavigationControl>(targetChild, true, null, this);
-            if (groupNavigationControlParent != null)
-                return false;
-
-            return true;
-        }
-
-        private static void OnParentGridControlChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-        {
-            DataGridControl grid = e.NewValue as DataGridControl;
-            GroupHeaderControl groupHeaderControl = sender as GroupHeaderControl;
-
-            if ((groupHeaderControl != null) && (grid != null))
-            {
-                groupHeaderControl.PrepareDefaultStyleKey(grid.GetView());
-            }
-        }
-
-        private void OnExpandCanExecute(object sender, CanExecuteRoutedEventArgs e)
-        {
-            e.CanExecute = false;
-
-            if (e.Parameter == null)
-            {
-                //can execute the Expand command if the group is NOT expanded.
-                e.CanExecute = !this.FindGroupCommandTarget(e.OriginalSource).IsExpanded;
-            }
-        }
-
-        private void OnExpandExecuted(object sender, ExecutedRoutedEventArgs e)
-        {
-            this.FindGroupCommandTarget(e.OriginalSource).IsExpanded = true;
-        }
-
-        private void OnCollapseCanExecute(object sender, CanExecuteRoutedEventArgs e)
-        {
-            e.CanExecute = false;
-
-            if (e.Parameter == null)
-            {
-                //can execute the Collapse command if the group is expanded.
-                e.CanExecute = this.FindGroupCommandTarget(e.OriginalSource).IsExpanded;
-            }
-        }
-
-        private void OnCollapseExecuted(object sender, ExecutedRoutedEventArgs e)
-        {
-            this.FindGroupCommandTarget(e.OriginalSource).IsExpanded = false;
-        }
-
-        private void OnToggleCanExecute(object sender, CanExecuteRoutedEventArgs e)
-        {
-            e.CanExecute = false;
-
-            if (e.Parameter == null)
-            {
-                e.CanExecute = true; //can always toggle
-            }
-        }
-
-        private void OnToggleExecuted(object sender, ExecutedRoutedEventArgs e)
-        {
-            Group group = FindGroupCommandTarget(e.OriginalSource);
-
-            group.IsExpanded = !group.IsExpanded;
-        }
-
-        // We use an ItemsControl inside the GroupHeaderControl to represent the
-        // ancestors (ParentGroups) of this.Group, and each item in this ItemsControl
-        // is a Group templated to look like a single, stand-alone GroupHeaderControl.
-        //
-        // In the ItemTemplate for each Group in the ItemsControl, we have a Border that
-        // declares some InputBindings to the group commands. In this case, we want to
-        // execute the command on this specific instance of Group, which is the DataContext
-        // of the Border.
-        private Group FindGroupCommandTarget(object originalSource)
-        {
-            object dataContext = null;
-
-            FrameworkElement fe = originalSource as FrameworkElement;
-            if (fe != null)
-            {
-                dataContext = fe.DataContext;
-            }
-            else
-            {
-                FrameworkContentElement fce = originalSource as FrameworkContentElement;
-                if (fce != null)
-                {
-                    dataContext = fce.DataContext;
-                }
-            }
-
-            Group groupCommandTarget = dataContext as Group;
-
-            return (groupCommandTarget != null) ? groupCommandTarget : this.Group;
-        }
-
-        #region INotifyPropertyChanged Members
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        private void RaisePropertyChanged(string propertyName)
-        {
-            var handler = this.PropertyChanged;
-            if (handler == null)
-                return;
-
-            handler.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        #endregion
-
-        #region IDataGridItemContainer Members
-
-        bool IDataGridItemContainer.CanBeRecycled
-        {
-            get
-            {
-                return this.CanBeRecycled;
-            }
-        }
-
-        bool IDataGridItemContainer.IsRecyclingCandidate
-        {
-            get
-            {
-                return m_isRecyclingCandidate;
-            }
-            set
-            {
-                m_isRecyclingCandidate = value;
-            }
-        }
-
-        void IDataGridItemContainer.PrepareContainer(DataGridContext dataGridContext, object item)
-        {
-            this.PrepareContainer(dataGridContext, item);
-        }
-
-        void IDataGridItemContainer.ClearContainer()
-        {
-            this.ClearContainer();
-        }
-
-        void IDataGridItemContainer.CleanRecyclingCandidate()
-        {
-            m_itemContainerManager.CleanRecyclingCandidates();
-        }
-
-        #endregion
-
-        private readonly DataGridItemContainerManager m_itemContainerManager;
-        private bool m_isContainerPrepared;
-        private bool m_isRecyclingCandidate;
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderFooterCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderFooterCollection.cs
deleted file mode 100644
index 25373dc4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderFooterCollection.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-using Xceed.Wpf.DataGrid.Markup;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class GroupHeaderFooterCollection : ObservableCollection<object>
-  {
-    protected override void InsertItem( int index, object item )
-    {
-      if( item is DataTemplate ) 
-      {
-        base.InsertItem( index, item );
-      }
-      else
-      {
-        GroupHeaderFooterItemTemplate vwc = item as GroupHeaderFooterItemTemplate;
-        if( vwc != null )
-        {
-          if(vwc.Template == null)
-          {
-            throw new ArgumentException( "A VisibleWhenCollapsed object must have its Template property set to an instance of a DataTemplate.");
-          }
-          else
-          {
-            base.InsertItem( index, item );
-          }
-        }
-        else
-        {
-          throw new ArgumentException( "Group headers and footers can only receive ClearHeadersFooters, DataTemplate, or VisibleWhenCollapsed objects." );
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfiguration.cs
deleted file mode 100644
index 9b7742a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfiguration.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-  public class GroupLevelConfiguration : DependencyObject
-  {
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public GroupLevelConfiguration()
-    {
-    }
-
-    #region Headers Read-Only Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public static readonly DependencyProperty HeadersProperty;
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public ObservableCollection<object> Headers
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    #endregion Headers Read-Only Property
-
-    #region Footers Read-Only Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public static readonly DependencyProperty FootersProperty;
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public ObservableCollection<object> Footers
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    #endregion Footers Read-Only Property
-
-    #region InitiallyExpanded Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public static readonly DependencyProperty InitiallyExpandedProperty;
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value" ), System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1822:MarkMembersAsStatic" ), Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public bool InitiallyExpanded
-    {
-      get
-      {
-        return false;
-      }
-      set
-      {
-      }
-    }
-
-    #endregion InitiallyExpanded Property
-
-    #region GroupLevelIndicatorStyle Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public static readonly DependencyProperty GroupLevelIndicatorStyleProperty;
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "value" ), System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1822:MarkMembersAsStatic" ), Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration class is obsolete and has been replaced by the LevelGroupConfigurationSelector class.", true )]
-    public Style GroupLevelIndicatorStyle
-    {
-      get
-      {
-        return null;
-      }
-      set
-      {
-      }
-    }
-
-    #endregion GroupLevelIndicatorStyle Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfigurationCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfigurationCollection.cs
deleted file mode 100644
index cf171cd2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfigurationCollection.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.DataGrid.Markup;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  [Obsolete( "The GroupLevelConfigurationCollection class is obsolete and has been replaced by the LevelGroupConfigurationSelectorItemCollection class.", true )]
-  public class GroupLevelConfigurationCollection : ObservableCollection<GroupLevelConfiguration>
-  {
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescription.cs
deleted file mode 100644
index c055d037..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescription.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class GroupLevelDescription : DependencyObject, IGroupLevelDescription, INotifyPropertyChanged
-  {
-    #region CONSTRUCTORS
-
-    internal GroupLevelDescription( GroupDescription groupDescription, string fieldName )
-    {
-      if( groupDescription == null )
-        throw new DataGridInternalException( "GroupDescription cannot be null." );
-
-      m_groupDescription = groupDescription;
-      m_fieldName = fieldName;
-    }
-
-    #endregion
-
-    #region FieldName Property
-
-    public string FieldName
-    {
-      get
-      {
-        return m_fieldName;
-      }
-    }
-
-    private readonly string m_fieldName;
-
-    #endregion
-
-    #region GroupDescription Property
-
-    internal GroupDescription GroupDescription
-    {
-      get
-      {
-        return m_groupDescription;
-      }
-    }
-
-    private readonly GroupDescription m_groupDescription;
-
-    #endregion
-
-    #region Title Property
-
-    internal static readonly DependencyProperty TitleProperty = DependencyProperty.Register(
-      "Title",
-      typeof( object ),
-      typeof( GroupLevelDescription ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( GroupLevelDescription.OnPropertyChanged ) ) );
-
-    public object Title
-    {
-      get
-      {
-        return ( object )this.GetValue( GroupLevelDescription.TitleProperty );
-      }
-    }
-
-    internal void SetTitle( object title )
-    {
-      this.SetValue( GroupLevelDescription.TitleProperty, title );
-    }
-
-    #endregion Title Property
-
-    #region TitleTemplate Property
-
-    internal static readonly DependencyProperty TitleTemplateProperty = DependencyProperty.Register(
-      "TitleTemplate",
-      typeof( DataTemplate ),
-      typeof( GroupLevelDescription ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( GroupLevelDescription.OnPropertyChanged ) ) );
-
-    public DataTemplate TitleTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( GroupLevelDescription.TitleTemplateProperty );
-      }
-    }
-
-    #endregion TitleTemplate Property
-
-    #region TitleTemplateSelector Property
-
-    internal static readonly DependencyProperty TitleTemplateSelectorProperty = DependencyProperty.Register(
-      "TitleTemplateSelector",
-      typeof( DataTemplateSelector ),
-      typeof( GroupLevelDescription ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( GroupLevelDescription.OnPropertyChanged ) ) );
-
-    public DataTemplateSelector TitleTemplateSelector
-    {
-      get
-      {
-        return ( DataTemplateSelector )this.GetValue( GroupLevelDescription.TitleTemplateSelectorProperty );
-      }
-    }
-
-    #endregion TitleTemplateSelector Property
-
-    #region ValueStringFormat Property
-
-    internal static readonly DependencyProperty ValueStringFormatProperty = DependencyProperty.Register(
-      "ValueStringFormat",
-      typeof( string ),
-      typeof( GroupLevelDescription ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( GroupLevelDescription.OnPropertyChanged ) ) );
-
-    public string ValueStringFormat
-    {
-      get
-      {
-        return ( string )this.GetValue( GroupLevelDescription.ValueStringFormatProperty );
-      }
-    }
-
-    #endregion ValueStringFormat Property
-
-    #region ValueStringFormatCulture Property
-
-    internal static readonly DependencyProperty ValueStringFormatCultureProperty = DependencyProperty.Register(
-      "ValueStringFormatCulture",
-      typeof( CultureInfo ),
-      typeof( GroupLevelDescription ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( GroupLevelDescription.OnPropertyChanged ) ) );
-
-    public CultureInfo ValueStringFormatCulture
-    {
-      get
-      {
-        return ( CultureInfo )this.GetValue( GroupLevelDescription.ValueStringFormatCultureProperty );
-      }
-    }
-
-    #endregion ValueStringFormatCulture Property
-
-    #region ValueTemplate Property
-
-    internal static readonly DependencyProperty ValueTemplateProperty = DependencyProperty.Register(
-      "ValueTemplate",
-      typeof( DataTemplate ),
-      typeof( GroupLevelDescription ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( GroupLevelDescription.OnPropertyChanged ) ) );
-
-    public DataTemplate ValueTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( GroupLevelDescription.ValueTemplateProperty );
-      }
-    }
-
-    #endregion ValueTemplate Property
-
-    #region ValueTemplateSelector Property
-
-    internal static readonly DependencyProperty ValueTemplateSelectorProperty = DependencyProperty.Register(
-      "ValueTemplateSelector",
-      typeof( DataTemplateSelector ),
-      typeof( GroupLevelDescription ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( GroupLevelDescription.OnPropertyChanged ) ) );
-
-    public DataTemplateSelector ValueTemplateSelector
-    {
-      get
-      {
-        return ( DataTemplateSelector )this.GetValue( GroupLevelDescription.ValueTemplateSelectorProperty );
-      }
-    }
-
-    #endregion ValueTemplateSelector Property
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private static void OnPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = ( GroupLevelDescription )sender;
-      var handler = self.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( self, new PropertyChangedEventArgs( e.Property.Name ) );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescriptionCollection.cs
deleted file mode 100644
index 3786a8b5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescriptionCollection.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class GroupLevelDescriptionCollection : ReadOnlyObservableCollection<GroupLevelDescription>
-  {
-    public GroupLevelDescriptionCollection()
-      : base( new ObservableCollection<GroupLevelDescription>() )
-    {
-    }
-
-    internal void Add( GroupLevelDescription info )
-    {
-      this.Items.Add( info );
-    }
-
-    internal void Insert( int index, GroupLevelDescription info )
-    {
-      this.Items.Insert( index, info );
-    }
-
-    internal bool Remove( GroupLevelDescription info )
-    {
-      return this.Items.Remove( info );
-    }
-
-    internal void RemoveAt( int index )
-    {
-      this.Items.RemoveAt( index );
-    }
-
-    internal void Clear()
-    {
-      this.Items.Clear();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicator.cs
deleted file mode 100644
index b83b67f7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicator.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class GroupLevelIndicator : Control
-  {
-    static GroupLevelIndicator()
-    {
-      // This DefaultStyleKey will only be used in design-time.
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( GroupLevelIndicator ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( GroupLevelIndicator ) ) ) );
-
-      DataGridControl.DataGridContextPropertyKey.OverrideMetadata( typeof( GroupLevelIndicator ), new FrameworkPropertyMetadata( new PropertyChangedCallback( GroupLevelIndicator.OnDataGridContextChanged ) ) );
-
-      FocusableProperty.OverrideMetadata( typeof( GroupLevelIndicator ), new FrameworkPropertyMetadata( false ) );
-    }
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( GroupLevelIndicator ) );
-    }
-
-    private static void OnDataGridContextChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridContext dataGridContext = e.NewValue as DataGridContext;
-
-      if( dataGridContext != null )
-      {
-        ( ( GroupLevelIndicator )sender ).PrepareDefaultStyleKey( dataGridContext.DataGridControl.GetView() );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs
deleted file mode 100644
index 31629031..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs
+++ /dev/null
@@ -1,490 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_GroupLevelIndicatorHost", Type = typeof( Panel ) )]
-  public class GroupLevelIndicatorPane : Control, IWeakEventListener
-  {
-    static GroupLevelIndicatorPane()
-    {
-      GroupLevelIndicatorPane.IsLeafProperty = GroupLevelIndicatorPane.IsLeafPropertyKey.DependencyProperty;
-      GroupLevelIndicatorPane.CurrentIndicatorCountProperty = GroupLevelIndicatorPane.CurrentIndicatorCountPropertyKey.DependencyProperty;
-
-      FocusableProperty.OverrideMetadata( typeof( GroupLevelIndicatorPane ), new FrameworkPropertyMetadata( false ) );
-
-      DataGridControl.DataGridContextPropertyKey.OverrideMetadata( typeof( GroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnDataGridContextChanged ) ) );
-      CustomItemContainerGenerator.DataItemPropertyProperty.OverrideMetadata( typeof( GroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnDataItemChanged ) ) );
-
-      AreGroupsFlattenedBinding = new Binding();
-      AreGroupsFlattenedBinding.Mode = BindingMode.OneWay;
-      AreGroupsFlattenedBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      AreGroupsFlattenedBinding.Path = new PropertyPath( "(0).(1)",
-        DataGridControl.DataGridContextProperty,
-        TableflowView.AreGroupsFlattenedProperty );
-    }
-
-    public GroupLevelIndicatorPane()
-    {
-      this.SetBinding( GroupLevelIndicatorPane.AreGroupsFlattenedProperty, GroupLevelIndicatorPane.AreGroupsFlattenedBinding );
-    }
-
-    #region AreGroupsFlattened Internal Property
-
-    internal static readonly DependencyProperty AreGroupsFlattenedProperty = DependencyProperty.Register(
-      "AreGroupsFlattened", typeof( bool ), typeof( GroupLevelIndicatorPane ),
-      new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-
-    internal bool AreGroupsFlattened
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupLevelIndicatorPane.AreGroupsFlattenedProperty );
-      }
-      set
-      {
-        this.SetValue( GroupLevelIndicatorPane.AreGroupsFlattenedProperty, value );
-      }
-    }
-
-    private static Binding AreGroupsFlattenedBinding;
-
-    #endregion AreGroupsFlattened Internal Property
-
-    #region GroupLevelIndicatorPaneHost Read-Only Property
-
-    private Panel GroupLevelIndicatorPaneHost
-    {
-      get
-      {
-        //if there is no local storage for the host panel, try to retrieve and store the value
-        if( m_storedGroupLevelIndicatorPaneHost == null )
-        {
-          m_storedGroupLevelIndicatorPaneHost = this.RetrieveGroupLevelIndicatorPaneHostPanel();
-        }
-
-        return m_storedGroupLevelIndicatorPaneHost;
-      }
-    }
-
-    private Panel m_storedGroupLevelIndicatorPaneHost; //null
-
-    #endregion GroupLevelIndicatorPaneHost Read-Only Property
-
-    #region ShowIndicators Attached Property
-
-    public static readonly DependencyProperty ShowIndicatorsProperty = DependencyProperty.RegisterAttached(
-      "ShowIndicators", typeof( bool ), typeof( GroupLevelIndicatorPane ),
-      new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-
-    public static bool GetShowIndicators( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( GroupLevelIndicatorPane.ShowIndicatorsProperty );
-    }
-
-    public static void SetShowIndicators( DependencyObject obj, bool value )
-    {
-      obj.SetValue( GroupLevelIndicatorPane.ShowIndicatorsProperty, value );
-    }
-
-    #endregion ShowIndicators Attached Property
-
-    #region ShowVerticalBorder Attached Property
-
-    public static readonly DependencyProperty ShowVerticalBorderProperty =
-      DependencyProperty.RegisterAttached( "ShowVerticalBorder", typeof( bool ), typeof( GroupLevelIndicatorPane ),
-      new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-
-    public static bool GetShowVerticalBorder( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( ShowVerticalBorderProperty );
-    }
-
-    public static void SetShowVerticalBorder( DependencyObject obj, bool value )
-    {
-      obj.SetValue( ShowVerticalBorderProperty, value );
-    }
-
-    #endregion
-
-    #region Indented Property
-
-    public static readonly DependencyProperty IndentedProperty =
-        DependencyProperty.Register( "Indented", typeof( bool ), typeof( GroupLevelIndicatorPane ),
-        new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-
-    public bool Indented
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupLevelIndicatorPane.IndentedProperty );
-      }
-      set
-      {
-        this.SetValue( GroupLevelIndicatorPane.IndentedProperty, value );
-      }
-    }
-
-    #endregion Indented Property
-
-    #region GroupLevel Attached Property
-
-    public static readonly DependencyProperty GroupLevelProperty = DependencyProperty.RegisterAttached(
-      "GroupLevel", typeof( int ), typeof( GroupLevelIndicatorPane ),
-      new FrameworkPropertyMetadata( 0, FrameworkPropertyMetadataOptions.Inherits | FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-
-    public static int GetGroupLevel( DependencyObject obj )
-    {
-      return ( int )obj.GetValue( GroupLevelIndicatorPane.GroupLevelProperty );
-    }
-
-    public static void SetGroupLevel( DependencyObject obj, int value )
-    {
-      obj.SetValue( GroupLevelIndicatorPane.GroupLevelProperty, value );
-    }
-
-    #endregion GroupLevel Attached Property
-
-    #region IsLeaf Read-Only Property
-
-    internal static readonly DependencyPropertyKey IsLeafPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsLeaf", typeof( bool ), typeof( GroupLevelIndicatorPane ),
-      new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-
-    public static readonly DependencyProperty IsLeafProperty;
-
-    public bool IsLeaf
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupLevelIndicatorPane.IsLeafProperty );
-      }
-    }
-
-    internal void SetIsLeaf( bool value )
-    {
-      this.SetValue( GroupLevelIndicatorPane.IsLeafPropertyKey, value );
-    }
-
-    #endregion IsLeaf Read-Only Property
-
-    #region CurrentIndicatorCount Read-Only Property
-
-    private static readonly DependencyPropertyKey CurrentIndicatorCountPropertyKey =
-        DependencyProperty.RegisterReadOnly( "CurrentIndicatorCount", typeof( int ), typeof( GroupLevelIndicatorPane ), new PropertyMetadata( 0 ) );
-
-    public static readonly DependencyProperty CurrentIndicatorCountProperty;
-
-    public int CurrentIndicatorCount
-    {
-      get
-      {
-        return ( int )this.GetValue( GroupLevelIndicatorPane.CurrentIndicatorCountProperty );
-      }
-    }
-
-    internal void SetCurrentIndicatorCount( int value )
-    {
-      this.SetValue( GroupLevelIndicatorPane.CurrentIndicatorCountPropertyKey, value );
-    }
-
-    #endregion CurrentIndicatorCount Read-Only Property
-
-    internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( GroupLevelIndicatorPane ) );
-    }
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      var panel = this.GroupLevelIndicatorPaneHost;
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( ( panel == null ) || ( dataGridContext == null ) )
-        return base.MeasureOverride( availableSize );
-
-      var groupDescriptions = DataGridContext.GetGroupDescriptionsHelper( dataGridContext.Items );
-      var leafGroupLevel = GroupLevelIndicatorPane.GetGroupLevel( this );
-
-      // If Indented is true (default), we use the total groupDescriptions.Count for this DataGridContext
-      var correctedGroupLevel = ( this.Indented == true ) ? groupDescriptions.Count : leafGroupLevel;
-
-      // Ensure that the GroupLevel retrieved does not exceeds the number of group descriptions for the DataGridContext
-      correctedGroupLevel = Math.Min( correctedGroupLevel, groupDescriptions.Count );
-
-      // Then finally, if the GroupLevel is -1, then indent at maximum.
-      if( correctedGroupLevel == -1 )
-      {
-        correctedGroupLevel = groupDescriptions.Count;
-      }
-
-      if( ( correctedGroupLevel > 0 ) && ( this.AreGroupsFlattened ) )
-      {
-        correctedGroupLevel = ( this.Indented ) ? 1 : 0;
-      }
-
-      var children = panel.Children;
-      var childrenCount = children.Count;
-
-      // If we need to add/remove GroupLevelIndicators from the panel
-      if( correctedGroupLevel != childrenCount )
-      {
-        // When grouping change, we take for granted that the group deepness will change, 
-        // so we initialize DataContext of the margin only in there.
-
-        // Clear all the panel's children!
-        children.Clear();
-
-        // Create 1 group margin content presenter for each group level
-        for( int i = correctedGroupLevel - 1; i >= 0; i-- )
-        {
-          GroupLevelIndicator groupMargin = new GroupLevelIndicator();
-          groupMargin.DataContext = dataGridContext.GroupLevelDescriptions[ i ];
-          children.Insert( 0, new GroupLevelIndicator() );
-        }
-
-        childrenCount = correctedGroupLevel;
-        this.SetCurrentIndicatorCount( childrenCount );
-
-        this.InvalidateGroupLevelIndicatorPaneHostPanelMeasure();
-      }
-
-      var item = dataGridContext.GetItemFromContainer( this );
-
-      for( int i = 0; i < childrenCount; i++ )
-      {
-        GroupLevelIndicator groupMargin = children[ i ] as GroupLevelIndicator;
-
-        CollectionViewGroup groupForIndicator = GroupLevelIndicatorPane.GetCollectionViewGroupHelper(
-          dataGridContext, groupDescriptions, item, i );
-
-        GroupConfiguration groupLevelConfig = GroupConfiguration.GetGroupConfiguration(
-          dataGridContext, groupDescriptions, dataGridContext.GroupConfigurationSelector, i, groupForIndicator );
-
-        if( groupLevelConfig != null )
-        {
-          Binding groupLevelIndicatorStyleBinding = BindingOperations.GetBinding( groupMargin, GroupLevelIndicator.StyleProperty );
-
-          if( ( groupLevelIndicatorStyleBinding == null ) || ( groupLevelIndicatorStyleBinding.Source != groupLevelConfig ) )
-          {
-            groupLevelIndicatorStyleBinding = new Binding( "GroupLevelIndicatorStyle" );
-            groupLevelIndicatorStyleBinding.Source = groupLevelConfig;
-
-            // Use a Converter to manage groupLevelConfig.GroupLevelIndicatorStyle == null
-            // so that an implicit syle won't be overriden by a null style.
-            groupLevelIndicatorStyleBinding.Converter = new GroupLevelIndicatorConverter();
-
-            groupLevelIndicatorStyleBinding.ConverterParameter = groupMargin;
-            groupMargin.SetBinding( GroupLevelIndicator.StyleProperty, groupLevelIndicatorStyleBinding );
-          }
-        }
-        else
-        {
-          groupMargin.ClearValue( GroupLevelIndicator.StyleProperty );
-        }
-
-        // If the ShowIndicators property is False or there is already leafGroupLevel GroupLevelIndicators in the panel,
-        // the current newGroupMargin must be hidden.
-        if( ( !GroupLevelIndicatorPane.GetShowIndicators( this ) ) || ( ( i >= leafGroupLevel ) && ( leafGroupLevel != -1 ) ) )
-        {
-          groupMargin.Visibility = Visibility.Hidden;
-        }
-        else
-        {
-          groupMargin.Visibility = Visibility.Visible;
-        }
-      }
-
-      return base.MeasureOverride( availableSize );
-    }
-
-    private static CollectionViewGroup GetCollectionViewGroupHelper( DataGridContext dataGridContext, ObservableCollection<GroupDescription> groupDescriptions, object item, int groupLevel )
-    {
-      if( item == null )
-        return null;
-
-      int levelOfRecursion = groupDescriptions.Count - groupLevel - 1;
-
-      CollectionViewGroup retval = dataGridContext.GetParentGroupFromItemCore( item, true );
-
-      if( retval == null )
-        return null;
-
-      for( int i = 0; i < levelOfRecursion; i++ )
-      {
-        retval = dataGridContext.GetParentGroupFromItemCore( retval, true ) as CollectionViewGroup;
-
-        if( retval == null )
-          return null;
-      }
-
-      return retval;
-    }
-
-    private static void OnDataGridContextChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      GroupLevelIndicatorPane self = sender as GroupLevelIndicatorPane;
-
-      if( self != null )
-      {
-        DataGridContext dataGridContext = e.OldValue as DataGridContext;
-
-        //unregister to the old contexts Collection GroupDescriptions Changed event
-        if( dataGridContext != null )
-        {
-          CollectionChangedEventManager.RemoveListener( dataGridContext.Items.GroupDescriptions, self );
-        }
-
-        dataGridContext = e.NewValue as DataGridContext;
-
-        //register to the new contexts Collection GroupDescriptions Changed event
-        if( dataGridContext != null )
-        {
-          CollectionChangedEventManager.AddListener( dataGridContext.Items.GroupDescriptions, self );
-          self.PrepareDefaultStyleKey( dataGridContext.DataGridControl.GetView() );
-        }
-
-        self.InvalidateMeasure();
-      }
-    }
-
-    private static void OnDataItemChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = ( GroupLevelIndicatorPane )sender;
-      Debug.Assert( self != null );
-
-      var oldDataItemStore = ( DataItemDataProviderBase )e.OldValue;
-      var newDataItemStore = ( DataItemDataProviderBase )e.NewValue;
-
-      if( oldDataItemStore != null )
-      {
-        PropertyChangedEventManager.RemoveListener( oldDataItemStore, self, "Data" );
-      }
-
-      if( newDataItemStore != null )
-      {
-        PropertyChangedEventManager.AddListener( newDataItemStore, self, "Data" );
-      }
-
-      if( !newDataItemStore.IsEmpty )
-      {
-        self.InvalidateMeasure();
-      }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      //whenever the template gets "applied" I want to invalidate the stored Panel.
-      m_storedGroupLevelIndicatorPaneHost = null;
-    }
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( e.Property == GroupLevelIndicatorPane.GroupLevelProperty )
-      {
-        this.InvalidateMeasure();
-      }
-    }
-
-    private Panel RetrieveGroupLevelIndicatorPaneHostPanel()
-    {
-      //get the template part
-      return this.GetTemplateChild( "PART_GroupLevelIndicatorHost" ) as Panel;
-    }
-
-    private void InvalidateGroupLevelIndicatorPaneHostPanelMeasure()
-    {
-      UIElement container = this.GroupLevelIndicatorPaneHost;
-
-      while( ( container != null ) && ( container != this ) )
-      {
-        container.InvalidateMeasure();
-        container = VisualTreeHelper.GetParent( container ) as UIElement;
-      }
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.InvalidateMeasure();
-      }
-      else if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        var dataItemStore = sender as DataItemDataProviderBase;
-        if( ( dataItemStore != null ) && !dataItemStore.IsEmpty )
-        {
-          this.InvalidateMeasure();
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private class GroupLevelIndicatorConverter : IValueConverter
-    {
-      public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-      {
-        // When groupLevelConfig.GroupLevelIndicatorStyle exists, return it.
-        if( value != null )
-          return value;
-
-        // When groupLevelConfig.GroupLevelIndicatorStyle is null, try to find an implicit style
-        // for the GroupLevelIndicator in the resources.
-        var gli = ( GroupLevelIndicator )parameter;
-        var style = gli.TryFindResource( gli.GetType() );
-        if( style != null )
-          return style;
-
-        return value;
-      }
-
-      public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-      {
-        throw new NotSupportedException();
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationButton.cs
deleted file mode 100644
index 72b759e6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationButton.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class GroupNavigationButton : Button
-  {
-    #region CONSTRUCTORS
-
-    static GroupNavigationButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( 
-        typeof( GroupNavigationButton ), 
-        new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( TableView ), typeof( GroupNavigationButton ) ) ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata(
-        typeof( GroupNavigationButton ), new FrameworkPropertyMetadata( new PropertyChangedCallback( GroupNavigationButton.OnParentGridControlChanged ) ) );
-    }
-
-    public GroupNavigationButton()
-    {
-      this.Focusable = false;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region NavigateToGroup Command
-
-    public static readonly RoutedCommand NavigateToGroup =
-      new RoutedCommand( "NavigateToGroup", typeof( GroupNavigationButton ) );
-
-    #endregion NavigateToGroup Command
-
-    #region PROTECTED METHODS
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( GroupNavigationButton ) );
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region PRIVATE METHODS
-
-    private static void OnParentGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      GroupNavigationButton button = sender as GroupNavigationButton;
-
-      if( button == null )
-        return;
-
-      DataGridControl parentGridControl = e.NewValue as DataGridControl;
-
-      if( parentGridControl == null )
-        return;
-
-      button.PrepareDefaultStyleKey( parentGridControl.GetView() );
-    }
-
-    #endregion PRIVATE METHODS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControl.cs
deleted file mode 100644
index eabe4c86..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControl.cs
+++ /dev/null
@@ -1,433 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Windows.Media;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.DataGrid.Views;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_Button", Type = typeof( Button ) )]
-  [TemplatePart( Name = "PART_ToggleButton", Type = typeof( ToggleButton ) )]
-  [TemplatePart( Name = "PART_Popup", Type = typeof( Popup ) )]
-  [StyleTypedProperty( Property = "ItemContainerStyle", StyleTargetType = typeof( GroupNavigationControlItem ) )]
-  public class GroupNavigationControl : ItemsControl
-  {
-    #region CONSTRUCTORS
-
-    static GroupNavigationControl()
-    {
-      GroupNavigationControl.GroupProperty = GroupHeaderControl.GroupProperty.AddOwner( typeof( GroupNavigationControl ) );
-
-      DefaultStyleKeyProperty.OverrideMetadata(
-        typeof( GroupNavigationControl ),
-        new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( TableView ), typeof( GroupNavigationControl ) ) ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata(
-        typeof( GroupNavigationControl ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( GroupNavigationControl.OnParentGridControlChanged ) ) );
-
-      EventManager.RegisterClassHandler(
-        typeof( GroupNavigationControl ),
-        Mouse.LostMouseCaptureEvent,
-        new MouseEventHandler( GroupNavigationControl.OnLostMouseCapture ) );
-
-      EventManager.RegisterClassHandler(
-        typeof( GroupNavigationControl ),
-        Mouse.PreviewMouseDownEvent,
-        new MouseButtonEventHandler( GroupNavigationControl.OnPreviewMouseButtonDown ) );
-
-      EventManager.RegisterClassHandler(
-        typeof( GroupNavigationControl ),
-        Mouse.MouseDownEvent,
-        new MouseButtonEventHandler( GroupNavigationControl.OnMouseButtonDown ), true );
-
-      EventManager.RegisterClassHandler(
-        typeof( GroupNavigationControl ),
-        Mouse.MouseWheelEvent,
-        new MouseWheelEventHandler( GroupNavigationControl.OnMouseWheel ), true );
-    }
-
-    public GroupNavigationControl()
-    {
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region Group Property
-
-    public static readonly DependencyProperty GroupProperty;
-
-    public Group Group
-    {
-      get
-      {
-        return GroupHeaderControl.GetGroup( this );
-      }
-      set
-      {
-        GroupHeaderControl.SetGroup( this, value );
-      }
-    }
-
-    #endregion Group Property
-
-    #region MainItemTemplate Property
-
-    public static readonly DependencyProperty MainItemTemplateProperty = DependencyProperty.Register(
-      "MainItemTemplate",
-      typeof( DataTemplate ),
-      typeof( GroupNavigationControl ) );
-
-    public DataTemplate MainItemTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( GroupNavigationControl.MainItemTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( GroupNavigationControl.MainItemTemplateProperty, value );
-      }
-    }
-
-    #endregion MainItemTemplate Property
-
-    #region MainItemTemplateSelector Property
-
-    public static readonly DependencyProperty MainItemTemplateSelectorProperty = DependencyProperty.Register(
-      "MainItemTemplateSelector",
-      typeof( DataTemplateSelector ),
-      typeof( GroupNavigationControl ) );
-
-    public DataTemplateSelector MainItemTemplateSelector
-    {
-      get
-      {
-        return ( DataTemplateSelector )this.GetValue( GroupNavigationControl.MainItemTemplateSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( GroupNavigationControl.MainItemTemplateSelectorProperty, value );
-      }
-    }
-
-    #endregion MainItemTemplateSelector Property
-
-    #region MaxDropDownHeight Property
-
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(
-      "MaxDropDownHeight",
-      typeof( double ),
-      typeof( GroupNavigationControl ),
-      new FrameworkPropertyMetadata( SystemParameters.PrimaryScreenHeight / 3.0 ) );
-
-    public double MaxDropDownHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( GroupNavigationControl.MaxDropDownHeightProperty );
-      }
-      set
-      {
-        this.SetValue( GroupNavigationControl.MaxDropDownHeightProperty, value );
-      }
-    }
-
-    #endregion MaxDropDownHeight Property
-
-    #region IsDropDownOpen Property
-
-    [Browsable( false )]
-    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
-      "IsDropDownOpen",
-      typeof( bool ),
-      typeof( GroupNavigationControl ),
-      new FrameworkPropertyMetadata( new PropertyChangedCallback( GroupNavigationControl.OnIsDropDownOpenChanged ) ) );
-
-    [Browsable( false )]
-    public bool IsDropDownOpen
-    {
-      get
-      {
-        return ( bool )this.GetValue( GroupNavigationControl.IsDropDownOpenProperty );
-      }
-      set
-      {
-        this.SetValue( GroupNavigationControl.IsDropDownOpenProperty, value );
-      }
-    }
-
-    private static void OnIsDropDownOpenChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      GroupNavigationControl groupNavigationControl = ( GroupNavigationControl )sender;
-
-      if( ( bool )e.NewValue )
-      {
-        // To avoid lag while generating the control, we do 
-        // a late binding of the items.
-        if( groupNavigationControl.ItemsSource == null )
-        {
-          Group group = groupNavigationControl.DataContext as Group;
-          if( group != null )
-          {
-            groupNavigationControl.ItemsSource = group.SiblingGroups;
-          }
-        }
-
-        Mouse.Capture( groupNavigationControl, CaptureMode.SubTree );
-      }
-      else
-      {
-        groupNavigationControl.ItemsSource = null;
-
-        if( groupNavigationControl.IsKeyboardFocusWithin )
-        {
-          groupNavigationControl.Focus();
-        }
-
-        if( Mouse.Captured == groupNavigationControl )
-        {
-          Mouse.Capture( null );
-        }
-      }
-    }
-
-    #endregion IsDropDownOpen Property
-
-    #region PartButton Private Property
-
-    private Button PartButton
-    {
-      get;
-      set;
-    }
-
-    #endregion PartButton Private Property
-
-    #region PartToggleButton Private Property
-
-    private ToggleButton PartToggleButton
-    {
-      get;
-      set;
-    }
-
-    #endregion PartToggleButton Private Property
-
-    #region PartPopup Private Property
-
-    private Popup PartPopup
-    {
-      get;
-      set;
-    }
-
-    #endregion PartPopup Private Property
-
-    #region EVENT HANDLERS
-
-    private static void OnLostMouseCapture( object sender, MouseEventArgs e )
-    {
-      GroupNavigationControl groupNavigationControl = ( GroupNavigationControl )sender;
-
-      DependencyObject originalSource = e.OriginalSource as DependencyObject;
-
-      if( Mouse.Captured != groupNavigationControl )
-      {
-        if( e.OriginalSource == groupNavigationControl )
-        {
-          if( ( Mouse.Captured == null )
-            && ( Xceed.Utils.Wpf.TreeHelper.IsDescendantOf( originalSource, groupNavigationControl ) ) )
-          {
-            groupNavigationControl.Close();
-          }
-        }
-        else if( ( originalSource != null ) && ( Xceed.Utils.Wpf.TreeHelper.IsDescendantOf( originalSource, groupNavigationControl ) ) )
-        {
-          if( ( groupNavigationControl.IsDropDownOpen ) && ( Mouse.Captured == null ) )
-          {
-            Mouse.Capture( groupNavigationControl, CaptureMode.SubTree );
-            e.Handled = true;
-          }
-        }
-        else
-        {
-          groupNavigationControl.Close();
-        }
-      }
-    }
-
-    private static void OnPreviewMouseButtonDown( object sender, MouseButtonEventArgs e )
-    {
-      GroupNavigationControl groupNavigationControl = ( GroupNavigationControl )sender;
-      Visual originalSource = e.OriginalSource as Visual;
-
-      if( ( originalSource != null )
-        && ( groupNavigationControl.PartButton != null )
-        && ( groupNavigationControl.PartButton.IsAncestorOf( originalSource ) ) )
-      {
-        if( groupNavigationControl.IsDropDownOpen )
-        {
-          groupNavigationControl.Close();
-        }
-      }
-    }
-
-    private static void OnMouseButtonDown( object sender, MouseButtonEventArgs e )
-    {
-      GroupNavigationControl groupNavigationControl = ( GroupNavigationControl )sender;
-
-      if( !groupNavigationControl.IsKeyboardFocusWithin )
-      {
-        groupNavigationControl.Focus();
-      }
-
-      e.Handled = true;
-
-      if( ( Mouse.Captured == groupNavigationControl ) && ( e.OriginalSource == groupNavigationControl ) )
-      {
-        groupNavigationControl.Close();
-      }
-    }
-
-    private static void OnMouseWheel( object sender, MouseWheelEventArgs e )
-    {
-      GroupNavigationControl groupNavigationControl = ( GroupNavigationControl )sender;
-
-      if( groupNavigationControl.IsDropDownOpen )
-      {
-        // This is to avoid scrolling any other list if the drop down is open. 
-        // If not set, the grid could scroll while leaving the drop down in view. 
-        // The dorp down will then be left alone while the GroupNavigationControl 
-        // might not be in view anymore.
-        e.Handled = true;
-      }
-    }
-
-    private static void OnParentGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      GroupNavigationControl groupNavigationControl = sender as GroupNavigationControl;
-
-      if( groupNavigationControl == null )
-        return;
-
-      DataGridControl parentGridControl = e.NewValue as DataGridControl;
-
-      if( parentGridControl == null )
-        return;
-
-      groupNavigationControl.PrepareDefaultStyleKey( parentGridControl.GetView() );
-    }
-
-    #endregion EVENT HANDLERS
-
-    #region OVERRIDES
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      this.PartButton = this.GetTemplateChild( "PART_Button" ) as Button;
-      this.PartToggleButton = this.GetTemplateChild( "PART_ToggleButton" ) as ToggleButton;
-      this.PartPopup = this.GetTemplateChild( "PART_Popup" ) as Popup;
-    }
-
-    protected override DependencyObject GetContainerForItemOverride()
-    {
-      return new GroupNavigationControlItem( this );
-    }
-
-    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
-    {
-      base.PrepareContainerForItemOverride( element, item );
-
-      element.SetValue( GroupHeaderControl.GroupProperty, item );
-    }
-
-    protected override void ClearContainerForItemOverride( DependencyObject element, object item )
-    {
-      element.ClearValue( GroupHeaderControl.GroupProperty );
-
-      base.ClearContainerForItemOverride( element, item );
-    }
-
-    protected override void OnIsKeyboardFocusWithinChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnIsKeyboardFocusWithinChanged( e );
-
-      if( ( this.IsDropDownOpen )
-        && ( !base.IsKeyboardFocusWithin ) )
-      {
-        this.Close();
-      }
-    }
-
-    #endregion OVERRIDES
-
-    #region INTERNAL METHODS
-
-    internal void NotifyGroupNavigationControlItemMouseDown( GroupNavigationControlItem groupNavigationControlItem )
-    {
-    }
-
-    internal void NotifyGroupNavigationControlItemMouseUp( GroupNavigationControlItem groupNavigationControlItem )
-    {
-      Group group = groupNavigationControlItem.DataContext as Group;
-      if( group != null )
-      {
-        GroupNavigationButton.NavigateToGroup.Execute( group, this );
-      }
-
-      this.Close();
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PROTECTED METHODS
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( GroupNavigationControl ) );
-    }
-
-    #endregion PROTECTED METHODS
-
-    #region PRIVATE METHODS
-
-    private void Close()
-    {
-      if( this.IsDropDownOpen )
-      {
-        base.ClearValue( GroupNavigationControl.IsDropDownOpenProperty );
-
-        if( this.IsDropDownOpen )
-          this.IsDropDownOpen = false;
-      }
-    }
-
-    #endregion PRIVATE METHODS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControlItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControlItem.cs
deleted file mode 100644
index 45fc9666..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControlItem.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class GroupNavigationControlItem : ContentControl
-  {
-    #region CONSTRUCTORS
-
-    static GroupNavigationControlItem()
-    {
-      GroupNavigationControlItem.GroupProperty = GroupHeaderControl.GroupProperty.AddOwner( typeof( GroupNavigationControlItem ) );
-
-      DefaultStyleKeyProperty.OverrideMetadata(
-        typeof( GroupNavigationControlItem ),
-        new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( TableView ), typeof( GroupNavigationControlItem ) ) ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata(
-        typeof( GroupNavigationControlItem ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( GroupNavigationControlItem.OnParentGridControlChanged ) ) );
-    }
-
-    public GroupNavigationControlItem( GroupNavigationControl parentNavigationControl )
-    {
-      this.ParentNavigationControl = parentNavigationControl;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region ParentGroupNavigationControl Internal Property
-
-    internal GroupNavigationControl ParentNavigationControl
-    {
-      get;
-      private set;
-    }
-
-    #endregion ParentGroupNavigationControl Internal Property
-
-    #region Group Property
-
-    public static readonly DependencyProperty GroupProperty;
-
-    public Group Group
-    {
-      get
-      {
-        return GroupHeaderControl.GetGroup( this );
-      }
-    }
-
-    #endregion Group Property
-
-    #region OVERRIDES
-
-    protected override void OnMouseLeftButtonDown( System.Windows.Input.MouseButtonEventArgs e )
-    {
-      e.Handled = true;
-
-      if( this.ParentNavigationControl != null )
-      {
-        this.ParentNavigationControl.NotifyGroupNavigationControlItemMouseDown( this );
-      }
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( System.Windows.Input.MouseButtonEventArgs e )
-    {
-      e.Handled = true;
-
-      if( this.ParentNavigationControl != null )
-      {
-        this.ParentNavigationControl.NotifyGroupNavigationControlItemMouseUp( this );
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-
-    #endregion OVERRIDES
-
-    #region EVENT HANDLERS
-
-    private static void OnParentGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      GroupNavigationControlItem groupNavigationControlItem = sender as GroupNavigationControlItem;
-
-      if( groupNavigationControlItem == null )
-        return;
-
-      DataGridControl parentGridControl = e.NewValue as DataGridControl;
-
-      if( parentGridControl == null )
-        return;
-
-      groupNavigationControlItem.PrepareDefaultStyleKey( parentGridControl.GetView() );
-    }
-
-    #endregion EVENT HANDLERS
-
-    #region PROTECTED METHODS
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( GroupNavigationControlItem ) );
-    }
-
-    #endregion PROTECTED METHODS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupingHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupingHelper.cs
deleted file mode 100644
index efd70150..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupingHelper.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Data;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class GroupingHelper
-  {
-    public static bool HasGroup( DataGridContext dataGridContext )
-    {
-      if( dataGridContext.GroupLevelDescriptions.Count > 0 )
-        return true;
-
-      return GroupingHelper.HasGroup( dataGridContext.DetailConfigurations );
-    }
-
-    private static bool HasGroup( DetailConfigurationCollection configurations )
-    {
-      bool returnValue = false;
-
-      int detailConfigurationCount = configurations.Count;
-
-      for( int i = 0; i < detailConfigurationCount; i++ )
-      {
-        DetailConfiguration detailConfiguration = configurations[ i ];
-
-        if( detailConfiguration.DetailConfigurations != null )
-          returnValue = GroupingHelper.HasGroup( detailConfiguration.DetailConfigurations );
-
-        if( returnValue )
-          break;
-
-        returnValue = ( detailConfiguration.GroupLevelDescriptions.Count > 0 );
-
-        if( returnValue )
-          break;
-      }
-
-      return returnValue;
-    }
-
-    public static bool IsAlreadyGroupedBy( ColumnManagerCell cell )
-    {
-      DataGridContext cellDataGridContext = DataGridControl.GetDataGridContext( cell );
-
-      GroupLevelDescriptionCollection cellGroupLevelDescriptions = cellDataGridContext.GroupLevelDescriptions;
-
-      bool isAlreadyGroupedBy = false;
-      if( cellDataGridContext != null )
-      {
-        foreach( GroupLevelDescription description in cellGroupLevelDescriptions )
-        {
-          if( description.FieldName == cell.FieldName )
-          {
-            isAlreadyGroupedBy = true;
-            break;
-          }
-        }
-      }
-
-      return isAlreadyGroupedBy;
-    }
-
-    public static HierarchicalGroupByControl GetHierarchicalGroupByControl( UIElement element )
-    {
-      DependencyObject parent = TreeHelper.GetParent( element );
-
-      while( parent != null )
-      {
-        if( parent is HierarchicalGroupByControl )
-          break;
-
-        parent = TreeHelper.GetParent( parent );
-      }
-
-      return parent as HierarchicalGroupByControl;
-    }
-
-    public static int GetGroupDescriptionIndex( ObservableCollection<GroupDescription> groupDescriptions, GroupLevelDescription groupLevelDescription, DropMarkAlignment alignment )
-    {
-      int groupIndex = groupDescriptions.IndexOf( groupLevelDescription.GroupDescription );
-
-      if( groupIndex > -1 )
-      {
-        if( alignment == DropMarkAlignment.Far )
-          groupIndex++;
-
-        return groupIndex;
-      }
-      else
-      {
-        // return the size of the Collection if not found
-        return groupDescriptions.Count;
-      }
-    }
-
-    public static int GetGroupDescriptionIndexFromFieldName( DataGridContext dataGridContext, string fieldName, DropMarkAlignment alignment )
-    {
-      ObservableCollection<GroupDescription> groupDescriptions = dataGridContext.Items.GroupDescriptions;
-
-      for( int i = groupDescriptions.Count - 1; i >= 0; i-- )
-      {
-        if( DataGridContext.GetColumnNameFromGroupDescription( groupDescriptions[ i ] ) == fieldName )
-        {
-          if( alignment == DropMarkAlignment.Far )
-            i++;
-
-          return i;
-        }
-      }
-
-      return dataGridContext.Items.GroupDescriptions.Count;
-    }
-
-    public static bool IsColumnManagerCellInDataGridContext( DataGridContext dataGridContext, ColumnManagerCell cell )
-    {
-      DataGridContext cellDataGridContext = DataGridControl.GetDataGridContext( cell );
-
-      Debug.Assert( cellDataGridContext != null );
-
-      if( ( dataGridContext != null ) &&
-          ( cellDataGridContext != null ) &&
-          ( dataGridContext.GroupLevelDescriptions == cellDataGridContext.GroupLevelDescriptions ) )
-        return true;
-
-      return GroupingHelper.IsGroupLevelDescriptionsInDetailConfigurations( dataGridContext.DetailConfigurations, cellDataGridContext.GroupLevelDescriptions );
-    }
-
-    private static bool IsGroupLevelDescriptionsInDetailConfigurations( DetailConfigurationCollection configurations, GroupLevelDescriptionCollection groupLevelDescriptions )
-    {
-      bool returnValue = false;
-
-      int detailConfigurationCount = configurations.Count;
-
-      for( int i = 0; i < detailConfigurationCount; i++ )
-      {
-        DetailConfiguration detailConfiguration = configurations[ i ];
-
-        if( detailConfiguration.DetailConfigurations != null )
-          returnValue = GroupingHelper.IsGroupLevelDescriptionsInDetailConfigurations( detailConfiguration.DetailConfigurations, groupLevelDescriptions );
-
-        if( returnValue )
-          break;
-
-        returnValue = ( detailConfiguration.GroupLevelDescriptions == groupLevelDescriptions );
-
-        if( returnValue )
-          break;
-      }
-
-      return returnValue;
-    }
-
-    public static void AddNewGroupFromColumnManagerCell( ColumnManagerCell cell, GroupLevelDescription draggedOverDescription, DropMarkAlignment alignment, DataGridControl parentDataGridControl )
-    {
-      if( cell == null )
-        return;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( cell );
-      ColumnBase column = cell.ParentColumn;
-
-      if( ( dataGridContext == null ) ||
-          ( parentDataGridControl == null ) ||
-          ( column == null ) ||
-          ( parentDataGridControl != dataGridContext.DataGridControl ) )
-        return;
-
-      var addGroupCommand = dataGridContext.AddGroupCommand;
-
-      if( draggedOverDescription != null )
-      {
-        var position = GroupingHelper.GetGroupDescriptionIndexFromFieldName( dataGridContext, draggedOverDescription.FieldName, alignment );
-
-        if( addGroupCommand.CanExecute( column, position ) )
-        {
-          addGroupCommand.Execute( column, position );
-        }
-      }
-      else
-      {
-        if( addGroupCommand.CanExecute( column ) )
-        {
-          addGroupCommand.Execute( column );
-        }
-      }
-    }
-
-    public static void AppendNewGroupFromColumnManagerCell( ColumnManagerCell cell, DataGridControl parentDataGridControl )
-    {
-      GroupingHelper.AddNewGroupFromColumnManagerCell( cell, null, DropMarkAlignment.Far, parentDataGridControl );
-    }
-
-    public static void MoveGroupDescription( ColumnCollection targetColumns, ObservableCollection<GroupDescription> targetGroupDescriptions, GroupLevelDescription targetGroupLevelDescription, DropMarkAlignment targetAlignment, GroupLevelDescription movedGroupLevelDescription, DataGridControl parentDataGridControl )
-    {
-      Debug.Assert( targetColumns != null );
-      Debug.Assert( targetGroupDescriptions != null );
-      Debug.Assert( targetGroupLevelDescription != null );
-      Debug.Assert( movedGroupLevelDescription != null );
-
-      if( ( parentDataGridControl == null ) ||
-          ( targetColumns == null ) ||
-          ( targetGroupDescriptions == null ) ||
-          ( targetGroupLevelDescription == null ) ||
-          ( movedGroupLevelDescription == null ) )
-        return;
-
-      int oldPos = GroupingHelper.GetGroupDescriptionIndex( targetGroupDescriptions, movedGroupLevelDescription, DropMarkAlignment.Near );
-      int newPos = GroupingHelper.GetGroupDescriptionIndex( targetGroupDescriptions, targetGroupLevelDescription, targetAlignment );
-
-      if( newPos > oldPos )
-      {
-        newPos--;
-      }
-
-      if( newPos != oldPos )
-      {
-        Debug.Assert( oldPos < targetGroupDescriptions.Count );
-
-        using( parentDataGridControl.SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged ) )
-        {
-          targetGroupDescriptions.Move( oldPos, newPos );
-        }
-      }
-    }
-
-    public static void RemoveGroupDescription( ObservableCollection<GroupDescription> groupDescriptions, GroupLevelDescription groupLevelDescription, DataGridControl parentDataGridControl )
-    {
-      if( ( groupLevelDescription == null ) ||
-          ( parentDataGridControl == null ) )
-        return;
-
-      using( parentDataGridControl.SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged ) )
-      {
-        groupDescriptions.Remove( groupLevelDescription.GroupDescription );
-      }
-    }
-
-    public static bool ValidateMaxGroupDescriptions( DataGridContext draggedContext )
-    {
-      Debug.Assert( draggedContext != null );
-
-      int maxGroupDescriptionCount = -1;
-      int currentGroupDescriptionCount = -1;
-
-      CollectionView collectionView = draggedContext.Items;
-
-      if( collectionView == null )
-        return true;
-
-      ObservableCollection<GroupDescription> groupDescriptions = collectionView.GroupDescriptions;
-
-      if( groupDescriptions == null )
-        return true;
-
-      maxGroupDescriptionCount = draggedContext.MaxGroupLevels;
-      currentGroupDescriptionCount = groupDescriptions.Count;
-
-      return ( ( maxGroupDescriptionCount == -1 ) || ( currentGroupDescriptionCount < maxGroupDescriptionCount ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HashedLinkedList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HashedLinkedList.cs
deleted file mode 100644
index 39b93cec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HashedLinkedList.cs
+++ /dev/null
@@ -1,380 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class HashedLinkedList<T> : ICollection<T>, ICollection
-  {
-    #region Constructors
-
-    public HashedLinkedList()
-      : this( null )
-    {
-    }
-
-    public HashedLinkedList( IEnumerable<T> collection )
-    {
-      if( collection == null )
-      {
-        m_innerLinkedList = new LinkedList<T>();
-      }
-      else
-      {
-        m_innerLinkedList = new LinkedList<T>( collection );
-      }
-
-      m_nodeDictionary = new Dictionary<T, LinkedListNode<T>>( m_innerLinkedList.Count );
-
-      var node = m_innerLinkedList.First;
-
-      while( node != null )
-      {
-        var value = node.Value;
-
-        this.ValidateValue( value );
-
-        m_nodeDictionary.Add( value, node );
-      }
-    }
-
-    #endregion
-
-    #region Validation
-
-    private void ValidateNewNode( LinkedListNode<T> node )
-    {
-      if( node == null )
-        throw new ArgumentNullException( "node" );
-
-      this.ValidateValue( node.Value );
-    }
-
-    private void ValidateExistingNode( LinkedListNode<T> node )
-    {
-      if( node == null )
-        throw new ArgumentNullException( "node" );
-
-      if( node.List != m_innerLinkedList )
-        throw new InvalidOperationException( "The specified LinkedListNode does belong to this LinkedList." );
-    }
-
-    private void ValidateValue( T value )
-    {
-      if( value == null )
-        throw new InvalidOperationException( "Null values are not supported by the HashedLinkedList" );
-
-      if( m_nodeDictionary.ContainsKey( value ) )
-        throw new ArgumentException( "The HashedLinkedList already contains this value.", "value" );
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    public LinkedListNode<T> AddAfter( LinkedListNode<T> node, T value )
-    {
-      this.ValidateValue( value );
-
-      var newNode = m_innerLinkedList.AddAfter( node, value );
-
-      m_nodeDictionary.Add( value, newNode );
-
-      return newNode;
-    }
-
-    public void AddAfter( LinkedListNode<T> node, LinkedListNode<T> newNode )
-    {
-      this.ValidateNewNode( newNode );
-
-      m_innerLinkedList.AddAfter( node, newNode );
-
-      m_nodeDictionary.Add( newNode.Value, newNode );
-    }
-
-    public LinkedListNode<T> AddBefore( LinkedListNode<T> node, T value )
-    {
-      this.ValidateValue( value );
-
-      var newNode = m_innerLinkedList.AddBefore( node, value );
-
-      m_nodeDictionary.Add( value, newNode );
-
-      return newNode;
-    }
-
-    public void AddBefore( LinkedListNode<T> node, LinkedListNode<T> newNode )
-    {
-      this.ValidateNewNode( newNode );
-
-      m_innerLinkedList.AddBefore( node, newNode );
-
-      m_nodeDictionary.Add( newNode.Value, newNode );
-    }
-
-    public LinkedListNode<T> AddFirst( T value )
-    {
-      this.ValidateValue( value );
-
-      var newNode = m_innerLinkedList.AddFirst( value );
-
-      m_nodeDictionary.Add( value, newNode );
-
-      return newNode;
-    }
-
-    public void AddFirst( LinkedListNode<T> node )
-    {
-      this.ValidateNewNode( node );
-
-      m_innerLinkedList.AddFirst( node );
-
-      m_nodeDictionary.Add( node.Value, node );
-    }
-
-
-    public LinkedListNode<T> AddLast( T value )
-    {
-      this.ValidateValue( value );
-
-      var newNode = m_innerLinkedList.AddLast( value );
-
-      m_nodeDictionary.Add( value, newNode );
-
-      return newNode;
-    }
-
-    public void AddLast( LinkedListNode<T> node )
-    {
-      this.ValidateNewNode( node );
-
-      m_innerLinkedList.AddLast( node );
-
-      m_nodeDictionary.Add( node.Value, node );
-    }
-
-    public void Clear()
-    {
-      m_innerLinkedList.Clear();
-      m_nodeDictionary.Clear();
-    }
-
-    public bool Contains( T value )
-    {
-      return m_nodeDictionary.ContainsKey( value );
-    }
-
-    public void CopyTo( T[] array, int index )
-    {
-      m_innerLinkedList.CopyTo( array, index );
-    }
-
-    public LinkedListNode<T> Find( T value )
-    {
-      if( value == null )
-        return null;
-
-      LinkedListNode<T> node = null;
-
-      m_nodeDictionary.TryGetValue( value, out node );
-
-      return node;
-    }
-
-    public LinkedList<T>.Enumerator GetEnumerator()
-    {
-      return m_innerLinkedList.GetEnumerator();
-    }
-
-
-    public bool Remove( T value )
-    {
-      LinkedListNode<T> node = this.Find( value );
-
-      if( node != null )
-      {
-        this.Remove( node );
-        return true;
-      }
-
-      return false;
-    }
-
-    public void Remove( LinkedListNode<T> node )
-    {
-      m_innerLinkedList.Remove( node );
-      m_nodeDictionary.Remove( node.Value );
-    }
-
-    public void RemoveFirst()
-    {
-      this.Remove( this.First );
-    }
-
-    public void RemoveLast()
-    {
-      this.Remove( this.Last );
-    }
-
-    #endregion
-
-    #region Count Property
-
-    public int Count
-    {
-      get
-      {
-        return m_innerLinkedList.Count;
-      }
-    }
-
-    #endregion
-
-    #region First Property
-
-    public LinkedListNode<T> First
-    {
-      get
-      {
-        return m_innerLinkedList.First;
-      }
-    }
-
-
-    #endregion
-
-    #region Last Property
-
-    public LinkedListNode<T> Last
-    {
-      get
-      {
-        return m_innerLinkedList.Last;
-      }
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    private LinkedList<T> m_innerLinkedList;
-    private Dictionary<T, LinkedListNode<T>> m_nodeDictionary;
-
-    #endregion
-
-
-    #region ICollection<T> Members
-
-    void ICollection<T>.Add( T value )
-    {
-      this.AddLast( value );
-    }
-
-    void ICollection<T>.Clear()
-    {
-      this.Clear();
-    }
-
-    bool ICollection<T>.Contains( T value )
-    {
-      return this.Contains( value );
-    }
-
-    void ICollection<T>.CopyTo( T[] array, int arrayIndex )
-    {
-      this.CopyTo( array, arrayIndex );
-    }
-
-    int ICollection<T>.Count
-    {
-      get 
-      {
-        return this.Count;
-      }
-    }
-
-    bool ICollection<T>.IsReadOnly
-    {
-      get 
-      {
-        return false;
-      }
-    }
-
-    bool ICollection<T>.Remove( T value )
-    {
-      return this.Remove( value );
-    }
-
-    #endregion
-
-    #region IEnumerable<T> Members
-
-    IEnumerator<T> IEnumerable<T>.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    void ICollection.CopyTo( Array array, int index )
-    {
-      ( ( ICollection )m_innerLinkedList ).CopyTo( array, index );
-    }
-
-    int ICollection.Count
-    {
-      get 
-      {
-        return this.Count;
-      }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get 
-      {
-        return false; 
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get 
-      {
-        return ( ( ICollection )m_innerLinkedList ).SyncRoot;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs
deleted file mode 100644
index 3fdc5132..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs
+++ /dev/null
@@ -1,449 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class HeaderFooterItem : ContentPresenter, IDataGridItemContainer
-  {
-    #region Static Fields
-
-    private static readonly Binding m_sIsCurrentInternalBinding;
-    private static readonly Binding m_sItemIndexBinding;
-    private static readonly Binding m_sIsBeingEditedInternalBinding;
-    private static readonly Binding m_sHasValidationErrorInternalBinding;
-    private static readonly Binding m_sRowSelectorVisibleBinding;
-    private static readonly Binding m_sRowSelectorStyleBinding;
-
-    #endregion
-
-    static HeaderFooterItem()
-    {
-      KeyboardNavigation.TabNavigationProperty.OverrideMetadata( typeof( HeaderFooterItem ), new FrameworkPropertyMetadata( KeyboardNavigationMode.None ) );
-
-      HeaderFooterItem.ContainerProperty = ContainerPropertyKey.DependencyProperty;
-
-      m_sItemIndexBinding = new Binding();
-      m_sItemIndexBinding.RelativeSource = RelativeSource.Self;
-      m_sItemIndexBinding.Path = new PropertyPath( "(0).(1)", HeaderFooterItem.ContainerProperty, DataGridVirtualizingPanel.ItemIndexProperty );
-      m_sItemIndexBinding.Mode = BindingMode.OneWay;
-
-      m_sIsCurrentInternalBinding = new Binding();
-      m_sIsCurrentInternalBinding.RelativeSource = RelativeSource.Self;
-      m_sIsCurrentInternalBinding.Path = new PropertyPath( "(0).(1)", HeaderFooterItem.ContainerProperty, Row.IsCurrentProperty );
-      m_sIsCurrentInternalBinding.Mode = BindingMode.OneWay;
-
-      m_sIsBeingEditedInternalBinding = new Binding();
-      m_sIsBeingEditedInternalBinding.RelativeSource = RelativeSource.Self;
-      m_sIsBeingEditedInternalBinding.Path = new PropertyPath( "(0).(1)", HeaderFooterItem.ContainerProperty, Row.IsBeingEditedProperty );
-      m_sIsBeingEditedInternalBinding.Mode = BindingMode.OneWay;
-
-      m_sHasValidationErrorInternalBinding = new Binding();
-      m_sHasValidationErrorInternalBinding.RelativeSource = RelativeSource.Self;
-      m_sHasValidationErrorInternalBinding.Path = new PropertyPath( "(0).(1)", HeaderFooterItem.ContainerProperty, Row.HasValidationErrorProperty );
-      m_sHasValidationErrorInternalBinding.Mode = BindingMode.OneWay;
-
-      m_sRowSelectorVisibleBinding = new Binding();
-      m_sRowSelectorVisibleBinding.RelativeSource = RelativeSource.Self;
-      m_sRowSelectorVisibleBinding.Path = new PropertyPath( "(0).(1)", HeaderFooterItem.ContainerProperty, RowSelector.VisibleProperty );
-      m_sRowSelectorVisibleBinding.Mode = BindingMode.OneWay;
-
-      m_sRowSelectorStyleBinding = new Binding();
-      m_sRowSelectorStyleBinding.RelativeSource = RelativeSource.Self;
-      m_sRowSelectorStyleBinding.Path = new PropertyPath( "(0).(1)", HeaderFooterItem.ContainerProperty, RowSelector.RowSelectorStyleProperty );
-      m_sRowSelectorStyleBinding.Mode = BindingMode.OneWay;
-    }
-
-    internal HeaderFooterItem()
-    {
-      m_itemContainerManager = new DataGridItemContainerManager( this );
-
-      //to prevent creation of the headerfooteritem by anybody else than us.
-      BindingOperations.SetBinding( this, HeaderFooterItem.ItemIndexProperty, m_sItemIndexBinding );
-      BindingOperations.SetBinding( this, HeaderFooterItem.IsBeingEditedInternalProperty, m_sIsBeingEditedInternalBinding );
-      BindingOperations.SetBinding( this, HeaderFooterItem.IsCurrentInternalProperty, m_sIsCurrentInternalBinding );
-      BindingOperations.SetBinding( this, HeaderFooterItem.HasValidationErrorInternalProperty, m_sHasValidationErrorInternalBinding );
-
-      BindingOperations.SetBinding( this, RowSelector.VisibleProperty, m_sRowSelectorVisibleBinding );
-      BindingOperations.SetBinding( this, RowSelector.RowSelectorStyleProperty, m_sRowSelectorStyleBinding );
-    }
-
-    #region IsCurrentInternal Property
-
-    private static readonly DependencyProperty IsCurrentInternalProperty = DependencyProperty.Register(
-      "IsCurrentInternal",
-      typeof( bool ),
-      typeof( HeaderFooterItem ),
-      new FrameworkPropertyMetadata(
-        ( bool )false,
-        new PropertyChangedCallback( OnIsCurrentInternalChanged ) ) );
-
-    private static void OnIsCurrentInternalChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( HeaderFooterItem )d ).OnIsCurrentInternalChanged( e );
-    }
-
-    protected virtual void OnIsCurrentInternalChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.SetValue( Row.IsCurrentPropertyKey, e.NewValue );
-    }
-
-    #endregion
-
-    #region IsBeingEditedInternal Property
-
-    private static readonly DependencyProperty IsBeingEditedInternalProperty = DependencyProperty.Register(
-      "IsBeingEditedInternal",
-      typeof( bool ),
-      typeof( HeaderFooterItem ),
-      new FrameworkPropertyMetadata(
-        ( bool )false,
-        new PropertyChangedCallback( OnIsBeingEditedInternalChanged ) ) );
-
-    private static void OnIsBeingEditedInternalChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( HeaderFooterItem )d ).OnIsBeingEditedInternalChanged( e );
-    }
-
-    protected virtual void OnIsBeingEditedInternalChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.SetValue( Row.IsBeingEditedPropertyKey, e.NewValue );
-    }
-
-    #endregion
-
-    #region HasValidationErrorInternal Property
-
-    private static readonly DependencyProperty HasValidationErrorInternalProperty = DependencyProperty.Register(
-      "HasValidationErrorInternal",
-      typeof( bool ),
-      typeof( HeaderFooterItem ),
-      new FrameworkPropertyMetadata(
-        ( bool )false,
-        new PropertyChangedCallback( OnHasValidationErrorInternalChanged ) ) );
-
-    private static void OnHasValidationErrorInternalChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( HeaderFooterItem )d ).OnHasValidationErrorInternalChanged( e );
-    }
-
-    protected virtual void OnHasValidationErrorInternalChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.SetValue( Row.HasValidationErrorPropertyKey, e.NewValue );
-    }
-
-    #endregion
-
-    #region IsCurrent Property
-
-    public static readonly DependencyProperty IsCurrentProperty = Row.IsCurrentProperty.AddOwner( typeof( HeaderFooterItem ) );
-
-    public bool IsCurrent
-    {
-      get
-      {
-        return ( bool )this.GetValue( IsCurrentProperty );
-      }
-    }
-
-    #endregion
-
-    #region IsBeingEdited Property
-
-    public static readonly DependencyProperty IsBeingEditedProperty = Row.IsBeingEditedProperty.AddOwner( typeof( HeaderFooterItem ) );
-
-    public bool IsBeingEdited
-    {
-      get
-      {
-        return ( bool )this.GetValue( IsBeingEditedProperty );
-      }
-    }
-
-    #endregion
-
-    #region HasValidationError Property
-
-    public static readonly DependencyProperty HasValidationErrorProperty = Row.HasValidationErrorProperty.AddOwner( typeof( HeaderFooterItem ) );
-
-    public bool HasValidationError
-    {
-      get
-      {
-        return ( bool )this.GetValue( HasValidationErrorProperty );
-      }
-    }
-
-    #endregion
-
-    #region ItemIndex Property
-
-    public static readonly DependencyProperty ItemIndexProperty = DataGridVirtualizingPanel.ItemIndexProperty.AddOwner( typeof( HeaderFooterItem ) );
-
-    #endregion
-
-    #region Container Property
-
-    private static readonly DependencyPropertyKey ContainerPropertyKey = DependencyProperty.RegisterReadOnly(
-      "Container",
-      typeof( DependencyObject ),
-      typeof( HeaderFooterItem ),
-      new FrameworkPropertyMetadata( ( DependencyObject )null ) );
-
-    public static readonly DependencyProperty ContainerProperty;
-
-    public DependencyObject Container
-    {
-      get
-      {
-        return ( DependencyObject )this.GetValue( ContainerProperty );
-      }
-    }
-
-    private void SetContainer( DependencyObject value )
-    {
-      this.SetValue( ContainerPropertyKey, value );
-    }
-
-    #endregion
-
-    #region CanBeRecycled Protected Property
-
-    protected virtual bool CanBeRecycled
-    {
-      get
-      {
-        if( this.IsKeyboardFocused
-          || this.IsKeyboardFocusWithin
-          || this.IsBeingEdited )
-          return false;
-
-        return m_itemContainerManager.CanBeRecycled;
-      }
-    }
-
-    #endregion
-
-    #region VisualRootElementType Property
-
-    internal Type VisualRootElementType
-    {
-      get
-      {
-        Type elementType = null;
-        DataTemplate template = m_initializingDataItem as DataTemplate;
-
-        if( template == null )
-        {
-          template = this.ContentTemplate;
-        }
-
-        if( ( template != null ) && ( template.VisualTree != null ) )
-        {
-          elementType = template.VisualTree.Type;
-        }
-
-        if( elementType == null )
-        {
-          Visual visual = this.AsVisual();
-
-          if( visual == null )
-          {
-            //this will force the control to apply the content template "inline"...
-            this.ApplyTemplate();
-
-            visual = this.AsVisual();
-          }
-
-          Debug.Assert( visual != null );
-
-          if( visual != null )
-          {
-            elementType = visual.GetType();
-          }
-        }
-
-        return elementType;
-      }
-    }
-
-    #endregion
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      m_itemContainerManager.Update();
-    }
-
-    public Visual AsVisual()
-    {
-      if( this.VisualChildrenCount == 0 )
-        return null;
-
-      return this.GetVisualChild( 0 );
-    }
-
-
-    protected void PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      m_initializingDataGridContext = dataGridContext;
-      m_initializingDataItem = item;
-
-      if( !this.IsLoaded )
-      {
-        if( dataGridContext.DataGridControl.ItemsHost.IsAncestorOf( this ) )
-        {
-          this.ApplyTemplate();
-          this.PrepareContainerWorker();
-        }
-        else
-        {
-          // When a HeaderFooterItem is in the FixedHeaders or FixedFooters of the grid,
-          // we must prepare the container only when the container is loaded so that the
-          // TableView.CanScrollHorizontallyProperty attached property is taken into consideration.
-          m_loadedHandler = this.HeaderFooterItem_Loaded;
-          this.Loaded += m_loadedHandler;
-        }
-      }
-      else
-      {
-        this.PrepareContainerWorker();
-      }
-    }
-
-    protected void ClearContainer()
-    {
-      if( !m_isRecyclingCandidate )
-      {
-        // Ensure we removed the HeaderFooterItem_Loaded event handler if it was not yet loaded
-        if( m_loadedHandler != null )
-        {
-          this.Loaded -= m_loadedHandler;
-          m_loadedHandler = null;
-        }
-      }
-
-      m_itemContainerManager.Clear( m_isRecyclingCandidate );
-    }
-
-    protected override void OnIsKeyboardFocusWithinChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnIsKeyboardFocusWithinChanged( e );
-
-      //In this case, since the first visual child is not a row, I want to stub the IsCurrent property with the KeyboardFocus.
-      Row row = this.AsVisual() as Row;
-
-      if( row == null )
-      {
-        this.SetValue( IsCurrentInternalProperty, e.NewValue );
-      }
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      base.OnMouseLeftButtonDown( e );
-
-      if( !e.Handled )
-      {
-        e.Handled = DataGridControl.SetFocusUIElementHelper( this );
-      }
-    }
-
-    private void HeaderFooterItem_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( m_loadedHandler != null )
-      {
-        this.Loaded -= m_loadedHandler;
-        m_loadedHandler = null;
-      }
-
-      this.PrepareContainerWorker();
-      //Bind properties that CAN be bound (if the DataTemplate instantiated a Row as first visual child )
-    }
-
-    private void PrepareContainerWorker()
-    {
-      m_isRecyclingCandidate = false;
-
-      var rootContainer = this.AsVisual();
-
-      this.SetContainer( rootContainer );
-
-      m_itemContainerManager.Prepare( m_initializingDataGridContext, m_initializingDataItem );
-
-      m_initializingDataGridContext = null;
-      m_initializingDataItem = null;
-    }
-
-    #region IDataGridItemContainer Members
-
-    bool IDataGridItemContainer.CanBeRecycled
-    {
-      get
-      {
-        return this.CanBeRecycled;
-      }
-    }
-
-    bool IDataGridItemContainer.IsRecyclingCandidate
-    {
-      get
-      {
-        return m_isRecyclingCandidate;
-      }
-      set
-      {
-        m_isRecyclingCandidate = value;
-      }
-    }
-
-    void IDataGridItemContainer.PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      this.PrepareContainer( dataGridContext, item );
-    }
-
-    void IDataGridItemContainer.ClearContainer()
-    {
-      this.ClearContainer();
-    }
-
-    void IDataGridItemContainer.CleanRecyclingCandidate()
-    {
-      m_itemContainerManager.CleanRecyclingCandidates();
-    }
-
-    #endregion
-
-    private readonly DataGridItemContainerManager m_itemContainerManager;
-    private DataGridContext m_initializingDataGridContext; // = null
-    private object m_initializingDataItem; // = null
-    private RoutedEventHandler m_loadedHandler;
-    private bool m_isRecyclingCandidate;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs
deleted file mode 100644
index 2304dcba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs
+++ /dev/null
@@ -1,665 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Media;
-using Xceed.Utils.Wpf.DragDrop;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_HierarchicalGroupByControlTreeView", Type = typeof( TreeView ) )]
-  public class HierarchicalGroupByControl : Control, IDropTarget, INotifyPropertyChanged
-  {
-    #region CONSTRUCTORS
-
-    static HierarchicalGroupByControl()
-    {
-      // This DefaultStyleKey will only be used in design-time.
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( HierarchicalGroupByControl ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( HierarchicalGroupByControl ) ) ) );
-
-      // Default binding to HierarchicalGroupByControl value
-      FrameworkElementFactory staircaseFactory = new FrameworkElementFactory( typeof( StaircasePanel ) );
-      ItemsPanelTemplate itemsPanelTemplate = new ItemsPanelTemplate( staircaseFactory );
-
-      Binding binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControl.ConnectionLineAlignmentProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = RelativeSource.Self;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLineAlignmentProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControl.ConnectionLineOffsetProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = RelativeSource.Self;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLineOffsetProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControl.ConnectionLinePenProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = RelativeSource.Self;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLinePenProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControl.StairHeightProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = RelativeSource.Self;
-      staircaseFactory.SetBinding( StaircasePanel.StairHeightProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControl.StairSpacingProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = RelativeSource.Self;
-      staircaseFactory.SetBinding( StaircasePanel.StairSpacingProperty, binding );
-
-      itemsPanelTemplate.Seal();
-
-      ItemsControl.ItemsPanelProperty.OverrideMetadata( typeof( HierarchicalGroupByControl ), new FrameworkPropertyMetadata( itemsPanelTemplate ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( HierarchicalGroupByControl ), new FrameworkPropertyMetadata( new PropertyChangedCallback( HierarchicalGroupByControl.ParentGridControlChangedCallback ) ) );
-      FocusableProperty.OverrideMetadata( typeof( HierarchicalGroupByControl ), new FrameworkPropertyMetadata( false ) );
-
-    }
-
-    #endregion
-
-    #region AllowGroupingModification Property
-
-    public static readonly DependencyProperty AllowGroupingModificationProperty =
-      GroupByControl.AllowGroupingModificationProperty.AddOwner( typeof( HierarchicalGroupByControl ), new UIPropertyMetadata( true ) );
-
-    public bool AllowGroupingModification
-    {
-      get
-      {
-        return ( bool )this.GetValue( HierarchicalGroupByControl.AllowGroupingModificationProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControl.AllowGroupingModificationProperty, value );
-      }
-    }
-
-    #endregion AllowGroupingModification Property
-
-    #region AllowSort Property
-
-    public static readonly DependencyProperty AllowSortProperty =
-        ColumnManagerRow.AllowSortProperty.AddOwner( typeof( HierarchicalGroupByControl ), new UIPropertyMetadata( true ) );
-
-    public bool AllowSort
-    {
-      get
-      {
-        return ( bool )this.GetValue( HierarchicalGroupByControl.AllowSortProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControl.AllowSortProperty, value );
-      }
-    }
-
-    #endregion AllowSort Property
-
-    #region ConnectionLineAlignment Property
-
-    public static readonly DependencyProperty ConnectionLineAlignmentProperty =
-      StaircasePanel.ConnectionLineAlignmentProperty.AddOwner( typeof( HierarchicalGroupByControl ) );
-
-    public ConnectionLineAlignment ConnectionLineAlignment
-    {
-      get
-      {
-        return ( ConnectionLineAlignment )this.GetValue( HierarchicalGroupByControl.ConnectionLineAlignmentProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControl.ConnectionLineAlignmentProperty, value );
-      }
-    }
-
-    #endregion ConnectionLineAlignment Property
-
-    #region ConnectionLineOffset Property
-
-    public static readonly DependencyProperty ConnectionLineOffsetProperty =
-      StaircasePanel.ConnectionLineOffsetProperty.AddOwner( typeof( HierarchicalGroupByControl ) );
-
-    public double ConnectionLineOffset
-    {
-      get
-      {
-        return ( double )this.GetValue( HierarchicalGroupByControl.ConnectionLineOffsetProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControl.ConnectionLineOffsetProperty, value );
-      }
-    }
-
-    #endregion ConnectionLineOffset Property
-
-    #region ConnectionLinePen Property
-
-    public static readonly DependencyProperty ConnectionLinePenProperty =
-      StaircasePanel.ConnectionLinePenProperty.AddOwner( typeof( HierarchicalGroupByControl ) );
-
-    public Pen ConnectionLinePen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( HierarchicalGroupByControl.ConnectionLinePenProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControl.ConnectionLinePenProperty, value );
-      }
-    }
-
-    #endregion ConnectionLinePen Property
-
-    #region StairHeight Property
-
-    public static readonly DependencyProperty StairHeightProperty =
-      StaircasePanel.StairHeightProperty.AddOwner( typeof( HierarchicalGroupByControl ) );
-
-    public double StairHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( HierarchicalGroupByControl.StairHeightProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControl.StairHeightProperty, value );
-      }
-    }
-
-    #endregion StairHeight Property
-
-    #region StairSpacing Property
-
-    public static readonly DependencyProperty StairSpacingProperty =
-      StaircasePanel.StairSpacingProperty.AddOwner( typeof( HierarchicalGroupByControl ) );
-
-    public double StairSpacing
-    {
-      get
-      {
-        return ( double )this.GetValue( HierarchicalGroupByControl.StairSpacingProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControl.StairSpacingProperty, value );
-      }
-    }
-
-    #endregion StairSpacing Property
-
-    #region HasGroups
-
-    public bool HasGroups
-    {
-      get
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        if( dataGridContext == null )
-          return false;
-
-        // We only display the NoGroupContent if the HierarchicalGroupByControl is at the master level
-        if( dataGridContext.ParentDataGridContext != null )
-          return false;
-
-        // We look for GroupLevelDescription in the DataGridContext and all details
-        return ( GroupingHelper.HasGroup( dataGridContext ) == false );
-      }
-    }
-
-    #endregion
-
-    #region NoGroupContent Property
-
-    public static readonly DependencyProperty NoGroupContentProperty =
-      GroupByControl.NoGroupContentProperty.AddOwner(
-        typeof( HierarchicalGroupByControl ),
-        new PropertyMetadata( "Drag a column header here to group by that column." ) );
-
-    public object NoGroupContent
-    {
-      get
-      {
-        return this.GetValue( HierarchicalGroupByControl.NoGroupContentProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControl.NoGroupContentProperty, value );
-      }
-    }
-
-    #endregion NoGroupContent Property
-
-    #region PROTECTED INTERNAL METHODS
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( HierarchicalGroupByControl ) );
-    }
-
-    #endregion
-
-    #region PRIVATE STATIC METHODS
-
-    private static HierarchicalGroupByControlNode GetHierarchicalGroupByControlNode( UIElement element )
-    {
-      HierarchicalGroupByControlNode hierarchicalGroupByControlNode = element as HierarchicalGroupByControlNode;
-
-      if( hierarchicalGroupByControlNode != null )
-        return hierarchicalGroupByControlNode;
-
-      int childCount = VisualTreeHelper.GetChildrenCount( element );
-
-      for( int i = 0; i < childCount; i++ )
-      {
-        UIElement child = VisualTreeHelper.GetChild( element, i ) as UIElement;
-
-        if( child != null )
-          hierarchicalGroupByControlNode = HierarchicalGroupByControl.GetHierarchicalGroupByControlNode( child );
-
-        if( hierarchicalGroupByControlNode != null )
-          break;
-      }
-
-      return hierarchicalGroupByControlNode;
-    }
-
-    private static TreeViewItem GetTreeViewItemFromGroupLevelDescriptionCollection( TreeViewItem rootItem, GroupLevelDescriptionCollection groupLevelDescriptions )
-    {
-      TreeViewItem returned = null;
-      Debug.Assert( rootItem != null );
-      Debug.Assert( groupLevelDescriptions != null );
-
-      if( rootItem == null )
-        throw new DataGridInternalException( "rootItem is null." );
-
-      foreach( object item in rootItem.Items )
-      {
-        TreeViewItem child = rootItem.ItemContainerGenerator.ContainerFromItem( item ) as TreeViewItem;
-
-        // It may not be visible
-        if( child == null )
-          continue;
-
-        DetailConfiguration detailConfiguration = child.Header as DetailConfiguration;
-
-        if( detailConfiguration == null )
-          throw new DataGridInternalException( "The item's DataContext must be a DetailConfiguration except for the top-most HierarchicalGroupByControl, which contains a DataGridContext." );
-
-        if( groupLevelDescriptions == detailConfiguration.GroupLevelDescriptions )
-        {
-          returned = child;
-          break;
-        }
-
-        returned = HierarchicalGroupByControl.GetTreeViewItemFromGroupLevelDescriptionCollection( child, groupLevelDescriptions );
-
-        if( returned != null )
-          break;
-      }
-
-      return returned;
-    }
-
-    private static TreeViewItem GetTreeViewItemFromGroupLevelDescription( TreeViewItem rootItem, GroupLevelDescription groupLevelDescription )
-    {
-      TreeViewItem returned = null;
-      Debug.Assert( rootItem != null );
-      Debug.Assert( groupLevelDescription != null );
-
-      if( rootItem == null )
-        throw new DataGridInternalException( "rootItem is null." );
-
-      foreach( object item in rootItem.Items )
-      {
-        TreeViewItem child = rootItem.ItemContainerGenerator.ContainerFromItem( item ) as TreeViewItem;
-
-        Debug.Assert( child != null );
-        if( child == null )
-          throw new DataGridInternalException( "An item does not contain a valid item." );
-
-        DetailConfiguration detailConfiguration = child.Header as DetailConfiguration;
-
-        if( detailConfiguration == null )
-          throw new DataGridInternalException( "An item's DataContext must be a DetailConfiguration except for the top-most HierarchicalGroupByControl, which contains a DataGridContext." );
-
-        if( detailConfiguration.GroupLevelDescriptions.Contains( groupLevelDescription ) )
-        {
-          returned = child;
-          break;
-        }
-
-        returned = HierarchicalGroupByControl.GetTreeViewItemFromGroupLevelDescription( child, groupLevelDescription );
-
-        if( returned != null )
-          break;
-      }
-
-      return returned;
-    }
-
-    private static void ParentGridControlChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridControl parentDataGrid = e.NewValue as DataGridControl;
-      HierarchicalGroupByControl groupByControl = ( HierarchicalGroupByControl )sender;
-
-      if( parentDataGrid != null )
-        groupByControl.PrepareDefaultStyleKey( parentDataGrid.GetView() );
-    }
-
-    #endregion
-
-    #region INTERNAL METHODS
-
-    internal HierarchicalGroupByControlNode GetHierarchicalGroupByControlNodeFromColumnManagerCell( ColumnManagerCell cell )
-    {
-      Debug.Assert( cell != null );
-      if( cell == null )
-        return null;
-
-      DataGridContext cellDataGridContext = DataGridControl.GetDataGridContext( cell );
-
-      if( cellDataGridContext == null )
-        throw new DataGridInternalException( "A DataGridContext cannot be null on ColumnManagerCell." );
-
-      TreeView treeView = this.GetTemplateChild( @"PART_HierarchicalGroupByControlTreeView" ) as TreeView;
-
-      if( treeView == null )
-        return null;
-
-      if( treeView.Items.Count == 0 )
-        throw new DataGridInternalException( "The HierarchicalGroupByControl should contain at least one grouping level." );
-
-      // The first item is always the top level HierarchicalGroupByControlNode
-      TreeViewItem rootItem = treeView.ItemContainerGenerator.ContainerFromItem( treeView.Items[ 0 ] ) as TreeViewItem;
-
-      // It may not be visible
-      if( rootItem == null )
-        return null;
-
-      TreeViewItem dropMarkedTreeViewItem = null;
-
-      DataGridContext rootDataGridContext = rootItem.Header as DataGridContext;
-
-      if( ( rootDataGridContext != null ) && ( rootDataGridContext.GroupLevelDescriptions == cellDataGridContext.GroupLevelDescriptions ) )
-      {
-        dropMarkedTreeViewItem = rootItem;
-      }
-      else
-      {
-        GroupLevelDescriptionCollection groupLevelDescriptions = cellDataGridContext.GroupLevelDescriptions;
-
-        dropMarkedTreeViewItem = HierarchicalGroupByControl.GetTreeViewItemFromGroupLevelDescriptionCollection( rootItem, groupLevelDescriptions );
-      }
-
-      // If null, it means the cell does not belong to this detail
-      if( dropMarkedTreeViewItem == null )
-        return null;
-
-      ContentPresenter treeViewItemHeader = dropMarkedTreeViewItem.Template.FindName( "PART_Header", dropMarkedTreeViewItem ) as ContentPresenter;
-
-      // It may not be visible
-      if( treeViewItemHeader == null )
-        return null;
-
-      HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByControl.GetHierarchicalGroupByControlNode( treeViewItemHeader );
-
-      return hierarchicalGroupByControlNode;
-    }
-
-    internal HierarchicalGroupByControlNode GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( HierarchicalGroupByItem hierarchicalGroupByItem )
-    {
-      Debug.Assert( hierarchicalGroupByItem != null );
-      if( hierarchicalGroupByItem == null )
-        return null;
-
-      TreeView treeView = this.GetTemplateChild( @"PART_HierarchicalGroupByControlTreeView" ) as TreeView;
-
-      if( treeView == null )
-        return null;
-
-      if( treeView.Items.Count == 0 )
-        throw new DataGridInternalException( "The HierarchicalGroupByControl should contain at least one grouping level." );
-
-      // The first item is always the top level HierarchicalGroupByControlNode
-      TreeViewItem rootItem = treeView.ItemContainerGenerator.ContainerFromItem( treeView.Items[ 0 ] ) as TreeViewItem;
-
-      if( rootItem == null )
-        throw new DataGridInternalException( "The root item is null." );
-
-      GroupLevelDescription detailGroupLevelDescription = hierarchicalGroupByItem.Content as GroupLevelDescription;
-
-      Debug.Assert( detailGroupLevelDescription != null );
-
-      TreeViewItem dropMarkedTreeViewItem = null;
-
-      DataGridContext rootDataGridContext = rootItem.Header as DataGridContext;
-
-      Debug.Assert( rootDataGridContext != null );
-
-      if( rootDataGridContext.GroupLevelDescriptions.Contains( detailGroupLevelDescription ) )
-      {
-        dropMarkedTreeViewItem = rootItem;
-      }
-      else
-      {
-        dropMarkedTreeViewItem = HierarchicalGroupByControl.GetTreeViewItemFromGroupLevelDescription( rootItem, detailGroupLevelDescription );
-      }
-
-
-      // If null, it means the cell does not belong to this detail
-      if( dropMarkedTreeViewItem == null )
-        return null;
-
-      ContentPresenter treeViewItemHeader = dropMarkedTreeViewItem.Template.FindName( "PART_Header", dropMarkedTreeViewItem ) as ContentPresenter;
-
-      Debug.Assert( treeViewItemHeader != null );
-      if( treeViewItemHeader == null )
-        throw new DataGridInternalException( "An error occurred while retrieving the PART_Header template part of an item containing a HierarchicalGroupByControlNode." );
-
-      HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByControl.GetHierarchicalGroupByControlNode( treeViewItemHeader );
-
-      return hierarchicalGroupByControlNode;
-    }
-
-    #endregion
-
-    #region IDropTarget Members
-
-
-    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      bool canDrop = this.AllowGroupingModification;
-
-      ColumnManagerCell cell = null;
-      HierarchicalGroupByItem hierarchicalGroupByItem = null;
-
-      if( canDrop )
-      {
-        cell = draggedElement as ColumnManagerCell;
-
-        if( cell != null )
-        {
-          ColumnBase parentColumn = cell.ParentColumn;
-
-          if( ( parentColumn == null ) || ( !parentColumn.AllowGroup ) )
-            return false;
-
-          // Check if already grouped using the cell's DataGridContext
-          canDrop = !GroupingHelper.IsAlreadyGroupedBy( cell );
-
-          if( canDrop )
-          {
-            DataGridContext thisDataGridContext = DataGridControl.GetDataGridContext( this );
-
-            if( thisDataGridContext.Items != null )
-              canDrop = thisDataGridContext.Items.CanGroup;
-
-            if( canDrop )
-            {
-              canDrop = GroupingHelper.IsColumnManagerCellInDataGridContext( thisDataGridContext, cell );
-
-              if( canDrop == true )
-                canDrop = GroupingHelper.ValidateMaxGroupDescriptions( DataGridControl.GetDataGridContext( draggedElement ) );
-            }
-          }
-        }
-        else
-        {
-          hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-
-          if( hierarchicalGroupByItem == null )
-            canDrop = false;
-
-          if( canDrop )
-          {
-            // Try to get the HierarchicalGroupByControlNode in which this HierarchicalGroupByItem can be added using the parent HierarchicalGroupByControl => null it can't
-            HierarchicalGroupByControlNode draggedHierarchicalGroupByControlNode = this.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-            if( draggedHierarchicalGroupByControlNode == null )
-              canDrop = false;
-          }
-        }
-      }
-
-      bool returnedValue = ( ( cell != null ) || ( hierarchicalGroupByItem != null ) ) && // ColumnManagerCell or HierarchicalGroupByItem 
-                            ( canDrop );
-
-
-      return returnedValue;
-    }
-
-    void IDropTarget.DragEnter( UIElement draggedElement )
-    {
-    }
-
-    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      if( cell != null )
-      {
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = this.GetHierarchicalGroupByControlNodeFromColumnManagerCell( cell );
-
-        // It may not be visible
-        if( hierarchicalGroupByControlNode != null )
-          hierarchicalGroupByControlNode.ShowFarDropMark( cell, mousePosition );
-      }
-      else
-      {
-        HierarchicalGroupByItem hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-        if( hierarchicalGroupByItem == null )
-          return;
-
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = this.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-        Debug.Assert( hierarchicalGroupByControlNode != null, "CanDrop should have returned false" );
-        if( hierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-        hierarchicalGroupByControlNode.ShowFarDropMark( mousePosition );
-      }
-    }
-
-    void IDropTarget.DragLeave( UIElement draggedElement )
-    {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      if( cell != null )
-      {
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = this.GetHierarchicalGroupByControlNodeFromColumnManagerCell( cell );
-
-        // It may not be visible
-        if( hierarchicalGroupByControlNode != null )
-          hierarchicalGroupByControlNode.HideFarDropMark();
-      }
-      else
-      {
-        HierarchicalGroupByItem hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-        if( hierarchicalGroupByItem == null )
-          return;
-
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = this.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-        Debug.Assert( hierarchicalGroupByControlNode != null, "CanDrop should have returned false" );
-        if( hierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-        hierarchicalGroupByControlNode.HideFarDropMark();
-      }
-    }
-
-    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      if( cell == null )
-        return;
-
-      HierarchicalGroupByControlNode hierarchicalGroupByControlNode = this.GetHierarchicalGroupByControlNodeFromColumnManagerCell( cell );
-
-      // It may not be visible
-      if( hierarchicalGroupByControlNode != null )
-        hierarchicalGroupByControlNode.HideFarDropMark( cell );
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl parentGrid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      GroupingHelper.AppendNewGroupFromColumnManagerCell( cell, parentGrid );
-
-      // Notify groups have changed for NoGroupContent    
-      this.UpdateHasGroups();
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    internal void UpdateHasGroups()
-    {
-      this.OnPropertyChanged( "HasGroups" );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs
deleted file mode 100644
index 5963ef4a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs
+++ /dev/null
@@ -1,911 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Media;
-using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class HierarchicalGroupByControlNode : ItemsControl, IDropTarget
-  {
-    #region CONSTRUCTORS
-
-    static HierarchicalGroupByControlNode()
-    {
-      // Default binding to HierarchicalGroupByControlNode value
-      FrameworkElementFactory staircaseFactory = new FrameworkElementFactory( typeof( StaircasePanel ) );
-      ItemsPanelTemplate itemsPanelTemplate = new ItemsPanelTemplate( staircaseFactory );
-      RelativeSource ancestorSource = new RelativeSource( RelativeSourceMode.FindAncestor, typeof( HierarchicalGroupByControl ), 1 );
-
-      Binding binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControlNode.ConnectionLineAlignmentProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLineAlignmentProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControlNode.ConnectionLineOffsetProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLineOffsetProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControlNode.ConnectionLinePenProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.ConnectionLinePenProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControlNode.StairHeightProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.StairHeightProperty, binding );
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( HierarchicalGroupByControlNode.StairSpacingProperty );
-      binding.Mode = BindingMode.OneWay;
-      binding.RelativeSource = ancestorSource;
-      staircaseFactory.SetBinding( StaircasePanel.StairSpacingProperty, binding );
-
-      itemsPanelTemplate.Seal();
-
-      ItemsControl.ItemsPanelProperty.OverrideMetadata( typeof( HierarchicalGroupByControlNode ), new FrameworkPropertyMetadata( itemsPanelTemplate ) );
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( HierarchicalGroupByControlNode ), new FrameworkPropertyMetadata( new PropertyChangedCallback( HierarchicalGroupByControlNode.ParentGridControlChangedCallback ) ) );
-      FocusableProperty.OverrideMetadata( typeof( HierarchicalGroupByControlNode ), new FrameworkPropertyMetadata( false ) );
-    }
-
-    #endregion
-
-    #region AllowGroupingModification Property
-
-    public static readonly DependencyProperty AllowGroupingModificationProperty =
-        GroupByControl.AllowGroupingModificationProperty.AddOwner( typeof( HierarchicalGroupByControlNode ), new UIPropertyMetadata( true ) );
-
-    public bool AllowGroupingModification
-    {
-      get
-      {
-        return ( bool )this.GetValue( HierarchicalGroupByControlNode.AllowGroupingModificationProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControlNode.AllowGroupingModificationProperty, value );
-      }
-    }
-
-    #endregion AllowGroupingModification Property
-
-    #region AllowSort Property
-
-    public static readonly DependencyProperty AllowSortProperty =
-        ColumnManagerRow.AllowSortProperty.AddOwner( typeof( HierarchicalGroupByControlNode ), new UIPropertyMetadata( true ) );
-
-    public bool AllowSort
-    {
-      get
-      {
-        return ( bool )this.GetValue( HierarchicalGroupByControlNode.AllowSortProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControlNode.AllowSortProperty, value );
-      }
-    }
-
-    #endregion AllowSort Property
-
-    #region ConnectionLineAlignment Property
-
-    public static readonly DependencyProperty ConnectionLineAlignmentProperty =
-      StaircasePanel.ConnectionLineAlignmentProperty.AddOwner( typeof( HierarchicalGroupByControlNode ) );
-
-    public ConnectionLineAlignment ConnectionLineAlignment
-    {
-      get
-      {
-        return ( ConnectionLineAlignment )this.GetValue( HierarchicalGroupByControlNode.ConnectionLineAlignmentProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControlNode.ConnectionLineAlignmentProperty, value );
-      }
-    }
-
-    #endregion ConnectionLineAlignment Property
-
-    #region ConnectionLineOffset Property
-
-    public static readonly DependencyProperty ConnectionLineOffsetProperty =
-      StaircasePanel.ConnectionLineOffsetProperty.AddOwner( typeof( HierarchicalGroupByControlNode ) );
-
-    public double ConnectionLineOffset
-    {
-      get
-      {
-        return ( double )this.GetValue( HierarchicalGroupByControlNode.ConnectionLineOffsetProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControlNode.ConnectionLineOffsetProperty, value );
-      }
-    }
-
-    #endregion ConnectionLineOffset Property
-
-    #region ConnectionLinePen Property
-
-    public static readonly DependencyProperty ConnectionLinePenProperty =
-      StaircasePanel.ConnectionLinePenProperty.AddOwner( typeof( HierarchicalGroupByControlNode ) );
-
-    public Pen ConnectionLinePen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( HierarchicalGroupByControlNode.ConnectionLinePenProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControlNode.ConnectionLinePenProperty, value );
-      }
-    }
-
-    #endregion ConnectionLinePen Property
-
-    #region StairHeight Property
-
-    public static readonly DependencyProperty StairHeightProperty =
-      StaircasePanel.StairHeightProperty.AddOwner( typeof( HierarchicalGroupByControlNode ) );
-
-    public double StairHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( HierarchicalGroupByControlNode.StairHeightProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControlNode.StairHeightProperty, value );
-      }
-    }
-
-    #endregion StairHeight Property
-
-    #region StairSpacing Property
-
-    public static readonly DependencyProperty StairSpacingProperty =
-      StaircasePanel.StairSpacingProperty.AddOwner( typeof( HierarchicalGroupByControlNode ) );
-
-    public double StairSpacing
-    {
-      get
-      {
-        return ( double )this.GetValue( HierarchicalGroupByControlNode.StairSpacingProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControlNode.StairSpacingProperty, value );
-      }
-    }
-
-    #endregion StairSpacing Property
-
-    #region NoGroupContent Property
-
-    public static readonly DependencyProperty NoGroupContentProperty =
-      GroupByControl.NoGroupContentProperty.AddOwner(
-        typeof( HierarchicalGroupByControlNode ),
-        new PropertyMetadata( "Drag a column header here to group by that column." ) );
-
-    public object NoGroupContent
-    {
-      get
-      {
-        return this.GetValue( HierarchicalGroupByControlNode.NoGroupContentProperty );
-      }
-      set
-      {
-        this.SetValue( HierarchicalGroupByControlNode.NoGroupContentProperty, value );
-      }
-    }
-
-    #endregion NoGroupContent Property
-
-    #region Title
-
-    public object Title
-    {
-      get
-      {
-        return ( object )GetValue( TitleProperty );
-      }
-      set
-      {
-        SetValue( TitleProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty TitleProperty =
-        DependencyProperty.Register( "Title", typeof( object ), typeof( HierarchicalGroupByControlNode ) );
-
-    #endregion
-
-    // INTERNAL PROPERTIES
-
-    #region DataGridContext Property
-
-    internal DataGridContext DataGridContext
-    {
-      get
-      {
-        DataGridContext dataGridContext = this.DataContext as DataGridContext;
-
-        if( dataGridContext != null )
-          return dataGridContext;
-
-        DetailConfiguration configuration = this.DetailConfiguration;
-
-        if( configuration == null )
-          return null;
-
-        // Ensure to get a DataGridContext created with the same DetailConfiguration
-        return HierarchicalGroupByControlNode.GetDataGridContextFromDetailConfiguration( configuration,
-          DataGridControl.GetDataGridContext( this ) );
-      }
-    }
-
-    #endregion
-
-    #region DetailConfiguration Property
-
-    internal DetailConfiguration DetailConfiguration
-    {
-      get
-      {
-        return this.DataContext as DetailConfiguration;
-      }
-    }
-
-    #endregion
-
-    #region Columns Property
-
-    internal ColumnCollection Columns
-    {
-      get
-      {
-        ColumnCollection columnsCollection = null;
-        DetailConfiguration detailConfiguration = this.DetailConfiguration;
-
-        if( detailConfiguration != null )
-        {
-          columnsCollection = detailConfiguration.Columns;
-        }
-        else
-        {
-          DataGridContext dataGridContext = this.DataGridContext;
-
-          if( dataGridContext != null )
-            columnsCollection = dataGridContext.Columns;
-        }
-        Debug.Assert( ( columnsCollection != null ) || ( DesignerProperties.GetIsInDesignMode( this ) ) );
-        return columnsCollection;
-      }
-    }
-
-    #endregion
-
-    #region GroupDescriptions Property
-
-    internal ObservableCollection<GroupDescription> GroupDescriptions
-    {
-      get
-      {
-        ObservableCollection<GroupDescription> groupDescriptions = null;
-        DetailConfiguration detailConfiguration = this.DetailConfiguration;
-
-        if( detailConfiguration != null )
-        {
-          groupDescriptions = detailConfiguration.GroupDescriptions;
-        }
-        else
-        {
-          DataGridContext dataGridContext = this.DataGridContext;
-
-          groupDescriptions = dataGridContext.Items.GroupDescriptions;
-        }
-        Debug.Assert( groupDescriptions != null );
-        return groupDescriptions;
-      }
-    }
-
-    #endregion
-
-    #region GroupLevelDescriptions Property
-
-    internal GroupLevelDescriptionCollection GroupLevelDescriptions
-    {
-      get
-      {
-        GroupLevelDescriptionCollection groupLevelDescriptions = null;
-        DetailConfiguration detailConfiguration = this.DetailConfiguration;
-
-        if( detailConfiguration != null )
-        {
-          groupLevelDescriptions = detailConfiguration.GroupLevelDescriptions;
-        }
-        else
-        {
-          DataGridContext dataGridContext = this.DataGridContext;
-
-          groupLevelDescriptions = dataGridContext.GroupLevelDescriptions;
-        }
-
-        if( groupLevelDescriptions == null )
-          throw new DataGridInternalException( "GroupLevelDescriptions cannot be null on " + typeof( HierarchicalGroupByControlNode ).Name + "." );
-
-        return groupLevelDescriptions;
-      }
-    }
-
-    #endregion
-
-    #region SortDescriptions Property
-
-    internal SortDescriptionCollection SortDescriptions
-    {
-      get
-      {
-        SortDescriptionCollection sortDescriptions = null;
-        DetailConfiguration detailConfiguration = this.DetailConfiguration;
-
-        if( detailConfiguration != null )
-        {
-          sortDescriptions = detailConfiguration.SortDescriptions;
-        }
-        else
-        {
-          DataGridContext dataGridContext = this.DataGridContext;
-
-          sortDescriptions = dataGridContext.Items.SortDescriptions;
-        }
-
-        if( sortDescriptions == null )
-          throw new DataGridInternalException( "GroupLevelDescriptions cannot be null on " + typeof( HierarchicalGroupByControlNode ).Name + "." );
-
-        return sortDescriptions;
-      }
-    }
-
-    #endregion
-
-    #region PROTECTED METHODS
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( HierarchicalGroupByControlNode ) );
-    }
-
-    protected override DependencyObject GetContainerForItemOverride()
-    {
-      return new HierarchicalGroupByItem();
-    }
-
-    protected override bool IsItemItsOwnContainerOverride( object item )
-    {
-      return item is HierarchicalGroupByItem;
-    }
-
-    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl grid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      base.PrepareContainerForItemOverride( element, item );
-
-      if( grid != null )
-      {
-        HierarchicalGroupByItem groupByItem = ( HierarchicalGroupByItem )element;
-        groupByItem.PrepareDefaultStyleKey( grid.GetView() );
-      }
-    }
-
-    #endregion
-
-    #region PRIVATE STATIC METHODS
-
-    private static void ParentGridControlChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridControl parentDataGrid = e.NewValue as DataGridControl;
-      HierarchicalGroupByControlNode groupByControl = ( HierarchicalGroupByControlNode )sender;
-
-      if( parentDataGrid != null )
-        groupByControl.PrepareDefaultStyleKey( parentDataGrid.GetView() );
-    }
-
-    private static DataGridContext GetDataGridContextFromDetailConfiguration(
-    DetailConfiguration configuration,
-    DataGridContext parentDataGridContext )
-    {
-      if( ( configuration == null ) || ( parentDataGridContext == null ) )
-        return null;
-
-      if( parentDataGridContext.SourceDetailConfiguration == configuration )
-        return parentDataGridContext;
-
-      foreach( DataGridContext childContext in parentDataGridContext.GetChildContexts() )
-      {
-        DataGridContext foundContext =
-          HierarchicalGroupByControlNode.GetDataGridContextFromDetailConfiguration( configuration,
-            childContext );
-
-        if( foundContext != null )
-          return foundContext;
-      }
-
-      return null;
-    }
-
-    #endregion
-
-    #region INTERNAL METHODS
-
-    internal bool IsGroupingModificationAllowed
-    {
-      get
-      {
-        HierarchicalGroupByControl hierarchicalGroupByControl = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-        // By default, we can since DataGridCollectionView.CanGroup always return true
-        // but we rely on the HierarchicalGroupByControl.AllowGroupModification value
-        bool allowGroupingModification = hierarchicalGroupByControl.AllowGroupingModification;
-        if( allowGroupingModification == true )
-        {
-          DataGridContext dataGridContext = this.DataGridContext;
-
-          Debug.Assert( dataGridContext != null );
-
-          if( ( dataGridContext != null ) && ( dataGridContext.SourceDetailConfiguration == null ) )
-          {
-            allowGroupingModification = dataGridContext.Items.CanGroup;
-          }
-        }
-
-        return allowGroupingModification;
-      }
-    }
-
-    internal void ShowFarDropMark( ColumnManagerCell cell, RelativePoint mousePosition )
-    {
-      Debug.Assert( cell != null );
-      if( cell == null )
-        return;
-
-      DataGridContext cellDataGridContext = DataGridControl.GetDataGridContext( cell );
-
-      Debug.Assert( cellDataGridContext != null );
-      if( cellDataGridContext == null )
-        throw new DataGridInternalException( "DataGridContext cannot be null on ColumnManagerCell." );
-
-      // We already have GroupLevelDescriptions for this level, we should show DropMark on the last HierarchicalGroupByItem
-      if( cellDataGridContext.GroupLevelDescriptions.Count > 0 )
-      {
-        Debug.Assert( cellDataGridContext.GroupLevelDescriptions == this.GroupLevelDescriptions );
-
-        if( cellDataGridContext.GroupLevelDescriptions != this.GroupLevelDescriptions )
-          return;
-
-        int lastIndex = this.GroupLevelDescriptions.Count - 1;
-
-        // If there
-        if( lastIndex > -1 )
-        {
-          HierarchicalGroupByItem hierarchicalGroupByItem = this.ItemContainerGenerator.ContainerFromItem( this.GroupLevelDescriptions[ lastIndex ] ) as HierarchicalGroupByItem;
-
-          Debug.Assert( hierarchicalGroupByItem != null );
-          if( hierarchicalGroupByItem == null )
-            return;
-
-          hierarchicalGroupByItem.ShowFarDropMark( mousePosition );
-        }
-        else
-        {
-          this.ShowFarDropMark( mousePosition );
-        }
-      }
-      else
-      {
-        this.ShowFarDropMark( mousePosition );
-      }
-    }
-
-    internal void ShowFarDropMark( RelativePoint mousePosition )
-    {
-      int itemsCount = this.Items.Count;
-      if( itemsCount < 1 )
-      {
-        if( m_dropMarkAdorner == null )
-        {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          DataGridControl grid = ( dataGridContext != null )
-            ? dataGridContext.DataGridControl
-            : null;
-
-          Pen pen = UIViewBase.GetDropMarkPen( this );
-
-          if( ( pen == null ) && ( grid != null ) )
-          {
-            UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-            pen = uiViewBase.DefaultDropMarkPen;
-          }
-
-          DropMarkOrientation orientation = UIViewBase.GetDropMarkOrientation( this );
-
-          if( ( orientation == DropMarkOrientation.Default ) && ( grid != null ) )
-          {
-            UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-
-            orientation = uiViewBase.DefaultDropMarkOrientation;
-          }
-
-          m_dropMarkAdorner = new DropMarkAdorner( this, pen, orientation );
-
-          AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-          if( adornerLayer != null )
-          {
-            adornerLayer.Add( m_dropMarkAdorner );
-          }
-        }
-
-        // We Only want the drop mark to be displayed at the end of the HierarchicalGroupByControlNode
-        m_dropMarkAdorner.Alignment = DropMarkAlignment.Far;
-      }
-      else
-      {
-        HierarchicalGroupByItem hierarchicalGroupByItem = this.ItemContainerGenerator.ContainerFromIndex( itemsCount - 1 ) as HierarchicalGroupByItem;
-
-        Debug.Assert( hierarchicalGroupByItem != null );
-
-        GroupLevelDescription groupLevelDescription = hierarchicalGroupByItem.Content as GroupLevelDescription;
-
-        Debug.Assert( groupLevelDescription != null );
-
-        // Show Far DropMark only if not already grouped
-        if( !this.Items.Contains( groupLevelDescription ) )
-        {
-          hierarchicalGroupByItem.ShowFarDropMark( mousePosition );
-        }
-      }
-    }
-
-    internal void HideFarDropMark()
-    {
-      int itemsCount = this.Items.Count;
-      if( itemsCount > 0 )
-      {
-        HierarchicalGroupByItem hierarchicalGroupByItem = null;
-        if( itemsCount > 1 )
-        {
-          // Hide the before last item's DropMark if any in case
-          hierarchicalGroupByItem = this.ItemContainerGenerator.ContainerFromIndex( itemsCount - 2 ) as HierarchicalGroupByItem;
-
-          Debug.Assert( hierarchicalGroupByItem != null );
-
-          if( hierarchicalGroupByItem != null )
-            hierarchicalGroupByItem.HideDropMark();
-        }
-
-        // Hide last item's DropMark if any
-        hierarchicalGroupByItem = this.ItemContainerGenerator.ContainerFromIndex( itemsCount - 1 ) as HierarchicalGroupByItem;
-
-        Debug.Assert( hierarchicalGroupByItem != null );
-
-        if( hierarchicalGroupByItem != null )
-          hierarchicalGroupByItem.HideDropMark();
-      }
-
-      if( m_dropMarkAdorner != null )
-      {
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-        if( adornerLayer != null )
-          adornerLayer.Remove( m_dropMarkAdorner );
-
-        m_dropMarkAdorner = null;
-      }
-    }
-
-    internal void HideFarDropMark( ColumnManagerCell cell )
-    {
-      Debug.Assert( cell != null );
-      if( cell == null )
-        return;
-
-      DataGridContext cellDataGridContext = DataGridControl.GetDataGridContext( cell );
-
-      Debug.Assert( cellDataGridContext != null );
-      if( cellDataGridContext == null )
-        throw new DataGridInternalException( "DataGridContext cannot be null on ColumnManagerCell." );
-
-      this.HideFarDropMark();
-
-      // We already have GroupLevelDescriptions for this level, we should show DropMark on the last HierarchicalGroupByItem
-      if( cellDataGridContext.GroupLevelDescriptions.Count > 0 )
-      {
-        Debug.Assert( cellDataGridContext.GroupLevelDescriptions == this.GroupLevelDescriptions );
-
-        if( cellDataGridContext.GroupLevelDescriptions != this.GroupLevelDescriptions )
-          return;
-
-        int lastIndex = this.GroupLevelDescriptions.Count - 1;
-
-        if( lastIndex > -1 )
-        {
-          HierarchicalGroupByItem hierarchicalGroupByItem = this.ItemContainerGenerator.ContainerFromItem( this.GroupLevelDescriptions[ lastIndex ] ) as HierarchicalGroupByItem;
-
-          Debug.Assert( hierarchicalGroupByItem != null );
-          if( hierarchicalGroupByItem == null )
-            return;
-
-          hierarchicalGroupByItem.HideDropMark();
-        }
-      }
-    }
-
-    #endregion
-
-    #region IDropTarget Members
-
-    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      ColumnManagerCell cell = null;
-      HierarchicalGroupByItem hierarchicalGroupByItem = null;
-      bool canDrop = this.AllowGroupingModification;
-
-      if( canDrop )
-      {
-        cell = draggedElement as ColumnManagerCell;
-
-        if( cell != null )
-        {
-          ColumnBase parentColumn = cell.ParentColumn;
-
-          if( ( parentColumn == null ) || ( !parentColumn.AllowGroup ) )
-            return false;
-
-          // Check if already grouped using the cell's DataGridContext
-          canDrop = !GroupingHelper.IsAlreadyGroupedBy( cell );
-
-          if( canDrop )
-          {
-
-            // Get the HierarchicalGroupByControl for this HierarchicalGroupByControlNode
-            HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-            if( parentGBC == null )
-              throw new DataGridInternalException( "The hierarchical group-by control node must be rooted by a HierarchicalGroupByControl." );
-
-            DataGridContext parentGBCDataGridContext = DataGridControl.GetDataGridContext( parentGBC );
-
-            Debug.Assert( parentGBCDataGridContext != null );
-
-            if( parentGBCDataGridContext.Items != null )
-              canDrop = parentGBCDataGridContext.Items.CanGroup;
-
-            if( canDrop )
-            {
-              canDrop = GroupingHelper.IsColumnManagerCellInDataGridContext( parentGBCDataGridContext, cell );
-
-              if( canDrop == true )
-              {
-                canDrop = GroupingHelper.ValidateMaxGroupDescriptions( DataGridControl.GetDataGridContext( draggedElement ) );
-              }
-            }
-          }
-        }
-        else
-        {
-          hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-
-          if( hierarchicalGroupByItem == null )
-            canDrop = false;
-
-          if( canDrop )
-          {
-            HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-            if( parentGBC == null )
-              throw new DataGridInternalException( "The hierarchical group-by control node must be rooted by a HierarchicalGroupByControl." );
-
-            // Try to get the HierarchicalGroupByControlNode in which this HierarchicalGroupByItem can be added using the parent HierarchicalGroupByControl => null it can't
-            HierarchicalGroupByControlNode draggedHierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-            if( draggedHierarchicalGroupByControlNode == null )
-              canDrop = false;
-          }
-        }
-      }
-
-      bool returnedValue = ( ( cell != null ) || ( hierarchicalGroupByItem != null ) ) &&// ColumnManagerCell or HierarchicalGroupByItem
-                           ( canDrop );
-
-
-      return returnedValue;
-    }
-
-    void IDropTarget.DragEnter( UIElement draggedElement )
-    {
-    }
-
-    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      if( cell != null )
-      {
-        HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-        if( parentGBC == null )
-          throw new DataGridInternalException( "The hierarchical group-by control node must be rooted by a HierarchicalGroupByControl." );
-
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromColumnManagerCell( cell );
-
-        if( hierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-        hierarchicalGroupByControlNode.ShowFarDropMark( cell, mousePosition );
-      }
-      else
-      {
-        HierarchicalGroupByItem hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-        if( hierarchicalGroupByItem == null )
-          return;
-
-        HierarchicalGroupByControlNode draggedHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( hierarchicalGroupByItem );
-
-        if( draggedHierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "draggedHierarchicalGroupByControlNode is null." );
-
-        if( draggedHierarchicalGroupByControlNode.GroupLevelDescriptions == this.GroupLevelDescriptions )
-        {
-          this.ShowFarDropMark( mousePosition );
-        }
-        else
-        {
-          // This HierarchicalGroupByItem does not belong this parent HierarchicalGroupByControlNode, display the DropMark on the correct one
-          HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-          if( parentGBC == null )
-            throw new DataGridInternalException( "The hierarchical group-by control node must be rooted by a HierarchicalGroupByControl." );
-
-          HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-          Debug.Assert( hierarchicalGroupByControlNode != null, "CanDrop should have returned false" );
-          if( hierarchicalGroupByControlNode == null )
-            throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-          hierarchicalGroupByControlNode.ShowFarDropMark( mousePosition );
-        }
-      }
-    }
-
-    void IDropTarget.DragLeave( UIElement draggedElement )
-    {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      if( cell != null )
-      {
-        HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-        if( parentGBC == null )
-          throw new DataGridInternalException( "The hierarchical group-by control node must be rooted by a HierarchicalGroupByControl." );
-
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromColumnManagerCell( cell );
-
-        if( hierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-        hierarchicalGroupByControlNode.HideFarDropMark( cell );
-      }
-      else
-      {
-        HierarchicalGroupByItem hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-        if( hierarchicalGroupByItem == null )
-          return;
-
-        HierarchicalGroupByControlNode draggedHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( hierarchicalGroupByItem );
-
-        if( draggedHierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "draggedHierarchicalGroupByControlNode is null." );
-
-        if( draggedHierarchicalGroupByControlNode.GroupLevelDescriptions == this.GroupLevelDescriptions )
-        {
-          this.HideFarDropMark();
-        }
-        else
-        {
-          // This HierarchicalGroupByItem does not belong this parent HierarchicalGroupByControlNode, display the DropMark on the correct one
-          HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-          Debug.Assert( parentGBC != null );
-          if( parentGBC == null )
-            throw new DataGridInternalException( "The hierarchical group-by control node must be rooted by a HierarchicalGroupByControl" );
-
-          HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-          Debug.Assert( hierarchicalGroupByControlNode != null, "CanDrop should have returned false" );
-          if( hierarchicalGroupByControlNode == null )
-            throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-          hierarchicalGroupByControlNode.HideFarDropMark();
-        }
-      }
-    }
-
-    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      if( cell == null )
-        return;
-
-      HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-      if( parentGBC == null )
-        throw new DataGridInternalException( "The hierarchical group-by control node must be rooted by a HierarchicalGroupByControl." );
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl parentGrid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      GroupingHelper.AppendNewGroupFromColumnManagerCell( cell, parentGrid );
-
-      // Notify groups have changed for NoGroupContent    
-      parentGBC.UpdateHasGroups();
-
-      HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromColumnManagerCell( cell );
-
-      if( hierarchicalGroupByControlNode == null )
-        return;
-
-      hierarchicalGroupByControlNode.HideFarDropMark( cell );
-
-      this.HideFarDropMark();
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private DropMarkAdorner m_dropMarkAdorner;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs
deleted file mode 100644
index e28af749..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs
+++ /dev/null
@@ -1,1148 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Utils.Wpf;
-using Xceed.Utils.Wpf.DragDrop;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class HierarchicalGroupByItem : ButtonBase, INotifyPropertyChanged, IDropTarget
-  {
-    #region CONSTRUCTORS
-
-    static HierarchicalGroupByItem()
-    {
-      // This DefaultStyleKey will only be used in design-time.
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( HierarchicalGroupByItem ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( HierarchicalGroupByItem ) ) ) );
-
-      HierarchicalGroupByItem.IsBeingDraggedProperty = HierarchicalGroupByItem.IsBeingDraggedPropertyKey.DependencyProperty;
-
-      FocusableProperty.OverrideMetadata( typeof( HierarchicalGroupByItem ), new FrameworkPropertyMetadata( false ) );
-    }
-
-    #endregion
-
-    #region IsBeingDragged Read-Only Property
-
-    private static readonly DependencyPropertyKey IsBeingDraggedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsBeingDragged", typeof( bool ), typeof( HierarchicalGroupByItem ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsBeingDraggedProperty;
-
-    public bool IsBeingDragged
-    {
-      get
-      {
-        return ( bool )this.GetValue( HierarchicalGroupByItem.IsBeingDraggedProperty );
-      }
-    }
-
-    private void SetIsBeingDragged( bool value )
-    {
-      this.SetValue( HierarchicalGroupByItem.IsBeingDraggedPropertyKey, value );
-    }
-
-    #endregion IsBeingDragged Read-Only Property
-
-    #region ParentColumns Property
-
-    internal ColumnCollection ParentColumns
-    {
-      get
-      {
-        ColumnCollection columnCollection = null;
-
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        Debug.Assert( ( hierarchicalGroupByControlNode != null ) || ( DesignerProperties.GetIsInDesignMode( this ) ) );
-
-        if( hierarchicalGroupByControlNode != null )
-        {
-          columnCollection = hierarchicalGroupByControlNode.Columns;
-        }
-
-        if( ( columnCollection == null ) && ( !DesignerProperties.GetIsInDesignMode( this ) ) )
-          throw new DataGridInternalException( "The " + typeof( HierarchicalGroupByItem ).Name + "'s ParentColumns cannot be null." );
-
-        return columnCollection;
-      }
-    }
-
-    #endregion
-
-    #region ParentGroupDescriptions Property
-
-    internal ObservableCollection<GroupDescription> ParentGroupDescriptions
-    {
-      get
-      {
-        ObservableCollection<GroupDescription> groupDescriptions = null;
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        Debug.Assert( hierarchicalGroupByControlNode != null );
-        if( hierarchicalGroupByControlNode != null )
-        {
-          groupDescriptions = hierarchicalGroupByControlNode.GroupDescriptions;
-        }
-
-        if( groupDescriptions == null )
-          throw new DataGridInternalException( "The " + typeof( HierarchicalGroupByItem ).Name + "'s ParentGroupDescriptions cannot be null." );
-
-        return groupDescriptions;
-      }
-    }
-
-    #endregion
-
-    #region ParentGroupLevelDescriptions Property
-
-    private GroupLevelDescriptionCollection ParentGroupLevelDescriptions
-    {
-      get
-      {
-        GroupLevelDescriptionCollection groupLevelDescriptions = null;
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        if( hierarchicalGroupByControlNode != null )
-        {
-          groupLevelDescriptions = hierarchicalGroupByControlNode.GroupLevelDescriptions;
-        }
-        else
-        {
-          DataGridContext dataGridContext = this.ParentDataGridContext;
-          if( dataGridContext == null )
-            throw new DataGridInternalException( "The " + typeof( HierarchicalGroupByItem ).Name + "'s DataGridContext cannot be null." );
-          groupLevelDescriptions = dataGridContext.GroupLevelDescriptions;
-        }
-
-        if( groupLevelDescriptions == null )
-          throw new DataGridInternalException( "The " + typeof( HierarchicalGroupByItem ).Name + "'s ParentGroupLevelDescriptions cannot be null." );
-
-        return groupLevelDescriptions;
-      }
-    }
-
-    #endregion
-
-    #region ParentSortDescriptions Property
-
-    private SortDescriptionCollection ParentSortDescriptions
-    {
-      get
-      {
-        SortDescriptionCollection sortDescriptions = null;
-
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        if( hierarchicalGroupByControlNode != null )
-        {
-          sortDescriptions = hierarchicalGroupByControlNode.SortDescriptions;
-        }
-        else
-        {
-          DataGridContext dataGridContext = this.ParentDataGridContext;
-          if( dataGridContext == null )
-            throw new DataGridInternalException( "The " + typeof( HierarchicalGroupByItem ).Name + "'s DataGridContext cannot be null." );
-          sortDescriptions = dataGridContext.Items.SortDescriptions;
-        }
-
-        if( sortDescriptions == null )
-          throw new DataGridInternalException( "The " + typeof( HierarchicalGroupByItem ).Name + "'s ParentSortDescriptions cannot be null." );
-
-        return sortDescriptions;
-      }
-    }
-
-    #endregion
-
-    #region SortDirection Property
-
-    // Only used to bind between Column and us, but we don't want to expose it publicly
-    private static readonly DependencyProperty SortDirectionInternalProperty =
-        DependencyProperty.Register( "SortDirectionInternal", typeof( SortDirection ), typeof( HierarchicalGroupByItem ), new PropertyMetadata( SortDirection.None, new PropertyChangedCallback( HierarchicalGroupByItem.OnSortDirectionInternalChanged ) ) );
-
-    public SortDirection SortDirection
-    {
-      get
-      {
-        return ( SortDirection )this.GetValue( HierarchicalGroupByItem.SortDirectionInternalProperty );
-      }
-    }
-
-    private static void OnSortDirectionInternalChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      HierarchicalGroupByItem groupByItem = ( HierarchicalGroupByItem )sender;
-      groupByItem.OnPropertyChanged( new PropertyChangedEventArgs( "SortDirection" ) );
-    }
-
-    #endregion SortDirection Property
-
-    #region Drag & Drop Manager METHODS
-
-    private void SetupDragManager()
-    {
-      // We do not support DragDrop when there are no AdornerLayer because there wouldn't 
-      // be any visual feedback for the operation.
-      if( AdornerLayer.GetAdornerLayer( this ) == null )
-        return;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl dataGridControl = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      // Can be null in design-time (edition of a style TargetType HierarchicalGroupByItem ).
-      if( dataGridControl == null )
-        return;
-
-      Debug.Assert( m_dragSourceManager == null, "There might be problems when there is already a m_dragSourceManager." );
-
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.PropertyChanged -= new PropertyChangedEventHandler( DragSourceManager_PropertyChanged );
-        m_dragSourceManager.DragOutsideQueryCursor -= new QueryCursorEventHandler( DragSourceManager_DragOutsideQueryCursor );
-        m_dragSourceManager.DroppedOutside -= new EventHandler( DragSourceManager_DroppedOutside );
-      }
-
-      // The DataGridControl's AdornerDecoratorForDragAndDrop must be used for dragging in order to include the 
-      // RenderTransform the DataGridControl may performs. This AdornerDecorator is defined in the ControlTemplate
-      // as PART_DragDropAdornerDecorator
-      if( ( dataGridControl.DragDropAdornerDecorator != null )
-          && ( dataGridControl.DragDropAdornerDecorator.AdornerLayer != null ) )
-      {
-        m_dragSourceManager = new DragSourceManager( this, dataGridControl.DragDropAdornerDecorator.AdornerLayer, dataGridControl );
-      }
-      else
-      {
-        System.Diagnostics.Debug.Assert( false, "The drag and drop functionnality won't be fully working properly: PART_DragDropAdornerDecorator was not found" );
-        m_dragSourceManager = new DragSourceManager( this, null, dataGridControl );
-      }
-
-      m_dragSourceManager.PropertyChanged += new PropertyChangedEventHandler( DragSourceManager_PropertyChanged );
-      m_dragSourceManager.DragOutsideQueryCursor += new QueryCursorEventHandler( DragSourceManager_DragOutsideQueryCursor );
-      m_dragSourceManager.DroppedOutside += new EventHandler( DragSourceManager_DroppedOutside );
-    }
-
-    private void DragSourceManager_DroppedOutside( object sender, EventArgs e )
-    {
-      HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-      if( hierarchicalGroupByControlNode == null )
-        throw new DataGridInternalException( "hierarchicalGroupByControlNode is null." );
-
-      bool allowGroupingModification = hierarchicalGroupByControlNode.IsGroupingModificationAllowed;
-
-      if( !allowGroupingModification )
-        return;
-
-      ObservableCollection<GroupDescription> groupDescriptions = this.ParentGroupDescriptions;
-
-      if( groupDescriptions != null )
-      {
-        // Get the HierarchicalGroupByControl before removing us from it
-        HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-        GroupLevelDescription groupLevelDescription = this.Content as GroupLevelDescription;
-
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        DataGridControl parentDataGridControl = ( dataGridContext != null )
-          ? dataGridContext.DataGridControl
-          : null;
-
-        GroupingHelper.RemoveGroupDescription( groupDescriptions, groupLevelDescription, parentDataGridControl );
-
-        // Notify groups have changed for NoGroupContent    
-        parentGBC.UpdateHasGroups();
-
-        // Update the HasGroups property
-        Debug.Assert( parentGBC != null );
-        if( parentGBC == null )
-          throw new DataGridInternalException( "The hierarchical group-by item must be rooted by a HierarchicalGroupByControl." );
-      }
-    }
-
-    private void DragSourceManager_PropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      if( e.PropertyName == "IsDragging" )
-      {
-        this.SetIsBeingDragged( m_dragSourceManager.IsDragging );
-      }
-    }
-
-    private void DragSourceManager_DragOutsideQueryCursor( object sender, QueryCursorEventArgs e )
-    {
-      HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-      if( ( hierarchicalGroupByControlNode == null )
-        || ( !hierarchicalGroupByControlNode.IsGroupingModificationAllowed ) )
-        return;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( ( dataGridContext != null ) && ( dataGridContext.DataGridControl != null ) )
-      {
-        UIViewBase uiViewBase = dataGridContext.DataGridControl.GetView() as UIViewBase;
-
-        e.Cursor = ( uiViewBase != null )
-          ? uiViewBase.RemovingGroupCursor
-          : UIViewBase.DefaultGroupDraggedOutsideCursor;
-      }
-      else
-      {
-        e.Cursor = UIViewBase.DefaultGroupDraggedOutsideCursor;
-      }
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( this.CaptureMouse() )
-      {
-        if( m_dragSourceManager != null )
-        {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          if( dataGridContext != null )
-          {
-            // Update the DropOutsideCursor since it is defined on the View
-            UIViewBase uiViewBase = dataGridContext.DataGridControl.GetView() as UIViewBase;
-
-            m_dragSourceManager.DropOutsideCursor = ( uiViewBase != null )
-             ? uiViewBase.RemovingGroupCursor
-             : UIViewBase.DefaultGroupDraggedOutsideCursor;
-          }
-
-          m_dragSourceManager.DragStart( e );
-        }
-
-        e.Handled = true;
-      }
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      if( ( this.IsMouseCaptured ) && ( e.LeftButton == MouseButtonState.Pressed ) )
-      {
-        if( m_dragSourceManager != null )
-        {
-          m_dragSourceManager.DragMove( e );
-        }
-      }
-
-      base.OnMouseMove( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      bool isMouseCaptured = this.IsMouseCaptured;
-      bool isPressed = this.IsPressed;
-
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.Drop( e );
-      }
-
-      if( isMouseCaptured )
-      {
-        this.ReleaseMouseCapture();
-
-        bool click = isPressed;
-
-        if( click )
-        {
-          // DataGridCollectionView always return true for CanSort
-          bool allowSort = true;
-
-          // Use the ParentDataGridContext to be sure to get a
-          // DataGridContext of the correct detail level since
-          // all the HierarchicalGroupByItem will share the same DataGridContext
-          // which is the one of the level where the HierarchicalGroupByControl
-          // is located
-          DataGridContext dataGridContext = this.ParentDataGridContext;
-
-          if( ( dataGridContext != null ) && ( dataGridContext.SourceDetailConfiguration == null ) )
-          {
-            allowSort = dataGridContext.Items.CanSort;
-          }
-
-          if( allowSort )
-          {
-            ColumnCollection columns = this.ParentColumns;
-            GroupLevelDescription groupInfo = this.Content as GroupLevelDescription;
-
-            Debug.Assert( ( columns != null ) && ( groupInfo != null ) );
-
-            if( ( columns != null ) && ( groupInfo != null ) )
-            {
-              ColumnBase column = columns[ groupInfo.FieldName ];
-
-              if( ( column != null ) && ( column.AllowSort ) )
-              {
-                bool shiftUnpressed = ( ( Keyboard.Modifiers & ModifierKeys.Shift ) != ModifierKeys.Shift );
-
-                var toggleColumnSort = new HierarchicalGroupByItemToggleColumnSortCommand( this );
-
-                if( toggleColumnSort.CanExecute( column, shiftUnpressed ) )
-                {
-                  toggleColumnSort.Execute( column, shiftUnpressed );
-                }
-
-                e.Handled = true;
-              }
-            }
-          }
-        }
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-
-    protected override void OnLostMouseCapture( MouseEventArgs e )
-    {
-      if( m_dragSourceManager != null )
-      {
-        m_dragSourceManager.DragCancel( e );
-      }
-
-      base.OnLostMouseCapture( e );
-    }
-
-    internal void ShowFarDropMark( RelativePoint mousePosition )
-    {
-      this.ShowDropMark( mousePosition, DropMarkAlignment.Far, true );
-    }
-
-    private void ShowDropMark( RelativePoint mousePosition )
-    {
-      this.ShowDropMark( mousePosition, DropMarkAlignment.Far, false );
-    }
-
-    private void ShowDropMark( RelativePoint mousePosition, DropMarkAlignment defaultAlignment, bool forceDefaultAlignment )
-    {
-      if( m_dropMarkAdorner == null )
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        DataGridControl grid = ( dataGridContext != null )
-          ? dataGridContext.DataGridControl
-          : null;
-
-        Pen pen = UIViewBase.GetDropMarkPen( this );
-
-        if( ( pen == null ) && ( grid != null ) )
-        {
-          UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-          pen = uiViewBase.DefaultDropMarkPen;
-        }
-
-        DropMarkOrientation orientation = Xceed.Wpf.DataGrid.Views.UIViewBase.GetDropMarkOrientation( this );
-
-        if( ( orientation == DropMarkOrientation.Default ) && ( grid != null ) )
-        {
-          UIViewBase uiViewBase = grid.GetView() as UIViewBase;
-
-          orientation = uiViewBase.DefaultDropMarkOrientation;
-        }
-
-        m_dropMarkAdorner = new DropMarkAdorner( this, pen, orientation );
-
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-        if( adornerLayer != null )
-          adornerLayer.Add( m_dropMarkAdorner );
-      }
-
-      if( forceDefaultAlignment )
-      {
-        m_dropMarkAdorner.Alignment = defaultAlignment;
-      }
-      else
-      {
-        m_dropMarkAdorner.UpdateAlignment( mousePosition );
-      }
-    }
-
-    internal void HideDropMark()
-    {
-      if( m_dropMarkAdorner != null )
-      {
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-
-        if( adornerLayer != null )
-          adornerLayer.Remove( m_dropMarkAdorner );
-
-        m_dropMarkAdorner = null;
-      }
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    protected virtual void OnPropertyChanged( PropertyChangedEventArgs e )
-    {
-      if( this.PropertyChanged != null )
-        this.PropertyChanged( this, e );
-    }
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    #endregion
-
-    #region PROTECTED METHDOS
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      this.InitSortDirection();
-      this.SetupDragManager();
-    }
-
-    #endregion
-
-    #region PROTECTED INTERNAL METHODS
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( HierarchicalGroupByItem ) );
-    }
-
-    #endregion
-
-    #region PRIVATE METHODS
-
-    private void InitSortDirection()
-    {
-      ColumnCollection columns = this.ParentColumns;
-      GroupLevelDescription groupInfo = this.Content as GroupLevelDescription;
-
-      Debug.Assert( ( columns != null ) && ( groupInfo != null ) || ( DesignerProperties.GetIsInDesignMode( this ) ) );
-      if( ( columns != null ) && ( groupInfo != null ) )
-      {
-        ColumnBase column = columns[ groupInfo.FieldName ];
-
-        if( column != null )
-        {
-          Binding sortBinding = new Binding();
-          sortBinding.Path = new PropertyPath( ColumnBase.SortDirectionProperty );
-          sortBinding.Mode = BindingMode.OneWay;
-          sortBinding.NotifyOnSourceUpdated = true;
-          sortBinding.Source = column;
-          sortBinding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-
-          BindingOperations.SetBinding( this, HierarchicalGroupByItem.SortDirectionInternalProperty, sortBinding );
-        }
-      }
-    }
-
-    #endregion
-
-    #region INTERNAL STATIC METHODS
-
-    internal static HierarchicalGroupByControlNode GetParentHierarchicalGroupByControlNode( UIElement element )
-    {
-      DependencyObject parent = TreeHelper.GetParent( element );
-
-      while( parent != null )
-      {
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parent as HierarchicalGroupByControlNode;
-        if( hierarchicalGroupByControlNode != null )
-          break;
-
-        parent = TreeHelper.GetParent( parent );
-      }
-
-      return parent as HierarchicalGroupByControlNode;
-    }
-
-    #endregion
-
-    #region ParentDataGridContext Property
-
-    internal DataGridContext ParentDataGridContext
-    {
-      get
-      {
-        DataGridContext dataGridContext = null;
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        if( hierarchicalGroupByControlNode != null )
-          dataGridContext = hierarchicalGroupByControlNode.DataGridContext;
-
-        return dataGridContext;
-      }
-    }
-
-    #endregion
-
-    #region ParentDetailConfiguration Property
-
-    internal DetailConfiguration ParentDetailConfiguration
-    {
-      get
-      {
-        DetailConfiguration detailConfiguration = null;
-        HierarchicalGroupByControlNode hierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        if( hierarchicalGroupByControlNode != null )
-          detailConfiguration = hierarchicalGroupByControlNode.DetailConfiguration;
-
-        // Can return null if the master level is reached: the DataContext
-        // will be a DataGridContext instead of a DetailConfiguration and
-        // the properties must be fetched via the DataGridContext instead
-        return detailConfiguration;
-      }
-    }
-
-    #endregion
-
-    #region IDropTarget Members
-
-    bool IDropTarget.CanDropElement( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      bool canDrop = true;
-
-      // Check if this HierarchicalGroupByItem parent HierarchicalGroupByControlNode allows grouping modifications, default yes
-      HierarchicalGroupByControlNode parentHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-      if( parentHierarchicalGroupByControlNode != null )
-        canDrop = parentHierarchicalGroupByControlNode.IsGroupingModificationAllowed;
-
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      HierarchicalGroupByItem hierarchicalGroupByItem = null;
-
-      if( canDrop )
-      {
-        if( cell != null )
-        {
-          ColumnBase parentColumn = cell.ParentColumn;
-
-          if( ( parentColumn == null ) || ( !parentColumn.AllowGroup ) )
-            return false;
-
-          // Check if already grouped using the cell's DataGridContext
-          canDrop = !GroupingHelper.IsAlreadyGroupedBy( cell );
-
-          if( canDrop )
-          {
-            // Get the HierarchicalGroupByControl for this HierarchicalGroupByItem 
-            HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( parentHierarchicalGroupByControlNode );
-
-            if( parentGBC == null )
-              throw new DataGridInternalException( "The hierarchical group-by item must be rooted by a HierarchicalGroupByControl." );
-
-            DataGridContext parentGBCDataGridContext = DataGridControl.GetDataGridContext( parentGBC );
-
-            if( parentGBCDataGridContext.Items != null )
-              canDrop = parentGBCDataGridContext.Items.CanGroup;
-
-            if( canDrop )
-            {
-              canDrop = GroupingHelper.IsColumnManagerCellInDataGridContext( parentGBCDataGridContext, cell );
-
-              if( canDrop == true )
-                canDrop = GroupingHelper.ValidateMaxGroupDescriptions( DataGridControl.GetDataGridContext( draggedElement ) );
-            }
-          }
-        }
-        else
-        {
-          hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-
-          if( hierarchicalGroupByItem == null )
-            canDrop = false;
-
-          if( canDrop )
-          {
-            HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( parentHierarchicalGroupByControlNode );
-
-            if( parentGBC == null )
-              throw new DataGridInternalException( "The hierarchical group-by item must be rooted by a HierarchicalGroupByControl." );
-
-            // Try to get the HierarchicalGroupByControlNode in which this HierarchicalGroupByItem can be added using the parent HierarchicalGroupByControl => null it can't
-            HierarchicalGroupByControlNode draggedHierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-            if( draggedHierarchicalGroupByControlNode == null )
-              canDrop = false;
-          }
-        }
-      }
-
-
-      bool returnedValue = ( ( cell != null ) || ( hierarchicalGroupByItem != null ) ) && // ColumnManagerCell or HierarchicalGroupByItem 
-                           ( draggedElement != this ) &&
-                           ( canDrop );
-
-
-      return returnedValue;
-    }
-
-    void IDropTarget.DragEnter( UIElement draggedElement )
-    {
-    }
-
-    void IDropTarget.DragOver( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      if( cell != null )
-      {
-        DataGridContext draggedCellDataGridContext = DataGridControl.GetDataGridContext( cell );
-
-        HierarchicalGroupByControlNode draggedOverHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        if( draggedCellDataGridContext == null )
-          throw new DataGridInternalException( "A ColumnManagerCell must have a DataGridContext." );
-
-        if( draggedOverHierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "draggedOverHierarchicalGroupByControlNode is null." );
-
-        if( draggedOverHierarchicalGroupByControlNode.GroupLevelDescriptions == draggedCellDataGridContext.GroupLevelDescriptions )
-        {
-          this.ShowDropMark( mousePosition );
-        }
-        else
-        {
-          // This ColumnManagerCell does not belong this parent HierarchicalGroupByControlNode, display the DropMark on the correct one
-          HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( draggedOverHierarchicalGroupByControlNode );
-
-          if( parentGBC == null )
-            throw new DataGridInternalException( "The hierarchical group-by item must be rooted by a HierarchicalGroupByControl." );
-
-          HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromColumnManagerCell( cell );
-
-          Debug.Assert( hierarchicalGroupByControlNode != null, "CanDrop should have returned false" );
-          if( hierarchicalGroupByControlNode == null )
-            throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-          hierarchicalGroupByControlNode.ShowFarDropMark( cell, mousePosition );
-        }
-      }
-      else
-      {
-        HierarchicalGroupByItem hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-
-        if( hierarchicalGroupByItem == null )
-          return;
-
-        HierarchicalGroupByControlNode draggedHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( hierarchicalGroupByItem );
-
-        HierarchicalGroupByControlNode draggedOverHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        if( draggedHierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "draggedHierarchicalGroupByControlNode is null." );
-
-        if( draggedOverHierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "draggedOverHierarchicalGroupByControlNode is null." );
-
-        if( draggedHierarchicalGroupByControlNode.GroupLevelDescriptions == draggedOverHierarchicalGroupByControlNode.GroupLevelDescriptions )
-        {
-          this.ShowDropMark( mousePosition );
-        }
-        else
-        {
-          // This HierarchicalGroupByItem does not belong this parent HierarchicalGroupByControlNode, display the DropMark on the correct one
-          HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( draggedOverHierarchicalGroupByControlNode );
-
-          if( parentGBC == null )
-            throw new DataGridInternalException( "A hierarchical group-by item must be rooted by a HierarchicalGroupByControl." );
-
-          HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-          Debug.Assert( hierarchicalGroupByControlNode != null, "CanDrop should have returned false" );
-          if( hierarchicalGroupByControlNode == null )
-            throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-          hierarchicalGroupByControlNode.ShowFarDropMark( mousePosition );
-        }
-      }
-    }
-
-    void IDropTarget.DragLeave( UIElement draggedElement )
-    {
-      ColumnManagerCell cell = draggedElement as ColumnManagerCell;
-
-      if( cell != null )
-      {
-        DataGridContext draggedCellDataGridContext = DataGridControl.GetDataGridContext( cell );
-
-        HierarchicalGroupByControlNode draggedOverHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        if( draggedOverHierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "We should never be dragged over and not contained inside a HierarchicalGroupByControlNode." );
-
-        if( draggedOverHierarchicalGroupByControlNode.GroupLevelDescriptions == draggedCellDataGridContext.GroupLevelDescriptions )
-        {
-          this.HideDropMark();
-        }
-        else
-        {
-          // This ColumnManagerCell does not belong this parent HierarchicalGroupByControlNode, display the DropMark on the correct one
-          HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( draggedOverHierarchicalGroupByControlNode );
-
-          if( parentGBC == null )
-            throw new DataGridInternalException( "A hierarchical group-by item must be rooted by a HierarchicalGroupByControl." );
-
-          HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromColumnManagerCell( cell );
-
-          Debug.Assert( hierarchicalGroupByControlNode != null, "CanDrop should have returned false" );
-          if( hierarchicalGroupByControlNode == null )
-            throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-          hierarchicalGroupByControlNode.HideFarDropMark( cell );
-        }
-      }
-      else
-      {
-        HierarchicalGroupByItem hierarchicalGroupByItem = draggedElement as HierarchicalGroupByItem;
-
-        if( hierarchicalGroupByItem == null )
-          return;
-
-        HierarchicalGroupByControlNode draggedHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( hierarchicalGroupByItem );
-
-        HierarchicalGroupByControlNode draggedOverHierarchicalGroupByControlNode = HierarchicalGroupByItem.GetParentHierarchicalGroupByControlNode( this );
-
-        if( draggedHierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "draggedHierarchicalGroupByControlNode is null." );
-
-        if( draggedOverHierarchicalGroupByControlNode == null )
-          throw new DataGridInternalException( "draggedOverHierarchicalGroupByControlNode is null." );
-
-        if( draggedHierarchicalGroupByControlNode.GroupLevelDescriptions == draggedOverHierarchicalGroupByControlNode.GroupLevelDescriptions )
-        {
-          this.HideDropMark();
-        }
-        else
-        {
-          // This HierarchicalGroupByItem does not belong this parent HierarchicalGroupByControlNode, display the DropMark on the correct one
-          HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( draggedOverHierarchicalGroupByControlNode );
-
-          Debug.Assert( parentGBC != null );
-          if( parentGBC == null )
-            throw new DataGridInternalException( "A hierarchical group-by item must be rooted by a HierarchicalGroupByControl." );
-
-          HierarchicalGroupByControlNode hierarchicalGroupByControlNode = parentGBC.GetHierarchicalGroupByControlNodeFromHierarchicalGroupByItem( hierarchicalGroupByItem );
-
-          Debug.Assert( hierarchicalGroupByControlNode != null, "CanDrop should have returned false" );
-          if( hierarchicalGroupByControlNode == null )
-            throw new DataGridInternalException( "A HierarchicalGroupByControlNode must exist for every level." );
-
-          hierarchicalGroupByControlNode.HideFarDropMark();
-        }
-      }
-    }
-
-    void IDropTarget.Drop( UIElement draggedElement, RelativePoint mousePosition )
-    {
-      ColumnManagerCell draggedColumnManagerCell = draggedElement as ColumnManagerCell;
-
-      if( m_dropMarkAdorner != null )
-      {
-        GroupLevelDescription draggedOverGroupLevelDescription = this.Content as GroupLevelDescription;
-
-        DropMarkAlignment alignment = m_dropMarkAdorner.Alignment;
-        this.HideDropMark();
-
-        if( draggedColumnManagerCell != null )
-        {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          DataGridControl parentGrid = ( dataGridContext != null )
-            ? dataGridContext.DataGridControl
-            : null;
-
-          GroupingHelper.AddNewGroupFromColumnManagerCell( draggedColumnManagerCell, draggedOverGroupLevelDescription, alignment, parentGrid );
-        }
-        else
-        {
-          HierarchicalGroupByItem draggedGroupByItem = draggedElement as HierarchicalGroupByItem;
-
-          if( draggedGroupByItem == null )
-            return;
-
-          GroupLevelDescription draggedGroupLevelDescription = draggedGroupByItem.Content as GroupLevelDescription;
-
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          DataGridControl parentDataGridControl = ( dataGridContext != null )
-            ? dataGridContext.DataGridControl
-            : null;
-
-          GroupLevelDescription destinationGroupLevelDescription = this.Content as GroupLevelDescription;
-
-          GroupingHelper.MoveGroupDescription( this.ParentColumns, this.ParentGroupDescriptions,
-                                               destinationGroupLevelDescription, alignment,
-                                               draggedGroupLevelDescription, parentDataGridControl );
-        }
-      }
-      else
-      {
-        // We try to add a new Group which is not in the current GroupLevelDescriptions
-        if( draggedColumnManagerCell == null )
-          return;
-
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        DataGridControl parentGrid = ( dataGridContext != null )
-          ? dataGridContext.DataGridControl
-          : null;
-
-        GroupingHelper.AppendNewGroupFromColumnManagerCell( draggedColumnManagerCell, parentGrid );
-      }
-
-      HierarchicalGroupByControl parentGBC = GroupingHelper.GetHierarchicalGroupByControl( this );
-
-      Debug.Assert( parentGBC != null );
-      if( parentGBC == null )
-        throw new DataGridInternalException( "A hierarchical group-by item must be rooted by a HierarchicalGroupByControl." );
-
-      // Notify groups have changed for NoGroupContent    
-      parentGBC.UpdateHasGroups();
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    // Will remain null when no AdornerLayer is found.
-    private DragSourceManager m_dragSourceManager;
-    private DropMarkAdorner m_dropMarkAdorner;
-
-    #endregion
-
-    #region HierarchicalGroupByItemToggleColumnSortCommand Private Class
-
-    private sealed class HierarchicalGroupByItemToggleColumnSortCommand : ToggleColumnSortCommand
-    {
-      #region Constructor
-
-      internal HierarchicalGroupByItemToggleColumnSortCommand( HierarchicalGroupByItem target )
-        : base()
-      {
-        if( target == null )
-          throw new ArgumentNullException( "owner" );
-
-        m_target = new WeakReference( target );
-
-        if( target.ParentDataGridContext != null )
-        {
-          m_dataGridContext = new WeakReference( target.ParentDataGridContext );
-        }
-
-        DataGridContext groupByItemDataGridContext = DataGridControl.GetDataGridContext( target );
-        ToggleColumnSortCommand.ThrowIfNull( groupByItemDataGridContext, "groupByItemDataGridContext" );
-
-        DataGridControl dataGridControl = groupByItemDataGridContext.DataGridControl;
-        ToggleColumnSortCommand.ThrowIfNull( dataGridControl, "dataGridControl" );
-
-        m_dataGridControl = new WeakReference( dataGridControl );
-      }
-
-      #endregion
-
-      #region Properties
-
-      #region CanSort Protected Property
-
-      protected override bool CanSort
-      {
-        get
-        {
-          var datagrid = this.DataGridControl;
-          if( datagrid == null )
-            return false;
-
-          // When details are flatten, only the master may toggle a column.
-          if( this.DataGridControl.AreDetailsFlatten )
-            return false;
-
-          if( this.DataGridContext != null )
-          {
-            return this.DataGridContext.Items.CanSort;
-          }
-
-          return true;
-        }
-      }
-
-      #endregion
-
-      #region Columns Protected Property
-
-      protected override ColumnCollection Columns
-      {
-        get
-        {
-          var target = this.Target;
-          if( target == null )
-            return null;
-
-          return target.ParentColumns;
-        }
-      }
-
-      #endregion
-
-      #region DataGridContext Protected Property
-
-      protected override DataGridContext DataGridContext
-      {
-        get
-        {
-          return ( m_dataGridContext != null ) ? m_dataGridContext.Target as DataGridContext : null;
-        }
-      }
-
-      private readonly WeakReference m_dataGridContext;
-
-      #endregion   
-
-      #region DataGridControl Private Property
-
-      private DataGridControl DataGridControl
-      {
-        get
-        {
-          return ( m_dataGridControl != null ) ? m_dataGridControl.Target as DataGridControl : null;
-        }
-      }
-
-      private readonly WeakReference m_dataGridControl;
-
-      #endregion
-
-      #region MaxSortLevels Protected Property
-
-      protected override int MaxSortLevels
-      {
-        get
-        {
-          return -1;
-        }
-      }
-
-      #endregion
-
-      #region SortDescriptions Protected Property
-
-      protected override SortDescriptionCollection SortDescriptions
-      {
-        get
-        {
-          var target = this.Target;
-          if( target == null )
-            return null;
-
-          return target.ParentSortDescriptions;
-        }
-      }
-
-      #endregion
-
-      #region Target Private Property
-
-      private HierarchicalGroupByItem Target
-      {
-        get
-        {
-          return m_target.Target as HierarchicalGroupByItem;
-        }
-      }
-
-      private readonly WeakReference m_target;
-
-      #endregion
-
-      #endregion
-
-      #region Methods Override
-
-      protected override void ValidateToggleColumnSort()
-      {
-        Debug.Assert( !this.DataGridControl.AreDetailsFlatten, "A flatten detail should not be able to toggle the column sort direction." );
-      }
-
-      protected override SortDescriptionsSyncContext GetSortDescriptionsSyncContext()
-      {
-        var dataGridContext = this.DataGridContext;
-        if( dataGridContext != null )
-          return dataGridContext.SortDescriptionsSyncContext;
-
-        return this.DataGridControl.DataGridContext.SortDescriptionsSyncContext;
-      }
-
-      protected override void ValidateSynchronizationContext( SynchronizationContext synchronizationContext )
-      {
-        if( !synchronizationContext.Own )
-          throw new DataGridInternalException( "The column is already being processed.", this.DataGridControl );
-      }
-
-      protected override void DeferRestoreStateOnLevel( Disposer disposer )
-      {
-        var dataGridContext = this.DataGridContext;
-        if( dataGridContext != null )
-        {
-          ToggleColumnSortCommand.DeferRestoreStateOnLevel( disposer, dataGridContext );
-        }
-      }
-
-      protected override IDisposable DeferResortHelperItemsSourceCollection()
-      {
-        var dataGridContext = this.DataGridContext;
-
-        return ( dataGridContext != null )
-                ? this.DeferResortHelper( dataGridContext.ItemsSourceCollection, dataGridContext.Items )
-                : this.DeferResortHelper( this.DataGridControl.ItemsSource, this.DataGridControl.DataGridContext.Items );
-      }
-
-      protected override bool TryDeferResortSourceDetailConfiguration( out IDisposable defer )
-      {
-        var dataGridContext = this.DataGridContext;
-
-        return ( dataGridContext != null )
-                ? this.TryDeferResort( dataGridContext.SourceDetailConfiguration, out defer )
-                : this.TryDeferResort( this.DataGridControl.DataGridContext.SourceDetailConfiguration, out defer );
-      }
-
-      protected override IDisposable SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers triggers )
-      {
-        return this.DataGridControl.SetQueueBringIntoViewRestrictions( triggers );
-      }
-
-      #endregion
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs
deleted file mode 100644
index fa5f40a6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class HierarchicalGroupLevelIndicatorPane : Control, IWeakEventListener
-  {
-    static HierarchicalGroupLevelIndicatorPane()
-    {
-      // This DefaultStyleKey will only be used in design-time.
-      FrameworkElement.DefaultStyleKeyProperty.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( HierarchicalGroupLevelIndicatorPane ) ) ) );
-
-      UIElement.FocusableProperty.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( false ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnParentDataGridControlChanged ) ) );
-      DataGridControl.DataGridContextPropertyKey.OverrideMetadata( typeof( HierarchicalGroupLevelIndicatorPane ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnDataGridContextChanged ) ) );
-    }
-
-    #region GroupLevelIndicatorPaneHost Private Property
-
-    private Panel GroupLevelIndicatorPaneHost
-    {
-      get
-      {
-        //if there is no local storage for the host panel, try to retrieve and store the value
-        if( m_storedGroupLevelIndicatorPaneHost == null )
-        {
-          m_storedGroupLevelIndicatorPaneHost = this.GetTemplateChild( "PART_GroupLevelIndicatorHost" ) as Panel;
-        }
-
-        return m_storedGroupLevelIndicatorPaneHost;
-      }
-    }
-
-    private Panel m_storedGroupLevelIndicatorPaneHost = null;
-
-    #endregion
-
-    #region GroupLevelIndicatorPaneNeedsRefresh Private Property
-
-    private bool GroupLevelIndicatorPaneNeedsRefresh
-    {
-      get
-      {
-        var panel = this.GroupLevelIndicatorPaneHost;
-        if( panel == null )
-          return false;
-
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-        if( dataGridContext == null )
-          return false;
-
-        //skip the "current" DataGridContext
-        dataGridContext = dataGridContext.ParentDataGridContext;
-
-        var expectedIndicatorsCount = 0;
-        for( ; dataGridContext != null; dataGridContext = dataGridContext.ParentDataGridContext )
-        {
-          //a group indicator and a detail indicator should exist per level
-          expectedIndicatorsCount += 2;
-        }
-
-        return ( panel.Children.Count != expectedIndicatorsCount );
-      }
-    }
-
-    #endregion
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      //whenever the template gets "applied" I want to invalidate the stored Panel.
-      m_storedGroupLevelIndicatorPaneHost = null;
-    }
-
-    internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      var newThemeKey = view.GetDefaultStyleKey( typeof( HierarchicalGroupLevelIndicatorPane ) );
-      if( object.Equals( this.DefaultStyleKey, newThemeKey ) )
-        return;
-
-      this.DefaultStyleKey = newThemeKey;
-    }
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      var panel = this.GroupLevelIndicatorPaneHost;
-      if( panel == null )
-        return base.MeasureOverride( availableSize );
-
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( ( dataGridContext == null ) || !this.GroupLevelIndicatorPaneNeedsRefresh )
-        return base.MeasureOverride( availableSize );
-
-      //clear all the panel's children!
-      panel.Children.Clear();
-
-      var previousContext = dataGridContext;
-      var runningDataGridContext = dataGridContext.ParentDataGridContext;
-
-      while( runningDataGridContext != null )
-      {
-        //create a GroupLevelIndicator to create indentation between the GLIPs
-        FrameworkElement newGroupMargin = new DetailIndicator();
-        newGroupMargin.DataContext = dataGridContext;
-
-        object bindingSource = dataGridContext.GetDefaultDetailConfigurationForContext();
-        if( bindingSource == null )
-        {
-          bindingSource = dataGridContext.SourceDetailConfiguration;
-        }
-
-        //Bind the GroupLevelIndicator`s style to the running DataGridContext`s GroupLevelIndicatorStyle.
-        var groupLevelIndicatorStyleBinding = new Binding();
-        groupLevelIndicatorStyleBinding.Path = new PropertyPath( DetailConfiguration.DetailIndicatorStyleProperty );
-        groupLevelIndicatorStyleBinding.Source = bindingSource;
-        newGroupMargin.SetBinding( StyleProperty, groupLevelIndicatorStyleBinding );
-
-        //insert the Spacer GroupLevelIndicator in the panel
-        panel.Children.Insert( 0, newGroupMargin );
-
-        if( !runningDataGridContext.AreDetailsFlatten )
-        {
-          //then create the GLIP for the running DataGridContext
-          var newSubGLIP = new GroupLevelIndicatorPane();
-          DataGridControl.SetDataGridContext( newSubGLIP, runningDataGridContext );
-          newSubGLIP.SetIsLeaf( false );
-          GroupLevelIndicatorPane.SetGroupLevel( newSubGLIP, -1 );
-
-          //and insert it in the panel.
-          panel.Children.Insert( 0, newSubGLIP );
-        }
-
-        previousContext = runningDataGridContext;
-        runningDataGridContext = runningDataGridContext.ParentDataGridContext;
-      }
-
-      return base.MeasureOverride( availableSize );
-    }
-
-    private static void OnParentDataGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as HierarchicalGroupLevelIndicatorPane;
-      if( self == null )
-        return;
-
-      var dataGridControl = e.OldValue as DataGridControl;
-      if( dataGridControl != null )
-      {
-        DetailsChangedEventManager.RemoveListener( dataGridControl, self );
-      }
-
-      dataGridControl = e.NewValue as DataGridControl;
-
-      //register to the parent grid control's Items Collection GroupDescriptions Changed event
-      if( dataGridControl != null )
-      {
-        self.PrepareDefaultStyleKey( dataGridControl.GetView() );
-
-        DetailsChangedEventManager.AddListener( dataGridControl, self );
-        self.InvalidateMeasure();
-      }
-    }
-
-    private static void OnDataGridContextChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as HierarchicalGroupLevelIndicatorPane;
-      if( self == null )
-        return;
-
-      var panel = self.GroupLevelIndicatorPaneHost;
-      if( panel != null )
-      {
-        panel.Children.Clear();
-      }
-
-      self.InvalidateMeasure();
-    }
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( DetailsChangedEventManager ) )
-      {
-        this.InvalidateMeasure();
-        return true;
-      }
-
-      return false;
-    }
-
-    #endregion
-  }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ICustomVirtualizingPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ICustomVirtualizingPanel.cs
deleted file mode 100644
index 2097ed18..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ICustomVirtualizingPanel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public interface ICustomVirtualizingPanel
-  {
-    void BringIntoView( int index );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitable.cs
deleted file mode 100644
index 60d5538e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitable.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal interface IDataGridContextVisitable
-  {
-    void AcceptVisitor( IDataGridContextVisitor visitor, out bool visitWasStopped );
-    void AcceptVisitor( int minIndex, int maxIndex, IDataGridContextVisitor visitor, out bool visitWasStopped );
-    void AcceptVisitor( int minIndex, int maxIndex, IDataGridContextVisitor visitor, DataGridContextVisitorType visitorType, out bool visitWasStopped );
-    void AcceptVisitor( int minIndex, int maxIndex, IDataGridContextVisitor visitor, DataGridContextVisitorType visitorType, bool visitDetails, out bool visitWasStopped );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitor.cs
deleted file mode 100644
index 128d1a20..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitor.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal interface IDataGridContextVisitor
-  {
-    void Visit( DataGridContext sourceContext, ref bool stopVisit );
-    void Visit( DataGridContext sourceContext, int sourceDataItemIndex, object item, ref bool stopVisit );
-    void Visit( DataGridContext sourceContext, int startSourceDataItemIndex, int endSourceDataItemIndex, ref bool stopVisit );
-    void Visit( DataGridContext sourceContext, CollectionViewGroup group, object[] namesTree, int groupLevel, bool isExpanded, bool isComputedExpanded, ref bool stopVisit );
-    void Visit( DataGridContext sourceContext, DataTemplate headerFooter, ref bool stopVisit );
-    void Visit( DataGridContext sourceContext, GroupHeaderFooterItem groupHeaderFooter, ref bool stopVisit );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs
deleted file mode 100644
index 16607809..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid
-{
-  internal interface IDataGridItemContainer
-  {
-    bool CanBeRecycled
-    {
-      get;
-    }
-
-    bool IsRecyclingCandidate
-    {
-      get;
-      set;
-    }
-
-    void PrepareContainer( DataGridContext dataGridContext, object item );
-    void ClearContainer();
-    void CleanRecyclingCandidate();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainerExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainerExtensions.cs
deleted file mode 100644
index c1697628..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainerExtensions.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class IDataGridItemContainerExtensions
-  {
-    internal static IEnumerable<IDataGridItemContainer> GetTemplatedDescendantDataGridItemContainers( this IDataGridItemContainer source )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      var predicate = IDataGridItemContainerExtensions.GetTemplatedDescendantExpandPredicate( source );
-
-      return IDataGridItemContainerExtensions.GetChildDataGridItemContainers( source, predicate );
-    }
-
-    internal static IEnumerable<IDataGridItemContainer> GetTemplatedChildDataGridItemContainers( this IDataGridItemContainer source )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      var predicate = IDataGridItemContainerExtensions.GetTemplatedChildExpandPredicate( source );
-
-      return IDataGridItemContainerExtensions.GetChildDataGridItemContainers( source, predicate );
-    }
-
-    private static IEnumerable<IDataGridItemContainer> GetChildDataGridItemContainers( IDataGridItemContainer source, Func<DependencyObject, bool> expand )
-    {
-      Debug.Assert( source != null );
-
-      var root = source as DependencyObject;
-      if( root == null )
-        throw new ArgumentException( "The source object must be a DependencyObject.", "source" );
-
-      return IDataGridItemContainerExtensions.GetChildDataGridItemContainers( root, expand );
-    }
-
-    private static IEnumerable<IDataGridItemContainer> GetChildDataGridItemContainers( DependencyObject source, Func<DependencyObject, bool> expand )
-    {
-      Debug.Assert( source != null );
-
-      if( expand == null )
-        throw new ArgumentNullException( "expand" );
-
-      var strategy = new DepthFirstSearchTreeTraversalStrategy();
-
-      return TreeHelper.GetDescendants<IDataGridItemContainer>( strategy, source, null, expand );
-    }
-
-    private static Func<DependencyObject, bool> GetTemplatedDescendantExpandPredicate( IDataGridItemContainer source )
-    {
-      var fe = source as FrameworkElement;
-      if( fe == null )
-        throw new ArgumentException( "The source object must be a FrameworkElement.", "source" );
-
-      return ( DependencyObject item ) => IDataGridItemContainerExtensions.IsPartOfTargetTemplate( item, fe );
-    }
-
-    private static Func<DependencyObject, bool> GetTemplatedChildExpandPredicate( IDataGridItemContainer source )
-    {
-      var fe = source as FrameworkElement;
-      if( fe == null )
-        throw new ArgumentException( "The source object must be a FrameworkElement.", "source" );
-
-      return ( DependencyObject item ) => IDataGridItemContainerExtensions.ExpandChild( item )
-                                       && IDataGridItemContainerExtensions.IsPartOfTargetTemplate( item, fe );
-    }
-
-    private static bool ExpandChild( DependencyObject container )
-    {
-      return ( container != null ) && !( container is IDataGridItemContainer );
-    }
-
-    private static bool IsPartOfTargetTemplate( DependencyObject element, FrameworkElement target )
-    {
-      while( element != null )
-      {
-        var templatedParent = IDataGridItemContainerExtensions.GetTemplatedParent( element );
-        if( templatedParent == target )
-          return true;
-
-        element = templatedParent;
-      }
-
-      return false;
-    }
-
-    private static DependencyObject GetTemplatedParent( DependencyObject element )
-    {
-      var fe = element as FrameworkElement;
-      if( fe != null )
-        return fe.TemplatedParent;
-
-      var fce = element as FrameworkContentElement;
-      if( fce != null )
-        return fce.TemplatedParent;
-
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDeferableScrollInfoRefresh.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDeferableScrollInfoRefresh.cs
deleted file mode 100644
index 6c111df0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDeferableScrollInfoRefresh.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal interface IDeferableScrollInfoRefresh
-  {
-    IDisposable DeferScrollInfoRefresh( Orientation orientation );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IGroupLevelDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IGroupLevelDescription.cs
deleted file mode 100644
index a67a1889..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IGroupLevelDescription.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal interface IGroupLevelDescription
-  {
-    string FieldName
-    {
-      get;
-    }
-
-    object Title
-    {
-      get;
-    }
-
-    DataTemplate TitleTemplate
-    {
-      get;
-    }
-
-    DataTemplateSelector TitleTemplateSelector
-    {
-      get;
-    }
-
-    DataTemplate ValueTemplate
-    {
-      get;
-    }
-
-    DataTemplateSelector ValueTemplateSelector
-    {
-      get;
-    }
-
-    string ValueStringFormat
-    {
-      get;
-    }
-
-    CultureInfo ValueStringFormatCulture
-    {
-      get;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerDescriptor.cs
deleted file mode 100644
index 2356d331..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerDescriptor.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Reflection;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class IndexerDescriptor : PropertyDescriptor
-  {
-    #region Static Fields
-
-    private static readonly object NotInitialized = new object();
-    private static readonly object NotSet = new object();
-
-    #endregion
-
-    // The name must be set to Item[] for binding to get notified when the data item implements INotifyPropertyChanged.
-    private IndexerDescriptor( string indexerName, string parametersList, object[] parameterValues, PropertyInfo propertyInfo, Attribute[] attributes )
-        : base( string.Format( "{0}[]", indexerName ), attributes )
-    {
-      m_displayName = string.Format( "{0}[{1}]", indexerName, parametersList );
-      m_indexerName = indexerName;
-      m_indexerParameters = parametersList;
-      m_indexerParameterValues = parameterValues;
-      m_propertyInfo = propertyInfo;
-    }
-
-    #region ComponentType Property
-
-    public override Type ComponentType
-    {
-      get
-      {
-        return m_propertyInfo.DeclaringType;
-      }
-    }
-
-    #endregion
-
-    #region PropertyType Property
-
-    public override Type PropertyType
-    {
-      get
-      {
-        return m_propertyInfo.PropertyType;
-      }
-    }
-
-    #endregion
-
-    #region IsReadOnly Property
-
-    public sealed override bool IsReadOnly
-    {
-      get
-      {
-        if( !m_propertyInfo.CanWrite )
-          return true;
-
-        var attribute = ( ReadOnlyAttribute )this.Attributes[ typeof( ReadOnlyAttribute ) ];
-
-        return ( attribute != null )
-            && ( attribute.IsReadOnly );
-      }
-    }
-
-    #endregion
-
-    #region DisplayName Property
-
-    public override string DisplayName
-    {
-      get
-      {
-        return m_displayName;
-      }
-    }
-
-    private readonly string m_displayName;
-
-    #endregion
-
-    #region IndexerName Internal Property
-
-    internal string IndexerName
-    {
-      get
-      {
-        return m_indexerName;
-      }
-    }
-
-    private readonly string m_indexerName;
-
-    #endregion
-
-    #region IndexerParameters Internal Property
-
-    internal string IndexerParameters
-    {
-      get
-      {
-        return m_indexerParameters;
-      }
-    }
-
-    private readonly string m_indexerParameters;
-
-    #endregion
-
-    #region DefaultValue Private Property
-
-    private object DefaultValue
-    {
-      get
-      {
-        if( m_defaultValue == IndexerDescriptor.NotInitialized )
-        {
-          var attribute = ( DefaultValueAttribute )this.Attributes[ typeof( DefaultValueAttribute ) ];
-          if( attribute != null )
-          {
-            var propertyType = this.PropertyType;
-            var value = attribute.Value;
-
-            if( ( value != null ) && ( propertyType.IsEnum ) && ( Enum.GetUnderlyingType( propertyType ) == value.GetType() ) )
-            {
-              value = Enum.ToObject( propertyType, value );
-            }
-
-            m_defaultValue = value;
-          }
-          else
-          {
-            m_defaultValue = IndexerDescriptor.NotSet;
-          }
-        }
-
-        return m_defaultValue;
-      }
-    }
-
-    private object m_defaultValue = IndexerDescriptor.NotInitialized;
-
-    #endregion
-
-    #region AmbientValue Private Property
-
-    private object AmbientValue
-    {
-      get
-      {
-        if( m_ambientValue == IndexerDescriptor.NotInitialized )
-        {
-          var attribute = ( AmbientValueAttribute )this.Attributes[ typeof( AmbientValueAttribute ) ];
-          if( attribute != null )
-          {
-            m_ambientValue = attribute.Value;
-          }
-          else
-          {
-            m_ambientValue = IndexerDescriptor.NotSet;
-          }
-        }
-
-        return m_ambientValue;
-      }
-    }
-
-    private object m_ambientValue = IndexerDescriptor.NotInitialized;
-
-    #endregion
-
-    public override bool ShouldSerializeValue( object component )
-    {
-      if( this.IsReadOnly )
-        return this.Attributes.Contains( DesignerSerializationVisibilityAttribute.Content );
-
-      if( this.DefaultValue != IndexerDescriptor.NotSet )
-        return !object.Equals( this.GetValue( component ), this.DefaultValue );
-
-      return true;
-    }
-
-    public override object GetValue( object component )
-    {
-      if( component == null )
-        return null;
-
-      return m_propertyInfo.GetValue( component, m_indexerParameterValues );
-    }
-
-    public override void SetValue( object component, object value )
-    {
-      if( ( component == null ) || this.IsReadOnly )
-        return;
-
-      m_propertyInfo.SetValue( component, value, m_indexerParameterValues );
-
-      this.OnValueChanged( component, EventArgs.Empty );
-    }
-
-    public override bool CanResetValue( object component )
-    {
-      if( this.IsReadOnly )
-        return false;
-
-      if( this.DefaultValue != IndexerDescriptor.NotSet )
-        return !object.Equals( this.GetValue( component ), this.DefaultValue );
-
-      return ( this.AmbientValue != IndexerDescriptor.NotSet )
-          && ( this.ShouldSerializeValue( component ) );
-    }
-
-    public override void ResetValue( object component )
-    {
-      if( ( component == null ) || this.IsReadOnly )
-        return;
-
-      if( this.DefaultValue != IndexerDescriptor.NotSet )
-      {
-        this.SetValue( component, this.DefaultValue );
-      }
-      else if( this.AmbientValue != IndexerDescriptor.NotSet )
-      {
-        this.SetValue( component, this.AmbientValue );
-      }
-    }
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      var descriptor = obj as IndexerDescriptor;
-      if( object.ReferenceEquals( descriptor, null ) )
-        return false;
-
-      return ( base.Equals( descriptor ) )
-          && ( descriptor.ComponentType == this.ComponentType )
-          && ( descriptor.IsReadOnly == this.IsReadOnly )
-          && ( descriptor.SupportsChangeEvents == this.SupportsChangeEvents )
-          && ( descriptor.IndexerName == this.IndexerName )
-          && ( descriptor.IndexerParameters == this.IndexerParameters );
-    }
-
-    internal static IndexerDescriptor Create( PropertyInfo propertyInfo, object[] parameterNames, object[] parameterValues )
-    {
-      if( propertyInfo == null )
-        throw new ArgumentNullException( "propertyInfo" );
-
-      if( parameterNames == null )
-        throw new ArgumentNullException( "parameterNames" );
-
-      if( parameterNames.Length <= 0 )
-        throw new ArgumentException( "The indexer must contain at least one index.", "parameterNames" );
-
-      if( parameterValues == null )
-        throw new ArgumentNullException( "parameterValues" );
-
-      if( parameterValues.Length <= 0 )
-        throw new ArgumentException( "The indexer must contain at least one index.", "parameterValues" );
-
-      var parameters = propertyInfo.GetIndexParameters();
-      if( ( parameters == null ) || ( parameters.Length <= 0 ) )
-        throw new ArgumentException( "The target property is not a valid indexer.", "propertyInfo" );
-
-      var attributes = ( from entry in propertyInfo.GetCustomAttributes( true )
-                         let attr = ( entry as Attribute )
-                         where ( attr != null )
-                         select attr ).ToArray();
-      var parametersList = IndexerParametersParser.Parse( parameterNames );
-      var indexerName = propertyInfo.Name;
-
-      return new IndexerDescriptor( indexerName, parametersList, parameterValues, propertyInfo, attributes );
-    }
-
-    private readonly PropertyInfo m_propertyInfo;
-    private readonly object[] m_indexerParameterValues;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerParametersParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerParametersParser.cs
deleted file mode 100644
index 37452bfa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IndexerParametersParser.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class IndexerParametersParser
-  {
-    #region Static Fields
-
-    private const char Separator = ',';
-    private const char DoubleQuote = '"';
-
-    #endregion
-
-    internal static string Parse( IEnumerable<object> values )
-    {
-      if( values == null )
-        return string.Empty;
-
-      var sb = new StringBuilder();
-      var first = true;
-
-      foreach( var value in values )
-      {
-        if( !first )
-        {
-          sb.Append( "," );
-        }
-        else
-        {
-          first = false;
-        }
-
-        if( value == null )
-        {
-          sb.Append( "null" );
-        }
-        else
-        {
-          sb.Append( Convert.ToString( value, CultureInfo.InvariantCulture ) );
-        }
-      }
-
-      return sb.ToString();
-    }
-
-    internal static IEnumerable<string> Parse( string value )
-    {
-      var parameters = ( value != null ) ? value.Trim() : string.Empty;
-      var length = parameters.Length;
-      if( length <= 0 )
-        return Enumerable.Empty<string>();
-
-      var values = new List<string>();
-      var state = ParserState.Start;
-      var index = 0;
-
-      while( index < length )
-      {
-        var c = parameters[ index ];
-
-        switch( state )
-        {
-          case ParserState.Start:
-            {
-              if( char.IsWhiteSpace( c ) )
-              {
-                index++;
-              }
-              else
-              {
-                state = ParserState.FindValue;
-              }
-            }
-            break;
-
-          case ParserState.FindValue:
-            {
-              if( char.IsWhiteSpace( c ) )
-              {
-                index++;
-              }
-              else if( c == IndexerParametersParser.Separator )
-              {
-                // A parameter is missing.
-                return Enumerable.Empty<string>();
-              }
-              else if( c == IndexerParametersParser.DoubleQuote )
-              {
-                state = ParserState.ExtractString;
-              }
-              else
-              {
-                state = ParserState.ExtractValue;
-              }
-            }
-            break;
-
-          case ParserState.FindSeparator:
-            {
-              if( char.IsWhiteSpace( c ) )
-              {
-                index++;
-              }
-              else if( c == IndexerParametersParser.Separator )
-              {
-                index++;
-                state = ParserState.FindValue;
-              }
-              else
-              {
-                // Unexpected character.
-                return Enumerable.Empty<string>();
-              }
-            }
-            break;
-
-          case ParserState.ExtractString:
-            {
-              if( !IndexerParametersParser.AddString( parameters, length, ref index, values ) )
-                return Enumerable.Empty<string>();
-
-              state = ParserState.FindSeparator;
-            }
-            break;
-
-          case ParserState.ExtractValue:
-            {
-              if( !IndexerParametersParser.AddValue( parameters, length, ref index, values ) )
-                return Enumerable.Empty<string>();
-
-              state = ParserState.FindSeparator;
-            }
-            break;
-
-          default:
-            throw new NotImplementedException();
-        }
-      }
-
-      if( state != ParserState.FindSeparator )
-        return Enumerable.Empty<string>();
-
-      return values;
-    }
-
-    private static bool AddString( string source, int length, ref int index, IList<string> values )
-    {
-      if( ( index >= length ) || ( source[ index ] != IndexerParametersParser.DoubleQuote ) )
-        return false;
-
-      var currentIndex = index + 1;
-      var startIndex = currentIndex;
-      var containsSeparator = false;
-
-      while( currentIndex < length )
-      {
-        var c = source[ currentIndex ];
-        if( c == IndexerParametersParser.DoubleQuote )
-        {
-          Debug.Assert( startIndex < length );
-          Debug.Assert( startIndex <= currentIndex );
-
-          var value = source.Substring( startIndex, currentIndex - startIndex ).Trim();
-          if( value.Length <= 0 )
-          {
-            return false;
-          }
-          else if( containsSeparator )
-          {
-            values.Add( string.Format( "\"{0}\"", value ) );
-          }
-          else
-          {
-            values.Add( value );
-          }
-
-          index = currentIndex + 1;
-
-          return true;
-        }
-        else
-        {
-          containsSeparator = containsSeparator || ( c == IndexerParametersParser.Separator );
-          currentIndex++;
-        }
-      }
-
-      return false;
-    }
-
-    private static bool AddValue( string source, int length, ref int index, IList<string> values )
-    {
-      if( index >= length )
-        return false;
-
-      var currentIndex = index;
-      var startIndex = currentIndex;
-
-      while( currentIndex < length )
-      {
-        var c = source[ currentIndex ];
-
-        if( c == IndexerParametersParser.Separator )
-          break;
-
-        // Unexpected character.
-        if( c == IndexerParametersParser.DoubleQuote )
-          return false;
-
-        currentIndex++;
-      }
-
-      var value = source.Substring( startIndex, currentIndex - startIndex ).Trim();
-      if( value.Length <= 0 )
-        return false;
-
-      values.Add( value );
-
-      index = currentIndex;
-
-      return true;
-    }
-
-    #region ParserState Private Enum
-
-    private enum ParserState
-    {
-      Start,
-      FindValue,
-      FindSeparator,
-      ExtractString,
-      ExtractValue,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs
deleted file mode 100644
index ac971a5c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class InnerCellContentPresenter : ContentPresenter
-  {
-    static InnerCellContentPresenter()
-    {
-      Binding trimmingBinding = new Binding();
-      trimmingBinding.Path = new PropertyPath( "(0).(1).(2)",
-        Cell.ParentCellProperty,
-        Cell.ParentColumnProperty,
-        ColumnBase.TextTrimmingProperty );
-      trimmingBinding.Mode = BindingMode.OneWay;
-      trimmingBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      Binding wrappingBinding = new Binding();
-      wrappingBinding.Path = new PropertyPath( "(0).(1).(2)",
-        Cell.ParentCellProperty,
-        Cell.ParentColumnProperty,
-        ColumnBase.TextWrappingProperty );
-      wrappingBinding.Mode = BindingMode.OneWay;
-      wrappingBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      m_sTextBlockStyle = new Style( typeof( TextBlock ) );
-      m_sTextBlockStyle.Setters.Add( new Setter( TextBlock.TextTrimmingProperty, trimmingBinding ) );
-      m_sTextBlockStyle.Setters.Add( new Setter( TextBlock.TextWrappingProperty, wrappingBinding ) );
-      m_sTextBlockStyle.Seal();
-    }
-
-    public InnerCellContentPresenter()
-    {
-      //ContentPresenter.ContentProperty.OverrideMetadata( typeof( InnerCellContentPresenter ), new PropertyMetadata( defaultContent ) );
-      this.Resources.Add( typeof( TextBlock ), m_sTextBlockStyle );
-    }
-
-    private static Style m_sTextBlockStyle;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsHostUIElementCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsHostUIElementCollection.cs
deleted file mode 100644
index 70e2d2b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsHostUIElementCollection.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ItemsHostUIElementCollection : IList<UIElement>
-  {
-    #region Constructors
-
-    public ItemsHostUIElementCollection( UIElement visualParent )
-    {
-      if( visualParent == null )
-        throw new ArgumentNullException( "visualParent" );
-
-      m_visualCollection = new VisualCollection( visualParent );
-      m_visualCollectionLookupDictionary = new Dictionary<UIElement, object>();
-      m_visualParent = visualParent;
-    }
-
-    #endregion
-
-    #region IList<UIElement> Members
-
-    public int IndexOf( UIElement element )
-    {
-      if( !m_visualCollectionLookupDictionary.ContainsKey( element ) )
-        return -1;
-
-      return m_visualCollection.IndexOf( element );
-    }
-
-    public void Insert( int index, UIElement element )
-    {
-      if( element == null )
-        throw new ArgumentNullException( "element" );
-
-      m_visualCollection.Insert( index, element );
-      m_visualCollectionLookupDictionary.Add( element, null );
-      m_visualParent.InvalidateMeasure();
-    }
-
-    public void RemoveAt( int index )
-    {
-      UIElement element = m_visualCollection[ index ] as UIElement;
-
-      if( element != null )
-      {
-        m_visualCollectionLookupDictionary.Remove( element );
-      }
-
-      m_visualCollection.RemoveAt( index );
-      m_visualParent.InvalidateMeasure();
-    }
-
-    public UIElement this[ int index ]
-    {
-      get
-      {
-        return ( m_visualCollection[ index ] as UIElement );
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "value" );
-
-        // Ensure to contain the value in the lookup dictionary
-        if( !m_visualCollectionLookupDictionary.ContainsKey( value ) )
-        {
-          m_visualCollectionLookupDictionary.Add( value, null );
-        }
-
-        if( m_visualCollection[ index ] == value )
-          return;
-
-        m_visualCollection[ index ] = value;
-
-        m_visualParent.InvalidateMeasure();
-      }
-    }
-
-    #endregion
-
-    #region ICollection<UIElement> Members
-
-    public void Add( UIElement element )
-    {
-      if( element == null )
-        throw new ArgumentNullException( "element" );
-
-      m_visualCollection.Add( element );
-      m_visualCollectionLookupDictionary.Add( element, null );
-      m_visualParent.InvalidateMeasure();
-    }
-
-    public void Clear()
-    {
-      if( m_visualCollection.Count == 0 )
-        return;
-
-      m_visualCollection.Clear();
-      m_visualCollectionLookupDictionary.Clear();
-      m_visualParent.InvalidateMeasure();
-    }
-
-    public bool Contains( UIElement element )
-    {
-      return m_visualCollectionLookupDictionary.ContainsKey( element );
-    }
-
-    public void CopyTo( UIElement[] array, int index )
-    {
-      m_visualCollection.CopyTo( array, index );
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_visualCollection.Count;
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public bool Remove( UIElement element )
-    {
-      m_visualCollection.Remove( element );
-      m_visualCollectionLookupDictionary.Remove( element );
-      m_visualParent.InvalidateMeasure();
-
-      return true;
-    }
-
-    #endregion
-
-    #region IEnumerable<UIElement> Members
-
-    public IEnumerator<UIElement> GetEnumerator()
-    {
-      return new Enumerator( m_visualCollection.GetEnumerator() );
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return m_visualCollection.GetEnumerator();
-    }
-
-    #endregion
-
-    #region Enumerator Private Class
-
-    private class Enumerator : IEnumerator<UIElement>
-    {
-      public Enumerator( IEnumerator nonGenericEnumerator )
-      {
-        if( nonGenericEnumerator == null )
-          throw new ArgumentNullException( "nonGenericEnumerator" );
-
-        m_enumerator = nonGenericEnumerator;
-      }
-
-      UIElement IEnumerator<UIElement>.Current
-      {
-        get
-        {
-          return m_enumerator.Current as UIElement;
-        }
-      }
-
-      void IDisposable.Dispose()
-      {
-        // Nothing to do
-      }
-
-      object IEnumerator.Current
-      {
-        get
-        {
-          return m_enumerator.Current;
-        }
-      }
-
-      bool IEnumerator.MoveNext()
-      {
-        return m_enumerator.MoveNext();
-      }
-
-      void IEnumerator.Reset()
-      {
-        m_enumerator.Reset();
-      }
-
-      IEnumerator m_enumerator;
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    private readonly Dictionary<UIElement, object> m_visualCollectionLookupDictionary;
-    private readonly VisualCollection m_visualCollection;
-    private readonly UIElement m_visualParent;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs
deleted file mode 100644
index d4d30326..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs
+++ /dev/null
@@ -1,2720 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Data;
-using System.Data.Entity;
-using System.Data.Entity.Core.Objects.DataClasses;
-using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Xml;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.ValidationRules;
-
-namespace Xceed.Wpf.DataGrid
-{
-    internal static class ItemsSourceHelper
-    {
-        #region Static Fields
-
-        private static readonly Type EntityObjectType = Type.GetType(
-          "System.Data.Objects.DataClasses.EntityObject, System.Data.Entity, Version=" + _XceedVersionInfo.FrameworkVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089",
-          false, false);
-
-        #endregion
-
-        internal static bool IsSourceSupportingChangeNotification(object source)
-        {
-            if (source is INotifyCollectionChanged)
-                return true;
-
-            var collection = source as IBindingList;
-
-            return (collection != null)
-                && (collection.SupportsChangeNotification);
-        }
-
-        private static bool IsSupportingDBNull(IEnumerable source)
-        {
-            // return false because all the DBNull conversion should have been done in the DataGridCollectionView.ItemProperties converter.
-            if (source is DataGridCollectionView)
-                return false;
-
-            if (source is DataView)
-                return true;
-
-            var collectionView = source as CollectionView;
-            if (collectionView != null)
-                return ItemsSourceHelper.IsSupportingDBNull(collectionView.SourceCollection);
-
-            return false;
-        }
-
-        internal static bool IsItemSupportingDBNull(object source)
-        {
-            return (source is System.Data.DataRow)
-                || (source is DataRowView);
-        }
-
-        internal static bool IsDataView(IEnumerable source)
-        {
-            if (source is DataGridCollectionView)
-                return false;
-
-            if (source is DataView)
-                return true;
-
-            var collectionView = source as CollectionView;
-
-            return (collectionView != null)
-                && (collectionView.SourceCollection is DataView);
-        }
-
-        internal static IList TryGetIList(IEnumerable itemsSourceCollection)
-        {
-            var collectionView = itemsSourceCollection as ItemCollection;
-            if (collectionView != null)
-            {
-                var list = collectionView.SourceCollection as IList;
-                if (list != null)
-                    return list;
-            }
-
-            return itemsSourceCollection as IList;
-        }
-
-        private static bool IsValueType(Type itemType)
-        {
-            if (typeof(string) == itemType)
-                return true;
-
-            if (!itemType.IsValueType)
-                return false;
-
-            return (itemType.IsPrimitive)
-                || (typeof(decimal) == itemType)
-                || (typeof(DateTime) == itemType)
-                || (typeof(TimeSpan) == itemType)
-                || (typeof(Guid) == itemType);
-        }
-
-        internal static bool IsEntityObjectLoadable(EntityObject entityObject)
-        {
-            return ((entityObject.EntityState & EntityState.Added) != EntityState.Added)
-                && ((entityObject.EntityState & EntityState.Detached) != EntityState.Detached);
-        }
-
-        private static bool IsEntityFramework(Type itemType)
-        {
-            var entityObjectType = ItemsSourceHelper.EntityObjectType;
-
-            // The EntityFramework assembly is not loaded.  We are running on the client framework.
-            return (entityObjectType != null)
-                && (entityObjectType.IsAssignableFrom(itemType));
-        }
-
-        internal static bool IsEntityFramework(object source)
-        {
-            return (source != null)
-                && (ItemsSourceHelper.IsEntityFramework(source.GetType()));
-        }
-
-        internal static object GetFirstItemByEnumerable(IEnumerable source)
-        {
-            if (source == null)
-                return null;
-
-            return source.Cast<object>().FirstOrDefault();
-        }
-
-        internal static DataGridItemPropertyCollection GetRootCollection(DataGridItemPropertyCollection collection)
-        {
-            if (collection == null)
-                return null;
-
-            var owner = collection.Owner;
-            if (owner == null)
-                return collection;
-
-            return ItemsSourceHelper.GetRootCollection(owner);
-        }
-
-        internal static DataGridItemPropertyCollection GetRootCollection(DataGridItemPropertyBase itemProperty)
-        {
-            if (itemProperty == null)
-                return null;
-
-            return ItemsSourceHelper.GetRootCollection(itemProperty.ContainingCollection);
-        }
-
-        internal static object AddNewDataItem(IEnumerable itemsSourceCollection, DataGridControl dataGridControl, out int itemIndex)
-        {
-            var dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
-            if (dataGridCollectionViewBase != null)
-            {
-                if (!dataGridCollectionViewBase.CanAddNew)
-                    throw new InvalidOperationException("An attempt was made to add a new data item to a source that does not support insertion.");
-
-                itemIndex = dataGridCollectionViewBase.Count;
-
-                return dataGridCollectionViewBase.AddNew();
-            }
-
-            var newItem = default(object);
-
-            if ((dataGridControl != null) && (dataGridControl.ItemsSource == null))
-            {
-                //unbound
-#pragma warning disable 618
-                var eventArgs = new AddingNewDataItemEventArgs();
-                dataGridControl.OnAddingNewDataItem(eventArgs);
-
-                newItem = eventArgs.DataItem;
-#pragma warning restore 618
-
-                if (newItem == null)
-                    throw new InvalidOperationException("The AddingNewDataItem event did not return a new data item because the grid is not bound to a data source.");
-
-                itemIndex = dataGridControl.Items.Add(newItem);
-
-                return newItem;
-            }
-
-            var dataView = itemsSourceCollection as DataView;
-            if (dataView == null)
-            {
-                var collectionView = itemsSourceCollection as CollectionView;
-
-                dataView = (collectionView == null) ? null : collectionView.SourceCollection as DataView;
-            }
-
-            if (dataView != null)
-            {
-                itemIndex = dataView.Count;
-
-                return dataView.AddNew();
-            }
-
-            var bindingList = itemsSourceCollection as IBindingList;
-            if (bindingList == null)
-            {
-                var collectionView = itemsSourceCollection as CollectionView;
-
-                bindingList = (collectionView == null) ? null : collectionView.SourceCollection as IBindingList;
-            }
-
-            if ((bindingList != null) && (bindingList.AllowNew))
-            {
-                itemIndex = bindingList.Count;
-                newItem = bindingList.AddNew();
-            }
-            else
-            {
-                var itemType = ItemsSourceHelper.GetItemTypeFromEnumeration(itemsSourceCollection);
-                if (itemType == null)
-                    throw new InvalidOperationException("An attempt was made to use a source whose item type cannot be determined.");
-
-                try
-                {
-                    itemIndex = -1;
-                    newItem = Activator.CreateInstance(itemType);
-                }
-                catch (MissingMethodException exception)
-                {
-                    throw new InvalidOperationException("An attempt was made to use a source whose item type does not have a default constructor.", exception);
-                }
-                catch (Exception exception)
-                {
-                    throw new InvalidOperationException("An unsuccessful attempt was made to create an instance of the source's item type using the item's default constructor.", exception);
-                }
-            }
-
-            var initializableObject = ItemsSourceHelper.GetSupportInitializeObject(newItem);
-            if (initializableObject != null)
-            {
-                initializableObject.BeginInit();
-            }
-
-            var editableObject = ItemsSourceHelper.GetEditableObject(newItem);
-            if (editableObject != null)
-            {
-                editableObject.BeginEdit();
-            }
-
-            return newItem;
-        }
-
-        internal static void CancelNewDataItem(IEnumerable itemsSourceCollection, DataGridControl dataGridControl, object newItem, int newItemIndex)
-        {
-            var dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
-            if (dataGridCollectionViewBase != null)
-            {
-                if (dataGridCollectionViewBase.CurrentAddItem == newItem)
-                {
-                    // The DataGridCollectionViewBase's CancelNew will take care of calling the item's CancelEdit if it must do so.
-                    dataGridCollectionViewBase.CancelNew();
-                }
-
-                return;
-            }
-
-            //if unbound
-            if ((dataGridControl != null) && (dataGridControl.ItemsSource == null))
-                return;
-
-            var editableObject = ItemsSourceHelper.GetEditableObject(newItem);
-            if (editableObject != null)
-            {
-                editableObject.CancelEdit();
-            }
-
-            var initializableObject = ItemsSourceHelper.GetSupportInitializeObject(newItem);
-            if (initializableObject != null)
-            {
-                initializableObject.EndInit();
-            }
-
-            if (ItemsSourceHelper.IsEditableObjectInsertedOrRemovedFromDataSourceAutomatically(editableObject))
-                return;
-
-            var cancelAddNew = itemsSourceCollection as ICancelAddNew;
-            if (cancelAddNew == null)
-            {
-                var collectionView = itemsSourceCollection as CollectionView;
-
-                cancelAddNew = (collectionView == null) ? null : collectionView.SourceCollection as ICancelAddNew;
-            }
-
-            if (cancelAddNew != null)
-            {
-                cancelAddNew.CancelNew(newItemIndex);
-                return;
-            }
-
-            if (newItemIndex >= 0)
-            {
-                var list = itemsSourceCollection as IList;
-                if (list == null)
-                {
-                    var collectionView = itemsSourceCollection as CollectionView;
-
-                    list = (collectionView == null) ? null : collectionView.SourceCollection as IList;
-                }
-
-                if ((list != null) && (!list.IsFixedSize))
-                {
-                    list.RemoveAt(newItemIndex);
-                }
-            }
-        }
-
-        internal static void EndNewDataItem(IEnumerable itemsSourceCollection, DataGridControl dataGridControl, object newItem, ref int newItemIndex)
-        {
-            var dataGridCollectionViewBase = itemsSourceCollection as DataGridCollectionViewBase;
-            if (dataGridCollectionViewBase != null)
-            {
-                if (dataGridCollectionViewBase.CurrentAddItem == newItem)
-                {
-                    // The DataGridCollectionViewBase's EndNew will take care of calling the item's EndEdit if it must do so.
-                    dataGridCollectionViewBase.CommitNew();
-                }
-
-                return;
-            }
-
-            //if unbound
-            if ((dataGridControl != null) && (dataGridControl.ItemsSource == null))
-                return;
-
-            var editableObject = ItemsSourceHelper.GetEditableObject(newItem);
-            if (editableObject != null)
-            {
-                editableObject.EndEdit();
-            }
-
-            var initializableObject = ItemsSourceHelper.GetSupportInitializeObject(newItem);
-            if (initializableObject != null)
-            {
-                initializableObject.EndInit();
-            }
-
-            if (ItemsSourceHelper.IsEditableObjectInsertedOrRemovedFromDataSourceAutomatically(editableObject))
-                return;
-
-            var cancelAddNew = itemsSourceCollection as ICancelAddNew;
-            if (cancelAddNew == null)
-            {
-                var collectionView = itemsSourceCollection as CollectionView;
-
-                cancelAddNew = (collectionView == null) ? null : collectionView.SourceCollection as ICancelAddNew;
-            }
-
-            if (cancelAddNew != null)
-            {
-                cancelAddNew.EndNew(newItemIndex);
-                return;
-            }
-
-            var bindingList = itemsSourceCollection as IBindingList;
-            if (bindingList == null)
-            {
-                var collectionView = itemsSourceCollection as CollectionView;
-
-                bindingList = (collectionView == null) ? null : collectionView.SourceCollection as IBindingList;
-            }
-
-            // If the item is already added into the list by IBindingList.AddNew.
-            if ((bindingList != null) && (bindingList.AllowNew))
-                return;
-
-            var list = itemsSourceCollection as IList;
-            if (list == null)
-            {
-                var collectionView = itemsSourceCollection as CollectionView;
-
-                list = (collectionView == null) ? null : collectionView.SourceCollection as IList;
-            }
-
-            if ((list == null) || (list.IsFixedSize))
-                throw new InvalidOperationException("An attempt was made to insert an item into a source that does not implement the IList interface or that has a fixed size.");
-
-            newItemIndex = list.Count;
-            list.Add(newItem);
-        }
-
-        private static PropertyDescription GetPropertyDescriptionFromItemProperty(PropertyDescriptionRouteDictionary propertyDescriptions, DataGridItemPropertyRoute itemPropertyRoute)
-        {
-            if ((propertyDescriptions == null) || (itemPropertyRoute == null))
-                return null;
-
-            var propertyRoute = PropertyRouteBuilder.ToPropertyRoute(itemPropertyRoute);
-            if (propertyRoute == null)
-                return null;
-
-            PropertyDescriptionRoute propertyDescription;
-            if (!propertyDescriptions.TryGetValue(propertyRoute, out propertyDescription))
-                return null;
-
-            return propertyDescription.Current;
-        }
-
-        internal static void CreateAndAddItemPropertiesForPropertyDescriptions(DataGridItemPropertyCollection itemProperties, IEnumerable<PropertyDescriptionRoute> propertyDescriptions)
-        {
-            if ((itemProperties == null) || (propertyDescriptions == null))
-                return;
-
-            using (itemProperties.DeferCollectionChanged())
-            {
-                foreach (var propertyDescription in propertyDescriptions)
-                {
-                    ItemsSourceHelper.CreateAndAddItemPropertyForPropertyDescription(itemProperties, propertyDescription);
-                }
-            }
-        }
-
-        internal static void CreateAndAddItemPropertyForPropertyDescription(DataGridItemPropertyCollection itemProperties, PropertyDescriptionRoute propertyDescription)
-        {
-            if ((itemProperties == null) || (propertyDescription == null))
-                return;
-
-            if (!propertyDescription.Current.IsBrowsable)
-                return;
-
-            var ancestors = new Stack<PropertyDescription>();
-            for (var current = propertyDescription; current != null; current = current.Parent)
-            {
-                var description = current.Current;
-                if (description.IsSubRelationship)
-                    return;
-
-                ancestors.Push(description);
-            }
-
-            var parentItemProperty = default(DataGridItemPropertyBase);
-            var isRoot = true;
-
-            while (ancestors.Count > 0)
-            {
-                var description = ancestors.Pop();
-                var itemProperty = (isRoot) ? itemProperties[description.Name] : parentItemProperty.ItemProperties[description.Name];
-
-                if (itemProperty == null)
-                {
-                    itemProperty = ItemsSourceHelper.CreateItemPropertyFromPropertyDescription(description);
-                    Debug.Assert(itemProperty != null);
-
-                    if (isRoot)
-                    {
-                        itemProperties.Add(itemProperty);
-                    }
-                    else
-                    {
-                        Debug.Assert(parentItemProperty != null);
-                        parentItemProperty.ItemProperties.Add(itemProperty);
-                    }
-                }
-
-                parentItemProperty = itemProperty;
-                isRoot = false;
-            }
-        }
-
-        internal static void CreateColumnsFromPropertyDescriptions(
-          ColumnHierarchyManager columnManager,
-          IDictionary<Type, CellEditor> defaultCellEditors,
-          PropertyDescriptionRouteDictionary propertyDescriptions,
-          bool autoCreateForeignKeyConfigurations)
-        {
-            Debug.Assert(columnManager != null);
-
-            var columns = columnManager.Columns;
-
-            using (columnManager.DeferUpdate())
-            {
-                using (columns.DeferNotifications())
-                {
-                    foreach (var propertyDescriptionRoute in propertyDescriptions.Values)
-                    {
-                        var fieldName = PropertyRouteParser.Parse(PropertyRouteBuilder.ToPropertyRoute(propertyDescriptionRoute));
-                        var columnBase = columns[fieldName];
-                        var column = columnBase as Column;
-
-                        if (columnBase == null)
-                        {
-                            column = ItemsSourceHelper.CreateColumnFromPropertyDescription(defaultCellEditors, propertyDescriptionRoute, autoCreateForeignKeyConfigurations);
-
-                            if (column != null)
-                            {
-                                columns.Add(column);
-                            }
-                        }
-                        else if (column != null)
-                        {
-                            ItemsSourceHelper.UpdateColumnFromPropertyDescription(column, defaultCellEditors, autoCreateForeignKeyConfigurations, propertyDescriptionRoute);
-                        }
-                    }
-                }
-            }
-        }
-
-        internal static void UpdateColumnsFromPropertyDescriptions(
-          ColumnHierarchyManager columnManager,
-          IDictionary<Type, CellEditor> defaultCellEditors,
-          PropertyDescriptionRouteDictionary propertyDescriptions,
-          bool autoCreateForeignKeyConfigurations)
-        {
-            Debug.Assert(columnManager != null);
-
-            var columns = columnManager.Columns;
-
-            using (columnManager.DeferUpdate())
-            {
-                using (columns.DeferNotifications())
-                {
-                    var columnsToRemove = new HashSet<ColumnBase>((from columnBase in columns
-                                                                   let column = columnBase as Column
-                                                                   where (column != null) && column.IsAutoCreated
-                                                                   select column));
-
-                    foreach (var propertyDescriptionRoute in propertyDescriptions.Values)
-                    {
-                        var fieldName = PropertyRouteParser.Parse(PropertyRouteBuilder.ToPropertyRoute(propertyDescriptionRoute));
-                        var columnBase = columns[fieldName];
-                        var column = columnBase as Column;
-
-                        if (columnBase == null)
-                        {
-                            column = ItemsSourceHelper.CreateColumnFromPropertyDescription(defaultCellEditors, propertyDescriptionRoute, autoCreateForeignKeyConfigurations);
-
-                            if (column != null)
-                            {
-                                columns.Add(column);
-                            }
-                        }
-                        else if (column != null)
-                        {
-                            columnsToRemove.Remove(column);
-
-                            ItemsSourceHelper.UpdateColumnFromPropertyDescription(column, defaultCellEditors, autoCreateForeignKeyConfigurations, propertyDescriptionRoute);
-                        }
-                    }
-
-                    foreach (var column in columnsToRemove)
-                    {
-                        columns.Remove(column);
-                    }
-                }
-            }
-        }
-
-        private static Column CreateColumnFromPropertyDescription(IDictionary<Type, CellEditor> defaultCellEditors, PropertyDescriptionRoute propertyDescriptionRoute, bool autoCreateForeignKeyConfigurations)
-        {
-            if (propertyDescriptionRoute == null)
-                return null;
-
-            var propertyDescription = propertyDescriptionRoute.Current;
-            var dataType = propertyDescription.DataType;
-
-            if (!propertyDescription.IsBrowsable || !propertyDescription.IsDisplayable)
-                return null;
-
-            for (var current = propertyDescriptionRoute; current != null; current = current.Parent)
-            {
-                var description = current.Current;
-                if (description.IsSubRelationship)
-                    return null;
-            }
-
-            var name = PropertyRouteParser.Parse(PropertyRouteBuilder.ToPropertyRoute(propertyDescriptionRoute));
-            if (string.IsNullOrEmpty(name))
-                return null;
-
-            var column = new Column();
-            column.IsAutoCreated = true;
-            column.FieldName = name;
-            column.Title = propertyDescription.DisplayName;
-            column.OverrideReadOnlyForInsertion = propertyDescription.OverrideReadOnlyForInsertion;
-            column.SetDisplayMemberBinding(ItemsSourceHelper.CreateDefaultBinding(propertyDescriptionRoute));
-            column.IsBindingAutoCreated = true;
-            column.IsBoundToDataGridUnboundItemProperty = propertyDescription.IsDataGridUnboundItemProperty;
-
-            if (propertyDescription.IsReadOnly)
-            {
-                column.ReadOnly = true;
-            }
-
-            var cellEditor = default(CellEditor);
-
-            if ((defaultCellEditors != null) && !defaultCellEditors.TryGetValue(dataType, out cellEditor))
-            {
-                cellEditor = default(CellEditor);
-            }
-
-            var foreignKeyDescription = propertyDescription.ForeignKeyDescription;
-
-            if ((foreignKeyDescription != null) && (foreignKeyDescription.ItemsSource != null) && (autoCreateForeignKeyConfigurations))
-            {
-                // We will only use the default foreign key CellEditor if:
-                // - a ForeignKey ItemsSource was detected
-                // - the grid allows the auto-creation of the ForeignKeyConfigurations
-                // else, use the default CellEditor
-                if (cellEditor == null)
-                {
-                    cellEditor = DefaultCellEditorSelector.ForeignKeyCellEditor;
-                }
-
-                // Update the ForeignKeyConfiguration from the ForeignKeyDescription found on the FieldDescriptor
-                ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription(column, foreignKeyDescription, autoCreateForeignKeyConfigurations);
-            }
-
-            if (cellEditor == null)
-            {
-                cellEditor = DefaultCellEditorSelector.SelectCellEditor(dataType);
-            }
-
-            column.CellEditor = cellEditor;
-            column.DefaultCellRecyclingGroupDataType = dataType;
-
-            return column;
-        }
-
-        internal static void UpdateColumnFromPropertyDescription(
-          ColumnBase column,
-          IDictionary<Type, CellEditor> defaultCellEditors,
-          bool autoCreateForeignKeyConfigurations,
-          PropertyDescriptionRoute propertyDescription)
-        {
-            if ((column == null) || (propertyDescription == null))
-                return;
-
-            var targetColumn = column as Column;
-            var targetPropertyDescription = propertyDescription.Current;
-
-            if (targetPropertyDescription.IsReadOnly)
-            {
-                if (column.ReadLocalValue(Column.ReadOnlyProperty) == DependencyProperty.UnsetValue)
-                {
-                    column.ReadOnly = targetPropertyDescription.IsReadOnly;
-                }
-            }
-
-            if (targetPropertyDescription.OverrideReadOnlyForInsertion)
-            {
-                if (column.ReadLocalValue(ColumnBase.OverrideReadOnlyForInsertionProperty) == DependencyProperty.UnsetValue)
-                {
-                    column.OverrideReadOnlyForInsertion = targetPropertyDescription.OverrideReadOnlyForInsertion;
-                }
-            }
-
-            if (column.ReadLocalValue(ColumnBase.TitleProperty) == DependencyProperty.UnsetValue)
-            {
-                column.Title = targetPropertyDescription.DisplayName;
-            }
-
-            if (column.ReadLocalValue(ColumnBase.CellEditorProperty) == DependencyProperty.UnsetValue)
-            {
-                var cellEditor = default(CellEditor);
-
-                if (defaultCellEditors != null)
-                {
-                    defaultCellEditors.TryGetValue(targetPropertyDescription.DataType, out cellEditor);
-                }
-
-                if ((cellEditor == null) && (targetColumn != null))
-                {
-                    var descriptionItemsSource = default(object);
-                    var configurationItemsSource = default(object);
-                    var configuration = targetColumn.ForeignKeyConfiguration;
-
-                    if (targetPropertyDescription.ForeignKeyDescription != null)
-                    {
-                        descriptionItemsSource = targetPropertyDescription.ForeignKeyDescription.ItemsSource;
-                    }
-
-                    if (configuration != null)
-                    {
-                        configurationItemsSource = configuration.ItemsSource;
-
-                        if (configurationItemsSource == null)
-                        {
-                            configurationItemsSource = targetColumn.ReadLocalValue(Column.ForeignKeyConfigurationProperty);
-                        }
-                    }
-
-                    // A foreign key ItemsSource is set and we can auto-create configuration, OR,
-                    // if the foreign key ItemsSource was found in the ForeignKeyConfiguration, use the Default ForeignKey CellEditor.
-                    if (((descriptionItemsSource != null) && (autoCreateForeignKeyConfigurations)) || (configurationItemsSource != null))
-                    {
-                        cellEditor = DefaultCellEditorSelector.ForeignKeyCellEditor;
-                    }
-                }
-
-                if (cellEditor == null)
-                {
-                    cellEditor = DefaultCellEditorSelector.SelectCellEditor(targetPropertyDescription.DataType);
-                }
-
-                column.CellEditor = cellEditor;
-            }
-
-            if (targetColumn != null)
-            {
-                if ((targetPropertyDescription.ForeignKeyDescription != null) && (targetPropertyDescription.ForeignKeyDescription.ItemsSource != null) && (autoCreateForeignKeyConfigurations))
-                {
-                    // Update the ForeignKeyConfiguration from the ForeignKeyDescription found on the FieldDescriptor
-                    ForeignKeyConfiguration.SynchronizeForeignKeyConfigurationFromForeignKeyDescription(targetColumn, targetPropertyDescription.ForeignKeyDescription, autoCreateForeignKeyConfigurations);
-                }
-
-                if (targetColumn.GetDisplayMemberBinding() == null)
-                {
-                    targetColumn.SetDisplayMemberBinding(ItemsSourceHelper.CreateDefaultBinding(propertyDescription));
-                    targetColumn.IsBindingAutoCreated = true;
-                    targetColumn.IsBoundToDataGridUnboundItemProperty = targetPropertyDescription.IsDataGridUnboundItemProperty;
-                }
-            }
-
-            column.DefaultCellRecyclingGroupDataType = targetPropertyDescription.DataType;
-        }
-
-        internal static DataGridItemPropertyBase GetItemPropertyFromProperty(DataGridItemPropertyCollection itemProperties, string propertyPath)
-        {
-            if (itemProperties == null)
-                return null;
-
-            return ItemsSourceHelper.GetItemPropertyFromProperty(itemProperties, PropertyRouteParser.Parse(propertyPath));
-        }
-
-        internal static DataGridItemPropertyBase GetItemPropertyFromProperty(DataGridItemPropertyCollection itemProperties, PropertyRoute propertyRoute)
-        {
-            if ((itemProperties == null) || (propertyRoute == null))
-                return null;
-
-            if (propertyRoute.Parent != null)
-            {
-                var parentItemProperty = ItemsSourceHelper.GetItemPropertyFromProperty(itemProperties, propertyRoute.Parent);
-                if (parentItemProperty == null)
-                    return null;
-
-                itemProperties = parentItemProperty.ItemPropertiesInternal;
-                if (itemProperties == null)
-                    return null;
-            }
-
-            return itemProperties[propertyRoute.Current.Name];
-        }
-
-        internal static object GetValueFromItemProperty(DataGridItemPropertyBase itemProperty, object item)
-        {
-            return ItemsSourceHelper.GetValueFromItemProperty(itemProperty, item, null);
-        }
-
-        internal static object GetValueFromItemProperty(DataGridItemPropertyBase itemProperty, object item, object defaultValue)
-        {
-            if (itemProperty == null)
-                throw new ArgumentNullException("itemProperty");
-
-            // Make sure the DataGridItemProperty is still in use.
-            var collection = itemProperty.ContainingCollection;
-            if (collection == null)
-                return defaultValue;
-
-            var parentItemProperty = collection.Owner;
-            if (parentItemProperty != null)
-            {
-                item = ItemsSourceHelper.GetValueFromItemProperty(parentItemProperty, item);
-            }
-
-            if (item == null)
-                return defaultValue;
-
-            return itemProperty.GetValue(item);
-        }
-
-        internal static void SetValueForItemProperty(DataGridItemPropertyBase itemProperty, object item, object value)
-        {
-            if (itemProperty == null)
-                throw new ArgumentNullException("itemProperty");
-
-            // Make sure the DataGridItemProperty is still in use.
-            var collection = itemProperty.ContainingCollection;
-            if (collection == null)
-                return;
-
-            var parentItemProperty = collection.Owner;
-            if (parentItemProperty != null)
-            {
-                item = ItemsSourceHelper.GetValueFromItemProperty(parentItemProperty, item);
-            }
-
-            if (item == null)
-                return;
-
-            itemProperty.SetValue(item, value);
-        }
-
-        internal static void AutoDetectSynonyms(DataGridCollectionViewBase collectionView)
-        {
-            if (collectionView == null)
-                return;
-
-            // The root CollectionView does not need to have its ItemProperties binded.
-            var masterCollectionView = collectionView.RootDataGridCollectionViewBase;
-            if ((masterCollectionView == null) || (masterCollectionView == collectionView))
-                return;
-
-            ItemsSourceHelper.AutoDetectSynonyms(masterCollectionView.ItemProperties, collectionView.ItemProperties);
-        }
-
-        internal static void AutoDetectSynonyms(DataGridCollectionViewBase collectionView, DataGridItemPropertyRoute detailItemPropertyRoute)
-        {
-            if ((collectionView == null) || (detailItemPropertyRoute == null))
-                return;
-
-            // The root CollectionView does not need to have its ItemProperties binded.
-            var masterCollectionView = collectionView.RootDataGridCollectionViewBase;
-            if ((masterCollectionView == null) || (masterCollectionView == collectionView))
-                return;
-
-            var masterItemProperty = ItemsSourceHelper.AutoDetectSynonyms(masterCollectionView.ItemProperties, detailItemPropertyRoute);
-            if (masterItemProperty == null)
-                return;
-
-            // Do the auto detection on child properties.
-            ItemsSourceHelper.AutoDetectSynonyms(masterItemProperty.ItemPropertiesInternal, detailItemPropertyRoute.Current.ItemPropertiesInternal);
-        }
-
-        private static void AutoDetectSynonyms(DataGridItemPropertyCollection masterItemProperties, DataGridItemPropertyCollection detailItemProperties)
-        {
-            if ((masterItemProperties == null) || (detailItemProperties == null))
-                return;
-
-            foreach (var detailItemProperty in detailItemProperties)
-            {
-                ItemsSourceHelper.AutoDetectSynonyms(masterItemProperties, detailItemProperty, true);
-            }
-        }
-
-        private static DataGridItemPropertyBase AutoDetectSynonyms(DataGridItemPropertyCollection masterItemProperties, DataGridItemPropertyRoute detailItemPropertyRoute)
-        {
-            if ((masterItemProperties == null) || (detailItemPropertyRoute == null))
-                return null;
-
-            if (detailItemPropertyRoute.Parent == null)
-                return ItemsSourceHelper.AutoDetectSynonyms(masterItemProperties, detailItemPropertyRoute.Current, false);
-
-            var masterParentItemProperty = ItemsSourceHelper.AutoDetectSynonyms(masterItemProperties, detailItemPropertyRoute.Parent);
-            if (masterParentItemProperty == null)
-                return null;
-
-            return ItemsSourceHelper.AutoDetectSynonyms(masterParentItemProperty.ItemPropertiesInternal, detailItemPropertyRoute.Current, false);
-        }
-
-        private static DataGridItemPropertyBase AutoDetectSynonyms(DataGridItemPropertyCollection masterItemProperties, DataGridItemPropertyBase detailItemProperty, bool autoDetectSubProperties)
-        {
-            if ((masterItemProperties == null) || (detailItemProperty == null))
-                return null;
-
-            var masterItemProperty = default(DataGridItemPropertyBase);
-
-            if (string.IsNullOrEmpty(detailItemProperty.Synonym))
-            {
-                masterItemProperty = masterItemProperties[detailItemProperty.Name];
-
-                if ((masterItemProperty != null) && (masterItemProperty.DataType == detailItemProperty.DataType))
-                {
-                    detailItemProperty.SetSynonym(masterItemProperty.Name);
-                }
-                else
-                {
-                    masterItemProperty = null;
-                }
-            }
-            else if ((detailItemProperty.ItemPropertiesInternal != null) && (detailItemProperty.Synonym == detailItemProperty.Name))
-            {
-                masterItemProperty = masterItemProperties[detailItemProperty.Name];
-            }
-
-            if (autoDetectSubProperties && (masterItemProperty != null) && (masterItemProperty.ItemPropertiesInternal != null) && (detailItemProperty.ItemPropertiesInternal != null))
-            {
-                ItemsSourceHelper.AutoDetectSynonyms(masterItemProperty.ItemPropertiesInternal, detailItemProperty.ItemPropertiesInternal);
-            }
-
-            return masterItemProperty;
-        }
-
-        internal static ICustomTypeDescriptor GetCustomTypeDescriptorFromItem(object item, Type itemType)
-        {
-            var descriptionProvider = default(TypeDescriptionProvider);
-            if (itemType != null)
-            {
-                descriptionProvider = TypeDescriptor.GetProvider(itemType);
-            }
-
-            if (!(descriptionProvider is DataItemTypeDescriptionProvider))
-            {
-                descriptionProvider = new DataItemTypeDescriptionProvider(descriptionProvider);
-            }
-
-            return descriptionProvider.GetTypeDescriptor(itemType, item);
-        }
-
-        private static ICustomTypeDescriptor GetCustomTypeDescriptor(IEnumerable itemsSource, Type itemType)
-        {
-            if ((itemsSource == null) && (itemType == null))
-                return null;
-
-            var firstItem = ItemsSourceHelper.GetFirstItemByEnumerable(itemsSource);
-
-            return ItemsSourceHelper.GetCustomTypeDescriptor(firstItem, itemType);
-        }
-
-        private static ICustomTypeDescriptor GetCustomTypeDescriptor(object item, Type itemType)
-        {
-            var descriptor = item as ICustomTypeDescriptor;
-            if (descriptor == null)
-                return ItemsSourceHelper.GetCustomTypeDescriptorFromItem(item, itemType);
-
-            if (!(descriptor is DataItemTypeDescriptor))
-                return DataItemTypeDescriptionProvider.GetTypeDescriptor(itemType, descriptor);
-
-            return descriptor;
-        }
-
-        internal static void ResetPropertyDescriptions(PropertyDescriptionRouteDictionary collection, DataGridItemPropertyMap itemPropertyMap, DataGridControl dataGridControl, IEnumerable itemsSource)
-        {
-            if (collection == null)
-                throw new ArgumentNullException("collection");
-
-            if (dataGridControl == null)
-                throw new ArgumentNullException("dataGridControl");
-
-            collection.Clear();
-
-            var masterPropertyDescriptions = dataGridControl.ItemsSourcePropertyDescriptions;
-
-            if ((collection != masterPropertyDescriptions) && dataGridControl.AreDetailsFlatten)
-            {
-                var collectionView = itemsSource as DataGridCollectionViewBase;
-                if (collectionView != null)
-                {
-                    ItemsSourceHelper.SetPropertyDescriptions(collection, masterPropertyDescriptions, itemPropertyMap, collectionView);
-                }
-            }
-            else
-            {
-                ItemsSourceHelper.SetPropertyDescriptions(collection, null, itemsSource, null, true);
-            }
-        }
-
-        internal static void SetPropertyDescriptions(PropertyDescriptionRouteDictionary collection, DataTable model, IEnumerable itemsSource, Type itemType, bool displayable)
-        {
-            if (collection == null)
-                throw new ArgumentNullException("collection");
-
-            var descriptions = default(IEnumerable<PropertyDescriptionRoute>);
-            var supportsDBNull = ItemsSourceHelper.IsSupportingDBNull(itemsSource);
-
-            if (model != null)
-            {
-                descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromDataTable(model, displayable);
-            }
-            else if (itemsSource is DataView)
-            {
-                descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromDataView((DataView)itemsSource, displayable);
-            }
-            else if (itemsSource is DataGridCollectionViewBase)
-            {
-                descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromDataGridCollectionView((DataGridCollectionViewBase)itemsSource);
-            }
-            else if (itemsSource is ITypedList)
-            {
-                descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors(((ITypedList)itemsSource).GetItemProperties(null), supportsDBNull, displayable);
-            }
-            else
-            {
-                if (itemType == null)
-                {
-                    itemType = ItemsSourceHelper.GetItemTypeFromEnumeration(itemsSource);
-                }
-
-                descriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromItemType(itemsSource, itemType, supportsDBNull, displayable);
-            }
-
-            if (descriptions != null)
-            {
-                foreach (var description in descriptions)
-                {
-                    collection.Add(description, true);
-                }
-            }
-        }
-
-        private static void SetPropertyDescriptions(PropertyDescriptionRouteDictionary detailCollection, PropertyDescriptionRouteDictionary masterCollection, DataGridItemPropertyMap itemPropertyMap, DataGridCollectionViewBase collectionView)
-        {
-            if (collectionView == null)
-                return;
-
-            foreach (var itemProperty in collectionView.ItemProperties)
-            {
-                var masterItemProperty = default(DataGridItemPropertyBase);
-                if (!itemPropertyMap.TryGetMasterItemProperty(itemProperty, out masterItemProperty))
-                {
-                    Debug.WriteLine(string.Format("No mapping was found for the item property."));
-                    continue;
-                }
-
-                var masterPropertyRoute = PropertyRouteBuilder.ToPropertyRoute(DataGridItemPropertyRoute.Create(masterItemProperty));
-                if (masterPropertyRoute == null)
-                {
-                    masterPropertyRoute = PropertyRouteBuilder.ToPropertyRoute(new PropertyRouteSegment(PropertyRouteSegmentType.Property, masterItemProperty.Name));
-                }
-
-                var masterPropertyDescription = masterCollection[masterPropertyRoute];
-                if (masterPropertyDescription == null)
-                {
-                    Debug.WriteLine(string.Format("An item property is mapped to a non-existent master field."));
-                    continue;
-                }
-
-                var detailPropertyDescription = ItemsSourceHelper.CreatePropertyDescriptionFromDataGridItemProperty(itemProperty);
-                if (detailPropertyDescription.Current.DataType != masterPropertyDescription.Current.DataType)
-                {
-                    Debug.WriteLine(string.Format("The data type of an item property doesn't match the data type of its master field."));
-                    continue;
-                }
-
-                if (detailCollection.Contains(masterPropertyRoute))
-                {
-                    Debug.WriteLine(string.Format("Another detail field is already linked to the master field."));
-                    continue;
-                }
-
-                detailCollection.Add(masterPropertyRoute, detailPropertyDescription, false);
-            }
-        }
-
-        internal static void SetPropertyDescriptionsFromItemProperty(PropertyDescriptionRouteDictionary propertyDescriptions, DataTable model, IEnumerable itemsSource, Type itemType, DataGridItemPropertyRoute itemPropertyRoute)
-        {
-            if ((propertyDescriptions == null) || (itemPropertyRoute == null))
-                return;
-
-            var key = PropertyRouteBuilder.ToPropertyRoute(itemPropertyRoute);
-            ItemsSourceHelper.SetPropertyDescriptions(propertyDescriptions, model, itemsSource, itemType, key);
-
-            var propertyDescription = default(PropertyDescriptionRoute);
-            if (!propertyDescriptions.TryGetValue(key, out propertyDescription))
-                return;
-
-            var itemProperty = itemPropertyRoute.Current;
-            if (itemProperty.ItemPropertiesInternal == null)
-                return;
-
-            foreach (var childItemProperty in itemProperty.ItemPropertiesInternal)
-            {
-                ItemsSourceHelper.SetPropertyDescriptionsFromItemProperty(
-                  propertyDescriptions,
-                  null,
-                  null,
-                  itemProperty.DataType,
-                  DataGridItemPropertyRoute.Combine(childItemProperty, itemPropertyRoute));
-            }
-        }
-
-        internal static void InitializePropertyDescriptions(PropertyDescriptionRouteDictionary collection, DataGridItemPropertyRoute itemPropertyRoute, Type itemType, bool defaultPropertyDescriptionsCreated)
-        {
-            if ((collection == null) || (itemPropertyRoute == null))
-                return;
-
-            var propertyDescription = ItemsSourceHelper.GetPropertyDescriptionFromItemProperty(collection, itemPropertyRoute);
-            var itemProperty = itemPropertyRoute.Current;
-
-            itemProperty.SetUnspecifiedPropertiesValues(propertyDescription, itemType, defaultPropertyDescriptionsCreated);
-
-            if (itemProperty.ItemPropertiesInternal != null)
-            {
-                foreach (var childItemProperty in itemProperty.ItemPropertiesInternal)
-                {
-                    ItemsSourceHelper.InitializePropertyDescriptions(collection, DataGridItemPropertyRoute.Combine(childItemProperty, itemPropertyRoute), itemProperty.DataType, defaultPropertyDescriptionsCreated);
-                }
-            }
-        }
-
-        internal static Type GetItemTypeFromEnumeration(IEnumerable source)
-        {
-            if (source == null)
-                return null;
-
-            var enumerationType = source.GetType();
-            var itemType = ItemsSourceHelper.GetItemTypeFromEnumerationType(enumerationType);
-
-            if (itemType != null)
-                return itemType;
-
-            var item = ItemsSourceHelper.GetFirstItemByEnumerable(source);
-            if (item != null)
-                return item.GetType();
-
-            return typeof(object);
-        }
-
-        internal static Type GetItemTypeFromEnumerationType(Type enumerationType)
-        {
-            if (enumerationType == null)
-                return null;
-
-            if (typeof(Array).IsAssignableFrom(enumerationType))
-                return enumerationType.GetElementType();
-
-            var itemType = ItemsSourceHelper.GetTypedListIndexerType(enumerationType);
-            if (itemType != null)
-                return itemType;
-
-            return ItemsSourceHelper.GetTypedEnumerationItemType(enumerationType);
-        }
-
-        internal static IEditableObject GetEditableObject(object item)
-        {
-            var dataRow = item as System.Data.DataRow;
-            if (dataRow != null)
-                return new DataRowEditableWrapper(dataRow);
-
-            return item as IEditableObject;
-        }
-
-        internal static ISupportInitialize GetSupportInitializeObject(object item)
-        {
-            return item as ISupportInitialize;
-        }
-
-        internal static bool IsASubRelationship(Type dataType)
-        {
-            if ((dataType == null) || (dataType.IsValueType) || (typeof(string).IsAssignableFrom(dataType)))
-                return false;
-
-            if (typeof(IEnumerable).IsAssignableFrom(dataType))
-                return !typeof(byte[]).IsAssignableFrom(dataType);
-
-            return typeof(IListSource).IsAssignableFrom(dataType);
-        }
-
-        internal static object TryGetDataRowFromDataItem(object dataItem)
-        {
-            var dataRowView = dataItem as DataRowView;
-            if (dataRowView != null)
-                return dataRowView.Row;
-
-            return dataItem;
-        }
-
-        internal static DataView TryGetDataViewFromDataGridContext(DataGridContext context)
-        {
-            if (context == null)
-                return null;
-
-            var dataView = context.ItemsSourceCollection as DataView;
-            if (dataView != null)
-                return dataView;
-
-            var collectionViewBase = context.ItemsSourceCollection as DataGridCollectionViewBase;
-            if (collectionViewBase != null)
-                return collectionViewBase.SourceCollection as DataView;
-
-            return null;
-        }
-
-        internal static Type GetColumnDataType(DataColumn column)
-        {
-            if (!column.AllowDBNull)
-                return column.DataType;
-
-            if (column.DataType == typeof(Boolean))
-                return typeof(Nullable<Boolean>);
-
-            if (column.DataType == typeof(Byte))
-                return typeof(Nullable<Byte>);
-
-            if (column.DataType == typeof(Char))
-                return typeof(Nullable<Char>);
-
-            if (column.DataType == typeof(DateTime))
-                return typeof(Nullable<DateTime>);
-
-            if (column.DataType == typeof(Decimal))
-                return typeof(Nullable<Decimal>);
-
-            if (column.DataType == typeof(Double))
-                return typeof(Nullable<Double>);
-
-            if (column.DataType == typeof(Int16))
-                return typeof(Nullable<Int16>);
-
-            if (column.DataType == typeof(Int32))
-                return typeof(Nullable<Int32>);
-
-            if (column.DataType == typeof(Int64))
-                return typeof(Nullable<Int64>);
-
-            if (column.DataType == typeof(SByte))
-                return typeof(Nullable<SByte>);
-
-            if (column.DataType == typeof(Single))
-                return typeof(Nullable<Single>);
-
-            if (column.DataType == typeof(TimeSpan))
-                return typeof(Nullable<TimeSpan>);
-
-            if (column.DataType == typeof(UInt16))
-                return typeof(Nullable<UInt16>);
-
-            if (column.DataType == typeof(UInt32))
-                return typeof(Nullable<UInt32>);
-
-            if (column.DataType == typeof(UInt64))
-                return typeof(Nullable<UInt64>);
-
-            return column.DataType;
-        }
-
-        internal static void CleanUpColumns(ColumnCollection columns, bool deleteAutoCreatedColumn)
-        {
-            var tempColumns = new ColumnBase[columns.Count];
-            columns.CopyTo(tempColumns, 0);
-
-            foreach (ColumnBase column in tempColumns)
-            {
-                var dataColumn = column as Column;
-                if (dataColumn == null)
-                    continue;
-
-                if ((deleteAutoCreatedColumn) && (dataColumn.IsAutoCreated))
-                {
-                    columns.Remove(column);
-                }
-                else if (dataColumn.IsBindingAutoCreated)
-                {
-                    dataColumn.IsBindingAutoCreated = false;
-                    dataColumn.IsBoundToDataGridUnboundItemProperty = false;
-                    dataColumn.SetDisplayMemberBinding(null);
-                }
-            }
-        }
-
-        internal static PropertyDescriptionRoute CreateOrGetPropertyDescriptionFromColumn(DataGridContext dataGridContext, ColumnBase column, Type itemType)
-        {
-            if ((dataGridContext == null) || (column == null) || string.IsNullOrEmpty(column.FieldName))
-                return null;
-
-            var key = PropertyRouteParser.Parse(column.FieldName);
-            if (key == null)
-                return null;
-
-            var propertyDescriptions = dataGridContext.ItemsSourcePropertyDescriptions;
-            if (propertyDescriptions == null)
-                return null;
-
-            var propertyDescriptionRoute = default(PropertyDescriptionRoute);
-            if (!propertyDescriptions.TryGetValue(key, out propertyDescriptionRoute))
-            {
-                if ((itemType == null) || typeof(EmptyDataItem).IsAssignableFrom(itemType))
-                {
-                    var dataGridCollectionView = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-                    if (dataGridCollectionView != null)
-                    {
-                        itemType = dataGridCollectionView.ItemType;
-                    }
-                    else
-                    {
-                        var dataItem = ItemsSourceHelper.GetFirstItemByEnumerable(dataGridContext.Items);
-
-                        itemType = ((dataItem != null) && !(dataItem is EmptyDataItem)) ? dataItem.GetType() : null;
-                    }
-                }
-
-                ItemsSourceHelper.SetPropertyDescriptions(propertyDescriptions, null, dataGridContext.Items, itemType, key);
-
-                if (!propertyDescriptions.TryGetValue(key, out propertyDescriptionRoute))
-                    return null;
-            }
-
-            return propertyDescriptionRoute;
-        }
-
-        internal static System.Windows.Data.Binding CreateDefaultBinding(PropertyDescriptionRoute propertyDescriptionRoute)
-        {
-            if (propertyDescriptionRoute == null)
-                return null;
-
-            var propertyDescription = propertyDescriptionRoute.Current;
-            var bindingXPath = propertyDescription.XPath;
-            var bindingPath = new StringBuilder();
-            var isPropertyDescriptorFirstAccessor = false;
-
-            var propertyDescriptors = new List<PropertyDescriptor>();
-            if (propertyDescription.PropertyDescriptor != null)
-            {
-                bindingPath.Append("(").Append(propertyDescriptors.Count).Append(")");
-                propertyDescriptors.Add(propertyDescription.PropertyDescriptor);
-                isPropertyDescriptorFirstAccessor = true;
-            }
-            else if (!string.IsNullOrEmpty(propertyDescription.Path))
-            {
-                bindingPath.Append(propertyDescription.Path);
-            }
-
-            var currentPropertyDescriptionRoute = propertyDescriptionRoute.Parent;
-
-            while (currentPropertyDescriptionRoute != null)
-            {
-                var currentPropertyDescription = currentPropertyDescriptionRoute.Current;
-
-                if (currentPropertyDescription.SupportDBNull)
-                    throw new InvalidOperationException("Cannot create binding when a parent property supports DBNull.");
-
-                if (currentPropertyDescription.IsDataGridUnboundItemProperty)
-                    throw new InvalidOperationException("Cannot create binding when a parent property is linked to an UnboundDataGridItemProperty.");
-
-                if (currentPropertyDescription.ForeignKeyDescription != null)
-                    throw new InvalidOperationException("Cannot create binding when a parent property is a foreign key.");
-
-                if (!string.IsNullOrEmpty(bindingXPath))
-                    throw new InvalidOperationException("Cannot create binding when a child property has an XPath.");
-
-                bindingXPath = currentPropertyDescription.XPath;
-
-                if (currentPropertyDescription.PropertyDescriptor != null)
-                {
-                    isPropertyDescriptorFirstAccessor = true;
-
-                    if (bindingPath.Length != 0)
-                    {
-                        bindingPath.Insert(0, ".");
-                    }
-
-                    bindingPath.Insert(0, ")").Insert(0, propertyDescriptors.Count).Insert(0, "(");
-                    propertyDescriptors.Add(currentPropertyDescription.PropertyDescriptor);
-                }
-                else if (!string.IsNullOrEmpty(currentPropertyDescription.Path))
-                {
-                    isPropertyDescriptorFirstAccessor = false;
-
-                    if (bindingPath.Length != 0)
-                    {
-                        bindingPath.Insert(0, ".");
-                    }
-
-                    bindingPath.Insert(0, currentPropertyDescription.Path);
-                }
-
-                currentPropertyDescriptionRoute = currentPropertyDescriptionRoute.Parent;
-            }
-
-            var bindingInfo = new DataGridBindingInfo();
-
-            if (!string.IsNullOrEmpty(bindingXPath))
-            {
-                bindingInfo.XPath = bindingXPath;
-            }
-            else
-            {
-                // We must insert a PropertyDescriptor to manage EmptyDataItem when the accessor is not from a DataGridItemPropertyBase.
-                if (isPropertyDescriptorFirstAccessor && !(propertyDescriptors.Last() is DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase))
-                {
-                    if (bindingPath.Length != 0)
-                    {
-                        bindingPath.Insert(0, ".");
-                    }
-
-                    bindingPath.Insert(0, ")").Insert(0, propertyDescriptors.Count).Insert(0, "(");
-                    propertyDescriptors.Add(EmptyDataItemSafePropertyDescriptor.Singleton);
-                }
-            }
-
-            bindingInfo.Path = new PropertyPath(bindingPath.ToString(), propertyDescriptors.ToArray());
-            bindingInfo.ReadOnly = (propertyDescription.IsReadOnly && !propertyDescription.OverrideReadOnlyForInsertion);
-            bindingInfo.Converter = new SourceDataConverter(propertyDescription.SupportDBNull);
-
-            bindingInfo.ValidationRules.Add(new SourceDataConverterValidationRule(propertyDescription.SupportDBNull, propertyDescription.DataType));
-
-            return bindingInfo.GetBinding();
-        }
-
-        private static Type GetTypedListIndexerType(Type listType)
-        {
-            if ((!typeof(IList).IsAssignableFrom(listType) && !typeof(ITypedList).IsAssignableFrom(listType)) && !typeof(IListSource).IsAssignableFrom(listType))
-                return null;
-
-            var info = default(PropertyInfo);
-            var propertyInfos = listType.GetProperties(BindingFlags.Public | BindingFlags.Instance);
-
-            foreach (var propertyInfo in propertyInfos)
-            {
-                if ((propertyInfo.GetIndexParameters().Length > 0) && (propertyInfo.PropertyType != typeof(object)))
-                {
-                    info = propertyInfo;
-
-                    if (info.Name == "Item")
-                        return info.PropertyType;
-                }
-            }
-
-            if (info != null)
-                return info.PropertyType;
-
-            return null;
-        }
-
-        private static Type GetTypedEnumerationItemType(Type listType)
-        {
-            if (listType == null)
-                return null;
-
-            foreach (Type interfaceType in listType.GetInterfaces())
-            {
-                if ((interfaceType.IsGenericType) && (interfaceType.GetGenericTypeDefinition() == typeof(IEnumerable<>)))
-                    return interfaceType.GetGenericArguments()[0];
-            }
-
-            return null;
-        }
-
-        private static void SetPropertyDescriptions(PropertyDescriptionRouteDictionary propertyDescriptions, DataTable model, IEnumerable itemsSource, Type itemType, PropertyRoute propertyRoute)
-        {
-            if ((propertyDescriptions == null) || (propertyRoute == null) || propertyDescriptions.Contains(propertyRoute))
-                return;
-
-            var parentKey = propertyRoute.Parent;
-            if (parentKey != null)
-            {
-                ItemsSourceHelper.SetPropertyDescriptions(propertyDescriptions, model, itemsSource, itemType, parentKey);
-
-                PropertyDescriptionRoute parentPropertyDescriptionRoute;
-                if (!propertyDescriptions.TryGetValue(parentKey, out parentPropertyDescriptionRoute))
-                    return;
-
-                var parentItemType = parentPropertyDescriptionRoute.Current.DataType;
-                var childPropertyDescriptions = new PropertyDescriptionRouteDictionary();
-
-                ItemsSourceHelper.SetPropertyDescriptions(childPropertyDescriptions, null, null, parentItemType, false);
-
-                foreach (var childPropertyDescriptionRoute in childPropertyDescriptions.Values)
-                {
-                    var newPropertyDescriptionRoute = PropertyDescriptionRoute.Combine(childPropertyDescriptionRoute, parentPropertyDescriptionRoute);
-                    var newPropertyRoute = PropertyRouteBuilder.ToPropertyRoute(newPropertyDescriptionRoute);
-
-                    if ((newPropertyRoute == null) || propertyDescriptions.Contains(newPropertyRoute))
-                        continue;
-
-                    propertyDescriptions.Add(newPropertyRoute, newPropertyDescriptionRoute, false);
-                }
-
-                var currentSegment = propertyRoute.Current;
-                if (currentSegment.Type == PropertyRouteSegmentType.Indexer)
-                {
-                    var indexerDescriptionRoute = ItemsSourceHelper.CreateIndexerDescription(itemsSource, parentItemType, currentSegment.Name, false);
-                    if (indexerDescriptionRoute != null)
-                    {
-                        var newIndexerDescriptionRoute = PropertyDescriptionRoute.Combine(indexerDescriptionRoute, parentPropertyDescriptionRoute);
-                        if (newIndexerDescriptionRoute != null)
-                        {
-                            var newIndexerRoute = PropertyRouteBuilder.ToPropertyRoute(newIndexerDescriptionRoute);
-                            if ((newIndexerRoute != null) && !propertyDescriptions.Contains(newIndexerRoute))
-                            {
-                                propertyDescriptions.Add(newIndexerRoute, newIndexerDescriptionRoute, false);
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                ItemsSourceHelper.SetPropertyDescriptions(propertyDescriptions, model, itemsSource, itemType, false);
-
-                var currentSegment = propertyRoute.Current;
-                if (currentSegment.Type == PropertyRouteSegmentType.Indexer)
-                {
-                    var newIndexerDescriptionRoute = ItemsSourceHelper.CreateIndexerDescription(itemsSource, itemType, currentSegment.Name, false);
-                    if (newIndexerDescriptionRoute != null)
-                    {
-                        var newIndexerRoute = PropertyRouteBuilder.ToPropertyRoute(newIndexerDescriptionRoute);
-                        if ((newIndexerRoute != null) && !propertyDescriptions.Contains(newIndexerRoute))
-                        {
-                            propertyDescriptions.Add(newIndexerRoute, newIndexerDescriptionRoute, false);
-                        }
-                    }
-                }
-            }
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromDataTable(DataTable source, bool displayable)
-        {
-            Debug.Assert(source != null);
-
-            var foreignKeyConstraints = ItemsSourceHelper.GetForeignKeyConstraints(source.Constraints);
-            var columns = source.Columns;
-
-            foreach (DataColumn column in columns)
-            {
-                yield return new PropertyDescriptionRoute(
-                                   new DataTablePropertyDescription(
-                                     new DataRowColumnPropertyDescriptor(column),
-                                     column,
-                                     foreignKeyConstraints,
-                                     displayable));
-            }
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromDataView(DataView source, bool displayable)
-        {
-            Debug.Assert(source != null);
-
-            var itemProperties = ((ITypedList)source).GetItemProperties(null);
-            var dataTable = source.Table;
-            var foreignKeyConstraints = ItemsSourceHelper.GetForeignKeyConstraints(dataTable.Constraints);
-            var columns = dataTable.Columns;
-
-            foreach (PropertyDescriptor propertyDescriptor in itemProperties)
-            {
-                yield return new PropertyDescriptionRoute(new DataTablePropertyDescription(propertyDescriptor, columns[propertyDescriptor.Name], foreignKeyConstraints, displayable));
-            }
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromDataGridCollectionView(DataGridCollectionViewBase source)
-        {
-            if (source == null)
-                return Enumerable.Empty<PropertyDescriptionRoute>();
-
-            return ItemsSourceHelper.CreatePropertyDescriptionsFromItemProperties(source.ItemProperties);
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromItemProperties(IEnumerable<DataGridItemPropertyBase> source)
-        {
-            if (source == null)
-                yield break;
-
-            foreach (var itemProperty in source)
-            {
-                yield return ItemsSourceHelper.CreatePropertyDescriptionFromDataGridItemProperty(itemProperty);
-
-                foreach (var childItemProperty in ItemsSourceHelper.CreatePropertyDescriptionsFromItemProperties(itemProperty.ItemPropertiesInternal))
-                {
-                    yield return childItemProperty;
-                }
-            }
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromPropertyDescriptors(PropertyDescriptorCollection source, bool supportsDBNull, bool displayable)
-        {
-            if (source == null)
-                yield break;
-
-            foreach (PropertyDescriptor propertyDescriptor in source)
-            {
-                yield return new PropertyDescriptionRoute(new PropertyDescriptorPropertyDescription(propertyDescriptor, supportsDBNull, displayable));
-            }
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromItemType(IEnumerable itemsSource, Type itemType, bool supportsDBNull, bool displayable)
-        {
-            if (itemType == null)
-                return Enumerable.Empty<PropertyDescriptionRoute>();
-
-            if (typeof(XmlNode).IsAssignableFrom(itemType))
-                return Enumerable.Empty<PropertyDescriptionRoute>();
-
-            if (itemType.IsArray)
-                return ItemsSourceHelper.CreatePropertyDescriptionsFromJaggedArray(itemType, itemsSource, displayable);
-
-            if (itemType.IsInterface)
-                return ItemsSourceHelper.CreatePropertyDescriptionsFromInterface(itemType, displayable);
-
-            if (ItemsSourceHelper.IsEntityFramework(itemType))
-                return ItemsSourceHelper.CreatePropertyDescriptionsFromEntityFramework(itemType, displayable);
-
-            if (ItemsSourceHelper.IsValueType(itemType))
-            {
-                var customTypeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor(itemsSource, itemType);
-
-                return ItemsSourceHelper.CreatePropertyDescriptionsFromValueType(itemType, supportsDBNull, null, displayable).Concat(
-                         (customTypeDescriptor != null)
-                           ? ItemsSourceHelper.CreatePropertyDescriptionsFromCustomTypeDescriptor(customTypeDescriptor, itemType, supportsDBNull, false)
-                           : ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors(TypeDescriptor.GetProperties(itemType), supportsDBNull, false));
-            }
-            else
-            {
-                var customTypeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor(itemsSource, itemType);
-                if (customTypeDescriptor != null)
-                    return ItemsSourceHelper.CreatePropertyDescriptionsFromCustomTypeDescriptor(customTypeDescriptor, itemType, supportsDBNull, displayable);
-
-                return ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors(TypeDescriptor.GetProperties(itemType), supportsDBNull, displayable);
-            }
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromJaggedArray(Type itemType, IEnumerable jaggedArray, bool displayable)
-        {
-            var firstItem = ItemsSourceHelper.GetFirstItemByEnumerable(jaggedArray) as Array;
-            if ((firstItem == null) || (itemType == null))
-                yield break;
-
-            var fieldCount = firstItem.GetLength(0);
-            var fieldType = itemType.GetElementType();
-
-            for (int i = 0; i < fieldCount; i++)
-            {
-                yield return new PropertyDescriptionRoute(new JaggedArrayPropertyDescription(i, fieldType, displayable));
-            }
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromInterface(Type itemType, bool displayable)
-        {
-            var propertyDescriptions = ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors(TypeDescriptor.GetProperties(itemType), false, displayable).ToList();
-            var names = new HashSet<string>(propertyDescriptions.Select(item => PropertyRouteParser.Parse(PropertyRouteBuilder.ToPropertyRoute(item))));
-
-            foreach (var interfaceType in itemType.GetInterfaces())
-            {
-                foreach (PropertyDescriptor propertyDescriptor in TypeDescriptor.GetProperties(interfaceType))
-                {
-                    PropertyDescription propertyDescription;
-
-                    if (names.Contains(propertyDescriptor.Name))
-                    {
-                        var newName = string.Format("{0}.{1}", interfaceType.FullName, propertyDescriptor.Name);
-                        propertyDescription = new NamedPropertyDescriptorPropertyDescription(newName, propertyDescriptor, false, displayable);
-                    }
-                    else
-                    {
-                        propertyDescription = new PropertyDescriptorPropertyDescription(propertyDescriptor, false, displayable);
-                    }
-
-                    Debug.Assert(propertyDescription != null);
-
-                    names.Add(propertyDescription.Name);
-                    propertyDescriptions.Add(new PropertyDescriptionRoute(propertyDescription));
-                }
-            }
-
-            return propertyDescriptions;
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromEntityFramework(Type itemType, bool displayable)
-        {
-            foreach (PropertyDescriptor propertyDescriptor in TypeDescriptor.GetProperties(itemType))
-            {
-                yield return new PropertyDescriptionRoute(new EntityFrameworkPropertyDescription(propertyDescriptor, displayable));
-            }
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromValueType(Type itemType, bool supportsDBNull, DataGridForeignKeyDescription foreignKeyDescription, bool displayable)
-        {
-            yield return new PropertyDescriptionRoute(new ValueTypePropertyDescription(itemType, supportsDBNull, foreignKeyDescription, displayable));
-        }
-
-        private static IEnumerable<PropertyDescriptionRoute> CreatePropertyDescriptionsFromCustomTypeDescriptor(ICustomTypeDescriptor customTypeDescriptor, Type itemType, bool supportsDBNull, bool displayable)
-        {
-            if (customTypeDescriptor == null)
-                return Enumerable.Empty<PropertyDescriptionRoute>();
-
-            return ItemsSourceHelper.CreatePropertyDescriptionsFromPropertyDescriptors(customTypeDescriptor.GetProperties(), supportsDBNull, displayable);
-        }
-
-        private static PropertyDescriptionRoute CreatePropertyDescriptionFromDataGridItemProperty(DataGridItemPropertyBase source)
-        {
-            if (source == null)
-                return null;
-
-            var collection = source.ContainingCollection;
-            var ancestors = (collection != null) ? ItemsSourceHelper.CreatePropertyDescriptionFromDataGridItemProperty(collection.Owner) : null;
-
-            return PropertyDescriptionRoute.Combine(new ItemPropertyPropertyDescription(source), ancestors);
-        }
-
-        private static PropertyDescriptionRoute CreateIndexerDescription(IEnumerable itemsSource, Type itemType, string index, bool displayable)
-        {
-            if ((itemType == null) || string.IsNullOrEmpty(index))
-                return null;
-
-            var typeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor(itemsSource, itemType) as DataItemTypeDescriptor;
-            if (typeDescriptor == null)
-                return null;
-
-            var parameters = IndexerParametersParser.Parse(index).ToArray();
-            if (parameters.Length <= 0)
-                return null;
-
-            var indexerDescriptor = typeDescriptor.GetIndexer(parameters);
-            if (indexerDescriptor == null)
-                return null;
-
-            var supportsDBNull = ItemsSourceHelper.IsSupportingDBNull(itemsSource);
-
-            return new PropertyDescriptionRoute(new IndexerDescriptorPropertyDescription(indexerDescriptor, supportsDBNull, displayable));
-        }
-
-        private static Dictionary<string, ForeignKeyConstraint> GetForeignKeyConstraints(ConstraintCollection constraints)
-        {
-            var foreignKeyConstraints = new Dictionary<string, ForeignKeyConstraint>();
-
-            // Detect every ForeignKeyConstraints
-            foreach (Constraint constraint in constraints)
-            {
-                var foreignKeyConstraint = constraint as ForeignKeyConstraint;
-                if (foreignKeyConstraint == null)
-                    continue;
-
-                // We only support auto-detection when the ForeignKey is composed of a single column
-                if ((foreignKeyConstraint.Columns != null) && (foreignKeyConstraint.Columns.Length == 1))
-                {
-                    foreignKeyConstraints.Add(foreignKeyConstraint.Columns[0].ColumnName, foreignKeyConstraint);
-                }
-            }
-
-            return foreignKeyConstraints;
-        }
-
-        private static DataGridForeignKeyDescription GetDataGridForeignKeyDescriptionForEnum(Type enumType)
-        {
-            if ((enumType == null) || !enumType.IsEnum)
-                return null;
-
-            var description = new DataGridForeignKeyDescription();
-
-            // Using "." as default value path will revert to Self when used as SelectedValuePath when bound to a DataGridForeignKeyDictionary or ComboBox (default editor)
-            description.ValuePath = ".";
-            description.ItemsSource = Enum.GetValues(enumType);
-            description.IsAutoCreated = true;
-
-            return description;
-        }
-
-        private static DataTableForeignKeyDescription GetDataGridForeignKeyDescriptionForForeignKeyConstraint(ForeignKeyConstraint foreignKeyConstraint)
-        {
-            if (foreignKeyConstraint == null)
-                return null;
-
-            var columns = foreignKeyConstraint.Columns;
-            if ((columns == null) || (columns.Length != 1))
-                return null;
-
-            var description = new DataTableForeignKeyDescription();
-            description.ForeignKeyConstraint = foreignKeyConstraint;
-            description.IsAutoCreated = true;
-
-            return description;
-        }
-
-        private static DataGridItemPropertyBase CreateItemPropertyFromPropertyDescription(PropertyDescription propertyDescription)
-        {
-            if (propertyDescription == null)
-                return null;
-
-            return new DataGridItemProperty(
-                         propertyDescription.Name,
-                         propertyDescription.PropertyDescriptor,
-                         propertyDescription.DisplayName,
-                         propertyDescription.XPath,
-                         propertyDescription.Path,
-                         propertyDescription.DataType,
-                         true,
-                         propertyDescription.IsReadOnly,
-                         propertyDescription.OverrideReadOnlyForInsertion,
-                         propertyDescription.IsDisplayable,
-                         propertyDescription.IsSubRelationship,
-                         propertyDescription.ForeignKeyDescription);
-        }
-
-        internal static List<DataGridDetailDescription> CreateDetailDescriptions(Type itemType, IEnumerable enumeration)
-        {
-            var dataTable = enumeration as DataTable;
-            if (dataTable == null)
-            {
-                var dataView = enumeration as DataView;
-                if (dataView != null)
-                {
-                    dataTable = dataView.Table;
-                }
-            }
-
-            if (dataTable != null)
-                return ItemsSourceHelper.CreateDetailDescriptions(dataTable);
-
-            if (itemType != null)
-            {
-                //We do not support automatic Master/Detail detection with an Xml source
-                if (typeof(XmlNode).IsAssignableFrom(itemType))
-                    return new List<DataGridDetailDescription>(0);
-
-                //Unbound mode, we do not support Master/Detail in this scenario.
-                if (typeof(DataRow).IsAssignableFrom(itemType))
-                    return new List<DataGridDetailDescription>(0);
-
-                //we do not support Master/Details when Item is a Value type...
-                if (ItemsSourceHelper.IsValueType(itemType))
-                    return new List<DataGridDetailDescription>(0);
-
-                //Check if the object is a Entity Framework Entity, before checking for IEnumerable (since Entity Framework does have IEnumerable
-                //properties, but require special handling )...
-                if (ItemsSourceHelper.IsEntityFramework(itemType))
-                    return ItemsSourceHelper.CreateDetailDescriptionsForEntityFramework(itemType);
-
-                //If the first item maps to an object that implements IEnumerable, expand that as a Relation ( and only that )...
-                if (typeof(IEnumerable).IsAssignableFrom(itemType))
-                    return ItemsSourceHelper.CreateDetailDescriptionsForEnumerable();
-
-                if (typeof(IListSource).IsAssignableFrom(itemType))
-                    return ItemsSourceHelper.CreateDetailDescriptionsForListSource();
-            }
-
-            //If the Source collection implements ITypedList
-            var typedList = enumeration as ITypedList;
-            if (typedList != null)
-                return ItemsSourceHelper.GetDataGridDetailDescriptions(typedList.GetItemProperties(null));
-
-            var customTypeDescriptor = ItemsSourceHelper.GetCustomTypeDescriptor(enumeration, itemType);
-            if (customTypeDescriptor != null)
-                return ItemsSourceHelper.GetDataGridDetailDescriptions(customTypeDescriptor.GetProperties());
-
-            if (itemType != null)
-                return ItemsSourceHelper.GetDataGridDetailDescriptions(TypeDescriptor.GetProperties(itemType));
-
-            return new List<DataGridDetailDescription>(0);
-        }
-
-        internal static List<DataGridDetailDescription> CreateDetailDescriptions(DataTable dataTable)
-        {
-            if (dataTable == null)
-                return new List<DataGridDetailDescription>(0);
-
-            return ItemsSourceHelper.CreateDetailDescriptionsForDataTable(dataTable);
-        }
-
-        private static List<DataGridDetailDescription> CreateDetailDescriptionsForDataTable(DataTable dataTable)
-        {
-            var detailDescriptions = new List<DataGridDetailDescription>(dataTable.ChildRelations.Count);
-
-            foreach (DataRelation relation in dataTable.ChildRelations)
-            {
-                var description = new DataRelationDetailDescription(relation);
-                description.IsAutoCreated = true;
-                description.IsInitialized = true;
-                detailDescriptions.Add(description);
-            }
-
-            return detailDescriptions;
-        }
-
-        private static List<DataGridDetailDescription> CreateDetailDescriptionsForEntityFramework(Type type)
-        {
-            var detailDescriptions = new List<DataGridDetailDescription>();
-
-            // Gets all the public properties of the type.
-            var propertyInfos = type.GetProperties(BindingFlags.Instance | BindingFlags.Public);
-
-            // Loop throught the properties to build up the detail descriptions.
-            foreach (var propertyInfo in propertyInfos)
-            {
-                // We must use Reflection to check for the EntityFramework types.
-                var propertyType = propertyInfo.PropertyType;
-
-                // The property must be of type RelatedEnd and IEnumerable to continue.
-                if ((propertyType.BaseType != null)
-                  && (propertyType.BaseType.FullName == "System.Data.Objects.DataClasses.RelatedEnd")
-                  && (typeof(IEnumerable).IsAssignableFrom(propertyType)))
-                {
-                    detailDescriptions.Add(new EntityDetailDescription(propertyInfo.Name));
-                }
-            }
-
-            return detailDescriptions;
-        }
-
-        private static List<DataGridDetailDescription> CreateDetailDescriptionsForEnumerable()
-        {
-            var detailDescriptions = new List<DataGridDetailDescription>(1);
-
-            var description = new EnumerableDetailDescription();
-            description.IsAutoCreated = true;
-            description.IsInitialized = true;
-            detailDescriptions.Add(description);
-
-            return detailDescriptions;
-        }
-
-        private static List<DataGridDetailDescription> CreateDetailDescriptionsForListSource()
-        {
-            var detailDescriptions = new List<DataGridDetailDescription>(1);
-
-            var description = new ListSourceDetailDescription();
-            description.IsAutoCreated = true;
-            description.IsInitialized = true;
-            detailDescriptions.Add(description);
-
-            return detailDescriptions;
-        }
-
-        private static List<DataGridDetailDescription> GetDataGridDetailDescriptions(PropertyDescriptorCollection properties)
-        {
-            var detailDescriptions = new List<DataGridDetailDescription>(properties.Count);
-
-            foreach (PropertyDescriptor property in properties)
-            {
-                // We only create details for properties that are browsable.
-                if (!property.IsBrowsable)
-                    continue;
-
-                if (ItemsSourceHelper.IsASubRelationship(property.PropertyType))
-                {
-                    var description = new PropertyDetailDescription(property);
-                    description.IsAutoCreated = true;
-                    description.IsInitialized = true;
-                    detailDescriptions.Add(description);
-                }
-            }
-
-            return detailDescriptions;
-        }
-
-        private static bool IsEditableObjectInsertedOrRemovedFromDataSourceAutomatically(IEditableObject item)
-        {
-            return (item is DataRowView)
-                || (item is DataRow);
-        }
-
-        #region DataTablePropertyDescription Private Class
-
-        private sealed class DataTablePropertyDescription : PropertyDescription
-        {
-            internal DataTablePropertyDescription(PropertyDescriptor propertyDescriptor, DataColumn column, IDictionary<string, ForeignKeyConstraint> constraints, bool isDisplayable)
-            {
-                if (propertyDescriptor == null)
-                    throw new ArgumentNullException("propertyDescriptor");
-
-                m_propertyDescriptor = propertyDescriptor;
-                m_column = column;
-                m_isDisplayable = isDisplayable;
-
-                if (constraints != null)
-                {
-                    ForeignKeyConstraint constraint;
-                    if (constraints.TryGetValue(propertyDescriptor.Name, out constraint))
-                    {
-                        m_foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForForeignKeyConstraint(constraint);
-                    }
-                }
-            }
-
-            internal override string Name
-            {
-                get
-                {
-                    return m_propertyDescriptor.Name;
-                }
-            }
-
-            internal override string DisplayName
-            {
-                get
-                {
-                    if (m_column != null)
-                        return m_column.Caption;
-
-                    return m_propertyDescriptor.DisplayName;
-                }
-            }
-
-            internal override Type DataType
-            {
-                get
-                {
-                    return m_propertyDescriptor.PropertyType;
-                }
-            }
-
-            internal override PropertyDescriptor PropertyDescriptor
-            {
-                get
-                {
-                    return m_propertyDescriptor;
-                }
-            }
-
-            internal override bool IsReadOnly
-            {
-                get
-                {
-                    return m_propertyDescriptor.IsReadOnly;
-                }
-            }
-
-            internal override bool SupportDBNull
-            {
-                get
-                {
-                    return (m_column != null)
-                        && (m_column.AllowDBNull);
-                }
-            }
-
-            internal override bool IsBrowsable
-            {
-                get
-                {
-                    return m_propertyDescriptor.IsBrowsable;
-                }
-            }
-
-            internal override bool IsDisplayable
-            {
-                get
-                {
-                    return m_isDisplayable;
-                }
-            }
-
-            internal override bool IsSubRelationship
-            {
-                get
-                {
-                    return (m_column == null)
-                        && (ItemsSourceHelper.IsASubRelationship(this.DataType));
-                }
-            }
-
-            internal override DataGridForeignKeyDescription ForeignKeyDescription
-            {
-                get
-                {
-                    return m_foreignKeyDescription;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                return m_propertyDescriptor.GetHashCode();
-            }
-
-            public override bool Equals(object obj)
-            {
-                var target = obj as DataTablePropertyDescription;
-                if (target == null)
-                    return false;
-
-                return (object.Equals(target.m_propertyDescriptor, m_propertyDescriptor))
-                    && (object.Equals(target.m_column, m_column));
-            }
-
-            private readonly PropertyDescriptor m_propertyDescriptor;
-            private readonly DataColumn m_column;
-            private readonly bool m_isDisplayable;
-            private readonly DataGridForeignKeyDescription m_foreignKeyDescription;
-        }
-
-        #endregion
-
-        #region ItemPropertyPropertyDescription Private Class
-
-        private sealed class ItemPropertyPropertyDescription : PropertyDescription
-        {
-            internal ItemPropertyPropertyDescription(DataGridItemPropertyBase itemProperty)
-            {
-                if (itemProperty == null)
-                    throw new ArgumentNullException("itemProperty");
-
-                m_itemProperty = itemProperty;
-                m_propertyDescriptor = itemProperty.GetPropertyDescriptorForBinding();
-                Debug.Assert(m_propertyDescriptor != null);
-            }
-
-            internal override string Name
-            {
-                get
-                {
-                    return m_itemProperty.Name;
-                }
-            }
-
-            internal override string DisplayName
-            {
-                get
-                {
-                    return m_propertyDescriptor.DisplayName;
-                }
-            }
-
-            internal override Type DataType
-            {
-                get
-                {
-                    return m_propertyDescriptor.PropertyType;
-                }
-            }
-
-            internal override PropertyDescriptor PropertyDescriptor
-            {
-                get
-                {
-                    return m_propertyDescriptor;
-                }
-            }
-
-            internal override bool IsReadOnly
-            {
-                get
-                {
-                    return m_propertyDescriptor.IsReadOnly;
-                }
-            }
-
-            internal override bool OverrideReadOnlyForInsertion
-            {
-                get
-                {
-                    return m_itemProperty.OverrideReadOnlyForInsertion.GetValueOrDefault(false);
-                }
-            }
-
-            internal override bool IsBrowsable
-            {
-                get
-                {
-                    return m_propertyDescriptor.IsBrowsable;
-                }
-            }
-
-            internal override bool IsDisplayable
-            {
-                get
-                {
-                    return m_itemProperty.IsDisplayable;
-                }
-            }
-
-            internal override bool IsSubRelationship
-            {
-                get
-                {
-                    return m_itemProperty.IsASubRelationship;
-                }
-            }
-
-            internal override DataGridForeignKeyDescription ForeignKeyDescription
-            {
-                get
-                {
-                    return m_itemProperty.ForeignKeyDescription;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                return m_itemProperty.GetHashCode();
-            }
-
-            public override bool Equals(object obj)
-            {
-                var target = obj as ItemPropertyPropertyDescription;
-                if (target == null)
-                    return false;
-
-                return object.Equals(target.m_itemProperty, m_itemProperty);
-            }
-
-            private readonly DataGridItemPropertyBase m_itemProperty;
-            private readonly PropertyDescriptor m_propertyDescriptor;
-        }
-
-        #endregion
-
-        #region PropertyDescriptorPropertyDescription Private Class
-
-        private class PropertyDescriptorPropertyDescription : PropertyDescription
-        {
-            internal PropertyDescriptorPropertyDescription(PropertyDescriptor propertyDescriptor, bool supportDBNull, bool isDisplayable)
-            {
-                if (propertyDescriptor == null)
-                    throw new ArgumentNullException("propertyDescriptor");
-
-                m_propertyDescriptor = propertyDescriptor;
-                m_supportDBNull = supportDBNull;
-                m_isDisplayable = isDisplayable;
-                m_foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForEnum(propertyDescriptor.PropertyType);
-            }
-
-            internal override string Name
-            {
-                get
-                {
-                    return m_propertyDescriptor.Name;
-                }
-            }
-
-            internal override string DisplayName
-            {
-                get
-                {
-                    return m_propertyDescriptor.DisplayName;
-                }
-            }
-
-            internal override Type DataType
-            {
-                get
-                {
-                    return m_propertyDescriptor.PropertyType;
-                }
-            }
-
-            internal override PropertyDescriptor PropertyDescriptor
-            {
-                get
-                {
-                    return m_propertyDescriptor;
-                }
-            }
-
-            internal override bool IsReadOnly
-            {
-                get
-                {
-                    return m_propertyDescriptor.IsReadOnly;
-                }
-            }
-
-            internal override bool SupportDBNull
-            {
-                get
-                {
-                    return m_supportDBNull;
-                }
-            }
-
-            internal override bool IsBrowsable
-            {
-                get
-                {
-                    return m_propertyDescriptor.IsBrowsable;
-                }
-            }
-
-            internal override bool IsDisplayable
-            {
-                get
-                {
-                    return m_isDisplayable;
-                }
-            }
-
-            internal override bool IsSubRelationship
-            {
-                get
-                {
-                    return ItemsSourceHelper.IsASubRelationship(this.DataType);
-                }
-            }
-
-            internal override DataGridForeignKeyDescription ForeignKeyDescription
-            {
-                get
-                {
-                    return m_foreignKeyDescription;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                return m_propertyDescriptor.GetHashCode();
-            }
-
-            public override bool Equals(object obj)
-            {
-                var target = obj as PropertyDescriptorPropertyDescription;
-                if (target == null)
-                    return false;
-
-                return (object.Equals(target.m_propertyDescriptor, m_propertyDescriptor))
-                    && (target.m_supportDBNull == m_supportDBNull);
-            }
-
-            private readonly PropertyDescriptor m_propertyDescriptor;
-            private readonly bool m_supportDBNull;
-            private readonly bool m_isDisplayable;
-            private readonly DataGridForeignKeyDescription m_foreignKeyDescription;
-        }
-
-        #endregion
-
-        #region NamedPropertyDescriptorPropertyDescription Private Class
-
-        private sealed class NamedPropertyDescriptorPropertyDescription : PropertyDescriptorPropertyDescription
-        {
-            internal NamedPropertyDescriptorPropertyDescription(string name, PropertyDescriptor propertyDescriptor, bool supportDBNull, bool isDisplayable)
-              : base(propertyDescriptor, supportDBNull, isDisplayable)
-            {
-                if (name == null)
-                    throw new ArgumentNullException("name");
-
-                m_name = name;
-            }
-
-            internal override string Name
-            {
-                get
-                {
-                    return m_name;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                return m_name.GetHashCode();
-            }
-
-            public override bool Equals(object obj)
-            {
-                var target = obj as NamedPropertyDescriptorPropertyDescription;
-                if (target == null)
-                    return false;
-
-                return (target.m_name == m_name)
-                    && (base.Equals(target));
-            }
-
-            private readonly string m_name;
-        }
-
-        #endregion
-
-        #region IndexerDescriptorPropertyDescription Private Class
-
-        private class IndexerDescriptorPropertyDescription : PropertyDescriptorPropertyDescription
-        {
-            internal IndexerDescriptorPropertyDescription(DataItemIndexerDescriptor indexerDescriptor, bool supportDBNull, bool isDisplayable)
-              : base(indexerDescriptor, supportDBNull, isDisplayable)
-            {
-            }
-
-            public override int GetHashCode()
-            {
-                return base.GetHashCode();
-            }
-
-            public override bool Equals(object obj)
-            {
-                return (obj is IndexerDescriptorPropertyDescription)
-                    && (base.Equals(obj));
-            }
-
-            internal override PropertyRouteSegment ToPropertyRouteSegment()
-            {
-                var descriptor = (DataItemIndexerDescriptor)this.PropertyDescriptor;
-
-                return new PropertyRouteSegment(PropertyRouteSegmentType.Indexer, descriptor.IndexerParameters);
-            }
-        }
-
-        #endregion
-
-        #region JaggedArrayPropertyDescription Private Class
-
-        private sealed class JaggedArrayPropertyDescription : PropertyDescription
-        {
-            internal JaggedArrayPropertyDescription(int index, Type dataType, bool isDisplayable)
-            {
-                if (index < 0)
-                    throw new ArgumentException("index");
-
-                if (dataType == null)
-                    throw new ArgumentNullException("dataType");
-
-                m_name = ".[" + index.ToString(CultureInfo.InvariantCulture) + "]";
-                m_dataType = dataType;
-                m_isDisplayable = isDisplayable;
-                m_propertyDescriptor = new JaggedArrayPropertyDescriptor(index, dataType);
-                m_foreignKeyDescription = ItemsSourceHelper.GetDataGridForeignKeyDescriptionForEnum(dataType);
-            }
-
-            internal override string Name
-            {
-                get
-                {
-                    return m_name;
-                }
-            }
-
-            internal override string DisplayName
-            {
-                get
-                {
-                    return m_name;
-                }
-            }
-
-            internal override Type DataType
-            {
-                get
-                {
-                    return m_dataType;
-                }
-            }
-
-            internal override PropertyDescriptor PropertyDescriptor
-            {
-                get
-                {
-                    return m_propertyDescriptor;
-                }
-            }
-
-            internal override bool IsReadOnly
-            {
-                get
-                {
-                    return false;
-                }
-            }
-
-            internal override bool IsDisplayable
-            {
-                get
-                {
-                    return m_isDisplayable;
-                }
-            }
-
-            internal override bool IsSubRelationship
-            {
-                get
-                {
-                    return ItemsSourceHelper.IsASubRelationship(this.DataType);
-                }
-            }
-
-            internal override DataGridForeignKeyDescription ForeignKeyDescription
-            {
-                get
-                {
-                    return m_foreignKeyDescription;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                return m_name.GetHashCode();
-            }
-
-            public override bool Equals(object obj)
-            {
-                var target = obj as JaggedArrayPropertyDescription;
-                if (target == null)
-                    return false;
-
-                return (target.m_name == m_name)
-                    && (target.m_dataType == m_dataType);
-            }
-
-            private readonly string m_name;
-            private readonly Type m_dataType;
-            private readonly bool m_isDisplayable;
-            private readonly PropertyDescriptor m_propertyDescriptor;
-            private readonly DataGridForeignKeyDescription m_foreignKeyDescription;
-        }
-
-        #endregion
-
-        #region EntityFrameworkPropertyDescription Private Class
-
-        private sealed class EntityFrameworkPropertyDescription : PropertyDescription
-        {
-            internal EntityFrameworkPropertyDescription(PropertyDescriptor propertyDescriptor, bool isDisplayable)
-            {
-                if (propertyDescriptor == null)
-                    throw new ArgumentNullException("propertyDescriptor");
-
-                var attribute = propertyDescriptor.Attributes[typeof(EdmScalarPropertyAttribute)] as EdmScalarPropertyAttribute;
-                if (attribute != null)
-                {
-                    m_isEntityKey = attribute.EntityKeyProperty;
-                    m_supportDBNull = attribute.IsNullable;
-                }
-                else
-                {
-                    m_isEntityKey = false;
-                    m_supportDBNull = false;
-                }
-
-                m_isDisplayable = isDisplayable;
-                m_propertyDescriptor = propertyDescriptor;
-            }
-
-            internal override string Name
-            {
-                get
-                {
-                    return m_propertyDescriptor.Name;
-                }
-            }
-
-            internal override string DisplayName
-            {
-                get
-                {
-                    return m_propertyDescriptor.DisplayName;
-                }
-            }
-
-            internal override Type DataType
-            {
-                get
-                {
-                    return m_propertyDescriptor.PropertyType;
-                }
-            }
-
-            internal override PropertyDescriptor PropertyDescriptor
-            {
-                get
-                {
-                    return m_propertyDescriptor;
-                }
-            }
-
-            internal override bool IsReadOnly
-            {
-                get
-                {
-                    return (m_isEntityKey)
-                        || (m_propertyDescriptor.IsReadOnly);
-                }
-            }
-
-            internal override bool OverrideReadOnlyForInsertion
-            {
-                get
-                {
-                    return (m_isEntityKey)
-                        && (!m_propertyDescriptor.IsReadOnly);
-                }
-            }
-
-            internal override bool SupportDBNull
-            {
-                get
-                {
-                    return m_supportDBNull;
-                }
-            }
-
-            internal override bool IsBrowsable
-            {
-                get
-                {
-                    return m_propertyDescriptor.IsBrowsable;
-                }
-            }
-
-            internal override bool IsDisplayable
-            {
-                get
-                {
-                    return m_isDisplayable;
-                }
-            }
-
-            internal override bool IsSubRelationship
-            {
-                get
-                {
-                    return ItemsSourceHelper.IsASubRelationship(this.DataType);
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                return m_propertyDescriptor.GetHashCode();
-            }
-
-            public override bool Equals(object obj)
-            {
-                var target = obj as EntityFrameworkPropertyDescription;
-                if (target == null)
-                    return false;
-
-                return object.Equals(target.m_propertyDescriptor, m_propertyDescriptor);
-            }
-
-            private readonly PropertyDescriptor m_propertyDescriptor;
-            private readonly bool m_isEntityKey;
-            private readonly bool m_supportDBNull;
-            private readonly bool m_isDisplayable;
-        }
-
-        #endregion
-
-        #region ValueTypePropertyDescription Private Class
-
-        private sealed class ValueTypePropertyDescription : PropertyDescription
-        {
-            internal ValueTypePropertyDescription(Type dataType, bool supportDBNull, DataGridForeignKeyDescription foreignKeyDescription, bool isDisplayable)
-            {
-                if (dataType == null)
-                    throw new ArgumentNullException("dataType");
-
-                m_dataType = dataType;
-                m_supportDBNull = supportDBNull;
-                m_isDisplayable = isDisplayable;
-                m_foreignKeyDescription = foreignKeyDescription;
-            }
-
-            internal override string Name
-            {
-                get
-                {
-                    return ".";
-                }
-            }
-
-            internal override string DisplayName
-            {
-                get
-                {
-                    return string.Empty;
-                }
-            }
-
-            internal override Type DataType
-            {
-                get
-                {
-                    return m_dataType;
-                }
-            }
-
-            internal override string Path
-            {
-                get
-                {
-                    return this.Name;
-                }
-            }
-
-            internal override bool SupportDBNull
-            {
-                get
-                {
-                    return m_supportDBNull;
-                }
-            }
-
-            internal override bool IsDisplayable
-            {
-                get
-                {
-                    return m_isDisplayable;
-                }
-            }
-
-            internal override bool IsSubRelationship
-            {
-                get
-                {
-                    return ItemsSourceHelper.IsASubRelationship(this.DataType);
-                }
-            }
-
-            internal override DataGridForeignKeyDescription ForeignKeyDescription
-            {
-                get
-                {
-                    return m_foreignKeyDescription;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                return m_dataType.GetHashCode();
-            }
-
-            public override bool Equals(object obj)
-            {
-                var target = obj as ValueTypePropertyDescription;
-                if (target == null)
-                    return false;
-
-                return (target.m_dataType == m_dataType);
-            }
-
-            internal override PropertyRouteSegment ToPropertyRouteSegment()
-            {
-                return PropertyRouteSegment.Self;
-            }
-
-            private readonly Type m_dataType;
-            private readonly bool m_supportDBNull;
-            private readonly bool m_isDisplayable;
-            private readonly DataGridForeignKeyDescription m_foreignKeyDescription;
-        }
-
-        #endregion
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/KeyActivationGesture.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/KeyActivationGesture.cs
deleted file mode 100644
index b3533f12..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/KeyActivationGesture.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public sealed class KeyActivationGesture : ActivationGesture
-  {
-    #region Key Property
-
-    public static readonly DependencyProperty KeyProperty = DependencyProperty.Register(
-      "Key",
-      typeof( Key ),
-      typeof( KeyActivationGesture ),
-      new FrameworkPropertyMetadata( Key.None ) );
-
-    public Key Key
-    {
-      get
-      {
-        return ( Key )this.GetValue( KeyActivationGesture.KeyProperty );
-      }
-      set
-      {
-        this.SetValue( KeyActivationGesture.KeyProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SystemKey Property
-
-    public static readonly DependencyProperty SystemKeyProperty = DependencyProperty.Register(
-      "SystemKey",
-      typeof( Key ),
-      typeof( KeyActivationGesture ),
-      new FrameworkPropertyMetadata( Key.None ) );
-
-    public Key SystemKey
-    {
-      get
-      {
-        return ( Key )this.GetValue( KeyActivationGesture.SystemKeyProperty );
-      }
-      set
-      {
-        this.SetValue( KeyActivationGesture.SystemKeyProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Modifiers Property
-
-    public static readonly DependencyProperty ModifiersProperty = DependencyProperty.Register(
-      "Modifiers",
-      typeof( ModifierKeys ),
-      typeof( KeyActivationGesture ),
-      new FrameworkPropertyMetadata( ( ModifierKeys )ModifierKeys.None ) );
-
-    public ModifierKeys Modifiers
-    {
-      get
-      {
-        return ( ModifierKeys )this.GetValue( KeyActivationGesture.ModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( KeyActivationGesture.ModifiersProperty, value );
-      }
-    }
-
-    #endregion
-
-    public bool IsActivationKey( Key key, Key systemKey, ModifierKeys modifiers)
-    {
-      if( key == Key.System )
-      {
-        return
-          ( ( systemKey == this.SystemKey ) &&
-            ( modifiers == this.Modifiers ) );
-      }
-      else
-      {
-        return
-          ( ( key == this.Key ) &&
-            ( modifiers == this.Modifiers ) );
-      }
-    }
-
-    protected override Freezable CreateInstanceCore()
-    {
-      return new KeyActivationGesture();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LateGroupLevelDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LateGroupLevelDescription.cs
deleted file mode 100644
index 4ffb8f02..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LateGroupLevelDescription.cs
+++ /dev/null
@@ -1,430 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class LateGroupLevelDescription : IGroupLevelDescription, INotifyPropertyChanged, IWeakEventListener
-  {
-    internal LateGroupLevelDescription( GroupDescription groupDescription, IEnumerable<GroupLevelDescription> groupLevelDescriptions )
-    {
-      if( groupDescription == null )
-        throw new ArgumentNullException( "groupDescription" );
-
-      var finder = new GroupLevelDescriptionFinder( groupDescription, groupLevelDescriptions );
-
-      m_groupDescription = groupDescription;
-      m_groupLevelDescription = finder.GroupLevelDescription;
-
-      if( m_groupLevelDescription == null )
-      {
-        m_finder = finder;
-        m_finder.PropertyChanged += new PropertyChangedEventHandler( this.OnGroupLevelDescriptionFound );
-      }
-      else
-      {
-        finder.Dispose();
-
-        PropertyChangedEventManager.AddListener( m_groupLevelDescription, this, string.Empty );
-      }
-    }
-
-    #region GroupDescription Property
-
-    public GroupDescription GroupDescription
-    {
-      get
-      {
-        return m_groupDescription;
-      }
-    }
-
-    private readonly GroupDescription m_groupDescription;
-
-    #endregion
-
-    #region FieldName Property
-
-    public string FieldName
-    {
-      get
-      {
-        GroupLevelDescription description;
-        if( !this.TryGetGroupLevelDescription( out description ) )
-          return null;
-
-        return description.FieldName;
-      }
-    }
-
-    #endregion
-
-    #region Title Property
-
-    public object Title
-    {
-      get
-      {
-        GroupLevelDescription description;
-        if( !this.TryGetGroupLevelDescription( out description ) )
-          return null;
-
-        return description.Title;
-      }
-    }
-
-    #endregion
-
-    #region TitleTemplate Property
-
-    public DataTemplate TitleTemplate
-    {
-      get
-      {
-        GroupLevelDescription description;
-        if( !this.TryGetGroupLevelDescription( out description ) )
-          return null;
-
-        return description.TitleTemplate;
-      }
-    }
-
-    #endregion
-
-    #region TitleTemplateSelector Property
-
-    public DataTemplateSelector TitleTemplateSelector
-    {
-      get
-      {
-        GroupLevelDescription description;
-        if( !this.TryGetGroupLevelDescription( out description ) )
-          return null;
-
-        return description.TitleTemplateSelector;
-      }
-    }
-
-    #endregion
-
-    #region ValueStringFormat Property
-
-    public string ValueStringFormat
-    {
-      get
-      {
-        GroupLevelDescription description;
-        if( !this.TryGetGroupLevelDescription( out description ) )
-          return null;
-
-        return description.ValueStringFormat;
-      }
-    }
-
-    #endregion
-
-    #region ValueStringFormatCulture Property
-
-    public CultureInfo ValueStringFormatCulture
-    {
-      get
-      {
-        GroupLevelDescription description;
-        if( !this.TryGetGroupLevelDescription( out description ) )
-          return null;
-
-        return description.ValueStringFormatCulture;
-      }
-    }
-
-    #endregion
-
-    #region ValueTemplate Property
-
-    public DataTemplate ValueTemplate
-    {
-      get
-      {
-        GroupLevelDescription description;
-        if( !this.TryGetGroupLevelDescription( out description ) )
-          return null;
-
-        return description.ValueTemplate;
-      }
-    }
-
-    #endregion
-
-    #region ValueTemplateSelector Property
-
-    public DataTemplateSelector ValueTemplateSelector
-    {
-      get
-      {
-        GroupLevelDescription description;
-        if( !this.TryGetGroupLevelDescription( out description ) )
-          return null;
-
-        return description.ValueTemplateSelector;
-      }
-    }
-
-    #endregion
-
-    internal void Clear()
-    {
-      this.ClearLateBinding();
-
-      this.PropertyChanged = null;
-    }
-
-    private void ClearLateBinding()
-    {
-      if( m_finder != null )
-      {
-        m_finder.PropertyChanged -= new PropertyChangedEventHandler( this.OnGroupLevelDescriptionFound );
-        m_finder.Dispose();
-        m_finder = null;
-      }
-
-      if( m_groupLevelDescription != null )
-      {
-        PropertyChangedEventManager.RemoveListener( m_groupLevelDescription, this, string.Empty );
-      }
-    }
-
-    private bool TryGetGroupLevelDescription( out GroupLevelDescription result )
-    {
-      result = m_groupLevelDescription;
-      if( result != null )
-        return true;
-
-      m_raiseEventOnGroupLevelDescriptionFound = true;
-
-      return false;
-    }
-
-    private void OnGroupLevelDescriptionFound( object sender, PropertyChangedEventArgs e )
-    {
-      var finder = ( GroupLevelDescriptionFinder )sender;
-      Debug.Assert( finder == m_finder );
-
-      var groupLevelDescription = finder.GroupLevelDescription;
-      Debug.Assert( groupLevelDescription != null );
-
-      this.ClearLateBinding();
-
-      m_groupLevelDescription = groupLevelDescription;
-      PropertyChangedEventManager.AddListener( m_groupLevelDescription, this, string.Empty );
-
-      if( m_raiseEventOnGroupLevelDescriptionFound )
-      {
-        this.RaisePropertyChanged();
-      }
-    }
-
-    private void OnGroupLevelDescriptionPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      Debug.Assert( sender == m_groupLevelDescription );
-
-      this.RaisePropertyChanged( e );
-    }
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void RaisePropertyChanged()
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( null ) );
-    }
-
-    private void RaisePropertyChanged( PropertyChangedEventArgs e )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( typeof( PropertyChangedEventManager ) == managerType )
-      {
-        this.OnGroupLevelDescriptionPropertyChanged( sender, ( PropertyChangedEventArgs )e );
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private GroupLevelDescription m_groupLevelDescription;
-    private GroupLevelDescriptionFinder m_finder;
-    private bool m_raiseEventOnGroupLevelDescriptionFound; //false
-
-    private sealed class GroupLevelDescriptionFinder : INotifyPropertyChanged, IWeakEventListener, IDisposable
-    {
-      internal GroupLevelDescriptionFinder( GroupDescription groupDescription, IEnumerable<GroupLevelDescription> groupLevelDescriptions )
-      {
-        if( groupDescription == null )
-          throw new ArgumentNullException( "groupDescription" );
-
-        if( groupLevelDescriptions == null )
-          throw new ArgumentNullException( "groupLevelDescriptions" );
-
-        if( !GroupLevelDescriptionFinder.TryFind( groupLevelDescriptions, groupDescription, out m_groupLevelDescription ) )
-        {
-          m_groupDescription = groupDescription;
-          m_groupLevelDescriptions = groupLevelDescriptions;
-
-          this.RegisterCollectionChanged( ( INotifyCollectionChanged )groupLevelDescriptions );
-        }
-      }
-
-      #region GroupLevelDescription Property
-
-      internal GroupLevelDescription GroupLevelDescription
-      {
-        get
-        {
-          return m_groupLevelDescription;
-        }
-      }
-
-      #endregion
-
-      public event PropertyChangedEventHandler PropertyChanged;
-
-      private void RaisePropertyChanged( string propertyName )
-      {
-        var handler = this.PropertyChanged;
-        if( handler == null )
-          return;
-
-        handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-      }
-
-      private void RegisterCollectionChanged( INotifyCollectionChanged collection )
-      {
-        if( collection == null )
-          return;
-
-        CollectionChangedEventManager.AddListener( collection, this );
-      }
-
-      private void UnregisterCollectionChanged( INotifyCollectionChanged collection )
-      {
-        if( collection == null )
-          return;
-
-        CollectionChangedEventManager.RemoveListener( collection, this );
-      }
-
-      private static bool TryFind( IEnumerable<GroupLevelDescription> collection, GroupDescription description, out GroupLevelDescription result )
-      {
-        result = default( GroupLevelDescription );
-
-        if( ( collection != null ) && ( description != null ) )
-        {
-          foreach( var item in collection )
-          {
-            if( ( item == null ) || ( item.GroupDescription != description ) )
-              continue;
-
-            result = item;
-            break;
-          }
-        }
-
-        return ( result != null );
-      }
-
-      bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-      {
-        if( typeof( CollectionChangedEventManager ) == managerType )
-        {
-          Debug.Assert( sender == m_groupLevelDescriptions );
-
-          switch( ( ( NotifyCollectionChangedEventArgs )e ).Action )
-          {
-            case NotifyCollectionChangedAction.Move:
-            case NotifyCollectionChangedAction.Remove:
-              break;
-
-            default:
-              if( GroupLevelDescriptionFinder.TryFind( m_groupLevelDescriptions, m_groupDescription, out m_groupLevelDescription ) )
-              {
-                this.RaisePropertyChanged( "GroupLevelDescription" );
-                this.Dispose();
-              }
-              break;
-          }
-
-          return true;
-        }
-
-        return false;
-      }
-
-      public void Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        this.PropertyChanged = null;
-
-        this.UnregisterCollectionChanged( ( INotifyCollectionChanged )m_groupLevelDescriptions );
-
-        m_groupLevelDescriptions = null;
-        m_groupDescription = null;
-      }
-
-      ~GroupLevelDescriptionFinder()
-      {
-        this.Dispose( false );
-      }
-
-      private GroupDescription m_groupDescription; //null
-      private GroupLevelDescription m_groupLevelDescription; //null
-      private IEnumerable<GroupLevelDescription> m_groupLevelDescriptions; //null
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelector.cs
deleted file mode 100644
index 6668e80c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelector.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Markup;
-using System.Collections.ObjectModel;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [ContentProperty( "SelectorItems" )]
-  public class LevelGroupConfigurationSelector : GroupConfigurationSelector
-  {
-    private LevelGroupConfigurationSelectorItemCollection m_groupConfigurationSelectorItems = new LevelGroupConfigurationSelectorItemCollection();
-
-    public ObservableCollection<LevelGroupConfigurationSelectorItem> SelectorItems
-    {
-      get
-      {
-        return m_groupConfigurationSelectorItems;
-      }
-    }
-
-    public override GroupConfiguration SelectGroupConfiguration(int groupLevel, CollectionViewGroup collectionViewGroup, System.ComponentModel.GroupDescription groupDescription)
-    {
-      if (m_groupConfigurationSelectorItems.Count == 0)
-        return base.SelectGroupConfiguration( groupLevel, collectionViewGroup, groupDescription );
-
-      LevelGroupConfigurationSelectorItem levelGroupConfig = m_groupConfigurationSelectorItems.GetGroupConfigurationSelectorItem( groupLevel );
-      if( levelGroupConfig != null )
-      {
-        return levelGroupConfig.GroupConfiguration;
-      }
-
-      return base.SelectGroupConfiguration( groupLevel, collectionViewGroup, groupDescription );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItem.cs
deleted file mode 100644
index 80a378fc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItem.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Markup;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [ContentProperty("GroupConfiguration" )]
-  public class LevelGroupConfigurationSelectorItem
-  {
-    #region Level Property
-
-    public int Level
-    {
-      get
-      {
-        return m_level;
-      }
-      set
-      {
-        if( m_isSealed == true )
-          throw new InvalidOperationException( "An attempt was made to modify the level of a LevelGroupConfigurationSelectorItem that has already been added to a LevelGroupConfigurationSelector." );
-
-        m_level = value;
-      }
-    }
-
-    private int m_level;
-
-    #endregion
-
-    #region GroupConfiguration Property
-
-    public GroupConfiguration GroupConfiguration
-    {
-      get
-      {
-        return m_groupConfig;
-      }
-      set
-      {
-        m_groupConfig = value;
-      }
-    }
-
-    private GroupConfiguration m_groupConfig;
-
-    #endregion
-
-    #region IsSealed Property
-
-    private bool m_isSealed = false;
-
-    public bool IsSealed
-    {
-      get
-      {
-        return m_isSealed;
-      }
-    }
-
-    internal void Seal()
-    {
-      m_isSealed = true;
-    }
-
-    #endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItemCollection.cs
deleted file mode 100644
index a50a0ba8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItemCollection.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class LevelGroupConfigurationSelectorItemCollection : ObservableCollection<LevelGroupConfigurationSelectorItem>
-  {
-    internal LevelGroupConfigurationSelectorItemCollection()
-      : base()
-    {
-    }
-
-    public LevelGroupConfigurationSelectorItem GetGroupConfigurationSelectorItem( int level )
-    {
-      LevelGroupConfigurationSelectorItem retval = null;
-
-      foreach( LevelGroupConfigurationSelectorItem levelGroupConfig in this )
-      {
-        if( levelGroupConfig.Level == level )
-        {
-          retval = levelGroupConfig;
-          break;
-        }
-      }
-
-      return retval;
-    }
-
-    protected override void InsertItem( int index, LevelGroupConfigurationSelectorItem item )
-    {
-      if( this.GetGroupConfigurationSelectorItem( item.Level ) != null )
-        throw new InvalidOperationException( "An attempt was made to insert a LevelGroupConfigurationSelectorItem that specifies the same level as an existing LevelGroupConfigurationSelectorItem." );
-
-      base.InsertItem( index, item );
-
-      item.Seal();
-    }
-
-    protected override void SetItem( int index, LevelGroupConfigurationSelectorItem item )
-    {
-      LevelGroupConfigurationSelectorItem oldLevelGroupConfig = this[ index ];
-      LevelGroupConfigurationSelectorItem failingLevelGroupConfig = this.GetGroupConfigurationSelectorItem( item.Level );
-
-      if( ( failingLevelGroupConfig != null ) && ( oldLevelGroupConfig != failingLevelGroupConfig ) )
-        throw new InvalidOperationException( "An attempt was made to set a LevelGroupConfigurationSelectorItem that specifies the same level as an existing LevelGroupConfigurationSelectorItem." );
-
-      base.SetItem( index, item );
-
-      item.Seal();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellContentBindingExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellContentBindingExtension.cs
deleted file mode 100644
index ee6261ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellContentBindingExtension.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Markup;
-using System.Windows.Data;
-using System.Windows;
-using System.Windows.Controls;
-using System.Globalization;
-using System.Collections.Specialized;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [MarkupExtensionReturnType( typeof( object ) )]
-  [Obsolete( "The CellContentBinding markup extension is obsolete and has been replaced by the CellContentPresenter class.", false )]
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public class CellContentBindingExtension : MarkupExtension
-  {
-    public CellContentBindingExtension()
-    {
-      m_cellBinding.RelativeSource = new RelativeSource( RelativeSourceMode.TemplatedParent );
-      m_cellBinding.Mode = BindingMode.OneWay;
-      m_cellBinding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-
-      m_cellBinding.Path = new PropertyPath( Cell.ContentProperty );
-    }
-
-    #region Converter Property
-
-    public IValueConverter Converter
-    {
-      get
-      {
-        return m_cellBinding.Converter;
-      }
-      set
-      {
-        if( this.ConverterInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the Converter property when it has already been initialized." );
-
-        m_cellBinding.Converter = value;
-        this.ConverterInitialized = true;
-      }
-    }
-
-    #endregion Converter Property
-
-    #region ConverterParameter Property
-
-    public object ConverterParameter
-    {
-      get
-      {
-        return m_cellBinding.ConverterParameter;
-      }
-      set
-      {
-        if( this.ConverterParameterInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the ConverterParameter property when it has already been initialized." );
-
-        m_cellBinding.ConverterParameter = value;
-        this.ConverterParameterInitialized = true;
-      }
-    }
-
-    #endregion ConverterParameter Property
-
-    #region ConverterCulture Property
-
-    public CultureInfo ConverterCulture
-    {
-      get
-      {
-        return m_cellBinding.ConverterCulture;
-      }
-      set
-      {
-        if( this.ConverterCultureInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the ConverterCulture property when it has already been initialized." );
-
-        m_cellBinding.ConverterCulture = value;
-        this.ConverterCultureInitialized = true;
-      }
-    }
-
-    #endregion ConverterCulture Property
-
-    #region PUBLIC METHODS
-
-    public sealed override object ProvideValue( IServiceProvider serviceProvider )
-    {
-      return m_cellBinding.ProvideValue( serviceProvider );
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region PRIVATE PROPERTIES
-
-    private bool ConverterCultureInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellContentBindingExtensionFlags.ConverterCultureInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellContentBindingExtensionFlags.ConverterCultureInitialized ] = value;
-      }
-    }
-
-
-    private bool ConverterInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellContentBindingExtensionFlags.ConverterInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellContentBindingExtensionFlags.ConverterInitialized ] = value;
-      }
-    }
-
-    private bool ConverterParameterInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellContentBindingExtensionFlags.ConverterParameterInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellContentBindingExtensionFlags.ConverterParameterInitialized ] = value;
-      }
-    }
-
-    #endregion PRIVATE PROPERTIES
-
-    #region PRIVATE FIELDS
-
-    private Binding m_cellBinding = new Binding();
-    private BitVector32 m_flags = new BitVector32();
-
-    #endregion PRIVATE FIELDS
-
-    #region NESTED CLASSES
-
-    [Flags]
-    private enum CellContentBindingExtensionFlags
-    {
-      ConverterCultureInitialized = 1,
-      ConverterInitialized = 2,
-      ConverterParameterInitialized = 4
-    }
-
-    #endregion NESTED CLASSES
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellEditorBindingExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellEditorBindingExtension.cs
deleted file mode 100644
index 81e0e612..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellEditorBindingExtension.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Text;
-using System.Windows.Markup;
-using System.Windows.Data;
-using System.Windows;
-using System.Windows.Controls;
-
-using Xceed.Wpf.DataGrid.Converters;
-using System.Collections.Specialized;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [MarkupExtensionReturnType( typeof( object ) )]
-  public class CellEditorBindingExtension : MarkupExtension
-  {
-    public CellEditorBindingExtension()
-    {
-      m_cellBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-      m_cellBinding.Mode = BindingMode.TwoWay;
-      m_cellBinding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-      m_cellBinding.Converter = new DefaultDataConverter();
-
-      m_cellBinding.Path = new PropertyPath( 
-        "(0).(1)", 
-        Cell.ParentCellProperty, Cell.ContentProperty );
-    }
-
-    #region Converter Property
-
-    public IValueConverter Converter
-    {
-      get
-      {
-        return m_cellBinding.Converter;
-      }
-      set
-      {
-        if( this.ConverterInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the Converter property when it has already been initialized." );
-
-        m_cellBinding.Converter = value;
-        this.ConverterInitialized = true;
-      }
-    }
-
-    #endregion Converter Property
-
-    #region ConverterParameter Property
-
-    public object ConverterParameter
-    {
-      get
-      {
-        return m_cellBinding.ConverterParameter;
-      }
-      set
-      {
-        if( this.ConverterParameterInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the ConverterParameter property when it has already been initialized." );
-
-        m_cellBinding.ConverterParameter = value;
-        this.ConverterParameterInitialized = true;
-      }
-    }
-
-    #endregion ConverterParameter Property
-
-    #region ConverterCulture Property
-
-    public CultureInfo ConverterCulture
-    {
-      get
-      {
-        return m_cellBinding.ConverterCulture;
-      }
-      set
-      {
-        if( this.ConverterCultureInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the ConverterCulture property when it has already been initialized." );
-
-        m_cellBinding.ConverterCulture = value;
-        this.ConverterCultureInitialized = true;
-      }
-    }
-
-    #endregion ConverterCulture Property
-
-    #region NotifyOnSourceUpdated Property
-
-    public bool NotifyOnSourceUpdated
-    {
-      get
-      {
-        return m_cellBinding.NotifyOnSourceUpdated;
-      }
-      set
-      {
-        if( this.NotifyOnSourceUpdatedInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the NotifyOnSourceUpdated property when it has already been initialized." );
-
-        m_cellBinding.NotifyOnSourceUpdated = value;
-        this.NotifyOnSourceUpdatedInitialized = true;
-      }
-    }
-
-    #endregion NotifyOnSourceUpdated Property
-
-    #region NotifyOnTargetUpdated Property
-
-    public bool NotifyOnTargetUpdated
-    {
-      get
-      {
-        return m_cellBinding.NotifyOnTargetUpdated;
-      }
-      set
-      {
-        if( this.NotifyOnTargetUpdatedInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the NotifyOnTargetUpdated property when it has already been initialized." );
-
-        m_cellBinding.NotifyOnTargetUpdated = value;
-        this.NotifyOnTargetUpdatedInitialized = true;
-      }
-    }
-
-    #endregion NotifyOnTargetUpdated Property
-
-    #region NotifyOnValidationError Property
-
-    public bool NotifyOnValidationError
-    {
-      get
-      {
-        return m_cellBinding.NotifyOnValidationError;
-      }
-      set
-      {
-        if( this.NotifyOnValidationErrorInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the NotifyOnValidationError property when it has already been initialized." );
-
-        m_cellBinding.NotifyOnValidationError = value;
-        this.NotifyOnValidationErrorInitialized = true;
-      }
-    }
-
-    #endregion NotifyOnValidationError Property
-
-    #region PUBLIC METHODS
-
-    public sealed override object ProvideValue( IServiceProvider serviceProvider )
-    {
-      return m_cellBinding.ProvideValue( serviceProvider );
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region PRIVATE PROPERTIES
-
-    private bool ConverterInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellEditorBindingExtensionFlags.ConverterInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellEditorBindingExtensionFlags.ConverterInitialized ] = value;
-      }
-    }
-
-    private bool ConverterParameterInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellEditorBindingExtensionFlags.ConverterParameterInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellEditorBindingExtensionFlags.ConverterParameterInitialized ] = value;
-      }
-    }
-
-    private bool ConverterCultureInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellEditorBindingExtensionFlags.ConverterCultureInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellEditorBindingExtensionFlags.ConverterCultureInitialized ] = value;
-      }
-    }
-
-    private bool NotifyOnSourceUpdatedInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellEditorBindingExtensionFlags.NotifyOnSourceUpdatedInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellEditorBindingExtensionFlags.NotifyOnSourceUpdatedInitialized ] = value;
-      }
-    }
-
-    private bool NotifyOnTargetUpdatedInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellEditorBindingExtensionFlags.NotifyOnTargetUpdatedInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellEditorBindingExtensionFlags.NotifyOnTargetUpdatedInitialized ] = value;
-      }
-    }
-
-    private bool NotifyOnValidationErrorInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )CellEditorBindingExtensionFlags.NotifyOnValidationErrorInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )CellEditorBindingExtensionFlags.NotifyOnValidationErrorInitialized ] = value;
-      }
-    }
-
-    #endregion PRIVATE PROPERTIES
-
-    #region PRIVATE FIELDS
-
-    private Binding m_cellBinding = new Binding();
-    private BitVector32 m_flags = new BitVector32();
-
-    #endregion PRIVATE FIELDS
-
-    #region NESTED CLASSES
-
-    [Flags]
-    private enum CellEditorBindingExtensionFlags
-    {
-      ConverterInitialized = 1,
-      ConverterParameterInitialized = 2,
-      ConverterCultureInitialized = 4,
-      NotifyOnSourceUpdatedInitialized = 8,
-      NotifyOnTargetUpdatedInitialized = 16,
-      NotifyOnValidationErrorInitialized = 32
-    }
-
-    #endregion NESTED CLASSES
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearGroupLevelConfigurations.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearGroupLevelConfigurations.cs
deleted file mode 100644
index ab4ca7dc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearGroupLevelConfigurations.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 Xceed.Wpf.DataGrid.Views;
-using System.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  [Obsolete( "The ClearGroupLevelConfigurations class is obsolete.", true )]
-  public sealed class ClearGroupLevelConfigurations : GroupLevelConfiguration
-  {
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearHeadersFooters.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearHeadersFooters.cs
deleted file mode 100644
index 5b5d8911..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearHeadersFooters.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [EditorBrowsable( EditorBrowsableState.Never)]
-  [Obsolete( "The ClearHeadersFooters class is obsolete and has been replaced by the ViewBase.UseDefaultHeadersFooters, GroupConfiguration.UseDefaultHeadersFooters, and DetailConfiguration.UseDefaultHeadersFooters properties.", true )]
-  public sealed class ClearHeadersFooters : DataTemplate
-  {
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/DataGridThemeResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/DataGridThemeResourceDictionary.cs
deleted file mode 100644
index 8afeb94e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/DataGridThemeResourceDictionary.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Threading;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public sealed class DataGridThemeResourceDictionary : SharedThemeResourceDictionary
-  {
-    #region Static Fields
-
-    private static Uri s_baseUri; //null
-
-    #endregion
-
-    protected override Uri GetBaseUri()
-    {
-      if( s_baseUri == null )
-      {
-        var baseUri = this.CreateBaseUri( this.GetType().Assembly );
-
-        Interlocked.CompareExchange<Uri>( ref s_baseUri, baseUri, null );
-      }
-
-      return s_baseUri;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/FrameworkThemeResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/FrameworkThemeResourceDictionary.cs
deleted file mode 100644
index d9654f82..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/FrameworkThemeResourceDictionary.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public sealed class FrameworkThemeResourceDictionary : SharedThemeResourceDictionary
-  {
-    protected override Uri GetBaseUri()
-    {
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedResourceDictionary.cs
deleted file mode 100644
index 8dcb102f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedResourceDictionary.cs
+++ /dev/null
@@ -1,283 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Threading;
-using System.Windows;
-using System.Windows.Markup;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public abstract class SharedResourceDictionary : ResourceDictionary
-  {
-    #region SharedDictionaries Private Static Property
-
-    private static List<KeyValuePair<Uri, WeakResourceDictionary>> SharedDictionaries
-    {
-      get
-      {
-        if( s_sharedDictionaries == null )
-        {
-          Interlocked.CompareExchange<List<KeyValuePair<Uri, WeakResourceDictionary>>>( ref s_sharedDictionaries, new List<KeyValuePair<Uri, WeakResourceDictionary>>(), null );
-        }
-
-        return s_sharedDictionaries;
-      }
-    }
-
-    private static List<KeyValuePair<Uri, WeakResourceDictionary>> s_sharedDictionaries; //null
-
-    #endregion
-
-    #region Source Property
-
-    public new Uri Source
-    {
-      get
-      {
-        if( m_sourceUri != null )
-          return m_sourceUri;
-
-        return base.Source;
-      }
-      set
-      {
-        Uri sourceUri;
-        if( !this.TryCreateAbsoluteUri( ( ( IUriContext )this ).BaseUri, value, out sourceUri )
-          || ( sourceUri == null )
-          || ( !sourceUri.IsAbsoluteUri ) )
-        {
-          base.Source = value;
-        }
-        else
-        {
-          var dictionaries = SharedResourceDictionary.SharedDictionaries;
-          lock( ( ( ICollection )dictionaries ).SyncRoot )
-          {
-            bool cleanUp;
-            ResourceDictionary dictionary;
-
-            var index = SharedResourceDictionary.FindIndex( dictionaries, sourceUri, out cleanUp );
-            if( index >= 0 )
-            {
-              var container = dictionaries[ index ].Value;
-              if( container.Status == ResourceDictionaryStatus.NotSet )
-                throw new InvalidOperationException( "A circular reference has been detected in a ResourceDictionary." );
-
-              dictionary = container.Target;
-            }
-            else
-            {
-              dictionary = null;
-            }
-
-            m_sourceUri = value;
-
-            if( dictionary != null )
-            {
-              var mergedDictionaries = this.MergedDictionaries;
-              lock( ( ( ICollection )this ).SyncRoot )
-              {
-                lock( ( ( ICollection )mergedDictionaries ).SyncRoot )
-                {
-                  mergedDictionaries.Add( dictionary );
-                }
-              }
-            }
-            else
-            {
-              // We must add the entry in the collection before we actually load the ResourceDictionary because
-              // the ResourceDictionary may load other ResourceDictionary as well.  Our insertion index may no longer
-              // be valid after the ResourceDictionary is loaded.
-              var container = new WeakResourceDictionary();
-              var newEntry = new KeyValuePair<Uri, WeakResourceDictionary>( sourceUri, container );
-              if( index >= 0 )
-              {
-                dictionaries[ index ] = newEntry;
-              }
-              else
-              {
-                dictionaries.Insert( ~index, newEntry );
-              }
-
-              bool exceptionOccured = true;
-
-              try
-              {
-                base.Source = sourceUri;
-
-                exceptionOccured = false;
-              }
-              finally
-              {
-                if( exceptionOccured )
-                {
-                  dictionaries.Remove( newEntry );
-                }
-                else
-                {
-                  container.Target = this;
-                }
-              }
-            }
-
-            if( cleanUp )
-            {
-              for( int i = dictionaries.Count - 1; i >= 0; i-- )
-              {
-                if( dictionaries[ i ].Value.Status != ResourceDictionaryStatus.GarbageCollected )
-                  continue;
-
-                dictionaries.RemoveAt( i );
-              }
-            }
-          }
-        }
-      }
-    }
-
-    private Uri m_sourceUri; //null
-
-    #endregion
-
-    protected virtual bool TryCreateAbsoluteUri( Uri baseUri, Uri sourceUri, out Uri result )
-    {
-      result = null;
-
-      if( ( sourceUri == null ) || !sourceUri.IsAbsoluteUri )
-        return false;
-
-      if( string.Compare( sourceUri.Scheme, Uri.UriSchemeFile, StringComparison.OrdinalIgnoreCase ) != 0 )
-      {
-        result = sourceUri;
-      }
-      else if( string.Compare( sourceUri.OriginalString, 0, Uri.UriSchemeFile, 0, Uri.UriSchemeFile.Length, StringComparison.OrdinalIgnoreCase ) == 0 )
-      {
-        result = sourceUri;
-      }
-      else
-      {
-        result = new Uri( sourceUri.AbsoluteUri );
-      }
-
-      return true;
-    }
-
-    private static int FindIndex( IList<KeyValuePair<Uri, WeakResourceDictionary>> collection, Uri sourceUri, out bool cleanUp )
-    {
-      cleanUp = false;
-
-      Debug.Assert( collection != null );
-      Debug.Assert( sourceUri != null );
-
-      var lowerBound = 0;
-      var upperBound = collection.Count - 1;
-
-      while( lowerBound <= upperBound )
-      {
-        var middle = lowerBound + ( upperBound - lowerBound ) / 2;
-        var entry = collection[ middle ];
-        var compare = Uri.Compare( entry.Key, sourceUri, UriComponents.AbsoluteUri, UriFormat.SafeUnescaped, StringComparison.InvariantCultureIgnoreCase );
-
-        cleanUp = cleanUp || ( entry.Value.Status == ResourceDictionaryStatus.GarbageCollected );
-
-        if( compare < 0 )
-        {
-          if( middle == lowerBound )
-            return ~middle;
-
-          upperBound = middle - 1;
-        }
-        else if( compare > 0 )
-        {
-          if( middle == upperBound )
-            return ~( middle + 1 );
-
-          lowerBound = middle + 1;
-        }
-        else
-        {
-          return middle;
-        }
-      }
-
-      return ~0;
-    }
-
-    #region WeakResourceDictionary Private Class
-
-    private sealed class WeakResourceDictionary
-    {
-      internal ResourceDictionary Target
-      {
-        get
-        {
-          var resource = m_resource;
-          if( resource == null )
-            return null;
-
-          return ( ResourceDictionary )resource.Target;
-        }
-        set
-        {
-          if( value == null )
-            throw new ArgumentNullException( "value" );
-
-          if( m_resource != null )
-            throw new InvalidOperationException( "The property can only be set once." );
-
-          m_resource = new WeakReference( value );
-        }
-      }
-
-      internal ResourceDictionaryStatus Status
-      {
-        get
-        {
-          var resource = m_resource;
-          if( resource == null )
-            return ResourceDictionaryStatus.NotSet;
-
-          if( resource.IsAlive )
-            return ResourceDictionaryStatus.Alive;
-
-          return ResourceDictionaryStatus.GarbageCollected;
-        }
-      }
-
-      private WeakReference m_resource; //null
-    }
-
-    #endregion
-
-    #region ResourceDictionaryStatus Private Enum
-
-    private enum ResourceDictionaryStatus
-    {
-      NotSet = 0,
-      Alive,
-      GarbageCollected
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedThemeResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedThemeResourceDictionary.cs
deleted file mode 100644
index 9892c773..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/SharedThemeResourceDictionary.cs
+++ /dev/null
@@ -1,416 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Reflection;
-using System.Security;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public abstract class SharedThemeResourceDictionary : SharedResourceDictionary
-  {
-    #region Static Fields
-
-    private const string UriSchemePack = "pack";
-    private const string UriComponent = ";component";
-    private const string UriAssemblyVersionSymbol = "V";
-    private const string UriAssemblyInfoSeparator = ";";
-    private const string UriPathSeparator = "/";
-
-    private const string AssemblyFullNameSeparator = ",";
-    private const string AssemblyFullNameVersionPrefix = "Version=";
-    private const string AssemblyFullNamePublicKeyTokenPrefix = "PublicKeyToken=";
-
-    private static readonly Uri SchemePackBaseUri = new Uri( "pack://application:,,,/", UriKind.Absolute );
-
-    #endregion
-
-    protected abstract Uri GetBaseUri();
-
-    protected sealed override bool TryCreateAbsoluteUri( Uri baseUri, Uri sourceUri, out Uri result )
-    {
-      Uri packUri;
-
-      if( sourceUri != null )
-      {
-        if( SharedThemeResourceDictionary.TryConvertToPackUri( sourceUri, out packUri ) )
-        {
-          sourceUri = packUri;
-        }
-
-        UriDescription sourceUriDescription;
-        if( SharedThemeResourceDictionary.TryGetUriDescription( sourceUri, out sourceUriDescription ) )
-        {
-          if( SharedThemeResourceDictionary.IsAssemblyInfoFilled( sourceUriDescription ) )
-          {
-            result = SharedThemeResourceDictionary.CreateUri( sourceUriDescription );
-            return true;
-          }
-        }
-      }
-
-      if( SharedThemeResourceDictionary.TryConvertToPackUri( baseUri, out packUri ) )
-      {
-        baseUri = packUri;
-      }
-
-      var newBaseUri = this.GetBaseUri();
-      if( newBaseUri != null )
-      {
-        if( SharedThemeResourceDictionary.TryConvertToPackUri( newBaseUri, out packUri ) )
-        {
-          newBaseUri = packUri;
-        }
-
-        if( baseUri != null )
-        {
-          Uri combinedUri;
-          if( SharedThemeResourceDictionary.TryCombineUri( newBaseUri, baseUri, out combinedUri ) )
-          {
-            newBaseUri = combinedUri;
-          }
-        }
-
-        if( sourceUri != null )
-          return SharedThemeResourceDictionary.TryCombineUri( newBaseUri, sourceUri, out result );
-      }
-      else
-      {
-        newBaseUri = baseUri;
-      }
-
-      return base.TryCreateAbsoluteUri( newBaseUri, sourceUri, out result );
-    }
-
-    protected Uri CreateBaseUri( Assembly assembly )
-    {
-      if( assembly == null )
-        return null;
-
-      try
-      {
-        return SharedThemeResourceDictionary.CreateBaseUriFromAssembly( assembly );
-      }
-      catch( SecurityException )
-      {
-        return SharedThemeResourceDictionary.CreateBaseUriFromAssemblyFullName( assembly );
-      }
-    }
-
-    private static Uri CreateBaseUriFromAssembly( Assembly assembly )
-    {
-      Debug.Assert( assembly != null );
-
-      var assemblyInfo = assembly.GetName();
-      var assemblyName = assemblyInfo.Name;
-      var assemblyVersion = SharedThemeResourceDictionary.GetAssemblyVersion( assemblyInfo.Version );
-      var assemblyPublicKeyToken = SharedThemeResourceDictionary.GetAssemblyPublicKeyToken( assemblyInfo.GetPublicKeyToken() );
-
-      return SharedThemeResourceDictionary.CreateUri( assemblyName, assemblyVersion, assemblyPublicKeyToken, string.Empty );
-    }
-
-    private static Uri CreateBaseUriFromAssemblyFullName( Assembly assembly )
-    {
-      Debug.Assert( assembly != null );
-
-      var fullName = assembly.FullName;
-      var assemblyName = SharedThemeResourceDictionary.GetAssemblyName( fullName );
-      var assemblyVersion = SharedThemeResourceDictionary.GetAssemblyVersion( fullName );
-      var assemblyPublicKeyToken = SharedThemeResourceDictionary.GetAssemblyPublicKeyToken( fullName );
-
-      return SharedThemeResourceDictionary.CreateUri( assemblyName, assemblyVersion, assemblyPublicKeyToken, string.Empty );
-    }
-
-    private static string GetAssemblyName( string fullName )
-    {
-      if( fullName == null )
-        return null;
-
-      var length = fullName.IndexOf( SharedThemeResourceDictionary.AssemblyFullNameSeparator, StringComparison.InvariantCultureIgnoreCase );
-      if( length <= 0 )
-        return null;
-
-      return fullName.Substring( 0, length );
-    }
-
-    private static string GetAssemblyVersion( Version version )
-    {
-      if( version == null )
-        return null;
-
-      return SharedThemeResourceDictionary.UriAssemblyVersionSymbol + version.ToString();
-    }
-
-    private static string GetAssemblyVersion( string fullName )
-    {
-      if( fullName == null )
-        return null;
-
-      var start = fullName.IndexOf( SharedThemeResourceDictionary.AssemblyFullNameVersionPrefix, StringComparison.InvariantCultureIgnoreCase );
-      if( start < 0 )
-        return null;
-
-      start += SharedThemeResourceDictionary.AssemblyFullNameVersionPrefix.Length;
-
-      var end = fullName.IndexOf( SharedThemeResourceDictionary.AssemblyFullNameSeparator, start, StringComparison.InvariantCultureIgnoreCase );
-      var value = ( end > 0 )
-                    ? fullName.Substring( start, end - start )
-                    : fullName.Substring( start );
-
-      if( string.IsNullOrEmpty( value ) )
-        return null;
-
-      return SharedThemeResourceDictionary.UriAssemblyVersionSymbol + value;
-    }
-
-    private static string GetAssemblyPublicKeyToken( byte[] publicKeyToken )
-    {
-      if( publicKeyToken == null )
-        return null;
-
-      var sb = new StringBuilder();
-      for( int i = 0; i < publicKeyToken.Length; i++ )
-      {
-        sb.AppendFormat( "{0:x2}", publicKeyToken[ i ] );
-      }
-
-      return sb.ToString();
-    }
-
-    private static string GetAssemblyPublicKeyToken( string fullName )
-    {
-      if( fullName == null )
-        return null;
-
-      var start = fullName.IndexOf( SharedThemeResourceDictionary.AssemblyFullNamePublicKeyTokenPrefix, StringComparison.InvariantCultureIgnoreCase );
-      if( start < 0 )
-        return null;
-
-      start += SharedThemeResourceDictionary.AssemblyFullNamePublicKeyTokenPrefix.Length;
-
-      var end = fullName.IndexOf( SharedThemeResourceDictionary.AssemblyFullNameSeparator, start, StringComparison.InvariantCultureIgnoreCase );
-      var value = ( end > 0 )
-                    ? fullName.Substring( start, end - start )
-                    : fullName.Substring( start );
-
-      return value;
-    }
-
-    private static string ParseAssemblyVersion( string version )
-    {
-      var symbol = SharedThemeResourceDictionary.UriAssemblyVersionSymbol;
-      if( string.IsNullOrEmpty( version ) || !version.StartsWith( symbol, StringComparison.InvariantCultureIgnoreCase ) )
-        return version;
-
-      Version ver;
-      if( !Version.TryParse( version.Substring( symbol.Length ), out ver ) )
-        return version;
-
-      return SharedThemeResourceDictionary.GetAssemblyVersion( ver );
-    }
-
-    private static Uri CreateUri( UriDescription description )
-    {
-      Debug.Assert( description != null );
-
-      return SharedThemeResourceDictionary.CreateUri(
-               description.AssemblyName,
-               description.AssemblyVersion,
-               description.AssemblyPublicKeyToken,
-               description.RelativePath );
-    }
-
-    private static Uri CreateUri( string assemblyName, string assemblyVersion, string assemblyPublicKeyToken, string relativePath )
-    {
-      var sb = new StringBuilder( SharedThemeResourceDictionary.UriPathSeparator );
-
-      sb.Append( assemblyName ?? string.Empty );
-
-      sb.Append( SharedThemeResourceDictionary.UriAssemblyInfoSeparator );
-      sb.Append( assemblyVersion ?? string.Empty );
-      sb.Append( SharedThemeResourceDictionary.UriAssemblyInfoSeparator );
-      sb.Append( assemblyPublicKeyToken ?? string.Empty );
-
-      sb.Append( SharedThemeResourceDictionary.UriComponent );
-
-      if( string.IsNullOrEmpty( relativePath ) || !relativePath.StartsWith( SharedThemeResourceDictionary.UriPathSeparator, StringComparison.InvariantCultureIgnoreCase ) )
-      {
-        sb.Append( SharedThemeResourceDictionary.UriPathSeparator );
-      }
-
-      sb.Append( relativePath ?? string.Empty );
-
-      return new Uri( SharedThemeResourceDictionary.SchemePackBaseUri, sb.ToString() );
-    }
-
-    private static bool TryConvertToPackUri( Uri sourceUri, out Uri result )
-    {
-      if( SharedThemeResourceDictionary.IsPackUri( sourceUri ) )
-      {
-        result = new Uri( SharedThemeResourceDictionary.SchemePackBaseUri, sourceUri );
-      }
-      else
-      {
-        result = null;
-      }
-
-      return ( result != null );
-    }
-
-    private static bool IsPackUri( Uri sourceUri )
-    {
-      if( sourceUri == null )
-        return false;
-
-      var path = sourceUri.ToString();
-
-      return ( path.IndexOf( SharedThemeResourceDictionary.UriComponent, StringComparison.InvariantCultureIgnoreCase ) >= 0 );
-    }
-
-    private static bool IsAssemblyInfoFilled( UriDescription description )
-    {
-      if( string.IsNullOrEmpty( description.AssemblyName ) )
-        return false;
-
-      return !string.IsNullOrEmpty( description.AssemblyVersion )
-          || !string.IsNullOrEmpty( description.AssemblyPublicKeyToken );
-    }
-
-    private static bool TryGetUriDescription( Uri uri, out UriDescription description )
-    {
-      description = null;
-      if( ( uri == null ) || !uri.IsAbsoluteUri )
-        return false;
-
-      if( !string.Equals( uri.Scheme, SharedThemeResourceDictionary.UriSchemePack, StringComparison.InvariantCultureIgnoreCase ) )
-        return false;
-
-      var segments = uri.Segments;
-      if( ( segments == null ) || ( segments.Length < 2 ) )
-        return false;
-
-      var componentPart = segments[ 1 ];
-      var index = componentPart.IndexOf( SharedThemeResourceDictionary.UriComponent, StringComparison.InvariantCultureIgnoreCase );
-      if( index < 0 )
-        return false;
-
-      string assemblyName = null;
-      string assemblyVersion = null;
-      string assemblyPublicKeyToken = null;
-
-      var assemblyInfo = componentPart.Substring( 0, index );
-      if( assemblyInfo.Length > 0 )
-      {
-        var assemblyParts = assemblyInfo.Split( new string[] { SharedThemeResourceDictionary.UriAssemblyInfoSeparator }, StringSplitOptions.None );
-        Debug.Assert( assemblyParts.Length <= 3 );
-
-        assemblyName = ( assemblyParts.Length > 0 ) ? assemblyParts[ 0 ] : null;
-        assemblyVersion = ( assemblyParts.Length > 1 ) ? SharedThemeResourceDictionary.ParseAssemblyVersion( assemblyParts[ 1 ] ) : null;
-        assemblyPublicKeyToken = ( assemblyParts.Length > 2 ) ? assemblyParts[ 2 ] : null;
-      }
-
-      string relativePath = null;
-
-      if( segments.Length > 2 )
-      {
-        var sb = new StringBuilder();
-        for( int i = 2; i < segments.Length; i++ )
-        {
-          sb.Append( segments[ i ] );
-        }
-
-        relativePath = sb.ToString();
-      }
-
-      description = new UriDescription( assemblyName, assemblyVersion, assemblyPublicKeyToken, relativePath );
-
-      return true;
-    }
-
-    private static bool TryCombineUri( Uri baseUri, Uri relativeUri, out Uri result )
-    {
-      result = null;
-
-      Debug.Assert( ( baseUri != null ) && ( relativeUri != null ) );
-      Debug.Assert( baseUri.IsAbsoluteUri );
-
-      UriDescription baseUriDescription;
-      if( !SharedThemeResourceDictionary.TryGetUriDescription( baseUri, out baseUriDescription ) )
-        return false;
-
-      UriDescription relativeUriDescription;
-      if( SharedThemeResourceDictionary.TryGetUriDescription( relativeUri, out relativeUriDescription ) )
-      {
-        if( !string.IsNullOrEmpty( relativeUriDescription.AssemblyName ) && !string.Equals( relativeUriDescription.AssemblyName, baseUriDescription.AssemblyName, StringComparison.InvariantCultureIgnoreCase ) )
-          return false;
-      }
-      else if( relativeUri.IsAbsoluteUri )
-      {
-        return false;
-      }
-      else
-      {
-        relativeUriDescription = null;
-      }
-
-      var baseUriPath = baseUriDescription.RelativePath;
-      var relativeUriPath = ( relativeUriDescription != null ) ? relativeUriDescription.RelativePath : Uri.EscapeUriString( relativeUri.ToString() );
-
-      if( relativeUriPath.StartsWith( SharedThemeResourceDictionary.UriPathSeparator, StringComparison.InvariantCultureIgnoreCase ) )
-      {
-        baseUriPath = string.Empty;
-        relativeUriPath = relativeUriPath.Substring( SharedThemeResourceDictionary.UriPathSeparator.Length );
-      }
-
-      var assemblyDescription = ( ( relativeUriDescription != null ) && !SharedThemeResourceDictionary.IsAssemblyInfoFilled( baseUriDescription ) )
-                                  ? relativeUriDescription
-                                  : baseUriDescription;
-      var newBaseUri = SharedThemeResourceDictionary.CreateUri(
-                         assemblyDescription.AssemblyName,
-                         assemblyDescription.AssemblyVersion,
-                         assemblyDescription.AssemblyPublicKeyToken,
-                         baseUriPath );
-      var newRelativeUri = new Uri( relativeUriPath, UriKind.Relative );
-
-      return Uri.TryCreate( newBaseUri, newRelativeUri, out result );
-    }
-
-    #region UriDescription Private Class
-
-    private sealed class UriDescription
-    {
-      internal UriDescription( string assemblyName, string assemblyVersion, string assemblyPublicKeyToken, string relativePath )
-      {
-        this.AssemblyName = assemblyName ?? string.Empty;
-        this.AssemblyVersion = assemblyVersion ?? string.Empty;
-        this.AssemblyPublicKeyToken = assemblyPublicKeyToken ?? string.Empty;
-        this.RelativePath = relativePath ?? string.Empty;
-      }
-
-      internal readonly string AssemblyName;
-      internal readonly string AssemblyVersion;
-      internal readonly string AssemblyPublicKeyToken;
-      internal readonly string RelativePath;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeConverter.cs
deleted file mode 100644
index c6e80087..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeConverter.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  public class ThemeConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext context, Type sourceType )
-    {
-      if( sourceType == typeof( string ) )
-        return true;
-
-      return base.CanConvertFrom( context, sourceType );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext context, Type destinationType )
-    {
-      // We support conversion from string but we don't want to convert back to string.
-      // Otherwise, the DataGrid designer would persist in XAML using the attribute
-      // syntax which would fail for ThemePack themes.
-      if( destinationType == typeof( string ) )
-        return false;
-
-      return base.CanConvertTo( context, destinationType );
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1807:AvoidUnnecessaryStringCreation", MessageId = "stringValue" ), System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1807:AvoidUnnecessaryStringCreation", MessageId = "value" )]
-    public override object ConvertFrom( ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value )
-    {
-      string stringValue = value as string;
-
-      if( stringValue != null )
-      {
-        string themeName = stringValue.ToLowerInvariant();
-        Theme theme = null;
-
-        switch( themeName )
-        {
-          case "classic.systemcolor":
-          case "classicsystemcolortheme":
-            theme = s_classicSystemColorTheme;
-            break;
-          case "luna.normalcolor":
-          case "lunanormalcolortheme":
-            theme = s_lunaNormalColorTheme;
-            break;
-          case "luna.homestead":
-          case "lunahomesteadtheme":
-            theme = s_lunaHomesteadTheme;
-            break;
-          case "luna.metallic":
-          case "lunametallictheme":
-            theme = s_lunaMetallicTheme;
-            break;
-          case "aero.normalcolor":
-          case "aeronormalcolortheme":
-            theme = s_aeroNormalColorTheme;
-            break;
-          case "royale.normalcolor":
-          case "royalenormalcolortheme":
-            theme = s_royaleNormalColorTheme;
-            break;
-          case "zune.normalcolor":
-          case "zunenormalcolortheme":
-            theme = s_zuneNormalColorTheme;
-            break;
-          case "windows7":
-          case "windows7theme":
-            theme = s_windows7Theme;
-            break;
-          case "aero2.normalcolor":
-          case "aero2normalcolortheme":
-            theme = s_aero2NormalColorTheme;
-            break;
-        }
-
-        if( theme == null )
-          throw new ArgumentException( "The specified theme is invalid.", "value" );
-
-        return theme;
-      }
-
-      return base.ConvertFrom( context, culture, value );
-    }
-
-    private static readonly Theme s_classicSystemColorTheme = new ClassicSystemColorTheme();
-    private static readonly Theme s_lunaNormalColorTheme = new LunaNormalColorTheme();
-    private static readonly Theme s_lunaHomesteadTheme = new LunaHomesteadTheme();
-    private static readonly Theme s_lunaMetallicTheme = new LunaMetallicTheme();
-    private static readonly Theme s_aeroNormalColorTheme = new AeroNormalColorTheme();
-    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_aero2NormalColorTheme = new Windows8Theme();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs
deleted file mode 100644
index f2614724..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Reflection;
-using System.Windows;
-using System.Windows.Markup;
-using System.Windows.Media;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [MarkupExtensionReturnType( typeof( ThemeKey ) )]
-  public class ThemeKey : ResourceKey
-  {
-
-    public ThemeKey()
-    {
-    }
-
-    public ThemeKey( Type targetViewType, Type themeType, Type targetElementType )
-    {
-      if( targetViewType == null )
-        throw new ArgumentNullException( "targetViewType" );
-
-      if( !typeof( ViewBase ).IsAssignableFrom( targetViewType ) )
-        throw new ArgumentException( "The specified view type must derive from ViewBase.", "targetViewType" );
-
-      m_targetViewType = targetViewType;
-      m_targetViewTypeInitialized = true;
-      m_themeType = themeType;
-      m_themeTypeInitialized = true;
-      m_targetElementType = targetElementType;
-      m_targetElementTypeInitialized = true;
-    }
-
-    public ThemeKey( Type targetViewType, Type targetElementType )
-      : this( targetViewType, null, targetElementType )
-    {
-    }
-
-    #region TargetViewType Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public Type TargetViewType
-    {
-      get
-      {
-        return m_targetViewType;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "TargetViewType" );
-
-          if( !typeof( ViewBase ).IsAssignableFrom( value ) )
-            throw new ArgumentException( "The specified view type must derive from ViewBase.", "TargetViewType" );
-
-        if( m_targetViewTypeInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the TargetViewType property when it has already been initialized." );
-
-        m_targetViewType = value;
-        m_targetViewTypeInitialized = true;
-      }
-    }
-
-    private Type m_targetViewType; // = null;
-    private bool m_targetViewTypeInitialized; // = false;
-
-    #endregion TargetViewType Property
-
-    #region ThemeType Property
-
-    public Type ThemeType
-    {
-      get
-      {
-        return m_themeType;
-      }
-      set
-      {
-        if( m_themeTypeInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the ThemeType property when it has already been initialized." );
-
-        m_themeType = value;
-        m_themeTypeInitialized = true;
-      }
-    }
-
-    private Type m_themeType; // = null;
-    private bool m_themeTypeInitialized; // = false;
-
-    #endregion ThemeType Property
-
-    #region TargetElementType Property
-
-    public Type TargetElementType
-    {
-      get
-      {
-        return m_targetElementType;
-      }
-      set
-      {
-        if( m_targetElementTypeInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the TargetElementType property when it has already been initialized." );
-
-        m_targetElementType = value;
-        m_targetElementTypeInitialized = true;
-      }
-    }
-
-    private Type m_targetElementType; // = null;
-    private bool m_targetElementTypeInitialized; // = false;
-
-    #endregion TargetElementType Property
-
-    public override Assembly Assembly
-    {
-      get
-      {
-        if( m_themeType != null )
-          return m_themeType.Assembly;
-
-        if( m_targetViewType != null )
-          return m_targetViewType.Assembly;
-
-        return null;
-      }
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( object.ReferenceEquals( obj, this ) )
-        return true;
-
-      var key = obj as ThemeKey;
-      if( object.ReferenceEquals( key, null ) )
-        return false;
-
-      return ( object.Equals( key.TargetViewType, this.TargetViewType ) )
-          && ( object.Equals( key.ThemeType, this.ThemeType ) )
-          && ( object.Equals( key.TargetElementType, this.TargetElementType ) );
-    }
-
-    public override int GetHashCode()
-    {
-      var hashCode = 0;
-
-      var elementType = this.TargetElementType;
-      if( elementType != null )
-      {
-        hashCode += elementType.GetHashCode();
-      }
-
-      var viewType = this.TargetViewType;
-      if( viewType != null )
-      {
-        hashCode *= 11;
-        hashCode += viewType.GetHashCode();
-      }
-
-      var themeType = this.ThemeType;
-      if( themeType != null )
-      {
-        hashCode *= 17;
-        hashCode += themeType.GetHashCode();
-      }
-
-      return hashCode;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewBindingExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewBindingExtension.cs
deleted file mode 100644
index c3fc6891..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewBindingExtension.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System.Windows.Markup;
-using System.Windows;
-using System.Globalization;
-using System.Collections.Specialized;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  [MarkupExtensionReturnType( typeof( Binding ) )]
-  public class ViewBindingExtension : MarkupExtension
-  {
-    public ViewBindingExtension() : base()
-    {
-    }
-
-    public ViewBindingExtension( string path ) : base()
-    {
-      if( path == null )
-        throw new ArgumentNullException( "path" );
-
-      m_path = path;
-    }
-
-    #region Path Property
-
-    private string m_path; // = null;
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public string Path
-    {
-      get
-      {
-        return m_path;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "Path" );
-
-        if( m_path != null )
-          throw new InvalidOperationException( "An attempt was made to set the Path property when it has already been initialized.s" );
-
-        m_path = value;
-      }
-    }
-
-    #endregion Path Property
-
-    #region Mode Property
-
-    private BindingMode m_bindingMode = BindingMode.OneWay;
-
-    public BindingMode Mode
-    {
-      get
-      {
-        return m_bindingMode;
-      }
-      set
-      {
-        m_bindingMode = value;
-      }
-    }
-
-    #endregion Mode Property
-
-    #region Converter Property
-
-    private IValueConverter m_converter; // = null;
-
-    public IValueConverter Converter
-    {
-      get
-      {
-        return m_converter;
-      }
-      set
-      {
-        if( this.ConverterInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the Converter property when it has already been initialized." );
-
-        m_converter = value;
-        this.ConverterInitialized = true;
-      }
-    }
-
-    #endregion Converter Property
-
-    #region ConverterParameter Property
-
-    private object m_converterParameter; // = null;
-
-    public object ConverterParameter
-    {
-      get
-      {
-        return m_converterParameter;
-      }
-      set
-      {
-        if( this.ConverterParameterInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the ConverterParameter property when it has already been initialized." );
-
-        m_converterParameter = value;
-        this.ConverterParameterInitialized = true;
-      }
-    }
-
-    #endregion ConverterParameter Property
-
-    #region ConverterCulture Property
-
-    private CultureInfo m_converterCulture; // = null;
-
-    public CultureInfo ConverterCulture
-    {
-      get
-      {
-        return m_converterCulture;
-      }
-      set
-      {
-        if( this.ConverterCultureInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the ConverterCulture property when it has already been initialized." );
-
-        m_converterCulture = value;
-        this.ConverterCultureInitialized = true;
-      }
-    }
-
-    #endregion ConverterCulture Property
-
-    #region PUBLIC METHODS
-
-    public override object ProvideValue( IServiceProvider serviceProvider )
-    {
-      return this.CreateBinding();
-    }
-
-    #endregion PUBLIC METHODS
-
-    #region PRIVATE METHODS
-
-    private Binding CreateBinding()
-    {
-      if( m_path == null )
-        throw new InvalidOperationException( "An attempt was made to create a binding without a Path." );
-
-      Binding binding;
-
-      binding = new Binding();
-      binding.Path = new PropertyPath( "(0)." + m_path, DataGridControl.DataGridContextProperty );
-      binding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-
-      binding.Mode = m_bindingMode;
-      binding.Converter = m_converter;
-      binding.ConverterParameter = m_converterParameter;
-      binding.ConverterCulture = m_converterCulture;
-
-      return binding;
-    }
-
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE PROPERTIES
-
-    private bool ConverterCultureInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )ViewBindingExtensionFlags.ConverterCultureInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )ViewBindingExtensionFlags.ConverterCultureInitialized ] = value;
-      }
-    }
-
-
-    private bool ConverterInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )ViewBindingExtensionFlags.ConverterInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )ViewBindingExtensionFlags.ConverterInitialized ] = value;
-      }
-    }
-
-    private bool ConverterParameterInitialized
-    {
-      get
-      {
-        return m_flags[ ( int )ViewBindingExtensionFlags.ConverterParameterInitialized ];
-      }
-      set
-      {
-        m_flags[ ( int )ViewBindingExtensionFlags.ConverterParameterInitialized ] = value;
-      }
-    }
-
-    #endregion PRIVATE PROPERTIES
-
-    #region PRIVATE FIELDS
-
-    private BitVector32 m_flags = new BitVector32();
-
-    #endregion PRIVATE FIELDS
-
-    #region NESTED CLASSES
-
-    [Flags]
-    private enum ViewBindingExtensionFlags
-    {
-      ConverterCultureInitialized = 1,
-      ConverterInitialized = 2,
-      ConverterParameterInitialized = 4
-    }
-
-    #endregion NESTED CLASSES
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewConverter.cs
deleted file mode 100644
index 257ea898..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewConverter.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid.Markup
-{
-  public class ViewConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext context, Type sourceType )
-    {
-      if( sourceType == typeof( string ) )
-        return true;
-
-      return base.CanConvertFrom( context, sourceType );
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1807:AvoidUnnecessaryStringCreation", MessageId = "viewName" )]
-    public override object ConvertFrom( ITypeDescriptorContext context, CultureInfo culture, object value )
-    {
-      string stringValue = value as string;
-
-      if( stringValue != null )
-      {
-        ViewBase toReturn = null;
-
-        string completeName = stringValue;
-        int pointIndex = completeName.IndexOf( "." );
-        string viewName = string.Empty;
-        string themeName = string.Empty;
-
-        if(pointIndex != -1)
-        {
-          viewName = completeName.Substring( 0, pointIndex );
-          themeName = completeName.Substring( pointIndex + 1 );
-        }
-        else
-        {
-          viewName = completeName;
-        }
-
-        viewName = viewName.ToLowerInvariant();
-
-        switch( viewName )
-        {
-          case "tableview":
-            toReturn = new TableView();
-            break;
-          case "tableflowview":
-            toReturn = new TableflowView();
-            break;
-        }
-
-        if( toReturn == null )
-        {
-          throw new ArgumentException( "The specified view is invalid.", "value" );
-        }
-        else
-        {
-          if( !string.IsNullOrEmpty( themeName ) )
-          {
-            ThemeConverter themeConverter = new ThemeConverter();
-            toReturn.Theme = (Theme)themeConverter.ConvertFromString(themeName);
-          }
-        }
-
-        return toReturn;
-      }
-
-      return base.ConvertFrom( context, culture, value );
-    }
-
-    public override object ConvertTo( ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType )
-    {
-      if( ( destinationType != null ) && ( value is ViewBase ) )
-      {
-        if( destinationType == typeof( string ) )
-        {
-          return value.GetType().Name;
-        }
-      }
-
-      return base.ConvertTo( context, culture, value, destinationType );
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NoDrop.cur b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NoDrop.cur
deleted file mode 100644
index 7df3b590..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/NoDrop.cur and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObjectComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObjectComparer.cs
deleted file mode 100644
index 60a5c8af..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObjectComparer.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal class ObjectComparer : IComparer
-  {
-    private ObjectComparer()
-    {
-    }
-
-    #region Singleton Property
-
-    public static ObjectComparer Singleton
-    {
-      get
-      {
-        if( _singleton == null )
-          _singleton = new ObjectComparer();
-
-        return _singleton;
-      }
-    }
-
-    private static ObjectComparer _singleton;
-
-    #endregion Singleton Property
-
-    public int Compare( object xData, object yData )
-    {
-      // Code in there should be indentical to ObjectDataStore.CompareData
-
-      if( ( xData == null ) || ( xData == DBNull.Value ) )
-      {
-        if( ( yData != null ) && ( yData != DBNull.Value ) )
-        {
-          return -1;
-        }
-      }
-      else
-      {
-        if( ( yData == null ) || ( yData == DBNull.Value ) )
-          return 1;
-
-        IComparable xDataComparer = xData as IComparable;
-
-        if( xDataComparer != null )
-          return xDataComparer.CompareTo( yData );
-      }
-
-      return 0;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObservableColumnCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObservableColumnCollection.cs
deleted file mode 100644
index 72d9cb18..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObservableColumnCollection.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class ObservableColumnCollection : ObservableCollection<ColumnBase>
-  {
-    #region [] Property
-
-    public ColumnBase this[ string fieldName ]
-    {
-      get
-      {
-        if( fieldName != null )
-        {
-          ColumnBase value;
-          if( m_fieldNameToColumn.TryGetValue( fieldName, out value ) )
-            return value;
-        }
-
-        return null;
-      }
-    }
-
-    #endregion
-
-    #region SyncRoot Private Property
-
-    private object SyncRoot
-    {
-      get
-      {
-        return ( ( ICollection )this ).SyncRoot;
-      }
-    }
-
-    #endregion
-
-    // This method has better performance than the one on the base class.
-    public new bool Contains( ColumnBase item )
-    {
-      if( item == null )
-        return false;
-
-      return object.ReferenceEquals( item, this[ item.FieldName ] );
-    }
-
-    protected virtual void OnItemAdding( ColumnBase item )
-    {
-    }
-
-    protected virtual void OnItemAdded( ColumnBase item )
-    {
-    }
-
-    protected virtual void OnItemRemoving( ColumnBase item )
-    {
-    }
-
-    protected virtual void OnItemRemoved( ColumnBase item )
-    {
-    }
-
-    protected override void RemoveItem( int index )
-    {
-      var item = this[ index ];
-      Debug.Assert( item != null );
-
-      this.OnItemRemovingCore( item );
-
-      base.RemoveItem( index );
-
-      this.OnItemRemovedCore( item );
-    }
-
-    protected override void InsertItem( int index, ColumnBase item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      var fieldName = item.FieldName;
-      if( string.IsNullOrEmpty( fieldName ) )
-        throw new ArgumentException( "A column must have a fieldname.", "item" );
-
-      if( m_fieldNameToColumn.ContainsKey( fieldName ) )
-        throw new DataGridException( "A column with same field name already exists in collection." );
-
-      this.OnItemAddingCore( item );
-
-      base.InsertItem( index, item );
-
-      this.OnItemAddedCore( item );
-    }
-
-    protected override void ClearItems()
-    {
-      var items = new List<ColumnBase>( this );
-
-      foreach( var item in items )
-      {
-        this.OnItemRemovingCore( item );
-      }
-
-      Debug.Assert( m_fieldNameToColumn.Count == 0 );
-      m_fieldNameToColumn.Clear();
-
-      base.ClearItems();
-
-      foreach( var item in items )
-      {
-        this.OnItemRemovedCore( item );
-      }
-    }
-
-    protected override void SetItem( int index, ColumnBase item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      var fieldName = item.FieldName;
-      if( string.IsNullOrEmpty( fieldName ) )
-        throw new ArgumentException( "A column must have a fieldname.", "item" );
-
-      var oldItem = this[ index ];
-      Debug.Assert( oldItem != null );
-
-      if( oldItem.FieldName != fieldName )
-      {
-        if( m_fieldNameToColumn.ContainsKey( fieldName ) )
-          throw new DataGridException( "A column with same field name already exists in collection." );
-      }
-
-      this.OnItemRemovingCore( oldItem );
-      this.OnItemAddingCore( item );
-
-      base.SetItem( index, item );
-
-      this.OnItemRemovedCore( oldItem );
-      this.OnItemAddedCore( item );
-    }
-
-    protected override void OnPropertyChanged( PropertyChangedEventArgs e )
-    {
-      lock( this.SyncRoot )
-      {
-        if( m_deferCount != 0 )
-        {
-          if( m_deferPropertyChangedEventArgs == null )
-          {
-            m_deferPropertyChangedEventArgs = e;
-          }
-          else if( !string.IsNullOrEmpty( m_deferPropertyChangedEventArgs.PropertyName ) && !object.Equals( m_deferPropertyChangedEventArgs.PropertyName, e.PropertyName ) )
-          {
-            m_deferPropertyChangedEventArgs = new PropertyChangedEventArgs( string.Empty );
-          }
-
-          return;
-        }
-      }
-
-      base.OnPropertyChanged( e );
-    }
-
-    protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      lock( this.SyncRoot )
-      {
-        if( m_deferCount != 0 )
-        {
-          if( m_deferCollectionChangedEventArgs == null )
-          {
-            m_deferCollectionChangedEventArgs = e;
-          }
-          else if( m_deferCollectionChangedEventArgs.Action != NotifyCollectionChangedAction.Reset )
-          {
-            m_deferCollectionChangedEventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
-          }
-
-          return;
-        }
-      }
-
-      base.OnCollectionChanged( e );
-    }
-
-    internal IDisposable DeferNotifications()
-    {
-      return new DeferredDisposable( new DeferState( this ) );
-    }
-
-    private void OnItemAddingCore( ColumnBase item )
-    {
-      m_fieldNameToColumn.Add( item.FieldName, item );
-
-      this.OnItemAdding( item );
-    }
-
-    private void OnItemAddedCore( ColumnBase item )
-    {
-      this.OnItemAdded( item );
-    }
-
-    private void OnItemRemovingCore( ColumnBase item )
-    {
-      var fieldName = item.FieldName;
-
-      this.OnItemRemoving( item );
-
-      m_fieldNameToColumn.Remove( fieldName );
-    }
-
-    private void OnItemRemovedCore( ColumnBase item )
-    {
-      this.OnItemRemoved( item );
-    }
-
-    private int m_deferCount; //0
-    private PropertyChangedEventArgs m_deferPropertyChangedEventArgs; //null
-    private NotifyCollectionChangedEventArgs m_deferCollectionChangedEventArgs; //null
-
-    private readonly Dictionary<string, ColumnBase> m_fieldNameToColumn = new Dictionary<string, ColumnBase>();
-
-    #region DeferState Private Class
-
-    private sealed class DeferState : DeferredDisposableState
-    {
-      internal DeferState( ObservableColumnCollection target )
-      {
-        Debug.Assert( target != null );
-        m_target = target;
-      }
-
-      protected override object SyncRoot
-      {
-        get
-        {
-          return m_target.SyncRoot;
-        }
-      }
-
-      protected override bool IsDeferred
-      {
-        get
-        {
-          return ( m_target.m_deferCount != 0 );
-        }
-      }
-
-      protected override void Increment()
-      {
-        m_target.m_deferCount++;
-      }
-
-      protected override void Decrement()
-      {
-        m_target.m_deferCount--;
-      }
-
-      protected override void OnDeferEnding( bool disposing )
-      {
-        m_propertyChangedEventArgs = m_target.m_deferPropertyChangedEventArgs;
-        m_collectionChangedEventArgs = m_target.m_deferCollectionChangedEventArgs;
-        m_target.m_deferPropertyChangedEventArgs = null;
-        m_target.m_deferCollectionChangedEventArgs = null;
-
-        base.OnDeferEnding( disposing );
-      }
-
-      protected override void OnDeferEnded( bool disposing )
-      {
-        if( m_collectionChangedEventArgs != null )
-        {
-          m_target.OnCollectionChanged( m_collectionChangedEventArgs );
-        }
-
-        if( m_propertyChangedEventArgs != null )
-        {
-          m_target.OnPropertyChanged( m_propertyChangedEventArgs );
-        }
-      }
-
-      private readonly ObservableColumnCollection m_target;
-      private PropertyChangedEventArgs m_propertyChangedEventArgs;
-      private NotifyCollectionChangedEventArgs m_collectionChangedEventArgs;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescription.cs
deleted file mode 100644
index 90fe3db8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescription.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class PropertyDescription
-  {
-    internal abstract string Name
-    {
-      get;
-    }
-
-    internal virtual string DisplayName
-    {
-      get
-      {
-        return this.Name;
-      }
-    }
-
-    internal abstract Type DataType
-    {
-      get;
-    }
-
-    internal virtual string Path
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    internal virtual string XPath
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    internal virtual PropertyDescriptor PropertyDescriptor
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    internal virtual DataGridForeignKeyDescription ForeignKeyDescription
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    internal virtual bool IsReadOnly
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    internal virtual bool OverrideReadOnlyForInsertion
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    internal virtual bool SupportDBNull
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    internal virtual bool IsBrowsable
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    internal virtual bool IsDisplayable
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    internal virtual bool IsSubRelationship
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    internal virtual bool IsDataGridUnboundItemProperty
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    internal virtual PropertyRouteSegment ToPropertyRouteSegment()
-    {
-      var route = PropertyRouteParser.Parse( this.Name );
-      if( ( route == null ) || ( route.Parent != null ) )
-        return new PropertyRouteSegment( PropertyRouteSegmentType.Property, this.Name );
-
-      return route.Current;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRoute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRoute.cs
deleted file mode 100644
index 5549d486..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRoute.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal sealed class PropertyDescriptionRoute
-  {
-    internal PropertyDescriptionRoute( PropertyDescription description )
-      : this( description, null )
-    {
-    }
-
-    private PropertyDescriptionRoute( PropertyDescription description, PropertyDescriptionRoute parent )
-    {
-      if( description == null )
-        throw new ArgumentNullException( "description" );
-
-      m_description = description;
-      m_parent = parent;
-    }
-
-    #region Current Property
-
-    internal PropertyDescription Current
-    {
-      get
-      {
-        return m_description;
-      }
-    }
-
-    private readonly PropertyDescription m_description;
-
-    #endregion
-
-    #region Parent Property
-
-    internal PropertyDescriptionRoute Parent
-    {
-      get
-      {
-        return m_parent;
-      }
-    }
-
-    private readonly PropertyDescriptionRoute m_parent;
-
-    #endregion
-
-    internal static PropertyDescriptionRoute Combine( PropertyDescription description, PropertyDescriptionRoute ancestors )
-    {
-      return new PropertyDescriptionRoute( description, ancestors );
-    }
-
-    internal static PropertyDescriptionRoute Combine( PropertyDescriptionRoute descendants, PropertyDescription description )
-    {
-      if( description == null )
-        return descendants;
-
-      return PropertyDescriptionRoute.Combine( descendants, new PropertyDescriptionRoute( description ) );
-    }
-
-    internal static PropertyDescriptionRoute Combine( PropertyDescriptionRoute descendants, PropertyDescriptionRoute ancestors )
-    {
-      if( ancestors == null )
-        return descendants;
-
-      if( descendants == null )
-        return ancestors;
-
-      return PropertyDescriptionRoute.Combine(
-               descendants.Current,
-               PropertyDescriptionRoute.Combine( descendants.Parent, ancestors ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRouteDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRouteDictionary.cs
deleted file mode 100644
index b305c627..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyDescriptionRouteDictionary.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal sealed class PropertyDescriptionRouteDictionary
-  {
-    internal PropertyDescriptionRoute this[ PropertyRoute key ]
-    {
-      get
-      {
-        PropertyDescriptionRoute value;
-
-        if( this.TryGetValue( key, out value ) )
-          return value;
-
-        return null;
-      }
-    }
-
-    internal ICollection<PropertyDescriptionRoute> Values
-    {
-      get
-      {
-        return m_collection.Values;
-      }
-    }
-
-    internal void Clear()
-    {
-      m_collection.Clear();
-    }
-
-    internal void Add( PropertyDescriptionRoute value, bool overwrite )
-    {
-      PropertyDescriptionRouteDictionary.EnsureValue( value );
-
-      var key = PropertyRouteBuilder.ToPropertyRoute( value );
-
-      this.Add( key, value, overwrite );
-    }
-
-    internal void Add( PropertyRoute key, PropertyDescriptionRoute value, bool overwrite )
-    {
-      PropertyDescriptionRouteDictionary.EnsureKey( key );
-      PropertyDescriptionRouteDictionary.EnsureValue( value );
-
-      if( overwrite )
-      {
-        m_collection[ key ] = value;
-      }
-      else
-      {
-        m_collection.Add( key, value );
-      }
-    }
-
-    internal void Remove( PropertyRoute key )
-    {
-      PropertyDescriptionRouteDictionary.EnsureKey( key );
-
-      m_collection.Remove( key );
-    }
-
-    internal bool Contains( PropertyRoute key )
-    {
-      PropertyDescriptionRoute unused;
-
-      return this.TryGetValue( key, out unused );
-    }
-
-    internal bool TryGetValue( PropertyRoute key, out PropertyDescriptionRoute value )
-    {
-      PropertyDescriptionRouteDictionary.EnsureKey( key );
-
-      return m_collection.TryGetValue( key, out value );
-    }
-
-    private static void EnsureKey( PropertyRoute key )
-    {
-      if( key == null )
-        throw new ArgumentNullException( "key" );
-    }
-
-    private static void EnsureValue( PropertyDescriptionRoute value )
-    {
-      if( value == null )
-        throw new ArgumentNullException( "value" );
-    }
-
-    private readonly Dictionary<PropertyRoute, PropertyDescriptionRoute> m_collection = new Dictionary<PropertyRoute, PropertyDescriptionRoute>();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRoute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRoute.cs
deleted file mode 100644
index f225c51b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRoute.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class PropertyRoute
-  {
-    internal PropertyRoute( PropertyRouteSegment segment )
-      : this( segment, null )
-    {
-    }
-
-    private PropertyRoute( PropertyRouteSegment segment, PropertyRoute parent )
-    {
-      m_current = segment;
-      m_parent = parent;
-    }
-
-    #region Current Property
-
-    internal PropertyRouteSegment Current
-    {
-      get
-      {
-        return m_current;
-      }
-    }
-
-    private readonly PropertyRouteSegment m_current;
-
-    #endregion
-
-    #region Parent Property
-
-    internal PropertyRoute Parent
-    {
-      get
-      {
-        return m_parent;
-      }
-    }
-
-    private readonly PropertyRoute m_parent;
-
-    #endregion
-
-    public static bool operator ==( PropertyRoute x, PropertyRoute y )
-    {
-      if( object.ReferenceEquals( x, y ) )
-        return true;
-
-      if( object.ReferenceEquals( x, null ) || object.ReferenceEquals( y, null ) )
-        return false;
-
-      return ( PropertyRouteSegment.Equals( x.m_current, y.m_current ) )
-          && ( x.m_parent == y.m_parent );
-    }
-
-    public static bool operator !=( PropertyRoute x, PropertyRoute y )
-    {
-      return !( x == y );
-    }
-
-    public override int GetHashCode()
-    {
-      return m_current.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      var target = obj as PropertyRoute;
-      if( object.ReferenceEquals( target, null ) )
-        return false;
-
-      return ( target == this );
-    }
-
-    internal static PropertyRoute Combine( PropertyRouteSegment segment, PropertyRoute ancestors )
-    {
-      if( ancestors == null )
-        return new PropertyRoute( segment );
-
-      if( ancestors.Current.Type != PropertyRouteSegmentType.Other )
-        return new PropertyRoute( segment, ancestors );
-
-      var path = PropertyRouteParser.Parse( new PropertyRoute( segment, new PropertyRoute( ancestors.Current ) ) );
-      Debug.Assert( !string.IsNullOrEmpty( path ) );
-
-      return new PropertyRoute( new PropertyRouteSegment( PropertyRouteSegmentType.Other, path ), ancestors.Parent );
-    }
-
-    internal static PropertyRoute Combine( PropertyRoute descendants, PropertyRouteSegment segment )
-    {
-      return PropertyRoute.Combine( descendants, new PropertyRoute( segment ) );
-    }
-
-    internal static PropertyRoute Combine( PropertyRoute descendants, PropertyRoute ancestors )
-    {
-      if( ancestors == null )
-        return descendants;
-
-      if( descendants == null )
-        return ancestors;
-
-      return PropertyRoute.Combine(
-               descendants.Current,
-               PropertyRoute.Combine( descendants.Parent, ancestors ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteBuilder.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteBuilder.cs
deleted file mode 100644
index 6333694e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteBuilder.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class PropertyRouteBuilder
-  {
-    internal PropertyRouteBuilder()
-    {
-    }
-
-    internal PropertyRouteBuilder( PropertyRoute route )
-    {
-      if( route == null )
-        return;
-
-      for( var c = route; c != null; c = c.Parent )
-      {
-        this.PushAncestor( c.Current );
-      }
-    }
-
-    internal PropertyRouteBuilder( PropertyDescriptionRoute route )
-    {
-      if( route == null )
-        return;
-
-      for( var c = route; c != null; c = c.Parent )
-      {
-        this.PushAncestor( c.Current );
-      }
-    }
-
-    internal PropertyRouteBuilder( DataGridItemPropertyRoute route )
-    {
-      if( route == null )
-        return;
-
-      for( var c = route; c != null; c = c.Parent )
-      {
-        this.PushAncestor( c.Current );
-      }
-    }
-
-    internal bool IsEmpty
-    {
-      get
-      {
-        return ( m_segments.Count <= 0 );
-      }
-    }
-
-    internal static PropertyRoute ToPropertyRoute( PropertyRouteSegment segment )
-    {
-      return new PropertyRoute( segment );
-    }
-
-    internal static PropertyRoute ToPropertyRoute( PropertyDescriptionRoute description )
-    {
-      if( description == null )
-        return null;
-
-      return PropertyRoute.Combine( PropertyRouteBuilder.ToSegment( description.Current ), PropertyRouteBuilder.ToPropertyRoute( description.Parent ) );
-    }
-
-    internal static PropertyRoute ToPropertyRoute( DataGridItemPropertyRoute itemProperty )
-    {
-      if( itemProperty == null )
-        return null;
-
-      return PropertyRoute.Combine( PropertyRouteBuilder.ToSegment( itemProperty.Current ), PropertyRouteBuilder.ToPropertyRoute( itemProperty.Parent ) );
-    }
-
-    internal void PushAncestor( PropertyRouteSegment segment )
-    {
-      m_segments.Insert( 0, segment );
-    }
-
-    internal void PushAncestor( PropertyDescription description )
-    {
-      if( description == null )
-        throw new ArgumentNullException( "description" );
-
-      this.PushAncestor( PropertyRouteBuilder.ToSegment( description ) );
-    }
-
-    internal void PushAncestor( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        throw new ArgumentNullException( "itemProperty" );
-
-      this.PushAncestor( PropertyRouteBuilder.ToSegment( itemProperty ) );
-    }
-
-    internal void PushDescendant( PropertyRouteSegment segment )
-    {
-      m_segments.Add( segment );
-    }
-
-    internal void PushDescendant( PropertyDescription description )
-    {
-      if( description == null )
-        throw new ArgumentNullException( "description" );
-
-      this.PushDescendant( PropertyRouteBuilder.ToSegment( description ) );
-    }
-
-    internal void PushDescendant( DataGridItemPropertyBase itemProperty )
-    {
-      if( itemProperty == null )
-        throw new ArgumentNullException( "itemProperty" );
-
-      this.PushDescendant( PropertyRouteBuilder.ToSegment( itemProperty ) );
-    }
-
-    internal void PopAncestor()
-    {
-      if( m_segments.Count <= 0 )
-        throw new InvalidOperationException();
-
-      m_segments.RemoveAt( 0 );
-    }
-
-    internal void PopDescendant()
-    {
-      if( m_segments.Count <= 0 )
-        throw new InvalidOperationException();
-
-      m_segments.RemoveAt( m_segments.Count - 1 );
-    }
-
-    internal PropertyRoute ToPropertyRoute()
-    {
-      if( m_segments.Count <= 0 )
-        return null;
-
-      var route = new PropertyRoute( m_segments[ 0 ] );
-
-      for( int i = 1; i < m_segments.Count; i++ )
-      {
-        route = PropertyRoute.Combine( m_segments[ i ], route );
-      }
-
-      return route;
-    }
-
-    private static PropertyRouteSegment ToSegment( PropertyDescription description )
-    {
-      Debug.Assert( description != null );
-
-      return description.ToPropertyRouteSegment();
-    }
-
-    private static PropertyRouteSegment ToSegment( DataGridItemPropertyBase itemProperty )
-    {
-      Debug.Assert( itemProperty != null );
-
-      var route = PropertyRouteParser.Parse( itemProperty.Name );
-      if( route == null )
-        throw new ArgumentException( "Unexpected DataGridItemPropertyBase.Name property value.", "itemProperty" );
-
-      if( route.Parent == null )
-        return route.Current;
-
-      return new PropertyRouteSegment( PropertyRouteSegmentType.Other, itemProperty.Name );
-    }
-
-    private readonly List<PropertyRouteSegment> m_segments = new List<PropertyRouteSegment>();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteParser.cs
deleted file mode 100644
index 379e91b2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteParser.cs
+++ /dev/null
@@ -1,317 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Text;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal static class PropertyRouteParser
-  {
-    #region Static Fields
-
-    private static readonly string ReservedSymbols = ".[]";
-
-    #endregion
-
-    internal static PropertyRoute Parse( string path )
-    {
-      path = ( path != null ) ? path.Trim() : string.Empty;
-
-      var length = path.Length;
-      if( length <= 0 )
-        return null;
-
-      var builder = new PropertyRouteBuilder();
-      var state = ParserState.Start;
-      var index = 0;
-
-      while( index < length )
-      {
-        var c = path[ index ];
-
-        if( char.IsWhiteSpace( c ) )
-        {
-          index++;
-        }
-        else
-        {
-          switch( state )
-          {
-            case ParserState.Start:
-              {
-                switch( c )
-                {
-                  case '.':
-                    index++;
-                    break;
-
-                  default:
-                    state = ParserState.Property;
-                    break;
-                }
-              }
-              break;
-
-            case ParserState.Separator:
-              {
-                switch( c )
-                {
-                  case '.':
-                    index++;
-                    break;
-
-                  case '[':
-                    break;
-
-                  default:
-                    {
-                      PropertyRouteParser.AddOther( path, length, ref index, builder );
-                      Debug.Assert( index >= length );
-                    }
-                    break;
-                }
-
-                state = ParserState.Property;
-              }
-              break;
-
-            case ParserState.Property:
-              {
-                switch( c )
-                {
-                  case '[':
-                    {
-                      if( PropertyRouteParser.AddIndexer( path, length, ref index, builder ) )
-                      {
-                        state = ParserState.Separator;
-                      }
-                      else
-                      {
-                        PropertyRouteParser.AddOther( path, length, ref index, builder );
-                        Debug.Assert( index >= length );
-                      }
-                    }
-                    break;
-
-                  default:
-                    {
-                      if( PropertyRouteParser.AddProperty( path, length, ref index, builder ) )
-                      {
-                        state = ParserState.Separator;
-                      }
-                      else
-                      {
-                        PropertyRouteParser.AddOther( path, length, ref index, builder );
-                        Debug.Assert( index >= length );
-                      }
-                    }
-                    break;
-                }
-              }
-              break;
-
-            default:
-              throw new NotImplementedException();
-          }
-        }
-      }
-
-      if( builder.IsEmpty )
-      {
-        builder.PushDescendant( PropertyRouteSegment.Self );
-      }
-
-      return builder.ToPropertyRoute();
-    }
-
-    internal static string Parse( DataGridItemPropertyBase itemProperty )
-    {
-      return PropertyRouteParser.Parse( PropertyRouteBuilder.ToPropertyRoute( DataGridItemPropertyRoute.Create( itemProperty ) ) );
-    }
-
-    internal static string Parse( PropertyRoute route )
-    {
-      if( route == null )
-        return string.Empty;
-
-      var sb = new StringBuilder();
-      var childSegmentType = PropertyRouteSegmentType.Self;
-
-      while( route != null )
-      {
-        var segment = route.Current;
-        if( segment.Type != PropertyRouteSegmentType.Self )
-        {
-          if( !string.IsNullOrEmpty( segment.Name ) )
-          {
-            if( sb.Length != 0 )
-            {
-              switch( childSegmentType )
-              {
-                // For these type of segment, there is no need to put a separator.
-                case PropertyRouteSegmentType.Self:
-                case PropertyRouteSegmentType.Indexer:
-                  break;
-
-                default:
-                  sb.Insert( 0, "." );
-                  break;
-              }
-            }
-
-            if( segment.Type == PropertyRouteSegmentType.Indexer )
-            {
-              sb.Insert( 0, "]" );
-              sb.Insert( 0, segment.Name );
-              sb.Insert( 0, "[" );
-            }
-            else
-            {
-              sb.Insert( 0, segment.Name );
-            }
-          }
-        }
-        else
-        {
-          if( ( route.Parent == null ) && ( sb.Length == 0 ) )
-          {
-            sb.Append( segment.Name );
-          }
-        }
-
-        childSegmentType = segment.Type;
-        route = route.Parent;
-      }
-
-      return sb.ToString();
-    }
-
-    private static bool AddIndexer( string path, int length, ref int index, PropertyRouteBuilder builder )
-    {
-      if( ( index >= length ) || ( path[ index ] != '[' ) )
-        return false;
-
-      var currentIndex = index + 1;
-      var startIndex = currentIndex;
-
-      while( currentIndex < length )
-      {
-        var c = path[ currentIndex ];
-
-        if( c == ']' )
-        {
-          Debug.Assert( startIndex < length );
-          Debug.Assert( startIndex <= currentIndex );
-
-          var value = path.Substring( startIndex, currentIndex - startIndex ).Trim();
-          if( value.Length <= 0 )
-            return false;
-
-          // The value is parsed twice in order to get a standard name that could be used as a key for further use.
-          var parametersList = IndexerParametersParser.Parse( value );
-          var parameters = IndexerParametersParser.Parse( parametersList );
-          if( string.IsNullOrEmpty( parameters ) )
-            return false;
-
-          builder.PushDescendant( new PropertyRouteSegment( PropertyRouteSegmentType.Indexer, parameters ) );
-          index = currentIndex + 1;
-
-          return true;
-        }
-        else if( PropertyRouteParser.ReservedSymbols.IndexOf( c ) >= 0 )
-        {
-          return false;
-        }
-
-        currentIndex++;
-      }
-
-      return false;
-    }
-
-    private static bool AddProperty( string path, int length, ref int index, PropertyRouteBuilder builder )
-    {
-      var currentIndex = index;
-
-      while( ( currentIndex < length ) && ( path[ currentIndex ] == '.' ) )
-      {
-        currentIndex++;
-      }
-
-      var startIndex = currentIndex;
-      var parens = 0;
-
-      while( currentIndex < length )
-      {
-        var c = path[ currentIndex ];
-
-        if( PropertyRouteParser.ReservedSymbols.IndexOf( c ) >= 0 )
-          break;
-
-        if( c == '(' )
-        {
-          parens++;
-        }
-        else if( c == ')' )
-        {
-          parens--;
-
-          // A closing parenthesis was found before an opening parenthesis.
-          if( parens < 0 )
-            return false;
-        }
-
-        currentIndex++;
-      }
-
-      if( ( parens != 0 ) || ( startIndex >= length ) )
-        return false;
-
-      var name = path.Substring( startIndex, currentIndex - startIndex ).Trim();
-      if( name.Length > 0 )
-      {
-        builder.PushDescendant( new PropertyRouteSegment( PropertyRouteSegmentType.Property, name ) );
-        index = currentIndex;
-      }
-
-      return true;
-    }
-
-    private static void AddOther( string path, int length, ref int index, PropertyRouteBuilder builder )
-    {
-      if( index >= length )
-        return;
-
-      var value = path.Substring( index, length - index ).Trim();
-
-      builder.PushDescendant( new PropertyRouteSegment( PropertyRouteSegmentType.Other, value ) );
-      index = length;
-    }
-
-    #region ParserState Private Enum
-
-    private enum ParserState
-    {
-      Start,
-      Separator,
-      Property,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteSegment.Struct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteSegment.Struct.cs
deleted file mode 100644
index 1b4327e2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/PropertyRouteSegment.Struct.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal struct PropertyRouteSegment : IEquatable<PropertyRouteSegment>
-  {
-    #region Static Fields
-
-    internal static readonly PropertyRouteSegment Self = new PropertyRouteSegment( PropertyRouteSegmentType.Self, "." );
-
-    #endregion
-
-    internal PropertyRouteSegment( PropertyRouteSegmentType type, string name )
-    {
-      if( name == null )
-        throw new ArgumentNullException( "name" );
-
-      m_type = type;
-      m_name = name;
-    }
-
-    #region Type Property
-
-    internal PropertyRouteSegmentType Type
-    {
-      get
-      {
-        return m_type;
-      }
-    }
-
-    private readonly PropertyRouteSegmentType m_type;
-
-    #endregion
-
-    #region Name Property
-
-    internal string Name
-    {
-      get
-      {
-        return m_name;
-      }
-    }
-
-    private readonly string m_name;
-
-    #endregion
-
-    public static bool Equals( PropertyRouteSegment x, PropertyRouteSegment y )
-    {
-      return x.Equals( y );
-    }
-
-    public override int GetHashCode()
-    {
-      return m_name.GetHashCode() ^ m_type.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      return ( obj is PropertyRouteSegment )
-          && ( this.Equals( ( PropertyRouteSegment )obj ) );
-    }
-
-    public bool Equals( PropertyRouteSegment obj )
-    {
-      return ( obj.m_name == m_name )
-          && ( obj.m_type == m_type );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs
deleted file mode 100644
index c5cb9a49..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Specialized;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ReadOnlyColumnCollection : ReadOnlyObservableCollection<ColumnBase>
-  {
-    internal ReadOnlyColumnCollection( ObservableColumnCollection collection )
-      : base( collection )
-    {
-    }
-
-    #region [] Property
-
-    internal ColumnBase this[ string fieldName ]
-    {
-      get
-      {
-        return ( ( ObservableColumnCollection )this.Items )[ fieldName ];
-      }
-    }
-
-    #endregion
-
-    internal void RaiseItemChanged( ColumnBase column )
-    {
-      Debug.Assert( column != null );
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, column, column, this.IndexOf( column ) ) );
-    }
-
-    internal void InternalClear()
-    {
-      this.Items.Clear();
-    }
-
-    internal void InternalAdd( ColumnBase column )
-    {
-      this.Items.Add( column );
-    }
-
-    internal void InternalInsert( int index, ColumnBase column )
-    {
-      this.Items.Insert( index, column );
-    }
-
-    internal bool InternalRemove( ColumnBase column )
-    {
-      return this.Items.Remove( column );
-    }
-
-    internal void InternalRemoveAt( int index )
-    {
-      this.Items.RemoveAt( index );
-    }
-
-    internal IDisposable DeferNotifications()
-    {
-      return ( ( ObservableColumnCollection )this.Items ).DeferNotifications();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RelativePoint.Struct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RelativePoint.Struct.cs
deleted file mode 100644
index b60732a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RelativePoint.Struct.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal struct RelativePoint : IEquatable<RelativePoint>
-  {
-    internal RelativePoint( UIElement element, Point relativePoint )
-    {
-      if( element == null )
-        throw new ArgumentNullException( "element" );
-
-      m_element = element;
-      m_relativePoint = relativePoint;
-    }
-
-    public static bool operator ==( RelativePoint x, RelativePoint y )
-    {
-      return x.Equals( y );
-    }
-
-    public static bool operator !=( RelativePoint x, RelativePoint y )
-    {
-      return !( x == y );
-    }
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( !( obj is RelativePoint ) )
-        return false;
-
-      return this.Equals( ( RelativePoint )obj );
-    }
-
-    public bool Equals( RelativePoint obj )
-    {
-      return ( object.Equals( obj.m_element, m_element ) )
-          && ( object.Equals( obj.m_relativePoint, m_relativePoint ) );
-    }
-
-    internal Point GetPoint( UIElement relativeTo )
-    {
-      if( relativeTo == null )
-        throw new ArgumentNullException( "element" );
-
-      if( m_element == null )
-        throw new InvalidOperationException();
-
-      if( relativeTo == m_element )
-        return m_relativePoint;
-
-      return m_element.TranslatePoint( m_relativePoint, relativeTo );
-    }
-
-    internal RelativePoint TranslateTo( UIElement relativeTo )
-    {
-      return new RelativePoint( relativeTo, this.GetPoint( relativeTo ) );
-    }
-
-    private readonly UIElement m_element;
-    private readonly Point m_relativePoint;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs
deleted file mode 100644
index d9394dad..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs
+++ /dev/null
@@ -1,3067 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Automation.Peers;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using Xceed.Utils.Wpf;
-using Xceed.Wpf.DataGrid.Utils;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_CellsHost", Type = typeof( Panel ) )]
-  [TemplatePart( Name = "PART_RowFocusRoot", Type = typeof( FrameworkElement ) )]
-  [ContentProperty( "Cells" )]
-  public abstract class Row : Control, IDataGridItemContainer, INotifyPropertyChanged, IWeakEventListener
-  {
-    // This validation rule is meant to be used as the rule in error set in a Row's ValidationError when
-    // we want to flag a validation error even though no binding's ValidationRules or CellValidationRules are invalid.
-    // ie: Row EditEnding event throws or returns with e.Cancel set to True, IEditableObject's EndEdit throws.
-    private static readonly ValidationRule CustomRowValidationExceptionValidationRule = new ExceptionValidationRule();
-
-    static Row()
-    {
-      // We need to override the default Validation ErrorTemplate, else the default adorner will appear
-      // around the row when the main column's cell has a Validation error.
-      // We handle validation errors at the cell level by using error styles, not through Validation.ErrorTemplate.
-      Validation.ErrorTemplateProperty.OverrideMetadata( typeof( Xceed.Wpf.DataGrid.Row ),
-        new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.OverridesInheritanceBehavior ) );
-
-      Row.IsCurrentProperty = Row.IsCurrentPropertyKey.DependencyProperty;
-      Row.CellsProperty = Row.CellsPropertyKey.DependencyProperty;
-      Row.IsBeingEditedProperty = Row.IsBeingEditedPropertyKey.DependencyProperty;
-      Row.IsDirtyProperty = Row.IsDirtyPropertyKey.DependencyProperty;
-      Row.IsSelectedProperty = Row.IsSelectedPropertyKey.DependencyProperty;
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( Row ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( OnParentGridControlChanged ) ) );
-
-      DataGridControl.CellEditorDisplayConditionsProperty.OverrideMetadata( typeof( Row ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( OnCellEditorDisplayConditionsChanged ) ) );
-
-      // We do this last to ensure all the Static content of the row is done before using any static readonly field of the cell.
-      Row.SelectionBackgroundProperty = Cell.SelectionBackgroundProperty.AddOwner( typeof( Row ) );
-      Row.SelectionForegroundProperty = Cell.SelectionForegroundProperty.AddOwner( typeof( Row ) );
-      Row.InactiveSelectionBackgroundProperty = Cell.InactiveSelectionBackgroundProperty.AddOwner( typeof( Row ) );
-      Row.InactiveSelectionForegroundProperty = Cell.InactiveSelectionForegroundProperty.AddOwner( typeof( Row ) );
-      Row.ParentForegroundProperty = Cell.ParentForegroundProperty.AddOwner( typeof( Row ) );
-
-      EventManager.RegisterClassHandler( typeof( Row ), Cell.IsDirtyEvent, new RoutedEventHandler( OnCellIsDirty_ClassHandler ) );
-      Row.IsDirtyEvent = Cell.IsDirtyEvent.AddOwner( typeof( Row ) );
-    }
-
-    protected Row()
-    {
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.BeginEdit,
-                                                      new ExecutedRoutedEventHandler( OnBeginEditExecuted ),
-                                                      new CanExecuteRoutedEventHandler( OnBeginEditCanExecute ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.EndEdit,
-                                              new ExecutedRoutedEventHandler( OnEndEditExecuted ),
-                                              new CanExecuteRoutedEventHandler( OnEndEditCanExecute ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( DataGridCommands.CancelEdit,
-                                              new ExecutedRoutedEventHandler( OnCancelEditExecuted ),
-                                              new CanExecuteRoutedEventHandler( OnCancelEditCanExecute ) ) );
-
-      // Cache the CellsCollection and always return it in the getter of the DependencyProperty's CLR accessor
-      m_cellsCache = new VirtualizingCellCollection( this );
-
-      // Set the Value of the DependencyProperty
-      this.SetValue( Row.CellsPropertyKey, m_cellsCache );
-    }
-
-    #region NavigationBehavior Property
-
-    public static readonly DependencyProperty NavigationBehaviorProperty = DataGridControl.NavigationBehaviorProperty.AddOwner(
-      typeof( Row ),
-      new FrameworkPropertyMetadata( NavigationBehavior.CellOnly, FrameworkPropertyMetadataOptions.Inherits,
-        new PropertyChangedCallback( OnNavigationBehaviorChanged ) ) );
-
-    public NavigationBehavior NavigationBehavior
-    {
-      get
-      {
-        return ( NavigationBehavior )this.GetValue( Row.NavigationBehaviorProperty );
-      }
-      set
-      {
-        this.SetValue( Row.NavigationBehaviorProperty, value );
-      }
-    }
-
-    #endregion NavigationBehavior Property
-
-    #region Cells Read-Only Property
-
-    private static readonly DependencyPropertyKey CellsPropertyKey = DependencyProperty.RegisterReadOnly(
-      "Cells",
-      typeof( CellCollection ),
-      typeof( Row ),
-      new PropertyMetadata( null ) );
-
-    public static readonly DependencyProperty CellsProperty;
-
-    // Define it as Virtualizing to avoid casts
-    private readonly VirtualizingCellCollection m_cellsCache; // = null;
-
-    public CellCollection Cells
-    {
-      get
-      {
-        return m_cellsCache;
-      }
-    }
-
-    #endregion Cells Read-Only Property
-
-    #region CellEditorDisplayConditions Property
-
-    public CellEditorDisplayConditions CellEditorDisplayConditions
-    {
-      get
-      {
-        return ( CellEditorDisplayConditions )this.GetValue( DataGridControl.CellEditorDisplayConditionsProperty );
-      }
-      set
-      {
-        this.SetValue( DataGridControl.CellEditorDisplayConditionsProperty, value );
-      }
-    }
-
-    #endregion CellEditorDisplayConditions Property
-
-    #region CellErrorStyle Property
-
-    public static readonly DependencyProperty CellErrorStyleProperty =
-      DataGridControl.CellErrorStyleProperty.AddOwner( typeof( Row ) );
-
-    public Style CellErrorStyle
-    {
-      get
-      {
-        return ( Style )this.GetValue( Row.CellErrorStyleProperty );
-      }
-
-      set
-      {
-        this.SetValue( Row.CellErrorStyleProperty, value );
-      }
-    }
-
-    #endregion CellErrorStyle Property
-
-    #region CellContentOpacity Internal Property
-
-    internal static readonly DependencyProperty CellContentOpacityProperty = DependencyProperty.RegisterAttached(
-      "CellContentOpacity",
-      typeof( double ),
-      typeof( Row ),
-      new FrameworkPropertyMetadata( 1d ) );
-
-    internal static double GetCellContentOpacity( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( Row.CellContentOpacityProperty );
-    }
-    internal static void SetCellContentOpacity( DependencyObject obj, double value )
-    {
-      obj.SetValue( Row.CellContentOpacityProperty, value );
-    }
-
-    #endregion CellContentOpacity Internal Property
-
-    #region EditTriggers Property
-
-    public static readonly DependencyProperty EditTriggersProperty = DataGridControl.EditTriggersProperty.AddOwner( typeof( Row ) );
-
-    public EditTriggers EditTriggers
-    {
-      get
-      {
-        return ( EditTriggers )this.GetValue( Row.EditTriggersProperty );
-      }
-      set
-      {
-        this.SetValue( Row.EditTriggersProperty, value );
-      }
-    }
-
-    #endregion EditTriggers Property
-
-    #region HasValidationError Read-Only Property
-
-    internal static readonly DependencyPropertyKey HasValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
-      "HasValidationError",
-      typeof( bool ),
-      typeof( Row ),
-      new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasValidationErrorProperty = HasValidationErrorPropertyKey.DependencyProperty;
-
-    public bool HasValidationError
-    {
-      get
-      {
-        return ( bool )this.GetValue( Row.HasValidationErrorProperty );
-      }
-    }
-
-    internal void SetHasValidationError( bool value )
-    {
-      if( value != this.HasValidationError )
-      {
-        if( value )
-        {
-          this.SetValue( Row.HasValidationErrorPropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Row.HasValidationErrorPropertyKey, DependencyProperty.UnsetValue );
-        }
-      }
-    }
-
-    #endregion HasValidationError Read-Only Property
-
-    #region IsValidationErrorRestrictive Read-Only Property
-
-    private static readonly DependencyPropertyKey IsValidationErrorRestrictivePropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsValidationErrorRestrictive",
-      typeof( bool ),
-      typeof( Row ),
-      new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsValidationErrorRestrictiveProperty = IsValidationErrorRestrictivePropertyKey.DependencyProperty;
-
-    public bool IsValidationErrorRestrictive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Row.IsValidationErrorRestrictiveProperty );
-      }
-    }
-
-    internal void SetIsValidationErrorRestrictive( bool value )
-    {
-      if( value != this.IsValidationErrorRestrictive )
-      {
-        if( value )
-        {
-          this.SetValue( Row.IsValidationErrorRestrictivePropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Row.IsValidationErrorRestrictivePropertyKey, DependencyProperty.UnsetValue );
-        }
-      }
-    }
-
-    #endregion IsValidationErrorRestrictive Read-Only Property
-
-    #region IsBeingEdited Read-Only Property
-
-    internal static readonly DependencyPropertyKey IsBeingEditedPropertyKey = DependencyProperty.RegisterReadOnly(
-      "IsBeingEdited",
-      typeof( bool ),
-      typeof( Row ),
-      new PropertyMetadata( false, new PropertyChangedCallback( OnIsBeingEditedChanged ) ) );
-
-    public static readonly DependencyProperty IsBeingEditedProperty;
-
-    public bool IsBeingEdited
-    {
-      get
-      {
-        return this.IsBeingEditedCache;
-      }
-    }
-
-    private void SetIsBeingEdited( bool value )
-    {
-      if( value != this.IsBeingEdited )
-      {
-        this.IsBeingEditedCache = value;
-
-        if( value )
-        {
-          this.SetValue( Row.IsBeingEditedPropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Row.IsBeingEditedPropertyKey, DependencyProperty.UnsetValue );
-        }
-      }
-    }
-
-    #endregion IsBeingEdited Read-Only Property
-
-    #region IsDirty Read-Only Property
-
-    private static readonly DependencyPropertyKey IsDirtyPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsDirty", typeof( bool ), typeof( Row ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsDirtyProperty;
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-    internal static RoutedEvent IsDirtyEvent; // = null;
-
-    public bool IsDirty
-    {
-      get
-      {
-        return ( bool )this.GetValue( Row.IsDirtyProperty );
-      }
-    }
-
-    private void SetIsDirty( bool value )
-    {
-      if( value != this.IsDirty )
-      {
-        if( value )
-        {
-          this.SetValue( Row.IsDirtyPropertyKey, value );
-        }
-        else
-        {
-          this.SetValue( Row.IsDirtyPropertyKey, DependencyProperty.UnsetValue );
-        }
-
-        if( this.IsBeingEdited )
-        {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          DataGridControl gridControl = ( dataGridContext != null )
-            ? dataGridContext.DataGridControl
-            : null;
-
-          if( gridControl != null )
-          {
-            RowState rowState = gridControl.CurrentRowInEditionState;
-            Debug.Assert( rowState != null );
-
-            if( rowState != null )
-              rowState.SetIsDirty( value );
-          }
-        }
-      }
-    }
-
-    #endregion IsDirty Read-Only Property
-
-    #region RowDisplayEditorMatchingConditions Property
-
-    internal static readonly DependencyProperty RowDisplayEditorMatchingConditionsProperty =
-        DependencyProperty.Register( "RowDisplayEditorMatchingConditions", typeof( CellEditorDisplayConditions ), typeof( Row ), new FrameworkPropertyMetadata( CellEditorDisplayConditions.None ) );
-
-    internal void SetDisplayEditorMatchingCondition( CellEditorDisplayConditions condition )
-    {
-      CellEditorDisplayConditions previousValue = ( CellEditorDisplayConditions )this.GetValue( Row.RowDisplayEditorMatchingConditionsProperty );
-
-      previousValue = previousValue | condition;
-
-      this.SetValue( Row.RowDisplayEditorMatchingConditionsProperty, previousValue );
-    }
-
-    internal void RemoveDisplayEditorMatchingCondition( CellEditorDisplayConditions condition )
-    {
-      CellEditorDisplayConditions previousValue = ( CellEditorDisplayConditions )this.GetValue( Row.RowDisplayEditorMatchingConditionsProperty );
-
-      previousValue = previousValue & ~condition;
-
-      this.SetValue( Row.RowDisplayEditorMatchingConditionsProperty, previousValue );
-    }
-
-    #endregion RowDisplayEditorMatchingConditions Property
-
-    #region ReadOnly Property
-
-    public static readonly DependencyProperty ReadOnlyProperty =
-        DataGridControl.ReadOnlyProperty.AddOwner( typeof( Row ) );
-
-    public bool ReadOnly
-    {
-      get
-      {
-        return ( bool )this.GetValue( Row.ReadOnlyProperty );
-      }
-      set
-      {
-        this.SetValue( Row.ReadOnlyProperty, value );
-      }
-    }
-
-    #endregion ReadOnly Property
-
-    #region IsCurrent Read-Only Property
-
-    internal static readonly DependencyPropertyKey IsCurrentPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsCurrent", typeof( bool ), typeof( Row ), new UIPropertyMetadata( false, new PropertyChangedCallback( Row.OnIsCurrentChanged ) ) );
-
-    public static readonly DependencyProperty IsCurrentProperty;
-
-    public bool IsCurrent
-    {
-      get
-      {
-        return ( bool )this.GetValue( Row.IsCurrentProperty );
-      }
-    }
-
-    internal void SetIsCurrent( bool value )
-    {
-      if( value )
-      {
-        this.SetValue( Row.IsCurrentPropertyKey, true );
-      }
-      else
-      {
-        this.SetValue( Row.IsCurrentPropertyKey, DependencyProperty.UnsetValue );
-      }
-
-      this.UpdateNavigationBehavior();
-    }
-
-    #endregion IsCurrent Read-Only Property
-
-    #region IsSelected Read-only Property
-
-    private static readonly DependencyPropertyKey IsSelectedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsSelected", typeof( bool ), typeof( Row ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsSelectedProperty;
-
-    public bool IsSelected
-    {
-      get
-      {
-        return ( bool )this.GetValue( Row.IsSelectedProperty );
-      }
-    }
-
-    internal void SetIsSelected( bool value )
-    {
-      if( this.IsSelected != value )
-      {
-        if( value )
-        {
-          this.SetValue( Row.IsSelectedPropertyKey, value );
-        }
-        else
-        {
-          this.ClearValue( Row.IsSelectedPropertyKey );
-        }
-
-      }
-    }
-
-    #endregion IsSelected Property
-
-    #region CellsHostPanel Read-Only Property
-
-    internal Panel CellsHostPanel
-    {
-      get
-      {
-        return m_cellsHostPanel;
-      }
-    }
-
-    #endregion CellsHostPanel Read-Only Property
-
-    #region SelectionBackground Property
-
-    public static readonly DependencyProperty SelectionBackgroundProperty;
-
-    public Brush SelectionBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Row.SelectionBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( Row.SelectionBackgroundProperty, value );
-      }
-    }
-
-    #endregion SelectionBackground Property
-
-    #region SelectionForeground Property
-
-    public static readonly DependencyProperty SelectionForegroundProperty;
-
-    public Brush SelectionForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Row.SelectionForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( Row.SelectionForegroundProperty, value );
-      }
-    }
-
-    #endregion SelectionForeground Property
-
-    #region InactiveSelectionBackground Property
-
-    public static readonly DependencyProperty InactiveSelectionBackgroundProperty;
-
-    public Brush InactiveSelectionBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Row.InactiveSelectionBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( Row.InactiveSelectionBackgroundProperty, value );
-      }
-    }
-
-    #endregion InactiveSelectionBackground Property
-
-    #region InactiveSelectionForeground Property
-
-    public static readonly DependencyProperty InactiveSelectionForegroundProperty;
-
-    public Brush InactiveSelectionForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Row.InactiveSelectionForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( Row.InactiveSelectionForegroundProperty, value );
-      }
-    }
-
-    #endregion InactiveSelectionForeground Property
-
-    #region ParentForeground Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty ParentForegroundProperty;
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public Brush ParentForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( Row.ParentForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( Row.ParentForegroundProperty, value );
-      }
-    }
-
-    private void UpdateParentForeground()
-    {
-      // Use the visual parent when there is no logical parent.
-      var parent = LogicalTreeHelper.GetParent( this ) ?? VisualTreeHelper.GetParent( this );
-
-      if( parent != null )
-      {
-        var binding = new Binding();
-        binding.Path = new PropertyPath( TextElement.ForegroundProperty );
-        binding.Source = parent;
-
-        this.SetBinding( Row.ParentForegroundProperty, binding );
-      }
-      else
-      {
-        this.ClearValue( Row.ParentForegroundProperty );
-      }
-    }
-
-    #endregion ParentForeground Property
-
-    #region RowFocusRoot Property
-
-    private FrameworkElement m_rowFocusRoot;
-
-    internal FrameworkElement RowFocusRoot
-    {
-      get
-      {
-        return m_rowFocusRoot;
-      }
-    }
-
-    #endregion
-
-    #region IsTemplateCell Attached Property
-
-    internal static readonly DependencyProperty IsTemplateCellProperty =
-        DependencyProperty.RegisterAttached( "IsTemplateCell", typeof( bool ), typeof( Row ), new UIPropertyMetadata( false ) );
-
-    internal static bool GetIsTemplateCell( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( Row.IsTemplateCellProperty );
-    }
-
-    private static void SetIsTemplateCell( DependencyObject obj, bool value )
-    {
-      obj.SetValue( Row.IsTemplateCellProperty, value );
-    }
-
-    #endregion IsTemplateCell Attached Property
-
-    #region ValidationError Read-Only Property
-
-    public static readonly RoutedEvent ValidationErrorChangingEvent =
-           EventManager.RegisterRoutedEvent( "ValidationErrorChanging", RoutingStrategy.Bubble, typeof( RowValidationErrorRoutedEventHandler ), typeof( Row ) );
-
-    public event RowValidationErrorRoutedEventHandler ValidationErrorChanging
-    {
-      add
-      {
-        base.AddHandler( Row.ValidationErrorChangingEvent, value );
-      }
-      remove
-      {
-
-        base.RemoveHandler( Row.ValidationErrorChangingEvent, value );
-      }
-    }
-
-    protected virtual void OnValidationErrorChanging( RowValidationErrorRoutedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    private static readonly DependencyPropertyKey ValidationErrorPropertyKey = DependencyProperty.RegisterReadOnly(
-      "ValidationError",
-      typeof( RowValidationError ),
-      typeof( Row ),
-      new PropertyMetadata( null, new PropertyChangedCallback( Row.OnValidationErrorChanged ), new CoerceValueCallback( Row.OnCoerceValidationError ) ) );
-
-    public static readonly DependencyProperty ValidationErrorProperty = Row.ValidationErrorPropertyKey.DependencyProperty;
-
-    public RowValidationError ValidationError
-    {
-      get
-      {
-        return ( RowValidationError )this.GetValue( Row.ValidationErrorProperty );
-      }
-    }
-
-    internal void SetValidationError( RowValidationError value )
-    {
-      this.SetValue( Row.ValidationErrorPropertyKey, value );
-    }
-
-    private static object OnCoerceValidationError( DependencyObject sender, object value )
-    {
-      if( value == null )
-        return value;
-
-      Row row = ( Row )sender;
-
-      RowValidationErrorRoutedEventArgs rowValidationErrorRoutedEventArgs =
-        new RowValidationErrorRoutedEventArgs( Row.ValidationErrorChangingEvent, row, ( RowValidationError )value );
-
-      row.OnValidationErrorChanging( rowValidationErrorRoutedEventArgs );
-
-      return rowValidationErrorRoutedEventArgs.RowValidationError;
-    }
-
-    private static void OnValidationErrorChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      Row row = ( Row )sender;
-
-      if( row.IsBeingEdited )
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( row );
-
-        if( dataGridContext != null )
-        {
-          DataGridControl dataGridControl = dataGridContext.DataGridControl;
-
-          if( dataGridControl != null )
-          {
-            RowState rowState = dataGridControl.CurrentRowInEditionState;
-            Debug.Assert( rowState != null );
-
-            if( rowState != null )
-            {
-              rowState.SetItemValidationError( e.NewValue as RowValidationError );
-            }
-          }
-        }
-      }
-
-      if( e.OldValue == null )
-      {
-        row.m_cachedLocalToolTip = row.ReadLocalValue( Row.ToolTipProperty );
-        row.ToolTip = ( ( RowValidationError )e.NewValue ).ErrorContent;
-      }
-      else if( e.NewValue == null )
-      {
-        if( row.m_cachedLocalToolTip == DependencyProperty.UnsetValue )
-        {
-          row.ClearValue( Row.ToolTipProperty );
-        }
-        else
-        {
-          row.ToolTip = row.m_cachedLocalToolTip;
-        }
-      }
-      else
-      {
-        row.ToolTip = ( ( RowValidationError )e.NewValue ).ErrorContent;
-      }
-
-
-      row.UpdateHasErrorFlags( null );
-    }
-
-    private object m_cachedLocalToolTip;
-
-    #endregion ValidationError Read-Only Property
-
-    #region CanBeRecycled Protected Property
-
-    protected virtual bool CanBeRecycled
-    {
-      get
-      {
-        if( this.IsKeyboardFocused
-          || this.IsKeyboardFocusWithin
-          || this.IsBeingEdited )
-          return false;
-
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region UnboundDataItemContext Property
-
-    internal UnboundDataItem UnboundDataItemContext
-    {
-      get
-      {
-        return m_unboundDataItem;
-      }
-    }
-
-    internal void ClearUnboundDataItemContext()
-    {
-      m_unboundDataItem = null;
-    }
-
-    internal void UpdateUnboundDataItemContext()
-    {
-      var dataItem = this.DataContext;
-      if( dataItem == null )
-      {
-        this.ClearUnboundDataItemContext();
-      }
-      else
-      {
-        if( m_unboundDataItem != null )
-        {
-          if( object.Equals( m_unboundDataItem.DataItem, dataItem ) )
-            return;
-        }
-
-        m_unboundDataItem = UnboundDataItem.GetUnboundDataItem( dataItem );
-      }
-    }
-
-    private UnboundDataItem m_unboundDataItem;
-
-    #endregion
-
-    #region VirtualizedCells Property
-
-    internal IEnumerable<Cell> VirtualizedCells
-    {
-      get
-      {
-        Debug.Assert( m_cellsCache != null );
-        return m_cellsCache.VirtualizedCells;
-      }
-    }
-
-    #endregion
-
-    #region CreatedCells Property
-
-    internal IEnumerable<Cell> CreatedCells
-    {
-      get
-      {
-        Debug.Assert( m_cellsCache != null );
-        return m_cellsCache.BindedCells;
-      }
-    }
-
-    #endregion
-
-    #region CreatedCellsCount Property
-
-    internal int CreatedCellsCount
-    {
-      get
-      {
-        Debug.Assert( m_cellsCache != null );
-        return m_cellsCache.BindedCells.Count;
-      }
-    }
-
-    #endregion
-
-    #region IsClearingContainer Property
-
-    internal bool IsClearingContainer
-    {
-      get
-      {
-        return m_flags[ ( int )RowFlags.IsClearingContainer ];
-      }
-      set
-      {
-        m_flags[ ( int )RowFlags.IsClearingContainer ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsContainerPrepared Property
-
-    internal bool IsContainerPrepared
-    {
-      get
-      {
-        return m_flags[ ( int )RowFlags.IsContainerPrepared ];
-      }
-      set
-      {
-        if( value == this.IsContainerPrepared )
-          return;
-
-        m_flags[ ( int )RowFlags.IsContainerPrepared ] = value;
-
-        this.OnPropertyChanged( Row.IsContainerPreparedPropertyName );
-      }
-    }
-
-    internal static readonly string IsContainerPreparedPropertyName = PropertyHelper.GetPropertyName( ( Row r ) => r.IsContainerPrepared );
-
-    #endregion
-
-    #region EmptyDataItem Property
-
-    internal EmptyDataItem EmptyDataItem
-    {
-      get
-      {
-        if( m_emptyDataItem == null )
-        {
-          m_emptyDataItem = new EmptyDataItem();
-        }
-
-        return m_emptyDataItem;
-      }
-    }
-
-    private EmptyDataItem m_emptyDataItem; // = null;
-
-    #endregion
-
-    #region LevelCache Property
-
-    internal static readonly DependencyProperty LevelCacheProperty = DependencyProperty.Register(
-      "LevelCache",
-      typeof( int ),
-      typeof( Row ),
-      new FrameworkPropertyMetadata( -1 ) );
-
-    internal int LevelCache
-    {
-      get
-      {
-        return ( int )this.GetValue( Row.LevelCacheProperty );
-      }
-      set
-      {
-        this.SetValue( Row.LevelCacheProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsUnfocusable Property
-
-    internal virtual bool IsUnfocusable
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    #endregion
-
-    public static Row FindFromChild( DependencyObject child )
-    {
-      return Row.FindFromChild( ( DataGridContext )null, child );
-    }
-
-    public static Row FindFromChild( DataGridContext dataGridContext, DependencyObject child )
-    {
-      // In this situation, the dataGridContext is the DataGridContext of the Row to find.
-      // Useful when a grid is used as a Cell editor and want the Row for a specific DataGridContext.
-      if( child == null )
-        return null;
-
-      Row row = null;
-
-      while( ( row == null ) && ( child != null ) )
-      {
-        child = TreeHelper.GetParent( child );
-        row = child as Row;
-
-        if( row == null )
-        {
-          RowSelector rowSelector = child as RowSelector;
-
-          if( rowSelector != null )
-          {
-            row = rowSelector.DataContext as Row;
-          }
-        }
-
-        if( ( row != null )
-          && ( dataGridContext != null )
-          && ( dataGridContext != DataGridControl.GetDataGridContext( row ) ) )
-        {
-          row = null;
-        }
-      }
-
-      return row;
-    }
-
-    public static Row FindFromChild( DataGridControl dataGridControl, DependencyObject child )
-    {
-      // In this situation, the dataGridControl is the DataGridControl of the Cell to find.
-      // Useful when a grid is used as a Cell editor and want the Row for a specific DataGridControl.
-      if( child == null )
-        return null;
-
-      Row row = null;
-
-      while( ( row == null ) && ( child != null ) )
-      {
-        child = TreeHelper.GetParent( child );
-        row = child as Row;
-
-        if( ( row != null ) && ( dataGridControl != null ) )
-        {
-          DataGridContext tempDataGridContext = DataGridControl.GetDataGridContext( row );
-
-          if( ( tempDataGridContext == null ) || ( tempDataGridContext.DataGridControl != dataGridControl ) )
-          {
-            row = null;
-          }
-        }
-      }
-
-      return row;
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        throw new DataGridInternalException( "DataGridContext is null for Row." );
-
-      var dataGridControl = dataGridContext.DataGridControl;
-      if( dataGridControl == null )
-        throw new DataGridInternalException( "DataGridControl is null for Row." );
-
-      m_rowFocusRoot = this.GetTemplateChild( "PART_RowFocusRoot" ) as FrameworkElement;
-
-      if( m_cellsHostPanel != null )
-      {
-        var oldVirtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
-        if( oldVirtualizingCellsHost != null )
-        {
-          oldVirtualizingCellsHost.ClearCellsHost();
-        }
-
-        m_cellsHostPanel.Children.Clear();
-      }
-
-      m_cellsHostPanel = this.GetTemplateChild( "PART_CellsHost" ) as Panel;
-
-      // The PART_CellsHost children are handled internally, it is not allowed to add child elements directly through the template, so clear it.
-      if( m_cellsHostPanel != null )
-      {
-        m_cellsHostPanel.Children.Clear();
-      }
-
-      if( m_rowFocusRoot == null )
-      {
-        m_rowFocusRoot = m_cellsHostPanel;
-      }
-
-      //Get templated cells, if any (cells added to the visual tree of the row, but not through .Cells).
-      m_templateCells.Clear();
-      this.GetTemplateCells( this, m_templateCells );
-
-      //This will, among other things, process cells added to Row.Cells, in xaml for instance.
-      //This must be done AFTER getting template cells, for cells added to Row.Cells will be part of the VisualTree after this call, thus would became template cells.
-      var fixedCellPanel = m_cellsHostPanel as FixedCellPanel;
-      if( fixedCellPanel != null )
-      {
-        fixedCellPanel.PrepareVirtualizationMode( dataGridContext );
-      }
-      else
-      {
-        m_cellsCache.MergeFreeCells();
-      }
-
-      var virtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
-      var hasVirtualizingCellsHost = virtualizingCellsHost != null;
-
-      // Ensure that old template cells are cleared, and remove cells not mapped to any columns.
-      this.SynchronizeActualAndTemplateCells( dataGridContext, dataGridContext.Columns, ( hasVirtualizingCellsHost && ( m_templateCells.Count > 0 ) ) );
-
-      if( hasVirtualizingCellsHost )
-      {
-        this.PrepareVirtualizingCellsHost( dataGridContext, virtualizingCellsHost );
-      }
-      else
-      {
-        dataGridControl.ForceGeneratorReset = true;
-        this.PrepareNonVirtualizingCellsHost();
-      }
-
-
-      this.UpdateNavigationBehavior();
-      this.UpdateCellsFocusableStatus();
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      base.OnMouseMove( e );
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      if( e.LeftButton == MouseButtonState.Pressed )
-      {
-        dataGridContext.DataGridControl.DoDrag( e );
-      }
-      else
-      {
-        dataGridContext.DataGridControl.ResetDragDataObject();
-      }
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      base.OnMouseLeftButtonDown( e );
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      dataGridContext.DataGridControl.ResetDragDataObject();
-
-      if( e.Handled )
-        return;
-
-      if( this.NavigationBehavior != NavigationBehavior.None )
-      {
-        // We accept NavigationBehavior.CellOnly because it will be handled by the OnPreviewGotKeyboardFocus
-        // of DataGridControl to redirect it to the current column if possible.
-        DependencyObject sourceElement = e.OriginalSource as DependencyObject;
-
-        // Is not FixedColumnSplitter
-        if( !Row.IsPartOfFixedColumnSplitter( sourceElement ) )
-        {
-          bool focused = false;
-
-          if( m_rowFocusRoot != null )
-          {
-            focused = m_rowFocusRoot.Focus();
-          }
-          else
-          {
-            focused = this.Focus();
-          }
-
-          e.Handled = true;
-
-          if( focused )
-          {
-            // Keep a reference to the mouse position so we can calculate when a drag operation is actually started.
-            dataGridContext.DataGridControl.InitializeDragPostion( e );
-          }
-        }
-      }
-    }
-
-    protected override void OnIsKeyboardFocusWithinChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnIsKeyboardFocusWithinChanged( e );
-
-      //Update the NavigationBehavior related parameter
-      this.UpdateNavigationBehavior();
-      this.UpdateCellsFocusableStatus();
-    }
-
-    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      //this element or a child element of the row is receiving the keyboard focus
-      //update the cell navigation parameters
-      this.UpdateNavigationBehavior();
-      this.UpdateCellsFocusableStatus();
-
-      base.OnGotKeyboardFocus( e );
-    }
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      object currentThemeKey = view.GetDefaultStyleKey( typeof( Row ) );
-
-      if( currentThemeKey.Equals( this.DefaultStyleKey ) == false )
-      {
-        this.DefaultStyleKey = currentThemeKey;
-      }
-    }
-
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-      this.OnPropertyChanged( e.Property.Name );
-    }
-
-    protected override void OnVisualParentChanged( DependencyObject oldParent )
-    {
-      base.OnVisualParentChanged( oldParent );
-
-      this.UpdateParentForeground();
-    }
-
-    protected virtual void SetDataContext( object item )
-    {
-      this.DataContext = item;
-    }
-
-    protected virtual void ClearDataContext()
-    {
-      this.DataContext = null;
-    }
-
-    protected virtual void PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      DataGridControl gridControl = dataGridContext.DataGridControl;
-
-      this.SetDataContext( item );
-
-      if( dataGridContext.InternalCurrentItem == item )
-      {
-        this.SetIsCurrent( true );
-        // The cell.SetIsCurrent is set later since at that stage we have no cell.
-
-        if( !gridControl.IsSetFocusInhibited )
-        {
-          gridControl.QueueSetFocusHelper( false );
-        }
-      }
-
-      //this Forces the generation of the template and linked to that, of the cells.
-      this.ApplyTemplate();
-
-      // We ensure to create the CurrentCell by fetching it from the CellsCollection
-      // If there is a current column on the DataGridContext, try to restore the currency of the cell
-      var currentColumn = dataGridContext.CurrentColumn;
-      if( ( this.IsCurrent ) && ( currentColumn != null ) )
-      {
-        //This will also trigger the creation of the Cell if it is virtualized.
-        Cell currentCell = m_cellsCache[ currentColumn ];
-      }
-
-      IVirtualizingCellsHost virtualizingCellsHost = this.CellsHostPanel as IVirtualizingCellsHost;
-
-      if( virtualizingCellsHost != null )
-      {
-        this.PrepareVirtualizingCellsHost( dataGridContext, virtualizingCellsHost );
-
-        // Template cells are not part of the VirtualzingCellsHost (thus not part of CreatedCells), so we must ensure they are prepared
-        if( m_templateCells != null )
-        {
-          foreach( Cell cell in m_templateCells.Values )
-          {
-            cell.PrepareContainer( dataGridContext, item );
-          }
-        }
-      }
-      else
-      {
-        // When not having a VirtualizingCellHost, both template and "default" cells are contained within the VirtualizingCellCollection, so they will all be in CreatedCells.
-        foreach( Cell cell in this.CreatedCells )
-        {
-          cell.PrepareContainer( dataGridContext, item );
-        }
-      }
-
-      // We must set isContainerPrepared because a verification is made in BeginEdit to ensure the container is prepared before entering in edition.
-      // The following RestoreEditionState will possibly trigger BeginEdit.
-      this.IsContainerPrepared = true;
-
-      // Use the CurrentContext.InternalCurrentItem when restoring current item
-      object currentItemInEdition = gridControl.CurrentItemInEdition;
-
-      // Restore the edition state on the container
-      // Voluntarilly using the .Equals() method instead of == operator to allow Struct comparison (in case of GroupHeaderFooterItem struct)
-      if( ( currentItemInEdition != null ) && ( currentItemInEdition.Equals( item ) ) )
-      {
-        //PL: Should only occur when hitting a CollectionView reset while editing.
-        this.RestoreEditionState( gridControl.CurrentRowInEditionState, currentColumn );
-      }
-
-      this.UpdateMatchingDisplayConditions();
-      this.UpdateNavigationBehavior();
-    }
-
-    protected abstract Cell CreateCell( ColumnBase column );
-
-    protected abstract bool IsValidCellType( Cell cell );
-
-    protected virtual void ClearContainer()
-    {
-      this.IsClearingContainer = true;
-
-      try
-      {
-        // If there were some validation errors, we want to clear every Cells to be sure they will
-        // never reflect the error state on another data item if they are not explicitly prepared
-        this.ClearCellsHost();
-
-        // Clear every Cells before clearing the Row's values to allow the Cell to check some properties on their
-        // parent row when processing a Cell.ClearContainer, which ensures every prepared Cells are cleared correctly
-        foreach( Cell cell in this.CreatedCells )
-        {
-          cell.ClearContainer();
-        }
-
-        // Clear all the DP's that are either public or somehow inherited.
-        this.ClearValue( Row.NavigationBehaviorProperty );
-        this.ClearValue( DataGridControl.CellEditorDisplayConditionsProperty );
-
-        // We need to clear both the ValidationError and the HasValidationError property.
-        // The clearing of ValidationError will take care of the tooltip/cached local tooltip
-        // The clearing of HasValidationError will take care of updating the DataGridControl HasValidationError property.
-        this.ClearValue( Row.ValidationErrorPropertyKey );
-        this.ClearValue( Row.HasValidationErrorPropertyKey );
-
-        this.ClearValue( Row.IsBeingEditedPropertyKey );
-        this.ClearValue( Row.IsDirtyPropertyKey );
-        this.ClearValue( Row.RowDisplayEditorMatchingConditionsProperty );
-        this.ClearValue( Row.IsCurrentPropertyKey );
-        this.ClearValue( Row.IsSelectedPropertyKey );
-
-        this.ClearValue( DataGridControl.ContainerGroupConfigurationProperty );
-
-        this.ClearDataContext();
-      }
-      finally
-      {
-        this.IsClearingContainer = false;
-        this.IsContainerPrepared = false;
-      }
-    }
-
-    protected virtual void PartialClearContainer()
-    {
-      this.IsClearingContainer = true;
-
-      try
-      {
-        this.ClearCellsHost();
-
-        // Clear every Cells before clearing the Row's values to allow the Cell to check some properties on their
-        // parent row when processing a Cell.ClearContainer, which ensures every prepared Cells are cleared correctly
-        foreach( Cell cell in this.CreatedCells )
-        {
-          cell.PartialClearContainer();
-        }
-
-        // We need to clear both the ValidationError and the HasValidationError property.
-        // The clearing of ValidationError will take care of the tooltip/cached local tooltip
-        // The clearing of HasValidationError will take care of updating the DataGridControl HasValidationError property.
-        this.ClearValue( Row.ValidationErrorPropertyKey );
-        this.ClearValue( Row.HasValidationErrorPropertyKey );
-
-        this.ClearValue( Row.IsBeingEditedPropertyKey );
-        this.ClearValue( Row.IsDirtyPropertyKey );
-        this.ClearValue( Row.IsCurrentPropertyKey );
-
-        //No need to clear the IsSelected property, it will be properly set by the CustomItemContainerGenerator when recycling the row.
-
-        this.ClearValue( DataGridControl.ContainerGroupConfigurationProperty );
-      }
-      finally
-      {
-        this.IsClearingContainer = false;
-      }
-    }
-
-    protected virtual void SynchronizeActualAndTemplateCells( DataGridContext dataGridContext, ColumnCollection columns, bool initializeTemplateCells )
-    {
-      var oldTemplateCellsToRemove = new List<Cell>();
-      var unmappedCellsToRemove = new Hashtable();
-
-      //cycle through all the currently created cells, and place them in the right collection for further processing
-      foreach( var cell in this.CreatedCells )
-      {
-        // When switching row templates, it is possible for a cell that was a template cell to be replaced by a regular cell,
-        // but still have a counterpart in the template cells.  As a result, both conditions need to be checked.
-        if( Row.GetIsTemplateCell( cell ) || m_templateCells.ContainsKey( cell.FieldName ) )
-        {
-          oldTemplateCellsToRemove.Add( cell );
-          continue;
-        }
-
-        unmappedCellsToRemove.Add( cell.FieldName, cell );
-      }
-
-      //First remove old templated cells, so they eventually get replaced by the newly discovered ones.
-      foreach( var oldTemplateCell in oldTemplateCellsToRemove )
-      {
-        oldTemplateCell.ClearContainer();
-        m_cellsCache.InternalRemove( oldTemplateCell );
-      }
-
-      if( initializeTemplateCells || ( unmappedCellsToRemove.Count > 0 ) )
-      {
-        Xceed.Wpf.DataGrid.Views.ViewBase view = dataGridContext.DataGridControl.GetView();
-        foreach( ColumnBase column in columns )
-        {
-          var fieldName = column.FieldName;
-
-          //This column is still in use, keep the corresponding cell.
-          unmappedCellsToRemove.Remove( fieldName );
-
-          // Case 161385 : the following is because template cells are not part of Row.Cells when dealing with an IVirtualizingCellPanel.
-          // If dealing with an IVirtualizingCellPanel, need to do further processing if there is a template cell associated to this column.
-          if( initializeTemplateCells )
-          {
-            Cell cell = null;
-            m_templateCells.TryGetValue( fieldName, out cell );
-
-            if( cell != null )
-            {
-              cell.Initialize( dataGridContext, this, column );
-              cell.PrepareDefaultStyleKey( view );
-            }
-          }
-        }
-      }
-
-      // Lastly, clear cells that are not mapped to any column.
-      foreach( Cell unmappedcell in unmappedCellsToRemove.Values )
-      {
-        unmappedcell.ClearContainer();
-        m_cellsCache.InternalRemove( unmappedcell );
-      }
-    }
-
-    internal static Row FromContainer( DependencyObject container )
-    {
-      if( container == null )
-        return null;
-
-      var row = container as Row;
-      if( row != null )
-        return row;
-
-      var itemContainer = container as IDataGridItemContainer;
-      if( itemContainer != null )
-        return ( Row )itemContainer.GetTemplatedDescendantDataGridItemContainers().FirstOrDefault( item => item is Row );
-
-      return null;
-    }
-
-    internal static void SetRowValidationErrorOnException( Row row, Exception exception )
-    {
-      Debug.Assert( ( row != null ) && ( exception != null ) );
-
-      // This method will set a validation error on the row and throw back a DataGridValidationException so that the row stays in edition.
-
-      if( exception is TargetInvocationException )
-      {
-        exception = exception.InnerException;
-      }
-
-      row.SetValidationError( new RowValidationError( Row.CustomRowValidationExceptionValidationRule, row, exception.Message, exception ) );
-
-      // Throwing a DataGridValidationException will be caught by the grid and will make the cell stay in edition.
-      throw new DataGridValidationException( "An error occurred while attempting to end the edit process.", exception );
-    }
-
-    internal static bool IsCellEditorDisplayConditionsSet( Row row, CellEditorDisplayConditions condition )
-    {
-      return ( ( row.CellEditorDisplayConditions & condition ) == condition );
-    }
-
-    internal virtual object GetEditingDataContext()
-    {
-      return this.DataContext;
-    }
-
-    internal void ClearCellsHost()
-    {
-      var cellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
-      if( cellsHost == null )
-        return;
-
-      cellsHost.ClearCellsHost();
-    }
-
-    internal void UpdateCellsContentBindingTarget()
-    {
-      // We need to refresh the Cell.Content target binding in case the dataObject value was coerced to something else.
-      foreach( Cell cell in this.CreatedCells )
-      {
-        cell.UpdateContentBindingTarget();
-      }
-    }
-
-    internal void UpdateHasErrorFlags( Cell errorChangedCell )
-    {
-      System.Diagnostics.Debug.Assert( ( errorChangedCell == null ) || ( errorChangedCell.ParentRow == this ) );
-
-      RowValidationError itemValidationError = this.ValidationError;
-
-      bool rowHasValidationError = ( itemValidationError != null );
-      bool rowHasRestrictiveValidationError = ( rowHasValidationError ) ? Row.GetIsValidationErrorRestrictive( itemValidationError ) : false;
-
-      if( ( !rowHasRestrictiveValidationError ) && ( errorChangedCell != null ) )
-      {
-        // We must check the passed cell since it might not yet be part of the row's Cells collection.
-        // This can occur when initializing a cell and its Content binding already has a ValidationError.
-        if( errorChangedCell.HasValidationError )
-        {
-          rowHasValidationError = true;
-
-          if( errorChangedCell.IsValidationErrorRestrictive )
-          {
-            rowHasRestrictiveValidationError = true;
-          }
-        }
-
-        if( !rowHasRestrictiveValidationError )
-        {
-          // Create a clone of the list to avoid concurrent access when iterating and a Cell is added to CreatedCells because of ColumnVirtualization
-          List<Cell> createdCells = new List<Cell>( this.CreatedCells );
-
-          foreach( Cell cell in createdCells )
-          {
-            if( cell == errorChangedCell )
-              continue;
-
-            if( cell.HasValidationError )
-            {
-              rowHasValidationError = true;
-
-              if( cell.IsValidationErrorRestrictive )
-              {
-                rowHasRestrictiveValidationError = true;
-                break;
-              }
-            }
-          }
-        }
-      }
-
-      this.SetHasValidationError( rowHasValidationError );
-      this.SetIsValidationErrorRestrictive( rowHasRestrictiveValidationError );
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl gridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
-
-      if( gridControl != null )
-      {
-        bool gridHasValidationError = rowHasValidationError;
-
-        if( !gridHasValidationError )
-        {
-          var generator = gridControl.CustomItemContainerGenerator;
-          foreach( var item in generator.GetRealizedDataItems() )
-          {
-            var row = gridControl.GetContainerFromItem( item ) as Row;
-
-            if( ( row != null ) && ( row.HasValidationError ) )
-            {
-              gridHasValidationError = true;
-              break;
-            }
-          }
-        }
-
-        gridControl.SetHasValidationError( gridHasValidationError );
-      }
-    }
-
-    internal virtual bool IsEditTriggerSet( EditTriggers triggers )
-    {
-      return ( ( this.EditTriggers & triggers ) == triggers );
-    }
-
-    internal Cell PrepareUnbindedCell( ColumnBase column, Cell cell )
-    {
-      if( column == null )
-        return cell;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return null;
-
-      //Generate a cell if it was not provided in xaml
-      if( cell == null )
-      {
-        cell = this.CreateCell( column );
-
-        // Make sure to add the cell to the VisualTree right away, so the binding engine works correctly when initializing the cell.
-        this.AddToVisualTree( cell );
-      }
-
-      cell.PrepareDefaultStyleKey( dataGridContext.DataGridControl.GetView() );
-      cell.Initialize( dataGridContext, this, column );
-      cell.PrepareContainer( dataGridContext, this.DataContext );
-
-      //This is like doing a Measure/Arrange pass, in the sens that first time scrolling will be faster because the cell is ready to be displayed.
-      cell.ApplyTemplate();
-
-      //This is an out of view cell, it needs to be treated as such.  However, no need to add the cell's fieldName to the FixedCellPanel.PermanentScrollingFieldNames,
-      //for FixedCellPanel.UpdateChildren() will take care of it in the next layout pass.
-      cell.Visibility = Visibility.Collapsed;
-      cell.RemoveContentBinding();
-
-      return cell;
-    }
-
-    internal Cell ProvideCell( ColumnBase column )
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      Cell cell = null;
-
-      // First verify if there is a corresponding Cell that has been explicitly positioned in the row template.
-      var fieldName = column.FieldName;
-      if( fieldName != null )
-      {
-        m_templateCells.TryGetValue( fieldName, out cell );
-      }
-
-      // If no template cell provided, create one and set it up.
-      if( cell == null )
-      {
-        cell = this.CreateCell( column );
-
-        // Make sure to add the cell to the VisualTree right away, so the binding engine works correctly when initializing the cell.
-        this.AddToVisualTree( cell );
-      }
-
-      cell.PrepareDefaultStyleKey( dataGridContext.DataGridControl.GetView() );
-
-      //The rest of the preparation of the cell must be done by the caller.
-      return cell;
-    }
-
-    internal void AddToVisualTree( Cell cell )
-    {
-      var virtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
-      if( ( virtualizingCellsHost != null ) && ( virtualizingCellsHost.CanModifyLogicalParent ) )
-      {
-        virtualizingCellsHost.SetLogicalParent( cell );
-      }
-      else if( ( virtualizingCellsHost == null ) && ( m_cellsHostPanel != null ) )
-      {
-        m_cellsHostPanel.Children.Add( cell );
-      }
-    }
-
-    internal void RemoveFromVisualTree( Cell cell )
-    {
-      IVirtualizingCellsHost virtualizingCellsHost = m_cellsHostPanel as IVirtualizingCellsHost;
-
-      if( ( virtualizingCellsHost != null ) && ( virtualizingCellsHost.CanModifyLogicalParent ) )
-      {
-        virtualizingCellsHost.ClearLogicalParent( cell );
-      }
-      else if( ( virtualizingCellsHost == null ) && ( m_cellsHostPanel != null ) )
-      {
-        m_cellsHostPanel.Children.Remove( cell );
-      }
-    }
-
-    internal void RefreshCellsDisplayedTemplate()
-    {
-      // We never want to update the cell's template while clearing container
-      if( this.IsClearingContainer )
-        return;
-
-      // In case a value was explicitly specified on the Cell's ParentColumn
-      foreach( Cell cell in this.CreatedCells )
-      {
-        cell.RefreshDisplayedTemplate();
-      }
-    }
-
-    internal virtual HashedLinkedList<ColumnBase> GetColumnsByVisiblePosition( DataGridContext dataGridContext )
-    {
-      return dataGridContext.ColumnsByVisiblePosition;
-    }
-
-    private static bool GetIsValidationErrorRestrictive( RowValidationError validationError )
-    {
-      if( validationError == null )
-        return false;
-
-      return !( validationError.RuleInError is DataErrorValidationRule );
-    }
-
-    private static bool IsPartOfFixedColumnSplitter( DependencyObject element )
-    {
-      DependencyObject parent = TreeHelper.GetParent( element );
-
-      while( parent != null )
-      {
-        // It is not necessary to go further than the Row.
-        if( parent is Row )
-          break;
-
-        parent = TreeHelper.GetParent( parent );
-      }
-
-      return false;
-    }
-
-    private static IDisposable DeferCollectionViewRefresh( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        return null;
-
-      return dataGridContext.Items.DeferRefresh();
-    }
-
-    private void PrepareVirtualizingCellsHost( DataGridContext dataGridContext, IVirtualizingCellsHost virtualizingCellsHost )
-    {
-      if( dataGridContext == null )
-        return;
-
-      // Ensure to register to the TableViewColumnVirtualizationManager
-      virtualizingCellsHost.PrepareCellsHost( dataGridContext );
-
-      // We force an InvalidateMeasure on the CellsHost to be sure the visible Cells are the good ones
-      virtualizingCellsHost.InvalidateCellsHostMeasure();
-    }
-
-    private void UpdateMatchingDisplayConditions()
-    {
-      CellEditorDisplayConditions newEffectiveValue = CellEditorDisplayConditions.None;
-
-      if( ( Row.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.RowIsBeingEdited ) ) &&
-        ( this.IsBeingEdited ) )
-      {
-        newEffectiveValue |= CellEditorDisplayConditions.RowIsBeingEdited;
-      }
-
-      if( ( Row.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.MouseOverRow ) ) &&
-        ( this.IsMouseOver ) )
-      {
-        newEffectiveValue |= CellEditorDisplayConditions.MouseOverRow;
-      }
-
-      if( ( Row.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.RowIsCurrent ) ) &&
-        ( this.IsCurrent ) )
-      {
-        newEffectiveValue |= CellEditorDisplayConditions.RowIsCurrent;
-      }
-
-      if( Row.IsCellEditorDisplayConditionsSet( this, CellEditorDisplayConditions.Always ) )
-      {
-        newEffectiveValue |= CellEditorDisplayConditions.Always;
-      }
-
-      this.SetValue( Row.RowDisplayEditorMatchingConditionsProperty, newEffectiveValue );
-    }
-
-    private Cell GetCellForCurrentColumn()
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return null;
-
-      return m_cellsCache[ dataGridContext.CurrentColumn ];
-    }
-
-    private void UpdateNavigationBehavior()
-    {
-      DataGridContext context = DataGridControl.GetDataGridContext( this );
-
-      // We check if the container has an Item binded to it and if
-      // it's not the case, we don't need to update the navigation 
-      // mode since it has already been changed to None by the 
-      // PrepareIsTabStop of the TableViewItemsHost class.
-      if( ( context == null )
-        || ( context.GetItemFromContainer( this ) == null ) )
-      {
-        return;
-      }
-
-      bool rowFocusable = false;
-      KeyboardNavigationMode tabNavigation = KeyboardNavigationMode.None;
-      KeyboardNavigationMode keyboardNavigation = KeyboardNavigationMode.None;
-
-      FrameworkElement focusItem = this.RowFocusRoot;
-
-      bool isKeyboardFocused = ( focusItem != null ) ? focusItem.IsKeyboardFocused : this.IsKeyboardFocused;
-
-      //do not want to update the navigation behavior of the row if i'm currently editing
-      if( !this.IsBeingEdited )
-      {
-        if( !this.IsCurrent )
-        {
-          rowFocusable = ( this.NavigationBehavior != NavigationBehavior.None );
-          tabNavigation = KeyboardNavigationMode.None;
-          keyboardNavigation = KeyboardNavigationMode.None;
-        }
-        else
-        {
-          switch( this.NavigationBehavior )
-          {
-            case NavigationBehavior.None:
-              rowFocusable = false;
-              tabNavigation = KeyboardNavigationMode.None;
-              keyboardNavigation = KeyboardNavigationMode.None;
-              break;
-
-            case NavigationBehavior.RowOnly:
-              rowFocusable = true;
-              tabNavigation = KeyboardNavigationMode.None;
-              keyboardNavigation = KeyboardNavigationMode.None;
-              break;
-
-            case NavigationBehavior.RowOrCell:
-              //There is an identified weakness with the IsKeyboardFocusWithin property where it cannot tell if the focus is within a Popup which is within the element
-              //This has been identified, and only the places where it caused problems were fixed... This comment is only here to remind developpers of the flaw
-              if( ( this.IsKeyboardFocusWithin ) && ( !isKeyboardFocused ) )
-              {
-                rowFocusable = false;
-                tabNavigation = KeyboardNavigationMode.None; //for case 99719: modified this to disable the Tab navigation between cells.
-                keyboardNavigation = KeyboardNavigationMode.Continue;
-              }
-              else
-              {
-                rowFocusable = true;
-                tabNavigation = KeyboardNavigationMode.None;
-                keyboardNavigation = KeyboardNavigationMode.None;
-              }
-              break;
-
-            case NavigationBehavior.CellOnly:
-              rowFocusable = false;
-              tabNavigation = KeyboardNavigationMode.None; 
-              keyboardNavigation = KeyboardNavigationMode.Continue;
-              break;
-          }
-        }
-      }
-      else
-      {
-        rowFocusable = true;
-        tabNavigation = KeyboardNavigationMode.Cycle;
-        keyboardNavigation = KeyboardNavigationMode.Continue;
-      }
-
-      if( focusItem != null )
-      {
-        this.Focusable = false;
-        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.None ); 
-        KeyboardNavigation.SetDirectionalNavigation( this, KeyboardNavigationMode.Continue );
-
-        if( focusItem.FocusVisualStyle != this.FocusVisualStyle )
-        {
-          if( focusItem.ReadLocalValue( FrameworkElement.FocusVisualStyleProperty ) == DependencyProperty.UnsetValue )
-          {
-            focusItem.FocusVisualStyle = this.FocusVisualStyle;
-          }
-        }
-
-        focusItem.Focusable = rowFocusable;
-        KeyboardNavigation.SetTabNavigation( focusItem, tabNavigation );
-        KeyboardNavigation.SetDirectionalNavigation( focusItem, keyboardNavigation );
-      }
-      else
-      {
-        this.Focusable = rowFocusable;
-        KeyboardNavigation.SetTabNavigation( this, tabNavigation );
-        KeyboardNavigation.SetDirectionalNavigation( this, keyboardNavigation );
-      }
-    }
-
-    private void UpdateCellsFocusableStatus()
-    {
-      //cycle through cells in view or those that are permanent (binded cells).
-      foreach( Cell cell in this.CreatedCells )
-      {
-        //force an update of the NavigationBehavior characteristics
-        this.UpdateCellFocusableStatus( cell );
-      }
-    }
-
-    private void UpdateCellFocusableStatus( Cell cell )
-    {
-      if( cell == null )
-        return;
-
-      var cellFocusable = true;
-
-      if( !this.IsBeingEdited )
-      {
-        switch( this.NavigationBehavior )
-        {
-          case NavigationBehavior.None:
-            cellFocusable = false;
-            break;
-          case NavigationBehavior.RowOnly:
-            cellFocusable = false;
-            break;
-          case NavigationBehavior.RowOrCell:
-            cellFocusable = true;
-            break;
-          case NavigationBehavior.CellOnly:
-            cellFocusable = true;
-            break;
-        }
-      }
-
-      //force an update of the NavigationBehavior characteristics
-      cell.Focusable = ( cellFocusable && cell.GetCalculatedCanBeCurrent() );
-    }
-
-    private void RestoreEditionState( RowState savedState, ColumnBase currentColumn )
-    {
-      if( savedState == null )
-        return;
-
-      savedState = savedState.Clone();
-
-      Dictionary<ColumnBase, CellState> cachedCellStates = new Dictionary<ColumnBase, CellState>();
-
-      foreach( Cell cell in this.CreatedCells )
-      {
-        ColumnBase parentColumn = cell.ParentColumn;
-
-        if( parentColumn == null )
-          continue;
-
-        var currentRowInEditionCellState = parentColumn.CurrentRowInEditionCellState;
-
-        if( currentRowInEditionCellState != null )
-        {
-          cachedCellStates.Add( parentColumn, currentRowInEditionCellState.Clone() );
-        }
-      }
-
-      try
-      {
-        this.BeginEdit();
-      }
-      catch( DataGridException )
-      {
-        // We swallow exception if it occurs because of a validation error or Cell was read-only or
-        // any other GridException.
-      }
-
-      if( this.IsBeingEdited )
-      {
-        this.SetValidationError( savedState.ItemValidationError );
-
-        this.SetIsDirty( savedState.IsDirty );
-
-        foreach( Cell cell in this.CreatedCells )
-        {
-          ColumnBase parentColumn = cell.ParentColumn;
-
-          if( parentColumn == null )
-            continue;
-
-          CellState cachedCellState;
-
-          if( cachedCellStates.TryGetValue( parentColumn, out cachedCellState ) )
-          {
-            parentColumn.CurrentRowInEditionCellState = cachedCellState;
-          }
-
-          cell.RestoreEditionState( currentColumn );
-        }
-      }
-    }
-
-    private void PrepareNonVirtualizingCellsHost()
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return;
-
-      if( m_cellsHostPanel == null )
-        return;
-
-      var cellsHostCollection = m_cellsHostPanel.Children;
-
-      // Fill the cellsHostPanel in visible order.
-      foreach( var column in this.GetColumnsByVisiblePosition( dataGridContext ) )
-      {
-        //Cells will be created (if non-existing, via Row.ProvideCell()), initialized, and prepared through this call, including template cells.
-        var cell = m_cellsCache[ column ];
-
-        // An existing cell may not be in the VisualTree anymore, since m_cellsHostPanel.Children was just cleared in calling method.
-        if( !cellsHostCollection.Contains( cell ) && ( ( cell.FieldName == null ) || !m_templateCells.ContainsKey( cell.FieldName ) ) )
-        {
-          cellsHostCollection.Add( cell );
-        }
-      }
-    }
-
-    private void GetTemplateCells( Visual root, Dictionary<string, Cell> templateCells )
-    {
-      int childrenCount = VisualTreeHelper.GetChildrenCount( root );
-
-      if( childrenCount > 0 )
-      {
-        Visual child = null;
-        Cell cell = null;
-
-        for( int i = 0; i < childrenCount; i++ )
-        {
-          child = VisualTreeHelper.GetChild( root, i ) as Visual;
-
-          if( child != null )
-          {
-            cell = child as Cell;
-
-            if( cell == null )
-            {
-              this.GetTemplateCells( child, templateCells );
-            }
-            else
-            {
-              //if the cell is of the appropriate type for the Row, then ...
-              if( this.IsValidCellType( cell ) )
-              {
-                //mark the Cell as a Fixed Tempalte Cell.
-                Row.SetIsTemplateCell( cell, true );
-
-                templateCells.Add( cell.FieldName, cell );
-              }
-
-              //if the cell is not of the appropriate type, don't do anything, it will remain blank.
-            }
-          }
-        }
-      }
-      else
-      {
-        Visual child = null;
-        ContentControl contentControl = root as ContentControl;
-
-        if( contentControl == null )
-        {
-          ContentPresenter contentPresenter = root as ContentPresenter;
-
-          if( contentPresenter != null )
-          {
-            child = contentPresenter.Content as Visual;
-          }
-        }
-        else
-        {
-          child = contentControl.Content as Visual;
-        }
-
-        //avoid recursing into a Row object... that can only mean that the Row object is the data item for the Row (self contained, unbound).
-        if( ( child != null ) && ( ( child is Row ) == false ) )
-        {
-          Cell cell = child as Cell;
-
-          if( cell == null )
-          {
-            this.GetTemplateCells( child, templateCells );
-          }
-          else
-          {
-            //mark the Cell as a Fixed Tempalte Cell.
-            Row.SetIsTemplateCell( cell, true );
-
-            templateCells.Add( cell.FieldName, cell );
-          }
-        }
-      }
-    }
-
-    private void RemovePreviousTemplateCells()
-    {
-      List<Cell> removeList = new List<Cell>();
-
-      //cycle through all the cells, and if any of them have the attached property identifying them as Fixed Template Cells, then clear their FieldName property
-      foreach( Cell cell in this.CreatedCells )
-      {
-        if( Row.GetIsTemplateCell( cell ) )
-        {
-          removeList.Add( cell );
-        }
-      }
-
-      foreach( Cell removedCell in removeList )
-      {
-        removedCell.ClearContainer();
-        m_cellsCache.InternalRemove( removedCell );
-      }
-    }
-
-    private void SynchronizeCellsWithColumns( DataGridControl parentGrid, Dictionary<string, Cell> templateCells, bool onlyIfParentGridHasChanged )
-    {
-      if( ( !onlyIfParentGridHasChanged ) || ( parentGrid != m_parentGridUsedForCellsGeneration ) )
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        if( dataGridContext == null )
-          return;
-
-        this.GenerateMissingAndRemoveUnusedCells( dataGridContext, dataGridContext.Columns, templateCells );
-        m_parentGridUsedForCellsGeneration = parentGrid;
-      }
-    }
-
-    private void GenerateMissingAndRemoveUnusedCells( DataGridContext dataGridContext, ColumnCollection columns, Dictionary<string, Cell> templateCells )
-    {
-      Hashtable cellsDictionary = new Hashtable();
-
-      //Take each and every cells already created and place them in a dictionary.
-      //This dictionary will be used to manage cells that need to be removed at the end of the method's body.
-      foreach( Cell cell in this.CreatedCells )
-      {
-        cellsDictionary.Add( cell.FieldName, cell );
-      }
-
-      ColumnBase currentColumn = dataGridContext.CurrentColumn;
-      bool rowIsCurrent = this.IsCurrent;
-
-      Xceed.Wpf.DataGrid.Views.ViewBase view = dataGridContext.DataGridControl.GetView();
-
-      foreach( ColumnBase column in columns )
-      {
-        string fieldName = column.FieldName;
-        Cell cell = null;
-
-        //Try to get the Template Cell defined for this column
-        templateCells.TryGetValue( fieldName, out cell );
-
-        //The cell has been found in the template cells, simply prepare it, no need to add it to the VirtualizingCellCollection
-        if( cell != null )
-        {
-          cell.Initialize( dataGridContext, this, column );
-
-          // Ensure to prepare a Cell if it is not prepared or virtualized
-          if( !cell.IsContainerPrepared || cell.IsContainerVirtualized )
-          {
-            cell.PrepareContainer( dataGridContext, this.DataContext );
-          }
-
-          //finally, if the Row is current and the column in question is current, set the Currency state on the template cell.
-          if( ( rowIsCurrent ) && ( column == currentColumn ) )
-          {
-            cell.SetIsCurrent( true );
-          }
-        }
-        //The cell is not part of the Template Cells... But it still needs some work to be done.
-        else
-        {
-          if( !m_cellsCache.TryGetBindedCell( column, out cell ) )
-          {
-            cell = null;
-          }
-        }
-
-        //the cell is a template cell OR is already present in the Row
-        if( cell != null )
-        {
-          //To ensure that the DefaultStyleKey is set appropriatly
-          cell.PrepareDefaultStyleKey( view );
-        }
-
-        //Remove the Column's FieldName from the dictionary of Cells to remove.  This is to prevent the removal of the cell in the cleanup code below.
-        cellsDictionary.Remove( fieldName );
-      }
-
-      // clean unmatched cells
-      foreach( Cell cell in cellsDictionary.Values )
-      {
-        cell.ClearContainer();
-        m_cellsCache.InternalRemove( cell );
-      }
-    }
-
-    #region EDITION
-
-    public static readonly RoutedEvent EditBeginningEvent = EventManager.RegisterRoutedEvent( "EditBeginning", RoutingStrategy.Bubble, typeof( CancelRoutedEventHandler ), typeof( Row ) );
-    public static readonly RoutedEvent EditBegunEvent = EventManager.RegisterRoutedEvent( "EditBegun", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Row ) );
-
-    #region IsBeginningEditFromCell Property
-
-    internal bool IsBeginningEditFromCell
-    {
-      get
-      {
-        return m_flags[ ( int )RowFlags.IsBeginningEditFromCell ];
-      }
-      set
-      {
-        m_flags[ ( int )RowFlags.IsBeginningEditFromCell ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsBeginningEdition Property
-
-    internal bool IsBeginningEdition
-    {
-      get
-      {
-        return m_flags[ ( int )RowFlags.IsBeginningEdition ];
-      }
-      private set
-      {
-        m_flags[ ( int )RowFlags.IsBeginningEdition ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsEndingEdition Property
-
-    internal bool IsEndingEdition
-    {
-      get
-      {
-        return m_flags[ ( int )RowFlags.IsEndingEdition ];
-      }
-      private set
-      {
-        m_flags[ ( int )RowFlags.IsEndingEdition ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsCancelingEdition Property
-
-    internal bool IsCancelingEdition
-    {
-      get
-      {
-        return m_flags[ ( int )RowFlags.IsCancelingEdition ];
-      }
-      private set
-      {
-        m_flags[ ( int )RowFlags.IsCancelingEdition ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsBeingEditedCache Property
-
-    private bool IsBeingEditedCache
-    {
-      get
-      {
-        return m_flags[ ( int )RowFlags.IsBeingEditedCache ];
-      }
-      set
-      {
-        m_flags[ ( int )RowFlags.IsBeingEditedCache ] = value;
-      }
-    }
-
-    #endregion
-
-    public event CancelRoutedEventHandler EditBeginning
-    {
-      add
-      {
-        base.AddHandler( Row.EditBeginningEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Row.EditBeginningEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler EditBegun
-    {
-      add
-      {
-        base.AddHandler( Row.EditBegunEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Row.EditBegunEvent, value );
-      }
-    }
-
-    protected internal virtual void OnEditBeginning( CancelRoutedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    protected internal virtual void OnEditBegun()
-    {
-      RoutedEventArgs e = new RoutedEventArgs( Row.EditBegunEvent, this );
-      this.RaiseEvent( e );
-    }
-
-    public void BeginEdit()
-    {
-      if( this.IsBeingEdited )
-        return;
-
-      // If there is no dataItem mapped to this container, we don't want to enter in edition
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext != null )
-      {
-        object dataItem = dataGridContext.GetItemFromContainer( this );
-
-        if( dataItem == null )
-          return;
-      }
-
-      // We must prevent entering in edition of an EmptyDataItem.
-      if( this.DataContext is EmptyDataItem )
-        return;
-
-      Debug.Assert( this.IsContainerPrepared, "Can't edit a container that has not been prepared." );
-
-      //A cell can be editable will the row of the grid is not.
-      if( this.ReadOnly && !this.IsBeginningEditFromCell )
-        throw new DataGridException( "An attempt was made to edit a read-only row." );
-
-      if( this.IsBeginningEdition )
-        throw new DataGridException( "An attempt was made to edit a row for which the edit process has already begun." );
-
-      this.IsBeginningEdition = true;
-
-      try
-      {
-        if( !this.IsBeginningEditFromCell )
-        {
-          CancelRoutedEventArgs e = new CancelRoutedEventArgs( Row.EditBeginningEvent, this );
-          this.OnEditBeginning( e );
-
-          if( e.Cancel )
-            throw new DataGridException( "BeginEdit was canceled." );
-        }
-
-        // We must update the CellStates before calling BeginEditCore to ensure we have the values that are currently present in the Cells before entering in edition.
-        DataGridControl gridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
-
-        // This call will also validate that we're not starting a second row edition. It will also save the row state and update the columns' CurrentRowInEditionCellState.
-        if( gridControl != null )
-        {
-          gridControl.UpdateCurrentRowInEditionCellStates( this, this.GetEditingDataContext() );
-        }
-
-        this.SetIsBeingEdited( true );
-
-        try
-        {
-          this.BeginEditCore();
-        }
-        catch
-        {
-          this.SetIsBeingEdited( false );
-
-          // Ensure to clear the CellStates
-          if( gridControl != null )
-          {
-            gridControl.UpdateCurrentRowInEditionCellStates( null, null );
-          }
-
-          throw;
-        }
-      }
-      finally
-      {
-        this.IsBeginningEdition = false;
-      }
-
-      if( !this.IsBeginningEditFromCell )
-      {
-        this.OnEditBegun();
-      }
-    }
-
-    protected virtual void BeginEditCore()
-    {
-      if( this.IsBeginningEditFromCell )
-        return;
-
-      Cell currentCell = this.GetCellForCurrentColumn();
-
-      try
-      {
-        if( currentCell != null )
-        {
-          if( !currentCell.IsBeingEdited )
-          {
-            currentCell.BeginEdit();
-          }
-        }
-        else
-        {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-          if( dataGridContext != null )
-          {
-            int firstEditableColumn = NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext );
-            if( firstEditableColumn < 0 )
-              throw new DataGridException( "Trying to edit while no cell is focusable. " );
-
-            currentCell = m_cellsCache[ dataGridContext.VisibleColumns[ firstEditableColumn ] ];
-
-            if( currentCell != null )
-            {
-              currentCell.BeginEdit();
-            }
-          }
-        }
-      }
-      catch( DataGridException )
-      {
-        // We swallow exception if it occurs because of a validation error or Cell was read-only or any other GridException.
-      }
-    }
-
-    public static readonly RoutedEvent EditEndingEvent = EventManager.RegisterRoutedEvent( "EditEnding", RoutingStrategy.Bubble, typeof( CancelRoutedEventHandler ), typeof( Row ) );
-    public static readonly RoutedEvent EditEndedEvent = EventManager.RegisterRoutedEvent( "EditEnded", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Row ) );
-
-    public event CancelRoutedEventHandler EditEnding
-    {
-      add
-      {
-        base.AddHandler( Row.EditEndingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Row.EditEndingEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler EditEnded
-    {
-      add
-      {
-        base.AddHandler( Row.EditEndedEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Row.EditEndedEvent, value );
-      }
-    }
-
-    protected virtual void OnEditEnding( CancelRoutedEventArgs e )
-    {
-      this.RaiseEvent( e );
-    }
-
-    protected virtual void OnEditEnded()
-    {
-      RoutedEventArgs e = new RoutedEventArgs( Row.EditEndedEvent, this );
-      this.RaiseEvent( e );
-    }
-
-    public void EndEdit()
-    {
-      if( !this.IsBeingEdited )
-        return;
-
-      if( this.IsEndingEdition )
-        throw new InvalidOperationException( "An attempt was made to end the edit process while it is already in the process of being ended." );
-
-      if( this.IsCancelingEdition )
-        throw new InvalidOperationException( "An attempt was made to end the edit process while it is being canceled." );
-
-      var e = new CancelRoutedEventArgs( Row.EditEndingEvent, this );
-
-      try
-      {
-        this.OnEditEnding( e );
-
-        if( e.Cancel )
-          throw new DataGridValidationException( "EndEdit was canceled." );
-      }
-      catch( Exception exception )
-      {
-        // This method will set a validation error on the row and throw back a DataGridValidationException so that  the row stays in edition.
-        Row.SetRowValidationErrorOnException( this, exception );
-      }
-
-      this.IsEndingEdition = true;
-
-      try
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-        if( dataGridContext == null )
-        {
-          Debug.Fail( "DataGridContext cannot be null." );
-          return;
-        }
-
-        var dataGridCollectionViewBase = dataGridContext.ItemsSourceCollection as DataGridCollectionViewBase;
-        var deferRefresh = ( ( dataGridCollectionViewBase != null ) ) ? Row.DeferCollectionViewRefresh( dataGridContext ) : null;
-
-        try
-        {
-          this.EndEditCore();
-          this.TerminateEditionFromEndEdit();
-        }
-        finally
-        {
-          if( deferRefresh != null )
-          {
-            // If there is a validation error, deferRefresh.Dispose() may clear the current error. Be sure to keep it in order to restore it if needed.
-            var hasValidationError = this.ReadLocalValue( Row.HasValidationErrorProperty );
-            var validationError = this.ReadLocalValue( Row.ValidationErrorProperty );
-
-            deferRefresh.Dispose();
-
-            if( hasValidationError != DependencyProperty.UnsetValue )
-            {
-              // This will use the PropertyKey.
-              this.SetHasValidationError( ( bool )hasValidationError );
-            }
-
-            if( validationError != DependencyProperty.UnsetValue )
-            {
-              this.SetValidationError( ( RowValidationError )validationError );
-            }
-          }
-        }
-
-        this.PreEditEnded();
-
-        // Item validation has passed if we reached this far. Since it is the Row's HasValidationError which drives the error styles,
-        // setting the ItemValidationError to null will not get in the way of the row's cells validation.
-        this.SetValidationError( null );
-
-      }
-      finally
-      {
-        this.IsEndingEdition = false;
-      }
-
-      this.OnEditEnded();
-    }
-
-    private void TerminateEditionFromEndEdit()
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl gridControl = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      // Lower IsDirty flags.
-      foreach( Cell cell in this.CreatedCells )
-      {
-        cell.SetIsDirty( false );
-      }
-
-      this.SetIsDirty( false );
-
-      // Reset current row in edition.
-      if( gridControl != null )
-      {
-        gridControl.UpdateCurrentRowInEditionCellStates( null, null );
-      }
-
-      this.SetIsBeingEdited( false );
-
-      this.UpdateCellsContentBindingTarget();
-
-      if( ( this.NavigationBehavior == NavigationBehavior.RowOnly ) && ( this.IsCurrent ) )
-      {
-        if( gridControl != null )
-        {
-          gridControl.QueueClearCurrentColumn( gridControl.CurrentItem );
-        }
-      }
-    }
-
-    internal virtual void PreEditEnded()
-    {
-    }
-
-    protected virtual void EndEditCore()
-    {
-      bool hasRestrictiveError = false;
-
-      // Create a clone of the list to avoid concurrent access when iterating and a Cell is added to CreatedCells because of ColumnVirtualization
-      var createdCells = new List<Cell>();
-
-      Cell editCell = null;
-
-      foreach( var cell in this.CreatedCells )
-      {
-        createdCells.Add( cell );
-
-        if( cell.IsBeingEdited )
-        {
-          editCell = cell;
-        }
-      }
-
-      if( editCell != null )
-      {
-        try
-        {
-          editCell.EndEdit( true, true, true );
-          hasRestrictiveError = hasRestrictiveError || Cell.GetIsValidationErrorRestrictive( editCell.ValidationError );
-        }
-        catch( DataGridValidationException )
-        {
-          hasRestrictiveError = true;
-        }
-      }
-
-      foreach( Cell cell in createdCells )
-      {
-        if( cell == editCell )
-          continue;
-
-        var contentBindingUpdateSourceTrigger = cell.GetContentBindingUpdateSourceTrigger();
-        var updateContentBindingSource = ( contentBindingUpdateSourceTrigger == DataGridUpdateSourceTrigger.RowEndingEdit );
-        var cascadeValidate = updateContentBindingSource;
-        Exception exception;
-        CellValidationRule ruleInError;
-
-        var result = cell.ValidateAndSetAllErrors( true, true, updateContentBindingSource, cascadeValidate, out exception, out ruleInError );
-
-        if( ( !result.IsValid ) && ( Cell.GetIsRuleInErrorRestrictive( ruleInError ) ) )
-        {
-          hasRestrictiveError = true;
-        }
-      }
-
-      // Throwing a DataGridValidationException will be caught by the grid and will make the cell stay in edition.
-      if( hasRestrictiveError )
-        throw new DataGridValidationException( "Row.EndEdit cannot complete because the cell content is invalid." );
-    }
-
-    public static readonly RoutedEvent EditCancelingEvent = EventManager.RegisterRoutedEvent( "EditCanceling", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Row ) );
-    public static readonly RoutedEvent EditCanceledEvent = EventManager.RegisterRoutedEvent( "EditCanceled", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Row ) );
-
-    public event RoutedEventHandler EditCanceling
-    {
-      add
-      {
-        base.AddHandler( Row.EditCancelingEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Row.EditCancelingEvent, value );
-      }
-    }
-
-    public event RoutedEventHandler EditCanceled
-    {
-      add
-      {
-        base.AddHandler( Row.EditCanceledEvent, value );
-      }
-      remove
-      {
-        base.RemoveHandler( Row.EditCanceledEvent, value );
-      }
-    }
-
-    protected virtual void OnEditCanceling()
-    {
-      RoutedEventArgs e = new RoutedEventArgs( Row.EditCancelingEvent, this );
-      this.RaiseEvent( e );
-    }
-
-    protected virtual void OnEditCanceled()
-    {
-      RoutedEventArgs e = new RoutedEventArgs( Row.EditCanceledEvent, this );
-      this.RaiseEvent( e );
-    }
-
-    public void CancelEdit()
-    {
-      this.CancelEdit( false );
-    }
-
-    internal void CancelEdit( bool forceCancelEdit )
-    {
-      if( !this.IsBeingEdited )
-        return;
-
-      if( this.IsCancelingEdition )
-        throw new InvalidOperationException( "An attempt was made to cancel the edit process while it is already in the process of being canceled." );
-
-      if( ( !forceCancelEdit ) && ( this.IsEndingEdition ) )
-        throw new InvalidOperationException( "An attempt was made to cancel the edit process while it is being ended." );
-
-      this.OnEditCanceling();
-      this.IsCancelingEdition = true;
-
-      try
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-        IDisposable deferRefresh = null;
-
-        if( dataGridContext != null )
-        {
-          deferRefresh = ( ( this is DataRow )  || ( dataGridContext.ItemsSourceCollection is DataGridCollectionViewBase ) )
-                         ? DataRow.DeferCollectionViewRefresh( dataGridContext ) : null;
-        }
-
-        try
-        {
-          this.CancelEditCore();
-          this.TerminateEditionFromCancelEdit();
-        }
-        finally
-        {
-          if( deferRefresh != null )
-          {
-            deferRefresh.Dispose();
-          }
-        }
-
-        this.PreEditCanceled();
-
-        // A row cannot have an ItemValidationError when not being edited. Since it is the Row's HasValidationError which drives the error styles,
-        // setting the ItemValidationError to null will not get in the way of the row's cells validation.
-        this.SetValidationError( null );
-
-      }
-      finally
-      {
-        this.IsCancelingEdition = false;
-      }
-
-      this.OnEditCanceled();
-    }
-
-    private void TerminateEditionFromCancelEdit()
-    {
-      this.SetIsDirty( false );
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl gridControl = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      if( gridControl != null )
-      {
-        gridControl.UpdateCurrentRowInEditionCellStates( null, null );
-      }
-
-      this.SetIsBeingEdited( false );
-
-      if( ( this.NavigationBehavior == NavigationBehavior.RowOnly )
-         && ( this.IsCurrent ) )
-      {
-        if( gridControl != null )
-        {
-          gridControl.QueueClearCurrentColumn( gridControl.CurrentItem );
-        }
-      }
-    }
-
-    internal virtual void PreEditCanceled()
-    {
-    }
-
-    protected virtual void CancelEditCore()
-    {
-      // Restore the Cell.Content
-      foreach( var cell in this.CreatedCells )
-      {
-        if( cell.IsBeingEdited )
-        {
-          cell.CancelEdit();
-        }
-
-        cell.RevertEditedValue();
-      }
-
-#if DEBUG
-      foreach( var cell in this.CreatedCells )
-      {
-        Debug.Assert( Cell.GetIsValidationErrorRestrictive( cell.ValidationError ) == false );
-      }
-#endif
-    }
-
-    #endregion EDITION
-
-    #region DP CHANGED HANDLERS
-
-    private static void OnIsBeingEditedChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      Row row = ( Row )sender;
-
-      row.UpdateNavigationBehavior();
-      row.UpdateCellsFocusableStatus();
-
-      //If the current CellEditorDisplayConditions requires display when Row is Editing
-      if( Row.IsCellEditorDisplayConditionsSet( row, CellEditorDisplayConditions.RowIsBeingEdited ) )
-      {
-        if( ( bool )e.NewValue )
-        {
-          //Display the editors for the Row
-          row.SetDisplayEditorMatchingCondition( CellEditorDisplayConditions.RowIsBeingEdited );
-        }
-        else
-        {
-          //Hide the editors for the Row
-          row.RemoveDisplayEditorMatchingCondition( CellEditorDisplayConditions.RowIsBeingEdited );
-        }
-      }
-
-      // In case a value was explicitly specified on the Cell's ParentColumn
-      row.RefreshCellsDisplayedTemplate();
-    }
-
-    private static void OnIsCurrentChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      Row row = ( Row )sender;
-
-      if( row == null )
-        return;
-
-      // In case a value was explicitly specified on the Cell's ParentColumn
-      row.RefreshCellsDisplayedTemplate();
-    }
-
-    private static void OnCellEditorDisplayConditionsChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      Row obj = ( Row )sender;
-
-      obj.UpdateMatchingDisplayConditions();
-    }
-
-    private static void OnNavigationBehaviorChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      Row obj = ( Row )sender;
-
-      obj.UpdateNavigationBehavior();
-      obj.UpdateCellsFocusableStatus();
-    }
-
-    private static void OnParentGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridControl grid = e.NewValue as DataGridControl;
-      Row row = sender as Row;
-
-      if( ( row != null ) && ( grid != null ) )
-      {
-        row.PrepareDefaultStyleKey( grid.GetView() );
-      }
-    }
-
-    private static void OnCellIsDirty_ClassHandler( object sender, RoutedEventArgs e )
-    {
-      Row row = ( Row )sender;
-
-      row.SetIsDirty( true );
-
-      e.Source = row;
-    }
-
-    #endregion DP CHANGED HANDLERS
-
-    #region COMMANDS
-
-    private void OnBeginEditExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      try
-      {
-        this.BeginEdit();
-      }
-      catch( DataGridException )
-      {
-        // We swallow exception if it occurs because of a validation error or Cell was readonly or
-        // any other GridException.
-      }
-    }
-
-    private void OnBeginEditCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl parentGrid = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      if( parentGrid == null )
-      {
-        e.CanExecute = false;
-      }
-      else
-      {
-        e.CanExecute = ( !this.IsBeingEdited ) && ( !this.ReadOnly )
-          && ( this.IsEditTriggerSet( EditTriggers.BeginEditCommand ) );
-      }
-    }
-
-    private void OnCancelEditExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.CancelEdit();
-    }
-
-    private void OnCancelEditCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = this.IsBeingEdited;
-    }
-
-    private void OnEndEditExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.OnEndEditCommandExecutedCore( e );
-    }
-
-    internal virtual void OnEndEditCommandExecutedCore( ExecutedRoutedEventArgs e )
-    {
-      try
-      {
-        this.EndEdit();
-      }
-      catch( DataGridException )
-      {
-        // We swallow exception if it occurs because of a validation error or Cell was read-only or
-        // any other GridException.
-      }
-    }
-
-    private void OnEndEditCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      this.OnEndEditCommandCanExecuteCore( e );
-    }
-
-    internal virtual void OnEndEditCommandCanExecuteCore( CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = this.IsBeingEdited;
-    }
-
-    #endregion COMMANDS
-
-    #region IDataGridItemContainer Members
-
-    bool IDataGridItemContainer.CanBeRecycled
-    {
-      get
-      {
-        return this.CanBeRecycled;
-      }
-    }
-
-    bool IDataGridItemContainer.IsRecyclingCandidate
-    {
-      get
-      {
-        return m_isRecyclingCandidate;
-      }
-      set
-      {
-        m_isRecyclingCandidate = value;
-      }
-    }
-
-    void IDataGridItemContainer.PrepareContainer( DataGridContext dataGridContext, object item )
-    {
-      if( m_isRecyclingCandidate )
-      {
-        this.IsContainerPrepared = false;
-        m_isRecyclingCandidate = false;
-      }
-
-      if( this.IsContainerPrepared )
-        Debug.Fail( "A Row can't be prepared twice, it must be cleaned before PrepareContainer is called again" );
-
-      this.PrepareContainer( dataGridContext, item );
-    }
-
-    void IDataGridItemContainer.ClearContainer()
-    {
-      if( m_isRecyclingCandidate )
-      {
-        this.PartialClearContainer();
-        return;
-      }
-
-      this.ClearContainer();
-    }
-
-    void IDataGridItemContainer.CleanRecyclingCandidate()
-    {
-      this.ClearContainer();
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected virtual void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return false;
-    }
-
-    #endregion
-
-    private DataGridControl m_parentGridUsedForCellsGeneration; // = null
-    private Panel m_cellsHostPanel; // = null
-    private Dictionary<string, Cell> m_templateCells = new Dictionary<string, Cell>();
-    private List<RegionPresenterConfig> m_oldRegionPresenterConfigs; // = null
-    private BitVector32 m_flags = new BitVector32();
-    private bool m_isRecyclingCandidate;
-
-    #region RegionPresenterConfig Private Class
-
-    private sealed class RegionPresenterConfig
-    {
-      public Nullable<bool> ReadOnly
-      {
-        get;
-        set;
-      }
-
-      public Nullable<bool> ShowCellTitles
-      {
-        get;
-        set;
-      }
-
-      public Nullable<Stretch> ImageStretch
-      {
-        get;
-        set;
-      }
-
-      public Nullable<StretchDirection> ImageStretchDirection
-      {
-        get;
-        set;
-      }
-
-      public List<string> FieldNameList
-      {
-        get
-        {
-          return m_fieldNameList;
-        }
-      }
-
-      private List<string> m_fieldNameList = new List<string>();
-    }
-
-    #endregion
-
-    #region RowFlags Nested Type
-
-    [Flags]
-    private enum RowFlags
-    {
-      IsBeginningEdition = 1,
-      IsEndingEdition = 2,
-      IsCancelingEdition = 4,
-      IsBeginningEditFromCell = 8,
-      IsBeingEditedCache = 16,
-      IsClearingContainer = 32,
-      IsContainerPrepared = 64,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs
deleted file mode 100644
index 4c6ce82e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs
+++ /dev/null
@@ -1,760 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [TemplatePart( Name = "PART_RowResizerThumb", Type = typeof( Thumb ) )]
-  public class RowSelector : ContentControl, INotifyPropertyChanged
-  {
-    static RowSelector()
-    {
-      RowSelector.IsPressedProperty = RowSelector.IsPressedPropertyKey.DependencyProperty;
-      RowSelector.RowTypeProperty = RowSelector.RowTypePropertyKey.DependencyProperty;
-
-      UIElement.FocusableProperty.OverrideMetadata( typeof( RowSelector ), new FrameworkPropertyMetadata( false ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( RowSelector ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( RowSelector.OnParentGridControlChanged ) ) );
-
-      m_sDataContextBinding = new Binding();
-      m_sDataContextBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-      m_sDataContextBinding.Path = new PropertyPath( DataGridControl.ContainerProperty );
-      m_sDataContextBinding.Mode = BindingMode.OneWay;
-
-      m_sItemIndexBinding = new Binding();
-      m_sItemIndexBinding.Path = new PropertyPath( DataGridVirtualizingPanel.ItemIndexProperty );
-      m_sItemIndexBinding.Mode = BindingMode.OneWay;
-
-      m_sIsCurrentBinding = new Binding();
-      m_sIsCurrentBinding.Path = new PropertyPath( Row.IsCurrentProperty );
-      m_sIsCurrentBinding.Mode = BindingMode.OneWay;
-
-      m_sIsBeingEditedBinding = new Binding();
-      m_sIsBeingEditedBinding.Path = new PropertyPath( Row.IsBeingEditedProperty );
-      m_sIsBeingEditedBinding.Mode = BindingMode.OneWay;
-
-      m_sHasValidationErrorBinding = new Binding();
-      m_sHasValidationErrorBinding.Path = new PropertyPath( Row.HasValidationErrorProperty );
-      m_sHasValidationErrorBinding.Mode = BindingMode.OneWay;
-
-      m_sRowSelectorVisibleBinding = new Binding();
-      m_sRowSelectorVisibleBinding.Path = new PropertyPath( RowSelector.VisibleProperty );
-      m_sRowSelectorVisibleBinding.Mode = BindingMode.OneWay;
-      m_sRowSelectorVisibleBinding.Converter = new BooleanToVisibilityConverter();
-      m_sRowSelectorVisibleBinding.ConverterParameter = Visibility.Collapsed;
-
-      m_sRowSelectorStyleBinding = new Binding();
-      m_sRowSelectorStyleBinding.Path = new PropertyPath( RowSelector.RowSelectorStyleProperty );
-      m_sRowSelectorStyleBinding.Mode = BindingMode.OneWay;
-
-      m_sAllowResizeBinding = new Binding();
-      m_sAllowResizeBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-      m_sAllowResizeBinding.Path = new PropertyPath( "(0).(1)", DataGridControl.DataGridContextProperty, TableView.AllowRowResizeProperty );
-
-      m_sAllowResizeBinding.Mode = BindingMode.OneWay;
-    }
-
-    internal RowSelector()
-    {
-      BindingOperations.SetBinding( this, RowSelector.DataContextProperty, m_sDataContextBinding );
-      BindingOperations.SetBinding( this, RowSelector.IsCurrentProperty, m_sIsCurrentBinding );
-      BindingOperations.SetBinding( this, RowSelector.IsBeingEditedProperty, m_sIsBeingEditedBinding );
-      BindingOperations.SetBinding( this, RowSelector.ItemIndexProperty, m_sItemIndexBinding );
-      BindingOperations.SetBinding( this, RowSelector.HasValidationErrorProperty, m_sHasValidationErrorBinding );
-      BindingOperations.SetBinding( this, RowSelector.VisibilityProperty, m_sRowSelectorVisibleBinding );
-      BindingOperations.SetBinding( this, RowSelector.RowSelectorStyleProperty, m_sRowSelectorStyleBinding );
-      BindingOperations.SetBinding( this, RowSelector.AllowResizeProperty, m_sAllowResizeBinding );
-    }
-
-    #region AllowResize Property
-
-    internal static readonly DependencyProperty AllowResizeProperty = DependencyProperty.Register(
-      "AllowResize",
-      typeof( bool ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( true ) );
-
-    internal bool AllowResize
-    {
-      get
-      {
-        return ( bool )this.GetValue( RowSelector.AllowResizeProperty );
-      }
-      set
-      {
-        this.SetValue( RowSelector.AllowResizeProperty, value );
-      }
-    }
-
-    private bool CanBeResized( Orientation orientation )
-    {
-      if( this.AllowResize )
-      {
-        FrameworkElement rowItem = this.DataContext as FrameworkElement;
-        if( rowItem != null )
-        {
-          if( orientation == Orientation.Vertical )
-          {
-            object minHeight = rowItem.ReadLocalValue( FrameworkElement.MinHeightProperty );
-            object maxHeight = rowItem.ReadLocalValue( FrameworkElement.MaxHeightProperty );
-
-            if( ( minHeight == DependencyProperty.UnsetValue )
-              || ( maxHeight == DependencyProperty.UnsetValue )
-              || ( !object.Equals( minHeight, maxHeight ) ) )
-            {
-              return true;
-            }
-          }
-          else
-          {
-            object minWidth = rowItem.ReadLocalValue( FrameworkElement.MinWidthProperty );
-            object maxWidth = rowItem.ReadLocalValue( FrameworkElement.MaxWidthProperty );
-
-            if( ( minWidth == DependencyProperty.UnsetValue )
-              || ( maxWidth == DependencyProperty.UnsetValue )
-              || ( !object.Equals( minWidth, maxWidth ) ) )
-            {
-              return true;
-            }
-          }
-        }
-      }
-
-      return false;
-    }
-
-    #endregion AllowResize Property
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void NotifyPropertyChanged( string propertyName )
-    {
-      if( this.PropertyChanged != null )
-      {
-        this.PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
-      }
-    }
-
-    #endregion
-
-    #region Orientation Property
-
-    public Orientation Orientation
-    {
-      get
-      {
-        return ( Orientation )GetValue( OrientationProperty );
-      }
-      set
-      {
-        SetValue( OrientationProperty, value );
-      }
-    }
-
-    // Using a DependencyProperty as the backing store for Orientation.  This enables animation, styling, binding, etc...
-    public static readonly DependencyProperty OrientationProperty =
-        DependencyProperty.Register( "Orientation", typeof( Orientation ), typeof( RowSelector ), new UIPropertyMetadata( Orientation.Vertical ) );
-
-    #endregion
-
-    #region IsPressed Read-Only Property
-
-    private static readonly DependencyPropertyKey IsPressedPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsPressed", typeof( bool ), typeof( RowSelector ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsPressedProperty;
-
-    public bool IsPressed
-    {
-      get
-      {
-        return ( bool )this.GetValue( RowSelector.IsPressedProperty );
-      }
-    }
-
-    internal void SetIsPressed( bool value )
-    {
-      this.SetValue( RowSelector.IsPressedPropertyKey, value );
-    }
-
-    #endregion IsPressed Read-Only Property
-
-    #region IsCurrent
-
-    public static readonly DependencyProperty IsCurrentProperty = DependencyProperty.Register(
-      "IsCurrent",
-      typeof( bool ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( false ) );
-
-    public bool IsCurrent
-    {
-      get
-      {
-        return ( bool )this.GetValue( IsCurrentProperty );
-      }
-    }
-
-    #endregion
-
-    #region IsBeingEdited
-
-    public static readonly DependencyProperty IsBeingEditedProperty = DependencyProperty.Register(
-      "IsBeingEdited",
-      typeof( bool ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( false ) );
-
-    public bool IsBeingEdited
-    {
-      get
-      {
-        return ( bool )this.GetValue( IsBeingEditedProperty );
-      }
-    }
-
-    #endregion
-
-    #region ItemIndex
-
-    public static readonly DependencyProperty ItemIndexProperty = DataGridVirtualizingPanel.ItemIndexProperty.AddOwner( typeof( RowSelector ) );
-
-    public int ItemIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( ItemIndexProperty );
-      }
-    }
-
-    #endregion
-
-    #region HasValidationError
-
-    public static readonly DependencyProperty HasValidationErrorProperty = DependencyProperty.Register(
-      "HasValidationError",
-      typeof( bool ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( false ) );
-
-    public bool HasValidationError
-    {
-      get
-      {
-        return ( bool )this.GetValue( HasValidationErrorProperty );
-      }
-    }
-
-    #endregion
-
-    #region RowType
-
-    private static readonly DependencyPropertyKey RowTypePropertyKey = DependencyProperty.RegisterReadOnly(
-      "RowType",
-      typeof( Type ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty RowTypeProperty;
-
-    public Type RowType
-    {
-      get
-      {
-        return ( Type )this.GetValue( RowSelector.RowTypeProperty );
-      }
-    }
-
-    private void SetRowType( Type value )
-    {
-      this.SetValue( RowSelector.RowTypePropertyKey, value );
-    }
-
-    #endregion
-
-    #region ContainerRect
-
-    public static readonly DependencyProperty ContainerRectProperty = DependencyProperty.Register(
-      "ContainerRect",
-      typeof( Rect ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public Rect ContainerRect
-    {
-      get
-      {
-        return ( Rect )this.GetValue( ContainerRectProperty );
-      }
-      internal set
-      {
-        this.SetValue( ContainerRectProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Visible Attached Property
-
-    public static readonly DependencyProperty VisibleProperty = DependencyProperty.RegisterAttached(
-      "Visible",
-      typeof( bool ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public static bool GetVisible( DependencyObject d )
-    {
-      return ( bool )d.GetValue( RowSelector.VisibleProperty );
-    }
-
-    public static void SetVisible( DependencyObject d, bool value )
-    {
-      d.SetValue( RowSelector.VisibleProperty, value );
-    }
-
-    #endregion
-
-    #region RowSelectorStyle Attached Property
-
-    public static readonly DependencyProperty RowSelectorStyleProperty = DependencyProperty.RegisterAttached(
-      "RowSelectorStyle",
-      typeof( Style ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( null, new PropertyChangedCallback( OnRowSelectorStyleChanged ) ) );
-
-    public static Style GetRowSelectorStyle( DependencyObject obj )
-    {
-      return ( Style )obj.GetValue( RowSelectorStyleProperty );
-    }
-
-    public static void SetRowSelectorStyle( DependencyObject obj, Style value )
-    {
-      obj.SetValue( RowSelectorStyleProperty, value );
-    }
-
-    private static void OnRowSelectorStyleChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      RowSelector rowSelector = sender as RowSelector;
-
-      //Here, since the property is an Attached propety, the type of sender can be anything, but in this particular case, I want
-      //to filter out everything but RowSelector since this is my queue to set a local style on the RowSelector ( or clear the local
-      //value).
-      if( rowSelector == null )
-        return;
-
-      if( e.NewValue == null )
-      {
-        rowSelector.ClearValue( RowSelector.StyleProperty );
-      }
-      else
-      {
-        rowSelector.SetValue( RowSelector.StyleProperty, e.NewValue );
-      }
-    }
-
-    #endregion
-
-    #region ReferenceElement Internal Property
-
-    internal static readonly DependencyProperty ReferenceElementProperty = DependencyProperty.Register(
-      "ReferenceElement",
-      typeof( FrameworkElement ),
-      typeof( RowSelector ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal FrameworkElement ReferenceElement
-    {
-      get
-      {
-        return ( FrameworkElement )this.GetValue( ReferenceElementProperty );
-      }
-      set
-      {
-        this.SetValue( ReferenceElementProperty, value );
-      }
-    }
-
-    #endregion
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      this.SetupColumnResizerThumb();
-    }
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( e.Property == RowSelector.DataContextProperty )
-      {
-        Type rowType = null;
-
-        Row row = this.DataContext as Row;
-        if( row != null )
-        {
-          rowType = row.GetType();
-        }
-        else
-        {
-          HeaderFooterItem hfi = this.DataContext as HeaderFooterItem;
-          if( hfi != null )
-          {
-            row = hfi.AsVisual() as Row;
-            if( row != null )
-            {
-              rowType = row.GetType();
-            }
-          }
-        }
-
-        this.SetRowType( rowType );
-
-      }
-    }
-
-    private static void OnParentGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      RowSelector rowSelector = ( RowSelector )sender;
-      DataGridControl newGrid = e.NewValue as DataGridControl;
-
-      if( newGrid != null )
-      {
-        rowSelector.PrepareDefaultStyleKey( newGrid.GetView() );
-      }
-    }
-
-    internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( RowSelector ) );
-    }
-
-    #region Row Resizer Code
-
-    private void SetupColumnResizerThumb()
-    {
-      if( m_rowResizerThumb != null )
-      {
-        m_rowResizerThumb.DragStarted -= new DragStartedEventHandler( m_rowResizerThumb_DragStarted );
-        m_rowResizerThumb.DragDelta -= new DragDeltaEventHandler( m_rowResizerThumb_DragDelta );
-        m_rowResizerThumb.DragCompleted -= new DragCompletedEventHandler( m_rowResizerThumb_DragCompleted );
-        m_rowResizerThumb.QueryCursor -= new QueryCursorEventHandler( m_rowResizerThumb_QueryCursor );
-        m_rowResizerThumb.MouseDoubleClick -= new MouseButtonEventHandler( m_rowResizerThumb_MouseDoubleClick );
-
-        m_rowResizerThumb = null;
-      }
-
-      m_rowResizerThumb = this.GetTemplateChild( "PART_RowResizerThumb" ) as Thumb;
-
-      if( m_rowResizerThumb != null )
-      {
-        m_rowResizerThumb.DragStarted += new DragStartedEventHandler( m_rowResizerThumb_DragStarted );
-        m_rowResizerThumb.DragDelta += new DragDeltaEventHandler( m_rowResizerThumb_DragDelta );
-        m_rowResizerThumb.DragCompleted += new DragCompletedEventHandler( m_rowResizerThumb_DragCompleted );
-        m_rowResizerThumb.QueryCursor += new QueryCursorEventHandler( m_rowResizerThumb_QueryCursor );
-        m_rowResizerThumb.MouseDoubleClick += new MouseButtonEventHandler( m_rowResizerThumb_MouseDoubleClick );
-      }
-    }
-
-    private void m_rowResizerThumb_MouseDoubleClick( object sender, MouseButtonEventArgs e )
-    {
-      FrameworkElement rowItem = ( FrameworkElement )this.DataContext;
-
-      if( rowItem == null )
-        return;
-
-      if( !this.CanBeResized( this.Orientation ) )
-        return;
-
-      // Resets the row width or height depending on the orientation.
-      DependencyProperty property = ( this.Orientation == Orientation.Vertical ) ? FrameworkElement.HeightProperty : FrameworkElement.WidthProperty;
-
-      rowItem.ClearValue( property );
-    }
-
-    private void m_rowResizerThumb_QueryCursor( object sender, QueryCursorEventArgs e )
-    {
-      FrameworkElement rowItem = ( FrameworkElement )this.DataContext;
-
-      if( rowItem == null )
-        return;
-
-      if( this.CanBeResized( this.Orientation ) )
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-        if( dataGridContext != null )
-        {
-          TableView tableView = dataGridContext.DataGridControl.GetView() as TableView;
-
-          e.Cursor = ( ( tableView != null ) && ( this.Orientation == Orientation.Vertical ) )
-            ? tableView.RowSelectorResizeNorthSouthCursor
-            : tableView.RowSelectorResizeWestEastCursor;
-        }
-
-        if( e.Cursor == null )
-        {
-          e.Cursor = ( this.Orientation == Orientation.Vertical ) ? TableView.DefaultRowSelectorResizeNorthSouthCursor : TableView.DefaultRowSelectorResizeWestEastCursor;
-        }
-      }
-
-      e.Handled = true;
-    }
-
-    private void m_rowResizerThumb_DragStarted( object sender, DragStartedEventArgs e )
-    {
-      if( !this.CanBeResized( this.Orientation ) )
-        return;
-
-      FrameworkElement rowItem = ( FrameworkElement )this.DataContext;
-
-      if( rowItem == null )
-        return;
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        m_originalSize = rowItem.ActualHeight;
-      }
-      else
-      {
-        m_originalSize = rowItem.ActualWidth;
-      }
-    }
-
-    private void m_rowResizerThumb_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      if( !this.CanBeResized( this.Orientation ) )
-        return;
-
-      FrameworkElement rowItem = ( FrameworkElement )this.DataContext;
-
-      if( rowItem == null )
-        return;
-
-      double newSize;
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        newSize = rowItem.ActualHeight + e.VerticalChange;
-      }
-      else
-      {
-        newSize = rowItem.ActualWidth + e.HorizontalChange;
-      }
-
-      if( newSize < MIN_SIZE )
-      {
-        newSize = MIN_SIZE;
-      }
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        if( newSize < rowItem.MinHeight )
-        {
-          newSize = rowItem.MinHeight;
-        }
-        else if( newSize > rowItem.MaxHeight )
-        {
-          newSize = rowItem.MaxHeight;
-        }
-
-        rowItem.Height = newSize;
-      }
-      else
-      {
-        if( newSize < rowItem.MinWidth )
-        {
-          newSize = rowItem.MinWidth;
-        }
-        else if( newSize > rowItem.MaxWidth )
-        {
-          newSize = rowItem.MaxWidth;
-        }
-
-        rowItem.Width = newSize;
-      }
-    }
-
-    private void m_rowResizerThumb_DragCompleted( object sender, DragCompletedEventArgs e )
-    {
-      if( !this.CanBeResized( this.Orientation ) )
-        return;
-
-      FrameworkElement rowItem = ( FrameworkElement )this.DataContext;
-
-      if( rowItem == null )
-        return;
-
-      if( e.Canceled )
-      {
-        if( this.Orientation == Orientation.Vertical )
-        {
-          rowItem.Height = m_originalSize;
-        }
-        else
-        {
-          rowItem.Width = m_originalSize;
-        }
-      }
-
-      m_originalSize = -1d;
-    }
-
-    private const double MIN_SIZE = 4d;
-
-    private double m_originalSize = -1d;
-    private Thumb m_rowResizerThumb; // = null
-
-    #endregion Column Resizer Code
-
-    #region Button Behavior Code
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      m_isFromMouseButtonDown = true;
-
-      if( this.CaptureMouse() )
-      {
-        this.SetIsPressed( true );
-        e.Handled = true;
-
-        FrameworkElement rowItemContainer = this.DataContext as FrameworkElement;
-
-        if( rowItemContainer != null )
-        {
-          DataGridContext dataGridContext = DataGridControl.GetDataGridContext( rowItemContainer );
-
-          if( dataGridContext != null )
-          {
-            DataGridControl dataGridControl = dataGridContext.DataGridControl;
-
-            // Ensure to push the RowSelector source to the SelectionChangeManager to be able to
-            // detect that a RowSelector was used to perform a selection of Row(s) and/or Cell(s)
-            using( dataGridControl.SelectionChangerManager.PushUpdateSelectionSource( SelectionManager.UpdateSelectionSource.RowSelector ) )
-            {
-              if( dataGridControl.SetFocusHelper( rowItemContainer, dataGridContext.CurrentColumn, true, true, true ) )
-              {
-                // Keep a reference to the mouse position so we can calculate when a drag operation is actually started.
-                dataGridControl.InitializeDragPostion( e );
-              }
-
-              if( dataGridControl.NavigationBehavior == NavigationBehavior.RowOrCell )
-              {
-                try
-                {
-                  dataGridContext.SetCurrentColumnCore( null, false, false, AutoScrollCurrentItemSourceTriggers.Navigation );
-                }
-                catch( DataGridException )
-                {
-                  // We swallow the exception if it occurs because of a validation error or Cell was read-only or any other GridException.
-                }
-              }
-            }
-          }
-        }
-      }
-
-      base.OnMouseLeftButtonDown( e );
-
-      m_isFromMouseButtonDown = false;
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      bool doDrag = false;
-
-      if( e.LeftButton == MouseButtonState.Pressed )
-      {
-        if( this.IsMouseCaptured )
-        {
-          Rect bounds = new Rect( 0d, 0d, this.ActualWidth, this.ActualHeight );
-          this.SetIsPressed( bounds.Contains( e.GetPosition( this ) ) );
-
-          e.Handled = true;
-        }
-
-        doDrag = true;
-      }
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext != null )
-      {
-        //Do not start the drag operation until we have an actual mouse mouve.
-        if( doDrag && !m_isFromMouseButtonDown )
-        {
-          dataGridContext.DataGridControl.DoDrag( e );
-        }
-        else
-        {
-          dataGridContext.DataGridControl.ResetDragDataObject();
-        }
-      }
-
-      base.OnMouseMove( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      bool isMouseCaptured = this.IsMouseCaptured;
-      bool isPressed = this.IsPressed;
-
-      if( isMouseCaptured )
-      {
-        this.ReleaseMouseCapture();
-        this.SetIsPressed( false );
-        e.Handled = true;
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-
-    protected override void OnLostMouseCapture( MouseEventArgs e )
-    {
-      if( this.IsPressed )
-      {
-        this.SetIsPressed( false );
-      }
-
-      base.OnLostMouseCapture( e );
-    }
-
-    private bool m_isFromMouseButtonDown = false;
-
-    #endregion Button Behavior Code
-
-    private static readonly Binding m_sDataContextBinding;
-    private static readonly Binding m_sItemIndexBinding;
-    private static readonly Binding m_sIsCurrentBinding;
-    private static readonly Binding m_sIsBeingEditedBinding;
-    private static readonly Binding m_sHasValidationErrorBinding;
-    private static readonly Binding m_sRowSelectorVisibleBinding;
-    private static readonly Binding m_sRowSelectorStyleBinding;
-    private static readonly Binding m_sAllowResizeBinding;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs
deleted file mode 100644
index e57d9bec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs
+++ /dev/null
@@ -1,523 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class RowSelectorPane : Panel
-  {
-    static RowSelectorPane()
-    {
-      ClipToBoundsProperty.OverrideMetadata( typeof( RowSelectorPane ), new FrameworkPropertyMetadata( true ) );
-      FocusableProperty.OverrideMetadata( typeof( RowSelectorPane ), new FrameworkPropertyMetadata( false ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( RowSelectorPane ), new FrameworkPropertyMetadata( new PropertyChangedCallback( RowSelectorPane.OnParentGridControlChanged ) ) );
-    }
-
-    #region Orientation Dependency Property
-
-    // Using a DependencyProperty as the backing store for Orientation.  This enables animation, styling, binding, etc...
-    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-      "Orientation",
-      typeof( Orientation ),
-      typeof( RowSelectorPane ),
-      new UIPropertyMetadata( Orientation.Vertical ) );
-
-    public Orientation Orientation
-    {
-      get
-      {
-        return ( Orientation )this.GetValue( RowSelectorPane.OrientationProperty );
-      }
-      set
-      {
-        this.SetValue( RowSelectorPane.OrientationProperty, value );
-      }
-    }
-
-    #endregion
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      foreach( UIElement child in this.InternalChildren )
-      {
-        var decorator = child as RowSelectorDecorator;
-        if( decorator != null )
-        {
-          if( this.IsRowSelectorVisible( decorator ) )
-          {
-            decorator.Visibility = Visibility.Visible;
-            decorator.Measure( this.GetAvailableSize( decorator, availableSize ) );
-          }
-          else
-          {
-            decorator.Visibility = Visibility.Collapsed;
-
-            if( !decorator.IsMeasureValid )
-            {
-              decorator.Measure( RowSelectorPane.EmptySize );
-            }
-          }
-        }
-        else
-        {
-          child.Measure( RowSelectorPane.EmptySize );
-        }
-      }
-
-      return RowSelectorPane.EmptySize;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      foreach( UIElement child in this.InternalChildren )
-      {
-        var decorator = child as RowSelectorDecorator;
-        if( decorator != null )
-        {
-          if( this.IsRowSelectorVisible( decorator ) )
-          {
-            var arrangeRect = this.GetArrangeRect( decorator, finalSize );
-            var rowSelector = decorator.RowSelector;
-            var referenceElement = ( rowSelector != null ) ? rowSelector.ReferenceElement : null;
-
-            decorator.Clip = this.GetClipRegion( decorator, arrangeRect, referenceElement );
-            decorator.Arrange( arrangeRect );
-          }
-          else if( !decorator.IsArrangeValid )
-          {
-            decorator.Arrange( RowSelectorPane.OutOfViewRect );
-          }
-        }
-        else
-        {
-          child.Arrange( RowSelectorPane.OutOfViewRect );
-        }
-      }
-
-      // The call to Mouse.Synchronize must not start dragging rows.
-      // Update the mouse status to make sure no container has invalid mouse over status.
-      // Only do this when the mouse is over the panel, to prevent unescessary update when scrolling with thumb.
-      if( this.IsMouseOver )
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-        var dataGridControl = ( dataGridContext != null ) ? dataGridContext.DataGridControl : null;
-
-        if( dataGridControl != null )
-        {
-          using( dataGridControl.InhibitDrag() )
-          {
-            Mouse.Synchronize();
-          }
-        }
-      }
-
-      return finalSize;
-    }
-
-    internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( RowSelectorPane ) );
-    }
-
-    internal void SetRowSelectorPosition( DependencyObject container, Rect containerRect, FrameworkElement referenceElement )
-    {
-      Debug.Assert( ( Visibility )this.GetValue( RowSelectorPane.VisibilityProperty ) == Visibility.Visible, "We should not be creating RowSelectors if we are not Visible." );
-
-      // Try to re-use the RowSelector already assigned to the container.
-      if( this.TryReUseVisibleRowSelector( container, containerRect ) )
-        return;
-
-      var decorator = this.RecycleOrCreateRowSelector( container );
-      Debug.Assert( decorator != null, "An attempt was made to set the position of a row selector that does not exist." );
-
-      RowSelectorPane.PrepareRowSelector( decorator, container, containerRect, referenceElement );
-
-      m_visibleSelectors.Add( container, decorator );
-
-      this.InvalidateMeasure();
-    }
-
-    internal void FreeRowSelector( DependencyObject container )
-    {
-      RowSelectorDecorator decorator;
-      if( !m_visibleSelectors.TryGetValue( container, out decorator ) )
-        return;
-
-      m_visibleSelectors.Remove( container );
-      m_pendingCleanup.Add( decorator );
-
-      this.ScheduleUnusedRowSelectorsCleanUp();
-      this.InvalidateMeasure();
-    }
-
-    private Rect GetArrangeRect( RowSelectorDecorator decorator, Size finalSize )
-    {
-      var rowSelector = decorator.RowSelector;
-      if( rowSelector == null )
-        return RowSelectorPane.EmptyRect;
-
-      var container = rowSelector.DataContext as FrameworkElement;
-      Debug.Assert( container != null );
-
-      var coordinatesTransform = container.TransformToVisual( this );
-      var origin = coordinatesTransform.Transform( RowSelectorPane.OriginPoint );
-
-      if( this.Orientation == Orientation.Vertical )
-        return new Rect( 0, origin.Y, finalSize.Width, container.ActualHeight );
-
-      return new Rect( origin.X, 0, container.ActualWidth, finalSize.Height );
-    }
-
-    private Size GetAvailableSize( RowSelectorDecorator decorator, Size availableSize )
-    {
-      var rowSelector = decorator.RowSelector;
-      if( rowSelector == null )
-        return RowSelectorPane.EmptySize;
-
-      var containerRect = rowSelector.ContainerRect;
-
-      if( this.Orientation == Orientation.Vertical )
-        return new Size( availableSize.Width, containerRect.Height );
-
-      return new Size( containerRect.Width, availableSize.Height );
-    }
-
-    private Geometry GetClipRegion( RowSelectorDecorator decorator, Rect arrangeRect, FrameworkElement referenceElement )
-    {
-      if( referenceElement == null )
-        return null;
-
-      var rowSelector = decorator.RowSelector;
-      if( rowSelector == null )
-        return null;
-
-      GeneralTransform referenceElementToRowSelectorPaneTransform = referenceElement.TransformToVisual( this );
-      Rect referenceElementRegion = referenceElementToRowSelectorPaneTransform.TransformBounds( new Rect( 0, 0, referenceElement.ActualWidth, referenceElement.ActualHeight ) );
-      RectangleGeometry clipRegion = null;
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        UIElement container = rowSelector.DataContext as UIElement;
-
-        if( ( container != null ) && ( container.Clip != null ) )
-        {
-          Rect containerClipBounds = container.Clip.Bounds;
-
-          // In this case, we will use the container's clip properties (Top and Bottom).
-          clipRegion = new RectangleGeometry( new Rect( 0d, containerClipBounds.Y, arrangeRect.Width, containerClipBounds.Height ) );
-        }
-        else if( ( arrangeRect.Top < referenceElementRegion.Top ) || ( arrangeRect.Bottom > referenceElementRegion.Bottom ) )
-        {
-          double x = 0d;
-          double y = Math.Max( referenceElementRegion.Top - arrangeRect.Top, 0 );
-
-          double width = arrangeRect.Width;
-          double height = Math.Max( 0, arrangeRect.Height - y - Math.Max( 0, arrangeRect.Bottom - referenceElementRegion.Bottom ) );
-
-          clipRegion = new RectangleGeometry( new Rect( x, y, width, height ) );
-        }
-      }
-      else
-      {
-        UIElement container = rowSelector.DataContext as UIElement;
-
-        if( ( container != null ) && ( container.Clip != null ) )
-        {
-          Rect containerClipBounds = container.Clip.Bounds;
-
-          // In this case, we will use the container's clip properties (Left and Right).
-          clipRegion = new RectangleGeometry( new Rect( containerClipBounds.X, 0d, containerClipBounds.Width, arrangeRect.Height ) );
-        }
-        else if( ( arrangeRect.Left < referenceElementRegion.Left ) || ( arrangeRect.Right > referenceElementRegion.Right ) )
-        {
-          double x = Math.Max( referenceElementRegion.Left - arrangeRect.Left, 0 );
-          double y = 0d;
-
-          double width = arrangeRect.Width - x - Math.Max( 0, arrangeRect.Right - referenceElementRegion.Right );
-          double height = arrangeRect.Height;
-
-          clipRegion = new RectangleGeometry( new Rect( x, y, width, height ) );
-        }
-      }
-
-      return clipRegion;
-    }
-
-    private bool IsRowSelectorVisible( RowSelectorDecorator decorator )
-    {
-      Debug.Assert( decorator != null );
-      if( decorator.RowSelector == null )
-        return false;
-
-      var container = DataGridControl.GetContainer( decorator );
-      if( container == null )
-        return false;
-
-      return m_visibleSelectors.ContainsKey( container );
-    }
-
-    private bool TryReUseVisibleRowSelector( DependencyObject container, Rect containerRect )
-    {
-      RowSelectorDecorator decorator;
-      if( !m_visibleSelectors.TryGetValue( container, out decorator ) )
-        return false;
-
-      var rowSelector = decorator.RowSelector;
-      if( rowSelector == null )
-      {
-        this.FreeRowSelector( container );
-        return false;
-      }
-
-      // Check if the cached position and size of the target container is up to date.
-      if( !Rect.Equals( rowSelector.ContainerRect, containerRect ) )
-      {
-        rowSelector.ContainerRect = containerRect;
-
-        this.InvalidateMeasure();
-      }
-
-      return true;
-    }
-
-    private RowSelectorDecorator RecycleOrCreateRowSelector( DependencyObject container )
-    {
-      RowSelectorDecorator decorator;
-
-      // Try to re-use a RowSelector that is schedule to be clean up.
-      if( m_pendingCleanup.Count > 0 )
-      {
-        int index = m_pendingCleanup.Count - 1;
-
-        for( int i = index; i >= 0; i-- )
-        {
-          decorator = m_pendingCleanup[ i ];
-          if( DataGridControl.GetContainer( decorator ) == container )
-          {
-            index = i;
-            break;
-          }
-        }
-
-        decorator = m_pendingCleanup[ index ];
-        m_pendingCleanup.RemoveAt( index );
-      }
-      // Try to recycle a RowSelector from the recycling pool.
-      else if( m_recyclingQueue.Count > 0 )
-      {
-        decorator = m_recyclingQueue.Dequeue();
-      }
-      else
-      {
-        decorator = new RowSelectorDecorator();
-
-        this.InternalChildren.Add( decorator );
-      }
-
-      return decorator;
-    }
-
-    private void ScheduleUnusedRowSelectorsCleanUp()
-    {
-      if( m_pendingCleanupOperation != null )
-        return;
-
-      m_pendingCleanupOperation = this.Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, new Action( this.CleanUpUnusedRowSelectors ) );
-    }
-
-    private void CleanUpUnusedRowSelectors()
-    {
-      m_pendingCleanupOperation = null;
-
-      for( int i = m_pendingCleanup.Count - 1; i >= 0; i-- )
-      {
-        var decorator = m_pendingCleanup[ i ];
-
-        RowSelectorPane.ClearRowSelector( decorator );
-
-        if( decorator.RowSelector != null )
-        {
-          m_recyclingQueue.Enqueue( decorator );
-        }
-        else
-        {
-          // The RowSelector has become useless, so we destroy it.
-          this.InternalChildren.Remove( decorator );
-        }
-      }
-
-      m_pendingCleanup.Clear();
-    }
-
-    private static void PrepareRowSelector( RowSelectorDecorator decorator, DependencyObject container, Rect containerRect, FrameworkElement referenceElement )
-    {
-      Debug.Assert( decorator != null );
-
-      DataGridControl.SetContainer( decorator, container );
-
-      var rowSelector = decorator.RowSelector;
-      if( rowSelector != null )
-      {
-        rowSelector.ReferenceElement = referenceElement;
-        rowSelector.ContainerRect = containerRect;
-      }
-    }
-
-    private static void ClearRowSelector( RowSelectorDecorator decorator )
-    {
-      Debug.Assert( decorator != null );
-
-      DataGridControl.ClearContainer( decorator );
-
-      var rowSelector = decorator.RowSelector;
-      if( rowSelector != null )
-      {
-        rowSelector.ReferenceElement = null;
-        rowSelector.ContainerRect = RowSelectorPane.EmptyRect;
-      }
-    }
-
-    private static void OnParentGridControlChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      RowSelectorPane rowSelectorPane = ( RowSelectorPane )sender;
-      DataGridControl newGrid = e.NewValue as DataGridControl;
-      DataGridControl oldGrid = e.OldValue as DataGridControl;
-
-      if( oldGrid != null )
-      {
-        // The RowSelectorPane must clear its internal state when the ParentGridControl changes
-        rowSelectorPane.m_pendingCleanup.Clear();
-        rowSelectorPane.m_recyclingQueue.Clear();
-        rowSelectorPane.m_visibleSelectors.Clear();
-        rowSelectorPane.InternalChildren.Clear();
-      }
-
-      if( newGrid != null )
-      {
-        rowSelectorPane.PrepareDefaultStyleKey( newGrid.GetView() );
-      }
-
-      rowSelectorPane.InvalidateMeasure();
-    }
-
-    #region Obsolete Members
-
-    [Obsolete( "The ItemsPlacementReference property is obsolete and should no longer be used.", true )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public FrameworkElement ItemsPlacementReference
-    {
-      get
-      {
-        return null;
-      }
-      set
-      {
-      }
-    }
-
-    [Obsolete( "The ItemsPlacementReferenceProperty dependency property is obsolete and should no longer be used.", true )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty ItemsPlacementReferenceProperty;
-
-
-    [Obsolete( "The RowSelectorStyle attached property is obsolete and has been replaced by the RowSelector.RowSelectorStyle attached property.", true )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static Style GetRowSelectorStyle( DependencyObject obj )
-    {
-      return null;
-    }
-
-    [Obsolete( "The RowSelectorStyle attached property is obsolete and has been replaced by the RowSelector.RowSelectorStyle attached property.", true )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static void SetRowSelectorStyle( DependencyObject obj, Style value )
-    {
-    }
-
-    [Obsolete( "The RowSelectorStyleProperty dependency property is obsolete and has been replaced by the RowSelector.RowSelectorStyleProperty dependency property.", true )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty RowSelectorStyleProperty;
-
-    [Obsolete( "The ScrollViewer property is obsolete and should no longer be used.", true )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public ScrollViewer ScrollViewer
-    {
-      get
-      {
-        return null;
-      }
-      set
-      {
-      }
-    }
-
-    [Obsolete( "The ScrollViewerProperty dependency property is obsolete and should no longer be used.", true )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty ScrollViewerProperty;
-
-    #endregion Obsolete Members
-
-    #region CONSTANTS
-
-    private static readonly Point OriginPoint = new Point( 0d, 0d );
-    private static readonly Size EmptySize = new Size( 0d, 0d );
-    private static readonly Rect EmptyRect = new Rect( RowSelectorPane.OriginPoint, RowSelectorPane.EmptySize );
-    private static readonly Rect OutOfViewRect = new Rect( new Point( -999999d, -999999d ), RowSelectorPane.EmptySize );
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private readonly Queue<RowSelectorDecorator> m_recyclingQueue = new Queue<RowSelectorDecorator>();
-    private readonly List<RowSelectorDecorator> m_pendingCleanup = new List<RowSelectorDecorator>();
-    private readonly Dictionary<DependencyObject, RowSelectorDecorator> m_visibleSelectors = new Dictionary<DependencyObject, RowSelectorDecorator>();
-    private DispatcherOperation m_pendingCleanupOperation; //null
-
-    #endregion
-
-    #region RowSelectorDecorator Private Class
-
-    private sealed class RowSelectorDecorator : Decorator
-    {
-      internal RowSelectorDecorator()
-      {
-        this.Focusable = false;
-        this.OverridesDefaultStyle = true;
-
-        this.Child = new RowSelector();
-      }
-
-      internal RowSelector RowSelector
-      {
-        get
-        {
-          return this.Child as RowSelector;
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowState.cs
deleted file mode 100644
index 225b1c8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowState.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class RowState
-  {
-    public RowState()
-    {
-    }
-
-    // Restore it only if the Row is being edited
-    public RowValidationError ItemValidationError
-    {
-      get
-      {
-        return m_itemValidationError;
-      }
-    }
-
-    // Restore it only if the Row is being edited
-    public bool IsDirty
-    {
-      get
-      {
-        return m_isDirty;
-      }
-    }
-
-    public RowState Clone()
-    {
-      RowState rowState = new RowState();
-
-      rowState.m_itemValidationError = m_itemValidationError;
-      rowState.m_isDirty = m_isDirty;
-
-      return rowState;
-    }
-
-    internal void SetItemValidationError( RowValidationError value )
-    {
-      m_itemValidationError = value;
-    }
-
-    internal void SetIsDirty( bool value )
-    {
-      m_isDirty = value;
-    }
-
-    private RowValidationError m_itemValidationError; // = null;
-    private bool m_isDirty; // = false
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationError.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationError.cs
deleted file mode 100644
index 5f33474e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationError.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class RowValidationError
-  {
-    public RowValidationError(
-      ValidationRule ruleInError,
-      Row rowInError,
-      object errorContent,
-      Exception exception )
-    {
-      m_ruleInError = ruleInError;
-      m_rowInError = rowInError;
-      m_errorContent = errorContent;
-      m_exception = exception;
-    }
-
-    public ValidationRule RuleInError
-    {
-      get
-      {
-        return m_ruleInError;
-      }
-    }
-
-    public Row RowInError
-    {
-      get
-      {
-        return m_rowInError;
-      }
-    }
-
-    public object ErrorContent
-    {
-      get
-      {
-        return m_errorContent;
-      }
-      set
-      {
-        m_errorContent = value;
-      }
-    }
-
-    public Exception Exception
-    {
-      get
-      {
-        return m_exception;
-      }
-    }
-
-    private ValidationRule m_ruleInError;
-    private Row m_rowInError;
-    private object m_errorContent;
-    private Exception m_exception;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs
deleted file mode 100644
index 4f67d28b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs
+++ /dev/null
@@ -1,672 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class ScrollTip : ContentControl, IWeakEventListener
-  {
-    #region CONSTRUCTORS
-
-    static ScrollTip()
-    {
-      // This DefaultStyleKey will only be used in design-time.
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ScrollTip ), new FrameworkPropertyMetadata( new Markup.ThemeKey( typeof( Views.TableView ), typeof( ScrollTip ) ) ) );
-
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( ScrollTip ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ScrollTip.ParentGridControlPropertyChangedCallback ) ) );
-      DataGridControl.DataGridContextPropertyKey.OverrideMetadata( typeof( ScrollTip ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ScrollTip.OnDataGridContextPropertyChanged ) ) );
-    }
-
-    #endregion
-
-    #region PUBLIC METHODS
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      this.ScrollTipContentTemplateNeedsRefresh = true;
-      this.RefreshDefaultScrollTipContentTemplate();
-    }
-
-    #endregion
-
-    #region PROTECTED METHODS
-
-    protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
-    {
-      this.DefaultStyleKey = view.GetDefaultStyleKey( typeof( ScrollTip ) );
-    }
-
-    #endregion
-
-    #region ScrollTipContentTemplateNeedsRefresh Private Property
-
-    private bool ScrollTipContentTemplateNeedsRefresh
-    {
-      get
-      {
-        return m_flags[ ( int )ScrollTipFlags.ScrollTipContentTemplateNeedsRefresh ];
-      }
-      set
-      {
-        m_flags[ ( int )ScrollTipFlags.ScrollTipContentTemplateNeedsRefresh ] = value;
-      }
-    }
-
-    #endregion
-
-    #region UsingDefaultScrollTipContentTemplate Private Property
-
-    private bool UsingDefaultScrollTipContentTemplate
-    {
-      get
-      {
-        return m_flags[ ( int )ScrollTipFlags.UsingDefaultScrollTipContentTemplate ];
-      }
-      set
-      {
-        m_flags[ ( int )ScrollTipFlags.UsingDefaultScrollTipContentTemplate ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsInParentGridChanged Private Property
-
-    private bool IsInParentGridChanged
-    {
-      get
-      {
-        return m_flags[ ( int )ScrollTipFlags.IsInParentGridChanged ];
-      }
-      set
-      {
-        m_flags[ ( int )ScrollTipFlags.IsInParentGridChanged ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsPixelScrolling Private Property
-
-    private bool IsPixelScrolling
-    {
-      get
-      {
-        return m_flags[ ( int )ScrollTipFlags.IsPixelScrolling ];
-      }
-      set
-      {
-        m_flags[ ( int )ScrollTipFlags.IsPixelScrolling ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ShouldDisplayScrollTip Private Property
-
-    private bool ShouldDisplayScrollTip
-    {
-      get
-      {
-        DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-        if( dataGridContext != null )
-        {
-          if( dataGridContext.DataGridControl != null )
-          {
-            UIViewBase uiViewBase = dataGridContext.DataGridControl.GetView() as UIViewBase;
-            if( ( uiViewBase != null ) && ( uiViewBase.ShowScrollTip ) )
-              return true;
-          }
-        }
-
-        return false;
-      }
-    }
-
-    #endregion
-
-    #region DefaultScrollTipContentTemplateBinding Private Property
-
-    private Binding DefaultScrollTipContentTemplateBinding
-    {
-      get
-      {
-        if( m_defaultScrollTipContentTemplateBinding == null )
-        {
-          m_defaultScrollTipContentTemplateBinding = new Binding();
-          m_defaultScrollTipContentTemplateBinding.Path = new PropertyPath( "(0).ScrollTipContentTemplate", DataGridControl.DataGridContextProperty );
-          m_defaultScrollTipContentTemplateBinding.Source = this;
-        }
-
-        return m_defaultScrollTipContentTemplateBinding;
-      }
-    }
-
-    private Binding m_defaultScrollTipContentTemplateBinding; // = null;
-
-    #endregion
-
-    #region DefaultScrollTipContentTemplateSelectorBinding Private Property
-
-    private Binding DefaultScrollTipContentTemplateSelectorBinding
-    {
-      get
-      {
-        if( m_defaultScrollTipContentTemplateSelectorBinding == null )
-        {
-          m_defaultScrollTipContentTemplateSelectorBinding = new Binding();
-          m_defaultScrollTipContentTemplateSelectorBinding.Path = new PropertyPath( "(0).ScrollTipContentTemplateSelector", DataGridControl.DataGridContextProperty );
-          m_defaultScrollTipContentTemplateSelectorBinding.Source = this;
-        }
-
-        return m_defaultScrollTipContentTemplateSelectorBinding;
-      }
-    }
-
-
-    private Binding m_defaultScrollTipContentTemplateSelectorBinding; // = null;
-
-    #endregion
-
-    #region DefaultCellContentTemplateBinding Private Property
-
-    private Binding DefaultCellContentTemplateBinding
-    {
-      get
-      {
-        if( m_defaultCellContentTemplateBinding == null )
-        {
-          m_defaultCellContentTemplateBinding = new Binding();
-          m_defaultCellContentTemplateBinding.Path = new PropertyPath( "(0).Columns.MainColumn.CellContentTemplate", DataGridControl.DataGridContextProperty );
-          m_defaultCellContentTemplateBinding.Source = this;
-        }
-
-        return m_defaultCellContentTemplateBinding;
-      }
-    }
-
-    private Binding m_defaultCellContentTemplateBinding;
-
-    #endregion
-
-    #region DefaultCellContentTemplateSelectorBinding Private Property
-
-    private Binding DefaultCellContentTemplateSelectorBinding
-    {
-      get
-      {
-        if( m_defaultCellContentTemplateSelectorBinding == null )
-        {
-          m_defaultCellContentTemplateSelectorBinding = new Binding();
-          m_defaultCellContentTemplateSelectorBinding.Path = new PropertyPath( "(0).Columns.MainColumn.CellContentTemplateSelector", DataGridControl.DataGridContextProperty );
-          m_defaultCellContentTemplateSelectorBinding.Source = this;
-        }
-
-        return m_defaultCellContentTemplateSelectorBinding;
-      }
-    }
-
-    private Binding m_defaultCellContentTemplateSelectorBinding;
-
-    #endregion
-
-    #region PRIVATE METHODS
-
-    private static void OnDataGridContextPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ScrollTip scrollTip = ( ScrollTip )sender;
-
-      DataGridContext oldItemContext = e.OldValue as DataGridContext;
-      DataGridContext newItemContext = e.NewValue as DataGridContext;
-
-      if( scrollTip.m_mainColumn != null )
-      {
-        PropertyChangedEventManager.RemoveListener( scrollTip.m_mainColumn, scrollTip, Column.DisplayMemberBindingPropertyName );
-      }
-
-      scrollTip.m_mainColumn = null;
-
-      if( oldItemContext != null )
-      {
-        PropertyChangedEventManager.RemoveListener( oldItemContext.Columns, scrollTip, ColumnCollection.MainColumnPropertyName );
-      }
-
-      scrollTip.ClearValue( ScrollTip.ContentProperty );
-
-      if( newItemContext != null )
-      {
-        scrollTip.m_mainColumn = newItemContext.Columns.MainColumn;
-
-        if( scrollTip.m_mainColumn != null )
-        {
-          PropertyChangedEventManager.AddListener( scrollTip.m_mainColumn, scrollTip, Column.DisplayMemberBindingPropertyName );
-        }
-
-        PropertyChangedEventManager.AddListener( newItemContext.Columns, scrollTip, ColumnCollection.MainColumnPropertyName );
-      }
-
-      if( !scrollTip.IsInParentGridChanged )
-      {
-        if( !scrollTip.ApplyTemplate() )
-          scrollTip.RefreshDefaultScrollTipContentTemplate();
-      }
-    }
-
-    private static void ParentGridControlPropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridControl oldParentGridControl = e.OldValue as DataGridControl;
-      DataGridControl parentGridControl = e.NewValue as DataGridControl;
-      ScrollTip scrollTip = sender as ScrollTip;
-
-      scrollTip.IsInParentGridChanged = true;
-      try
-      {
-        if( oldParentGridControl != null )
-        {
-          if( scrollTip.UsingDefaultScrollTipContentTemplate )
-          {
-            // Unload DefaultTemplate
-            Xceed.Wpf.DataGrid.Views.UIViewBase uiViewBase = oldParentGridControl.GetView() as Xceed.Wpf.DataGrid.Views.UIViewBase;
-
-            if( uiViewBase != null )
-            {
-              uiViewBase.ClearValue( UIViewBase.ScrollTipContentTemplateProperty );
-              scrollTip.UsingDefaultScrollTipContentTemplate = false;
-            }
-          }
-
-          if( scrollTip.m_mainColumn != null )
-          {
-            PropertyChangedEventManager.RemoveListener( scrollTip.m_mainColumn, scrollTip, "DisplayMemberBinding" );
-          }
-
-          scrollTip.m_mainColumn = null;
-
-          scrollTip.UnregisterListeners( oldParentGridControl );
-        }
-
-        if( parentGridControl == null )
-          return;
-
-        scrollTip.PrepareDefaultStyleKey( parentGridControl.GetView() );
-
-        // Assert Template is applied in order to be notified for ScrollBars events
-        DataGridControl.SetDataGridContext( scrollTip, parentGridControl.DataGridContext );
-
-        if( !scrollTip.ApplyTemplate() )
-          scrollTip.RefreshDefaultScrollTipContentTemplate();
-
-        scrollTip.RegisterListeners( parentGridControl );
-      }
-      finally
-      {
-        scrollTip.IsInParentGridChanged = false;
-      }
-    }
-
-    private void RegisterListeners( DataGridControl parentGridControl )
-    {
-      if( parentGridControl.ScrollViewer != null )
-      {
-        parentGridControl.ScrollViewer.ScrollChanged += new ScrollChangedEventHandler( this.OnScrollViewerScrollChanged );
-        m_scrollViewerTemplateHelper = new ScrollViewerTemplateHelper( parentGridControl.ScrollViewer, this.DragScrollBegin, this.DragScrollEnd );
-        m_scrollViewerTemplateHelper.RefreshTemplate();
-      }
-    }
-
-    private void UnregisterListeners( DataGridControl parentGridControl )
-    {
-      if( parentGridControl.ScrollViewer != null )
-      {
-        parentGridControl.ScrollViewer.ScrollChanged -= new ScrollChangedEventHandler( this.OnScrollViewerScrollChanged );
-      }
-
-      if( m_scrollViewerTemplateHelper != null )
-      {
-        m_scrollViewerTemplateHelper.Dispose();
-        m_scrollViewerTemplateHelper = null;
-      }
-    }
-
-    private void RefreshDefaultScrollTipContentTemplate()
-    {
-      DataGridContext itemContext = DataGridControl.GetDataGridContext( this );
-
-      if( itemContext == null )
-        return;
-
-      DataGridControl parentGridControl = itemContext.DataGridControl;
-
-      if( ( parentGridControl == null ) || ( parentGridControl.ScrollViewer == null ) )
-        return;
-
-      ColumnCollection columnCollection = itemContext.Columns;
-
-      if( columnCollection == null )
-        return;
-
-      Column mainColumn = columnCollection.MainColumn as Column;
-
-      if( mainColumn == null )
-        return;
-
-      Xceed.Wpf.DataGrid.Views.UIViewBase uiViewBase = parentGridControl.GetView() as Xceed.Wpf.DataGrid.Views.UIViewBase;
-
-      if( uiViewBase == null )
-        return;
-
-      // The ScrollTip.ContentTemplate will now be set. This is to avoid
-      // a null ContentTemplate when the ColumnsCollection update its
-      // MainColumn after the template is applied
-      this.ScrollTipContentTemplateNeedsRefresh = false;
-
-      ForeignKeyConfiguration configuration = mainColumn.ForeignKeyConfiguration;
-
-      // Do not create default template only when none was created before and a template already exists
-      if( ( !this.UsingDefaultScrollTipContentTemplate ) && ( uiViewBase.ScrollTipContentTemplate != null ) )
-      {
-        if( configuration != null )
-        {
-          this.ContentTemplate = configuration.DefaultScrollTipContentTemplate;
-        }
-        else
-        {
-          // Clear the value in case we previously affected it 
-          this.ClearValue( ScrollTip.ContentTemplateProperty );
-
-          // Set the default Binding values
-          this.SetBinding( ScrollTip.ContentTemplateProperty, this.DefaultScrollTipContentTemplateBinding );
-          this.SetBinding( ScrollTip.ContentTemplateSelectorProperty, this.DefaultScrollTipContentTemplateSelectorBinding );
-        }
-      }
-      else
-      {
-        // A default ContentTemplate template is created using MainColumn as displayed data
-        this.UsingDefaultScrollTipContentTemplate = true;
-
-        // If a configuration was found, the default ContentTemplate will
-        // be used to convert Content to Foreign value and
-        // it will use the ScrollTipContentTemplate defined on UIViewBase
-        // if any
-        if( configuration == null )
-        {
-          // Disable warning for DisplayMemberBinding when internaly used
-#pragma warning disable 618
-
-          BindingBase displayMemberBinding = mainColumn.DisplayMemberBinding;
-
-#pragma warning restore 618
-
-          FrameworkElementFactory contentPresenter = new FrameworkElementFactory( typeof( ContentPresenter ) );
-          contentPresenter.SetValue( ContentPresenter.NameProperty, "defaultScrollTipDataTemplateContentPresenter" );
-          contentPresenter.SetBinding( ContentPresenter.ContentProperty, displayMemberBinding );
-
-          contentPresenter.SetBinding( ContentPresenter.ContentTemplateProperty, this.DefaultCellContentTemplateBinding );
-          contentPresenter.SetBinding( ContentPresenter.ContentTemplateSelectorProperty, this.DefaultCellContentTemplateSelectorBinding );
-
-          DataTemplate template = new DataTemplate();
-          template.VisualTree = contentPresenter;
-          template.Seal();
-
-          this.ContentTemplate = template;
-        }
-        else
-        {
-          this.SetBinding( ContentPresenter.ContentTemplateProperty, this.DefaultCellContentTemplateBinding );
-          this.SetBinding( ContentPresenter.ContentTemplateSelectorProperty, this.DefaultCellContentTemplateSelectorBinding );
-          this.ContentTemplate = configuration.DefaultScrollTipContentTemplate;
-        }
-      }
-    }
-
-    private void DragScrollBegin( Orientation orientation )
-    {
-      if( !this.ShouldDisplayScrollTip )
-        return;
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      if( dataGridContext.DataGridControl == null )
-        return;
-
-      // Update items scrolling orientation and pixel scrolling
-      m_itemsScrollingOrientation = ScrollViewerHelper.GetItemScrollingOrientation( dataGridContext.DataGridControl );
-
-      if( m_itemsScrollingOrientation != orientation )
-        return;
-
-      this.Visibility = Visibility.Visible;
-
-      this.IsPixelScrolling = ScrollViewerHelper.IsPixelScrolling( dataGridContext.DataGridControl, dataGridContext.DataGridControl.ItemsHost, dataGridContext.DataGridControl.ScrollViewer );
-
-      this.RefreshScrollTipContent( m_scrollViewerTemplateHelper.GetScrollBar( orientation ) );
-    }
-
-    private void DragScrollEnd( Orientation orientation )
-    {
-      this.Visibility = Visibility.Collapsed;
-    }
-
-    private void OnScrollViewerScrollChanged( object sender, ScrollChangedEventArgs e )
-    {
-      if( this.Visibility != Visibility.Visible )
-        return;
-
-      if( !this.ShouldDisplayScrollTip )
-        return;
-
-      // Determine if we are scrolling horizontally or vertically
-      ScrollBar scrollBar = null;
-
-      if( e.VerticalChange == 0 )
-      {
-        scrollBar = m_scrollViewerTemplateHelper.HorizontalScrollBar;
-      }
-      else
-      {
-        scrollBar = m_scrollViewerTemplateHelper.VerticalScrollBar;
-      }
-
-      if( scrollBar == null )
-        return;
-
-      this.RefreshScrollTipContent( scrollBar );
-    }
-
-    private void RefreshScrollTipContent( ScrollBar scrollBar )
-    {
-      const int MaxItemToVisit = 100;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return;
-
-      var parentGridControl = dataGridContext.DataGridControl;
-      if( parentGridControl == null )
-        return;
-
-      if( scrollBar.Orientation != m_itemsScrollingOrientation )
-        return;
-
-      var maxOffset = 0d;
-
-      if( scrollBar.Orientation == Orientation.Vertical )
-      {
-        maxOffset = parentGridControl.ScrollViewer.ExtentHeight;
-      }
-      else
-      {
-        maxOffset = parentGridControl.ScrollViewer.ExtentWidth;
-      }
-
-      var offset = scrollBar.Track.Value;
-
-      var itemMaxOffset = 0;
-      var itemOffset = 0;
-      var itemHiddenRatio = 0d;
-
-      if( this.IsPixelScrolling )
-      {
-        // Calculate the offset ratio to get the item from the Generator
-        int itemsCount = parentGridControl.CustomItemContainerGenerator.ItemCount;
-        itemMaxOffset = itemsCount;
-
-        if( ( maxOffset > 0 ) && ( itemsCount > 0 ) )
-        {
-          var position = offset / ( maxOffset / itemsCount );
-          itemOffset = ( int )position;
-          itemHiddenRatio = position - itemOffset;
-        }
-        else
-        {
-          itemOffset = 0;
-        }
-      }
-      else
-      {
-        itemMaxOffset = ( int )maxOffset;
-        itemOffset = ( int )offset;
-        itemHiddenRatio = offset - itemOffset;
-      }
-
-      object newValue;
-      DataGridContext itemContext;
-
-      // If data is grouped, we do not want to keep the next data item if a HeaderFooterItem
-      // is the current item returned. So we increment the scroll up to the next item in order
-      // to get the real item that will be visible when the user will release the mouse
-      var visitor = new ItemContextVisitor( parentGridControl.ItemsHost as TableflowViewItemsHost, itemHiddenRatio );
-      var endOffset = Math.Min( itemOffset + MaxItemToVisit, itemMaxOffset );
-      bool visitWasStopped;
-      ( ( IDataGridContextVisitable )parentGridControl.DataGridContext ).AcceptVisitor( itemOffset, endOffset, visitor, DataGridContextVisitorType.Items, out visitWasStopped );
-
-      if( visitor.VisitSuccessful )
-      {
-        itemContext = visitor.ParentDataGridContext;
-        newValue = visitor.Item;
-      }
-      else
-      {
-        //Set the ItemContext as the ScrollTip's DataGridContext, this is to ensure the
-        //ScrollTip will not change the ScrollContentTemplate ( by invalidation of the binding).
-        itemContext = DataGridControl.GetDataGridContext( this );
-        newValue = null; //show nothing in the ScrollTip.
-      }
-
-      // The TippedItemDataGridContext PropertChanged callback will take care of refreshing the ScrollTip CellContentTemplate.
-      if( itemContext != DataGridControl.GetDataGridContext( this ) )
-      {
-        DataGridControl.SetDataGridContext( this, itemContext );
-      }
-
-      this.Content = newValue;
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return true;
-
-      if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        if( dataGridContext.Columns == sender )
-        {
-          if( m_mainColumn != null )
-          {
-            PropertyChangedEventManager.RemoveListener( m_mainColumn, this, Column.DisplayMemberBindingPropertyName );
-          }
-
-          m_mainColumn = dataGridContext.Columns.MainColumn;
-
-          if( m_mainColumn != null )
-          {
-            PropertyChangedEventManager.AddListener( m_mainColumn, this, Column.DisplayMemberBindingPropertyName );
-          }
-
-          // If a defaut template was created for the previous MainColumn
-          // create another one for the new MainColumn
-          if( this.UsingDefaultScrollTipContentTemplate || this.ScrollTipContentTemplateNeedsRefresh )
-          {
-            this.RefreshDefaultScrollTipContentTemplate();
-          }
-        }
-        else if( sender == m_mainColumn )
-        {
-          // If a defaut template was created for the previous MainColumn
-          // create another one
-          if( this.UsingDefaultScrollTipContentTemplate || this.ScrollTipContentTemplateNeedsRefresh )
-          {
-            this.RefreshDefaultScrollTipContentTemplate();
-          }
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private ColumnBase m_mainColumn; // = null;
-    private Orientation m_itemsScrollingOrientation = Orientation.Vertical;
-    private ScrollViewerTemplateHelper m_scrollViewerTemplateHelper;
-
-    private BitVector32 m_flags = new BitVector32();
-
-    #endregion
-
-    #region ScrollTipFlags Private Enum
-
-    [Flags]
-    private enum ScrollTipFlags
-    {
-      UsingDefaultScrollTipContentTemplate = 1,
-      IsInParentGridChanged = 2,
-      IsPixelScrolling = 4,
-      ScrollTipContentTemplateNeedsRefresh = 8,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollViewerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollViewerHelper.cs
deleted file mode 100644
index ae7448d7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollViewerHelper.cs
+++ /dev/null
@@ -1,711 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Controls.Primitives;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Utils.Math;
-using Xceed.Utils.Wpf;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class ScrollViewerHelper
-  {
-    //-----------------  PROPERTIES -------------------------
-
-    private static ScrollViewerHelper Current
-    {
-      get
-      {
-        if( m_singleInstance == null )
-        {
-          m_singleInstance = new ScrollViewerHelper();
-        }
-
-        return m_singleInstance;
-      }
-    }
-
-    public static readonly int PixelScrollingCount = 16;
-
-    //-----------------  PUBLIC METHODS -------------------------
-
-    public static bool IsFocusInElement( FrameworkElement element )
-    {
-      if( element != null )
-        return element.IsKeyboardFocusWithin;
-      else
-        return false;
-    }
-
-    public static FrameworkElement GetLastVisibleContainer( 
-      DataGridControl gridControl,
-      FrameworkElement container,
-      ScrollViewer scrollViewer )
-    {
-      FrameworkElement retval = null;
-
-      if( ScrollViewerHelper.IsPixelScrolling( gridControl, container, scrollViewer ) == false )
-      {
-        //This means that the panel is performing Item Scrolling
-
-        //if the panel is Vertically scrolling the items (means the Horizontal Axis is Pixel scrolling)
-        if( ScrollViewerHelper.GetItemScrollingOrientation( gridControl, container, scrollViewer ) == Orientation.Vertical )
-        {
-          retval = ScrollViewerHelper.ProcessLastVisibleContainer( gridControl,
-            scrollViewer.VerticalOffset,
-            scrollViewer.ViewportHeight,
-            scrollViewer.HorizontalOffset,
-            scrollViewer.ViewportWidth,
-            Orientation.Vertical );
-        }
-        //the panel is Horizontally scrolling the items (means the Vertically Axis is Pixel scrolling)
-        else
-        {
-          retval = ScrollViewerHelper.ProcessLastVisibleContainer( gridControl,
-            scrollViewer.HorizontalOffset,
-            scrollViewer.ViewportWidth,
-            scrollViewer.VerticalOffset,
-            scrollViewer.ViewportHeight,
-            Orientation.Horizontal );
-        }
-      }
-      else
-      {
-        Point pt = new Point();
-
-        if( ( container is VirtualizingPanel )
-            || ( container is DataGridItemsHost )
-            || ( scrollViewer == null ) )
-        {
-          pt.X = 0;
-          pt.Y = 0;
-        }
-        else
-        {
-          pt.X = scrollViewer.HorizontalOffset;
-          pt.Y = scrollViewer.VerticalOffset;
-        }
-
-        Size size = new Size( ( scrollViewer != null ) ? scrollViewer.ViewportWidth : container.ActualWidth,
-                              ( scrollViewer != null ) ? scrollViewer.ViewportHeight : container.ActualHeight );
-
-        Rect visibleRect = new Rect( pt, size );
-
-        RectangleGeometry geo = new RectangleGeometry( visibleRect );
-
-        lock( ScrollViewerHelper.Current )
-        {
-          m_sVisibleChildList.Clear();
-          m_sGridControl = gridControl;
-
-          VisualTreeHelper.HitTest( container,
-                                    new HitTestFilterCallback( ScrollViewerHelper.MyFilterFunct ),
-                                    new HitTestResultCallback( ScrollViewerHelper.UselessResultCallback ),
-                                    new GeometryHitTestParameters( geo ) );
-
-          m_sGridControl = null;
-
-          FrameworkElement preservedChild = null;
-          Nullable<Vector> preservedOffset = null;
-
-          foreach( FrameworkElement child in m_sVisibleChildList )
-          {
-            Vector itemOffset = VisualTreeHelper.GetOffset( child );
-
-            Rect itemRect = new Rect( itemOffset.X, itemOffset.Y, child.ActualWidth, child.ActualHeight );
-
-            itemRect.Intersect( visibleRect );
-
-            switch( gridControl.ItemsPrimaryAxis )
-            {
-              case PrimaryAxis.Vertical:
-                if( DoubleUtil.AreClose( itemRect.Width, 0 ) == false )
-                {
-                  if( DoubleUtil.AreClose( itemRect.Height, child.ActualHeight ) == true )
-                  {
-                    if( ScrollViewerHelper.IsABetterLastRow( preservedChild, preservedOffset, itemOffset ) == true )
-                    {
-                      preservedChild = child;
-                      preservedOffset = itemOffset;
-                    }
-                  }
-                }
-                break;
-              case PrimaryAxis.Horizontal:
-                if( DoubleUtil.AreClose( itemRect.Width, child.ActualWidth ) == true )
-                {
-                  if( DoubleUtil.AreClose( itemRect.Height, 0 ) == false )
-                  {
-                    if( ScrollViewerHelper.IsABetterLastRow( preservedChild, preservedOffset, itemOffset ) == true )
-                    {
-                      preservedChild = child;
-                      preservedOffset = itemOffset;
-                    }
-                  }
-                }
-                break;
-              case PrimaryAxis.Both:
-                if( ( DoubleUtil.AreClose( itemRect.Width, child.ActualWidth ) == true )
-                  && ( DoubleUtil.AreClose( itemRect.Height, child.ActualHeight ) == true ) )
-                {
-                  if( ScrollViewerHelper.IsABetterLastRow( preservedChild, preservedOffset, itemOffset ) == true )
-                  {
-                    preservedChild = child;
-                    preservedOffset = itemOffset;
-                  }
-                }
-                break;
-              case PrimaryAxis.None:
-                if( itemRect.IsEmpty == false )
-                {
-                  if( ( DoubleUtil.AreClose( itemRect.Height, 0 ) == false ) && ( DoubleUtil.AreClose( itemRect.Width, 0 ) == false ) )
-                  {
-                    if( ScrollViewerHelper.IsABetterLastRow( preservedChild, preservedOffset, itemOffset ) == true )
-                    {
-                      preservedChild = child;
-                      preservedOffset = itemOffset;
-                    }
-                  }
-                }
-                break;
-            }
-          }
-
-          retval = preservedChild;
-
-        }//end lock (protection of shared static members with GetFirstVisibleItem() )
-      }
-
-
-      return retval;
-    }
-
-    private static FrameworkElement ProcessLastVisibleContainer( 
-      DataGridControl gridControl,
-      double offset,
-      double viewportSize,
-      double opposedOffset,
-      double opposedViewportSize,
-      Orientation panelOrientation )
-    {
-      FrameworkElement retval = null;
-
-      // Only needed if the DataGridControl contains items
-      if( ( gridControl != null ) && ( gridControl.Items.Count > 0 ) )
-      {
-        bool qualifyingContainerFound = false;
-
-        //retrieve the last object index according to item scrolling axis (this covers both the "Vertical and None" primary axis cases... 
-        //as well as default if no other row matches the PrimaryAxis criteria)
-        int runningIndex = ( int )( offset + viewportSize - 1 );
-
-        //cycle for as long as a qualifying container is not found.
-        while( qualifyingContainerFound == false )
-        {
-          retval = gridControl.GetContainerFromIndex( runningIndex ) as FrameworkElement;
-
-          if( retval != null )
-          {
-            qualifyingContainerFound = ScrollViewerHelper.IsContainerQualifying( retval,
-              gridControl,
-              offset,
-              viewportSize,
-              opposedOffset,
-              opposedViewportSize,
-              panelOrientation );
-          }
-
-          //under all circumstances, if I am back at the original offset (first item visible), then have it qualify.
-          if( runningIndex == offset )
-            qualifyingContainerFound = true;
-
-          runningIndex--;
-        }
-      }
-
-      return retval;
-    }
-
-    private static FrameworkElement ProcessFirstVisibleContainer( 
-      DataGridControl gridControl,
-      double offset,
-      double viewportSize,
-      double opposedOffset,
-      double opposedViewportSize,
-      Orientation panelOrientation )
-    {
-      FrameworkElement retval = null;
-
-      // Only needed if the DataGridControl contains items
-      if( ( gridControl != null ) && ( gridControl.Items.Count > 0 ) )
-      {
-        bool qualifyingContainerFound = false;
-
-        //retrieve the last object index according to item scrolling axis (this covers both the "Vertical and None" primary axis cases... 
-        //as well as default if no other row matches the PrimaryAxis criteria)
-        int runningIndex = ( int )( offset );
-
-        //cycle for as long as a qualifying container is not found.
-        while( !qualifyingContainerFound )
-        {
-          retval = gridControl.GetContainerFromIndex( runningIndex ) as FrameworkElement;
-
-          //will be reverted back if the container does not match a particular condition.
-          if( retval != null )
-          {
-            qualifyingContainerFound = ScrollViewerHelper.IsContainerQualifying( retval,
-              gridControl,
-              offset,
-              viewportSize,
-              opposedOffset,
-              opposedViewportSize,
-              panelOrientation );
-          }
-
-          //under all circumstances, if I am back at the end of the viewport ( last item visible), then have it qualify.
-          if( runningIndex == ( offset + viewportSize - 1 ) )
-            qualifyingContainerFound = true;
-
-          runningIndex++;
-        }
-      }
-
-      return retval;
-    }
-
-    private static bool IsContainerQualifying(
-      FrameworkElement container,
-      DataGridControl gridControl,
-      double offset,
-      double viewportSize,
-      double opposedOffset,
-      double opposedViewportSize,
-      Orientation panelOrientation )
-    {
-      bool retval = true;
-
-      HeaderFooterItem headerFooterItemContainer = container as HeaderFooterItem;
-      Row rowContainer = container as Row;
-
-      //Determine if the Element is Focusable or Navigable
-      if( headerFooterItemContainer != null )
-      {
-        rowContainer = headerFooterItemContainer.AsVisual() as Row;
-        if( rowContainer == null )
-        {
-          //If the HeaderFooter Item is not a Row and is Not focusable, then the item does not qualify.
-          UIElement uiElementContainer = headerFooterItemContainer.AsVisual() as UIElement;
-          if( ( uiElementContainer == null ) || ( !uiElementContainer.Focusable ) )
-          {
-            retval = false;
-          }
-        }
-      }
-
-      //If the container is a Row (in the headers footers region or not )
-      if( ( retval ) && ( rowContainer != null ) )
-      {
-        //and the Row is not navigable, then it does not qualify.
-        if( rowContainer.NavigationBehavior == NavigationBehavior.None )
-        {
-          retval = false;
-        }
-      }
-
-
-      //If the container still qualifies after first verification, check for the scrolling axis.
-      if( retval )
-      {
-        //if the PrimaryAxis requires the opposed axis to be fully visible.
-        if( ( ( panelOrientation == Orientation.Vertical ) && ( ( gridControl.ItemsPrimaryAxis == PrimaryAxis.Horizontal ) || ( gridControl.ItemsPrimaryAxis == PrimaryAxis.Both ) ) )
-          || ( ( panelOrientation == Orientation.Horizontal ) && ( ( gridControl.ItemsPrimaryAxis == PrimaryAxis.Vertical ) || ( gridControl.ItemsPrimaryAxis == PrimaryAxis.Both ) ) ) )
-        {
-          FrameworkElement frameworkElementContainer = container as FrameworkElement;
-          //Somehow, I decided that a container that is not a FrameworkElement (extremelly highly unprobable) was automaticaly NOT to qualify if opposed axis was required.
-          if( frameworkElementContainer != null )
-          {
-            Vector rowOffset = VisualTreeHelper.GetOffset( frameworkElementContainer );
-
-            double computedOffset = ( panelOrientation == Orientation.Vertical ) ? rowOffset.X : rowOffset.Y;
-            double computedSize = ( panelOrientation == Orientation.Vertical ) ? frameworkElementContainer.ActualWidth : frameworkElementContainer.ActualHeight;
-
-            //if the coordinates of the Row are NOT inside the Scrolling Axis' viewport... then the item is not qualifyable.
-            if( ( computedOffset < opposedOffset ) || ( ( computedOffset + computedSize ) > ( opposedViewportSize + opposedOffset ) ) )
-            {
-              retval = false;
-            }
-          }
-          else
-          {
-            retval = false;
-          }
-        }
-      }
-
-      return retval;
-    }
-
-    public static FrameworkElement GetFirstVisibleContainer( 
-      DataGridControl gridControl, 
-      FrameworkElement container, 
-      ScrollViewer scrollViewer )
-    {
-      FrameworkElement retval = null;
-
-      if( !ScrollViewerHelper.IsPixelScrolling( gridControl, container, scrollViewer ) )
-      {
-        //This means that the panel is performing Item Scrolling
-
-        //if the panel is Vertically scrolling the items (means the Horizontal Axis is Pixel scrolling)
-        if( ScrollViewerHelper.GetItemScrollingOrientation( gridControl, container, scrollViewer ) == Orientation.Vertical )
-        {
-          retval = ScrollViewerHelper.ProcessFirstVisibleContainer( gridControl,
-            scrollViewer.VerticalOffset,
-            scrollViewer.ViewportHeight,
-            scrollViewer.HorizontalOffset,
-            scrollViewer.ViewportWidth,
-            Orientation.Vertical );
-        }
-        //the panel is Horizontally scrolling the items (means the Vertically Axis is Pixel scrolling)
-        else
-        {
-          retval = ScrollViewerHelper.ProcessFirstVisibleContainer( gridControl,
-            scrollViewer.HorizontalOffset,
-            scrollViewer.ViewportWidth,
-            scrollViewer.VerticalOffset,
-            scrollViewer.ViewportHeight,
-            Orientation.Horizontal );
-        }
-      }
-      else
-      {
-        Point pt = new Point();
-
-        if( ( container is VirtualizingPanel )
-            || ( container is DataGridItemsHost )
-            || ( scrollViewer == null ) )
-        {
-          pt.X = 0;
-          pt.Y = 0;
-        }
-        else
-        {
-          pt.X = scrollViewer.HorizontalOffset;
-          pt.Y = scrollViewer.VerticalOffset;
-        }
-
-        Size size = new Size( ( scrollViewer != null ) ? scrollViewer.ViewportWidth : container.ActualWidth,
-                              ( scrollViewer != null ) ? scrollViewer.ViewportHeight : container.ActualHeight );
-
-        Rect visibleRect = new Rect( pt, size );
-
-        RectangleGeometry geo = new RectangleGeometry( visibleRect );
-
-        lock( ScrollViewerHelper.Current )
-        {
-          m_sVisibleChildList.Clear();
-          m_sGridControl = gridControl;
-
-          VisualTreeHelper.HitTest( container,
-                                    new HitTestFilterCallback( ScrollViewerHelper.MyFilterFunct ),
-                                    new HitTestResultCallback( ScrollViewerHelper.UselessResultCallback ),
-                                    new GeometryHitTestParameters( geo ) );
-
-          m_sGridControl = null;
-
-          FrameworkElement preservedChild = null;
-          Nullable<Vector> preservedOffset = null;
-
-          foreach( FrameworkElement child in m_sVisibleChildList )
-          {
-            Vector itemOffset = VisualTreeHelper.GetOffset( child );
-
-            Rect itemRect = new Rect( itemOffset.X, itemOffset.Y, child.ActualWidth, child.ActualHeight );
-
-            itemRect.Intersect( visibleRect );
-
-            switch( gridControl.ItemsPrimaryAxis )
-            {
-              case PrimaryAxis.Vertical:
-                if( DoubleUtil.AreClose( itemRect.Width, 0 ) == false )
-                {
-                  if( DoubleUtil.AreClose( child.ActualHeight, itemRect.Height ) == true )
-                  {
-                    if( ScrollViewerHelper.IsABetterFirstRow( preservedChild, preservedOffset, itemOffset ) == true )
-                    {
-                      preservedChild = child;
-                      preservedOffset = itemOffset;
-                    }
-                  }
-                }
-                break;
-              case PrimaryAxis.Horizontal:
-                if( DoubleUtil.AreClose( itemRect.Height, 0 ) == false )
-                {
-                  if( DoubleUtil.AreClose( itemRect.Width, child.ActualWidth ) == true )
-                  {
-                    if( ScrollViewerHelper.IsABetterFirstRow( preservedChild, preservedOffset, itemOffset ) == true )
-                    {
-                      preservedChild = child;
-                      preservedOffset = itemOffset;
-                    }
-                  }
-                }
-                break;
-              case PrimaryAxis.Both:
-                if( ( DoubleUtil.AreClose( itemRect.Width, child.ActualWidth ) == true ) && ( DoubleUtil.AreClose( itemRect.Height, child.ActualHeight ) == true ) )
-                {
-                  if( ScrollViewerHelper.IsABetterFirstRow( preservedChild, preservedOffset, itemOffset ) == true )
-                  {
-                    preservedChild = child;
-                    preservedOffset = itemOffset;
-                  }
-                }
-                break;
-              case PrimaryAxis.None:
-                if( ( DoubleUtil.AreClose( itemRect.Width, 0 ) == false ) && ( DoubleUtil.AreClose( itemRect.Width, 0 ) == false ) )
-                {
-                  if( itemRect.IsEmpty == false )
-                  {
-                    if( ScrollViewerHelper.IsABetterFirstRow( preservedChild, preservedOffset, itemOffset ) == true )
-                    {
-                      preservedChild = child;
-                      preservedOffset = itemOffset;
-                    }
-                  }
-                }
-                break;
-            }
-          }
-
-          retval = preservedChild;
-        }//end lock
-      }
-
-      return retval;
-    }
-
-    //-----------------  INTERNAL METHODS -------------------------
-
-    internal static Thumb FindParentThumb( object reference, ScrollViewer scrollViewer )
-    {
-      Thumb retval = null;
-      DependencyObject obj = reference as DependencyObject;
-
-      if( obj != null )
-      {
-        do
-        {
-          retval = obj as Thumb;
-
-          if( retval == null )
-          {
-            obj = TreeHelper.GetParent( obj );
-
-            if( ( obj == scrollViewer ) || ( obj == null ) )
-              break;
-          }
-        } while( retval == null );
-      }
-
-      return retval;
-    }
-
-    internal static Orientation GetItemScrollingOrientation( 
-      DataGridControl dataGridControl, 
-      FrameworkElement container, 
-      ScrollViewer scrollViewer )
-    {
-      int itemsCount = dataGridControl.Items.Count;
-
-      //if the Panel passed supports the CustomItemContainerGenerator, then retrieve the itemcount from the customItemContainerGenerator
-      if( ( container is DataGridVirtualizingPanel ) || ( container is DataGridItemsHost ) )
-      {
-        itemsCount = dataGridControl.CustomItemContainerGenerator.ItemCount;
-      }
-
-      if( scrollViewer.ExtentHeight == itemsCount )
-        return Orientation.Vertical;
-
-      return Orientation.Horizontal;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1800:DoNotCastUnnecessarily" )]
-    internal static Orientation GetItemScrollingOrientation( DataGridControl dataGridControl )
-    {
-      int itemsCount = dataGridControl.Items.Count;
-
-      ScrollViewer scrollViewer = dataGridControl.ScrollViewer;
-      FrameworkElement container = dataGridControl.ItemsHost;
-
-      //if the Panel passed supports the CustomItemContainerGenerator, then retrieve the itemcount from the customItemContainerGenerator
-      if( ( container is DataGridVirtualizingPanel ) || ( container is DataGridItemsHost ) )
-      {
-        itemsCount = dataGridControl.CustomItemContainerGenerator.ItemCount;
-      }
-
-      Orientation foundOrientation = Orientation.Horizontal;
-      if( scrollViewer.ExtentHeight == itemsCount )
-      {
-        foundOrientation = Orientation.Vertical;
-      }
-      else if( container is StackPanel )
-      {
-        foundOrientation = ( ( StackPanel )container ).Orientation;
-      }
-      else if( container is WrapPanel )
-      {
-        foundOrientation = ( ( WrapPanel )container ).Orientation;
-      }
-      else if( container is IAnimatedScrollInfo )
-      {
-        foundOrientation = Orientation.Vertical;
-      }
-      else
-      {
-        foundOrientation = Orientation.Horizontal;
-      }
-      return foundOrientation;
-    }
-
-    internal static bool IsPixelScrolling( DataGridControl dataGridControl, FrameworkElement container, ScrollViewer scrollViewer )
-    {
-      int itemsCount = dataGridControl.Items.Count;
-
-      //if the Panel passed supports the CustomItemContainerGenerator, then retrieve the itemcount from the customItemContainerGenerator
-      if( ( container is DataGridVirtualizingPanel ) || ( container is DataGridItemsHost ) )
-      {
-        itemsCount = dataGridControl.CustomItemContainerGenerator.ItemCount;
-      }
-
-      //This means that the ScrollViewer performs Items Scrolling
-      if( ( scrollViewer != null )
-        && ( ( scrollViewer.ExtentHeight == itemsCount ) || ( scrollViewer.ExtentWidth == itemsCount ) )
-        && ( container is IScrollInfo ) && ( scrollViewer.CanContentScroll == true ) )
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    internal static void ResetScrollPositions( ScrollViewer scrollViewer )
-    {
-      if( scrollViewer == null )
-      {
-        throw new ArgumentNullException( "scrollViewer" );
-      }
-
-      DataGridScrollViewer dataGridScrollViewer = scrollViewer as DataGridScrollViewer;
-      if( dataGridScrollViewer != null )
-      {
-        foreach( SynchronizedScrollViewer ssv in dataGridScrollViewer.SynchronizedScrollViewers )
-        {
-          ssv.ScrollToTop();
-          ssv.ScrollToLeftEnd();
-        }
-      }
-
-      scrollViewer.ScrollToTop();
-      scrollViewer.ScrollToLeftEnd();
-
-    }
-
-    //-----------------  PRIVATE METHODS -------------------------
-
-    private static HitTestFilterBehavior MyFilterFunct( DependencyObject obj )
-    {
-      Panel panel = m_sGridControl.ItemsHost as Panel;
-
-      //if the object passed is a direct child of the ItemsHostPanel; keep it
-      if( ( panel != null ) 
-        && ( panel.Children.Contains( ( UIElement )obj ) == true ) )
-      {
-        m_sVisibleChildList.Add( obj );
-
-        return HitTestFilterBehavior.ContinueSkipChildren;
-      }
-      else //otherwise, discard it.
-      {
-        return HitTestFilterBehavior.ContinueSkipSelf;
-      }
-    }
-
-    private static HitTestResultBehavior UselessResultCallback( HitTestResult htr )
-    {
-      return HitTestResultBehavior.Continue;
-    }
-
-    private static bool IsABetterFirstRow( DependencyObject referenceChild, Nullable<Vector> referenceOffset, Vector newOffset )
-    {
-      bool retval = false;
-
-      if( referenceChild != null )
-      {
-        if( ( DoubleUtil.AreClose( referenceOffset.Value.Y, newOffset.Y ) == true ) && ( newOffset.X < referenceOffset.Value.X ) )
-        {
-          retval = true;
-        }
-        else if( referenceOffset.Value.Y > newOffset.Y )
-        {
-          retval = true;
-        }
-      }
-      else
-      {
-        retval = true;
-      }
-
-      return retval;
-    }
-
-    private static bool IsABetterLastRow( DependencyObject referenceChild, Nullable<Vector> referenceOffset, Vector newOffset )
-    {
-      bool retval = false;
-
-      if( referenceChild != null )
-      {
-        if( ( DoubleUtil.AreClose( referenceOffset.Value.Y, newOffset.Y ) == true ) && ( newOffset.X > referenceOffset.Value.X ) )
-        {
-          retval = true;
-        }
-        else if( referenceOffset.Value.Y < newOffset.Y )
-        {
-          retval = true;
-        }
-      }
-      else
-      {
-        retval = true;
-      }
-
-      return retval;
-    }
-
-    //-----------------  FIELDS -------------------------
-
-    private static ScrollViewerHelper m_singleInstance; // = null;
-    private static List<DependencyObject> m_sVisibleChildList = new List<DependencyObject>();
-    private static DataGridControl m_sGridControl; // = null;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs
deleted file mode 100644
index aee175fe..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs
+++ /dev/null
@@ -1,594 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelectedCellsStorage : ICloneable, IEnumerable<SelectionCellRangeWithItems>, IEnumerable
-  {
-    internal SelectedCellsStorage( DataGridContext dataGridContext )
-    {
-      // dataGridContext can be null for store that we don't want to auto-get Items from index
-      m_dataGridContext = dataGridContext;
-    }
-
-    #region Count Property
-
-    public int Count
-    {
-      get
-      {
-        return m_ranges.Count;
-      }
-    }
-
-    #endregion
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-    }
-
-    private readonly DataGridContext m_dataGridContext;
-
-    #endregion
-
-    #region [] Property
-
-    public SelectionCellRangeWithItems this[ int index ]
-    {
-      get
-      {
-        return m_ranges[ index ].Value;
-      }
-      private set
-      {
-        this.RemoveAt( index, false );
-        this.Insert( index, value, false );
-      }
-    }
-
-    #endregion
-
-    public void Add( SelectionCellRangeWithItems rangeWithItems )
-    {
-      Debug.Assert( m_ranges.All( r => r.Value.CellRange.Intersect( rangeWithItems.CellRange ).IsEmpty ), "Part of this range is already selected" );
-
-      var itemRangeWithItems = rangeWithItems.ItemRangeWithItems;
-
-      SelectedItemsStorage.UpdateSelectionRangeWithItemsFromAdd( m_dataGridContext, itemRangeWithItems, ref itemRangeWithItems );
-
-      var newRangeWithItems = new SelectionCellRangeWithItems( itemRangeWithItems.Range, itemRangeWithItems.Items, rangeWithItems.ColumnRange );
-
-      this.Insert( this.Count, newRangeWithItems, true );
-    }
-
-    public void Clear()
-    {
-      m_ranges.Clear();
-      m_map.Clear();
-    }
-
-    public bool Contains( int itemIndex, int columnIndex )
-    {
-      if( ( itemIndex < 0 ) || ( itemIndex >= int.MaxValue ) || ( columnIndex < 0 ) || ( columnIndex >= int.MaxValue ) )
-        return false;
-
-      return this.Contains( new SelectionCellRange( itemIndex, columnIndex ) );
-    }
-
-    public bool Contains( SelectionCellRange range )
-    {
-      if( ( m_ranges.Count <= 0 ) || ( SelectedCellsStorage.IsEmpty( range ) ) )
-        return false;
-
-      return this.Contains( new SelectionCellRangeWithItems( range.ItemRange, null, range.ColumnRange ) );
-    }
-
-    public bool Contains( SelectionCellRangeWithItems rangeWithItems )
-    {
-      if( ( m_ranges.Count <= 0 ) || ( SelectedCellsStorage.IsEmpty( rangeWithItems ) ) )
-        return false;
-
-      if( rangeWithItems.Length == 1 )
-        return this.IndexOfOverlap( rangeWithItems ).Any();
-
-      var store = new SelectedCellsStorage( null );
-      store.Add( rangeWithItems );
-
-      foreach( var match in this.IndexOfOverlap( rangeWithItems ) )
-      {
-        store.Remove( m_ranges[ match ].Value );
-
-        if( store.Count == 0 )
-          return true;
-      }
-
-      return false;
-    }
-
-    public bool Remove( SelectionCellRangeWithItems rangeWithItems )
-    {
-      if( SelectedCellsStorage.IsEmpty( rangeWithItems ) )
-        return true;
-
-      // It improves performance to leave early and prevent empty enumerators creation.
-      if( m_ranges.Count <= 0 )
-        return false;
-
-      // The SelectionCellRange.IsEmpty should be mapped to the item range's SelectionRange.IsEmpty property.
-      Debug.Assert( !rangeWithItems.ItemRange.IsEmpty );
-
-      var matches = this.IndexOfOverlap( rangeWithItems ).OrderBy( index => index ).ToList();
-      var rangeToRemove = rangeWithItems.CellRange;
-
-      for( int i = matches.Count - 1; i >= 0; i-- )
-      {
-        var index = matches[ i ];
-        var currentRangeWithItems = m_ranges[ index ].Value;
-        var currentRange = currentRangeWithItems.CellRange;
-        var overlap = rangeToRemove.Intersect( currentRange );
-
-        Debug.Assert( !overlap.IsEmpty );
-
-        var newRanges = currentRange.Exclude( overlap );
-
-        if( newRanges.Length == 0 )
-        {
-          this.RemoveAt( index, true );
-        }
-        else
-        {
-          var currentRangeItems = currentRangeWithItems.ItemRangeWithItems;
-
-          this[ index ] = new SelectionCellRangeWithItems( newRanges[ 0 ].ItemRange, currentRangeItems.GetItems( newRanges[ 0 ].ItemRange ), newRanges[ 0 ].ColumnRange );
-
-          if( newRanges.Length > 1 )
-          {
-            for( int j = 1; j < newRanges.Length; j++ )
-            {
-              this.Insert( index + j, new SelectionCellRangeWithItems( newRanges[ j ].ItemRange, currentRangeItems.GetItems( newRanges[ j ].ItemRange ), newRanges[ j ].ColumnRange ), false );
-            }
-
-            this.RepairIndex( index + 1 );
-          }
-        }
-      }
-
-      return ( matches.Count > 0 );
-    }
-
-    public void OffsetIndex( int startIndex, int offset )
-    {
-      if( m_map.Count == 0 )
-        return;
-
-      // Used to offset index after an add or remove from the data source of the grid.
-      var offsetRange = new SelectionRange( startIndex, startIndex + Math.Abs( offset ) - 1 );
-
-      var entries = m_map.GetEntriesWithin( new RSTree2D<SelectionCellRangeWithItemsWrapper>.Area( startIndex, int.MaxValue - startIndex, 0, int.MaxValue ) ).OrderByDescending( e => e.Item.Index ).ToList();
-
-      // Adjust the range of all ranges greater or that overlaps the target range.
-      foreach( var entry in entries )
-      {
-        var currentRangeWithItemsWrapper = entry.Item;
-        var currentRangeIndex = currentRangeWithItemsWrapper.Index;
-        var currentRangeWithItems = currentRangeWithItemsWrapper.Value;
-        var currentRange = currentRangeWithItems.ItemRange;
-        var currentRangeItems = currentRangeWithItems.ItemRangeWithItems.Items;
-
-        Debug.Assert( !( offsetRange > currentRange ) );
-
-        var currentRangeIntersection = currentRange.Intersect( offsetRange );
-
-        // The range overlaps.
-        if( !currentRangeIntersection.IsEmpty )
-        {
-          // Should only happen when adding since when we remove data from the source, we remove the
-          // the range from the list.
-          Debug.Assert( offset > 0 );
-
-          SelectionRange topRange;
-          SelectionRange bottomRange;
-
-          if( currentRange.StartIndex > currentRange.EndIndex )
-          {
-            if( currentRangeIntersection.EndIndex == currentRange.EndIndex )
-            {
-              this[ currentRangeIndex ] = new SelectionCellRangeWithItems(
-                                            new SelectionRange( currentRange.StartIndex + offset, currentRange.EndIndex + offset ),
-                                            currentRangeItems,
-                                            currentRangeWithItems.ColumnRange );
-              continue;
-            }
-            else
-            {
-              topRange = new SelectionRange( currentRange.StartIndex + offset, startIndex + offset );
-              bottomRange = new SelectionRange( startIndex - 1, currentRange.EndIndex );
-            }
-          }
-          else
-          {
-            if( currentRangeIntersection.StartIndex == currentRange.StartIndex )
-            {
-              this[ currentRangeIndex ] = new SelectionCellRangeWithItems(
-                                            new SelectionRange( currentRange.StartIndex + offset, currentRange.EndIndex + offset ),
-                                            currentRangeItems,
-                                            currentRangeWithItems.ColumnRange );
-              continue;
-            }
-            else
-            {
-              topRange = new SelectionRange( currentRange.StartIndex, startIndex - 1 );
-              bottomRange = new SelectionRange( startIndex + offset, currentRange.EndIndex + offset );
-            }
-          }
-
-          object[] topItems = null;
-          object[] bottomItems = null;
-
-          if( currentRangeItems != null )
-          {
-            topItems = new object[ topRange.Length ];
-            Array.Copy( currentRangeItems, 0, topItems, 0, topItems.Length );
-
-            bottomItems = new object[ bottomRange.Length ];
-            Array.Copy( currentRangeItems, topItems.Length, bottomItems, 0, bottomItems.Length );
-          }
-
-          this[ currentRangeIndex ] = new SelectionCellRangeWithItems( topRange, topItems, currentRangeWithItems.ColumnRange );
-          this.Insert( currentRangeIndex + 1, new SelectionCellRangeWithItems( bottomRange, bottomItems, currentRangeWithItems.ColumnRange ), true );
-        }
-        // The range is greater.
-        else
-        {
-          this[ currentRangeIndex ] = new SelectionCellRangeWithItems(
-                                        new SelectionRange( currentRange.StartIndex + offset, currentRange.EndIndex + offset ),
-                                        currentRangeItems,
-                                        currentRangeWithItems.ColumnRange );
-        }
-      }
-    }
-
-    public void OffsetIndexBasedOnSourceNewIndex( int maxOffset )
-    {
-      if( m_dataGridContext == null )
-        throw new InvalidOperationException( "We must have a DataGridContext to find the new index." );
-
-      if( maxOffset == 0 )
-        return;
-
-      var sourceItems = m_dataGridContext.Items;
-
-      for( int i = this.Count - 1; i >= 0; i-- )
-      {
-        var rangeWithItems = this[ i ];
-        var rangeItems = rangeWithItems.ItemRangeWithItems.Items;
-
-        if( rangeItems == null )
-          throw new InvalidOperationException( "We should have items to find the new index." );
-
-        var item = rangeItems[ 0 ];
-        var range = rangeWithItems.ItemRange;
-        var startIndex = range.StartIndex;
-
-        if( maxOffset < 0 )
-        {
-          for( int j = 0; j >= maxOffset; j-- )
-          {
-            if( object.Equals( sourceItems.GetItemAt( startIndex ), item ) )
-            {
-              if( j != 0 )
-              {
-                this[ i ] = new SelectionCellRangeWithItems( new SelectionRange( range.StartIndex + j, range.EndIndex + j ), rangeItems, rangeWithItems.ColumnRange );
-              }
-
-              break;
-            }
-
-            startIndex--;
-
-            if( startIndex < 0 )
-              break;
-          }
-        }
-        else
-        {
-          var sourceItemCount = sourceItems.Count;
-
-          for( int j = 0; j <= maxOffset; j++ )
-          {
-            if( object.Equals( sourceItems.GetItemAt( startIndex ), item ) )
-            {
-              if( j != 0 )
-              {
-                this[ i ] = new SelectionCellRangeWithItems( new SelectionRange( range.StartIndex + j, range.EndIndex + j ), rangeItems, rangeWithItems.ColumnRange );
-              }
-
-              break;
-            }
-
-            startIndex++;
-
-            if( startIndex >= sourceItemCount )
-              break;
-          }
-        }
-      }
-    }
-
-    public IEnumerable<SelectionRange> GetIntersectedColumnRanges( SelectionCellRange range )
-    {
-      // It improves performance to leave early and prevent empty enumerators creation.
-      if( m_ranges.Count <= 0 )
-        return Enumerable.Empty<SelectionRange>();
-
-      return ( from match in this.IndexOfOverlap( range )
-               let current = m_ranges[ match ].Value
-               let intersection = current.CellRange.Intersect( range )
-               select intersection.ColumnRange ).ToList();
-    }
-
-    public IEnumerable<SelectionCellRangeWithItems> GetIntersectedCellRangesWithItems( SelectionCellRange range )
-    {
-      // It improves performance to leave early and prevent empty enumerators creation.
-      if( m_ranges.Count <= 0 )
-        return Enumerable.Empty<SelectionCellRangeWithItems>();
-
-      return ( from match in this.IndexOfOverlap( range )
-               let current = m_ranges[ match ].Value
-               let intersection = current.CellRange.Intersect( range )
-               select new SelectionCellRangeWithItems(
-                 intersection.ItemRange,
-                 current.ItemRangeWithItems.GetItems( intersection.ItemRange ),
-                 intersection.ColumnRange ) ).ToList();
-    }
-
-    private static RSTree2D<SelectionCellRangeWithItemsWrapper>.Area GetArea( SelectionCellRange range )
-    {
-      if( range.IsEmpty )
-        return RSTree2D<SelectionCellRangeWithItemsWrapper>.Area.Empty;
-
-      var itemRange = range.ItemRange;
-      var columnRange = range.ColumnRange;
-      int rs, re, cs, ce;
-
-      if( itemRange.StartIndex <= itemRange.EndIndex )
-      {
-        rs = itemRange.StartIndex;
-        re = itemRange.EndIndex;
-      }
-      else
-      {
-        rs = itemRange.EndIndex;
-        re = itemRange.StartIndex;
-      }
-
-      if( columnRange.StartIndex <= columnRange.EndIndex )
-      {
-        cs = columnRange.StartIndex;
-        ce = columnRange.EndIndex;
-      }
-      else
-      {
-        cs = columnRange.EndIndex;
-        ce = columnRange.StartIndex;
-      }
-
-      return new RSTree2D<SelectionCellRangeWithItemsWrapper>.Area( rs, re - rs + 1, cs, ce - cs + 1 );
-    }
-
-    private static RSTree2D<SelectionCellRangeWithItemsWrapper>.Area GetArea( SelectionCellRangeWithItems range )
-    {
-      return SelectedCellsStorage.GetArea( range.CellRange );
-    }
-
-    private void Insert( int index, SelectionCellRangeWithItems item, bool repairIndex )
-    {
-      var wrapper = new SelectionCellRangeWithItemsWrapper( item, index );
-
-      m_ranges.Insert( index, wrapper );
-
-      if( repairIndex )
-      {
-        this.RepairIndex( index + 1 );
-      }
-
-      if( !SelectedCellsStorage.IsEmpty( item ) )
-      {
-        m_map.Add( SelectedCellsStorage.GetArea( item ), wrapper );
-      }
-    }
-
-    private void RemoveAt( int index, bool repairIndex )
-    {
-      var wrapper = m_ranges[ index ];
-      var rangeWithItems = wrapper.Value;
-
-      Debug.Assert( wrapper.Index == index );
-
-      if( !SelectedCellsStorage.IsEmpty( rangeWithItems ) )
-      {
-        var removed = m_map.Remove( SelectedCellsStorage.GetArea( rangeWithItems ), wrapper );
-        Debug.Assert( removed, "Failed to remove the selection range." );
-
-        // Since there should be only a single instance of the wrapper within the collection, try an altenate strategy.
-        if( !removed )
-        {
-          var entry = m_map.FirstOrDefault( e => e.Item == wrapper );
-          if( entry.Item == wrapper )
-          {
-            removed = m_map.Remove( entry );
-          }
-
-          Debug.Assert( removed, "Failed to find the selection range." );
-        }
-      }
-
-      m_ranges.RemoveAt( index );
-
-      if( repairIndex )
-      {
-        this.RepairIndex( index );
-      }
-    }
-
-    private void RepairIndex( int index )
-    {
-      Debug.Assert( index >= 0 );
-
-      for( int i = index; i < m_ranges.Count; i++ )
-      {
-        m_ranges[ i ].Index = i;
-      }
-    }
-
-    private IEnumerable<int> IndexOfOverlap( SelectionCellRange range )
-    {
-      // It improves performance to leave early.
-      if( m_map.Count <= 0 )
-        yield break;
-
-      foreach( var entry in m_map.GetEntriesWithin( SelectedCellsStorage.GetArea( range ) ) )
-      {
-        var candidate = entry.Item;
-        var target = candidate.Value;
-        var overlap = range.Intersect( target.CellRange );
-
-        Debug.Assert( !SelectedCellsStorage.IsEmpty( overlap ) );
-
-        if( !SelectedCellsStorage.IsEmpty( overlap ) )
-          yield return candidate.Index;
-      }
-    }
-
-    private IEnumerable<int> IndexOfOverlap( SelectionCellRangeWithItems target )
-    {
-      var targetRange = target.CellRange;
-      var targetRangeWithItems = target.ItemRangeWithItems;
-      var targetItemRange = targetRange.ItemRange;
-
-      foreach( var match in this.IndexOfOverlap( targetRange ) )
-      {
-        var currentRangeWithItems = m_ranges[ match ].Value;
-        var overlap = targetItemRange.Intersect( currentRangeWithItems.ItemRange );
-
-        Debug.Assert( !overlap.IsEmpty );
-
-        if( targetRangeWithItems.IsItemsEqual( overlap, currentRangeWithItems.ItemRangeWithItems ) )
-          yield return match;
-      }
-    }
-
-    private static bool IsEmpty( SelectionCellRange range )
-    {
-      return ( range.ItemRange.IsEmpty )
-          || ( range.ColumnRange.IsEmpty );
-    }
-
-    private static bool IsEmpty( SelectionCellRangeWithItems rangeWithItems )
-    {
-      return ( rangeWithItems.ItemRange.IsEmpty )
-          || ( rangeWithItems.ColumnRange.IsEmpty );
-    }
-
-    #region ICloneable Members
-
-    public object Clone()
-    {
-      var copy = new SelectedCellsStorage( m_dataGridContext );
-
-      for( int i = 0; i < m_ranges.Count; i++ )
-      {
-        copy.Insert( i, m_ranges[ i ].Value, false );
-      }
-
-      return copy;
-    }
-
-    #endregion
-
-    #region IEnumerable<SelectionCellRangeWithItems> Members
-
-    public IEnumerator<SelectionCellRangeWithItems> GetEnumerator()
-    {
-      return m_ranges.Select( item => item.Value ).GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly List<SelectionCellRangeWithItemsWrapper> m_ranges = new List<SelectionCellRangeWithItemsWrapper>();
-    private readonly RSTree2D<SelectionCellRangeWithItemsWrapper> m_map = new RSTree2D<SelectionCellRangeWithItemsWrapper>();
-
-    #region SelectionCellRangeWithItemsWrapper Private Class
-
-    // We are wrapping the SelectionCellRangeWithItems structure inside a class so our collections
-    // may target the same object.
-    private sealed class SelectionCellRangeWithItemsWrapper
-    {
-      internal SelectionCellRangeWithItemsWrapper( SelectionCellRangeWithItems value, int index )
-      {
-        m_value = value;
-        m_index = index;
-      }
-
-      internal SelectionCellRangeWithItems Value
-      {
-        get
-        {
-          return m_value;
-        }
-      }
-
-      internal int Index
-      {
-        get
-        {
-          return m_index;
-        }
-        set
-        {
-          m_index = value;
-        }
-      }
-
-      private readonly SelectionCellRangeWithItems m_value;
-      private int m_index;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs
deleted file mode 100644
index 85ce3541..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs
+++ /dev/null
@@ -1,653 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Xceed.Utils.Collections;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelectedItemsStorage : ICloneable, IEnumerable<SelectionRangeWithItems>, IEnumerable
-  {
-    internal SelectedItemsStorage( DataGridContext dataGridContext )
-    {
-      // dataGridContext can be null for store that we don't want to auto-get Items from index
-      m_dataGridContext = dataGridContext;
-    }
-
-    #region Count Property
-
-    public int Count
-    {
-      get
-      {
-        return m_ranges.Count;
-      }
-    }
-
-    #endregion
-
-    #region ItemsCount Property
-
-    public int ItemsCount
-    {
-      get
-      {
-        return m_itemsCount;
-      }
-    }
-
-    private int m_itemsCount;
-
-    #endregion
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-    }
-
-    private readonly DataGridContext m_dataGridContext;
-
-    #endregion
-
-    #region [] Property
-
-    public SelectionRangeWithItems this[ int index ]
-    {
-      get
-      {
-        return m_ranges[ index ].Value;
-      }
-      private set
-      {
-        this.RemoveAt( index, false );
-        this.Insert( index, value, false );
-      }
-    }
-
-    #endregion
-
-    public static void UpdateSelectionRangeWithItemsFromAdd(
-      DataGridContext dataGridContext,
-      SelectionRangeWithItems newRangeWithItems,
-      ref SelectionRangeWithItems lastRangeWithItems )
-    {
-      // Only work for adding at the end of an existing range.
-
-      object[] newRangeItems = newRangeWithItems.Items;
-
-      if( ( dataGridContext == null )
-        || ( ( dataGridContext.ItemsSourceCollection == null ) && ( newRangeItems == null ) )
-        || ( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
-      {
-        lastRangeWithItems = new SelectionRangeWithItems( new SelectionRange( lastRangeWithItems.Range.StartIndex, newRangeWithItems.Range.EndIndex ), null );
-        return;
-      }
-
-      SharedList newItemsList;
-
-      if( newRangeWithItems == lastRangeWithItems )
-      {
-        if( newRangeItems != null )
-          return;
-
-        newItemsList = new SharedList( lastRangeWithItems.Length );
-      }
-      else
-      {
-        int minNewCapacity = lastRangeWithItems.Length + newRangeWithItems.Length;
-
-        // Optimization, re-use the ItemsList if available.
-        if( lastRangeWithItems.SharedList != null )
-        {
-          newItemsList = lastRangeWithItems.SharedList.Value;
-          newItemsList.EnsureCapacity( minNewCapacity );
-        }
-        else
-        {
-          newItemsList = new SharedList( minNewCapacity );
-          newItemsList.AddRange( lastRangeWithItems.Items );
-        }
-      }
-
-      var rangeToUpdateStartIndex = lastRangeWithItems.Range.StartIndex;
-      var newRangeEndIndex = newRangeWithItems.Range.EndIndex;
-
-      // If new range have no items set, found the items and set it.
-      if( newRangeItems == null )
-      {
-        var items = dataGridContext.Items;
-        var newRangeStartIndex = newRangeWithItems.Range.StartIndex;
-
-        if( newRangeEndIndex > newRangeStartIndex )
-        {
-          for( int i = newRangeStartIndex; i <= newRangeEndIndex; i++ )
-          {
-            newItemsList.Add( items.GetItemAt( i ) );
-          }
-        }
-        else
-        {
-          for( int i = newRangeStartIndex; i >= newRangeEndIndex; i-- )
-          {
-            newItemsList.Add( items.GetItemAt( i ) );
-          }
-        }
-      }
-      else
-      {
-        newItemsList.AddRange( newRangeItems );
-      }
-
-      lastRangeWithItems = new SelectionRangeWithItems( new SelectionRange( rangeToUpdateStartIndex, newRangeEndIndex ), newItemsList );
-    }
-
-    public void Add( SelectionRangeWithItems rangeWithItems )
-    {
-      Debug.Assert( !this.Contains( rangeWithItems.Range ) );
-
-      m_itemsCount += rangeWithItems.Length;
-
-      if( this.Count > 0 )
-      {
-        var lastIndex = this.Count - 1;
-        var lastRangeWithItems = this[ lastIndex ];
-        var lastRange = lastRangeWithItems.Range;
-
-        if( ( lastRange.EndIndex + 1 ) == rangeWithItems.Range.StartIndex )
-        {
-          Debug.Assert( rangeWithItems.Range.EndIndex > lastRange.EndIndex );
-
-          SelectedItemsStorage.UpdateSelectionRangeWithItemsFromAdd( m_dataGridContext, rangeWithItems, ref lastRangeWithItems );
-
-          this[ lastIndex ] = lastRangeWithItems;
-          return;
-        }
-        else if( ( lastRange.EndIndex - 1 ) == rangeWithItems.Range.StartIndex )
-        {
-          Debug.Assert( rangeWithItems.Range.EndIndex < lastRange.EndIndex );
-
-          SelectedItemsStorage.UpdateSelectionRangeWithItemsFromAdd( m_dataGridContext, rangeWithItems, ref lastRangeWithItems );
-
-          this[ lastIndex ] = lastRangeWithItems;
-          return;
-        }
-      }
-
-      SelectedItemsStorage.UpdateSelectionRangeWithItemsFromAdd( m_dataGridContext, rangeWithItems, ref rangeWithItems );
-
-      this.Insert( this.Count, rangeWithItems, true );
-    }
-
-    public void Clear()
-    {
-      m_itemsCount = 0;
-      m_ranges.Clear();
-      m_map.Clear();
-    }
-
-    public SelectionRange[] ToSelectionRangeArray()
-    {
-      return ( from item in m_ranges
-               select item.Value.Range ).ToArray();
-    }
-
-    public bool Contains( int itemIndex )
-    {
-      if( ( itemIndex < -1 ) || ( itemIndex >= int.MaxValue ) )
-        return false;
-
-      return this.Contains( new SelectionRange( itemIndex ) );
-    }
-
-    public bool Contains( SelectionRange range )
-    {
-      return m_map.Overlaps( SelectedItemsStorage.GetArea( range ) );
-    }
-
-    public bool Contains( SelectionRangeWithItems rangeWithItems )
-    {
-      return this.IndexOfOverlap( rangeWithItems ).Any();
-    }
-
-    public bool Remove( SelectionRangeWithItems rangeWithItems )
-    {
-      if( rangeWithItems.IsEmpty )
-        return this.RemoveEmptyRange( rangeWithItems );
-
-      return this.RemoveRangeWithItems( rangeWithItems );
-    }
-
-    public void OffsetIndex( int startIndex, int offset )
-    {
-      if( m_map.Count == 0 )
-        return;
-
-      // Used to offset index after an add or remove from the data source of the grid.
-      var offsetRange = new SelectionRange( startIndex, startIndex + Math.Abs( offset ) - 1 );
-
-      var entries = m_map.GetEntriesWithin( new RSTree1D<SelectionRangeWithItemsWrapper>.Area( startIndex, int.MaxValue - startIndex ) ).OrderByDescending( e => e.Item.Index ).ToList();
-
-      // Adjust the range of all ranges greater or that overlaps the target range.
-      foreach( var entry in entries )
-      {
-        var currentRangeWithItemsWrapper = entry.Item;
-        var currentRangeIndex = currentRangeWithItemsWrapper.Index;
-        var currentRangeWithItems = currentRangeWithItemsWrapper.Value;
-        var currentRange = currentRangeWithItems.Range;
-        var currentRangeItems = currentRangeWithItems.Items;
-
-        Debug.Assert( !( offsetRange > currentRange ) );
-
-        var currentRangeIntersection = currentRange.Intersect( offsetRange );
-
-        // The range overlaps.
-        if( !currentRangeIntersection.IsEmpty )
-        {
-          // Should only happen when adding since when we remove data from the source, we remove the
-          // the range from the list.
-          Debug.Assert( offset > 0 );
-
-          SelectionRange topRange;
-          SelectionRange bottomRange;
-
-          if( currentRange.StartIndex > currentRange.EndIndex )
-          {
-            if( currentRangeIntersection.EndIndex == currentRange.EndIndex )
-            {
-              this[ currentRangeIndex ] = new SelectionRangeWithItems(
-                                            new SelectionRange( currentRange.StartIndex + offset, currentRange.EndIndex + offset ),
-                                            currentRangeItems );
-              continue;
-            }
-            else
-            {
-              topRange = new SelectionRange( currentRange.StartIndex + offset, startIndex + offset );
-              bottomRange = new SelectionRange( startIndex - 1, currentRange.EndIndex );
-            }
-          }
-          else
-          {
-            if( currentRangeIntersection.StartIndex == currentRange.StartIndex )
-            {
-              this[ currentRangeIndex ] = new SelectionRangeWithItems(
-                                            new SelectionRange( currentRange.StartIndex + offset, currentRange.EndIndex + offset ),
-                                            currentRangeItems );
-              continue;
-            }
-            else
-            {
-              topRange = new SelectionRange( currentRange.StartIndex, startIndex - 1 );
-              bottomRange = new SelectionRange( startIndex + offset, currentRange.EndIndex + offset );
-            }
-          }
-
-          object[] topItems = null;
-          object[] bottomItems = null;
-
-          if( currentRangeItems != null )
-          {
-            topItems = new object[ topRange.Length ];
-            Array.Copy( currentRangeItems, 0, topItems, 0, topItems.Length );
-
-            bottomItems = new object[ bottomRange.Length ];
-            Array.Copy( currentRangeItems, topItems.Length, bottomItems, 0, bottomItems.Length );
-          }
-
-          this[ currentRangeIndex ] = new SelectionRangeWithItems( topRange, topItems );
-          this.Insert( currentRangeIndex + 1, new SelectionRangeWithItems( bottomRange, bottomItems ), true );
-        }
-        // The range is greater.
-        else
-        {
-          this[ currentRangeIndex ] = new SelectionRangeWithItems(
-                                        new SelectionRange( currentRange.StartIndex + offset, currentRange.EndIndex + offset ),
-                                        currentRangeItems );
-        }
-      }
-    }
-
-    public void OffsetIndexBasedOnSourceNewIndex( int maxOffset )
-    {
-      if( m_dataGridContext == null )
-        throw new InvalidOperationException( "We must have a DataGridContext to find the new index." );
-
-      if( maxOffset == 0 )
-        return;
-
-      var sourceItems = m_dataGridContext.Items;
-
-      for( int i = this.Count - 1; i >= 0; i-- )
-      {
-        var rangeWithItems = this[ i ];
-        var rangeItems = rangeWithItems.Items;
-
-        if( rangeItems == null )
-          throw new InvalidOperationException( "We should have items to find the new index." );
-
-        var item = rangeItems[ 0 ];
-        var range = rangeWithItems.Range;
-        var startIndex = range.StartIndex;
-
-        if( maxOffset < 0 )
-        {
-          for( int j = 0; j >= maxOffset; j-- )
-          {
-            if( object.Equals( sourceItems.GetItemAt( startIndex ), item ) )
-            {
-              if( j != 0 )
-              {
-                this[ i ] = new SelectionRangeWithItems( new SelectionRange( range.StartIndex + j, range.EndIndex + j ), rangeItems );
-              }
-
-              break;
-            }
-
-            startIndex--;
-
-            if( startIndex < 0 )
-              break;
-          }
-        }
-        else
-        {
-          var sourceItemCount = sourceItems.Count;
-
-          for( int j = 0; j <= maxOffset; j++ )
-          {
-            if( object.Equals( sourceItems.GetItemAt( startIndex ), item ) )
-            {
-              if( j != 0 )
-              {
-                this[ i ] = new SelectionRangeWithItems( new SelectionRange( range.StartIndex + j, range.EndIndex + j ), rangeItems );
-              }
-
-              break;
-            }
-
-            startIndex++;
-
-            if( startIndex >= sourceItemCount )
-              break;
-          }
-        }
-      }
-    }
-
-    private static RSTree1D<SelectionRangeWithItemsWrapper>.Area GetArea( SelectionRange range )
-    {
-      if( range.IsEmpty )
-        return RSTree1D<SelectionRangeWithItemsWrapper>.Area.Empty;
-
-      return new RSTree1D<SelectionRangeWithItemsWrapper>.Area( Math.Min( range.StartIndex, range.EndIndex ), range.Length );
-    }
-
-    private static RSTree1D<SelectionRangeWithItemsWrapper>.Area GetArea( SelectionRangeWithItems range )
-    {
-      return SelectedItemsStorage.GetArea( range.Range );
-    }
-
-    private void Insert( int index, SelectionRangeWithItems item, bool repairIndex )
-    {
-      var wrapper = new SelectionRangeWithItemsWrapper( item, index );
-
-      m_ranges.Insert( index, wrapper );
-
-      if( repairIndex )
-      {
-        this.RepairIndex( index + 1 );
-      }
-
-      if( !item.IsEmpty )
-      {
-        m_map.Add( SelectedItemsStorage.GetArea( item ), wrapper );
-      }
-    }
-
-    private void RemoveAt( int index, bool repairIndex )
-    {
-      var wrapper = m_ranges[ index ];
-      var rangeWithItems = wrapper.Value;
-
-      Debug.Assert( wrapper.Index == index );
-
-      if( !rangeWithItems.IsEmpty )
-      {
-        var removed = m_map.Remove( SelectedItemsStorage.GetArea( rangeWithItems ), wrapper );
-        Debug.Assert( removed, "Failed to remove the selection range." );
-
-        // Since there should be only a single instance of the wrapper within the collection, try an altenate strategy.
-        if( !removed )
-        {
-          var entry = m_map.FirstOrDefault( e => e.Item == wrapper );
-          if( entry.Item == wrapper )
-          {
-            removed = m_map.Remove( entry );
-          }
-
-          Debug.Assert( removed, "Failed to find the selection range." );
-        }
-      }
-
-      m_ranges.RemoveAt( index );
-
-      if( repairIndex )
-      {
-        this.RepairIndex( index );
-      }
-    }
-
-    private void RepairIndex( int index )
-    {
-      Debug.Assert( index >= 0 );
-
-      for( int i = index; i < m_ranges.Count; i++ )
-      {
-        m_ranges[ i ].Index = i;
-      }
-    }
-
-    private bool RemoveEmptyRange( SelectionRangeWithItems rangeWithItems )
-    {
-      Debug.Assert( rangeWithItems.IsEmpty );
-
-      bool removed = false;
-
-      var itemsToRemove = rangeWithItems.Items;
-      var itemsToRemoveCount = ( itemsToRemove == null ) ? 0 : itemsToRemove.Length;
-      var itemOffsetToRemove = 0;
-
-      do
-      {
-        for( int i = this.Count - 1; i >= 0; i-- )
-        {
-          var currentRangeWithItems = this[ i ];
-          var currentRange = currentRangeWithItems.Range;
-
-          var itemOffset = Array.IndexOf( currentRangeWithItems.Items, itemsToRemove[ itemOffsetToRemove ] );
-          if( itemOffset == -1 )
-            continue;
-
-          var overlap = new SelectionRange( currentRange.GetIndexFromItemOffset( itemOffset ) );
-
-          removed = true;
-          m_itemsCount -= overlap.Length;
-
-          var newRanges = currentRange.Exclude( overlap );
-
-          if( newRanges.Length == 0 )
-          {
-            this.RemoveAt( i, true );
-          }
-          else
-          {
-            this[ i ] = new SelectionRangeWithItems( newRanges[ 0 ], currentRangeWithItems.GetItems( newRanges[ 0 ] ) );
-
-            if( newRanges.Length > 1 )
-            {
-              Debug.Assert( newRanges.Length == 2 );
-              this.Insert( i + 1, new SelectionRangeWithItems( newRanges[ 1 ], currentRangeWithItems.GetItems( newRanges[ 1 ] ) ), true );
-            }
-          }
-        }
-
-        itemOffsetToRemove++;
-      }
-      while( itemOffsetToRemove < itemsToRemoveCount );
-
-      return removed;
-    }
-
-    private bool RemoveRangeWithItems( SelectionRangeWithItems rangeWithItems )
-    {
-      Debug.Assert( !rangeWithItems.IsEmpty );
-
-      var rangeToRemove = rangeWithItems.Range;
-      var matches = this.IndexOfOverlap( rangeWithItems ).OrderBy( item => item ).ToList();
-
-      for( int i = matches.Count - 1; i >= 0; i-- )
-      {
-        var index = matches[ i ];
-        var currentRangeWithItems = this[ index ];
-        var currentRange = currentRangeWithItems.Range;
-        var overlap = rangeToRemove.Intersect( currentRange );
-
-        Debug.Assert( !overlap.IsEmpty );
-
-        m_itemsCount -= overlap.Length;
-
-        var newRanges = currentRange.Exclude( overlap );
-
-        if( newRanges.Length == 0 )
-        {
-          this.RemoveAt( index, true );
-        }
-        else
-        {
-          this[ index ] = new SelectionRangeWithItems( newRanges[ 0 ], currentRangeWithItems.GetItems( newRanges[ 0 ] ) );
-
-          if( newRanges.Length > 1 )
-          {
-            Debug.Assert( newRanges.Length == 2 );
-            this.Insert( index + 1, new SelectionRangeWithItems( newRanges[ 1 ], currentRangeWithItems.GetItems( newRanges[ 1 ] ) ), true );
-          }
-        }
-      }
-
-      return ( matches.Count > 0 );
-    }
-
-    private IEnumerable<int> IndexOfOverlap( SelectionRangeWithItems rangeWithItems )
-    {
-      foreach( var entry in m_map.GetEntriesWithin( SelectedItemsStorage.GetArea( rangeWithItems ) ) )
-      {
-        var candidate = entry.Item;
-        var target = candidate.Value;
-        var overlap = rangeWithItems.Range.Intersect( target.Range );
-
-        Debug.Assert( !overlap.IsEmpty );
-
-        if( !overlap.IsEmpty && ( rangeWithItems.IsItemsEqual( overlap, target ) ) )
-          yield return candidate.Index;
-      }
-    }
-
-    #region ICloneable Members
-
-    public object Clone()
-    {
-      var copy = new SelectedItemsStorage( m_dataGridContext );
-
-      for( int i = 0; i < m_ranges.Count; i++ )
-      {
-        copy.Insert( i, m_ranges[ i ].Value, false );
-      }
-
-      copy.m_itemsCount = m_itemsCount;
-
-      return copy;
-    }
-
-    #endregion
-
-    #region IEnumerable<SelectionRangeWithItems> Members
-
-    public IEnumerator<SelectionRangeWithItems> GetEnumerator()
-    {
-      return m_ranges.Select( item => item.Value ).GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly List<SelectionRangeWithItemsWrapper> m_ranges = new List<SelectionRangeWithItemsWrapper>();
-    private readonly RSTree1D<SelectionRangeWithItemsWrapper> m_map = new RSTree1D<SelectionRangeWithItemsWrapper>();
-
-    #region SelectionRangeWithItemsWrapper Private Class
-
-    // We are wrapping the SelectionRangeWithItems structure inside a class so our collections
-    // may target the same object.
-    private sealed class SelectionRangeWithItemsWrapper
-    {
-      internal SelectionRangeWithItemsWrapper( SelectionRangeWithItems value, int index )
-      {
-        m_value = value;
-        m_index = index;
-      }
-
-      internal SelectionRangeWithItems Value
-      {
-        get
-        {
-          return m_value;
-        }
-      }
-
-      internal int Index
-      {
-        get
-        {
-          return m_index;
-        }
-        set
-        {
-          m_index = value;
-        }
-      }
-
-      private readonly SelectionRangeWithItems m_value;
-      private int m_index;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs
deleted file mode 100644
index 201f46f4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public struct SelectionCellRange
-  {
-    public static readonly SelectionCellRange Empty = new SelectionCellRange( -1, -1 );
-
-    #region CONSTRUCTORS
-
-    public SelectionCellRange( int itemIndex, int columnIndex )
-    {
-      if( ( itemIndex == -1 || columnIndex == -1 ) && ( itemIndex != -1 || columnIndex != -1 ) )
-        throw new ArgumentException( "itemIndex and columnIndex must be equal if the value of one is -1." );
-
-      if( ( itemIndex < -1 ) || ( itemIndex >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "itemIndex", "itemIndex must be equal to or greater than -1 and lower than int.MaxValue." );
-
-      if( ( columnIndex < -1 ) || ( columnIndex >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "columnIndex", "columnIndex must be equal to or greater than -1 and lower than int.MaxValue." );
-
-      m_itemRange = new SelectionRange( itemIndex );
-      m_columnRange = new SelectionRange( columnIndex );
-    }
-
-    public SelectionCellRange( int itemStartIndex, int columnStartIndex, int itemEndIndex, int columnEndIndex )
-    {
-      if( ( itemStartIndex < 0 ) || ( itemStartIndex >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "itemStartIndex", "itemStartIndex must be equal to or greater than zero and lower than int.MaxValue." );
-
-      if( ( itemEndIndex < 0 ) || ( itemEndIndex >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "itemEndIndex", "itemEndIndex must be equal to or greater than zero and lower than int.MaxValue." );
-
-      if( ( columnStartIndex < 0 ) || ( columnStartIndex >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "columnStartIndex", "columnStartIndex must be equal to or greater than zero and lower than int.MaxValue." );
-
-      if( ( columnEndIndex < 0 ) || ( columnEndIndex >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "columnEndIndex", "columnEndIndex must be equal to or greater than zero and lower than int.MaxValue." );
-
-      m_itemRange = new SelectionRange( itemStartIndex, itemEndIndex );
-      m_columnRange = new SelectionRange( columnStartIndex, columnEndIndex );
-    }
-
-    public SelectionCellRange( SelectionRange itemRange, SelectionRange columnRange )
-    {
-      m_itemRange = itemRange;
-      m_columnRange = columnRange;
-    }
-
-    #endregion
-
-    #region ItemRange Property
-
-    public SelectionRange ItemRange
-    {
-      get
-      {
-        return m_itemRange;
-      }
-      set
-      {
-        m_itemRange = value;
-      }
-    }
-
-    private SelectionRange m_itemRange;
-
-    #endregion
-
-    #region ColumnRange Property
-
-    public SelectionRange ColumnRange
-    {
-      get
-      {
-        return m_columnRange;
-      }
-      set
-      {
-        m_columnRange = value;
-      }
-    }
-
-    private SelectionRange m_columnRange;
-
-    #endregion
-
-    #region Length Property
-
-    public int Length
-    {
-      get
-      {
-        return m_itemRange.Length * m_columnRange.Length;
-      }
-    }
-
-    #endregion
-
-    #region IsEmpty Property
-
-    public bool IsEmpty
-    {
-      get
-      {
-        return m_itemRange.IsEmpty;
-      }
-    }
-
-    #endregion
-
-    public static bool operator ==( SelectionCellRange range1, SelectionCellRange range2 )
-    {
-      return range1.Equals( range2 );
-    }
-
-    public static bool operator !=( SelectionCellRange range1, SelectionCellRange range2 )
-    {
-      return !range1.Equals( range2 );
-    }
-
-    public SelectionCellRange Intersect( SelectionCellRange range )
-    {
-      SelectionCellRange cellRangeIntersection = SelectionCellRange.Empty;
-
-      SelectionRange itemRange = range.ItemRange;
-      SelectionRange itemRangeIntersection = m_itemRange.Intersect( itemRange );
-
-      if( itemRangeIntersection.IsEmpty )
-        return SelectionCellRange.Empty;
-
-      SelectionRange columnRange = range.ColumnRange;
-      SelectionRange columnRangeIntersection = m_columnRange.Intersect( columnRange );
-
-      if( columnRangeIntersection.IsEmpty )
-        return SelectionCellRange.Empty;
-
-      return new SelectionCellRange( itemRangeIntersection, columnRangeIntersection );
-    }
-
-    public SelectionCellRange[] Exclude( SelectionCellRange cellRangeToExclude )
-    {
-      if( cellRangeToExclude.IsEmpty )
-        return new SelectionCellRange[] { this };
-
-      SelectionCellRange cellRangeIntersection = this.Intersect( cellRangeToExclude );
-
-      if( cellRangeIntersection.IsEmpty )
-        return new SelectionCellRange[] { this };
-
-      SelectionRange[] itemRanges = m_itemRange.Exclude( cellRangeToExclude.ItemRange );
-      SelectionRange[] columnRanges = m_columnRange.Exclude( cellRangeToExclude.ColumnRange );
-      SelectionCellRange[] cellRanges = new SelectionCellRange[ itemRanges.Length + columnRanges.Length ];
-      int index = 0;
-
-      foreach( SelectionRange itemRange in itemRanges )
-      {
-        cellRanges[ index ] = new SelectionCellRange( itemRange, m_columnRange );
-        index++;
-      }
-
-      foreach( SelectionRange columnRange in columnRanges )
-      {
-        cellRanges[ index ] = new SelectionCellRange( cellRangeIntersection.ItemRange, columnRange );
-        index++;
-      }
-
-      Debug.Assert( index == cellRanges.Length );
-      return cellRanges;
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( !( obj is SelectionCellRange ) )
-        return false;
-
-      SelectionCellRange selectionRange = ( SelectionCellRange )obj;
-
-      return ( selectionRange.m_itemRange == m_itemRange )
-        && ( selectionRange.m_columnRange == m_columnRange );
-    }
-
-    public override int GetHashCode()
-    {
-      return ( m_itemRange.GetHashCode() ^ m_columnRange.GetHashCode() );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs
deleted file mode 100644
index 183b8d8e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class SelectionCellRangeCollection : IList<SelectionCellRange>, IList
-  {
-    internal SelectionCellRangeCollection( SelectedCellsStorage collection )
-    {
-      Debug.Assert( collection != null );
-
-      m_storage = collection;
-    }
-
-    #region IList<> Members
-
-    public SelectionCellRange this[ int index ]
-    {
-      get
-      {
-        return m_storage[ index ].CellRange;
-      }
-      set
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    public int IndexOf( SelectionCellRange item )
-    {
-      var count = m_storage.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( m_storage[ i ].CellRange == item )
-          return i;
-      }
-
-      return -1;
-    }
-
-    public void Insert( int index, SelectionCellRange item )
-    {
-      if( ( index < 0 ) || ( index > m_storage.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
-
-      var dataGridContext = m_storage.DataGridContext;
-      var dataGridControl = dataGridContext.DataGridControl;
-
-      if( dataGridControl.SelectionUnit == SelectionUnit.Row )
-        throw new InvalidOperationException( "Can't add cell range when SelectionUnit is Row." );
-
-      if( !( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
-      {
-        var minIndex = Math.Min( item.ItemRange.StartIndex, item.ItemRange.EndIndex );
-        var maxIndex = Math.Max( item.ItemRange.StartIndex, item.ItemRange.EndIndex );
-
-        if( ( minIndex < 0 ) || ( maxIndex >= dataGridContext.Items.Count ) )
-          throw new ArgumentException( "The selection range targets items outside of the data source.", "item" );
-      }
-
-      var selectionManager = dataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.SelectCells( dataGridContext, new SelectionCellRangeWithItems( item.ItemRange, null, item.ColumnRange ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public void RemoveAt( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_storage.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-      var dataGridContext = m_storage.DataGridContext;
-      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        var cellRange = this[ index ];
-        selectionManager.UnselectCells( dataGridContext, new SelectionCellRangeWithItems( cellRange.ItemRange, null, cellRange.ColumnRange ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    #endregion
-
-    #region IList Members
-
-    object IList.this[ int index ]
-    {
-      get
-      {
-        return this[ index ];
-      }
-      set
-      {
-        this[ index ] = ( SelectionCellRange )value;
-      }
-    }
-
-    bool IList.IsReadOnly
-    {
-      get
-      {
-        return ( ( ICollection<SelectionCellRange> )this ).IsReadOnly;
-      }
-    }
-
-    bool IList.IsFixedSize
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    int IList.Add( object item )
-    {
-      this.Add( ( SelectionCellRange )item );
-      return this.Count - 1;
-    }
-
-    void IList.Clear()
-    {
-      this.Clear();
-    }
-
-    void IList.Insert( int index, object item )
-    {
-      this.Insert( index, ( SelectionCellRange )item );
-    }
-
-    void IList.Remove( object item )
-    {
-      this.Remove( ( SelectionCellRange )item );
-    }
-
-    void IList.RemoveAt( int index )
-    {
-      this.RemoveAt( index );
-    }
-
-    bool IList.Contains( object item )
-    {
-      return this.Contains( ( SelectionCellRange )item );
-    }
-
-    int IList.IndexOf( object item )
-    {
-      return this.IndexOf( ( SelectionCellRange )item );
-    }
-
-    #endregion
-
-    #region ICollection<> Members
-
-    public int Count
-    {
-      get
-      {
-        return m_storage.Count;
-      }
-    }
-
-    bool ICollection<SelectionCellRange>.IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public void Add( SelectionCellRange item )
-    {
-      this.Insert( m_storage.Count, item );
-    }
-
-    public void Clear()
-    {
-      var dataGridContext = m_storage.DataGridContext;
-      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.UnselectAllCells( dataGridContext );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public bool Contains( SelectionCellRange item )
-    {
-      return ( this.IndexOf( item ) >= 0 );
-    }
-
-    public bool Remove( SelectionCellRange item )
-    {
-      var dataGridContext = m_storage.DataGridContext;
-      var dataGridControl = dataGridContext.DataGridControl;
-
-      if( dataGridControl.SelectionUnit == SelectionUnit.Row )
-        throw new InvalidOperationException( "Can't remove cell range when SelectionUnit is Row." );
-
-      if( !( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
-      {
-        var minIndex = Math.Min( item.ItemRange.StartIndex, item.ItemRange.EndIndex );
-        var maxIndex = Math.Max( item.ItemRange.StartIndex, item.ItemRange.EndIndex );
-
-        if( ( minIndex < 0 ) || ( maxIndex >= dataGridContext.Items.Count ) )
-          throw new ArgumentException( "The selection range targets items outside of the data source.", "item" );
-      }
-
-      var selectionManager = dataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        return selectionManager.UnselectCells( dataGridContext, new SelectionCellRangeWithItems( item.ItemRange, null, item.ColumnRange ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public void CopyTo( SelectionCellRange[] array, int arrayIndex )
-    {
-      ( ( ICollection )this ).CopyTo( array, arrayIndex );
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    int ICollection.Count
-    {
-      get
-      {
-        return this.Count;
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        return m_storage;
-      }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    void ICollection.CopyTo( Array array, int arrayIndex )
-    {
-      var count = m_storage.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        array.SetValue( m_storage[ i ].CellRange, arrayIndex );
-        arrayIndex++;
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable<SelectionRange> Members
-
-    public IEnumerator<SelectionCellRange> GetEnumerator()
-    {
-      return ( from item in m_storage
-               select item.CellRange ).GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly SelectedCellsStorage m_storage;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs
deleted file mode 100644
index 3a62357a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  internal struct SelectionCellRangeWithItems
-  {
-    public static readonly SelectionCellRangeWithItems Empty = new SelectionCellRangeWithItems( SelectionRange.Empty, null, SelectionRange.Empty );
-
-    public SelectionCellRangeWithItems( int itemIndex, object item, int columnIndex )
-      : this( new SelectionRange( itemIndex ), new object[] { item }, new SelectionRange( columnIndex ) )
-    {
-    }
-
-    public SelectionCellRangeWithItems( SelectionRange itemRange, object[] items, SelectionRange columnRange )
-    {
-      if( ( items != null ) && ( items.Length != itemRange.Length ) )
-        throw new ArgumentException( "itemRange and items must have the same length." );
-
-      m_itemRangeWithItems = new SelectionRangeWithItems( itemRange, items );
-      m_columnRange = columnRange;
-    }
-
-    #region ItemRangeWithItems Property
-
-    public SelectionRangeWithItems ItemRangeWithItems
-    {
-      get
-      {
-        return m_itemRangeWithItems;
-      }
-    }
-
-    SelectionRangeWithItems m_itemRangeWithItems;
-
-    #endregion
-
-    #region ItemRange Property
-
-    public SelectionRange ItemRange
-    {
-      get
-      {
-        return m_itemRangeWithItems.Range;
-      }
-    }
-
-    #endregion
-
-    #region ColumnRange Property
-
-    public SelectionRange ColumnRange
-    {
-      get
-      {
-        return m_columnRange;
-      }
-    }
-
-    SelectionRange m_columnRange;
-
-    #endregion
-
-    #region CellRange Property
-
-    public SelectionCellRange CellRange
-    {
-      get
-      {
-        return new SelectionCellRange( m_itemRangeWithItems.Range, m_columnRange );
-      }
-    }
-
-    #endregion
-
-    #region Length Property
-
-    public int Length
-    {
-      get
-      {
-        return m_itemRangeWithItems.Range.Length * m_columnRange.Length;
-      }
-    }
-
-    #endregion
-
-    public static bool operator ==( SelectionCellRangeWithItems rangeWithItems1, SelectionCellRangeWithItems rangeWithItems2 )
-    {
-      return ( rangeWithItems1.m_columnRange == rangeWithItems2.m_columnRange )
-          && ( rangeWithItems1.m_itemRangeWithItems == rangeWithItems2.m_itemRangeWithItems );
-    }
-
-    public static bool operator !=( SelectionCellRangeWithItems rangeWithItems1, SelectionCellRangeWithItems rangeWithItems2 )
-    {
-      return ( rangeWithItems1.m_columnRange != rangeWithItems2.m_columnRange )
-          || ( rangeWithItems1.m_itemRangeWithItems != rangeWithItems2.m_itemRangeWithItems );
-    }
-
-    public override int GetHashCode()
-    {
-      return ( m_itemRangeWithItems.GetHashCode() ^ m_columnRange.GetHashCode() );
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( !( obj is SelectionCellRangeWithItems ) )
-        return false;
-
-      return ( ( SelectionCellRangeWithItems )obj ) == this;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs
deleted file mode 100644
index f2b08270..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs
+++ /dev/null
@@ -1,1255 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelectionChanger
-  {
-    #region Static Fields
-
-    private static readonly SelectedItemsStorage EmptyItemsStore = new SelectedItemsStorage( null );
-    private static readonly SelectedCellsStorage EmptyCellsStore = new SelectedCellsStorage( null );
-
-    #endregion
-
-    internal SelectionChanger( DataGridContext owner )
-    {
-      m_owner = owner;
-      m_itemsToSelect = new SelectedItemsStorage( owner );
-      m_itemsToUnselect = new SelectedItemsStorage( owner );
-      m_cellsToSelect = new SelectedCellsStorage( owner );
-      m_cellsToUnselect = new SelectedCellsStorage( owner );
-      m_toDeferSelect = new List<object>( 1 );
-      m_sourceChanges = new List<SourceChangeInfo>( 2 );
-    }
-
-    #region Owner Property
-
-    internal DataGridContext Owner
-    {
-      get
-      {
-        return m_owner;
-      }
-    }
-
-    private readonly DataGridContext m_owner;
-
-    #endregion
-
-    public bool SelectItems( SelectionRangeWithItems rangeWithItems )
-    {
-      SelectionRange range = rangeWithItems.Range;
-
-      if( !( m_owner.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
-      {
-        if( range.IsEmpty )
-        {
-          foreach( object item in rangeWithItems.Items )
-          {
-            if( !m_toDeferSelect.Contains( item ) )
-              m_toDeferSelect.Add( item );
-          }
-
-          return false;
-        }
-      }
-      else
-      {
-        if( range.IsEmpty )
-          throw new ArgumentException( "rangeWithItems.Range can't be empty when we are using a DataGridVirtualizingCollectionView", "rangeWithItems" );
-      }
-
-      if( rangeWithItems.Length == 1 )
-      {
-        if( !m_itemsToUnselect.Remove( rangeWithItems ) )
-        {
-          if( m_owner.SelectedItemsStore.Contains( rangeWithItems ) )
-            return false;
-
-          if( m_itemsToSelect.Contains( range ) )
-            return false;
-
-          this.m_itemsToSelect.Add( rangeWithItems );
-        }
-
-        return true;
-      }
-      else
-      {
-        bool selectionChanged = m_itemsToUnselect.Remove( rangeWithItems );
-
-        SelectedItemsStorage tempStorage = new SelectedItemsStorage( m_owner );
-        tempStorage.Add( rangeWithItems );
-
-        // Remove the currently selected item from the new range to select
-        foreach( SelectionRangeWithItems existingSelectionRangeWithItems in m_owner.SelectedItemsStore )
-        {
-          tempStorage.Remove( existingSelectionRangeWithItems );
-        }
-
-        // Remove the pending item to be selected from the new range to select
-        foreach( SelectionRangeWithItems existingSelectionRangeWithItems in m_itemsToSelect )
-        {
-          tempStorage.Remove( existingSelectionRangeWithItems );
-        }
-
-        if( tempStorage.Count > 0 )
-        {
-          selectionChanged = true;
-
-          foreach( SelectionRangeWithItems rangeWithItemsToAdd in tempStorage )
-          {
-            m_itemsToSelect.Add( rangeWithItemsToAdd );
-          }
-        }
-
-        return selectionChanged;
-      }
-    }
-
-    public bool SelectCells( SelectionCellRangeWithItems cellRangeWithItems )
-    {
-      SelectionRange itemRange = cellRangeWithItems.ItemRange;
-
-      if( itemRange.IsEmpty )
-        throw new ArgumentException( "cellRangeWithItems.ItemRange can't be empty", "cellRangeWithItems" );
-
-      if( cellRangeWithItems.Length == 1 )
-      {
-        if( !m_cellsToUnselect.Remove( cellRangeWithItems ) )
-        {
-          if( m_owner.SelectedCellsStore.Contains( cellRangeWithItems ) )
-            return false;
-
-          if( m_cellsToSelect.Contains( cellRangeWithItems.CellRange ) )
-            return false;
-
-          this.m_cellsToSelect.Add( cellRangeWithItems );
-        }
-
-        return true;
-      }
-      else
-      {
-        bool selectionChanged = m_cellsToUnselect.Remove( cellRangeWithItems );
-
-        SelectedCellsStorage tempStorage = new SelectedCellsStorage( m_owner );
-        tempStorage.Add( cellRangeWithItems );
-
-        // Remove the currently selected item from the new range to select
-        foreach( SelectionCellRangeWithItems existingSelectionCellRangeWithItems in m_owner.SelectedCellsStore )
-        {
-          tempStorage.Remove( existingSelectionCellRangeWithItems );
-        }
-
-        // Remove the pending item to be selected from the new range to select
-        foreach( SelectionCellRangeWithItems existingSelectionCellRangeWithItems in m_cellsToSelect )
-        {
-          tempStorage.Remove( existingSelectionCellRangeWithItems );
-        }
-
-        if( tempStorage.Count > 0 )
-        {
-          selectionChanged = true;
-
-          foreach( SelectionCellRangeWithItems cellRangeWithItemsToAdd in tempStorage )
-          {
-            m_cellsToSelect.Add( cellRangeWithItemsToAdd );
-          }
-        }
-
-        return selectionChanged;
-      }
-    }
-
-    public bool UnselectItems( SelectionRangeWithItems rangeWithItems )
-    {
-      if( !( m_owner.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
-      {
-        if( m_toDeferSelect.Count > 0 )
-        {
-          foreach( object item in rangeWithItems.Items )
-          {
-            m_toDeferSelect.Remove( item );
-          }
-        }
-      }
-
-      SelectionRange range = rangeWithItems.Range;
-
-      if( range.IsEmpty )
-      {
-        // We have no index we have to remove based on item
-        bool selectionChanged = false;
-
-        List<SelectionRangeWithItems> itemsRangeToRemove = new List<SelectionRangeWithItems>();
-        List<object> itemsToUnselect = new List<object>( rangeWithItems.Items );
-        int count = itemsToUnselect.Count;
-
-        for( int i = count - 1; i >= 0; i-- )
-        {
-          object itemToUnselect = itemsToUnselect[ i ];
-          bool selectionAdded = false;
-
-          foreach( SelectionRangeWithItems existingSelectionRangeWithItems in m_itemsToSelect )
-          {
-            int index = Array.IndexOf( existingSelectionRangeWithItems.Items, itemToUnselect );
-
-            if( index > -1 )
-            {
-              selectionAdded = true;
-
-              itemsRangeToRemove.Add(
-                new SelectionRangeWithItems(
-                  existingSelectionRangeWithItems.Range.GetIndexFromItemOffset( index ),
-                  itemToUnselect ) );
-            }
-          }
-
-          if( selectionAdded )
-          {
-            itemsToUnselect.RemoveAt( i );
-          }
-        }
-
-        // Remove the currently unselected item from the new range to select
-        foreach( SelectionRangeWithItems itemRangeToRemove in itemsRangeToRemove )
-        {
-          selectionChanged |= m_itemsToSelect.Remove( itemRangeToRemove );
-        }
-
-        count = itemsToUnselect.Count;
-
-        for( int i = 0; i < count; i++ )
-        {
-          object itemToUnselect = itemsToUnselect[ i ];
-
-          foreach( SelectionRangeWithItems existingSelectionRangeWithItems in m_owner.SelectedItemsStore )
-          {
-            int index = Array.IndexOf( existingSelectionRangeWithItems.Items, itemToUnselect );
-
-            if( index >= 0 )
-            {
-              index = existingSelectionRangeWithItems.Range.GetIndexFromItemOffset( index );
-
-              if( !m_itemsToUnselect.Contains( index ) )
-              {
-                selectionChanged = true;
-                m_itemsToUnselect.Add( new SelectionRangeWithItems( index, itemToUnselect ) );
-              }
-            }
-          }
-        }
-
-        return selectionChanged;
-      }
-
-      if( range.Length == 1 )
-      {
-        if( !m_itemsToSelect.Remove( rangeWithItems ) )
-        {
-          if( !m_owner.SelectedItemsStore.Contains( range ) )
-            return false;
-
-          if( m_itemsToUnselect.Contains( range ) )
-            return false;
-
-          m_itemsToUnselect.Add( rangeWithItems );
-        }
-
-        return true;
-      }
-      else
-      {
-        SelectedItemsStorage tempStorage = new SelectedItemsStorage( m_owner );
-        tempStorage.Add( rangeWithItems );
-
-        // Remove the currently selected item from the new range to select
-        foreach( SelectionRangeWithItems existingSelectionRangeWithItems in m_itemsToSelect )
-        {
-          if( !range.Intersect( existingSelectionRangeWithItems.Range ).IsEmpty )
-          {
-            tempStorage.Remove( existingSelectionRangeWithItems );
-          }
-        }
-
-        bool selectionChanged = m_itemsToSelect.Remove( rangeWithItems );
-
-        if( tempStorage.Count > 0 )
-        {
-          selectionChanged = true;
-
-          foreach( SelectionRangeWithItems rangeWithItemsToAdd in tempStorage )
-          {
-            Debug.Assert( !m_itemsToUnselect.Contains( rangeWithItemsToAdd.Range ) );
-            m_itemsToUnselect.Add( rangeWithItemsToAdd );
-          }
-        }
-
-        return selectionChanged;
-      }
-    }
-
-    public bool UnselectCells( SelectionCellRangeWithItems cellRangeWithItems )
-    {
-      SelectionRange itemRange = cellRangeWithItems.ItemRange;
-      SelectionRange columnRange = cellRangeWithItems.ColumnRange;
-      SelectionCellRange cellRange = cellRangeWithItems.CellRange;
-
-      if( itemRange.IsEmpty )
-      {
-        // We have no index we have to remove based on item
-        bool selectionChanged = false;
-
-        List<SelectionCellRangeWithItems> cellsRangeToRemove = new List<SelectionCellRangeWithItems>();
-        List<object> itemsToUnselect = new List<object>( cellRangeWithItems.ItemRangeWithItems.Items );
-        int count = itemsToUnselect.Count;
-
-        for( int i = count - 1; i >= 0; i-- )
-        {
-          object itemToUnselect = itemsToUnselect[ i ];
-
-          foreach( SelectionCellRangeWithItems existingSelectionCellRangeWithItems in m_cellsToSelect )
-          {
-            SelectionRange columnIntersection = columnRange.Intersect( existingSelectionCellRangeWithItems.ColumnRange );
-
-            if( columnIntersection.IsEmpty )
-              continue;
-
-            int index = Array.IndexOf( existingSelectionCellRangeWithItems.ItemRangeWithItems.Items, itemToUnselect );
-
-            if( index > -1 )
-            {
-              cellsRangeToRemove.Add(
-                new SelectionCellRangeWithItems(
-                  new SelectionRange( existingSelectionCellRangeWithItems.ItemRange.GetIndexFromItemOffset( index ) ),
-                  new object[] { itemToUnselect },
-                  columnIntersection ) );
-            }
-          }
-        }
-
-        // Remove the currently unselected item from the new range to select
-        foreach( SelectionCellRangeWithItems cellRangeToRemove in cellsRangeToRemove )
-        {
-          selectionChanged |= m_cellsToSelect.Remove( cellRangeToRemove );
-        }
-
-        count = itemsToUnselect.Count;
-
-        for( int i = 0; i < count; i++ )
-        {
-          object itemToUnselect = itemsToUnselect[ i ];
-
-          foreach( SelectionCellRangeWithItems existingSelectionCellRangeWithItems in m_owner.SelectedCellsStore )
-          {
-            SelectionRange columnIntersection = columnRange.Intersect( existingSelectionCellRangeWithItems.ColumnRange );
-
-            if( columnIntersection.IsEmpty )
-              continue;
-
-            int index = Array.IndexOf( existingSelectionCellRangeWithItems.ItemRangeWithItems.Items, itemToUnselect );
-
-            if( index > -1 )
-            {
-              index = existingSelectionCellRangeWithItems.ItemRange.GetIndexFromItemOffset( index );
-
-              SelectionCellRange cellRangeTemp = new SelectionCellRange(
-                new SelectionRange( existingSelectionCellRangeWithItems.ItemRange.GetIndexFromItemOffset( index ) ),
-                columnIntersection );
-
-              if( !m_cellsToUnselect.Contains( cellRangeTemp ) )
-              {
-                selectionChanged = true;
-
-                m_cellsToUnselect.Add( new SelectionCellRangeWithItems(
-                  cellRangeTemp.ItemRange, new object[] { itemToUnselect }, cellRangeTemp.ColumnRange ) );
-              }
-            }
-          }
-        }
-
-        return selectionChanged;
-      }
-
-      if( cellRangeWithItems.Length == 1 )
-      {
-        if( !m_cellsToSelect.Remove( cellRangeWithItems ) )
-        {
-          if( !m_owner.SelectedCellsStore.Contains( cellRange ) )
-            return false;
-
-          if( m_cellsToUnselect.Contains( cellRange ) )
-            return false;
-
-          m_cellsToUnselect.Add( cellRangeWithItems );
-        }
-
-        return true;
-      }
-      else
-      {
-        SelectedCellsStorage tempStorage = new SelectedCellsStorage( m_owner );
-        tempStorage.Add( cellRangeWithItems );
-
-        // Remove the currently selected item from the new range to select
-        foreach( SelectionCellRangeWithItems existingSelectionCellRangeWithItems in m_cellsToSelect )
-        {
-          tempStorage.Remove( existingSelectionCellRangeWithItems );
-        }
-
-        bool selectionChanged = m_cellsToSelect.Remove( cellRangeWithItems );
-
-        if( tempStorage.Count > 0 )
-        {
-          selectionChanged = true;
-
-          foreach( SelectionCellRangeWithItems cellRangeWithItemsToAdd in tempStorage )
-          {
-            Debug.Assert( !m_cellsToUnselect.Contains( cellRangeWithItemsToAdd.CellRange ) );
-            m_cellsToUnselect.Add( cellRangeWithItemsToAdd );
-          }
-        }
-
-        return selectionChanged;
-      }
-    }
-
-    public bool SelectJustThisItem( int itemIndex, object item )
-    {
-      bool selectionDone = true;
-      m_toDeferSelect.Clear();
-
-      SelectionRangeWithItems rangeWithItemsToSelect = new SelectionRangeWithItems( itemIndex, item );
-      SelectionRange range = rangeWithItemsToSelect.Range;
-
-      if( m_itemsToSelect.Contains( range ) )
-        selectionDone = false;
-
-      m_itemsToSelect.Clear();
-      SelectedItemsStorage selectedItemsInChange = m_owner.SelectedItemsStore;
-
-      if( selectedItemsInChange.Contains( range ) )
-      {
-        if( !m_itemsToUnselect.Contains( range ) )
-          selectionDone = false;
-
-        m_itemsToUnselect.Clear();
-
-        foreach( SelectionRangeWithItems selectedRangeWithItems in selectedItemsInChange )
-        {
-          m_itemsToUnselect.Add( selectedRangeWithItems );
-        }
-
-        m_itemsToUnselect.Remove( rangeWithItemsToSelect );
-      }
-      else
-      {
-        m_itemsToSelect.Add( rangeWithItemsToSelect );
-        m_itemsToUnselect.Clear();
-
-        foreach( SelectionRangeWithItems selectedRangeWithItems in selectedItemsInChange )
-        {
-          m_itemsToUnselect.Add( selectedRangeWithItems );
-        }
-      }
-
-      this.UnselectAllCells();
-      return selectionDone;
-    }
-
-    public bool SelectJustThisCell( int itemIndex, object item, int columnIndex )
-    {
-      bool selectionDone = true;
-      m_toDeferSelect.Clear();
-
-      SelectionCellRangeWithItems rangeWithItemsToSelect =
-        new SelectionCellRangeWithItems( itemIndex, item, columnIndex );
-
-      SelectionCellRange cellRange = rangeWithItemsToSelect.CellRange;
-
-      if( m_cellsToSelect.Contains( cellRange ) )
-        selectionDone = false;
-
-      m_cellsToSelect.Clear();
-      SelectedCellsStorage selectedCellsInChange = m_owner.SelectedCellsStore;
-
-      if( selectedCellsInChange.Contains( cellRange ) )
-      {
-        if( !m_cellsToUnselect.Contains( cellRange ) )
-          selectionDone = false;
-
-        m_cellsToUnselect.Clear();
-
-        foreach( SelectionCellRangeWithItems selectedCellRangeWithItems in selectedCellsInChange )
-        {
-          m_cellsToUnselect.Add( selectedCellRangeWithItems );
-        }
-
-        m_cellsToUnselect.Remove( rangeWithItemsToSelect );
-      }
-      else
-      {
-        m_cellsToSelect.Add( rangeWithItemsToSelect );
-        m_cellsToUnselect.Clear();
-
-        foreach( SelectionCellRangeWithItems selectedCellRangeWithItems in selectedCellsInChange )
-        {
-          m_cellsToUnselect.Add( selectedCellRangeWithItems );
-        }
-      }
-
-      this.UnselectAllItems();
-      return selectionDone;
-    }
-
-    public bool SelectItemCells(
-      int itemIndex,
-      object item,
-      HashedLinkedList<ColumnBase> columnsByVisiblePosition,
-      bool preserveSelection )
-    {
-      bool selectionDone = true;
-      int columnsCount = columnsByVisiblePosition.Count;
-      m_toDeferSelect.Clear();
-
-      SelectionCellRangeWithItems rangeWithItemsToSelect =
-        new SelectionCellRangeWithItems(
-        new SelectionRange( itemIndex ),
-        new object[] { item },
-        new SelectionRange( 0, columnsCount - 1 ) );
-
-      SelectionCellRange cellRange = rangeWithItemsToSelect.CellRange;
-
-      m_cellsToSelect.Clear();
-      SelectedCellsStorage selectedCellsInChange = m_owner.SelectedCellsStore;
-
-      // Remove all currently selected Cells from the new selectionRange
-      // to avoid duplicate SelectionCellRange
-      SelectedCellsStorage tempStorage = new SelectedCellsStorage( null );
-      tempStorage.Add( rangeWithItemsToSelect );
-
-      for( int i = 0; i < selectedCellsInChange.Count; i++ )
-      {
-        tempStorage.Remove( selectedCellsInChange[ i ] );
-      }
-
-      foreach( ColumnBase column in columnsByVisiblePosition )
-      {
-        if( !column.Visible )
-          tempStorage.Remove( new SelectionCellRangeWithItems( itemIndex, item, column.VisiblePosition ) );
-      }
-
-      int tempStorageCount = tempStorage.Count;
-
-      // All Cells are already selected
-      if( tempStorageCount == 0 )
-      {
-        if( !m_cellsToUnselect.Contains( cellRange ) )
-          selectionDone = false;
-
-        m_cellsToUnselect.Clear();
-
-        if( !preserveSelection )
-        {
-          foreach( SelectionCellRangeWithItems selectedCellRangeWithItems in selectedCellsInChange )
-          {
-            m_cellsToUnselect.Add( selectedCellRangeWithItems );
-          }
-        }
-
-        m_cellsToUnselect.Remove( rangeWithItemsToSelect );
-      }
-      else
-      {
-        // Add each range to selection
-        for( int i = 0; i < tempStorageCount; i++ )
-        {
-          m_cellsToSelect.Add( tempStorage[ i ] );
-        }
-
-        m_cellsToUnselect.Clear();
-
-        if( !preserveSelection )
-        {
-          foreach( SelectionCellRangeWithItems selectedCellRangeWithItems in selectedCellsInChange )
-          {
-            tempStorage = new SelectedCellsStorage( null );
-            tempStorage.Add( selectedCellRangeWithItems );
-            tempStorage.Remove( rangeWithItemsToSelect );
-            tempStorageCount = tempStorage.Count;
-
-            for( int i = 0; i < tempStorageCount; i++ )
-            {
-              m_cellsToUnselect.Add( tempStorage[ i ] );
-            }
-          }
-        }
-      }
-
-      if( !preserveSelection )
-        this.UnselectAllItems();
-
-      return selectionDone;
-    }
-
-    public void UnselectAllItems()
-    {
-      m_toDeferSelect.Clear();
-      m_itemsToSelect.Clear();
-      m_itemsToUnselect.Clear();
-
-      foreach( SelectionRangeWithItems selectedRangeWithItems in m_owner.SelectedItemsStore )
-      {
-        m_itemsToUnselect.Add( selectedRangeWithItems );
-      }
-    }
-
-    public void UnselectAllCells()
-    {
-      m_cellsToSelect.Clear();
-      m_cellsToUnselect.Clear();
-
-      foreach( SelectionCellRangeWithItems selectedCellRangeWithItems in m_owner.SelectedCellsStore )
-      {
-        m_cellsToUnselect.Add( selectedCellRangeWithItems );
-      }
-    }
-
-    public void Cleanup()
-    {
-      m_itemsToSelect.Clear();
-      m_itemsToUnselect.Clear();
-      m_cellsToSelect.Clear();
-      m_cellsToUnselect.Clear();
-    }
-
-    public void CleanupDeferSelection()
-    {
-      m_toDeferSelect.Clear();
-    }
-
-    public void UpdateSelectedItemsInChangeOfDataGridContext()
-    {
-      var removedRangeWithItems = new List<SelectionRangeWithItems>();
-      var unselectedItemsFromRemove = this.GetUnselectedItemsFromRemove( removedRangeWithItems );
-      var ownerSelectedItems = m_owner.SelectedItemsStore;
-
-      for( int i = 0; i < m_sourceChanges.Count; i++ )
-      {
-        var sourceChangeInfo = m_sourceChanges[ i ];
-
-        switch( sourceChangeInfo.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-            {
-              if( sourceChangeInfo.StartIndex != -1 )
-              {
-                ownerSelectedItems.OffsetIndex( sourceChangeInfo.StartIndex, sourceChangeInfo.Count );
-              }
-
-              break;
-            }
-
-          case NotifyCollectionChangedAction.Remove:
-            break;
-
-          default:
-            throw new NotSupportedException( "Only Add and Remove are supported." );
-        }
-      }
-
-      foreach( SelectionRangeWithItems rangeWithItems in removedRangeWithItems )
-      {
-        ownerSelectedItems.Remove( rangeWithItems );
-        ownerSelectedItems.OffsetIndex( rangeWithItems.Range.StartIndex, -rangeWithItems.Length );
-      }
-
-      for( int i = m_toDeferSelect.Count - 1; i >= 0; i-- )
-      {
-        object item = m_toDeferSelect[ i ];
-        int itemIndex = m_owner.Items.IndexOf( item );
-
-        if( itemIndex >= 0 )
-        {
-          if( !m_itemsToUnselect.Contains( itemIndex ) )
-          {
-            m_itemsToSelect.Add( new SelectionRangeWithItems( itemIndex, item ) );
-          }
-
-          m_toDeferSelect.RemoveAt( i );
-        }
-      }
-
-      if( ( m_itemsToUnselect.Count > 0 ) || ( m_itemsToSelect.Count > 0 ) || ( unselectedItemsFromRemove.Any() ) )
-      {
-        var realizedDataRows = new Dictionary<int, DataRow>();
-
-        // Only want to update the realizedDataRows if the selection change is from user interaction and not
-        // from the source being updated.  When the source is updated, the generator will recreate needed container,
-        // so the old one will have the correct selection state.
-        foreach( var container in m_owner.CustomItemContainerGenerator.RealizedContainers )
-        {
-          var dataRow = container as DataRow;
-
-          if( ( dataRow != null ) && ( DataGridControl.GetDataGridContext( dataRow ) == m_owner ) )
-          {
-            realizedDataRows[ DataGridVirtualizingPanel.GetItemIndex( dataRow ) ] = dataRow;
-          }
-        }
-
-        var sourceItemIsDataRow = false;
-
-        foreach( var rangeWithItems in m_itemsToUnselect )
-        {
-          sourceItemIsDataRow |= this.SetIsSelectedOnDataRow( realizedDataRows, rangeWithItems, false );
-          ownerSelectedItems.Remove( rangeWithItems );
-        }
-
-        foreach( var rangeWithItems in m_itemsToSelect )
-        {
-          sourceItemIsDataRow |= this.SetIsSelectedOnDataRow( realizedDataRows, rangeWithItems, true );
-          ownerSelectedItems.Add( rangeWithItems );
-        }
-
-        foreach( var rangeWithItems in unselectedItemsFromRemove )
-        {
-          m_itemsToUnselect.Add( rangeWithItems );
-        }
-
-        if( !sourceItemIsDataRow )
-        {
-          foreach( var realizedItemPair in realizedDataRows )
-          {
-            if( ownerSelectedItems.Contains( new SelectionRange( realizedItemPair.Key ) ) )
-            {
-              realizedItemPair.Value.SetIsSelected( true );
-            }
-            else
-            {
-              realizedItemPair.Value.SetIsSelected( false );
-            }
-          }
-        }
-      }
-    }
-
-    public void UpdateSelectedCellsInChangeOfDataGridContext()
-    {
-      var removedCellsRangeWithItems = new List<SelectionCellRangeWithItems>();
-      var unselectedCellsFromRemove = this.GetUnselectedCellsFromRemove( removedCellsRangeWithItems );
-      var ownerSelectedCells = m_owner.SelectedCellsStore;
-
-      for( int i = 0; i < m_sourceChanges.Count; i++ )
-      {
-        var sourceChangeInfo = m_sourceChanges[ i ];
-
-        switch( sourceChangeInfo.Action )
-        {
-          case NotifyCollectionChangedAction.Add:
-            {
-              if( sourceChangeInfo.StartIndex != -1 )
-              {
-                ownerSelectedCells.OffsetIndex( sourceChangeInfo.StartIndex, sourceChangeInfo.Count );
-              }
-
-              break;
-            }
-
-          case NotifyCollectionChangedAction.Remove:
-            break;
-
-          default:
-            throw new NotSupportedException( "Only Add and Remove are supported." );
-        }
-      }
-
-      foreach( var cellRangeWithItems in removedCellsRangeWithItems )
-      {
-        ownerSelectedCells.Remove( cellRangeWithItems );
-        ownerSelectedCells.OffsetIndex( cellRangeWithItems.ItemRange.StartIndex, -cellRangeWithItems.ItemRange.Length );
-      }
-
-      if( ( m_cellsToUnselect.Count > 0 ) || ( m_cellsToSelect.Count > 0 ) || ( unselectedCellsFromRemove.Any() ) )
-      {
-        var realizedDataRows = new Dictionary<int, DataRow>();
-
-        // Only want to update the realizedCells if the selection change is from user interaction and not
-        // from the source being updated.  When the source is updated, the generator will recreate needed container,
-        // so the old one will have the correct selection state.
-        foreach( var container in m_owner.CustomItemContainerGenerator.RealizedContainers )
-        {
-          var dataRow = container as DataRow;
-
-          if( ( dataRow != null ) && ( DataGridControl.GetDataGridContext( dataRow ) == m_owner ) )
-          {
-            realizedDataRows[ DataGridVirtualizingPanel.GetItemIndex( dataRow ) ] = dataRow;
-          }
-        }
-
-        // We use the ColumnsByVisiblePosition for when column are changing position, we want to have the state before the change.
-        var columnsByVisiblePositionLikedList = m_owner.ColumnsByVisiblePosition;
-        var columnIndex = 0;
-        var columnsVisiblePosition = new Dictionary<ColumnBase, int>( columnsByVisiblePositionLikedList.Count );
-        var columnNode = columnsByVisiblePositionLikedList.First;
-
-        while( columnNode != null )
-        {
-          columnsVisiblePosition.Add( columnNode.Value, columnIndex );
-          columnIndex++;
-          columnNode = columnNode.Next;
-        }
-
-        foreach( var cellRangeWithItems in m_cellsToUnselect )
-        {
-          this.SetIsSelectedOnDataCell( columnsVisiblePosition, realizedDataRows, cellRangeWithItems, false );
-          ownerSelectedCells.Remove( cellRangeWithItems );
-        }
-
-        foreach( var cellRangeWithItems in m_cellsToSelect )
-        {
-          this.SetIsSelectedOnDataCell( columnsVisiblePosition, realizedDataRows, cellRangeWithItems, true );
-          ownerSelectedCells.Add( cellRangeWithItems );
-        }
-
-        foreach( var cellRangeWithItems in unselectedCellsFromRemove )
-        {
-          m_cellsToUnselect.Add( cellRangeWithItems );
-        }
-      }
-    }
-
-    public void UpdateSelectionAfterSourceDataItemAdded( NotifyCollectionChangedEventArgs e )
-    {
-      int newStartingIndex = e.NewStartingIndex;
-
-      // if newStartingIndex == -1, we take for granted that the newly added items are at the end of the list.
-      // In that case, we have nothing to do.
-      if( newStartingIndex == -1 )
-        return;
-
-      IList addedItemsList = e.NewItems;
-      int addedItemsCount = addedItemsList.Count;
-
-      m_sourceChanges.Add( new SourceChangeInfo( e.Action, newStartingIndex, addedItemsCount, addedItemsList ) );
-
-      m_itemsToSelect.OffsetIndex( newStartingIndex, addedItemsCount );
-      m_itemsToUnselect.OffsetIndex( newStartingIndex, addedItemsCount );
-      m_cellsToSelect.OffsetIndex( newStartingIndex, addedItemsCount );
-      m_cellsToUnselect.OffsetIndex( newStartingIndex, addedItemsCount );
-    }
-
-    public void UpdateSelectionAfterSourceDataItemRemoved( NotifyCollectionChangedEventArgs e )
-    {
-      int oldStartingIndex = e.OldStartingIndex;
-      IList removedItemsList = e.OldItems;
-      int removedItemsCount = removedItemsList.Count;
-
-      m_sourceChanges.Add( new SourceChangeInfo( e.Action, oldStartingIndex, removedItemsCount, removedItemsList ) );
-
-      if( oldStartingIndex == -1 )
-      {
-        foreach( object item in removedItemsList )
-        {
-          SelectionRangeWithItems rangeWithItemsToRemove = new SelectionRangeWithItems( SelectionRange.Empty, new object[] { item } );
-
-          m_itemsToSelect.Remove( rangeWithItemsToRemove );
-          m_itemsToUnselect.Remove( rangeWithItemsToRemove );
-
-          SelectionCellRangeWithItems cellRangeWithItemsToRemove = new SelectionCellRangeWithItems(
-            SelectionRange.Empty, new object[] { item }, new SelectionRange( 0, int.MaxValue - 1 ) );
-
-          m_cellsToSelect.Remove( cellRangeWithItemsToRemove );
-          m_cellsToUnselect.Remove( cellRangeWithItemsToRemove );
-        }
-
-        // Seek out in a max range of removedItemsCount the new position for actually selected item.
-        m_itemsToSelect.OffsetIndexBasedOnSourceNewIndex( -removedItemsCount );
-        m_itemsToUnselect.OffsetIndexBasedOnSourceNewIndex( -removedItemsCount );
-        m_cellsToSelect.OffsetIndexBasedOnSourceNewIndex( -removedItemsCount );
-        m_cellsToUnselect.OffsetIndexBasedOnSourceNewIndex( -removedItemsCount );
-      }
-      else
-      {
-        SelectionRange itemRange = new SelectionRange( oldStartingIndex, oldStartingIndex + removedItemsCount - 1 );
-        SelectionRangeWithItems rangeWithItemsToRemove = new SelectionRangeWithItems( itemRange, null );
-        m_itemsToSelect.Remove( rangeWithItemsToRemove );
-        m_itemsToUnselect.Remove( rangeWithItemsToRemove );
-        m_itemsToSelect.OffsetIndex( oldStartingIndex, -removedItemsCount );
-        m_itemsToUnselect.OffsetIndex( oldStartingIndex, -removedItemsCount );
-
-        SelectionCellRangeWithItems cellRangeWithItemsToRemove = new SelectionCellRangeWithItems(
-          itemRange, null, new SelectionRange( 0, int.MaxValue - 1 ) );
-
-        m_cellsToSelect.Remove( cellRangeWithItemsToRemove );
-        m_cellsToUnselect.Remove( cellRangeWithItemsToRemove );
-        m_cellsToSelect.OffsetIndex( oldStartingIndex, -removedItemsCount );
-        m_cellsToUnselect.OffsetIndex( oldStartingIndex, -removedItemsCount );
-      }
-    }
-
-    public void UpdateSelectionAfterSourceDataItemReplaced( NotifyCollectionChangedEventArgs e )
-    {
-      Debug.Assert( e.OldItems.Count == e.NewItems.Count );
-      Debug.Assert( e.OldStartingIndex == e.NewStartingIndex );
-
-      SelectedItemsStorage selectedItemsStorage = m_owner.SelectedItemsStore;
-      SelectedCellsStorage selectedCellsStorage = m_owner.SelectedCellsStore;
-      int oldItemIndex = e.OldStartingIndex;
-      IList oldItems = e.OldItems;
-      IList newItems = e.NewItems;
-      int replacedItemCount = oldItems.Count;
-      int cellRangeCount = selectedCellsStorage.Count;
-
-      if( oldItemIndex >= 0 )
-      {
-        int itemIndex = oldItemIndex;
-
-        for( int i = 0; i < replacedItemCount; i++ )
-        {
-          object newItem = newItems[ i ];
-
-          if( selectedItemsStorage.Contains( itemIndex ) )
-          {
-            this.UnselectItems( new SelectionRangeWithItems( itemIndex, oldItems[ i ] ) );
-            this.SelectItems( new SelectionRangeWithItems( itemIndex, newItem ) );
-          }
-
-          SelectionCellRange replacedCellRange = new SelectionCellRange(
-            new SelectionRange( itemIndex ), new SelectionRange( 0, int.MaxValue - 1 ) );
-
-          for( int j = 0; j < cellRangeCount; j++ )
-          {
-            SelectionCellRangeWithItems cellRangeWithItems = selectedCellsStorage[ j ];
-            SelectionCellRange cellRange = cellRangeWithItems.CellRange;
-
-            if( !cellRange.Intersect( replacedCellRange ).IsEmpty )
-            {
-              object[] items = cellRangeWithItems.ItemRangeWithItems.Items;
-
-              if( items != null )
-              {
-                items[ cellRange.ItemRange.GetOffsetFromItemIndex( itemIndex ) ] = newItem;
-              }
-            }
-          }
-
-          itemIndex++;
-        }
-      }
-      else
-      {
-        CollectionView sourceItems = m_owner.Items;
-
-        for( int i = 0; i < replacedItemCount; i++ )
-        {
-          object newItem = newItems[ i ];
-          int itemIndex = sourceItems.IndexOf( newItem );
-
-          if( itemIndex < 0 )
-            continue;
-
-          if( selectedItemsStorage.Contains( itemIndex ) )
-          {
-            this.UnselectItems( new SelectionRangeWithItems( itemIndex, oldItems[ i ] ) );
-            this.SelectItems( new SelectionRangeWithItems( itemIndex, newItem ) );
-          }
-
-          SelectionCellRange replacedCellRange = new SelectionCellRange(
-            new SelectionRange( itemIndex ), new SelectionRange( 0, int.MaxValue - 1 ) );
-
-          for( int j = 0; j < cellRangeCount; j++ )
-          {
-            SelectionCellRangeWithItems cellRangeWithItems = selectedCellsStorage[ j ];
-            SelectionCellRange cellRange = cellRangeWithItems.CellRange;
-
-            if( !cellRange.Intersect( replacedCellRange ).IsEmpty )
-            {
-              object[] items = cellRangeWithItems.ItemRangeWithItems.Items;
-
-              if( items != null )
-              {
-                items[ cellRange.ItemRange.GetOffsetFromItemIndex( itemIndex ) ] = newItem;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    public SelectionInfo GetSelectionInfo()
-    {
-      var unselectedItemsFromRemove = this.GetUnselectedItemsFromRemove();
-      var unselectedCellsFromRemove = this.GetUnselectedCellsFromRemove();
-
-      var itemsToUnselect = ( ( m_itemsToUnselect.Count > 0 ) || unselectedItemsFromRemove.Any() ) ? ( SelectedItemsStorage )m_itemsToUnselect.Clone() : SelectionChanger.EmptyItemsStore;
-      var itemsToSelect = ( m_itemsToSelect.Count > 0 ) ? ( SelectedItemsStorage )m_itemsToSelect.Clone() : SelectionChanger.EmptyItemsStore;
-      var cellsToUnselect = ( ( m_cellsToUnselect.Count > 0 ) || unselectedCellsFromRemove.Any() ) ? ( SelectedCellsStorage )m_cellsToUnselect.Clone() : SelectionChanger.EmptyCellsStore;
-      var cellsToSelect = ( m_cellsToSelect.Count > 0 ) ? ( SelectedCellsStorage )m_cellsToSelect.Clone() : SelectionChanger.EmptyCellsStore;
-
-      foreach( var rangeWithItems in unselectedItemsFromRemove )
-      {
-        itemsToUnselect.Add( rangeWithItems );
-      }
-
-      foreach( var cellRangeWithItems in unselectedCellsFromRemove )
-      {
-        cellsToUnselect.Add( cellRangeWithItems );
-      }
-
-      return new SelectionInfo( m_owner, itemsToUnselect, itemsToSelect, cellsToUnselect, cellsToSelect );
-    }
-
-    private IEnumerable<SelectionRangeWithItems> GetUnselectedItemsFromRemove()
-    {
-      return this.GetUnselectedItemsFromRemove( null );
-    }
-
-    private IEnumerable<SelectionRangeWithItems> GetUnselectedItemsFromRemove( ICollection<SelectionRangeWithItems> removedRangeWithItems )
-    {
-      var store = m_owner.SelectedItemsStore;
-      if( ( store.Count <= 0 ) || ( m_sourceChanges.Count <= 0 ) )
-        return Enumerable.Empty<SelectionRangeWithItems>();
-
-      var unselectedItemsFromRemove = new List<SelectionRangeWithItems>();
-
-      for( int i = 0; i < m_sourceChanges.Count; i++ )
-      {
-        var sourceChangeInfo = m_sourceChanges[ i ];
-        if( ( sourceChangeInfo.Action != NotifyCollectionChangedAction.Remove ) || ( sourceChangeInfo.StartIndex == -1 ) )
-          continue;
-
-        var startIndex = sourceChangeInfo.StartIndex;
-        var removedItemCount = sourceChangeInfo.Count;
-        var removedItems = new object[ removedItemCount ];
-
-        sourceChangeInfo.Items.CopyTo( removedItems, 0 );
-
-        var range = new SelectionRange( startIndex, startIndex + removedItemCount - 1 );
-        var rangeWithItemsToRemove = new SelectionRangeWithItems( range, removedItems );
-
-        if( removedRangeWithItems != null )
-        {
-          removedRangeWithItems.Add( rangeWithItemsToRemove );
-        }
-
-        if( store.Contains( rangeWithItemsToRemove ) )
-        {
-          unselectedItemsFromRemove.Add( rangeWithItemsToRemove );
-        }
-      }
-
-      return unselectedItemsFromRemove;
-    }
-
-    private IEnumerable<SelectionCellRangeWithItems> GetUnselectedCellsFromRemove()
-    {
-      return this.GetUnselectedCellsFromRemove( null );
-    }
-
-    private IEnumerable<SelectionCellRangeWithItems> GetUnselectedCellsFromRemove( ICollection<SelectionCellRangeWithItems> removedCellsRangeWithItems )
-    {
-      var store = m_owner.SelectedCellsStore;
-      if( ( store.Count <= 0 ) || ( m_sourceChanges.Count <= 0 ) )
-        return Enumerable.Empty<SelectionCellRangeWithItems>();
-
-      var unselectedCellsFromRemove = new List<SelectionCellRangeWithItems>();
-
-      for( int i = 0; i < m_sourceChanges.Count; i++ )
-      {
-        var sourceChangeInfo = m_sourceChanges[ i ];
-        if( ( sourceChangeInfo.Action != NotifyCollectionChangedAction.Remove ) || ( sourceChangeInfo.StartIndex == -1 ) )
-          continue;
-
-        var startIndex = sourceChangeInfo.StartIndex;
-        var removedItemCount = sourceChangeInfo.Count;
-        var range = new SelectionCellRange( new SelectionRange( startIndex, startIndex + removedItemCount - 1 ), new SelectionRange( 0, int.MaxValue - 1 ) );
-
-        if( removedCellsRangeWithItems != null )
-        {
-          var removedItems = new object[ removedItemCount ];
-          sourceChangeInfo.Items.CopyTo( removedItems, 0 );
-
-          removedCellsRangeWithItems.Add( new SelectionCellRangeWithItems( range.ItemRange, removedItems, range.ColumnRange ) );
-        }
-
-        foreach( var cellRangeWithItems in store.GetIntersectedCellRangesWithItems( range ) )
-        {
-          unselectedCellsFromRemove.Add( cellRangeWithItems );
-        }
-      }
-
-      return unselectedCellsFromRemove;
-    }
-
-    private bool SetIsSelectedOnDataRow( Dictionary<int, DataRow> realizedDataRows, SelectionRangeWithItems rangeWithItems, bool selected )
-    {
-      int rangeLength = rangeWithItems.Length;
-      object[] rangeItems = rangeWithItems.Items;
-      bool selectionChanged = false;
-
-      if( rangeItems != null )
-      {
-        for( int i = 0; i < rangeLength; i++ )
-        {
-          DataRow rangeItemAsDataRow = rangeItems[ i ] as DataRow;
-
-          if( rangeItemAsDataRow != null )
-          {
-            selectionChanged = true;
-            rangeItemAsDataRow.SetIsSelected( selected );
-          }
-          else
-          {
-            // We take for granted that no item will be a DataRow
-            break;
-          }
-        }
-      }
-
-      return selectionChanged;
-    }
-
-    private void SetIsSelectedOnDataCell(
-      Dictionary<ColumnBase, int> columnsVisiblePosition,
-      Dictionary<int, DataRow> realizedDataRows,
-      SelectionCellRangeWithItems cellRangeWithItems,
-      bool selected )
-    {
-      var rangeItems = cellRangeWithItems.ItemRangeWithItems.Items;
-      var selectionChanged = false;
-      var columnRange = cellRangeWithItems.ColumnRange;
-
-      if( rangeItems != null )
-      {
-        int itemsCount = rangeItems.Length;
-
-        for( int i = 0; i < itemsCount; i++ )
-        {
-          var rangeItemAsDataRow = rangeItems[ i ] as DataRow;
-
-          if( rangeItemAsDataRow != null )
-          {
-            selectionChanged = true;
-
-            foreach( var dataCell in rangeItemAsDataRow.CreatedCells )
-            {
-              if( dataCell.IsContainerVirtualized )
-                continue;
-
-              int columnPosition;
-
-              if( !columnsVisiblePosition.TryGetValue( dataCell.ParentColumn, out columnPosition ) )
-                continue;
-
-              if( !columnRange.Intersect( new SelectionRange( columnPosition ) ).IsEmpty )
-              {
-                dataCell.SetIsSelected( selected );
-              }
-            }
-          }
-          else
-          {
-            // We take for granted that no item will be a DataRow
-            break;
-          }
-        }
-      }
-
-      if( !selectionChanged )
-      {
-        var itemRange = cellRangeWithItems.ItemRange;
-
-        foreach( var realizedItemPair in realizedDataRows )
-        {
-          if( !itemRange.Intersect( new SelectionRange( realizedItemPair.Key ) ).IsEmpty )
-          {
-            foreach( var dataCell in realizedItemPair.Value.CreatedCells )
-            {
-              if( dataCell.IsContainerVirtualized )
-                continue;
-
-              int columnPosition;
-
-              if( !columnsVisiblePosition.TryGetValue( dataCell.ParentColumn, out columnPosition ) )
-                continue;
-
-              if( !columnRange.Intersect( new SelectionRange( columnPosition ) ).IsEmpty )
-              {
-                dataCell.SetIsSelected( selected );
-              }
-            }
-          }
-        }
-      }
-    }
-
-    private readonly List<object> m_toDeferSelect;
-    private readonly SelectedItemsStorage m_itemsToSelect;
-    private readonly SelectedItemsStorage m_itemsToUnselect;
-    private readonly SelectedCellsStorage m_cellsToSelect;
-    private readonly SelectedCellsStorage m_cellsToUnselect;
-    private readonly List<SourceChangeInfo> m_sourceChanges;
-
-    #region SourceChangeInfo Private Class
-
-    private sealed class SourceChangeInfo
-    {
-      internal SourceChangeInfo( NotifyCollectionChangedAction action, int startIndex, int count, IList items )
-      {
-        this.Action = action;
-        this.StartIndex = startIndex;
-        this.Count = count;
-        this.Items = items;
-      }
-
-      internal NotifyCollectionChangedAction Action
-      {
-        get;
-        private set;
-      }
-
-      internal int StartIndex
-      {
-        get;
-        private set;
-      }
-
-      internal int Count
-      {
-        get;
-        private set;
-      }
-
-      internal IList Items
-      {
-        get;
-        private set;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionInfo.cs
deleted file mode 100644
index dedbbb94..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionInfo.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class SelectionInfo
-  {
-    internal SelectionInfo( 
-      DataGridContext dataGridContext, 
-      SelectedItemsStorage removedItems, 
-      SelectedItemsStorage addedItems,
-      SelectedCellsStorage removedCells,
-      SelectedCellsStorage addedCells )
-    {
-      this.DataGridContext = dataGridContext;
-      this.AddedItems = new ReadOnlyCollection<object>( new SelectionItemCollection( addedItems ) );
-      this.RemovedItems = new ReadOnlyCollection<object>( new SelectionItemCollection( removedItems ) );
-      this.AddedItemRanges = new ReadOnlyCollection<SelectionRange>( new SelectionItemRangeCollection( addedItems ) );
-      this.RemovedItemRanges = new ReadOnlyCollection<SelectionRange>( new SelectionItemRangeCollection( removedItems ) );
-      this.AddedCellRanges = new ReadOnlyCollection<SelectionCellRange>( new SelectionCellRangeCollection( addedCells ) );
-      this.RemovedCellRanges = new ReadOnlyCollection<SelectionCellRange>( new SelectionCellRangeCollection( removedCells ) );
-    }
-
-    public DataGridContext DataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public ReadOnlyCollection<object> AddedItems
-    {
-      get;
-      private set;
-    }
-
-    public ReadOnlyCollection<object> RemovedItems
-    {
-      get;
-      private set;
-    }
-
-    public ReadOnlyCollection<SelectionRange> AddedItemRanges
-    {
-      get;
-      private set;
-    }
-
-    public ReadOnlyCollection<SelectionRange> RemovedItemRanges
-    {
-      get;
-      private set;
-    }
-
-    public ReadOnlyCollection<SelectionCellRange> AddedCellRanges
-    {
-      get;
-      private set;
-    }
-
-    public ReadOnlyCollection<SelectionCellRange> RemovedCellRanges
-    {
-      get;
-      private set;
-    }
-
-    internal bool IsEmpty
-    {
-      get
-      {
-        return 
-          this.RemovedCellRanges.Count == 0
-          && this.AddedCellRanges.Count == 0
-          && this.RemovedItemRanges.Count == 0
-          && this.AddedItemRanges.Count == 0;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs
deleted file mode 100644
index 69586ef5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs
+++ /dev/null
@@ -1,473 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class SelectionItemCollection : IList<object>, IList
-  {
-    internal SelectionItemCollection( SelectedItemsStorage collection )
-    {
-      m_storage = collection;
-    }
-
-    private bool FindItem( int index, DataGridContext dataGridContext, int itemsCount, out SelectionRangeWithItems range, out int offset )
-    {
-      var rangesCount = m_storage.Count;
-
-      range = SelectionRangeWithItems.Empty;
-      offset = index;
-
-      for( int i = 0; i < rangesCount; i++ )
-      {
-        if( offset < 0 )
-          break;
-
-        range = m_storage[ i ];
-        var length = range.Length;
-
-        if( offset < length )
-        {
-          var startAt = range.Range.StartIndex;
-          var endAt = range.Range.EndIndex;
-
-          if( startAt > endAt )
-          {
-            if( startAt - offset >= itemsCount )
-              break;
-          }
-          else
-          {
-            if( startAt + offset >= itemsCount )
-              break;
-          }
-
-          Debug.Assert( ( offset >= 0 ) && ( offset < length ) );
-
-          return true;
-        }
-        else
-        {
-          offset -= length;
-        }
-      }
-
-      return false;
-    }
-
-    private IEnumerable<object> EnumerateItems( SelectionRangeWithItems range, DataGridContext dataGridContext, int itemsCount )
-    {
-      var startAt = range.Range.StartIndex;
-      var endAt = range.Range.EndIndex;
-      var min = Math.Min( startAt, endAt );
-      var max = Math.Max( startAt, endAt );
-
-      if( startAt > endAt )
-      {
-        var upperLimit = Math.Min( startAt, itemsCount - 1 );
-
-        for( int i = upperLimit; i >= endAt; i-- )
-        {
-          object item;
-
-          try
-          {
-            item = range.GetItem( dataGridContext, startAt - i );
-          }
-          catch( ArgumentOutOfRangeException )
-          {
-            continue;
-          }
-
-          yield return item;
-        }
-      }
-      else
-      {
-        var upperLimit = Math.Min( endAt, itemsCount - 1 );
-
-        for( int i = startAt; i <= upperLimit; i++ )
-        {
-          object item;
-
-          try
-          {
-            item = range.GetItem( dataGridContext, i - startAt );
-          }
-          catch( ArgumentOutOfRangeException )
-          {
-            break;
-          }
-
-          yield return item;
-        }
-      }
-    }
-
-    #region IList<> Members
-
-    public object this[ int index ]
-    {
-      get
-      {
-        if( ( index < 0 ) || ( index >= m_storage.ItemsCount ) )
-          throw new ArgumentOutOfRangeException( "index", "The index must be equal or greater than zero and less than Count." );
-
-        var dataGridContext = m_storage.DataGridContext;
-        var itemsCount = dataGridContext.Items.Count;
-        var range = SelectionRangeWithItems.Empty;
-        var offset = default( int );
-
-        if( this.FindItem( index, dataGridContext, itemsCount, out range, out offset ) )
-        {
-          try
-          {
-            return range.GetItem( dataGridContext, offset );
-          }
-          catch( ArgumentOutOfRangeException )
-          {
-            // return null
-          }
-        }
-
-        return null;
-      }
-      set
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    public int IndexOf( object item )
-    {
-      var rangesCount = m_storage.Count;
-      if( rangesCount <= 0 )
-        return -1;
-
-      var dataGridContext = m_storage.DataGridContext;
-      var itemsCount = default( int? );
-      var offset = 0;
-
-      for( int i = 0; i < rangesCount; i++ )
-      {
-        var range = m_storage[ i ];
-        if( range.Items != null )
-        {
-          var index = 0;
-
-          if( !itemsCount.HasValue )
-          {
-            itemsCount = dataGridContext.Items.Count;
-          }
-
-          foreach( var target in this.EnumerateItems( range, dataGridContext, itemsCount.Value ) )
-          {
-            if( object.Equals( target, item ) )
-              return offset + index;
-
-            index++;
-          }
-        }
-
-        offset += range.Length;
-      }
-
-      return -1;
-    }
-
-    public void Insert( int index, object item )
-    {
-      if( ( index < 0 ) || ( index > m_storage.ItemsCount ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
-
-      var dataGridContext = m_storage.DataGridContext;
-      var dataGridControl = dataGridContext.DataGridControl;
-
-      if( dataGridControl.SelectionUnit == SelectionUnit.Cell )
-        throw new InvalidOperationException( "Can't add item when SelectionUnit is Cell." );
-
-      var selectionManager = dataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.SelectItems( dataGridContext, new SelectionRangeWithItems( dataGridContext.Items.IndexOf( item ), item ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public void RemoveAt( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_storage.ItemsCount ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-      var dataGridContext = m_storage.DataGridContext;
-      var itemsCount = dataGridContext.Items.Count;
-      var range = SelectionRangeWithItems.Empty;
-      var offset = default( int );
-
-      if( !this.FindItem( index, dataGridContext, itemsCount, out range, out offset ) )
-        return;
-
-      object item;
-      int itemIndex;
-
-      try
-      {
-        item = range.GetItem( dataGridContext, offset );
-        itemIndex = range.Range.GetIndexFromItemOffset( offset );
-      }
-      catch( ArgumentOutOfRangeException )
-      {
-        return;
-      }
-
-      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( itemIndex, item ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    #endregion
-
-    #region IList Members
-
-    object IList.this[ int index ]
-    {
-      get
-      {
-        return this[ index ];
-      }
-      set
-      {
-        this[ index ] = value;
-      }
-    }
-
-    bool IList.IsReadOnly
-    {
-      get
-      {
-        return ( ( ICollection<object> )this ).IsReadOnly;
-      }
-    }
-
-    bool IList.IsFixedSize
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    int IList.Add( object item )
-    {
-      this.Add( item );
-      return this.Count - 1;
-    }
-
-    void IList.Clear()
-    {
-      this.Clear();
-    }
-
-    void IList.Insert( int index, object item )
-    {
-      this.Insert( index, item );
-    }
-
-    void IList.Remove( object item )
-    {
-      this.Remove( item );
-    }
-
-    void IList.RemoveAt( int index )
-    {
-      this.RemoveAt( index );
-    }
-
-    bool IList.Contains( object item )
-    {
-      return this.Contains( item );
-    }
-
-    int IList.IndexOf( object item )
-    {
-      return this.IndexOf( item );
-    }
-
-    #endregion
-
-    #region ICollection<> Members
-
-    public int Count
-    {
-      get
-      {
-        return m_storage.ItemsCount;
-      }
-    }
-
-    bool ICollection<object>.IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public void Add( object item )
-    {
-      this.Insert( m_storage.ItemsCount, item );
-    }
-
-    public void Clear()
-    {
-      var dataGridContext = m_storage.DataGridContext;
-      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.UnselectAllItems( dataGridContext );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public bool Contains( object item )
-    {
-      return ( this.IndexOf( item ) >= 0 );
-    }
-
-    public bool Remove( object item )
-    {
-      var dataGridContext = m_storage.DataGridContext;
-      var dataGridControl = dataGridContext.DataGridControl;
-
-      if( dataGridControl.SelectionUnit == SelectionUnit.Cell )
-        throw new InvalidOperationException( "Can't remove item when SelectionUnit is Cell." );
-
-      var selectionManager = dataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        return selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( SelectionRange.Empty, new object[] { item } ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public void CopyTo( object[] array, int arrayIndex )
-    {
-      ( ( ICollection )this ).CopyTo( array, arrayIndex );
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    int ICollection.Count
-    {
-      get
-      {
-        return this.Count;
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        return m_storage;
-      }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    void ICollection.CopyTo( Array array, int arrayIndex )
-    {
-      using( var enumerator = this.GetEnumerator() )
-      {
-        while( enumerator.MoveNext() )
-        {
-          array.SetValue( enumerator.Current, arrayIndex );
-          arrayIndex++;
-        }
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<object> GetEnumerator()
-    {
-      if( m_storage.Count <= 0 )
-        yield break;
-
-      var dataGridContext = m_storage.DataGridContext;
-      var itemsCount = dataGridContext.Items.Count;
-
-      // We use a foreach to get the exception when the collection is changed.
-      foreach( var range in m_storage )
-      {
-        foreach( var item in this.EnumerateItems( range, dataGridContext, itemsCount ) )
-        {
-          yield return item;
-        }
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly SelectedItemsStorage m_storage;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs
deleted file mode 100644
index aa118aee..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs
+++ /dev/null
@@ -1,329 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class SelectionItemRangeCollection : IList<SelectionRange>, IList
-  {
-    internal SelectionItemRangeCollection( SelectedItemsStorage collection )
-    {
-      Debug.Assert( collection != null );
-
-      m_storage = collection;
-    }
-
-    #region IList<> Members
-
-    public SelectionRange this[ int index ]
-    {
-      get
-      {
-        return m_storage[ index ].Range;
-      }
-      set
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    public int IndexOf( SelectionRange item )
-    {
-      var count = m_storage.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( m_storage[ i ].Range == item )
-          return i;
-      }
-
-      return -1;
-    }
-
-    public void Insert( int index, SelectionRange item )
-    {
-      if( ( index < 0 ) || ( index > m_storage.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than or equal to Count." );
-
-      var dataGridContext = m_storage.DataGridContext;
-      var dataGridControl = dataGridContext.DataGridControl;
-
-      if( dataGridControl.SelectionUnit == SelectionUnit.Cell )
-        throw new InvalidOperationException( "Can't add item when SelectionUnit is Cell." );
-
-      if( !( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
-      {
-        var minIndex = Math.Min( item.StartIndex, item.EndIndex );
-        var maxIndex = Math.Max( item.StartIndex, item.EndIndex );
-
-        if( ( minIndex < 0 ) || ( maxIndex >= dataGridContext.Items.Count ) )
-          throw new ArgumentException( "The selection range targets items outside of the data source.", "item" );
-      }
-
-      var selectionManager = dataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.SelectItems( dataGridContext, new SelectionRangeWithItems( item, null ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public void RemoveAt( int index )
-    {
-      if( ( index < 0 ) || ( index >= m_storage.Count ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero and less than Count." );
-
-      var dataGridContext = m_storage.DataGridContext;
-      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( this[ index ], null ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    #endregion
-
-    #region IList Members
-
-    object IList.this[ int index ]
-    {
-      get
-      {
-        return this[ index ];
-      }
-      set
-      {
-        this[ index ] = ( SelectionRange )value;
-      }
-    }
-
-    bool IList.IsReadOnly
-    {
-      get
-      {
-        return ( ( ICollection<SelectionRange> )this ).IsReadOnly;
-      }
-    }
-
-    bool IList.IsFixedSize
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    int IList.Add( object item )
-    {
-      this.Add( ( SelectionRange )item );
-      return this.Count - 1;
-    }
-
-    void IList.Clear()
-    {
-      this.Clear();
-    }
-
-    void IList.Insert( int index, object item )
-    {
-      this.Insert( index, ( SelectionRange )item );
-    }
-
-    void IList.Remove( object item )
-    {
-      this.Remove( ( SelectionRange )item );
-    }
-
-    void IList.RemoveAt( int index )
-    {
-      this.RemoveAt( index );
-    }
-
-    bool IList.Contains( object item )
-    {
-      return this.Contains( ( SelectionRange )item );
-    }
-
-    int IList.IndexOf( object item )
-    {
-      return this.IndexOf( ( SelectionRange )item );
-    }
-
-    #endregion
-
-    #region ICollection<> Members
-
-    public int Count
-    {
-      get
-      {
-        return m_storage.Count;
-      }
-    }
-
-    bool ICollection<SelectionRange>.IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public void Add( SelectionRange item )
-    {
-      this.Insert( m_storage.Count, item );
-    }
-
-    public void Clear()
-    {
-      var dataGridContext = m_storage.DataGridContext;
-      var selectionManager = dataGridContext.DataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        selectionManager.UnselectAllItems( dataGridContext );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public bool Contains( SelectionRange item )
-    {
-      return ( this.IndexOf( item ) >= 0 );
-    }
-
-    public bool Remove( SelectionRange item )
-    {
-      var dataGridContext = m_storage.DataGridContext;
-      var dataGridControl = dataGridContext.DataGridControl;
-
-      if( dataGridControl.SelectionUnit == SelectionUnit.Cell )
-        throw new InvalidOperationException( "Can't remove item when SelectionUnit is Cell." );
-
-      if( !( dataGridContext.ItemsSourceCollection is DataGridVirtualizingCollectionViewBase ) )
-      {
-        var minIndex = Math.Min( item.StartIndex, item.EndIndex );
-        var maxIndex = Math.Max( item.StartIndex, item.EndIndex );
-
-        if( ( minIndex < 0 ) || ( maxIndex >= dataGridContext.Items.Count ) )
-          throw new ArgumentException( "The selection range targets items outside of the data source.", "item" );
-      }
-
-      var selectionManager = dataGridControl.SelectionChangerManager;
-      selectionManager.Begin();
-
-      try
-      {
-        return selectionManager.UnselectItems( dataGridContext, new SelectionRangeWithItems( item, null ) );
-      }
-      finally
-      {
-        selectionManager.End( true, true );
-      }
-    }
-
-    public void CopyTo( SelectionRange[] array, int arrayIndex )
-    {
-      ( ( ICollection )this ).CopyTo( array, arrayIndex );
-    }
-
-    internal bool Contains( int itemIndex )
-    {
-      return m_storage.Contains( itemIndex );
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    int ICollection.Count
-    {
-      get
-      {
-        return this.Count;
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        return m_storage;
-      }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    void ICollection.CopyTo( Array array, int arrayIndex )
-    {
-      var count = m_storage.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        array.SetValue( m_storage[ i ].Range, arrayIndex );
-        arrayIndex++;
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<SelectionRange> GetEnumerator()
-    {
-      return ( from item in m_storage
-               select item.Range ).GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly SelectedItemsStorage m_storage;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs
deleted file mode 100644
index 96c14252..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs
+++ /dev/null
@@ -1,1715 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class SelectionManager
-  {
-    public enum UpdateSelectionSource
-    {
-      Navigation = 0,
-      MouseDown = 1,
-      MouseUp = 2,
-      SpaceDown = 3,
-      RowSelector = 4,
-      MouseMove = 5,
-      None = 99
-    }
-
-    public SelectionManager( DataGridControl owner )
-    {
-      if( owner == null )
-        throw new ArgumentNullException( "owner" );
-
-      m_owner = owner;
-    }
-
-    #region IsActive Property
-
-    public bool IsActive
-    {
-      get
-      {
-        return m_isActive;
-      }
-    }
-
-    #endregion
-
-    public IDisposable PushUpdateSelectionSource( UpdateSelectionSource updateSelectionSource )
-    {
-      // We raise the fromRowSelector flag here since it's possible
-      // that the focus is already on the correct Cell for the container
-      // mapped to the RowSelector, preventing the SelectionManager to
-      // do any processing.
-      if( updateSelectionSource == UpdateSelectionSource.RowSelector )
-        m_fromRowSelector = true;
-
-      return new UpdateSelectionSourceHelper( this, updateSelectionSource );
-    }
-
-    public void EnsureRootSelectedItemAndSelectedIndex()
-    {
-      // This is done to force the DataGridControl's Root DataGridContext to be in the activated selection changer so that even if no changes were made
-      // the CommitSelectionChanger method will be called and the DataGridControl's SelectedItem/SelectedIndex will be rectified (ie: When sorting or grouping).
-      this.GetSelectionChanger( m_owner.DataGridContext );
-    }
-
-    public void Begin()
-    {
-      if( m_isActive )
-        throw new InvalidOperationException( "An attempt was made to change the selection while a selection-change process is already in progress." );
-
-      m_isActive = true;
-    }
-
-    public void Cancel()
-    {
-      Debug.Assert( m_isActive );
-      m_isActive = false;
-
-      foreach( SelectionChanger selectionChanger in m_activatedSelectionChanger.Values )
-      {
-        selectionChanger.Cleanup();
-      }
-    }
-
-    public void End( bool allowCancelingOfSelection, bool allowSynchronizeSelectionWithCurrent )
-    {
-      Debug.Assert( m_isActive );
-
-      var activatedSelectionDeltas = new List<SelectionInfo>();
-      var selectionInfo = default( SelectionInfo );
-
-      try
-      {
-        foreach( var selectionChanger in m_activatedSelectionChanger.Values )
-        {
-          selectionInfo = selectionChanger.GetSelectionInfo();
-
-          if( !selectionInfo.IsEmpty )
-          {
-            activatedSelectionDeltas.Add( selectionInfo );
-          }
-        }
-
-        if( activatedSelectionDeltas.Count > 0 )
-        {
-          var eventArgs = new DataGridSelectionChangingEventArgs( new ReadOnlyCollection<SelectionInfo>( activatedSelectionDeltas ), allowCancelingOfSelection );
-
-          m_owner.RaiseSelectionChanging( eventArgs );
-
-          if( allowCancelingOfSelection && eventArgs.Cancel )
-          {
-            this.Cancel();
-            return;
-          }
-        }
-
-        foreach( var selectionChanger in m_activatedSelectionChanger.Values )
-        {
-          this.CommitSelectionChanger( selectionChanger );
-        }
-
-        if( ( allowSynchronizeSelectionWithCurrent ) && ( m_owner.SynchronizeSelectionWithCurrent ) )
-        {
-          this.UpdateCurrentToSelection();
-        }
-      }
-      finally
-      {
-        m_isActive = false;
-        m_activatedSelectionChanger.Clear();
-      }
-
-      // Notify that GlobalSelectedItems has changed if at least one selection has changed.
-      if( activatedSelectionDeltas.Count > 0 )
-      {
-        for( int i = activatedSelectionDeltas.Count - 1; i >= 0; i-- )
-        {
-          selectionInfo = activatedSelectionDeltas[ i ];
-
-          // Invoke the selection changed on the DataGridContext.
-          selectionInfo.DataGridContext.InvokeSelectionChanged( selectionInfo );
-        }
-
-        m_owner.RaiseSelectionChanged( new DataGridSelectionChangedEventArgs( new ReadOnlyCollection<SelectionInfo>( activatedSelectionDeltas ) ) );
-        m_owner.NotifyGlobalSelectedItemsChanged();
-      }
-    }
-
-    public bool ToggleItemSelection( SelectionRangePoint rangePosition )
-    {
-      var group = rangePosition.Group;
-      if( group != null )
-      {
-        bool unselect = false;
-        var range = rangePosition.ToSelectionRangeWithItems();
-
-        // When [un]selecting a group, select all children, and recursively
-        // the expanded details nodes.
-        return this.AffectSelectionRecursivelyOnDetails(
-          rangePosition.DataGridContext, range.Range.StartIndex, range.Range.EndIndex,
-          unselect );
-      }
-      else
-      {
-        return this.ToggleItemSelection(
-          rangePosition.DataGridContext,
-          rangePosition.ItemIndex, rangePosition.Item );
-      }
-    }
-
-    public bool ToggleItemSelection( DataGridContext context, int itemIndex, object item )
-    {
-      if( this.IsItemSelected( context, itemIndex ) )
-      {
-        return this.UnselectItems( context, new SelectionRangeWithItems( itemIndex, item ) );
-      }
-      else
-      {
-        return this.SelectItems( context, new SelectionRangeWithItems( itemIndex, item ) );
-      }
-    }
-
-    public bool ToggleCellSelection( DataGridContext context, int itemIndex, object item, int columnIndex )
-    {
-      if( this.IsCellSelected( context, itemIndex, columnIndex ) )
-      {
-        return this.UnselectCells( context, new SelectionCellRangeWithItems( itemIndex, item, columnIndex ) );
-      }
-      else
-      {
-        return this.SelectCells( context, new SelectionCellRangeWithItems( itemIndex, item, columnIndex ) );
-      }
-    }
-
-    public bool ToggleItemCellsSelection( DataGridContext dataGridContext, int itemIndex, object item )
-    {
-      SelectedCellsStorage tempStorage = this.GetItemCellStorage( dataGridContext, itemIndex, item );
-
-      bool selectionDone = true;
-
-      if( this.IsItemCellsSelected( dataGridContext, tempStorage ) )
-      {
-        foreach( SelectionCellRangeWithItems allCellSelection in tempStorage )
-        {
-          selectionDone &= this.UnselectCells( dataGridContext, allCellSelection );
-        }
-      }
-      else
-      {
-        foreach( SelectionCellRangeWithItems allCellSelection in tempStorage )
-        {
-          selectionDone &= this.SelectCells( dataGridContext, allCellSelection );
-        }
-      }
-
-      return selectionDone;
-    }
-
-    public bool SelectCells( DataGridContext dataGridContext, SelectionCellRangeWithItems cellRangeWithItems )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      return selectionChanger.SelectCells( cellRangeWithItems );
-    }
-
-    public bool SelectItems( SelectionRangePoint position )
-    {
-      if( position.Group != null )
-      {
-        // When [un]selecting a group, select all children, and recursively
-        // the expanded details nodes.
-        var range = position.ToSelectionRangeWithItems();
-        return this.AffectSelectionRecursivelyOnDetails(
-          position.DataGridContext, range.Range.StartIndex, range.Range.EndIndex,
-          false );
-      }
-      else
-      {
-        return this.SelectItems( position.DataGridContext, position.ToSelectionRangeWithItems() );
-      }
-    }
-
-    public bool SelectItems( DataGridContext dataGridContext, SelectionRangeWithItems rangeWithItems )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      return selectionChanger.SelectItems( rangeWithItems );
-    }
-
-    public bool SelectJustThisCell( DataGridContext dataGridContext, int itemIndex, object item, int columnIndex )
-    {
-      bool selected = false;
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // select only the wanted item.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        if( activatedSelectionChanger == selectionChanger )
-        {
-          selected = activatedSelectionChanger.SelectJustThisCell( itemIndex, item, columnIndex );
-        }
-        else
-        {
-          activatedSelectionChanger.UnselectAllItems();
-          activatedSelectionChanger.UnselectAllCells();
-        }
-      }
-
-      return selected;
-    }
-
-    public bool SelectItemCells( DataGridContext dataGridContext, int itemIndex, object item, bool preserveSelection )
-    {
-      bool selected = false;
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // select only the wanted item.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        if( activatedSelectionChanger == selectionChanger )
-        {
-          selected = activatedSelectionChanger.SelectItemCells( itemIndex,
-            item,
-            dataGridContext.ColumnsByVisiblePosition,
-            preserveSelection );
-        }
-        else
-        {
-          if( !preserveSelection )
-          {
-            activatedSelectionChanger.UnselectAllItems();
-            activatedSelectionChanger.UnselectAllCells();
-          }
-        }
-      }
-
-      return selected;
-    }
-
-    public bool SelectJustThisItem( SelectionRangePoint point )
-    {
-      bool selected = false;
-      var group = point.Group;
-
-      if( group != null )
-      {
-        this.UnselectAll();
-        // This will also recursively select all expanded detail childrens.
-        selected = this.SelectItems( point );
-      }
-      else
-      {
-        var item = point.Item;
-        var itemIndex = point.ItemIndex;
-        if( itemIndex != -1 )
-        {
-          selected = this.SelectJustThisItem( point.DataGridContext, itemIndex, item );
-        }
-      }
-
-      return selected;
-    }
-
-    public bool SelectJustThisItem( DataGridContext dataGridContext, int itemIndex, object item )
-    {
-      bool selected = false;
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // select only the wanted item.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        if( activatedSelectionChanger == selectionChanger )
-        {
-          selected = activatedSelectionChanger.SelectJustThisItem( itemIndex, item );
-        }
-        else
-        {
-          activatedSelectionChanger.UnselectAllItems();
-          activatedSelectionChanger.UnselectAllCells();
-        }
-      }
-
-      return selected;
-    }
-
-    public bool UnselectCells( DataGridContext dataGridContext, SelectionCellRangeWithItems cellRangeWithItems )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      return selectionChanger.UnselectCells( cellRangeWithItems );
-    }
-
-    public bool UnselectItems( DataGridContext dataGridContext, SelectionRangeWithItems rangeWithItems )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      return selectionChanger.UnselectItems( rangeWithItems );
-    }
-
-    public void CleanupDeferSelection( DataGridContext dataGridContext )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      selectionChanger.CleanupDeferSelection();
-    }
-
-    public void UpdateSelectionAfterSourceCollectionChanged( DataGridContext dataGridContext, NotifyCollectionChangedEventArgs e )
-    {
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Replace:
-          {
-            // When we get a replace with the same instance, we just have nothing to do.
-            if( ( e.NewItems.Count == e.OldItems.Count ) && e.NewItems.Cast<object>().SequenceEqual( e.OldItems.Cast<object>() ) )
-              break;
-
-            this.Begin();
-
-            try
-            {
-              // This is done to force the SelectionChangerManager to call the DataGridControl's
-              // DataGridContext UpdatePublicSelectionProperties method wheter or not
-              // there is any changes to the selection.  This is usefull when resetting due to a Sort operation for instance.
-              this.EnsureRootSelectedItemAndSelectedIndex();
-
-              SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-              selectionChanger.UpdateSelectionAfterSourceDataItemReplaced( e );
-            }
-            finally
-            {
-              this.End( false, true );
-            }
-
-            break;
-          }
-
-        case NotifyCollectionChangedAction.Add:
-          {
-            this.Begin();
-
-            try
-            {
-              // This is done to force the SelectionChangerManager to call the DataGridControl's
-              // DataGridContext UpdatePublicSelectionProperties method wheter or not
-              // there is any changes to the selection.  This is usefull when resetting due to a Sort operation for instance.
-              this.EnsureRootSelectedItemAndSelectedIndex();
-
-              m_selectionRangeStartPoint = null;
-              SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-              selectionChanger.UpdateSelectionAfterSourceDataItemAdded( e );
-            }
-            finally
-            {
-              this.End( false, true );
-            }
-
-            break;
-          }
-
-        case NotifyCollectionChangedAction.Remove:
-          {
-            this.Begin();
-
-            try
-            {
-              // This is done to force the SelectionChangerManager to call the DataGridControl's
-              // DataGridContext UpdatePublicSelectionProperties method wheter or not
-              // there is any changes to the selection.  This is usefull when resetting due to a Sort operation for instance.
-              this.EnsureRootSelectedItemAndSelectedIndex();
-
-              m_selectionRangeStartPoint = null;
-              SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-              selectionChanger.UpdateSelectionAfterSourceDataItemRemoved( e );
-            }
-            finally
-            {
-              this.End( false, true );
-            }
-
-            break;
-          }
-
-        case NotifyCollectionChangedAction.Move:
-        case NotifyCollectionChangedAction.Reset:
-          {
-            this.Begin();
-
-            try
-            {
-              // This is done to force the SelectionChangerManager to call the DataGridControl's
-              // DataGridContext UpdatePublicSelectionProperties method wheter or not
-              // there is any changes to the selection.  This is usefull when resetting due to a Sort operation for instance.
-              this.EnsureRootSelectedItemAndSelectedIndex();
-
-              m_selectionRangeStartPoint = null;
-
-              SelectedItemsStorage selectedItemsStorage = dataGridContext.SelectedItemsStore;
-              int selectedItemsCount = selectedItemsStorage.Count;
-              SelectedCellsStorage selectedCellsStorage = dataGridContext.SelectedCellsStore;
-              int selectedCellsCount = selectedCellsStorage.Count;
-              SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-
-              int newItemCount = dataGridContext.Items.Count;
-              SelectionRange maxItemRange;
-
-              if( newItemCount == 0 )
-              {
-                maxItemRange = SelectionRange.Empty;
-              }
-              else
-              {
-                maxItemRange = new SelectionRange( 0, newItemCount - 1 );
-              }
-
-              if( selectedItemsCount > 0 )
-              {
-                selectionChanger.UnselectAllItems();
-
-                for( int i = 0; i < selectedItemsCount; i++ )
-                {
-                  SelectionRangeWithItems rangeWithItems = selectedItemsStorage[ i ];
-                  object[] items = rangeWithItems.Items;
-
-                  if( items == null )
-                  {
-                    SelectionRange itemRange = rangeWithItems.Range;
-                    SelectionRange rangeIntersection = itemRange.Intersect( maxItemRange );
-
-                    if( rangeIntersection != itemRange )
-                    {
-                      if( rangeIntersection.IsEmpty )
-                        continue;
-
-                      rangeWithItems = new SelectionRangeWithItems( rangeIntersection, null );
-                    }
-
-                    selectionChanger.SelectItems( rangeWithItems );
-                  }
-                  else
-                  {
-                    CollectionView sourceItems = dataGridContext.Items;
-                    int itemsCount = items.Length;
-                    SelectionRange range = rangeWithItems.Range;
-
-                    for( int j = 0; j < itemsCount; j++ )
-                    {
-                      object item = items[ j ];
-                      object replacement = e.GetReplacement( item ) ?? item;
-
-                      int index = sourceItems.IndexOf( replacement );
-                      if( index >= 0 )
-                      {
-                        selectionChanger.SelectItems( new SelectionRangeWithItems( index, replacement ) );
-                      }
-                    }
-                  }
-                }
-              }
-
-              if( selectedCellsCount > 0 )
-              {
-                selectionChanger.UnselectAllCells();
-
-                for( int i = 0; i < selectedCellsCount; i++ )
-                {
-                  SelectionCellRangeWithItems cellRangeWithItems = selectedCellsStorage[ i ];
-                  SelectionRangeWithItems itemRangeWithItems = cellRangeWithItems.ItemRangeWithItems;
-                  object[] items = itemRangeWithItems.Items;
-
-                  if( items == null )
-                  {
-                    SelectionRange itemRange = itemRangeWithItems.Range;
-                    SelectionRange itemRangeIntersection = itemRange.Intersect( maxItemRange );
-
-                    if( itemRangeIntersection != itemRange )
-                    {
-                      if( itemRangeIntersection.IsEmpty )
-                        continue;
-
-                      cellRangeWithItems = new SelectionCellRangeWithItems( itemRangeIntersection, null, cellRangeWithItems.ColumnRange );
-                    }
-
-                    selectionChanger.SelectCells( cellRangeWithItems );
-                  }
-                  else
-                  {
-                    CollectionView sourceItems = dataGridContext.Items;
-                    int itemsCount = items.Length;
-                    SelectionRange itemRange = cellRangeWithItems.ItemRange;
-
-                    for( int j = 0; j < itemsCount; j++ )
-                    {
-                      object item = items[ j ];
-                      int index = sourceItems.IndexOf( item );
-
-                      if( index != -1 )
-                      {
-                        selectionChanger.SelectCells( new SelectionCellRangeWithItems(
-                          new SelectionRange( index ), new object[] { item }, cellRangeWithItems.ColumnRange ) );
-                      }
-                    }
-                  }
-                }
-              }
-            }
-            finally
-            {
-              this.End( false, true );
-            }
-
-            break;
-          }
-      }
-    }
-
-    public void UpdateSelection(
-      SelectionRangePoint oldPosition,
-      SelectionRangePoint newPosition,
-      bool oldFocusWasInTheGrid,
-      bool rowIsBeingEditedAndCurrentRowNotChanged,
-      Nullable<UpdateSelectionSource> updateSelectionSourceParam )
-    {
-      if( oldPosition != null && oldPosition.Group != null )
-      {
-        oldPosition = null;
-      }
-
-      if( newPosition != null && newPosition.Group != null )
-      {
-        newPosition = null;
-      }
-
-      if( newPosition == null )
-        return;
-
-      UpdateSelectionSource updateSelectionSource = ( updateSelectionSourceParam.HasValue )
-        ? updateSelectionSourceParam.Value : m_currentUpdateSelectionSource;
-
-      // Force the node tree to be created since detail can be deleted during that node creation and selection uptade will be call
-      // That way we prevent selection code reentrance.
-      this.EnsureNodeTreeCreatedOnAllSubContext( m_owner.DataGridContext );
-
-      if( ( updateSelectionSource != UpdateSelectionSource.RowSelector )
-          && ( updateSelectionSource != UpdateSelectionSource.MouseUp )
-          && ( updateSelectionSource != UpdateSelectionSource.MouseMove ) )
-      {
-        // Reset the fromRowSelector to ensure nothing special is done
-        // on next MouseUp
-        m_fromRowSelector = false;
-      }
-
-      if( updateSelectionSource == UpdateSelectionSource.None )
-        return;
-
-      this.Begin();
-
-      try
-      {
-        switch( m_owner.SelectionModeToUse )
-        {
-          case SelectionMode.Single:
-            {
-              this.DoSingleSelection(
-                newPosition,
-                oldFocusWasInTheGrid, rowIsBeingEditedAndCurrentRowNotChanged, updateSelectionSource );
-
-              break;
-            }
-
-          case SelectionMode.Multiple:
-            {
-              this.DoMultipleSelection(
-                newPosition, rowIsBeingEditedAndCurrentRowNotChanged, updateSelectionSource );
-
-              break;
-            }
-
-          case SelectionMode.Extended:
-            {
-              this.DoExtendedSelection(
-                oldPosition, newPosition,
-                oldFocusWasInTheGrid, rowIsBeingEditedAndCurrentRowNotChanged, updateSelectionSource );
-
-              break;
-            }
-        }
-      }
-      finally
-      {
-        this.End( true, false );
-      }
-    }
-
-    internal void UnselectAll()
-    {
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // Unselect all items and cells.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        activatedSelectionChanger.UnselectAllItems();
-        activatedSelectionChanger.UnselectAllCells();
-      }
-    }
-
-    internal void UnselectAllItems()
-    {
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // Unselect all item.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        activatedSelectionChanger.UnselectAllItems();
-      }
-    }
-
-    internal void UnselectAllItems( DataGridContext dataGridContext )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      selectionChanger.UnselectAllItems();
-    }
-
-    internal void UnselectAllCells()
-    {
-      // Add all the selected context to the activatedSelectionChanger since
-      // we will unselect all the selected item from it.
-      foreach( DataGridContext selectedDataGridContext in m_owner.SelectedContexts )
-      {
-        this.GetSelectionChanger( selectedDataGridContext );
-      }
-
-      // Unselect all item.
-      foreach( SelectionChanger activatedSelectionChanger in m_activatedSelectionChanger.Values )
-      {
-        activatedSelectionChanger.UnselectAllCells();
-      }
-    }
-
-    internal void UnselectAllCells( DataGridContext dataGridContext )
-    {
-      SelectionChanger selectionChanger = this.GetSelectionChanger( dataGridContext );
-      selectionChanger.UnselectAllCells();
-    }
-
-    private void EnsureNodeTreeCreatedOnAllSubContext( DataGridContext context )
-    {
-      // context.GetChildContexts() do a EnsureNodeTreeCreated(), no need to do one before calling it
-
-      foreach( var subContext in context.GetChildContexts() )
-      {
-        this.EnsureNodeTreeCreatedOnAllSubContext( subContext );
-      }
-    }
-
-    private void DoSingleSelection(
-      SelectionRangePoint newPosition,
-      bool oldFocusWasInTheGrid,
-      bool rowIsBeingEditedAndCurrentRowNotChanged,
-      UpdateSelectionSource updateSelectionSource )
-    {
-
-      //Group selection is not valid in single selection mode.
-      if( newPosition == null || newPosition.Group != null )
-        return;
-
-      bool applySelection = true;
-
-      if( updateSelectionSource == UpdateSelectionSource.Navigation )
-      {
-        bool isPageKeys = Keyboard.IsKeyDown( Key.PageUp )
-              || Keyboard.IsKeyDown( Key.PageDown )
-              || Keyboard.IsKeyDown( Key.End )
-              || Keyboard.IsKeyDown( Key.Home );
-
-        bool isCtrlPressed = ( Keyboard.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control;
-
-        //Special cases where selection should not be applied:
-        //1. Focus was not in the datagrid
-        //2. Ctrl is pressed but not the "page keys".
-        if( !oldFocusWasInTheGrid || ( isCtrlPressed && !isPageKeys ) )
-        {
-          applySelection = false;
-        }
-      }
-
-      // Special case for RowSelector : We do not want the
-      // MouseUp to clear the Selection when it was just set
-      // by the RowSelector
-      m_fromRowSelector |= ( updateSelectionSource == UpdateSelectionSource.RowSelector );
-
-      if( applySelection )
-      {
-        //Handle the case where the selected item is not a datarow/cell.
-        bool isValid = ( m_owner.SelectionUnit == SelectionUnit.Row )
-          ? ( newPosition.ItemIndex != -1 )
-          : ( newPosition.ItemIndex != -1 ) && ( newPosition.ColumnIndex != -1 );
-
-        // In cell selection, Do not remove selection when it comes from the RowSelector
-        bool cellSelection = ( m_owner.SelectionUnit == SelectionUnit.Cell );
-
-        this.ApplySelection( null, newPosition, m_fromRowSelector, isValid,
-          doRangeSelection: false,
-          allowRangeUnselection: false,
-          toggleSelection: false,
-          keepSelection: m_fromRowSelector && cellSelection );
-      }
-    }
-
-    private void DoMultipleSelection( SelectionRangePoint newPosition, bool rowIsBeingEditedAndCurrentRowNotChanged, UpdateSelectionSource updateSelectionSource )
-    {
-      if( newPosition == null )
-        return;
-
-      bool applySelection = true;
-      bool fromRowSelector = ( updateSelectionSource == UpdateSelectionSource.RowSelector ) || m_fromRowSelector;
-      bool toggleSelection = true;
-
-      //Handle the case where the selected item is not a datarow/cell.
-      bool isValid = ( m_owner.SelectionUnit == SelectionUnit.Row ) || fromRowSelector
-        ? ( newPosition.Group != null ) || ( newPosition.ItemIndex != -1 )
-        : ( newPosition.ItemIndex != -1 ) && ( newPosition.ColumnIndex != -1 );
-
-      switch( updateSelectionSource )
-      {
-        case UpdateSelectionSource.RowSelector:
-          {
-            m_fromRowSelector = true;
-            goto case UpdateSelectionSource.MouseDown;
-          }
-        case UpdateSelectionSource.MouseDown:
-          {
-            m_updateSelectionOnNextMouseUp =
-              newPosition.GetIsSelected( m_owner.SelectionUnit )
-              && !m_owner.UseDragToSelectBehavior;
-
-            if( m_updateSelectionOnNextMouseUp )
-            {
-              applySelection = false;
-            }
-            break;
-          }
-
-        case UpdateSelectionSource.MouseUp:
-          {
-            if( !isValid || !m_updateSelectionOnNextMouseUp || rowIsBeingEditedAndCurrentRowNotChanged )
-            {
-              applySelection = false;
-            }
-
-            // Reset the fromRowSelector to ensure nothing special is done
-            // on next MouseUp (failsafe, should be reset by UpdateSelection)
-            m_fromRowSelector = false;
-
-            // We reset the m_updateSelectionOnNextMouseUp to be sure when no focus is moved
-            // around that mouse up will toggle selection
-            m_updateSelectionOnNextMouseUp = true;
-            break;
-          }
-
-        case UpdateSelectionSource.SpaceDown:
-          {
-            break;
-          }
-        case UpdateSelectionSource.MouseMove:
-          {
-            //This is no "unselection" or "toggle" when doing drag selection.
-            toggleSelection = false;
-            break;
-          }
-
-        default:
-          {
-            //Fallback for "None", "Navigation" or other futur cases:
-            applySelection = false;
-            break;
-          }
-      }
-
-      if( applySelection )
-      {
-        //Never do range selections, Always keep selection, always toggle.
-        this.ApplySelection( null, newPosition,
-          fromRowSelector, isValid,
-          doRangeSelection: false,
-          allowRangeUnselection: false,
-          toggleSelection: toggleSelection,
-          keepSelection: true );
-      }
-    }
-
-    private void DoExtendedSelection(
-      SelectionRangePoint oldPosition,
-      SelectionRangePoint newPosition,
-      bool oldFocusWasInTheGrid,
-      bool rowIsBeingEditedAndCurrentRowNotChanged,
-      UpdateSelectionSource updateSelectionSource )
-    {
-      if( newPosition == null )
-        return;
-
-      Group group = newPosition.Group;
-      DataGridContext dataGridContext = newPosition.DataGridContext;
-      object item = newPosition.Item;
-      int sourceDataItemIndex = newPosition.ItemIndex;
-      int columnIndex = newPosition.ColumnIndex;
-
-      bool shift = ( Keyboard.Modifiers & ModifierKeys.Shift ) == ModifierKeys.Shift;
-      bool ctrl = ( Keyboard.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control;
-
-      //Default behavior
-      //Ctrl : Keep the current selection
-      //Shift : Do a range selection and Do not update the selection anchor.
-      //Ctrl+!Shift: Toggle current.
-
-      bool keepSelection = ctrl;
-      bool toggleSelection = ctrl && !shift;
-      bool doRangeSelection = shift;
-      bool allowRangeUnselection = ctrl;
-      bool updateRangeStartPosition = !shift;
-      bool applySelection = true;
-      bool fromRowSelector = ( updateSelectionSource == UpdateSelectionSource.RowSelector ) || m_fromRowSelector;
-      bool cellSelection = ( m_owner.SelectionUnit == SelectionUnit.Cell );
-
-      //Handle the case where the selected item is not a datarow/cell.
-      bool isValid = ( m_owner.SelectionUnit == SelectionUnit.Row || fromRowSelector )
-        ? ( newPosition.Group != null ) || ( newPosition.ItemIndex != -1 )
-        : ( newPosition.ItemIndex != -1 ) && ( newPosition.ColumnIndex != -1 );
-
-      //Special case management in relation to update selection source
-      switch( updateSelectionSource )
-      {
-        case UpdateSelectionSource.Navigation:
-          {
-            // Focus was not in the grid, do nothing.
-            if( !oldFocusWasInTheGrid )
-            {
-              updateRangeStartPosition = false;
-              applySelection = false;
-              break;
-            }
-
-            // About every behavior of the selection is different in 
-            // keyboard navigation...
-
-            // Navigation never toggle. "Ctrl+Space" is the way
-            // to select with the keyboard
-            toggleSelection = false;
-
-            // Do not make range selection for the "Shift-Tab" case...
-            // Ignore the "Shift", just as it was not pressed.
-            if( Keyboard.IsKeyDown( Key.Tab ) )
-            {
-              shift = false;
-              doRangeSelection = false;
-            }
-
-            // Anchor also is keeped when Ctrl is pressed
-            updateRangeStartPosition = !ctrl && !shift;
-
-            // Ctrl + Page[Up/Down] and Ctrl+ [Home/End] are special ways
-            // to scroll using navigation, and does reset the selection.
-            if( !shift && ctrl )
-            {
-              if( Keyboard.IsKeyDown( Key.PageUp )
-                || Keyboard.IsKeyDown( Key.PageDown )
-                || Keyboard.IsKeyDown( Key.End )
-                || Keyboard.IsKeyDown( Key.Home ) )
-              {
-                keepSelection = false;
-              }
-              else
-              {
-                //Do not apply selection when moving with the Ctrl pressed.
-                applySelection = false;
-              }
-            }
-
-            if( !keepSelection && !doRangeSelection )
-            {
-              bool isSelected = ( cellSelection )
-                ? dataGridContext.SelectedCellsStore.Contains( sourceDataItemIndex, columnIndex )
-                : dataGridContext.SelectedItemsStore.Contains( sourceDataItemIndex );
-              if( group == null
-                && isSelected
-                && rowIsBeingEditedAndCurrentRowNotChanged )
-              {
-                applySelection = false;
-              }
-            }
-            break;
-          }
-
-        case UpdateSelectionSource.MouseDown:
-          {
-            if( doRangeSelection )
-            {
-              m_updateSelectionOnNextMouseUp = false;
-            }
-            else
-            {
-              m_updateSelectionOnNextMouseUp =
-                newPosition.GetIsSelected( m_owner.SelectionUnit )
-                && !m_owner.UseDragToSelectBehavior;
-              // If the target item is already selected, do not update
-              // the selection on mouse down, differ this to mouse up.
-              if( m_updateSelectionOnNextMouseUp )
-              {
-                applySelection = false;
-
-                if( isValid )
-                {
-                  if( !( ctrl && !shift ) )
-                  {
-                    m_updateSelectionOnNextMouseUp = !rowIsBeingEditedAndCurrentRowNotChanged;
-                  }
-                }
-              }
-            }
-            break;
-          }
-        case UpdateSelectionSource.RowSelector:
-          {
-            if( doRangeSelection )
-            {
-              m_updateSelectionOnNextMouseUp = false;
-            }
-            else
-            {
-              newPosition.ColumnIndex = 0;
-              isValid = ( newPosition.ItemIndex != -1 );
-
-              if( isValid )
-              {
-                // If the target item is already selected, do not update
-                // the selection on mouse down, differ this to mouse up.
-                m_updateSelectionOnNextMouseUp =
-                  newPosition.GetIsSelected( SelectionUnit.Row )
-                  && !m_owner.UseDragToSelectBehavior;
-
-                if( m_updateSelectionOnNextMouseUp )
-                {
-                  applySelection = false;
-                }
-              }
-            }
-            break;
-          }
-
-        case UpdateSelectionSource.MouseUp:
-          {
-            if( !isValid || !m_updateSelectionOnNextMouseUp )
-            {
-              applySelection = false;
-              updateRangeStartPosition = false;
-            }
-
-
-            // Reset the fromRowSelector to ensure nothing special is done
-            // on next MouseUp (failsafe, should be reset by UpdateSelection)
-            m_fromRowSelector = false;
-
-            // We reset the m_updateSelectionOnNextMouseUp to be sure when no focus is moved
-            // around that mouse up will toggle selection
-            m_updateSelectionOnNextMouseUp = true;
-
-            break;
-          }
-
-        case UpdateSelectionSource.SpaceDown:
-          {
-            //Space Will add to selection without removing the existing
-            //selection. (ie. Like Windows Explorer)
-            if( !ctrl && !shift )
-            {
-              keepSelection = true;
-            }
-            break;
-          }
-        case UpdateSelectionSource.MouseMove:
-          {
-            toggleSelection = false;
-            doRangeSelection = true;
-            updateRangeStartPosition = false;
-            break;
-          }
-        default:
-          {
-            //Fallback for "None" or other futur cases:
-            applySelection = false;
-            updateRangeStartPosition = false;
-            break;
-          }
-      }
-
-      if( updateRangeStartPosition )
-      {
-        m_selectionRangeStartPoint = newPosition;
-      }
-
-      if( applySelection )
-      {
-        this.ApplySelection(
-          oldPosition, newPosition,
-          fromRowSelector,
-          isValid,
-          doRangeSelection,
-          allowRangeUnselection,
-          toggleSelection, keepSelection );
-      }
-    }
-
-    private void ApplySelection(
-      SelectionRangePoint oldPosition,
-      SelectionRangePoint newPosition,
-      bool fromRowSelector,
-      bool isValid,
-      bool doRangeSelection,
-      bool allowRangeUnselection,
-      bool toggleSelection,
-      bool keepSelection )
-    {
-      if( !isValid )
-      {
-        if( !keepSelection )
-        {
-          this.UnselectAll();
-        }
-        return;
-      }
-
-      if( doRangeSelection )
-      {
-        this.DoRangeSelection( oldPosition, newPosition, keepSelection, fromRowSelector, allowRangeUnselection );
-        return;
-      }
-
-      DataGridContext dataGridContext = newPosition.DataGridContext;
-      object item = newPosition.Item;
-      int sourceDataItemIndex = newPosition.ItemIndex;
-      int columnIndex = newPosition.ColumnIndex;
-
-      Action toggleAction;
-      Action selectAndClearAction;
-      Action addToSelectionAction;
-
-      if( m_owner.SelectionUnit == SelectionUnit.Cell )
-      {
-        if( fromRowSelector )
-        {
-          toggleAction = () => this.ToggleItemCellsSelection( dataGridContext, sourceDataItemIndex, item );
-          selectAndClearAction = () => this.SelectItemCells( dataGridContext, sourceDataItemIndex, item, false );
-          addToSelectionAction = () => this.SelectItemCells( dataGridContext, sourceDataItemIndex, item, true );
-        }
-        else
-        {
-          toggleAction = () => this.ToggleCellSelection( dataGridContext, sourceDataItemIndex, item, columnIndex );
-          selectAndClearAction = () => this.SelectJustThisCell( dataGridContext, sourceDataItemIndex, item, columnIndex );
-          addToSelectionAction = () => this.SelectCells( dataGridContext, new SelectionCellRangeWithItems( sourceDataItemIndex, item, columnIndex ) );
-        }
-      }
-      else
-      {
-        toggleAction = () => this.ToggleItemSelection( newPosition );
-        selectAndClearAction = () => this.SelectJustThisItem( newPosition );
-        addToSelectionAction = () => this.SelectItems( newPosition );
-      }
-
-      if( toggleSelection )
-      {
-        toggleAction();
-      }
-      else if( !keepSelection )
-      {
-        selectAndClearAction();
-      }
-      else
-      {
-        addToSelectionAction();
-      }
-    }
-
-    private void DoRangeSelection(
-      SelectionRangePoint oldPosition,
-      SelectionRangePoint newPosition,
-      bool keepPreviousSelection,
-      bool fromRowSelector,
-      bool allowRangeUnselection )
-    {
-      // Un-select a range if we keep previous selection, and
-      // the selection anchor is a unselected item.
-
-      //Group selection not supported. Be sure to have no ranges
-      //that will be relative to a group position.
-      if( newPosition != null && newPosition.Group != null )
-        return;
-
-      if( oldPosition != null && oldPosition.Group != null )
-      {
-        oldPosition = null;
-      }
-
-      if( m_selectionRangeStartPoint != null && m_selectionRangeStartPoint.Group != null )
-      {
-        m_selectionRangeStartPoint = null;
-      }
-
-      if( m_selectionRangeStartPoint == null )
-      {
-        m_selectionRangeStartPoint = oldPosition ?? newPosition;
-      }
-
-      bool unselect = false;
-      if( allowRangeUnselection && keepPreviousSelection )
-      {
-        if( m_owner.SelectionUnit == SelectionUnit.Cell )
-        {
-          unselect = ( fromRowSelector )
-            ? !this.IsItemCellsSelected( m_selectionRangeStartPoint )
-            : !this.IsCellSelected( m_selectionRangeStartPoint );
-        }
-        else
-        {
-          unselect = !this.IsItemSelected( m_selectionRangeStartPoint );
-        }
-      }
-
-      this.DoRangeSelectionNoGroupSupport( newPosition, keepPreviousSelection, fromRowSelector, unselect );
-    }
-
-    private void DoRangeSelectionNoGroupSupport( SelectionRangePoint newPosition, bool keepPreviousSelection, bool fromRowSelector, bool unselect )
-    {
-      int starting_index = m_selectionRangeStartPoint.ItemGlobalIndex;
-      int ending_index = newPosition.ItemGlobalIndex;
-
-      if( !keepPreviousSelection )
-      {
-        this.UnselectAll();
-      }
-
-      // here I need to normalize the values to ensure that I'm not catching the Fixed Headers or Fixed Footers
-      if( starting_index != -1 && ending_index != -1 )
-      {
-
-        int min = Math.Min( starting_index, ending_index );
-        int max = Math.Max( starting_index, ending_index );
-
-        SelectionRange[] selectedColumns;
-
-        if( m_owner.SelectionUnit == SelectionUnit.Row )
-        {
-          selectedColumns = null;
-        }
-        else
-        {
-          SelectionRange fullColumnRange;
-
-          // If called from a RowSelector, we do a range
-          // selection using all the columns no matter
-          // what was the previous anchor
-          if( fromRowSelector )
-          {
-            m_selectionRangeStartPoint.ColumnIndex = 0;
-            fullColumnRange = new SelectionRange( 0, Math.Max( 0, newPosition.DataGridContext.ColumnsByVisiblePosition.Count - 1 ) );
-          }
-          else
-          {
-            if( m_selectionRangeStartPoint.ColumnIndex == -1 )
-              m_selectionRangeStartPoint.ColumnIndex = 0;
-
-            if( newPosition.ColumnIndex == -1 )
-              return;
-
-            fullColumnRange = new SelectionRange( m_selectionRangeStartPoint.ColumnIndex, newPosition.ColumnIndex );
-          }
-
-          SelectedItemsStorage selectedColumnStore = new SelectedItemsStorage( null );
-          selectedColumnStore.Add( new SelectionRangeWithItems( fullColumnRange, null ) );
-          int index = 0;
-
-          foreach( ColumnBase column in newPosition.DataGridContext.ColumnsByVisiblePosition )
-          {
-            if( !column.Visible )
-            {
-              selectedColumnStore.Remove( new SelectionRangeWithItems( new SelectionRange( index ), null ) );
-            }
-
-            index++;
-          }
-
-          selectedColumns = selectedColumnStore.ToSelectionRangeArray();
-        }
-
-        IDataGridContextVisitable visitable = ( IDataGridContextVisitable )m_owner.DataGridContext;
-        bool visitWasStopped;
-
-        visitable.AcceptVisitor(
-          min, max,
-          new RangeSelectionVisitor( selectedColumns, unselect ),
-          DataGridContextVisitorType.ItemsBlock, out visitWasStopped );
-      }
-    }
-
-    private void AffectSelectionRange( List<SelectionRangePoint> startPath, List<SelectionRangePoint> endPath, bool unselect )
-    {
-      // For each DataContext depth of each path.
-      for( int i = Math.Max( startPath.Count, endPath.Count ) - 1; i >= 0; i-- )
-      {
-        DataGridContext startContext = null;
-        DataGridContext endContext = null;
-        int startIndex = -1;
-        int endIndex = -1;
-        int notUsed;
-
-        if( i < startPath.Count )
-        {
-          startContext = startPath[ i ].DataGridContext;
-          this.ExtractRangePositionIndexes( startPath[ i ], out startIndex, out notUsed );
-          if( i != startPath.Count - 1 )
-          {
-            // Except for the deepest level of the start path,
-            // We should not include the start index in the selection
-            // This is because the parent item placeholder (ie. the master row) is
-            // over/before the displayed children, and is not visually within
-            // the range of the selection.
-            startIndex++;
-          }
-        }
-
-        if( i < endPath.Count )
-        {
-          endContext = endPath[ i ].DataGridContext;
-          this.ExtractRangePositionIndexes( endPath[ i ], out notUsed, out endIndex );
-        }
-
-        if( startContext != endContext )
-        {
-          if( startContext != null )
-          {
-            // This is a sub context unique to the start selection path.
-            // Since the selection go beyond this data context, select all items starting
-            // at the startIndex to the last item of this context.
-            int lastItemIndex = startContext.Items.Count - 1;
-            this.AffectSelectionRecursivelyForSelectRange( startContext, startIndex, lastItemIndex, unselect );
-          }
-
-          if( endContext != null )
-          {
-            // This is a sub context unique to the end selection path.
-            // Since the selection is starting before this data context, select all items from
-            // the first of this data context down to the endIndex.
-            this.AffectSelectionRecursivelyForSelectRange( endContext, 0, endIndex, unselect );
-          }
-        }
-        else
-        {
-          // The context is the same for start and end path.
-          // Select only items within the range of the startIndex down to the
-          // endIndex.
-          Debug.Assert( startContext != null );
-          this.AffectSelectionRecursivelyForSelectRange( startContext, startIndex, endIndex, unselect );
-        }
-      }
-    }
-
-    private void AffectSelectionRecursivelyForSelectRange( DataGridContext dataGridContext, int startIndex, int endIndex, bool unselect )
-    {
-      if( startIndex > endIndex )
-        return;
-
-      // We do not Recursively select the last item since the children
-      // of theses will go beyond this last item.
-      if( startIndex < endIndex )
-      {
-        this.AffectSelectionRecursivelyOnDetails( dataGridContext, startIndex, endIndex - 1, unselect );
-      }
-
-      //Select, not recursively the last item of the range.
-      var selectionRange = new SelectionRangeWithItems( new SelectionRange( endIndex, endIndex ), null );
-      this.AffectSelection( dataGridContext, selectionRange, unselect );
-    }
-
-    private bool AffectSelectionRecursivelyOnDetails( DataGridContext dataGridContext, int startIndex, int endIndex, bool unselect )
-    {
-      if( startIndex < 0 || endIndex < 0 )
-        return false;
-
-      //Apply the selection operation at the current level.
-      var rangeWithItem = new SelectionRangeWithItems( new SelectionRange( startIndex, endIndex ), null );
-      bool wasAlreadyDone = this.AffectSelection( dataGridContext, rangeWithItem, unselect );
-
-      if( dataGridContext.DetailConfigurations.Count > 0 )
-      {
-        int firstIndex = Math.Min( startIndex, endIndex );
-        int lastIndex = Math.Max( startIndex, endIndex );
-
-        for( int i = firstIndex; i <= lastIndex; i++ )
-        {
-          // If the items are not provided, extract them from the DataGridContext.
-          var item = dataGridContext.Items.GetItemAt( i );
-          foreach( var configuration in dataGridContext.DetailConfigurations )
-          {
-            var subContext = dataGridContext.GetChildContext( item, configuration );
-            if( subContext != null )
-            {
-              wasAlreadyDone = wasAlreadyDone
-                && this.AffectSelectionRecursivelyOnDetails( subContext, 0, subContext.Items.Count - 1, unselect );
-            }
-          }
-        }
-      }
-
-      return wasAlreadyDone;
-    }
-
-    private bool AffectSelection( DataGridContext dataGridContext, SelectionRangeWithItems selectionRange, bool unselect )
-    {
-      return ( unselect )
-        ? this.UnselectItems( dataGridContext, selectionRange )
-        : this.SelectItems( dataGridContext, selectionRange );
-    }
-
-    private bool IsItemSelected( SelectionRangePoint rangePosition )
-    {
-      return this.IsItemSelected( rangePosition.DataGridContext, rangePosition.ItemIndex );
-    }
-
-    private bool IsItemSelected( DataGridContext context, int itemIndex )
-    {
-      return context.SelectedItemsStore.Contains( itemIndex );
-    }
-
-    private bool IsCellSelected( SelectionRangePoint selectionPoint )
-    {
-      return this.IsCellSelected( selectionPoint.DataGridContext, selectionPoint.ItemIndex, selectionPoint.ColumnIndex );
-    }
-
-    private bool IsCellSelected( DataGridContext context, int itemIndex, int columnIndex )
-    {
-      return context.SelectedCellsStore.Contains( itemIndex, columnIndex );
-    }
-
-    private bool IsItemCellsSelected( SelectionRangePoint selectionPoint )
-    {
-      SelectedCellsStorage itemCells = this.GetItemCellStorage( selectionPoint.DataGridContext,
-        selectionPoint.ItemIndex, selectionPoint.Item );
-
-      return this.IsItemCellsSelected( selectionPoint.DataGridContext, itemCells );
-    }
-
-    private bool IsItemCellsSelected( DataGridContext dataGridContext, SelectedCellsStorage itemCellsStorage )
-    {
-      bool allCellSelected = true;
-
-      foreach( SelectionCellRangeWithItems allCellSelection in itemCellsStorage )
-      {
-        if( !dataGridContext.SelectedCellsStore.Contains( allCellSelection ) )
-        {
-          allCellSelected = false;
-          break;
-        }
-      }
-
-      return allCellSelected;
-    }
-
-    private SelectedCellsStorage GetItemCellStorage( DataGridContext dataGridContext, int itemIndex, object item )
-    {
-      SelectedCellsStorage tempStorage = new SelectedCellsStorage( null );
-      tempStorage.Add( this.GetItemCellRange( dataGridContext, itemIndex, item ) );
-
-      foreach( ColumnBase column in dataGridContext.ColumnsByVisiblePosition )
-      {
-        if( !column.Visible )
-          tempStorage.Remove( new SelectionCellRangeWithItems( itemIndex, item, column.VisiblePosition ) );
-      }
-
-      return tempStorage;
-    }
-
-    private SelectionCellRangeWithItems GetItemCellRange( DataGridContext dataGridContext, int itemIndex, object item )
-    {
-      SelectionRange itemRange = new SelectionRange( itemIndex );
-
-      SelectionRange cellRange = new SelectionRange( 0,
-        Math.Max( 0, dataGridContext.Columns.Count - 1 ) );
-
-      // Select all visible cells for this itemIndex
-      return new SelectionCellRangeWithItems( itemRange, new object[] { item }, cellRange );
-    }
-
-    private int CompareRangePosition( List<SelectionRangePoint> range1Indexes, List<SelectionRangePoint> range2Indexes )
-    {
-      for( int i = 0; i < range1Indexes.Count && i < range2Indexes.Count; i++ )
-      {
-        SelectionRangePoint node1 = range1Indexes[ i ];
-        SelectionRangePoint node2 = range2Indexes[ i ];
-
-        Debug.Assert( node1.DataGridContext == node2.DataGridContext );
-        int node1First, node1Last;
-        int node2First, node2Last;
-
-        this.ExtractRangePositionIndexes( node1, out node1First, out node1Last );
-        this.ExtractRangePositionIndexes( node2, out node2First, out node2Last );
-
-        if( node1First < node2First )
-        {
-          return -1;
-        }
-        else if( node1First > node2First )
-        {
-          return 1;
-        }
-        else
-        {
-          // Both node have the same first index. They may however represent
-          // different items (Ex. A the first item or subgroup of a group 
-          // in relation to this parent group)
-          //
-          // In this case, since the group is visually represented as 
-          // the "header" of it's children, consider 
-          // the parent group to be "before" its children.
-          // The the parent group of an item/subgroup will have a
-          // higher last index than its children.
-          if( node1Last != node2Last )
-          {
-            return ( node1Last > node2Last )
-              ? -1
-              : 1;
-          }
-        }
-      }
-
-      // Since the visual representation of the master is before the children,
-      // any Master->Children comparaision will identify the master to be "before" 
-      // the children.
-      if( range1Indexes.Count != range2Indexes.Count )
-      {
-        return ( range1Indexes.Count < range2Indexes.Count ) ? -1 : 1;
-      }
-
-      // Paths are perfectly equals
-      return 0;
-    }
-
-    private List<SelectionRangePoint> CreatePathForSelectionPoint( SelectionRangePoint rangePoint )
-    {
-      var indexList = new List<SelectionRangePoint>();
-
-      indexList.Insert( 0, rangePoint );
-
-      var context = rangePoint.DataGridContext;
-      var parentContext = context.ParentDataGridContext;
-
-      while( parentContext != null )
-      {
-        var parentIndex = parentContext.Items.IndexOf( context.ParentItem );
-
-        var parentRangePoint = SelectionRangePoint.TryCreateRangePoint( parentContext, context.ParentItem, parentIndex, -1 );
-        if( parentRangePoint != null )
-        {
-          indexList.Insert( 0, parentRangePoint );
-        }
-
-        context = parentContext;
-        parentContext = parentContext.ParentDataGridContext;
-      }
-
-      return indexList;
-    }
-
-    private void ExtractRangePositionIndexes( SelectionRangePoint rangePosition, out int firstIndex, out int lastIndex )
-    {
-      firstIndex = -1;
-      lastIndex = -1;
-
-      if( rangePosition.Item != null )
-      {
-        Debug.Assert( rangePosition.ItemIndex != -1 );
-        firstIndex = rangePosition.ItemIndex;
-        lastIndex = firstIndex;
-      }
-      else if( rangePosition.Group != null )
-      {
-        var groupRange = rangePosition.Group.GetRange();
-        firstIndex = groupRange.StartIndex;
-        lastIndex = groupRange.EndIndex;
-      }
-
-      Debug.Assert( firstIndex <= lastIndex );
-    }
-
-    private SelectionChanger GetSelectionChanger( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        return null;
-
-      var selectionChanger = default( SelectionChanger );
-
-      if( !m_activatedSelectionChanger.TryGetValue( dataGridContext, out selectionChanger ) )
-      {
-        selectionChanger = new SelectionChanger( dataGridContext );
-        m_activatedSelectionChanger.Add( dataGridContext, selectionChanger );
-      }
-
-      return selectionChanger;
-    }
-
-    private void CommitSelectionChanger( SelectionChanger selectionChanger )
-    {
-      try
-      {
-        selectionChanger.UpdateSelectedItemsInChangeOfDataGridContext();
-        selectionChanger.UpdateSelectedCellsInChangeOfDataGridContext();
-      }
-      finally
-      {
-        selectionChanger.Cleanup();
-      }
-
-      selectionChanger.Owner.UpdatePublicSelectionProperties();
-    }
-
-    private void UpdateCurrentToSelection()
-    {
-      var currentContext = m_owner.CurrentContext;
-      var currentItemIndex = default( int );
-      var currentColumn = default( ColumnBase );
-
-      var selectedColumn = default( ColumnBase );
-      var selectedColumnIndex = -1;
-      var selectedItemIndex = -1;
-      var selectedItem = default( object );
-
-      if( ( currentContext == null ) || !m_owner.SelectedContexts.Contains( currentContext ) )
-      {
-        currentItemIndex = -1;
-        currentColumn = null;
-
-        if( m_owner.SelectedContexts.Count > 0 )
-        {
-          currentContext = m_owner.SelectedContexts[ 0 ];
-          currentContext.GetFirstSelectedItemFromStore( true, out selectedItemIndex, out selectedItem, out selectedColumnIndex );
-        }
-      }
-      else
-      {
-        currentItemIndex = currentContext.CurrentItemIndex;
-        currentColumn = currentContext.CurrentColumn;
-        currentContext.GetFirstSelectedItemFromStore( true, out selectedItemIndex, out selectedItem, out selectedColumnIndex );
-      }
-
-      if( currentContext == null )
-        return;
-
-      if( m_owner.SelectionUnit == SelectionUnit.Cell )
-      {
-        if( ( currentItemIndex != -1 ) && ( currentColumn != null )
-          && currentContext.SelectedCellsStore.GetIntersectedColumnRanges( new SelectionCellRange( currentItemIndex, currentColumn.VisiblePosition ) ).Any() )
-          return;
-
-        selectedColumn = currentContext.ColumnsByVisiblePosition.ElementAtOrDefault( selectedColumnIndex );
-      }
-      else
-      {
-        if( ( currentItemIndex != -1 ) && currentContext.SelectedItemsStore.Contains( currentItemIndex ) )
-          return;
-
-        selectedColumn = currentContext.CurrentColumn;
-      }
-
-      // No need to change Current when the previous and subsequent current are both null, even if SelectionUnit is set to Cell and columns do not correspond,
-      // since there is no current anyway.  It will be correctly updated next time an item becomes current.
-      if( selectedItem == currentContext.CurrentItem )
-        return;
-
-      currentContext.SetCurrent( selectedItem, null, selectedItemIndex, selectedColumn, false, true, false, AutoScrollCurrentItemSourceTriggers.SelectionChanged );
-    }
-
-    private bool m_isActive;
-    private readonly Dictionary<DataGridContext, SelectionChanger> m_activatedSelectionChanger = new Dictionary<DataGridContext, SelectionChanger>();
-    private readonly DataGridControl m_owner;
-    private SelectionRangePoint m_selectionRangeStartPoint;
-    private bool m_updateSelectionOnNextMouseUp = true;
-    private bool m_fromRowSelector; // = false;
-
-    // = Navigation ?
-    private UpdateSelectionSource m_currentUpdateSelectionSource;
-
-    private class UpdateSelectionSourceHelper : IDisposable
-    {
-      public UpdateSelectionSourceHelper(
-        SelectionManager selectionManager,
-        UpdateSelectionSource newUpdateSelectionSource )
-      {
-        m_selectionManager = selectionManager;
-        m_oldUpdateSelectionSource = selectionManager.m_currentUpdateSelectionSource;
-        selectionManager.m_currentUpdateSelectionSource = newUpdateSelectionSource;
-      }
-
-      private UpdateSelectionSource m_oldUpdateSelectionSource;
-      private SelectionManager m_selectionManager;
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        m_selectionManager.m_currentUpdateSelectionSource = m_oldUpdateSelectionSource;
-      }
-
-      #endregion IDisposable Members
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs
deleted file mode 100644
index 973d85dd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs
+++ /dev/null
@@ -1,354 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public struct SelectionRange : IComparable<SelectionRange>
-  {
-    public static readonly SelectionRange Empty = new SelectionRange( -1 );
-
-    #region CONSTRUCTORS
-
-    public SelectionRange( int startIndex, int endIndex )
-    {
-      if( ( startIndex < 0 ) || ( startIndex >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "startIndex", "startIndex must be equal to or greater than zero and lower than int.MaxValue." );
-
-      if( ( endIndex < 0 ) || ( endIndex >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "endIndex", "endIndex must be equal to or greater than zero and lower than int.MaxValue." );
-
-      m_startIndex = startIndex;
-      m_endIndex = endIndex;
-    }
-
-    public SelectionRange( int index )
-    {
-      // Only place where we accept index = -1
-      if( ( index < -1 ) || ( index >= int.MaxValue ) )
-        throw new ArgumentOutOfRangeException( "index", "index must be equal to or greater than -1 and lower than int.MaxValue." );
-
-      m_startIndex = index;
-      m_endIndex = index;
-    }
-
-    #endregion
-
-    #region StartIndex Property
-
-    public int StartIndex
-    {
-      get
-      {
-        return m_startIndex;
-      }
-      set
-      {
-        if( ( value < 0 ) || ( value >= int.MaxValue ) )
-          throw new ArgumentOutOfRangeException( "StartIndex", "StartIndex must be equal to or greater than zero and lower than int.MaxValue." );
-
-        m_startIndex = value;
-      }
-    }
-
-    private int m_startIndex;
-
-    #endregion
-
-    #region EndIndex Property
-
-    public int EndIndex
-    {
-      get
-      {
-        return m_endIndex;
-      }
-      set
-      {
-        if( ( value < 0 ) || ( value >= int.MaxValue ) )
-          throw new ArgumentOutOfRangeException( "EndIndex", "EndIndex must be equal to or greater than zero and lower than int.MaxValue." );
-
-        m_endIndex = value;
-      }
-    }
-
-    private int m_endIndex;
-
-    #endregion
-
-    #region Length Property
-
-    public int Length
-    {
-      get
-      {
-        if( this.IsEmpty )
-          return 0;
-
-        return Math.Abs( m_endIndex - m_startIndex ) + 1;
-      }
-    }
-
-    #endregion
-
-    #region IsEmpty Property
-
-    public bool IsEmpty
-    {
-      get
-      {
-        return ( m_startIndex == -1 ) || ( m_endIndex == -1 );
-      }
-    }
-
-    #endregion
-
-    public static bool operator >( SelectionRange range1, SelectionRange range2 )
-    {
-      if( range1.m_startIndex > range1.m_endIndex )
-      {
-        if( range2.m_startIndex < range2.m_endIndex )
-        {
-          return range1.m_endIndex > range2.m_endIndex;
-        }
-        else
-        {
-          return range1.m_endIndex > range2.m_startIndex;
-        }
-      }
-      else
-      {
-        if( range2.m_startIndex > range2.m_endIndex )
-        {
-          return range1.m_startIndex > range2.m_startIndex;
-        }
-        else
-        {
-          return range1.m_startIndex > range2.m_endIndex;
-        }
-      }
-    }
-
-    public static bool operator <( SelectionRange range1, SelectionRange range2 )
-    {
-      if( range1.m_startIndex > range1.m_endIndex )
-      {
-        if( range2.m_startIndex < range2.m_endIndex )
-        {
-          return range1.m_startIndex < range2.m_startIndex;
-        }
-        else
-        {
-          return range1.m_startIndex < range2.m_endIndex;
-        }
-      }
-      else
-      {
-        if( range2.m_startIndex > range2.m_endIndex )
-        {
-          return range1.m_endIndex < range2.m_endIndex;
-        }
-        else
-        {
-          return range1.m_endIndex < range2.m_startIndex;
-        }
-      }
-    }
-
-    public static bool operator ==( SelectionRange range1, SelectionRange range2 )
-    {
-      return range1.Equals( range2 );
-    }
-
-    public static bool operator !=( SelectionRange range1, SelectionRange range2 )
-    {
-      return !range1.Equals( range2 );
-    }
-
-    public SelectionRange Intersect( SelectionRange range )
-    {
-      int newStart;
-      int newEnd;
-
-      if( m_startIndex > m_endIndex )
-      {
-        if( range.m_startIndex < range.m_endIndex )
-        {
-          int temp = range.m_startIndex;
-          range.m_startIndex = range.m_endIndex;
-          range.m_endIndex = temp;
-        }
-
-        newStart = Math.Min( range.m_startIndex, m_startIndex );
-        newEnd = Math.Max( range.m_endIndex, m_endIndex );
-
-        if( newEnd > newStart )
-          return SelectionRange.Empty;
-      }
-      else
-      {
-        if( range.m_startIndex > range.m_endIndex )
-        {
-          int temp = range.m_startIndex;
-          range.m_startIndex = range.m_endIndex;
-          range.m_endIndex = temp;
-        }
-
-        newStart = Math.Max( range.m_startIndex, m_startIndex );
-        newEnd = Math.Min( range.m_endIndex, m_endIndex );
-
-        if( newStart > newEnd )
-          return SelectionRange.Empty;
-      }
-
-      return new SelectionRange( newStart, newEnd );
-    }
-
-    public SelectionRange[] Exclude( SelectionRange rangeToExclude )
-    {
-      if( rangeToExclude.IsEmpty )
-        return new SelectionRange[] { this };
-
-      var rangeIntersection = this.Intersect( rangeToExclude );
-      if( rangeIntersection.IsEmpty )
-        return new SelectionRange[] { this };
-
-      if( m_startIndex > m_endIndex )
-      {
-        Debug.Assert( rangeIntersection.StartIndex >= rangeIntersection.EndIndex );
-
-        if( rangeIntersection.EndIndex > m_endIndex )
-        {
-          var newRange = this;
-          newRange.StartIndex = rangeIntersection.EndIndex - 1;
-
-          if( rangeIntersection.StartIndex < m_startIndex )
-          {
-            return new SelectionRange[] 
-              { 
-                new SelectionRange( m_startIndex, rangeIntersection.StartIndex + 1 ),
-                newRange 
-              };
-          }
-          else
-          {
-            return new SelectionRange[] { newRange };
-          }
-        }
-        else
-        {
-          if( rangeIntersection.StartIndex < m_startIndex )
-          {
-            var newRange = this;
-            newRange.EndIndex = rangeIntersection.StartIndex + 1;
-            return new SelectionRange[] { newRange };
-          }
-        }
-      }
-      else
-      {
-        Debug.Assert( rangeIntersection.StartIndex <= rangeIntersection.EndIndex );
-
-        if( rangeIntersection.StartIndex > m_startIndex )
-        {
-          SelectionRange newRange = this;
-          newRange.EndIndex = rangeIntersection.StartIndex - 1;
-
-          if( rangeIntersection.EndIndex < m_endIndex )
-          {
-            return new SelectionRange[]
-              { 
-                newRange,
-                new SelectionRange( rangeIntersection.EndIndex + 1, m_endIndex )
-              };
-          }
-          else
-          {
-            return new SelectionRange[] { newRange };
-          }
-        }
-        else
-        {
-          if( rangeIntersection.EndIndex < m_endIndex )
-          {
-            SelectionRange newRange = this;
-            newRange.StartIndex = rangeIntersection.EndIndex + 1;
-            return new SelectionRange[] { newRange };
-          }
-        }
-      }
-
-      return new SelectionRange[ 0 ];
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( !( obj is SelectionRange ) )
-        return false;
-
-      var selectionRange = ( SelectionRange )obj;
-
-      return ( selectionRange.m_startIndex == m_startIndex )
-        && ( selectionRange.m_endIndex == m_endIndex );
-    }
-
-    public override int GetHashCode()
-    {
-      return ( ( m_startIndex >> 16 ) | ( m_startIndex << 16 ) ) ^ m_endIndex;
-    }
-
-    public int GetIndexFromItemOffset( int itemOffset )
-    {
-      if( m_startIndex > m_endIndex )
-      {
-        return m_startIndex - itemOffset;
-      }
-      else
-      {
-        return m_startIndex + itemOffset;
-      }
-    }
-
-    public int GetOffsetFromItemIndex( int itemIndex )
-    {
-      if( m_startIndex > m_endIndex )
-      {
-        return m_startIndex - itemIndex;
-      }
-      else
-      {
-        return itemIndex - m_startIndex;
-      }
-    }
-
-    #region IComparable<SelectionRange> Members
-
-    public int CompareTo( SelectionRange other )
-    {
-      if( this < other )
-        return -1;
-
-      if( this > other )
-        return 1;
-
-      return 0;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangePoint.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangePoint.cs
deleted file mode 100644
index cc23be8b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangePoint.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class SelectionRangePoint
-  {
-    private SelectionRangePoint()
-    {
-    }
-
-    private SelectionRangePoint( DataGridContext dataGridContext, object item, int itemIndex, int columnPosition )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException();
-
-      if( item == null )
-        throw new ArgumentNullException();
-
-      m_localIndex = itemIndex;
-
-      this.Item = item;
-      this.ColumnIndex = columnPosition;
-      this.DataGridContext = dataGridContext;
-    }
-
-    private SelectionRangePoint( Group group )
-    {
-      if( group == null )
-        throw new ArgumentNullException();
-
-      this.Group = group;
-      this.DataGridContext = group.DataGridContext;
-      this.ColumnIndex = -1;
-    }
-
-    public object Item
-    {
-      get;
-      private set;
-    }
-
-    public int ColumnIndex
-    {
-      get;
-      set;
-    }
-
-    public Group Group
-    {
-      get;
-      private set;
-    }
-
-    public DataGridContext DataGridContext
-    {
-      get;
-      private set;
-    }
-
-    public int ItemIndex
-    {
-      get
-      {
-        if( m_localIndex == null )
-        {
-          m_localIndex = this.DataGridContext.Items.IndexOf( this.Item );
-        }
-
-        return m_localIndex.Value;
-      }
-
-    }
-
-    public int ItemGlobalIndex
-    {
-      get
-      {
-        if( m_globalIndex == null )
-        {
-          m_globalIndex = this.DataGridContext.DataGridControl.GetGlobalGeneratorIndexFromItem( this.DataGridContext, this.Item );
-        }
-
-        return m_globalIndex.Value;
-      }
-    }
-
-    public bool GetIsSelected( SelectionUnit selectionUnit )
-    {
-      if( selectionUnit == SelectionUnit.Cell )
-      {
-        return this.DataGridContext.SelectedCellsStore.Contains( this.ItemIndex, this.ColumnIndex );
-      }
-      else if( selectionUnit == SelectionUnit.Row )
-      {
-        if( this.ItemIndex >= 0 )
-        {
-          return this.DataGridContext.SelectedItemsStore.Contains( this.ItemIndex );
-        }
-      }
-
-      return false;
-    }
-
-    public static SelectionRangePoint TryCreateRangePoint( DataGridContext dataGridContext, object item, int itemIndex, int columnIndex )
-    {
-      if( ( dataGridContext == null ) || ( item == null ) )
-        return null;
-
-      if( !( item is GroupHeaderFooterItem ) )
-        return new SelectionRangePoint( dataGridContext, item, itemIndex, columnIndex );
-
-      var dataGridControl = dataGridContext.DataGridControl;
-      if( ( dataGridControl == null ) )
-        return null;
-
-      var group = dataGridContext.GetGroupFromCollectionViewGroup( ( ( GroupHeaderFooterItem )item ).Group );
-
-      return SelectionRangePoint.TryCreateRangePoint( group );
-    }
-
-    public static SelectionRangePoint TryCreateRangePoint( Group group )
-    {
-      if( group != null )
-        return new SelectionRangePoint( group );
-
-      return null;
-    }
-
-    public static SelectionRangePoint TryCreateFromCurrent( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        return null;
-
-      var dataGridControl = dataGridContext.DataGridControl;
-      if( dataGridControl == null )
-        return null;
-
-      var column = dataGridContext.CurrentColumn;
-      int columnIndex = ( column != null ) ? column.VisiblePosition : -1;
-
-      var oldPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, dataGridContext.CurrentItem, dataGridContext.CurrentItemIndex, columnIndex );
-      if( oldPosition == null )
-      {
-        oldPosition = SelectionRangePoint.TryCreateRangePoint( dataGridContext, dataGridContext.InternalCurrentItem, -1, columnIndex );
-      }
-
-      return oldPosition;
-    }
-
-    public SelectionRangeWithItems ToSelectionRangeWithItems()
-    {
-      if( this.Item != null )
-      {
-        return new SelectionRangeWithItems( this.ItemIndex, this.Item );
-      }
-      else
-      {
-        var group = this.Group;
-        var dataGridContext = group.DataGridContext;
-        var groupList = group.GetLeafItems().ToArray();
-        int firstIndex = dataGridContext.Items.IndexOf( groupList[ 0 ] );
-        int lastIndex = dataGridContext.Items.IndexOf( groupList[ groupList.Length - 1 ] );
-
-        return new SelectionRangeWithItems( new SelectionRange( firstIndex, lastIndex ), groupList );
-      }
-    }
-
-    private int? m_globalIndex;
-    private int? m_localIndex;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs
deleted file mode 100644
index ed281619..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs
+++ /dev/null
@@ -1,312 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal struct SelectionRangeWithItems
-  {
-    public static readonly SelectionRangeWithItems Empty = new SelectionRangeWithItems( new SelectionRange( -1 ), null );
-
-    public SelectionRangeWithItems( int itemIndex, object item )
-      : this( new SelectionRange( itemIndex ), new object[] { item } )
-    {
-    }
-
-    public SelectionRangeWithItems( SelectionRange range, object[] items )
-    {
-      if( ( items != null ) && ( items.Length != range.Length ) && ( !range.IsEmpty ) )
-        throw new ArgumentException( "selectionRange and items must have the same length." );
-
-      m_items = ( items != null ) ? new OptimizedItemsList( items ) : null;
-      m_range = range;
-    }
-
-    internal SelectionRangeWithItems( SelectionRange range, SharedList items )
-    {
-      if( ( items.Count != range.Length ) && ( !range.IsEmpty ) )
-        throw new ArgumentException( "selectionRange and items must have the same length." );
-
-      m_items = new OptimizedItemsList( items );
-      m_range = range;
-    }
-
-    #region SelectionRange Property
-
-    public SelectionRange Range
-    {
-      get
-      {
-        return m_range;
-      }
-    }
-
-    private SelectionRange m_range;
-
-    #endregion
-
-    #region Items Property
-
-    public object[] Items
-    {
-      get
-      {
-        if( m_items == null )
-          return null;
-
-        return m_items.ItemsArray;
-      }
-    }
-
-    private OptimizedItemsList m_items;
-
-    #endregion
-
-    #region ItemsList Property
-
-    internal SharedList? SharedList
-    {
-      get
-      {
-        if( m_items == null )
-          return null;
-
-        return m_items.SharedList;
-      }
-    }
-
-    #endregion
-
-    #region Length Property
-
-    public int Length
-    {
-      get
-      {
-        return m_range.Length;
-      }
-    }
-
-    #endregion
-
-    #region IsEmpty Property
-
-    public bool IsEmpty
-    {
-      get
-      {
-        return m_range.IsEmpty;
-      }
-    }
-
-    #endregion
-
-    public static bool operator ==( SelectionRangeWithItems rangeWithItems1, SelectionRangeWithItems rangeWithItems2 )
-    {
-      if( rangeWithItems1.Range != rangeWithItems2.Range )
-        return false;
-
-      return rangeWithItems1.IsItemsEqual( rangeWithItems1.Range, rangeWithItems2 );
-    }
-
-    public static bool operator !=( SelectionRangeWithItems rangeWithItems1, SelectionRangeWithItems rangeWithItems2 )
-    {
-      if( rangeWithItems1.Range != rangeWithItems2.Range )
-        return true;
-
-      return !rangeWithItems1.IsItemsEqual( rangeWithItems1.Range, rangeWithItems2 );
-    }
-
-    public bool IsItemsEqual( SelectionRange rangeIntersection, SelectionRangeWithItems rangeWithItemsToCompare )
-    {
-      OptimizedItemsList itemsToCompare = rangeWithItemsToCompare.m_items;
-
-      if( ( m_items == null ) || ( itemsToCompare == null ) )
-        return true;
-
-      SelectionRange rangeToCompare = rangeWithItemsToCompare.Range;
-      int startIndex = Math.Min( rangeIntersection.StartIndex, rangeIntersection.EndIndex );
-      int itemIndex1 = Math.Abs( startIndex - m_range.StartIndex );
-      int itemIndex2 = Math.Abs( startIndex - rangeToCompare.StartIndex );
-      bool inversedRange1 = m_range.StartIndex > m_range.EndIndex;
-      bool inversedRange2 = rangeToCompare.StartIndex > rangeToCompare.EndIndex;
-      int count = rangeIntersection.Length;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( !object.Equals( m_items[ itemIndex1 ], itemsToCompare[ itemIndex2 ] ) )
-          return false;
-
-        itemIndex1 = inversedRange1 ? itemIndex1 - 1 : itemIndex1 + 1;
-        itemIndex2 = inversedRange2 ? itemIndex2 - 1 : itemIndex2 + 1;
-      }
-
-      return true;
-    }
-
-    public object GetItem( DataGridContext dataGridContext, int offset )
-    {
-      if( m_items != null )
-        return m_items[ offset ];
-
-      int rangeStart = m_range.StartIndex;
-      int rangeEnd = m_range.EndIndex;
-
-      if( rangeStart > rangeEnd )
-      {
-        return dataGridContext.Items.GetItemAt( rangeStart - offset );
-      }
-      else
-      {
-        return dataGridContext.Items.GetItemAt( rangeStart + offset );
-      }
-    }
-
-    public object[] GetItems( SelectionRange range )
-    {
-      if( m_items == null )
-        return null;
-
-      if( range.IsEmpty )
-        return new object[ 0 ];
-
-      int startOffset;
-      bool reverseOrder;
-
-      SelectionRange rangeIntersection = m_range.Intersect( range );
-
-      if( m_range.StartIndex > m_range.EndIndex )
-      {
-        startOffset = m_range.StartIndex - rangeIntersection.StartIndex;
-        reverseOrder = range.StartIndex < range.EndIndex;
-      }
-      else
-      {
-        startOffset = rangeIntersection.StartIndex - m_range.StartIndex;
-        reverseOrder = range.StartIndex > range.EndIndex;
-      }
-
-      object[] items = new object[ rangeIntersection.Length ];
-      m_items.CopyItemsToArray( startOffset, items, 0, items.Length );
-
-      if( reverseOrder )
-      {
-        Array.Reverse( items );
-      }
-
-      return items;
-    }
-
-    public override int GetHashCode()
-    {
-      return m_range.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      if( !( obj is SelectionRangeWithItems ) )
-        return false;
-
-      return ( ( SelectionRangeWithItems )obj ) == this;
-    }
-
-    #region OptimizedItemsList Private Class
-
-    // Performance optimization.
-    // This wrapper class allows to store items as an array (exclusive)OR as a SharedList.
-    // This allows a uniform API to access the items, whether they are stored as an Array or as a SharedList. 
-    //
-    // The SharedList allows us to be more efficient when we need to add items to the existing ones. 
-    // The Array allows the return of a value to the SelectionRangeWithItems.Items property more efficiently.
-    private class OptimizedItemsList
-    {
-      public OptimizedItemsList( SharedList list )
-      {
-        m_itemsArray = null;
-        m_itemsList = list;
-      }
-
-      public OptimizedItemsList( object[] items )
-      {
-        if( items == null )
-          throw new ArgumentNullException( "items" );
-
-        m_itemsArray = items;
-        m_itemsList = null;
-      }
-
-      public object this[ int index ]
-      {
-        get
-        {
-          if( m_itemsArray != null )
-          {
-            return m_itemsArray[ index ];
-          }
-          else
-          {
-            Debug.Assert( m_itemsList != null );
-            return m_itemsList.Value[ index ];
-          }
-        }
-      }
-
-      public SharedList? SharedList
-      {
-        get
-        {
-          return m_itemsList;
-        }
-      }
-
-      public object[] ItemsArray
-      {
-        get
-        {
-          //Convert the list to an array if needed.
-          if( m_itemsList != null )
-          {
-            Debug.Assert( m_itemsArray == null );
-            m_itemsArray = m_itemsList.Value.ToArray();
-            m_itemsList = null;
-          }
-
-          return m_itemsArray;
-        }
-      }
-
-      public void CopyItemsToArray( int index, object[] array, int arrayIndex, int length )
-      {
-        if( m_itemsArray != null )
-        {
-          Array.Copy( m_itemsArray, index, array, arrayIndex, length );
-        }
-        else
-        {
-          Debug.Assert( m_itemsList != null );
-          m_itemsList.Value.CopyTo( index, array, arrayIndex, length );
-        }
-      }
-
-      private object[] m_itemsArray;
-      private SharedList? m_itemsList;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SharedListStruct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SharedListStruct.cs
deleted file mode 100644
index 049a8312..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SharedListStruct.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid
-{
-  // The idea behind this struct is to share the same "List" instance
-  // (eg. m_internalList) across many "SharedList" instances 
-  // (note: SharedList is a value type, so the reference is copied on every
-  //  assignation) without having to create and copy of the list every time.
-  // As long as each SharedList intances shares the same first items,
-  // each instances can add new items to the list without affecting other instances.
-  internal struct SharedList
-  {
-    public SharedList( int capacity )
-    {
-      m_internalList = new List<object>( capacity );
-      m_localCount = 0;
-    }
-
-    public object this[ int index ]
-    {
-      get
-      {
-        if( index >= m_localCount )
-          throw new ArgumentException( "Provided index is out of range", "index" );
-
-        return m_internalList[ index ];
-      }
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_localCount;
-      }
-    }
-
-    public void EnsureCapacity( int capacity )
-    {
-      if( m_internalList.Capacity < capacity )
-      {
-        // Performance optimization. 
-        // To avoid increasing to frequently, at least double the list capacity
-        m_internalList.Capacity = Math.Max( m_internalList.Capacity * 2, capacity );
-      }
-    }
-
-    public void Add( object item )
-    {
-      this.TrunkExcessiveContent( 1 );
-      m_internalList.Add( item );
-      m_localCount++;
-    }
-
-    public void AddRange( object[] e )
-    {
-      this.TrunkExcessiveContent( e.Length );
-      m_internalList.AddRange( e );
-      m_localCount += e.Length;
-    }
-
-    public object[] ToArray()
-    {
-      object[] newArray = new object[ m_localCount ];
-      m_internalList.CopyTo( 0, newArray, 0, m_localCount );
-      return newArray;
-    }
-
-    public void CopyTo( int startIndex, object[] array, int arrayIndex, int length )
-    {
-      if( ( startIndex < 0 )
-        || ( length < 0 )
-        || ( startIndex + length > m_localCount ) )
-        throw new DataGridInternalException( "Specified range is invalid" );
-
-      m_internalList.CopyTo( startIndex, array, arrayIndex, length );
-    }
-
-    private void TrunkExcessiveContent( int newListExtraCapacity )
-    {
-      if( m_localCount < m_internalList.Count )
-      {
-        // This is the scenario that should not happen very often 
-        // where we loose the "same list copy" advantage. If we need
-        // to add items to a list that already contains others "added" items,
-        // we need to "branch" the list instance.
-        var newList = new List<object>( m_localCount + newListExtraCapacity );
-        for( int i = 0; i < m_localCount; i++ )
-        {
-          newList[ i ] = m_internalList[ i ];
-        }
-        m_internalList = newList;
-      }
-    }
-
-    #region Fields
-
-    private int m_localCount; //0
-    private List<object> m_internalList;
-
-    #endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortDirectionCycleCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortDirectionCycleCollection.cs
deleted file mode 100644
index 93a86f29..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortDirectionCycleCollection.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Specialized;
-using System.ComponentModel;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class SortDirectionCycleCollection : Collection<SortDirection>, INotifyCollectionChanged, INotifyPropertyChanged
-  {
-    #region Static Fields
-
-    internal static readonly string CountPropertyName = PropertyHelper.GetPropertyName( ( SortDirectionCycleCollection s ) => s.Count );
-    internal static readonly string IndexerName = "Item[]";
-
-    #endregion
-
-    public SortDirectionCycleCollection()
-      : base( new List<SortDirection>() )
-    {
-    }
-
-    internal SortDirectionCycleCollection( IList<SortDirection> list )
-      : base( list )
-    {
-    }
-
-    protected override void ClearItems()
-    {
-      if( this.Count == 0 )
-        return;
-
-      base.ClearItems();
-      this.OnPropertyChanged( SortDirectionCycleCollection.CountPropertyName );
-      this.OnPropertyChanged( SortDirectionCycleCollection.IndexerName );
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-    }
-
-    protected override void InsertItem( int index, SortDirection item )
-    {
-      this.EnsureUnique( item );
-      base.InsertItem( index, item );
-      this.OnPropertyChanged( SortDirectionCycleCollection.CountPropertyName );
-      this.OnPropertyChanged( SortDirectionCycleCollection.IndexerName );
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, item, index ) );
-    }
-
-    protected override void RemoveItem( int index )
-    {
-      var item = base[ index ];
-
-      base.RemoveItem( index );
-      this.OnPropertyChanged( SortDirectionCycleCollection.CountPropertyName );
-      this.OnPropertyChanged( SortDirectionCycleCollection.IndexerName );
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, item, index ) );
-    }
-
-    protected override void SetItem( int index, SortDirection item )
-    {
-      var oldItem = base[ index ];
-      if( oldItem == item )
-        return;
-
-      this.EnsureUnique( item );
-      base.SetItem( index, item );
-      this.OnPropertyChanged( SortDirectionCycleCollection.IndexerName );
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, item, oldItem, index ) );
-    }
-
-    private void EnsureUnique( SortDirection item )
-    {
-      if( this.Contains( item ) )
-        throw new ArgumentException( "The SortDirection is already contained in the collection and cannot be added again.", "item" );
-    }
-
-    #region INotifyCollectionChanged Members
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    protected virtual void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      var handler = this.CollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected virtual void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StaircasePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StaircasePanel.cs
deleted file mode 100644
index 06aa59b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StaircasePanel.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class StaircasePanel : Panel
-  {
-    #region ConnectionLineAlignment Property
-
-    public static readonly DependencyProperty ConnectionLineAlignmentProperty =
-      DependencyProperty.Register(
-      "ConnectionLineAlignment",
-      typeof( ConnectionLineAlignment ),
-      typeof( StaircasePanel ),
-      new FrameworkPropertyMetadata( ConnectionLineAlignment.RightToBottom,
-        FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public ConnectionLineAlignment ConnectionLineAlignment
-    {
-      get
-      {
-        return ( ConnectionLineAlignment )this.GetValue( StaircasePanel.ConnectionLineAlignmentProperty );
-      }
-      set
-      {
-        this.SetValue( StaircasePanel.ConnectionLineAlignmentProperty, value );
-      }
-    }
-
-    #endregion ConnectionLineAlignment Property
-
-    #region ConnectionLineOffset Property
-
-    public static readonly DependencyProperty ConnectionLineOffsetProperty =
-      DependencyProperty.Register(
-      "ConnectionLineOffset",
-      typeof( double ),
-      typeof( StaircasePanel ),
-      new FrameworkPropertyMetadata( 5.0d, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public double ConnectionLineOffset
-    {
-      get
-      {
-        return ( double )this.GetValue( StaircasePanel.ConnectionLineOffsetProperty );
-      }
-      set
-      {
-        this.SetValue( StaircasePanel.ConnectionLineOffsetProperty, value );
-      }
-    }
-
-    #endregion ConnectionLineOffset Property
-
-    #region StairHeight Property
-
-    public static readonly DependencyProperty StairHeightProperty =
-      DependencyProperty.Register(
-      "StairHeight",
-      typeof( double ),
-      typeof( StaircasePanel ),
-      new FrameworkPropertyMetadata( 10.0d,
-        FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-
-    public double StairHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( StaircasePanel.StairHeightProperty );
-      }
-      set
-      {
-        this.SetValue( StaircasePanel.StairHeightProperty, value );
-      }
-    }
-
-    #endregion StairHeight Property
-
-    #region StairSpacing Property
-
-    public static readonly DependencyProperty StairSpacingProperty =
-      DependencyProperty.Register(
-      "StairSpacing",
-      typeof( double ),
-      typeof( StaircasePanel ),
-      new FrameworkPropertyMetadata( 5.0d,
-        FrameworkPropertyMetadataOptions.AffectsArrange | FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-
-    public double StairSpacing
-    {
-      get
-      {
-        return ( double )this.GetValue( StaircasePanel.StairSpacingProperty );
-      }
-      set
-      {
-        this.SetValue( StaircasePanel.StairSpacingProperty, value );
-      }
-    }
-
-    #endregion StairSpacing Property
-
-    #region ConnectionLinePen Property
-
-    public static readonly DependencyProperty ConnectionLinePenProperty =
-      DependencyProperty.Register(
-      "ConnectionLinePen",
-      typeof( Pen ),
-      typeof( StaircasePanel ),
-      new FrameworkPropertyMetadata(
-        new Pen( SystemColors.ControlTextBrush, 2d ),
-        FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Pen ConnectionLinePen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( StaircasePanel.ConnectionLinePenProperty );
-      }
-      set
-      {
-        this.SetValue( StaircasePanel.ConnectionLinePenProperty, value );
-      }
-    }
-
-    #endregion ConnectionLinePen Property
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      Size infiniteSize = new Size( double.PositiveInfinity, double.PositiveInfinity );
-      Size actualRequestedSize = new Size();
-
-      //for all children of the panel
-      for( int i = 0; i < this.InternalChildren.Count; i++ )
-      {
-        UIElement item = this.InternalChildren[ i ];
-
-        //measure the child with no constraints
-        item.Measure( infiniteSize );
-
-        //add the desired width of the item to the panel's requested width
-        actualRequestedSize.Width += item.DesiredSize.Width;
-
-        //if this pass is not for the last item in the collection
-        if( i < ( this.InternalChildren.Count - 1 ) )
-        {
-          //add the spacing factor as well
-          actualRequestedSize.Width += this.StairSpacing;
-        }
-
-        //calculate the remaining 
-        double itemBottom = ( i * this.StairHeight ) + item.DesiredSize.Height;
-        if( itemBottom > actualRequestedSize.Height )
-        {
-          actualRequestedSize.Height = itemBottom;
-        }
-      }
-
-      return actualRequestedSize;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      Point offset = new Point( 0, 0 );
-
-      Rect itemRect = new Rect( 0, 0, 0, 0 );
-
-      //for all children of the panel
-      for( int i = 0; i < this.InternalChildren.Count; i++ )
-      {
-        UIElement item = this.InternalChildren[ i ];
-
-        itemRect = new Rect( offset, item.DesiredSize );
-
-        item.Arrange( itemRect );
-
-        //if not the last item
-        if( i < ( this.InternalChildren.Count - 1 ) )
-        {
-          //add to the offset, so next item is positionned properly
-          offset.X += item.DesiredSize.Width + this.StairSpacing;
-          offset.Y += this.StairHeight;
-        }
-      }
-
-      if( double.IsInfinity( finalSize.Width ) == true )
-      {
-        finalSize.Width = itemRect.Right;
-      }
-
-      if( double.IsInfinity( finalSize.Height ) == true )
-      {
-        finalSize.Height = itemRect.Bottom;
-      }
-
-      return finalSize;
-    }
-
-    protected override void OnRender( DrawingContext drawingContext )
-    {
-      if( this.ConnectionLinePen != null )
-      {
-        bool left = false;
-        bool top = false;
-        bool middle = false;
-
-        switch( this.ConnectionLineAlignment )
-        {
-          case ConnectionLineAlignment.LeftToBottom:
-            left = true;
-            break;
-
-          case ConnectionLineAlignment.RightToTop:
-            top = true;
-            break;
-
-          case ConnectionLineAlignment.LeftToTop:
-            left = true;
-            top = true;
-            break;
-
-          case ConnectionLineAlignment.CenterToCenter:
-            middle = true;
-            break;
-
-          case ConnectionLineAlignment.RightToBottom:
-          default:
-            break;
-        }
-
-        //cycling with count -1 because we don't want to draw a ligne after last item
-        for( int i = 0; i < this.InternalChildren.Count - 1; i++ )
-        {
-          UIElement startItem = this.InternalChildren[ i ];
-          UIElement endItem = this.InternalChildren[ i + 1 ];
-
-          Vector startOffset = VisualTreeHelper.GetOffset( startItem );
-          Vector endOffset = VisualTreeHelper.GetOffset( endItem );
-
-          Size startSize = startItem.RenderSize;
-          Size endSize = endItem.RenderSize;
-
-          double startPointX = 0.0d;
-          double startPointY = 0.0d;
-          double endPointX = 0.0d;
-          double endPointY = 0.0d;
-
-          List<PathSegment> myPathSegments = null;
-
-          GuidelineSet guidelineSet = new GuidelineSet();
-          drawingContext.PushGuidelineSet( guidelineSet );
-
-          if( middle == true )
-          {
-            startPointX = startOffset.X + startSize.Width + this.ConnectionLineOffset;
-
-            startPointY = startOffset.Y + ( startSize.Height / 2 );
-
-            endPointY = endOffset.Y + ( endSize.Height / 2 );
-
-            endPointX = endOffset.X - this.ConnectionLineOffset;
-
-            double deltaX = ( endPointX - startPointX );
-
-            guidelineSet.GuidelinesX.Add( startPointX );
-            guidelineSet.GuidelinesX.Add( startPointX + ( deltaX / 2 ) + 0.5d );
-            guidelineSet.GuidelinesX.Add( startPointX + deltaX );
-            guidelineSet.GuidelinesY.Add( startPointY );
-            guidelineSet.GuidelinesY.Add( endPointY );
-
-            myPathSegments = new List<PathSegment>( 4 ); //we know there are going be only 4 segments
-            myPathSegments.Add( new LineSegment( new Point( startPointX, startPointY ), true ) );
-            myPathSegments.Add( new LineSegment( new Point( startPointX + ( deltaX / 2 ), startPointY ), true ) );
-            myPathSegments.Add( new LineSegment( new Point( startPointX + ( deltaX / 2 ), endPointY ), true ) );
-            myPathSegments.Add( new LineSegment( new Point( startPointX + deltaX, endPointY ), true ) );
-
-          }
-          else
-          {
-            if( left == true )
-            {
-              startPointX = startOffset.X + this.ConnectionLineOffset;
-            }
-            else
-            {
-              startPointX = startOffset.X + startSize.Width - this.ConnectionLineOffset;
-            }
-
-            startPointY = startOffset.Y + startSize.Height;
-
-            if( top == true )
-            {
-              endPointY = endOffset.Y + this.ConnectionLineOffset;
-            }
-            else
-            {
-              endPointY = endOffset.Y + endSize.Height - this.ConnectionLineOffset;
-            }
-
-            endPointX = endOffset.X;
-
-            guidelineSet.GuidelinesX.Add( startPointX );
-            guidelineSet.GuidelinesX.Add( endPointX );
-            guidelineSet.GuidelinesY.Add( startPointY );
-            guidelineSet.GuidelinesY.Add( endPointY );
-
-            myPathSegments = new List<PathSegment>( 2 ); //we know there are going be only 2 segments
-            myPathSegments.Add( new LineSegment( new Point( startPointX, endPointY ), true ) );
-            myPathSegments.Add( new LineSegment( new Point( endPointX, endPointY ), true ) );
-          }
-
-          PathFigure myPathFigure = new PathFigure( new Point( startPointX, startPointY ), myPathSegments, false );
-
-          PathGeometry myPathGeometry = new PathGeometry();
-          myPathGeometry.Figures.Add( myPathFigure );
-
-          drawingContext.DrawGeometry( null, this.ConnectionLinePen, myPathGeometry );
-
-          // pop the context to remove the GuidelineSet
-          drawingContext.Pop();
-        }
-      }
-
-      base.OnRender( drawingContext );
-    }
-
-    protected override void OnChildDesiredSizeChanged( UIElement child )
-    {
-      base.OnChildDesiredSizeChanged( child );
-
-      // OnRender is not automatically called when a child's size changes.
-      // We have to do it manually if we want the ConnectionLines to adapt.
-      this.InvalidateVisual();
-    }
-
-    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-
-      // OnRender is not automatically called when a new child is added or removed from 
-      // the Panel. We have to do it manually if we want to redraw the ConnectionLines.
-      this.InvalidateVisual();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StringFormatDataTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StringFormatDataTemplate.cs
deleted file mode 100644
index 7f93410b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StringFormatDataTemplate.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class StringFormatDataTemplate : DataTemplate
-  {
-    #region Static Fields
-
-    private static readonly List<Entry> s_templates = new List<Entry>( 0 );
-    private static readonly StringFormatConverter s_converter = new StringFormatConverter();
-    private static readonly StringFormatComparer s_comparer = new StringFormatComparer();
-
-    #endregion
-
-    #region Constructor
-
-    private StringFormatDataTemplate( DataTemplate contentTemplate )
-    {
-      m_contentTemplate = contentTemplate;
-    }
-
-    #endregion
-
-    internal static StringFormatDataTemplate Get( DataTemplate contentTemplate, string format, CultureInfo culture )
-    {
-      if( string.IsNullOrEmpty( format ) )
-        throw new ArgumentException( "The format must be non empty.", "format" );
-
-      lock( ( ( ICollection )s_templates ).SyncRoot )
-      {
-        int insertionIndex = 0;
-        bool cleanUp = false;
-        StringFormatDataTemplate template = null;
-
-        if( s_templates.Count > 0 )
-        {
-          var lookup = new Entry( format, culture );
-          insertionIndex = s_templates.BinarySearch( lookup, s_comparer );
-
-          if( insertionIndex >= 0 )
-          {
-            for( int i = insertionIndex; i < s_templates.Count; i++ )
-            {
-              var item = s_templates[ i ];
-              if( s_comparer.Compare( lookup, item ) != 0 )
-                break;
-
-              var target = item.Template;
-              if( target == null )
-              {
-                cleanUp = true;
-              }
-              else
-              {
-                Debug.Assert( object.Equals( item.Format, format ) && object.Equals( item.Culture, culture ) );
-
-                if( target.m_contentTemplate == contentTemplate )
-                {
-                  template = target;
-                  break;
-                }
-              }
-            }
-          }
-          else
-          {
-            insertionIndex = ~insertionIndex;
-            cleanUp = ( insertionIndex < s_templates.Count ) && ( s_templates[ insertionIndex ].Template == null );
-          }
-        }
-
-        if( template == null )
-        {
-          template = StringFormatDataTemplate.Create( contentTemplate, format, culture );
-          s_templates.Insert( insertionIndex, new Entry( template, format, culture ) );
-        }
-
-        if( cleanUp )
-        {
-          StringFormatDataTemplate.CleanUpCache();
-        }
-
-        Debug.Assert( template != null );
-
-        return template;
-      }
-    }
-
-    private static StringFormatDataTemplate Create( DataTemplate contentTemplate, string format, CultureInfo culture )
-    {
-      // We are using a converter to format the target value instead of using the
-      // ContentPresenter.ContentStringFormat or Binding.StringFormat property because
-      // it is not applied if a ContentPresenter.ContentTemplate is given or if the binding is
-      // not targeting a string property.
-      var template = new StringFormatDataTemplate( contentTemplate );
-      var control = new FrameworkElementFactory( typeof( ContentPresenter ) );
-
-      var binding = new Binding();
-      binding.Path = new PropertyPath( FrameworkElement.DataContextProperty );
-      binding.RelativeSource = RelativeSource.TemplatedParent;
-      binding.Converter = s_converter;
-      binding.ConverterParameter = format;
-      binding.ConverterCulture = culture;
-
-      control.SetValue( ContentPresenter.ContentTemplateProperty, contentTemplate );
-      control.SetValue( ContentPresenter.ContentProperty, binding );
-
-      template.VisualTree = control;
-      template.Seal();
-
-      return template;
-    }
-
-    private static void CleanUpCache()
-    {
-      for( int i = s_templates.Count - 1; i >= 0; i-- )
-      {
-        if( s_templates[ i ].Template == null )
-        {
-          s_templates.RemoveAt( i );
-        }
-      }
-
-      s_templates.TrimExcess();
-    }
-
-    #region Private Fields
-
-    private readonly DataTemplate m_contentTemplate;
-
-    #endregion
-
-    #region StringFormatConverter Private Class
-
-    private sealed class StringFormatConverter : IValueConverter
-    {
-      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        var format = parameter as string;
-        if( string.IsNullOrEmpty( format ) )
-          return value;
-
-        return string.Format( culture, format, value );
-      }
-
-      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    #endregion
-
-    #region StringFormatComparer Private Class
-
-    private sealed class StringFormatComparer : IComparer<Entry>
-    {
-      public int Compare( Entry x, Entry y )
-      {
-        if( object.ReferenceEquals( x, y ) )
-          return 0;
-
-        if( object.ReferenceEquals( x, null ) )
-          return -1;
-
-        if( object.ReferenceEquals( y, null ) )
-          return 1;
-
-        var xf = x.Format;
-        var yf = y.Format;
-
-        if( !string.Equals( xf, yf, StringComparison.InvariantCulture ) )
-        {
-          if( xf == null )
-            return -1;
-
-          if( yf == null )
-            return 1;
-
-          return string.Compare( xf, yf, StringComparison.InvariantCulture );
-        }
-
-        var xc = x.Culture;
-        var yc = y.Culture;
-
-        if( !object.Equals( xc, yc ) )
-        {
-          if( xc == null )
-            return -1;
-
-          if( yc == null )
-            return 1;
-
-          return xc.LCID.CompareTo( yc.LCID );
-        }
-
-        return 0;
-      }
-    }
-
-    #endregion
-
-    #region Entry Private Class
-
-    private class Entry
-    {
-      internal Entry( string format, CultureInfo culture )
-        : this( null, format, culture )
-      {
-      }
-
-      internal Entry( StringFormatDataTemplate template, string format, CultureInfo culture )
-      {
-        Debug.Assert( format != null );
-
-        if( template != null )
-        {
-          m_template = new WeakReference( template );
-        }
-
-        m_format = format;
-        m_culture = culture;
-      }
-
-      internal StringFormatDataTemplate Template
-      {
-        get
-        {
-          if( m_template == null )
-            return null;
-
-          return ( StringFormatDataTemplate )m_template.Target;
-        }
-      }
-
-      internal string Format
-      {
-        get
-        {
-          return m_format;
-        }
-      }
-
-      internal CultureInfo Culture
-      {
-        get
-        {
-          return m_culture;
-        }
-      }
-
-      private readonly WeakReference m_template;
-      private readonly string m_format;
-      private readonly CultureInfo m_culture;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/TextInputActivationGesture.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/TextInputActivationGesture.cs
deleted file mode 100644
index 8090dc2b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/TextInputActivationGesture.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public sealed class TextInputActivationGesture : ActivationGesture
-  {
-    protected override Freezable CreateInstanceCore()
-    {
-      return new TextInputActivationGesture();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ToggleColumnSortCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ToggleColumnSortCommand.cs
deleted file mode 100644
index ffa6abeb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ToggleColumnSortCommand.cs
+++ /dev/null
@@ -1,327 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class ToggleColumnSortCommand : ColumnSortCommand
-  {
-    #region Constructor
-
-    protected ToggleColumnSortCommand()
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region CanSort Protected Property
-
-    protected abstract bool CanSort
-    {
-      get;
-    }
-
-    #endregion
-
-    #region Columns Protected Property
-
-    protected abstract ColumnCollection Columns
-    {
-      get;
-    }
-
-    #endregion
-
-    #region DataGridContext Protected Property
-
-    protected abstract DataGridContext DataGridContext
-    {
-      get;
-    }
-
-    #endregion
-
-    #region MaxSortLevels Protected Property
-
-    protected abstract int MaxSortLevels
-    {
-      get;
-    }
-
-    #endregion
-
-    #region SortDescriptions Protected Property
-
-    protected abstract SortDescriptionCollection SortDescriptions
-    {
-      get;
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Methods
-
-    public bool CanExecute( ColumnBase column, bool resetSort )
-    {
-      return this.CanExecuteCore( column, resetSort );
-    }
-
-    public void Execute( ColumnBase column, bool resetSort )
-    {
-      if( !this.CanExecute( column, resetSort ) )
-        return;
-
-      var currentSortDirection = column.SortDirection;
-      var nextSortDirection = currentSortDirection;
-      var pattern = column.SortDirectionCycle;
-
-      if( ( pattern != null ) && ( pattern.Count > 0 ) )
-      {
-        var index = pattern.IndexOf( currentSortDirection );
-
-        nextSortDirection = ( ( index < 0 ) || ( index == pattern.Count - 1 ) )
-                              ? pattern[ 0 ]
-                              : pattern[ index + 1 ];
-      }
-
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return;
-
-      var eventArgs = new ColumnSortDirectionChangingEventArgs( DataGridControl.SortDirectionChangingEvent, column, dataGridContext, currentSortDirection, nextSortDirection );
-      dataGridContext.DataGridControl.RaiseSortDirectionChanging( eventArgs );
-
-      nextSortDirection = eventArgs.NextSortDirection;
-
-      if( currentSortDirection == nextSortDirection )
-        return;
-
-      if( currentSortDirection == SortDirection.None )
-      {
-        var maxSortCount = this.MaxSortLevels;
-
-        // Cannot insert sort description since it would go beyond the max sort description count, but only if Shift key is pressed
-        if( !resetSort && ( maxSortCount >= 0 ) && ( this.SortDescriptions.Count >= maxSortCount ) )
-          return;
-
-        //When Shift key is not pressed, simply evaluate if one sort description can be added, since all others will be cleared.
-        if( resetSort && maxSortCount == 0 )
-          return;
-      }
-
-      using( this.SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers.CollectionViewCurrentItemChanged ) )
-      {
-        this.ExecuteCore( column, nextSortDirection, resetSort );
-      }
-    }
-
-    protected virtual bool CanExecuteCore( ColumnBase column, bool resetSort )
-    {
-      if( ( column == null ) || string.IsNullOrEmpty( column.FieldName ) )
-        return false;
-
-      if( !this.CanSort || !this.Columns.Contains( column ) )
-        return false;
-
-      return true;
-    }
-
-    protected virtual void ExecuteCore( ColumnBase column, SortDirection direction, bool resetSort )
-    {
-      if( column == null )
-        return;
-
-      if( !this.ToggleColumnSort( column, direction, resetSort ) )
-        return;
-
-      this.UpdateColumnSort();
-    }
-
-    protected virtual SortDescriptionsSyncContext GetSortDescriptionsSyncContext()
-    {
-      return null;
-    }
-
-    protected virtual void ValidateSynchronizationContext( SynchronizationContext synchronizationContext )
-    {
-    }
-
-    protected virtual IDisposable DeferResortHelperItemsSourceCollection()
-    {
-      return null;
-    }
-
-    protected virtual bool TryDeferResortSourceDetailConfiguration( out IDisposable defer )
-    {
-      defer = null;
-      return false;
-    }
-
-    protected virtual IDisposable SetQueueBringIntoViewRestrictions( AutoScrollCurrentItemSourceTriggers triggers )
-    {
-      return null;
-    }
-
-    protected virtual void ValidateToggleColumnSort()
-    {
-    }
-
-    protected virtual void DeferRestoreStateOnLevel( Disposer disposer )
-    {
-    }
-
-    protected virtual void UpdateColumnSort()
-    {
-      var dataGridContext = this.DataGridContext;
-
-      if( this.DataGridContext != null )
-      {
-        var command = dataGridContext.UpdateColumnSortCommand;
-        if( command.CanExecute() )
-        {
-          command.Execute();
-        }
-      }
-    }
-
-    protected override bool CanExecuteImpl( object parameter )
-    {
-      return this.CanExecute( parameter as ColumnBase, true );
-    }
-
-    protected override void ExecuteImpl( object parameter )
-    {
-      this.Execute( parameter as ColumnBase, true );
-    }
-
-    protected static void DeferRestoreStateOnLevel( Disposer disposer, DataGridContext dataGridContext )
-    {
-      ToggleColumnSortCommand.ThrowIfNull( disposer, "disposer" );
-      ToggleColumnSortCommand.ThrowIfNull( dataGridContext, "dataGridContext" );
-
-      var parentDataGridContext = dataGridContext.ParentDataGridContext;
-
-      // Defer the RestoreState of each DataGridContext of the same level
-      // to ensure all the DataGridContext will be correctly restored once
-      // all of them are completely resorted
-      if( parentDataGridContext != null )
-      {
-        foreach( var childContext in parentDataGridContext.GetChildContexts() )
-        {
-          disposer.Add( childContext.DeferRestoreState(), DisposableType.DeferRestoreState );
-        }
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private static ListSortDirection Convert( SortDirection value )
-    {
-      if( value == SortDirection.None )
-        throw new ArgumentException( "Cannot convert the value to ListSortDirection.", "value" );
-
-      if( value == SortDirection.Descending )
-        return ListSortDirection.Descending;
-
-      return ListSortDirection.Ascending;
-    }
-
-    private bool ToggleColumnSort( ColumnBase column, SortDirection direction, bool resetSort )
-    {
-      this.ValidateToggleColumnSort();
-
-      using( var synchronizationContext = this.StartSynchronizing( this.GetSortDescriptionsSyncContext() ) )
-      {
-        this.ValidateSynchronizationContext( synchronizationContext );
-
-        using( var disposer = new Disposer() )
-        {
-          this.DeferRestoreStateOnLevel( disposer );
-
-          // This will ensure that all DataGridCollectionViews mapped to the SortDescriptions collection will only refresh their sorting once!
-          var sortDescriptions = this.SortDescriptions;
-          disposer.Add( this.DeferResortHelper( sortDescriptions ), DisposableType.DeferResort );
-
-          var columnName = column.FieldName;
-          int insertionIndex;
-
-          if( ( resetSort ) &&
-              ( ( column.SortIndex == -1 ) || ( sortDescriptions.Count > 1 ) ) )
-          {
-            insertionIndex = 0;
-
-            if( sortDescriptions.Count > 0 )
-            {
-              sortDescriptions.Clear();
-            }
-
-            Debug.Assert( sortDescriptions.Count == 0 );
-          }
-          else
-          {
-            for( insertionIndex = 0; insertionIndex < sortDescriptions.Count; insertionIndex++ )
-            {
-              if( sortDescriptions[ insertionIndex ].PropertyName == columnName )
-                break;
-            }
-          }
-
-          if( insertionIndex < sortDescriptions.Count )
-          {
-            if( direction == SortDirection.None )
-            {
-              sortDescriptions.RemoveAt( insertionIndex );
-            }
-            else
-            {
-              sortDescriptions[ insertionIndex ] = new SortDescription( columnName, ToggleColumnSortCommand.Convert( direction ) );
-            }
-          }
-          else if( direction != SortDirection.None )
-          {
-            sortDescriptions.Add( new SortDescription( columnName, ToggleColumnSortCommand.Convert( direction ) ) );
-          }
-        }
-      }
-
-      return true;
-    }
-
-    private IDisposable DeferResortHelper( SortDescriptionCollection sortDescriptions )
-    {
-      IDisposable defer;
-
-      if( this.TryDeferResort( sortDescriptions, out defer ) )
-        return defer;
-
-      if( this.TryDeferResortSourceDetailConfiguration( out defer ) )
-        return defer;
-
-      return this.DeferResortHelperItemsSourceCollection();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UnboundColumn.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UnboundColumn.cs
deleted file mode 100644
index 5fe08b0e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UnboundColumn.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public class UnboundColumn : ColumnBase
-  {
-    public UnboundColumn()
-    {
-    }
-
-    public UnboundColumn( string fieldName, object title )
-      : base( fieldName, title )
-    {
-    }
-
-    #region AllowSort Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public override bool AllowSort
-    {
-      get
-      {
-        return base.AllowSort;
-      }
-      set
-      {
-        base.AllowSort = value;
-      }
-    }
-
-    #endregion AllowSort Property
-
-    #region AllowGroup Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public override bool AllowGroup
-    {
-      get
-      {
-        return base.AllowGroup;
-      }
-      set
-      {
-        base.AllowGroup = value;
-      }
-    }
-
-    #endregion AllowGroup Property
-
-    #region GroupValueStringFormat Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new string GroupValueStringFormat
-    {
-      get
-      {
-        return base.GroupValueStringFormat;
-      }
-      set
-      {
-        base.GroupValueStringFormat = value;
-      }
-    }
-
-    #endregion GroupValueStringFormat Property
-
-    #region GroupValueTemplate Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new DataTemplate GroupValueTemplate
-    {
-      get
-      {
-        return base.GroupValueTemplate;
-      }
-      set
-      {
-        base.GroupValueTemplate = value;
-      }
-    }
-
-    #endregion GroupValueTemplate Property
-
-    #region GroupValueTemplateSelector Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new DataTemplateSelector GroupValueTemplateSelector
-    {
-      get
-      {
-        return base.GroupValueTemplateSelector;
-      }
-      set
-      {
-        base.GroupValueTemplateSelector = value;
-      }
-    }
-
-    #endregion GroupValueTemplateSelector Property
-
-    #region CellEditor Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new CellEditor CellEditor
-    {
-      get
-      {
-        return base.CellEditor;
-      }
-      set
-      {
-        base.CellEditor = value;
-      }
-    }
-
-    #endregion CellEditor Property
-
-    #region CellEditorDisplayConditions Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new CellEditorDisplayConditions CellEditorDisplayConditions
-    {
-      get
-      {
-        return base.CellEditorDisplayConditions;
-      }
-      set
-      {
-        base.CellEditorDisplayConditions = value;
-      }
-    }
-
-    #endregion CellEditorDisplayConditions Property
-
-    #region CellValidationRules Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new Collection<CellValidationRule> CellValidationRules
-    {
-      get
-      {
-        return base.CellValidationRules;
-      }
-    }
-
-    #endregion CellValidationRules Property
-
-    #region CellErrorStyle Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new Style CellErrorStyle
-    {
-      get
-      {
-        return base.CellErrorStyle;
-      }
-      set
-      {
-        base.CellErrorStyle = value;
-      }
-    }
-
-    #endregion CellErrorStyle Property
-
-    #region HasValidationError Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new bool HasValidationError
-    {
-      get
-      {
-        return base.HasValidationError;
-      }
-    }
-
-    #endregion HasValidationError Property
-
-    #region SortDirection Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new SortDirection SortDirection
-    {
-      get
-      {
-        return base.SortDirection;
-      }
-    }
-
-    #endregion SortDirection Property
-
-    #region SortIndex Read-Only Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new int SortIndex
-    {
-      get
-      {
-        return base.SortIndex;
-      }
-    }
-
-    #endregion SortIndex Read-Only Property
-
-    #region GroupDescription Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new GroupDescription GroupDescription
-    {
-      get
-      {
-        return base.GroupDescription;
-      }
-      set
-      {
-        base.GroupDescription = value;
-      }
-    }
-
-    #endregion GroupDescription Property
-
-    #region GroupConfiguration Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Browsable( false )]
-    public new GroupConfiguration GroupConfiguration
-    {
-      get
-      {
-        return base.GroupConfiguration;
-      }
-      set
-      {
-        base.GroupConfiguration = value;
-      }
-    }
-
-    #endregion GroupConfiguration Property
-
-    #region ReadOnly Property
-
-    public static new readonly DependencyProperty ReadOnlyProperty = DependencyProperty.Register(
-      "ReadOnly", typeof( bool ), typeof( UnboundColumn ), new FrameworkPropertyMetadata( true ) );
-
-    public override bool ReadOnly
-    {
-      get
-      {
-        return ( bool )this.GetValue( UnboundColumn.ReadOnlyProperty );
-      }
-      set
-      {
-        if( value == this.ReadOnly )
-          return;
-
-        throw new InvalidOperationException( "An attempt was made to set the ReadOnly property of a UnboundColumn, which cannot be edited, to false." );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UpdateColumnSortCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UpdateColumnSortCommand.cs
deleted file mode 100644
index 7e2e5799..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UpdateColumnSortCommand.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Threading;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal abstract class UpdateColumnSortCommand : ColumnSortCommand
-  {
-    #region SortDescriptionsSyncContext Protected Property
-
-    protected abstract SortDescriptionsSyncContext SortDescriptionsSyncContext
-    {
-      get;
-    }
-
-    #endregion
-
-    public bool CanExecute()
-    {
-      return this.CanExecuteCore();
-    }
-
-    public void Execute()
-    {
-      if( !this.CanExecute() )
-        return;
-
-      this.ExecuteCore();
-    }
-
-    protected abstract bool CanExecuteCore();
-    protected abstract void ExecuteCore();
-
-    protected override bool CanExecuteImpl( object parameter )
-    {
-      return this.CanExecuteCore();
-    }
-
-    protected override void ExecuteImpl( object parameter )
-    {
-      this.Execute();
-    }
-
-    protected void SynchronizeColumnSort(
-      SynchronizationContext synchronizationContext,
-      SortDescriptionCollection sortDescriptions,
-      ColumnCollection columns )
-    {
-      ColumnSortCommand.ThrowIfNull( synchronizationContext, "synchronizationContext" );
-      ColumnSortCommand.ThrowIfNull( sortDescriptions, "sortDescriptions" );
-      ColumnSortCommand.ThrowIfNull( columns, "columns" );
-
-      if( !synchronizationContext.Own || !columns.Any() )
-        return;
-
-      this.SetResortCallback( sortDescriptions, columns );
-
-      int count = sortDescriptions.Count;
-      Dictionary<string, ColumnSortInfo> sortOrder = new Dictionary<string, ColumnSortInfo>( count );
-
-      for( int i = 0; i < count; i++ )
-      {
-        var sortDescription = sortDescriptions[ i ];
-        string propertyName = sortDescription.PropertyName;
-
-        if( sortOrder.ContainsKey( propertyName ) )
-          continue;
-
-        sortOrder.Add( propertyName, new ColumnSortInfo( i, sortDescription.Direction ) );
-      }
-
-      foreach( var column in columns )
-      {
-        ColumnSortInfo entry;
-
-        if( sortOrder.TryGetValue( column.FieldName, out entry ) )
-        {
-          column.SetSortIndex( entry.Index );
-          column.SetSortDirection( entry.Direction );
-        }
-        else
-        {
-          column.SetSortIndex( -1 );
-          column.SetSortDirection( SortDirection.None );
-        }
-      }
-    }
-
-    private void SetResortCallback( SortDescriptionCollection sortDescriptions, ColumnCollection columns )
-    {
-      var collection = sortDescriptions as DataGridSortDescriptionCollection;
-      if( ( m_resortCallback != null ) || ( collection == null ) || !collection.IsResortDefered )
-        return;
-
-      m_resortCallback = new ResortCallback( this, sortDescriptions, columns );
-      collection.AddResortNotification( m_resortCallback );
-    }
-
-    private void OnResortCallback( SortDescriptionCollection sortDescriptions, ColumnCollection columns )
-    {
-      using( var synchronizationContext = this.StartSynchronizing( this.SortDescriptionsSyncContext ) )
-      {
-        this.SynchronizeColumnSort( synchronizationContext, sortDescriptions, columns );
-      }
-    }
-
-    #region Private Fields
-
-    private IDisposable m_resortCallback; //null
-
-    #endregion
-
-    #region ColumnSortInfo Private Nested Type
-
-    private struct ColumnSortInfo
-    {
-      public ColumnSortInfo( int index, ListSortDirection direction )
-      {
-        this.Index = index;
-        this.Direction = ColumnSortInfo.Convert( direction );
-      }
-
-      private static SortDirection Convert( ListSortDirection value )
-      {
-        if( value == ListSortDirection.Descending )
-          return SortDirection.Descending;
-
-        return SortDirection.Ascending;
-      }
-
-      public readonly int Index;
-      public readonly SortDirection Direction;
-    }
-
-    #endregion
-
-    #region ResortCallback Private Class
-
-    private sealed class ResortCallback : IDisposable
-    {
-      internal ResortCallback(
-        UpdateColumnSortCommand owner,
-        SortDescriptionCollection sortDescriptions,
-        ColumnCollection columns )
-      {
-        if( owner == null )
-          throw new ArgumentNullException( "owner" );
-
-        m_owner = new WeakReference( owner );
-        m_sortDescriptions = sortDescriptions;
-        m_columns = columns;
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        if( !disposing )
-          return;
-
-        var ownerRef = Interlocked.Exchange( ref m_owner, null );
-        if( ownerRef == null )
-          return;
-
-        var owner = ( UpdateColumnSortCommand )ownerRef.Target;
-        if( owner != null )
-        {
-          owner.OnResortCallback( m_sortDescriptions, m_columns );
-        }
-
-        m_sortDescriptions = null;
-        m_columns = null;
-      }
-
-      private WeakReference m_owner;
-      private SortDescriptionCollection m_sortDescriptions;
-      private ColumnCollection m_columns;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ArrayHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ArrayHelper.cs
deleted file mode 100644
index 0a05aa88..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ArrayHelper.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Utils.Collections
-{
-  internal static class ArrayHelper
-  {
-    internal static readonly int[] Sizes = new int[] { 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 16411, 32771, 65537, 131101, 262147, 524309, 1048583, 2097169, 4194319, 8388617, 16777259, 33554467, 67108879, 134217757, 268435459, 536870923, 1073741827, int.MaxValue };
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/DoubleFenwickTree.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/DoubleFenwickTree.cs
deleted file mode 100644
index 91031212..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/DoubleFenwickTree.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Utils.Collections
-{
-  internal sealed class DoubleFenwickTree : FenwickTree<double>
-  {
-    #region Constructor
-
-    public DoubleFenwickTree( int capacity )
-      : base( capacity )
-    {
-    }
-
-    #endregion
-
-    protected override double Add( double x, double y )
-    {
-      return x + y;
-    }
-
-    protected override double Substract( double x, double y )
-    {
-      return x - y;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/EnumerableWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/EnumerableWrapper.cs
deleted file mode 100644
index 81e2f2e7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/EnumerableWrapper.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections;
-
-namespace Xceed.Utils.Collections
-{
-  internal class EnumerableWrapper<T> : IEnumerable<T> where T : class
-  {
-    public EnumerableWrapper( IEnumerable collection )
-    {
-      if( collection == null )
-        throw new ArgumentNullException( "collection" );
-
-      m_collection = collection;
-    }
-
-    #region IEnumerable<T> Members
-
-    public IEnumerator<T> GetEnumerator()
-    {
-      return new EnumeratorWrapper<T>( m_collection.GetEnumerator() );
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-    {
-      return m_collection.GetEnumerator();
-    }
-
-    #endregion
-
-    private IEnumerable m_collection;
-
-    private class EnumeratorWrapper<U> : IEnumerator<U> where U : class
-    {
-      public EnumeratorWrapper( IEnumerator enumerator )
-      {
-        m_wrappedEnumerator = enumerator;
-      }
-
-      #region IEnumerator<U> Members
-
-      public U Current
-      {
-        get
-        {
-          return m_wrappedEnumerator.Current as U;
-        }
-      }
-
-      #endregion
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        IDisposable disposable = m_wrappedEnumerator as IDisposable;
-        if(disposable != null)
-        {
-          disposable.Dispose();
-        }
-      }
-
-      #endregion
-
-      #region IEnumerator Members
-
-      object System.Collections.IEnumerator.Current
-      {
-        get
-        {
-          return m_wrappedEnumerator.Current;
-        }
-      }
-
-      public bool MoveNext()
-      {
-        return m_wrappedEnumerator.MoveNext();
-      }
-
-      public void Reset()
-      {
-        m_wrappedEnumerator.Reset();
-      }
-
-      #endregion
-
-      IEnumerator m_wrappedEnumerator;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/FenwickTree.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/FenwickTree.Generic.cs
deleted file mode 100644
index 6f75e22a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/FenwickTree.Generic.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Utils.Collections
-{
-  internal abstract class FenwickTree<T>
-  {
-    #region Constructor
-
-    protected FenwickTree( int capacity )
-    {
-      if( capacity < 0 )
-        throw new ArgumentException( "The capacity must be greater than or equal to zero.", "capacity" );
-
-      if( capacity > 0 )
-      {
-        m_collection = new T[ capacity + 1 ];
-      }
-    }
-
-    #endregion
-
-    #region Count Property
-
-    public int Count
-    {
-      get
-      {
-        if( m_collection != null )
-          return m_collection.Length - 1;
-
-        return 0;
-      }
-    }
-
-    #endregion
-
-    #region [] Property
-
-    public T this[ int index ]
-    {
-      get
-      {
-        return this.GetRunningSum( index, index );
-      }
-      set
-      {
-        var current = this[ index ];
-        if( object.Equals( current, value ) )
-          return;
-
-        var diff = this.Substract( value, current );
-        var x = FenwickTree<T>.ConvertIndex( index );
-
-        while( x < m_collection.Length )
-        {
-          m_collection[ x ] = this.Add( m_collection[ x ], diff );
-          x += FenwickTree<T>.FindLastDigit( x );
-        }
-      }
-    }
-
-    #endregion
-
-    public T GetRunningSum( int index )
-    {
-      return this.GetRunningSum( 0, index );
-    }
-
-    public T GetRunningSum( int startIndex, int endIndex )
-    {
-      if( ( startIndex < 0 ) || ( startIndex >= this.Count ) )
-        throw new ArgumentOutOfRangeException( "startIndex", startIndex, "The index must be greater or equal to zero and lesser than the collection Count." );
-
-      if( ( endIndex < 0 ) || ( endIndex >= this.Count ) )
-        throw new ArgumentOutOfRangeException( "endIndex", endIndex, "The index must be greater or equal to zero and lesser than the collection Count." );
-
-      if( startIndex > endIndex )
-        throw new ArgumentException( "The start index must be lesser than or equal to the end index.", "startIndex" );
-
-      var x = FenwickTree<T>.ConvertIndex( endIndex );
-      var y = FenwickTree<T>.ConvertIndex( startIndex - 1 );
-      var sum = default( T );
-
-      while( x > y )
-      {
-        sum = this.Add( sum, m_collection[ x ] );
-        x -= FenwickTree<T>.FindLastDigit( x );
-      }
-
-      while( y > x )
-      {
-        sum = this.Substract( sum, m_collection[ y ] );
-        y -= FenwickTree<T>.FindLastDigit( y );
-      }
-
-      return sum;
-    }
-
-    protected abstract T Add( T x, T y );
-    protected abstract T Substract( T x, T y );
-
-    private static int ConvertIndex( int value )
-    {
-      return value + 1;
-    }
-
-    private static int FindLastDigit( int value )
-    {
-      return ( value & -value );
-    }
-
-    #region Private Fields
-
-    private T[] m_collection; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTree.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTree.Generic.cs
deleted file mode 100644
index 25c8c027..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTree.Generic.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-
-namespace Xceed.Utils.Collections
-{
-  internal interface IBinaryTree<T> : INotifyCollectionChanged, INotifyPropertyChanged, IEnumerable<T>, IEnumerable
-  {
-    IBinaryTreeNode<T> Root
-    {
-      get;
-    }
-
-    IBinaryTreeNode<T> Find( T value );
-
-    IBinaryTreeNode<T> Insert( T value );
-    IBinaryTreeNode<T> InsertBefore( T value, IBinaryTreeNode<T> node );
-    IBinaryTreeNode<T> InsertAfter( T value, IBinaryTreeNode<T> node );
-
-    void Remove( T value );
-    void Remove( IBinaryTreeNode<T> node );
-
-    void Clear();
-
-    IEnumerable<T> GetItems( bool reverse );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTreeNode.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTreeNode.Generic.cs
deleted file mode 100644
index 3840a304..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IBinaryTreeNode.Generic.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Utils.Collections
-{
-  internal interface IBinaryTreeNode<T>
-  {
-    T Value
-    {
-      get;
-    }
-
-    IBinaryTree<T> Tree
-    {
-      get;
-    }
-
-    IBinaryTreeNode<T> Parent
-    {
-      get;
-    }
-
-    IBinaryTreeNode<T> Left
-    {
-      get;
-    }
-
-    IBinaryTreeNode<T> Right
-    {
-      get;
-    }
-
-    IBinaryTreeNode<T> GetPrevious();
-    IBinaryTreeNode<T> GetNext();
-
-    IBinaryTreeNode<T> GetLeftmost();
-    IBinaryTreeNode<T> GetRightmost();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListExtensions.cs
deleted file mode 100644
index 4c2de480..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListExtensions.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-
-namespace Xceed.Utils.Collections
-{
-  internal static class IListExtensions
-  {
-    internal static void Diff(
-      this IList source,
-      IList destination,
-      ICollection<object> itemsAdded,
-      ICollection<object> itemsRemoved,
-      ICollection<object> itemsMoved )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( destination == null )
-        throw new ArgumentNullException( "destination" );
-
-      // There is nothing to do since the caller is not interested by the result.
-      if( ( itemsAdded == null ) && ( itemsRemoved == null ) && ( itemsMoved == null ) )
-        return;
-
-      IListExtensions.Diff( new IListWrapper( source ), new IListWrapper( destination ), itemsAdded, itemsRemoved, itemsMoved );
-    }
-
-    internal static void Diff<T>(
-      this IList<T> source,
-      IList<T> destination,
-      ICollection<T> itemsAdded,
-      ICollection<T> itemsRemoved,
-      ICollection<T> itemsMoved )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      if( destination == null )
-        throw new ArgumentNullException( "destination" );
-
-      // There is nothing to do since the caller is not interested by the result.
-      if( ( itemsAdded == null ) && ( itemsRemoved == null ) && ( itemsMoved == null ) )
-        return;
-
-      var sourceCount = source.Count;
-      var sourcePositions = new Dictionary<T, int>( sourceCount );
-      var sequence = new List<int>( System.Math.Min( sourceCount, destination.Count ) );
-      var isAlive = new BitArray( sourceCount, false );
-      var hasNotMoved = default( BitArray );
-
-      for( var i = 0; i < sourceCount; i++ )
-      {
-        sourcePositions.Add( source[ i ], i );
-      }
-
-      foreach( var item in destination )
-      {
-        int index;
-
-        if( sourcePositions.TryGetValue( item, out index ) )
-        {
-          isAlive[ index ] = true;
-          sequence.Add( index );
-        }
-        else if( itemsAdded != null )
-        {
-          itemsAdded.Add( item );
-        }
-      }
-
-      // We may omit this part of the algorithm if the caller is not interested by the items that have moved.
-      if( itemsMoved != null )
-      {
-        hasNotMoved = new BitArray( sourceCount, false );
-
-        // The subsequence contains the position of the item that are in the destination collection and that have not moved.
-        foreach( var index in LongestIncreasingSubsequence.Find( sequence ) )
-        {
-          hasNotMoved[ index ] = true;
-        }
-      }
-
-      // We may omit this part of the algorithm if the caller is not interested by the items that have moved or were removed.
-      if( ( itemsRemoved != null ) || ( itemsMoved != null ) )
-      {
-        for( var i = 0; i < sourceCount; i++ )
-        {
-          if( isAlive[ i ] )
-          {
-            // We check if the move collection is not null first because the bit array is null when the move collection is null.
-            if( ( itemsMoved != null ) && !hasNotMoved[ i ] )
-            {
-              itemsMoved.Add( source[ i ] );
-            }
-          }
-          else if( itemsRemoved != null )
-          {
-            itemsRemoved.Add( source[ i ] );
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.Generic.cs
deleted file mode 100644
index 302813d5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.Generic.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Xceed.Utils.Collections
-{
-  internal sealed class IListWrapper<T> : IList<T>
-  {
-    internal IListWrapper( IList source )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      m_source = source;
-    }
-
-    #region IList<> Members
-
-    public T this[ int index ]
-    {
-      get
-      {
-        return ( T )m_source[ index ];
-      }
-      set
-      {
-        m_source[ index ] = value;
-      }
-    }
-
-    public int IndexOf( T item )
-    {
-      return m_source.IndexOf( item );
-    }
-
-    public void Insert( int index, T item )
-    {
-      m_source.Insert( index, item );
-    }
-
-    public void RemoveAt( int index )
-    {
-      m_source.RemoveAt( index );
-    }
-
-    #endregion
-
-    #region ICollection<> Members
-
-    public int Count
-    {
-      get
-      {
-        return m_source.Count;
-      }
-    }
-
-    bool ICollection<T>.IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public void Add( T item )
-    {
-      m_source.Add( item );
-    }
-
-    public void Clear()
-    {
-      m_source.Clear();
-    }
-
-    public bool Contains( T item )
-    {
-      return m_source.Contains( item );
-    }
-
-    public void CopyTo( T[] array, int index )
-    {
-      m_source.CopyTo( array, index );
-    }
-
-    public bool Remove( T item )
-    {
-      var index = m_source.IndexOf( item );
-      if( index < 0 )
-        return false;
-
-      m_source.RemoveAt( index );
-
-      return true;
-    }
-
-    #endregion
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<T> GetEnumerator()
-    {
-      return m_source.Cast<T>().GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return m_source.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly IList m_source;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.cs
deleted file mode 100644
index dac4d8d8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IListWrapper.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Xceed.Utils.Collections
-{
-  internal sealed class IListWrapper : IList<object>
-  {
-    internal IListWrapper( IList source )
-    {
-      if( source == null )
-        throw new ArgumentNullException( "source" );
-
-      m_source = source;
-    }
-
-    #region IList<> Members
-
-    public object this[ int index ]
-    {
-      get
-      {
-        return m_source[ index ];
-      }
-      set
-      {
-        m_source[ index ] = value;
-      }
-    }
-
-    public int IndexOf( object item )
-    {
-      return m_source.IndexOf( item );
-    }
-
-    public void Insert( int index, object item )
-    {
-      m_source.Insert( index, item );
-    }
-
-    public void RemoveAt( int index )
-    {
-      m_source.RemoveAt( index );
-    }
-
-    #endregion
-
-    #region ICollection<> Members
-
-    public int Count
-    {
-      get
-      {
-        return m_source.Count;
-      }
-    }
-
-    bool ICollection<object>.IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public void Add( object item )
-    {
-      m_source.Add( item );
-    }
-
-    public void Clear()
-    {
-      m_source.Clear();
-    }
-
-    public bool Contains( object item )
-    {
-      return m_source.Contains( item );
-    }
-
-    public void CopyTo( object[] array, int index )
-    {
-      m_source.CopyTo( array, index );
-    }
-
-    public bool Remove( object item )
-    {
-      var index = m_source.IndexOf( item );
-      if( index < 0 )
-        return false;
-
-      m_source.RemoveAt( index );
-
-      return true;
-    }
-
-    #endregion
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<object> GetEnumerator()
-    {
-      return m_source.Cast<object>().GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return m_source.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly IList m_source;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IndexWeakHeapSort.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IndexWeakHeapSort.cs
deleted file mode 100644
index 673d1dfa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IndexWeakHeapSort.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-
-namespace Xceed.Utils.Collections
-{
-  // "Weak heap sort" sort m_dataIndexArray[0..length-1] to m_dataIndexArray[1..length]
-  //
-  // m_dataIndexArray is an array of int which points to the real value to sort.
-  // The index in dataIndexArray will be used to pass as parameters to Compare.
-  // That way, when implementing Compare, we use this index to directly acces the real data.
-  internal abstract class IndexWeakHeapSort
-  {
-    protected IndexWeakHeapSort( int[] dataIndexArray )
-    {
-      m_dataIndexArray = dataIndexArray;
-    }
-
-    public void Sort( int length )
-    {
-      if( m_dataIndexArray == null )
-        throw new InvalidOperationException( "A dataIndexArray must be passed at construction in order to sort." );
-
-      if( length < 0 )
-        throw new ArgumentOutOfRangeException( "length", length, "length must be greater than or equal to zero." );
-
-      if( length >= m_dataIndexArray.Length )
-        throw new ArgumentOutOfRangeException( "length", length, "length must be less than dataIndexArray.Length - 1." );
-
-      m_reverse = new sbyte[ length + 1 ];
-      int i;
-
-      for( i = length - 1; i >= 1; i-- )
-      {
-        int parent = i;
-
-        // Gparent //
-        while( ( parent & 1 ) == 0 )
-        {
-          parent >>= 1;
-        }
-
-        parent >>= 1;
-        // End GParent //
-
-        // Merge //
-        if( this.Compare( m_dataIndexArray[ parent ], m_dataIndexArray[ i ] ) < 0 )
-        {
-          int temp = m_dataIndexArray[ parent ];
-          m_dataIndexArray[ parent ] = m_dataIndexArray[ i ];
-          m_dataIndexArray[ i ] = temp;
-
-          if( m_reverse[ i ] == 0 )
-          {
-            m_reverse[ i ] = 1;
-          }
-          else
-          {
-            m_reverse[ i ] = 0;
-          }
-        }
-        // End merge //
-      }
-
-      m_dataIndexArray[ length ] = m_dataIndexArray[ 0 ];
-
-      for( i = length - 1; i >= 2; i-- )
-      {
-        this.MergeForest( i );
-      }
-
-      // "Weak heap sort" sort array[0..NUM_ELEMENTS-1] to array[1..NUM_ELEMENTS]
-
-      m_reverse = null;
-    }
-
-    public abstract int Compare( int xDataIndex, int yDataIndex );
-
-    private void MergeForest( int m )
-    {
-      int x = 1;
-
-      while( ( ( x << 1 ) + m_reverse[ x ] ) < m )
-      {
-        x = ( x << 1 ) + m_reverse[ x ];
-      }
-
-      do
-      {
-        // Merge //
-        if( this.Compare( m_dataIndexArray[ m ], m_dataIndexArray[ x ] ) < 0 )
-        {
-          int temp = m_dataIndexArray[ m ];
-          m_dataIndexArray[ m ] = m_dataIndexArray[ x ];
-          m_dataIndexArray[ x ] = temp;
-
-          if( m_reverse[ x ] == 0 )
-          {
-            m_reverse[ x ] = 1;
-          }
-          else
-          {
-            m_reverse[ x ] = 0;
-          }
-        }
-        // End merge //
-
-        x >>= 1;
-      }
-      while( x > 0 );
-    }
-
-    private int[] m_dataIndexArray;
-    private sbyte[] m_reverse;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LLRBTree.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LLRBTree.Generic.cs
deleted file mode 100644
index d797c3ac..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LLRBTree.Generic.cs
+++ /dev/null
@@ -1,944 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using Xceed.Wpf.DataGrid.Utils;
-
-namespace Xceed.Utils.Collections
-{
-  // This class implements a left-leaning red–black that is based on
-  // the research paper "Left-leaning Red-Black Trees" by Robert Sedgewick.
-  internal class LLRBTree<T> : IBinaryTree<T>
-  {
-    #region Static Fields
-
-    internal static readonly string RootPropertyName = PropertyHelper.GetPropertyName( ( LLRBTree<T> t ) => t.Root );
-
-    #endregion
-
-    internal LLRBTree()
-      : this( EqualityComparer<T>.Default )
-    {
-    }
-
-    internal LLRBTree( IEqualityComparer<T> comparer )
-    {
-      if( comparer == null )
-        throw new ArgumentNullException( "comparer" );
-
-      m_comparer = comparer;
-    }
-
-    #region Root Property
-
-    public IBinaryTreeNode<T> Root
-    {
-      get
-      {
-        return m_rootNode;
-      }
-    }
-
-    #endregion
-
-    public IBinaryTreeNode<T> Find( T value )
-    {
-      this.EnsureValue( value );
-
-      var node = this.FindNode( value );
-      if( ( node != null ) && ( node.Tree != this ) )
-        return null;
-
-      return node;
-    }
-
-    public IBinaryTreeNode<T> Insert( T value )
-    {
-      if( m_rootNode != null )
-        throw new InvalidOperationException( "This method cannot be called when the tree has a root node." );
-
-      this.EnsureNewValue( value );
-
-      m_rootNode = this.CreateNode( value );
-
-      if( m_rootNode == null )
-        throw new InvalidOperationException( "A node was not created." );
-
-      this.SetRootNodeColor();
-      this.OnPostInsert( m_rootNode, null );
-
-      return m_rootNode;
-    }
-
-    public IBinaryTreeNode<T> InsertBefore( T value, IBinaryTreeNode<T> node )
-    {
-      this.EnsureNewValue( value );
-      this.EnsureCurrentNode( node );
-
-      var pivotNode = ( Node )node;
-      var rightmostNode = ( pivotNode.Left != null ) ? pivotNode.Left.GetRightmost() : null;
-      var oldRootNode = m_rootNode;
-      var parentNode = rightmostNode ?? pivotNode;
-      var newNode = this.CreateNode( value );
-
-      if( newNode == null )
-        throw new InvalidOperationException( "A node was not created." );
-
-      if( rightmostNode != null )
-      {
-        parentNode.Right = newNode;
-      }
-      else
-      {
-        parentNode.Left = newNode;
-      }
-
-      newNode.Parent = parentNode;
-
-      this.BalanceUp( parentNode );
-      this.SetRootNodeColor();
-      this.OnPostInsert( newNode, oldRootNode );
-
-      return newNode;
-    }
-
-    public IBinaryTreeNode<T> InsertAfter( T value, IBinaryTreeNode<T> node )
-    {
-      this.EnsureNewValue( value );
-      this.EnsureCurrentNode( node );
-
-      var pivotNode = ( Node )node;
-      var leftmostNode = ( pivotNode.Right != null ) ? pivotNode.Right.GetLeftmost() : null;
-      var oldRootNode = m_rootNode;
-      var parentNode = leftmostNode ?? pivotNode;
-      var newNode = this.CreateNode( value );
-
-      if( newNode == null )
-        throw new InvalidOperationException( "A node was not created." );
-
-      if( leftmostNode != null )
-      {
-        parentNode.Left = newNode;
-      }
-      else
-      {
-        parentNode.Right = newNode;
-      }
-
-      newNode.Parent = parentNode;
-
-      this.BalanceUp( parentNode );
-      this.SetRootNodeColor();
-      this.OnPostInsert( newNode, oldRootNode );
-
-      return newNode;
-    }
-
-    public void Remove( T value )
-    {
-      this.EnsureValue( value );
-
-      this.Remove( this.FindNode( value ) );
-    }
-
-    public void Remove( IBinaryTreeNode<T> node )
-    {
-      this.EnsureCurrentNode( node );
-
-      var targetNode = ( Node )node;
-      var path = new Stack<Node>();
-      path.Push( targetNode );
-
-      this.FindPath( path, m_rootNode );
-
-      var oldValue = node.Value;
-      var oldRootNode = m_rootNode;
-      var oldParentNode = default( Node );
-
-      m_rootNode = this.Remove( path, true, out oldParentNode );
-
-      this.SetRootNodeColor();
-      this.OnPostRemove( oldValue, oldParentNode, oldRootNode );
-    }
-
-    public void Clear()
-    {
-      if( m_rootNode == null )
-        return;
-
-      this.Clear( m_rootNode );
-
-      m_rootNode = null;
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-      this.OnPropertyChanged( LLRBTree<T>.RootPropertyName );
-    }
-
-    public IEnumerable<T> GetItems( bool reverse )
-    {
-      return this.GetNodes( reverse ).Select( node => node.Value );
-    }
-
-    protected virtual Node CreateNode( T value )
-    {
-      return new Node( this, value );
-    }
-
-    protected virtual void ClearNode( Node node )
-    {
-      if( node == null )
-        return;
-
-      node.Parent = null;
-      node.Left = null;
-      node.Right = null;
-      node.IsRed = true;
-    }
-
-    protected virtual Node FindNode( T value )
-    {
-      foreach( var node in this.GetNodes( false ) )
-      {
-        if( m_comparer.Equals( value, node.Value ) )
-          return node;
-      }
-
-      return null;
-    }
-
-    protected virtual void EnsureValue( T value )
-    {
-    }
-
-    protected virtual void EnsureNewValue( T value )
-    {
-      this.EnsureValue( value );
-    }
-
-    private IEnumerable<Node> GetNodes( bool reverse )
-    {
-      if( m_rootNode == null )
-        yield break;
-
-      if( reverse )
-      {
-        for( var node = m_rootNode.GetRightmost() ?? m_rootNode; node != null; node = node.GetPrevious() )
-        {
-          yield return node;
-        }
-      }
-      else
-      {
-        for( var node = m_rootNode.GetLeftmost() ?? m_rootNode; node != null; node = node.GetNext() )
-        {
-          yield return node;
-        }
-      }
-    }
-
-    private Node Remove( Stack<Node> path, bool destroy, out Node oldParentNode )
-    {
-      Debug.Assert( path != null );
-      Debug.Assert( path.Count > 0 );
-
-      var node = path.Pop();
-
-      if( ( path.Count > 0 ) && ( node.Left == path.Peek() ) )
-      {
-        if( !this.IsRed( node.Left ) && !this.IsRed( node.Left.Left ) )
-        {
-          node = this.MoveRedLeft( node );
-
-          this.CutPath( path );
-          this.FindPath( path, node.Left );
-        }
-
-        node.Left = this.Remove( path, destroy, out oldParentNode );
-      }
-      else
-      {
-        if( this.IsRed( node.Left ) )
-        {
-          if( path.Count <= 0 )
-          {
-            path.Push( node );
-          }
-
-          node = this.RotateRight( node );
-
-          Debug.Assert( path.Count > 0 );
-
-          this.CutPath( path );
-          this.FindPath( path, node.Right );
-        }
-
-        if( ( node.Right == null ) && ( path.Count == 0 ) )
-        {
-          Debug.Assert( node.Left == null );
-
-          oldParentNode = node.Parent;
-
-          if( destroy )
-          {
-            this.ClearNode( node );
-          }
-
-          return null;
-        }
-
-        if( !this.IsRed( node.Right ) && !this.IsRed( node.Right.Left ) )
-        {
-          if( path.Count <= 0 )
-          {
-            path.Push( node );
-          }
-
-          node = this.MoveRedRight( node );
-
-          Debug.Assert( path.Count > 0 );
-
-          if( path.Peek() == node )
-          {
-            path.Pop();
-          }
-          else
-          {
-            this.CutPath( path );
-            this.FindPath( path, node.Right );
-          }
-        }
-
-        if( path.Count == 0 )
-        {
-          Debug.Assert( node.Right != null );
-
-          var child = default( Node );
-          var target = node.Right.GetLeftmost();
-
-          Debug.Assert( target != null );
-          Debug.Assert( target.Left == null );
-
-          if( target != node.Right )
-          {
-            path.Push( target );
-            this.FindPath( path, node.Right );
-
-            child = this.Remove( path, false, out oldParentNode );
-          }
-          else
-          {
-            oldParentNode = target;
-          }
-
-          target.Parent = node.Parent;
-          target.Left = node.Left;
-          target.Right = child;
-          target.IsRed = node.IsRed;
-
-          if( target.Left != null )
-          {
-            target.Left.Parent = target;
-          }
-
-          if( target.Right != null )
-          {
-            target.Right.Parent = target;
-          }
-
-          if( target.Parent != null )
-          {
-            if( target.Parent.Left == node )
-            {
-              target.Parent.Left = target;
-            }
-            else
-            {
-              target.Parent.Right = target;
-            }
-          }
-
-          Debug.Assert( destroy );
-          if( destroy )
-          {
-            this.ClearNode( node );
-          }
-
-          node = target;
-        }
-        else
-        {
-          node.Right = this.Remove( path, destroy, out oldParentNode );
-        }
-      }
-
-      return this.Balance( node );
-    }
-
-    private void BalanceUp( Node node )
-    {
-      while( node != null )
-      {
-        node = this.Balance( node ).Parent;
-      }
-    }
-
-    private Node Balance( Node node )
-    {
-      if( this.IsRed( node.Right ) && !this.IsRed( node.Left ) )
-      {
-        // Avoid right-leaning node
-        node = this.RotateLeft( node );
-      }
-
-      if( this.IsRed( node.Left ) && this.IsRed( node.Left.Left ) )
-      {
-        node = this.RotateRight( node );
-      }
-
-      if( this.IsRed( node.Left ) && this.IsRed( node.Right ) )
-      {
-        this.FlipColor( node );
-      }
-
-      return node;
-    }
-
-    private void FlipColor( Node node )
-    {
-      Debug.Assert( node != null );
-      Debug.Assert( node.Left != null );
-      Debug.Assert( node.Right != null );
-
-      node.Left.IsRed = !node.Left.IsRed;
-      node.Right.IsRed = !node.Right.IsRed;
-      node.IsRed = !node.IsRed;
-    }
-
-    private void SetRootNodeColor()
-    {
-      if( m_rootNode == null )
-        return;
-
-      m_rootNode.IsRed = false;
-    }
-
-    private void Clear( Node node )
-    {
-      if( node == null )
-        return;
-
-      this.Clear( node.Left );
-      this.Clear( node.Right );
-      this.ClearNode( node );
-    }
-
-    private Node RotateLeft( Node node )
-    {
-      Debug.Assert( node != null );
-
-      var right = node.Right;
-      Debug.Assert( right != null );
-
-      node.Right = right.Left;
-      if( node.Right != null )
-      {
-        node.Right.Parent = node;
-      }
-
-      var parentNode = node.Parent;
-
-      right.Parent = parentNode;
-      right.Left = node;
-      right.IsRed = node.IsRed;
-
-      node.Parent = right;
-      node.IsRed = true;
-
-      if( parentNode != null )
-      {
-        if( parentNode.Left == node )
-        {
-          parentNode.Left = right;
-        }
-        else
-        {
-          parentNode.Right = right;
-        }
-      }
-      else
-      {
-        m_rootNode = right;
-      }
-
-      return right;
-    }
-
-    private Node RotateRight( Node node )
-    {
-      Debug.Assert( node != null );
-
-      var left = node.Left;
-      Debug.Assert( left != null );
-
-      node.Left = left.Right;
-      if( node.Left != null )
-      {
-        node.Left.Parent = node;
-      }
-
-      var parentNode = node.Parent;
-
-      left.Parent = parentNode;
-      left.Right = node;
-      left.IsRed = node.IsRed;
-
-      node.Parent = left;
-      node.IsRed = true;
-
-      if( parentNode != null )
-      {
-        if( parentNode.Left == node )
-        {
-          parentNode.Left = left;
-        }
-        else
-        {
-          parentNode.Right = left;
-        }
-      }
-      else
-      {
-        m_rootNode = left;
-      }
-
-      return left;
-    }
-
-    private Node MoveRedLeft( Node node )
-    {
-      Debug.Assert( node != null );
-      Debug.Assert( node.Right != null );
-
-      this.FlipColor( node );
-
-      if( this.IsRed( node.Right.Left ) )
-      {
-        node.Right = this.RotateRight( node.Right );
-        node = this.RotateLeft( node );
-
-        this.FlipColor( node );
-      }
-
-      return node;
-    }
-
-    private Node MoveRedRight( Node node )
-    {
-      Debug.Assert( node != null );
-      Debug.Assert( node.Left != null );
-
-      this.FlipColor( node );
-
-      if( this.IsRed( node.Left.Left ) )
-      {
-        node = this.RotateRight( node );
-
-        this.FlipColor( node );
-      }
-
-      return node;
-    }
-
-    private void FindPath( Stack<Node> path, Node upTo )
-    {
-      Debug.Assert( path != null );
-
-      if( path.Count <= 0 )
-        throw new ArgumentException( "The path must contain at least one element.", "path" );
-
-      if( path.Peek() != upTo )
-      {
-        for( var parentNode = path.Peek().Parent; parentNode != null; parentNode = parentNode.Parent )
-        {
-          path.Push( parentNode );
-
-          if( parentNode == upTo )
-            break;
-        }
-
-        if( path.Peek() != upTo )
-          throw new InvalidOperationException();
-      }
-    }
-
-    private void CutPath( Stack<Node> path )
-    {
-      for( int i = 0; i < 2; i++ )
-      {
-        if( path.Count <= 1 )
-          break;
-
-        path.Pop();
-      }
-    }
-
-    private void OnPostInsert( Node newNode, Node oldRootNode )
-    {
-      Debug.Assert( newNode != null );
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, newNode.Value ) );
-
-      if( oldRootNode != m_rootNode )
-      {
-        this.OnPropertyChanged( LLRBTree<T>.RootPropertyName );
-      }
-    }
-
-    private void OnPostRemove( T value, Node parentNode, Node oldRootNode )
-    {
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, value ) );
-
-      if( oldRootNode != m_rootNode )
-      {
-        this.OnPropertyChanged( LLRBTree<T>.RootPropertyName );
-      }
-    }
-
-    private bool IsRed( Node node )
-    {
-      // A null node is "black".
-      return ( node != null )
-          && ( node.IsRed );
-    }
-
-    private void EnsureNode( IBinaryTreeNode<T> node )
-    {
-      if( node == null )
-        throw new ArgumentNullException( "node" );
-
-      if( !( node is Node ) )
-        throw new ArgumentException( "Unexpected node type.", "node" );
-    }
-
-    private void EnsureCurrentNode( IBinaryTreeNode<T> node )
-    {
-      this.EnsureNode( node );
-
-      if( node.Tree != this )
-        throw new ArgumentException( "The node is not within the tree.", "node" );
-    }
-
-    #region INotifyCollectionChanged Members
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    protected virtual void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      var handler = this.CollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    protected void OnPropertyChanged( string propertyName )
-    {
-      this.OnPropertyChanged( new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    protected virtual void OnPropertyChanged( PropertyChangedEventArgs e )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region IEnumerable<> Members
-
-    IEnumerator<T> IEnumerable<T>.GetEnumerator()
-    {
-      return this.GetItems( false ).GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return ( ( IEnumerable<T> )this ).GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly IEqualityComparer<T> m_comparer;
-
-    private Node m_rootNode;
-
-    #region Node Protected Class
-
-    protected class Node : IBinaryTreeNode<T>
-    {
-      public Node( LLRBTree<T> owner, T value )
-      {
-        Debug.Assert( owner != null );
-        Debug.Assert( value != null );
-
-        m_owner = owner;
-        m_value = value;
-        m_isRed = true;
-      }
-
-      public T Value
-      {
-        get
-        {
-          return m_value;
-        }
-      }
-
-      public LLRBTree<T> Tree
-      {
-        get
-        {
-          return m_owner;
-        }
-      }
-
-      public Node Parent
-      {
-        get
-        {
-          return m_parent;
-        }
-        internal set
-        {
-          if( value == m_parent )
-            return;
-
-          var oldNode = m_parent;
-
-          m_parent = value;
-
-          this.OnParentChanged( oldNode, m_parent );
-        }
-      }
-
-      public Node Left
-      {
-        get
-        {
-          return m_left;
-        }
-        internal set
-        {
-          if( value == m_left )
-            return;
-
-          var oldNode = m_left;
-
-          m_left = value;
-
-          this.OnLeftChanged( oldNode, m_left );
-        }
-      }
-
-      public Node Right
-      {
-        get
-        {
-          return m_right;
-        }
-        internal set
-        {
-          if( value == m_right )
-            return;
-
-          var oldNode = m_right;
-
-          m_right = value;
-
-          this.OnRightChanged( oldNode, m_right );
-        }
-      }
-
-      internal bool IsRed
-      {
-        get
-        {
-          return m_isRed;
-        }
-        set
-        {
-          m_isRed = value;
-        }
-      }
-
-      public Node GetPrevious()
-      {
-        if( m_left != null )
-          return m_left.GetRightmost();
-
-        var child = this;
-        var parent = m_parent;
-
-        while( parent != null )
-        {
-          if( parent.Right == child )
-            return parent;
-
-          child = parent;
-          parent = parent.Parent;
-        }
-
-        return null;
-      }
-
-      public Node GetNext()
-      {
-        if( m_right != null )
-          return m_right.GetLeftmost();
-
-        var child = this;
-        var parent = m_parent;
-
-        while( parent != null )
-        {
-          if( parent.Left == child )
-            return parent;
-
-          child = parent;
-          parent = parent.Parent;
-        }
-
-        return null;
-      }
-
-      public Node GetLeftmost()
-      {
-        var child = default( Node );
-
-        for( var current = this; current != null; current = current.Left )
-        {
-          child = current;
-        }
-
-        return child;
-      }
-
-      public Node GetRightmost()
-      {
-        var child = default( Node );
-
-        for( var current = this; current != null; current = current.Right )
-        {
-          child = current;
-        }
-
-        return child;
-      }
-
-      protected virtual void OnParentChanged( Node oldNode, Node newNode )
-      {
-      }
-
-      protected virtual void OnLeftChanged( Node oldNode, Node newNode )
-      {
-      }
-
-      protected virtual void OnRightChanged( Node oldNode, Node newNode )
-      {
-      }
-
-      IBinaryTree<T> IBinaryTreeNode<T>.Tree
-      {
-        get
-        {
-          return this.Tree;
-        }
-      }
-
-      IBinaryTreeNode<T> IBinaryTreeNode<T>.Parent
-      {
-        get
-        {
-          return this.Parent;
-        }
-      }
-
-      IBinaryTreeNode<T> IBinaryTreeNode<T>.Left
-      {
-        get
-        {
-          return this.Left;
-        }
-      }
-
-      IBinaryTreeNode<T> IBinaryTreeNode<T>.Right
-      {
-        get
-        {
-          return this.Right;
-        }
-      }
-
-      IBinaryTreeNode<T> IBinaryTreeNode<T>.GetPrevious()
-      {
-        return this.GetPrevious();
-      }
-
-      IBinaryTreeNode<T> IBinaryTreeNode<T>.GetNext()
-      {
-        return this.GetNext();
-      }
-
-      IBinaryTreeNode<T> IBinaryTreeNode<T>.GetLeftmost()
-      {
-        return this.GetLeftmost();
-      }
-
-      IBinaryTreeNode<T> IBinaryTreeNode<T>.GetRightmost()
-      {
-        return this.GetRightmost();
-      }
-
-      private readonly T m_value;
-      private readonly LLRBTree<T> m_owner;
-      private Node m_parent; // null
-      private Node m_left; // null
-      private Node m_right; // null
-      private bool m_isRed;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LongestIncreasingSubsequence.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LongestIncreasingSubsequence.cs
deleted file mode 100644
index b5ca6012..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/LongestIncreasingSubsequence.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Utils.Collections
-{
-  internal static class LongestIncreasingSubsequence
-  {
-    internal static IList<int> Find( IList<int> values )
-    {
-      if( values == null )
-        throw new ArgumentNullException( "values" );
-
-      if( values.Count <= 0 )
-        return new int[ 0 ];
-
-      var maximum = 1;
-      var predecessors = new int[ values.Count ];
-      var positions = new int[ values.Count ];
-
-      predecessors[ 0 ] = -1;
-      positions[ 0 ] = 0;
-
-      for( var i = 1; i < values.Count; i++ )
-      {
-        // We have found an element that extend the longest subsequence found so far.
-        if( values[ i ] > values[ positions[ maximum - 1 ] ] )
-        {
-          predecessors[ i ] = positions[ maximum - 1 ];
-          positions[ maximum ] = i;
-          maximum++;
-        }
-        else
-        {
-          var index = LongestIncreasingSubsequence.FindLeastIndex( i, values, positions, maximum );
-
-          // This is the lowest value found so far.
-          if( index < 0 )
-          {
-            predecessors[ i ] = -1;
-            positions[ 0 ] = i;
-          }
-          // We have found an element that could help to find new future subsequences.
-          else
-          {
-            Debug.Assert( index + 1 < maximum );
-
-            predecessors[ i ] = positions[ index ];
-            positions[ index + 1 ] = i;
-          }
-        }
-      }
-
-      var result = new int[ maximum ];
-      var position = positions[ maximum - 1 ];
-
-      for( var i = maximum - 1; i >= 0; i-- )
-      {
-        result[ i ] = values[ position ];
-        position = predecessors[ position ];
-      }
-
-      return result;
-    }
-
-    private static int FindLeastIndex( int index, IList<int> values, int[] positions, int maximum )
-    {
-      Debug.Assert( ( values != null ) && ( values.Count > 0 ) );
-      Debug.Assert( ( positions != null ) && ( maximum <= positions.Length ) );
-      Debug.Assert( ( index >= 0 ) && ( index < values.Count ) );
-
-      var lower = 0;
-      var upper = maximum - 1;
-      var value = values[ index ];
-
-      while( lower <= upper )
-      {
-        var middle = lower + ( upper - lower ) / 2;
-        var compare = value.CompareTo( values[ positions[ middle ] ] );
-
-        if( compare <= 0 )
-        {
-          if( middle == 0 )
-            break;
-
-          if( lower == middle )
-            return middle - 1;
-
-          upper = middle - 1;
-        }
-        else
-        {
-          if( upper == middle )
-            return middle;
-
-          lower = middle + 1;
-        }
-      }
-
-      return -1;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs
deleted file mode 100644
index 08d6a7b4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs
+++ /dev/null
@@ -1,423 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Threading;
-using Xceed.Wpf.DataGrid;
-
-namespace Xceed.Utils.Collections
-{
-  [Serializable]
-  [DebuggerTypeProxy( typeof( Xceed.Utils.Collections.ObservableHashList.ObservableHashListDebugView ) )]
-  [DebuggerDisplay( "Count = {Count}" )]
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1039:ListsAreStronglyTyped" )]
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1035:ICollectionImplementationsHaveStronglyTypedMembers" )]
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix" )]
-  public sealed class ObservableHashList : IList, INotifyCollectionChanged, INotifyPropertyChanged
-  {
-    #region CONSTANTS
-
-    private const int UseHashSetThreshold = 10;
-    private const int UseListThreshold = 8;
-
-    #endregion
-
-    internal ObservableHashList()
-    {
-    }
-
-    #region IList Members
-
-    public bool IsFixedSize
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public object this[ int index ]
-    {
-      get
-      {
-        return m_items[ index ];
-      }
-      set
-      {
-        var count = this.Count;
-        if( ( index < 0 ) || ( index > count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        if( index == count )
-        {
-          this.InsertCore( index, value );
-        }
-        else
-        {
-          this.ReplaceCore( index, value );
-        }
-      }
-    }
-
-    public int Add( object value )
-    {
-      int index = this.Count;
-      this.InsertCore( index, value );
-
-      return index;
-    }
-
-    public void Clear()
-    {
-      if( this.Count == 0 )
-        return;
-
-      m_set = null;
-      m_items.Clear();
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-    }
-
-    public bool Contains( object value )
-    {
-      if( m_set != null )
-        return m_set.Contains( value );
-
-      return m_items.Contains( value );
-    }
-
-    public int IndexOf( object value )
-    {
-      if( ( m_set != null ) && !m_set.Contains( value ) )
-        return -1;
-
-      return m_items.IndexOf( value );
-    }
-
-    public void Insert( int index, object value )
-    {
-      this.InsertCore( index, value );
-    }
-
-    public void Remove( object value )
-    {
-      int index = this.IndexOf( value );
-      if( index < 0 )
-        return;
-
-      this.RemoveAtCore( index );
-    }
-
-    public void RemoveAt( int index )
-    {
-      this.RemoveAtCore( index );
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    public int Count
-    {
-      get
-      {
-        return m_items.Count;
-      }
-    }
-
-    public bool IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public object SyncRoot
-    {
-      get
-      {
-        return ( ( ICollection )m_items ).SyncRoot;
-      }
-    }
-
-    public void CopyTo( Array array, int index )
-    {
-      ( ( IList )m_items ).CopyTo( array, index );
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    public IEnumerator GetEnumerator()
-    {
-      return m_items.GetEnumerator();
-    }
-
-    #endregion
-
-    #region INotifyCollectionChanged Members
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    private void OnCollectionChanged( NotifyCollectionChangedEventArgs e )
-    {
-      var handler = this.CollectionChanged;
-      if( handler == null )
-        return;
-
-      if( m_deferCount == 0 )
-      {
-        this.OnPropertyChanged( "Item[]" );
-        this.OnPropertyChanged( "Count" );
-
-        handler.Invoke( this, e );
-      }
-      else
-      {
-        m_hasDeferredNotifications = true;
-      }
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void OnPropertyChanged( string propertyName )
-    {
-      var handler = this.PropertyChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-
-    #endregion
-
-    public IDisposable DeferINotifyCollectionChanged()
-    {
-      return new DeferDisposable( this );
-    }
-
-    public void Sort()
-    {
-      this.Sort( null );
-    }
-
-    public void Sort( IComparer comparer )
-    {
-      var comparerWrapper = new ComparerWrapper( ( comparer != null ) ? comparer : ObjectComparer.Singleton );
-      m_items.Sort( comparerWrapper );
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-    }
-
-    private void InsertCore( int index, object value )
-    {
-      var count = this.Count;
-      if( ( index < 0 ) || ( index > count ) )
-        throw new ArgumentOutOfRangeException( "index" );
-
-      this.EnsureNotIn( value );
-
-      if( ( m_set == null ) && ( count >= ObservableHashList.UseHashSetThreshold ) )
-      {
-        m_set = new HashSet<object>( m_items );
-      }
-
-      m_items.Insert( index, value );
-
-      if( m_set != null )
-      {
-        m_set.Add( value );
-      }
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, value, index ) );
-    }
-
-    private void RemoveAtCore( int index )
-    {
-      var count = this.Count;
-      if( ( index < 0 ) || ( index >= count ) )
-        throw new ArgumentOutOfRangeException( "index" );
-
-      var value = m_items[ index ];
-
-      m_items.RemoveAt( index );
-
-      if( m_set != null )
-      {
-        if( count > ObservableHashList.UseListThreshold )
-        {
-          m_set.Remove( value );
-        }
-        else
-        {
-          m_set = null;
-        }
-      }
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, value, index ) );
-    }
-
-    private void ReplaceCore( int index, object value )
-    {
-      Debug.Assert( ( index >= 0 ) && ( index < this.Count ) );
-
-      if( m_items[ index ] == value )
-        return;
-
-      this.EnsureNotIn( value );
-
-      var oldValue = m_items[ index ];
-      m_items[ index ] = value;
-
-      if( m_set != null )
-      {
-        m_set.Remove( oldValue );
-        m_set.Add( value );
-      }
-
-      this.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, value, oldValue, index ) );
-    }
-
-    private void EnsureNotIn( object value )
-    {
-      if( this.Contains( value ) )
-        throw new ArgumentException( string.Format( "Item has already been added. (Key being added: '{0}')", "value", ( value == null ) ? "null" : value.ToString() ) );
-    }
-
-    #region Private Fields
-
-    private readonly List<object> m_items = new List<object>();
-    private HashSet<object> m_set; //null
-    private int m_deferCount;
-    private bool m_hasDeferredNotifications; //false
-
-    #endregion
-
-    #region DeferDisposable Private Class
-
-    private sealed class DeferDisposable : IDisposable
-    {
-      internal DeferDisposable( ObservableHashList owner )
-      {
-        Debug.Assert( owner != null );
-
-        m_owner = owner;
-        m_owner.m_deferCount++;
-      }
-
-      public void Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        var target = Interlocked.Exchange( ref m_owner, null );
-        if( target == null )
-          return;
-
-        target.m_deferCount--;
-        if( target.m_deferCount != 0 )
-          return;
-
-        if( target.m_hasDeferredNotifications )
-        {
-          target.m_hasDeferredNotifications = false;
-          target.OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-        }
-      }
-
-      ~DeferDisposable()
-      {
-        this.Dispose( false );
-      }
-
-      private ObservableHashList m_owner; // = null;
-    }
-
-    #endregion
-
-    #region ComparerWrapper Private Class
-
-    private sealed class ComparerWrapper : IComparer<object>
-    {
-      internal ComparerWrapper( IComparer comparer )
-      {
-        Debug.Assert( comparer != null );
-
-        m_comparer = comparer;
-      }
-
-      public int Compare( object x, object y )
-      {
-        return m_comparer.Compare( x, y );
-      }
-
-      private readonly IComparer m_comparer;
-    }
-
-    #endregion
-
-    #region ObservableHashListDebugView Private Class
-
-    private sealed class ObservableHashListDebugView
-    {
-      internal ObservableHashListDebugView( ObservableHashList owner )
-      {
-        if( owner == null )
-          throw new ArgumentNullException( "list" );
-
-        m_owner = owner;
-      }
-
-      public object[] Values
-      {
-        get
-        {
-          var items = m_owner.m_items;
-          if( items == null )
-            return new object[ 0 ];
-
-          return items.ToArray();
-        }
-      }
-
-      private readonly ObservableHashList m_owner;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableList.cs
deleted file mode 100644
index c0981fc4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableList.cs
+++ /dev/null
@@ -1,517 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Specialized;
-using System.Collections.ObjectModel;
-using System.Collections;
-
-namespace Xceed.Utils.Collections
-{
-  internal class ObservableList<T> : IList<T>, IList, ICollection, INotifyCollectionChanged
-  {
-    public ObservableList()
-    {
-      m_wrappedlist = new List<T>();
-    }
-
-    public ObservableList( IEnumerable<T> collection )
-    {
-      m_wrappedlist = new List<T>( collection );
-    }
-
-    public ObservableList( int capacity )
-    {
-      m_wrappedlist = new List<T>( capacity );
-    }
-
-    public void AddRange( IEnumerable<T> collection )
-    {
-      int startingIndex = m_wrappedlist.Count;
-
-      m_wrappedlist.AddRange( collection );
-
-      if( this.CollectionChanged != null )
-      {
-        List<T> newItems = new List<T>( collection );
-
-        this.CollectionChanged( this, new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, newItems, startingIndex ) );
-      }
-    }
-
-    public ReadOnlyCollection<T> AsReadOnly()
-    {
-      return m_wrappedlist.AsReadOnly();
-    }
-
-    public int BinarySearch( T item )
-    {
-      return m_wrappedlist.BinarySearch( item );
-    }
-
-    public int BinarySearch( T item, IComparer<T> comparer )
-    {
-      return m_wrappedlist.BinarySearch( item, comparer );
-    }
-
-    public int BinarySearch( int index, int count, T item, IComparer<T> comparer )
-    {
-      return m_wrappedlist.BinarySearch( index, count, item, comparer );
-    }
-
-    public List<TOutput> ConvertAll<TOutput>( Converter<T, TOutput> converter )
-    {
-      return m_wrappedlist.ConvertAll<TOutput>( converter );
-    }
-
-    public void CopyTo( T[] array )
-    {
-      m_wrappedlist.CopyTo( array );
-    }
-
-    public void CopyTo( int index, T[] array, int arrayIndex, int count )
-    {
-      m_wrappedlist.CopyTo( index, array, arrayIndex, count );
-    }
-
-    public bool Exists( Predicate<T> match )
-    {
-      return m_wrappedlist.Exists( match );
-    }
-
-    public T Find( Predicate<T> match )
-    {
-      return m_wrappedlist.Find( match );
-    }
-
-    public List<T> FindAll( Predicate<T> match )
-    {
-      return m_wrappedlist.FindAll( match );
-    }
-
-    public int FindIndex( Predicate<T> match )
-    {
-      return m_wrappedlist.FindIndex( match );
-    }
-
-    public int FindIndex( int startIndex, Predicate<T> match )
-    {
-      return m_wrappedlist.FindIndex( startIndex, match );
-    }
-
-    public int FindIndex( int startIndex, int count, Predicate<T> match )
-    {
-      return m_wrappedlist.FindIndex( startIndex, count, match );
-    }
-
-    public T FindLast( Predicate<T> match )
-    {
-      return m_wrappedlist.FindLast( match );
-    }
-
-    public int FindLastIndex( Predicate<T> match )
-    {
-      return m_wrappedlist.FindLastIndex( match );
-    }
-
-    public int FindLastIndex( int startIndex, Predicate<T> match )
-    {
-      return m_wrappedlist.FindLastIndex( startIndex, match );
-    }
-
-    public int FindLastIndex( int startIndex, int count, Predicate<T> match )
-    {
-      return m_wrappedlist.FindLastIndex( startIndex, count, match );
-    }
-
-    public void ForEach( Action<T> action )
-    {
-      m_wrappedlist.ForEach( action );
-    }
-
-    public List<T> GetRange( int index, int count )
-    {
-      return m_wrappedlist.GetRange( index, count );
-    }
-
-    public int IndexOf( T item, int index )
-    {
-      return m_wrappedlist.IndexOf( item, index );
-    }
-
-    public int IndexOf( T item, int index, int count )
-    {
-      return m_wrappedlist.IndexOf( item, index, count );
-    }
-
-    public void InsertRange( int index, IEnumerable<T> collection )
-    {
-      m_wrappedlist.InsertRange( index, collection );
-
-      if( this.CollectionChanged != null )
-      {
-        List<object> newItems = new List<object>( ( IEnumerable<object> )collection );
-
-        NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, newItems, index );
-
-        this.CollectionChanged( this, eventArgs );
-      }
-    }
-
-    public int LastIndexOf( T item )
-    {
-      return m_wrappedlist.LastIndexOf( item );
-    }
-
-    public int LastIndexOf( T item, int index )
-    {
-      return m_wrappedlist.LastIndexOf( item, index );
-    }
-
-    public int LastIndexOf( T item, int index, int count )
-    {
-      return m_wrappedlist.LastIndexOf( item, index, count );
-    }
-
-    public int RemoveAll( Predicate<T> match )
-    {
-      int retval = m_wrappedlist.RemoveAll( match );
-
-      if( this.CollectionChanged != null )
-      {
-        // Not choices but to send a reset... since I do not know what items were removed.
-        NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
-
-        this.CollectionChanged( this, eventArgs );
-      }
-
-      return retval;
-    }
-
-    public void RemoveRange( int index, int count )
-    {
-      List<T> removedItems = this.GetRange( index, count );
-
-      m_wrappedlist.RemoveRange( index, count );
-
-      if( this.CollectionChanged != null )
-      {
-        NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, removedItems, index );
-
-        this.CollectionChanged( this, eventArgs );
-      }
-    }
-
-    public void Reverse()
-    {
-      m_wrappedlist.Reverse();
-    }
-
-    public void Reverse( int index, int count )
-    {
-      m_wrappedlist.Reverse( index, count );
-    }
-
-    public void Sort()
-    {
-      m_wrappedlist.Sort();
-    }
-
-    public void Sort( IComparer<T> comparer )
-    {
-      m_wrappedlist.Sort( comparer );
-    }
-
-    public void Sort( Comparison<T> comparison )
-    {
-      m_wrappedlist.Sort( comparison );
-    }
-
-    public void Sort( int index, int count, IComparer<T> comparer )
-    {
-      m_wrappedlist.Sort( index, count, comparer );
-    }
-
-    #region IList<T> Members
-
-    public int IndexOf( T item )
-    {
-      return m_wrappedlist.IndexOf( item );
-    }
-
-    public void Insert( int index, T item )
-    {
-      m_wrappedlist.Insert( index, item );
-
-      if( this.CollectionChanged != null )
-      {
-        NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, item, index );
-
-        this.CollectionChanged( this, eventArgs );
-      }
-    }
-
-    public void RemoveAt( int index )
-    {
-      T removedItem = this[ index ];
-
-      m_wrappedlist.RemoveAt( index );
-
-      if( this.CollectionChanged != null )
-      {
-        NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, removedItem, index );
-
-        this.CollectionChanged( this, eventArgs );
-      }
-    }
-
-    public T this[ int index ]
-    {
-      get
-      {
-        return m_wrappedlist[ index ];
-      }
-      set
-      {
-        T oldItem = m_wrappedlist[ index ];
-
-        m_wrappedlist[ index ] = value;
-
-        if( this.CollectionChanged != null )
-        {
-          NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Replace, value, oldItem );
-
-          this.CollectionChanged( this, eventArgs );
-        }
-      }
-    }
-
-    #endregion
-
-    #region ICollection<T> Members
-
-    public void Add( T item )
-    {
-      m_wrappedlist.Add( item );
-
-      if( this.CollectionChanged != null )
-      {
-        // -1 since the item is already added to the list
-        NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Add, item, this.Count - 1 );
-
-        this.CollectionChanged( this, eventArgs );
-      }
-    }
-
-    public void Clear()
-    {
-      m_wrappedlist.Clear();
-
-      if( this.CollectionChanged != null )
-      {
-        NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset );
-
-        this.CollectionChanged( this, eventArgs );
-      }
-    }
-
-    public bool Contains( T item )
-    {
-      return m_wrappedlist.Contains( item );
-    }
-
-    public void CopyTo( T[] array, int arrayIndex )
-    {
-      m_wrappedlist.CopyTo( array, arrayIndex );
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_wrappedlist.Count;
-      }
-    }
-
-    bool ICollection<T>.IsReadOnly
-    {
-      get
-      {
-        return ( ( ICollection<T> )m_wrappedlist ).IsReadOnly;
-      }
-    }
-
-    public bool Remove( T item )
-    {
-      bool retval = false;
-
-      int oldIndex = m_wrappedlist.IndexOf( item );
-
-      retval = m_wrappedlist.Remove( item );
-
-      if( ( retval == true ) && ( this.CollectionChanged != null ) )
-      {
-        NotifyCollectionChangedEventArgs eventArgs = new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Remove, item, oldIndex );
-
-        this.CollectionChanged( this, eventArgs );
-      }
-
-      return retval;
-    }
-
-    #endregion
-
-    #region IEnumerable<T> Members
-
-    public IEnumerator<T> GetEnumerator()
-    {
-      return ( ( IEnumerable<T> )m_wrappedlist ).GetEnumerator();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-    {
-      return ( ( System.Collections.IEnumerable )m_wrappedlist ).GetEnumerator();
-    }
-
-    #endregion
-
-    #region INotifyCollectionChanged Members
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    #endregion
-
-    #region IList Members
-
-    int IList.Add( object value )
-    {
-      if( IsCompatibleObject( value ) == false )
-        throw new ArgumentException( "value must be of type T." );
-
-      this.Add( ( T )value );
-
-      return ( this.Count - 1 );
-    }
-
-    bool IList.Contains( object value )
-    {
-      if( IsCompatibleObject( value ) == false )
-        throw new ArgumentException( "value must be of type T." );
-
-      return this.Contains( ( T )value );
-    }
-
-    int IList.IndexOf( object value )
-    {
-      if( IsCompatibleObject( value ) == false )
-        throw new ArgumentException( "value must be of type T." );
-
-      return this.IndexOf( ( T )value );
-    }
-
-    void IList.Insert( int index, object value )
-    {
-      if( IsCompatibleObject( value ) == false )
-        throw new ArgumentException( "value must be of type T." );
-
-      this.Insert( index, ( T )value );
-    }
-
-    bool IList.IsFixedSize
-    {
-      get
-      {
-        return ( ( IList )m_wrappedlist ).IsFixedSize;
-      }
-    }
-
-    bool IList.IsReadOnly
-    {
-      get
-      {
-        return ( ( IList )m_wrappedlist ).IsReadOnly;
-      }
-    }
-
-    void IList.Remove( object value )
-    {
-      if( IsCompatibleObject( value ) == false )
-        throw new ArgumentException( "value must be of type T." );
-
-      this.Remove( ( T )value );
-    }
-
-    object IList.this[ int index ]
-    {
-      get
-      {
-        return this[ index ];
-      }
-      set
-      {
-        if( IsCompatibleObject( value ) == false )
-          throw new ArgumentException( "value must be of type T." );
-
-        this[ index ] = ( T )value;
-      }
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    void ICollection.CopyTo( Array array, int index )
-    {
-      ( ( ICollection )m_wrappedlist ).CopyTo( array, index );
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        return ( ( ICollection )m_wrappedlist ).IsSynchronized;
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        return ( ( ICollection )m_wrappedlist ).SyncRoot;
-      }
-    }
-
-    #endregion
-
-    private static bool IsCompatibleObject( object value )
-    {
-      if( !( value is T ) && ( ( value != null ) || typeof( T ).IsValueType ) )
-      {
-        return false;
-      }
-      return true;
-    }
-
-    private List<T> m_wrappedlist;
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree.Generic.cs
deleted file mode 100644
index 48c2d88a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree.Generic.cs
+++ /dev/null
@@ -1,2087 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-
-namespace Xceed.Utils.Collections
-{
-  internal class RSTree<TRegion, TItem> : ICollection<RSTree<TRegion, TItem>.Entry>, ICollection
-  {
-    #region Static Fields
-
-    private const double OverflowReInsertionRatio = 0.3d;
-
-    #endregion
-
-    internal RSTree( RSTreeHelper<TRegion> helper )
-      : this( helper, 3, 8 )
-    {
-    }
-
-    internal RSTree( RSTreeHelper<TRegion> helper, int minNodeSize, int maxNodeSize )
-    {
-      if( helper == null )
-        throw new ArgumentNullException( "helper" );
-
-      var dimensions = helper.GetDimensions();
-      if( dimensions < 1 )
-        throw new ArgumentException( "The number of dimensions must be greater than or equal to one.", "helper" );
-
-      if( minNodeSize < 2 )
-        throw new ArgumentOutOfRangeException( "minNodeSize", minNodeSize, "minNodeSize must be greater than or equal to 2." );
-
-      if( maxNodeSize < minNodeSize * 2 )
-        throw new ArgumentException( "maxNodeSize must be greater than or equal to minNodeSize * 2.", "maxNodeSize" );
-
-      m_helper = helper;
-      m_minNodeSize = minNodeSize;
-      m_maxNodeSize = maxNodeSize;
-    }
-
-    #region Count Property
-
-    public int Count
-    {
-      get
-      {
-        return m_count;
-      }
-    }
-
-    #endregion
-
-    public void Add( TRegion region, TItem item )
-    {
-      this.Add( new Entry( region, item ) );
-    }
-
-    public bool Remove( TRegion region, TItem item )
-    {
-      return this.Remove( new Entry( region, item ) );
-    }
-
-    public bool Contains( TRegion region, TItem item )
-    {
-      return this.Contains( new Entry( region, item ) );
-    }
-
-    public bool Overlaps( TRegion region )
-    {
-      return this.Overlaps( m_rootNode, region );
-    }
-
-    public IEnumerable<RSTree<TRegion, TItem>.Entry> GetEntriesWithin( TRegion region )
-    {
-      if( ( m_rootNode == null ) || m_helper.IsEmptyRegion( region ) )
-        return Enumerable.Empty<RSTree<TRegion, TItem>.Entry>();
-
-      return new EntryEnumerable( this, region );
-    }
-
-    private static int FindLevel( Node node )
-    {
-      Debug.Assert( node != null );
-
-      if( node.Parent == null )
-        return 0;
-
-      return RSTree<TRegion, TItem>.FindLevel( node.Parent ) + 1;
-    }
-
-    private void Insert( Entry entry )
-    {
-      Debug.Assert( !m_helper.IsEmptyRegion( entry.Region ) );
-
-      if( m_rootNode == null )
-      {
-        m_rootNode = new LeafNode( m_helper, m_maxNodeSize );
-      }
-
-      var leafNode = ( LeafNode )m_rootNode.FindNearest( entry.Region );
-      Debug.Assert( leafNode != null );
-
-      leafNode.Add( entry );
-
-      if( leafNode.Count > m_maxNodeSize )
-      {
-        this.ManageOverflow( leafNode );
-      }
-    }
-
-    private bool Overlaps( Node node, TRegion region )
-    {
-      if( ( node == null ) || !m_helper.IsOverlapping( node.Region, region ) )
-        return false;
-
-      var leafNode = node as LeafNode;
-      if( leafNode != null )
-      {
-        var count = leafNode.Count;
-        for( int i = 0; i < count; i++ )
-        {
-          var entry = leafNode[ i ];
-          if( m_helper.IsOverlapping( entry.Region, region ) )
-            return true;
-        }
-      }
-      else
-      {
-        var internalNode = ( InternalNode )node;
-        var count = internalNode.Count;
-
-        for( int i = 0; i < count; i++ )
-        {
-          if( this.Overlaps( internalNode[ i ], region ) )
-            return true;
-        }
-      }
-
-      return false;
-    }
-
-    private void Insert( Node node, int level )
-    {
-      Debug.Assert( ( node != null ) && ( level > 0 ) );
-      Debug.Assert( m_rootNode != null );
-
-      var internalNode = ( InternalNode )m_rootNode.FindNearest( node.Region, level - 1 );
-      Debug.Assert( internalNode != null );
-
-      internalNode.Add( node );
-
-      if( internalNode.Count > m_maxNodeSize )
-      {
-        this.ManageOverflow( internalNode );
-      }
-    }
-
-    private IEnumerable<Node> FindNodes( TRegion region, int level )
-    {
-      Debug.Assert( !m_helper.IsEmptyRegion( region ) );
-
-      if( m_rootNode == null )
-        yield break;
-
-      var nodeInfos = new Queue<NodeInfo>();
-      nodeInfos.Enqueue( new NodeInfo( m_rootNode, 0 ) );
-
-      while( nodeInfos.Count > 0 )
-      {
-        var nodeInfo = nodeInfos.Dequeue();
-        var node = nodeInfo.Node;
-        var nodeLevel = nodeInfo.Level;
-
-        if( !m_helper.IsOverlapping( node.Region, region ) )
-          continue;
-
-        if( nodeLevel == level )
-        {
-          yield return node;
-        }
-        else if( ( level < 0 ) || ( nodeLevel < level ) )
-        {
-          var leafNode = node as LeafNode;
-          if( leafNode != null )
-          {
-            if( level < 0 )
-              yield return leafNode;
-          }
-          else
-          {
-            foreach( var child in ( InternalNode )node )
-            {
-              nodeInfos.Enqueue( new NodeInfo( child, nodeLevel + 1 ) );
-            }
-          }
-        }
-      }
-    }
-
-    private void ManageOverflow( Node node )
-    {
-      while( node != null )
-      {
-        node = ( node is LeafNode )
-                 ? this.ManageOverflowCore( ( LeafNode )node )
-                 : this.ManageOverflowCore( ( InternalNode )node );
-      }
-    }
-
-    private Node ManageOverflowCore( LeafNode node )
-    {
-      Debug.Assert( node.Count > m_maxNodeSize );
-
-      // It makes no sense to reinsert the entry in the root node.
-      if( node.Parent != null )
-      {
-        node = this.Reinsert( node );
-        if( node == null )
-          return null;
-      }
-
-      // We have no choice but to split the node.
-      var newNode = node.Split( m_minNodeSize );
-      Debug.Assert( newNode != null );
-
-      // We have splited the root node.  A new root is required.
-      if( node == m_rootNode )
-      {
-        var newRootNode = new InternalNode( m_helper, m_maxNodeSize );
-        newRootNode.Add( node );
-        newRootNode.Add( newNode );
-
-        m_rootNode = newRootNode;
-      }
-      // Add the new node to the same parent node.
-      else
-      {
-        var parentNode = ( InternalNode )node.Parent;
-        Debug.Assert( parentNode != null );
-
-        parentNode.Add( newNode );
-
-        // Return the parent node if it is overflowing to process it.
-        if( parentNode.Count > m_maxNodeSize )
-          return parentNode;
-      }
-
-      return null;
-    }
-
-    private Node ManageOverflowCore( InternalNode node )
-    {
-      Debug.Assert( node.Count > m_maxNodeSize );
-
-      // It makes no sense to reinsert child nodes in the root node.
-      if( node.Parent != null )
-      {
-        node = this.Reinsert( node );
-        if( node == null )
-          return null;
-      }
-
-      // We have no choice but to split the node.
-      var newNode = node.Split( m_minNodeSize );
-      Debug.Assert( newNode != null );
-
-      // We have splited the root node.  A new root is required.
-      if( node == m_rootNode )
-      {
-        var newRootNode = new InternalNode( m_helper, m_maxNodeSize );
-        newRootNode.Add( node );
-        newRootNode.Add( newNode );
-
-        m_rootNode = newRootNode;
-      }
-      // Add the new node to the same parent node.
-      else
-      {
-        var parentNode = ( InternalNode )node.Parent;
-        Debug.Assert( parentNode != null );
-
-        parentNode.Add( newNode );
-
-        // Return the parent node if it is overflowing to process it.
-        if( parentNode.Count > m_maxNodeSize )
-          return parentNode;
-      }
-
-      return null;
-    }
-
-    private LeafNode Reinsert( LeafNode node )
-    {
-      Debug.Assert( node != null );
-      Debug.Assert( node.Count > m_maxNodeSize );
-
-      var reinsertCount = System.Math.Min( node.Count - m_minNodeSize, ( int )System.Math.Ceiling( m_maxNodeSize * RSTree<TRegion, TItem>.OverflowReInsertionRatio ) );
-      if( reinsertCount <= 0 )
-        return node;
-
-      Debug.Assert( ( m_minNodeSize <= node.Count - reinsertCount ) && ( reinsertCount <= m_maxNodeSize ) );
-
-      // Identify the entries that are at the "edge" of current region.
-      var center = new KPoint( m_helper.CenterOf( node.Region ) );
-      var candidates = node.Select( ( entry, entryIndex ) => new
-                             {
-                               Entry = entry,
-                               Index = entryIndex,
-                               Distance = KPoint.Distance( center, new KPoint( m_helper.CenterOf( entry.Region ) ) )
-                             } )
-                           .OrderByDescending( item => item.Distance )
-                           .ThenBy( item => item.Index )
-                           .Take( reinsertCount ).ToList();
-
-      // The entries must be removed from last to first to prevent an index shift.
-      foreach( var item in candidates.OrderByDescending( x => x.Index ) )
-      {
-        node.RemoveAt( item.Index );
-      }
-
-      var splitNode = node;
-      var reinsert = 0;
-
-      while( reinsert < candidates.Count )
-      {
-        var entry = candidates[ reinsert ].Entry;
-        var newLeafNode = ( LeafNode )m_rootNode.FindNearest( entry.Region );
-        Debug.Assert( newLeafNode != null );
-
-        newLeafNode.Add( entry );
-        reinsert++;
-
-        // If a new overflow occur while reinserting entries, stop reinserting in order to split the node.
-        if( newLeafNode.Count > m_maxNodeSize )
-        {
-          splitNode = newLeafNode;
-          break;
-        }
-        // If the best leaf node for this entry is the original node, so does the remaining entries.
-        else if( newLeafNode == node )
-        {
-          break;
-        }
-      }
-
-      Debug.Assert( ( ( candidates.Count - reinsert ) + node.Count <= m_maxNodeSize )
-                 || ( ( ( candidates.Count - reinsert ) + node.Count > m_maxNodeSize ) && ( splitNode == node ) ) );
-
-      // Reinsert the remaining entries in the original node.
-      for( ; reinsert < candidates.Count; reinsert++ )
-      {
-        node.Add( candidates[ reinsert ].Entry );
-      }
-
-      if( splitNode.Count > m_maxNodeSize )
-        return splitNode;
-
-      return null;
-    }
-
-    private InternalNode Reinsert( InternalNode node )
-    {
-      Debug.Assert( node != null );
-      Debug.Assert( node.Count > m_maxNodeSize );
-
-      var reinsertCount = System.Math.Min( node.Count - m_minNodeSize, ( int )System.Math.Ceiling( m_maxNodeSize * RSTree<TRegion, TItem>.OverflowReInsertionRatio ) );
-      if( reinsertCount <= 0 )
-        return node;
-
-      Debug.Assert( ( m_minNodeSize <= node.Count - reinsertCount ) && ( reinsertCount <= m_maxNodeSize ) );
-
-      // Identify the child nodes that are at the "edge" of current region.
-      var center = new KPoint( m_helper.CenterOf( node.Region ) );
-      var candidates = node.Select( ( childNode, childNodeIndex ) => new
-                             {
-                               Node = childNode,
-                               Index = childNodeIndex,
-                               Distance = KPoint.Distance( center, new KPoint( m_helper.CenterOf( childNode.Region ) ) )
-                             } )
-                           .OrderByDescending( item => item.Distance )
-                           .ThenBy( item => item.Index )
-                           .Take( reinsertCount ).ToList();
-
-      // The child nodes must be removed from last to first to prevent an index shift.
-      foreach( var item in candidates.OrderByDescending( x => x.Index ) )
-      {
-        node.RemoveAt( item.Index );
-      }
-
-      var splitNode = node;
-      var nodeLevel = RSTree<TRegion, TItem>.FindLevel( node );
-      var reinsert = 0;
-
-      while( reinsert < candidates.Count )
-      {
-        var childNode = candidates[ reinsert ].Node;
-        var newInternalNode = ( InternalNode )m_rootNode.FindNearest( childNode.Region, nodeLevel );
-        Debug.Assert( newInternalNode != null );
-
-        newInternalNode.Add( childNode );
-        reinsert++;
-
-        // If a new overflow occur while reinserting child nodes, stop reinserting in order to split the node.
-        if( newInternalNode.Count > m_maxNodeSize )
-        {
-          splitNode = newInternalNode;
-          break;
-        }
-        // If the best internal node for this child node is the original node, so does the remaining child nodes.
-        else if( newInternalNode == node )
-        {
-          break;
-        }
-      }
-
-      Debug.Assert( ( ( candidates.Count - reinsert ) + node.Count <= m_maxNodeSize )
-                 || ( ( ( candidates.Count - reinsert ) + node.Count > m_maxNodeSize ) && ( splitNode == node ) ) );
-
-      // Reinsert the remaining child nodes in the original node.
-      for( ; reinsert < candidates.Count; reinsert++ )
-      {
-        node.Add( candidates[ reinsert ].Node );
-      }
-
-      if( splitNode.Count > m_maxNodeSize )
-        return splitNode;
-
-      return null;
-    }
-
-    private void ManageUnderflow( Node node )
-    {
-      while( node != null )
-      {
-        node = ( node is LeafNode )
-                 ? this.ManageUnderflowCore( ( LeafNode )node )
-                 : this.ManageUnderflowCore( ( InternalNode )node );
-      }
-    }
-
-    private Node ManageUnderflowCore( LeafNode node )
-    {
-      Debug.Assert( node.Count < m_minNodeSize );
-
-      if( node == m_rootNode )
-      {
-        if( node.Count == 0 )
-        {
-          m_rootNode = null;
-        }
-      }
-      else
-      {
-        var parent = ( InternalNode )node.Parent;
-        Debug.Assert( parent != null );
-
-        // Remove the current node from the parent node to prevent entries to
-        // be reinserted within it.
-        var removed = parent.Remove( node );
-        Debug.Assert( removed );
-
-        // Reinsert the entries in the remaining nodes.
-        for( int i = node.Count - 1; i >= 0; i-- )
-        {
-          var entry = node[ i ];
-          node.RemoveAt( i );
-
-          this.Insert( entry );
-        }
-
-        // Return the parent node if it is underflowing to process it.
-        if( parent.Count < m_minNodeSize )
-          return parent;
-      }
-
-      return null;
-    }
-
-    private Node ManageUnderflowCore( InternalNode node )
-    {
-      Debug.Assert( node.Count < m_minNodeSize );
-
-      if( node == m_rootNode )
-      {
-        Debug.Assert( node.Count > 0 );
-
-        // Remove an entire level.
-        if( node.Count == 1 )
-        {
-          var child = node[ 0 ];
-          node.RemoveAt( 0 );
-
-          m_rootNode = child;
-        }
-      }
-      else
-      {
-        var level = RSTree<TRegion, TItem>.FindLevel( node );
-        var parent = ( InternalNode )node.Parent;
-        Debug.Assert( ( parent != null ) && ( level > 0 ) );
-
-        // Remove the current node from the parent node to prevent child nodes to
-        // be reinserted within it.
-        var removed = parent.Remove( node );
-        Debug.Assert( removed );
-
-        // Reinsert the child nodes in the remaining nodes of the same level.
-        for( int i = node.Count - 1; i >= 0; i-- )
-        {
-          var child = node[ i ];
-          node.RemoveAt( i );
-
-          this.Insert( child, level + 1 );
-        }
-
-        // Return the parent node if it is underflowing to process it.
-        if( parent.Count < m_minNodeSize )
-          return parent;
-      }
-
-      return null;
-    }
-
-    private void IncrementVersion()
-    {
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    #region ICollection<> Members
-
-    int ICollection<RSTree<TRegion, TItem>.Entry>.Count
-    {
-      get
-      {
-        return this.Count;
-      }
-    }
-
-    bool ICollection<RSTree<TRegion, TItem>.Entry>.IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    public void Add( Entry entry )
-    {
-      if( m_helper.IsEmptyRegion( entry.Region ) )
-        throw new ArgumentException( "The region must not be empty.", "entry" );
-
-      this.Insert( entry );
-
-      m_count++;
-      this.IncrementVersion();
-    }
-
-    public void Clear()
-    {
-      m_count = 0;
-      m_rootNode = null;
-
-      this.IncrementVersion();
-    }
-
-    public bool Contains( Entry entry )
-    {
-      if( ( m_rootNode == null ) || m_helper.IsEmptyRegion( entry.Region ) )
-        return false;
-
-      return ( from candidate in this.GetEntriesWithin( entry.Region )
-               where ( m_helper.AreEquivalent( entry.Region, candidate.Region ) )
-                  && ( object.Equals( entry.Item, candidate.Item ) )
-               select candidate ).Any();
-    }
-
-    public bool Remove( Entry entry )
-    {
-      if( ( m_rootNode == null ) || m_helper.IsEmptyRegion( entry.Region ) )
-        return false;
-
-      // Get the first LeafNode where the entry was found.
-      var leafNode = ( from candidate in this.FindNodes( entry.Region, -1 ).Cast<LeafNode>()
-                       where candidate.Remove( entry )
-                       select candidate ).FirstOrDefault();
-      if( leafNode == null )
-        return false;
-
-      if( leafNode.Count < m_minNodeSize )
-      {
-        this.ManageUnderflow( leafNode );
-      }
-
-      m_count--;
-      this.IncrementVersion();
-
-      return true;
-    }
-
-    void ICollection<RSTree<TRegion, TItem>.Entry>.CopyTo( Entry[] array, int index )
-    {
-      ( ( ICollection )this ).CopyTo( array, index );
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    int ICollection.Count
-    {
-      get
-      {
-        return this.Count;
-      }
-    }
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        if( m_syncRoot == null )
-        {
-          Interlocked.CompareExchange( ref m_syncRoot, new object(), null );
-        }
-
-        return m_syncRoot;
-      }
-    }
-
-    void ICollection.CopyTo( Array array, int index )
-    {
-      if( array == null )
-        throw new ArgumentNullException( "array" );
-
-      if( index < 0 )
-        throw new ArgumentOutOfRangeException( "index" );
-
-      if( array.Rank != 1 )
-        throw new ArgumentException( "Multi-dimensional array is not supported.", "array" );
-
-      if( ( array.Length - index ) < this.Count )
-        throw new ArgumentException( "The number of elements is greater than the available space from index to the end of the destination array.", "array" );
-
-      foreach( var entry in this )
-      {
-        array.SetValue( entry, index++ );
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<Entry> GetEnumerator()
-    {
-      return new EntryEnumerator( this );
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly RSTreeHelper<TRegion> m_helper;
-    private readonly int m_minNodeSize;
-    private readonly int m_maxNodeSize;
-
-    private Node m_rootNode; //null
-    private int m_count; //0
-    private int m_version; //0
-    private object m_syncRoot; //null
-
-    #region Entry Internal Struct
-
-    internal struct Entry
-    {
-      public Entry( TRegion region, TItem item )
-      {
-        m_region = region;
-        m_item = item;
-      }
-
-      public TRegion Region
-      {
-        get
-        {
-          return m_region;
-        }
-      }
-
-      public TItem Item
-      {
-        get
-        {
-          return m_item;
-        }
-      }
-
-      public override int GetHashCode()
-      {
-        return ( !object.ReferenceEquals( m_item, null ) ) ? m_item.GetHashCode() : 0;
-      }
-
-      public override bool Equals( object obj )
-      {
-        if( !( obj is Entry ) )
-          return false;
-
-        var target = ( Entry )obj;
-
-        return ( object.Equals( target.m_region, m_region ) )
-            && ( object.Equals( target.m_item, m_item ) );
-      }
-
-      private readonly TRegion m_region;
-      private readonly TItem m_item;
-    }
-
-    #endregion
-
-    #region EntryEnumerable Private Class
-
-    private sealed class EntryEnumerable : IEnumerable<RSTree<TRegion, TItem>.Entry>
-    {
-      internal EntryEnumerable( RSTree<TRegion, TItem> owner, TRegion region )
-      {
-        Debug.Assert( owner != null );
-
-        m_owner = owner;
-        m_region = region;
-      }
-
-      public IEnumerator<RSTree<TRegion, TItem>.Entry> GetEnumerator()
-      {
-        return new EntryEnumerator( m_owner, m_region );
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return this.GetEnumerator();
-      }
-
-      private readonly RSTree<TRegion, TItem> m_owner;
-      private readonly TRegion m_region;
-    }
-
-    #endregion
-
-    #region EntryEnumerator Private Class
-
-    private sealed class EntryEnumerator : IEnumerator<RSTree<TRegion, TItem>.Entry>
-    {
-      internal EntryEnumerator( RSTree<TRegion, TItem> owner, TRegion region )
-        : this( owner )
-      {
-        Debug.Assert( !owner.m_helper.IsEmptyRegion( region ) );
-
-        m_filter = ( TRegion r ) => m_owner.m_helper.IsOverlapping( region, r );
-      }
-
-      internal EntryEnumerator( RSTree<TRegion, TItem> owner )
-      {
-        Debug.Assert( owner != null );
-
-        m_owner = owner;
-        m_version = owner.m_version;
-
-        if( owner.m_rootNode != null )
-        {
-          m_nodes.Enqueue( owner.m_rootNode );
-        }
-      }
-
-      public Entry Current
-      {
-        get
-        {
-          if( m_entries.Count == 0 )
-            throw new InvalidOperationException();
-
-          return m_entries.Peek();
-        }
-      }
-
-      object IEnumerator.Current
-      {
-        get
-        {
-          return this.Current;
-        }
-      }
-
-      public bool MoveNext()
-      {
-        this.CheckVersion();
-
-        if( m_entries.Count > 0 )
-        {
-          m_entries.Dequeue();
-
-          if( m_entries.Count > 0 )
-            return true;
-        }
-
-        Debug.Assert( m_entries.Count == 0 );
-
-        while( m_nodes.Count > 0 )
-        {
-          var node = m_nodes.Dequeue();
-          if( ( m_filter != null ) && !m_filter.Invoke( node.Region ) )
-            continue;
-
-          var leafNode = node as LeafNode;
-          if( leafNode != null )
-          {
-            var count = leafNode.Count;
-
-            for( int i = 0; i < count; i++ )
-            {
-              var entry = leafNode[ i ];
-              if( ( m_filter != null ) && !m_filter.Invoke( entry.Region ) )
-                continue;
-
-              m_entries.Enqueue( entry );
-            }
-
-            if( m_entries.Count > 0 )
-              return true;
-          }
-          else
-          {
-            var internalNode = ( InternalNode )node;
-            var count = internalNode.Count;
-
-            for( int i = 0; i < count; i++ )
-            {
-              m_nodes.Enqueue( internalNode[ i ] );
-            }
-          }
-        }
-
-        Debug.Assert( m_nodes.Count == 0 );
-        Debug.Assert( m_entries.Count == 0 );
-
-        return false;
-      }
-
-      public void Reset()
-      {
-        this.CheckVersion();
-
-        m_entries.Clear();
-        m_nodes.Clear();
-
-        if( m_owner.m_rootNode != null )
-        {
-          m_nodes.Enqueue( m_owner.m_rootNode );
-        }
-      }
-
-      void IDisposable.Dispose()
-      {
-      }
-
-      private void CheckVersion()
-      {
-        if( m_version != m_owner.m_version )
-          throw new InvalidOperationException();
-      }
-
-      private readonly RSTree<TRegion, TItem> m_owner;
-      private readonly Queue<Node> m_nodes = new Queue<Node>();
-      private readonly Queue<Entry> m_entries = new Queue<Entry>();
-      private readonly Func<TRegion, bool> m_filter; //null
-      private int m_version;
-    }
-
-    #endregion
-
-    #region Node Private Class
-
-    protected abstract class Node : ICollection
-    {
-      public abstract int Count
-      {
-        get;
-      }
-
-      internal abstract TRegion Region
-      {
-        get;
-      }
-
-      internal Node Parent
-      {
-        get
-        {
-          return m_parent;
-        }
-      }
-
-      bool ICollection.IsSynchronized
-      {
-        get
-        {
-          return false;
-        }
-      }
-
-      object ICollection.SyncRoot
-      {
-        get
-        {
-          throw new NotSupportedException();
-        }
-      }
-
-      protected abstract void CopyToCore( Array array, int index );
-      protected abstract IEnumerator GetEnumeratorCore();
-
-      protected void SetParent( Node child, Node parent )
-      {
-        if( ( child == null ) || ( child.m_parent == parent ) )
-          return;
-
-        if( child.m_parent != null )
-        {
-          child.m_parent.SliceRegion( child.Region );
-        }
-
-        child.m_parent = parent;
-
-        if( parent != null )
-        {
-          parent.MergeRegion( child.Region );
-        }
-      }
-
-      protected internal abstract void MergeRegion( TRegion region );
-      protected internal abstract void SliceRegion( TRegion region );
-      protected internal abstract void InvalidateRegion();
-
-      internal abstract Node FindNearest( TRegion region, int level );
-
-      internal Node FindNearest( TRegion region )
-      {
-        return this.FindNearest( region, -1 );
-      }
-
-      internal abstract Node Split( int minNodeSize );
-
-      void ICollection.CopyTo( Array array, int index )
-      {
-        this.CopyToCore( array, index );
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return this.GetEnumeratorCore();
-      }
-
-      private Node m_parent;
-    }
-
-    #endregion
-
-    #region InternalNode Private Class
-
-    [DebuggerDisplay( "Internal (Count = {Count})" )]
-    private sealed class InternalNode : Node, IList<Node>
-    {
-      internal InternalNode( RSTreeHelper<TRegion> helper, int size )
-      {
-        Debug.Assert( helper != null );
-        Debug.Assert( size > 0 );
-
-        m_helper = helper;
-        m_nodes = new Node[ size + 1 ]; // We reserve one extra space for overflow.
-      }
-
-      public override int Count
-      {
-        get
-        {
-          return m_count;
-        }
-      }
-
-      internal override TRegion Region
-      {
-        get
-        {
-          if( !m_regionValid )
-          {
-            m_region = m_helper.GetEmptyRegion();
-
-            for( int i = 0; i < m_count; i++ )
-            {
-              m_region = m_helper.Union( m_region, m_nodes[ i ].Region );
-            }
-
-            m_regionValid = true;
-          }
-
-          return m_region;
-        }
-      }
-
-      public Node this[ int index ]
-      {
-        get
-        {
-          if( ( index < 0 ) || ( index >= m_count ) )
-            throw new ArgumentOutOfRangeException( "index" );
-
-          return m_nodes[ index ];
-        }
-        set
-        {
-          this.SetAt( index, value );
-        }
-      }
-
-      bool ICollection<Node>.IsReadOnly
-      {
-        get
-        {
-          return false;
-        }
-      }
-
-      public void Add( Node node )
-      {
-        this.InsertAt( m_count, node );
-      }
-
-      public void Insert( int index, Node node )
-      {
-        this.InsertAt( index, node );
-      }
-
-      public void RemoveAt( int index )
-      {
-        if( ( index < 0 ) || ( index >= m_count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        var node = m_nodes[ index ];
-
-        for( int i = index; i < m_count - 1; i++ )
-        {
-          m_nodes[ i ] = m_nodes[ i + 1 ];
-        }
-
-        m_nodes[ m_count - 1 ] = null;
-        m_count--;
-
-        this.SetParent( node, null );
-      }
-
-      public bool Remove( Node node )
-      {
-        var index = this.IndexOf( node );
-        if( index < 0 )
-          return false;
-
-        this.RemoveAt( index );
-        return true;
-      }
-
-      public void Clear()
-      {
-        var count = m_count;
-        var nodes = new Node[ m_nodes.Length ];
-
-        Array.Copy( m_nodes, 0, nodes, 0, m_count );
-        Array.Clear( m_nodes, 0, m_count );
-        m_count = 0;
-        m_regionValid = false;
-
-        for( int i = 0; i < count; i++ )
-        {
-          this.SetParent( nodes[ i ], null );
-        }
-      }
-
-      public int IndexOf( Node node )
-      {
-        if( node == null )
-          return -1;
-
-        return Array.IndexOf( m_nodes, node, 0, m_count );
-      }
-
-      public bool Contains( Node node )
-      {
-        return ( this.IndexOf( node ) >= 0 );
-      }
-
-      public IEnumerator<Node> GetEnumerator()
-      {
-        for( int i = 0; i < m_count; i++ )
-        {
-          yield return m_nodes[ i ];
-        }
-      }
-
-      protected override void CopyToCore( Array array, int index )
-      {
-        Array.Copy( m_nodes, 0, array, index, m_count );
-      }
-
-      protected override IEnumerator GetEnumeratorCore()
-      {
-        return this.GetEnumerator();
-      }
-
-      protected internal override void MergeRegion( TRegion region )
-      {
-        if( !m_regionValid )
-          return;
-
-        var newRegion = m_helper.Union( m_region, region );
-        if( m_helper.AreEquivalent( m_region, newRegion ) )
-          return;
-
-        m_region = newRegion;
-        this.InvalidateParentRegion();
-      }
-
-      protected internal override void SliceRegion( TRegion region )
-      {
-        if( !m_regionValid || m_helper.IsWithinBounds( m_region, region ) )
-          return;
-
-        m_regionValid = false;
-        this.InvalidateParentRegion();
-      }
-
-      protected internal override void InvalidateRegion()
-      {
-        if( !m_regionValid )
-          return;
-
-        m_regionValid = false;
-        this.InvalidateParentRegion();
-      }
-
-      internal override Node FindNearest( TRegion region, int level )
-      {
-        if( m_count <= 0 )
-          throw new InvalidOperationException( "An internal node must have children." );
-
-        this.CheckChildNodesOfSameType();
-
-        if( level == 0 )
-          return this;
-
-        var childNode = ( m_nodes[ 0 ] is LeafNode )
-                          ? this.FindLeastOverlapEnlargement( m_nodes, m_count, region )
-                          : this.FindLeastAreaEnlargement( m_nodes, m_count, region );
-
-        Debug.Assert( childNode != null );
-
-        return childNode.FindNearest( region, ( level < 0 ) ? level : level - 1 );
-      }
-
-      internal override Node Split( int minNodeSize )
-      {
-        Debug.Assert( m_count == m_nodes.Length );
-
-        var nodes = ( Node[] )m_nodes.Clone();
-        var axis = this.FindSplitAxis( nodes, minNodeSize );
-        var index = this.FindSplitIndex( nodes, minNodeSize, axis );
-
-        this.Clear();
-
-        for( int i = 0; i < index; i++ )
-        {
-          this.Add( nodes[ i ] );
-        }
-
-        var newNode = new InternalNode( m_helper, m_nodes.Length - 1 );
-        Debug.Assert( newNode.m_nodes.Length == m_nodes.Length );
-
-        for( int i = index; i < nodes.Length; i++ )
-        {
-          newNode.Add( nodes[ i ] );
-        }
-
-        return newNode;
-      }
-
-      [Conditional( "DEBUG" )]
-      private void CheckChildNodesOfSameType()
-      {
-        if( m_count <= 0 )
-          return;
-
-        var isLeaf = m_nodes[ 0 ] is LeafNode;
-
-        for( int i = 1; i < m_count; i++ )
-        {
-          Debug.Assert( ( m_nodes[ i ] is LeafNode ) == isLeaf );
-        }
-      }
-
-      private void SetAt( int index, Node node )
-      {
-        if( node == null )
-          throw new ArgumentNullException( "node" );
-
-        if( ( index < 0 ) || ( index >= m_count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        if( m_count >= m_nodes.Length )
-          throw new InvalidOperationException();
-
-        var oldNode = m_nodes[ index ];
-        m_nodes[ index ] = node;
-
-        this.SetParent( node, this );
-        this.SetParent( oldNode, null );
-      }
-
-      private void InsertAt( int index, Node node )
-      {
-        if( node == null )
-          throw new ArgumentNullException( "node" );
-
-        if( ( index < 0 ) || ( index > m_count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        if( m_count >= m_nodes.Length )
-          throw new InvalidOperationException();
-
-        for( int i = m_count; i > index; i-- )
-        {
-          m_nodes[ i ] = m_nodes[ i - 1 ];
-        }
-
-        m_nodes[ index ] = node;
-        m_count++;
-
-        this.SetParent( node, this );
-      }
-
-      private void InvalidateParentRegion()
-      {
-        var parent = this.Parent;
-        if( parent == null )
-          return;
-
-        parent.InvalidateRegion();
-      }
-
-      private Node FindLeastOverlapEnlargement( IList<Node> nodes, int count, TRegion region )
-      {
-        Debug.Assert( ( nodes != null ) && ( nodes.Count > 0 ) );
-        Debug.Assert( nodes.Count >= count );
-
-        if( count == 1 )
-          return nodes[ 0 ];
-
-        var candidates = new List<Node>( 1 );
-        var minimum = double.PositiveInfinity;
-
-        for( int i = 0; i < count; i++ )
-        {
-          var candidate = nodes[ i ];
-          var newRegion = m_helper.Union( candidate.Region, region );
-          var value = 0d;
-
-          for( int j = 0; j < count; j++ )
-          {
-            if( i == j )
-              continue;
-
-            value += m_helper.CalculateOverlapEnlargement( newRegion, nodes[ j ].Region );
-          }
-
-          if( value < minimum )
-          {
-            candidates.Clear();
-            candidates.Add( candidate );
-            minimum = value;
-          }
-          else if( value == minimum )
-          {
-            candidates.Add( candidate );
-          }
-        }
-
-        if( candidates.Count > 1 )
-          return this.FindLeastAreaEnlargement( candidates, candidates.Count, region );
-
-        return candidates[ 0 ];
-      }
-
-      private Node FindLeastAreaEnlargement( IList<Node> nodes, int count, TRegion region )
-      {
-        Debug.Assert( ( nodes != null ) && ( nodes.Count > 0 ) );
-        Debug.Assert( nodes.Count >= count );
-
-        if( count == 1 )
-          return nodes[ 0 ];
-
-        var candidates = new List<Node>( 1 );
-        var minimum = double.PositiveInfinity;
-
-        for( int i = 0; i < count; i++ )
-        {
-          var candidate = nodes[ i ];
-          var value = m_helper.CalculateAreaEnlargement( candidate.Region, region );
-
-          if( value < minimum )
-          {
-            candidates.Clear();
-            candidates.Add( candidate );
-            minimum = value;
-          }
-          else if( value == minimum )
-          {
-            candidates.Add( candidate );
-          }
-        }
-
-        if( candidates.Count > 1 )
-          return this.FindSmallestArea( candidates, candidates.Count );
-
-        return candidates[ 0 ];
-      }
-
-      private Node FindSmallestArea( IList<Node> nodes, int count )
-      {
-        Debug.Assert( ( nodes != null ) && ( nodes.Count > 0 ) );
-        Debug.Assert( nodes.Count >= count );
-
-        if( count == 1 )
-          return nodes[ 0 ];
-
-        var index = 0;
-        var minimum = double.PositiveInfinity;
-
-        for( int i = 0; i < count; i++ )
-        {
-          var value = m_helper.CalculateArea( nodes[ i ].Region );
-          if( value < minimum )
-          {
-            index = i;
-            minimum = value;
-          }
-        }
-
-        return nodes[ index ];
-      }
-
-      private int FindSplitAxis( Node[] nodes, int minNodeSize )
-      {
-        Debug.Assert( ( nodes != null ) && ( nodes.Length == m_count ) );
-
-        var axis = 0;
-        var minimum = double.PositiveInfinity;
-        var dimensions = m_helper.GetDimensions();
-
-        for( int i = 0; i < dimensions; i++ )
-        {
-          Array.Sort( nodes, new LowerBoundComparer( m_helper, i ) );
-
-          var value = this.CalculateMargin( nodes, minNodeSize );
-          if( value < minimum )
-          {
-            minimum = value;
-            axis = i;
-          }
-
-          Array.Sort( nodes, new UpperBoundComparer( m_helper, i ) );
-
-          value = this.CalculateMargin( nodes, minNodeSize );
-          if( value < minimum )
-          {
-            minimum = value;
-            axis = i;
-          }
-        }
-
-        return axis;
-      }
-
-      private int FindSplitIndex( Node[] nodes, int minNodeSize, int dimension )
-      {
-        Array.Sort( nodes, new LowerBoundComparer( m_helper, dimension ) );
-
-        var lowerOverlap = double.PositiveInfinity;
-        var lowerArea = double.PositiveInfinity;
-        var lowerIndex = this.FindSplitIndex( nodes, minNodeSize, out lowerOverlap, out lowerArea );
-
-        Array.Sort( nodes, new UpperBoundComparer( m_helper, dimension ) );
-
-        var upperOverlap = double.PositiveInfinity;
-        var upperArea = double.PositiveInfinity;
-        var upperIndex = this.FindSplitIndex( nodes, minNodeSize, out upperOverlap, out upperArea );
-
-        if( ( upperOverlap < lowerOverlap ) || ( ( upperOverlap == lowerOverlap ) && ( upperArea < lowerArea ) ) )
-          return upperIndex;
-
-        Array.Sort( nodes, new LowerBoundComparer( m_helper, dimension ) );
-        return lowerIndex;
-      }
-
-      private int FindSplitIndex( Node[] nodes, int minSize, out double overlap, out double area )
-      {
-        var splitIndex = 0;
-
-        overlap = double.PositiveInfinity;
-        area = double.PositiveInfinity;
-
-        var maxSize = nodes.Length - minSize;
-
-        for( int i = minSize; i < maxSize; i++ )
-        {
-          var firstRegion = m_helper.GetEmptyRegion();
-          for( int j = 0; j < i; j++ )
-          {
-            firstRegion = m_helper.Union( firstRegion, nodes[ j ].Region );
-          }
-
-          var secondRegion = m_helper.GetEmptyRegion();
-          for( int j = i; j < nodes.Length; j++ )
-          {
-            secondRegion = m_helper.Union( secondRegion, nodes[ j ].Region );
-          }
-
-          var currentOverlap = m_helper.CalculateArea( m_helper.Intersect( firstRegion, secondRegion ) );
-          var currentArea = m_helper.CalculateArea( firstRegion ) + m_helper.CalculateArea( secondRegion );
-
-          if( ( currentOverlap < overlap ) || ( ( currentOverlap == overlap ) && ( currentArea < area ) ) )
-          {
-            overlap = currentOverlap;
-            area = currentArea;
-            splitIndex = i;
-          }
-        }
-
-        return splitIndex;
-      }
-
-      private double CalculateMargin( IList<Node> nodes, int minSize )
-      {
-        var maxSize = nodes.Count - minSize;
-        var margin = 0d;
-
-        for( int i = minSize; i < maxSize; i++ )
-        {
-          var region = m_helper.GetEmptyRegion();
-          for( int j = 0; j < i; j++ )
-          {
-            region = m_helper.Union( region, nodes[ j ].Region );
-          }
-
-          margin += m_helper.CalculateMargin( region );
-
-          region = m_helper.GetEmptyRegion();
-          for( int j = i; j < nodes.Count; j++ )
-          {
-            region = m_helper.Union( region, nodes[ j ].Region );
-          }
-
-          margin += m_helper.CalculateMargin( region );
-        }
-
-        return margin;
-      }
-
-      void ICollection<Node>.CopyTo( Node[] array, int index )
-      {
-        this.CopyToCore( array, index );
-      }
-
-      private readonly RSTreeHelper<TRegion> m_helper;
-      private readonly Node[] m_nodes;
-      private int m_count;
-      private TRegion m_region;
-      private bool m_regionValid; //false
-    }
-
-    #endregion
-
-    #region LeafNode Private Class
-
-    [DebuggerDisplay( "Leaf (Count = {Count})" )]
-    private sealed class LeafNode : Node, IList<Entry>
-    {
-      internal LeafNode( RSTreeHelper<TRegion> helper, int size )
-      {
-        Debug.Assert( helper != null );
-        Debug.Assert( size > 0 );
-
-        m_helper = helper;
-        m_values = new Entry[ size + 1 ]; // We reserve one extra space for overflow.
-      }
-
-      public override int Count
-      {
-        get
-        {
-          return m_count;
-        }
-      }
-
-      internal override TRegion Region
-      {
-        get
-        {
-          if( !m_regionValid )
-          {
-            m_region = m_helper.GetEmptyRegion();
-
-            for( int i = 0; i < m_count; i++ )
-            {
-              m_region = m_helper.Union( m_region, m_values[ i ].Region );
-            }
-
-            m_regionValid = true;
-          }
-
-          return m_region;
-        }
-      }
-
-      public Entry this[ int index ]
-      {
-        get
-        {
-          if( ( index < 0 ) || ( index >= m_count ) )
-            throw new ArgumentOutOfRangeException( "index" );
-
-          return m_values[ index ];
-        }
-        set
-        {
-          this.SetAt( index, value );
-        }
-      }
-
-      bool ICollection<Entry>.IsReadOnly
-      {
-        get
-        {
-          return false;
-        }
-      }
-
-      public void Add( Entry value )
-      {
-        this.InsertAt( m_count, value );
-      }
-
-      public void Insert( int index, Entry value )
-      {
-        this.InsertAt( index, value );
-      }
-
-      public void RemoveAt( int index )
-      {
-        if( ( index < 0 ) || ( index >= m_count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        var value = m_values[ index ];
-
-        for( int i = index; i < m_count - 1; i++ )
-        {
-          m_values[ i ] = m_values[ i + 1 ];
-        }
-
-        m_values[ m_count - 1 ] = default( Entry );
-        m_count--;
-
-        this.PostRemove( value );
-      }
-
-      public bool Remove( Entry value )
-      {
-        var index = this.IndexOf( value );
-        if( index < 0 )
-          return false;
-
-        this.RemoveAt( index );
-        return true;
-      }
-
-      public void Clear()
-      {
-        Array.Clear( m_values, 0, m_count );
-        m_count = 0;
-        m_regionValid = false;
-      }
-
-      public int IndexOf( Entry value )
-      {
-        return Array.IndexOf( m_values, value, 0, m_count );
-      }
-
-      public bool Contains( Entry value )
-      {
-        return ( this.IndexOf( value ) >= 0 );
-      }
-
-      public IEnumerator<Entry> GetEnumerator()
-      {
-        for( int i = 0; i < m_count; i++ )
-        {
-          yield return m_values[ i ];
-        }
-      }
-
-      protected override void CopyToCore( Array array, int index )
-      {
-        Array.Copy( m_values, 0, array, index, m_count );
-      }
-
-      protected override IEnumerator GetEnumeratorCore()
-      {
-        return this.GetEnumerator();
-      }
-
-      protected internal override void MergeRegion( TRegion region )
-      {
-        if( !m_regionValid )
-          return;
-
-        var newRegion = m_helper.Union( m_region, region );
-        if( m_helper.AreEquivalent( m_region, newRegion ) )
-          return;
-
-        m_region = newRegion;
-        this.InvalidateParentRegion();
-      }
-
-      protected internal override void SliceRegion( TRegion region )
-      {
-        if( !m_regionValid || m_helper.IsWithinBounds( m_region, region ) )
-          return;
-
-        m_regionValid = false;
-        this.InvalidateParentRegion();
-      }
-
-      protected internal override void InvalidateRegion()
-      {
-        if( !m_regionValid )
-          return;
-
-        m_regionValid = false;
-        this.InvalidateParentRegion();
-      }
-
-      internal override Node FindNearest( TRegion region, int level )
-      {
-        return this;
-      }
-
-      internal override Node Split( int minNodeSize )
-      {
-        Debug.Assert( m_count == m_values.Length );
-
-        var entries = ( Entry[] )m_values.Clone();
-        var axis = this.FindSplitAxis( entries, minNodeSize );
-        var index = this.FindSplitIndex( entries, minNodeSize, axis );
-
-        this.Clear();
-
-        for( int i = 0; i < index; i++ )
-        {
-          this.Add( entries[ i ] );
-        }
-
-        var newNode = new LeafNode( m_helper, m_values.Length - 1 );
-        Debug.Assert( newNode.m_values.Length == m_values.Length );
-
-        for( int i = index; i < entries.Length; i++ )
-        {
-          newNode.Add( entries[ i ] );
-        }
-
-        return newNode;
-      }
-
-      private void SetAt( int index, Entry value )
-      {
-        if( ( index < 0 ) || ( index >= m_count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        if( m_count >= m_values.Length )
-          throw new InvalidOperationException();
-
-        var oldValue = m_values[ index ];
-        m_values[ index ] = value;
-
-        this.PostAdd( value );
-        this.PostRemove( oldValue );
-      }
-
-      private void InsertAt( int index, Entry value )
-      {
-        if( ( index < 0 ) || ( index > m_count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        if( m_count >= m_values.Length )
-          throw new InvalidOperationException();
-
-        for( int i = m_count; i > index; i-- )
-        {
-          m_values[ i ] = m_values[ i - 1 ];
-        }
-
-        m_values[ index ] = value;
-        m_count++;
-
-        this.PostAdd( value );
-      }
-
-      private void PostAdd( Entry entry )
-      {
-        this.MergeRegion( entry.Region );
-      }
-
-      private void PostRemove( Entry entry )
-      {
-        this.SliceRegion( entry.Region );
-      }
-
-      private void InvalidateParentRegion()
-      {
-        var parent = this.Parent;
-        if( parent == null )
-          return;
-
-        parent.InvalidateRegion();
-      }
-
-      private int FindSplitAxis( Entry[] entries, int minNodeSize )
-      {
-        Debug.Assert( ( entries != null ) && ( entries.Length == m_count ) );
-
-        var axis = 0;
-        var minimum = double.PositiveInfinity;
-        var dimensions = m_helper.GetDimensions();
-
-        for( int i = 0; i < dimensions; i++ )
-        {
-          Array.Sort( entries, new LowerBoundComparer( m_helper, i ) );
-
-          var value = this.CalculateMargin( entries, minNodeSize );
-          if( value < minimum )
-          {
-            minimum = value;
-            axis = i;
-          }
-
-          Array.Sort( entries, new UpperBoundComparer( m_helper, i ) );
-
-          value = this.CalculateMargin( entries, minNodeSize );
-          if( value < minimum )
-          {
-            minimum = value;
-            axis = i;
-          }
-        }
-
-        return axis;
-      }
-
-      private int FindSplitIndex( Entry[] entries, int minNodeSize, int dimension )
-      {
-        Array.Sort( entries, new LowerBoundComparer( m_helper, dimension ) );
-
-        var lowerOverlap = double.PositiveInfinity;
-        var lowerArea = double.PositiveInfinity;
-        var lowerIndex = this.FindSplitIndex( entries, minNodeSize, out lowerOverlap, out lowerArea );
-
-        Array.Sort( entries, new UpperBoundComparer( m_helper, dimension ) );
-
-        var upperOverlap = double.PositiveInfinity;
-        var upperArea = double.PositiveInfinity;
-        var upperIndex = this.FindSplitIndex( entries, minNodeSize, out upperOverlap, out upperArea );
-
-        if( ( upperOverlap < lowerOverlap ) || ( ( upperOverlap == lowerOverlap ) && ( upperArea < lowerArea ) ) )
-          return upperIndex;
-
-        Array.Sort( entries, new LowerBoundComparer( m_helper, dimension ) );
-        return lowerIndex;
-      }
-
-      private int FindSplitIndex( Entry[] entries, int minSize, out double overlap, out double area )
-      {
-        var splitIndex = 0;
-
-        overlap = double.PositiveInfinity;
-        area = double.PositiveInfinity;
-
-        var maxSize = entries.Length - minSize;
-
-        for( int i = minSize; i < maxSize; i++ )
-        {
-          var firstRegion = m_helper.GetEmptyRegion();
-          for( int j = 0; j < i; j++ )
-          {
-            firstRegion = m_helper.Union( firstRegion, entries[ j ].Region );
-          }
-
-          var secondRegion = m_helper.GetEmptyRegion();
-          for( int j = i; j < entries.Length; j++ )
-          {
-            secondRegion = m_helper.Union( secondRegion, entries[ j ].Region );
-          }
-
-          var currentOverlap = m_helper.CalculateArea( m_helper.Intersect( firstRegion, secondRegion ) );
-          var currentArea = m_helper.CalculateArea( firstRegion ) + m_helper.CalculateArea( secondRegion );
-
-          if( ( currentOverlap < overlap ) || ( ( currentOverlap == overlap ) && ( currentArea < area ) ) )
-          {
-            overlap = currentOverlap;
-            area = currentArea;
-            splitIndex = i;
-          }
-        }
-
-        return splitIndex;
-      }
-
-      private double CalculateMargin( IList<Entry> entries, int minSize )
-      {
-        var maxSize = entries.Count - minSize;
-        var margin = 0d;
-
-        for( int i = minSize; i < maxSize; i++ )
-        {
-          var region = m_helper.GetEmptyRegion();
-          for( int j = 0; j < i; j++ )
-          {
-            region = m_helper.Union( region, entries[ j ].Region );
-          }
-
-          margin += m_helper.CalculateMargin( region );
-
-          region = m_helper.GetEmptyRegion();
-          for( int j = i; j < entries.Count; j++ )
-          {
-            region = m_helper.Union( region, entries[ j ].Region );
-          }
-
-          margin += m_helper.CalculateMargin( region );
-        }
-
-        return margin;
-      }
-
-      void ICollection<Entry>.CopyTo( Entry[] array, int index )
-      {
-        this.CopyToCore( array, index );
-      }
-
-      private readonly RSTreeHelper<TRegion> m_helper;
-      private readonly Entry[] m_values;
-      private int m_count;
-      private TRegion m_region;
-      private bool m_regionValid; //false
-    }
-
-    #endregion
-
-    #region NodeInfo Private Struct
-
-    private struct NodeInfo
-    {
-      internal NodeInfo( Node node, int level )
-      {
-        this.Node = node;
-        this.Level = level;
-      }
-
-      internal readonly Node Node;
-      internal readonly int Level;
-    }
-
-    #endregion
-
-    #region KPoint Private Struct
-
-    private struct KPoint
-    {
-      internal KPoint( params double[] values )
-      {
-        if( values == null )
-          throw new ArgumentNullException( "values" );
-
-        m_values = values;
-      }
-
-      public int Count
-      {
-        get
-        {
-          return m_values.Length;
-        }
-      }
-
-      public double this[ int index ]
-      {
-        get
-        {
-          if( ( index < 0 ) || ( index >= m_values.Length ) )
-            throw new ArgumentOutOfRangeException( "index" );
-
-          return m_values[ index ];
-        }
-      }
-
-      public static double Distance( KPoint x, KPoint y )
-      {
-        var xs = x.m_values;
-        var ys = y.m_values;
-
-        if( xs.Length != ys.Length )
-          throw new ArgumentException( "The points must have the same number of values.", "y" );
-
-        if( ( xs == ys ) || ( xs.Length == 0 ) )
-          return 0d;
-
-        if( xs.Length == 1 )
-          return System.Math.Abs( xs[ 0 ] - ys[ 0 ] );
-
-        var squareSum = 0d;
-        for( int i = 0; i < xs.Length; i++ )
-        {
-          var delta = xs[ i ] - ys[ i ];
-          squareSum += delta * delta;
-        }
-
-        return System.Math.Sqrt( squareSum );
-      }
-
-      public override int GetHashCode()
-      {
-        var hashCode = 0;
-
-        foreach( var value in m_values )
-        {
-          hashCode *= 13;
-          hashCode += value.GetHashCode();
-        }
-
-        return hashCode;
-      }
-
-      public override bool Equals( object obj )
-      {
-        if( !( obj is KPoint ) )
-          return false;
-
-        var values = ( ( KPoint )obj ).m_values;
-        if( values == m_values )
-          return true;
-
-        if( values.Length != m_values.Length )
-          return false;
-
-        for( int i = 0; i < m_values.Length; i++ )
-        {
-          if( values[ i ] != m_values[ i ] )
-            return false;
-        }
-
-        return true;
-      }
-
-      private readonly double[] m_values;
-    }
-
-    #endregion
-
-    #region LowerBoundComparer Private Class
-
-    private sealed class LowerBoundComparer : IComparer<Node>, IComparer<Entry>
-    {
-      internal LowerBoundComparer( RSTreeHelper<TRegion> helper, int dimension )
-      {
-        Debug.Assert( helper != null );
-
-        m_helper = helper;
-        m_dimension = dimension;
-      }
-
-      int IComparer<Node>.Compare( Node x, Node y )
-      {
-        return this.GetValue( x.Region ).CompareTo( this.GetValue( y.Region ) );
-      }
-
-      int IComparer<Entry>.Compare( Entry x, Entry y )
-      {
-        return this.GetValue( x.Region ).CompareTo( this.GetValue( y.Region ) );
-      }
-
-      private double GetValue( TRegion region )
-      {
-        Debug.Assert( !m_helper.IsEmptyRegion( region ) );
-
-        return m_helper.GetValueOf( region, m_dimension );
-      }
-
-      private readonly RSTreeHelper<TRegion> m_helper;
-      private readonly int m_dimension;
-    }
-
-    #endregion
-
-    #region UpperBoundComparer Private Class
-
-    private sealed class UpperBoundComparer : IComparer<Node>, IComparer<Entry>
-    {
-      internal UpperBoundComparer( RSTreeHelper<TRegion> helper, int dimension )
-      {
-        Debug.Assert( helper != null );
-
-        m_helper = helper;
-        m_dimension = dimension;
-      }
-
-      int IComparer<Node>.Compare( Node x, Node y )
-      {
-        return this.GetValue( x.Region ).CompareTo( this.GetValue( y.Region ) );
-      }
-
-      int IComparer<Entry>.Compare( Entry x, Entry y )
-      {
-        return this.GetValue( x.Region ).CompareTo( this.GetValue( y.Region ) );
-      }
-
-      private double GetValue( TRegion region )
-      {
-        Debug.Assert( !m_helper.IsEmptyRegion( region ) );
-
-        return m_helper.GetValueOf( region, m_dimension ) + m_helper.GetSizeOf( region, m_dimension );
-      }
-
-      private readonly RSTreeHelper<TRegion> m_helper;
-      private readonly int m_dimension;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree1D.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree1D.Generic.cs
deleted file mode 100644
index c6efc0e5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree1D.Generic.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-
-namespace Xceed.Utils.Collections
-{
-  internal sealed class RSTree1D<T> : RSTree<RSTree1D<T>.Area, T>
-  {
-    internal RSTree1D()
-      : base( new Helper() )
-    {
-    }
-
-    internal RSTree1D( int minNodeSize, int maxNodeSize )
-      : base( new Helper(), minNodeSize, maxNodeSize )
-    {
-    }
-
-    #region Area Internal Struct
-
-    internal struct Area
-    {
-      internal static readonly Area Empty = new Area( 0, 0 );
-
-      internal Area( int index, int length )
-      {
-        Debug.Assert( length >= 0 );
-
-        this.Index = index;
-        this.Length = length;
-      }
-
-      internal bool IsEmpty
-      {
-        get
-        {
-          return ( this.Length <= 0 );
-        }
-      }
-
-      public override string ToString()
-      {
-        if( this.IsEmpty )
-          return "Empty";
-
-        var startIndex = this.Index;
-        var endIndex = this.Index + this.Length - 1;
-
-        return string.Format( CultureInfo.InvariantCulture, "[{0},{1}]", startIndex, endIndex );
-      }
-
-      internal readonly int Index;
-      internal readonly int Length;
-    }
-
-    #endregion
-
-    #region Helper Private Class
-
-    private sealed class Helper : RSTreeHelper<Area>
-    {
-      protected override int Dimensions
-      {
-        get
-        {
-          return 1;
-        }
-      }
-
-      protected override bool AreEqual( Area x, Area y )
-      {
-        return ( x.Index == y.Index )
-            && ( x.Length == y.Length );
-      }
-
-      protected override bool AreOverlapping( Area x, Area y )
-      {
-        return !this.Intersect( x, y ).IsEmpty;
-      }
-
-      protected override bool IsWithin( Area source, Area region )
-      {
-        return ( source.Index < region.Index )
-            && ( source.Index + source.Length ) > ( region.Index + region.Length );
-      }
-
-      protected override bool IsEmpty( Area region )
-      {
-        return region.IsEmpty;
-      }
-
-      protected override Area CreateEmptyRegion()
-      {
-        return Area.Empty;
-      }
-
-      protected override double GetValue( Area region, int dimension )
-      {
-        return region.Index;
-      }
-
-      protected override double GetSize( Area region, int dimension )
-      {
-        return region.Length;
-      }
-
-      protected override double GetArea( Area region )
-      {
-        return region.Length;
-      }
-
-      protected override double GetMargin( Area region )
-      {
-        return region.Length;
-      }
-
-      protected override double[] GetCenter( Area region )
-      {
-        return new double[] { region.Index + ( region.Length - 1 ) / 2d };
-      }
-
-      protected override Area UnionWith( Area x, Area y )
-      {
-        var index = System.Math.Min( x.Index, y.Index );
-        var length = System.Math.Max( x.Index + x.Length, y.Index + y.Length ) - index;
-
-        return new Area( index, length );
-      }
-
-      protected override Area IntersectWith( Area x, Area y )
-      {
-        var xs = x.Index;
-        var xe = xs + x.Length;
-        var ys = y.Index;
-        var ye = ys + y.Length;
-
-        if( xs <= ys )
-        {
-          if( xe <= ys )
-            return Area.Empty;
-
-          return new Area( ys, System.Math.Min( xe, ye ) - ys );
-        }
-        else
-        {
-          if( ye <= xs )
-            return Area.Empty;
-
-          return new Area( xs, System.Math.Min( xe, ye ) - xs );
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree2D.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree2D.Generic.cs
deleted file mode 100644
index 4814d4ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTree2D.Generic.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Globalization;
-
-namespace Xceed.Utils.Collections
-{
-  internal sealed class RSTree2D<T> : RSTree<RSTree2D<T>.Area, T>
-  {
-    internal RSTree2D()
-      : base( new Helper() )
-    {
-    }
-
-    internal RSTree2D( int minNodeSize, int maxNodeSize )
-      : base( new Helper(), minNodeSize, maxNodeSize )
-    {
-    }
-
-    #region Area Internal Struct
-
-    internal struct Area
-    {
-      internal static readonly Area Empty = new Area( 0, 0, 0, 0 );
-
-      internal Area( int row, int rowLength, int column, int columnLength )
-      {
-        Debug.Assert( ( rowLength >= 0 ) && ( columnLength >= 0 ) );
-
-        this.Row = row;
-        this.RowLength = rowLength;
-        this.Column = column;
-        this.ColumnLength = columnLength;
-      }
-
-      internal bool IsEmpty
-      {
-        get
-        {
-          return ( this.RowLength <= 0 )
-              || ( this.ColumnLength <= 0 );
-        }
-      }
-
-      public override string ToString()
-      {
-        if( this.IsEmpty )
-          return "Empty";
-
-        var rs = this.Row;
-        var re = this.Row + this.RowLength - 1;
-        var cs = this.Column;
-        var ce = this.Column + this.ColumnLength - 1;
-
-        return string.Format( CultureInfo.InvariantCulture, "[R({0},{1}),C({2},{3})]", rs, re, cs, ce );
-      }
-
-      internal readonly int Row;
-      internal readonly int RowLength;
-      internal readonly int Column;
-      internal readonly int ColumnLength;
-    }
-
-    #endregion
-
-    #region Helper Private Class
-
-    private sealed class Helper : RSTreeHelper<Area>
-    {
-      protected override int Dimensions
-      {
-        get
-        {
-          return 2;
-        }
-      }
-
-      protected override bool AreEqual( Area x, Area y )
-      {
-        return ( x.Row == y.Row )
-            && ( x.RowLength == y.RowLength )
-            && ( x.Column == y.Column )
-            && ( x.ColumnLength == y.ColumnLength );
-      }
-
-      protected override bool AreOverlapping( Area x, Area y )
-      {
-        return !this.Intersect( x, y ).IsEmpty;
-      }
-
-      protected override bool IsWithin( Area source, Area region )
-      {
-        return ( source.Row < region.Row )
-            && ( source.Column < region.Column )
-            && ( ( source.Row + source.RowLength ) > ( region.Row + region.RowLength ) )
-            && ( ( source.Column + source.ColumnLength ) > ( region.Column + region.ColumnLength ) );
-      }
-
-      protected override bool IsEmpty( Area region )
-      {
-        return region.IsEmpty;
-      }
-
-      protected override Area CreateEmptyRegion()
-      {
-        return Area.Empty;
-      }
-
-      protected override double GetValue( Area region, int dimension )
-      {
-        switch( dimension )
-        {
-          case 0:
-            return region.Row;
-
-          case 1:
-            return region.Column;
-
-          default:
-            throw new InvalidOperationException();
-        }
-      }
-
-      protected override double GetSize( Area region, int dimension )
-      {
-        switch( dimension )
-        {
-          case 0:
-            return region.RowLength;
-
-          case 1:
-            return region.ColumnLength;
-
-          default:
-            throw new InvalidOperationException();
-        }
-      }
-
-      protected override double GetArea( Area region )
-      {
-        return ( region.RowLength * region.ColumnLength );
-      }
-
-      protected override double GetMargin( Area region )
-      {
-        return ( region.RowLength + region.ColumnLength );
-      }
-
-      protected override double[] GetCenter( Area region )
-      {
-        return new double[] { region.Row + ( region.RowLength - 1 ) / 2d, region.Column + ( region.ColumnLength - 1 ) / 2d };
-      }
-
-      protected override Area UnionWith( Area x, Area y )
-      {
-        var xrs = x.Row;
-        var xrl = x.RowLength;
-        var xcs = x.Column;
-        var xcl = x.ColumnLength;
-        var yrs = y.Row;
-        var yrl = y.RowLength;
-        var ycs = y.Column;
-        var ycl = y.ColumnLength;
-
-        var rs = System.Math.Min( xrs, yrs );
-        var cs = System.Math.Min( xcs, ycs );
-        var rl = System.Math.Max( xrs + xrl, yrs + yrl ) - rs;
-        var cl = System.Math.Max( xcs + xcl, ycs + ycl ) - cs;
-
-        return new Area( rs, rl, cs, cl );
-      }
-
-      protected override Area IntersectWith( Area x, Area y )
-      {
-        var xrs = x.Row;
-        var xre = xrs + x.RowLength;
-        var xcs = x.Column;
-        var xce = xcs + x.ColumnLength;
-        var yrs = y.Row;
-        var yre = yrs + y.RowLength;
-        var ycs = y.Column;
-        var yce = ycs + y.ColumnLength;
-
-        int rs, rl, cs, cl;
-
-        if( xrs <= yrs )
-        {
-          if( xre <= yrs )
-            return Area.Empty;
-
-          rs = yrs;
-
-          if( xcs <= ycs )
-          {
-            if( xce <= ycs )
-              return Area.Empty;
-
-            cs = ycs;
-          }
-          else
-          {
-            if( yce <= xcs )
-              return Area.Empty;
-
-            cs = xcs;
-          }
-        }
-        else
-        {
-          if( yre <= xrs )
-            return Area.Empty;
-
-          rs = xrs;
-
-          if( xcs <= ycs )
-          {
-            if( xce <= ycs )
-              return Area.Empty;
-
-            cs = ycs;
-          }
-          else
-          {
-            if( yce <= xcs )
-              return Area.Empty;
-
-            cs = xcs;
-          }
-        }
-
-        rl = System.Math.Min( xre, yre ) - rs;
-        cl = System.Math.Min( xce, yce ) - cs;
-
-        return new Area( rs, rl, cs, cl );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTreeHelper.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTreeHelper.Generic.cs
deleted file mode 100644
index b4db49cb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/RSTreeHelper.Generic.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Utils.Collections
-{
-  internal abstract class RSTreeHelper<T>
-  {
-    protected abstract int Dimensions
-    {
-      get;
-    }
-
-    protected abstract double GetArea( T region );
-    protected abstract double GetMargin( T region );
-    protected abstract double[] GetCenter( T region );
-
-    protected abstract T UnionWith( T x, T y );
-    protected abstract T IntersectWith( T x, T y );
-
-    protected abstract bool AreEqual( T x, T y );
-    protected abstract bool AreOverlapping( T x, T y );
-
-    protected abstract bool IsWithin( T source, T region );
-    protected abstract bool IsEmpty( T region );
-
-    protected abstract T CreateEmptyRegion();
-
-    protected abstract double GetValue( T region, int dimension );
-    protected abstract double GetSize( T region, int dimension );
-
-    internal int GetDimensions()
-    {
-      return this.Dimensions;
-    }
-
-    internal bool IsEmptyRegion( T region )
-    {
-      return this.IsEmpty( region );
-    }
-
-    internal T GetEmptyRegion()
-    {
-      return this.CreateEmptyRegion();
-    }
-
-    internal double GetValueOf( T region, int dimension )
-    {
-      Debug.Assert( ( dimension >= 0 ) && ( dimension < this.Dimensions ) );
-      return this.GetValue( region, dimension );
-    }
-
-    internal double GetSizeOf( T region, int dimension )
-    {
-      Debug.Assert( ( dimension >= 0 ) && ( dimension < this.Dimensions ) );
-      return this.GetSize( region, dimension );
-    }
-
-    internal bool AreEquivalent( T x, T y )
-    {
-      if( this.IsEmpty( x ) )
-      {
-        return this.IsEmpty( y );
-      }
-      else if( this.IsEmpty( y ) )
-      {
-        return this.IsEmpty( x );
-      }
-      else
-      {
-        return this.AreEqual( x, y );
-      }
-    }
-
-    internal bool IsOverlapping( T source, T region )
-    {
-      if( this.IsEmpty( source ) || this.IsEmpty( region ) )
-        return false;
-
-      return this.AreOverlapping( source, region );
-    }
-
-    internal bool IsWithinBounds( T source, T region )
-    {
-      if( this.IsEmpty( source ) || this.IsEmpty( region ) )
-        return false;
-
-      return this.IsWithin( source, region );
-    }
-
-    internal double[] CenterOf( T region )
-    {
-      if( this.IsEmpty( region ) )
-        throw new InvalidOperationException();
-
-      var center = this.GetCenter( region );
-      Debug.Assert( ( center != null ) && ( center.Length == this.Dimensions ) );
-
-      return center;
-    }
-
-    internal T Union( T source, T region )
-    {
-      if( this.IsEmpty( source ) )
-      {
-        return region;
-      }
-      else if( this.IsEmpty( region ) )
-      {
-        return source;
-      }
-      else
-      {
-        return this.UnionWith( source, region );
-      }
-    }
-
-    internal T Intersect( T source, T region )
-    {
-      if( this.IsEmpty( source ) )
-      {
-        return source;
-      }
-      else if( this.IsEmpty( region ) )
-      {
-        return region;
-      }
-      else
-      {
-        return this.IntersectWith( source, region );
-      }
-    }
-
-    internal double CalculateOverlapEnlargement( T source, T region )
-    {
-      return this.CalculateArea( this.Intersect( source, region ) );
-    }
-
-    internal double CalculateAreaEnlargement( T source, T region )
-    {
-      var finalArea = this.CalculateArea( this.Union( source, region ) );
-      var sourceArea = this.CalculateArea( source );
-
-      Debug.Assert( finalArea >= sourceArea );
-
-      return finalArea - sourceArea;
-    }
-
-    internal double CalculateArea( T region )
-    {
-      if( this.IsEmpty( region ) )
-        return 0d;
-
-      return this.GetArea( region );
-    }
-
-    internal double CalculateMargin( T region )
-    {
-      if( this.IsEmpty( region ) )
-        return 0d;
-
-      return this.GetMargin( region );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyDictionary.cs
deleted file mode 100644
index 2cbae59b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyDictionary.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Utils.Collections
-{
-  internal class ReadOnlyDictionary<Key, Value> : IDictionary<Key, Value>
-  {
-    #region IDictionary<Key,Value> Members
-
-    public virtual void Add( Key key, Value value )
-    {
-      throw new NotSupportedException();
-    }
-
-    public virtual bool ContainsKey( Key key )
-    {
-      return m_dictionary.ContainsKey( key );
-    }
-
-    public virtual ICollection<Key> Keys
-    {
-      get
-      {
-        return m_dictionary.Keys;
-      }
-    }
-
-    public virtual bool Remove( Key key )
-    {
-      throw new NotSupportedException();
-    }
-
-    public virtual bool TryGetValue( Key key, out Value value )
-    {
-      return m_dictionary.TryGetValue( key, out value );
-    }
-
-    public virtual ICollection<Value> Values
-    {
-      get
-      {
-        return m_dictionary.Values;
-      }
-    }
-
-    public virtual Value this[ Key key ]
-    {
-      get
-      {
-        return m_dictionary[ key ];
-      }
-      set
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    #endregion
-
-    #region ICollection<KeyValuePair<Key,Value>> Members
-
-    public virtual void Add( KeyValuePair<Key, Value> item )
-    {
-      throw new NotSupportedException();
-    }
-
-    public virtual void Clear()
-    {
-      throw new NotSupportedException();
-    }
-
-    public virtual bool Contains( KeyValuePair<Key, Value> item )
-    {
-      return m_dictionary.Contains( item );
-    }
-
-    public void CopyTo( KeyValuePair<Key, Value>[] array, int arrayIndex )
-    {
-      throw new NotSupportedException();
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_dictionary.Count;
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public virtual bool Remove( KeyValuePair<Key, Value> item )
-    {
-      throw new NotSupportedException();
-    }
-
-    #endregion
-
-    #region IEnumerable<KeyValuePair<Key,Value>> Members
-
-    public virtual IEnumerator<KeyValuePair<Key, Value>> GetEnumerator()
-    {
-      throw new NotSupportedException();
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      throw new NotSupportedException();
-    }
-
-    #endregion
-
-    #region INTERNAL METHODS
-
-    internal virtual void InternalAdd( Key key, Value value )
-    {
-      m_dictionary.Add( key, value );
-    }
-
-    internal virtual void InternalClear()
-    {
-      m_dictionary.Clear();
-    }
-
-    internal virtual bool InternalRemove( Key key )
-    {
-      return m_dictionary.Remove( key );
-    }
-
-    internal virtual void InternalSet( Key key, Value value )
-    {
-      m_dictionary[ key ] = value;
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    Dictionary<Key, Value> m_dictionary = new Dictionary<Key, Value>();
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyObservableHashList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyObservableHashList.cs
deleted file mode 100644
index a36eb5c1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyObservableHashList.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Specialized;
-using System.Collections;
-using System.Diagnostics;
-using System.ComponentModel;
-
-namespace Xceed.Utils.Collections
-{
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1039:ListsAreStronglyTyped" )]
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix" )]
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1035:ICollectionImplementationsHaveStronglyTypedMembers" )]
-  public sealed class ReadOnlyObservableHashList : IList, ICollection, IEnumerable, INotifyCollectionChanged, INotifyPropertyChanged
-  {
-    public ReadOnlyObservableHashList()
-    {
-      m_hashList = new ObservableHashList();
-
-      m_hashList.CollectionChanged += new NotifyCollectionChangedEventHandler( this.OnInnerCollectionChanged );
-      m_hashList.PropertyChanged += new PropertyChangedEventHandler( this.OnInnerPropertyChanged );
-    }
-
-    #region IList Members
-
-    public int Add( object value )
-    {
-      throw new InvalidOperationException( "An attempt was made to add an item to a read-only ObservableHashList." );
-    }
-
-    public void Clear()
-    {
-      throw new InvalidOperationException( "An attempt was made to clear a read-only ObservableHashList." );
-    }
-
-    public bool Contains( object value )
-    {
-      return m_hashList.Contains( value );
-    }
-
-    public int IndexOf( object value )
-    {
-      return m_hashList.IndexOf( value );
-    }
-
-    public void Insert( int index, object value )
-    {
-      throw new InvalidOperationException( "An attempt was made to insert an item into a read-only ObservableHashList." );
-    }
-
-    public bool IsFixedSize
-    {
-      get
-      {
-        return m_hashList.IsFixedSize;
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    public void Remove( object value )
-    {
-      throw new InvalidOperationException( "An attempt was made to remove an item from a read-only ObservableHashList." );
-    }
-
-    public void RemoveAt( int index )
-    {
-      throw new InvalidOperationException( "An attempt was made to remove an item from a read-only ObservableHashList." );
-    }
-
-    public object this[ int index ]
-    {
-      get
-      {
-        return m_hashList[ index ];
-      }
-      set
-      {
-        throw new InvalidOperationException( "An attempt was made to replace an item in a read-only ObservableHashList." );
-      }
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    public void CopyTo( Array array, int index )
-    {
-      m_hashList.CopyTo( array, index );
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_hashList.Count;
-      }
-    }
-
-    public bool IsSynchronized
-    {
-      get
-      {
-        return m_hashList.IsSynchronized;
-      }
-    }
-
-    public object SyncRoot
-    {
-      get
-      {
-        return m_hashList.SyncRoot;
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    public IEnumerator GetEnumerator()
-    {
-      return m_hashList.GetEnumerator();
-    }
-
-    #endregion
-
-    #region INotifyCollectionChanged Members
-
-    public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-    private void OnCollectionChanged( NotifyCollectionChangedEventArgs args )
-    {
-      if( this.CollectionChanged != null )
-        this.CollectionChanged( this, args );
-    }
-
-    #endregion
-
-    #region INotifyPropertyChanged Members
-
-    public event PropertyChangedEventHandler PropertyChanged;
-
-    private void OnPropertyChanged( PropertyChangedEventArgs args )
-    {
-      if( this.PropertyChanged != null )
-        this.PropertyChanged( this, args );
-    }
-
-    #endregion
-
-    #region INTERNAL PROPERTIES
-
-    internal ObservableHashList InnerObservableHashList
-    {
-      get
-      {
-        return m_hashList;
-      }
-    }
-
-
-    #endregion
-
-    #region PRIVATE METHODS
-
-    private void OnInnerCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      this.OnCollectionChanged( e );
-    }
-
-    private void OnInnerPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      this.OnPropertyChanged( e );
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private ObservableHashList m_hashList; // = null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/WeakDictionary.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/WeakDictionary.Generic.cs
deleted file mode 100644
index 0b50b58f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/WeakDictionary.Generic.cs
+++ /dev/null
@@ -1,987 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-
-namespace Xceed.Utils.Collections
-{
-  internal sealed class WeakDictionary<TKey, TValue> : IDictionary<TKey, TValue>, ICollection
-  {
-    internal WeakDictionary()
-      : this( 0, null )
-    {
-    }
-
-    internal WeakDictionary( int capacity )
-      : this( capacity, null )
-    {
-    }
-
-    internal WeakDictionary( IEqualityComparer<TKey> comparer )
-      : this( 0, comparer )
-    {
-    }
-
-    internal WeakDictionary( int capacity, IEqualityComparer<TKey> comparer )
-    {
-      if( capacity < 0 )
-        throw new ArgumentOutOfRangeException( "capacity" );
-
-      if( capacity > 0 )
-      {
-        this.EnsureCapacity( capacity );
-      }
-
-      m_comparer = comparer ?? EqualityComparer<TKey>.Default;
-      m_creator = WeakDictionary<TKey, TValue>.GetCreator();
-
-      Debug.Assert( m_comparer != null );
-      Debug.Assert( m_creator != null );
-    }
-
-    #region Count Property
-
-    public int Count
-    {
-      get
-      {
-        return m_size;
-      }
-    }
-
-    #endregion
-
-    #region Keys Property
-
-    public ICollection<TKey> Keys
-    {
-      get
-      {
-        if( m_keys == null )
-        {
-          m_keys = new KeyCollection( this );
-        }
-
-        return m_keys;
-      }
-    }
-
-    #endregion
-
-    #region Values Property
-
-    public ICollection<TValue> Values
-    {
-      get
-      {
-        if( m_values == null )
-        {
-          m_values = new ValueCollection( this );
-        }
-
-        return m_values;
-      }
-    }
-
-    #endregion
-
-    public void Add( TKey key, TValue value )
-    {
-      if( object.ReferenceEquals( key, null ) )
-        throw new ArgumentNullException( "key" );
-
-      if( this.ContainsKey( key ) )
-        throw new ArgumentException();
-
-      this.AddCore( key, value );
-    }
-
-    public bool ContainsKey( TKey key )
-    {
-      TValue unused;
-
-      return this.TryGetValue( key, out unused );
-    }
-
-    public bool Remove( TKey key )
-    {
-      if( object.ReferenceEquals( key, null ) )
-        throw new ArgumentNullException( "key" );
-
-      return this.Remove( key, default( TValue ), false );
-    }
-
-    public void Clear()
-    {
-      if( m_size <= 0 )
-        return;
-
-      Debug.Assert( m_buckets != null );
-      Debug.Assert( m_entries != null );
-      Debug.Assert( m_entriesInfo != null );
-      Debug.Assert( m_entries.Length == m_entriesInfo.Length );
-
-      for( int i = 0; i < m_buckets.Length; i++ )
-      {
-        m_buckets[ i ] = -1;
-      }
-
-      for( int i = 0; i < m_entries.Length; i++ )
-      {
-        m_entries[ i ] = null;
-        m_entriesInfo[ i ] = new EntryInfo( ( i < m_entries.Length - 1 ) ? i + 1 : -1 );
-      }
-
-      m_size = 0;
-      m_free = 0;
-
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    public bool TryGetValue( TKey key, out TValue value )
-    {
-      if( object.ReferenceEquals( key, null ) )
-        throw new ArgumentNullException( "key" );
-
-      value = default( TValue );
-
-      var bucket = default( int );
-      var index = default( int );
-      var previous = default( int );
-
-      return this.FindKey( key, out bucket, out index, out previous, out value );
-    }
-
-    private bool FindKey( TKey key, out int bucket, out int index, out int previous, out TValue value )
-    {
-      Debug.Assert( !object.ReferenceEquals( key, null ) );
-
-      bucket = -1;
-      index = -1;
-      previous = -1;
-      value = default( TValue );
-
-      if( m_size <= 0 )
-        return false;
-
-      Debug.Assert( m_buckets != null );
-      Debug.Assert( m_entries != null );
-      Debug.Assert( m_entriesInfo != null );
-
-      var hashCode = m_comparer.GetHashCode( key );
-
-      bucket = this.GetBucket( hashCode );
-      Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
-
-      index = m_buckets[ bucket ];
-      previous = -1;
-
-      while( index >= 0 )
-      {
-        var entryInfo = m_entriesInfo[ index ];
-        if( entryInfo.HashCode == hashCode )
-        {
-          TKey targetKey;
-          var entry = m_entries[ index ];
-
-          Debug.Assert( !WeakDictionary<TKey, TValue>.IsFree( entry ) );
-
-          if( entry.TryGetKeyValue( out targetKey, out value ) && m_comparer.Equals( targetKey, key ) )
-            return true;
-        }
-
-        previous = index;
-        index = entryInfo.Next;
-      }
-
-      bucket = -1;
-      index = -1;
-      previous = -1;
-
-      return false;
-    }
-
-    private bool ContainsValue( TValue value )
-    {
-      if( m_size <= 0 )
-        return false;
-
-      Debug.Assert( m_entries != null );
-
-      var comparer = EqualityComparer<TValue>.Default;
-
-      for( int i = 0; i < m_entries.Length; i++ )
-      {
-        var entry = m_entries[ i ];
-        if( WeakDictionary<TKey, TValue>.IsFree( entry ) )
-          continue;
-
-        TKey targetKey;
-        TValue targetValue;
-        if( !entry.TryGetKeyValue( out targetKey, out targetValue ) )
-          continue;
-
-        if( comparer.Equals( targetValue, value ) )
-          return true;
-      }
-
-      return false;
-    }
-
-    private bool Remove( TKey key, TValue value, bool compareValue )
-    {
-      Debug.Assert( !object.ReferenceEquals( key, null ) );
-
-      var bucket = default( int );
-      var index = default( int );
-      var previous = default( int );
-      var targetValue = default( TValue );
-
-      if( !this.FindKey( key, out bucket, out index, out previous, out targetValue ) )
-        return false;
-
-      if( compareValue && !EqualityComparer<TValue>.Default.Equals( value, targetValue ) )
-        return false;
-
-      this.RemoveCore( bucket, index, previous );
-
-      return true;
-    }
-
-    private void AddCore( TKey key, TValue value )
-    {
-      Debug.Assert( !object.ReferenceEquals( key, null ) );
-
-      this.EnsureCapacity();
-      Debug.Assert( m_buckets != null );
-      Debug.Assert( m_entries != null );
-      Debug.Assert( m_entriesInfo != null );
-      Debug.Assert( m_free >= 0 );
-
-      var index = m_free;
-      var hashCode = m_comparer.GetHashCode( key );
-      var bucket = this.GetBucket( hashCode );
-
-      m_free = m_entriesInfo[ index ].Next;
-      m_entries[ index ] = m_creator.Invoke( key, value );
-      m_entriesInfo[ index ] = new EntryInfo( hashCode, m_buckets[ bucket ] );
-      m_buckets[ bucket ] = index;
-      m_size++;
-
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    private void RemoveCore( int bucket, int index, int previous )
-    {
-      Debug.Assert( ( bucket >= 0 ) && ( bucket < m_buckets.Length ) );
-      Debug.Assert( ( index >= 0 ) && ( index < m_entries.Length ) );
-      Debug.Assert( previous < m_entries.Length );
-
-      var next = m_entriesInfo[ index ].Next;
-
-      if( m_buckets[ bucket ] == index )
-      {
-        Debug.Assert( previous < 0 );
-
-        m_buckets[ bucket ] = next;
-      }
-      else
-      {
-        Debug.Assert( previous >= 0 );
-        Debug.Assert( m_entriesInfo[ previous ].Next == index );
-
-        m_entriesInfo[ previous ] = m_entriesInfo[ previous ].SetNext( next );
-      }
-
-      m_entries[ index ] = null;
-      m_entriesInfo[ index ] = new EntryInfo( m_free );
-      m_free = index;
-      m_size--;
-
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    private int GetBucket( int hashCode )
-    {
-      return WeakDictionary<TKey, TValue>.GetBucket( hashCode, m_capacity );
-    }
-
-    private void EnsureCapacity()
-    {
-      // Make sure the collection is not full.
-      if( m_size != m_capacity )
-        return;
-
-      this.EnsureCapacity( m_capacity * 2L );
-      Debug.Assert( m_free >= 0 );
-      Debug.Assert( m_size != m_capacity );
-    }
-
-    private void EnsureCapacity( long min )
-    {
-      if( ( m_capacity >= min ) && ( m_capacity > 0 ) )
-        return;
-
-      this.RemoveDeadEntries();
-
-      if( m_size * 2L < m_capacity )
-        return;
-
-      var capacity = WeakDictionary<TKey, TValue>.FindNextSize( min );
-      Debug.Assert( capacity > 0 );
-
-      m_buckets = new int[ capacity ];
-
-      Array.Resize( ref m_entries, capacity );
-      Array.Resize( ref m_entriesInfo, capacity );
-
-      for( int i = 0; i < m_buckets.Length; i++ )
-      {
-        m_buckets[ i ] = -1;
-      }
-
-      for( int i = m_capacity; i < capacity; i++ )
-      {
-        m_entries[ i ] = null;
-        m_entriesInfo[ i ] = new EntryInfo( ( i < capacity - 1 ) ? i + 1 : -1 );
-      }
-
-      // Rehash the elements to initialize the buckets.
-      for( int i = 0; i < m_capacity; i++ )
-      {
-        // Do not rehash free entries.
-        if( WeakDictionary<TKey, TValue>.IsFree( m_entries[ i ] ) )
-          continue;
-
-        var entryInfo = m_entriesInfo[ i ];
-        var bucket = WeakDictionary<TKey, TValue>.GetBucket( entryInfo.HashCode, capacity );
-        Debug.Assert( ( bucket >= 0 ) && ( bucket < capacity ) );
-
-        var index = m_buckets[ bucket ];
-
-        m_buckets[ bucket ] = i;
-        m_entriesInfo[ i ] = entryInfo.SetNext( index );
-      }
-
-      // Link the remaining free entries to the newly created free entries.
-      if( m_free >= 0 )
-      {
-        var index = m_free;
-
-        while( true )
-        {
-          var next = m_entriesInfo[ index ].Next;
-          if( next < 0 )
-          {
-            m_entriesInfo[ index ] = new EntryInfo( m_capacity );
-            break;
-          }
-
-          index = next;
-        }
-      }
-      else
-      {
-        m_free = m_capacity;
-      }
-
-      m_capacity = capacity;
-
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    private void RemoveDeadEntries()
-    {
-      if( m_capacity <= 0 )
-        return;
-
-      Debug.Assert( m_buckets != null );
-      Debug.Assert( m_entries != null );
-      Debug.Assert( m_entriesInfo != null );
-
-      for( int bucket = 0; bucket < m_buckets.Length; bucket++ )
-      {
-        var index = m_buckets[ bucket ];
-        var previous = -1;
-
-        while( index >= 0 )
-        {
-          var entry = m_entries[ index ];
-          var entryInfo = m_entriesInfo[ index ];
-          var next = entryInfo.Next;
-
-          Debug.Assert( !WeakDictionary<TKey, TValue>.IsFree( entry ) );
-
-          TKey targetKey;
-          TValue targetValue;
-
-          if( !entry.TryGetKeyValue( out targetKey, out targetValue ) )
-          {
-            this.RemoveCore( bucket, index, previous );
-          }
-          else
-          {
-            previous = index;
-          }
-
-          index = next;
-        }
-      }
-    }
-
-    private static int FindNextSize( long min )
-    {
-      var sizes = ArrayHelper.Sizes;
-
-      for( int i = 0; i < sizes.Length; i++ )
-      {
-        var size = sizes[ i ];
-
-        if( size >= min )
-          return size;
-      }
-
-      throw new InvalidOperationException( "Cannot find a larger size." );
-    }
-
-    private static int GetBucket( int hashCode, int capacity )
-    {
-      Debug.Assert( capacity > 0 );
-
-      // Remove the negative sign without using Math.Abs to handle the case of int.MinValue.
-      return ( hashCode & 0x7fffffff ) % capacity;
-    }
-
-    private static bool IsFree( Entry entry )
-    {
-      return ( entry == null );
-    }
-
-    private static Func<TKey, TValue, Entry> GetCreator()
-    {
-      var isKeyRef = !typeof( TKey ).IsValueType;
-      var isValueRef = !typeof( TValue ).IsValueType;
-
-      if( isKeyRef && isValueRef )
-        return ( k, v ) => new WWEntry( k, v );
-
-      if( isKeyRef )
-        return ( k, v ) => new WHEntry( k, v );
-
-      if( isValueRef )
-        return ( k, v ) => new HWEntry( k, v );
-
-      return ( k, v ) => new HHEntry( k, v );
-    }
-
-    #region IDictionary<> Members
-
-    TValue IDictionary<TKey, TValue>.this[ TKey key ]
-    {
-      get
-      {
-        throw new NotSupportedException();
-      }
-      set
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    #endregion
-
-    #region ICollection<> Members
-
-    bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    void ICollection<KeyValuePair<TKey, TValue>>.Add( KeyValuePair<TKey, TValue> item )
-    {
-      var key = item.Key;
-      if( object.ReferenceEquals( key, null ) )
-        throw new ArgumentException( "item" );
-
-      this.Add( key, item.Value );
-    }
-
-    bool ICollection<KeyValuePair<TKey, TValue>>.Contains( KeyValuePair<TKey, TValue> item )
-    {
-      var key = item.Key;
-      if( object.ReferenceEquals( key, null ) )
-        throw new ArgumentException( "item" );
-
-      TValue value;
-
-      if( !this.TryGetValue( key, out value ) )
-        return false;
-
-      return EqualityComparer<TValue>.Default.Equals( item.Value, value );
-    }
-
-    void ICollection<KeyValuePair<TKey, TValue>>.CopyTo( KeyValuePair<TKey, TValue>[] array, int index )
-    {
-      throw new NotSupportedException();
-    }
-
-    bool ICollection<KeyValuePair<TKey, TValue>>.Remove( KeyValuePair<TKey, TValue> item )
-    {
-      var key = item.Key;
-      if( object.ReferenceEquals( key, null ) )
-        throw new ArgumentException( "item" );
-
-      return this.Remove( key, item.Value, true );
-    }
-
-    #endregion
-
-    #region ICollection Members
-
-    bool ICollection.IsSynchronized
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    object ICollection.SyncRoot
-    {
-      get
-      {
-        if( m_syncRoot == null )
-        {
-          Interlocked.CompareExchange( ref m_syncRoot, new object(), null );
-          Debug.Assert( m_syncRoot != null );
-        }
-
-        return m_syncRoot;
-      }
-    }
-
-    void ICollection.CopyTo( Array array, int index )
-    {
-      throw new NotSupportedException();
-    }
-
-    #endregion
-
-    #region IEnumerable<> Members
-
-    public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-    {
-      if( m_capacity <= 0 )
-        yield break;
-
-      Debug.Assert( m_entries != null );
-
-      var version = m_version;
-
-      for( int i = 0; i < m_entries.Length; i++ )
-      {
-        var entry = m_entries[ i ];
-
-        if( !WeakDictionary<TKey, TValue>.IsFree( entry ) )
-        {
-          TKey key;
-          TValue value;
-
-          if( entry.TryGetKeyValue( out key, out value ) )
-            yield return new KeyValuePair<TKey, TValue>( key, value );
-        }
-
-        if( version != m_version )
-          throw new InvalidOperationException();
-      }
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return this.GetEnumerator();
-    }
-
-    #endregion
-
-    private readonly IEqualityComparer<TKey> m_comparer;
-    private readonly Func<TKey, TValue, Entry> m_creator;
-    private ICollection<TKey> m_keys; //null
-    private ICollection<TValue> m_values; //null
-    private object m_syncRoot;
-    private int[] m_buckets;
-    private Entry[] m_entries;
-    private EntryInfo[] m_entriesInfo;
-    private int m_capacity; //0
-    private int m_size; //0
-    private int m_free = -1;
-    private int m_version; //0
-
-    #region Entry Private Class
-
-    private abstract class Entry
-    {
-      internal abstract bool TryGetKey( out TKey value );
-      internal abstract bool TryGetValue( out TValue value );
-
-      internal bool TryGetKeyValue( out TKey key, out TValue value )
-      {
-        if( this.TryGetKey( out key ) )
-          return this.TryGetValue( out value );
-
-        value = default( TValue );
-
-        return false;
-      }
-    }
-
-    #endregion
-
-    #region WWEntry Private Class
-
-    private sealed class WWEntry : Entry
-    {
-      internal WWEntry( TKey key, TValue value )
-      {
-        Debug.Assert( !object.ReferenceEquals( key, null ) );
-
-        m_key = new WeakReference( key );
-        m_value = ( object.ReferenceEquals( value, null ) )
-                    ? null
-                    : new WeakReference( value );
-      }
-
-      internal override bool TryGetKey( out TKey value )
-      {
-        value = ( TKey )m_key.Target;
-
-        return !object.ReferenceEquals( value, null );
-      }
-
-      internal override bool TryGetValue( out TValue value )
-      {
-        if( m_value != null )
-        {
-          value = ( TValue )m_value.Target;
-
-          return !object.ReferenceEquals( value, null );
-        }
-
-        value = default( TValue );
-        return true;
-      }
-
-      private readonly WeakReference m_key;
-      private readonly WeakReference m_value;
-    }
-
-    #endregion
-
-    #region WHEntry Private Class
-
-    private sealed class WHEntry : Entry
-    {
-      internal WHEntry( TKey key, TValue value )
-      {
-        Debug.Assert( !object.ReferenceEquals( key, null ) );
-
-        m_key = new WeakReference( key );
-        m_value = value;
-      }
-
-      internal override bool TryGetKey( out TKey value )
-      {
-        value = ( TKey )m_key.Target;
-
-        return !object.ReferenceEquals( value, null );
-      }
-
-      internal override bool TryGetValue( out TValue value )
-      {
-        value = m_value;
-        return true;
-      }
-
-      private readonly WeakReference m_key;
-      private readonly TValue m_value;
-    }
-
-    #endregion
-
-    #region HWEntry Private Class
-
-    private sealed class HWEntry : Entry
-    {
-      internal HWEntry( TKey key, TValue value )
-      {
-        m_key = key;
-        m_value = ( object.ReferenceEquals( value, null ) )
-                    ? null
-                    : new WeakReference( value );
-      }
-
-      internal override bool TryGetKey( out TKey value )
-      {
-        value = m_key;
-        return true;
-      }
-
-      internal override bool TryGetValue( out TValue value )
-      {
-        if( m_value != null )
-        {
-          value = ( TValue )m_value.Target;
-
-          return !object.ReferenceEquals( value, null );
-        }
-
-        value = default( TValue );
-        return true;
-      }
-
-      private readonly TKey m_key;
-      private readonly WeakReference m_value;
-    }
-
-    #endregion
-
-    #region HHEntry Private Class
-
-    private sealed class HHEntry : Entry
-    {
-      internal HHEntry( TKey key, TValue value )
-      {
-        m_key = key;
-        m_value = value;
-      }
-
-      internal override bool TryGetKey( out TKey value )
-      {
-        value = m_key;
-        return true;
-      }
-
-      internal override bool TryGetValue( out TValue value )
-      {
-        value = m_value;
-        return true;
-      }
-
-      private readonly TKey m_key;
-      private readonly TValue m_value;
-    }
-
-    #endregion
-
-    #region EntryInfo Private Struct
-
-    [DebuggerDisplay( "HashCode = {HashCode}, Next = {Next}" )]
-    private struct EntryInfo
-    {
-      internal EntryInfo( int hashCode, int next )
-      {
-        m_hashCode = hashCode;
-        m_next = next;
-      }
-
-      internal EntryInfo( int next )
-        : this( 0, next )
-      {
-      }
-
-      internal int HashCode
-      {
-        get
-        {
-          return m_hashCode;
-        }
-      }
-
-      internal int Next
-      {
-        get
-        {
-          return m_next;
-        }
-      }
-
-      internal EntryInfo SetNext( int next )
-      {
-        return new EntryInfo( m_hashCode, next );
-      }
-
-      private readonly int m_hashCode;
-      private readonly int m_next;
-    }
-
-    #endregion
-
-    #region KeyCollection Private Class
-
-    private sealed class KeyCollection : ICollection<TKey>
-    {
-      internal KeyCollection( WeakDictionary<TKey, TValue> owner )
-      {
-        Debug.Assert( owner != null );
-        m_owner = owner;
-      }
-
-      public int Count
-      {
-        get
-        {
-          return m_owner.Count;
-        }
-      }
-
-      bool ICollection<TKey>.IsReadOnly
-      {
-        get
-        {
-          return true;
-        }
-      }
-
-      void ICollection<TKey>.Add( TKey item )
-      {
-        throw new NotSupportedException();
-      }
-
-      void ICollection<TKey>.Clear()
-      {
-        throw new NotSupportedException();
-      }
-
-      public bool Contains( TKey item )
-      {
-        return m_owner.ContainsKey( item );
-      }
-
-      void ICollection<TKey>.CopyTo( TKey[] array, int index )
-      {
-        throw new NotSupportedException();
-      }
-
-      bool ICollection<TKey>.Remove( TKey item )
-      {
-        throw new NotSupportedException();
-      }
-
-      public IEnumerator<TKey> GetEnumerator()
-      {
-        return m_owner.Select( item => item.Key ).GetEnumerator();
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return this.GetEnumerator();
-      }
-
-      private readonly WeakDictionary<TKey, TValue> m_owner;
-    }
-
-    #endregion
-
-    #region ValueCollection Private Class
-
-    private sealed class ValueCollection : ICollection<TValue>
-    {
-      internal ValueCollection( WeakDictionary<TKey, TValue> owner )
-      {
-        Debug.Assert( owner != null );
-        m_owner = owner;
-      }
-
-      public int Count
-      {
-        get
-        {
-          return m_owner.Count;
-        }
-      }
-
-      bool ICollection<TValue>.IsReadOnly
-      {
-        get
-        {
-          return true;
-        }
-      }
-
-      void ICollection<TValue>.Add( TValue item )
-      {
-        throw new NotSupportedException();
-      }
-
-      void ICollection<TValue>.Clear()
-      {
-        throw new NotSupportedException();
-      }
-
-      public bool Contains( TValue item )
-      {
-        return m_owner.ContainsValue( item );
-      }
-
-      void ICollection<TValue>.CopyTo( TValue[] array, int arrayIndex )
-      {
-        throw new NotSupportedException();
-      }
-
-      bool ICollection<TValue>.Remove( TValue item )
-      {
-        throw new NotSupportedException();
-      }
-
-      public IEnumerator<TValue> GetEnumerator()
-      {
-        return m_owner.Select( item => item.Value ).GetEnumerator();
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return this.GetEnumerator();
-      }
-
-      private readonly WeakDictionary<TKey, TValue> m_owner;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/BoolDataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/BoolDataStore.cs
deleted file mode 100644
index 52b4482b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/BoolDataStore.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Utils.Data
-{
-  internal sealed class BoolDataStore : DataStore
-  {
-    public BoolDataStore( int initialCapacity )
-    {
-      this.SetCapacity( initialCapacity );
-    }
-
-    public override object GetData( int recordIndex )
-    {
-      switch( m_values[ recordIndex ] )
-      {
-        case BoolDataStoreValue.False:
-          return false;
-
-        case BoolDataStoreValue.True:
-          return true;
-      }
-
-      return null;
-    }
-
-    public override void SetData( int recordIndex, object data )
-    {
-      if( ( data == null ) || ( data == DBNull.Value ) )
-      {
-        m_values[ recordIndex ] = BoolDataStoreValue.Null;
-        return;
-      }
-
-      if( data is bool )
-      {
-        m_values[ recordIndex ] = ( ( bool )data ) ? BoolDataStoreValue.True : BoolDataStoreValue.False;
-        return;
-      }
-
-      throw new ArgumentException( "The data must be of " + typeof( bool ).ToString() + " type or null (Nothing in Visual Basic).", "data" );
-    }
-
-    public override int Compare( int xRecordIndex, int yRecordIndex )
-    {
-      return ( m_values[ xRecordIndex ] - m_values[ yRecordIndex ] );
-    }
-
-    public override void SetCapacity( int capacity )
-    {
-      BoolDataStoreValue[] newValues = new BoolDataStoreValue[ capacity ];
-
-      if( m_values != null )
-        Array.Copy( m_values, 0, newValues, 0, System.Math.Min( capacity, m_values.Length ) );
-
-      m_values = newValues;
-    }
-
-    private BoolDataStoreValue[] m_values;
-  }
-
-  internal enum BoolDataStoreValue : sbyte
-  {
-    Null = 0,
-    False = 1,
-    True = 2
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/DataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/DataStore.cs
deleted file mode 100644
index 420a52aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/DataStore.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Utils.Data
-{
-  // When deriving from that class, ensure that the initial SetCapacity call is 
-  // setting the value to Null ( DefaultValue )
-  internal abstract class DataStore
-  {
-    public abstract int Compare( int xRecordIndex, int yRecordIndex );
-
-    public abstract object GetData( int recordIndex );
-    public abstract void SetData( int recordIndex, object data );
-    public abstract void SetCapacity( int capacity );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ObjectDataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ObjectDataStore.cs
deleted file mode 100644
index 1247255e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ObjectDataStore.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Utils.Data
-{
-  internal sealed class ObjectDataStore : DataStore
-  {
-    public ObjectDataStore( int initialCapacity )
-    {
-      this.SetCapacity( initialCapacity );
-    }
-
-    public override object GetData( int index )
-    {
-      return m_values[ index ];
-    }
-
-    public override void SetData( int index, object data )
-    {
-      m_values[ index ] = data;
-    }
-
-    public override int Compare( int xRecordIndex, int yRecordIndex )
-    {
-      object xData = m_values[ xRecordIndex ];
-      object yData = m_values[ yRecordIndex ];
-
-      return ObjectDataStore.CompareData( xData, yData );
-    }
-
-    public override void SetCapacity( int capacity )
-    {
-      object[] newValues = new object[ capacity ];
-
-      if( m_values != null )
-        Array.Copy( m_values, 0, newValues, 0, System.Math.Min( capacity, m_values.Length ) );
-
-      m_values = newValues;
-    }
-
-    public static int CompareData( object xData, object yData )
-    {
-      // Code in there should be indentical to ObjectComparer.Compare
-
-      if( ( xData == null ) || ( xData == DBNull.Value ) )
-      {
-        if( ( yData != null ) && ( yData != DBNull.Value ) )
-        {
-          return -1;
-        }
-      }
-      else
-      {
-        if( ( yData == null ) || ( yData == DBNull.Value ) )
-          return 1;
-
-        IComparable xDataComparer = xData as IComparable;
-
-        if( xDataComparer != null )
-          return xDataComparer.CompareTo( yData );
-      }
-
-      return 0;
-    }
-
-    private object[] m_values;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/StringDataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/StringDataStore.cs
deleted file mode 100644
index a50c7c6f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/StringDataStore.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Globalization;
-
-namespace Xceed.Utils.Data
-{
-  internal sealed class StringDataStore : DataStore
-  {
-    public StringDataStore( int initialCapacity )
-    {
-      this.SetCapacity( initialCapacity );
-    }
-
-    public override object GetData( int index )
-    {
-      return m_values[ index ];
-    }
-
-    public override void SetData( int index, object data )
-    {
-      m_values[ index ] = data as string;
-    }
-
-    public override int Compare( int xRecordIndex, int yRecordIndex )
-    {
-      return CultureInfo.CurrentCulture.CompareInfo.Compare(
-        m_values[ xRecordIndex ], m_values[ yRecordIndex ], CompareOptions.None );
-    }
-
-    public override void SetCapacity( int capacity )
-    {
-      string[] newValues = new string[ capacity ];
-
-      if( m_values != null )
-        Array.Copy( m_values, 0, newValues, 0, System.Math.Min( capacity, m_values.Length ) );
-
-      m_values = newValues;
-    }
-
-    private string[] m_values;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ValueTypeDataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ValueTypeDataStore.cs
deleted file mode 100644
index c4273c70..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ValueTypeDataStore.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Xceed.Utils.Data
-{
-  internal sealed class ValueTypeDataStore<T> : DataStore
-    where T : struct
-  {
-    public ValueTypeDataStore( int initialCapacity )
-    {
-      this.SetCapacity( initialCapacity );
-    }
-
-    public override int Compare( int xRecordIndex, int yRecordIndex )
-    {
-      if( m_valuesIsNull[ xRecordIndex ] == ValueNull )
-      {
-        if( m_valuesIsNull[ yRecordIndex ] == ValueNull )
-        {
-          return 0;
-        }
-        else
-        {
-          return -1;
-        }
-      }
-      else
-      {
-        if( m_valuesIsNull[ yRecordIndex ] == ValueNull )
-        {
-          return 1;
-        }
-      }
-
-      return Comparer<T>.Default.Compare( m_values[ xRecordIndex ], m_values[ yRecordIndex ] );
-    }
-
-    public override object GetData( int recordIndex )
-    {
-      if( m_valuesIsNull[ recordIndex ] == ValueNull )
-        return null;
-
-      return m_values[ recordIndex ];
-    }
-
-    public override void SetData( int recordIndex, object data )
-    {
-      if( ( data == null ) || ( data == DBNull.Value ) )
-      {
-        m_valuesIsNull[ recordIndex ] = ValueNull;
-        return;
-      }
-
-      if( data is T )
-      {
-        m_valuesIsNull[ recordIndex ] = ValueNotNull;
-        m_values[ recordIndex ] = ( T )data;
-        return;
-      }
-
-      throw new ArgumentException( "The data must be of " + typeof( T ).ToString() + " type or null (Nothing in Visual Basic).", "data" );
-    }
-
-    public override void SetCapacity( int capacity )
-    {
-      T[] newValues = new T[ capacity ];
-      byte[] newValuesIsNull = new byte[ capacity ];
-
-      if( m_values != null )
-      {
-        int copyCount = System.Math.Min( capacity, m_values.Length );
-        Array.Copy( m_values, 0, newValues, 0, copyCount );
-        Debug.Assert( ( m_valuesIsNull != null ) && ( m_valuesIsNull.Length == m_values.Length ) );
-        Array.Copy( m_valuesIsNull, 0, newValuesIsNull, 0, copyCount );
-      }
-
-      m_values = newValues;
-      m_valuesIsNull = newValuesIsNull;
-    }
-
-    private const byte ValueNull = 0;
-    private const byte ValueNotNull = 1;
-
-    private T[] m_values;
-    private byte[] m_valuesIsNull;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Math/DoubleUtil.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Math/DoubleUtil.cs
deleted file mode 100644
index 1afb14d1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Math/DoubleUtil.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Utils.Math
-{
-  internal static class DoubleUtil
-  {
-    public static bool AreClose( double value1, double value2 )
-    {
-      if( value1 == value2 )
-      {
-        return true;
-      }
-
-      double num1 = value1 - value2;
-
-      if( num1 < 1.53E-06 )
-      {
-        return ( num1 > -1.53E-06 );
-      }
-
-      return false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/PropertyHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/PropertyHelper.cs
deleted file mode 100644
index db465ea6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/PropertyHelper.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq.Expressions;
-
-namespace Xceed.Wpf.DataGrid.Utils
-{
-  internal static class PropertyHelper
-  {
-    internal static string GetPropertyName<TSource, TResult>( Expression<Func<TSource, TResult>> expression )
-    {
-      if( expression == null )
-        throw new ArgumentNullException( "expression" );
-
-      var memberExpression = expression.Body as MemberExpression;
-      if( memberExpression == null )
-        throw new ArgumentException( "The body of the expression must be a MemberExpression.", "expression" );
-
-      return memberExpression.Member.Name;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs
deleted file mode 100644
index 79c0340f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-/**************************************************************
- * 
- * This code is based on public domain code written by Paul Stovell. 
- * All copyrights and other rights have been waived. 
- * 
- * ************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Reflection;
-
-namespace Xceed.Wpf.DataGrid.Utils
-{
-  [Obsolete( "This class is inefficient. You should derive from System.Windows.WeakEventManager instead." )]
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public sealed class WeakEventHandler<TEventArgs>
-    where TEventArgs : class
-  {
-    #region Constructors
-
-    public WeakEventHandler( Action<object, TEventArgs> callback )
-    {
-      if( callback == null )
-        throw new ArgumentNullException( "callback" );
-
-      // We keep a WeakReference on the target so that the event
-      // won't keep the object alive.
-      m_method = callback.Method;
-      m_targetReference = new WeakReference( callback.Target );
-    }
-
-    #endregion // Constructors
-
-    public void Handler( object sender, TEventArgs e )
-    {
-      // Only invoke the callback if the target is still alive.
-      if( m_targetReference.IsAlive )
-      {
-        var target = m_targetReference.Target;
-        if( target != null )
-        {
-          // Recreate the callback based on the MethodInfo and target that we received in the ctor.
-          var callback = Delegate.CreateDelegate( typeof( Action<object, TEventArgs> ), target, m_method, false ) as Action<object, TEventArgs>;
-          if( callback != null )
-          {
-            // This will invoke the callback that the subscriber wants to be called for the event.
-            callback( sender, e );
-          }
-        }
-      }
-    }
-
-    #region Private Fields
-
-    private MethodInfo m_method;
-    private WeakReference m_targetReference;
-
-    #endregion // Private Fields
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/BreadthFirstSearchTreeTraversal.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/BreadthFirstSearchTreeTraversal.cs
deleted file mode 100644
index ded4203d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/BreadthFirstSearchTreeTraversal.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-
-namespace Xceed.Utils.Wpf
-{
-  internal sealed class BreadthFirstSearchTreeTraversal : ITreeTraversal
-  {
-    #region Current Property
-
-    public DependencyObject Current
-    {
-      get
-      {
-        if( m_current == null )
-          throw new InvalidOperationException();
-
-        return m_current;
-      }
-    }
-
-    private DependencyObject m_current; //null
-
-    #endregion
-
-    public bool MoveNext()
-    {
-      if( m_collection.Count > 0 )
-      {
-        m_current = m_collection.Dequeue();
-        return true;
-      }
-      else
-      {
-        m_current = null;
-        return false;
-      }
-    }
-
-    public void VisitNodes( IEnumerable<DependencyObject> nodes )
-    {
-      if( nodes == null )
-        return;
-
-      foreach( var node in nodes )
-      {
-        m_collection.Enqueue( node );
-      }
-    }
-
-    #region Private Fields
-
-    private readonly Queue<DependencyObject> m_collection = new Queue<DependencyObject>();
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/BreadthFirstSearchTreeTraversalStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/BreadthFirstSearchTreeTraversalStrategy.cs
deleted file mode 100644
index 243e2761..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/BreadthFirstSearchTreeTraversalStrategy.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Utils.Wpf
-{
-  internal sealed class BreadthFirstSearchTreeTraversalStrategy : ITreeTraversalStrategy
-  {
-    public ITreeTraversal Create()
-    {
-      return new BreadthFirstSearchTreeTraversal();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposable.cs
deleted file mode 100644
index a9f033b1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposable.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Threading;
-
-namespace Xceed.Utils.Wpf
-{
-  internal sealed class DeferredDisposable : DispatcherDisposable
-  {
-    internal DeferredDisposable( DeferredDisposableState state )
-    {
-      if( state == null )
-        throw new ArgumentNullException( "state" );
-
-      m_state = state;
-      m_state.Initialize();
-    }
-
-    protected override Dispatcher GetDisposeDispatcher()
-    {
-      var dispatcher = m_state.GetDispatcher();
-      if( dispatcher != null )
-        return dispatcher;
-
-      return base.GetDisposeDispatcher();
-    }
-
-    protected override Action<bool> GetDisposeDelegate()
-    {
-      // We store the member in a local variable to create a closure.
-      // We do not want the returned delegate to target the current object.
-      var state = m_state;
-
-      return ( disposing ) => state.Dispose( disposing );
-    }
-
-    private readonly DeferredDisposableState m_state;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposableState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposableState.cs
deleted file mode 100644
index 01fb8393..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DeferredDisposableState.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Threading;
-using System.Windows.Threading;
-
-namespace Xceed.Utils.Wpf
-{
-  internal abstract class DeferredDisposableState
-  {
-    protected virtual object SyncRoot
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    protected virtual Dispatcher Dispatcher
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    protected abstract bool IsDeferred
-    {
-      get;
-    }
-
-    protected abstract void Increment();
-    protected abstract void Decrement();
-
-    protected virtual void OnDeferEnding( bool disposing )
-    {
-    }
-
-    protected abstract void OnDeferEnded( bool disposing );
-
-    internal Dispatcher GetDispatcher()
-    {
-      return this.Dispatcher;
-    }
-
-    internal void Initialize()
-    {
-      var syncRoot = this.SyncRoot;
-      if( syncRoot != null )
-      {
-        Monitor.Enter( syncRoot );
-      }
-
-      try
-      {
-        this.Increment();
-      }
-      finally
-      {
-        if( syncRoot != null )
-        {
-          Monitor.Exit( syncRoot );
-        }
-      }
-    }
-
-    internal void Dispose( bool disposing )
-    {
-      var syncRoot = this.SyncRoot;
-      if( syncRoot != null )
-      {
-        Monitor.Enter( syncRoot );
-      }
-
-      try
-      {
-        this.Decrement();
-
-        if( this.IsDeferred )
-          return;
-
-        this.OnDeferEnding( disposing );
-      }
-      finally
-      {
-        if( syncRoot != null )
-        {
-          Monitor.Exit( syncRoot );
-        }
-      }
-
-      this.OnDeferEnded( disposing );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DepthFirstSearchTreeTraversal.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DepthFirstSearchTreeTraversal.cs
deleted file mode 100644
index 275e161e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DepthFirstSearchTreeTraversal.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-
-namespace Xceed.Utils.Wpf
-{
-  internal sealed class DepthFirstSearchTreeTraversal : ITreeTraversal
-  {
-    #region Current Property
-
-    public DependencyObject Current
-    {
-      get
-      {
-        if( m_current == null )
-          throw new InvalidOperationException();
-
-        return m_current;
-      }
-    }
-
-    private DependencyObject m_current; //null
-
-    #endregion
-
-    public bool MoveNext()
-    {
-      var lastIndex = m_collection.Count - 1;
-      if( lastIndex >= 0 )
-      {
-        m_current = m_collection[ lastIndex ];
-        m_collection.RemoveAt( lastIndex );
-        return true;
-      }
-      else
-      {
-        m_current = null;
-        return false;
-      }
-    }
-
-    public void VisitNodes( IEnumerable<DependencyObject> nodes )
-    {
-      if( nodes == null )
-        return;
-
-      m_collection.AddRange( nodes.Reverse() );
-    }
-
-    #region Private Fields
-
-    private readonly List<DependencyObject> m_collection = new List<DependencyObject>();
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DepthFirstSearchTreeTraversalStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DepthFirstSearchTreeTraversalStrategy.cs
deleted file mode 100644
index 60e84389..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DepthFirstSearchTreeTraversalStrategy.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Utils.Wpf
-{
-  internal sealed class DepthFirstSearchTreeTraversalStrategy : ITreeTraversalStrategy
-  {
-    public ITreeTraversal Create()
-    {
-      return new DepthFirstSearchTreeTraversal();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherDisposable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherDisposable.cs
deleted file mode 100644
index af6454f0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherDisposable.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Threading;
-using System.Windows;
-using System.Windows.Threading;
-
-namespace Xceed.Utils.Wpf
-{
-  internal abstract class DispatcherDisposable : DependencyObject, IDisposable
-  {
-    #region Static Fields
-
-    private static readonly object IsAlive = new object();
-
-    #endregion
-
-    public void Dispose()
-    {
-      this.Dispose( true );
-      GC.SuppressFinalize( this );
-    }
-
-    protected void Dispose( bool disposing )
-    {
-      // Make sure we are only disposing once.
-      if( Interlocked.Exchange( ref m_isAlive, null ) == null )
-        return;
-
-      // We must not try to use managed objects since we have no clue whatever they have been
-      // garbage collected before the current object or not.
-      if( !disposing )
-        return;
-
-      // We ask the derived class for a delegate instead of calling a protected method directly
-      // because the current object could be garbage collected before the dispatcher calls the delegate.
-      // We want to avoid calling a method on a object that is no longer valid.  Instead, we ask
-      // the derived class to generate a delegate that will do the dispose.  For example, the delegate
-      // could be a lambda that encapsulate the fields in a closure.
-      var d = this.GetDisposeDelegate();
-      if( d == null )
-        return;
-
-      if( object.ReferenceEquals( d.Target, this ) )
-        throw new InvalidOperationException( "The dispose delegate must not target the disposable object." );
-
-      var dispatcher = this.GetDisposeDispatcher() ?? this.Dispatcher;
-      if( ( dispatcher == null ) || dispatcher.HasShutdownStarted || dispatcher.HasShutdownFinished )
-        return;
-
-      if( dispatcher.CheckAccess() )
-      {
-        d.Invoke( disposing );
-      }
-      else
-      {
-        dispatcher.BeginInvoke( d, DispatcherPriority.Send, disposing );
-      }
-    }
-
-    protected abstract Action<bool> GetDisposeDelegate();
-
-    protected virtual Dispatcher GetDisposeDispatcher()
-    {
-      return this.Dispatcher;
-    }
-
-    // This class does not cleanup unmanaged resource, so it does not need a finalizer.
-    //~DispatcherDisposable()
-    //{
-    //  this.Dispose( false );
-    //}
-
-    private object m_isAlive = DispatcherDisposable.IsAlive;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherHelper.cs
deleted file mode 100644
index fa35b536..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherHelper.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Threading;
-
-namespace Xceed.Utils.Wpf
-{
-  internal static class DispatcherHelper
-  {
-    private static object ExitFrame( object state )
-    {
-      DispatcherFrame frame = state as DispatcherFrame;
-      frame.Continue = false;
-      return null;
-    }
-
-    private static DispatcherOperationCallback ExitFrameCallback = new
-             DispatcherOperationCallback( DispatcherHelper.ExitFrame );
-
-    public static void DoEvents( Dispatcher dispatcher )
-    {
-      if( dispatcher == null )
-        throw new ArgumentNullException( "dispatcher" );
-
-      DispatcherFrame nestedFrame = new DispatcherFrame();
-
-      DispatcherOperation exitOperation = dispatcher.BeginInvoke( 
-        DispatcherPriority.Background,
-        DispatcherHelper.ExitFrameCallback,
-        nestedFrame );
-
-      Dispatcher.PushFrame( nestedFrame );
-
-      if( exitOperation.Status != DispatcherOperationStatus.Completed )
-        exitOperation.Abort();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/AutoScrollManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/AutoScrollManager.cs
deleted file mode 100644
index f086d803..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/AutoScrollManager.cs
+++ /dev/null
@@ -1,294 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-
-namespace Xceed.Utils.Wpf.DragDrop
-{
-  internal sealed class AutoScrollManager : DependencyObject
-  {
-    #region Static Fields
-
-    internal static readonly TimeSpan AutoScrollInterval_DefaultValue = TimeSpan.FromMilliseconds( 50d );
-    internal const int AutoScrollThreshold_DefaultValue = 5;
-
-    #endregion
-
-    internal AutoScrollManager( ScrollViewer scrollViewer )
-    {
-      if( scrollViewer == null )
-        throw new ArgumentNullException( "scrollViewer" );
-
-      m_scrollViewer = scrollViewer;
-
-      m_timer = new System.Windows.Threading.DispatcherTimer();
-      m_timer.Interval = AutoScrollManager.AutoScrollInterval_DefaultValue;
-      m_timer.Tick += new EventHandler( this.OnAutoScrollTimer_Tick );
-
-      this.AutoScrollInterval = AutoScrollManager.AutoScrollInterval_DefaultValue;
-      this.AutoScrollThreshold = AutoScrollManager.AutoScrollThreshold_DefaultValue;
-    }
-
-    #region AutoScrollInterval Property
-
-    internal TimeSpan AutoScrollInterval
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region AutoScrollThreshold Property
-
-    internal int AutoScrollThreshold
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ScrollViewer Internal Property
-
-    internal ScrollViewer ScrollViewer
-    {
-      get
-      {
-        return m_scrollViewer;
-      }
-    }
-
-    #endregion
-
-    #region AutoScrolled Internal Event
-
-    internal event EventHandler AutoScrolled;
-
-    private void OnAutoScrolled()
-    {
-      var handler = this.AutoScrolled;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    #endregion
-
-    internal void Start()
-    {
-      m_isStarted = true;
-    }
-
-    internal void Stop()
-    {
-      m_isStarted = false;
-      m_timer.Stop();
-    }
-
-    internal void HandleMouseMove( MouseEventArgs e )
-    {
-      if( !m_isStarted )
-        return;
-
-      this.HandleMove( e.GetPosition );
-    }
-
-    internal void HandleMove( Func<IInputElement, Point> getCursorPosition )
-    {
-      if( !m_isStarted )
-        return;
-
-      var position = getCursorPosition.Invoke( m_scrollViewer );
-      var renderSize = m_scrollViewer.RenderSize;
-      var treshold = this.AutoScrollThreshold;
-      var horizontalSpeed = 0d;
-      var verticalSpeed = 0d;
-
-      m_autoScrollDirection = AutoScrollDirection.None;
-
-      if( ( m_scrollViewer.ScrollableWidth > 0d ) && ( m_scrollViewer.ViewportWidth > 0d ) )
-      {
-        var distance = 0d;
-
-        if( ( position.X < treshold ) && ( m_scrollViewer.HorizontalOffset > 0d ) )
-        {
-          m_autoScrollDirection |= AutoScrollDirection.Left;
-          distance = position.X - treshold;
-        }
-        else if( ( position.X > renderSize.Width - treshold ) && ( m_scrollViewer.HorizontalOffset < m_scrollViewer.ScrollableWidth ) )
-        {
-          m_autoScrollDirection |= AutoScrollDirection.Right;
-          distance = position.X - ( renderSize.Width - treshold );
-        }
-
-        horizontalSpeed = distance / m_scrollViewer.ViewportWidth;
-      }
-
-      if( ( m_scrollViewer.ScrollableHeight > 0d ) && ( m_scrollViewer.ViewportHeight > 0d ) )
-      {
-        var distance = 0d;
-
-        if( ( position.Y < treshold ) && ( m_scrollViewer.VerticalOffset > 0d ) )
-        {
-          m_autoScrollDirection |= AutoScrollDirection.Up;
-          distance = position.Y - treshold;
-        }
-        else if( ( position.Y > renderSize.Height - treshold ) && ( m_scrollViewer.VerticalOffset < m_scrollViewer.ScrollableHeight ) )
-        {
-          m_autoScrollDirection |= AutoScrollDirection.Down;
-          distance = position.Y - ( renderSize.Height - treshold );
-        }
-
-        verticalSpeed = distance / m_scrollViewer.ViewportHeight;
-      }
-
-      m_scrollSpeed = new Vector( horizontalSpeed, verticalSpeed );
-
-      if( m_autoScrollDirection == AutoScrollDirection.None )
-      {
-        m_timer.Stop();
-      }
-      else
-      {
-        // The DispatcherTimer is not a priority event. The Tick event won't fire while the user moves the mouse pointer. That's why we manually call the 
-        // PerformAutoScroll method (on each MouseMove, i.e. Drag). When the user doesn't move the mouse pointer, the timer will take over to do the AutoScroll.
-        if( !m_timer.IsEnabled )
-        {
-          m_timer.Start();
-        }
-
-        this.PerformAutoScroll();
-      }
-    }
-
-    private void PerformAutoScroll()
-    {
-      if( !m_timer.IsEnabled )
-        return;
-
-      var elapsedTime = DateTime.UtcNow - m_timestamp;
-      if( elapsedTime < this.AutoScrollInterval )
-        return;
-
-      var scaleFactor = Matrix.Identity;
-      scaleFactor.Scale( m_scrollViewer.ViewportWidth, m_scrollViewer.ViewportHeight );
-
-      var scrollUnits = m_scrollSpeed * scaleFactor;
-
-      if( ( m_autoScrollDirection & AutoScrollDirection.Left ) == AutoScrollDirection.Left )
-      {
-        if( m_scrollSpeed.X <= -1d )
-        {
-          m_scrollViewer.PageLeft();
-        }
-        else
-        {
-          var unit = System.Math.Min( -1d, scrollUnits.X );
-          var offset = System.Math.Max( 0d, m_scrollViewer.HorizontalOffset + unit );
-
-          m_scrollViewer.ScrollToHorizontalOffset( offset );
-        }
-      }
-      else if( ( m_autoScrollDirection & AutoScrollDirection.Right ) == AutoScrollDirection.Right )
-      {
-        if( m_scrollSpeed.X >= 1d )
-        {
-          m_scrollViewer.PageRight();
-        }
-        else
-        {
-          var unit = System.Math.Max( 1d, scrollUnits.X );
-          var offset = System.Math.Min( m_scrollViewer.ScrollableWidth, m_scrollViewer.HorizontalOffset + unit );
-
-          m_scrollViewer.ScrollToHorizontalOffset( offset );
-        }
-      }
-
-      if( ( m_autoScrollDirection & AutoScrollDirection.Up ) == AutoScrollDirection.Up )
-      {
-        if( m_scrollSpeed.Y <= -1d )
-        {
-          m_scrollViewer.PageUp();
-        }
-        else
-        {
-          var unit = System.Math.Min( -1d, scrollUnits.Y );
-          var offset = System.Math.Max( 0d, m_scrollViewer.VerticalOffset + unit );
-
-          m_scrollViewer.ScrollToVerticalOffset( offset );
-        }
-      }
-      else if( ( m_autoScrollDirection & AutoScrollDirection.Down ) == AutoScrollDirection.Down )
-      {
-        if( m_scrollSpeed.Y >= 1d )
-        {
-          m_scrollViewer.PageDown();
-        }
-        else
-        {
-          var unit = System.Math.Max( 1d, scrollUnits.Y );
-          var offset = System.Math.Min( m_scrollViewer.ScrollableHeight, m_scrollViewer.VerticalOffset + unit );
-
-          m_scrollViewer.ScrollToVerticalOffset( offset );
-        }
-      }
-
-      m_timestamp = DateTime.UtcNow;
-
-      this.OnAutoScrolled();
-    }
-
-    private void OnAutoScrollTimer_Tick( object sender, EventArgs e )
-    {
-      if( m_isStarted )
-      {
-        this.PerformAutoScroll();
-      }
-      else
-      {
-        ( ( DispatcherTimer )sender ).Stop();
-      }
-    }
-
-    private AutoScrollDirection m_autoScrollDirection = AutoScrollDirection.None;
-    private readonly ScrollViewer m_scrollViewer;
-    private readonly DispatcherTimer m_timer;
-    private DateTime m_timestamp;
-    private Vector m_scrollSpeed = new Vector( 0d, 0d );
-    private bool m_isStarted; //false
-
-    #region AutoScrollManager Private Enum
-
-    [Flags()]
-    private enum AutoScrollDirection
-    {
-      None = 0,
-      Left = 1,
-      Right = 2,
-      Up = 4,
-      Down = 8
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs
deleted file mode 100644
index 28d23454..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Input;
-using Xceed.Wpf.DataGrid;
-
-namespace Xceed.Utils.Wpf.DragDrop
-{
-  internal static class DragDropHelper
-  {
-    internal static bool IsMouseMoveDrag( Point initialPosition, Point currentPosition )
-    {
-      var dragRect = new Rect(
-        initialPosition.X - SystemParameters.MinimumHorizontalDragDistance,
-        initialPosition.Y - SystemParameters.MinimumVerticalDragDistance,
-        SystemParameters.MinimumHorizontalDragDistance * 2,
-        SystemParameters.MinimumVerticalDragDistance * 2 );
-
-      return !dragRect.Contains( currentPosition );
-    }
-
-    internal static IEnumerable<DropTargetInfo> GetDropTargetAtPoint(
-      UIElement draggedElement,
-      UIElement container,
-      MouseEventArgs e )
-    {
-      return DragDropHelper.GetDropTargetAtPoint( draggedElement, container, e.GetPosition );
-    }
-
-    internal static IEnumerable<DropTargetInfo> GetDropTargetAtPoint(
-      UIElement draggedElement,
-      UIElement container,
-      Func<IInputElement, Point> getPosition )
-    {
-      if( container == null )
-        yield break;
-
-      var mousePosition = new RelativePoint( container, getPosition.Invoke( container ) );
-      var hitTest = container.InputHitTest( mousePosition.GetPoint( container ) );
-      if( hitTest == null )
-        yield break;
-
-      var parent = hitTest as DependencyObject;
-
-      while( parent != null )
-      {
-        var dropTarget = parent as IDropTarget;
-        if( dropTarget != null )
-        {
-          var element = parent as UIElement;
-          if( element != null )
-          {
-            var dropTargetPosition = mousePosition.TranslateTo( element );
-            var canDrop = dropTarget.CanDropElement( draggedElement, dropTargetPosition );
-
-            yield return new DropTargetInfo( dropTarget, dropTargetPosition, canDrop );
-          }
-        }
-
-        parent = Xceed.Utils.Wpf.TreeHelper.GetParent( parent );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs
deleted file mode 100644
index a99b3e70..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Wpf.DataGrid;
-
-namespace Xceed.Utils.Wpf.DragDrop
-{
-  internal class DragSourceManager : DragSourceManagerBase
-  {
-    internal DragSourceManager( UIElement draggedElement, AdornerLayer adornerLayer, UIElement container )
-      : base( draggedElement, adornerLayer, container )
-    {
-    }
-
-    #region CurrentDropTarget Protected Property
-
-    protected IDropTarget CurrentDropTarget
-    {
-      get
-      {
-        return m_currentDropTarget;
-      }
-    }
-
-    private void SetCurrentDropTarget( IDropTarget value, RelativePoint mousePosition, bool raiseDragEvents )
-    {
-      if( value == m_currentDropTarget )
-        return;
-
-      var element = this.DraggedElement;
-
-      if( m_currentDropTarget != null )
-      {
-        if( raiseDragEvents )
-        {
-          m_currentDropTarget.DragLeave( element );
-        }
-
-        m_currentDropTarget = null;
-      }
-
-      if( ( value != null ) && value.CanDropElement( element, mousePosition ) )
-      {
-        m_currentDropTarget = value;
-
-        if( raiseDragEvents )
-        {
-          m_currentDropTarget.DragEnter( element );
-        }
-      }
-
-      this.OnPropertyChanged( "CurrentDropTarget" );
-    }
-
-    private IDropTarget m_currentDropTarget; //null
-
-    #endregion
-
-    #region CurrentDropTargetToContainerPosition Protected Property
-
-    protected RelativePoint? CurrentDropTargetToContainerPosition
-    {
-      get
-      {
-        return m_currentDropTargetToContainerPosition;
-      }
-      private set
-      {
-        if( value == m_currentDropTargetToContainerPosition )
-          return;
-
-        m_currentDropTargetToContainerPosition = value;
-
-        this.OnPropertyChanged( "CurrentDropTargetToContainerPosition" );
-      }
-    }
-
-    private RelativePoint? m_currentDropTargetToContainerPosition; //null
-
-    #endregion
-
-    #region DropOutsideCursor Internal Property
-
-    internal Cursor DropOutsideCursor
-    {
-      get
-      {
-        return m_dropOutsideCursor;
-      }
-      set
-      {
-        if( value == m_dropOutsideCursor )
-          return;
-
-        m_dropOutsideCursor = value;
-
-        this.OnPropertyChanged( "DropOutsideCursor" );
-      }
-    }
-
-    private Cursor m_dropOutsideCursor; //null
-
-    #endregion
-
-    #region DragOutsideQueryCursor Internal Event
-
-    internal event QueryCursorEventHandler DragOutsideQueryCursor;
-
-    private void OnDragOutsideQueryCursor( QueryCursorEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = true;
-
-      e.Cursor = m_dropOutsideCursor ?? Cursors.No;
-
-      var handler = this.DragOutsideQueryCursor;
-      if( handler != null )
-      {
-        handler.Invoke( this, e );
-      }
-    }
-
-    #endregion
-
-    #region DroppedOutside Internal Event
-
-    internal event EventHandler DroppedOutside;
-
-    protected virtual void OnDroppedOutside()
-    {
-      var handler = this.DroppedOutside;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    #endregion
-
-    protected override void OnDragStart( Func<IInputElement, Point> getPosition )
-    {
-      base.OnDragStart( getPosition );
-
-      var element = this.DraggedElement;
-      element.QueryCursor += new QueryCursorEventHandler( this.OnDraggedElementQueryCursor );
-
-      Debug.Assert( element.IsMouseCaptured, "The mouse should have be captured by the dragged element." );
-    }
-
-    protected override void OnDragEnd( Func<IInputElement, Point> getPosition, bool drop )
-    {
-      var element = this.DraggedElement;
-      element.QueryCursor -= new QueryCursorEventHandler( this.OnDraggedElementQueryCursor );
-
-      base.OnDragEnd( getPosition, drop );
-    }
-
-    protected override void OnDragMove( Func<IInputElement, Point> getPosition )
-    {
-      base.OnDragMove( getPosition );
-
-      var dropTargetInfo = this.GetDropTarget( getPosition );
-
-      this.CurrentDropTargetToContainerPosition = dropTargetInfo.Position;
-      this.SetCurrentDropTarget( dropTargetInfo.Target, dropTargetInfo.Position.GetValueOrDefault(), true );
-
-      var dropTarget = this.CurrentDropTarget;
-      if( dropTarget != null )
-      {
-        this.OnDragOver( dropTarget, getPosition );
-      }
-    }
-
-    protected override void OnDragCancel( Func<IInputElement, Point> getPosition )
-    {
-      var dropTarget = this.CurrentDropTarget;
-      if( dropTarget != null )
-      {
-        dropTarget.DragLeave( this.DraggedElement );
-        this.SetCurrentDropTarget( null, default( RelativePoint ), false );
-      }
-      else
-      {
-        this.OnDroppedOutside();
-      }
-
-      base.OnDragCancel( getPosition );
-    }
-
-    protected override void OnDrop( Func<IInputElement, Point> getPosition )
-    {
-      var dropTarget = this.CurrentDropTarget;
-      if( dropTarget != null )
-      {
-        var element = dropTarget as UIElement;
-        if( element != null )
-        {
-          var mousePosition = new RelativePoint( element, getPosition.Invoke( element ) );
-
-          dropTarget.Drop( this.DraggedElement, mousePosition );
-        }
-
-        this.SetCurrentDropTarget( null, default( RelativePoint ), false );
-      }
-      else
-      {
-        this.OnDroppedOutside();
-      }
-
-      base.OnDrop( getPosition );
-    }
-
-    protected virtual void OnDragOver( IDropTarget target, Func<IInputElement, Point> getPosition )
-    {
-      if( target == null )
-        throw new ArgumentNullException( "target" );
-
-      if( getPosition == null )
-        throw new ArgumentNullException( "getPosition" );
-
-      var element = target as UIElement;
-      if( element == null )
-        return;
-
-      target.DragOver( this.DraggedElement, new RelativePoint( element, getPosition.Invoke( element ) ) );
-    }
-
-    protected override void ValidateMouseEventArgs( MouseEventArgs e )
-    {
-      base.ValidateMouseEventArgs( e );
-
-      var element = this.DraggedElement;
-      var source = e.Source as DependencyObject;
-
-      while( source != null )
-      {
-        if( source == element )
-          break;
-
-        source = VisualTreeHelper.GetParent( source );
-      }
-
-      Debug.Assert( ( source != null ), "The Source of the " + e.RoutedEvent.Name + " event is NOT the UIElement that was passed to the ctor of this DragSourceManager OR one of its children." );
-    }
-
-    protected virtual DropTargetInfo GetDropTarget( Func<IInputElement, Point> getPosition )
-    {
-      foreach( var info in DragDropHelper.GetDropTargetAtPoint( this.DraggedElement, this.Container, getPosition ) )
-      {
-        if( !info.CanDrop )
-          continue;
-
-        // ColumnManagerRow was defined as IDropTarget only because Animated Column Reordering required it, ignore it in base class
-        if( info.Target is ColumnManagerRow )
-          break;
-
-        return info;
-      }
-
-      return new DropTargetInfo( null, null, false );
-    }
-
-    private void OnDraggedElementQueryCursor( object sender, QueryCursorEventArgs e )
-    {
-      if( !this.IsDragging )
-        return;
-
-      var dropTarget = this.CurrentDropTarget;
-      if( dropTarget != null )
-      {
-        var element = dropTarget as UIElement;
-        if( element != null )
-        {
-          var dropPoint = e.GetPosition( element );
-          if( dropTarget.CanDropElement( this.DraggedElement, new RelativePoint( element, dropPoint ) ) )
-            return;
-        }
-      }
-
-      this.OnDragOutsideQueryCursor( e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManagerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManagerBase.cs
deleted file mode 100644
index 02522557..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManagerBase.cs
+++ /dev/null
@@ -1,710 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-using Xceed.Wpf.DataGrid;
-
-namespace Xceed.Utils.Wpf.DragDrop
-{
-    internal class DragSourceManagerBase : DependencyObject, INotifyPropertyChanged
-    {
-        internal DragSourceManagerBase(UIElement draggedElement, AdornerLayer adornerLayer, UIElement container)
-          : this(draggedElement, adornerLayer, container, true)
-        {
-        }
-
-        internal DragSourceManagerBase(UIElement draggedElement, AdornerLayer adornerLayer, UIElement container, bool enableAutoScroll)
-          : this(draggedElement, adornerLayer, container, enableAutoScroll, true)
-        {
-        }
-
-        internal DragSourceManagerBase(UIElement draggedElement, AdornerLayer adornerLayer, UIElement container, bool enableAutoScroll, bool showGhost)
-        {
-            if (draggedElement == null)
-                throw new ArgumentNullException("draggedElement");
-
-            if (container == null)
-                throw new ArgumentNullException("container");
-
-            m_draggedElement = draggedElement;
-            m_container = container;
-            m_adornerLayer = (adornerLayer != null) ? adornerLayer : AdornerLayer.GetAdornerLayer(container);
-            m_showGhost = showGhost;
-
-            if (enableAutoScroll)
-            {
-                var scrollViewer = DragSourceManagerBase.GetScrollViewer(draggedElement);
-                if (scrollViewer != null)
-                {
-                    m_autoScrollManager = new AutoScrollManager(scrollViewer);
-                }
-            }
-        }
-
-        #region IsDragging Property
-
-        internal bool IsDragging
-        {
-            get
-            {
-                return m_isDragging;
-            }
-            private set
-            {
-                if (value == m_isDragging)
-                    return;
-
-                m_isDragging = value;
-
-                this.OnPropertyChanged("IsDragging");
-            }
-        }
-
-        private bool m_isDragging;
-
-        #endregion
-
-        #region IsDragStarted Property
-
-        internal bool IsDragStarted
-        {
-            get
-            {
-                return m_isDragStarted;
-            }
-            private set
-            {
-                if (value == m_isDragStarted)
-                    return;
-
-                m_isDragStarted = value;
-
-                this.OnPropertyChanged("IsDragStarted");
-            }
-        }
-
-        private bool m_isDragStarted;
-
-        #endregion
-
-        #region ShowGhost Property
-
-        internal bool ShowGhost
-        {
-            get
-            {
-                return m_showGhost;
-            }
-            set
-            {
-                if (value == m_showGhost)
-                    return;
-
-                m_showGhost = value;
-
-                this.OnPropertyChanged("ShowGhost");
-            }
-        }
-
-        private bool m_showGhost;
-
-        #endregion
-
-        #region AutoScrollInterval Property
-
-        internal static readonly DependencyProperty AutoScrollIntervalProperty = DependencyProperty.Register(
-          "AutoScrollInterval",
-          typeof(TimeSpan),
-          typeof(DragSourceManagerBase),
-          new FrameworkPropertyMetadata(AutoScrollManager.AutoScrollInterval_DefaultValue, DragSourceManagerBase.OnAutoScrollIntervalChanged));
-
-        internal TimeSpan AutoScrollInterval
-        {
-            get
-            {
-                return (TimeSpan)this.GetValue(DragSourceManagerBase.AutoScrollIntervalProperty);
-            }
-            set
-            {
-                this.SetValue(DragSourceManagerBase.AutoScrollIntervalProperty, value);
-            }
-        }
-
-        private void OnAutoScrollIntervalChanged(TimeSpan oldValue, TimeSpan newValue)
-        {
-            if (m_autoScrollManager == null)
-                return;
-
-            m_autoScrollManager.AutoScrollInterval = newValue;
-        }
-
-        private static void OnAutoScrollIntervalChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-        {
-            var self = sender as DragSourceManagerBase;
-            if (self == null)
-                return;
-
-            self.OnAutoScrollIntervalChanged((TimeSpan)e.OldValue, (TimeSpan)e.NewValue);
-        }
-
-        #endregion
-
-        #region AutoScrollThreshold Property
-
-        public static readonly DependencyProperty AutoScrollThresholdProperty = DependencyProperty.Register(
-          "AutoScrollThreshold",
-          typeof(int),
-          typeof(DragSourceManagerBase),
-          new FrameworkPropertyMetadata(AutoScrollManager.AutoScrollThreshold_DefaultValue, DragSourceManagerBase.OnAutoScrollThresholdChanged));
-
-        public int AutoScrollThreshold
-        {
-            get
-            {
-                return (int)this.GetValue(DragSourceManagerBase.AutoScrollThresholdProperty);
-            }
-            set
-            {
-                this.SetValue(DragSourceManagerBase.AutoScrollThresholdProperty, value);
-            }
-        }
-
-        private void OnAutoScrollThresholdChanged(int oldValue, int newValue)
-        {
-            if (m_autoScrollManager == null)
-                return;
-
-            m_autoScrollManager.AutoScrollThreshold = newValue;
-        }
-
-        private static void OnAutoScrollThresholdChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-        {
-            var self = sender as DragSourceManagerBase;
-            if (self == null)
-                return;
-
-            self.OnAutoScrollThresholdChanged((int)e.OldValue, (int)e.NewValue);
-        }
-
-        #endregion
-
-        #region AdornerLayer Protected Property
-
-        protected AdornerLayer AdornerLayer
-        {
-            get
-            {
-                return m_adornerLayer;
-            }
-        }
-
-        private readonly AdornerLayer m_adornerLayer;
-
-        #endregion
-
-        #region DraggedElement Protected Property
-
-        protected UIElement DraggedElement
-        {
-            get
-            {
-                return m_draggedElement;
-            }
-        }
-
-        private readonly UIElement m_draggedElement;
-
-        #endregion
-
-        #region Container Protected Property
-
-        protected UIElement Container
-        {
-            get
-            {
-                return m_container;
-            }
-        }
-
-        private readonly UIElement m_container;
-
-        #endregion
-
-        #region IsPopup Protected Property
-
-        protected bool IsPopup
-        {
-            get
-            {
-                return m_isPopup;
-            }
-        }
-
-        private bool m_isPopup;
-
-        #endregion
-
-        #region InitialMousePositionToDraggedElement Protected Property
-
-        protected Point? InitialMousePositionToDraggedElement
-        {
-            get
-            {
-                return m_initialMousePositionToDraggedElement;
-            }
-        }
-
-        private Point? m_initialMousePositionToDraggedElement;
-
-        #endregion
-
-        #region InitialMousePositionToAdorner Protected Property
-
-        protected Point? InitialMousePositionToAdorner
-        {
-            get
-            {
-                return m_initialMousePositionToAdorner;
-            }
-        }
-
-        private Point? m_initialMousePositionToAdorner;
-
-        #endregion
-
-        protected virtual void OnDragStart(Func<IInputElement, Point> getPosition)
-        {
-        }
-
-        protected virtual void OnDragEnd(Func<IInputElement, Point> getPosition, bool drop)
-        {
-            if (drop)
-            {
-                this.OnDrop(getPosition);
-            }
-            else
-            {
-                this.OnDragCancel(getPosition);
-            }
-        }
-
-        protected virtual void OnDragCancel(Func<IInputElement, Point> getPosition)
-        {
-        }
-
-        protected virtual void OnDragMove(Func<IInputElement, Point> getPosition)
-        {
-        }
-
-        protected virtual void OnDrop(Func<IInputElement, Point> getPosition)
-        {
-        }
-
-        protected virtual void UpdateGhost(Func<IInputElement, Point> getPosition)
-        {
-            if (m_isPopup || (m_draggedElementGhost == null))
-                return;
-
-            if (m_showGhost != m_draggedElementGhost.IsVisible)
-            {
-                if (m_showGhost)
-                {
-                    m_draggedElementGhost.Show();
-                }
-                else
-                {
-                    m_draggedElementGhost.Hide();
-                }
-            }
-
-            //Find the new ghost position based on the current mouse position.
-            var mousePosition = getPosition.Invoke(m_container);
-            var draggedElementPosition = Point.Subtract(mousePosition, m_draggedElementMouseOffset);
-
-            if (FrameworkElement.GetFlowDirection(m_container) != FlowDirection.LeftToRight)
-            {
-                draggedElementPosition.X += m_draggedElement.RenderSize.Width;
-            }
-
-            var draggedElementPositionOnScreen = m_container.PointToScreen(draggedElementPosition);
-
-            // When Windows fonts are magnified (via the Control Panel), the position returned by PointToScreen doesn't match perfectly to the coordinate used
-            // to translate a Window object.  We need to multiply the result by a zoom factor in order to place the Window at the mouse location.
-            var ghostPosition = new Point(draggedElementPositionOnScreen.X * m_mouseToScreenPositionFactor.X,
-                                           draggedElementPositionOnScreen.Y * m_mouseToScreenPositionFactor.Y);
-
-            m_draggedElementGhost.Left = ghostPosition.X;
-            m_draggedElementGhost.Top = ghostPosition.Y;
-        }
-
-        [Conditional("DEBUG")]
-        protected virtual void ValidateMouseEventArgs(MouseEventArgs e)
-        {
-        }
-
-        internal void DragStart(MouseEventArgs e)
-        {
-            if (e.Handled || m_isDragStarted || m_isReentrant || (e.LeftButton != MouseButtonState.Pressed))
-                return;
-
-            m_isReentrant = true;
-
-            try
-            {
-                this.ValidateMouseEventArgs(e);
-                this.DragStart(e.GetPosition);
-            }
-            finally
-            {
-                m_isReentrant = false;
-            }
-        }
-
-        internal void DragCancel(MouseEventArgs e)
-        {
-            if (e.Handled || !m_isDragStarted || m_isReentrant)
-                return;
-
-            m_isReentrant = true;
-
-            try
-            {
-                this.ValidateMouseEventArgs(e);
-                this.DragEnd(e.GetPosition, false);
-            }
-            finally
-            {
-                m_isReentrant = false;
-            }
-        }
-
-        internal void Drop(MouseEventArgs e)
-        {
-            if (e.Handled || !m_isDragStarted || m_isReentrant)
-                return;
-
-            m_isReentrant = true;
-
-            try
-            {
-                this.ValidateMouseEventArgs(e);
-                this.DragEnd(e.GetPosition, true);
-            }
-            finally
-            {
-                m_isReentrant = false;
-            }
-        }
-
-        internal void DragMove(MouseEventArgs e)
-        {
-            this.DragMove(e, false);
-        }
-
-        internal void DragMove(MouseEventArgs e, bool isCreatingCopy)
-        {
-            if (e.Handled || !m_isDragStarted || m_isReentrant || (e.LeftButton != MouseButtonState.Pressed))
-                return;
-
-            m_isReentrant = true;
-
-            try
-            {
-                this.ValidateMouseEventArgs(e);
-                this.DragMove(e.GetPosition, isCreatingCopy);
-
-                if (m_autoScrollManager != null)
-                {
-                    m_autoScrollManager.HandleMouseMove(e);
-                }
-            }
-            finally
-            {
-                m_isReentrant = false;
-            }
-        }
-
-        private static ScrollViewer GetScrollViewer(DependencyObject from)
-        {
-            while (from != null)
-            {
-                var scrollViewer = from as ScrollViewer;
-                if (scrollViewer != null)
-                    return scrollViewer;
-
-                from = VisualTreeHelper.GetParent(from);
-            }
-
-            return null;
-        }
-
-        private static FrameworkElement GetPopupOrWindow(DependencyObject from)
-        {
-            while (from != null)
-            {
-                var popup = from as Popup;
-                if (popup != null)
-                    return popup;
-
-                var window = from as Window;
-                if (window != null)
-                    return window;
-
-                from = TreeHelper.GetParent(from);
-            }
-
-            return null;
-        }
-
-        private static DependencyObject GetPopupParent(DependencyObject from)
-        {
-            while (from != null)
-            {
-                var popup = from as Popup;
-                if (popup != null)
-                {
-                    var parent = popup.Parent;
-                    if (parent != null)
-                        return parent;
-
-                    var target = popup.PlacementTarget;
-                    if (target != null)
-                        return target;
-                }
-
-                from = VisualTreeHelper.GetParent(from);
-            }
-
-            return null;
-        }
-
-        private static Vector CalculateMouseToScreenPositionFactor(FrameworkElement element)
-        {
-            if (element == null)
-                return new Vector(1d, 1d);
-
-            var source = PresentationSource.FromVisual(element);
-            if (source == null)
-            {
-                var parent = DragSourceManagerBase.GetPopupParent(element);
-                while (parent != null)
-                {
-                    source = PresentationSource.FromDependencyObject(parent);
-                    if (source != null)
-                        break;
-
-                    parent = DragSourceManagerBase.GetPopupParent(parent);
-                }
-            }
-
-            double x, y;
-
-            if (source != null)
-            {
-                var deviceUnits = source.CompositionTarget.TransformToDevice;
-                x = deviceUnits.M11;
-                y = deviceUnits.M22;
-            }
-            else
-            {
-                using (var hwnd = new HwndSource(new HwndSourceParameters()))
-                {
-                    var deviceUnits = hwnd.CompositionTarget.TransformToDevice;
-                    x = deviceUnits.M11;
-                    y = deviceUnits.M22;
-                }
-            }
-
-            return new Vector((x == 0d) ? 1d : 1d / x, (y == 0d) ? 1d : 1d / y);
-        }
-
-        private static Window CreateDraggedElementGhost(UIElement element, bool isCreatingCopy)
-        {
-            if (element == null)
-                return null;
-
-            TileBrush brush = null;
-
-            // Draw a copy of the element to make sure it won't be modified. 
-            // Used in MergedColumnEditor when recycling is active while dragging a cell far away.
-            if (isCreatingCopy)
-            {
-                var drawingVisual = new DrawingVisual();
-                using (var drawingContext = drawingVisual.RenderOpen())
-                {
-                    var visualBrush = new VisualBrush(element);
-                    drawingContext.DrawRectangle(visualBrush, null, new Rect(new Point(), new Size(element.RenderSize.Width, element.RenderSize.Height)));
-                }
-
-                float dpiX = 0f, dpiY = 0f;
-                //using( System.Drawing.Graphics graphics = System.Drawing.Graphics.FromHwnd( IntPtr.Zero ) )
-                //{
-                //  dpiX = graphics.DpiX;
-                //  dpiY = graphics.DpiY;
-                //}
-                var bitmapTarget = new RenderTargetBitmap((int)element.RenderSize.Width, (int)element.RenderSize.Height, dpiX, dpiY, PixelFormats.Default);
-                bitmapTarget.Render(drawingVisual);
-                brush = new ImageBrush(bitmapTarget);
-            }
-            else
-            {
-                brush = new VisualBrush(element);
-            }
-
-            brush.Opacity = 0.75d;
-            brush.Stretch = Stretch.None;
-            brush.AlignmentX = AlignmentX.Left;
-            brush.AlignmentY = AlignmentY.Top;
-
-            var rectangle = new Rectangle();
-            rectangle.Width = element.DesiredSize.Width;
-            rectangle.Height = element.DesiredSize.Height;
-            rectangle.Fill = brush;
-
-            var window = new Window();
-            window.Topmost = true;
-            window.WindowStyle = WindowStyle.None;
-            window.AllowsTransparency = true;
-            window.Background = null;
-            window.SizeToContent = SizeToContent.WidthAndHeight;
-            window.ShowInTaskbar = false;
-            window.IsHitTestVisible = false;
-            window.ShowActivated = false;
-            window.Focusable = false;
-            window.Left = 0;
-            window.Top = 0;
-            window.Content = rectangle;
-
-            //This will make sure the window follows what has been set on the parent grid.
-            var dataGridContext = DataGridControl.GetDataGridContext(element);
-            if (dataGridContext != null)
-            {
-                window.FlowDirection = dataGridContext.DataGridControl.FlowDirection;
-            }
-
-            return window;
-        }
-
-        private void DragStart(Func<IInputElement, Point> getPosition)
-        {
-            var parent = DragSourceManagerBase.GetPopupOrWindow(m_draggedElement);
-            var draggedElementPosition = getPosition.Invoke(m_draggedElement);
-
-            m_isPopup = (parent is Popup);
-            m_initialMousePositionToAdorner = (m_adornerLayer != null) ? getPosition.Invoke(m_adornerLayer) : default(Point?);
-            m_initialMousePositionToDraggedElement = draggedElementPosition;
-            m_mouseToScreenPositionFactor = DragSourceManagerBase.CalculateMouseToScreenPositionFactor(parent);
-            m_draggedElementMouseOffset = new Vector(draggedElementPosition.X, draggedElementPosition.Y);
-
-            if (m_autoScrollManager != null)
-            {
-                m_autoScrollManager.Start();
-            }
-
-            this.IsDragStarted = true;
-        }
-
-        private void DragEnd(Func<IInputElement, Point> getPosition, bool drop)
-        {
-            if (m_isDragging)
-            {
-                this.OnDragEnd(getPosition, drop);
-                this.IsDragging = false;
-            }
-
-            if (m_draggedElementGhost != null)
-            {
-                m_draggedElementGhost.Hide();
-                m_draggedElementGhost.Content = null;
-                m_draggedElementGhost.Close();
-                m_draggedElementGhost = null;
-            }
-
-            if (m_autoScrollManager != null)
-            {
-                m_autoScrollManager.Stop();
-            }
-
-            m_initialMousePositionToAdorner = default(Point?);
-            m_initialMousePositionToDraggedElement = default(Point?);
-
-            this.IsDragStarted = false;
-        }
-
-        private void DragMove(Func<IInputElement, Point> getPosition, bool isCreatingCopy)
-        {
-            if (!m_initialMousePositionToAdorner.HasValue)
-                return;
-
-            if (!m_isDragging)
-            {
-                var position = getPosition.Invoke(m_adornerLayer);
-
-                if (DragDropHelper.IsMouseMoveDrag(m_initialMousePositionToAdorner.Value, position))
-                {
-                    m_draggedElementGhost = DragSourceManagerBase.CreateDraggedElementGhost(m_draggedElement, isCreatingCopy);
-
-                    this.OnDragStart(getPosition);
-                    this.IsDragging = true;
-                }
-            }
-
-            if (m_isDragging)
-            {
-                this.OnDragMove(getPosition);
-                this.UpdateGhost(getPosition);
-            }
-        }
-
-        #region INotifyPropertyChanged Members
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            var handler = this.PropertyChanged;
-            if (handler == null)
-                return;
-
-            handler.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        protected sealed override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-            this.OnPropertyChanged(e.Property.Name);
-        }
-
-        #endregion
-
-        private readonly AutoScrollManager m_autoScrollManager;
-        private Window m_draggedElementGhost; //null
-        private Vector m_mouseToScreenPositionFactor = new Vector(1d, 1d);
-        private Vector m_draggedElementMouseOffset;
-        private bool m_isReentrant; //false
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DraggedElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DraggedElementAdorner.cs
deleted file mode 100644
index e5ed5bb9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DraggedElementAdorner.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Documents;
-using System.Windows;
-using System.Windows.Shapes;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-
-namespace Xceed.Utils.Wpf.DragDrop
-{
-  internal class DraggedElementAdorner : Adorner
-  {
-    public DraggedElementAdorner( UIElement adornedElement, AdornerLayer adornerLayer )
-      : base( adornedElement )
-    {
-      FrameworkElement element = this.AdornedElement as FrameworkElement;
-      FrameworkElement layer = adornerLayer as FrameworkElement;
-
-      if( ( element != null ) && ( layer != null ) && ( element.FlowDirection != layer.FlowDirection ) )
-      {
-        m_invertXAxis = true;
-      }
-    }
-
-    #region Offset Property
-
-    public static readonly DependencyProperty OffsetProperty = DependencyProperty.Register(
-      "Offset",
-      typeof( Point ),
-      typeof( DraggedElementAdorner ),
-      new FrameworkPropertyMetadata( new PropertyChangedCallback( DraggedElementAdorner.OnOffsetChanged ) ) );
-
-    public Point Offset
-    {
-      get
-      {
-        return ( Point )this.GetValue( DraggedElementAdorner.OffsetProperty );
-      }
-      set
-      {
-        this.SetValue( DraggedElementAdorner.OffsetProperty, value );
-      }
-    }
-
-    private static void OnOffsetChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DraggedElementAdorner adorner = sender as DraggedElementAdorner;
-
-      if( adorner == null )
-        return;
-
-      adorner.UpdatePosition();
-    }
-
-    #endregion
-
-    #region AdornedElementImage Property
-
-    public Rectangle AdornedElementImage
-    {
-      get
-      {
-        if( m_adornedElementImage == null )
-        {
-          m_adornedElementImage = this.InitializeAdornedElementImage();
-        }
-
-        return m_adornedElementImage;
-      }
-    }
-
-    #endregion
-
-    public void SetOffset( Point offset )
-    {
-      this.Offset = offset;
-    }
-
-    public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
-    {
-      GeneralTransformGroup transformGroup = new GeneralTransformGroup();
-
-      transformGroup.Children.Add( base.GetDesiredTransform( transform ) );
-      transformGroup.Children.Add( new TranslateTransform( ( m_invertXAxis == false ) ? this.Offset.X : -this.Offset.X, this.Offset.Y ) );
-
-      return transformGroup;
-    }
-
-    protected virtual Rectangle InitializeAdornedElementImage()
-    {
-      Rectangle rectangle = new Rectangle();
-      VisualBrush brush = new VisualBrush( this.AdornedElement );
-      brush.Opacity = 0.75;
-      brush.Stretch = Stretch.None;
-      brush.AlignmentX = AlignmentX.Left;
-      brush.AlignmentY = AlignmentY.Top;
-      rectangle.Fill = brush;
-
-      return rectangle;
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      this.AdornedElement.Measure( constraint );
-
-      return this.AdornedElement.RenderSize;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      this.AdornedElementImage.Width = finalSize.Width;
-      this.AdornedElementImage.Height = finalSize.Height;
-      this.AdornedElementImage.Arrange( new Rect( finalSize ) );
-
-      return finalSize;
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( index != 0 )
-        throw new ArgumentOutOfRangeException( "index", index, "Index must be zero: a DraggedElementAdorner can only have one child." );
-
-      return this.AdornedElementImage;
-    }
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return 1;
-      }
-    }
-
-    private void UpdatePosition()
-    {
-      AdornerLayer adornerLayer = this.Parent as AdornerLayer;
-
-      if( adornerLayer != null )
-      {
-        adornerLayer.Update( this.AdornedElement );
-      }
-    }
-
-    private Rectangle m_adornedElementImage;
-    private bool m_invertXAxis; // = false 
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DropTargetInfo.Struct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DropTargetInfo.Struct.cs
deleted file mode 100644
index 4aedcab9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DropTargetInfo.Struct.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using Xceed.Wpf.DataGrid;
-
-namespace Xceed.Utils.Wpf.DragDrop
-{
-  internal struct DropTargetInfo
-  {
-    public DropTargetInfo( IDropTarget target, RelativePoint? position, bool canDrop )
-    {
-      this.Target = target;
-      this.Position = position;
-      this.CanDrop = canDrop;
-    }
-
-    internal readonly IDropTarget Target;
-    internal readonly RelativePoint? Position;
-    internal readonly bool CanDrop;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs
deleted file mode 100644
index ac3a1b05..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 Xceed.Wpf.DataGrid;
-
-namespace Xceed.Utils.Wpf.DragDrop
-{
-  internal interface IDropTarget
-  {
-    bool CanDropElement( UIElement draggedElement, RelativePoint mousePosition );
-
-    void DragEnter( UIElement draggedElement );
-
-    void DragOver( UIElement draggedElement, RelativePoint mousePosition );
-
-    void DragLeave( UIElement draggedElement );
-
-    void Drop( UIElement draggedElement, RelativePoint mousePosition );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/ITreeTraversal.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/ITreeTraversal.cs
deleted file mode 100644
index ab1b021a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/ITreeTraversal.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Utils.Wpf
-{
-  internal interface ITreeTraversal
-  {
-    DependencyObject Current
-    {
-      get;
-    }
-
-    bool MoveNext();
-    void VisitNodes( IEnumerable<DependencyObject> nodes );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/ITreeTraversalStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/ITreeTraversalStrategy.cs
deleted file mode 100644
index fc0df99a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/ITreeTraversalStrategy.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Utils.Wpf
-{
-  internal interface ITreeTraversalStrategy
-  {
-    ITreeTraversal Create();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/Markup/XceedResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/Markup/XceedResourceDictionary.cs
deleted file mode 100644
index 58174876..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/Markup/XceedResourceDictionary.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Utils.Wpf.Markup
-{
-  [Browsable( false )]
-  [EditorBrowsable( EditorBrowsableState.Never )]
-  public sealed class XceedResourceDictionary : ResourceDictionary
-  {
-    #region XceedSource Property
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    public string XceedSource
-    {
-
-      get
-      {
-        return m_xceedSource;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "XceedSource" );
-
-        m_xceedSource = value;
-
-        string[] parsedArguments = m_xceedSource.Split( new char[] { ';' }, 2, StringSplitOptions.RemoveEmptyEntries );
-
-        if( parsedArguments.Length != 2 )
-          throw new ArgumentException( "Invalid URI format.", "XceedSource" );
-
-        string uriString =  parsedArguments[ 0 ] + 
-          ";;;" + parsedArguments[ 1 ];
-
-        this.Source = new Uri( uriString, UriKind.RelativeOrAbsolute );
-      }
-    }
-
-    private string m_xceedSource = string.Empty;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/TreeHelper.cs
deleted file mode 100644
index 6f6015a2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/TreeHelper.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-
-namespace Xceed.Utils.Wpf
-{
-  internal static class TreeHelper
-  {
-    /// <summary>
-    /// Tries its best to return the specified element's parent. It will 
-    /// try to find, in this order, the VisualParent, LogicalParent, LogicalTemplatedParent.
-    /// It only works for Visual, FrameworkElement or FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element to which to return the parent. It will only 
-    /// work if element is a Visual, a FrameworkElement or a FrameworkContentElement.</param>
-    /// <remarks>If the logical parent is not found (Parent), we check the TemplatedParent
-    /// (see FrameworkElement.Parent documentation). But, we never actually witnessed
-    /// this situation.</remarks>
-    public static DependencyObject GetParent( DependencyObject element )
-    {
-      return TreeHelper.GetParent( element, true );
-    }
-
-    private static DependencyObject GetParent( DependencyObject element, bool recurseIntoPopup )
-    {
-      if( recurseIntoPopup )
-      {
-        Popup popup = element as Popup;
-
-        if( ( popup != null ) && ( popup.PlacementTarget != null ) )
-          return popup.PlacementTarget;
-      }
-
-      Visual visual = element as Visual;
-      DependencyObject parent = ( visual == null ) ? null : VisualTreeHelper.GetParent( visual );
-
-      if( parent == null )
-      {
-        // No Visual parent. Check in the logical tree.
-        FrameworkElement fe = element as FrameworkElement;
-
-        if( fe != null )
-        {
-          parent = fe.Parent;
-
-          if( parent == null )
-          {
-            parent = fe.TemplatedParent;
-          }
-        }
-        else
-        {
-          FrameworkContentElement fce = element as FrameworkContentElement;
-
-          if( fce != null )
-          {
-            parent = fce.Parent;
-
-            if( parent == null )
-            {
-              parent = fce.TemplatedParent;
-            }
-          }
-        }
-      }
-
-      return parent;
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins. This element is not checked.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindParent<T>( DependencyObject startingObject ) where T : DependencyObject
-    {
-      return TreeHelper.FindParent<T>( startingObject, false, null );
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins.</param>
-    /// <param name="checkStartingObject">Should the specified startingObject be checked first.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindParent<T>( DependencyObject startingObject, bool checkStartingObject ) where T : DependencyObject
-    {
-      return TreeHelper.FindParent<T>( startingObject, checkStartingObject, null );
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins.</param>
-    /// <param name="checkStartingObject">Should the specified startingObject be checked first.</param>
-    /// <param name="additionalCheck">Provide a callback to check additional properties 
-    /// of the found elements. Can be left Null if no additional criteria are needed.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    /// <example>Button button = TreeHelper.FindParent&lt;Button&gt;( this, foundChild => foundChild.Focusable );</example>
-    public static T FindParent<T>( DependencyObject startingObject, bool checkStartingObject, Func<T, bool> additionalCheck ) where T : DependencyObject
-    {
-      return TreeHelper.FindParent<T>( startingObject, checkStartingObject, additionalCheck, null );
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins.</param>
-    /// <param name="checkStartingObject">Should the specified startingObject be checked first.</param>
-    /// <param name="additionalCheck">Provide a callback to check additional properties 
-    /// of the found elements. Can be left Null if no additional criteria are needed.</param>
-    /// <param name="scope">Should not search behond this parent. Scope value is excluded from the search</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    /// <example>Button button = TreeHelper.FindParent&lt;Button&gt;( this, foundChild => foundChild.Focusable );</example>
-    internal static T FindParent<T>( DependencyObject startingObject, bool checkStartingObject, Func<T, bool> additionalCheck, DependencyObject scope ) where T : DependencyObject
-    {
-      T foundElement;
-      DependencyObject parent = ( checkStartingObject ? startingObject : TreeHelper.GetParent( startingObject, true ) );
-
-      while( parent != null )
-      {
-        foundElement = parent as T;
-
-        if( foundElement != null )
-        {
-          if( additionalCheck == null )
-          {
-            return foundElement;
-          }
-          else
-          {
-            if( additionalCheck( foundElement ) )
-              return foundElement;
-          }
-        }
-
-        parent = TreeHelper.GetParent( parent, true );
-
-        if( object.ReferenceEquals( parent, scope ) )
-          break;
-
-      }
-
-      return null;
-    }
-
-    /// <summary>
-    /// This will search for a child of the specified type. The search is performed 
-    /// hierarchically, breadth first (as opposed to depth first).
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="parent">The root of the tree to search for. This element itself is not checked.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindChild<T>( DependencyObject parent ) where T : DependencyObject
-    {
-      return TreeHelper.FindChild<T>( parent, null );
-    }
-
-    /// <summary>
-    /// This will search for a child of the specified type. The search is performed 
-    /// hierarchically, breadth first (as opposed to depth first).
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="parent">The root of the tree to search for. This element itself is not checked.</param>
-    /// <param name="predicate">Provide a callback to check additional properties 
-    /// of the found elements. Can be left Null if no additional criteria are needed.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    /// <example>Button button = TreeHelper.FindChild&lt;Button&gt;( this, foundChild => foundChild.Focusable );</example>
-    public static T FindChild<T>( DependencyObject parent, Func<T, bool> predicate ) where T : DependencyObject
-    {
-      return TreeHelper.GetDescendants<T>( new BreadthFirstSearchTreeTraversalStrategy(), parent, predicate, null ).FirstOrDefault();
-    }
-
-    /// <summary>
-    /// Returns true if the specified element is a child of parent somewhere in the visual 
-    /// tree. This method will work for Visual, FrameworkElement and FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element that is potentially a child of the specified parent.</param>
-    /// <param name="parent">The element that is potentially a parent of the specified element.</param>
-    public static bool IsDescendantOf( DependencyObject element, DependencyObject parent )
-    {
-      return TreeHelper.IsDescendantOf( element, parent, true );
-    }
-
-    /// <summary>
-    /// Returns true if the specified element is a child of parent somewhere in the visual 
-    /// tree. This method will work for Visual, FrameworkElement and FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element that is potentially a child of the specified parent.</param>
-    /// <param name="parent">The element that is potentially a parent of the specified element.</param>
-    public static bool IsDescendantOf( DependencyObject element, DependencyObject parent, bool recurseIntoPopup )
-    {
-      while( element != null )
-      {
-        if( element == parent )
-          return true;
-
-        element = TreeHelper.GetParent( element, recurseIntoPopup );
-      }
-
-      return false;
-    }
-
-    public static IEnumerable<T> GetDescendants<T>( ITreeTraversalStrategy strategy, DependencyObject root ) where T : DependencyObject
-    {
-      return TreeHelper.GetDescendants<T>( strategy, root, null, null );
-    }
-
-    public static IEnumerable<T> GetDescendants<T>( ITreeTraversalStrategy strategy, DependencyObject root, Func<T, bool> predicate ) where T : class
-    {
-      return TreeHelper.GetDescendants<T>( strategy, root, predicate, null );
-    }
-
-    public static IEnumerable<T> GetDescendants<T>(
-      ITreeTraversalStrategy strategy,
-      DependencyObject root,
-      Func<T, bool> predicate,
-      Func<DependencyObject, bool> expand ) where T : class
-    {
-      if( strategy == null )
-        throw new ArgumentNullException( "strategy" );
-
-      if( root == null )
-        yield break;
-
-      var traversal = strategy.Create();
-      Debug.Assert( traversal != null );
-
-      traversal.VisitNodes( TreeHelper.GetChildren( root ) );
-
-      while( traversal.MoveNext() )
-      {
-        var current = traversal.Current;
-        var descendant = current as T;
-
-        if( ( descendant != null ) && ( ( predicate == null ) || predicate.Invoke( descendant ) ) )
-        {
-          yield return descendant;
-        }
-
-        if( ( expand == null ) || expand.Invoke( current ) )
-        {
-          traversal.VisitNodes( TreeHelper.GetChildren( current ) );
-        }
-      }
-    }
-
-    private static IEnumerable<DependencyObject> GetChildren( DependencyObject parent )
-    {
-      if( parent == null )
-        yield break;
-
-      var childrenCount = VisualTreeHelper.GetChildrenCount( parent );
-      for( int i = 0; i < childrenCount; i++ )
-      {
-        var child = VisualTreeHelper.GetChild( parent, i );
-        if( child != null )
-        {
-          yield return child;
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/XmlSerialization/XmlSerializableBaseType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/XmlSerialization/XmlSerializableBaseType.cs
deleted file mode 100644
index 89829d07..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/XmlSerialization/XmlSerializableBaseType.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Xml.Schema;
-using System.Xml;
-using System.ComponentModel;
-
-namespace Xceed.Utils.XmlSerialization
-{
-  /// <summary>
-  /// This class can serialize or desirialize the specified type, 
-  /// or any derived type, using an XmlSerializer.
-  /// 
-  /// To use this class, simply put an XmlElement attribute on the 
-  /// property to serialize and pass the type of this class to
-  /// the Type parameter of the XmlElement. This can also be used 
-  /// with the XmlArrayItem attribute.
-  /// </summary>
-  /// <typeparam name="T">The base type for the object to serialize or deserialize.</typeparam>
-  public class XmlSerializableBaseType<T> : IXmlSerializable
-  {
-    #region Implicit Operators
-
-    public static implicit operator XmlSerializableBaseType<T>( T item )
-    {
-      return ( item == null )
-        ? null
-        : new XmlSerializableBaseType<T>( item );
-    }
-
-    public static implicit operator T( XmlSerializableBaseType<T> item )
-    {
-      return ( item.Equals( default( T ) ) )
-        ? default( T )
-        : item.m_item;
-    }
-
-    #endregion Implicit Operators
-
-    #region CONSTRUCTORS
-
-    public XmlSerializableBaseType()
-    {
-    }
-
-    public XmlSerializableBaseType( T item )
-    {
-      m_item = item;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region IXmlSerializable Members
-
-    XmlSchema IXmlSerializable.GetSchema()
-    {
-      return null;
-    }
-
-    void IXmlSerializable.ReadXml( XmlReader reader )
-    {
-      Type type = XmlSerializableBaseType<T>.GetType( reader.GetAttribute( "type" ) );
-
-      reader.ReadStartElement();
-      m_item = ( T )new XmlSerializer( type ).Deserialize( reader );
-      reader.ReadEndElement();
-    }
-
-    void IXmlSerializable.WriteXml( XmlWriter writer )
-    {
-      Type type = m_item.GetType();
-
-      writer.WriteAttributeString( 
-        "type", string.Format( "{0}, {1}", type.FullName, type.Assembly.GetName().Name ) );
-
-      new XmlSerializer( type ).Serialize( writer, m_item );
-    }
-
-    #endregion IXmlSerializable Members
-
-    #region PRIVATE METHODS
-
-    private static Type GetType( string typeName )
-    {
-      if( mg_types.ContainsKey( typeName ) )
-        return mg_types[ typeName ];
-
-      Type type = null;
-      int commaPosition = typeName.IndexOf( ',' );
-
-      if( commaPosition > 0 )
-      {
-        type = Type.GetType( typeName.Substring( 0, commaPosition ) );
-      }
-
-      if( type == null )
-      {
-        type = Type.GetType( typeName );
-      }
-
-      if( type != null )
-        mg_types.Add( typeName, type );
-
-      return type;
-    }
-
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
-    private static Dictionary<string, Type> mg_types = new Dictionary<string, Type>();
-    private T m_item;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellContentBindingValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellContentBindingValidationRule.cs
deleted file mode 100644
index 16d229f5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellContentBindingValidationRule.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.ValidationRules
-{
-  public class CellContentBindingValidationRule : PassthroughCellValidationRule
-  {
-    public CellContentBindingValidationRule( ValidationRule validationRule )
-      : base( validationRule )
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorErrorValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorErrorValidationRule.cs
deleted file mode 100644
index 10f563a7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorErrorValidationRule.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.ValidationRules
-{
-  public class CellEditorErrorValidationRule : CellEditorValidationRule
-  {
-    public override ValidationResult Validate( object value, CultureInfo culture, CellValidationContext context, FrameworkElement cellEditor )
-    {
-      bool cellEditorHasError = ( cellEditor == null ) ? false : ( bool )cellEditor.GetValue( CellEditor.HasErrorProperty );
-
-      if( !cellEditorHasError )
-        return ValidationResult.ValidResult;
-
-      return new ValidationResult( false, "An invalid or incomplete value was provided." );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorValidationRule.cs
deleted file mode 100644
index d46bbe10..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorValidationRule.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid.ValidationRules
-{
-  public abstract class CellEditorValidationRule : CellValidationRule
-  {
-    protected CellEditorValidationRule()
-    {
-    }
-
-    public override sealed ValidationResult Validate( object value, CultureInfo culture, CellValidationContext context )
-    {
-      return this.Validate( value, culture, context, context.Cell.CellEditorBoundControl );
-    }
-
-    public abstract ValidationResult Validate(
-      object value,
-      CultureInfo culture,
-      CellValidationContext context,
-      FrameworkElement cellEditor );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellValidationRule.cs
deleted file mode 100644
index d7a11ec8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellValidationRule.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-
-namespace Xceed.Wpf.DataGrid.ValidationRules
-{
-  public abstract class CellValidationRule
-  {
-    protected CellValidationRule()
-    {
-    }
-
-    public abstract ValidationResult Validate(
-      object value,
-      CultureInfo culture,
-      CellValidationContext context );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/EventCellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/EventCellValidationRule.cs
deleted file mode 100644
index 29918006..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/EventCellValidationRule.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-
-namespace Xceed.Wpf.DataGrid.ValidationRules
-{
-  public class EventCellValidationRule : CellValidationRule
-  {
-    public EventCellValidationRule()
-    {
-    }
-
-    public override ValidationResult Validate( 
-      object value,
-      CultureInfo culture, 
-      CellValidationContext context )
-    {
-      if( this.Validating != null )
-      {
-        CellValidatingEventArgs cellValidatingEventArgs = 
-          new CellValidatingEventArgs( value, culture, context );
-
-        this.Validating( this, cellValidatingEventArgs );
-        return cellValidatingEventArgs.Result;
-      }
-
-      return ValidationResult.ValidResult;
-    }
-
-    public event EventHandler<CellValidatingEventArgs> Validating;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/PassthroughCellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/PassthroughCellValidationRule.cs
deleted file mode 100644
index b0f34c36..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/PassthroughCellValidationRule.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System;
-
-namespace Xceed.Wpf.DataGrid.ValidationRules
-{
-  public class PassthroughCellValidationRule : CellValidationRule
-  {
-    public PassthroughCellValidationRule()
-    {
-    }
-
-    public PassthroughCellValidationRule( ValidationRule validationRule )
-    {
-      m_validationRule = validationRule;
-    }
-
-    public override ValidationResult Validate( 
-      object value, 
-      CultureInfo culture, 
-      CellValidationContext context )
-    {
-      if( m_validationRule == null )
-        return ValidationResult.ValidResult;
-
-      return m_validationRule.Validate( value, culture );
-    }
-
-    public ValidationRule ValidationRule
-    {
-      get
-      {
-        return m_validationRule;
-      }
-
-      set
-      {
-        m_validationRule = value;
-      }
-    }
-
-    ValidationRule m_validationRule;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/SourceDataConverterValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/SourceDataConverterValidationRule.cs
deleted file mode 100644
index ec166a03..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/SourceDataConverterValidationRule.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Globalization;
-
-using Xceed.Wpf.DataGrid.Converters;
-
-namespace Xceed.Wpf.DataGrid.ValidationRules
-{
-  public class SourceDataConverterValidationRule : ValidationRule
-  {
-    public SourceDataConverterValidationRule( bool sourceSupportDBNull, Type targetType )
-    {
-      if( targetType == null )
-        throw new ArgumentNullException( "targetType" );
-
-      m_sourceSupportDBNull = sourceSupportDBNull;
-      m_targetType = targetType;
-    }
-
-    public override ValidationResult Validate( object value, CultureInfo culture )
-    {
-      SourceDataConverter converter = new SourceDataConverter( m_sourceSupportDBNull );
-
-      Exception exception;
-      converter.TryConvertBack( value, m_targetType, CultureInfo.InvariantCulture, culture, out exception );
-
-      if( exception != null )
-        return new ValidationResult( false, exception.Message );
-
-      return ValidationResult.ValidResult;
-    }
-
-    bool m_sourceSupportDBNull; // = false
-    Type m_targetType; // = null
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemIndexerDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemIndexerDescriptor.cs
deleted file mode 100644
index c41c0b71..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemIndexerDescriptor.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ValueChangeDataItemIndexerDescriptor : DataItemIndexerDescriptor
-  {
-    internal ValueChangeDataItemIndexerDescriptor(
-      DataItemTypeDescriptor owner,
-      IndexerDescriptor parent,
-      EventDescriptor eventDescriptor )
-      : base( owner, parent )
-    {
-      if( eventDescriptor == null )
-        throw new ArgumentNullException( "eventDescriptor" );
-
-      m_eventDescriptor = eventDescriptor;
-      m_eventProxy = new EventProxy( this, eventDescriptor );
-
-      var indexerName = parent.IndexerName;
-      var indexerParameters = parent.IndexerParameters;
-
-      m_propertyChangedNames = new string[]
-        {
-          Binding.IndexerName,
-          string.Format( "{0}[]", indexerName ),
-          string.Format( "{0}[{1}]", indexerName, indexerParameters )
-        };
-    }
-
-    #region SupportsChangeEvents Property
-
-    public override bool SupportsChangeEvents
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      var descriptor = obj as ValueChangeDataItemIndexerDescriptor;
-      if( object.ReferenceEquals( descriptor, null ) )
-        return false;
-
-      return ( object.Equals( descriptor.m_eventDescriptor, m_eventDescriptor ) )
-          && ( base.Equals( descriptor ) );
-    }
-
-    protected override void AddValueChangedCore( object component )
-    {
-      if( component == null )
-        return;
-
-      m_eventProxy.AddValueChanged( component );
-    }
-
-    protected override void RemoveValueChangedCore( object component )
-    {
-      if( component == null )
-        return;
-
-      m_eventProxy.RemoveValueChanged( component );
-    }
-
-    protected override bool MustInhibitValueChanged( object component )
-    {
-      return ( ( m_inhibitValueChanged == null ) || !m_inhibitValueChanged.Contains( component ) )
-          && ( this.GetValueChangedHandler( component ) != null );
-    }
-
-    protected override bool IsValueChangedInhibited( object component )
-    {
-      return ( m_inhibitValueChanged != null )
-          && ( m_inhibitValueChanged.Contains( component ) );
-    }
-
-    protected override void InhibitValueChanged( object component )
-    {
-      if( m_inhibitValueChanged == null )
-      {
-        m_inhibitValueChanged = new HashSet<object>();
-      }
-
-      m_inhibitValueChanged.Add( component );
-    }
-
-    protected override void ResetInhibitValueChanged( object component )
-    {
-      Debug.Assert( m_inhibitValueChanged != null );
-
-      m_inhibitValueChanged.Remove( component );
-
-      if( m_inhibitValueChanged.Count == 0 )
-      {
-        m_inhibitValueChanged = null;
-      }
-    }
-
-    private void OnPropertyChanged( object sender, PropertyChangedEventArgs e )
-    {
-      var propertyName = e.PropertyName;
-
-      if( string.IsNullOrEmpty( propertyName ) || m_propertyChangedNames.Contains( propertyName ) )
-      {
-        this.OnValueChanged( sender, e );
-      }
-    }
-
-    #region Private Fields
-
-    private readonly string[] m_propertyChangedNames;
-    private readonly EventProxy m_eventProxy;
-    private readonly EventDescriptor m_eventDescriptor;
-    private HashSet<object> m_inhibitValueChanged;
-
-    #endregion
-
-    #region EventProxy Private Class
-
-    private sealed class EventProxy
-    {
-      internal EventProxy( ValueChangeDataItemIndexerDescriptor propertyDescriptor, EventDescriptor eventDescriptor )
-      {
-        m_propertyDescriptor = new WeakReference( propertyDescriptor );
-        m_eventDescriptor = new WeakReference( eventDescriptor );
-      }
-
-      private ValueChangeDataItemIndexerDescriptor PropertyDescriptor
-      {
-        get
-        {
-          return m_propertyDescriptor.Target as ValueChangeDataItemIndexerDescriptor;
-        }
-      }
-
-      private EventDescriptor EventDescriptor
-      {
-        get
-        {
-          return m_eventDescriptor.Target as EventDescriptor;
-        }
-      }
-
-      internal void AddValueChanged( object component )
-      {
-        var descriptor = this.EventDescriptor;
-        if( descriptor == null )
-          return;
-
-        var handlerType = descriptor.EventType;
-
-        if( typeof( PropertyChangedEventHandler ).IsAssignableFrom( handlerType ) )
-        {
-          descriptor.AddEventHandler( component, new PropertyChangedEventHandler( this.OnPropertyChanged ) );
-        }
-      }
-
-      internal void RemoveValueChanged( object component )
-      {
-        var descriptor = this.EventDescriptor;
-        if( descriptor == null )
-          return;
-
-        var handlerType = descriptor.EventType;
-
-        if( typeof( PropertyChangedEventHandler ).IsAssignableFrom( handlerType ) )
-        {
-          descriptor.RemoveEventHandler( component, new PropertyChangedEventHandler( this.OnPropertyChanged ) );
-        }
-      }
-
-      private void OnPropertyChanged( object sender, PropertyChangedEventArgs e )
-      {
-        var propertyDescriptor = this.PropertyDescriptor;
-        if( propertyDescriptor != null )
-        {
-          propertyDescriptor.OnPropertyChanged( sender, e );
-        }
-        else
-        {
-          // Since the real listener is no longer available, try to unregister the handler.
-          this.RemoveValueChanged( sender );
-        }
-      }
-
-      private readonly WeakReference m_propertyDescriptor;
-      private readonly WeakReference m_eventDescriptor;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemPropertyDescriptor.cs
deleted file mode 100644
index 4fdec3b9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValueChangeDataItemPropertyDescriptor.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal sealed class ValueChangeDataItemPropertyDescriptor : DataItemPropertyDescriptor
-  {
-    internal ValueChangeDataItemPropertyDescriptor(
-      DataItemTypeDescriptor owner,
-      PropertyDescriptor parent,
-      Type componentType,
-      Type propertyType,
-      Func<object, object> getter,
-      Action<object, object> setter,
-      Action<object> resetter,
-      EventDescriptor eventDescriptor )
-      : base( owner, parent, componentType, propertyType, getter, setter, resetter )
-    {
-      if( eventDescriptor == null )
-        throw new ArgumentNullException( "eventDescriptor" );
-
-      m_eventDescriptor = eventDescriptor;
-      m_eventProxy = new EventProxy( this, eventDescriptor );
-    }
-
-    #region SupportsChangeEvents Property
-
-    public override bool SupportsChangeEvents
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    public override int GetHashCode()
-    {
-      return base.GetHashCode();
-    }
-
-    public override bool Equals( object obj )
-    {
-      var descriptor = obj as ValueChangeDataItemPropertyDescriptor;
-      if( object.ReferenceEquals( descriptor, null ) )
-        return false;
-
-      return ( object.Equals( descriptor.m_eventDescriptor, m_eventDescriptor ) )
-          && ( base.Equals( descriptor ) );
-    }
-
-    protected override void AddValueChangedCore( object component )
-    {
-      if( component == null )
-        return;
-
-      m_eventProxy.AddValueChanged( component );
-    }
-
-    protected override void RemoveValueChangedCore( object component )
-    {
-      if( component == null )
-        return;
-
-      m_eventProxy.RemoveValueChanged( component );
-    }
-
-    protected override bool MustInhibitValueChanged( object component )
-    {
-      return ( ( m_inhibitValueChanged == null ) || !m_inhibitValueChanged.Contains( component ) )
-          && ( this.GetValueChangedHandler( component ) != null );
-    }
-
-    protected override bool IsValueChangedInhibited( object component )
-    {
-      return ( m_inhibitValueChanged != null )
-          && ( m_inhibitValueChanged.Contains( component ) );
-    }
-
-    protected override void InhibitValueChanged( object component )
-    {
-      if( m_inhibitValueChanged == null )
-      {
-        m_inhibitValueChanged = new HashSet<object>();
-      }
-
-      m_inhibitValueChanged.Add( component );
-    }
-
-    protected override void ResetInhibitValueChanged( object component )
-    {
-      Debug.Assert( m_inhibitValueChanged != null );
-
-      m_inhibitValueChanged.Remove( component );
-
-      if( m_inhibitValueChanged.Count == 0 )
-      {
-        m_inhibitValueChanged = null;
-      }
-    }
-
-    private void OnPropertyChanged( object sender, EventArgs e )
-    {
-      var propertyChangedEventArgs = e as PropertyChangedEventArgs;
-      if( propertyChangedEventArgs != null )
-      {
-        var propertyName = propertyChangedEventArgs.PropertyName;
-
-        if( !string.IsNullOrEmpty( propertyName ) && ( string.Compare( propertyName, this.Name, false, CultureInfo.InvariantCulture ) != 0 ) )
-          return;
-      }
-
-      this.OnValueChanged( sender, e );
-    }
-
-    #region Private Fields
-
-    private readonly EventProxy m_eventProxy;
-    private readonly EventDescriptor m_eventDescriptor;
-    private HashSet<object> m_inhibitValueChanged;
-
-    #endregion
-
-    #region EventProxy Private Class
-
-    private sealed class EventProxy
-    {
-      internal EventProxy( ValueChangeDataItemPropertyDescriptor propertyDescriptor, EventDescriptor eventDescriptor )
-      {
-        m_propertyDescriptor = new WeakReference( propertyDescriptor );
-        m_eventDescriptor = new WeakReference( eventDescriptor );
-      }
-
-      private ValueChangeDataItemPropertyDescriptor PropertyDescriptor
-      {
-        get
-        {
-          return m_propertyDescriptor.Target as ValueChangeDataItemPropertyDescriptor;
-        }
-      }
-
-      private EventDescriptor EventDescriptor
-      {
-        get
-        {
-          return m_eventDescriptor.Target as EventDescriptor;
-        }
-      }
-
-      internal void AddValueChanged( object component )
-      {
-        var descriptor = this.EventDescriptor;
-        if( descriptor == null )
-          return;
-
-        var handlerType = descriptor.EventType;
-
-        if( typeof( PropertyChangedEventHandler ).IsAssignableFrom( handlerType ) )
-        {
-          descriptor.AddEventHandler( component, new PropertyChangedEventHandler( this.OnPropertyChanged ) );
-        }
-        else if( typeof( EventHandler ).IsAssignableFrom( handlerType ) )
-        {
-          descriptor.AddEventHandler( component, new EventHandler( this.OnPropertyChanged ) );
-        }
-      }
-
-      internal void RemoveValueChanged( object component )
-      {
-        var descriptor = this.EventDescriptor;
-        if( descriptor == null )
-          return;
-
-        var handlerType = descriptor.EventType;
-
-        if( typeof( PropertyChangedEventHandler ).IsAssignableFrom( handlerType ) )
-        {
-          descriptor.RemoveEventHandler( component, new PropertyChangedEventHandler( this.OnPropertyChanged ) );
-        }
-        else if( typeof( EventHandler ).IsAssignableFrom( handlerType ) )
-        {
-          descriptor.RemoveEventHandler( component, new EventHandler( this.OnPropertyChanged ) );
-        }
-      }
-
-      private void HandlePropertyChanged( object sender, EventArgs e )
-      {
-        var propertyDescriptor = this.PropertyDescriptor;
-
-        if( propertyDescriptor != null )
-        {
-          propertyDescriptor.OnPropertyChanged( sender, e );
-        }
-        else
-        {
-          // Since the real listener is no longer available, try to unregister the handler.
-          this.RemoveValueChanged( sender );
-        }
-      }
-
-      private void OnPropertyChanged( object sender, EventArgs e )
-      {
-        this.HandlePropertyChanged( sender, e );
-      }
-
-      private void OnPropertyChanged( object sender, PropertyChangedEventArgs e )
-      {
-        this.HandlePropertyChanged( sender, e );
-      }
-
-      private readonly WeakReference m_propertyDescriptor;
-      private readonly WeakReference m_eventDescriptor;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs
deleted file mode 100644
index a0a47d2b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class ColumnVirtualizationManager : DependencyObject, IWeakEventListener
-  {
-    static ColumnVirtualizationManager()
-    {
-      ColumnVirtualizationManager.ColumnVirtualizationManagerProperty = ColumnVirtualizationManager.ColumnVirtualizationManagerPropertyKey.DependencyProperty;
-    }
-
-    public ColumnVirtualizationManager( DataGridContext dataGridContext )
-    {
-      Debug.Assert( dataGridContext != null );
-      m_dataGridContext = dataGridContext;
-
-      // Assign the ColumnVirtualizationManager to the DataGridContext
-      ColumnVirtualizationManager.SetColumnVirtualizationManager( m_dataGridContext, this );
-
-      this.Initialize();
-
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    #region ColumnVirtualizationManager Property
-
-    private static readonly DependencyPropertyKey ColumnVirtualizationManagerPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "ColumnVirtualizationManager",
-      typeof( ColumnVirtualizationManager ),
-      typeof( ColumnVirtualizationManager ),
-      new UIPropertyMetadata( null, new PropertyChangedCallback( ColumnVirtualizationManager.OnColumnVirtualizationManagerChanged ) ) );
-
-    public static readonly DependencyProperty ColumnVirtualizationManagerProperty;
-
-    public static ColumnVirtualizationManager GetColumnVirtualizationManager( DependencyObject obj )
-    {
-      return ( ColumnVirtualizationManager )obj.GetValue( ColumnVirtualizationManager.ColumnVirtualizationManagerProperty );
-    }
-
-    internal static void SetColumnVirtualizationManager( DependencyObject obj, ColumnVirtualizationManager value )
-    {
-      obj.SetValue( ColumnVirtualizationManager.ColumnVirtualizationManagerPropertyKey, value );
-    }
-
-    internal static void ClearColumnVirtualizationManager( DependencyObject obj )
-    {
-      obj.ClearValue( ColumnVirtualizationManager.ColumnVirtualizationManagerPropertyKey );
-    }
-
-    private static void OnColumnVirtualizationManagerChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as ColumnVirtualizationManager;
-      if( self == null )
-        return;
-
-      var dataGridContext = self.DataGridContext;
-      if( dataGridContext == null )
-        return;
-
-      var column = dataGridContext.Columns.MainColumn;
-      if( column == null )
-        return;
-
-      column.RefreshDraggableStatus();
-    }
-
-    #endregion
-
-    #region NeedsUpdate Property
-
-    public bool NeedsUpdate
-    {
-      get
-      {
-        return ( m_currentVersion != m_version );
-      }
-    }
-
-    #endregion
-
-    #region DataGridContext Property
-
-    public DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-    }
-
-    private DataGridContext m_dataGridContext; //null;
-
-    #endregion
-
-    #region Version Proptety
-
-    public int Version
-    {
-      get
-      {
-        return m_version;
-      }
-    }
-
-    private int m_version; //0;
-
-    #endregion
-
-    public void Update()
-    {
-      if( !this.NeedsUpdate )
-        return;
-
-      this.PreUpdate();
-      this.ResetInternalState();
-      this.DoUpdate();
-      this.PostUpdate();
-    }
-
-    public virtual void CleanManager()
-    {
-      this.Uninitialize();
-    }
-
-    protected virtual void PreUpdate()
-    {
-      // To be able to keep the previous state of the manager before updating
-    }
-
-    protected virtual void DoUpdate()
-    {
-    }
-
-    // Called after PreUpdate in Update method
-    protected virtual void ResetInternalState()
-    {
-    }
-
-    protected virtual void PostUpdate()
-    {
-      // Update was completed correctly
-      m_currentVersion = m_version;
-    }
-
-    // Called after attaching ColumnVirtualizationManager to DataGridContext
-    protected virtual void Initialize()
-    {
-      PropertyChangedEventManager.AddListener( m_dataGridContext, this, string.Empty );
-      ItemsSourceChangeCompletedEventManager.AddListener( m_dataGridContext.DataGridControl, this );
-      ViewChangedEventManager.AddListener( m_dataGridContext.DataGridControl, this );
-      ThemeChangedEventManager.AddListener( m_dataGridContext.DataGridControl, this );
-      ColumnsLayoutChangingEventManager.AddListener( m_dataGridContext.ColumnManager, this );
-      ColumnsLayoutChangedEventManager.AddListener( m_dataGridContext.ColumnManager, this );
-    }
-
-    // Called before detaching ColumnVirtualizationManager from DataGridContext
-    protected virtual void Uninitialize()
-    {
-      this.ResetInternalState();
-
-      PropertyChangedEventManager.RemoveListener( m_dataGridContext, this, string.Empty );
-      ItemsSourceChangeCompletedEventManager.RemoveListener( m_dataGridContext.DataGridControl, this );
-      ViewChangedEventManager.RemoveListener( m_dataGridContext.DataGridControl, this );
-      ThemeChangedEventManager.RemoveListener( m_dataGridContext.DataGridControl, this );
-      ColumnsLayoutChangingEventManager.RemoveListener( m_dataGridContext.ColumnManager, this );
-      ColumnsLayoutChangedEventManager.RemoveListener( m_dataGridContext.ColumnManager, this );
-
-      m_dataGridContext = null;
-    }
-
-    protected virtual void IncrementVersion( UpdateMeasureRequiredEventArgs e )
-    {
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    protected virtual void OnDataGridContextPropertyChanged( PropertyChangedEventArgs e )
-    {
-      Debug.Assert( !string.IsNullOrEmpty( e.PropertyName ) );
-
-      if( string.IsNullOrEmpty( e.PropertyName ) )
-        return;
-
-      switch( e.PropertyName )
-      {
-        case "CurrentColumn":
-          this.IncrementVersion( null );
-          break;
-      }
-    }
-
-    protected virtual void OnColumnsLayoutChanging()
-    {
-    }
-
-    protected virtual void OnColumnsLayoutChanged()
-    {
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
-    }
-
-    protected virtual void OnDataGridControlViewChanged()
-    {
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
-    }
-
-    protected virtual void OnDataGridControlThemeChanged()
-    {
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
-    }
-
-    protected virtual void OnDataGridControlItemsSourceChanged()
-    {
-    }
-
-    private int m_currentVersion; //0;
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      var detach = false;
-
-      if( managerType == typeof( PropertyChangedEventManager ) )
-      {
-        if( sender == m_dataGridContext )
-        {
-          this.OnDataGridContextPropertyChanged( ( PropertyChangedEventArgs )e );
-        }
-      }
-      else if( managerType == typeof( ColumnsLayoutChangingEventManager ) )
-      {
-        this.OnColumnsLayoutChanging();
-      }
-      else if( managerType == typeof( ColumnsLayoutChangedEventManager ) )
-      {
-        this.OnColumnsLayoutChanged();
-      }
-      else if( managerType == typeof( ViewChangedEventManager ) )
-      {
-        this.OnDataGridControlViewChanged();
-        detach = true;
-      }
-      else if( managerType == typeof( ThemeChangedEventManager ) )
-      {
-        this.OnDataGridControlThemeChanged();
-        detach = true;
-      }
-      else if( managerType == typeof( ItemsSourceChangeCompletedEventManager ) )
-      {
-        this.OnDataGridControlItemsSourceChanged();
-        detach = true;
-      }
-      else
-      {
-        return false;
-      }
-
-      if( detach && ( m_dataGridContext != null ) )
-      {
-        // Detach the ColumnVirtualizationManager from the DataGridContext and detach from the DataGridContext
-        ColumnVirtualizationManager.SetColumnVirtualizationManager( m_dataGridContext, null );
-
-        this.Uninitialize();
-      }
-
-      return true;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/IColumnInfoCollection.Generic.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/IColumnInfoCollection.Generic.cs
deleted file mode 100644
index 729da54d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/IColumnInfoCollection.Generic.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid.Views
-{
-  internal interface IColumnInfoCollection<T>
-  {
-    void Clear();
-
-    T this[ string fieldName ]
-    {
-      get;
-      set;
-    }
-
-    T this[ ColumnBase column ]
-    {
-      get;
-      set;
-    }
-
-    void Reset( string fieldName );
-    void Reset( ColumnBase column );
-
-    bool Contains( string fieldName );
-    bool Contains( ColumnBase column );
-
-    bool TryGetValue( string fieldName, out T value );
-    bool TryGetValue( ColumnBase column, out T value );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/IColumnNameCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/IColumnNameCollection.cs
deleted file mode 100644
index 62062fa7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/IColumnNameCollection.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal interface IColumnNameCollection : IEnumerable<string>
-  {
-    int Count
-    {
-      get;
-    }
-
-    string this[ int index ]
-    {
-      get;
-    }
-
-    void Clear();
-
-    void Add( string fieldName );
-    void Add( ColumnBase column );
-
-    void Remove( string fieldName );
-    void Remove( ColumnBase column );
-
-    bool Contains( string fieldName );
-    bool Contains( ColumnBase column );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs
deleted file mode 100644
index 3255ac45..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class TableViewColumnVirtualizationManager : TableViewColumnVirtualizationManagerBase
-  {
-    public TableViewColumnVirtualizationManager( DataGridContext dataGridContext )
-      : base( dataGridContext )
-    {
-    }
-
-    #region FixedColumnsWidth Internal Property
-
-    internal override double FixedColumnsWidth
-    {
-      get
-      {
-        return m_fixedColumnsWidth;
-      }
-    }
-
-    protected override void SetFixedColumnsWidth( double value )
-    {
-      m_fixedColumnsWidth = value;
-    }
-
-    private double m_fixedColumnsWidth;
-
-    #endregion
-
-    #region ScrollingColumnsWidth Internal Property
-
-    internal override double ScrollingColumnsWidth
-    {
-      get
-      {
-        return m_scrollingColumnsWidth;
-      }
-    }
-
-    protected override void SetScrollingColumnsWidth( double value )
-    {
-      m_scrollingColumnsWidth = value;
-    }
-
-    private double m_scrollingColumnsWidth;
-
-    #endregion
-
-    #region VisibleColumnsWidth Internal Property
-
-    internal override double VisibleColumnsWidth
-    {
-      get
-      {
-        return m_visibleColumnsWidth;
-      }
-    }
-
-    protected override void SetVisibleColumnsWidth( double value )
-    {
-      m_visibleColumnsWidth = value;
-    }
-
-    private double m_visibleColumnsWidth;
-
-    #endregion
-
-    #region FieldNameToOffset Internal Property
-
-    internal override IColumnInfoCollection<double> FieldNameToOffset
-    {
-      get
-      {
-        return m_fieldNameToOffset;
-      }
-    }
-
-    private readonly IColumnInfoCollection<double> m_fieldNameToOffset = new TableViewColumnVirtualizationManagerBase.ColumnInfoCollection<double>();
-
-    #endregion
-
-    #region FieldNameToWidth Internal Property
-
-    internal override IColumnInfoCollection<double> FieldNameToWidth
-    {
-      get
-      {
-        return m_fieldNameToWidth;
-      }
-    }
-
-    private readonly IColumnInfoCollection<double> m_fieldNameToWidth = new TableViewColumnVirtualizationManagerBase.ColumnInfoCollection<double>();
-
-    #endregion
-
-    #region FieldNameToPosition Internal Property
-
-    internal override IColumnInfoCollection<int> FieldNameToPosition
-    {
-      get
-      {
-        return m_fieldNameToPosition;
-      }
-    }
-
-    private readonly IColumnInfoCollection<int> m_fieldNameToPosition = new TableViewColumnVirtualizationManagerBase.ColumnInfoCollection<int>();
-
-    #endregion
-
-    #region MergedNameToOffset Property
-
-    internal override IList<IColumnInfoCollection<double>> MergedNameToOffset
-    {
-      get
-      {
-        return m_mergedNameToOffset;
-      }
-    }
-
-    private readonly IList<IColumnInfoCollection<double>> m_mergedNameToOffset = new List<IColumnInfoCollection<double>>();
-
-    #endregion
-
-    #region MergedNameToWidth Property
-
-    internal override IList<IColumnInfoCollection<double>> MergedNameToWidth
-    {
-      get
-      {
-        return m_mergedNameToWidth;
-      }
-    }
-
-    private readonly IList<IColumnInfoCollection<double>> m_mergedNameToWidth = new List<IColumnInfoCollection<double>>();
-
-    #endregion
-
-    #region MergedNameToPostion Property
-
-    internal override IList<IColumnInfoCollection<int>> MergedNameToPostion
-    {
-      get
-      {
-        return m_mergedNameToPostion;
-      }
-    }
-
-    private readonly IList<IColumnInfoCollection<int>> m_mergedNameToPostion = new List<IColumnInfoCollection<int>>();
-
-    #endregion
-
-    #region FixedFieldNames Internal Property
-
-    internal override IColumnNameCollection FixedFieldNames
-    {
-      get
-      {
-        return m_fixedFieldNames;
-      }
-    }
-
-    private readonly IColumnNameCollection m_fixedFieldNames = new TableViewColumnVirtualizationManagerBase.ColumnNameCollection();
-
-    #endregion
-
-    #region ScrollingFieldNames Internal Property
-
-    internal override IColumnNameCollection ScrollingFieldNames
-    {
-      get
-      {
-        return m_scrollingFieldNames;
-      }
-    }
-
-    private readonly IColumnNameCollection m_scrollingFieldNames = new TableViewColumnVirtualizationManagerBase.ColumnNameCollection();
-
-    #endregion
-
-    #region FixedMergedNames Internal Property
-
-    internal override IList<IColumnNameCollection> FixedMergedNames
-    {
-      get
-      {
-        return m_fixedMergedNames;
-      }
-    }
-
-    private readonly List<IColumnNameCollection> m_fixedMergedNames = new List<IColumnNameCollection>();
-
-    #endregion
-
-    #region ScrollingMergedNames Internal Property
-
-    internal override IList<IColumnNameCollection> ScrollingMergedNames
-    {
-      get
-      {
-        return m_scrollingMergedNames;
-      }
-    }
-
-    private readonly List<IColumnNameCollection> m_scrollingMergedNames = new List<IColumnNameCollection>();
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManagerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManagerBase.cs
deleted file mode 100644
index 682e7176..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManagerBase.cs
+++ /dev/null
@@ -1,1352 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal abstract class TableViewColumnVirtualizationManagerBase : ColumnVirtualizationManager
-  {
-    protected TableViewColumnVirtualizationManagerBase( DataGridContext dataGridContext )
-      : base( dataGridContext )
-    {
-    }
-
-    #region VirtualizationMode Property
-
-    protected static readonly DependencyProperty VirtualizationModeProperty = DependencyProperty.Register(
-      "VirtualizationMode",
-      typeof( ColumnVirtualizationMode ),
-      typeof( TableViewColumnVirtualizationManagerBase ),
-      new UIPropertyMetadata( ColumnVirtualizationMode.Recycling, new PropertyChangedCallback( TableViewColumnVirtualizationManagerBase.OnVirtualizationModeChanged ) ) );
-
-    public ColumnVirtualizationMode VirtualizationMode
-    {
-      get
-      {
-        return ( ColumnVirtualizationMode )this.GetValue( TableViewColumnVirtualizationManagerBase.VirtualizationModeProperty );
-      }
-      set
-      {
-        this.SetValue( TableViewColumnVirtualizationManagerBase.VirtualizationModeProperty, value );
-      }
-    }
-
-    protected virtual void OnVirtualizationModeChanged( ColumnVirtualizationMode oldValue, ColumnVirtualizationMode newValue )
-    {
-      this.OnVirtualizingCellCollectionUpdateRequired(
-             new VirtualizingCellCollectionUpdateRequiredEventArgs( VirtualizingCellCollectionUpdateTriggeredAction.VirtualizationModeChanged ) );
-    }
-
-    private static void OnVirtualizationModeChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var manager = sender as TableViewColumnVirtualizationManagerBase;
-      if( manager == null )
-        return;
-
-      manager.OnVirtualizationModeChanged( ( ColumnVirtualizationMode )e.OldValue, ( ColumnVirtualizationMode )e.NewValue );
-    }
-
-    #endregion
-
-    #region FirstColumnCompensationOffset Property
-
-    // This field is set by the FixedCellPanel in OnCompensationOffsetChanged when the AttachedPropertyChanges
-    protected static readonly DependencyProperty FirstColumnCompensationOffsetProperty = DependencyProperty.Register(
-      "FirstColumnCompensationOffset",
-      typeof( double ),
-      typeof( TableViewColumnVirtualizationManagerBase ),
-      new FrameworkPropertyMetadata(
-        0d,
-        new PropertyChangedCallback( TableViewColumnVirtualizationManagerBase.OnFirstColumnCompensationOffsetChanged ) ) );
-
-    public double FirstColumnCompensationOffset
-    {
-      get
-      {
-        return ( double )this.GetValue( TableViewColumnVirtualizationManagerBase.FirstColumnCompensationOffsetProperty );
-      }
-      set
-      {
-        this.SetValue( TableViewColumnVirtualizationManagerBase.FirstColumnCompensationOffsetProperty, value );
-      }
-    }
-
-    protected virtual void OnFirstColumnCompensationOffsetChanged( double oldValue, double newValue )
-    {
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
-    }
-
-    private static void OnFirstColumnCompensationOffsetChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var manager = sender as TableViewColumnVirtualizationManagerBase;
-      if( manager == null )
-        return;
-
-      manager.OnFirstColumnCompensationOffsetChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    #endregion
-
-    #region FixedColumnCount Protected Property
-
-    protected static readonly DependencyProperty FixedColumnCountProperty = DependencyProperty.Register(
-      "FixedColumnCount",
-      typeof( int ),
-      typeof( TableViewColumnVirtualizationManagerBase ),
-      new UIPropertyMetadata( 0, new PropertyChangedCallback( TableViewColumnVirtualizationManagerBase.OnFixedColumnCountChanged ),
-                                 new CoerceValueCallback( TableViewColumnVirtualizationManagerBase.CoerceFixedColumnCount ) ) );
-
-    // Only used to back the dp.  The dp itself is used as the API for the user to change the fixed column count (through TableView binding),
-    // and the PropertyChangedCallback redirect the value to the top most manager row.
-    protected int FixedColumnCount
-    {
-      get
-      {
-        return ( int )this.GetValue( TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty );
-      }
-      set
-      {
-        this.SetValue( TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty, value );
-      }
-    }
-
-    private static void OnFixedColumnCountChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as TableViewColumnVirtualizationManagerBase;
-      if( self == null )
-        return;
-
-      self.OnFixedColumnCountChanged( ( int )e.OldValue, ( int )e.NewValue );
-    }
-
-    private static object CoerceFixedColumnCount( DependencyObject sender, object value )
-    {
-      var self = sender as TableViewColumnVirtualizationManagerBase;
-      var count = ( int )value;
-
-      if( ( count == 0 ) || ( self == null ) )
-        return value;
-
-      var dataGridContext = self.DataGridContext;
-      if( dataGridContext == null )
-        return value;
-
-      if( count < 0 )
-        return 0;
-
-      var columns = dataGridContext.VisibleColumns;
-      var max = columns.Count;
-
-      if( count > max )
-        return max;
-
-      return value;
-    }
-
-    private void OnFixedColumnCountChanged( int oldValue, int newValue )
-    {
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return;
-
-      var columnManager = dataGridContext.ColumnManager;
-      columnManager.SetFixedColumnCount( newValue );
-    }
-
-    #endregion
-
-    #region FixedColumnsWidth Internal Property
-
-    internal abstract double FixedColumnsWidth
-    {
-      get;
-    }
-
-    protected abstract void SetFixedColumnsWidth( double value );
-
-    #endregion
-
-    #region ScrollingColumnsWidth Internal Property
-
-    // The width of all visible columns in 
-    internal abstract double ScrollingColumnsWidth
-    {
-      get;
-    }
-
-    protected abstract void SetScrollingColumnsWidth( double value );
-
-    #endregion
-
-    #region VisibleColumnsWidth Internal Property
-
-    // The width of all visible columns (fixed and scrolling ones)
-    internal abstract double VisibleColumnsWidth
-    {
-      get;
-    }
-
-    protected abstract void SetVisibleColumnsWidth( double value );
-
-    #endregion
-
-    #region FieldNameToOffset Internal Property
-
-    internal abstract IColumnInfoCollection<double> FieldNameToOffset
-    {
-      get;
-    }
-
-    #endregion
-
-    #region FieldNameToWidth Internal Property
-
-    internal abstract IColumnInfoCollection<double> FieldNameToWidth
-    {
-      get;
-    }
-
-    #endregion
-
-    #region FieldNameToPosition Internal Property
-
-    internal abstract IColumnInfoCollection<int> FieldNameToPosition
-    {
-      get;
-    }
-
-    #endregion
-
-    #region MergedNameToOffset Internal Property
-
-    internal abstract IList<IColumnInfoCollection<double>> MergedNameToOffset
-    {
-      get;
-    }
-
-    #endregion
-
-    #region MergedNameToWidth Internal Property
-
-    internal abstract IList<IColumnInfoCollection<double>> MergedNameToWidth
-    {
-      get;
-    }
-
-    #endregion
-
-    #region MergedNameToPostion Internal Property
-
-    internal abstract IList<IColumnInfoCollection<int>> MergedNameToPostion
-    {
-      get;
-    }
-
-    #endregion
-
-    #region FixedFieldNames Internal Property
-
-    internal abstract IColumnNameCollection FixedFieldNames
-    {
-      get;
-    }
-
-    #endregion
-
-    #region ScrollingFieldNames Internal Property
-
-    internal abstract IColumnNameCollection ScrollingFieldNames
-    {
-      get;
-    }
-
-    #endregion
-
-    #region VisibleFieldNames Internal Property
-
-    internal IColumnNameCollection VisibleFieldNames
-    {
-      get
-      {
-        return new ColumnNameLookup( new IColumnNameCollection[] { this.FixedFieldNames, this.ScrollingFieldNames } );
-      }
-    }
-
-    #endregion
-
-    #region FixedMergedNames Internal Property
-
-    internal abstract IList<IColumnNameCollection> FixedMergedNames
-    {
-      get;
-    }
-
-    #endregion
-
-    #region ScrollingMergedNames Internal Property
-
-    internal abstract IList<IColumnNameCollection> ScrollingMergedNames
-    {
-      get;
-    }
-
-    #endregion
-
-    #region VisibleMergedFieldNames Internal Property
-
-    internal IList<IColumnNameCollection> VisibleMergedFieldNames
-    {
-      get
-      {
-        var fixedFieldNames = this.FixedMergedNames;
-        var scrollingFieldNames = this.ScrollingMergedNames;
-
-        Debug.Assert( fixedFieldNames != null );
-        Debug.Assert( scrollingFieldNames != null );
-        Debug.Assert( fixedFieldNames.Count == scrollingFieldNames.Count );
-
-        var count = fixedFieldNames.Count;
-        var retval = new List<IColumnNameCollection>( count );
-
-        for( int i = 0; i < count; i++ )
-        {
-          retval.Add( new ColumnNameLookup( new IColumnNameCollection[] { fixedFieldNames[ i ], scrollingFieldNames[ i ] } ) );
-        }
-
-        return retval.AsReadOnly();
-      }
-    }
-
-    #endregion
-
-    #region ScrollViewer Private Property
-
-    private ScrollViewer ScrollViewer
-    {
-      get
-      {
-        return m_scrollViewer;
-      }
-      set
-      {
-        if( value == m_scrollViewer )
-          return;
-
-        if( m_scrollViewer != null )
-        {
-          m_scrollViewer.ScrollChanged -= new ScrollChangedEventHandler( this.ScrollViewer_ScrollChanged );
-        }
-
-        m_scrollViewer = value;
-
-        if( m_scrollViewer != null )
-        {
-          m_scrollViewer.ScrollChanged += new ScrollChangedEventHandler( this.ScrollViewer_ScrollChanged );
-        }
-      }
-    }
-
-    private void ScrollViewer_ScrollChanged( object sender, ScrollChangedEventArgs e )
-    {
-      //If only scrolling vertically, there is no changes to columns in view, thus no need to update this manager, and therefore no need to make FixedCellPanels update.
-      if( e.VerticalChange != 0 )
-      {
-        if( ( e.ExtentHeightChange == 0 ) && ( e.ExtentWidthChange == 0 ) && ( e.HorizontalChange == 0 ) &&
-            ( e.ViewportHeightChange == 0 ) && ( e.ViewportWidthChange == 0 ) )
-          return;
-      }
-
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return;
-
-      var dataGridControl = dataGridContext.DataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      if( e.OriginalSource != dataGridControl.ScrollViewer )
-        return;
-
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ScrollViewerChanged ) );
-    }
-
-    private void UpdateScrollViewer()
-    {
-      var dataGridContext = this.DataGridContext;
-
-      this.ScrollViewer = ( dataGridContext != null ) ? dataGridContext.DataGridControl.ScrollViewer : null;
-    }
-
-    private ScrollViewer m_scrollViewer; //null;
-
-    #endregion
-
-    #region UpdateMeasureRequired Public Event
-
-    // This event will be use to notify every listener that the DataGridControl's layout has changed and they must at least call MeasureOverride
-    public event EventHandler UpdateMeasureRequired;
-
-    protected void OnUpdateMeasureRequired( UpdateMeasureRequiredEventArgs e )
-    {
-      // If the manager is detached, it means it will be soon collected, thus don't send update notifications to FixedCellPanels that can still be hook to it (but being recycled).
-      if( this.DataGridContext == null )
-        return;
-
-      var handler = this.UpdateMeasureRequired;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    #region VirtualizingCellCollectionUpdateRequired Public Event
-
-    // This event is raised so FixedCellPanels can update their cell collections accordingly to changes in columns in the ColumnVirtualizingMode they are currently in.
-    public event EventHandler VirtualizingCellCollectionUpdateRequired;
-
-    protected void OnVirtualizingCellCollectionUpdateRequired( VirtualizingCellCollectionUpdateRequiredEventArgs e )
-    {
-      // If the manager is detached, it means it will be soon collected, thus don't send update notifications to FixedCellPanels that can still be hook to it (but being recycled).
-      if( this.DataGridContext == null )
-        return;
-
-      var handler = this.VirtualizingCellCollectionUpdateRequired;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    #endregion
-
-    protected override void Initialize()
-    {
-      base.Initialize();
-
-      CollectionChangedEventManager.AddListener( this.DataGridContext.Items.SortDescriptions, this );
-      CollectionChangedEventManager.AddListener( this.DataGridContext.Items.GroupDescriptions, this );
-      ColumnActualWidthEventManager.AddListener( this.DataGridContext.Columns, this );
-      DataGridControlTemplateChangedEventManager.AddListener( this.DataGridContext.DataGridControl, this );
-
-      this.UpdateScrollViewer();
-
-      var fixedColumnCountBindingBase = new Binding( TableView.FixedColumnCountProperty.Name );
-      fixedColumnCountBindingBase.Source = this.DataGridContext;
-      fixedColumnCountBindingBase.Mode = BindingMode.TwoWay;
-      BindingOperations.SetBinding( this, TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty, fixedColumnCountBindingBase );
-
-      var compensationOffsetBinding = new Binding();
-      compensationOffsetBinding.Path = new PropertyPath( TableView.CompensationOffsetProperty );
-      compensationOffsetBinding.Source = this.DataGridContext;
-      compensationOffsetBinding.Mode = BindingMode.OneWay;
-      BindingOperations.SetBinding( this, TableViewColumnVirtualizationManagerBase.FirstColumnCompensationOffsetProperty, compensationOffsetBinding );
-
-      var columnVirtualizationModeBindingBase = new Binding();
-      columnVirtualizationModeBindingBase.Source = this.DataGridContext;
-      columnVirtualizationModeBindingBase.Path = new PropertyPath( TableView.ColumnVirtualizationModeProperty.Name );
-      columnVirtualizationModeBindingBase.Mode = BindingMode.OneWay;
-      BindingOperations.SetBinding( this, TableViewColumnVirtualizationManagerBase.VirtualizationModeProperty, columnVirtualizationModeBindingBase );
-    }
-
-    protected override void Uninitialize()
-    {
-      BindingOperations.ClearBinding( this, TableViewColumnVirtualizationManagerBase.VirtualizationModeProperty );
-      BindingOperations.ClearBinding( this, TableViewColumnVirtualizationManagerBase.FirstColumnCompensationOffsetProperty );
-      BindingOperations.ClearBinding( this, TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty );
-
-      this.ScrollViewer = null;
-
-      CollectionChangedEventManager.RemoveListener( this.DataGridContext.Items.SortDescriptions, this );
-      CollectionChangedEventManager.RemoveListener( this.DataGridContext.Items.GroupDescriptions, this );
-      ColumnActualWidthEventManager.RemoveListener( this.DataGridContext.Columns, this );
-      DataGridControlTemplateChangedEventManager.RemoveListener( this.DataGridContext.DataGridControl, this );
-
-      base.Uninitialize();
-    }
-
-    protected override void ResetInternalState()
-    {
-      this.SetFixedColumnsWidth( 0d );
-      this.SetScrollingColumnsWidth( 0d );
-      this.SetVisibleColumnsWidth( 0d );
-
-      this.FieldNameToOffset.Clear();
-      this.FieldNameToWidth.Clear();
-      this.FieldNameToPosition.Clear();
-      this.MergedNameToOffset.Clear();
-      this.MergedNameToPostion.Clear();
-      this.MergedNameToWidth.Clear();
-
-      this.FixedFieldNames.Clear();
-      this.ScrollingFieldNames.Clear();
-      this.FixedMergedNames.Clear();
-      this.ScrollingMergedNames.Clear();
-    }
-
-    protected override void DoUpdate()
-    {
-      var dataGridContext = this.DataGridContext;
-      Debug.Assert( dataGridContext != null );
-
-      var columnManager = dataGridContext.ColumnManager;
-      Debug.Assert( columnManager != null );
-
-      // Make sure the fixed column count is up-to-date.
-      this.CoerceValue( TableViewColumnVirtualizationManagerBase.FixedColumnCountProperty );
-
-      //It can happen that the columnManager has not been initialized yet (e.g. when creating a grid in code behind), so make sure markers are not null.
-      var levelMarkers = columnManager.GetLevelMarkersFor( dataGridContext.Columns );
-      if( levelMarkers == null )
-        return;
-
-      var currentLocation = levelMarkers.Start;
-      Debug.Assert( currentLocation != null );
-      Debug.Assert( currentLocation.Type == LocationType.Start );
-
-      var columnPosition = 0;
-      var visibleColumnsTotalWidth = 0d;
-
-      // Fill the data structures for the fixed columns.
-      while( currentLocation.Type != LocationType.Splitter )
-      {
-        var columnLocation = currentLocation as ColumnHierarchyManager.IColumnLocation;
-        if( columnLocation != null )
-        {
-          var column = columnLocation.Column;
-          Debug.Assert( column != null );
-
-          // Ensure we keep the correct visible offset for all columns even if they are collpased
-          this.FieldNameToOffset[ column ] = visibleColumnsTotalWidth;
-
-          if( column.Visible )
-          {
-            var width = column.ActualWidth;
-
-            this.FixedFieldNames.Add( column );
-            this.FieldNameToPosition[ column ] = columnPosition;
-            this.FieldNameToWidth[ column ] = width;
-
-            visibleColumnsTotalWidth += width;
-          }
-
-          columnPosition++;
-        }
-        else
-        {
-          Debug.Assert( currentLocation.Type != LocationType.Column );
-        }
-
-        currentLocation = currentLocation.GetNextSiblingOrCousin();
-        Debug.Assert( currentLocation != null );
-      }
-
-      this.SetFixedColumnsWidth( visibleColumnsTotalWidth );
-
-      var horizontalOffset = this.GetHorizontalOffset();
-      var viewportWidth = this.GetViewportWidth();
-
-      if( this.VirtualizationMode != ColumnVirtualizationMode.None )
-      {
-        // We increment the horizontalOffset to take the fixed columns width into consideration.
-        horizontalOffset += visibleColumnsTotalWidth;
-        viewportWidth = Math.Max( 0d, viewportWidth - visibleColumnsTotalWidth );
-      }
-
-      // We must consider the fixed columns width when calculating visible indexes in viewport
-      var viewportMaximumOffset = horizontalOffset + viewportWidth;
-      var visibleScrollingColumnsTotalWidth = 0d;
-
-      // Fill the data structures for the scrolling columns.
-      while( currentLocation.Type != LocationType.Orphan )
-      {
-        var columnLocation = currentLocation as ColumnHierarchyManager.IColumnLocation;
-        if( columnLocation != null )
-        {
-          var column = columnLocation.Column;
-          Debug.Assert( column != null );
-
-          // Ensure we keep the correct visible offset for all columns even if they are collapsed
-          this.FieldNameToOffset[ column ] = visibleColumnsTotalWidth;
-
-          if( column.Visible )
-          {
-            var width = column.ActualWidth;
-            var leftEdgeOffset = visibleColumnsTotalWidth;
-            var rightEdgeOffset = leftEdgeOffset + width;
-
-            this.FieldNameToPosition[ column ] = columnPosition;
-            this.FieldNameToWidth[ column ] = width;
-
-            visibleColumnsTotalWidth += width;
-            visibleScrollingColumnsTotalWidth += width;
-
-            if( this.VirtualizationMode != ColumnVirtualizationMode.None )
-            {
-              // The column is in the viewport.
-              if( ( leftEdgeOffset < viewportMaximumOffset ) && ( rightEdgeOffset > horizontalOffset ) )
-              {
-                this.ScrollingFieldNames.Add( column );
-              }
-            }
-            else
-            {
-              this.ScrollingFieldNames.Add( column );
-            }
-          }
-
-          columnPosition++;
-        }
-        else
-        {
-          Debug.Assert( currentLocation.Type != LocationType.Column );
-        }
-
-        currentLocation = currentLocation.GetNextSiblingOrCousin();
-        Debug.Assert( currentLocation != null );
-      }
-
-      this.SetScrollingColumnsWidth( visibleScrollingColumnsTotalWidth );
-      this.SetVisibleColumnsWidth( visibleColumnsTotalWidth );
-    }
-
-    protected override void IncrementVersion( UpdateMeasureRequiredEventArgs e )
-    {
-      base.IncrementVersion( e );
-
-      this.OnUpdateMeasureRequired( e );
-    }
-
-    protected override void OnDataGridContextPropertyChanged( PropertyChangedEventArgs e )
-    {
-      base.OnDataGridContextPropertyChanged( e );
-
-      Debug.Assert( !string.IsNullOrEmpty( e.PropertyName ) );
-
-      if( string.IsNullOrEmpty( e.PropertyName ) )
-        return;
-
-      switch( e.PropertyName )
-      {
-        case "FixedHeaderFooterViewPortSize":
-          this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ViewPortWidthChanged ) );
-          break;
-
-        case "CurrentItem":
-          // No need to increment version, only notify the current item to invalidate measure
-          this.OnUpdateMeasureRequired( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.CurrentItemChanged ) );
-          break;
-      }
-    }
-
-    protected override void OnColumnsLayoutChanging()
-    {
-      m_columnsVisibilitySnapshot.Clear();
-
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext != null )
-      {
-        // We consult the VisibleColumns collection to figure if a column was visible or not instead
-        // of the ColumnBase.Visible property because the property may already be tainted by a change
-        // at this step.
-        var visibleColumns = ( ReadOnlyColumnCollection )dataGridContext.VisibleColumns;
-
-        foreach( var column in dataGridContext.Columns )
-        {
-          // This line of code is equivalent to
-          //   m_columnsVisibilitySnapshot[ column ] = visibleColumns.Contains( column );
-          // However, the result is found in O(1) instead of O(n).
-          m_columnsVisibilitySnapshot[ column ] = ( visibleColumns[ column.FieldName ] == column );
-        }
-      }
-
-      base.OnColumnsLayoutChanging();
-    }
-
-    protected override void OnColumnsLayoutChanged()
-    {
-      var columnsVisibilitySnapshot = new Dictionary<ColumnBase, bool>( m_columnsVisibilitySnapshot );
-      m_columnsVisibilitySnapshot.Clear();
-
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext != null )
-      {
-        // When details are flatten, the detail DataGridContext's FixedColumnCount property is bound to the 
-        // DataGridControl's FixedColumnCount property.  Allowing the value to be changed here would destroy the binding.
-        if( !dataGridContext.IsAFlattenDetail )
-        {
-          var columnManager = dataGridContext.ColumnManager;
-          var fixedColumnCount = columnManager.GetFixedColumnCount();
-
-          Debug.Assert( fixedColumnCount >= 0 );
-
-          this.FixedColumnCount = fixedColumnCount;
-        }
-
-        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnReordering ) );
-
-        var columns = dataGridContext.Columns;
-
-        if( this.VirtualizationMode == ColumnVirtualizationMode.Virtualizing )
-        {
-          // Notify the FixedCellPanel that some cells need to be created for new columns.
-          if( ( columnsVisibilitySnapshot.Count < columns.Count ) || ( columns.Any( c => !columnsVisibilitySnapshot.ContainsKey( c ) ) ) )
-          {
-            this.OnVirtualizingCellCollectionUpdateRequired( new VirtualizingCellCollectionUpdateRequiredEventArgs( VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsAdded ) );
-          }
-        }
-
-        // Figure out the columns that have changed visibility
-        if( columnsVisibilitySnapshot.Count > 0 )
-        {
-          var columnChanges = new List<ColumnBase>();
-
-          foreach( var column in columns )
-          {
-            bool visible;
-
-            if( columnsVisibilitySnapshot.TryGetValue( column, out visible ) && ( column.Visible != visible ) )
-            {
-              columnChanges.Add( column );
-            }
-          }
-
-          if( columnChanges.Count > 0 )
-          {
-            this.OnVirtualizingCellCollectionUpdateRequired( new VirtualizingCellCollectionUpdateRequiredEventArgs( columnChanges ) );
-          }
-        }
-      }
-
-      base.OnColumnsLayoutChanged();
-    }
-
-    protected virtual void OnSortDescriptionsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.SortingChanged ) );
-    }
-
-    protected virtual void OnGroupDescriptionsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.GroupingChanged ) );
-    }
-
-    protected virtual void OnColumnActualWidthChanged( ColumnActualWidthChangedEventArgs e )
-    {
-      // We pass the delta between the old and new value to tell the Panel to reduce the horizontal offset when a column is auto-resized to a smaller value
-      if( e != null )
-      {
-        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnActualWidthChanged, e.OldValue - e.NewValue ) );
-      }
-      else
-      {
-        this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.ColumnActualWidthChanged ) );
-      }
-    }
-
-    protected virtual void OnDataGridControlTemplateChanged()
-    {
-      this.UpdateScrollViewer();
-      this.IncrementVersion( new UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction.Unspecified ) );
-    }
-
-    internal IColumnInfoCollection<double> GetFieldNameToOffset()
-    {
-      return this.GetFieldNameToOffset( -1 );
-    }
-
-    internal IColumnInfoCollection<double> GetFieldNameToOffset( int level )
-    {
-      if( level < 0 )
-        return this.FieldNameToOffset;
-
-      var collection = this.MergedNameToOffset;
-      if( collection.Count > 0 )
-        return collection[ level ];
-
-      //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the FieldNameToOffset property.
-      return new ColumnInfoCollection<double>();
-    }
-
-    internal IColumnInfoCollection<double> GetFieldNameToWidth()
-    {
-      return this.GetFieldNameToWidth( -1 );
-    }
-
-    internal IColumnInfoCollection<double> GetFieldNameToWidth( int level )
-    {
-      if( level < 0 )
-        return this.FieldNameToWidth;
-
-      var collection = this.MergedNameToWidth;
-      if( collection.Count > 0 )
-        return collection[ level ];
-
-      //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the FieldNameToWidth property.
-      return new ColumnInfoCollection<double>();
-    }
-
-    internal IColumnInfoCollection<int> GetFieldNameToPosition()
-    {
-      return this.GetFieldNameToPosition( -1 );
-    }
-
-    internal IColumnInfoCollection<int> GetFieldNameToPosition( int level )
-    {
-      if( level < 0 )
-        return this.FieldNameToPosition;
-
-      var collection = this.MergedNameToPostion;
-      if( collection.Count > 0 )
-        return collection[ level ];
-
-      //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the FieldNameToPosition property.
-      return new ColumnInfoCollection<int>();
-    }
-
-    internal IColumnNameCollection GetFixedFieldNames()
-    {
-      return this.GetFixedFieldNames( -1 );
-    }
-
-    internal IColumnNameCollection GetFixedFieldNames( int level )
-    {
-      if( level < 0 )
-        return this.FixedFieldNames;
-
-      var collection = this.FixedMergedNames;
-      if( collection.Count > 0 )
-        return collection[ level ];
-
-      //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the FixedFieldNames property.
-      return new ColumnNameCollection();
-    }
-
-    internal IColumnNameCollection GetScrollingFieldNames()
-    {
-      return this.GetScrollingFieldNames( -1 );
-    }
-
-    internal IColumnNameCollection GetScrollingFieldNames( int level )
-    {
-      if( level < 0 )
-        return this.ScrollingFieldNames;
-
-      var collection = this.ScrollingMergedNames;
-      if( collection.Count > 0 )
-        return collection[ level ];
-
-      //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the ScrollingFieldNames property.
-      return new ColumnNameCollection();
-    }
-
-    internal IColumnNameCollection GetVisibleFieldNames()
-    {
-      return this.GetVisibleFieldNames( -1 );
-    }
-
-    internal IColumnNameCollection GetVisibleFieldNames( int level )
-    {
-      if( level < 0 )
-        return this.VisibleFieldNames;
-
-      var collection = this.VisibleMergedFieldNames;
-      if( collection.Count > 0 )
-        return collection[ level ];
-
-      //If the list is empty, it means there is no column in the grid right now, so return an empty collection, as does the VisibleFieldNames property.
-      return new ColumnNameCollection();
-    }
-
-    private string FindFirstVisibleFocusableColumnFieldName( LinkedListNode<ColumnBase> startNode, Func<LinkedListNode<ColumnBase>, LinkedListNode<ColumnBase>> getNextNodeHandler )
-    {
-      if( getNextNodeHandler == null )
-        throw new ArgumentNullException( "getNextNodeHandler" );
-
-      if( startNode == null )
-        return null;
-
-      ColumnBase currentColumn = startNode.Value;
-
-      while( ( currentColumn != null )
-        && ( ( currentColumn.ReadOnly )
-          && ( !currentColumn.CanBeCurrentWhenReadOnly )
-          || ( this.FixedFieldNames.Contains( currentColumn.FieldName ) )
-          || ( !currentColumn.Visible ) ) )
-      {
-        startNode = getNextNodeHandler.Invoke( startNode );
-        currentColumn = ( startNode != null ) ? startNode.Value : null;
-      }
-
-      return ( currentColumn != null ) ? currentColumn.FieldName : null;
-    }
-
-    private string GetFirstVisibleFocusableColumnFieldName()
-    {
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return null;
-
-      return this.FindFirstVisibleFocusableColumnFieldName(
-               dataGridContext.ColumnsByVisiblePosition.First,
-               ( node ) => node.Next );
-    }
-
-    private string GetLastVisibleFocusableColumnFieldName()
-    {
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return null;
-
-      return this.FindFirstVisibleFocusableColumnFieldName(
-               dataGridContext.ColumnsByVisiblePosition.Last,
-               ( node ) => node.Previous );
-    }
-
-    private double GetHorizontalOffset()
-    {
-      var scrollViewer = this.ScrollViewer;
-      if( scrollViewer == null )
-        return 0d;
-
-      return scrollViewer.HorizontalOffset - this.FirstColumnCompensationOffset;
-    }
-
-    private double GetViewportWidth()
-    {
-      // Viewport is only required when UI Virtualization is on.
-      if( this.VirtualizationMode == ColumnVirtualizationMode.None )
-        return 0d;
-
-      IScrollInfo scrollInfo = null;
-
-      try
-      {
-        var dataGridContext = this.DataGridContext;
-        if( dataGridContext != null )
-        {
-          scrollInfo = this.DataGridContext.DataGridControl.ItemsHost as IScrollInfo;
-        }
-      }
-      catch( Exception )
-      {
-        // Ignore exceptions since it may be called before the ItemsHost Template is applied
-      }
-
-      double width = ( scrollInfo != null ) ? scrollInfo.ViewportWidth : 0d;
-
-      // We use the HeaderFooterItem width when greater than the viewport width.
-      return Math.Max( width, this.DataGridContext.FixedHeaderFooterViewPortSize.Width );
-    }
-
-    private IList<ColumnBase> GetVisibleColumns( int level )
-    {
-      return this.DataGridContext.VisibleColumns;
-    }
-
-    private ColumnCollection GetColumnCollectionForLevel( int level )
-    {
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext == null )
-        return null;
-
-      if( level < 0 )
-        return dataGridContext.Columns;
-
-      return null;
-    }
-
-    private IEnumerable<ColumnHierarchyManager.ILocation> GetChildLocations( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      location = location.GetFirstChild();
-
-      while( location != null )
-      {
-        yield return location;
-
-        location = location.GetNextSibling();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyManager.IColumnLocation> GetColumnLocations( IEnumerable<ColumnHierarchyManager.ILocation> locations )
-    {
-      if( locations == null )
-        return Enumerable.Empty<ColumnHierarchyManager.IColumnLocation>();
-
-      return ( from location in locations
-               let columnLocation = location as ColumnHierarchyManager.IColumnLocation
-               where ( columnLocation != null )
-               select columnLocation );
-    }
-
-    private double GetVisibleChildColumnsWidth( ColumnHierarchyManager.ILocation parentLocation )
-    {
-      var width = 0d;
-
-      foreach( var columnLocation in this.GetColumnLocations( this.GetChildLocations( parentLocation ) ) )
-      {
-        var column = columnLocation.Column;
-        if( column.Visible )
-        {
-          width += column.ActualWidth;
-        }
-      }
-
-      return width;
-    }
-
-    #region IWeakEventListener Members
-
-    protected override bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      var handled = true;
-      var dataGridContext = this.DataGridContext;
-
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        if( sender == dataGridContext.Items.SortDescriptions )
-        {
-          this.OnSortDescriptionsChanged( ( NotifyCollectionChangedEventArgs )e );
-        }
-        else if( sender == dataGridContext.Items.GroupDescriptions )
-        {
-          this.OnGroupDescriptionsChanged( ( NotifyCollectionChangedEventArgs )e );
-        }
-      }
-      else if( managerType == typeof( ColumnActualWidthEventManager ) )
-      {
-        this.OnColumnActualWidthChanged( e as ColumnActualWidthChangedEventArgs );
-      }
-      else if( managerType == typeof( DataGridControlTemplateChangedEventManager ) )
-      {
-        this.OnDataGridControlTemplateChanged();
-      }
-      else
-      {
-        handled = false;
-      }
-
-      if( !base.OnReceiveWeakEvent( managerType, sender, e ) )
-        return handled;
-
-      return true;
-    }
-
-    #endregion
-
-    private readonly Dictionary<ColumnBase, bool> m_columnsVisibilitySnapshot = new Dictionary<ColumnBase, bool>();
-
-    internal sealed class ColumnNameCollection : IColumnNameCollection
-    {
-      public int Count
-      {
-        get
-        {
-          return m_list.Count;
-        }
-      }
-
-      public string this[ int index ]
-      {
-        get
-        {
-          return m_list[ index ];
-        }
-      }
-
-      public void Clear()
-      {
-        m_list.Clear();
-        m_list.TrimExcess();
-
-        m_lookup.Clear();
-        m_lookup.TrimExcess();
-      }
-
-      public void Add( string fieldName )
-      {
-        if( fieldName == null )
-          return;
-
-        if( m_lookup.Contains( fieldName ) )
-          return;
-
-        m_lookup.Add( fieldName );
-        m_list.Add( fieldName );
-      }
-
-      public void Add( ColumnBase column )
-      {
-        if( column == null )
-          return;
-
-        this.Add( column.FieldName );
-      }
-
-      public void Remove( string fieldName )
-      {
-        if( fieldName == null )
-          return;
-
-        if( !m_lookup.Contains( fieldName ) )
-          return;
-
-        m_lookup.Remove( fieldName );
-        m_list.Remove( fieldName );
-      }
-
-      public void Remove( ColumnBase column )
-      {
-        if( column == null )
-          return;
-
-        this.Remove( column.FieldName );
-      }
-
-      public bool Contains( string fieldName )
-      {
-        if( fieldName == null )
-          return false;
-
-        return m_lookup.Contains( fieldName );
-      }
-
-      public bool Contains( ColumnBase column )
-      {
-        if( column == null )
-          return false;
-
-        return this.Contains( column.FieldName );
-      }
-
-      public IEnumerator<string> GetEnumerator()
-      {
-        return m_list.GetEnumerator();
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return this.GetEnumerator();
-      }
-
-      private readonly List<string> m_list = new List<string>();
-      private readonly HashSet<string> m_lookup = new HashSet<string>();
-    }
-
-    internal sealed class ColumnInfoCollection<T> : IColumnInfoCollection<T>
-    {
-      public void Clear()
-      {
-        m_data.Clear();
-      }
-
-      public T this[ string fieldName ]
-      {
-        get
-        {
-          return m_data[ fieldName ];
-        }
-        set
-        {
-          if( fieldName == null )
-            return;
-
-          m_data[ fieldName ] = value;
-        }
-      }
-
-      public T this[ ColumnBase column ]
-      {
-        get
-        {
-          return this[ column.FieldName ];
-        }
-        set
-        {
-          if( column == null )
-            return;
-
-          this[ column.FieldName ] = value;
-        }
-      }
-
-      public void Reset( string fieldName )
-      {
-        if( fieldName == null )
-          return;
-
-        m_data.Remove( fieldName );
-      }
-
-      public void Reset( ColumnBase column )
-      {
-        if( column == null )
-          return;
-
-        this.Reset( column.FieldName );
-      }
-
-      public bool Contains( string fieldName )
-      {
-        if( fieldName == null )
-          return false;
-
-        return m_data.ContainsKey( fieldName );
-      }
-
-      public bool Contains( ColumnBase column )
-      {
-        if( column == null )
-          return false;
-
-        return this.Contains( column.FieldName );
-      }
-
-      public bool TryGetValue( string fieldName, out T value )
-      {
-        if( fieldName != null )
-          return m_data.TryGetValue( fieldName, out value );
-
-        value = default( T );
-        return false;
-      }
-
-      public bool TryGetValue( ColumnBase column, out T value )
-      {
-        if( column != null )
-          return this.TryGetValue( column.FieldName, out value );
-
-        value = default( T );
-        return false;
-      }
-
-      private readonly Dictionary<string, T> m_data = new Dictionary<string, T>();
-    }
-
-    private sealed class ColumnNameLookup : IColumnNameCollection
-    {
-      internal ColumnNameLookup( IEnumerable<IColumnNameCollection> collection )
-      {
-        m_collection = ( collection != null ) ? collection.ToList() : new List<IColumnNameCollection>( 0 );
-      }
-
-      public int Count
-      {
-        get
-        {
-          return m_collection.Sum( item => item.Count );
-        }
-      }
-
-      public string this[ int index ]
-      {
-        get
-        {
-          foreach( var collection in m_collection )
-          {
-            int count = collection.Count;
-
-            if( index < count )
-              return collection[ index ];
-
-            index -= count;
-          }
-
-          throw new ArgumentOutOfRangeException( "index" );
-        }
-      }
-
-      public void Clear()
-      {
-        throw new NotSupportedException();
-      }
-
-      public void Add( string fieldName )
-      {
-        throw new NotSupportedException();
-      }
-
-      public void Add( ColumnBase column )
-      {
-        throw new NotSupportedException();
-      }
-
-      public void Remove( string fieldName )
-      {
-        throw new NotSupportedException();
-      }
-
-      public void Remove( ColumnBase column )
-      {
-        throw new NotSupportedException();
-      }
-
-      public bool Contains( string fieldName )
-      {
-        if( fieldName == null )
-          return false;
-
-        return ( from list in m_collection
-                 where list.Contains( fieldName )
-                 select true ).Any();
-      }
-
-      public bool Contains( ColumnBase column )
-      {
-        if( column == null )
-          return false;
-
-        return this.Contains( column.FieldName );
-      }
-
-      public IEnumerator<string> GetEnumerator()
-      {
-        if( m_collection.Count == 0 )
-          return Enumerable.Empty<string>().GetEnumerator();
-
-        IEnumerable<string> result = m_collection[ 0 ];
-        foreach( var more in m_collection.Skip( 1 ) )
-        {
-          result = result.Concat( more );
-        }
-
-        return result.GetEnumerator();
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return this.GetEnumerator();
-      }
-
-      private readonly List<IColumnNameCollection> m_collection;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs
deleted file mode 100644
index b61610da..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class UpdateMeasureRequiredEventArgs : EventArgs
-  {
-    public UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction action )
-    {
-      this.TriggeredAction = action;
-    }
-
-    public UpdateMeasureRequiredEventArgs( UpdateMeasureTriggeredAction action, object parameters )
-      : this( action )
-    {
-      this.Parameters = parameters;
-    }
-
-    public UpdateMeasureTriggeredAction TriggeredAction
-    {
-      get;
-      private set;
-    }
-
-    public object Parameters
-    {
-      get;
-      private set;
-    }
-  }
-
-  internal enum UpdateMeasureTriggeredAction
-  {
-    Unspecified,
-    ColumnActualWidthChanged,
-    ColumnReordering, // FixedColumns, Columns drag and drop
-    CurrentItemChanged,
-    GroupingChanged,
-    ScrollViewerChanged,
-    SortingChanged,
-    ViewPortWidthChanged // Parent viewport resized
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventManager.cs
deleted file mode 100644
index bc27eca2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class UpdateMeasureRequiredEventManager : WeakEventManager
-  {
-    private UpdateMeasureRequiredEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var columnVirtualizationManager = source as TableViewColumnVirtualizationManagerBase;
-      if( columnVirtualizationManager == null )
-        throw new InvalidOperationException( "An attempt was made to use a source other than a ColumnVirtualizationManager." );
-
-      columnVirtualizationManager.UpdateMeasureRequired += this.OnUpdateMeasureRequired;
-    }
-
-    protected override void StopListening( object source )
-    {
-      var columnVirtualizationManager = source as TableViewColumnVirtualizationManagerBase;
-      if( columnVirtualizationManager == null )
-        throw new InvalidOperationException( "An attempt was made to use a source other than a ColumnVirtualizationManager." );
-
-      columnVirtualizationManager.UpdateMeasureRequired -= this.OnUpdateMeasureRequired;
-    }
-
-    private static UpdateMeasureRequiredEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( UpdateMeasureRequiredEventManager );
-        UpdateMeasureRequiredEventManager currentManager = ( UpdateMeasureRequiredEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new UpdateMeasureRequiredEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnUpdateMeasureRequired( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventArgs.cs
deleted file mode 100644
index fb8daa4f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventArgs.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal sealed class VirtualizingCellCollectionUpdateRequiredEventArgs : EventArgs
-  {
-    internal VirtualizingCellCollectionUpdateRequiredEventArgs( VirtualizingCellCollectionUpdateTriggeredAction action )
-    {
-      if( action == VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsChanged )
-        throw new ArgumentException( "The action must be anything but VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsChanged.", "action" );
-
-      this.TriggeredAction = action;
-    }
-
-    internal VirtualizingCellCollectionUpdateRequiredEventArgs( IList<ColumnBase> columns )
-    {
-      if( columns == null )
-        throw new ArgumentNullException( "columns" );
-
-      if( columns.Count <= 0 )
-        throw new ArgumentException( "The column count must be greater than zero.", "columns" );
-
-      this.TriggeredAction = VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsChanged;
-      this.Columns = columns;
-    }
-
-    internal VirtualizingCellCollectionUpdateTriggeredAction TriggeredAction
-    {
-      get;
-      private set;
-    }
-
-    internal IList<ColumnBase> Columns
-    {
-      get;
-      private set;
-    }
-  }
-
-  internal enum VirtualizingCellCollectionUpdateTriggeredAction
-  {
-    VirtualizationModeChanged, //Virtualizing and recycling cells.
-    VisibleColumnsAdded,
-    VisibleColumnsChanged
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventManager.cs
deleted file mode 100644
index 7fdcf9e4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingCellCollectionUpdateRequiredEventManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class VirtualizingCellCollectionUpdateRequiredEventManager : WeakEventManager
-  {
-    private VirtualizingCellCollectionUpdateRequiredEventManager()
-    {
-    }
-
-    public static void AddListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedAddListener( source, listener );
-    }
-
-    public static void RemoveListener( object source, IWeakEventListener listener )
-    {
-      CurrentManager.ProtectedRemoveListener( source, listener );
-    }
-
-    protected override void StartListening( object source )
-    {
-      var columnVirtualizationManager = source as TableViewColumnVirtualizationManagerBase;
-      if( columnVirtualizationManager == null )
-        throw new InvalidOperationException( "An attempt was made to use a source other than a ColumnVirtualizationManager." );
-
-      columnVirtualizationManager.VirtualizingCellCollectionUpdateRequired += this.OnVirtualizingCellCollectionUpdateRequired;
-    }
-
-    protected override void StopListening( object source )
-    {
-      var columnVirtualizationManager = source as TableViewColumnVirtualizationManagerBase;
-      if( columnVirtualizationManager == null )
-        throw new InvalidOperationException( "An attempt was made to use a source other than a ColumnVirtualizationManager." );
-
-      columnVirtualizationManager.VirtualizingCellCollectionUpdateRequired -= this.OnVirtualizingCellCollectionUpdateRequired;
-    }
-
-    private static VirtualizingCellCollectionUpdateRequiredEventManager CurrentManager
-    {
-      get
-      {
-        Type managerType = typeof( VirtualizingCellCollectionUpdateRequiredEventManager );
-        VirtualizingCellCollectionUpdateRequiredEventManager currentManager = ( VirtualizingCellCollectionUpdateRequiredEventManager )WeakEventManager.GetCurrentManager( managerType );
-
-        if( currentManager == null )
-        {
-          currentManager = new VirtualizingCellCollectionUpdateRequiredEventManager();
-          WeakEventManager.SetCurrentManager( managerType, currentManager );
-        }
-
-        return currentManager;
-      }
-    }
-
-    private void OnVirtualizingCellCollectionUpdateRequired( object sender, EventArgs args )
-    {
-      this.DeliverEvent( sender, args );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs
deleted file mode 100644
index 2d310342..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class VirtualizingFixedCellSubPanel : FixedCellSubPanel
-  {
-    public VirtualizingFixedCellSubPanel( FixedCellPanel parentPanel )
-      : base( parentPanel )
-    {
-    }
-
-    // Measure horizontally.
-    protected override Size MeasureOverride( Size constraint )
-    {
-      // This can be null when the parent Row is not prepared yet.
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( columnVirtualizationManager == null )
-        return new Size();
-
-      var parentRow = this.ParentPanel.ParentRow;
-      if( parentRow == null )
-        return new Size();
-
-      var desiredSize = new Size();
-      var columnToVisibleWidth = columnVirtualizationManager.GetFieldNameToWidth( parentRow.LevelCache );
-
-      //This using prevents a WeakEvent to be raised to execute UpdateChildren() in FixedCellPanel, as it is already up to date at this point.
-      using( this.ParentPanel.ParentRowCells.SetIsUpdating() )
-      {
-        foreach( var cell in this.GetCellsToLayout() )
-        {
-          double width;
-
-          if( columnToVisibleWidth.TryGetValue( cell.FieldName, out width ) )
-          {
-            cell.Measure( new Size( width, constraint.Height ) );
-          }
-          else
-          {
-            // The cell will be hidden.
-            cell.Measure( new Size() );
-          }
-
-          if( cell.DesiredSize.Height > desiredSize.Height )
-          {
-            desiredSize.Height = cell.DesiredSize.Height;
-          }
-        }
-      }
-
-      desiredSize.Width = columnVirtualizationManager.ScrollingColumnsWidth;
-
-      return desiredSize;
-    }
-
-    // Arrange horizontally.
-    protected override Size ArrangeOverride( Size arrangeSize )
-    {
-      // This can be null when the parent Row is not prepared yet.
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( columnVirtualizationManager == null )
-        return new Size();
-
-      var parentRow = this.ParentPanel.ParentRow;
-      if( parentRow == null )
-        return new Size();
-
-      var dataGridContext = this.DataGridContext;
-      var scrollViewer = ( dataGridContext != null ) ? dataGridContext.DataGridControl.ScrollViewer : null;
-
-      var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( parentRow.LevelCache );
-      var horizontalOffset = ( scrollViewer != null ) ? scrollViewer.HorizontalOffset : 0d;
-      var fixedColumnsWidth = columnVirtualizationManager.FixedColumnsWidth;
-      var compensationOffset = columnVirtualizationManager.FirstColumnCompensationOffset;
-      var finalRect = new Rect( arrangeSize );
-
-      //This using prevents a WeakEvent to be raised to execute UpdateChildren() in FixedCellPanel, as it is already up to date at this point.
-      using( this.ParentPanel.ParentRowCells.SetIsUpdating() )
-      {
-        foreach( var cell in this.GetCellsToLayout() )
-        {
-          var offset = this.CalculateCellOffset( cell.ParentColumn, columnToVisibleOffset, horizontalOffset, fixedColumnsWidth, compensationOffset );
-
-          finalRect.X = offset.X;
-          finalRect.Width = cell.DesiredSize.Width;
-          finalRect.Height = Math.Max( arrangeSize.Height, cell.DesiredSize.Height );
-
-          cell.Arrange( finalRect );
-        }
-      }
-
-      return arrangeSize;
-    }
-
-    protected override IEnumerable<string> GetVisibleFieldsName()
-    {
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( columnVirtualizationManager == null )
-        return new string[ 0 ];
-
-      return columnVirtualizationManager.GetScrollingFieldNames( this.ParentPanel.ParentRow.LevelCache );
-    }
-
-    internal override Point CalculateCellOffset( ColumnBase column )
-    {
-      Debug.Assert( column != null );
-      var row = this.ParentPanel.ParentRow;
-
-      if( ( column != null ) && ( row != null ) )
-      {
-        var dataGridContext = this.DataGridContext;
-        var columnVirtualizationManager = this.ColumnVirtualizationManager;
-
-        if( ( dataGridContext != null ) && ( columnVirtualizationManager != null ) )
-        {
-          var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( row.LevelCache );
-          var scrollViewer = dataGridContext.DataGridControl.ScrollViewer;
-          var horizontalOffset = ( scrollViewer != null ) ? scrollViewer.HorizontalOffset : 0d;
-          var fixedColumnsWidth = columnVirtualizationManager.FixedColumnsWidth;
-          var compensationOffset = columnVirtualizationManager.FirstColumnCompensationOffset;
-
-          return this.CalculateCellOffset( column, columnToVisibleOffset, horizontalOffset, fixedColumnsWidth, compensationOffset );
-        }
-      }
-
-      return new Point();
-    }
-
-    private Point CalculateCellOffset( ColumnBase column, IColumnInfoCollection<double> columnsOffset, double horizontalOffset, double fixedColumnsWidth, double compensationOffset )
-    {
-      if( column == null )
-        return new Point();
-
-      Debug.Assert( columnsOffset != null );
-      Debug.Assert( columnsOffset.Contains( column ) );
-
-      var columnOffset = columnsOffset[ column ];
-
-      // Calculate the offset of the cell's parent column:
-      //    The original offset of the Column
-      //    - the horizontal offset of the ScrollViewer to scroll to the right
-      //    - the width of the fixed columns since we are in the Scrolling FixedCellSubPanel
-      //    + the compensation offset used in master detail to avoid scrolling when not required 
-      return new Point( columnOffset - horizontalOffset - fixedColumnsWidth + compensationOffset, 0d );
-    }
-
-    private IEnumerable<Cell> GetCellsToLayout()
-    {
-      var visibleCells = this.GetVisibleCells();
-
-      // Check out if there are any out of view cells that needs to be layouted for different purpose.  In case of a BringIntoView, the cell
-      // must be layouted in order to find out the target location.  In case of a non recyclable cell, the cell must be arranged out of view.
-      var permanentScrollingFieldNames = this.ParentPanel.PermanentScrollingFieldNames;
-      if( !permanentScrollingFieldNames.Any() )
-        return visibleCells;
-
-      // Make sure we have access to the collection containing the additional cells to be layouted.
-      var parentRowCells = this.ParentPanel.ParentRowCells;
-      if( parentRowCells == null )
-        return visibleCells;
-
-      return this.GetCellsToLayout( visibleCells, permanentScrollingFieldNames, parentRowCells );
-    }
-
-    private IEnumerable<Cell> GetCellsToLayout( IEnumerable<Cell> visibleCells, IEnumerable<string> permanentScrollingFieldNames, VirtualizingCellCollection cellsCollection )
-    {
-      List<string> unhandledCells = permanentScrollingFieldNames.ToList();
-
-      foreach( var cell in visibleCells )
-      {
-        unhandledCells.Remove( cell.FieldName );
-
-        yield return cell;
-      }
-
-      foreach( var fieldName in unhandledCells )
-      {
-        var cell = cellsCollection.GetCell( fieldName, false );
-        Debug.Assert( cell != null );
-
-        yield return cell;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs
deleted file mode 100644
index e40406d3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  // This class manages the various panel of a FixedCellPanel and the Logical/Visual 
-  // Parent of the elements added to it. More precisely :
-  // - The logical parent of all the elements added to this collection will be the 
-  //   FixedCellPanel.
-  // - An element added or inserted will be either added to the "fixed" sub panel or the
-  //   "scrolling" sub panel, according to its index. Thus, the element's Visual Parent 
-  //   will either be the fixed or the scrolling sub panel.
-  // - When removing or inserting elements, some other elements may see their parent 
-  //   change. From the fixed sub panel to the scrolling sub panel or vice versa.
-  // - As long as the elements are added to FixedCellSubPanel objects (like our 
-  //   m_fixedPanel and m_scrollingPanel), this Visual vs Logical parent management will 
-  //   work.
-  // - The collapsed elements are not considered when counting the number of fixed 
-  //   elements, even though they can be found in the m_fixedPanel. This also means that
-  //   for a FixedCellCount of 0, there can still be some (collapsed) element in m_fixedPanel.
-  // - The scrolling panel only contains the elements presently in ViewPort
-  internal class VirtualizingUICellCollection : UIElementCollection
-  {
-    // The visualParent is passed to the base constructor because it is mandatory, but 
-    // the element's visual parent will always be either the fixed or the scrolling sub 
-    // panel. This is one of the reason why we don't use the base implementation of this
-    // class functions.
-    public VirtualizingUICellCollection( Panel fixedPanel, Panel scrollingPanel, FixedCellPanel parentFixedCellPanel )
-      : base( parentFixedCellPanel, parentFixedCellPanel )
-    {
-      if( fixedPanel == null )
-        throw new ArgumentNullException( "fixedPanel" );
-
-      if( scrollingPanel == null )
-        throw new ArgumentNullException( "scrollingPanel" );
-
-      if( parentFixedCellPanel == null )
-        throw new ArgumentNullException( "parentFixedCellPanel" );
-
-      m_fixedPanel = fixedPanel;
-      m_scrollingPanel = scrollingPanel;
-      m_parentVirtualizingCellsHost = parentFixedCellPanel as IVirtualizingCellsHost;
-    }
-
-    public override int Capacity
-    {
-      get
-      {
-        return 0;
-      }
-      set
-      {
-        Debug.Fail( "Check to see if the caller does something meaningful with this. We don't want to implement this property." );
-      }
-    }
-
-    public override void Clear()
-    {
-      //Empty both sub panels
-      m_fixedPanel.Children.Clear();
-      m_scrollingPanel.Children.Clear();
-    }
-
-    public override bool Contains( UIElement element )
-    {
-      //check for presence in both sub panels
-      return m_fixedPanel.Children.Contains( element ) || m_scrollingPanel.Children.Contains( element );
-    }
-
-    public override void CopyTo( Array array, int index )
-    {
-      throw new NotSupportedException();
-    }
-
-    public override void CopyTo( UIElement[] array, int index )
-    {
-      throw new NotSupportedException();
-    }
-
-    public override int Count
-    {
-      get
-      {
-        return m_fixedPanel.Children.Count + m_scrollingPanel.Children.Count;
-      }
-    }
-
-    public override IEnumerator GetEnumerator()
-    {
-      return new CombinedEnumerator( this );
-    }
-
-    public override int IndexOf( UIElement element )
-    {
-      //get the index of the element in the fixed sub panel first.
-      int fixedIndex = m_fixedPanel.Children.IndexOf( element );
-
-      //if found, return this index as it is valid
-      if( fixedIndex != -1 )
-        return fixedIndex;
-
-      //then determine the index of the element in the scrolling sub panel.
-      int scrollingIndex = m_scrollingPanel.Children.IndexOf( element );
-
-      //if item not found in the second sub panel, return -1 right away.
-      if( scrollingIndex == -1 )
-        return -1;
-
-      int fixedCount = m_fixedPanel.Children.Count;
-
-      //finally, item was found in second sub panel, return a combined value
-      return fixedCount + scrollingIndex;
-    }
-
-    public override bool IsSynchronized
-    {
-      get
-      {
-        return m_scrollingPanel.Children.IsSynchronized;
-      }
-    }
-
-    public override object SyncRoot
-    {
-      get
-      {
-        return m_scrollingPanel.Children.SyncRoot;
-      }
-    }
-
-    public override int Add( UIElement element )
-    {
-      throw new NotSupportedException( "VirtualizingUICellCollection.Add" );
-    }
-
-    public override void Insert( int index, UIElement element )
-    {
-      throw new NotSupportedException( "VirtualizingUICellCollection.Insert" );
-    }
-
-    public override void Remove( UIElement element )
-    {
-      throw new NotSupportedException( "VirtualizingUICellCollection.Remove" );
-    }
-
-    public override void RemoveAt( int index )
-    {
-      throw new NotSupportedException( "VirtualizingUICellCollection.RemoveAt" );
-    }
-
-    public override void RemoveRange( int index, int count )
-    {
-      throw new NotSupportedException( "VirtualizingUICellCollection.RemoveRange" );
-    }
-
-    public override UIElement this[ int index ]
-    {
-      get
-      {
-        //check if the index is out of the valid range
-        if( ( index < 0 ) || ( index >= this.Count ) )
-          throw new ArgumentOutOfRangeException( "index" );
-
-        int fixedCount = m_fixedPanel.Children.Count;
-
-        if( index < fixedCount )
-        {
-          return m_fixedPanel.Children[ index ];
-        }
-
-        return m_scrollingPanel.Children[ index - fixedCount ];
-      }
-      set
-      {
-        throw new NotSupportedException( "The VirtualizingUICellCollection does not support direct modification of its children." );
-      }
-    }
-
-    public void ClearCellLogicalParent( UIElement targetElement )
-    {
-      if( ( m_parentVirtualizingCellsHost != null ) && ( m_parentVirtualizingCellsHost.CanModifyLogicalParent == false ) )
-      {
-        this.ClearLogicalParent( targetElement );
-      }
-    }
-
-    public void SetCellLogicalParent( UIElement targetElement )
-    {
-      if( ( m_parentVirtualizingCellsHost != null ) && ( m_parentVirtualizingCellsHost.CanModifyLogicalParent == false ) )
-      {
-        this.SetLogicalParent( targetElement );
-      }
-    }
-
-    private void IncrementVersion()
-    {
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    private Panel m_fixedPanel;
-    private Panel m_scrollingPanel;
-    private IVirtualizingCellsHost m_parentVirtualizingCellsHost;
-    private int m_version;
-
-    private class CombinedEnumerator : IEnumerator
-    {
-      public CombinedEnumerator( VirtualizingUICellCollection cellCollection )
-      {
-        if( cellCollection == null )
-          throw new ArgumentNullException( "cellCollection" );
-
-        m_cellCollection = cellCollection;
-      }
-
-      #region IEnumerator Members
-
-      public object Current
-      {
-        get
-        {
-          //Enumerator not started.
-          if( m_fixedEnumerator == null )
-            throw new InvalidOperationException();
-
-          //If enumerating through fixed panel
-          if( m_fixed == true )
-            return m_fixedEnumerator.Current;
-
-          //otherwise, use the scrolling enumerator
-          return m_scrollingEnumerator.Current;
-        }
-      }
-
-      public bool MoveNext()
-      {
-        //If the Enumerator is not started, 
-        if( m_fixedEnumerator == null )
-        {
-          m_fixedEnumerator = m_cellCollection.m_fixedPanel.Children.GetEnumerator();
-          m_scrollingEnumerator = m_cellCollection.m_scrollingPanel.Children.GetEnumerator();
-
-          //problems creating one of the enumerator
-          if( ( m_fixedEnumerator == null ) || ( m_scrollingEnumerator == null ) )
-          {
-            m_fixedEnumerator = null;
-            m_scrollingEnumerator = null;
-
-            //could not move to first item.
-            return false;
-          }
-
-          //flag to the CombinedEnumerator to use the Fixed enumerator.
-          m_fixed = true;
-        }
-
-        //If Fixed enumerator is in use
-        if( m_fixed == true )
-        {
-          //try to move the Fixed enumerator
-          bool fixedRetval = m_fixedEnumerator.MoveNext();
-          if( fixedRetval == true )
-          {
-            //success, return true
-            return true;
-          }
-          else
-          {
-            //failure, reached the end of enumerator empty
-            m_fixed = false;
-
-            //continue with execution so that scrolling enumerator gets started
-          }
-        }
-
-        //If it returns false, then scrolling panel is empty, or we reaced the end.
-        return m_scrollingEnumerator.MoveNext();
-      }
-
-      public void Reset()
-      {
-        m_fixedEnumerator = null;
-        m_scrollingEnumerator = null;
-      }
-
-      #endregion
-
-      private VirtualizingUICellCollection m_cellCollection;
-      private bool m_fixed;
-      private IEnumerator m_fixedEnumerator;
-      private IEnumerator m_scrollingEnumerator;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnStretchModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnStretchModeEnum.cs
deleted file mode 100644
index c09c12f1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnStretchModeEnum.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  public enum ColumnStretchMode
-  {
-    None,
-    First,
-    Last,
-    All
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnVirtualizationModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnVirtualizationModeEnum.cs
deleted file mode 100644
index b57795de..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnVirtualizationModeEnum.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.DataGrid.Views
-{
-  public enum ColumnVirtualizationMode
-  {
-    None,
-    Recycling,
-    Virtualizing
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/DropMarkOrientationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/DropMarkOrientationEnum.cs
deleted file mode 100644
index 945af0ee..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/DropMarkOrientationEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public enum DropMarkOrientation
-  {
-    Default,
-    Vertical,
-    Horizontal
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/FlattenDetailBindingModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/FlattenDetailBindingModeEnum.cs
deleted file mode 100644
index 4aa68000..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/FlattenDetailBindingModeEnum.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal enum FlattenDetailBindingMode
-  {
-    Default,
-    None,
-    MasterOneWay,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/MasterDetailLayoutModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/MasterDetailLayoutModeEnum.cs
deleted file mode 100644
index 1bdd1701..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/MasterDetailLayoutModeEnum.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal enum MasterDetailLayoutMode
-  {
-    Default,
-    Flatten,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/PassiveLayoutAxisEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/PassiveLayoutAxisEnum.cs
deleted file mode 100644
index 830ead10..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/PassiveLayoutAxisEnum.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  public enum PassiveLayoutAxis
-  {
-    Vertical,
-    Horizontal,
-    Both
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/SynchronizedScrollViewerPositionEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/SynchronizedScrollViewerPositionEnum.cs
deleted file mode 100644
index dd4f82f7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/SynchronizedScrollViewerPositionEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  public enum SynchronizedScrollViewerPosition
-  {
-    Top,
-    Bottom,
-    Left,
-    Right,
-    None,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ViewPropertyModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ViewPropertyModeEnum.cs
deleted file mode 100644
index dcc59272..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ViewPropertyModeEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public enum ViewPropertyMode
-  {
-    None,
-    ViewOnly,
-    Routed,
-    RoutedNoFallback,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/AnimatedDraggedElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/AnimatedDraggedElementAdorner.cs
deleted file mode 100644
index 054c3a40..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/AnimatedDraggedElementAdorner.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Utils.Wpf.DragDrop;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Media.Imaging;
-using System.Diagnostics;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class AnimatedDraggedElementAdorner : DraggedElementAdorner
-  {
-    #region Constructors
-
-    public AnimatedDraggedElementAdorner( UIElement adornedElement, AdornerLayer adornerLayer )
-      : this( adornedElement, adornerLayer, false )
-    {
-    }
-
-    public AnimatedDraggedElementAdorner( UIElement adornedElement, AdornerLayer adornerLayer, bool deepCopy )
-      : base( adornedElement, adornerLayer )
-    {
-      this.DeepCopy = deepCopy;
-      this.IsHitTestVisible = false;
-    }
-
-    #endregion
-
-    #region DeepCopy Property
-
-    public bool DeepCopy
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region Protected Methods
-
-    protected override Rectangle InitializeAdornedElementImage()
-    {
-      Rect adornedBounds = VisualTreeHelper.GetDescendantBounds( this.AdornedElement );
-
-      // Round the height and width of the bounds to reduce the 
-      // blur effect caused by the RenderTargetBitmap. 
-      // When drawing Text into RenderTargetBitmap, the ClearType 
-      // reverts to grayscale causing a blur effect. If there is 
-      // also an extrapolation, the blur effect will be worst.
-      int roundedHeight = ( int )Math.Round( adornedBounds.Height, MidpointRounding.ToEven );
-      int roundedWidth = ( int )Math.Round( adornedBounds.Width, MidpointRounding.ToEven );
-
-      VisualBrush brush = new VisualBrush( this.AdornedElement );
-
-      Rectangle rectangle = new Rectangle();
-
-      // Only if we have something to adorn
-      if( this.DeepCopy
-        && ( ( roundedWidth > 0 ) && ( roundedHeight > 0 ) ) )
-      {
-        try
-        {
-          RenderTargetBitmap bitmap = new RenderTargetBitmap( roundedWidth,
-            roundedHeight,
-            96,
-            96,
-            PixelFormats.Pbgra32 );
-
-          DrawingVisual drawingVisual = new DrawingVisual();
-
-          using( DrawingContext context = drawingVisual.RenderOpen() )
-          {
-            Rect finalRect = new Rect( 0,
-                0,
-                roundedWidth,
-                roundedHeight );
-
-            context.DrawRectangle( brush, null, finalRect );
-          }
-
-          bitmap.Render( drawingVisual );
-
-          // Ensure to set the Height and Width
-          // values for the Fill does not resize the 
-          // rectangle if it is larger. This also
-          // reduce the blur effect.
-          rectangle.Height = roundedHeight;
-          rectangle.Width = roundedWidth;
-          rectangle.UpdateLayout();
-
-          // Adding BitmapScallingMode using any other BitmapScalingMode cause some
-          // blur in the resulting Bitmap
-          RenderOptions.SetBitmapScalingMode( rectangle, BitmapScalingMode.NearestNeighbor );
-          rectangle.Fill = new ImageBrush( bitmap );
-
-          // Translate the Top Left corner of the rectangle that
-          // contains the AdornedElement
-          if( !adornedBounds.Size.IsEmpty )
-          {
-            rectangle.RenderTransform = new TranslateTransform( adornedBounds.X, adornedBounds.Y );
-          }
-        }
-        catch( Exception )
-        {
-          // Avoid any exception and use the brush itself
-          rectangle.Fill = brush;
-        }
-      }
-      else
-      {
-        rectangle.Fill = brush;
-      }
-
-      return rectangle;
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      this.AdornedElement.Measure( constraint );
-
-      // Ensure to return the DescendantBounds to take Margins and Padding
-      // into consideration
-      Rect bounds = VisualTreeHelper.GetDescendantBounds( this.AdornedElement );
-
-      return bounds.Size;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs
deleted file mode 100644
index 476dac4c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs
+++ /dev/null
@@ -1,2664 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using Xceed.Utils.Wpf.DragDrop;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal sealed class ColumnReorderingDragSourceManager : DragSourceManager
-  {
-    #region Private Fields
-
-    private static readonly Duration s_columnAnimationDuration = new Duration( TimeSpan.FromMilliseconds( 500d ) );
-    private static readonly Duration s_draggedElementFadeInDuration = new Duration( TimeSpan.FromMilliseconds( 250d ) );
-    private static readonly Duration s_returnToOriginalPositionDuration = new Duration( TimeSpan.FromMilliseconds( 250d ) );
-
-    private static readonly Point s_origin = new Point();
-
-    #endregion
-
-    internal ColumnReorderingDragSourceManager( UIElement draggedElement, AdornerLayer adornerLayer, UIElement container, int level )
-      : base( draggedElement, adornerLayer, container )
-    {
-      m_level = level;
-      m_dataGridContext = DataGridControl.GetDataGridContext( draggedElement );
-
-      Debug.Assert( m_dataGridContext != null );
-
-      m_splitterTranslation = TableflowView.GetFixedColumnSplitterTranslation( m_dataGridContext );
-      m_columnVirtualizationManager = m_dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
-      m_reorderCancelled = false;
-    }
-
-    #region IsAnimatedColumnReorderingEnabled Internal Property
-
-    internal bool IsAnimatedColumnReorderingEnabled
-    {
-      get
-      {
-        return m_isAnimatedColumnReorderingEnabled;
-      }
-      private set
-      {
-        if( value == m_isAnimatedColumnReorderingEnabled )
-          return;
-
-        m_isAnimatedColumnReorderingEnabled = value;
-
-        this.OnPropertyChanged( "IsAnimatedColumnReorderingEnabled" );
-      }
-    }
-
-    private bool m_isAnimatedColumnReorderingEnabled;
-
-    #endregion
-
-    #region AnimatedColumnReorderingTranslation Attached Property
-
-    // This translation will be used by the AnimatedColumnReorderingManager to apply a TranslateTransform
-    // to Columns that require it in order to give a preview of the reordering in an animated or live way
-    internal static readonly DependencyProperty AnimatedColumnReorderingTranslationProperty = DependencyProperty.RegisterAttached(
-      "AnimatedColumnReorderingTranslation",
-      typeof( TransformGroup ),
-      typeof( ColumnReorderingDragSourceManager ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal static TransformGroup GetAnimatedColumnReorderingTranslation( DependencyObject obj )
-    {
-      return ( TransformGroup )obj.GetValue( ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
-    }
-
-    private static void SetAnimatedColumnReorderingTranslation( DependencyObject obj, TransformGroup value )
-    {
-      obj.SetValue( ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty, value );
-    }
-
-    private static void ClearAnimatedColumnReorderingTranslation( DependencyObject obj )
-    {
-      var group = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingTranslation( obj );
-      if( group != null )
-      {
-        ColumnReorderingDragSourceManager.ClearTranslateTransformAnimation( ColumnReorderingDragSourceManager.GetColumnPositionTransform( group ) );
-        ColumnReorderingDragSourceManager.ClearScaleTransformAnimation( ColumnReorderingDragSourceManager.GetColumnSizeTransform( group ) );
-      }
-
-      obj.ClearValue( ColumnReorderingDragSourceManager.AnimatedColumnReorderingTranslationProperty );
-    }
-
-    private static TransformGroup CreateColumnTransformGroup()
-    {
-      var group = new TransformGroup();
-      group.Children.Add( new TranslateTransform() );
-      group.Children.Add( new ScaleTransform() );
-
-      return group;
-    }
-
-    private static TransformGroup GetColumnTransformGroup( ColumnBase column )
-    {
-      if( column == null )
-        return null;
-
-      var group = ColumnReorderingDragSourceManager.GetAnimatedColumnReorderingTranslation( column );
-      if( group == null )
-      {
-        group = ColumnReorderingDragSourceManager.CreateColumnTransformGroup();
-        ColumnReorderingDragSourceManager.SetAnimatedColumnReorderingTranslation( column, group );
-      }
-
-      Debug.Assert( group != null );
-
-      return group;
-    }
-
-    private static TranslateTransform GetColumnPositionTransform( TransformGroup group )
-    {
-      if( ( group == null ) || ( group.Children.Count <= 0 ) )
-        return null;
-
-      return group.Children[ 0 ] as TranslateTransform;
-    }
-
-    private static ScaleTransform GetColumnSizeTransform( TransformGroup group )
-    {
-      if( ( group == null ) || ( group.Children.Count <= 1 ) )
-        return null;
-
-      return group.Children[ 1 ] as ScaleTransform;
-    }
-
-    #endregion
-
-    protected override void OnDragStart( Func<IInputElement, Point> getPosition )
-    {
-      if( m_isDragStarted )
-        throw new InvalidOperationException();
-
-      m_isDragStarted = true;
-
-      this.StopAnimationsAndRollback();
-      this.UpdateIsAnimatedColumnReorderingEnabled();
-
-      base.OnDragStart( getPosition );
-
-      var draggedElement = this.DraggedElement;
-
-      //When the grid is hosted in a popup window, it is not possible to know the position of the popup in certain scenarios (e.g. fullscreen, popup openning upward).
-      //Thus we must use a regular system adorner instead of the ghost window, so that the dragged adorner will appear correctly under the mouse pointer.
-      if( this.IsPopup )
-      {
-        this.SetPopupDragAdorner( draggedElement as ColumnManagerCell );
-      }
-
-      if( !this.IsAnimatedColumnReorderingEnabled )
-      {
-        this.AutoScrollInterval = TimeSpan.FromMilliseconds( 50d );
-        return;
-      }
-
-      this.AutoScrollInterval = TimeSpan.Zero;
-
-      // Get initial mouse positions
-      m_lastDraggedElementOffset = draggedElement.TranslatePoint( getPosition.Invoke( draggedElement ), this.Container ).X;
-
-      var draggedCell = draggedElement as ColumnManagerCell;
-      if( draggedCell != null )
-      {
-        var draggedColumn = draggedCell.ParentColumn;
-        Debug.Assert( draggedColumn != null );
-
-        this.TakeColumnsLayoutSnapshot();
-
-        // Affect the column's IsBeingDraggedAnimated to ensure every prepared container calls AddDraggedColumnGhost of this manager.
-        draggedColumn.SetColumnReorderingDragSourceManager( this );
-        draggedColumn.SetIsBeingDraggedAnimated( true );
-      }
-
-      TableflowView.SetAreColumnsBeingReordered( m_dataGridContext, true );
-      TableflowView.SetColumnReorderingDragSourceManager( m_dataGridContext, this );
-
-      this.HideDraggedElements();
-    }
-
-    protected override void OnDragEnd( Func<IInputElement, Point> getPosition, bool drop )
-    {
-      if( !m_isDragStarted )
-        throw new InvalidOperationException();
-
-      m_isDragStarted = false;
-
-      base.OnDragEnd( getPosition, drop );
-
-      //If in a popup, we are using a system adorner, and we need to hide it when releasing the mouse button.
-      if( this.IsPopup )
-      {
-        m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 0d;
-        m_popupDraggedElementAdorner.SetOffset( s_origin );
-      }
-
-      m_columnsLayout.Clear();
-
-      if( !this.IsAnimatedColumnReorderingEnabled )
-        return;
-
-      this.MoveGhostToTargetAndDetach();
-      this.ClearColumnAnimations();
-      this.ClearSplitterAnimation();
-    }
-
-    protected override void OnDragMove( Func<IInputElement, Point> getPosition )
-    {
-      if( this.IsAnimatedColumnReorderingEnabled )
-      {
-        this.UpdateMouseMoveDirection( getPosition );
-      }
-
-      base.OnDragMove( getPosition );
-    }
-
-    protected override void OnDragOver( IDropTarget target, Func<IInputElement, Point> getPosition )
-    {
-      base.OnDragOver( target, getPosition );
-
-      if( !this.IsAnimatedColumnReorderingEnabled )
-        return;
-
-      // We are reverting every animation before detaching from the manager
-      // so do not update the ghost position
-      if( m_ghostToTargetAndDetachAnimationClock != null )
-        return;
-
-      var draggedCell = this.DraggedElement as ColumnManagerCell;
-      if( draggedCell == null )
-        return;
-
-      var dropTarget = this.CurrentDropTarget as ColumnManagerCell;
-      if( ( dropTarget == null ) || ( dropTarget == draggedCell ) )
-        return;
-
-      var draggedOverDataGridContext = DataGridControl.GetDataGridContext( dropTarget );
-      if( ( draggedOverDataGridContext == null ) || ( m_dataGridContext != draggedOverDataGridContext ) || !this.CanReorder( draggedCell, dropTarget, this.CurrentDropTargetToContainerPosition ) )
-        return;
-
-      this.UpdateColumnsLayout();
-      this.ApplyColumnsLayoutAnimations();
-      this.ApplySplitterAnimation();
-    }
-
-    protected override DropTargetInfo GetDropTarget( Func<IInputElement, Point> getPosition )
-    {
-      if( !this.IsAnimatedColumnReorderingEnabled )
-        return base.GetDropTarget( getPosition );
-
-      var cell = this.DraggedElement as ColumnManagerCell;
-      if( cell == null )
-        return base.GetDropTarget( getPosition );
-
-      var parentRow = cell.ParentRow as ColumnManagerRow;
-      if( parentRow == null )
-        return base.GetDropTarget( getPosition );
-
-      foreach( var dropTargetInfo in DragDropHelper.GetDropTargetAtPoint( this.DraggedElement, this.Container, getPosition ) )
-      {
-        var target = dropTargetInfo.Target;
-        if( !( target is ColumnManagerCell ) && !( target is ColumnManagerRow ) )
-          return dropTargetInfo;
-      }
-
-      var dragContainer = this.Container;
-      var dragContainerRect = new Rect( new Point(), dragContainer.RenderSize );
-
-      var draggedElementToMouse = getPosition.Invoke( cell );
-      var draggedElementTopLeftToMouse = new Point( draggedElementToMouse.X - this.InitialMousePositionToDraggedElement.Value.X, draggedElementToMouse.Y - this.InitialMousePositionToDraggedElement.Value.Y );
-      var draggedElementBottomRightToMouse = new Point( draggedElementTopLeftToMouse.X + cell.ActualWidth, draggedElementTopLeftToMouse.Y + cell.ActualHeight );
-
-      var draggedElementRectInDragContainer = new Rect( cell.TranslatePoint( draggedElementTopLeftToMouse, dragContainer ),
-                                                        cell.TranslatePoint( draggedElementBottomRightToMouse, dragContainer ) );
-      draggedElementRectInDragContainer.Intersect( dragContainerRect );
-
-      // We are not interested by the y-axis.  We set the y-axis value to 0 so the rectangle use to look for overlap on the x-axis
-      // will work no matter where is located the dragged element on the y-axis.
-      var cellRectInDragContainer = new Rect( cell.TranslatePoint( new Point( draggedElementTopLeftToMouse.X, 0d ), dragContainer ),
-                                              cell.TranslatePoint( new Point( draggedElementBottomRightToMouse.X, cell.ActualHeight ), dragContainer ) );
-      var rowRectInDragContainer = parentRow.TransformToVisual( dragContainer ).TransformBounds( VisualTreeHelper.GetDescendantBounds( parentRow ) );
-
-      var dropTargetRectInDragContainer = rowRectInDragContainer;
-      dropTargetRectInDragContainer.Intersect( cellRectInDragContainer );
-
-      var result = default( DropTargetInfo );
-
-      // Some part of the dragged element overlaps the container.
-      if( !draggedElementRectInDragContainer.IsEmpty && !dropTargetRectInDragContainer.IsEmpty )
-      {
-        var hitTestPosition = new Point();
-        var dropPosition = new Point();
-
-        // We are not interested by the y-axis, but we will set a value that will return a positive result for hit testing.
-        hitTestPosition.Y = cellRectInDragContainer.Top + ( cellRectInDragContainer.Height / 2d );
-        dropPosition.Y = hitTestPosition.Y;
-
-        switch( m_horizontalMouseDragDirection )
-        {
-          // Use the dragged element left edge to minimize the size of the blank area during animations.
-          case HorizontalMouseDragDirection.Left:
-            {
-              hitTestPosition.X = dropTargetRectInDragContainer.Left;
-              dropPosition.X = cellRectInDragContainer.Left;
-            }
-            break;
-
-          // Use the dragged element right edge to minimize the size of the blank area during animations.
-          case HorizontalMouseDragDirection.Right:
-            {
-              hitTestPosition.X = dropTargetRectInDragContainer.Right;
-              dropPosition.X = cellRectInDragContainer.Right;
-            }
-            break;
-
-          default:
-            {
-              var dragContainerToMouse = getPosition.Invoke( dragContainer );
-
-              if( dragContainerToMouse.X <= dropTargetRectInDragContainer.Left )
-              {
-                hitTestPosition.X = dropTargetRectInDragContainer.Left;
-                dropPosition.X = cellRectInDragContainer.Left;
-              }
-              else if( dragContainerToMouse.X >= dropTargetRectInDragContainer.Right )
-              {
-                hitTestPosition.X = dropTargetRectInDragContainer.Right;
-                dropPosition.X = cellRectInDragContainer.Right;
-              }
-              else
-              {
-                hitTestPosition.X = dragContainerToMouse.X;
-                dropPosition.X = dragContainerToMouse.X;
-              }
-            }
-            break;
-        }
-
-        // Ensure the DraggedElement is not visible to hit test.
-        cell.IsHitTestVisible = false;
-
-        try
-        {
-          result = this.GetDropTargetAtPoint( cell, new RelativePoint( dragContainer, dropPosition ) );
-        }
-        finally
-        {
-          cell.ClearValue( UIElement.IsHitTestVisibleProperty );
-        }
-      }
-
-      if( !( result.Target is ColumnManagerRow ) && !( result.Target is ColumnManagerCell ) )
-      {
-        result = default( DropTargetInfo );
-      }
-
-      // Flag used to reduce the number of column animations, to speed up the scrolling on ColumnManagerCell dragging.
-      if( ( result.Target == null ) && ( this.CurrentDropTarget == null ) )
-      {
-        m_noColumnsReorderingNeeded = true;
-        if( this.IsPopup )
-        {
-          m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 0d;
-        }
-      }
-      else
-      {
-        m_noColumnsReorderingNeeded = false;
-      }
-
-      return result;
-    }
-
-    protected override void UpdateGhost( Func<IInputElement, Point> getPosition )
-    {
-      //If in TableView and the grid is hosted in a Popup window.
-      if( !this.IsAnimatedColumnReorderingEnabled && this.IsPopup )
-      {
-        this.ShowGhost = false;
-
-        var draggedElementToMouse = getPosition.Invoke( this.DraggedElement );
-        var initialMousePosition = this.InitialMousePositionToDraggedElement.GetValueOrDefault();
-
-        // Correct it according to initial mouse position over the dragged element
-        draggedElementToMouse.X -= initialMousePosition.X;
-        draggedElementToMouse.Y -= initialMousePosition.Y;
-
-        this.ApplyContainerClip( m_popupDraggedElementAdorner );
-        m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 1d;
-        m_popupDraggedElementAdorner.SetOffset( draggedElementToMouse );
-      }
-      //If no animation, or if the dragged object is beyond the edge of the grid, no need to do anything in this override, simply call base.
-      //This will be sufficient to update the DraggedElementGhost positon. The result is a much faster scrolling of the grid via the CheckForAutoScroll() method.
-      else if( this.IsAnimatedColumnReorderingEnabled && !m_noColumnsReorderingNeeded )
-      {
-        // We are reverting every animation before detaching from the manager
-        // so do not update the ghost position
-        if( m_ghostToTargetAndDetachAnimationClock != null )
-          return;
-
-        var dragOverRowOrCell = ( this.CurrentDropTarget is ColumnManagerRow ) || ( this.CurrentDropTarget is ColumnManagerCell );
-
-        // We are dragging over an object that will handle the drop itself
-        if( !dragOverRowOrCell && !this.IsPopup )
-        {
-          // Ensure to pause every other animations before
-          this.PauseGhostToMousePositionAnimation();
-          this.PauseDraggedElementFadeInAnimation();
-
-          this.RollbackReordering();
-          this.ShowGhost = true;
-
-          this.MoveGhostToTargetColumn( getPosition.Invoke( this.DraggedElement ) );
-        }
-        //If dragging over an object that will handle the drop itself and the grid is hosted in a Popup window.
-        else if( !dragOverRowOrCell && this.IsPopup )
-        {
-          // Ensure to pause every other animations before
-          this.PauseGhostToMousePositionAnimation();
-          this.PauseDraggedElementFadeInAnimation();
-
-          this.RollbackReordering();
-          this.ShowGhost = false;
-
-          var draggedElementToMouse = getPosition.Invoke( this.DraggedElement );
-
-          this.MoveGhostToTargetColumn( draggedElementToMouse );
-
-          var initialMousePosition = this.InitialMousePositionToDraggedElement.GetValueOrDefault();
-
-          // Correct it according to initial mouse position over the dragged element
-          draggedElementToMouse.X -= initialMousePosition.X;
-          draggedElementToMouse.Y -= initialMousePosition.Y;
-
-          this.ApplyContainerClip( m_popupDraggedElementAdorner );
-          m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 1d;
-          m_popupDraggedElementAdorner.SetOffset( draggedElementToMouse );
-        }
-        //If animations are required.
-        else
-        {
-          //If in a popup, hide the dragged element adorner.
-          if( this.IsPopup )
-          {
-            m_popupDraggedElementAdorner.AdornedElementImage.Opacity = 0d;
-            m_popupDraggedElementAdorner.SetOffset( s_origin );
-          }
-
-          // Pause animations that are moving ghosts to target Column
-          this.PauseMoveGhostToTargetColumnAnimation();
-          this.PauseDraggedElementFadeInAnimation();
-
-          this.ShowGhost = false;
-          this.ShowDraggedColumnGhosts();
-          this.HideDraggedElements();
-
-          var draggedElementToMouse = getPosition.Invoke( this.DraggedElement );
-          var initialMousePosition = this.InitialMousePositionToDraggedElement.GetValueOrDefault();
-
-          // Correct it according to initial mouse position over the dragged element
-          draggedElementToMouse.X -= initialMousePosition.X;
-          draggedElementToMouse.Y -= initialMousePosition.Y;
-
-          // Wait for the animation to complete before explicitly setting the X and Y offsets on the ghost adorners OR if reordering was canceled
-          if( ( m_ghostToMousePositionAnimationClock == null ) && ( m_ghostToTargetColumnAnimationClock == null ) && !m_reorderCancelled )
-          {
-            // Update the position of ghosts for each rows
-            foreach( var adorner in this.GetElementAdorners() )
-            {
-              adorner.ApplyAnimationClock( DraggedElementAdorner.OffsetProperty, null );
-              adorner.SetOffset( draggedElementToMouse );
-            }
-          }
-          else
-          {
-            this.MoveGhostToMousePosition( draggedElementToMouse );
-          }
-        }
-      }
-
-      base.UpdateGhost( getPosition );
-    }
-
-    protected override void OnDroppedOutside()
-    {
-      base.OnDroppedOutside();
-
-      if( !this.IsAnimatedColumnReorderingEnabled )
-        return;
-
-      this.RollbackReordering();
-    }
-
-    internal void AddDraggedColumnGhost( UIElement element )
-    {
-      if( ( element == null ) || m_elementToDraggedElementAdorner.ContainsKey( element ) )
-        return;
-
-      // Get the Rect for the DataGridControl
-      var dataGridControl = m_dataGridContext.DataGridControl;
-      var dataGridControlRect = new Rect( 0d, 0d, dataGridControl.ActualWidth, dataGridControl.ActualHeight );
-      var elementToDataGridControl = element.TranslatePoint( s_origin, dataGridControl );
-      var elementRect = new Rect( elementToDataGridControl, element.RenderSize );
-
-      // This is a special case with the current element that is always layouted, but can be out of view
-      if( !elementRect.IntersectsWith( dataGridControlRect ) )
-        return;
-
-      var adorner = new AnimatedDraggedElementAdorner( element, this.AdornerLayer, true );
-
-      this.ApplyContainerClip( adorner );
-      this.AdornerLayer.Add( adorner );
-
-      m_elementToDraggedElementAdorner.Add( element, adorner );
-    }
-
-    internal void RemoveDraggedColumnGhost( UIElement element )
-    {
-      if( m_elementToDraggedElementAdorner.Count == 0 )
-        return;
-
-      DraggedElementAdorner adorner;
-      if( !m_elementToDraggedElementAdorner.TryGetValue( element, out adorner ) )
-        return;
-
-      Debug.Assert( adorner != null );
-      this.AdornerLayer.Remove( adorner );
-      m_elementToDraggedElementAdorner.Remove( element );
-    }
-
-    internal bool ContainsDraggedColumnGhost( UIElement element )
-    {
-      if( ( element == null ) || ( m_elementToDraggedElementAdorner.Count == 0 ) )
-        return false;
-
-      return m_elementToDraggedElementAdorner.ContainsKey( element );
-    }
-
-    internal bool CanReorder( ColumnManagerCell draggedCell, ColumnManagerCell dropTarget, RelativePoint? dropPoint )
-    {
-      if( ( draggedCell == null )
-        || ( dropTarget == null )
-        || ( draggedCell == dropTarget )
-        || !dropPoint.HasValue
-        || ( DataGridControl.GetDataGridContext( draggedCell ) != m_dataGridContext )
-        || ( DataGridControl.GetDataGridContext( dropTarget ) != DataGridControl.GetDataGridContext( draggedCell ) ) )
-        return false;
-
-      var dropColumn = dropTarget.ParentColumn;
-      if( dropColumn == null )
-        return false;
-
-      var sourceLayout = m_dataGridContext.ColumnManager;
-      var dropColumnLocation = sourceLayout.GetColumnLocationFor( dropColumn );
-      if( dropColumnLocation == null )
-        return false;
-
-      if( ColumnReorderingDragSourceManager.IsPointLocatedBeforeTarget( dropTarget, dropPoint ) )
-      {
-        if( !draggedCell.CanMoveBefore( dropColumn ) )
-          return false;
-
-        for( var location = dropColumnLocation.GetPreviousSibling(); location != null; location = location.GetPreviousSibling() )
-        {
-          if( location.Type != LocationType.Column )
-            continue;
-
-          var previousColumn = ( ( ColumnHierarchyManager.IColumnLocation )location ).Column;
-          if( !draggedCell.CanMoveAfter( previousColumn ) )
-            return false;
-
-          break;
-        }
-      }
-      else if( ColumnReorderingDragSourceManager.IsPointLocatedAfterTarget( dropTarget, dropPoint ) )
-      {
-        if( !draggedCell.CanMoveAfter( dropColumn ) )
-          return false;
-
-        for( var location = dropColumnLocation.GetNextSibling(); location != null; location = location.GetNextSibling() )
-        {
-          if( location.Type != LocationType.Column )
-            continue;
-
-          var nextColumn = ( ( ColumnHierarchyManager.IColumnLocation )location ).Column;
-          if( !draggedCell.CanMoveBefore( nextColumn ) )
-            return false;
-
-          break;
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    internal void CommitReordering()
-    {
-      var draggedCell = this.DraggedElement as Cell;
-      if( draggedCell == null )
-        return;
-
-      var draggedColumn = draggedCell.ParentColumn;
-      if( draggedColumn == null )
-        return;
-
-      var draggedColumnReorderLocation = m_columnsLayout[ draggedColumn ];
-      if( draggedColumnReorderLocation == null )
-        return;
-
-      var sourceLayout = m_dataGridContext.ColumnManager;
-
-      var draggedColumnSourceLocation = sourceLayout.GetColumnLocationFor( draggedColumn );
-      Debug.Assert( draggedColumnSourceLocation != null );
-      if( draggedColumnSourceLocation == null )
-        return;
-
-      var previousLocation = draggedColumnReorderLocation.GetPreviousSibling();
-      if( previousLocation != null )
-      {
-        switch( previousLocation.Type )
-        {
-          case LocationType.Column:
-            {
-              var pivotColumn = ( ( ColumnHierarchyModel.IColumnLocation )previousLocation ).Column;
-              var pivotLocation = sourceLayout.GetColumnLocationFor( pivotColumn );
-
-              if( pivotLocation != null )
-              {
-                Debug.Assert( draggedColumnSourceLocation.CanMoveAfter( pivotLocation ) );
-                draggedColumnSourceLocation.MoveAfter( pivotLocation );
-                return;
-              }
-            }
-            break;
-
-          case LocationType.Splitter:
-            {
-              var levelMarkers = sourceLayout.GetLevelMarkersFor( draggedColumn.ContainingCollection );
-              var pivotLocation = ( levelMarkers != null ) ? levelMarkers.Splitter : null;
-
-              if( ( pivotLocation != null ) && draggedColumnSourceLocation.CanMoveAfter( pivotLocation ) )
-              {
-                draggedColumnSourceLocation.MoveAfter( pivotLocation );
-                return;
-              }
-            }
-            break;
-
-          case LocationType.Start:
-            {
-              var levelMarkers = sourceLayout.GetLevelMarkersFor( draggedColumn.ContainingCollection );
-              var pivotLocation = ( levelMarkers != null ) ? levelMarkers.Start : null;
-
-              if( ( pivotLocation != null ) && draggedColumnSourceLocation.CanMoveAfter( pivotLocation ) )
-              {
-                draggedColumnSourceLocation.MoveAfter( pivotLocation );
-                return;
-              }
-            }
-            break;
-
-          default:
-            throw new NotImplementedException( "Unexpected target location." );
-        }
-      }
-
-      var nextLocation = draggedColumnReorderLocation.GetNextSibling();
-      if( nextLocation != null )
-      {
-        switch( nextLocation.Type )
-        {
-          case LocationType.Column:
-            {
-              var pivotColumn = ( ( ColumnHierarchyModel.IColumnLocation )nextLocation ).Column;
-              var pivotLocation = sourceLayout.GetColumnLocationFor( pivotColumn );
-
-              if( pivotLocation != null )
-              {
-                Debug.Assert( draggedColumnSourceLocation.CanMoveBefore( pivotLocation ) );
-                draggedColumnSourceLocation.MoveBefore( pivotLocation );
-                return;
-              }
-            }
-            break;
-
-          case LocationType.Splitter:
-            {
-              var levelMarkers = sourceLayout.GetLevelMarkersFor( draggedColumn.ContainingCollection );
-              var pivotLocation = ( levelMarkers != null ) ? levelMarkers.Splitter : null;
-
-              if( ( pivotLocation != null ) && draggedColumnSourceLocation.CanMoveBefore( pivotLocation ) )
-              {
-                draggedColumnSourceLocation.MoveBefore( pivotLocation );
-                return;
-              }
-            }
-            break;
-
-          case LocationType.Orphan:
-            {
-              var levelMarkers = sourceLayout.GetLevelMarkersFor( draggedColumn.ContainingCollection );
-              var pivotLocation = ( levelMarkers != null ) ? levelMarkers.Orphan : null;
-
-              if( ( pivotLocation != null ) && draggedColumnSourceLocation.CanMoveBefore( pivotLocation ) )
-              {
-                draggedColumnSourceLocation.MoveBefore( pivotLocation );
-                return;
-              }
-            }
-            break;
-
-          default:
-            throw new NotImplementedException( "Unexpected target location." );
-        }
-      }
-
-      var parentLocation = draggedColumnReorderLocation.GetParent();
-      if( parentLocation != null )
-      {
-        switch( parentLocation.Type )
-        {
-          case LocationType.Column:
-            {
-              var pivotColumn = ( ( ColumnHierarchyModel.IColumnLocation )parentLocation ).Column;
-              var pivotLocation = sourceLayout.GetColumnLocationFor( pivotColumn );
-
-              if( pivotLocation != null )
-              {
-                Debug.Assert( draggedColumnSourceLocation.CanMoveUnder( pivotLocation ) );
-                draggedColumnSourceLocation.MoveUnder( pivotLocation );
-                return;
-              }
-            }
-            break;
-        }
-      }
-
-      this.ClearColumnAnimations();
-      this.ClearSplitterAnimation();
-    }
-
-    internal IEnumerable<IDropTarget> GetDropTargetsAtPoint( RelativePoint point )
-    {
-      var container = this.Container;
-      if( container == null )
-        yield break;
-
-      for( var target = container.InputHitTest( point.GetPoint( container ) ) as DependencyObject; target != null; target = Xceed.Utils.Wpf.TreeHelper.GetParent( target ) )
-      {
-        var dropTarget = target as IDropTarget;
-        if( dropTarget == null )
-          continue;
-
-        yield return dropTarget;
-      }
-    }
-
-    private static bool IsPointLocatedBeforeTarget( FrameworkElement target, RelativePoint? point )
-    {
-      if( ( target == null ) || !point.HasValue )
-        return false;
-
-      var targetPoint = point.Value.GetPoint( target );
-
-      return ( targetPoint.X <= target.ActualWidth / 2d );
-    }
-
-    private static bool IsPointLocatedAfterTarget( FrameworkElement target, RelativePoint? point )
-    {
-      if( ( target == null ) || !point.HasValue )
-        return false;
-
-      var targetPoint = point.Value.GetPoint( target );
-
-      return ( targetPoint.X > target.ActualWidth / 2d );
-    }
-
-    private DropTargetInfo GetDropTargetAtPoint( UIElement draggedElement, RelativePoint point )
-    {
-      foreach( var dropTarget in this.GetDropTargetsAtPoint( point ) )
-      {
-        if( dropTarget.CanDropElement( draggedElement, point ) )
-          return new DropTargetInfo( dropTarget, point, true );
-      }
-
-      return default( DropTargetInfo );
-    }
-
-    private static void ClearTranslateTransformAnimation( TranslateTransform transform )
-    {
-      if( transform == null )
-        return;
-
-      // Force a local value before removing the potential animation clock of this transform to avoid leaving the current animated value after animation is removed
-      transform.X = 0d;
-      transform.ApplyAnimationClock( TranslateTransform.XProperty, null );
-    }
-
-    private static void ClearScaleTransformAnimation( ScaleTransform transform )
-    {
-      if( transform == null )
-        return;
-
-      // Force a local value before removing the potential animation clock of this transform to avoid leaving the current animated value after animation is removed
-      transform.CenterX = 0d;
-      transform.ScaleX = 1d;
-      transform.ApplyAnimationClock( ScaleTransform.ScaleXProperty, null );
-    }
-
-    private void SetPopupDragAdorner( ColumnManagerCell columnManagerCell )
-    {
-      if( columnManagerCell == null )
-        return;
-
-      if( m_popupDraggedElementAdorner != null )
-      {
-        this.AdornerLayer.Remove( m_popupDraggedElementAdorner );
-        m_popupDraggedElementAdorner = null;
-      }
-
-      var dataGridControl = m_dataGridContext.DataGridControl;
-      var dataGridControlRect = new Rect( 0d, 0d, dataGridControl.ActualWidth, dataGridControl.ActualHeight );
-      var elementToDataGridControl = columnManagerCell.TranslatePoint( s_origin, dataGridControl );
-      var elementRect = new Rect( elementToDataGridControl, columnManagerCell.RenderSize );
-
-      // This is a special case with the current Element that is always be layouted, but can be out of view
-      if( !elementRect.IntersectsWith( dataGridControlRect ) )
-        return;
-
-      var adorner = new AnimatedDraggedElementAdorner( columnManagerCell, this.AdornerLayer, true );
-      adorner.AdornedElementImage.Opacity = 0d;
-
-      this.ApplyContainerClip( adorner );
-      this.AdornerLayer.Add( adorner );
-
-      m_popupDraggedElementAdorner = adorner;
-    }
-
-    private void StopAnimationsAndRollback()
-    {
-      // Ensure to pause any animation that was applied to ghost adorners.
-      this.PauseGhostToMousePositionAnimation();
-      this.PauseMoveGhostToTargetColumnAnimation();
-      this.PauseMoveGhostToTargetAndDetachAnimation();
-
-      m_reorderCancelled = false;
-
-      this.ShowGhost = true;
-
-      this.ClearColumnAnimations();
-      this.ClearSplitterAnimation();
-    }
-
-    private void UpdateMouseMoveDirection( Func<IInputElement, Point> getPosition )
-    {
-      var draggedElement = this.DraggedElement;
-      var draggedElementToMouse = getPosition.Invoke( draggedElement );
-      var currentDraggedElementOffset = draggedElement.TranslatePoint( draggedElementToMouse, this.Container ).X;
-
-      // Verify if there is an horizontal change according to the lastchange
-      var dragRect = new Rect( m_lastDraggedElementOffset - SystemParameters.MinimumHorizontalDragDistance, 0d, SystemParameters.MinimumVerticalDragDistance * 2, 0d );
-      if( dragRect.Contains( new Point( currentDraggedElementOffset, 0 ) ) )
-        return;
-
-      if( currentDraggedElementOffset < m_lastDraggedElementOffset )
-      {
-        m_horizontalMouseDragDirection = HorizontalMouseDragDirection.Left;
-      }
-      else if( currentDraggedElementOffset > m_lastDraggedElementOffset )
-      {
-        m_horizontalMouseDragDirection = HorizontalMouseDragDirection.Right;
-      }
-
-      m_lastDraggedElementOffset = currentDraggedElementOffset;
-    }
-
-    private void UpdateIsAnimatedColumnReorderingEnabled()
-    {
-      var tableflowView = m_dataGridContext.DataGridControl.GetView() as TableflowView;
-
-      // Column reordering is not allowed in a detail when details are flatten.
-      var isAnimatedColumnReorderingEnabled = ( tableflowView != null )
-                                           && ( tableflowView.IsAnimatedColumnReorderingEnabled )
-                                           && ( !m_dataGridContext.IsAFlattenDetail );
-
-      // Make sure the dragged cell's parent row allows column reordering.
-      if( isAnimatedColumnReorderingEnabled )
-      {
-        var draggedCell = this.DraggedElement as Cell;
-        if( draggedCell != null )
-        {
-          // We don't want any ghost to be displayed when column reordering is not allowed by the parent row.
-          // Setting the IsAnimatedColumnReorderingEnabled property will prevent this and will display the Cursor.No when dragging.
-          var parentRow = draggedCell.ParentRow as ColumnManagerRow;
-          if( parentRow != null )
-          {
-            isAnimatedColumnReorderingEnabled = parentRow.AllowColumnReorder;
-          }
-
-          // The main column is not allowed to be reorder when details are flatten.
-          if( isAnimatedColumnReorderingEnabled && m_dataGridContext.AreDetailsFlatten )
-          {
-            var parentColumn = draggedCell.ParentColumn;
-            if( parentColumn != null )
-            {
-              isAnimatedColumnReorderingEnabled = ( parentColumn != null ) && !parentColumn.IsMainColumn;
-            }
-          }
-        }
-      }
-
-      this.IsAnimatedColumnReorderingEnabled = isAnimatedColumnReorderingEnabled;
-    }
-
-    private void MoveGhostToMousePosition( Point mousePosition )
-    {
-      // Ensure the opacity of the ghost is correctly set
-      this.ShowDraggedColumnGhosts();
-
-      var currentAdornerPosition = mousePosition;
-
-      if( m_elementToDraggedElementAdorner.Count == 0 )
-        return;
-
-      var remainingDuration = s_returnToOriginalPositionDuration;
-
-      if( m_ghostToMousePositionAnimationClock != null )
-      {
-        var pointAnimation = m_ghostToMousePositionAnimationClock.Timeline as PointAnimation;
-        var currentValue = pointAnimation.To.GetValueOrDefault();
-        var deltaX = currentValue.X - mousePosition.X;
-        var deltaY = currentValue.Y - mousePosition.Y;
-
-        var dragingX = Math.Abs( deltaX ) > SystemParameters.MinimumHorizontalDragDistance;
-        var dragingY = Math.Abs( deltaY ) > SystemParameters.MinimumVerticalDragDistance;
-
-        // If the target value is already the correct one, no need to stop animation and create another one
-        if( ( pointAnimation != null ) && ( !dragingX && !dragingY ) )
-          return;
-
-        if( m_ghostToMousePositionAnimationClock.CurrentState == ClockState.Active )
-        {
-          // The remaining duration is the Timeline Duration less the elapsed time
-          remainingDuration = new Duration( pointAnimation.Duration.TimeSpan - m_ghostToMousePositionAnimationClock.CurrentTime.Value );
-        }
-      }
-
-      this.PauseGhostToMousePositionAnimation();
-
-      var animation = new PointAnimation( currentAdornerPosition, mousePosition, remainingDuration );
-
-      m_ghostToMousePositionAnimationClock = animation.CreateClock( true ) as AnimationClock;
-      m_ghostToMousePositionAnimationClock.Completed += new EventHandler( this.GhostToMousePosition_Completed );
-
-      foreach( var adorner in this.GetElementAdorners() )
-      {
-        adorner.ApplyAnimationClock( DraggedElementAdorner.OffsetProperty, m_ghostToMousePositionAnimationClock, HandoffBehavior.SnapshotAndReplace );
-      }
-
-      m_ghostToMousePositionAnimationClock.Controller.Begin();
-    }
-
-    private void GhostToMousePosition_Completed( object sender, EventArgs e )
-    {
-      if( m_ghostToMousePositionAnimationClock == sender )
-      {
-        this.PauseGhostToMousePositionAnimation();
-      }
-
-      // Ghosts are returned to their original position reordering was successfully cancelled
-      m_reorderCancelled = false;
-    }
-
-    private void PauseGhostToMousePositionAnimation()
-    {
-      if( m_ghostToMousePositionAnimationClock == null )
-        return;
-
-      // Stop the animation, do not simply pause it, so it resets correctly.
-      m_ghostToMousePositionAnimationClock.Controller.Stop();
-      m_ghostToMousePositionAnimationClock.Completed -= new EventHandler( this.GhostToMousePosition_Completed );
-      m_ghostToMousePositionAnimationClock = null;
-    }
-
-    private void MoveGhostToTargetColumn( Point mousePostion )
-    {
-      if( m_elementToDraggedElementAdorner.Count == 0 )
-        return;
-
-      var remainingDuration = s_returnToOriginalPositionDuration;
-
-      if( m_ghostToTargetColumnAnimationClock != null )
-      {
-        var pointAnimation = m_ghostToTargetColumnAnimationClock.Timeline as PointAnimation;
-
-        // If the target value is already the correct one, no need to stop animation and create another one
-        if( ( pointAnimation != null ) && ( pointAnimation.To == s_origin ) )
-          return;
-
-        if( m_ghostToTargetColumnAnimationClock.CurrentState == ClockState.Active )
-        {
-          // The remaining duration is the Timeline Duration less the elapsed time
-          remainingDuration = new Duration( pointAnimation.Duration.TimeSpan - m_ghostToTargetColumnAnimationClock.CurrentTime.Value );
-        }
-      }
-
-      // We must apply the DraggedCell FadeIn animation to let the DraggedCell reappears while the ghosts are moving to their target position
-      this.ApplyDraggedElementFadeInAnimation();
-      this.PauseMoveGhostToTargetColumnAnimation();
-
-      var animation = new PointAnimation( mousePostion, s_origin, remainingDuration );
-
-      m_ghostToTargetColumnAnimationClock = animation.CreateClock( true ) as AnimationClock;
-      m_ghostToTargetColumnAnimationClock.Completed += new EventHandler( this.GhostToTargetAnimation_Completed );
-
-      foreach( var adorner in this.GetElementAdorners() )
-      {
-        adorner.ApplyAnimationClock( DraggedElementAdorner.OffsetProperty, m_ghostToTargetColumnAnimationClock, HandoffBehavior.SnapshotAndReplace );
-      }
-    }
-
-    private void GhostToTargetAnimation_Completed( object sender, EventArgs e )
-    {
-      if( m_ghostToTargetColumnAnimationClock == sender )
-      {
-        this.PauseMoveGhostToTargetColumnAnimation();
-      }
-      else if( m_draggedElementFadeInAnimationClock == sender )
-      {
-        this.PauseDraggedElementFadeInAnimation();
-      }
-
-      if( ( m_ghostToTargetColumnAnimationClock == null ) && ( m_draggedElementFadeInAnimationClock == null ) )
-      {
-        // The ghosts were successfully moved to the target position so we hide the ghosts and display the Cells in order
-        // for the DraggedElementGhost, which is a VisualBrush of the DraggedElement that is transparent during the drag.
-        this.HideDraggedColumnGhosts();
-        this.ShowDraggedElements();
-        m_reorderCancelled = false;
-      }
-    }
-
-    private void PauseMoveGhostToTargetColumnAnimation()
-    {
-      if( m_ghostToTargetColumnAnimationClock == null )
-        return;
-
-      // Stop the animation, do not simply pause it, so it resets correctly.
-      m_ghostToTargetColumnAnimationClock.Controller.Stop();
-      m_ghostToTargetColumnAnimationClock.Completed -= new EventHandler( this.GhostToTargetAnimation_Completed );
-      m_ghostToTargetColumnAnimationClock = null;
-    }
-
-    private void MoveGhostToTargetAndDetach()
-    {
-      if( m_elementToDraggedElementAdorner.Count == 0 )
-      {
-        this.DetachManager();
-        return;
-      }
-
-      this.PauseMoveGhostToTargetAndDetachAnimation();
-
-      var draggedCell = this.DraggedElement as ColumnManagerCell;
-      if( draggedCell == null )
-        return;
-
-      var parentColumn = draggedCell.ParentColumn;
-      if( parentColumn == null )
-        return;
-
-      var parentRow = draggedCell.ParentRow;
-      if( ( parentRow == null ) || ( parentRow.CellsHostPanel == null ) )
-        return;
-
-      var cellsHostPanel = parentRow.CellsHostPanel as FixedCellPanel;
-      var draggedAdorner = m_elementToDraggedElementAdorner[ draggedCell ];
-      var fromPoint = default( Point );
-
-      if( ( draggedAdorner != null ) && ( cellsHostPanel != null ) )
-      {
-        Debug.Assert( m_columnVirtualizationManager != null );
-
-        // Update the column layout in order to have the right offset.
-        m_columnVirtualizationManager.Update();
-
-        var toPoint = default( Point? );
-        var fixedPanel = cellsHostPanel.FixedPanel as FixedCellSubPanel;
-        var scrollingPanel = cellsHostPanel.ScrollingCellsDecorator.Child as VirtualizingFixedCellSubPanel;
-
-        if( m_columnVirtualizationManager.GetScrollingFieldNames( m_level ).Contains( parentColumn ) )
-        {
-          if( scrollingPanel != null )
-          {
-            var targetPosition = scrollingPanel.CalculateCellOffset( parentColumn );
-
-            // The position must be adjusted when the dragged cell is moved from the fixed panel to the scrolling panel.
-            targetPosition.Offset( m_columnVirtualizationManager.FixedColumnsWidth - fixedPanel.ActualWidth, 0d );
-
-            toPoint = scrollingPanel.TranslatePoint( targetPosition, draggedAdorner );
-          }
-        }
-        else if( m_columnVirtualizationManager.GetFixedFieldNames( m_level ).Contains( parentColumn ) )
-        {
-          if( fixedPanel != null )
-          {
-            var targetPosition = fixedPanel.CalculateCellOffset( parentColumn );
-            toPoint = fixedPanel.TranslatePoint( targetPosition, draggedAdorner );
-          }
-        }
-
-        if( toPoint.HasValue )
-        {
-          fromPoint = new Point( -toPoint.Value.X, -toPoint.Value.Y );
-        }
-        else
-        {
-          fromPoint = draggedAdorner.Offset;
-        }
-      }
-
-      var animation = new PointAnimation( fromPoint, new Point(), s_columnAnimationDuration );
-
-      m_ghostToTargetAndDetachAnimationClock = ( AnimationClock )animation.CreateClock( true );
-      m_ghostToTargetAndDetachAnimationClock.Completed += new EventHandler( this.MoveGhostToTargetAndDetach_Completed );
-
-      //Animate all cells of all columns.
-      foreach( var entry in this.GetElementAdornerEntries() )
-      {
-        var cell = entry.Key as Cell;
-        if( cell == null )
-        {
-          Debug.Assert( false, "Only Cells should be dragged by this manager" );
-          continue;
-        }
-
-        var adorner = entry.Value;
-        adorner.ApplyAnimationClock( DraggedElementAdorner.OffsetProperty, m_ghostToTargetAndDetachAnimationClock, HandoffBehavior.SnapshotAndReplace );
-      }
-
-      m_ghostToTargetAndDetachAnimationClock.Controller.Begin();
-    }
-
-    private void MoveGhostToTargetAndDetach_Completed( object sender, EventArgs e )
-    {
-      // Ensure to stop and unregister any event handlers from animations if not null by completed
-      this.PauseMoveGhostToTargetAndDetachAnimation();
-      this.DetachManager();
-    }
-
-    private void PauseMoveGhostToTargetAndDetachAnimation()
-    {
-      if( m_ghostToTargetAndDetachAnimationClock == null )
-        return;
-
-      // Stop the animation, do not simply pause it, so it resets correctly.
-      m_ghostToTargetAndDetachAnimationClock.Controller.Stop();
-      m_ghostToTargetAndDetachAnimationClock.Completed -= new EventHandler( this.MoveGhostToTargetAndDetach_Completed );
-      m_ghostToTargetAndDetachAnimationClock = null;
-    }
-
-    private void DetachManager()
-    {
-      this.ShowDraggedElements();
-
-      var draggedCell = this.DraggedElement as Cell;
-      var parentColumn = ( draggedCell != null ) ? draggedCell.ParentColumn : null;
-
-      if( ( parentColumn != null ) && this.OwnElement( draggedCell ) )
-      {
-        parentColumn.SetIsBeingDraggedAnimated( false );
-      }
-
-      // Clear properties on the manager if it is the one currently in use on for this Detail level. This avoids problem with the FixedColumnSplitter
-      // when multiple Cells are moved rapidly:
-      // The FixedColumnSplitter listens to TableflowView.AreColumnsBeingReordered internal ViewProperty to bind to the TableflowView.FixedColumnSplitterTranslation internal 
-      // ViewProperty. The internal ViewProperty ColumnReorderingDragSourceManager is affected when a new Drag begins. The old DragSourceManager is not stopped to allow 
-      // any pending animations to complete smoothly. If the first manager clears the TableflowView.AreColumnBeingReordered property, the FixedColumnSplitters
-      // just clears its binding to the FixedColumnSplitterTranslation and is no more animated.
-      //
-      // Ensuring that the current manager for this Detail level ensure that no other drag was initialized since this manager started animations.
-
-      if( this.OwnElement( m_dataGridContext ) )
-      {
-        TableflowView.SetAreColumnsBeingReordered( m_dataGridContext, false );
-
-        if( ( parentColumn != null ) && this.OwnElement( draggedCell ) )
-        {
-          parentColumn.ClearColumnReorderingDragSourceManager();
-        }
-
-        TableflowView.ClearColumnReorderingDragSourceManager( m_dataGridContext );
-      }
-    }
-
-    private void UpdateColumnsLayout()
-    {
-      var targetCell = this.CurrentDropTarget as ColumnManagerCell;
-      var targetPoint = this.CurrentDropTargetToContainerPosition;
-      Debug.Assert( targetCell != null );
-      Debug.Assert( DataGridControl.GetDataGridContext( targetCell ) == m_dataGridContext );
-
-      var targetColumn = targetCell.ParentColumn;
-      Debug.Assert( targetColumn != null );
-
-      var targetLocation = m_columnsLayout[ targetColumn ];
-      Debug.Assert( targetLocation != null );
-      if( targetLocation == null )
-        return;
-
-      var draggedCell = this.DraggedElement as Cell;
-      Debug.Assert( draggedCell != null );
-      var draggedLocation = m_columnsLayout[ draggedCell.ParentColumn ];
-      Debug.Assert( draggedLocation != null );
-      if( draggedLocation == null )
-        return;
-
-      // Drop before target cell.
-      if( ColumnReorderingDragSourceManager.IsPointLocatedBeforeTarget( targetCell, targetPoint ) )
-      {
-        if( !draggedLocation.CanMoveBefore( targetLocation ) || object.Equals( draggedLocation, targetLocation.GetPreviousSibling() ) )
-          return;
-
-        draggedLocation.MoveBefore( targetLocation );
-      }
-      // Drop after target cell.
-      else if( ColumnReorderingDragSourceManager.IsPointLocatedAfterTarget( targetCell, targetPoint ) )
-      {
-        if( !draggedLocation.CanMoveAfter( targetLocation ) || object.Equals( draggedLocation, targetLocation.GetNextSibling() ) )
-          return;
-
-        draggedLocation.MoveAfter( targetLocation );
-      }
-      else
-      {
-        return;
-      }
-
-      this.UpdateColumnsLayoutAnimations();
-    }
-
-    private void UpdateColumnsLayoutAnimations()
-    {
-      this.ResetColumnsLayoutAnimations();
-
-      var draggedCell = ( Cell )this.DraggedElement;
-      var draggedColumn = draggedCell.ParentColumn;
-
-      var draggedColumnReorderLocation = m_columnsLayout[ draggedColumn ];
-      Debug.Assert( draggedColumnReorderLocation != null );
-      if( draggedColumnReorderLocation == null )
-        return;
-
-      var draggedColumnSourceLocation = m_dataGridContext.ColumnManager.GetColumnLocationFor( draggedColumn );
-      Debug.Assert( draggedColumnSourceLocation != null );
-      if( draggedColumnSourceLocation == null )
-        return;
-
-      Debug.Assert( m_columnVirtualizationManager != null );
-
-      var indexOfDraggedColumnInReorderedColumns = this.GetColumnLocations( this.GetPreviousLocationsOf( draggedColumnReorderLocation ) ).Count();
-      var indexOfDraggedColumnInSourceColumns = this.GetColumnLocations( this.GetPreviousLocationsOf( draggedColumnSourceLocation ) ).Count();
-      var columnsInView = m_columnVirtualizationManager.GetVisibleFieldNames( m_level );
-      var isDraggingLeft = ( indexOfDraggedColumnInReorderedColumns < indexOfDraggedColumnInSourceColumns );
-      var isDraggingRight = ( indexOfDraggedColumnInReorderedColumns > indexOfDraggedColumnInSourceColumns );
-
-      if( isDraggingLeft )
-      {
-        var remaining = indexOfDraggedColumnInSourceColumns - indexOfDraggedColumnInReorderedColumns;
-
-        foreach( var columnLocation in this.GetColumnLocations( this.GetNextLocationsOf( draggedColumnReorderLocation ) ) )
-        {
-          if( remaining <= 0 )
-            break;
-
-          if( columnsInView.Contains( columnLocation.Column ) )
-          {
-            this.AnimateColumn( columnLocation, AnimationType.MoveRight );
-            this.AnimateColumnDescendants( columnLocation, AnimationType.MoveRight );
-            this.AnimateColumnAncestors( columnLocation, AnimationType.MoveRight );
-          }
-
-          remaining--;
-        }
-      }
-      else if( isDraggingRight )
-      {
-        var remaining = indexOfDraggedColumnInReorderedColumns - indexOfDraggedColumnInSourceColumns;
-
-        foreach( var columnLocation in this.GetColumnLocations( this.GetPreviousLocationsOf( draggedColumnReorderLocation ) ) )
-        {
-          if( remaining <= 0 )
-            break;
-
-          if( columnsInView.Contains( columnLocation.Column ) )
-          {
-            this.AnimateColumn( columnLocation, AnimationType.MoveLeft );
-            this.AnimateColumnDescendants( columnLocation, AnimationType.MoveLeft );
-            this.AnimateColumnAncestors( columnLocation, AnimationType.MoveLeft );
-          }
-
-          remaining--;
-        }
-      }
-
-      var commonAncestor = this.GetCommonAncestor( draggedColumnSourceLocation, draggedColumnReorderLocation );
-
-      // Adjust the animation type on the ancestors.
-      for( var childLocation = draggedColumnSourceLocation; childLocation != null; )
-      {
-        var parentLocation = childLocation.GetParent() as ColumnHierarchyManager.IColumnLocation;
-        if( ( parentLocation == null ) || ( parentLocation.Column == commonAncestor ) )
-          break;
-
-        var columnLocation = m_columnsLayout[ parentLocation.Column ];
-        Debug.Assert( columnLocation != null );
-
-        switch( columnLocation.Status )
-        {
-          case AnimationType.MoveLeft:
-            this.AnimateColumn( columnLocation, AnimationType.DecreaseWidth );
-            break;
-
-          case AnimationType.MoveRight:
-            this.AnimateColumn( columnLocation, AnimationType.MoveRightAndDecreaseWidth );
-            break;
-
-          default:
-            {
-              if( isDraggingLeft )
-              {
-                this.AnimateColumn( columnLocation, AnimationType.MoveRightAndDecreaseWidth );
-              }
-              else if( isDraggingRight )
-              {
-                this.AnimateColumn( columnLocation, AnimationType.DecreaseWidth );
-              }
-              else
-              {
-                var wasFirstVisibleChildColumn = !this.GetVisibleLocations( this.GetColumnLocations( this.GetPreviousSiblingLocationsOf( childLocation ) ) ).Any();
-                var wasLastVisibleChildColumn = !this.GetVisibleLocations( this.GetColumnLocations( this.GetNextSiblingLocationsOf( childLocation ) ) ).Any();
-
-                // We must check for last first since we want to apply the "last" animation if the column is both
-                // the first and last child.
-                if( wasLastVisibleChildColumn )
-                {
-                  this.AnimateColumn( columnLocation, AnimationType.DecreaseWidth );
-                }
-                else if( wasFirstVisibleChildColumn )
-                {
-                  this.AnimateColumn( columnLocation, AnimationType.MoveRightAndDecreaseWidth );
-                }
-              }
-            }
-            break;
-        }
-
-        childLocation = parentLocation;
-      }
-
-      for( var childLocation = draggedColumnReorderLocation; childLocation != null; )
-      {
-        var parentLocation = childLocation.GetParent() as ColumnHierarchyModel.IColumnLocation;
-        if( ( parentLocation == null ) || ( parentLocation.Column == commonAncestor ) )
-          break;
-
-        switch( parentLocation.Status )
-        {
-          case AnimationType.MoveLeft:
-            this.AnimateColumn( parentLocation, AnimationType.MoveLeftAndIncreaseWidth );
-            break;
-
-          case AnimationType.MoveRight:
-            this.AnimateColumn( parentLocation, AnimationType.IncreaseWidth );
-            break;
-
-          default:
-            {
-              if( isDraggingLeft )
-              {
-                this.AnimateColumn( parentLocation, AnimationType.IncreaseWidth );
-              }
-              else if( isDraggingRight )
-              {
-                this.AnimateColumn( parentLocation, AnimationType.MoveLeftAndIncreaseWidth );
-              }
-              else
-              {
-                var isFirstVisibleChildColumn = !this.GetVisibleLocations( this.GetColumnLocations( this.GetPreviousSiblingLocationsOf( childLocation ) ) ).Any();
-                var isLastVisibleChildColumn = !this.GetVisibleLocations( this.GetColumnLocations( this.GetNextSiblingLocationsOf( childLocation ) ) ).Any();
-
-                // We must check for last first since we want to apply the "last" animation if the column is both
-                // the first and last child.
-                if( isLastVisibleChildColumn )
-                {
-                  this.AnimateColumn( parentLocation, AnimationType.IncreaseWidth );
-                }
-                else if( isFirstVisibleChildColumn )
-                {
-                  this.AnimateColumn( parentLocation, AnimationType.MoveLeftAndIncreaseWidth );
-                }
-              }
-            }
-            break;
-        }
-
-        childLocation = parentLocation;
-      }
-
-      // Since the column is staying under the same ancestor, no animation needs to be done.
-      if( commonAncestor != null )
-      {
-        var columnLocation = m_columnsLayout[ commonAncestor ];
-        Debug.Assert( columnLocation != null );
-
-        this.AnimateColumn( columnLocation, AnimationType.Rollback );
-        this.AnimateColumnAncestors( columnLocation, AnimationType.Rollback );
-      }
-    }
-
-    private void ResetColumnsLayoutAnimations()
-    {
-      for( int i = 0; i < m_columnsLayout.LevelCount; i++ )
-      {
-        foreach( var location in this.GetColumnLocations( this.GetNextLocationsOf( m_columnsLayout.GetLevelMarkers( i ).Start ) ) )
-        {
-          location.Status = AnimationType.Rollback;
-        }
-      }
-    }
-
-    private ColumnHierarchyManager.ILevelMarkers GetTopLevelMarkers()
-    {
-      return m_dataGridContext.ColumnManager.GetLevelMarkersFor(  m_dataGridContext.Columns );
-    }
-
-    private ColumnHierarchyManager.ILocation GetTopLevelStartLocation()
-    {
-      var levelMarkers = this.GetTopLevelMarkers();
-
-      Debug.Assert( levelMarkers != null );
-      if( levelMarkers == null )
-        return null;
-
-      return levelMarkers.Start;
-    }
-
-    private IEnumerable<ColumnHierarchyManager.IColumnLocation> GetColumnLocations( IEnumerable<ColumnHierarchyManager.ILocation> locations )
-    {
-      if( locations == null )
-        return Enumerable.Empty<ColumnHierarchyManager.IColumnLocation>();
-
-      return ( from location in locations
-               let columnLocation = location as ColumnHierarchyManager.IColumnLocation
-               where ( columnLocation != null )
-               select columnLocation );
-    }
-
-    private IEnumerable<ColumnHierarchyModel.IColumnLocation> GetColumnLocations( IEnumerable<ColumnHierarchyModel.ILocation> locations )
-    {
-      if( locations == null )
-        return Enumerable.Empty<ColumnHierarchyModel.IColumnLocation>();
-
-      return ( from location in locations
-               let columnLocation = location as ColumnHierarchyModel.IColumnLocation
-               where ( columnLocation != null )
-               select columnLocation );
-    }
-
-    private IEnumerable<ColumnHierarchyManager.IColumnLocation> GetVisibleLocations( IEnumerable<ColumnHierarchyManager.IColumnLocation> locations )
-    {
-      if( locations == null )
-        return Enumerable.Empty<ColumnHierarchyManager.IColumnLocation>();
-
-      return ( from location in locations
-               where location.Column.Visible
-               select location );
-    }
-
-    private IEnumerable<ColumnHierarchyModel.IColumnLocation> GetVisibleLocations( IEnumerable<ColumnHierarchyModel.IColumnLocation> locations )
-    {
-      if( locations == null )
-        return Enumerable.Empty<ColumnHierarchyModel.IColumnLocation>();
-
-      return ( from location in locations
-               where location.Column.Visible
-               select location );
-    }
-
-    private IEnumerable<ColumnHierarchyManager.ILocation> GetNextLocationsOf( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetNextSiblingOrCousin();
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetNextSiblingOrCousin();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetNextLocationsOf( ColumnHierarchyModel.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetNextSiblingOrCousin();
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetNextSiblingOrCousin();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyManager.ILocation> GetNextSiblingLocationsOf( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetNextSibling();
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetNextSibling();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetNextSiblingLocationsOf( ColumnHierarchyModel.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetNextSibling();
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetNextSibling();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyManager.ILocation> GetPreviousLocationsOf( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetPreviousSiblingOrCousin();
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetPreviousSiblingOrCousin();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetPreviousLocationsOf( ColumnHierarchyModel.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetPreviousSiblingOrCousin();
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetPreviousSiblingOrCousin();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyManager.ILocation> GetPreviousSiblingLocationsOf( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetPreviousSibling();
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetPreviousSibling();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetPreviousSiblingLocationsOf( ColumnHierarchyModel.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetPreviousSibling();
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetPreviousSibling();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyManager.ILocation> GetChildLocationsOf( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetFirstChild();
-
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetNextSibling();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyModel.ILocation> GetChildLocationsOf( ColumnHierarchyModel.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var targetLocation = location.GetFirstChild();
-
-      while( targetLocation != null )
-      {
-        yield return targetLocation;
-        targetLocation = targetLocation.GetNextSibling();
-      }
-    }
-
-    private void ApplyColumnsLayoutAnimations()
-    {
-      var draggedCell = this.DraggedElement as Cell;
-      Debug.Assert( draggedCell != null );
-
-      var draggedColumn = draggedCell.ParentColumn;
-      Debug.Assert( draggedColumn != null );
-
-      var draggedColumnWidth = draggedColumn.ActualWidth;
-
-      var startLocation = this.GetTopLevelStartLocation();
-      Debug.Assert( startLocation != null );
-
-      foreach( var location in this.GetNextLocationsOf( startLocation ) )
-      {
-        this.ApplyColumnsLayoutAnimations( location, draggedColumnWidth, s_columnAnimationDuration );
-      }
-    }
-
-    private void ApplyColumnsLayoutAnimations( ColumnHierarchyManager.ILocation location, double draggedColumnWidth, Duration animationDuration )
-    {
-      if( location == null )
-        return;
-
-      var columnLocation = location as ColumnHierarchyManager.IColumnLocation;
-      if( columnLocation != null )
-      {
-        var column = columnLocation.Column;
-        var targetLocation = m_columnsLayout[ column ];
-        var animationType = ( targetLocation != null ) ? targetLocation.Status : AnimationType.Rollback;
-
-        switch( animationType )
-        {
-          case AnimationType.MoveLeft:
-            {
-              this.StartColumnPositionAnimation( column, -draggedColumnWidth, animationDuration );
-            }
-            break;
-
-          case AnimationType.MoveRight:
-            {
-              this.StartColumnPositionAnimation( column, draggedColumnWidth, animationDuration );
-            }
-            break;
-
-          case AnimationType.MoveLeftAndIncreaseWidth:
-            {
-            }
-            break;
-
-          case AnimationType.MoveRightAndDecreaseWidth:
-            {
-            }
-            break;
-
-          case AnimationType.IncreaseWidth:
-            {
-            }
-            break;
-
-          case AnimationType.DecreaseWidth:
-            {
-            }
-            break;
-
-          case AnimationType.Rollback:
-            {
-              this.StartColumnPositionAnimation( column, 0d, animationDuration );
-            }
-            break;
-
-          default:
-            throw new NotImplementedException();
-        }
-      }
-
-      foreach( var childLocation in this.GetChildLocationsOf( location ) )
-      {
-        this.ApplyColumnsLayoutAnimations( childLocation, draggedColumnWidth, animationDuration );
-      }
-    }
-
-    private void RollbackColumnsLayoutAnimations()
-    {
-      var startLocation = this.GetTopLevelStartLocation();
-      Debug.Assert( startLocation != null );
-
-      foreach( var location in this.GetNextLocationsOf( startLocation ) )
-      {
-        this.RollbackColumnsLayoutAnimations( location );
-      }
-    }
-
-    private void RollbackColumnsLayoutAnimations( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        return;
-
-      var columnLocation = location as ColumnHierarchyManager.IColumnLocation;
-      if( columnLocation != null )
-      {
-        var column = columnLocation.Column;
-
-        this.StartColumnPositionAnimation( column, 0d, s_columnAnimationDuration );
-      }
-
-      foreach( var childLocation in this.GetChildLocationsOf( location ) )
-      {
-        this.RollbackColumnsLayoutAnimations( childLocation );
-      }
-    }
-
-    private void ApplySplitterAnimation()
-    {
-      var draggedCell = this.DraggedElement as Cell;
-      var draggedColumn = ( draggedCell != null ) ? draggedCell.ParentColumn : null;
-      Debug.Assert( draggedColumn != null );
-
-      var draggedColumnContainingCollection = ( draggedColumn != null ) ? draggedColumn.ContainingCollection : null;
-      Debug.Assert( draggedColumnContainingCollection != null );
-
-      var sourceLevelMarkers = ( draggedColumnContainingCollection != null ) ? m_dataGridContext.ColumnManager.GetLevelMarkersFor( draggedColumnContainingCollection ) : null;
-      var sourceSplitter = ( sourceLevelMarkers != null ) ? sourceLevelMarkers.Splitter : null;
-
-      var draggedColumnLocation = m_columnsLayout[ draggedColumn ];
-      var reorderedLevelMarkers = ( draggedColumnLocation != null ) ? m_columnsLayout.GetLevelMarkers( draggedColumnLocation.Level ) : null;
-      var reorderedSplitter = ( reorderedLevelMarkers != null ) ? reorderedLevelMarkers.Splitter : null;
-
-      int oldFixedColumnCount;
-      int newFixedColumnCount;
-
-      if( ( sourceSplitter != null ) && ( reorderedSplitter != null ) )
-      {
-        oldFixedColumnCount = this.GetVisibleLocations( this.GetColumnLocations( this.GetPreviousLocationsOf( sourceSplitter ) ) ).Count();
-        newFixedColumnCount = this.GetVisibleLocations( this.GetColumnLocations( this.GetPreviousLocationsOf( reorderedSplitter ) ) ).Count();
-      }
-      else
-      {
-        oldFixedColumnCount = 0;
-        newFixedColumnCount = 0;
-      }
-
-      if( newFixedColumnCount > oldFixedColumnCount )
-      {
-        Debug.Assert( draggedColumn != null );
-
-        this.StartSplitterPositionAnimation( draggedColumn.ActualWidth );
-      }
-      else if( newFixedColumnCount < oldFixedColumnCount )
-      {
-        Debug.Assert( draggedColumn != null );
-
-        this.StartSplitterPositionAnimation( -draggedColumn.ActualWidth );
-      }
-      else
-      {
-        this.StartSplitterPositionAnimation( 0d );
-      }
-    }
-
-    private void RollbackReordering()
-    {
-      m_reorderCancelled = true;
-
-      this.RollbackColumnsLayoutAnimations();
-      this.StartSplitterPositionAnimation( 0d );
-    }
-
-    private void StartColumnPositionAnimation( ColumnBase column, double offset, Duration duration )
-    {
-      if( column == null )
-        return;
-
-      var isMergedColumn = false;
-
-      var transformGroup = ColumnReorderingDragSourceManager.GetColumnTransformGroup( column );
-      var positionTransform = ColumnReorderingDragSourceManager.GetColumnPositionTransform( transformGroup );
-      var sizeTransform = ColumnReorderingDragSourceManager.GetColumnSizeTransform( transformGroup );
-
-      var positionClock = default( AnimationClock );
-      var sizeClock = default( AnimationClock );
-      var clocks = default( ColumnAnimationClocks );
-
-      // Pause any previously started animation.
-      if( m_animationClocks.TryGetValue( column, out clocks ) )
-      {
-        positionClock = clocks.Position;
-        var positionTimeLine = ( positionClock != null ) ? positionClock.Timeline as OffsetAnimation : null;
-        var resetPosition = ( positionTimeLine == null ) || ( positionTimeLine.To != offset );
-
-        sizeClock = clocks.Size;
-        var sizeTimeLine = ( sizeClock != null ) ? sizeClock.Timeline as OffsetAnimation : null;
-        var resetSize = ( isMergedColumn && ( ( sizeTimeLine == null ) || ( sizeTimeLine.To != 1d ) ) )
-                     || ( !isMergedColumn && ( sizeClock != null ) );
-
-        // No animation needs to be done.
-        if( !resetPosition && !resetSize )
-          return;
-
-        if( resetPosition && ( positionClock != null ) )
-        {
-          var controller = positionClock.Controller;
-          Debug.Assert( controller != null );
-
-          // Stop the animation, do not simply pause it, so it resets correctly.
-          controller.Stop();
-          controller.Remove();
-
-          positionClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
-          positionClock = null;
-        }
-
-        if( resetSize && ( sizeClock != null ) )
-        {
-          var controller = sizeClock.Controller;
-          Debug.Assert( controller != null );
-
-          // Stop the animation, do not simply pause it, so it resets correctly.
-          controller.Stop();
-          controller.Remove();
-
-          sizeClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
-          sizeClock = null;
-        }
-      }
-
-      if( positionClock == null )
-      {
-        var animation = new OffsetAnimation( offset, duration );
-        positionClock = animation.CreateClock( true ) as AnimationClock;
-        positionTransform.ApplyAnimationClock( TranslateTransform.XProperty, positionClock, HandoffBehavior.SnapshotAndReplace );
-
-        if( offset == 0d )
-        {
-          positionClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
-        }
-
-        positionClock.Controller.Begin();
-      }
-
-      Debug.Assert( positionClock != null );
-
-      if( isMergedColumn && ( sizeClock == null ) )
-      {
-        var animation = new OffsetAnimation( 1d, duration );
-        sizeClock = animation.CreateClock( true ) as AnimationClock;
-        sizeTransform.ApplyAnimationClock( ScaleTransform.ScaleXProperty, sizeClock, HandoffBehavior.SnapshotAndReplace );
-
-        if( offset == 0d )
-        {
-          sizeClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
-        }
-
-        sizeClock.Controller.Begin();
-      }
-
-      m_animationClocks[ column ] = new ColumnAnimationClocks( positionClock, sizeClock );
-    }
-
-    private void StartColumnSizeAnimation( ColumnBase column, double enlarge, Duration duration )
-    {
-      if( column == null )
-        return;
-
-      Debug.Assert( column.Width != 0d );
-
-      //Calculate the resize ratio that needs to be applied to the ScaleTransform (works in %)
-      var resizedWith = column.Width + enlarge;
-      var resizedFactor = resizedWith / column.Width;
-
-      var transformGroup = ColumnReorderingDragSourceManager.GetColumnTransformGroup( column );
-      var positionTransform = ColumnReorderingDragSourceManager.GetColumnPositionTransform( transformGroup );
-      var sizeTransform = ColumnReorderingDragSourceManager.GetColumnSizeTransform( transformGroup );
-
-      var positionClock = default( AnimationClock );
-      var sizeClock = default( AnimationClock );
-      var clocks = default( ColumnAnimationClocks );
-
-      // Pause any previously started animation.
-      if( m_animationClocks.TryGetValue( column, out clocks ) )
-      {
-        positionClock = clocks.Position;
-        var positionTimeLine = ( positionClock != null ) ? positionClock.Timeline as OffsetAnimation : null;
-        var resetPosition = ( positionTimeLine == null ) || ( positionTimeLine.To != 0d );
-
-        sizeClock = clocks.Size;
-        var sizeTimeLine = ( sizeClock != null ) ? sizeClock.Timeline as OffsetAnimation : null;
-        var resetSize = ( sizeTimeLine == null ) || ( sizeTimeLine.To != resizedFactor );
-
-        // No animation needs to be done.
-        if( !resetPosition && !resetSize )
-          return;
-
-        if( resetPosition && ( positionClock != null ) )
-        {
-          var controller = positionClock.Controller;
-          Debug.Assert( controller != null );
-
-          // Stop the animation, do not simply pause it, so it resets correctly.
-          controller.Stop();
-          controller.Remove();
-
-          positionClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
-          positionClock = null;
-        }
-
-        if( resetSize && ( sizeClock != null ) )
-        {
-          var controller = sizeClock.Controller;
-          Debug.Assert( controller != null );
-
-          // Stop the animation, do not simply pause it, so it resets correctly.
-          controller.Stop();
-          controller.Remove();
-
-          sizeClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
-          sizeClock = null;
-        }
-      }
-
-      if( positionClock == null )
-      {
-        var animation = new OffsetAnimation( 0d, duration );
-        positionClock = animation.CreateClock( true ) as AnimationClock;
-        positionTransform.ApplyAnimationClock( TranslateTransform.XProperty, positionClock, HandoffBehavior.SnapshotAndReplace );
-
-        if( enlarge == 0d )
-        {
-          positionClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
-        }
-
-        positionClock.Controller.Begin();
-      }
-
-      Debug.Assert( positionClock != null );
-
-      if( sizeClock == null )
-      {
-        var animation = new OffsetAnimation( resizedFactor, duration );
-        sizeClock = animation.CreateClock( true ) as AnimationClock;
-        sizeTransform.ApplyAnimationClock( ScaleTransform.ScaleXProperty, sizeClock, HandoffBehavior.SnapshotAndReplace );
-
-        if( enlarge == 0d )
-        {
-          sizeClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
-        }
-
-        sizeClock.Controller.Begin();
-      }
-
-      Debug.Assert( sizeClock != null );
-
-      m_animationClocks[ column ] = new ColumnAnimationClocks( positionClock, sizeClock );
-    }
-
-    private void StartColumnPositionAndSizeAnimations( ColumnBase column, double offset, Duration duration )
-    {
-      if( column == null )
-        return;
-
-      Debug.Assert( column.Width != 0d );
-
-      //Calculate the resize ratio that needs to be applied to the ScaleTransform (works in %)
-      var resizedWidth = column.Width - offset;
-      var resizedFactor = resizedWidth / column.Width;
-
-      var transformGroup = ColumnReorderingDragSourceManager.GetColumnTransformGroup( column );
-      var positionTransform = ColumnReorderingDragSourceManager.GetColumnPositionTransform( transformGroup );
-      var sizeTransform = ColumnReorderingDragSourceManager.GetColumnSizeTransform( transformGroup );
-
-      var positionClock = default( AnimationClock );
-      var sizeClock = default( AnimationClock );
-      var clocks = default( ColumnAnimationClocks );
-
-      // Pause any previously started animation.
-      if( m_animationClocks.TryGetValue( column, out clocks ) )
-      {
-        positionClock = clocks.Position;
-        var positionTimeLine = ( positionClock != null ) ? positionClock.Timeline as OffsetAnimation : null;
-        var resetPosition = ( positionTimeLine == null ) || ( positionTimeLine.To != offset );
-
-        sizeClock = clocks.Size;
-        var sizeTimeLine = ( sizeClock != null ) ? sizeClock.Timeline as OffsetAnimation : null;
-        var resetSize = ( sizeTimeLine == null ) || ( sizeTimeLine.To != resizedFactor );
-
-        // No animation needs to be done.
-        if( !resetPosition && !resetSize )
-          return;
-
-        if( resetPosition && ( positionClock != null ) )
-        {
-          var controller = positionClock.Controller;
-          Debug.Assert( controller != null );
-
-          // Stop the animation, do not simply pause it, so it resets correctly.
-          controller.Stop();
-          controller.Remove();
-
-          positionClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
-          positionClock = null;
-        }
-
-        if( resetSize && ( sizeClock != null ) )
-        {
-          var controller = sizeClock.Controller;
-          Debug.Assert( controller != null );
-
-          // Stop the animation, do not simply pause it, so it resets correctly.
-          controller.Stop();
-          controller.Remove();
-
-          sizeClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
-          sizeClock = null;
-        }
-      }
-
-      if( positionClock == null )
-      {
-        var animation = new OffsetAnimation( offset, duration );
-        positionClock = animation.CreateClock( true ) as AnimationClock;
-        positionTransform.ApplyAnimationClock( TranslateTransform.XProperty, positionClock, HandoffBehavior.SnapshotAndReplace );
-
-        if( offset == 0d )
-        {
-          positionClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
-        }
-
-        positionClock.Controller.Begin();
-      }
-
-      Debug.Assert( positionClock != null );
-
-      if( sizeClock == null )
-      {
-        var animation = new OffsetAnimation( resizedFactor, duration );
-        sizeClock = animation.CreateClock( true ) as AnimationClock;
-
-        // When doing both a position and a resize animation, the CenterX value must be set so the resizing is applied from the new position,
-        // or else the offset at which is starts will be wrong.
-        sizeTransform.CenterX = offset;
-        sizeTransform.ApplyAnimationClock( ScaleTransform.ScaleXProperty, sizeClock, HandoffBehavior.SnapshotAndReplace );
-
-        if( offset == 0d )
-        {
-          sizeClock.Completed += new EventHandler( this.OnRollbackColumnAnimationCompleted );
-        }
-
-        sizeClock.Controller.Begin();
-      }
-
-      Debug.Assert( sizeClock != null );
-
-      m_animationClocks[ column ] = new ColumnAnimationClocks( positionClock, sizeClock );
-    }
-
-    private void StartSplitterPositionAnimation( double offset )
-    {
-      if( m_splitterAnimationClock != null )
-      {
-        var timeLine = m_splitterAnimationClock.Timeline as OffsetAnimation;
-
-        // No animation needs to be done.
-        if( ( timeLine != null ) && ( timeLine.To == offset ) )
-          return;
-
-        var controller = m_splitterAnimationClock.Controller;
-        Debug.Assert( controller != null );
-
-        controller.Stop();
-        controller.Remove();
-
-        m_splitterAnimationClock.Completed -= new EventHandler( this.OnRollbackSplitterPositionCompleted );
-      }
-
-      var animation = new OffsetAnimation( offset, s_columnAnimationDuration );
-      m_splitterAnimationClock = animation.CreateClock( true ) as AnimationClock;
-      m_splitterTranslation.ApplyAnimationClock( TranslateTransform.XProperty, m_splitterAnimationClock, HandoffBehavior.SnapshotAndReplace );
-
-      if( m_splitterAnimationClock != null )
-      {
-        if( offset == 0d )
-        {
-          m_splitterAnimationClock.Completed += new EventHandler( this.OnRollbackSplitterPositionCompleted );
-        }
-
-        m_splitterAnimationClock.Controller.Begin();
-      }
-    }
-
-    private void OnRollbackColumnAnimationCompleted( object sender, EventArgs e )
-    {
-      var animationClock = sender as AnimationClock;
-      if( animationClock == null )
-        return;
-
-      animationClock.Completed -= new EventHandler( this.OnRollbackColumnAnimationCompleted );
-
-      this.ClearAnimationClock( ref animationClock );
-    }
-
-    private void OnRollbackSplitterPositionCompleted( object sender, EventArgs e )
-    {
-      var animationClock = sender as AnimationClock;
-      if( animationClock == null )
-        return;
-
-      animationClock.Completed -= new EventHandler( this.OnRollbackSplitterPositionCompleted );
-
-      if( m_splitterAnimationClock == animationClock )
-      {
-        this.ClearAnimationClock( ref m_splitterAnimationClock );
-
-        Debug.Assert( ( m_splitterTranslation == null ) || ( m_splitterTranslation.X == 0d ) );
-      }
-      else
-      {
-        this.ClearAnimationClock( ref animationClock );
-      }
-    }
-
-    private void ClearAnimationClock( ref AnimationClock animationClock )
-    {
-      if( animationClock == null )
-        return;
-
-      var controller = animationClock.Controller;
-      Debug.Assert( controller != null );
-
-      controller.Stop();
-      controller.Remove();
-
-      animationClock = null;
-    }
-
-    private void ClearSplitterAnimationClock()
-    {
-      if( m_splitterAnimationClock == null )
-        return;
-
-      m_splitterAnimationClock.Completed -= new EventHandler( this.OnRollbackSplitterPositionCompleted );
-
-      this.ClearAnimationClock( ref m_splitterAnimationClock );
-    }
-
-    private void ClearColumnAnimations()
-    {
-      foreach( var column in m_dataGridContext.Columns )
-      {
-        ColumnReorderingDragSourceManager.ClearAnimatedColumnReorderingTranslation( column );
-      }
-
-      m_animationClocks.Clear();
-    }
-
-    private void ClearSplitterAnimation()
-    {
-      this.ClearSplitterAnimationClock();
-
-      ColumnReorderingDragSourceManager.ClearTranslateTransformAnimation( TableflowView.GetFixedColumnSplitterTranslation( m_dataGridContext ) );
-    }
-
-    private void ApplyContainerClip( DraggedElementAdorner adorner )
-    {
-      if( adorner == null )
-        return;
-
-      var adornedElement = adorner.AdornedElement;
-      if( adornedElement == null )
-        return;
-
-      // We only want to clip Cells other than the dragged Cell
-      if( adornedElement == this.DraggedElement )
-        return;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( adornedElement );
-      if( dataGridContext == null )
-        return;
-
-      var dataItemStore = CustomItemContainerGenerator.GetDataItemProperty( adornedElement );
-      if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
-        return;
-
-      var dataItem = dataItemStore.Data;
-      if( dataItem == null )
-        return;
-
-      var container = dataGridContext.GetContainerFromItem( dataItem ) as UIElement;
-      if( container != null )
-      {
-        var containerClip = container.Clip as RectangleGeometry;
-        if( containerClip != null )
-        {
-          // Transform the bounds of the clip region of the container to fit the bounds of the adornedElement
-          var transformedBounds = container.TransformToDescendant( adornedElement ).TransformBounds( containerClip.Bounds );
-
-          containerClip = new RectangleGeometry( transformedBounds );
-        }
-
-        adorner.AdornedElementImage.Clip = containerClip;
-      }
-      else
-      {
-        //This is an item that is in the FixedHeaders/Footers of the gird, do not clip it.
-        adorner.AdornedElementImage.Clip = null;
-      }
-    }
-
-    private void ShowDraggedColumnGhosts()
-    {
-      foreach( var adorner in this.GetElementAdorners() )
-      {
-        this.ApplyContainerClip( adorner );
-        adorner.AdornedElementImage.Opacity = 1d;
-      }
-    }
-
-    private void HideDraggedColumnGhosts()
-    {
-      foreach( var adorner in this.GetElementAdorners() )
-      {
-        adorner.AdornedElementImage.Opacity = 0d;
-      }
-    }
-
-    private void ShowDraggedElements()
-    {
-      this.PauseDraggedElementFadeInAnimation();
-
-      foreach( var element in this.GetElements() )
-      {
-        element.Opacity = 1d;
-      }
-    }
-
-    private void HideDraggedElements()
-    {
-      this.PauseDraggedElementFadeInAnimation();
-
-      foreach( var element in this.GetElements() )
-      {
-        element.Opacity = 0d;
-      }
-    }
-
-    private void ApplyDraggedElementFadeInAnimation()
-    {
-      var remainingOpacityDuration = s_draggedElementFadeInDuration;
-
-      if( m_draggedElementFadeInAnimationClock != null )
-      {
-        var fadeInAnimation = m_draggedElementFadeInAnimationClock.Timeline as OffsetAnimation;
-
-        if( ( fadeInAnimation != null ) && ( fadeInAnimation.To == 1d ) )
-          return;
-
-        if( m_draggedElementFadeInAnimationClock.CurrentState == ClockState.Active )
-        {
-          // The remaining duration is the Timeline Duration less the elapsed time
-          remainingOpacityDuration = new Duration( fadeInAnimation.Duration.TimeSpan - m_draggedElementFadeInAnimationClock.CurrentTime.Value );
-        }
-      }
-
-      this.PauseDraggedElementFadeInAnimation();
-
-      var draggedElement = this.DraggedElement;
-
-      // Apply an animation on the opacity of the Cell to ensure a nice transition between the ColumnReordering and another IDropTarget that is not handled by this manager
-      if( draggedElement != null )
-      {
-        var opacityAnimation = new OffsetAnimation( 1d, remainingOpacityDuration );
-
-        m_draggedElementFadeInAnimationClock = opacityAnimation.CreateClock( true ) as AnimationClock;
-
-        // We ust the same completed callback as MoveGhostToTarget animation to  be sure that the DraggedElement
-        // FadeIn is completed and the ghosts are correctly positioned before displaying the original UIElements
-        m_draggedElementFadeInAnimationClock.Completed += new EventHandler( this.GhostToTargetAnimation_Completed );
-
-        draggedElement.ApplyAnimationClock( UIElement.OpacityProperty, m_draggedElementFadeInAnimationClock );
-
-        m_draggedElementFadeInAnimationClock.Controller.Begin();
-      }
-    }
-
-    private void PauseDraggedElementFadeInAnimation()
-    {
-      // Ensure to stop dragged element FadeIn in order to correctly display the DraggedElementGhost
-      var draggedElement = this.DraggedElement;
-      if( draggedElement != null )
-      {
-        draggedElement.ApplyAnimationClock( UIElement.OpacityProperty, null );
-      }
-
-      if( m_draggedElementFadeInAnimationClock == null )
-        return;
-
-      // Stop the animation, do not simply pause it, so it resets correctly.
-      m_draggedElementFadeInAnimationClock.Controller.Stop();
-      m_draggedElementFadeInAnimationClock.Completed -= new EventHandler( this.GhostToTargetAnimation_Completed );
-      m_draggedElementFadeInAnimationClock = null;
-    }
-
-    private void TakeColumnsLayoutSnapshot()
-    {
-      Debug.Assert( !m_dataGridContext.ColumnManager.IsUpdateDeferred );
-
-      m_columnsLayout.Clear();
-
-      var levelCount = 1;
-
-      for( int i = 0; i < levelCount; i++ )
-      {
-        m_columnsLayout.AddLevel( i );
-      }
-
-      var sourceLevelMarkers = this.GetTopLevelMarkers();
-      Debug.Assert( sourceLevelMarkers != null );
-
-      var pivotLocation = m_columnsLayout.GetLevelMarkers( levelCount - 1 ).Splitter;
-      Debug.Assert( pivotLocation != null );
-
-      // Clone all column locations.
-      for( var currentLocation = sourceLevelMarkers.Start; currentLocation != null; currentLocation = currentLocation.GetNextSibling() )
-      {
-        var cloneLocation = ColumnReorderingDragSourceManager.CloneLocation( m_columnsLayout, currentLocation, levelCount - 1 );
-        if( cloneLocation == null )
-          continue;
-
-        Debug.Assert( cloneLocation.CanMoveAfter( pivotLocation ) );
-        cloneLocation.MoveAfter( pivotLocation );
-
-        pivotLocation = cloneLocation;
-      }
-
-      // Move the splitter to get an exact copy.
-      var sourcePivotLocation = sourceLevelMarkers.Splitter.GetPreviousSibling();
-      Debug.Assert( sourcePivotLocation != null );
-
-      var levelMarkers = m_columnsLayout.GetLevelMarkers( levelCount - 1 );
-      var splitterLocation = levelMarkers.Splitter;
-
-      if( sourcePivotLocation.Type == LocationType.Column )
-      {
-        pivotLocation = m_columnsLayout[ ( ( ColumnHierarchyManager.IColumnLocation )sourcePivotLocation ).Column ];
-      }
-      else
-      {
-        Debug.Assert( sourcePivotLocation.Type == LocationType.Start );
-        pivotLocation = levelMarkers.Start;
-      }
-
-      Debug.Assert( splitterLocation != null );
-      Debug.Assert( pivotLocation != null );
-
-      Debug.Assert( splitterLocation.CanMoveAfter( pivotLocation ) );
-      splitterLocation.MoveAfter( pivotLocation );
-    }
-
-    private static ColumnHierarchyModel.ILocation CloneLocation( ColumnHierarchyModel columnsLayout, ColumnHierarchyManager.ILocation sourceLocation, int level )
-    {
-      Debug.Assert( columnsLayout != null );
-      Debug.Assert( sourceLocation != null );
-      Debug.Assert( level >= 0 );
-
-      var parentLocation = default( ColumnHierarchyModel.ILocation );
-
-      if( sourceLocation.Type == LocationType.Column )
-      {
-        var columnLocation = columnsLayout.Add( ( ( ColumnHierarchyManager.IColumnLocation )sourceLocation ).Column, level );
-        if( columnLocation == null )
-          throw new InvalidOperationException();
-
-        columnLocation.Status = AnimationType.Rollback;
-
-        parentLocation = columnLocation;
-      }
-      else if( sourceLocation.Type == LocationType.Orphan )
-      {
-        parentLocation = columnsLayout.GetLevelMarkers( level ).Orphan;
-        if( parentLocation == null )
-          throw new InvalidOperationException();
-      }
-
-      if( parentLocation != null )
-      {
-        var lastLocation = default( ColumnHierarchyModel.ILocation );
-        var childLocation = sourceLocation.GetFirstChild();
-
-        while( childLocation != null )
-        {
-          var cloneLocation = ColumnReorderingDragSourceManager.CloneLocation( columnsLayout, childLocation, level - 1 );
-          if( cloneLocation != null )
-          {
-            if( lastLocation != null )
-            {
-              Debug.Assert( cloneLocation.CanMoveAfter( lastLocation ) );
-              cloneLocation.MoveAfter( lastLocation );
-            }
-            else
-            {
-              Debug.Assert( cloneLocation.CanMoveUnder( parentLocation ) );
-              cloneLocation.MoveUnder( parentLocation );
-            }
-
-            lastLocation = cloneLocation;
-          }
-
-          childLocation = childLocation.GetNextSibling();
-        }
-
-        if( parentLocation.Type == LocationType.Column )
-          return parentLocation;
-      }
-
-      return null;
-    }
-
-    private ColumnBase GetCommonAncestor( ColumnHierarchyManager.IColumnLocation x, ColumnHierarchyModel.IColumnLocation y )
-    {
-      Debug.Assert( x != null );
-      Debug.Assert( y != null );
-
-      var ancestors = new HashSet<ColumnBase>();
-
-      for( var parentLocation = x.GetParent(); parentLocation != null; parentLocation = parentLocation.GetParent() )
-      {
-        var columnLocation = parentLocation as ColumnHierarchyManager.IColumnLocation;
-        if( columnLocation == null )
-          break;
-
-        ancestors.Add( columnLocation.Column );
-      }
-
-      for( var parentLocation = y.GetParent(); parentLocation != null; parentLocation = parentLocation.GetParent() )
-      {
-        var columnLocation = parentLocation as ColumnHierarchyModel.IColumnLocation;
-        if( columnLocation == null )
-          break;
-
-        var column = columnLocation.Column;
-        if( ancestors.Contains( column ) )
-          return column;
-      }
-
-      return null;
-    }
-
-    private void AnimateColumn( ColumnHierarchyModel.IColumnLocation columnLocation, AnimationType animationType )
-    {
-      Debug.Assert( columnLocation != null );
-      columnLocation.Status = animationType;
-    }
-
-    private void AnimateColumnDescendants( ColumnHierarchyModel.IColumnLocation columnLocation, AnimationType animationType )
-    {
-      Debug.Assert( columnLocation != null );
-
-      foreach( var childLocation in this.GetColumnLocations( this.GetChildLocationsOf( columnLocation ) ) )
-      {
-        this.AnimateColumn( childLocation, animationType );
-        this.AnimateColumnDescendants( childLocation, animationType );
-      }
-    }
-
-    private void AnimateColumnAncestors( ColumnHierarchyModel.IColumnLocation columnLocation, AnimationType animationType )
-    {
-      Debug.Assert( columnLocation != null );
-
-      var parentColumnLocation = columnLocation.GetParent() as ColumnHierarchyModel.IColumnLocation;
-      while( parentColumnLocation != null )
-      {
-        this.AnimateColumn( parentColumnLocation, animationType );
-
-        parentColumnLocation = parentColumnLocation.GetParent() as ColumnHierarchyModel.IColumnLocation;
-      }
-    }
-
-    private IEnumerable<UIElement> GetElements()
-    {
-      return this.GetElementAdornerEntries().Select( item => item.Key );
-    }
-
-    private IEnumerable<DraggedElementAdorner> GetElementAdorners()
-    {
-      return this.GetElementAdornerEntries().Select( item => item.Value );
-    }
-
-    private IEnumerable<KeyValuePair<UIElement, DraggedElementAdorner>> GetElementAdornerEntries()
-    {
-      var entries = m_elementToDraggedElementAdorner.ToList();
-
-      foreach( var entry in entries )
-      {
-        var container = entry.Key;
-
-        if( this.OwnElement( container ) )
-        {
-          Debug.Assert( m_elementToDraggedElementAdorner.ContainsKey( container ) );
-
-          yield return entry;
-        }
-        else
-        {
-          this.RemoveDraggedColumnGhost( container );
-        }
-      }
-    }
-
-    private bool OwnElement( DependencyObject target )
-    {
-      if( target == null )
-        return false;
-
-      ColumnReorderingDragSourceManager manager;
-
-      var cell = target as Cell;
-      if( cell != null )
-      {
-        manager = cell.ParentColumnReorderingDragSourceManager;
-      }
-      else
-      {
-        manager = TableflowView.GetColumnReorderingDragSourceManager( target );
-      }
-
-      return ( this == manager );
-    }
-
-    private readonly int m_level;
-    private readonly DataGridContext m_dataGridContext;
-    private readonly TranslateTransform m_splitterTranslation;
-    private readonly TableViewColumnVirtualizationManagerBase m_columnVirtualizationManager;
-    private readonly ColumnHierarchyModel m_columnsLayout = new ColumnHierarchyModel();
-    private readonly Dictionary<ColumnBase, ColumnAnimationClocks> m_animationClocks = new Dictionary<ColumnBase, ColumnAnimationClocks>();
-    private readonly Dictionary<UIElement, DraggedElementAdorner> m_elementToDraggedElementAdorner = new Dictionary<UIElement, DraggedElementAdorner>();
-
-    private bool m_isDragStarted; //false
-    private bool m_reorderCancelled; //false;
-    private bool m_noColumnsReorderingNeeded; //false
-
-    private AnimationClock m_draggedElementFadeInAnimationClock; //null
-    private AnimationClock m_ghostToTargetAndDetachAnimationClock; //null;
-    private AnimationClock m_ghostToTargetColumnAnimationClock; //null;
-    private AnimationClock m_ghostToMousePositionAnimationClock; //null;
-    private AnimationClock m_splitterAnimationClock; //null;
-
-    private DraggedElementAdorner m_popupDraggedElementAdorner; //null
-    private HorizontalMouseDragDirection m_horizontalMouseDragDirection = HorizontalMouseDragDirection.None;
-    private double m_lastDraggedElementOffset; // 0d;
-
-    #region HorizontalMouseDragDirection Private Enum
-
-    private enum HorizontalMouseDragDirection
-    {
-      None,
-      Left,
-      Right
-    }
-
-    #endregion
-
-    #region AnimationType Private Enum
-
-    private enum AnimationType
-    {
-      Rollback = 0,
-      MoveLeft,
-      MoveRight,
-      IncreaseWidth,
-      DecreaseWidth,
-      MoveLeftAndIncreaseWidth,
-      MoveRightAndDecreaseWidth,
-    }
-
-    #endregion
-
-    #region ColumnAnimationClocks Private Struct
-
-    private struct ColumnAnimationClocks
-    {
-      internal ColumnAnimationClocks( AnimationClock position, AnimationClock size )
-      {
-        m_position = position;
-        m_size = size;
-      }
-
-      internal AnimationClock Position
-      {
-        get
-        {
-          return m_position;
-        }
-      }
-
-      internal AnimationClock Size
-      {
-        get
-        {
-          return m_size;
-        }
-      }
-
-      private readonly AnimationClock m_position;
-      private readonly AnimationClock m_size;
-    }
-
-    #endregion
-
-    #region ColumnHierarchyModel Private Class
-
-    private sealed class ColumnHierarchyModel : ColumnHierarchyModel<ColumnBase, AnimationType>
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/IAnimatedScrollInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/IAnimatedScrollInfo.cs
deleted file mode 100644
index 513dd5ec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/IAnimatedScrollInfo.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal interface IAnimatedScrollInfo : IScrollInfo
-  {
-    #region Horizontal Offset Properties
-
-    ScrollDirection HorizontalScrollingDirection
-    {
-      get;
-      set;
-    }
-
-    double OriginalHorizontalOffset
-    {
-      get;
-      set;
-    }
-
-    double TargetHorizontalOffset
-    {
-      get;
-      set;
-    }
-
-    #endregion Horizontal Offset Properties
-
-    #region Vertical Offset Properties
-
-    ScrollDirection VerticalScrollingDirection
-    {
-      get;
-      set;
-    }
-
-    double OriginalVerticalOffset
-    {
-      get;
-      set;
-    }
-    double TargetVerticalOffset
-    {
-      get;
-      set;
-    }
-
-    #endregion Vertical Offset Properties
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfo.cs
deleted file mode 100644
index 3225c616..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class LayoutedContainerInfo : IComparable<LayoutedContainerInfo>
-  {
-    #region CONSTRUCTORS
-
-    public LayoutedContainerInfo( int realizedIndex, UIElement container )
-    {
-      if( container == null )
-        throw new ArgumentNullException( "container" );
-
-      this.RealizedIndex = realizedIndex;
-      this.Container = container;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region RealizedIndex Property
-
-    public int RealizedIndex
-    {
-      get;
-      private set;
-    }
-
-    #endregion RealizedIndex Property
-
-    #region Container Property
-
-    public UIElement Container
-    {
-      get;
-      private set;
-    }
-
-    #endregion Container Property
-
-    #region IComparable<LayoutedContainerInfo> Members
-
-    public int CompareTo( LayoutedContainerInfo other )
-    {
-      if( other == null )
-        return -1;
-
-      return this.RealizedIndex.CompareTo( other.RealizedIndex );
-    }
-
-    #endregion IComparable<LayoutedContainerInfo> Members
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfoList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfoList.cs
deleted file mode 100644
index adb1be73..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfoList.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class LayoutedContainerInfoList : List<LayoutedContainerInfo>
-  {
-    public bool ContainsContainer( UIElement container )
-    {
-      return ( this.IndexOfContainer( container ) > -1 );
-    }
-
-    public int IndexOfContainer( UIElement container )
-    {
-      int count = this.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( this[ i ].Container == container )
-          return i;
-      }
-
-      return -1;
-    }
-
-    public bool ContainsRealizedIndex( int realizedIndex )
-    {
-      return ( this.IndexOfRealizedIndex( realizedIndex ) > -1 );
-    }
-
-    public int IndexOfRealizedIndex( int realizedIndex )
-    {
-      int count = this.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( this[ i ].RealizedIndex == realizedIndex )
-          return i;
-      }
-
-      return -1;
-    }
-
-    public LayoutedContainerInfo this[ UIElement container ]
-    {
-      get
-      {
-        int index = this.IndexOfContainer( container );
-
-        if( index == -1 )
-          return null;
-
-        return this[ index ];
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/OffsetAnimation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/OffsetAnimation.cs
deleted file mode 100644
index 0ba394ae..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/OffsetAnimation.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Animation;
-using System.Windows;
-using Xceed.Utils.Math;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class OffsetAnimation : DoubleAnimationBase
-  {
-    #region CONSTRUCTORS
-
-    public OffsetAnimation()
-      : base()
-    {
-    }
-
-    public OffsetAnimation( double toValue, Duration duration )
-      : this()
-    {
-      this.To = toValue;
-      this.Duration = duration;
-    }
-
-    public OffsetAnimation( double fromValue, double toValue, Duration duration )
-      : this( toValue, duration )
-    {
-      this.From = fromValue;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region From Property
-
-    public static readonly DependencyProperty FromProperty = DependencyProperty.Register(
-      "From",
-      typeof( Nullable<double> ),
-      typeof( OffsetAnimation ) );
-
-    public Nullable<double> From
-    {
-      get
-      {
-        return ( Nullable<double> )this.GetValue( OffsetAnimation.FromProperty );
-      }
-      set
-      {
-        this.SetValue( OffsetAnimation.FromProperty, value );
-      }
-    }
-
-    #endregion From Property
-
-    #region To Property
-
-    public static readonly DependencyProperty ToProperty = DependencyProperty.Register(
-      "To",
-      typeof( Nullable<double> ),
-      typeof( OffsetAnimation ) );
-
-    public Nullable<double> To
-    {
-      get
-      {
-        return ( Nullable<double> )this.GetValue( OffsetAnimation.ToProperty );
-      }
-      set
-      {
-        this.SetValue( OffsetAnimation.ToProperty, value );
-      }
-    }
-
-    #endregion To Property
-
-    #region IsDestinationDefault Property
-
-    public override bool IsDestinationDefault
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    #endregion IsDestinationDefault Property
-
-    #region DoubleAnimationBase Overrides
-
-    protected override double GetCurrentValueCore( double defaultOriginValue, double defaultDestinationValue, AnimationClock animationClock )
-    {
-      Nullable<double> to = this.To;
-      Nullable<double> from = this.From;
-
-      if( !from.HasValue )
-      {
-        from = defaultOriginValue;
-      }
-
-      if( !to.HasValue )
-      {
-        to = defaultDestinationValue;
-      }
-
-      double toValue = to.GetValueOrDefault();
-      double fromValue = from.GetValueOrDefault();
-
-      if( ( !animationClock.CurrentProgress.HasValue )
-        || ( animationClock.CurrentProgress.Value == 1 ) )
-      {
-        return toValue;
-      }
-
-      if( animationClock.CurrentProgress.Value == 0 )
-        return fromValue;
-
-      double totalTime = animationClock.Timeline.Duration.TimeSpan.TotalMilliseconds;
-      double elapsedTime = totalTime * animationClock.CurrentProgress.Value;
-
-      if( elapsedTime >= totalTime )
-        return toValue;
-
-      double animationStep = TableflowViewAnimationHelper.GetAnimationStep( fromValue, toValue, elapsedTime, totalTime );
-
-      if( DoubleUtil.AreClose( animationStep, toValue ) )
-        return toValue;
-
-      return animationStep;
-    }
-
-    protected override Freezable CreateInstanceCore()
-    {
-      return new OffsetAnimation();
-    }
-
-    #endregion DoubleAnimationBase Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/PointAnimation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/PointAnimation.cs
deleted file mode 100644
index 406399ea..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/PointAnimation.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Animation;
-using System.Windows;
-using Xceed.Utils.Math;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class PointAnimation : PointAnimationBase
-  {
-    #region CONSTRUCTORS
-
-    public PointAnimation()
-      : base()
-    {
-    }
-
-    public PointAnimation( Point toValue, Duration duration )
-      : this()
-    {
-      this.To = toValue;
-      this.Duration = duration;
-    }
-
-    public PointAnimation( Point fromValue, Point toValue, Duration duration )
-      : this( toValue, duration )
-    {
-      this.From = fromValue;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region From Property
-
-    public static readonly DependencyProperty FromProperty = DependencyProperty.Register(
-      "From",
-      typeof( Nullable<Point> ),
-      typeof( PointAnimation ) );
-
-    public Nullable<Point> From
-    {
-      get
-      {
-        return ( Nullable<Point> )this.GetValue( PointAnimation.FromProperty );
-      }
-      set
-      {
-        this.SetValue( PointAnimation.FromProperty, value );
-      }
-    }
-
-    #endregion From Property
-
-    #region To Property
-
-    public static readonly DependencyProperty ToProperty = DependencyProperty.Register(
-      "To",
-      typeof( Nullable<Point> ),
-      typeof( PointAnimation ) );
-
-    public Nullable<Point> To
-    {
-      get
-      {
-        return ( Nullable<Point> )this.GetValue( PointAnimation.ToProperty );
-      }
-      set
-      {
-        this.SetValue( PointAnimation.ToProperty, value );
-      }
-    }
-
-    #endregion To Property
-
-    #region IsDestinationDefault Property
-
-    public override bool IsDestinationDefault
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    #endregion IsDestinationDefault Property
-
-    #region DoubleAnimationBase Overrides
-
-    protected override Point GetCurrentValueCore( Point defaultOriginValue, Point defaultDestinationValue, AnimationClock animationClock )
-    {
-      Nullable<Point> to = this.To;
-      Nullable<Point> from = this.From;
-
-      if( !from.HasValue )
-      {
-        from = defaultOriginValue;
-      }
-
-      if( !to.HasValue )
-      {
-        to = defaultDestinationValue;
-      }
-
-      Point toValue = to.GetValueOrDefault();
-      Point fromValue = from.GetValueOrDefault();
-
-      if( ( !animationClock.CurrentProgress.HasValue )
-        || ( animationClock.CurrentProgress.Value == 1 ) )
-      {
-        return toValue;
-      }
-
-      if( animationClock.CurrentProgress.Value == 0 )
-        return fromValue;
-
-      double totalTime = animationClock.Timeline.Duration.TimeSpan.TotalMilliseconds;
-      double elapsedTime = totalTime * animationClock.CurrentProgress.Value;
-
-      if( elapsedTime >= totalTime )
-        return toValue;
-
-      Point animationStep = this.GetAnimationStep( fromValue, toValue, elapsedTime, totalTime );
-
-      if( DoubleUtil.AreClose( animationStep.X, toValue.X ) && DoubleUtil.AreClose( animationStep.Y, toValue.Y ) )
-        return toValue;
-
-      return animationStep;
-    }
-
-    protected override Freezable CreateInstanceCore()
-    {
-      return new PointAnimation();
-    }
-
-    #endregion DoubleAnimationBase Overrides
-
-    #region PRIVATE METHODS
-
-    private Point GetAnimationStep( Point startPos, Point finalPos, double elapsedTime, double totalTime )
-    {
-      double x = TableflowViewAnimationHelper.GetAnimationStep( startPos.X, finalPos.X, elapsedTime, totalTime );
-      double y = TableflowViewAnimationHelper.GetAnimationStep( startPos.Y, finalPos.Y, elapsedTime, totalTime );
-
-      return new Point( x, y );
-    }
-
-    #endregion PRIVATE METHODS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfo.cs
deleted file mode 100644
index 9bad2475..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfo.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class StickyContainerInfo 
-  {
-    #region CONSTRUCTORS
-
-    public StickyContainerInfo( UIElement container, int containerIndex, int holdingContainerIndex )
-    {
-      if( container == null )
-        throw new ArgumentNullException( "container" );
-
-      this.Container = container;
-      this.ContainerIndex = containerIndex;
-      this.HoldingContainerIndex = holdingContainerIndex;
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region Container Property
-
-    public UIElement Container
-    {
-      get;
-      private set;
-    }
-
-    #endregion Container Property
-
-    #region ContainerIndex Property
-
-    public int ContainerIndex
-    {
-      get;
-      private set;
-    }
-
-    #endregion ContainerIndex Property
-
-    #region HoldingContainerIndex Property
-
-    public int HoldingContainerIndex
-    {
-      get;
-      private set;
-    }
-
-    #endregion HoldingContainerIndex Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoComparer.cs
deleted file mode 100644
index 3e893f3f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoComparer.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class StickyContainerInfoComparer : IComparer<StickyContainerInfo>
-  {
-    #region Singleton Property
-
-    public static StickyContainerInfoComparer Singleton
-    {
-      get
-      {
-        if( _singleton == null )
-          _singleton = new StickyContainerInfoComparer();
-
-        return _singleton;
-      }
-    }
-
-    private static StickyContainerInfoComparer _singleton;
-
-    #endregion Singleton Property
-
-    #region IComparer<StickyContainerInfo> Members
-
-    public int Compare( StickyContainerInfo x, StickyContainerInfo y )
-    {
-      return x.ContainerIndex.CompareTo( y.ContainerIndex );
-    }
-
-    #endregion IComparer<StickyContainerInfo> Members
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoList.cs
deleted file mode 100644
index 666da526..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoList.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class StickyContainerInfoList : List<StickyContainerInfo>
-  {
-    public bool ContainsContainer( UIElement container )
-    {
-      return ( this.IndexOfContainer( container ) > -1 );
-    }
-
-    public int IndexOfContainer( UIElement container )
-    {
-      int count = this.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( this[ i ].Container == container )
-          return i;
-      }
-
-      return -1;
-    }
-
-    public bool ContainsRealizedIndex( int realizedIndex )
-    {
-      return ( this.IndexOfRealizedIndex( realizedIndex ) > -1 );
-    }
-
-    public int IndexOfRealizedIndex( int realizedIndex )
-    {
-      int count = this.Count;
-
-      for( int i = 0; i < count; i++ )
-      {
-        if( this[ i ].ContainerIndex == realizedIndex )
-          return i;
-      }
-
-      return -1;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoReverseComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoReverseComparer.cs
deleted file mode 100644
index 8e08735b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoReverseComparer.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class StickyContainerInfoReverseComparer : IComparer<StickyContainerInfo>
-  {
-    #region Singleton Property
-
-    public static StickyContainerInfoReverseComparer Singleton
-    {
-      get
-      {
-        if( _singleton == null )
-          _singleton = new StickyContainerInfoReverseComparer();
-
-        return _singleton;
-      }
-    }
-
-    private static StickyContainerInfoReverseComparer _singleton;
-
-    #endregion Singleton Property
-
-    #region IComparer<StickyContainerInfo> Members
-
-    public int Compare( StickyContainerInfo x, StickyContainerInfo y )
-    {
-      return y.ContainerIndex.CompareTo( x.ContainerIndex );
-    }
-
-    #endregion IComparer<StickyContainerInfo> Members
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowView.cs
deleted file mode 100644
index 56b92276..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowView.cs
+++ /dev/null
@@ -1,505 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class TableflowView : TableView
-  {
-    #region Constructors
-
-    static TableflowView()
-    {
-      FrameworkContentElement.DefaultStyleKeyProperty.OverrideMetadata(
-        typeof( TableflowView ),
-        new FrameworkPropertyMetadata( TableflowView.GetDefaultStyleKey( typeof( TableflowView ), null ) ) );
-
-      TableView.IsAlternatingRowStyleEnabledProperty.OverrideMetadata(
-        typeof( TableflowView ),
-        new FrameworkPropertyMetadata( true ) );
-
-      TableView.AllowRowResizeProperty.OverrideMetadata(
-        typeof( TableflowView ),
-        new FrameworkPropertyMetadata( false ) );
-
-      TableflowView.AreGroupsFlattenedProperty.OverrideMetadata(
-        typeof( TableflowView ),
-        new FrameworkPropertyMetadata( true ) );
-
-      TableflowView.IsDeferredLoadingEnabledProperty.OverrideMetadata(
-        typeof( TableflowView ),
-        new FrameworkPropertyMetadata( true ) );
-    }
-
-    public TableflowView()
-      : base()
-    {
-      // No need to preserve container size since it is
-      // forced via ContainerHeight property
-      this.PreserveContainerSize = false;
-    }
-
-    #endregion
-
-    #region RowFadeInAnimationDuration Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty RowFadeInAnimationDurationProperty = DependencyProperty.RegisterAttached(
-      "RowFadeInAnimationDuration",
-      typeof( double ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( 300d ) );
-
-    public double RowFadeInAnimationDuration
-    {
-      get
-      {
-        return TableflowView.GetRowFadeInAnimationDuration( this );
-      }
-      set
-      {
-        TableflowView.SetRowFadeInAnimationDuration( this, value );
-      }
-    }
-
-    public static double GetRowFadeInAnimationDuration( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableflowView.RowFadeInAnimationDurationProperty );
-    }
-
-    public static void SetRowFadeInAnimationDuration( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableflowView.RowFadeInAnimationDurationProperty, value );
-    }
-
-    #endregion RowFadeInAnimationDuration Property
-
-    #region IsAnimatedColumnReorderingEnabled Property
-
-    public static readonly DependencyProperty IsAnimatedColumnReorderingEnabledProperty = DependencyProperty.Register(
-      "IsAnimatedColumnReorderingEnabled",
-      typeof( bool ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool IsAnimatedColumnReorderingEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( TableflowView.IsAnimatedColumnReorderingEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( TableflowView.IsAnimatedColumnReorderingEnabledProperty, value );
-      }
-    }
-
-    #endregion RowFadeInAnimationDuration Attached Property
-
-    #region ColumnReorderingDragSourceManager Attached Property
-
-    [ViewProperty( ViewPropertyMode.RoutedNoFallback )]
-    internal static readonly DependencyProperty ColumnReorderingDragSourceManagerProperty = DependencyProperty.RegisterAttached(
-      "ColumnReorderingDragSourceManager",
-      typeof( ColumnReorderingDragSourceManager ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal static ColumnReorderingDragSourceManager GetColumnReorderingDragSourceManager( DependencyObject obj )
-    {
-      return ( ColumnReorderingDragSourceManager )obj.GetValue( TableflowView.ColumnReorderingDragSourceManagerProperty );
-    }
-
-    internal static void SetColumnReorderingDragSourceManager( DependencyObject obj, ColumnReorderingDragSourceManager value )
-    {
-      obj.SetValue( TableflowView.ColumnReorderingDragSourceManagerProperty, value );
-    }
-
-    internal static void ClearColumnReorderingDragSourceManager( DependencyObject obj )
-    {
-      obj.ClearValue( TableflowView.ColumnReorderingDragSourceManagerProperty );
-    }
-
-    #endregion
-
-    #region AreColumnsBeingReordered Attached Property
-
-    [ViewProperty( ViewPropertyMode.RoutedNoFallback, FlattenDetailBindingMode.MasterOneWay )]
-    public static readonly DependencyProperty AreColumnsBeingReorderedProperty = DependencyProperty.RegisterAttached(
-      "AreColumnsBeingReordered",
-      typeof( bool ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( ( bool )false ) );
-
-
-    public static bool GetAreColumnsBeingReordered( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.AreColumnsBeingReorderedProperty );
-    }
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static void SetAreColumnsBeingReordered( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.AreColumnsBeingReorderedProperty, value );
-    }
-
-    #endregion
-
-    #region IsBeingDraggedAnimated Attached Property
-
-    internal static readonly DependencyProperty IsBeingDraggedAnimatedProperty = DependencyProperty.RegisterAttached(
-      "IsBeingDraggedAnimated",
-      typeof( bool ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( ( bool )false ) );
-
-    internal static bool GetIsBeingDraggedAnimated( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.IsBeingDraggedAnimatedProperty );
-    }
-
-    internal static void SetIsBeingDraggedAnimated( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.IsBeingDraggedAnimatedProperty, value );
-    }
-
-    internal static void ClearIsBeingDraggedAnimated( DependencyObject obj )
-    {
-      obj.ClearValue( TableflowView.IsBeingDraggedAnimatedProperty );
-    }
-
-    #endregion
-
-    #region ContainerHeight Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ContainerHeightProperty = DependencyProperty.RegisterAttached(
-      "ContainerHeight",
-      typeof( double ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( 26d ) );
-
-    public double ContainerHeight
-    {
-      get
-      {
-        return TableflowView.GetContainerHeight( this );
-      }
-      set
-      {
-        TableflowView.SetContainerHeight( this, value );
-      }
-    }
-
-    public static double GetContainerHeight( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableflowView.ContainerHeightProperty );
-    }
-
-    public static void SetContainerHeight( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableflowView.ContainerHeightProperty, value );
-    }
-
-    #endregion ContainerHeight Attached Property
-
-    #region FixedColumnSplitterTranslation Attached Property
-
-    [ViewProperty( ViewPropertyMode.RoutedNoFallback, FlattenDetailBindingMode.MasterOneWay )]
-    internal static readonly DependencyProperty FixedColumnSplitterTranslationProperty = DependencyProperty.RegisterAttached(
-      "FixedColumnSplitterTranslation",
-      typeof( TranslateTransform ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( null ) );
-
-    internal static TranslateTransform GetFixedColumnSplitterTranslation( DependencyObject obj )
-    {
-      return ( TranslateTransform )obj.GetValue( TableflowView.FixedColumnSplitterTranslationProperty );
-    }
-
-    internal static void SetFixedColumnSplitterTranslation( DependencyObject obj, TranslateTransform value )
-    {
-      obj.SetValue( TableflowView.FixedColumnSplitterTranslationProperty, value );
-    }
-
-    #endregion
-
-    #region ScrollingAnimationDuration Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ScrollingAnimationDurationProperty = DependencyProperty.RegisterAttached(
-      "ScrollingAnimationDuration",
-      typeof( double ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( 750d ) );
-
-    public double ScrollingAnimationDuration
-    {
-      get
-      {
-        return TableflowView.GetScrollingAnimationDuration( this );
-      }
-      set
-      {
-        TableflowView.SetScrollingAnimationDuration( this, value );
-      }
-    }
-
-    public static double GetScrollingAnimationDuration( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableflowView.ScrollingAnimationDurationProperty );
-    }
-
-    public static void SetScrollingAnimationDuration( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableflowView.ScrollingAnimationDurationProperty, value );
-    }
-
-    #endregion ScrollingAnimationDuration Property
-
-    #region AreHeadersSticky Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AreHeadersStickyProperty = DependencyProperty.RegisterAttached(
-      "AreHeadersSticky",
-      typeof( bool ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool AreHeadersSticky
-    {
-      get
-      {
-        return TableflowView.GetAreHeadersSticky( this );
-      }
-      set
-      {
-        TableflowView.SetAreHeadersSticky( this, value );
-      }
-    }
-
-    public static bool GetAreHeadersSticky( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.AreHeadersStickyProperty );
-    }
-
-    public static void SetAreHeadersSticky( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.AreHeadersStickyProperty, value );
-    }
-
-    #endregion AreHeadersSticky Attached Property
-
-    #region AreFootersSticky Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AreFootersStickyProperty = DependencyProperty.RegisterAttached(
-      "AreFootersSticky",
-      typeof( bool ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool AreFootersSticky
-    {
-      get
-      {
-        return TableflowView.GetAreFootersSticky( this );
-      }
-      set
-      {
-        TableflowView.SetAreFootersSticky( this, value );
-      }
-    }
-
-    public static bool GetAreFootersSticky( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.AreFootersStickyProperty );
-    }
-
-    public static void SetAreFootersSticky( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.AreFootersStickyProperty, value );
-    }
-
-    #endregion AreFootersSticky Attached Property
-
-    #region AreGroupHeadersSticky Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AreGroupHeadersStickyProperty = DependencyProperty.RegisterAttached(
-      "AreGroupHeadersSticky",
-      typeof( bool ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool AreGroupHeadersSticky
-    {
-      get
-      {
-        return TableflowView.GetAreGroupHeadersSticky( this );
-      }
-      set
-      {
-        TableflowView.SetAreGroupHeadersSticky( this, value );
-      }
-    }
-
-    public static bool GetAreGroupHeadersSticky( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.AreGroupHeadersStickyProperty );
-    }
-
-    public static void SetAreGroupHeadersSticky( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.AreGroupHeadersStickyProperty, value );
-    }
-
-    #endregion AreGroupHeadersSticky Attached Property
-
-    #region AreGroupFootersSticky Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AreGroupFootersStickyProperty = DependencyProperty.RegisterAttached(
-      "AreGroupFootersSticky",
-      typeof( bool ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool AreGroupFootersSticky
-    {
-      get
-      {
-        return TableflowView.GetAreGroupFootersSticky( this );
-      }
-      set
-      {
-        TableflowView.SetAreGroupFootersSticky( this, value );
-      }
-    }
-
-    public static bool GetAreGroupFootersSticky( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.AreGroupFootersStickyProperty );
-    }
-
-    public static void SetAreGroupFootersSticky( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.AreGroupFootersStickyProperty, value );
-    }
-
-    #endregion AreGroupFootersSticky Attached Property
-
-    #region AreParentRowsSticky Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AreParentRowsStickyProperty = DependencyProperty.RegisterAttached(
-      "AreParentRowsSticky",
-      typeof( bool ),
-      typeof( TableflowView ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool AreParentRowsSticky
-    {
-      get
-      {
-        return TableflowView.GetAreParentRowsSticky( this );
-      }
-      set
-      {
-        TableflowView.SetAreParentRowsSticky( this, value );
-      }
-    }
-
-    public static bool GetAreParentRowsSticky( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.AreParentRowsStickyProperty );
-    }
-
-    public static void SetAreParentRowsSticky( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.AreParentRowsStickyProperty, value );
-    }
-
-    #endregion AreParentRowsSticky Attached Property
-
-    #region AreGroupsFlattened Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AreGroupsFlattenedProperty = DependencyProperty.RegisterAttached(
-      "AreGroupsFlattened",
-      typeof( bool ),
-      typeof( TableflowView ) );
-
-    public bool AreGroupsFlattened
-    {
-      get
-      {
-        return TableflowView.GetAreGroupsFlattened( this );
-      }
-      set
-      {
-        TableflowView.SetAreGroupsFlattened( this, value );
-      }
-    }
-
-    public static bool GetAreGroupsFlattened( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.AreGroupsFlattenedProperty );
-    }
-
-    public static void SetAreGroupsFlattened( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.AreGroupsFlattenedProperty, value );
-    }
-
-    #endregion AreGroupsFlattened Attached Property
-
-    #region IsDeferredLoadingEnabled Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty IsDeferredLoadingEnabledProperty = DependencyProperty.RegisterAttached(
-      "IsDeferredLoadingEnabled",
-      typeof( bool ),
-      typeof( TableflowView ) );
-
-    public bool IsDeferredLoadingEnabled
-    {
-      get
-      {
-        return TableflowView.GetIsDeferredLoadingEnabled( this );
-      }
-      set
-      {
-        TableflowView.SetIsDeferredLoadingEnabled( this, value );
-      }
-    }
-
-    public static bool GetIsDeferredLoadingEnabled( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowView.IsDeferredLoadingEnabledProperty );
-    }
-
-    public static void SetIsDeferredLoadingEnabled( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowView.IsDeferredLoadingEnabledProperty, value );
-    }
-
-    #endregion IsDeferredLoadingEnabled Attached Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewAnimationHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewAnimationHelper.cs
deleted file mode 100644
index aa68882f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewAnimationHelper.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal class TableflowViewAnimationHelper
-  {
-    #region Public Methods
-
-    public static double GetAnimationStep( double startPos, double finalPos, double elapsedTime, double totalTime )
-    {
-      const double power = 6;
-
-      return startPos +
-        ( ( 1 - Math.Pow( totalTime - elapsedTime, power ) / Math.Pow( totalTime, power ) ) *
-        ( finalPos - startPos ) );
-    } 
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs
deleted file mode 100644
index ca7f7663..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs
+++ /dev/null
@@ -1,3645 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class TableflowViewItemsHost : DataGridItemsHost, IAnimatedScrollInfo, IDeferableScrollInfoRefresh
-  {
-    static TableflowViewItemsHost()
-    {
-      KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata(
-        typeof( TableflowViewItemsHost ),
-        new FrameworkPropertyMetadata( KeyboardNavigationMode.Local ) );
-
-      TableflowView.AreHeadersStickyProperty.OverrideMetadata(
-        typeof( DataGridContext ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnViewPropertiesChanged ) ) );
-
-      TableflowView.AreFootersStickyProperty.OverrideMetadata(
-        typeof( DataGridContext ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnViewPropertiesChanged ) ) );
-
-      TableflowView.AreGroupHeadersStickyProperty.OverrideMetadata(
-        typeof( DataGridContext ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnViewPropertiesChanged ) ) );
-
-      TableflowView.AreGroupFootersStickyProperty.OverrideMetadata(
-        typeof( DataGridContext ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnViewPropertiesChanged ) ) );
-
-      TableflowView.AreParentRowsStickyProperty.OverrideMetadata(
-        typeof( DataGridContext ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnViewPropertiesChanged ) ) );
-
-      TableflowView.ContainerHeightProperty.OverrideMetadata(
-        typeof( DataGridContext ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnViewPropertiesChanged ) ) );
-
-      TableflowView.AreGroupsFlattenedProperty.OverrideMetadata(
-        typeof( DataGridContext ),
-        new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnAreGroupsFlattenedChanged ) ) );
-
-      TableflowViewItemsHost.IsStickyProperty = TableflowViewItemsHost.IsStickyPropertyKey.DependencyProperty;
-
-      CommandManager.RegisterClassCommandBinding( typeof( TableflowViewItemsHost ),
-        new CommandBinding( ComponentCommands.MoveFocusForward,
-          TableflowViewItemsHost.MoveFocusForwardExecuted, TableflowViewItemsHost.MoveFocusForwardCanExecute ) );
-
-      CommandManager.RegisterClassCommandBinding( typeof( TableflowViewItemsHost ),
-        new CommandBinding( ComponentCommands.MoveFocusBack,
-          TableflowViewItemsHost.MoveFocusBackExecuted, TableflowViewItemsHost.MoveFocusBackCanExecute ) );
-
-      CommandManager.RegisterClassCommandBinding( typeof( TableflowViewItemsHost ),
-        new CommandBinding( ComponentCommands.MoveFocusUp,
-          TableflowViewItemsHost.MoveFocusUpExecuted, TableflowViewItemsHost.MoveFocusUpCanExecute ) );
-
-      CommandManager.RegisterClassCommandBinding( typeof( TableflowViewItemsHost ),
-        new CommandBinding( ComponentCommands.MoveFocusDown,
-          TableflowViewItemsHost.MoveFocusDownExecuted, TableflowViewItemsHost.MoveFocusDownCanExecute ) );
-    }
-
-    public TableflowViewItemsHost()
-    {
-      this.AddHandler( FrameworkElement.RequestBringIntoViewEvent, new RequestBringIntoViewEventHandler( this.OnRequestBringIntoView ) );
-
-      this.CommandBindings.Add( new CommandBinding(
-        GroupNavigationButton.NavigateToGroup, this.OnNavigateToGroupExecuted, this.OnNavigateToGroupCanExecute ) );
-
-      this.InitializeHorizontalOffsetAnimation();
-      this.InitializeVerticalOffsetAnimation();
-
-      this.Unloaded += new RoutedEventHandler( this.TableflowViewItemsHost_Unloaded );
-    }
-
-    private void TableflowViewItemsHost_Unloaded( object sender, RoutedEventArgs e )
-    {
-      this.StopHorizontalOffsetAnimation();
-      this.StopVerticalOffsetAnimation();
-    }
-
-    private static void OnAreGroupsFlattenedChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridContext dataGridContext = sender as DataGridContext;
-
-      // This property is not intended to be update live in an application.
-      // We need to force a Reset on the CustomItemContainerGenerator to clear
-      // all containers in order to get the right indentation.
-      // Only reset when the change occurs on a the master DataGridContext
-      // since the property is a ViewOnly property.
-      if( ( dataGridContext != null ) && ( dataGridContext.ParentDataGridContext == null ) )
-      {
-        CustomItemContainerGenerator customItemContainerGenerator = dataGridContext.CustomItemContainerGenerator;
-
-        if( customItemContainerGenerator != null )
-        {
-          dataGridContext.CustomItemContainerGenerator.ResetGeneratorContent();
-        }
-      }
-    }
-
-    private static void OnViewPropertiesChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridContext dataGridContext = sender as DataGridContext;
-
-      if( ( dataGridContext == null )
-        || ( dataGridContext.DataGridControl == null )
-        || ( dataGridContext.DataGridControl.ItemsHost == null ) )
-      {
-        return;
-      }
-
-      // Nothing to do for detail DataGridContext.
-      if( dataGridContext.ParentDataGridContext == null )
-      {
-        dataGridContext.DataGridControl.ItemsHost.InvalidateMeasure();
-      }
-    }
-
-#if DEBUG
-    #region RealizedIndex Property
-
-    public static readonly DependencyProperty RealizedIndexProperty = DependencyProperty.RegisterAttached(
-      "RealizedIndex",
-      typeof( int ),
-      typeof( TableflowViewItemsHost ) );
-
-    public int RealizedIndex
-    {
-      get
-      {
-        return TableflowViewItemsHost.GetRealizedIndex( this );
-      }
-      set
-      {
-        TableflowViewItemsHost.SetRealizedIndex( this, value );
-      }
-    }
-
-    public static int GetRealizedIndex( DependencyObject obj )
-    {
-      return ( int )obj.GetValue( TableflowViewItemsHost.RealizedIndexProperty );
-    }
-
-    public static void SetRealizedIndex( DependencyObject obj, int value )
-    {
-      obj.SetValue( TableflowViewItemsHost.RealizedIndexProperty, value );
-    }
-
-    #endregion
-#endif //DEBUG
-
-    #region ShouldDelayDataContext Property (Internal Attached)
-
-    internal static readonly DependencyProperty ShouldDelayDataContextProperty = DependencyProperty.RegisterAttached(
-      "ShouldDelayDataContext",
-      typeof( bool ),
-      typeof( TableflowViewItemsHost ) );
-
-    internal static bool GetShouldDelayDataContext( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowViewItemsHost.ShouldDelayDataContextProperty );
-    }
-
-    internal static void SetShouldDelayDataContext( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowViewItemsHost.ShouldDelayDataContextProperty, value );
-    }
-
-    #endregion
-
-    #region NavigateToGroup Command
-
-    private void OnNavigateToGroupCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private void OnNavigateToGroupExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      Group group = e.Parameter as Group;
-
-      if( group != null )
-      {
-        double offset;
-        double stickyHeadersRegionHeight;
-        int groupContainerIndex;
-
-        if( this.GetGroupOffset( group, out offset, out stickyHeadersRegionHeight, out groupContainerIndex ) )
-        {
-          this.ScrollToVerticalOffset( offset - stickyHeadersRegionHeight );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private bool GetGroupOffset( Group group, out double offset, out double stickyHeadersRegionHeight, out int groupContainerIndex )
-    {
-      groupContainerIndex = ( ( CustomItemContainerGenerator )this.CustomItemContainerGenerator ).GetGroupIndex( group );
-
-      if( groupContainerIndex > -1 )
-      {
-        stickyHeadersRegionHeight = this.GetStickyHeaderCountForIndex( groupContainerIndex ) * m_containerHeight;
-        offset = this.GetContainerOffsetFromIndex( groupContainerIndex );
-
-        return true;
-      }
-
-      offset = 0d;
-      stickyHeadersRegionHeight = 0d;
-
-      return false;
-    }
-
-    #endregion
-
-    internal void OnGroupCollapsing( Group group )
-    {
-      double groupOffset;
-      double stickyHeadersRegionHeight;
-      int groupContainerIndex;
-
-      if( this.GetGroupOffset( group, out groupOffset, out stickyHeadersRegionHeight, out groupContainerIndex ) )
-      {
-        if( m_stickyHeaders.ContainsRealizedIndex( groupContainerIndex )
-          || m_stickyFooters.ContainsRealizedIndex( groupContainerIndex )
-          || m_layoutedContainers.ContainsRealizedIndex( groupContainerIndex ) )
-        {
-          double offset = groupOffset - stickyHeadersRegionHeight;
-
-          if( ( offset < m_verticalOffset ) || ( offset >= m_verticalOffset + m_viewportHeight ) )
-          {
-            this.PreventOpacityAnimation = true;
-            this.ScrollToVerticalOffset( offset, false, ScrollDirection.None );
-          }
-        }
-      }
-    }
-
-    #region AnimatedHorizontalOffset Property
-
-    private static readonly DependencyProperty AnimatedHorizontalOffsetProperty = DependencyProperty.Register(
-      "AnimatedHorizontalOffset",
-      typeof( double ),
-      typeof( TableflowViewItemsHost ),
-      new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnAnimatedHorizontalOffsetChanged ) ) );
-
-    private double AnimatedHorizontalOffset
-    {
-      get
-      {
-        return ( double )this.GetValue( TableflowViewItemsHost.AnimatedHorizontalOffsetProperty );
-      }
-      set
-      {
-        this.SetValue( TableflowViewItemsHost.AnimatedHorizontalOffsetProperty, value );
-      }
-    }
-
-    private static void OnAnimatedHorizontalOffsetChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      TableflowViewItemsHost host = ( TableflowViewItemsHost )sender;
-
-      host.SetHorizontalOffsetCore( ( double )e.NewValue );
-      host.InvalidateArrange();
-      host.InvalidateScrollInfo();
-    }
-
-    #endregion
-
-    #region AnimatedVerticalOffset Property
-
-    private static readonly DependencyProperty AnimatedVerticalOffsetProperty = DependencyProperty.Register(
-      "AnimatedVerticalOffset",
-      typeof( double ),
-      typeof( TableflowViewItemsHost ),
-      new FrameworkPropertyMetadata( new PropertyChangedCallback( TableflowViewItemsHost.OnAnimatedVerticalOffsetChanged ) ) );
-
-    private double AnimatedVerticalOffset
-    {
-      get
-      {
-        return ( double )this.GetValue( TableflowViewItemsHost.AnimatedVerticalOffsetProperty );
-      }
-      set
-      {
-        this.SetValue( TableflowViewItemsHost.AnimatedVerticalOffsetProperty, value );
-      }
-    }
-
-    private void OnAnimatedVerticalOffsetChanged( double oldValue, double newValue )
-    {
-      this.SetVerticalOffsetCore( newValue );
-      this.InvalidateLayoutFromScrollingHelper();
-    }
-
-    private static void OnAnimatedVerticalOffsetChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = ( TableflowViewItemsHost )sender;
-
-      // Do not generate a page while the changed is due to the unloading 
-      // of the grid. See TableflowViewItemsHost.OnParentDataGridControlChanged.
-      if( ( self == null ) || ( DataGridControl.GetDataGridContext( self ) == null ) )
-        return;
-
-      self.OnAnimatedVerticalOffsetChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    #endregion
-
-    #region AnimatedScrollInfo Property
-
-    internal IAnimatedScrollInfo AnimatedScrollInfo
-    {
-      get
-      {
-        return ( IAnimatedScrollInfo )this;
-      }
-    }
-
-    #endregion
-
-    #region PreviousTabNavigationMode ( private attached property )
-
-    private static readonly DependencyProperty PreviousTabNavigationModeProperty = DependencyProperty.RegisterAttached(
-      "PreviousTabNavigationMode",
-      typeof( KeyboardNavigationMode ),
-      typeof( TableflowViewItemsHost ),
-      new FrameworkPropertyMetadata( ( KeyboardNavigationMode )KeyboardNavigationMode.None ) );
-
-    private static KeyboardNavigationMode GetPreviousTabNavigationMode( DependencyObject d )
-    {
-      return ( KeyboardNavigationMode )d.GetValue( TableflowViewItemsHost.PreviousTabNavigationModeProperty );
-    }
-
-    private static void SetPreviousTabNavigationMode( DependencyObject d, KeyboardNavigationMode value )
-    {
-      d.SetValue( TableflowViewItemsHost.PreviousTabNavigationModeProperty, value );
-    }
-
-    #endregion
-
-    #region PreviousDirectionalNavigationMode ( private attached property )
-
-    private static readonly DependencyProperty PreviousDirectionalNavigationModeProperty = DependencyProperty.RegisterAttached(
-      "PreviousDirectionalNavigationMode",
-      typeof( KeyboardNavigationMode ),
-      typeof( TableflowViewItemsHost ),
-      new FrameworkPropertyMetadata( ( KeyboardNavigationMode )KeyboardNavigationMode.None ) );
-
-    private static KeyboardNavigationMode GetPreviousDirectionalNavigationMode( DependencyObject d )
-    {
-      return ( KeyboardNavigationMode )d.GetValue( TableflowViewItemsHost.PreviousDirectionalNavigationModeProperty );
-    }
-
-    private static void SetPreviousDirectionalNavigationMode( DependencyObject d, KeyboardNavigationMode value )
-    {
-      d.SetValue( TableflowViewItemsHost.PreviousDirectionalNavigationModeProperty, value );
-    }
-
-    #endregion
-
-    #region RowSelectorPane Property
-
-    private RowSelectorPane RowSelectorPane
-    {
-      get
-      {
-        TableViewScrollViewer tableViewScrollViewer = this.AnimatedScrollInfo.ScrollOwner as TableViewScrollViewer;
-
-        return ( tableViewScrollViewer == null )
-          ? null
-          : tableViewScrollViewer.RowSelectorPane;
-      }
-    }
-
-    #endregion
-
-    #region IsSticky Internal Attached Property
-
-    private static readonly DependencyPropertyKey IsStickyPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "IsSticky", typeof( bool ), typeof( TableflowViewItemsHost ),
-      new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    internal static readonly DependencyProperty IsStickyProperty;
-
-    internal static bool GetIsSticky( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableflowViewItemsHost.IsStickyProperty );
-    }
-
-    internal static void SetIsSticky( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableflowViewItemsHost.IsStickyPropertyKey, value );
-    }
-
-    internal static void ClearIsSticky( DependencyObject obj )
-    {
-      obj.ClearValue( TableflowViewItemsHost.IsStickyPropertyKey );
-    }
-
-    #endregion
-
-    #region AreHeadersStickyCache Private Property
-
-    private bool AreHeadersStickyCache
-    {
-      get
-      {
-        return m_flags[ ( int )TableflowItemsHostFlags.AreHeadersSticky ];
-      }
-      set
-      {
-        m_flags[ ( int )TableflowItemsHostFlags.AreHeadersSticky ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AreFootersStickyCache Private Property
-
-    private bool AreFootersStickyCache
-    {
-      get
-      {
-        return m_flags[ ( int )TableflowItemsHostFlags.AreFootersSticky ];
-      }
-      set
-      {
-        m_flags[ ( int )TableflowItemsHostFlags.AreFootersSticky ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AreGroupHeadersStickyCache Private Property
-
-    private bool AreGroupHeadersStickyCache
-    {
-      get
-      {
-        return m_flags[ ( int )TableflowItemsHostFlags.AreGroupHeadersSticky ];
-      }
-      set
-      {
-        m_flags[ ( int )TableflowItemsHostFlags.AreGroupHeadersSticky ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AreGroupFootersStickyCache Private Property
-
-    private bool AreGroupFootersStickyCache
-    {
-      get
-      {
-        return m_flags[ ( int )TableflowItemsHostFlags.AreGroupFootersSticky ];
-      }
-      set
-      {
-        m_flags[ ( int )TableflowItemsHostFlags.AreGroupFootersSticky ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AreParentRowsStickyCache Private Property
-
-    private bool AreParentRowsStickyCache
-    {
-      get
-      {
-        return m_flags[ ( int )TableflowItemsHostFlags.AreParentRowSticky ];
-      }
-      set
-      {
-        m_flags[ ( int )TableflowItemsHostFlags.AreParentRowSticky ] = value;
-      }
-    }
-
-    #endregion
-
-    #region PreventOpacityAnimation Private Property
-
-    private bool PreventOpacityAnimation
-    {
-      get
-      {
-        return m_flags[ ( int )TableflowItemsHostFlags.PreventOpacityAnimation ];
-      }
-      set
-      {
-        m_flags[ ( int )TableflowItemsHostFlags.PreventOpacityAnimation ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsDeferredLoadingEnabledCache Private Property
-
-    private bool IsDeferredLoadingEnabledCache
-    {
-      get
-      {
-        return m_flags[ ( int )TableflowItemsHostFlags.IsDeferredLoadingEnabled ];
-      }
-      set
-      {
-        m_flags[ ( int )TableflowItemsHostFlags.IsDeferredLoadingEnabled ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Measure/Arrange Methods
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      m_cachedContainerDesiredWidth.Clear();
-      m_cachedContainerRealDesiredWidth.Clear();
-      m_autoWidthCalculatedDataGridContextList.Clear();
-
-      m_lastMeasureAvailableSize = availableSize;
-
-      this.CacheViewProperties();
-
-      // CALCULATE THE VIEWPORT HEIGHT
-      m_viewportHeight = Double.IsInfinity( availableSize.Height )
-        ? this.AnimatedScrollInfo.ExtentHeight
-        : Math.Min( availableSize.Height, this.AnimatedScrollInfo.ExtentHeight );
-
-      this.CalculatePageItemCount( m_viewportHeight );
-      this.EnsureVerticalOffsetValid( m_viewportHeight );
-      this.GeneratePage( true, m_viewportHeight );
-
-      double synchronizedExtentWidth = 0d;
-      DataGridScrollViewer scrollViewer = this.AnimatedScrollInfo.ScrollOwner as DataGridScrollViewer;
-
-      if( scrollViewer != null )
-      {
-        synchronizedExtentWidth = scrollViewer.SynchronizedScrollViewersWidth;
-      }
-
-      // CALCULATE THE EXTENT WIDTH
-      m_extentWidth = Math.Max( this.GetMaxDesiredWidth(), synchronizedExtentWidth );
-
-      // CALCULATE THE VIEWPORT WIDTH
-      m_viewportWidth = Double.IsInfinity( availableSize.Width )
-        ? m_extentWidth : Math.Min( availableSize.Width, m_extentWidth );
-
-      this.InvalidateScrollInfo();
-
-      if( m_delayedBringIntoViewIndex != -1 )
-      {
-        this.DelayedBringIntoView();
-      }
-
-      return new Size( m_viewportWidth, m_viewportHeight );
-    }
-
-    private void CacheViewProperties()
-    {
-      DataGridContext dataGridContext = this.CachedRootDataGridContext;
-
-      m_containerHeight = TableflowView.GetContainerHeight( dataGridContext );
-
-      this.AreHeadersStickyCache = TableflowView.GetAreHeadersSticky( dataGridContext );
-      this.AreFootersStickyCache = TableflowView.GetAreFootersSticky( dataGridContext );
-      this.AreGroupHeadersStickyCache = TableflowView.GetAreGroupHeadersSticky( dataGridContext );
-      this.AreGroupFootersStickyCache = TableflowView.GetAreGroupFootersSticky( dataGridContext );
-      this.AreParentRowsStickyCache = TableflowView.GetAreParentRowsSticky( dataGridContext );
-      this.IsDeferredLoadingEnabledCache = TableflowView.GetIsDeferredLoadingEnabled( dataGridContext );
-    }
-
-    private void MeasureContainer( UIElement container )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( container );
-
-      string dataGridContextName = this.GetDataGridContextName( container, dataGridContext );
-      bool containerIsRow = this.ContainerIsRow( container );
-
-      if( !m_autoWidthCalculatedDataGridContextList.Contains( dataGridContextName )
-        && containerIsRow )
-      {
-        dataGridContext.ColumnStretchingManager.ColumnStretchingCalculated = false;
-
-        // Calling Measure with the Viewport's width will have the effect of 
-        // distributing the extra space (see FixedCellPanel's MeasureOverride). 
-        // Eventually, the FixedCellPanel will receive an adjusted viewport 
-        // width (where GroupLevelIndicator's width et al will be substracted).
-        container.Measure( new Size( m_lastMeasureAvailableSize.Width, m_containerHeight ) );
-
-        if( dataGridContext.ColumnStretchingManager.ColumnStretchingCalculated )
-        {
-          // We only calculate once per detail.
-          m_autoWidthCalculatedDataGridContextList.Add( dataGridContextName );
-        }
-      }
-      else
-      {
-        // We invalidate the CellsHostPanel of the row and all is parent to ensure the
-        // size is correctly evaluated when we have some auto stretching column.
-        container.InvalidateMeasure();
-
-        Row row = Row.FromContainer( container );
-        if( row != null )
-        {
-          UIElement itemToInvalidate = row.CellsHostPanel;
-
-          while( ( itemToInvalidate != null ) && ( itemToInvalidate != container ) )
-          {
-            itemToInvalidate.InvalidateMeasure();
-            itemToInvalidate = VisualTreeHelper.GetParent( itemToInvalidate ) as UIElement;
-          }
-        }
-      }
-
-      // We always measure the container with infinity so that we'll arrange each container,
-      // for a DataGridContext, with the maximum needed for that context.
-      container.Measure( new Size( double.PositiveInfinity, m_containerHeight ) );
-
-      double desiredSize = container.DesiredSize.Width;
-      double cachedSize;
-
-      if( m_cachedContainerDesiredWidth.TryGetValue( dataGridContextName, out cachedSize ) )
-      {
-        // Keep the largest size!
-        if( cachedSize < desiredSize )
-        {
-          m_cachedContainerDesiredWidth[ dataGridContextName ] = desiredSize;
-        }
-      }
-      else
-      {
-        // Cache the size for the context.
-        m_cachedContainerDesiredWidth.Add( dataGridContextName, desiredSize );
-      }
-
-      PassiveLayoutDecorator decorator = this.GetPassiveLayoutDecorator( container as HeaderFooterItem );
-      if( decorator != null )
-      {
-        desiredSize = decorator.RealDesiredSize.Width;
-
-        if( m_cachedContainerRealDesiredWidth.TryGetValue( dataGridContextName, out cachedSize ) )
-        {
-          // Keep the largest size!
-          if( cachedSize < desiredSize )
-          {
-            m_cachedContainerRealDesiredWidth[ dataGridContextName ] = desiredSize;
-          }
-        }
-        else
-        {
-          // Cache the size for the context.
-          m_cachedContainerRealDesiredWidth.Add( dataGridContextName, desiredSize );
-        }
-      }
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      // Never call InvalidateScrollInfo() in there, that can cause infinit invalidation loop.
-      m_lastArrangeFinalSize = finalSize;
-
-      this.CalculatePageItemCount( finalSize.Height );
-      this.LayoutContainers();
-
-      m_delayedBringIntoViewIndex = -1;
-
-      return finalSize;
-    }
-
-    private PassiveLayoutDecorator GetPassiveLayoutDecorator( HeaderFooterItem item )
-    {
-      if( ( item == null ) || ( VisualTreeHelper.GetChildrenCount( item ) == 0 ) )
-        return null;
-
-      var child = VisualTreeHelper.GetChild( item, 0 );
-      if( child == null )
-        return null;
-
-      var decorator = child as PassiveLayoutDecorator;
-      if( ( decorator == null ) && ( VisualTreeHelper.GetChildrenCount( child ) > 0 ) )
-      {
-        decorator = VisualTreeHelper.GetChild( child, 0 ) as PassiveLayoutDecorator;
-      }
-
-      return decorator;
-    }
-
-    private void ArrangeContainer( UIElement container, Point translationPoint, bool rowSelectorPaneVisible )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( container );
-      string dataGridContextName = this.GetDataGridContextName( container, dataGridContext );
-
-      Size containerSize = new Size(
-        this.GetContainerWidth( dataGridContextName ),
-        m_containerHeight );
-
-      container.Arrange( new Rect( translationPoint, containerSize ) );
-      this.SetCompensationOffset( dataGridContext, container, containerSize.Width );
-
-      if( rowSelectorPaneVisible )
-      {
-        this.SetRowSelector( container, translationPoint, containerSize );
-      }
-    }
-
-    private double GetContainerWidth( string dataGridContextName )
-    {
-      double synchronizedWidth = this.GetSynchronizedExtentWidth();
-      double desiredWidth = 0;
-
-      bool sizeCached = m_cachedContainerDesiredWidth.TryGetValue( dataGridContextName, out desiredWidth );
-
-      if( !sizeCached )
-      {
-        desiredWidth = synchronizedWidth;
-      }
-
-      if( string.IsNullOrEmpty( dataGridContextName ) ) // master level 
-      {
-        //for the master level, I want to consider the Synchronized Extent size as well.
-        desiredWidth = Math.Max( synchronizedWidth, desiredWidth );
-      }
-
-      if( desiredWidth == 0 )
-      {
-        m_cachedContainerRealDesiredWidth.TryGetValue( dataGridContextName, out desiredWidth );
-      }
-
-      return desiredWidth;
-    }
-
-    private double GetSynchronizedExtentWidth()
-    {
-      DataGridScrollViewer dgScrollViewer = this.AnimatedScrollInfo.ScrollOwner as DataGridScrollViewer;
-
-      if( dgScrollViewer != null )
-        return dgScrollViewer.SynchronizedScrollViewersWidth;
-
-      return 0;
-    }
-
-    private void SetCompensationOffset( DataGridContext dataGridContext, UIElement container, double desiredWidth )
-    {
-      double compensationOffset = Math.Max(
-        0,
-        ( ( m_horizontalOffset + Math.Min( m_viewportWidth, desiredWidth ) ) - desiredWidth ) );
-
-      TableView.SetCompensationOffset( container, compensationOffset );
-
-      // Affect the CompensationOffset on the DataGridContext for the TableViewColumnVirtualizationManager
-      // to bind to this value
-      TableView.SetCompensationOffset( dataGridContext, compensationOffset );
-    }
-
-    private void SetRowSelector( UIElement container, Point translationPoint, Size size )
-    {
-      RowSelectorPane rowSelectorPane = this.RowSelectorPane;
-
-      if( rowSelectorPane == null )
-        return;
-
-      rowSelectorPane.SetRowSelectorPosition(
-        container,
-        new Rect( translationPoint, size ),
-        this );
-    }
-
-    private void FreeRowSelector( UIElement container )
-    {
-      RowSelectorPane rowSelectorPane = this.RowSelectorPane;
-
-      if( rowSelectorPane == null )
-        return;
-
-      rowSelectorPane.FreeRowSelector( container );
-    }
-
-    private double GetMaxDesiredWidth()
-    {
-      double maxDesiredWidth = 0d;
-
-      foreach( var item in m_cachedContainerDesiredWidth )
-      {
-        double desiredWidth = item.Value;
-
-        if( desiredWidth == 0 )
-        {
-          m_cachedContainerRealDesiredWidth.TryGetValue( item.Key, out desiredWidth );
-        }
-
-        if( desiredWidth > maxDesiredWidth )
-        {
-          maxDesiredWidth = desiredWidth;
-        }
-      }
-
-      return maxDesiredWidth;
-    }
-
-    #endregion
-
-    #region Containers Methods
-
-    private bool ContainerIsRow( UIElement container )
-    {
-      if( container is Row )
-        return true;
-
-      HeaderFooterItem headerFooterItem = container as HeaderFooterItem;
-
-      if( headerFooterItem != null )
-        return typeof( Row ).IsAssignableFrom( headerFooterItem.VisualRootElementType );
-
-      return false;
-    }
-
-    private string GetDataGridContextName( UIElement container )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( container );
-
-      return this.GetDataGridContextName( container, dataGridContext );
-    }
-
-    private string GetDataGridContextName( UIElement container, DataGridContext dataGridContext )
-    {
-      return ( dataGridContext.SourceDetailConfiguration != null )
-        ? dataGridContext.SourceDetailConfiguration.RelationName
-        : string.Empty;
-    }
-
-    private void CalculatePageItemCount( double height )
-    {
-      m_pageVisibleContainerCount = Double.IsInfinity( height )
-        ? this.CustomItemContainerGenerator.ItemCount
-        : ( int )Math.Ceiling( height / m_containerHeight );
-    }
-
-    private int CalculateFlooredPageItemCount( double height )
-    {
-      return Double.IsInfinity( height )
-        ? this.CustomItemContainerGenerator.ItemCount
-        : ( int )Math.Floor( height / m_containerHeight );
-    }
-
-    private void CalculateLayoutedIndexes( double verticalOffset, double viewportHeight, out PageIndexes layoutedIndexes )
-    {
-      layoutedIndexes = new PageIndexes();
-
-      int itemCount = this.CustomItemContainerGenerator.ItemCount;
-      if( itemCount > 0 )
-      {
-        layoutedIndexes.StartIndex = Math.Min(
-          this.GetContainerIndexFromOffset( verticalOffset, false ),
-          itemCount - 1 );
-
-        layoutedIndexes.EndIndex = Math.Min(
-          this.GetContainerIndexFromOffset( verticalOffset + viewportHeight - m_containerHeight, true ),
-          itemCount - 1 );
-
-        layoutedIndexes.EndIndex = Math.Max(
-          layoutedIndexes.StartIndex,
-          layoutedIndexes.EndIndex );
-      }
-    }
-
-    private PageIndexes CalculateVisibleIndexesForDesiredFirstVisibleIndex( int desiredFirstVisibleIndex )
-    {
-      PageIndexes layoutedIndexes = new PageIndexes();
-
-      // Get the sticky header count for the desiredFirstVisibleIndex
-      // and set the StartIndex
-      int stickyHeaderCountForFirstVisibleIndex = this.GetStickyHeaderCountForIndex( desiredFirstVisibleIndex );
-      layoutedIndexes.StartIndex = desiredFirstVisibleIndex - stickyHeaderCountForFirstVisibleIndex;
-
-      // Get the index of the maximal visible index according
-      // to the number of container the viewport can display
-      // and the number of sticky header the desiredFirstVisibleIndex
-      // must display
-      int maxLastVisibleIndex = layoutedIndexes.StartIndex
-        + this.CalculateFlooredPageItemCount( this.AnimatedScrollInfo.ViewportHeight );
-
-      layoutedIndexes.EndIndex = maxLastVisibleIndex;
-
-      // Process indexes from top to bottom up to an index for which
-      // the number of required sticky footers will force a visible index
-      // larger than the maximal acceptable last visible index
-      for( int i = desiredFirstVisibleIndex + 1; i <= maxLastVisibleIndex; i++ )
-      {
-        int stickyFooterCountForIndex = this.GetStickyFooterCountForIndex( i );
-
-        // The index of the container + its sticky footer count
-        // is greater than the last acceptable visible index, we ensure
-        // the previous container as the maximal one to set as current
-        if( maxLastVisibleIndex < ( i + stickyFooterCountForIndex ) )
-        {
-          layoutedIndexes.EndIndex = i - 1;
-          break;
-        }
-      }
-
-      return layoutedIndexes;
-    }
-
-    private PageIndexes CalculateVisibleIndexesForDesiredLastVisibleIndex( int desiredLastVisibleIndex )
-    {
-      PageIndexes layoutedIndexes = new PageIndexes();
-
-      int stickyFooterCountForLastVisibleIndex = this.GetStickyFooterCountForIndex( desiredLastVisibleIndex );
-      layoutedIndexes.EndIndex = desiredLastVisibleIndex + stickyFooterCountForLastVisibleIndex;
-
-      int minVisibleIndex = layoutedIndexes.EndIndex
-        - this.CalculateFlooredPageItemCount( this.AnimatedScrollInfo.ViewportHeight );
-
-      layoutedIndexes.StartIndex = minVisibleIndex;
-
-      // Process indexes from bottom to top up to an index for which
-      // the number of required sticky headers will force a visible index
-      // larger than the maximal acceptable last visible index
-      for( int i = desiredLastVisibleIndex - 1; i >= minVisibleIndex; i-- )
-      {
-        int stickyHeaderCountForIndex = this.GetStickyHeaderCountForIndex( i );
-
-        // If the index of the container - its sticky header count
-        // is less than the minimal acceptable visible index, we ensure
-        // the next container index as the minimal one to set as current
-        if( minVisibleIndex > ( i - stickyHeaderCountForIndex ) )
-        {
-          layoutedIndexes.StartIndex = i + 1;
-          break;
-        }
-      }
-
-      return layoutedIndexes;
-    }
-
-    private void GeneratePage( bool measureInvalidated, double viewportHeight )
-    {
-      ICustomItemContainerGenerator generator = this.CustomItemContainerGenerator;
-
-      // The generator can be null if we're in design mode.
-      if( generator != null )
-      {
-        if( Double.IsInfinity( viewportHeight ) )
-        {
-          viewportHeight = this.AnimatedScrollInfo.ExtentHeight;
-        }
-
-        // Make sure that container recycling is currently enabled on the generator.
-        generator.IsRecyclingEnabled = true;
-
-        // Calculate the start and end index of the current page.
-        PageIndexes visiblePageIndexes;
-        this.CalculateLayoutedIndexes( m_verticalOffset, viewportHeight, out visiblePageIndexes );
-
-        bool pageChanged = ( m_lastVisiblePageIndexes != visiblePageIndexes );
-
-        if( measureInvalidated || pageChanged )
-        {
-          ICollection<UIElement> nonRecyclableContainers;
-
-          if( m_containerHeight > 0d )
-          {
-            // Recycle the containers we know will not be in the current page.  GenerateContainers will recycle
-            // the remaining containers that were uncertain.
-            nonRecyclableContainers = this.RecycleSafeContainers( generator, visiblePageIndexes.StartIndex, visiblePageIndexes.EndIndex );
-
-            this.GenerateContainers( generator, visiblePageIndexes.StartIndex, visiblePageIndexes.EndIndex, measureInvalidated, nonRecyclableContainers );
-            this.GenerateStickyHeaders( generator, measureInvalidated, nonRecyclableContainers );
-            this.GenerateStickyFooters( generator, measureInvalidated, nonRecyclableContainers );
-          }
-          else
-          {
-            nonRecyclableContainers = this.RecycleAllContainers( generator );
-            Debug.Assert( m_layoutedContainers.Count == 0 );
-          }
-
-          // Keep alive containers that cannot be recycled (i.e. focused element).
-          this.KeepNonRecyclableContainers( generator, measureInvalidated, nonRecyclableContainers );
-        }
-
-        m_lastVisiblePageIndexes = visiblePageIndexes;
-
-        this.PreventOpacityAnimation = false;
-      }
-
-    }
-
-    private ICollection<UIElement> RecycleContainers( ICustomItemContainerGenerator generator, int pageStartIndex, int pageEndIndex, bool clearContainer = false )
-    {
-      var nonRecyclableContainers = new HashSet<UIElement>( m_layoutedContainers.Select( entry => entry.Container ).Where( c => !this.CanRecycleContainer( c ) ) );
-
-      for( int i = m_layoutedContainers.Count - 1; i >= 0; i-- )
-      {
-        var container = m_layoutedContainers[ i ].Container;
-
-        var index = generator.GetRealizedIndexForContainer( container );
-
-        // If the container's index is now out of view, recycle that container.
-        if( ( index < pageStartIndex ) || ( index > pageEndIndex ) )
-        {
-          if( !nonRecyclableContainers.Contains( container ) )
-          {
-            this.RecycleContainer( generator, index, container, clearContainer );
-          }
-
-          m_layoutedContainers.RemoveAt( i );
-        }
-      }
-
-      return nonRecyclableContainers;
-    }
-
-    private ICollection<UIElement> RecycleAllContainers( ICustomItemContainerGenerator generator )
-    {
-      return this.RecycleContainers( generator, -1, -1, true );
-    }
-
-    private ICollection<UIElement> RecycleSafeContainers( ICustomItemContainerGenerator generator, int pageStartIndex, int pageEndIndex )
-    {
-      if( m_lastVisiblePageIndexes == PageIndexes.Empty )
-        return this.RecycleContainers( generator, pageStartIndex, pageEndIndex );
-
-      if( m_lastVisiblePageIndexes.StartIndex == pageStartIndex )
-        return this.RecycleContainers( generator,
-                                       pageStartIndex,
-                                       Math.Max( pageEndIndex, m_lastVisiblePageIndexes.EndIndex ) );
-
-      if( m_lastVisiblePageIndexes.EndIndex == pageEndIndex )
-        return this.RecycleContainers( generator,
-                                       Math.Min( pageStartIndex, m_lastVisiblePageIndexes.StartIndex ),
-                                       pageEndIndex );
-
-      int itemCount = generator.ItemCount;
-      int threshold = Math.Max( 0, ( m_lastVisiblePageIndexes.EndIndex - m_lastVisiblePageIndexes.StartIndex ) - ( pageEndIndex - pageStartIndex ) );
-
-      int endIndex = Math.Min( pageEndIndex + threshold, itemCount - 1 );
-      if( endIndex < 0 )
-        return this.RecycleAllContainers( generator );
-
-      int startIndex = Math.Max( endIndex - threshold - ( pageEndIndex - pageStartIndex ), 0 );
-
-      return this.RecycleContainers( generator, startIndex, endIndex );
-    }
-
-    private void RecycleUnusedStickyContainers(
-      ICustomItemContainerGenerator generator,
-      StickyContainerInfoList stickyContainers,
-      StickyContainerInfoList stickyContainersToExclude,
-      ICollection<UIElement> nonRecyclableContainers )
-    {
-      for( int i = stickyContainers.Count - 1; i >= 0; i-- )
-      {
-        StickyContainerInfo stickyHeaderInfo = stickyContainers[ i ];
-        UIElement container = stickyHeaderInfo.Container;
-
-        if( m_layoutedContainers.ContainsContainer( container ) )
-          continue;
-
-        if( ( stickyContainersToExclude != null ) && ( stickyContainersToExclude.ContainsContainer( container ) ) )
-          continue;
-
-        if( ( nonRecyclableContainers != null ) && nonRecyclableContainers.Contains( container ) )
-          continue;
-
-        var index = generator.GetRealizedIndexForContainer( container );
-
-        this.RecycleContainer( generator, index, container );
-        stickyContainers.RemoveAt( i );
-      }
-    }
-
-    private void RecycleContainer( UIElement container )
-    {
-      this.RecycleContainer( null, -1, container );
-    }
-
-    private void RecycleContainer( ICustomItemContainerGenerator generator, int containerIndex, UIElement container, bool clearContainer = true )
-    {
-      if( !clearContainer )
-      {
-        var dataGridItemContainer = container as IDataGridItemContainer;
-        if( dataGridItemContainer != null )
-        {
-          dataGridItemContainer.IsRecyclingCandidate = true;
-        }
-      }
-      else
-      {
-        this.ClearContainer( container );
-      }
-
-      if( ( generator != null ) && ( containerIndex != -1 ) )
-      {
-        try
-        {
-          GeneratorPosition position = generator.GeneratorPositionFromIndex( containerIndex );
-          generator.Remove( position, 1 );
-        }
-        catch
-        {
-          Debug.Fail( "Unable to remove container for containerIndex " + containerIndex );
-        }
-      }
-    }
-
-    private void CleanRecyclingCandidates()
-    {
-      var generator = this.CustomItemContainerGenerator as CustomItemContainerGenerator;
-      generator.CleanRecyclingCandidates();
-    }
-
-    private void GenerateContainers( ICustomItemContainerGenerator generator, int pageStartIndex, int pageEndIndex, bool measureInvalidated, ICollection<UIElement> nonRecyclableContainers )
-    {
-      HashSet<UIElement> unusedLayoutedContainers = new HashSet<UIElement>( m_layoutedContainers.Select( item => item.Container ) );
-      m_layoutedContainers.Clear();
-
-      ScrollDirection scrollDirection = this.AnimatedScrollInfo.VerticalScrollingDirection;
-
-      GeneratorPosition position;
-      GeneratorDirection direction;
-      int currentIndex;
-      int step;
-
-      if( ( scrollDirection == ScrollDirection.Forward )
-        || ( scrollDirection == ScrollDirection.None ) )
-      {
-        position = generator.GeneratorPositionFromIndex( pageStartIndex );
-        direction = GeneratorDirection.Forward;
-        currentIndex = pageStartIndex;
-        step = 1;
-      }
-      else
-      {
-        position = generator.GeneratorPositionFromIndex( pageEndIndex );
-        direction = GeneratorDirection.Backward;
-        currentIndex = pageEndIndex;
-        step = -1;
-      }
-
-      using( generator.StartAt( position, direction, true ) )
-      {
-        while( ( currentIndex >= pageStartIndex ) && ( currentIndex <= pageEndIndex ) )
-        {
-          var container = this.GenerateContainer( generator, currentIndex, measureInvalidated, true );
-          if( container == null )
-            break;
-
-          // The container is now part of the page layout. Add it to the list.
-          m_layoutedContainers.Add( new LayoutedContainerInfo( currentIndex, container ) );
-          unusedLayoutedContainers.Remove( container );
-          nonRecyclableContainers.Remove( container );
-
-          currentIndex += step;
-        }
-      }
-
-      // A ScrollViewer may measure forever if the containers that are "underneath" the horizontal
-      // scrollbar are the ones that required the scrollbar in the first place.
-      if( m_lastVisiblePageIndexes != PageIndexes.Empty )
-      {
-        int remainingItemCount = ( m_lastVisiblePageIndexes.EndIndex - m_lastVisiblePageIndexes.StartIndex )
-                               - ( pageEndIndex - pageStartIndex );
-
-        if( ( remainingItemCount > 0 ) && ( this.GetMaxDesiredWidth() < this.AnimatedScrollInfo.ExtentWidth ) )
-        {
-          int itemCount = generator.ItemCount;
-
-          if( ( currentIndex >= 0 ) && ( currentIndex < itemCount ) )
-          {
-            position = generator.GeneratorPositionFromIndex( currentIndex );
-
-            using( generator.StartAt( position, direction, true ) )
-            {
-              while( ( remainingItemCount > 0 ) && ( currentIndex >= 0 ) && ( currentIndex < itemCount ) )
-              {
-                var container = this.GenerateContainer( generator, currentIndex, measureInvalidated, true );
-                if( container == null )
-                  break;
-
-                // The container is now part of the page layout. Add it to the list.
-                m_layoutedContainers.Add( new LayoutedContainerInfo( currentIndex, container ) );
-                unusedLayoutedContainers.Remove( container );
-                nonRecyclableContainers.Remove( container );
-
-                currentIndex += step;
-                remainingItemCount--;
-              }
-            }
-          }
-        }
-      }
-
-      m_layoutedContainers.Sort();
-
-      // Recycle the containers that have not been reused in the current page.
-      foreach( var container in unusedLayoutedContainers )
-      {
-        if( nonRecyclableContainers.Contains( container ) )
-          continue;
-
-        var index = generator.GetRealizedIndexForContainer( container );
-
-        this.RecycleContainer( generator, index, container );
-      }
-
-      this.CleanRecyclingCandidates();
-    }
-
-    private void KeepNonRecyclableContainers( ICustomItemContainerGenerator generator, bool measureInvalidated, ICollection<UIElement> nonRecyclableContainers )
-    {
-      if( ( nonRecyclableContainers == null ) || ( nonRecyclableContainers.Count == 0 ) )
-        return;
-
-      foreach( var container in nonRecyclableContainers )
-      {
-        var index = generator.GetRealizedIndexForContainer( container );
-        if( index >= 0 )
-        {
-          if( measureInvalidated )
-          {
-            this.MeasureContainer( container );
-          }
-
-          m_layoutedContainers.Add( new LayoutedContainerInfo( index, container ) );
-        }
-        else
-        {
-          this.RecycleContainer( container );
-        }
-      }
-    }
-
-    private int GetStickyHeaderCountForIndex( int desiredIndex )
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return 0;
-
-      var customGenerator = dataGridContext.CustomItemContainerGenerator;
-      if( customGenerator == null )
-        return 0;
-
-      return customGenerator.GetStickyHeaderCountForIndex( desiredIndex,
-                                                           this.AreHeadersStickyCache,
-                                                           this.AreGroupHeadersStickyCache,
-                                                           this.AreParentRowsStickyCache );
-    }
-
-    private int GetStickyFooterCountForIndex( int desiredIndex )
-    {
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return 0;
-
-      var customGenerator = dataGridContext.CustomItemContainerGenerator;
-      if( customGenerator == null )
-        return 0;
-
-      return customGenerator.GetStickyFooterCountForIndex( desiredIndex,
-                                                           this.AreFootersStickyCache,
-                                                           this.AreGroupFootersStickyCache );
-    }
-
-    private void GenerateStickyHeaders( ICustomItemContainerGenerator generator, bool measureInvalidated, ICollection<UIElement> nonRecyclableContainers )
-    {
-      var customGenerator = ( CustomItemContainerGenerator )generator;
-      var newStickyHeaders = new StickyContainerInfoList();
-
-      if( this.AreHeadersStickyCache || this.AreGroupHeadersStickyCache || this.AreParentRowsStickyCache )
-      {
-        var numberOfContainerChecked = 0;
-
-        foreach( var layoutedContainerInfo in m_layoutedContainers )
-        {
-          var container = layoutedContainerInfo.Container;
-
-          // For each visible container, we must find what headers should be sticky for it.
-          var stickyHeaders = customGenerator.GenerateStickyHeaders( container, this.AreHeadersStickyCache, this.AreGroupHeadersStickyCache, this.AreParentRowsStickyCache );
-
-          stickyHeaders.Sort( StickyContainerGeneratedComparer.Singleton );
-
-          // For each sticky headers returned, we must get the index of the last container
-          // that could need that container to be sticky. 
-          foreach( var stickyHeaderInfo in stickyHeaders )
-          {
-            var stickyContainer = ( UIElement )stickyHeaderInfo.StickyContainer;
-            if( newStickyHeaders.ContainsContainer( stickyContainer ) )
-              continue;
-
-            var lastContainerIndex = customGenerator.GetLastHoldingContainerIndexForStickyHeader( stickyContainer );
-
-            var stickyContainerInfo = new StickyContainerInfo( stickyContainer, stickyHeaderInfo.Index, lastContainerIndex );
-            newStickyHeaders.Add( stickyContainerInfo );
-            nonRecyclableContainers.Remove( stickyContainer );
-
-            this.HandleGeneratedStickyContainerPreparation( stickyHeaderInfo, measureInvalidated );
-          }
-
-          // We only need to find the sticky headers for one 
-          // more element than what is already sticky.
-          var visibleStickyHeadersCount = ( int )Math.Ceiling( this.GetStickyHeadersRegionHeight( newStickyHeaders ) / m_containerHeight );
-
-          if( ( ++numberOfContainerChecked - visibleStickyHeadersCount ) >= 1 )
-            break;
-        }
-
-        foreach( var stickyHeaderInfo in newStickyHeaders )
-        {
-          var index = m_layoutedContainers.IndexOfContainer( stickyHeaderInfo.Container );
-          if( index < 0 )
-            continue;
-
-          m_layoutedContainers.RemoveAt( index );
-        }
-
-        foreach( var stickyHeaderInfo in m_stickyHeaders )
-        {
-          var container = stickyHeaderInfo.Container;
-
-          if( !newStickyHeaders.ContainsContainer( container ) && !nonRecyclableContainers.Contains( container ) && !this.CanRecycleContainer( container ) )
-          {
-            nonRecyclableContainers.Add( container );
-          }
-        }
-      }
-
-      this.RecycleUnusedStickyContainers( generator, m_stickyHeaders, newStickyHeaders, nonRecyclableContainers );
-
-      m_stickyHeaders.Clear();
-
-      if( newStickyHeaders.Count > 0 )
-      {
-        m_stickyHeaders.AddRange( newStickyHeaders );
-        m_stickyHeaders.Sort( StickyContainerInfoComparer.Singleton );
-      }
-    }
-
-    private void GenerateStickyFooters( ICustomItemContainerGenerator generator, bool measureInvalidated, ICollection<UIElement> nonRecyclableContainers )
-    {
-      var newStickyFooters = new StickyContainerInfoList();
-
-      if( this.AreFootersStickyCache || this.AreGroupFootersStickyCache )
-      {
-        var customGenerator = ( CustomItemContainerGenerator )generator;
-        var numberOfContainerChecked = 0;
-        var layoutedContainerCount = m_layoutedContainers.Count;
-
-        if( layoutedContainerCount > 0 )
-        {
-          // We must not generate sticky footers if the last container is not even at the bottom of the view!
-          var bottomMostContainerInfo = m_layoutedContainers[ layoutedContainerCount - 1 ];
-          var bottomMostContainerOffset = this.GetContainerOffsetFromIndex( bottomMostContainerInfo.RealizedIndex );
-
-          if( ( bottomMostContainerOffset + m_containerHeight ) >= m_viewportHeight )
-          {
-            for( var i = layoutedContainerCount - 1; i >= 0; i-- )
-            {
-              var layoutedContainerInfo = m_layoutedContainers[ i ];
-              var layoutedContainer = layoutedContainerInfo.Container;
-
-              // For each visible container, we must find what footers should be sticky for it.
-              var stickyFooters = customGenerator.GenerateStickyFooters( layoutedContainer, this.AreFootersStickyCache, this.AreGroupFootersStickyCache );
-
-              stickyFooters.Sort( StickyContainerGeneratedReverseComparer.Singleton );
-
-              // For each sticky headers returned, we must get the index of the last container
-              // that could need that container to be sticky. 
-              foreach( var stickyFooterInfo in stickyFooters )
-              {
-                var stickyContainer = ( UIElement )stickyFooterInfo.StickyContainer;
-                if( newStickyFooters.ContainsContainer( stickyContainer ) )
-                  continue;
-
-                var firstContainerIndex = customGenerator.GetFirstHoldingContainerIndexForStickyFooter( stickyContainer );
-
-                var stickyContainerInfo = new StickyContainerInfo( stickyContainer, stickyFooterInfo.Index, firstContainerIndex );
-                newStickyFooters.Add( stickyContainerInfo );
-                nonRecyclableContainers.Remove( stickyContainer );
-
-                this.HandleGeneratedStickyContainerPreparation( stickyFooterInfo, measureInvalidated );
-              }
-
-              // We only need to find the sticky footers for one 
-              // more element than what is already sticky.
-              var visibleStickyFootersCount = ( int )Math.Ceiling( ( this.AnimatedScrollInfo.ViewportHeight - this.GetStickyFootersRegionHeight( newStickyFooters ) ) / m_containerHeight );
-
-              if( ( ++numberOfContainerChecked - visibleStickyFootersCount ) >= 1 )
-                break;
-            }
-          }
-        }
-
-        foreach( var stickyFooterInfo in newStickyFooters )
-        {
-          var index = m_layoutedContainers.IndexOfContainer( stickyFooterInfo.Container );
-          if( index < 0 )
-            continue;
-
-          m_layoutedContainers.RemoveAt( index );
-        }
-
-        foreach( var stickyFooterInfo in m_stickyFooters )
-        {
-          var container = stickyFooterInfo.Container;
-
-          if( !newStickyFooters.ContainsContainer( container ) && !nonRecyclableContainers.Contains( container ) && !this.CanRecycleContainer( container ) )
-          {
-            nonRecyclableContainers.Add( container );
-          }
-        }
-      }
-
-      this.RecycleUnusedStickyContainers( generator, m_stickyFooters, newStickyFooters, nonRecyclableContainers );
-
-      m_stickyFooters.Clear();
-
-      if( newStickyFooters.Count > 0 )
-      {
-        m_stickyFooters.AddRange( newStickyFooters );
-        m_stickyFooters.Sort( StickyContainerInfoReverseComparer.Singleton );
-      }
-    }
-
-    private void HandleGeneratedStickyContainerPreparation( StickyContainerGenerated stickyContainerInfo, bool measureInvalidated )
-    {
-      UIElement container = ( UIElement )stickyContainerInfo.StickyContainer;
-      bool isNewlyRealized = stickyContainerInfo.IsNewlyRealized;
-
-      if( isNewlyRealized )
-      {
-        if( !this.Children.Contains( container ) )
-        {
-          this.Children.Add( container );
-        }
-
-        this.EnableElementNavigation( container );
-        KeyboardNavigation.SetTabIndex( container, stickyContainerInfo.Index );
-      }
-
-      TableflowViewItemsHost.SetIsSticky( container, true );
-
-      // This will prepare, if needed, the container.
-      this.HandleGeneratedContainerPreparation( container, stickyContainerInfo.Index, isNewlyRealized, true );
-
-      // Measure, if needed, the container.
-      if( isNewlyRealized || measureInvalidated )
-      {
-        this.MeasureContainer( container );
-      }
-    }
-
-    private UIElement GenerateContainer( ICustomItemContainerGenerator generator, int index, bool measureInvalidated, bool delayDataContext )
-    {
-      bool isNewlyRealized;
-      UIElement container = ( UIElement )generator.GenerateNext( out isNewlyRealized );
-
-      if( container != null )
-      {
-        if( isNewlyRealized )
-        {
-          if( !this.Children.Contains( container ) )
-          {
-            this.Children.Add( container );
-          }
-
-          this.EnableElementNavigation( container );
-          KeyboardNavigation.SetTabIndex( container, index );
-        }
-
-        this.HandleGeneratedContainerPreparation( container, index, isNewlyRealized, delayDataContext );
-
-        if( ( isNewlyRealized ) || ( measureInvalidated ) )
-        {
-          this.MeasureContainer( container );
-        }
-      }
-
-      return container;
-    }
-
-    private void HandleGeneratedContainerPreparation( UIElement container, int containerIndex, bool isNewlyRealized, bool delayDataContext )
-    {
-#if DEBUG
-      TableflowViewItemsHost.SetRealizedIndex( container, containerIndex );
-#endif //DEBUG
-
-      try
-      {
-        TableflowViewItemsHost.SetShouldDelayDataContext(
-          container, ( !this.PreventOpacityAnimation && this.IsDeferredLoadingEnabledCache && delayDataContext ) );
-
-        if( isNewlyRealized )
-        {
-          // We must prepare the container if the container preparation
-          // should not be delayed or if we've been ask to prepare it (from 
-          // a keyboard navigation for example)
-          this.PrepareContainer( container );
-        }
-
-        // We must set those properties AFTER calling PrepareContainer since PrepareContainer
-        // will set the ItemContainerStyle which could affect the Height properties. In our case,
-        // we want to override those properties so that our layout is ok.
-        container.SetValue( FrameworkElement.MinHeightProperty, m_containerHeight );
-        container.SetValue( FrameworkElement.MaxHeightProperty, m_containerHeight );
-        container.SetValue( FrameworkElement.HeightProperty, m_containerHeight );
-
-        // In the case of HeaderFooterItems, we also want to set the Height properties of the inner 
-        // container if that container is a Row or a descendant.
-        HeaderFooterItem headerFooterItem = container as HeaderFooterItem;
-
-        if( ( headerFooterItem != null )
-          && ( headerFooterItem.Container != null )
-          && ( this.ContainerIsRow( container ) ) )
-        {
-          headerFooterItem.Container.SetValue( FrameworkElement.MinHeightProperty, m_containerHeight );
-          headerFooterItem.Container.SetValue( FrameworkElement.MaxHeightProperty, m_containerHeight );
-          headerFooterItem.Container.SetValue( FrameworkElement.HeightProperty, m_containerHeight );
-        }
-      }
-      finally
-      {
-        container.ClearValue( TableflowViewItemsHost.ShouldDelayDataContextProperty );
-      }
-    }
-
-    private bool IsRowSelectorPaneVisible()
-    {
-      DataGridControl parentDataGridControl = this.ParentDataGridControl;
-
-      if( parentDataGridControl != null )
-      {
-        TableViewScrollViewer scrollViewer = parentDataGridControl.ScrollViewer as TableViewScrollViewer;
-        RowSelectorPane rowSelectorPane = ( scrollViewer != null ) ? scrollViewer.RowSelectorPane : null;
-
-        if( rowSelectorPane != null )
-          return ( rowSelectorPane.Visibility == Visibility.Visible );
-      }
-
-      return false;
-    }
-
-    private void LayoutContainers()
-    {
-      var rowSelectorPaneVisible = this.IsRowSelectorPaneVisible();
-
-      this.LayoutStickyHeaders( rowSelectorPaneVisible );
-      this.LayoutStickyFooters( rowSelectorPaneVisible );
-      this.LayoutNonStickyContainers( rowSelectorPaneVisible );
-
-      var layoutedContainers = new HashSet<UIElement>();
-
-      foreach( var container in m_layoutedContainers.Select( item => item.Container ) )
-      {
-        layoutedContainers.Add( container );
-      }
-
-      foreach( var container in m_stickyHeaders.Select( item => item.Container ) )
-      {
-        layoutedContainers.Add( container );
-      }
-
-      foreach( var container in m_stickyFooters.Select( item => item.Container ) )
-      {
-        layoutedContainers.Add( container );
-      }
-
-      // Layout out of view the recycled container
-      foreach( var container in this.Children )
-      {
-        if( layoutedContainers.Contains( container ) )
-          continue;
-
-        this.ArrangeContainer( container, TableflowViewItemsHost.OutOfViewPoint, false );
-      }
-
-      CommandManager.InvalidateRequerySuggested();
-
-      // The call to Mouse.Synchronize must not start dragging rows.
-      // Update the mouse status to make sure no container has invalid mouse over status.
-      // Only do this when the mouse is over the panel, to prevent unescessary update when scrolling with thumb.
-      if( this.IsMouseOver )
-      {
-        var dataGridControl = this.ParentDataGridControl;
-        if( dataGridControl != null )
-        {
-          using( dataGridControl.InhibitDrag() )
-          {
-            Mouse.Synchronize();
-          }
-        }
-      }
-    }
-
-    private void LayoutNonStickyContainers( bool rowSelectorPaneVisible )
-    {
-      int count = m_layoutedContainers.Count;
-      double clippedHeaderOffset = this.GetStickyHeadersRegionHeight();
-      double clippedFooterOffset = this.GetStickyFootersRegionHeight();
-
-      for( int i = 0; i < count; i++ )
-      {
-        LayoutedContainerInfo layoutedContainerInfo = m_layoutedContainers[ i ];
-        int realizedIndex = layoutedContainerInfo.RealizedIndex;
-        UIElement container = layoutedContainerInfo.Container;
-
-        double desiredOffset = this.GetContainerOffsetFromIndex( realizedIndex ) - m_verticalOffset;
-
-        if( desiredOffset < clippedHeaderOffset )
-        {
-          double shownRectHeight = Math.Max( m_containerHeight - ( clippedHeaderOffset - desiredOffset ), 0 );
-
-          Rect shownRect = new Rect(
-            new Point( 0, m_containerHeight - shownRectHeight ),
-            new Size( this.AnimatedScrollInfo.ExtentWidth, shownRectHeight ) );
-
-          container.SetValue( UIElement.ClipProperty, new RectangleGeometry( shownRect ) );
-        }
-        else if( desiredOffset + m_containerHeight > clippedFooterOffset )
-        {
-          double shownRectHeight = Math.Min( clippedFooterOffset - desiredOffset, m_containerHeight );
-          shownRectHeight = Math.Max( shownRectHeight, 0 );
-
-          Rect shownRect = new Rect(
-            new Point(),
-            new Size( this.AnimatedScrollInfo.ExtentWidth, shownRectHeight ) );
-
-          container.SetValue( UIElement.ClipProperty, new RectangleGeometry( shownRect ) );
-        }
-        else
-        {
-          container.ClearValue( UIElement.ClipProperty );
-        }
-
-        Point translationPoint = new Point( -m_horizontalOffset, desiredOffset );
-
-        this.ArrangeContainer( container, translationPoint, rowSelectorPaneVisible );
-      }
-    }
-
-    private void LayoutStickyHeaders( bool rowSelectorPaneVisible )
-    {
-      int count = m_stickyHeaders.Count;
-      double lastStickyHeaderOffset = -m_containerHeight;
-      double clippedOffset = lastStickyHeaderOffset + m_containerHeight;
-
-      for( int i = 0; i < count; i++ )
-      {
-        StickyContainerInfo stickyContainerInfo = m_stickyHeaders[ i ];
-        UIElement container = stickyContainerInfo.Container;
-
-        double desiredOffset = this.ComputeStickyHeaderDesiredOffset( stickyContainerInfo, lastStickyHeaderOffset );
-        lastStickyHeaderOffset = Math.Max( desiredOffset, lastStickyHeaderOffset );
-
-        if( desiredOffset < clippedOffset )
-        {
-          double shownRectHeight = Math.Max( m_containerHeight - ( clippedOffset - desiredOffset ), 0 );
-
-          Rect shownRect = new Rect(
-            new Point( 0, m_containerHeight - shownRectHeight ),
-            new Size( this.AnimatedScrollInfo.ExtentWidth, shownRectHeight ) );
-
-          container.SetValue( UIElement.ClipProperty, new RectangleGeometry( shownRect ) );
-        }
-        else
-        {
-          container.ClearValue( UIElement.ClipProperty );
-        }
-
-        clippedOffset = lastStickyHeaderOffset + m_containerHeight;
-
-        Point translationPoint = new Point(
-          -m_horizontalOffset,
-          desiredOffset );
-
-        this.ArrangeContainer( container, translationPoint, rowSelectorPaneVisible );
-      }
-    }
-
-    internal double GetStickyHeadersRegionHeight()
-    {
-      return this.GetStickyHeadersRegionHeight( m_stickyHeaders );
-    }
-
-    internal double GetStickyHeadersRegionHeight( StickyContainerInfoList stickyHeaders )
-    {
-      int count = stickyHeaders.Count;
-      double lastStickyHeaderOffset = -m_containerHeight;
-
-      for( int i = 0; i < count; i++ )
-      {
-        double desiredOffset = this.ComputeStickyHeaderDesiredOffset( stickyHeaders[ i ], lastStickyHeaderOffset );
-        lastStickyHeaderOffset = Math.Max( desiredOffset, lastStickyHeaderOffset );
-      }
-
-      return lastStickyHeaderOffset + m_containerHeight;
-    }
-
-    private double ComputeStickyHeaderDesiredOffset( StickyContainerInfo stickyHeaderInfo, double lastStickyHeaderOffset )
-    {
-      double lastHoldingContainerOffset = this.GetContainerOffsetFromIndex( stickyHeaderInfo.HoldingContainerIndex ) - m_verticalOffset;
-      double desiredStickyHeaderOffset = lastStickyHeaderOffset + m_containerHeight;
-      double realHeaderOffset = this.GetContainerOffsetFromIndex( stickyHeaderInfo.ContainerIndex ) - m_verticalOffset;
-
-      desiredStickyHeaderOffset = Math.Min( lastHoldingContainerOffset, desiredStickyHeaderOffset );
-      desiredStickyHeaderOffset = Math.Max( realHeaderOffset, desiredStickyHeaderOffset );
-
-      return desiredStickyHeaderOffset;
-    }
-
-    private void LayoutStickyFooters( bool rowSelectorPaneVisible )
-    {
-      int count = m_stickyFooters.Count;
-      double lastStickyFooterOffset = m_viewportHeight;
-      double clippedHeaderOffset = this.GetStickyHeadersRegionHeight();
-      double clippedOffset = lastStickyFooterOffset;
-
-      // The first one in the list is the last visible one!
-      for( int i = 0; i < count; i++ )
-      {
-        StickyContainerInfo stickyContainerInfo = m_stickyFooters[ i ];
-        UIElement container = stickyContainerInfo.Container;
-
-        double desiredOffset = this.ComputeStickyFooterDesiredOffset( stickyContainerInfo, lastStickyFooterOffset );
-        lastStickyFooterOffset = Math.Min( desiredOffset, lastStickyFooterOffset );
-
-        if( desiredOffset < clippedHeaderOffset )
-        {
-          double shownRectHeight = Math.Max( m_containerHeight - ( clippedHeaderOffset - desiredOffset ), 0 );
-
-          Rect shownRect = new Rect(
-            new Point( 0, m_containerHeight - shownRectHeight ),
-            new Size( this.AnimatedScrollInfo.ExtentWidth, shownRectHeight ) );
-
-          container.SetValue( UIElement.ClipProperty, new RectangleGeometry( shownRect ) );
-        }
-        else if( desiredOffset + m_containerHeight > clippedOffset )
-        {
-          double shownRectHeight = Math.Min( clippedOffset - desiredOffset, m_containerHeight );
-          shownRectHeight = Math.Max( shownRectHeight, 0 );
-
-          Rect shownRect = new Rect(
-            new Point(),
-            new Size( this.AnimatedScrollInfo.ExtentWidth, shownRectHeight ) );
-
-          container.SetValue( UIElement.ClipProperty, new RectangleGeometry( shownRect ) );
-        }
-        else
-        {
-          container.ClearValue( UIElement.ClipProperty );
-        }
-
-        clippedOffset = lastStickyFooterOffset;
-
-        Point translationPoint = new Point( -m_horizontalOffset, desiredOffset );
-
-        this.ArrangeContainer( container, translationPoint, rowSelectorPaneVisible );
-      }
-    }
-
-    internal double GetStickyFootersRegionHeight()
-    {
-      return this.GetStickyFootersRegionHeight( m_stickyFooters );
-    }
-
-    internal double GetStickyFootersRegionHeight( StickyContainerInfoList stickyFooters )
-    {
-      int count = stickyFooters.Count;
-      double lastStickyFooterOffset = m_viewportHeight;
-
-      for( int i = 0; i < count; i++ )
-      {
-        double desiredOffset = this.ComputeStickyFooterDesiredOffset( stickyFooters[ i ], lastStickyFooterOffset );
-        lastStickyFooterOffset = Math.Min( desiredOffset, lastStickyFooterOffset );
-      }
-
-      return lastStickyFooterOffset;
-    }
-
-    private double ComputeStickyFooterDesiredOffset( StickyContainerInfo stickyFooterInfo, double lastStickyFooterOffset )
-    {
-      double firstHoldingContainerOffset = this.GetContainerOffsetFromIndex( stickyFooterInfo.HoldingContainerIndex ) - m_verticalOffset;
-      double desiredStickyFooterOffset = lastStickyFooterOffset - m_containerHeight;
-      double realFooterOffset = this.GetContainerOffsetFromIndex( stickyFooterInfo.ContainerIndex ) - m_verticalOffset;
-
-      desiredStickyFooterOffset = Math.Max( firstHoldingContainerOffset, desiredStickyFooterOffset );
-      desiredStickyFooterOffset = Math.Min( realFooterOffset, desiredStickyFooterOffset );
-
-      return desiredStickyFooterOffset;
-    }
-
-    private int GetContainerIndexFromOffset( double offset, bool includePartiallyVisibleContainers )
-    {
-      if( includePartiallyVisibleContainers )
-      {
-        return ( int )Math.Ceiling( offset / m_containerHeight );
-      }
-      else
-      {
-        return ( int )Math.Floor( offset / m_containerHeight );
-      }
-    }
-
-    private double GetContainerOffsetFromIndex( int index )
-    {
-      return ( index * m_containerHeight );
-    }
-
-    private void DisableElementNavigation( UIElement child )
-    {
-      //get previous values and store them on the container (attached)
-      TableflowViewItemsHost.SetPreviousDirectionalNavigationMode( child, KeyboardNavigation.GetDirectionalNavigation( child ) );
-      TableflowViewItemsHost.SetPreviousTabNavigationMode( child, KeyboardNavigation.GetTabNavigation( child ) );
-
-      KeyboardNavigation.SetDirectionalNavigation( child, KeyboardNavigationMode.None );
-      KeyboardNavigation.SetTabNavigation( child, KeyboardNavigationMode.None );
-    }
-
-    private void EnableElementNavigation( UIElement child )
-    {
-      //checking only one of the 2 properties... This is because they are set together.
-      if( child.ReadLocalValue( TableflowViewItemsHost.PreviousDirectionalNavigationModeProperty ) != DependencyProperty.UnsetValue )
-      {
-        KeyboardNavigation.SetDirectionalNavigation( child, TableflowViewItemsHost.GetPreviousDirectionalNavigationMode( child ) );
-        KeyboardNavigation.SetTabNavigation( child, TableflowViewItemsHost.GetPreviousTabNavigationMode( child ) );
-      }
-      //If unset, then nothing to do in this method!
-    }
-
-    private void PrepareContainer( UIElement container )
-    {
-      container.ClearValue( UIElement.VisibilityProperty );
-
-      var dataItemStore = Xceed.Wpf.DataGrid.CustomItemContainerGenerator.GetDataItemProperty( container );
-      if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
-        return;
-
-      var dataItem = dataItemStore.Data;
-      if( dataItem == null )
-        return;
-
-      // Prepare the container.
-      this.ParentDataGridControl.PrepareItemContainer( container, dataItem );
-    }
-
-    private void ClearContainer( UIElement container )
-    {
-#if DEBUG
-      TableflowViewItemsHost.SetRealizedIndex( container, -1 );
-#endif //DEBUG
-      TableflowViewItemsHost.ClearIsSticky( container );
-      container.ClearValue( UIElement.ClipProperty );
-
-      this.DisableElementNavigation( container );
-      this.FreeRowSelector( container );
-
-      container.Visibility = Visibility.Collapsed;
-
-      // The call to DataGridControl.ClearItemContainer will be done by the CustomItemContainerGenerator.
-    }
-
-    #endregion
-
-    #region Animations Management
-
-    private void InitializeHorizontalOffsetAnimation()
-    {
-      if( m_horizontalOffsetAnimation != null )
-        return;
-
-      m_horizontalOffsetAnimation = new OffsetAnimation();
-    }
-
-    private bool StartHorizontalOffsetAnimation()
-    {
-      var rootDataGridContext = this.CachedRootDataGridContext;
-      if( rootDataGridContext == null )
-      {
-        this.StopHorizontalOffsetAnimation();
-        return false;
-      }
-
-      var scrollingAnimationDuration = TableflowView.GetScrollingAnimationDuration( rootDataGridContext );
-      if( scrollingAnimationDuration <= 0d )
-        return false;
-
-      var animatedScrollInfo = this.AnimatedScrollInfo;
-
-      m_horizontalOffsetAnimation.Duration = TimeSpan.FromMilliseconds( scrollingAnimationDuration );
-      m_horizontalOffsetAnimation.From = animatedScrollInfo.OriginalHorizontalOffset;
-      m_horizontalOffsetAnimation.To = animatedScrollInfo.TargetHorizontalOffset;
-
-      this.StopHorizontalOffsetAnimation();
-
-      m_horizontalOffsetAnimationClock = ( AnimationClock )m_horizontalOffsetAnimation.CreateClock( true );
-      m_horizontalOffsetAnimationClock.Completed += this.OnHorizontalOffsetAnimationCompleted;
-
-      this.ApplyAnimationClock( TableflowViewItemsHost.AnimatedHorizontalOffsetProperty, m_horizontalOffsetAnimationClock, HandoffBehavior.SnapshotAndReplace );
-
-      return true;
-    }
-
-    private void StopHorizontalOffsetAnimation()
-    {
-      if( ( m_horizontalOffsetAnimationClock != null ) && ( m_horizontalOffsetAnimationClock.Controller != null ) )
-      {
-        // We must call Pause instead on Stop to avoid having our
-        // offset momentary set to 0. Weird...
-        m_horizontalOffsetAnimationClock.Controller.Pause();
-        m_horizontalOffsetAnimationClock.Completed -= this.OnHorizontalOffsetAnimationCompleted;
-        m_horizontalOffsetAnimationClock = null;
-      }
-    }
-
-    private void OnHorizontalOffsetAnimationCompleted( object sender, EventArgs e )
-    {
-      this.AnimatedScrollInfo.HorizontalScrollingDirection = ScrollDirection.None;
-    }
-
-    private void InitializeVerticalOffsetAnimation()
-    {
-      if( m_verticalOffsetAnimation != null )
-        return;
-
-      m_verticalOffsetAnimation = new OffsetAnimation();
-    }
-
-    private bool StartVerticalOffsetAnimation()
-    {
-      var rootDataGridContext = this.CachedRootDataGridContext;
-      if( rootDataGridContext == null )
-      {
-        this.StopVerticalOffsetAnimation();
-        return false;
-      }
-
-      var scrollingAnimationDuration = TableflowView.GetScrollingAnimationDuration( rootDataGridContext );
-      if( scrollingAnimationDuration <= 0d )
-        return false;
-
-      var animatedScrollInfo = this.AnimatedScrollInfo;
-
-      m_verticalOffsetAnimation.Duration = TimeSpan.FromMilliseconds( scrollingAnimationDuration );
-      m_verticalOffsetAnimation.From = animatedScrollInfo.OriginalVerticalOffset;
-      m_verticalOffsetAnimation.To = animatedScrollInfo.TargetVerticalOffset;
-
-      this.StopVerticalOffsetAnimation( false );
-
-      m_verticalOffsetAnimationClock = ( AnimationClock )m_verticalOffsetAnimation.CreateClock( true );
-      m_verticalOffsetAnimationClock.Completed += this.OnVerticalOffsetAnimationCompleted;
-
-      this.ApplyAnimationClock( TableflowViewItemsHost.AnimatedVerticalOffsetProperty, m_verticalOffsetAnimationClock, HandoffBehavior.SnapshotAndReplace );
-
-      return true;
-    }
-
-    private void StopVerticalOffsetAnimation( bool resetScrollDirection = true )
-    {
-      if( ( m_verticalOffsetAnimationClock != null ) && ( m_verticalOffsetAnimationClock.Controller != null ) )
-      {
-        if( resetScrollDirection )
-        {
-          this.AnimatedScrollInfo.VerticalScrollingDirection = ScrollDirection.None;
-        }
-
-        // We must call Pause instead on Stop to avoid having our
-        // offset momentary set to 0. Weird...
-        m_verticalOffsetAnimationClock.Controller.Pause();
-        m_verticalOffsetAnimationClock.Completed -= this.OnVerticalOffsetAnimationCompleted;
-        m_verticalOffsetAnimationClock = null;
-
-      }
-    }
-
-    private void OnVerticalOffsetAnimationCompleted( object sender, EventArgs e )
-    {
-      this.AnimatedScrollInfo.VerticalScrollingDirection = ScrollDirection.None;
-    }
-
-    #endregion
-
-    #region Scrolling Management
-
-    internal void InvalidateScrollInfo()
-    {
-      ScrollViewer scrollOwner = this.AnimatedScrollInfo.ScrollOwner;
-
-      if( scrollOwner != null )
-      {
-        scrollOwner.InvalidateScrollInfo();
-      }
-    }
-
-    private void EnsureVerticalOffsetValid( double height )
-    {
-      IAnimatedScrollInfo animatedScrollInfo = this.AnimatedScrollInfo;
-
-      double maxOffset;
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( ( !Double.IsInfinity( height ) ) && ( ( dataGridContext == null ) || ( TableView.GetAutoFillLastPage( dataGridContext ) ) ) )
-      {
-        maxOffset = Math.Max( animatedScrollInfo.ExtentHeight - height, 0 );
-      }
-      else
-      {
-        maxOffset = Math.Max( animatedScrollInfo.ExtentHeight - m_containerHeight, 0 );
-      }
-
-      double offset = Math.Max( m_verticalOffset, 0 );
-      offset = Math.Min( m_verticalOffset, maxOffset );
-
-      if( offset != m_verticalOffset )
-      {
-        this.SetVerticalOffsetCore( offset );
-        this.AnimatedScrollInfo.TargetVerticalOffset = offset;
-      }
-    }
-
-    private void ScrollByHorizontalOffset( double offset )
-    {
-      this.ScrollByHorizontalOffset( offset, true );
-    }
-
-    private void ScrollByHorizontalOffset( double offset, bool animate )
-    {
-      this.ScrollToHorizontalOffset( this.AnimatedScrollInfo.TargetHorizontalOffset + offset, animate );
-    }
-
-    private void ScrollToHorizontalOffset( double offset )
-    {
-      this.ScrollToHorizontalOffset( offset, true );
-    }
-
-    private void ScrollToHorizontalOffset( double offset, bool animate )
-    {
-      this.ScrollToHorizontalOffset( offset, animate, null );
-    }
-
-    private void ScrollToHorizontalOffset( double offset, bool animate, ScrollDirection? scrollingDirection )
-    {
-      IAnimatedScrollInfo animatedScrollInfo = this.AnimatedScrollInfo;
-
-      double maxOffset = Math.Max( animatedScrollInfo.ExtentWidth - animatedScrollInfo.ViewportWidth, 0 );
-      offset = Math.Max( offset, 0 );
-      offset = Math.Min( offset, maxOffset );
-
-      if( animatedScrollInfo.TargetHorizontalOffset == offset )
-        return;
-
-      double scrollChange = ( offset - animatedScrollInfo.TargetHorizontalOffset );
-
-      if( scrollingDirection.HasValue )
-      {
-        animatedScrollInfo.HorizontalScrollingDirection = scrollingDirection.Value;
-      }
-      else if( scrollChange > 0 )
-      {
-        animatedScrollInfo.HorizontalScrollingDirection = ScrollDirection.Forward;
-      }
-      else if( scrollChange == 0 )
-      {
-        animatedScrollInfo.HorizontalScrollingDirection = ScrollDirection.None;
-      }
-      else
-      {
-        animatedScrollInfo.HorizontalScrollingDirection = ScrollDirection.Backward;
-      }
-
-      animatedScrollInfo.OriginalHorizontalOffset = animatedScrollInfo.HorizontalOffset;
-      animatedScrollInfo.TargetHorizontalOffset = offset;
-
-      bool animationStarted = false;
-
-      if( animate )
-      {
-        // The animated offset will take care of generating the 
-        // page and invalidating the ScrollInfo.
-        animationStarted = this.StartHorizontalOffsetAnimation();
-      }
-
-      if( !animationStarted )
-      {
-        if( this.CachedRootDataGridContext != null )
-        {
-          this.StopHorizontalOffsetAnimation();
-          this.SetHorizontalOffsetCore( offset );
-          // No need to regenerate the page since only the horizontal offset have changed.
-          // We must, on the other hand, relayout the containers to reflect the new offsets.
-          this.LayoutContainers();
-          this.InvalidateScrollInfo();
-        }
-
-        animatedScrollInfo.HorizontalScrollingDirection = ScrollDirection.None;
-      }
-    }
-
-    private void SetHorizontalOffsetCore( double offset )
-    {
-      if( m_horizontalOffset == offset )
-        return;
-
-      m_horizontalOffset = offset;
-    }
-
-    private void ScrollByVerticalOffset( double offset )
-    {
-      this.ScrollByVerticalOffset( offset, true );
-    }
-
-    private void ScrollByVerticalOffset( double offset, bool animate )
-    {
-      this.ScrollToVerticalOffset( this.AnimatedScrollInfo.TargetVerticalOffset + offset, animate );
-    }
-
-    private void ScrollToVerticalOffset( double offset )
-    {
-      this.ScrollToVerticalOffset( offset, true );
-    }
-
-    private void ScrollToVerticalOffset( double offset, bool animate )
-    {
-      this.ScrollToVerticalOffset( offset, animate, null );
-    }
-
-    private void ScrollToVerticalOffset( double offset, bool animate, ScrollDirection? scrollingDirection )
-    {
-      IAnimatedScrollInfo animatedScrollInfo = this.AnimatedScrollInfo;
-
-      double maxOffset;
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( ( dataGridContext == null ) || ( TableView.GetAutoFillLastPage( dataGridContext ) ) )
-      {
-        maxOffset = Math.Max( animatedScrollInfo.ExtentHeight - animatedScrollInfo.ViewportHeight, 0 );
-      }
-      else
-      {
-        maxOffset = Math.Max( animatedScrollInfo.ExtentHeight - m_containerHeight, 0 );
-      }
-
-      offset = Math.Max( offset, 0 );
-      offset = Math.Min( offset, maxOffset );
-
-      if( animatedScrollInfo.TargetVerticalOffset == offset )
-        return;
-
-      double scrollChange = ( offset - animatedScrollInfo.TargetVerticalOffset );
-
-      if( scrollingDirection.HasValue )
-      {
-        animatedScrollInfo.VerticalScrollingDirection = scrollingDirection.Value;
-      }
-      else if( scrollChange > 0 )
-      {
-        animatedScrollInfo.VerticalScrollingDirection = ScrollDirection.Forward;
-      }
-      else if( scrollChange == 0 )
-      {
-        animatedScrollInfo.VerticalScrollingDirection = ScrollDirection.None;
-      }
-      else
-      {
-        animatedScrollInfo.VerticalScrollingDirection = ScrollDirection.Backward;
-      }
-
-      animatedScrollInfo.OriginalVerticalOffset = animatedScrollInfo.VerticalOffset;
-      animatedScrollInfo.TargetVerticalOffset = offset;
-
-      bool animationStarted = false;
-
-      if( animate )
-      {
-        // The animated offset will take care of generating the 
-        // page and invalidating the ScrollInfo.
-        animationStarted = this.StartVerticalOffsetAnimation();
-      }
-
-      if( !animationStarted )
-      {
-        if( this.CachedRootDataGridContext != null )
-        {
-          this.StopVerticalOffsetAnimation( false );
-          this.SetVerticalOffsetCore( offset );
-          this.InvalidateLayoutFromScrollingHelper();
-        }
-
-        animatedScrollInfo.VerticalScrollingDirection = ScrollDirection.None;
-        animatedScrollInfo.HorizontalScrollingDirection = ScrollDirection.None;
-      }
-    }
-
-    private void SetVerticalOffsetCore( double offset )
-    {
-      if( m_verticalOffset == offset )
-        return;
-
-      m_verticalOffset = offset;
-    }
-
-    private bool SetCurrent( int index, bool changeColumn )
-    {
-      bool isDataRow;
-      return this.SetCurrent( index, changeColumn, out isDataRow );
-    }
-
-    private bool SetCurrent( int index, bool changeColumn, out bool isDataRow )
-    {
-      var generator = this.CustomItemContainerGenerator;
-      var position = generator.GeneratorPositionFromIndex( index );
-      var container = default( UIElement );
-
-      using( generator.StartAt( position, GeneratorDirection.Forward, true ) )
-      {
-        container = this.GenerateContainer( generator, index, false, false );
-      }
-
-      isDataRow = false;
-
-      if( container != null )
-      {
-        isDataRow = ( container is DataRow );
-
-        if( ( m_layoutedContainers.IndexOfContainer( container ) < 0 )
-          && ( m_stickyHeaders.IndexOfContainer( container ) < 0 )
-          && ( m_stickyFooters.IndexOfContainer( container ) < 0 ) )
-        {
-          // If the container was not already layouted, force
-          // a layout of the current page so that the new container
-          // is drawn at the right offset.
-          m_layoutedContainers.Add( new LayoutedContainerInfo( index, container ) );
-          this.LayoutContainers();
-        }
-
-        var dataGridContext = DataGridControl.GetDataGridContext( container );
-        var currentContext = dataGridContext.DataGridControl.CurrentContext;
-        var column = default( ColumnBase );
-
-        if( changeColumn )
-        {
-          column = dataGridContext.CurrentColumn;
-
-          if( isDataRow )
-          {
-            if( ( currentContext != dataGridContext ) && dataGridContext.AreDetailsFlatten )
-            {
-              column = dataGridContext.GetMatchingColumn( currentContext, currentContext.CurrentColumn ) ?? column;
-            }
-
-            if( ( column == null ) || ( !column.CanBeCurrentWhenReadOnly && column.ReadOnly ) )
-            {
-              var focusableIndex = NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext );
-              if( focusableIndex >= 0 )
-              {
-                column = dataGridContext.VisibleColumns[ focusableIndex ];
-              }
-            }
-          }
-        }
-
-        try
-        {
-          if( currentContext != null )
-          {
-            currentContext.EndEdit();
-          }
-        }
-        catch( DataGridException )
-        {
-          return false;
-        }
-
-        var containerIndex = generator.GetRealizedIndexForContainer( container );
-        if( containerIndex >= 0 )
-        {
-          if( dataGridContext.DataGridControl.SetFocusHelper( container, column, true, true ) )
-          {
-            generator.SetCurrentIndex( containerIndex );
-            return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
-    #endregion
-
-    #region BringIntoView Methods
-
-    private void OnRequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-    {
-      TableViewItemsHost.ProcessRequestBringIntoView( this,
-        Orientation.Vertical,
-        0.5, // Default StableScrollingProportion
-        e );
-    }
-
-    private bool FocusContainerOrPreviousFocusable( UIElement focusedContainer, bool changeColumn )
-    {
-      PageIndexes layoutedIndexes;
-      this.CalculateLayoutedIndexes( m_verticalOffset, this.AnimatedScrollInfo.ViewportHeight, out layoutedIndexes );
-
-      int firstIndex = 0;
-      int focusedIndex = this.CustomItemContainerGenerator.GetRealizedIndexForContainer( focusedContainer );
-      int desiredIndex = focusedIndex - 1;
-
-      System.Diagnostics.Debug.Assert( focusedIndex > -1, "How come the realized index is -1?!?" );
-
-      bool currentChanged = false;
-
-      if( desiredIndex != focusedIndex )
-      {
-        DataGridControl dataGridControl = this.ParentDataGridControl;
-        int cannotFocusCount = 0;
-
-        // We want to find the first element that can receive focus upward.
-        while( ( desiredIndex >= 0 ) && ( !currentChanged ) )
-        {
-          bool isDataRow;
-          currentChanged = this.SetCurrent( desiredIndex, changeColumn, out isDataRow );
-
-          if( !currentChanged )
-          {
-            if( dataGridControl.HasValidationError )
-              return false;
-
-            if( isDataRow )
-            {
-              cannotFocusCount++;
-
-              if( cannotFocusCount > TableflowViewItemsHost.MaxDataRowFailFocusCount )
-                return false;
-            }
-          }
-
-          // We succeded in changing the current.
-          if( currentChanged )
-            break;
-
-          // We already are at the first index and still not focused on a new container.
-          if( desiredIndex == firstIndex )
-          {
-            //Let's keep the focus on the last focused container.
-            currentChanged = this.SetCurrent( focusedIndex, changeColumn, out isDataRow );
-            break;
-          }
-
-          desiredIndex--;
-        }
-
-        // We will use MoveFocus if the focused index is currently in view.
-        if( ( !currentChanged ) && ( focusedIndex >= layoutedIndexes.StartIndex ) && ( focusedIndex <= layoutedIndexes.EndIndex ) )
-        {
-          currentChanged = this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Up ) );
-        }
-      }
-
-      return currentChanged;
-    }
-
-    private bool FocusIndexOrPreviousFocusable( int desiredIndex, int minimumIndex, bool changeColumn )
-    {
-      bool currentChanged = false;
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      int cannotFocusCount = 0;
-
-      // We want to find the first element that can receive focus upward.
-      while( ( desiredIndex >= 0 ) && ( !currentChanged ) )
-      {
-        bool isDataRow;
-        currentChanged = this.SetCurrent( desiredIndex, changeColumn, out isDataRow );
-
-        if( !currentChanged )
-        {
-          if( dataGridControl.HasValidationError )
-            return false;
-
-          if( isDataRow )
-          {
-            cannotFocusCount++;
-
-            if( cannotFocusCount > TableflowViewItemsHost.MaxDataRowFailFocusCount )
-              return false;
-          }
-        }
-
-        // We succeded in changing the current or we're already at the first index? Then nothing we can do.
-        if( ( currentChanged ) || ( desiredIndex == minimumIndex ) )
-          break;
-
-        desiredIndex--;
-      }
-
-      return currentChanged;
-    }
-
-    private bool FocusContainerOrNextFocusable( UIElement focusedContainer, bool changeColumn )
-    {
-      PageIndexes layoutedIndexes;
-      this.CalculateLayoutedIndexes( m_verticalOffset, this.AnimatedScrollInfo.ViewportHeight, out layoutedIndexes );
-
-      int lastIndex = this.CustomItemContainerGenerator.ItemCount - 1;
-      int focusedIndex = this.CustomItemContainerGenerator.GetRealizedIndexForContainer( focusedContainer );
-      int desiredIndex = focusedIndex + 1;
-
-      System.Diagnostics.Debug.Assert( focusedIndex > -1, "How come the realized index is -1?!?" );
-
-      bool currentChanged = false;
-
-      if( desiredIndex != focusedIndex )
-      {
-        DataGridControl dataGridControl = this.ParentDataGridControl;
-        int cannotFocusCount = 0;
-
-        // We want to find the first element that can receive focus downward.
-        while( ( desiredIndex <= lastIndex ) && ( !currentChanged ) )
-        {
-          bool isDataRow;
-          currentChanged = this.SetCurrent( desiredIndex, changeColumn, out isDataRow );
-
-          if( !currentChanged )
-          {
-            if( dataGridControl.HasValidationError )
-              return false;
-
-            if( isDataRow )
-            {
-              cannotFocusCount++;
-
-              if( cannotFocusCount > TableflowViewItemsHost.MaxDataRowFailFocusCount )
-                return false;
-            }
-          }
-
-          // We succeded in changing the current.
-          if( currentChanged )
-            break;
-
-          // We already are at the last index and still not focused on a new container.
-          if( desiredIndex == lastIndex )
-          {
-            //Let's keep the focus on the last focused container.
-            currentChanged = this.SetCurrent( focusedIndex, changeColumn, out isDataRow );
-          }
-
-          desiredIndex++;
-        }
-
-        // We will use MoveFocus if the focused index is currently in view.
-        if( ( !currentChanged ) && ( focusedIndex >= layoutedIndexes.StartIndex ) && ( focusedIndex <= layoutedIndexes.EndIndex ) )
-        {
-          currentChanged = this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Down ) );
-        }
-      }
-
-      return currentChanged;
-    }
-
-    private bool FocusIndexOrNextFocusable( int desiredIndex, int maximumIndex, bool changeColumn )
-    {
-      bool currentChanged = false;
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      int cannotFocusCount = 0;
-
-      // We want to find the first element that can receive focus downward.
-      while( ( desiredIndex <= maximumIndex ) && ( !currentChanged ) )
-      {
-        bool isDataRow;
-        currentChanged = this.SetCurrent( desiredIndex, changeColumn, out isDataRow );
-
-        if( !currentChanged )
-        {
-          if( dataGridControl.HasValidationError )
-            return false;
-
-          if( isDataRow )
-          {
-            cannotFocusCount++;
-
-            if( cannotFocusCount > TableflowViewItemsHost.MaxDataRowFailFocusCount )
-              return false;
-          }
-        }
-
-        // We succeded in changing the current or we're already at the first index? Then nothing we can do.
-        if( ( currentChanged ) || ( desiredIndex == maximumIndex ) )
-          break;
-
-        desiredIndex++;
-      }
-
-      return currentChanged;
-    }
-
-    #endregion
-
-    #region DataGridItemsHost Overrides
-
-    protected override IList<UIElement> CreateChildCollection()
-    {
-      return new TableflowViewUIElementCollection( this );
-    }
-
-    protected override void OnItemsAdded()
-    {
-      this.PreventOpacityAnimation = true;
-
-      // We are calling InvalidateMeasure to regenerate the current 
-      // page and forcing the recycling of out-of-view containers.
-      this.InvalidateMeasure();
-    }
-
-    protected override void OnItemsRemoved( IList<DependencyObject> containers )
-    {
-      this.PreventOpacityAnimation = true;
-
-      // We are calling InvalidateMeasure to regenerate the current 
-      // page and forcing the recycling of out-of-view containers.
-      this.InvalidateMeasure();
-    }
-
-    protected override void OnItemsReset()
-    {
-      // Everything will be recalculated and redrawn in the measure pass.
-      this.InvalidateMeasure();
-    }
-
-    protected override void OnContainersRemoved( IList<DependencyObject> removedContainers )
-    {
-      foreach( UIElement element in removedContainers )
-      {
-        this.RecycleContainer( element );
-
-        // Avoid checking if Children already contains
-        // the element. No exception will be thrown
-        // if the item is not found. This ensure to
-        // at parse all the children only 1 time as
-        // worst scenario
-        this.Children.Remove( element );
-
-
-        int index = m_layoutedContainers.IndexOfContainer( element );
-        if( index > -1 )
-        {
-          m_layoutedContainers.RemoveAt( index );
-        }
-
-        index = m_stickyHeaders.IndexOfContainer( element );
-        if( index > -1 )
-        {
-          m_stickyHeaders.RemoveAt( index );
-        }
-
-        index = m_stickyFooters.IndexOfContainer( element );
-        if( index > -1 )
-        {
-          m_stickyFooters.RemoveAt( index );
-        }
-      }
-    }
-
-    protected override void OnParentDataGridControlChanged( DataGridControl oldValue, DataGridControl newValue )
-    {
-      // Ensure to stop any animation since this ItemsHost
-      // is no more hosted in a DataGridControl
-      if( newValue == null )
-      {
-        // Stop the AnimationClock for each offset property
-        this.StopVerticalOffsetAnimation();
-        this.StopHorizontalOffsetAnimation();
-
-        // Ensure to clear any animation on offset property directly
-        this.ApplyAnimationClock( TableflowViewItemsHost.AnimatedVerticalOffsetProperty, null, HandoffBehavior.SnapshotAndReplace );
-        this.ApplyAnimationClock( TableflowViewItemsHost.AnimatedHorizontalOffsetProperty, null, HandoffBehavior.SnapshotAndReplace );
-      }
-
-      base.OnParentDataGridControlChanged( oldValue, newValue );
-    }
-
-    protected override void OnRecyclingCandidatesCleaned( IList<DependencyObject> recyclingCandidates )
-    {
-      foreach( UIElement candidate in recyclingCandidates )
-      {
-        this.ClearContainer( candidate );
-      }
-    }
-
-    #endregion
-
-    #region PreviewKeyDown and KeyDown Handling
-
-    protected override void HandleTabKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      var dataGridContext = dataGridControl.CurrentContext;
-      if( dataGridContext == null )
-        return;
-
-      e.Handled = NavigationHelper.HandleTabKey( dataGridControl, dataGridContext, e.OriginalSource as FrameworkElement, e.KeyboardDevice );
-    }
-
-    protected override void HandleLeftKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusLeft( dataGridControl.CurrentContext );
-    }
-
-    protected override void HandleRightKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusRight( dataGridControl.CurrentContext );
-    }
-
-    protected override void HandleUpKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = this.MoveFocusUp();
-    }
-
-    protected override void HandleDownKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = this.MoveFocusDown();
-    }
-
-    protected override void HandlePageUpKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = true;
-
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-      bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        this.MoveToFirstOverallUIElement( changeCurrentColumn );
-        return;
-      }
-
-      UIElement focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( this, Keyboard.FocusedElement as DependencyObject );
-
-      if( ( focusedContainer == null ) || ( navigationBehavior == NavigationBehavior.None ) )
-      {
-        // We just need to scroll one page up.
-        this.AnimatedScrollInfo.ScrollOwner.PageUp();
-        return;
-      }
-
-      int focusedContainerRealizedIndex = this.CustomItemContainerGenerator.GetRealizedIndexForContainer( focusedContainer );
-      int desiredPageUpIndex = Math.Max( 0, focusedContainerRealizedIndex - m_pageVisibleContainerCount + 1 );
-      int initialDesiredIndex = desiredPageUpIndex;
-
-      if( focusedContainerRealizedIndex == 0 )
-      {
-        this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Up ) );
-      }
-      else if( focusedContainerRealizedIndex != initialDesiredIndex )
-      {
-        PageIndexes pageIndexes = this.CalculateVisibleIndexesForDesiredLastVisibleIndex( focusedContainerRealizedIndex );
-        desiredPageUpIndex = Math.Max( 0, pageIndexes.StartIndex );
-        initialDesiredIndex = desiredPageUpIndex;
-        bool isDataRow = false;
-
-        // SetCurrent on the desired index or down until BEFORE the focused container.
-        while( ( !dataGridControl.HasValidationError ) && ( !isDataRow ) && ( desiredPageUpIndex < focusedContainerRealizedIndex ) )
-        {
-          if( this.SetCurrent( desiredPageUpIndex, changeCurrentColumn, out isDataRow ) )
-            return;
-
-          desiredPageUpIndex++;
-        }
-
-        if( ( dataGridControl.HasValidationError ) || ( isDataRow ) )
-          return;
-
-        // No container were focused while processing indexes from focused to initialDesiredIndex, try SetCurrent on indexes lower than the initial up to 0
-        desiredPageUpIndex = initialDesiredIndex - 1;
-        isDataRow = false;
-
-        while( ( !dataGridControl.HasValidationError ) && ( !isDataRow ) && ( desiredPageUpIndex > 0 ) )
-        {
-          if( this.SetCurrent( desiredPageUpIndex, changeCurrentColumn, out isDataRow ) )
-            return;
-
-          desiredPageUpIndex--;
-        }
-
-        // If not container was successfuly focused, set focus back to the current UIElement.
-        this.SetCurrent( focusedContainerRealizedIndex, changeCurrentColumn, out isDataRow );
-      }
-    }
-
-    protected override void HandlePageDownKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = true;
-
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-      bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        this.MoveToLastOverallUIElement( changeCurrentColumn );
-        return;
-      }
-
-      UIElement focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( this, Keyboard.FocusedElement as DependencyObject );
-
-      // No focused container or no navigation allowed
-      if( ( focusedContainer == null ) || ( navigationBehavior == NavigationBehavior.None ) )
-      {
-        // We just need to scroll one page down.
-        this.AnimatedScrollInfo.ScrollOwner.PageDown();
-        return;
-      }
-
-      int generatorItemCount = this.CustomItemContainerGenerator.ItemCount;
-      int focusedContainerRealizedIndex = this.CustomItemContainerGenerator.GetRealizedIndexForContainer( focusedContainer );
-      int maxIndex = generatorItemCount - 1;
-      int desiredPageDownIndex = Math.Min( generatorItemCount - 1, focusedContainerRealizedIndex + m_pageVisibleContainerCount - 1 );
-      int initialDesiredIndex = desiredPageDownIndex;
-
-      if( focusedContainerRealizedIndex == maxIndex )
-      {
-        this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Down ) );
-      }
-      else if( focusedContainerRealizedIndex != initialDesiredIndex )
-      {
-        PageIndexes pageIndexes = this.CalculateVisibleIndexesForDesiredFirstVisibleIndex( focusedContainerRealizedIndex );
-        desiredPageDownIndex = Math.Min( maxIndex, pageIndexes.EndIndex );
-
-        initialDesiredIndex = desiredPageDownIndex;
-
-        bool isDataRow = false;
-
-        // SetCurrent on the desired index or up until BEFORE the focused container.
-        while( ( !dataGridControl.HasValidationError ) && ( !isDataRow ) && ( desiredPageDownIndex > focusedContainerRealizedIndex ) )
-        {
-          if( this.SetCurrent( desiredPageDownIndex, changeCurrentColumn, out isDataRow ) )
-            return;
-
-          desiredPageDownIndex--;
-        }
-
-        if( ( dataGridControl.HasValidationError ) || ( isDataRow ) )
-          return;
-
-        desiredPageDownIndex = initialDesiredIndex + 1;
-        isDataRow = false;
-
-        // No container were focused while processing indexes from focused to initialDesiredIndex, try SetCurrent on indexes higher than the initial down to maxIndex
-        while( ( !dataGridControl.HasValidationError ) && ( !isDataRow ) && ( desiredPageDownIndex <= maxIndex ) )
-        {
-          if( this.SetCurrent( desiredPageDownIndex, changeCurrentColumn, out isDataRow ) )
-            return;
-
-          desiredPageDownIndex++;
-        }
-
-        // If not container was successfuly focused, set focus back to the current UIElement.
-        this.SetCurrent( focusedContainerRealizedIndex, changeCurrentColumn, out isDataRow );
-      }
-    }
-
-    protected override void HandleHomeKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        DataGridControl dataGridControl = this.ParentDataGridControl;
-        IAnimatedScrollInfo scrollInfo = this.AnimatedScrollInfo;
-        NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-        bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-        if( navigationBehavior != NavigationBehavior.None )
-        {
-          this.MoveToFirstOverallUIElement( changeCurrentColumn );
-
-          if( navigationBehavior == NavigationBehavior.CellOnly )
-          {
-            this.MoveToFirstVisibleColumn();
-          }
-        }
-        else
-        {
-          scrollInfo.ScrollOwner.ScrollToTop();
-        }
-
-        // In all cases, we must scroll to the left end of the panel.
-        scrollInfo.ScrollOwner.ScrollToLeftEnd();
-      }
-      else
-      {
-        // This should be handled by a parent.
-        return;
-      }
-
-      e.Handled = true;
-    }
-
-    protected override void HandleEndKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        DataGridControl dataGridControl = this.ParentDataGridControl;
-        IAnimatedScrollInfo scrollInfo = this.AnimatedScrollInfo;
-        NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-        bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-        if( navigationBehavior != NavigationBehavior.None )
-        {
-          this.MoveToLastOverallUIElement( changeCurrentColumn );
-
-          if( navigationBehavior == NavigationBehavior.CellOnly )
-          {
-            this.MoveToLastVisibleColumn();
-          }
-        }
-        else
-        {
-          scrollInfo.ScrollOwner.ScrollToBottom();
-        }
-
-        // In all cases, we must scroll to the right end of the panel.
-        scrollInfo.ScrollOwner.ScrollToRightEnd();
-      }
-      else
-      {
-        // This should be handled by a parent.
-        return;
-      }
-
-      e.Handled = true;
-    }
-
-    private void MoveToFirstOverallUIElement( bool changeCurrentColumn )
-    {
-      // Simply scroll to top.
-      this.AnimatedScrollInfo.ScrollOwner.ScrollToTop();
-
-      //Try to focus on first UIElement.
-      if( !this.SetCurrent( 0, changeCurrentColumn ) )
-      {
-        //If not focusable, find the next one downward.
-        CustomItemContainerGenerator generator = this.CustomItemContainerGenerator as CustomItemContainerGenerator;
-        this.FocusIndexOrNextFocusable( 1, generator.RealizedContainers.Count - 1, changeCurrentColumn );
-      }
-    }
-
-    private void MoveToLastOverallUIElement( bool changeCurrentColumn )
-    {
-      // Simply scroll to end
-      this.AnimatedScrollInfo.ScrollOwner.ScrollToBottom();
-
-      CustomItemContainerGenerator generator = this.CustomItemContainerGenerator as CustomItemContainerGenerator;
-      int lastItemIndex = generator.ItemCount - 1;
-
-      //Try to focus on last UIElement.
-      if( !this.SetCurrent( lastItemIndex, changeCurrentColumn ) )
-      {
-        //If not focusable, find the next one upward.
-        int minimumIndex = lastItemIndex - generator.RealizedContainers.Count;
-        this.FocusIndexOrPreviousFocusable( lastItemIndex, minimumIndex, changeCurrentColumn );
-      }
-    }
-
-    private void MoveToFirstVisibleColumn()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-
-      if( dataGridControl == null )
-        return;
-
-      DataGridContext currentDataGridContext = dataGridControl.CurrentContext;
-      ReadOnlyColumnCollection visibleColumnsCollection = ( ReadOnlyColumnCollection )currentDataGridContext.VisibleColumns;
-
-      int visibleColumnsCollectionCount = visibleColumnsCollection.Count;
-
-      // The previous SetCurrent will only select the first row. The CurrentColumn
-      // is left unchanged. We must set the current column to the first one.
-
-      if( ( currentDataGridContext != null ) && ( visibleColumnsCollectionCount > 0 ) )
-      {
-        int firstVisibleFocusableColumnIndex;
-        bool focusableColumnFound = false;
-
-        Row currentRow = currentDataGridContext.CurrentRow;
-
-        if( currentRow != null )
-        {
-          for( firstVisibleFocusableColumnIndex = 0; firstVisibleFocusableColumnIndex < visibleColumnsCollectionCount; firstVisibleFocusableColumnIndex++ )
-          {
-            if( currentRow.Cells[ visibleColumnsCollection[ firstVisibleFocusableColumnIndex ] ].GetCalculatedCanBeCurrent() )
-            {
-              focusableColumnFound = true;
-              break;
-            }
-          }
-
-          if( focusableColumnFound )
-          {
-            try
-            {
-              currentDataGridContext.SetCurrentColumnAndChangeSelection(
-                currentDataGridContext.VisibleColumns[ firstVisibleFocusableColumnIndex ] );
-            }
-            catch( DataGridException )
-            {
-              // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-              // any other GridException.
-            }
-          }
-        }
-      }
-    }
-
-    private void MoveToLastVisibleColumn()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-
-      if( dataGridControl == null )
-        return;
-
-      DataGridContext currentDataGridContext = dataGridControl.CurrentContext;
-      ReadOnlyColumnCollection visibleColumnsCollection = ( ReadOnlyColumnCollection )currentDataGridContext.VisibleColumns;
-
-      int visibleColumnsCollectionCount = visibleColumnsCollection.Count;
-
-      // The previous SetCurrent will only select the first row. The CurrentColumn
-      // is left unchanged. We must set the current column to the last one.
-
-      if( ( visibleColumnsCollection != null ) && ( visibleColumnsCollectionCount > 0 ) )
-      {
-        bool focusableColumnFound = false;
-        int lastVisibleFocusableColumnIndex;
-
-        Row currentRow = currentDataGridContext.CurrentRow;
-
-        if( currentRow != null )
-        {
-          for( lastVisibleFocusableColumnIndex = visibleColumnsCollectionCount - 1; lastVisibleFocusableColumnIndex >= 0; lastVisibleFocusableColumnIndex-- )
-          {
-            if( currentRow.Cells[ visibleColumnsCollection[ lastVisibleFocusableColumnIndex ] ].GetCalculatedCanBeCurrent() )
-            {
-              focusableColumnFound = true;
-              break;
-            }
-          }
-
-          if( focusableColumnFound )
-          {
-            try
-            {
-              currentDataGridContext.SetCurrentColumnAndChangeSelection(
-                currentDataGridContext.VisibleColumns[ lastVisibleFocusableColumnIndex ] );
-            }
-            catch( DataGridException )
-            {
-              // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-              // any other GridException.
-            }
-          }
-        }
-      }
-    }
-
-    private void ResetHorizontalOffset()
-    {
-      ScrollViewer parentScrollViewer = this.m_scrollOwner;
-
-      if( parentScrollViewer != null )
-        parentScrollViewer.ScrollToHorizontalOffset( 0d );
-    }
-
-    #endregion
-
-    #region IAnimatedScrollInfo Members
-
-    ScrollDirection IAnimatedScrollInfo.HorizontalScrollingDirection
-    {
-      get;
-      set;
-    }
-
-    double IAnimatedScrollInfo.OriginalHorizontalOffset
-    {
-      get;
-      set;
-    }
-
-    double IAnimatedScrollInfo.TargetHorizontalOffset
-    {
-      get;
-      set;
-    }
-
-    ScrollDirection IAnimatedScrollInfo.VerticalScrollingDirection
-    {
-      get;
-      set;
-    }
-
-    double IAnimatedScrollInfo.OriginalVerticalOffset
-    {
-      get;
-      set;
-    }
-
-    double IAnimatedScrollInfo.TargetVerticalOffset
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region ICustomVirtualizingPanel Members
-
-    protected override void BringIntoViewCore( int index )
-    {
-      m_delayedBringIntoViewIndex = index;
-      this.InvalidateMeasure();
-    }
-
-    private void DelayedBringIntoView()
-    {
-      if( m_delayedBringIntoViewIndex == -1 )
-        return;
-
-      double itemOffset = ( m_delayedBringIntoViewIndex * m_containerHeight );
-
-      bool areHeadersSticky = this.AreHeadersStickyCache || this.AreParentRowsStickyCache || this.AreGroupHeadersStickyCache;
-      int stickyHeadersCount = ( areHeadersSticky ) ? this.GetStickyHeaderCountForIndex( m_delayedBringIntoViewIndex ) : 0;
-
-      double stickyHeadersHeight = stickyHeadersCount * m_containerHeight;
-      double topThreshold = m_verticalOffset + stickyHeadersHeight;
-
-      if( itemOffset < topThreshold )
-      {
-        this.ScrollToVerticalOffset( itemOffset - stickyHeadersHeight );
-        return;
-      }
-
-      bool areFootersSticky = this.AreFootersStickyCache || this.AreGroupFootersStickyCache;
-      int stickyFootersCount = ( areFootersSticky ) ? this.GetStickyFooterCountForIndex( m_delayedBringIntoViewIndex ) : 0;
-
-      double stickyFootersHeight = stickyFootersCount * m_containerHeight;
-      double bottomThreshold = ( m_verticalOffset + m_viewportHeight ) - stickyHeadersHeight - stickyFootersHeight;
-
-      if( itemOffset + m_containerHeight > bottomThreshold )
-      {
-        this.ScrollToVerticalOffset( itemOffset - ( m_viewportHeight - stickyFootersHeight - m_containerHeight ) );
-      }
-
-    }
-
-    #endregion
-
-    #region IScrollInfo Members
-
-    bool IScrollInfo.CanHorizontallyScroll
-    {
-      get;
-      set;
-    }
-
-    bool IScrollInfo.CanVerticallyScroll
-    {
-      get;
-      set;
-    }
-
-    double IScrollInfo.ExtentHeight
-    {
-      get
-      {
-        return ( this.CachedRootDataGridContext != null ) ? ( this.CustomItemContainerGenerator.ItemCount * m_containerHeight ) : 0;
-      }
-    }
-
-    private double m_extentWidth;
-    double IScrollInfo.ExtentWidth
-    {
-      get
-      {
-        return m_extentWidth;
-      }
-    }
-
-    private double m_horizontalOffset;
-    double IScrollInfo.HorizontalOffset
-    {
-      get
-      {
-        return m_horizontalOffset;
-      }
-    }
-
-    void IScrollInfo.SetHorizontalOffset( double offset )
-    {
-      if( offset == m_horizontalOffset )
-        return;
-
-      DataGridScrollViewer scrollViewer = this.AnimatedScrollInfo.ScrollOwner as DataGridScrollViewer;
-
-      // The ScrollToHorizontalOffset method is called by the scroll viewer when the thumb is dragged and when
-      // the user right-click and choose "Scroll to here", "Scroll to bottom" or "Scroll to top".
-      // When this method is called, we only want to animate if the called wasn't made by dragging the thumb.
-      // We also validate if our parent ScrollViewer is a DataGridScrollViewer because for now, we cannot
-      // have a reference to the Thumb to see is the mouse is captured.
-      bool animate =
-        ( ( scrollViewer != null )
-        && ( scrollViewer.HorizontalScrollBar != null )
-        && ( scrollViewer.HorizontalScrollBar.Track != null )
-        && ( scrollViewer.HorizontalScrollBar.Track.Thumb != null )
-        && ( !scrollViewer.HorizontalScrollBar.Track.Thumb.IsMouseCaptureWithin ) );
-
-      this.ScrollToHorizontalOffset( offset, animate );
-    }
-
-    private ScrollViewer m_scrollOwner;
-    ScrollViewer IScrollInfo.ScrollOwner
-    {
-      get
-      {
-        return m_scrollOwner;
-      }
-      set
-      {
-
-
-
-        m_scrollOwner = value;
-
-
-      }
-    }
-
-    private double m_verticalOffset;
-    double IScrollInfo.VerticalOffset
-    {
-      get
-      {
-        return m_verticalOffset;
-      }
-    }
-
-    void IScrollInfo.SetVerticalOffset( double offset )
-    {
-      if( offset == m_verticalOffset )
-        return;
-
-      DataGridScrollViewer scrollViewer = this.AnimatedScrollInfo.ScrollOwner as DataGridScrollViewer;
-
-      // The SetVerticalOffset method is called by the scroll viewer when the thumb is dragged and when
-      // the user right-click and choose "Scroll to here", "Scroll to bottom" or "Scroll to top".
-      // When this method is called, we only want to animate if the called wasn't made by dragging the thumb.
-      // We also validate if our parent ScrollViewer is a DataGridScrollViewer because for now, we cannot
-      // have a reference to the Thumb to see is the mouse is captured.
-      bool animate =
-        ( ( scrollViewer != null )
-        && ( scrollViewer.VerticalScrollBar != null )
-        && ( scrollViewer.VerticalScrollBar.Track != null )
-        && ( scrollViewer.VerticalScrollBar.Track.Thumb != null )
-        && ( !scrollViewer.VerticalScrollBar.Track.Thumb.IsMouseCaptureWithin ) );
-
-      this.ScrollToVerticalOffset( offset, animate );
-    }
-
-    private double m_viewportHeight;
-    double IScrollInfo.ViewportHeight
-    {
-      get
-      {
-        return m_viewportHeight;
-      }
-    }
-
-    private double m_viewportWidth;
-    double IScrollInfo.ViewportWidth
-    {
-      get
-      {
-        return m_viewportWidth;
-      }
-    }
-
-    void IScrollInfo.LineDown()
-    {
-      this.ScrollByVerticalOffset( m_containerHeight );
-    }
-
-    void IScrollInfo.LineLeft()
-    {
-      this.ScrollByHorizontalOffset( ScrollViewerHelper.PixelScrollingCount * -1 );
-    }
-
-    void IScrollInfo.LineRight()
-    {
-      this.ScrollByHorizontalOffset( ScrollViewerHelper.PixelScrollingCount );
-    }
-
-    void IScrollInfo.LineUp()
-    {
-      this.ScrollByVerticalOffset( m_containerHeight * -1 );
-    }
-
-    void IScrollInfo.MouseWheelDown()
-    {
-      this.ScrollByVerticalOffset( SystemParameters.WheelScrollLines * m_containerHeight );
-    }
-
-    void IScrollInfo.MouseWheelLeft()
-    {
-      this.ScrollByHorizontalOffset( SystemParameters.WheelScrollLines * ScrollViewerHelper.PixelScrollingCount * -1 );
-    }
-
-    void IScrollInfo.MouseWheelRight()
-    {
-      this.ScrollByHorizontalOffset( SystemParameters.WheelScrollLines * ScrollViewerHelper.PixelScrollingCount );
-    }
-
-    void IScrollInfo.MouseWheelUp()
-    {
-      this.ScrollByVerticalOffset( SystemParameters.WheelScrollLines * m_containerHeight * -1 );
-    }
-
-    void IScrollInfo.PageDown()
-    {
-      this.ScrollByVerticalOffset( this.AnimatedScrollInfo.ViewportHeight );
-    }
-
-    void IScrollInfo.PageLeft()
-    {
-      this.ScrollByHorizontalOffset( this.AnimatedScrollInfo.ViewportWidth * -1 );
-    }
-
-    void IScrollInfo.PageRight()
-    {
-      this.ScrollByHorizontalOffset( this.AnimatedScrollInfo.ViewportWidth );
-    }
-
-    void IScrollInfo.PageUp()
-    {
-      this.ScrollByVerticalOffset( this.AnimatedScrollInfo.ViewportHeight * -1 );
-    }
-
-    Rect IScrollInfo.MakeVisible( Visual visual, Rect rectangle )
-    {
-      UIElement container = DataGridItemsHost.GetItemsHostContainerFromElement( this, visual );
-
-      if( container != null )
-      {
-        rectangle = visual.TransformToAncestor( container ).TransformBounds( rectangle );
-
-        // Make sure that the item is vertically visible.
-        ICustomItemContainerGenerator generator = this.CustomItemContainerGenerator;
-
-        if( generator != null )
-        {
-          int itemIndex = generator.GetRealizedIndexForContainer( container );
-
-          if( itemIndex != -1 )
-          {
-            // If the container is already layouted and no Clip applied, nothing to make visible
-            if( !m_layoutedContainers.ContainsRealizedIndex( itemIndex )
-                || ( container.Clip != null ) )
-            {
-              // This will make sure to scroll to the right offsets.
-              ICustomVirtualizingPanel virtualizingPanel = ( ICustomVirtualizingPanel )this;
-              virtualizingPanel.BringIntoView( itemIndex );
-            }
-          }
-        }
-      }
-
-      // Make sure that the item is horizontally visible.
-      IAnimatedScrollInfo animatedScrollInfo = this.AnimatedScrollInfo;
-
-      if( rectangle.Left < animatedScrollInfo.HorizontalOffset )
-      {
-        this.ScrollToHorizontalOffset( rectangle.Left );
-      }
-      else if( rectangle.Right > animatedScrollInfo.HorizontalOffset + animatedScrollInfo.ViewportWidth )
-      {
-        this.ScrollToHorizontalOffset(
-          Math.Min( rectangle.Left, ( rectangle.Right - animatedScrollInfo.ViewportWidth ) ) );
-      }
-
-      return rectangle;
-    }
-
-    #endregion
-
-    #region IDeferableScrollInfoRefresh Members
-
-    IDisposable IDeferableScrollInfoRefresh.DeferScrollInfoRefresh( Orientation orientation )
-    {
-      if( ( orientation == Orientation.Vertical ) && !this.IsDeferredLoadingEnabledCache )
-        return new LayoutSuspendedHelper( this );
-
-      return null;
-    }
-
-    #endregion
-
-    private static void MoveFocusForwardExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      var itemsHost = ( TableflowViewItemsHost )sender;
-      var dataGridControl = itemsHost.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusRight( dataGridControl.CurrentContext );
-    }
-
-    private static void MoveFocusForwardCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private static void MoveFocusBackExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      var itemsHost = ( TableflowViewItemsHost )sender;
-      var dataGridControl = itemsHost.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusLeft( dataGridControl.CurrentContext );
-    }
-
-    private static void MoveFocusBackCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private static void MoveFocusUpExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      e.Handled = ( ( TableflowViewItemsHost )sender ).MoveFocusUp();
-    }
-
-    private static void MoveFocusUpCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private static void MoveFocusDownExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      e.Handled = ( ( TableflowViewItemsHost )sender ).MoveFocusDown();
-    }
-
-    private static void MoveFocusDownCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private bool MoveFocusUp()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      UIElement focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( this, Keyboard.FocusedElement as DependencyObject );
-
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-      bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-      if( ( focusedContainer == null ) ||
-        ( navigationBehavior == NavigationBehavior.None ) )
-      {
-        // We just need to scroll one line up.
-        this.AnimatedScrollInfo.ScrollOwner.LineUp();
-      }
-      else
-      {
-        this.FocusContainerOrPreviousFocusable( focusedContainer, changeCurrentColumn );
-      }
-
-      return true;
-    }
-
-    private bool MoveFocusDown()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      UIElement focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( this, Keyboard.FocusedElement as DependencyObject );
-
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-      bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-      if( ( focusedContainer == null ) ||
-        ( navigationBehavior == NavigationBehavior.None ) )
-      {
-        // We just need to scroll one line down.
-        this.AnimatedScrollInfo.ScrollOwner.LineDown();
-      }
-      else
-      {
-        this.FocusContainerOrNextFocusable( focusedContainer, changeCurrentColumn );
-      }
-
-      return true;
-    }
-
-    private void InvalidateLayoutFromScrollingHelper()
-    {
-      if( m_layoutSuspended.IsSet )
-      {
-        m_layoutInvalidatedDuringSuspend = true;
-        return;
-      }
-
-      this.GeneratePage( false, this.AnimatedScrollInfo.ViewportHeight );
-      this.InvalidateArrange();
-      this.InvalidateScrollInfo();
-    }
-
-    private const int MaxDataRowFailFocusCount = 50;
-    private static readonly Point OutOfViewPoint = new Point( -999999, -999999 );
-    private static readonly Point EmptyPoint = new Point( 0, 0 );
-
-    private readonly LayoutedContainerInfoList m_layoutedContainers = new LayoutedContainerInfoList();
-    private readonly StickyContainerInfoList m_stickyHeaders = new StickyContainerInfoList();
-    private readonly StickyContainerInfoList m_stickyFooters = new StickyContainerInfoList();
-
-    private int m_pageVisibleContainerCount;
-
-    private OffsetAnimation m_horizontalOffsetAnimation;
-    private AnimationClock m_horizontalOffsetAnimationClock;
-
-    private OffsetAnimation m_verticalOffsetAnimation;
-    private AnimationClock m_verticalOffsetAnimationClock;
-
-    private PageIndexes m_lastVisiblePageIndexes = PageIndexes.Empty;
-
-    private readonly Dictionary<string, double> m_cachedContainerDesiredWidth = new Dictionary<string, double>();
-    private readonly Dictionary<string, double> m_cachedContainerRealDesiredWidth = new Dictionary<string, double>();
-
-    private readonly List<string> m_autoWidthCalculatedDataGridContextList = new List<string>();
-
-    private int m_delayedBringIntoViewIndex = -1;
-
-    private Size m_lastMeasureAvailableSize = Size.Empty;
-    private Size m_lastArrangeFinalSize = Size.Empty;
-
-    private double m_containerHeight;
-
-    private BitVector32 m_flags = new BitVector32();
-
-    private AutoResetFlag m_layoutSuspended = AutoResetFlagFactory.Create( false );
-    private bool m_layoutInvalidatedDuringSuspend;
-
-    #region TableflowItemsHostFlags Private Enum
-
-    [Flags]
-    private enum TableflowItemsHostFlags
-    {
-      AreHeadersSticky = 1,
-      AreFootersSticky = 2,
-      AreGroupHeadersSticky = 4,
-      AreGroupFootersSticky = 8,
-      AreParentRowSticky = 16,
-      PreventOpacityAnimation = 32,
-      IsDeferredLoadingEnabled = 64,
-    }
-
-    #endregion
-
-    #region PageIndexes Private Class
-
-    private class PageIndexes
-    {
-      public PageIndexes()
-      {
-      }
-
-      public PageIndexes( int startIndex, int endIndex )
-      {
-        this.StartIndex = startIndex;
-        this.EndIndex = endIndex;
-      }
-
-      public int StartIndex
-      {
-        get;
-        set;
-      }
-      public int EndIndex
-      {
-        get;
-        set;
-      }
-
-      private static PageIndexes _empty;
-      public static PageIndexes Empty
-      {
-        get
-        {
-          if( _empty == null )
-            _empty = new PageIndexes( -1, -1 );
-
-          return _empty;
-        }
-      }
-
-      public override bool Equals( object obj )
-      {
-        PageIndexes pageIndexes = obj as PageIndexes;
-
-        if( pageIndexes == null )
-          return false;
-
-        return ( pageIndexes.StartIndex == this.StartIndex )
-          && ( pageIndexes.EndIndex == this.EndIndex );
-      }
-
-      public override int GetHashCode()
-      {
-        return ( this.StartIndex ^ this.EndIndex );
-      }
-
-      public static bool operator ==( PageIndexes objA, PageIndexes objB )
-      {
-        return object.Equals( objA, objB );
-      }
-
-      public static bool operator !=( PageIndexes objA, PageIndexes objB )
-      {
-        return !object.Equals( objA, objB );
-      }
-    }
-
-    #endregion
-
-    #region LayoutSuspendedHelper Private Class
-
-    private sealed class LayoutSuspendedHelper : IDisposable
-    {
-      public LayoutSuspendedHelper( TableflowViewItemsHost owner )
-      {
-        if( owner == null )
-          throw new ArgumentNullException( "owner" );
-
-        m_owner = owner;
-        m_disposable = owner.m_layoutSuspended.Set();
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        var owner = Interlocked.Exchange( ref m_owner, null );
-        if( owner == null )
-          return;
-
-        if( m_disposable != null )
-        {
-          m_disposable.Dispose();
-          m_disposable = null;
-        }
-
-        if( !owner.m_layoutSuspended.IsSet && owner.m_layoutInvalidatedDuringSuspend )
-        {
-          owner.InvalidateMeasure();
-        }
-      }
-
-      ~LayoutSuspendedHelper()
-      {
-        this.Dispose( false );
-      }
-
-      private TableflowViewItemsHost m_owner;
-      private IDisposable m_disposable;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewUIElementCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewUIElementCollection.cs
deleted file mode 100644
index ce4936a1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewUIElementCollection.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class TableflowViewUIElementCollection : IList<UIElement>
-  {
-    #region CONSTRUCTORS
-
-    public TableflowViewUIElementCollection( UIElement visualParent )
-    {
-      if( visualParent == null )
-        throw new ArgumentNullException( "visualParent" );
-
-      m_visualCollection = new VisualCollection( visualParent );
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region IList<UIElement> Members
-
-    public int IndexOf( UIElement item )
-    {
-      return m_visualCollection.IndexOf( item );
-    }
-
-    public void Insert( int index, UIElement item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      m_visualCollection.Insert( index, item );
-    }
-
-    public void RemoveAt( int index )
-    {
-      m_visualCollection.RemoveAt( index );
-    }
-
-    public UIElement this[ int index ]
-    {
-      get
-      {
-        return m_visualCollection[ index ] as UIElement;
-      }
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "value" );
-
-        if( m_visualCollection[ index ] == value )
-          return;
-
-        m_visualCollection[ index ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ICollection<UIElement> Members
-
-    public void Add( UIElement item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      m_visualCollection.Add( item );
-    }
-
-    public void Clear()
-    {
-      m_visualCollection.Clear();
-    }
-
-    public bool Contains( UIElement item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      return m_visualCollection.Contains( item );
-    }
-
-    public void CopyTo( UIElement[] array, int arrayIndex )
-    {
-      m_visualCollection.CopyTo( array, arrayIndex );
-    }
-
-    public int Count
-    {
-      get
-      {
-        return m_visualCollection.Count;
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        return m_visualCollection.IsReadOnly;
-      }
-    }
-
-    public bool Remove( UIElement item )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      if( m_visualCollection.Contains( item ) )
-      {
-        m_visualCollection.Remove( item );
-        return true;
-      }
-
-      return false;
-    }
-
-    #endregion
-
-    #region IEnumerable<UIElement> Members
-
-    public IEnumerator<UIElement> GetEnumerator()
-    {
-      return new Enumerator( m_visualCollection.GetEnumerator() );
-    }
-
-    #endregion
-
-    #region IEnumerable Members
-
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-      return m_visualCollection.GetEnumerator();
-    }
-
-    #endregion
-
-    #region PRIVATE FIELDS
-
-    private VisualCollection m_visualCollection;
-
-    #endregion PRIVATE FIELDS
-
-    #region Enumerator Private Class
-
-    private class Enumerator : IEnumerator<UIElement>
-    {
-      public Enumerator( IEnumerator nonGenericEnumerator )
-      {
-        if( nonGenericEnumerator == null )
-          throw new ArgumentNullException( "nonGenericEnumerator" );
-
-        m_enumerator = nonGenericEnumerator;
-      }
-
-      #region IEnumerator<UIElement> Members
-
-      UIElement IEnumerator<UIElement>.Current
-      {
-        get
-        {
-          return m_enumerator.Current as UIElement;
-        }
-      }
-
-      #endregion
-
-      #region IDisposable Members
-
-      void IDisposable.Dispose()
-      {
-        // Nothing to do
-      }
-
-      #endregion
-
-      #region IEnumerator Members
-
-      object IEnumerator.Current
-      {
-        get
-        {
-          return m_enumerator.Current;
-        }
-      }
-
-      bool IEnumerator.MoveNext()
-      {
-        return m_enumerator.MoveNext();
-      }
-
-      void IEnumerator.Reset()
-      {
-        m_enumerator.Reset();
-      }
-
-      #endregion
-
-      IEnumerator m_enumerator;
-    }
-
-    #endregion Enumerator Private Class
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ZOrderHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ZOrderHelper.cs
deleted file mode 100644
index 288447e4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ZOrderHelper.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class ZOrderHelper
-  {
-    /// <param name="children">The Children of the Panel</param>
-    /// <param name="zIndexMapping">The int[] of ZOrder mapping</param>
-    /// <returns>True if a mapping was performed, false if nothing changed</returns>
-    public static bool ComputeZOrder( IList<UIElement> children, ref int[] zIndexMapping )
-    {
-      if( children == null )
-      {
-        return false;
-      }
-
-      int count = children.Count;
-      List<long> tempList = new List<long>( count );
-
-      bool needMapping = false;
-
-      if( count > 0 )
-      {
-        UIElement element = children[ 0 ] as UIElement;
-
-        int zIndex = ( element != null )
-          ? Panel.GetZIndex( element )
-          : 0;
-
-        tempList.Add( ( long )zIndex << 32 );
-
-        if( count > 1 )
-        {
-          int currentItemIndex = 1;
-          int lastZIndex = zIndex;
-
-          do
-          {
-            element = children[ currentItemIndex ] as UIElement;
-
-            zIndex = ( element != null )
-              ? Panel.GetZIndex( element )
-              : 0;
-
-            tempList.Add( ( ( long )zIndex << 32 ) + currentItemIndex );
-
-            needMapping |= ( zIndex < lastZIndex );
-            lastZIndex = zIndex;
-          }
-          while( ++currentItemIndex < count );
-        }
-      }
-
-
-      if( needMapping )
-      {
-        tempList.Sort();
-
-        if( ( zIndexMapping == null ) || ( zIndexMapping.Length != count ) )
-        {
-          zIndexMapping = new int[ children.Count ];
-        }
-
-        for( int i = 0; i < count; i++ )
-        {
-          zIndexMapping[ i ] = ( int )( tempList[ i ] & 0xFFFFFFFFL );
-        }
-      }
-      else
-      {
-        zIndexMapping = null;
-      }
-
-      return needMapping;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs
deleted file mode 100644
index 65423907..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs
+++ /dev/null
@@ -1,332 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class ColumnStretchingManager
-  {
-    public ColumnStretchingManager( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        throw new ArgumentNullException( "dataGridContext" );
-
-      m_dataGridContext = dataGridContext;
-    }
-
-    #region ColumnStretchingCalculated Property
-
-    private bool m_columnStretchingCalculated = false;
-
-    /// <summary>
-    /// This property is useful in the case where the first row(s) are not measured
-    /// (collapsed, for instance). The code that calls the Measure with a restricted
-    /// size should set this property to false and check if it is true after having
-    /// called Measure on the Row.
-    /// </summary>
-    public bool ColumnStretchingCalculated
-    {
-      get
-      {
-        return m_columnStretchingCalculated;
-      }
-
-      set
-      {
-        m_columnStretchingCalculated = value;
-      }
-    }
-
-    #endregion ColumnStretchingCalculated Property
-
-    public void DisableColumnStretching()
-    {
-      m_columnStretchingDisabled = true;
-
-      foreach( ColumnBase column in m_dataGridContext.Columns )
-      {
-        if( column.ReadLocalValue( ColumnBase.DesiredWidthProperty ) != DependencyProperty.UnsetValue )
-        {
-          column.Width = new ColumnWidth( column.DesiredWidth );
-          // Necessary to enable column sizing for Stretch First/Last/All.
-          column.ClearValue( ColumnBase.DesiredWidthProperty );
-        }
-      }
-    }
-
-    public void CalculateColumnStretchWidths( double widthToDistribute, ColumnStretchMode columnStretchMode, double columnStretchMinWidth, bool canIncreaseColumnWidth )
-    {
-      if( m_columnStretchingDisabled )
-        return;
-
-      int currentDataGridScrollViewerMeasureVersion = 0;
-      DataGridControl dataGridControl = m_dataGridContext.DataGridControl;
-
-      if( dataGridControl != null )
-      {
-        DataGridScrollViewer scrollViewer = dataGridControl.ScrollViewer as DataGridScrollViewer;
-
-        if( scrollViewer != null )
-        {
-          currentDataGridScrollViewerMeasureVersion = scrollViewer.MeasureVersion;
-        }
-      }
-
-      this.ColumnStretchingCalculated = true;
-
-      if( m_dataGridScrollViewerMeasureVersion != currentDataGridScrollViewerMeasureVersion )
-      {
-        // Reset the widthToDistribute since we are in a new pass of measure in the DataGridScrollViewer
-        m_widthToDistribute = widthToDistribute;
-        m_dataGridScrollViewerMeasureVersion = currentDataGridScrollViewerMeasureVersion;
-      }
-      else
-      {
-        if( widthToDistribute >= m_widthToDistribute )
-        {
-          widthToDistribute = m_widthToDistribute;
-        }
-        else
-        {
-          m_widthToDistribute = widthToDistribute;
-        }
-      }
-
-      List<WorkingColumnWidth> excludedColumns = null;
-      ColumnBase stretchedColumn = null;
-      ReadOnlyObservableCollection<ColumnBase> visibleColumns = m_dataGridContext.VisibleColumns;
-
-      if( visibleColumns.Count == 0 )
-        return;
-
-      switch( columnStretchMode )
-      {
-        case ColumnStretchMode.First:
-          stretchedColumn = visibleColumns[ 0 ];
-          excludedColumns = new List<WorkingColumnWidth>( 1 );
-          break;
-
-        case ColumnStretchMode.Last:
-          stretchedColumn = visibleColumns[ visibleColumns.Count - 1 ];
-          excludedColumns = new List<WorkingColumnWidth>( 1 );
-          break;
-
-        case ColumnStretchMode.All:
-          excludedColumns = new List<WorkingColumnWidth>( visibleColumns.Count );
-          foreach( ColumnBase column in visibleColumns )
-          {
-            excludedColumns.Add( new WorkingColumnWidth( column, 1d, columnStretchMinWidth ) );
-          }
-          break;
-
-        case ColumnStretchMode.None:
-          foreach( ColumnBase column in visibleColumns )
-          {
-            if( column.Width.UnitType == ColumnWidthUnitType.Star )
-            {
-              if( excludedColumns == null )
-                excludedColumns = new List<WorkingColumnWidth>();
-
-              excludedColumns.Add( new WorkingColumnWidth( column, column.Width.Value, columnStretchMinWidth ) );
-            }
-            else
-            {
-              column.ClearValue( Column.DesiredWidthProperty );
-              widthToDistribute -= column.ActualWidth;
-            }
-          }
-          break;
-      }
-
-      if( excludedColumns != null )
-      {
-        if( stretchedColumn != null )
-        {
-          foreach( ColumnBase column in visibleColumns )
-          {
-            if( column == stretchedColumn )
-            {
-              excludedColumns.Add( new WorkingColumnWidth( column, 1, columnStretchMinWidth ) );
-            }
-            else
-            {
-              column.ClearValue( Column.DesiredWidthProperty );
-              widthToDistribute -= column.ActualWidth;
-            }
-          }
-        }
-
-        this.CalculateColumnDesiredWidth( widthToDistribute, excludedColumns, canIncreaseColumnWidth );
-      }
-    }
-
-    private void CalculateColumnDesiredWidth( double widthToDistribute, List<WorkingColumnWidth> excludedColumns, bool canIncreaseColumnWidth )
-    {
-      double starToDistribute = 0d;
-
-      Debug.Assert( excludedColumns.Count > 0, "Should have at least one excluded Column." );
-
-      foreach( WorkingColumnWidth columnWidth in excludedColumns )
-      {
-        starToDistribute += columnWidth.StarValue;
-      }
-
-      double unitWidth = ColumnStretchingManager.CalculateUnitWidth( widthToDistribute, starToDistribute );
-      WorkingColumnWidth primaryColumnWidth;
-      WorkingColumnWidth previousColumnWidth;
-
-      // This width distribution algorithm will perform at most (n² + n)/2 iterations; 
-      // where n is the number of columns involved in the distribution.
-      // This worst-case scenario will happen if each column has an active MinWidth 
-      // or MaxWidth.
-      // But it's better than the Framework's grid algorithm which breaks down when star
-      // distribution is used with Min/MaxWidth.
-      for( int i = 0; i < excludedColumns.Count; i++ )
-      {
-        primaryColumnWidth = excludedColumns[ i ];
-        primaryColumnWidth.CalculateWidths( unitWidth );
-
-        if( primaryColumnWidth.OverriddenWidth >= 0d )
-        {
-          widthToDistribute -= primaryColumnWidth.OverriddenWidth;
-          starToDistribute -= primaryColumnWidth.StarValue;
-          unitWidth = ColumnStretchingManager.CalculateUnitWidth( widthToDistribute, starToDistribute );
-
-          for( int j = 0; j < i; j++ )
-          {
-            previousColumnWidth = excludedColumns[ j ];
-
-            if( previousColumnWidth.OverriddenWidth >= 0d )
-            {
-              widthToDistribute += previousColumnWidth.OverriddenWidth;
-              starToDistribute += previousColumnWidth.StarValue;
-              unitWidth = ColumnStretchingManager.CalculateUnitWidth( widthToDistribute, starToDistribute );
-            }
-
-            previousColumnWidth.CalculateWidths( unitWidth );
-
-            if( previousColumnWidth.OverriddenWidth >= 0d )
-            {
-              widthToDistribute -= previousColumnWidth.OverriddenWidth;
-              starToDistribute -= previousColumnWidth.StarValue;
-              unitWidth = ColumnStretchingManager.CalculateUnitWidth( widthToDistribute, starToDistribute );
-            }
-          }
-        }
-      }
-
-      foreach( WorkingColumnWidth columnWidth in excludedColumns )
-      {
-        if( columnWidth.OverriddenWidth >= 0d )
-        {
-          if( !canIncreaseColumnWidth && ( columnWidth.Column.DesiredWidth < columnWidth.DesiredWidth ) )
-            continue;
-
-          // Assign the desired calculated Width. Column.ActualWidth will be in charge of
-          // applying the MinWidth and MaxWidth. This ultimate responsability has to be 
-          // kept in Column to make MinWidth and MaxWidth modifications having an impact.
-          // For instance, an inactive MinWidth of 200 would become active if 
-          // DesiredWidth was set to a temporary MaxWidth of 200 (resetting MaxWidth
-          // would not trigger an immediate recalculation).
-          columnWidth.Column.DesiredWidth = columnWidth.DesiredWidth;
-        }
-        else
-        {
-          var desiredWidth = unitWidth * columnWidth.StarValue;
-
-          if( !canIncreaseColumnWidth && ( columnWidth.Column.DesiredWidth < desiredWidth ) )
-            continue;
-
-          columnWidth.Column.DesiredWidth = desiredWidth;
-        }
-      }
-    }
-
-    private static double CalculateUnitWidth( double widthToDistribute, double starToDistribute )
-    {
-      if( ( widthToDistribute > 0d ) && ( starToDistribute > 0d ) )
-        return widthToDistribute / starToDistribute;
-
-      return 0d;
-    }
-
-    #region Private WorkingColumnWidth Class
-
-    private class WorkingColumnWidth
-    {
-      public WorkingColumnWidth( ColumnBase column, double starValue, double columnStretchMinWidth )
-      {
-        bool unsetMinValue = ( column.ReadLocalValue( ColumnBase.MinWidthProperty ) == DependencyProperty.UnsetValue );
-
-        this.Column = column;
-        this.StarValue = starValue;
-        m_maxWidth = column.MaxWidth;
-        m_minWidth = column.MinWidth;
-        m_columnStretchMinWidth = ( ( unsetMinValue ) && ( columnStretchMinWidth < m_maxWidth ) ) ? columnStretchMinWidth : -1d;
-      }
-
-      public void CalculateWidths( double unitWidth )
-      {
-        double desiredWidth = unitWidth * this.StarValue;
-
-        this.OverriddenWidth = -1d;
-
-        if( desiredWidth < m_columnStretchMinWidth )
-        {
-          desiredWidth = m_columnStretchMinWidth;
-          this.OverriddenWidth = desiredWidth;
-        }
-
-        // No matter what the Column's MinWidth and MaxWidth are, this is the real
-        // desired width.
-        this.DesiredWidth = desiredWidth;
-
-        if( desiredWidth > m_maxWidth )
-        {
-          desiredWidth = m_maxWidth;
-          this.OverriddenWidth = desiredWidth;
-        }
-
-        if( desiredWidth < m_minWidth )
-        {
-          this.OverriddenWidth = m_minWidth;
-        }
-      }
-
-      public double StarValue;
-      public ColumnBase Column;
-      public double DesiredWidth;
-      public double OverriddenWidth;
-
-      private double m_columnStretchMinWidth;
-      private double m_minWidth;
-      private double m_maxWidth;
-    }
-
-    #endregion Private WorkingColumnWidth Class
-
-    private DataGridContext m_dataGridContext;
-    private bool m_columnStretchingDisabled;
-    private int m_dataGridScrollViewerMeasureVersion;
-    private double m_widthToDistribute = double.MaxValue;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushes.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushes.cs
deleted file mode 100644
index ecc685ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushes.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public static class DataGridControlBackgroundBrushes
-  {
-    static DataGridControlBackgroundBrushes()
-    {
-      DataGridControlBackgroundBrushesResources resources = new DataGridControlBackgroundBrushesResources();
-
-      s_auroraBlue = ( Brush )resources[ "auroraBlueBrush" ];
-      s_auroraPink = ( Brush )resources[ "auroraPinkBrush" ];
-      s_auroraRed = ( Brush )resources[ "auroraRedBrush" ];
-      s_elementalBlack = ( Brush )resources[ "elementalBlackBrush" ];
-      s_elementalBlue = ( Brush )resources[ "elementalBlueBrush" ];
-      s_elementalSilver = ( Brush )resources[ "elementalSilverBrush" ];
-      s_horizonBlue = ( Brush )resources[ "horizonBlueBrush" ];
-      s_horizonOrange = ( Brush )resources[ "horizonOrangeBrush" ];
-      s_nightFog = ( Brush )resources[ "nightFogBrush" ];
-      s_sunrise = ( Brush )resources[ "sunriseBrush" ];
-      s_sunriseBlue = ( Brush )resources[ "sunriseBlueBrush" ];
-      s_sunBlack = ( Brush )resources[ "sunBlackBrush" ];
-      s_sunBlue = ( Brush )resources[ "sunBlueBrush" ];
-      s_sunOrange = ( Brush )resources[ "sunOrangeBrush" ];
-    }
-
-    public static Brush AuroraBlue
-    {
-      get
-      {
-        return s_auroraBlue;
-      }
-    }
-
-    public static Brush AuroraPink
-    {
-      get
-      {
-        return s_auroraPink;
-      }
-    }
-
-    public static Brush AuroraRed
-    {
-      get
-      {
-        return s_auroraRed;
-      }
-    }
-
-    public static Brush ElementalBlack
-    {
-      get
-      {
-        return s_elementalBlack;
-      }
-    }
-
-    public static Brush ElementalBlue
-    {
-      get
-      {
-        return s_elementalBlue;
-      }
-    }
-
-    public static Brush ElementalSilver
-    {
-      get
-      {
-        return s_elementalSilver;
-      }
-    }
-
-    public static Brush HorizonBlue
-    {
-      get
-      {
-        return s_horizonBlue;
-      }
-    }
-
-    public static Brush HorizonOrange
-    {
-      get
-      {
-        return s_horizonOrange;
-      }
-    }
-
-    public static Brush NightFog
-    {
-      get
-      {
-        return s_nightFog;
-      }
-    }
-
-    public static Brush Sunrise
-    {
-      get
-      {
-        return s_sunrise;
-      }
-    }
-
-    public static Brush SunriseBlue
-    {
-      get
-      {
-        return s_sunriseBlue;
-      }
-    }
-
-    public static Brush SunBlack
-    {
-      get
-      {
-        return s_sunBlack;
-      }
-    }
-
-    public static Brush SunBlue
-    {
-      get
-      {
-        return s_sunBlue;
-      }
-    }
-
-    public static Brush SunOrange
-    {
-      get
-      {
-        return s_sunOrange;
-      }
-    }
-
-    private static Brush s_auroraBlue;
-    private static Brush s_auroraPink;
-    private static Brush s_auroraRed;
-    private static Brush s_elementalBlack;
-    private static Brush s_elementalBlue;
-    private static Brush s_elementalSilver;
-    private static Brush s_horizonBlue;
-    private static Brush s_horizonOrange;
-    private static Brush s_nightFog;
-    private static Brush s_sunrise;
-    private static Brush s_sunriseBlue;
-    private static Brush s_sunBlack;
-    private static Brush s_sunBlue;
-    private static Brush s_sunOrange;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml
deleted file mode 100644
index 44e15e30..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml
+++ /dev/null
@@ -1,1153 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 x:Class="Xceed.Wpf.DataGrid.Views.DataGridControlBackgroundBrushesResources"
-                    x:ClassModifier="internal"
-                    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">
-
-   <!-- auroraBlueBrush -->
-   <VisualBrush x:Key="auroraBlueBrush">
-      <VisualBrush.Visual>
-         <!-- This arbitrary size is useful to give the VisualBrush an element that it can
-              stretch. If absent, the visual would have a (0,0) size and would never be
-              rendered. -->
-         <Grid Width="4"
-               Height="3">
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#FF008EFF"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF000000"
-                                   Offset="1"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.287"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="180"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="-0.326"
-                                               Y="-0.092"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#CC00ECFF"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00008EFF"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.359"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="540"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="-0.173"
-                                               Y="0.024"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#7F0012BD"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00008EFF"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.383"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="180"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0.456"
-                                               Y="0.014"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#CC0012BD"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00008EFF"
-                                   Offset="0.995"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.489,0.985">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.575"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="540"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0.28"
-                                               Y="-0.074"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#CCC5FFDE"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00008EFF"
-                                   Offset="0.995"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- auroraPinkBrush -->
-   <VisualBrush x:Key="auroraPinkBrush">
-      <VisualBrush.Visual>
-         <!-- This arbitrary size is useful to give the VisualBrush an element that it can
-              stretch. If absent, the visual would have a (0,0) size and would never be
-              rendered. -->
-         <Grid Width="4"
-               Height="3">
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#FFFF009F"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF000000"
-                                   Offset="1"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.287"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="180"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="-0.326"
-                                               Y="-0.092"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#CCFFF1FE"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00FFE6FC"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.359"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="540"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="-0.173"
-                                               Y="0.024"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#7F7900BD"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00690068"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.383"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="180"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0.456"
-                                               Y="0.014"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#CCBD00AA"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00C70000"
-                                   Offset="0.995"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.489,0.985">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.575"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="540"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0.28"
-                                               Y="-0.074"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#CCFFFFFF"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00FF0000"
-                                   Offset="0.995"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- auroraRedBrush -->
-   <VisualBrush x:Key="auroraRedBrush">
-      <VisualBrush.Visual>
-         <!-- This arbitrary size is useful to give the VisualBrush an element that it can
-              stretch. If absent, the visual would have a (0,0) size and would never be
-              rendered. -->
-         <Grid Width="4"
-               Height="3">
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#FFFF0000"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF000000"
-                                   Offset="1"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.287"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="180"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="-0.326"
-                                               Y="-0.092"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#FFFF5900"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00F8FF44"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.359"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="540"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="-0.173"
-                                               Y="0.024"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#7FD9C300"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00FFF200"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.51,0.935">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.383"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="180"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0.456"
-                                               Y="0.014"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#CCCF5B00"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00FF0000"
-                                   Offset="0.995"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush GradientOrigin="0.489,0.985">
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="0.575"
-                                           ScaleY="1.318"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="540"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0.28"
-                                               Y="-0.074"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#CCF5FFB1"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00F8FF44"
-                                   Offset="0.995"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- elementalBlackBrush -->
-   <VisualBrush x:Key="elementalBlackBrush">
-      <VisualBrush.Visual>
-         <Grid Width="4"
-               Height="3">
-            <Border Background="#FF000000"/>
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#FF444444"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#00000000"
-                                   Offset="0.505"/>
-
-                     <GradientStop Color="#FF444444"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- elementalBlueBrush -->
-   <VisualBrush x:Key="elementalBlueBrush">
-      <VisualBrush.Visual>
-         <!-- This arbitrary size is useful to give the VisualBrush an element that it can
-              stretch. If absent, the visual would have a (0,0) size and would never be
-              rendered. -->
-         <Grid Width="4"
-               Height="3">
-            <Border Background="#FF93C1FE"/>
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#FFFFFFFF"
-                                   Offset="0.505"/>
-
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1.231"
-                                       StartPoint="0.5,-0.24">
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#FFFFFFFF"
-                                   Offset="0.505"/>
-
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- elementalSilverBrush -->
-   <VisualBrush x:Key="elementalSilverBrush">
-      <VisualBrush.Visual>
-         <!-- This arbitrary size is useful to give the VisualBrush an element that it can
-              stretch. If absent, the visual would have a (0,0) size and would never be
-              rendered. -->
-         <Grid Width="4"
-               Height="3">
-            <Border Background="#FFCFD1D7"/>
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#FFFFFFFF"
-                                   Offset="0.505"/>
-
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1.231"
-                                       StartPoint="0.5,-0.24">
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#FFFFFFFF"
-                                   Offset="0.505"/>
-
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- horizonBlueBrush -->
-   <VisualBrush x:Key="horizonBlueBrush">
-      <VisualBrush.Visual>
-         <!-- This arbitrary size is useful to give the VisualBrush an element that it can
-              stretch. If absent, the visual would have a (0,0) size and would never be
-              rendered. -->
-         <Grid Width="4"
-               Height="3">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
-
-            <Border Background="#FF007BAC" />
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,0"
-                                       StartPoint="0.5,1">
-                     <GradientStop Color="#7F000000"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00000000"
-                                   Offset="1"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border Grid.Row="1">
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="1"
-                                           ScaleY="1.249"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="0"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0"
-                                               Y="-0.124"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#FFD3D3D3"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF636363"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border Grid.Row="1">
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,0.121"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#007E7E7E"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#7FDDDDDD"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- horizonOrangeBrush -->
-   <VisualBrush x:Key="horizonOrangeBrush">
-      <VisualBrush.Visual>
-         <!-- This arbitrary size is useful to give the VisualBrush an element that it can
-              stretch. If absent, the visual would have a (0,0) size and would never be
-              rendered. -->
-         <Grid Width="4"
-               Height="3">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
-
-            <Border Background="#FFFF9300"/>
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,0"
-                                       StartPoint="0.5,1">
-                     <GradientStop Color="#7F550000"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00000000"
-                                   Offset="1"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border Grid.Row="1">
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="1"
-                                           ScaleY="1.249"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="0"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0"
-                                               Y="-0.124"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#FFD3D3D3"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF636363"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border Grid.Row="1">
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,0.121"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#007E7E7E"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#7FDDDDDD"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- nightFogBrush -->
-   <VisualBrush x:Key="nightFogBrush">
-      <VisualBrush.Visual>
-         <!-- This arbitrary size is useful to give the VisualBrush an element that it can
-              stretch. If absent, the visual would have a (0,0) size and would never be
-              rendered. -->
-         <Border Width="4"
-                 Height="3">
-            <Border.Background>
-               <RadialGradientBrush GradientOrigin="0.929,0.619">
-                  <RadialGradientBrush.RelativeTransform>
-                     <TransformGroup>
-                        <ScaleTransform CenterX="0.5"
-                                        CenterY="0.5"
-                                        ScaleX="1.24"
-                                        ScaleY="0.983"/>
-
-                        <SkewTransform AngleX="0"
-                                       AngleY="0"
-                                       CenterX="0.5"
-                                       CenterY="0.5"/>
-
-                        <RotateTransform Angle="0"
-                                         CenterX="0.5"
-                                         CenterY="0.5"/>
-
-                        <TranslateTransform X="0.121"
-                                            Y="0.001"/>
-                     </TransformGroup>
-                  </RadialGradientBrush.RelativeTransform>
-
-                  <GradientStop Color="#FFA09774"
-                                Offset="0"/>
-
-                  <GradientStop Color="#FF000000"
-                                Offset="1"/>
-               </RadialGradientBrush>
-            </Border.Background>
-         </Border>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- sunriseBrush -->
-   <VisualBrush x:Key="sunriseBrush">
-      <VisualBrush.Visual>
-         <!-- This grid will have a "natural" size because of the path. We don't have
-              to set an arbitrary size. -->
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
-
-            <Border Background="#FFFFAB00"/>
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,0"
-                                       StartPoint="0.5,1">
-                     <GradientStop Color="#7F670700"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#00FF8800"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Path Stretch="Fill"
-                  Opacity="0.1"
-                  Data="M133.79198,0.31168781 C133.79198,0.31168781 133.974,30.731293 133.974,30.731293 133.974,30.731293 143.07458,0.47357178 143.07458,0.47357178 143.07458,0.47357178 157.54028,0.4012001 157.54028,0.4012001 157.54028,0.4012001 137.48193,32.33194 137.48193,32.33194 137.48193,32.33194 173.43832,0.52253225 173.43832,0.52253225 173.43832,0.52253225 212.58966,0.31081702 212.58966,0.31081702 212.58966,0.31081702 139.56689,35.573425 139.56689,35.573425 139.56689,35.573425 273.49612,17.471771&#xa;273.49612,17.471771 273.49612,17.471771 273.59848,57.393555 273.59848,57.393555 273.59848,57.393555 139.56689,39.426575 139.56689,39.426575 139.56689,39.426575 273.49644,101.36441 273.49644,101.36441 273.49644,101.36441 273.58386,158 273.58386,158 273.58386,158 137.48193,42.66806 137.48193,42.66806 137.48193,42.66806 273.5,254 273.5,254 273.5,254 273.5,274.57522 273.5,274.57522 273.5,274.57522&#xa;202,274.5 202,274.5 202,274.5 133.974,44.268707 133.974,44.268707 133.974,44.268707 132,274.5 132,274.5 132,274.5 62.5,274.5 62.5,274.5 62.5,274.5 130.15686,43.720337 130.15686,43.720337 130.15686,43.720337 -0.69224702,242 -0.69224702,242 -0.69224702,242 -0.43354441,153.5 -0.43354441,153.5 -0.43354441,153.5 127.24243,41.197083 127.24243,41.197083&#xa;127.24243,41.197083 -0.43354441,98.5 -0.43354441,98.5 -0.43354441,98.5 -0.45959765,56.491119 -0.45959765,56.491119 -0.45959765,56.491119 126.15594,37.5 126.15594,37.5 126.15594,37.5 -0.45553525,18.424438 -0.45553525,18.424438 -0.45553525,18.424438 -0.5,0.5 -0.5,0.5 -0.5,0.5 54.625137,0.45311926 54.625137,0.45311926 54.625137,0.45311926 127.24243,33.802917 127.24243,33.802917 127.24243,33.802917 89.680466,0.55717544&#xa;89.680466,0.55717544 89.680466,0.55717544 110.51555,0.39574621 110.51555,0.39574621 110.51555,0.39574621 130.15686,31.279663 130.15686,31.279663 130.15686,31.279663 121.60161,0.39560964 121.60161,0.39560964 121.60161,0.39560964 133.79198,0.31168781 133.79198,0.31168781 z"
-                  Fill="#FFFFF200"
-                  Grid.RowSpan="2"
-                  RenderTransformOrigin="0.5,0.5">
-               <Path.RenderTransform>
-                  <TransformGroup>
-                     <ScaleTransform ScaleX="1"
-                                     ScaleY="1"/>
-
-                     <SkewTransform AngleX="0"
-                                    AngleY="0"/>
-
-                     <RotateTransform Angle="180"/>
-                  </TransformGroup>
-               </Path.RenderTransform>
-            </Path>
-
-            <Border Grid.Row="1">
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="1"
-                                           ScaleY="1.249"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="0"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0"
-                                               Y="-0.124"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#FF5F5F5F"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF000000"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border Grid.Row="1">
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,0.121"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#00383838"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#7FB1B1B1"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- sunriseBlueBrush -->
-   <VisualBrush x:Key="sunriseBlueBrush">
-      <VisualBrush.Visual>
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-            </Grid.RowDefinitions>
-
-            <Border Background="#FF00A6FF" />
-
-            <Border>
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,0"
-                                       StartPoint="0.5,1">
-                     <GradientStop Color="#7F090028"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#00FF8800"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Path Stretch="Fill"
-                  Opacity="0.1"
-                  Data="M133.79198,0.31168781 C133.79198,0.31168781 133.974,30.731293 133.974,30.731293 133.974,30.731293 143.07458,0.47357178 143.07458,0.47357178 143.07458,0.47357178 157.54028,0.4012001 157.54028,0.4012001 157.54028,0.4012001 137.48193,32.33194 137.48193,32.33194 137.48193,32.33194 173.43832,0.52253225 173.43832,0.52253225 173.43832,0.52253225 212.58966,0.31081702 212.58966,0.31081702 212.58966,0.31081702 139.56689,35.573425 139.56689,35.573425 139.56689,35.573425 273.49612,17.471771&#xa;273.49612,17.471771 273.49612,17.471771 273.59848,57.393555 273.59848,57.393555 273.59848,57.393555 139.56689,39.426575 139.56689,39.426575 139.56689,39.426575 273.49644,101.36441 273.49644,101.36441 273.49644,101.36441 273.58386,158 273.58386,158 273.58386,158 137.48193,42.66806 137.48193,42.66806 137.48193,42.66806 273.5,254 273.5,254 273.5,254 273.5,274.57522 273.5,274.57522 273.5,274.57522&#xa;202,274.5 202,274.5 202,274.5 133.974,44.268707 133.974,44.268707 133.974,44.268707 132,274.5 132,274.5 132,274.5 62.5,274.5 62.5,274.5 62.5,274.5 130.15686,43.720337 130.15686,43.720337 130.15686,43.720337 -0.69224702,242 -0.69224702,242 -0.69224702,242 -0.43354441,153.5 -0.43354441,153.5 -0.43354441,153.5 127.24243,41.197083 127.24243,41.197083&#xa;127.24243,41.197083 -0.43354441,98.5 -0.43354441,98.5 -0.43354441,98.5 -0.45959765,56.491119 -0.45959765,56.491119 -0.45959765,56.491119 126.15594,37.5 126.15594,37.5 126.15594,37.5 -0.45553525,18.424438 -0.45553525,18.424438 -0.45553525,18.424438 -0.5,0.5 -0.5,0.5 -0.5,0.5 54.625137,0.45311926 54.625137,0.45311926 54.625137,0.45311926 127.24243,33.802917 127.24243,33.802917 127.24243,33.802917 89.680466,0.55717544&#xa;89.680466,0.55717544 89.680466,0.55717544 110.51555,0.39574621 110.51555,0.39574621 110.51555,0.39574621 130.15686,31.279663 130.15686,31.279663 130.15686,31.279663 121.60161,0.39560964 121.60161,0.39560964 121.60161,0.39560964 133.79198,0.31168781 133.79198,0.31168781 z"
-                  Fill="#FF00E1FF"
-                  Grid.RowSpan="2"
-                  RenderTransformOrigin="0.5,0.5">
-               <Path.RenderTransform>
-                  <TransformGroup>
-                     <ScaleTransform ScaleX="1"
-                                     ScaleY="1"/>
-
-                     <SkewTransform AngleX="0"
-                                    AngleY="0"/>
-
-                     <RotateTransform Angle="180"/>
-                  </TransformGroup>
-               </Path.RenderTransform>
-            </Path>
-
-            <Border Grid.Row="1">
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="1"
-                                           ScaleY="1.249"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="0"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#FF5F5F5F"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF000000"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border Grid.Row="1">
-               <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,0.121"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#00383838"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#7FB1B1B1"
-                                   Offset="0"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- sunBlackBrush -->
-   <VisualBrush x:Key="sunBlackBrush">
-      <VisualBrush.Visual>
-         <Grid>
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <GradientStop Color="#FF737373"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF000000"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <GradientStop Color="#FF737373"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#00000000"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Path Stretch="Fill"
-                  Data="M25.144999,300 C25.144999,300 156.25999,143.745 156.25999,143.745 156.25999,143.745 300,0 300,0 300,0 276.875,0 276.875,0 276.875,0 156.25999,143.745 156.25999,143.745 156.25999,143.745 0,300 0,300 0,300 25.144999,300 25.144999,300 z M300,24.129999 C300,24.129999 157.245,143.91499 157.245,143.91499 157.245,143.91499 0,254.01999 0,254.01999 0,254.01999 0,275.85999 0,275.85999 0,275.85999 157.245,143.91499 157.245,143.91499 157.245,143.91499 300,43.959999 300,43.959999 300,43.959999 300,24.129999 300,24.129999 z M300,63.379997 C300,63.379997 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,219.92499 0,219.92499 0,219.92499 0,236.59 0,236.59 0,236.59 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,80.034996 300,80.034996 300,80.034996 300,63.379997 300,63.379997 z M300,95.379997 C300,95.379997 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,190.16499 0,190.16499 0,190.16499 0,204.56999 0,204.56999 0,204.56999 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,109.78 300,109.78 300,109.78 300,95.379997 300,95.379997 z M300,123.52 C300,123.52 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,163.08499 0,163.08499 0,163.08499 0,176.41499 0,176.41499 0,176.41499 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,136.84 300,136.84 300,136.84 300,123.52 300,123.52 z M300,150 C300,150 150.02,150 150.02,150 150.02,150 0,136.875 0,136.875 0,136.875 0,150 0,150 0,150 150.02,150 150.02,150 150.02,150 300,163.12 300,163.12 300,163.12 300,150 300,150 z M300,176.53 C300,176.53 149.545,150 149.545,150 149.545,150 0,109.93 0,109.93 0,109.93 0,123.63 0,123.63 0,123.63 149.545,150 149.545,150 149.545,150 300,190.315 300,190.315 300,190.315 300,176.53 300,176.53 z M300,204.58 C300,204.58 150.045,150 150.045,150 150.045,150 0,80.034996 0,80.034996 0,80.034996 0,95.389999 0,95.389999 0,95.389999 150.045,150 150.045,150 150.045,150 300,219.92499 300,219.92499 300,219.92499 300,204.58 300,204.58 z M300,236.58 C300,236.58 150.045,150 150.045,150 150.045,150 0,44.939999 0,44.939999 0,44.939999 0,63.375 0,63.375 0,63.375 150.045,150 150.045,150 150.045,150 300,255 300,255 300,255 300,236.58 300,236.58 z M143.83,143.785 C143.83,143.785 300,299.95999 300,299.95999 300,299.95999 300,274.82999 300,274.82999 300,274.82999 143.83,143.785 143.83,143.785 143.83,143.785 0.039999999,0 0.039999999,0 0.039999999,0 0,0 0,0 0,0 0,23.1 0,23.1 0,23.1 143.83,143.785 143.83,143.785 z M275.07001,300 C275.07001,300 154.27499,156.045 154.27499,156.045 154.27499,156.045 45.009998,0 45.009998,0 45.009998,0 23.34,0 23.34,0 23.34,0 154.27499,156.045 154.27499,156.045 154.27499,156.045 255.075,300 255.075,300 255.075,300 275.07001,300 275.07001,300 z M236.64499,300 C236.64499,300 150.045,150 150.045,150 150.045,150 80.095001,0 80.095001,0 80.095001,0 63.439999,0 63.439999,0 63.439999,0 150.045,150 150.045,150 150.045,150 219.98999,300 219.98999,300 219.98999,300 236.64499,300 236.64499,300 z M204.64,300 C204.64,300 150.045,150 150.045,150 150.045,150 109.85,0 109.85,0 109.85,0 95.449997,0 95.449997,0 95.449997,0 150.045,150 150.045,150 150.045,150 190.235,300 190.235,300 190.235,300 204.64,300 204.64,300 z M176.495,300 C176.495,300 150.045,150 150.045,150 150.045,150 136.92,0 136.92,0 136.92,0 123.59499,0 123.59499,0 123.59499,0 150.045,150 150.045,150 150.045,150 163.16499,300 163.16499,300 163.16499,300 176.495,300 176.495,300 z M150.045,300 C150.045,300 150.045,149.98 150.045,149.98 150.045,149.98 163.16499,0 163.16499,0 163.16499,0 150.045,0 150.045,0 150.045,0 150.045,149.98 150.045,149.98 150.045,149.98 136.92,300 136.92,300 136.92,300 150.045,300 150.045,300 z M123.59,300 C123.59,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 190.22499,0 190.22499,0 190.22499,0 176.485,0 176.485,0 176.485,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 109.84,300 109.84,300 109.84,300 123.59,300 123.59,300 z M204.625,0 C204.625,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 80.080002,300 80.080002,300 80.080002,300 95.434998,300 95.434998,300 95.434998,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 219.97,0 219.97,0 219.97,0 204.625,0 204.625,0 z M236.625,0 C236.625,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 44.985001,300 44.985001,300 44.985001,300 63.419998,300 63.419998,300 63.419998,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 255.04999,0 255.04999,0 255.04999,0 236.625,0 236.625,0 z">
-               <Path.Fill>
-                  <RadialGradientBrush>
-                     <GradientStop Color="#0CFFFFFF"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#19FFFFFF"
-                                   Offset="0"/>
-                  </RadialGradientBrush>
-               </Path.Fill>
-            </Path>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- sunBlueBrush -->
-   <VisualBrush x:Key="sunBlueBrush">
-      <VisualBrush.Visual>
-         <Grid>
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="1.158"
-                                           ScaleY="1.158"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="0"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0"
-                                               Y="0"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#FFFFFCE8"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FF00A6FF"
-                                   Offset="0.833"/>
-
-                     <GradientStop Color="#FFCBFF8C"
-                                   Offset="0.426"/>
-
-                     <GradientStop Color="#FF0083C9"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Path Stretch="Fill"
-                  Data="M25.144999,300 C25.144999,300 156.25999,143.745 156.25999,143.745 156.25999,143.745 300,0 300,0 300,0 276.875,0 276.875,0 276.875,0 156.25999,143.745 156.25999,143.745 156.25999,143.745 0,300 0,300 0,300 25.144999,300 25.144999,300 z M300,24.129999 C300,24.129999 157.245,143.91499 157.245,143.91499 157.245,143.91499 0,254.01999 0,254.01999 0,254.01999 0,275.85999 0,275.85999 0,275.85999 157.245,143.91499 157.245,143.91499 157.245,143.91499 300,43.959999 300,43.959999 300,43.959999 300,24.129999 300,24.129999 z M300,63.379997 C300,63.379997 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,219.92499 0,219.92499 0,219.92499 0,236.59 0,236.59 0,236.59 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,80.034996 300,80.034996 300,80.034996 300,63.379997 300,63.379997 z M300,95.379997 C300,95.379997 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,190.16499 0,190.16499 0,190.16499 0,204.56999 0,204.56999 0,204.56999 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,109.78 300,109.78 300,109.78 300,95.379997 300,95.379997 z M300,123.52 C300,123.52 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,163.08499 0,163.08499 0,163.08499 0,176.41499 0,176.41499 0,176.41499 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,136.84 300,136.84 300,136.84 300,123.52 300,123.52 z M300,150 C300,150 150.02,150 150.02,150 150.02,150 0,136.875 0,136.875 0,136.875 0,150 0,150 0,150 150.02,150 150.02,150 150.02,150 300,163.12 300,163.12 300,163.12 300,150 300,150 z M300,176.53 C300,176.53 149.545,150 149.545,150 149.545,150 0,109.93 0,109.93 0,109.93 0,123.63 0,123.63 0,123.63 149.545,150 149.545,150 149.545,150 300,190.315 300,190.315 300,190.315 300,176.53 300,176.53 z M300,204.58 C300,204.58 150.045,150 150.045,150 150.045,150 0,80.034996 0,80.034996 0,80.034996 0,95.389999 0,95.389999 0,95.389999 150.045,150 150.045,150 150.045,150 300,219.92499 300,219.92499 300,219.92499 300,204.58 300,204.58 z M300,236.58 C300,236.58 150.045,150 150.045,150 150.045,150 0,44.939999 0,44.939999 0,44.939999 0,63.375 0,63.375 0,63.375 150.045,150 150.045,150 150.045,150 300,255 300,255 300,255 300,236.58 300,236.58 z M143.83,143.785 C143.83,143.785 300,299.95999 300,299.95999 300,299.95999 300,274.82999 300,274.82999 300,274.82999 143.83,143.785 143.83,143.785 143.83,143.785 0.039999999,0 0.039999999,0 0.039999999,0 0,0 0,0 0,0 0,23.1 0,23.1 0,23.1 143.83,143.785 143.83,143.785 z M275.07001,300 C275.07001,300 154.27499,156.045 154.27499,156.045 154.27499,156.045 45.009998,0 45.009998,0 45.009998,0 23.34,0 23.34,0 23.34,0 154.27499,156.045 154.27499,156.045 154.27499,156.045 255.075,300 255.075,300 255.075,300 275.07001,300 275.07001,300 z M236.64499,300 C236.64499,300 150.045,150 150.045,150 150.045,150 80.095001,0 80.095001,0 80.095001,0 63.439999,0 63.439999,0 63.439999,0 150.045,150 150.045,150 150.045,150 219.98999,300 219.98999,300 219.98999,300 236.64499,300 236.64499,300 z M204.64,300 C204.64,300 150.045,150 150.045,150 150.045,150 109.85,0 109.85,0 109.85,0 95.449997,0 95.449997,0 95.449997,0 150.045,150 150.045,150 150.045,150 190.235,300 190.235,300 190.235,300 204.64,300 204.64,300 z M176.495,300 C176.495,300 150.045,150 150.045,150 150.045,150 136.92,0 136.92,0 136.92,0 123.59499,0 123.59499,0 123.59499,0 150.045,150 150.045,150 150.045,150 163.16499,300 163.16499,300 163.16499,300 176.495,300 176.495,300 z M150.045,300 C150.045,300 150.045,149.98 150.045,149.98 150.045,149.98 163.16499,0 163.16499,0 163.16499,0 150.045,0 150.045,0 150.045,0 150.045,149.98 150.045,149.98 150.045,149.98 136.92,300 136.92,300 136.92,300 150.045,300 150.045,300 z M123.59,300 C123.59,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 190.22499,0 190.22499,0 190.22499,0 176.485,0 176.485,0 176.485,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 109.84,300 109.84,300 109.84,300 123.59,300 123.59,300 z M204.625,0 C204.625,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 80.080002,300 80.080002,300 80.080002,300 95.434998,300 95.434998,300 95.434998,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 219.97,0 219.97,0 219.97,0 204.625,0 204.625,0 z M236.625,0 C236.625,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 44.985001,300 44.985001,300 44.985001,300 63.419998,300 63.419998,300 63.419998,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 255.04999,0 255.04999,0 255.04999,0 236.625,0 236.625,0 z">
-               <Path.Fill>
-                  <RadialGradientBrush>
-                     <GradientStop Color="#19FFFFFF"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="0"/>
-                  </RadialGradientBrush>
-               </Path.Fill>
-            </Path>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-
-   <!-- sunOrangeBrush -->
-   <VisualBrush x:Key="sunOrangeBrush">
-      <VisualBrush.Visual>
-         <Grid>
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <RadialGradientBrush.RelativeTransform>
-                        <TransformGroup>
-                           <ScaleTransform CenterX="0.5"
-                                           CenterY="0.5"
-                                           ScaleX="1.258"
-                                           ScaleY="1.258"/>
-
-                           <SkewTransform AngleX="0"
-                                          AngleY="0"
-                                          CenterX="0.5"
-                                          CenterY="0.5"/>
-
-                           <RotateTransform Angle="0"
-                                            CenterX="0.5"
-                                            CenterY="0.5"/>
-
-                           <TranslateTransform X="0"
-                                               Y="0"/>
-                        </TransformGroup>
-                     </RadialGradientBrush.RelativeTransform>
-
-                     <GradientStop Color="#FFFFDA00"
-                                   Offset="0"/>
-
-                     <GradientStop Color="#FFFF8800"
-                                   Offset="1"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border>
-               <Border.Background>
-                  <RadialGradientBrush>
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#CCFFFFFF"
-                                   Offset="0"/>
-                  </RadialGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Path Stretch="Fill"
-                  Data="M25.144999,300 C25.144999,300 156.25999,143.745 156.25999,143.745 156.25999,143.745 300,0 300,0 300,0 276.875,0 276.875,0 276.875,0 156.25999,143.745 156.25999,143.745 156.25999,143.745 0,300 0,300 0,300 25.144999,300 25.144999,300 z M300,24.129999 C300,24.129999 157.245,143.91499 157.245,143.91499 157.245,143.91499 0,254.01999 0,254.01999 0,254.01999 0,275.85999 0,275.85999 0,275.85999 157.245,143.91499 157.245,143.91499 157.245,143.91499 300,43.959999 300,43.959999 300,43.959999 300,24.129999 300,24.129999 z M300,63.379997 C300,63.379997 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,219.92499 0,219.92499 0,219.92499 0,236.59 0,236.59 0,236.59 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,80.034996 300,80.034996 300,80.034996 300,63.379997 300,63.379997 z M300,95.379997 C300,95.379997 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,190.16499 0,190.16499 0,190.16499 0,204.56999 0,204.56999 0,204.56999 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,109.78 300,109.78 300,109.78 300,95.379997 300,95.379997 z M300,123.52 C300,123.52 150.045,149.95999 150.045,149.95999 150.045,149.95999 0,163.08499 0,163.08499 0,163.08499 0,176.41499 0,176.41499 0,176.41499 150.045,149.95999 150.045,149.95999 150.045,149.95999 300,136.84 300,136.84 300,136.84 300,123.52 300,123.52 z M300,150 C300,150 150.02,150 150.02,150 150.02,150 0,136.875 0,136.875 0,136.875 0,150 0,150 0,150 150.02,150 150.02,150 150.02,150 300,163.12 300,163.12 300,163.12 300,150 300,150 z M300,176.53 C300,176.53 149.545,150 149.545,150 149.545,150 0,109.93 0,109.93 0,109.93 0,123.63 0,123.63 0,123.63 149.545,150 149.545,150 149.545,150 300,190.315 300,190.315 300,190.315 300,176.53 300,176.53 z M300,204.58 C300,204.58 150.045,150 150.045,150 150.045,150 0,80.034996 0,80.034996 0,80.034996 0,95.389999 0,95.389999 0,95.389999 150.045,150 150.045,150 150.045,150 300,219.92499 300,219.92499 300,219.92499 300,204.58 300,204.58 z M300,236.58 C300,236.58 150.045,150 150.045,150 150.045,150 0,44.939999 0,44.939999 0,44.939999 0,63.375 0,63.375 0,63.375 150.045,150 150.045,150 150.045,150 300,255 300,255 300,255 300,236.58 300,236.58 z M143.83,143.785 C143.83,143.785 300,299.95999 300,299.95999 300,299.95999 300,274.82999 300,274.82999 300,274.82999 143.83,143.785 143.83,143.785 143.83,143.785 0.039999999,0 0.039999999,0 0.039999999,0 0,0 0,0 0,0 0,23.1 0,23.1 0,23.1 143.83,143.785 143.83,143.785 z M275.07001,300 C275.07001,300 154.27499,156.045 154.27499,156.045 154.27499,156.045 45.009998,0 45.009998,0 45.009998,0 23.34,0 23.34,0 23.34,0 154.27499,156.045 154.27499,156.045 154.27499,156.045 255.075,300 255.075,300 255.075,300 275.07001,300 275.07001,300 z M236.64499,300 C236.64499,300 150.045,150 150.045,150 150.045,150 80.095001,0 80.095001,0 80.095001,0 63.439999,0 63.439999,0 63.439999,0 150.045,150 150.045,150 150.045,150 219.98999,300 219.98999,300 219.98999,300 236.64499,300 236.64499,300 z M204.64,300 C204.64,300 150.045,150 150.045,150 150.045,150 109.85,0 109.85,0 109.85,0 95.449997,0 95.449997,0 95.449997,0 150.045,150 150.045,150 150.045,150 190.235,300 190.235,300 190.235,300 204.64,300 204.64,300 z M176.495,300 C176.495,300 150.045,150 150.045,150 150.045,150 136.92,0 136.92,0 136.92,0 123.59499,0 123.59499,0 123.59499,0 150.045,150 150.045,150 150.045,150 163.16499,300 163.16499,300 163.16499,300 176.495,300 176.495,300 z M150.045,300 C150.045,300 150.045,149.98 150.045,149.98 150.045,149.98 163.16499,0 163.16499,0 163.16499,0 150.045,0 150.045,0 150.045,0 150.045,149.98 150.045,149.98 150.045,149.98 136.92,300 136.92,300 136.92,300 150.045,300 150.045,300 z M123.59,300 C123.59,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 190.22499,0 190.22499,0 190.22499,0 176.485,0 176.485,0 176.485,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 109.84,300 109.84,300 109.84,300 123.59,300 123.59,300 z M204.625,0 C204.625,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 80.080002,300 80.080002,300 80.080002,300 95.434998,300 95.434998,300 95.434998,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 219.97,0 219.97,0 219.97,0 204.625,0 204.625,0 z M236.625,0 C236.625,0 150.045,149.95999 150.045,149.95999 150.045,149.95999 44.985001,300 44.985001,300 44.985001,300 63.419998,300 63.419998,300 63.419998,300 150.045,149.95999 150.045,149.95999 150.045,149.95999 255.04999,0 255.04999,0 255.04999,0 236.625,0 236.625,0 z" >
-               <Path.Fill>
-                  <RadialGradientBrush>
-                     <GradientStop Color="#19FFFFFF"
-                                   Offset="1"/>
-
-                     <GradientStop Color="#00FFFFFF"
-                                   Offset="0"/>
-                  </RadialGradientBrush>
-               </Path.Fill>
-            </Path>
-         </Grid>
-      </VisualBrush.Visual>
-   </VisualBrush>
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml.cs
deleted file mode 100644
index 2f4b3e2a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal partial class DataGridControlBackgroundBrushesResources : ResourceDictionary
-  {
-    public DataGridControlBackgroundBrushesResources()
-    {
-      this.InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs
deleted file mode 100644
index 07bf8c9e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs
+++ /dev/null
@@ -1,1179 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Wpf.DataGrid.Converters;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class DataGridScrollViewer : ScrollViewer
-  {
-    static DataGridScrollViewer()
-    {
-      DataGridControl.ParentDataGridControlPropertyKey.OverrideMetadata( typeof( DataGridScrollViewer ), new FrameworkPropertyMetadata( new PropertyChangedCallback( OnParentDataGridChanged ) ) );
-    }
-
-    internal DataGridScrollViewer()
-    {
-      this.Loaded += new RoutedEventHandler( OnLoaded );
-      this.Unloaded += new RoutedEventHandler( OnUnloaded );
-      m_templateHelper = new ScrollViewerTemplateHelper( this, this.DragScrollBegin, this.DragScrollEnd );
-    }
-
-    #region SynchronizedScrollViewerPosition Attached Property
-
-    public static readonly DependencyProperty SynchronizedScrollViewerPositionProperty = DependencyProperty.RegisterAttached(
-      "SynchronizedScrollViewerPosition",
-      typeof( SynchronizedScrollViewerPosition ),
-      typeof( TableViewScrollViewer ),
-      new UIPropertyMetadata( SynchronizedScrollViewerPosition.None ) );
-
-    public static SynchronizedScrollViewerPosition GetSynchronizedScrollViewerPosition( DependencyObject obj )
-    {
-      return ( SynchronizedScrollViewerPosition )obj.GetValue( TableViewScrollViewer.SynchronizedScrollViewerPositionProperty );
-    }
-
-    public static void SetSynchronizedScrollViewerPosition( DependencyObject obj, SynchronizedScrollViewerPosition value )
-    {
-      obj.SetValue( TableViewScrollViewer.SynchronizedScrollViewerPositionProperty, value );
-    }
-
-    #endregion SynchronizedScrollViewerPosition Attached Property
-
-    #region SynchronizedScrollViewersWidth Property
-
-    internal double SynchronizedScrollViewersWidth
-    {
-      get
-      {
-        double maxValue = 0d;
-
-        foreach( SynchronizedScrollViewer ssv in m_childScrollViewers )
-        {
-          if( ssv.ScrollOrientation == ScrollOrientation.Horizontal )
-          {
-            if( ssv.ExtentWidth > maxValue )
-            {
-              maxValue = ssv.ExtentWidth;
-            }
-          }
-        }
-
-        return maxValue;
-      }
-    }
-
-    #endregion
-
-    #region SynchronizedScrollViewersHeight Property
-
-    internal double SynchronizedScrollViewersHeight
-    {
-      get
-      {
-        double maxValue = 0d;
-
-        foreach( SynchronizedScrollViewer ssv in m_childScrollViewers )
-        {
-          if( ssv.ScrollOrientation == ScrollOrientation.Vertical )
-          {
-            if( ssv.ExtentHeight > maxValue )
-            {
-              maxValue = ssv.ExtentHeight;
-            }
-          }
-        }
-
-        return maxValue;
-      }
-    }
-
-    #endregion
-
-    #region SynchronizedScrollViewers Property
-
-    internal IEnumerable<SynchronizedScrollViewer> SynchronizedScrollViewers
-    {
-      get
-      {
-        return m_childScrollViewers;
-      }
-    }
-
-    private static readonly DependencyProperty SynchronizedScrollViewerExtentProperty = DependencyProperty.Register(
-      "SynchronizedScrollViewerExtent",
-      typeof( double ),
-      typeof( DataGridScrollViewer ),
-      new FrameworkPropertyMetadata( new PropertyChangedCallback( DataGridScrollViewer.OnSynchronizedScrollViewerExtentPropertyChanged ) ) );
-
-    private static void OnSynchronizedScrollViewerExtentPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridScrollViewer dataGridScrollViewer = o as DataGridScrollViewer;
-
-      if( dataGridScrollViewer != null )
-      {
-        FrameworkElement panel = dataGridScrollViewer.ScrollInfo as FrameworkElement;
-
-        if( panel != null )
-        {
-          panel.InvalidateMeasure();
-        }
-      }
-    }
-
-    internal int MeasureVersion
-    {
-      get
-      {
-        return m_measureVersion;
-      }
-    }
-
-    #endregion
-
-    #region HorizontalScrollBar Property
-
-    protected internal ScrollBar HorizontalScrollBar
-    {
-      get
-      {
-        return m_templateHelper.HorizontalScrollBar;
-      }
-    }
-
-    #endregion
-
-    #region VerticalScrollBar Property
-
-    protected internal ScrollBar VerticalScrollBar
-    {
-      get
-      {
-        return m_templateHelper.VerticalScrollBar;
-      }
-    }
-
-    #endregion
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      this.ClearScrollViewerList();
-      m_deferableChilds.Clear();
-
-      this.PopulateScrollViewerList( this, m_childScrollViewers );
-      this.FindAllDeferableChildren( this, m_deferableChilds );
-
-      m_templateHelper.RefreshTemplate();
-
-      this.UpdateChildScrollViewers();
-    }
-
-    internal void HandlePageUpNavigation()
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
-      FrameworkElement hostPanel = dataGridControl.ItemsHost;
-
-      if( hostPanel != null )
-      {
-        // First thing to do here is the force the relayout of the ItemsHostPanel so that the target element gets "visible"
-        hostPanel.UpdateLayout();
-
-        FrameworkElement firstVisibleItem = ScrollViewerHelper.GetFirstVisibleContainer(
-          dataGridControl, hostPanel, this );
-
-        if( firstVisibleItem != null )
-        {
-          DataGridContext firstVisibleItemDataGridContext = DataGridControl.GetDataGridContext( firstVisibleItem );
-
-          object oldItem = dataGridContext.InternalCurrentItem;
-
-          bool focused;
-
-          // Make the first visible item the current and focused.
-          // in order to cancel the current column in mixed mode when paged-Up
-          if( dataGridControl.NavigationBehavior == NavigationBehavior.RowOrCell )
-            focused = dataGridControl.SetFocusHelper(
-            firstVisibleItem, null, true, true );
-          else
-          {
-            focused = dataGridControl.SetFocusHelper(
-              firstVisibleItem, firstVisibleItemDataGridContext.CurrentColumn, true, true );
-          }
-
-          if( ( ( !focused ) || ( oldItem == firstVisibleItemDataGridContext.InternalCurrentItem ) )
-            && ( !dataGridControl.HasValidationError ) )
-          {
-            // The current item was already the first item, move focus up.
-            DataGridItemsHost.ProcessMoveFocus( Key.Up );
-          }
-        }
-      }
-    }
-
-    internal void HandlePageDownNavigation()
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
-      FrameworkElement hostPanel = dataGridControl.ItemsHost;
-
-      if( hostPanel != null )
-      {
-        // First thing to do here is the force the relayout of the ItemsHostPanel so that the target element gets "visible"
-        hostPanel.UpdateLayout();
-
-        // Then retrieve the last visible item in this panel
-        FrameworkElement lastVisibleItem = ScrollViewerHelper.GetLastVisibleContainer(
-          dataGridControl, hostPanel, this ) as FrameworkElement;
-
-        if( lastVisibleItem != null )
-        {
-          DataGridContext lastVisibleItemDataGridContext = DataGridControl.GetDataGridContext( lastVisibleItem );
-
-          object oldItem = dataGridContext.InternalCurrentItem;
-
-          bool focused;
-
-          // Make the last visible item the current and focused.
-          // in order to cancel the current column in mixed mode when paged-Down
-          if( dataGridControl.NavigationBehavior == NavigationBehavior.RowOrCell )
-            focused = dataGridControl.SetFocusHelper(
-            lastVisibleItem, null, true, true );
-          else
-          {
-            focused = dataGridControl.SetFocusHelper(
-              lastVisibleItem, lastVisibleItemDataGridContext.CurrentColumn, true, true );
-          }
-
-          if( ( ( !focused ) || ( oldItem == lastVisibleItemDataGridContext.InternalCurrentItem ) )
-            && ( !dataGridControl.HasValidationError ) )
-          {
-            // The current item was already the first item, move focus down.
-            DataGridItemsHost.ProcessMoveFocus( Key.Down );
-          }
-        }
-      }
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      base.OnKeyDown( e );
-
-      if( e.Handled )
-        return;
-
-      switch( e.Key )
-      {
-        // Handle the System key definition (basically with ALT key pressed)
-        case Key.System:
-          this.HandleSystemKey( e );
-          break;
-
-        case Key.PageUp:
-          this.HandlePageUpKey( e );
-          break;
-
-        case Key.PageDown:
-          this.HandlePageDownKey( e );
-          break;
-
-        case Key.Home:
-          this.HandlePageHomeKey( e );
-          break;
-
-        case Key.End:
-          this.HandlePageEndKey( e );
-          break;
-
-        case Key.Up:
-          this.HandleUpKey( e );
-          break;
-
-        case Key.Down:
-          this.HandleDownKey( e );
-          break;
-
-        case Key.Left:
-          this.HandleLeftKey( e );
-          break;
-
-        case Key.Right:
-          this.HandleRightKey( e );
-          break;
-
-        default:
-          base.OnKeyDown( e );
-          break;
-      }
-    }
-
-    protected virtual void HandleSystemKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      PagingBehavior pagingBehavior = dataGridContext.DataGridControl.PagingBehavior;
-
-      // If Alt-PageDown was pressed
-      if( e.SystemKey == Key.PageDown )
-      {
-        // Process Paging in opposed axis
-        if( pagingBehavior == PagingBehavior.TopToBottom )
-        {
-          this.PageRight();
-        }
-        else
-        {
-          this.PageDown();
-        }
-
-        e.Handled = true;
-      }
-      // If Alt-PageUp was pressed
-      else if( e.SystemKey == Key.PageUp )
-      {
-        // Process scrolling in opposed axis
-        if( pagingBehavior == PagingBehavior.TopToBottom )
-        {
-          this.PageLeft();
-        }
-        else
-        {
-          this.PageUp();
-        }
-
-        e.Handled = true;
-      }
-      else
-      {
-        // If neither Alt-PageUp or alt-PageDown, flag the input as non-processed.
-        e.Handled = false;
-      }
-    }
-
-    protected virtual void HandlePageUpKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
-      PagingBehavior pagingBehavior = dataGridControl.PagingBehavior;
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-
-      //If the Ctrl Modifier was held at the same time
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        //scroll to absolute end of the scroll viewer
-        if( pagingBehavior == PagingBehavior.TopToBottom )
-        {
-          this.ScrollToTop();
-        }
-        else
-        {
-          this.ScrollToLeftEnd();
-        }
-
-        // Then handle new selection!
-        if( navigationBehavior != NavigationBehavior.None )
-          this.HandlePageUpNavigation();
-      }
-      // No special modifiers were held
-      else
-      {
-        // Retrieve first visible item
-        FrameworkElement firstVisibleItem = ScrollViewerHelper.GetFirstVisibleContainer(
-          dataGridControl, dataGridControl.ItemsHost, this );
-
-        if( firstVisibleItem != null )
-        {
-          // There is an identified weakness with the IsKeyboardFocusWithin property where 
-          // it cannot tell if the focus is within a Popup which is within the element
-          // This has been identified, and only the places where it caused problems 
-          // were fixed... This comment is only here to remind developpers of the flaw
-
-          // If the item has keyboard focus
-          if( ( firstVisibleItem.IsKeyboardFocusWithin ) || ( firstVisibleItem.IsKeyboardFocused )
-              || ( navigationBehavior == NavigationBehavior.None ) )
-          {
-            // Then scroll
-            if( pagingBehavior == PagingBehavior.TopToBottom )
-            {
-              this.PageUp();
-            }
-            else
-            {
-              this.PageLeft();
-            }
-          }
-
-          // And process new selection
-          if( navigationBehavior != NavigationBehavior.None )
-            this.HandlePageUpNavigation();
-        }
-        else
-        {
-          // Normaly for when we are in dataGridControl.NavigationBehavior == NavigationBehavior.None
-          if( pagingBehavior == PagingBehavior.TopToBottom )
-          {
-            this.PageUp();
-          }
-          else
-          {
-            this.PageLeft();
-          }
-        }
-      }
-
-      e.Handled = true;
-    }
-
-    protected virtual void HandlePageDownKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      DataGridControl dataGridControl = dataGridContext.DataGridControl;
-      PagingBehavior pagingBehavior = dataGridControl.PagingBehavior;
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-
-      // If the Ctrl Modifier was held at the same time
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        // Scroll to absolute end of the scroll viewer
-        if( pagingBehavior == PagingBehavior.TopToBottom )
-        {
-          this.ScrollToBottom();
-        }
-        else
-        {
-          this.ScrollToRightEnd();
-        }
-
-        // Then handle new selection!
-        if( navigationBehavior != NavigationBehavior.None )
-          this.HandlePageDownNavigation();
-      }
-      //No special modifiers were held
-      else
-      {
-        FrameworkElement lastVisibleContainer = ScrollViewerHelper.GetLastVisibleContainer(
-          dataGridControl, dataGridControl.ItemsHost, this );
-
-        if( lastVisibleContainer != null )
-        {
-          // There is an identified weakness with the IsKeyboardFocusWithin property where 
-          // it cannot tell if the focus is within a Popup which is within the element
-          // This has been identified, and only the places where it caused problems 
-          // were fixed... This comment is only here to remind developpers of the flaw
-
-          // If the item has keyboard focus
-          if( ( lastVisibleContainer.IsKeyboardFocusWithin ) || ( lastVisibleContainer.IsKeyboardFocused )
-              || ( navigationBehavior == NavigationBehavior.None ) )
-          {
-            // Then scroll
-            if( pagingBehavior == PagingBehavior.TopToBottom )
-            {
-              this.PageDown();
-            }
-            else
-            {
-              this.PageRight();
-            }
-          }
-
-          //and process new selection
-          if( navigationBehavior != NavigationBehavior.None )
-            this.HandlePageDownNavigation();
-        }
-        else
-        {
-          // Normaly for when we are in dataGridControl.NavigationBehavior == NavigationBehavior.None
-          if( pagingBehavior == PagingBehavior.TopToBottom )
-          {
-            this.PageDown();
-          }
-          else
-          {
-            this.PageRight();
-          }
-        }
-      }
-
-      e.Handled = true;
-    }
-
-    protected virtual void HandlePageHomeKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      PagingBehavior pagingBehavior = dataGridContext.DataGridControl.PagingBehavior;
-      NavigationBehavior navigationBehavior = dataGridContext.DataGridControl.NavigationBehavior;
-
-      ColumnBase currentColumn = dataGridContext.CurrentColumn;
-
-      if( ( ( navigationBehavior == NavigationBehavior.CellOnly ) || ( navigationBehavior == NavigationBehavior.RowOrCell ) ) && ( currentColumn != null ) )
-      {
-        int oldCurrentIndex = currentColumn.Index;
-
-        NavigationHelper.MoveFocusToFirstVisibleColumn( dataGridContext );
-
-        var columnVirtualizationManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
-
-        //if the first focusable column is is within the viewport, scroll so 0d offset, otherwise, bringIntoView
-        bool isFixedColumn = ( columnVirtualizationManager == null ) ? false : columnVirtualizationManager.GetFixedFieldNames().Contains( currentColumn.FieldName );
-
-        if( ( ( this.IsCellsOffsetNeedReset( dataGridContext ) ) && ( oldCurrentIndex == currentColumn.Index ) ) || ( isFixedColumn ) )
-        {
-          this.Dispatcher.BeginInvoke( DispatcherPriority.Normal, new Action( this.ScrollToLeftEnd ) );
-        }
-
-        if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-        {
-          if( pagingBehavior == PagingBehavior.TopToBottom )
-          {
-            this.ScrollToTop();
-          }
-          else
-          {
-            this.ScrollToLeftEnd();
-          }
-
-          this.HandlePageUpNavigation();
-        }
-      }
-      else
-      {
-        if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-        {
-          this.ScrollToTop();
-          this.ScrollToLeftEnd();
-
-          //than handle new selection!
-          if( navigationBehavior != NavigationBehavior.None )
-          {
-            this.HandlePageUpNavigation();
-          }
-        }
-        else
-        {
-          if( pagingBehavior == PagingBehavior.TopToBottom )
-          {
-            this.ScrollToLeftEnd();
-          }
-          else
-          {
-            this.ScrollToTop();
-          }
-        }
-      }
-
-      e.Handled = true;
-    }
-
-    protected virtual void HandlePageEndKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      PagingBehavior pagingBehavior = dataGridContext.DataGridControl.PagingBehavior;
-      NavigationBehavior navigationBehavior = dataGridContext.DataGridControl.NavigationBehavior;
-
-      ColumnBase CurrentColumn = dataGridContext.CurrentColumn;
-
-      if( ( ( navigationBehavior == NavigationBehavior.CellOnly ) || ( navigationBehavior == NavigationBehavior.RowOrCell ) ) && ( CurrentColumn != null ) )
-      {
-        int oldCurrentIndex = CurrentColumn.Index;
-
-        NavigationHelper.MoveFocusToLastVisibleColumn( dataGridContext );
-
-        //if the last focusable column is is within the viewport, scroll to Extended offset, otherwise, bringIntoView
-        if( ( this.IsCellsOffsetNeedReset( dataGridContext ) ) && ( oldCurrentIndex == CurrentColumn.Index ) )
-        {
-          this.Dispatcher.BeginInvoke( DispatcherPriority.Normal, new Action( this.ScrollToRightEnd ) );
-        }
-
-        if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-        {
-          if( pagingBehavior == PagingBehavior.TopToBottom )
-          {
-            this.ScrollToBottom();
-          }
-          else
-          {
-            this.ScrollToRightEnd();
-          }
-
-          this.HandlePageDownNavigation();
-        }
-      }
-      else
-      {
-        if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-        {
-          this.ScrollToBottom();
-          this.ScrollToRightEnd();
-
-          // Than handle new selection!
-          if( navigationBehavior != NavigationBehavior.None )
-          {
-            this.HandlePageDownNavigation();
-          }
-        }
-        else
-        {
-          if( pagingBehavior == PagingBehavior.TopToBottom )
-          {
-            this.ScrollToRightEnd();
-          }
-          else
-          {
-            this.ScrollToBottom();
-          }
-        }
-      }
-
-      e.Handled = true;
-    }
-
-    private bool IsCellsOffsetNeedReset( DataGridContext dataGridContext )
-    {
-      var columnVirtualizationManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
-      if( columnVirtualizationManager == null )
-        return false;
-
-      Cell targetCell = dataGridContext.CurrentCell;
-
-      // if the targetCell is null, it means we are on a header or a non focusable item; thus we want to scroll as the "no navigation" behavior
-      if( targetCell == null )
-        return true;
-
-      FixedCellPanel fixedCellPanel = targetCell.ParentRow.CellsHostPanel as FixedCellPanel;
-      DataGridItemsHost itemsHost = dataGridContext.DataGridControl.ItemsHost as DataGridItemsHost;
-
-      double viewportWidth = this.ViewportWidth;
-      double fixedColumnWidth = columnVirtualizationManager.FixedColumnsWidth;
-      double fixedColumnSplitterWidth = 0;
-      double cellsWidth = targetCell.ParentColumn.Width;
-
-      Point cellToScrollingCellsDecorator = targetCell.TranslatePoint( new Point(), fixedCellPanel.ScrollingCellsDecorator );
-
-      bool leftEdgeOutOfViewPort;
-
-      // verify if the cell's left edge is visible in the viewPort
-      leftEdgeOutOfViewPort = ( cellToScrollingCellsDecorator.X < 0 ) ? true : false;
-
-      // Verify if the Cell's right edge is visible in the ViewPort
-      Point cellToItemsHost = targetCell.TranslatePoint( new Point( cellsWidth, 0 ), itemsHost );
-
-      // If the right edge is out of Viewport, ensure not to call the resetHorizontalOffset
-      bool rightEdgeOutOfViewPort = ( ( cellToItemsHost.X - viewportWidth ) > 0 ) ? true : false;
-
-      bool resetHorizontalOffset = false;
-
-      // if the cell is inside the viewPort or if one of the edges of the cell are outside the portView but the the viewPort is not wide enough to contain the cell
-      if( ( ( !rightEdgeOutOfViewPort ) && ( !leftEdgeOutOfViewPort ) )
-        || ( ( ( rightEdgeOutOfViewPort ) || ( leftEdgeOutOfViewPort ) )
-        && ( ( cellsWidth - Math.Abs( cellToScrollingCellsDecorator.X ) ) >= ( viewportWidth - fixedColumnWidth - fixedColumnSplitterWidth ) ) ) )
-      {
-        resetHorizontalOffset = true;
-      }
-
-      return resetHorizontalOffset;
-    }
-
-    protected virtual void HandleUpKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      bool hasValidationError = dataGridContext.DataGridControl.HasValidationError;
-
-      if( !hasValidationError )
-      {
-        this.LineUp();
-      }
-
-      e.Handled = true;
-    }
-
-    protected virtual void HandleDownKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      bool hasValidationError = dataGridContext.DataGridControl.HasValidationError;
-
-      if( !hasValidationError )
-      {
-        this.LineDown();
-      }
-
-      e.Handled = true;
-    }
-
-    protected virtual void HandleLeftKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      FlowDirection flowDirection = dataGridContext.DataGridControl.FlowDirection;
-      bool hasValidationError = dataGridContext.DataGridControl.HasValidationError;
-
-      if( !hasValidationError )
-      {
-        if( flowDirection == FlowDirection.LeftToRight )
-        {
-          this.LineLeft();
-        }
-        else
-        {
-          this.LineRight();
-        }
-      }
-
-      e.Handled = true;
-    }
-
-    protected virtual void HandleRightKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      DataGridContext dataGridContext = null;
-
-      if( e.OriginalSource != null )
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( e.OriginalSource as DependencyObject );
-      }
-      else
-      {
-        dataGridContext = DataGridControl.GetDataGridContext( this );
-      }
-
-      if( dataGridContext == null )
-        return;
-
-      FlowDirection flowDirection = dataGridContext.DataGridControl.FlowDirection;
-      bool hasValidationError = dataGridContext.DataGridControl.HasValidationError;
-
-      if( !hasValidationError )
-      {
-        if( flowDirection == FlowDirection.LeftToRight )
-        {
-          this.LineRight();
-        }
-        else
-        {
-          this.LineLeft();
-        }
-      }
-
-      e.Handled = true;
-    }
-
-    protected override void OnScrollChanged( ScrollChangedEventArgs e )
-    {
-      base.OnScrollChanged( e );
-
-      this.UpdateChildScrollViewers();
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      unchecked
-      {
-        m_measureVersion++;
-      }
-
-      return base.MeasureOverride( constraint );
-    }
-
-    private static void OnParentDataGridChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridScrollViewer scrollViewer = sender as DataGridScrollViewer;
-      if( scrollViewer != null )
-      {
-        if( e.NewValue == null )
-        {
-          scrollViewer.ClearScrollViewerList();
-        }
-      }
-    }
-
-    private void OnLoaded( object sender, RoutedEventArgs e )
-    {
-      //Placing the "Populate" call here is redundant from the OnApplyTemplate() call, but still required to prevent any possible case
-      //where the DataGridScrollViewer is removed/added from/to its visual parent without having its template re-applied.
-      //the if statement is there to ensure that we are not doing the job 2 times 
-      //(if the list if not empty in the loaded event, its because OnApplyTemplate was called)
-      if( m_childScrollViewers.Count == 0 )
-      {
-        this.PopulateScrollViewerList( this, m_childScrollViewers );
-      }
-    }
-
-    private void OnUnloaded( object sender, RoutedEventArgs e )
-    {
-      //when the ScrollViewer gets unloaded, clear the events (we don't have other hooks that indicate the ScrollViewer 
-      //is deconnected from the DAtaGridControl's Template)
-      this.ClearScrollViewerList();
-    }
-
-    private void DragScrollBegin( Orientation orientation )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( dataGridContext == null )
-        return;
-
-      DataGridControl parentGridControl = dataGridContext.DataGridControl;
-
-      if( parentGridControl == null || dataGridContext.DataGridControl.ScrollViewer == null )
-        return;
-
-      if( parentGridControl.ItemScrollingBehavior == ItemScrollingBehavior.Deferred )
-      {
-        IDeferableScrollInfoRefresh panel = this.ScrollInfo as IDeferableScrollInfoRefresh;
-
-        if( panel != null )
-        {
-          if( m_deferScrollInfoRefresh != null )
-          {
-            foreach( IDeferableScrollChanged deferable in m_deferableChilds )
-            {
-              deferable.DeferScrollChanged = false;
-            }
-
-            m_deferScrollInfoRefresh.Dispose();
-            m_deferScrollInfoRefresh = null;
-          }
-
-          m_deferScrollInfoRefresh = panel.DeferScrollInfoRefresh( orientation );
-
-          if( m_deferScrollInfoRefresh != null )
-          {
-            foreach( IDeferableScrollChanged deferable in m_deferableChilds )
-            {
-              deferable.DeferScrollChanged = true;
-            }
-          }
-        }
-      }
-    }
-
-    private void DragScrollEnd( Orientation orientation )
-    {
-      if( m_deferScrollInfoRefresh != null )
-      {
-        foreach( IDeferableScrollChanged deferable in m_deferableChilds )
-        {
-          deferable.DeferScrollChanged = false;
-        }
-
-        m_deferScrollInfoRefresh.Dispose();
-        m_deferScrollInfoRefresh = null;
-      }
-    }
-
-    private void ClearScrollViewerList()
-    {
-      BindingOperations.ClearBinding( this, DataGridScrollViewer.SynchronizedScrollViewerExtentProperty );
-      m_childScrollViewers.Clear();
-    }
-
-    private void PopulateScrollViewerList( DependencyObject reference, List<SynchronizedScrollViewer> list )
-    {
-      MultiBinding multiBinding = new MultiBinding();
-      multiBinding.Converter = new SynchronizedScrollViewerMultiConverter();
-
-      this.PopulateScrollViewerListHelper( reference, list, multiBinding );
-
-      BindingOperations.SetBinding( this, DataGridScrollViewer.SynchronizedScrollViewerExtentProperty, multiBinding );
-    }
-
-    private void PopulateScrollViewerListHelper( DependencyObject reference, List<SynchronizedScrollViewer> list, MultiBinding multiBinding )
-    {
-      if( reference == null )
-        return;
-
-      var childCount = VisualTreeHelper.GetChildrenCount( reference );
-
-      for( int i = 0; i < childCount; i++ )
-      {
-        var child = VisualTreeHelper.GetChild( reference, i );
-        var synchronizedScrollViewer = child as SynchronizedScrollViewer;
-
-        if( synchronizedScrollViewer != null )
-        {
-          var propertyName = String.Empty;
-
-          if( synchronizedScrollViewer.ScrollOrientation == ScrollOrientation.Horizontal )
-          {
-            propertyName = "ExtentWidth";
-          }
-          else
-          {
-            propertyName = "ExtentHeight";
-          }
-
-          var binding = new Binding();
-          binding.Path = new PropertyPath( propertyName );
-          binding.Mode = BindingMode.OneWay;
-          binding.Source = synchronizedScrollViewer;
-
-          multiBinding.Bindings.Add( binding );
-
-          list.Add( synchronizedScrollViewer );
-        }
-        else
-        {
-          this.PopulateScrollViewerListHelper( child, list, multiBinding );
-        }
-      }
-    }
-
-    private void FindAllDeferableChildren( DependencyObject reference, List<IDeferableScrollChanged> list )
-    {
-      if( reference == null )
-        return;
-
-      var childCount = VisualTreeHelper.GetChildrenCount( reference );
-
-      for( int i = 0; i < childCount; i++ )
-      {
-        var child = VisualTreeHelper.GetChild( reference, i );
-        var deferable = child as IDeferableScrollChanged;
-
-        if( deferable != null )
-        {
-          list.Add( deferable );
-        }
-        else
-        {
-          this.FindAllDeferableChildren( child, list );
-        }
-      }
-    }
-
-    private void UpdateChildScrollViewers()
-    {
-      bool isAtTop = ( this.VerticalOffset == 0 );
-      bool isAtLeft = ( this.HorizontalOffset == 0 );
-      bool isAtBottom = ( ( this.VerticalOffset + this.ViewportHeight ) == this.ExtentHeight );
-      bool isAtRight = ( ( this.HorizontalOffset + this.ViewportWidth ) == this.ExtentWidth );
-
-      foreach( SynchronizedScrollViewer scrollViewer in m_childScrollViewers )
-      {
-        SynchronizedScrollViewerPosition position = TableViewScrollViewer.GetSynchronizedScrollViewerPosition( scrollViewer );
-
-        bool handled = false;
-
-        switch( position )
-        {
-          case SynchronizedScrollViewerPosition.Top:
-            if( isAtTop == true )
-            {
-              KeyboardNavigation.SetDirectionalNavigation( scrollViewer, KeyboardNavigationMode.Continue );
-              KeyboardNavigation.SetTabNavigation( scrollViewer, KeyboardNavigationMode.Continue );
-              handled = true;
-            }
-            break;
-          case SynchronizedScrollViewerPosition.Bottom:
-            if( isAtBottom == true )
-            {
-              KeyboardNavigation.SetDirectionalNavigation( scrollViewer, KeyboardNavigationMode.Continue );
-              KeyboardNavigation.SetTabNavigation( scrollViewer, KeyboardNavigationMode.Continue );
-              handled = true;
-            }
-            break;
-          case SynchronizedScrollViewerPosition.Left:
-            if( isAtLeft == true )
-            {
-              KeyboardNavigation.SetDirectionalNavigation( scrollViewer, KeyboardNavigationMode.Continue );
-              KeyboardNavigation.SetTabNavigation( scrollViewer, KeyboardNavigationMode.Continue );
-              handled = true;
-            }
-            break;
-          case SynchronizedScrollViewerPosition.Right:
-            if( isAtRight == true )
-            {
-              KeyboardNavigation.SetDirectionalNavigation( scrollViewer, KeyboardNavigationMode.Continue );
-              KeyboardNavigation.SetTabNavigation( scrollViewer, KeyboardNavigationMode.Continue );
-              handled = true;
-            }
-            break;
-
-          case SynchronizedScrollViewerPosition.None:
-          default:
-            break;
-        }
-
-        if( handled == false )
-        {
-          KeyboardNavigation.SetDirectionalNavigation( scrollViewer, KeyboardNavigationMode.None );
-          KeyboardNavigation.SetTabNavigation( scrollViewer, KeyboardNavigationMode.None );
-        }
-      }
-    }
-
-    private List<SynchronizedScrollViewer> m_childScrollViewers = new List<SynchronizedScrollViewer>();
-    private List<IDeferableScrollChanged> m_deferableChilds = new List<IDeferableScrollChanged>();
-
-    ScrollViewerTemplateHelper m_templateHelper;
-    IDisposable m_deferScrollInfoRefresh; // = null 
-    int m_measureVersion;
-
-    internal interface IDeferableScrollChanged
-    {
-      bool DeferScrollChanged
-      {
-        get;
-        set;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DictionaryTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DictionaryTheme.cs
deleted file mode 100644
index 29b100b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DictionaryTheme.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public abstract class DictionaryTheme : Theme
-  {
-    public DictionaryTheme()
-    {
-    }
-
-    public DictionaryTheme( ResourceDictionary themeResourceDictionary )
-    {
-      m_themeResourceDictionary = themeResourceDictionary;
-      m_themeResourceDictionaryInitialized = true;
-    }
-
-    #region ThemeResourceDictionary Property
-
-    public ResourceDictionary ThemeResourceDictionary
-    {
-      get
-      {
-        return m_themeResourceDictionary;
-      }
-      set
-      {
-        if( m_themeResourceDictionaryInitialized )
-          throw new InvalidOperationException( "An attempt was made to set the ThemeResourceDictionary property when it has already been initialized." );
-
-        m_themeResourceDictionary = value;
-      }
-    }
-
-    private ResourceDictionary m_themeResourceDictionary;
-    private bool m_themeResourceDictionaryInitialized; //false
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs
deleted file mode 100644
index 8efd9a9b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs
+++ /dev/null
@@ -1,2007 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class FixedCellPanel : Panel, IVirtualizingCellsHost, IWeakEventListener
-  {
-    private static readonly TimeSpan MaxProcessDurationTime = TimeSpan.FromMilliseconds( 25d );
-
-    static FixedCellPanel()
-    {
-      FixedCellPanel.MinHeightProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( null, new CoerceValueCallback( FixedCellPanel.CoerceMinHeight ) ) );
-      TextElement.FontFamilyProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
-      TextElement.FontSizeProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
-      TextElement.FontStretchProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
-      TextElement.FontStyleProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
-      TextElement.FontWeightProperty.OverrideMetadata( typeof( FixedCellPanel ), new FrameworkPropertyMetadata( new PropertyChangedCallback( FixedCellPanel.InvalidateMinHeight ) ) );
-    }
-
-    public FixedCellPanel()
-    {
-      // None of the Visual children of the FixedCellPanel will scroll. The needed scrolling as demanded by the parent ScrollViewer
-      // will be manually transferred to the  content (m_scrollingPanel) of the ScrollingCellsDecorator below.
-
-      m_fixedPanel = new FixedCellSubPanel( this );
-
-      m_scrollingPanel = new VirtualizingFixedCellSubPanel( this );
-
-      m_scrollingCellsDecorator = new ScrollingCellsDecorator();
-      m_scrollingCellsDecorator.Child = m_scrollingPanel;
-
-      this.AddVisualChild( m_fixedPanel );
-      this.AddVisualChild( null );
-      this.AddVisualChild( m_scrollingCellsDecorator );
-
-      // Used to get the correct item depending of the ZIndex
-      m_visualChildren.Add( m_fixedPanel );
-      m_visualChildren.Add( null );
-      m_visualChildren.Add( m_scrollingCellsDecorator );
-
-      this.SetCurrentValue( FixedCellPanel.MinHeightProperty, 0d );
-
-      this.LayoutUpdated += new EventHandler( FixedCellPanelLayoutUpdated );
-    }
-
-    #region ColumnStretchMinWidth Property
-
-    public static readonly DependencyProperty ColumnStretchMinWidthProperty = DependencyProperty.Register(
-      "ColumnStretchMinWidth",
-      typeof( double ),
-      typeof( FixedCellPanel ),
-      new UIPropertyMetadata( 50d,
-        new PropertyChangedCallback( FixedCellPanel.ColumnStretchMinWidthChanged ) ),
-        new ValidateValueCallback( TableView.ValidateColumnStretchMinWidthCallback ) );
-
-    public double ColumnStretchMinWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( FixedCellPanel.ColumnStretchMinWidthProperty );
-      }
-      set
-      {
-        this.SetValue( FixedCellPanel.ColumnStretchMinWidthProperty, value );
-      }
-    }
-
-    private static void ColumnStretchMinWidthChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var panel = sender as FixedCellPanel;
-      if( panel == null )
-        return;
-
-      //Do not process merged headers.  Their width is determined by their child columns.
-      if( panel.ParentRow.LevelCache != -1 )
-        return;
-
-      var dataGridContext = DataGridControl.GetDataGridContext( panel );
-      if( dataGridContext == null )
-        return;
-
-      if( ( dataGridContext.VisibleColumns.Count > 0 ) && !dataGridContext.IsAFlattenDetail )
-      {
-        // When ColumnStretchMinWidth changes trigger an update by clearing all DesiredWidth values.
-        foreach( ColumnBase column in dataGridContext.VisibleColumns )
-        {
-          column.ClearValue( Column.DesiredWidthProperty );
-        }
-      }
-    }
-
-    #endregion
-
-    #region ColumnStretchMode Property
-
-    public static readonly DependencyProperty ColumnStretchModeProperty = DependencyProperty.Register(
-      "ColumnStretchMode",
-      typeof( ColumnStretchMode ),
-      typeof( FixedCellPanel ),
-      new UIPropertyMetadata( ColumnStretchMode.None ) );
-
-    public ColumnStretchMode ColumnStretchMode
-    {
-      get
-      {
-        return ( ColumnStretchMode )this.GetValue( FixedCellPanel.ColumnStretchModeProperty );
-      }
-      set
-      {
-        this.SetValue( FixedCellPanel.ColumnStretchModeProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DataGridContext Property
-
-    // DataGridContext is set when IVirtualizingCellsHost.PrepareCellsHost is called and cleared when IVirtualizingCellsHost.ClearContainer is called.
-    // We always use the DataGridContext passed and assert the old one is never referenced
-    internal DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_dataGridContext;
-      }
-    }
-
-    #endregion
-
-    #region Columns Internal Property
-
-    internal ColumnCollection Columns
-    {
-      get
-      {
-        return m_dataGridContext.Columns;
-      }
-    }
-
-    #endregion
-
-    #region ColumnsByVisiblePosition Property
-
-    internal HashedLinkedList<ColumnBase> ColumnsByVisiblePosition
-    {
-      get
-      {
-        return m_dataGridContext.ColumnsByVisiblePosition;
-      }
-    }
-
-    #endregion
-
-    #region VisibleColumns Property
-
-    private ReadOnlyObservableCollection<ColumnBase> VisibleColumns
-    {
-      get
-      {
-        return m_dataGridContext.VisibleColumns;
-      }
-    }
-
-    #endregion
-
-    #region FixedCellCount Property
-
-    public static readonly DependencyProperty FixedCellCountProperty = DependencyProperty.Register(
-      "FixedCellCount",
-      typeof( int ),
-      typeof( FixedCellPanel ),
-      new UIPropertyMetadata(
-        0,
-        new PropertyChangedCallback( FixedCellPanel.FixedCellCountChanged ) ),
-        new ValidateValueCallback( FixedCellPanel.ValidateFixedCellCountCallback ) );
-
-    public int FixedCellCount
-    {
-      get
-      {
-        return ( int )this.GetValue( FixedCellPanel.FixedCellCountProperty );
-      }
-      set
-      {
-        this.SetValue( FixedCellPanel.FixedCellCountProperty, value );
-      }
-    }
-
-    private static void FixedCellCountChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      FixedCellPanel panel = sender as FixedCellPanel;
-      if( panel == null )
-        return;
-
-      // Invalidate the measure to force a layout pass
-      panel.InvalidateMeasure();
-    }
-
-    private static bool ValidateFixedCellCountCallback( object value )
-    {
-      return ( ( int )value >= 0 );
-    }
-
-    #endregion
-
-    #region FixedPanel Property
-
-    internal Panel FixedPanel
-    {
-      get
-      {
-        return m_fixedPanel;
-      }
-    }
-
-    #endregion
-
-    #region FixedColumnDropMarkPen Property
-
-    public static readonly DependencyProperty FixedColumnDropMarkPenProperty = DependencyProperty.Register(
-      "FixedColumnDropMarkPen",
-      typeof( Pen ),
-      typeof( FixedCellPanel ),
-      new PropertyMetadata( null ) );
-
-    public Pen FixedColumnDropMarkPen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( FixedCellPanel.FixedColumnDropMarkPenProperty );
-      }
-      set
-      {
-        this.SetValue( FixedCellPanel.FixedColumnDropMarkPenProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ParentRow Property
-
-    internal Row ParentRow
-    {
-      get
-      {
-        if( m_parentRow == null )
-        {
-          m_parentRow = Row.FindFromChild( m_dataGridContext, this );
-        }
-
-        return m_parentRow;
-      }
-    }
-
-    #endregion
-
-    #region ParentRowCells Property
-
-    internal VirtualizingCellCollection ParentRowCells
-    {
-      get
-      {
-        if( m_parentRowCells == null )
-        {
-          Row parentRow = this.ParentRow;
-
-          if( parentRow == null )
-            return null;
-
-          m_parentRowCells = ( VirtualizingCellCollection )parentRow.Cells;
-
-          Debug.Assert( m_parentRowCells != null );
-        }
-
-        return m_parentRowCells;
-      }
-    }
-
-    #endregion
-
-    #region ParentScrollViewer Property
-
-    internal ScrollViewer ParentScrollViewer
-    {
-      get
-      {
-        if( m_parentScrollViewer == null )
-        {
-          m_parentScrollViewer = TableViewScrollViewer.GetParentScrollViewer( this );
-          Debug.Assert( m_parentScrollViewer != null );
-        }
-
-        return m_parentScrollViewer;
-      }
-    }
-
-    #endregion
-
-    #region ScrollingCellsDecorator Property
-
-    internal Decorator ScrollingCellsDecorator
-    {
-      get
-      {
-        return m_scrollingCellsDecorator;
-      }
-    }
-
-    #endregion
-
-    #region ColumnVirtualizationManager Internal Property
-
-    internal TableViewColumnVirtualizationManagerBase ColumnVirtualizationManager
-    {
-      get
-      {
-        if( m_dataGridContext == null )
-          return null;
-
-        var columnVirtualizationManager = m_dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
-        if( columnVirtualizationManager == null )
-          throw new DataGridInternalException( "Invalid ColumnVirtualizationManager for FixedCellPanel", m_dataGridContext.DataGridControl );
-
-        return columnVirtualizationManager;
-      }
-    }
-
-    #endregion
-
-    #region VisualChildrenCount Property
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return c_visualChildrenCount;
-      }
-    }
-
-    #endregion
-
-    #region LogicalChildren Property
-
-    protected override IEnumerator LogicalChildren
-    {
-      get
-      {
-        return this.Children.GetEnumerator();
-      }
-    }
-
-    #endregion
-
-    #region CellsInView Private Property
-
-    private IEnumerable<Cell> CellsInView
-    {
-      get
-      {
-        var parentRowCells = this.ParentRowCells;
-        if( parentRowCells == null )
-          return new Cell[ 0 ];
-
-        TableViewColumnVirtualizationManagerBase columnVirtualizationManager = this.ColumnVirtualizationManager;
-        if( columnVirtualizationManager == null )
-          return new Cell[ 0 ];
-
-        List<Cell> cells = new List<Cell>();
-        Cell cell;
-
-        var fieldNames = columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache )
-                           .Concat( columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ) );
-
-        foreach( string fieldName in fieldNames )
-        {
-          if( parentRowCells.TryGetCreatedCell( fieldName, out cell ) )
-          {
-            cells.Add( cell );
-          }
-        }
-
-        return cells;
-      }
-    }
-
-    #endregion
-
-    #region PermanentScrollingFieldNames Internal Property
-
-    internal IEnumerable<string> PermanentScrollingFieldNames
-    {
-      get
-      {
-        return m_permanentScrollingFieldNames;
-      }
-    }
-
-    private void AddPermanentScrollingFieldNames( string fieldName )
-    {
-      if( string.IsNullOrEmpty( fieldName ) || m_permanentScrollingFieldNames.Contains( fieldName ) )
-        return;
-
-      m_permanentScrollingFieldNames.Add( fieldName );
-    }
-
-    private bool AddPermanentScrollingFieldNamesIfOutOfViewColumn( string fieldName )
-    {
-      if( string.IsNullOrEmpty( fieldName ) || m_permanentScrollingFieldNames.Contains( fieldName ) )
-        return false;
-
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( columnVirtualizationManager != null )
-      {
-        if( columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache ).Contains( fieldName )
-          || columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ).Contains( fieldName ) )
-          return false;
-      }
-
-      m_permanentScrollingFieldNames.Add( fieldName );
-
-      return true;
-    }
-
-    private void ClearPermanentScrollingFieldNames()
-    {
-      m_permanentScrollingFieldNames.Clear();
-      m_permanentScrollingFieldNames.TrimExcess();
-    }
-
-    private readonly List<string> m_permanentScrollingFieldNames = new List<string>( 0 );
-
-    #endregion
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( m_zOrderDirty )
-      {
-        this.RecomputeZOrder();
-      }
-
-      var correctedIndex = ( m_zIndexMapping == null ) ? index : m_zIndexMapping[ index ];
-
-      switch( correctedIndex )
-      {
-        case 0:
-          return m_fixedPanel;
-        case 1:
-          return null;
-        case 2:
-          return m_scrollingCellsDecorator;
-        default:
-          throw DataGridException.Create<IndexOutOfRangeException>( "Invalid visual child index.", ( m_dataGridContext != null ? m_dataGridContext.DataGridControl : null ) );
-      }
-    }
-
-    protected override UIElementCollection CreateUIElementCollection( FrameworkElement logicalParent )
-    {
-      return new VirtualizingUICellCollection( m_fixedPanel, m_scrollingPanel, this );
-    }
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      // DataGridContext can be null when the parent Row is not prepared
-      if( m_dataGridContext == null )
-        return this.DesiredSize;
-
-      this.ApplyFixedTranform();
-
-      // If a change occured and did not triggered an UpdateMeasureRequiredEvent by the columnVirtualizationManager, we ensure the Row contains the necessary Cells
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( m_lastColumnVirtualizationManagerVersion != columnVirtualizationManager.Version )
-      {
-        this.UpdateChildren();
-      }
-
-      double tempDesiredHeight = 0;
-      m_desiredSize.Width = 0;
-
-      // Measure the Panels (visual children) around the cells (logical children).  Logical children will not be measured again during this process.
-      m_fixedPanel.Measure( availableSize );
-
-      if( m_fixedPanel.DesiredSize.Height > tempDesiredHeight )
-      {
-        tempDesiredHeight = m_fixedPanel.DesiredSize.Height;
-      }
-
-      // Set the desired size for m_scrollingPanel which will be passed to the Decorated that will allow the first cell to be clipped
-      m_desiredSize.Width += columnVirtualizationManager.VisibleColumnsWidth;
-
-      m_scrollingCellsDecorator.Measure( availableSize );
-
-      if( m_scrollingCellsDecorator.DesiredSize.Height > tempDesiredHeight )
-      {
-        tempDesiredHeight = m_scrollingCellsDecorator.DesiredSize.Height;
-      }
-
-      m_desiredSize.Height = tempDesiredHeight;
-
-      if( !double.IsPositiveInfinity( availableSize.Width ) && !m_dataGridContext.IsAFlattenDetail )
-      {
-        m_dataGridContext.ColumnStretchingManager.CalculateColumnStretchWidths( availableSize.Width, this.ColumnStretchMode,
-                                                                                this.ColumnStretchMinWidth, m_dataGridContext.CanIncreaseColumnWidth );
-
-        // Since a panel can make a column change its width, and since this will invalidate every panel that has already been measured, only a decreasing value
-        // is allowd to be set from one panel to another, so the layout pass does not fall into an infinite loop of increasing and decreasing values.
-        m_dataGridContext.CanIncreaseColumnWidth = false;
-      }
-
-      // Adjust TabIndex of fixed cell and scrolling cell for the tab navigation to be ok
-      this.AdjustCellTabIndex( columnVirtualizationManager );
-
-      return m_desiredSize;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      // DataGridContext can be null when the parent Row is not prepared
-      if( m_dataGridContext == null )
-        return this.DesiredSize;
-
-      // Very simple horizontally Arrange implementation.  We use m_visualChildren instead of GetVisualChild(index)
-      // to ensure the sub panels are always arranged in the  correct visible order
-      int childrenCount = m_visualChildren.Count;
-      Rect finalRect = new Rect( finalSize );
-      double offset = 0d;
-
-      UIElement element;
-
-      for( int i = 0; i < childrenCount; i++ )
-      {
-        element = m_visualChildren[ i ];
-        if( element != null )
-        {
-          finalRect.X = offset;
-          finalRect.Width = element.DesiredSize.Width;
-          finalRect.Height = Math.Max( finalSize.Height, element.DesiredSize.Height );
-          element.Arrange( finalRect );
-
-          offset += finalRect.Width;
-        }
-      }
-
-      return finalSize;
-    }
-
-    // Returns the visible index of a column by its visible position
-    internal static int CalculateVisibleIndex( int visiblePosition, HashedLinkedList<ColumnBase> columnsByVisiblePosition )
-    {
-      if( columnsByVisiblePosition == null )
-        return -1;
-
-      int visibleIndex = 0;
-      LinkedListNode<ColumnBase> tempNode = columnsByVisiblePosition.First;
-
-      for( int i = 0; i < visiblePosition; i++ )
-      {
-        if( tempNode == null )
-          break;
-
-        if( tempNode.Value.Visible )
-        {
-          visibleIndex++;
-        }
-
-        tempNode = tempNode.Next;
-      }
-
-      return visibleIndex;
-    }
-
-    internal double GetFixedWidth()
-    {
-      var offset = VisualTreeHelper.GetOffset( m_scrollingCellsDecorator ).X;
-      var parent = VisualTreeHelper.GetParent( this );
-
-      while( parent != null )
-      {
-        if( parent is Row )
-        {
-          offset = this.TransformToAncestor( parent as Visual ).Transform( new Point( offset, 0 ) ).X;
-          break;
-        }
-
-        parent = VisualTreeHelper.GetParent( parent );
-      }
-
-      return offset;
-    }
-
-    internal ScrollViewer GetParentScrollViewer()
-    {
-      if( m_parentScrollViewer == null )
-      {
-        m_parentScrollViewer = TableViewScrollViewer.GetParentScrollViewer( this );
-      }
-
-      return m_parentScrollViewer;
-    }
-
-    internal bool ForceScrollingCellToLayout( Cell cell )
-    {
-      bool retVal = false;
-
-      if( cell == null )
-        return retVal;
-
-      // We do not want any template cells to be added to/removed from visual tree
-      Debug.Assert( !Row.GetIsTemplateCell( cell ), "We should never insert template cells" );
-
-      ColumnBase parentColumn = cell.ParentColumn;
-      Debug.Assert( parentColumn != null, "The cell doesn't have a parent column" );
-
-      CellCollection parentRowCells = this.ParentRowCells;
-      Debug.Assert( parentRowCells != null );
-
-      Cell targetCell = parentRowCells[ parentColumn ];
-      Debug.Assert( targetCell == cell, "The forced cell is inappropriate" );
-
-      retVal = this.MoveCellToScrollingPanel( cell );
-
-      // Keep the field name in order to inform the scrolling sub-panel to measure and arrange the target cell.
-      retVal = this.AddPermanentScrollingFieldNamesIfOutOfViewColumn( parentColumn.FieldName ) || retVal;
-
-      return retVal;
-    }
-
-    internal void PrepareVirtualizationMode( DataGridContext dataGridContext )
-    {
-      var columnVirtualizationManager = dataGridContext.ColumnVirtualizationManager as TableViewColumnVirtualizationManagerBase;
-      if( columnVirtualizationManager == null )
-        return;
-
-      var parentRowCells = this.ParentRowCells;
-      m_virtualizationMode = columnVirtualizationManager.VirtualizationMode;
-      parentRowCells.VirtualizationMode = m_virtualizationMode;
-
-      //Cells provided through Row.Cells (in xaml for instance) must be merged now.
-      parentRowCells.MergeFreeCells();
-
-      //Check if the mode is virutalizing without cell recycling
-      if( m_virtualizationMode != ColumnVirtualizationMode.Virtualizing )
-        return;
-
-      //In this mode, cells for all visible columns are automatically generated (speeds up first time horizontal scrolling).
-      m_generateMissingCellsDispatcherOperation = this.Dispatcher.BeginInvoke( new Action<int>( this.GenerateMissingCells ), DispatcherPriority.Input, 0 );
-    }
-
-    private void FixedCellPanelLayoutUpdated( object sender, EventArgs e )
-    {
-      if( m_dataGridContext == null )
-        return;
-
-      // Once the layout pass is done, the flag must be reset so the width of columns can be resized.
-      m_dataGridContext.CanIncreaseColumnWidth = true;
-    }
-
-    private void MoveCellToFixedPanel( Cell movingCell )
-    {
-      if( movingCell == null )
-        return;
-
-      UIElementCollection origin = m_scrollingPanel.Children;
-      UIElementCollection destination = m_fixedPanel.Children;
-
-      //The VisualTree is altered only if the cells isn't in the appropriate location.
-      if( !destination.Contains( movingCell ) )
-      {
-        //Transfer the cell from one panel to the other.
-        origin.Remove( movingCell );
-        destination.Add( movingCell );
-      }
-    }
-
-    private bool MoveCellToScrollingPanel( Cell movingCell )
-    {
-      bool retVal = false;
-
-      if( movingCell == null )
-        return retVal;
-
-      UIElementCollection origin = m_fixedPanel.Children;
-      UIElementCollection destination = m_scrollingPanel.Children;
-
-      //The VisualTree is altered only if the cells isn't in the appropriate location.
-      if( !destination.Contains( movingCell ) )
-      {
-        //Transfer the cell from one panel to the other.
-        origin.Remove( movingCell );
-        destination.Add( movingCell );
-        retVal = true;
-      }
-
-      return retVal;
-    }
-
-    private void RemoveCellFromFixedOrScrollingPanel( Cell cell )
-    {
-      if( cell == null )
-        return;
-
-      m_fixedPanel.Children.Remove( cell );
-      m_scrollingPanel.Children.Remove( cell );
-    }
-
-    private IEnumerable<ColumnHierarchyManager.ILocation> GetPreviousLocationsOf( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var previousLocation = location.GetPreviousSiblingOrCousin();
-      while( previousLocation != null )
-      {
-        yield return previousLocation;
-        previousLocation = previousLocation.GetPreviousSiblingOrCousin();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyManager.ILocation> GetNextLocationsOf( ColumnHierarchyManager.ILocation location )
-    {
-      if( location == null )
-        yield break;
-
-      var nextLocation = location.GetNextSiblingOrCousin();
-      while( nextLocation != null )
-      {
-        yield return nextLocation;
-        nextLocation = nextLocation.GetNextSiblingOrCousin();
-      }
-    }
-
-    private IEnumerable<ColumnHierarchyManager.IColumnLocation> GetColumnLocations( IEnumerable<ColumnHierarchyManager.ILocation> locations )
-    {
-      if( locations == null )
-        return Enumerable.Empty<ColumnHierarchyManager.IColumnLocation>();
-
-      return ( from location in locations
-               let columnLocation = location as ColumnHierarchyManager.IColumnLocation
-               where ( columnLocation != null )
-               select columnLocation );
-    }
-
-    private bool IsDropMarkAtDropTarget( DropTarget dropTarget )
-    {
-      if( ( dropTarget == null ) || ( m_dataGridContext == null ) )
-        return false;
-
-      var columnManager = m_dataGridContext.ColumnManager;
-      var levelMarkers = columnManager.GetLevelMarkersFor( dropTarget.Columns );
-      if( levelMarkers == null )
-        return false;
-
-      var splitterLocation = levelMarkers.Splitter;
-      Debug.Assert( splitterLocation != null );
-      if( splitterLocation == null )
-        return false;
-
-      // The drop mark location should not be adjusted when the only thing that is between the splitter and
-      // the target location are hidden columns.
-      if( dropTarget.Type != DropTargetType.Column )
-      {
-        var locations = ( dropTarget.Before ) ? this.GetNextLocationsOf( splitterLocation ) : this.GetPreviousLocationsOf( splitterLocation );
-
-        return this.GetColumnLocations( locations ).All( columnLocation => !columnLocation.Column.Visible );
-      }
-      else
-      {
-        Debug.Assert( dropTarget.Column != null );
-
-        foreach( var columnLocation in this.GetColumnLocations( this.GetPreviousLocationsOf( splitterLocation ) ) )
-        {
-          var column = columnLocation.Column;
-          if( column == dropTarget.Column )
-          {
-            if( dropTarget.Before )
-              return !column.Visible;
-
-            return true;
-          }
-
-          if( column.Visible )
-            break;
-        }
-
-        foreach( var columnLocation in this.GetColumnLocations( this.GetNextLocationsOf( splitterLocation ) ) )
-        {
-          var column = columnLocation.Column;
-          if( column == dropTarget.Column )
-          {
-            if( !dropTarget.Before )
-              return !column.Visible;
-
-            return true;
-          }
-
-          if( column.Visible )
-            break;
-        }
-      }
-
-      return false;
-    }
-
-    private bool ShowDropMark()
-    {
-      if( ( m_dragDropState == null ) || ( m_dataGridContext == null ) )
-        return false;
-
-      var scrollViewer = TableViewScrollViewer.GetParentTableViewScrollViewer( this );
-      if( scrollViewer == null )
-        return false;
-
-      var parentRowCells = this.ParentRowCells;
-      if( parentRowCells == null )
-        return false;
-
-      var dropTarget = m_dragDropState.DropTarget;
-      var targetCell = default( Cell );
-      var showDropMarkBeforeTargetCell = ( dropTarget != null ) ? dropTarget.Before : false;
-
-      if( ( dropTarget != null ) && !this.IsDropMarkAtDropTarget( dropTarget ) )
-      {
-        var dropTargetLocation = default( ColumnHierarchyManager.ILocation );
-
-        if( dropTarget.Type == DropTargetType.Column )
-        {
-          Debug.Assert( dropTarget.Column != null );
-          dropTargetLocation = m_dataGridContext.ColumnManager.GetColumnLocationFor( dropTarget.Column );
-        }
-        else
-        {
-          var levelMarkers = m_dataGridContext.ColumnManager.GetLevelMarkersFor( dropTarget.Columns );
-          if( levelMarkers == null )
-            return false;
-
-          switch( dropTarget.Type )
-          {
-            case DropTargetType.Start:
-              dropTargetLocation = levelMarkers.Start;
-              break;
-
-            case DropTargetType.Orphan:
-              dropTargetLocation = levelMarkers.Orphan;
-              break;
-
-            default:
-              throw new NotImplementedException();
-          }
-        }
-
-        if( dropTargetLocation == null )
-          return false;
-
-        // Since the drop target may be a hidden column, we must look for the first visible column
-        // next to it since the calculation requires a cell.
-        {
-          var columnLocation = dropTargetLocation as ColumnHierarchyManager.IColumnLocation;
-          if( ( columnLocation != null ) && columnLocation.Column.Visible )
-          {
-            if( !parentRowCells.TryGetBindedCell( columnLocation.Column, false, out targetCell ) )
-              return false;
-          }
-        }
-
-        if( targetCell == null )
-        {
-          foreach( var columnLocation in this.GetColumnLocations( this.GetPreviousLocationsOf( dropTargetLocation ) ) )
-          {
-            if( !columnLocation.Column.Visible )
-              continue;
-
-            if( !parentRowCells.TryGetBindedCell( columnLocation.Column, false, out targetCell ) )
-              continue;
-
-            showDropMarkBeforeTargetCell = false;
-            break;
-          }
-        }
-
-        if( targetCell == null )
-        {
-          foreach( var columnLocation in this.GetColumnLocations( this.GetNextLocationsOf( dropTargetLocation ) ) )
-          {
-            if( !columnLocation.Column.Visible )
-              continue;
-
-            if( !parentRowCells.TryGetBindedCell( columnLocation.Column, false, out targetCell ) )
-              continue;
-
-            showDropMarkBeforeTargetCell = true;
-            break;
-          }
-        }
-      }
-
-      double dropMarkOffset = 0;
-
-      if( targetCell != null )
-      {
-        if( showDropMarkBeforeTargetCell )
-        {
-          dropMarkOffset = targetCell.TranslatePoint( new Point(), scrollViewer ).X;
-        }
-        else
-        {
-          dropMarkOffset = targetCell.TranslatePoint( new Point( targetCell.ActualWidth, 0d ), scrollViewer ).X;
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      var adorner = m_dragDropState.DropMarkAdorner;
-      if( adorner == null )
-      {
-        // FixedCellPanel can only be used in a Horizontal manner. We can afford to plug this vertical handling of drop mark.
-        var pen = this.FixedColumnDropMarkPen;
-        if( pen == null )
-        {
-          var dropMarkWidth = 1d;
-
-          pen = new Pen( Brushes.Gray, dropMarkWidth );
-        }
-
-        adorner = new DropMarkAdorner( scrollViewer, pen, DropMarkOrientation.Vertical );
-        adorner.HorizontalPosition = dropMarkOffset;
-
-        var adornerLayer = AdornerLayer.GetAdornerLayer( scrollViewer );
-        if( adornerLayer != null )
-        {
-          adornerLayer.Add( adorner );
-        }
-
-        m_dragDropState.DropMarkAdorner = adorner;
-      }
-      else
-      {
-        adorner.HorizontalPosition = dropMarkOffset;
-      }
-
-      return true;
-    }
-
-    private void HideDropMark()
-    {
-      if( m_dragDropState == null )
-        return;
-
-      var adorner = m_dragDropState.DropMarkAdorner;
-      if( adorner == null )
-        return;
-
-      var adornerLayer = AdornerLayer.GetAdornerLayer( adorner.AdornedElement );
-      if( adornerLayer != null )
-      {
-        adornerLayer.Remove( adorner );
-      }
-
-      m_dragDropState.DropMarkAdorner = null;
-    }
-
-    private void UpdateChildren()
-    {
-      // If the parent Row is not prepared, do not update children.
-      // And contrary to this.UpdateChildren( UpdateMeasureTriggeredAction action ), m_dataGridContext can be null here, since it is from a dispatched call.
-      if( m_dataGridContext == null )
-        return;
-
-      this.UpdateChildren( UpdateMeasureTriggeredAction.Unspecified );
-    }
-
-    private void UpdateChildren( UpdateMeasureTriggeredAction action )
-    {
-      Debug.Assert( m_dataGridContext != null, "Should not be called when a container is not prepared" );
-
-      // If the parent Row is not prepared, do not update children
-      if( m_dataGridContext == null )
-        return;
-
-      Row parentRow = this.ParentRow;
-
-      // A CurrentItemChanged was received for a non current Row
-      if( ( action == UpdateMeasureTriggeredAction.CurrentItemChanged ) && ( parentRow != null ) && ( !parentRow.IsCurrent ) )
-        return;
-
-      bool currentItemChangedOnCurrentRow = ( action == UpdateMeasureTriggeredAction.CurrentItemChanged ) && ( parentRow != null ) && ( parentRow.IsCurrent );
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-
-      if( ( m_lastColumnVirtualizationManagerVersion != columnVirtualizationManager.Version ) || ( currentItemChangedOnCurrentRow )
-            || ( m_virtualizingCellCollectionChangedDispatcherOperation != null ) )
-      {
-        this.UpdateChildren( columnVirtualizationManager );
-
-        m_lastColumnVirtualizationManagerVersion = columnVirtualizationManager.Version;
-
-        this.InvalidateMeasure();
-
-        m_virtualizingCellCollectionChangedDispatcherOperation = null;
-      }
-    }
-
-    private void UpdateChildren( TableViewColumnVirtualizationManagerBase columnVirtualizationManager )
-    {
-      var parentRowCells = this.ParentRowCells;
-
-      //Prevent reentrance
-      if( ( parentRowCells == null ) || parentRowCells.IsUpdating )
-        return;
-
-      using( parentRowCells.SetIsUpdating() )
-      {
-        //If in virtualizing mode but not recycling cells.
-        if( m_virtualizationMode == ColumnVirtualizationMode.Virtualizing )
-        {
-          //Retrieve the cells that aren't needed anymore.
-          var cellsToCollapse = this.GetCellsToCollapse( columnVirtualizationManager, parentRowCells );
-
-          //Simply hide these cells for now.
-          foreach( var cell in cellsToCollapse )
-          {
-            if( cell.CanBeCollapsed )
-            {
-              cell.Visibility = Visibility.Collapsed;
-            }
-            else
-            {
-              this.AddPermanentScrollingFieldNames( cell.FieldName );
-            }
-          }
-
-          //And do the actual processing after scrolling has stopped.
-          if( m_processUnusedCellsDispatcherOperation == null )
-          {
-            m_processUnusedCellsDispatcherOperation = this.Dispatcher.BeginInvoke( new Action<TableViewColumnVirtualizationManagerBase>( this.ProcessCollapsedCells ),
-                                                                                   DispatcherPriority.Background, columnVirtualizationManager );
-          }
-        }
-        else
-        {
-          //If recycling cells, we need to process them now, in order to minimize cells' creation.
-          this.ProcessCollapsedCells( columnVirtualizationManager );
-        }
-
-        var fixedFieldNames = columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache ).ToList();
-        var scrollingFieldNames = columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ).ToList();
-
-        //Add the missing cells to the fixed region.
-        foreach( string fieldName in fixedFieldNames )
-        {
-          var cell = this.GetCell( fieldName, parentRowCells );
-
-          //Make sure the cell is in the appropriate panel.
-          this.MoveCellToFixedPanel( cell );
-
-        }
-
-        //Add the missing cells to the scrolling region.
-        foreach( string fieldName in scrollingFieldNames )
-        {
-          var cell = this.GetCell( fieldName, parentRowCells );
-
-          //Make sure the cell is in the appropriate panel.
-          this.MoveCellToScrollingPanel( cell );
-        }
-
-        m_fixedPanel.InvalidateMeasure();
-        m_scrollingCellsDecorator.InvalidateMeasure();
-        m_scrollingPanel.InvalidateMeasure();
-      }
-    }
-
-    private void ProcessCollapsedCells( TableViewColumnVirtualizationManagerBase columnVirtualizationManager )
-    {
-      m_processUnusedCellsDispatcherOperation = null;
-
-      if( m_dataGridContext == null )
-        return;
-
-      this.ClearPermanentScrollingFieldNames();
-
-      //Retrieve the cells that aren't needed anymore.
-      var collapsedCells = this.GetCellsToCollapse( columnVirtualizationManager, m_parentRowCells );
-
-      foreach( Cell cell in collapsedCells )
-      {
-        var isCollapsible = cell.CanBeCollapsed;
-
-        if( isCollapsible && cell.CanBeRecycled )
-        {
-          // Ensure to close the ContextMenu if it is open and the Cell is virtualized to avoid problems with ContextMenus defined as static resources
-          // that won't be able to reopen again if the Close private method is called after the PlacementTarget is removed from the VisualTree
-          var contextMenu = cell.ContextMenu;
-          if( ( contextMenu != null ) && ( contextMenu.IsOpen ) )
-          {
-            contextMenu.IsOpen = false;
-          }
-
-          cell.ClearContainer();
-          m_parentRowCells.Release( cell );
-        }
-        else
-        {
-          //Certain non recyclable cells like StatCells needs their content binding to be removed when they become out of view.
-          cell.RemoveContentBinding();
-
-          //If in virtualizing mode but not recycling cells, release the cell so it will be collapsed, so no need to measure and arrange it.
-          if( isCollapsible && m_virtualizationMode == ColumnVirtualizationMode.Virtualizing )
-          {
-            m_parentRowCells.Release( cell );
-          }
-          else
-          {
-            //Since the cell cannot be released, it will not be collapsed. We must keep its fieldname
-            //in order to let the scrolling sub-panel measure and arrange the cell out of view.
-            this.AddPermanentScrollingFieldNames( cell.FieldName );
-          }
-        }
-      }
-    }
-
-    private List<Cell> GetCellsToCollapse( TableViewColumnVirtualizationManagerBase columnVirtualizationManager, VirtualizingCellCollection parentRowCells )
-    {
-      return ( from cell in parentRowCells.BindedCells
-               where !columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ).Contains( cell.FieldName )
-                 && !columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache ).Contains( cell.FieldName )
-               select cell ).ToList();
-    }
-
-    private Cell GetCell( string fieldName, VirtualizingCellCollection parentRowCells )
-    {
-      //The cell is created if it is missing.
-      var cell = parentRowCells[ fieldName ];
-
-      //Certain non recyclable cells like StatCells need their content binding to be updated when they become (or stay) in view.
-      cell.AddContentBinding( m_dataGridContext, m_parentRow, this.Columns[ fieldName ] );
-
-      //Only when in Virtualizing mode can the cell still be collapsed at this point, since parentRowCells[ fieldName ] will have uncollapsed it in other modes.
-      if( m_virtualizationMode == ColumnVirtualizationMode.Virtualizing )
-      {
-        //The current local value must be cleared instead of setting a new local value to give a chance for a style to set a value.
-        cell.ClearValue( Cell.VisibilityProperty );
-      }
-
-      return cell;
-    }
-
-    private void ApplyFixedTranform()
-    {
-      ScrollViewer parentScrollViewer = this.GetParentScrollViewer();
-
-      if( parentScrollViewer == null )
-        return;
-
-      Transform fixedTranslation = TableViewScrollViewer.GetStoredFixedTransform( parentScrollViewer );
-
-      if( m_fixedPanel.RenderTransform != fixedTranslation )
-      {
-        m_fixedPanel.RenderTransform = fixedTranslation;
-      }
-
-      if( m_scrollingCellsDecorator.RenderTransform != fixedTranslation )
-      {
-        m_scrollingCellsDecorator.RenderTransform = fixedTranslation;
-      }
-    }
-
-    private void AdjustCellTabIndex( TableViewColumnVirtualizationManagerBase columnVirtualizationManager )
-    {
-      // The order of the children in the panel is not guaranteed to be good.  We do not reorder children because we will have to remove
-      // and add them at a different location.  Doing that will cause more calculations to occur, so we only change the TabIndex.
-      var parentRowCells = this.ParentRowCells;
-      if( parentRowCells == null )
-        return;
-
-      var fieldNameToPositionMapping = columnVirtualizationManager.GetFieldNameToPosition( m_parentRow.LevelCache );
-      var fieldNames = columnVirtualizationManager.GetFixedFieldNames( m_parentRow.LevelCache )
-                         .Concat( columnVirtualizationManager.GetScrollingFieldNames( m_parentRow.LevelCache ) )
-                         .Concat( m_permanentScrollingFieldNames );
-
-      foreach( var fieldName in fieldNames )
-      {
-        Cell cell = parentRowCells.GetCell( fieldName, false );
-        Debug.Assert( cell != null );
-
-        int tabIndex;
-        if( fieldNameToPositionMapping.TryGetValue( fieldName, out tabIndex ) )
-        {
-          KeyboardNavigation.SetTabIndex( cell, tabIndex );
-        }
-        else
-        {
-          cell.ClearValue( Cell.TabIndexProperty );
-        }
-      }
-    }
-
-    private void GenerateMissingCells( int index )
-    {
-      m_generateMissingCellsDispatcherOperation = null;
-
-      if( m_dataGridContext == null )
-      {
-        // The row is being recycled without having been prepared properly.  By setting these properties,
-        // it will be correctly prepare when used again (through IVirtualizingCellsHost.PrepareCellsHost()).
-        m_virtualizationModeChanged = true;
-        m_virtualizingCellCollectionUpdateRequired = true;
-        return;
-      }
-
-      DateTime startTime = DateTime.UtcNow;
-
-      //Generate cells only for visible columns
-      var columns = this.VisibleColumns;
-      var parentRowCells = this.ParentRowCells;
-      var count = columns.Count;
-      var actualIndex = count;
-
-      for( int i = index; i < count; i++ )
-      {
-        var column = columns[ i ];
-
-        if( parentRowCells.HasVirtualizedCell( column.FieldName ) )
-          continue;
-
-        var cell = parentRowCells.AddVirtualizedCell( column );
-
-        //Though the cell has been newly prepared to provide better first time scrolling, it needs to be cleared like any other out of view cell.
-        //For non releasable cells (like StatCell), it's been properly processed in Row.PrepareUnbindedCell(), in the previous call.
-        if( cell.CanBeRecycled )
-        {
-          cell.ClearContainer();
-        }
-
-        if( DateTime.UtcNow.Subtract( startTime ) > FixedCellPanel.MaxProcessDurationTime )
-        {
-          actualIndex = i + 1;
-          break;
-        }
-      }
-
-      if( actualIndex == count )
-        return;
-
-      //If there is still cells to generate, dispatch again.
-      m_generateMissingCellsDispatcherOperation = this.Dispatcher.BeginInvoke( new Action<int>( this.GenerateMissingCells ), DispatcherPriority.Input, actualIndex );
-    }
-
-    private void GenerateOrRemoveCell( ColumnBase column )
-    {
-      Debug.Assert( column != null );
-
-      var parentRowCells = this.ParentRowCells;
-
-      switch( m_virtualizationMode )
-      {
-        case ColumnVirtualizationMode.None:
-          {
-            if( !column.Visible )
-            {
-              Cell cell;
-              if( parentRowCells.TryGetBindedCell( column, false, out cell ) )
-              {
-                //Only remove cells that can be generated without any unique configuration (e.g. no custom template, no ResultPropertyName, etc..)
-                if( cell.CanBeRecycled )
-                {
-                  parentRowCells.InternalRemove( cell );
-                }
-              }
-            }
-            break;
-          }
-
-        case ColumnVirtualizationMode.Recycling:
-          {
-            if( !column.Visible && ( m_synchronizeRecyclingBinsDispatcherOperation == null ) )
-            {
-              m_synchronizeRecyclingBinsDispatcherOperation = this.Dispatcher.BeginInvoke( DispatcherPriority.Background,
-                                                                                           new Action( this.SynchronizeRecyclingBinsWithRecyclingGroups ) );
-            }
-            break;
-          }
-
-        case ColumnVirtualizationMode.Virtualizing:
-          {
-            if( column.Visible )
-            {
-              if( !parentRowCells.HasVirtualizedCell( column.FieldName ) )
-              {
-                parentRowCells.AddVirtualizedCell( column );
-              }
-              break;
-            }
-
-            parentRowCells.RemoveVirtualizedCell( column );
-            break;
-          }
-      }
-    }
-
-    private void UpdateVirtualizationMode()
-    {
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( columnVirtualizationManager == null )
-        return;
-
-      var parentRowCells = this.ParentRowCells;
-      m_virtualizationMode = columnVirtualizationManager.VirtualizationMode;
-      parentRowCells.VirtualizationMode = m_virtualizationMode;
-
-      switch( m_virtualizationMode )
-      {
-        case ColumnVirtualizationMode.None:
-          {
-            //Not virtualizing
-            parentRowCells.BindRecycledCells( this.Columns );
-            parentRowCells.BindVirtualizedCells();
-            break;
-          }
-
-        case ColumnVirtualizationMode.Recycling:
-          {
-            //Virtualizing and recycling
-            parentRowCells.ClearOutOfViewBindedCells( this.GetCellsToCollapse( columnVirtualizationManager, parentRowCells ) );
-            parentRowCells.ClearVirtualizedCells();
-            break;
-          }
-
-        case ColumnVirtualizationMode.Virtualizing:
-          {
-            //Virtualizing with no recycling
-            this.ProcessCollapsedCells( columnVirtualizationManager );
-            parentRowCells.VirtualizeRecycledCells();
-            if( m_generateMissingCellsDispatcherOperation == null )
-            {
-              this.GenerateMissingCells( 0 );
-            }
-            break;
-          }
-      }
-    }
-
-    private void SynchronizeRecyclingBinsWithRecyclingGroups()
-    {
-      m_synchronizeRecyclingBinsDispatcherOperation = null;
-
-      if( m_dataGridContext == null )
-        return;
-
-      m_parentRowCells.SynchronizeRecyclingBinsWithRecyclingGroups( this.VisibleColumns );
-    }
-
-    private FrameworkElement GetPreparedContainer( Cell cell )
-    {
-      if( cell == null )
-        return null;
-
-      var parentRow = cell.ParentRow;
-      if( parentRow == null )
-        return null;
-
-      // Use the DataGridControl.Container attached property to assert a container is always returned even if the container is in FixedHeaders or FixedFooters.
-      var container = DataGridControl.GetContainer( parentRow );
-      if( container == null )
-        return null;
-
-      if( !DataGridControl.GetIsContainerPrepared( container ) )
-        return null;
-
-      return container;
-    }
-
-    private static object CoerceMinHeight( DependencyObject sender, object value )
-    {
-      var self = sender as FixedCellPanel;
-      if( self == null )
-        return value;
-
-      return self.CoerceMinHeight( new Thickness(), value );
-    }
-
-    private static void InvalidateMinHeight( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var self = sender as FixedCellPanel;
-      if( self == null )
-        return;
-
-      self.CoerceValue( FixedCellPanel.MinHeightProperty );
-    }
-
-    #region ZOrder Management
-
-    private void RecomputeZOrder()
-    {
-      ZOrderHelper.ComputeZOrder( m_visualChildren, ref m_zIndexMapping );
-      m_zOrderDirty = false;
-    }
-
-    private void InvalidateZOrder()
-    {
-      m_zOrderDirty = true;
-    }
-
-    internal bool ChangeCellZOrder( Cell cell, int zIndex )
-    {
-      bool zOrderChanged = false;
-
-      UIElement panelToChangeZOrder = null;
-
-      // Ensure the ZOrder is also considered by the panel containing the Cell
-      if( m_fixedPanel.Children.Contains( cell ) )
-      {
-        panelToChangeZOrder = m_fixedPanel;
-      }
-      else
-      {
-        panelToChangeZOrder = m_scrollingCellsDecorator;
-      }
-
-      if( object.Equals( zIndex, DependencyProperty.UnsetValue ) )
-      {
-        if( panelToChangeZOrder.ReadLocalValue( Panel.ZIndexProperty ) != DependencyProperty.UnsetValue )
-        {
-          panelToChangeZOrder.ClearValue( Panel.ZIndexProperty );
-          this.InvalidateZOrder();
-
-          zOrderChanged = true;
-        }
-      }
-      else
-      {
-        if( !object.Equals( panelToChangeZOrder.GetValue( Panel.ZIndexProperty ), zIndex ) )
-        {
-          panelToChangeZOrder.SetValue( Panel.ZIndexProperty, zIndex );
-          this.InvalidateZOrder();
-
-          zOrderChanged = true;
-        }
-      }
-
-      Panel.SetZIndex( cell, zIndex );
-
-      return zOrderChanged;
-    }
-
-    internal void ClearCellZOrder( Cell cell )
-    {
-      m_fixedPanel.ClearValue( Panel.ZIndexProperty );
-      m_scrollingCellsDecorator.ClearValue( Panel.ZIndexProperty );
-      cell.ClearValue( Panel.ZIndexProperty );
-      this.InvalidateZOrder();
-    }
-
-    #endregion
-
-    #region IVirtualizingCellsHost Members
-
-    bool IVirtualizingCellsHost.CanModifyLogicalParent
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    void IVirtualizingCellsHost.ClearLogicalParent( Cell cell )
-    {
-      Debug.Assert( cell != null );
-
-      VirtualizingUICellCollection cellCollection = this.Children as VirtualizingUICellCollection;
-
-      Debug.Assert( cellCollection != null );
-
-      cellCollection.ClearCellLogicalParent( cell );
-
-      this.RemoveCellFromFixedOrScrollingPanel( cell );
-    }
-
-    void IVirtualizingCellsHost.SetLogicalParent( Cell cell )
-    {
-      Debug.Assert( cell != null );
-
-      VirtualizingUICellCollection cellCollection = this.Children as VirtualizingUICellCollection;
-
-      Debug.Assert( cellCollection != null );
-
-      cellCollection.SetCellLogicalParent( cell );
-
-      this.MoveCellToScrollingPanel( cell );
-    }
-
-    void IVirtualizingCellsHost.PrepareCellsHost( DataGridContext dataGridContext )
-    {
-      // This method is called in Row.PrepareContainer and Row.OnApplyTemplate, which is also called in Row.PrepareContainer but only if the template
-      // was not previously applied, so it is possible that this panel is already prepared. In that case, we only ignore this preparation.
-      if( m_cellsHostPrepared )
-        return;
-
-      if( dataGridContext != null )
-      {
-        m_dataGridContext = dataGridContext;
-
-        object dataItem = this.ParentRow.DataContext;
-
-        foreach( Cell cell in this.CellsInView )
-        {
-          cell.PrepareContainer( dataGridContext, dataItem );
-        }
-
-        var columnVirtualizationManager = this.ColumnVirtualizationManager;
-
-        //If the manager has changed, make sure to stop listening to it.
-        if( columnVirtualizationManager != m_previousColumnVirtualizationManager )
-        {
-          VirtualizingCellCollectionUpdateRequiredEventManager.RemoveListener( m_previousColumnVirtualizationManager, this );
-          VirtualizingCellCollectionUpdateRequiredEventManager.AddListener( columnVirtualizationManager, this );
-        }
-
-        UpdateMeasureRequiredEventManager.AddListener( columnVirtualizationManager, this );
-        m_previousColumnVirtualizationManager = columnVirtualizationManager;
-
-        var parentRowCells = this.ParentRowCells;
-        if( parentRowCells != null )
-        {
-          VirtualizingCellCollectionChangedEventManager.AddListener( parentRowCells, this );
-        }
-
-        //When pulling a row from the recycling pool, need to make sure it is in the correct virtualization mode and its VirtualzingCellCollection is update to date.
-        if( m_virtualizingCellCollectionUpdateRequired )
-        {
-          m_virtualizingCellCollectionUpdateRequired = false;
-
-          if( m_virtualizationModeChanged )
-          {
-            m_virtualizationModeChanged = false;
-            this.UpdateVirtualizationMode();
-          }
-
-          if( m_visibleColumnsChanged )
-          {
-            m_visibleColumnsChanged = false;
-            var columns = this.Columns;
-            foreach( WeakReference weakRef in m_changedVisibleColumns )
-            {
-              var column = weakRef.Target as ColumnBase;
-
-              if( ( column == null ) || !columns.Contains( column ) )
-                continue;
-
-              this.GenerateOrRemoveCell( column );
-            }
-            m_changedVisibleColumns.Clear();
-            m_changedVisibleColumns.TrimExcess();
-          }
-
-          if( m_visibleColumnsAdded )
-          {
-            m_visibleColumnsAdded = false;
-            this.GenerateMissingCells( 0 );
-          }
-        }
-
-        m_cellsHostPrepared = true;
-      }
-    }
-
-    void IVirtualizingCellsHost.ClearCellsHost()
-    {
-      if( !m_cellsHostPrepared )
-        return;
-
-      var parentRowCells = this.ParentRowCells;
-      if( parentRowCells != null )
-      {
-        VirtualizingCellCollectionChangedEventManager.RemoveListener( parentRowCells, this );
-      }
-
-      //Make sure to stop listening from the same manager it started to listen from.
-      UpdateMeasureRequiredEventManager.RemoveListener( m_previousColumnVirtualizationManager, this );
-
-      m_dataGridContext = null;
-      m_cellsHostPrepared = false;
-    }
-
-    void IVirtualizingCellsHost.InvalidateCellsHostMeasure()
-    {
-      if( m_dataGridContext == null )
-        return;
-
-      this.InvalidateMeasure();
-      m_fixedPanel.InvalidateMeasure();
-      m_scrollingCellsDecorator.InvalidateMeasure();
-      m_scrollingPanel.InvalidateMeasure();
-    }
-
-    bool IVirtualizingCellsHost.BringIntoView( Cell cell, RequestBringIntoViewEventArgs e )
-    {
-      // This cell doesn't seem to be in the grid.  We return true to handle the event that triggered the BringIntoView.
-      var dataGridContext = DataGridControl.GetDataGridContext( this );
-      if( dataGridContext == null )
-        return true;
-
-      // If the container is not in use, we return true to handle the event that triggered the BringIntoView.
-      var container = this.GetPreparedContainer( cell );
-      if( container == null )
-        return true;
-
-      // The ScrollViewer can handle the bring into view if the grid isn't virtualized.
-      var scrollViewer = this.ParentScrollViewer;
-      if( ( scrollViewer == null ) || !scrollViewer.CanContentScroll )
-        return false;
-
-      // This cell seems to be dead.  We return true to handle the event that triggered the BringIntoView.
-      var row = cell.ParentRow;
-      var column = cell.ParentColumn;
-      if( ( row == null ) || ( column == null ) )
-        return true;
-
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-
-      // Fixed cells are always visible.
-      if( columnVirtualizationManager.GetFixedFieldNames( row.LevelCache ).Contains( column ) )
-        return this.BringIntoViewFixedCell( container );
-
-      return this.BringIntoViewScrollingCell( cell, container, e );
-    }
-
-    private bool BringIntoViewFixedCell( FrameworkElement container )
-    {
-      Debug.Assert( container != null );
-
-      // We always want the horizontal offset to change if Tab, Home, Left or Right is pressed.
-      if( Keyboard.IsKeyDown( Key.Tab ) || Keyboard.IsKeyDown( Key.Home ) || Keyboard.IsKeyDown( Key.Left ) || Keyboard.IsKeyDown( Key.Right ) )
-      {
-        container.BringIntoView( new Rect( 0d, 0d, 0d, 0d ) );
-      }
-      else
-      {
-        // Ensure to bring the container into view vertically.
-        container.BringIntoView();
-      }
-
-      return true;
-    }
-
-    private bool BringIntoViewScrollingCell( Cell cell, FrameworkElement container, RequestBringIntoViewEventArgs e )
-    {
-      Debug.Assert( cell != null );
-      Debug.Assert( container != null );
-
-      // The cell must be measured/arranged for the BringIntoView to correctly reacts
-      if( this.ForceScrollingCellToLayout( cell ) )
-      {
-        container.UpdateLayout();
-      }
-
-      var fixedWidth = this.GetFixedWidth();
-      var viewportWidth = this.ParentScrollViewer.ViewportWidth;
-
-      //If fixed cells fill the entire viewport, then there is no scrolling cell that can be brought in to view, simply return.
-      if( fixedWidth >= viewportWidth )
-        return true;
-
-      var scrollingPanel = this.ScrollingCellsDecorator;
-      var scrollingArea = new Rect( scrollingPanel.TranslatePoint( new Point(), this ), new Size( viewportWidth - fixedWidth, scrollingPanel.ActualHeight ) );
-      var cellArea = new Rect( cell.TranslatePoint( new Point(), this ), new Size( cell.ParentColumn.ActualWidth, cell.ActualHeight ) );
-
-      // The cell is larger than the scrolling area.
-      if( cellArea.Width > scrollingArea.Width )
-      {
-        var targetObject = e.TargetObject as UIElement;
-        var targetRect = e.TargetRect;
-
-        // Try to narrow the area within the cell that we clearly want to bring into view.
-        if( ( targetObject != null ) && ( targetObject != cell || !targetRect.IsEmpty ) )
-        {
-          Debug.Assert( targetObject.IsDescendantOf( cell ) );
-
-          if( targetRect.IsEmpty )
-          {
-            targetRect = new Rect( new Point( 0d, 0d ), targetObject.RenderSize );
-          }
-
-          if( targetRect.Width <= scrollingArea.Width )
-          {
-            var offset = targetObject.TranslatePoint( new Point(), cell );
-            var location = cellArea.Location;
-            location.Offset( offset.X, offset.Y );
-
-            cellArea.Location = location;
-            cellArea.Size = targetRect.Size;
-          }
-        }
-      }
-
-      if( ( cellArea.Left <= scrollingArea.Left ) && ( cellArea.Right >= scrollingArea.Right ) )
-      {
-        // Ensure to bring the container into view vertically.
-        container.BringIntoView();
-      }
-      else if( cellArea.Left < scrollingArea.Left )
-      {
-        // The ScrollViewer's extent width includes the fixed section.  We must offset the target area or the cell
-        // will come into view under the fixed panel.
-        cellArea.X -= fixedWidth;
-
-        this.BringIntoView( cellArea );
-      }
-      else if( cellArea.Right > scrollingArea.Right )
-      {
-        this.BringIntoView( cellArea );
-      }
-      // The cell is fully visible.
-      else
-      {
-        // Ensure to bring the container into view vertically.
-        container.BringIntoView();
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region IWeakEventListener Members
-
-    bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      return this.OnReceiveWeakEvent( managerType, sender, e );
-    }
-
-    protected virtual bool OnReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( UpdateMeasureRequiredEventManager ) )
-      {
-        var action = UpdateMeasureTriggeredAction.Unspecified;
-        var eventArgs = e as UpdateMeasureRequiredEventArgs;
-
-        if( eventArgs != null )
-        {
-          action = eventArgs.TriggeredAction;
-        }
-
-        this.UpdateChildren( action );
-      }
-      else if( managerType == typeof( VirtualizingCellCollectionUpdateRequiredEventManager ) )
-      {
-        var eventArgs = e as VirtualizingCellCollectionUpdateRequiredEventArgs;
-
-        switch( eventArgs.TriggeredAction )
-        {
-          case VirtualizingCellCollectionUpdateTriggeredAction.VirtualizationModeChanged:
-            {
-              if( !m_cellsHostPrepared )
-              {
-                m_virtualizationModeChanged = true;
-                m_virtualizingCellCollectionUpdateRequired = true;
-                break;
-              }
-
-              this.UpdateVirtualizationMode();
-              break;
-            }
-
-          case VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsChanged:
-            {
-              var columns = eventArgs.Columns;
-              if( ( columns == null ) || ( columns.Count <= 0 ) )
-                break;
-
-              if( !m_cellsHostPrepared )
-              {
-                foreach( var column in columns )
-                {
-                  m_changedVisibleColumns.Add( new WeakReference( column ) );
-                }
-
-                m_visibleColumnsChanged = true;
-                m_virtualizingCellCollectionUpdateRequired = true;
-                break;
-              }
-
-              //A column was added or removed from VisibleColumns.
-              foreach( var column in columns )
-              {
-                this.GenerateOrRemoveCell( column );
-              }
-              break;
-            }
-
-          //This action will be triggered only when in Virtualizing mode, so no need to check it.
-          //No need to handle Remove, Replace, Reset, since every row will be flushed and recreated, and rows present in recycle bins will simply be flushed.
-          case VirtualizingCellCollectionUpdateTriggeredAction.VisibleColumnsAdded:
-            {
-              if( !m_cellsHostPrepared )
-              {
-                m_visibleColumnsAdded = true;
-                m_virtualizingCellCollectionUpdateRequired = true;
-                break;
-              }
-
-              if( m_generateMissingCellsDispatcherOperation == null )
-              {
-                this.GenerateMissingCells( 0 );
-              }
-              break;
-            }
-        }
-      }
-      else if( managerType == typeof( VirtualizingCellCollectionChangedEventManager ) )
-      {
-        //Changes to the Cells collection (i.e. VirtualizingCellCollection) can come directly from the Row.Cells property, without the FixedCellPanel knowing about it.
-        //So it needs to be informed if this is the case, since it is the FixedCellPanel responsablility to correctly manage and recycle cells.
-        //However, if changes to Cells come from the FixedCellPanel itself, of course there is nothing to do.
-        if( !m_parentRowCells.IsUpdating )
-        {
-          //Update cells as rarely as possible, so performance is not affected by this (for instance when Row.Cells is updated in a loop, do it once at the end).
-          if( m_virtualizingCellCollectionChangedDispatcherOperation == null )
-          {
-            m_virtualizingCellCollectionChangedDispatcherOperation = this.Dispatcher.BeginInvoke( DispatcherPriority.Render, new Action( this.UpdateChildren ) );
-          }
-        }
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    private int m_lastColumnVirtualizationManagerVersion = -1;
-    private Row m_parentRow; // = null;
-    private ScrollViewer m_parentScrollViewer; // = null;
-    private bool m_cellsHostPrepared; //false
-    private bool m_zOrderDirty; //false
-
-    private Size m_desiredSize = new Size();
-    private VirtualizingCellCollection m_parentRowCells; // = null;
-
-    private DragDropState m_dragDropState = null;
-
-    // The immediate visual children of this panel.
-    private FixedCellSubPanel m_fixedPanel;
-    private ScrollingCellsDecorator m_scrollingCellsDecorator;
-    private VirtualizingFixedCellSubPanel m_scrollingPanel;
-
-    private int[] m_zIndexMapping; // = null;
-
-    private const int c_visualChildrenCount = 3;
-    private readonly IList<UIElement> m_visualChildren = new List<UIElement>();
-
-    private DataGridContext m_dataGridContext; // = null;
-    private TableViewColumnVirtualizationManagerBase m_previousColumnVirtualizationManager; // = null;
-
-    private DispatcherOperation m_processUnusedCellsDispatcherOperation; // = null;
-    private DispatcherOperation m_virtualizingCellCollectionChangedDispatcherOperation;
-    private DispatcherOperation m_generateMissingCellsDispatcherOperation;
-    private DispatcherOperation m_synchronizeRecyclingBinsDispatcherOperation;
-    private ColumnVirtualizationMode m_virtualizationMode;
-    private List<WeakReference> m_changedVisibleColumns = new List<WeakReference>();
-    private bool m_virtualizingCellCollectionUpdateRequired;
-    private bool m_virtualizationModeChanged;
-    private bool m_visibleColumnsChanged;
-    private bool m_visibleColumnsAdded;
-
-    #region DragDropState Private Class
-
-    private sealed class DragDropState
-    {
-      internal DragDropState( double splitterOffset )
-      {
-        m_initialSplitterOffset = splitterOffset;
-      }
-
-      internal double InitialSplitterOffset
-      {
-        get
-        {
-          return m_initialSplitterOffset;
-        }
-      }
-
-      internal DropMarkAdorner DropMarkAdorner
-      {
-        get;
-        set;
-      }
-
-      internal DropTarget DropTarget
-      {
-        get;
-        set;
-      }
-
-      private readonly double m_initialSplitterOffset;
-    }
-
-    #endregion
-
-    #region DropTarget Private Class
-
-    private sealed class DropTarget
-    {
-      internal DropTarget( DropTargetType type, ColumnCollection columns )
-      {
-        if( ( type != DropTargetType.Start ) && ( type != DropTargetType.Orphan ) )
-          throw new ArgumentException( "The drop target must be a Start or Orphan target type.", "type" );
-
-        m_type = type;
-        m_column = default( ColumnBase );
-        m_before = ( type == DropTargetType.Orphan );
-        m_columns = columns;
-      }
-
-      internal DropTarget( ColumnBase column, bool before, ColumnCollection columns )
-      {
-        if( column == null )
-          throw new ArgumentNullException( "column" );
-
-        m_type = DropTargetType.Column;
-        m_column = column;
-        m_before = before;
-        m_columns = columns;
-      }
-
-      internal DropTargetType Type
-      {
-        get
-        {
-          return m_type;
-        }
-      }
-
-      internal ColumnBase Column
-      {
-        get
-        {
-          return m_column;
-        }
-      }
-
-      internal bool Before
-      {
-        get
-        {
-          return m_before;
-        }
-      }
-
-      internal ColumnCollection Columns
-      {
-        get
-        {
-          return m_columns;
-        }
-      }
-
-      private readonly DropTargetType m_type;
-      private readonly ColumnBase m_column;
-      private readonly ColumnCollection m_columns;
-      private readonly bool m_before;
-    }
-
-    #endregion
-
-    #region DropTargetType Private Enum
-
-    private enum DropTargetType
-    {
-      Column = 0,
-      Start,
-      Orphan
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs
deleted file mode 100644
index 5946c317..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  // Panel used as children of the FixedCellPanel that only layout horizontally.
-  internal class FixedCellSubPanel : Panel
-  {
-    public FixedCellSubPanel( FixedCellPanel parentPanel )
-    {
-      if( parentPanel == null )
-        throw new ArgumentNullException( "parentPanel" );
-
-      m_parentPanel = parentPanel;
-    }
-
-    #region DataGridContext Internal Property
-
-    internal DataGridContext DataGridContext
-    {
-      get
-      {
-        return m_parentPanel.DataGridContext;
-      }
-    }
-
-    #endregion
-
-    #region ParentFixedCellPanel Internal Property
-
-    internal FixedCellPanel ParentPanel
-    {
-      get
-      {
-        return m_parentPanel;
-      }
-    }
-
-    private readonly FixedCellPanel m_parentPanel;
-
-    #endregion
-
-    #region ColumnVirtualizationManager Internal Property
-
-    internal TableViewColumnVirtualizationManagerBase ColumnVirtualizationManager
-    {
-      get
-      {
-        var dataGridContext = this.DataGridContext;
-        if( dataGridContext == null )
-          return null;
-
-        return ( TableViewColumnVirtualizationManagerBase )dataGridContext.ColumnVirtualizationManager;
-      }
-    }
-
-    #endregion
-
-    protected override UIElementCollection CreateUIElementCollection( FrameworkElement logicalParent )
-    {
-      // We make sure that the element added to this panel won't have this panel as logical parent.
-      // We want the logical parent of these element to be the FixedCellPanel itself. This is handled in the UICellCollection class.
-      return new UIElementCollection( this, null );
-    }
-
-    // Measure horizontally.
-    protected override Size MeasureOverride( Size constraint )
-    {
-      // This can be null when the parent Row is not prepared yet.
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( columnVirtualizationManager == null )
-        return new Size();
-
-      var parentRow = this.ParentPanel.ParentRow;
-      if( parentRow == null )
-        return new Size();
-
-      var desiredSize = new Size();
-      var fieldNameToWidth = columnVirtualizationManager.GetFieldNameToWidth( parentRow.LevelCache );
-
-      //This using prevents a WeakEvent to be raised to execute UpdateChildren() in FixedCellPanel, as it is already up to date at this point.
-      using( this.ParentPanel.ParentRowCells.SetIsUpdating() )
-      {
-        foreach( var cell in this.GetVisibleCells() )
-        {
-          Debug.Assert( !Row.GetIsTemplateCell( cell ), "No template Cells should be added to FixedCellPanel" );
-
-          cell.Measure( new Size( fieldNameToWidth[ cell.FieldName ], constraint.Height ) );
-
-          if( cell.DesiredSize.Height > desiredSize.Height )
-          {
-            desiredSize.Height = cell.DesiredSize.Height;
-          }
-        }
-      }
-
-      desiredSize.Width = columnVirtualizationManager.FixedColumnsWidth;
-
-      return desiredSize;
-    }
-
-    // Arrange horizontally.
-    protected override Size ArrangeOverride( Size arrangeSize )
-    {
-      // This can be null when the parent Row is not prepared yet.
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( columnVirtualizationManager == null )
-        return new Size();
-
-      var parentRow = this.ParentPanel.ParentRow;
-      if( parentRow == null )
-        return new Size();
-
-      var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( parentRow.LevelCache );
-      var finalRect = new Rect( arrangeSize );
-
-      //This using prevents a WeakEvent to be raised to execute UpdateChildren() in FixedCellPanel, as it is already up to date at this point.
-      using( this.ParentPanel.ParentRowCells.SetIsUpdating() )
-      {
-        foreach( var cell in this.GetVisibleCells() )
-        {
-          Debug.Assert( !Row.GetIsTemplateCell( cell ), "No template Cells should be added to FixedCellPanel" );
-
-          var offset = this.CalculateCellOffset( cell.ParentColumn, columnToVisibleOffset );
-
-          finalRect.X = offset.X;
-          finalRect.Width = cell.DesiredSize.Width;
-          finalRect.Height = Math.Max( arrangeSize.Height, cell.DesiredSize.Height );
-
-          cell.Arrange( finalRect );
-        }
-      }
-
-      return arrangeSize;
-    }
-
-    protected virtual IEnumerable<string> GetVisibleFieldsName()
-    {
-      var columnVirtualizationManager = this.ColumnVirtualizationManager;
-      if( columnVirtualizationManager == null )
-        return new string[ 0 ];
-
-      return columnVirtualizationManager.GetFixedFieldNames( m_parentPanel.ParentRow.LevelCache );
-    }
-
-    protected IEnumerable<Cell> GetVisibleCells()
-    {
-      var parentRowCells = this.ParentPanel.ParentRowCells;
-
-      if( parentRowCells == null )
-        yield break;
-
-      foreach( string fieldName in this.GetVisibleFieldsName() )
-      {
-        yield return parentRowCells.GetCell( fieldName, false );
-      }
-    }
-
-    internal virtual Point CalculateCellOffset( ColumnBase column )
-    {
-      Debug.Assert( column != null );
-      var row = this.ParentPanel.ParentRow;
-
-      if( ( column != null ) && ( row != null ) )
-      {
-        var columnVirtualizationManager = this.ColumnVirtualizationManager;
-        if( columnVirtualizationManager != null )
-        {
-          var columnToVisibleOffset = columnVirtualizationManager.GetFieldNameToOffset( row.LevelCache );
-
-          return this.CalculateCellOffset( column, columnToVisibleOffset );
-        }
-      }
-
-      return new Point();
-    }
-
-    private Point CalculateCellOffset( ColumnBase column, IColumnInfoCollection<double> columnsOffset )
-    {
-      if( column == null )
-        return new Point();
-
-      Debug.Assert( columnsOffset != null );
-      Debug.Assert( columnsOffset.Contains( column ) );
-
-      var columnOffset = columnsOffset[ column ];
-
-      return new Point( columnOffset, 0d );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs
deleted file mode 100644
index bd54791e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal interface IVirtualizingCellsHost
-  {
-    // Determines if it is possible for this CellsHost to internaly set/clear the LogicalParent
-    // to avoid the UIElementCollection to do it in background for each Collection modification
-    bool CanModifyLogicalParent
-    {
-      get;
-    }
-
-    void ClearLogicalParent( Cell cell );
-
-    void SetLogicalParent( Cell cell );
-
-    void PrepareCellsHost( DataGridContext dataGridContext );
-
-    void ClearCellsHost();
-
-    void InvalidateCellsHostMeasure();
-
-    bool BringIntoView( Cell cell, RequestBringIntoViewEventArgs e );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/MasterDetailLayoutAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/MasterDetailLayoutAttribute.cs
deleted file mode 100644
index 9e3d4f2e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/MasterDetailLayoutAttribute.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  [AttributeUsage( AttributeTargets.Class, AllowMultiple = false )] // Applies only to the class of a view
-  internal sealed class MasterDetailLayoutAttribute : Attribute
-  {
-    public MasterDetailLayoutAttribute( MasterDetailLayoutMode masterDetailLayoutMode )
-    {
-      if( !Enum.IsDefined( typeof( MasterDetailLayoutMode ), masterDetailLayoutMode ) )
-        throw new ArgumentException( "The value is not a valid enum value.", "masterDetailLayoutMode" );
-
-      m_masterDetailLayoutMode = masterDetailLayoutMode;
-    }
-
-    public MasterDetailLayoutMode MasterDetailLayoutMode
-    {
-      get
-      {
-        return m_masterDetailLayoutMode;
-      }
-    }
-
-    private MasterDetailLayoutMode m_masterDetailLayoutMode = MasterDetailLayoutMode.Default;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/NavigationHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/NavigationHelper.cs
deleted file mode 100644
index a73e47fb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/NavigationHelper.cs
+++ /dev/null
@@ -1,616 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal static class NavigationHelper
-  {
-    internal static int GetFirstVisibleFocusableColumnIndex( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        return -1;
-
-      return NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext, dataGridContext.CurrentRow );
-    }
-
-    internal static int GetFirstVisibleFocusableColumnIndex( DataGridContext dataGridContext, Row targetRow )
-    {
-      if( dataGridContext == null )
-        return -1;
-
-      if( dataGridContext.IsAFlattenDetail )
-        return NavigationHelper.GetNextVisibleFocusableDetailColumnIndexFromMasterColumnIndex( dataGridContext, targetRow, int.MinValue );
-
-      return NavigationHelper.GetNextVisibleFocusableColumnIndex( dataGridContext, targetRow, int.MinValue );
-    }
-
-    internal static int GetLastVisibleFocusableColumnIndex( DataGridContext dataGridContext )
-    {
-      if( dataGridContext == null )
-        return -1;
-
-      return NavigationHelper.GetLastVisibleFocusableColumnIndex( dataGridContext, dataGridContext.CurrentRow );
-    }
-
-    internal static int GetLastVisibleFocusableColumnIndex( DataGridContext dataGridContext, Row targetRow )
-    {
-      if( dataGridContext == null )
-        return -1;
-
-      if( dataGridContext.IsAFlattenDetail )
-        return NavigationHelper.GetPreviousVisibleFocusableDetailColumnIndexFromMasterColumnIndex( dataGridContext, targetRow, int.MaxValue );
-
-      return NavigationHelper.GetPreviousVisibleFocusableColumnIndex( dataGridContext, targetRow, int.MaxValue );
-    }
-
-    internal static int GetNextVisibleFocusableColumnIndex( DataGridContext dataGridContext, Row targetRow, ColumnBase targetColumn )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) || ( targetColumn == null ) )
-        return -1;
-
-      var columns = dataGridContext.VisibleColumns;
-      if( ( columns == null ) || ( columns.Count <= 0 ) )
-        return -1;
-
-      var columnIndex = columns.IndexOf( targetColumn );
-      if( columnIndex < 0 )
-        return -1;
-
-      if( !dataGridContext.IsAFlattenDetail )
-        return NavigationHelper.GetNextVisibleFocusableColumnIndex( dataGridContext, targetRow, columnIndex + 1 );
-
-      var masterColumn = default( ColumnBase );
-      if( !DataGridItemPropertyMapHelper.TryGetMasterColumn( dataGridContext, targetColumn, out masterColumn ) )
-        return -1;
-
-      var masterDataGridContext = dataGridContext.RootDataGridContext;
-      var masterColumnIndex = masterDataGridContext.VisibleColumns.IndexOf( masterColumn );
-      if( masterColumnIndex < 0 )
-        return -1;
-
-      return NavigationHelper.GetNextVisibleFocusableDetailColumnIndexFromMasterColumnIndex( dataGridContext, targetRow, masterColumnIndex + 1 );
-    }
-
-    internal static int GetPreviousVisibleFocusableColumnIndex( DataGridContext dataGridContext, Row targetRow, ColumnBase targetColumn )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) || ( targetColumn == null ) )
-        return -1;
-
-      var columns = dataGridContext.VisibleColumns;
-      if( ( columns == null ) || ( columns.Count <= 0 ) )
-        return -1;
-
-      var columnIndex = columns.IndexOf( targetColumn );
-      if( columnIndex < 0 )
-        return -1;
-
-      if( !dataGridContext.IsAFlattenDetail )
-        return NavigationHelper.GetPreviousVisibleFocusableColumnIndex( dataGridContext, targetRow, columnIndex - 1 );
-
-      var masterColumn = default( ColumnBase );
-      if( !DataGridItemPropertyMapHelper.TryGetMasterColumn( dataGridContext, targetColumn, out masterColumn ) )
-        return -1;
-
-      var masterDataGridContext = dataGridContext.RootDataGridContext;
-      var masterColumnIndex = masterDataGridContext.VisibleColumns.IndexOf( masterColumn );
-      if( masterColumnIndex < 0 )
-        return -1;
-
-      return NavigationHelper.GetPreviousVisibleFocusableDetailColumnIndexFromMasterColumnIndex( dataGridContext, targetRow, masterColumnIndex - 1 );
-    }
-
-    internal static int GetFirstVisibleFocusableInViewportColumnIndex( DataGridContext dataGridContext, Row targetRow )
-    {
-      if( dataGridContext == null )
-        return -1;
-
-      if( dataGridContext.IsAFlattenDetail )
-        return NavigationHelper.GetNextVisibleFocusableInViewportDetailColumnIndexFromMasterColumnIndex( dataGridContext, targetRow );
-
-      return NavigationHelper.GetNextVisibleFocusableInViewportColumnIndex( dataGridContext, targetRow );
-    }
-
-    internal static bool MoveFocusLeft( DataGridContext dataGridContext )
-    {
-      var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
-      if( dataGridControl == null )
-        return false;
-
-      var leftToRight = ( dataGridControl.FlowDirection == FlowDirection.LeftToRight );
-
-      return NavigationHelper.MoveFocus( dataGridControl, dataGridContext, leftToRight, false );
-    }
-
-    internal static bool MoveFocusRight( DataGridContext dataGridContext )
-    {
-      var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
-      if( dataGridControl == null )
-        return false;
-
-      var leftToRight = ( dataGridControl.FlowDirection == FlowDirection.LeftToRight );
-
-      return NavigationHelper.MoveFocus( dataGridControl, dataGridContext, !leftToRight, false );
-    }
-
-    internal static bool MoveFocusToNextVisibleColumn( DataGridContext dataGridContext, bool cycle )
-    {
-      var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
-      if( dataGridControl == null )
-        return false;
-
-      Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
-
-      return NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn, cycle );
-    }
-
-    internal static bool MoveFocusToPreviousVisibleColumn( DataGridContext dataGridContext, bool cycle )
-    {
-      var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
-      if( dataGridControl == null )
-        return false;
-
-      Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
-
-      return NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn, cycle );
-    }
-
-    internal static bool MoveFocusToFirstVisibleColumn( DataGridContext dataGridContext )
-    {
-      var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
-      if( dataGridControl == null )
-        return false;
-
-      Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
-
-      return NavigationHelper.MoveFocusToFirstVisibleColumn( dataGridContext, dataGridContext.CurrentRow );
-    }
-
-    internal static bool MoveFocusToLastVisibleColumn( DataGridContext dataGridContext )
-    {
-      var dataGridControl = NavigationHelper.GetDataGridControl( dataGridContext );
-      if( dataGridControl == null )
-        return false;
-
-      Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
-
-      return NavigationHelper.MoveFocusToLastVisibleColumn( dataGridContext, dataGridContext.CurrentRow );
-    }
-
-    internal static bool HandleTabKey(
-      DataGridControl dataGridControl,
-      DataGridContext dataGridContext,
-      FrameworkElement source,
-      KeyboardDevice device )
-    {
-      if( ( dataGridControl == null ) || !dataGridControl.IsKeyboardFocusWithin )
-        return false;
-
-      Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
-
-      if( !dataGridControl.IsBeingEdited )
-      {
-        Debug.Assert( dataGridContext != null );
-        return false;
-      }
-
-      if( NavigationHelper.ValidateTabKeyHandleIsWithin( dataGridControl, source, device ) )
-        return false;
-
-      var columns = dataGridContext.VisibleColumns;
-      if( columns.Count <= 0 )
-        return false;
-
-      bool handled;
-
-      if( dataGridContext.CurrentColumn == null )
-      {
-        handled = NavigationHelper.MoveFocusToFirstVisibleColumn( dataGridContext );
-      }
-      else
-      {
-        if( ( device.Modifiers & ModifierKeys.Shift ) == ModifierKeys.Shift )
-        {
-          handled = NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext, true );
-        }
-        else
-        {
-          handled = NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext, true );
-        }
-      }
-
-      if( !handled )
-        throw new DataGridException( "Trying to edit while no cell is focusable.", dataGridControl );
-
-      return true;
-    }
-
-    private static int GetNextVisibleFocusableColumnIndex( DataGridContext dataGridContext, Row targetRow, int startIndex )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return -1;
-
-      var columns = dataGridContext.VisibleColumns;
-      if( ( columns == null ) || ( columns.Count <= 0 ) )
-        return -1;
-
-      var cells = targetRow.Cells;
-
-      for( int i = Math.Max( 0, startIndex ); i < columns.Count; i++ )
-      {
-        var targetColumn = columns[ i ];
-
-        if( cells[ targetColumn ].GetCalculatedCanBeCurrent() )
-          return i;
-      }
-
-      return -1;
-    }
-
-    private static int GetPreviousVisibleFocusableColumnIndex( DataGridContext dataGridContext, Row targetRow, int startIndex )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return -1;
-
-      var columns = dataGridContext.VisibleColumns;
-      if( ( columns == null ) || ( columns.Count <= 0 ) )
-        return -1;
-
-      var cells = targetRow.Cells;
-
-      for( int i = Math.Min( columns.Count - 1, startIndex ); i >= 0; i-- )
-      {
-        var targetColumn = columns[ i ];
-
-        if( cells[ targetColumn ].GetCalculatedCanBeCurrent() )
-          return i;
-      }
-
-      return -1;
-    }
-
-    private static int GetNextVisibleFocusableDetailColumnIndexFromMasterColumnIndex( DataGridContext dataGridContext, Row targetRow, int startIndex )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return -1;
-
-      Debug.Assert( dataGridContext.IsAFlattenDetail );
-
-      var detailVisibleColumns = dataGridContext.VisibleColumns;
-      if( ( detailVisibleColumns == null ) || ( detailVisibleColumns.Count <= 0 ) )
-        return -1;
-
-      var masterDataGridContext = dataGridContext.RootDataGridContext;
-      var masterVisibleColumns = masterDataGridContext.VisibleColumns;
-      var cells = targetRow.Cells;
-
-      for( int i = Math.Max( 0, startIndex ); i < masterVisibleColumns.Count; i++ )
-      {
-        var masterColumn = masterVisibleColumns[ i ];
-        Debug.Assert( masterColumn != null );
-
-        var detailColumn = default( ColumnBase );
-        if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( dataGridContext, masterColumn, out detailColumn ) )
-          continue;
-
-        var detailColumnIndex = detailVisibleColumns.IndexOf( detailColumn );
-        if( ( detailColumnIndex >= 0 ) && ( cells[ detailColumn ].GetCalculatedCanBeCurrent() ) )
-          return detailColumnIndex;
-      }
-
-      return -1;
-    }
-
-    private static int GetPreviousVisibleFocusableDetailColumnIndexFromMasterColumnIndex( DataGridContext dataGridContext, Row targetRow, int startIndex )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return -1;
-
-      Debug.Assert( dataGridContext.IsAFlattenDetail );
-
-      var detailVisibleColumns = dataGridContext.VisibleColumns;
-      if( ( detailVisibleColumns == null ) || ( detailVisibleColumns.Count <= 0 ) )
-        return -1;
-
-      var masterDataGridContext = dataGridContext.RootDataGridContext;
-      var masterVisibleColumns = masterDataGridContext.VisibleColumns;
-      var cells = targetRow.Cells;
-
-      for( int i = Math.Min( masterVisibleColumns.Count - 1, startIndex ); i >= 0; i-- )
-      {
-        var masterColumn = masterVisibleColumns[ i ];
-        Debug.Assert( masterColumn != null );
-
-        var detailColumn = default( ColumnBase );
-        if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( dataGridContext, masterColumn, out detailColumn ) )
-          continue;
-
-        var detailColumnIndex = detailVisibleColumns.IndexOf( detailColumn );
-        if( ( detailColumnIndex >= 0 ) && ( cells[ detailColumn ].GetCalculatedCanBeCurrent() ) )
-          return detailColumnIndex;
-      }
-
-      return -1;
-    }
-
-    private static int GetNextVisibleFocusableInViewportColumnIndex( DataGridContext dataGridContext, Row targetRow )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return -1;
-
-      var columns = dataGridContext.VisibleColumns;
-      if( ( columns == null ) || ( columns.Count <= 0 ) )
-        return -1;
-
-      var fixedCellPanel = targetRow.CellsHostPanel as FixedCellPanel;
-      if( fixedCellPanel == null )
-        return -1;
-
-      var cell = default( Cell );
-      var virtualizingCellCollection = fixedCellPanel.ParentRowCells;
-
-      foreach( var targetColumn in columns )
-      {
-        if( !virtualizingCellCollection.TryGetBindedCell( targetColumn, out cell ) )
-          continue;
-
-        if( cell.GetCalculatedCanBeCurrent() )
-          return columns.IndexOf( targetColumn );
-      }
-
-      return -1;
-    }
-
-    private static int GetNextVisibleFocusableInViewportDetailColumnIndexFromMasterColumnIndex( DataGridContext dataGridContext, Row targetRow )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return -1;
-
-      Debug.Assert( dataGridContext.IsAFlattenDetail );
-
-      var detailVisibleColumns = dataGridContext.VisibleColumns;
-      if( ( detailVisibleColumns == null ) || ( detailVisibleColumns.Count <= 0 ) )
-        return -1;
-
-      var masterDataGridContext = dataGridContext.RootDataGridContext;
-      var masterVisibleColumns = masterDataGridContext.VisibleColumns;
-
-      var fixedCellPanel = targetRow.CellsHostPanel as FixedCellPanel;
-      if( fixedCellPanel == null )
-        return -1;
-
-      var cell = default( Cell );
-      var virtualizingCellCollection = fixedCellPanel.ParentRowCells;
-
-      foreach( var masterColumn in masterVisibleColumns )
-      {
-        Debug.Assert( masterColumn != null );
-
-        var detailColumn = default( ColumnBase );
-        if( !DataGridItemPropertyMapHelper.TryGetDetailColumn( dataGridContext, masterColumn, out detailColumn ) )
-          continue;
-
-        if( !virtualizingCellCollection.TryGetBindedCell( detailColumn, out cell ) )
-          continue;
-
-        if( cell.GetCalculatedCanBeCurrent() )
-          return detailVisibleColumns.IndexOf( detailColumn );
-      }
-
-      return -1;
-    }
-
-    private static bool ValidateTabKeyHandleIsWithin(
-      DataGridControl dataGridControl,
-      FrameworkElement source,
-      KeyboardDevice device )
-    {
-      if( ( dataGridControl == null ) || ( source == null ) )
-        return false;
-
-      var nextControl = NavigationHelper.PredictNextElement( source, device );
-      if( nextControl == null )
-        return false;
-
-      //If the original source is not a control (e.g. the cells panel instead of a cell), columns will be used to move focus.
-      var cell = Cell.FindFromChild( nextControl );
-      if( ( cell == null ) || ( cell.ParentColumn != dataGridControl.CurrentColumn ) )
-        return false;
-
-      return object.Equals( cell.ParentRow.GetEditingDataContext(), dataGridControl.CurrentItemInEdition );
-    }
-
-    private static bool MoveFocus( DataGridControl dataGridControl, DataGridContext dataGridContext, bool moveLeft, bool cycle )
-    {
-      Debug.Assert( dataGridControl != null );
-      Debug.Assert( dataGridControl.CurrentContext == dataGridContext );
-
-      bool isFocusWithin = dataGridControl.IsKeyboardFocusWithin;
-      bool isBeingEdited = ( isFocusWithin && dataGridControl.IsBeingEdited );
-
-      var navigationBehavior = dataGridControl.NavigationBehavior;
-
-      // Process key even if NavigationBehavior is RowOnly when the grid is being edited.
-      if( ( navigationBehavior == NavigationBehavior.CellOnly )
-        || ( ( navigationBehavior == NavigationBehavior.RowOnly ) && isBeingEdited )
-        || ( ( navigationBehavior == NavigationBehavior.RowOrCell ) && isFocusWithin && ( dataGridContext.CurrentColumn != null ) ) )
-      {
-        if( moveLeft )
-          return NavigationHelper.MoveFocusToPreviousVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn, cycle );
-
-        return NavigationHelper.MoveFocusToNextVisibleColumn( dataGridContext, dataGridContext.CurrentRow, dataGridContext.CurrentColumn, cycle );
-      }
-
-      return false;
-    }
-
-    private static bool MoveFocusToNextVisibleColumn( DataGridContext dataGridContext, Row targetRow, ColumnBase targetColumn, bool cycle )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return false;
-
-      var columnIndex = NavigationHelper.GetNextVisibleFocusableColumnIndex( dataGridContext, targetRow, targetColumn );
-      if( columnIndex < 0 )
-      {
-        if( cycle )
-          return NavigationHelper.MoveFocusToFirstVisibleColumn( dataGridContext, targetRow );
-
-        return false;
-      }
-      else
-      {
-        var columns = dataGridContext.VisibleColumns;
-        Debug.Assert( columns != null );
-
-        NavigationHelper.SetCurrentColumnAndChangeSelection( dataGridContext, columns[ columnIndex ] );
-
-        return true;
-      }
-    }
-
-    private static bool MoveFocusToPreviousVisibleColumn( DataGridContext dataGridContext, Row targetRow, ColumnBase targetColumn, bool cycle )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return false;
-
-      var columnIndex = NavigationHelper.GetPreviousVisibleFocusableColumnIndex( dataGridContext, targetRow, targetColumn );
-      if( columnIndex < 0 )
-      {
-        if( cycle )
-          return NavigationHelper.MoveFocusToLastVisibleColumn( dataGridContext, targetRow );
-
-        return false;
-      }
-      else
-      {
-        var columns = dataGridContext.VisibleColumns;
-        Debug.Assert( columns != null );
-
-        NavigationHelper.SetCurrentColumnAndChangeSelection( dataGridContext, columns[ columnIndex ] );
-
-        return true;
-      }
-    }
-
-    private static bool MoveFocusToFirstVisibleColumn( DataGridContext dataGridContext, Row targetRow )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return false;
-
-      var columnIndex = NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext, targetRow );
-      if( columnIndex < 0 )
-        return false;
-
-      var columns = dataGridContext.VisibleColumns;
-      Debug.Assert( columns != null );
-
-      NavigationHelper.SetCurrentColumnAndChangeSelection( dataGridContext, columns[ columnIndex ] );
-
-      return true;
-    }
-
-    private static bool MoveFocusToLastVisibleColumn( DataGridContext dataGridContext, Row targetRow )
-    {
-      if( ( dataGridContext == null ) || ( targetRow == null ) )
-        return false;
-
-      var columnIndex = NavigationHelper.GetLastVisibleFocusableColumnIndex( dataGridContext, targetRow );
-      if( columnIndex < 0 )
-        return false;
-
-      var columns = dataGridContext.VisibleColumns;
-      Debug.Assert( columns != null );
-
-      NavigationHelper.SetCurrentColumnAndChangeSelection( dataGridContext, columns[ columnIndex ] );
-
-      return true;
-    }
-
-    private static DataGridControl GetDataGridControl( DataGridContext dataGridContext )
-    {
-      if( dataGridContext != null )
-        return dataGridContext.DataGridControl;
-
-      return null;
-    }
-
-    private static DependencyObject PredictNextElement( FrameworkElement source, KeyboardDevice device )
-    {
-      foreach( var direction in NavigationHelper.GetFocusNavigationDirections( source, device ) )
-      {
-        var target = source.PredictFocus( direction );
-        if( target != null )
-          return target;
-      }
-
-      return null;
-    }
-
-    private static IEnumerable<FocusNavigationDirection> GetFocusNavigationDirections( FrameworkElement source, KeyboardDevice device )
-    {
-      if( source == null )
-        yield break;
-
-      //In the case of a ListBox set with Cycle or Contained navigation mode, we must move in the other direction if on the first or last item,
-      //since PredictFocus will throw is we use FocusNavigationDirection.First/Last.
-      if( ( device.Modifiers & ModifierKeys.Shift ) == ModifierKeys.Shift )
-      {
-        yield return FocusNavigationDirection.Left;
-        yield return FocusNavigationDirection.Up;
-
-        var navigationMode = ( KeyboardNavigationMode )source.GetValue( KeyboardNavigation.TabNavigationProperty );
-        if( navigationMode == KeyboardNavigationMode.Cycle || navigationMode == KeyboardNavigationMode.Contained )
-        {
-          yield return FocusNavigationDirection.Right;
-          yield return FocusNavigationDirection.Down;
-        }
-      }
-      else
-      {
-        yield return FocusNavigationDirection.Right;
-        yield return FocusNavigationDirection.Down;
-
-        var navigationMode = ( KeyboardNavigationMode )source.GetValue( KeyboardNavigation.TabNavigationProperty );
-        if( navigationMode == KeyboardNavigationMode.Cycle || navigationMode == KeyboardNavigationMode.Contained )
-        {
-          yield return FocusNavigationDirection.Left;
-          yield return FocusNavigationDirection.Up;
-        }
-      }
-    }
-
-    private static void SetCurrentColumnAndChangeSelection( DataGridContext dataGridContext, ColumnBase column )
-    {
-      Debug.Assert( dataGridContext != null );
-      Debug.Assert( column != null );
-
-      try
-      {
-        dataGridContext.SetCurrentColumnAndChangeSelection( column );
-      }
-      catch( DataGridException )
-      {
-        // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-        // any other GridException.
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/PassiveLayoutDecorator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/PassiveLayoutDecorator.cs
deleted file mode 100644
index f502755d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/PassiveLayoutDecorator.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Windows;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class PassiveLayoutDecorator : Decorator
-  {
-    #region Axis Property
-
-    public static readonly DependencyProperty AxisProperty =
-        DependencyProperty.Register( "Axis", typeof( PassiveLayoutAxis ), typeof( PassiveLayoutDecorator ), new UIPropertyMetadata( PassiveLayoutAxis.Vertical ) );
-
-    public PassiveLayoutAxis Axis
-    {
-      get
-      {
-        return ( PassiveLayoutAxis )this.GetValue( PassiveLayoutDecorator.AxisProperty );
-      }
-      set
-      {
-        this.SetValue( PassiveLayoutDecorator.AxisProperty, value );
-      }
-    }
-
-    #endregion Axis Property
-
-    #region RealDesiredSize Internal Property
-
-    internal Size RealDesiredSize
-    {
-      get
-      {
-        return m_realDesiredSize;
-      }
-    }
-
-    private Size m_realDesiredSize;
-
-    #endregion RealDesiredSize Property
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      Size size = base.MeasureOverride( availableSize );
-      m_realDesiredSize = size;
-
-      switch( this.Axis )
-      {
-        case PassiveLayoutAxis.Vertical:
-          return new Size( size.Width, 0d );
-
-        case PassiveLayoutAxis.Horizontal:
-          return new Size( 0d, size.Height );
-
-        case PassiveLayoutAxis.Both:
-          return new Size( 0d, 0d );
-
-        default:
-          System.Diagnostics.Debug.Assert( false, "Unknown PassiveLayoutAxis." );
-          return size;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollViewerTemplateHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollViewerTemplateHelper.cs
deleted file mode 100644
index 8db9777e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollViewerTemplateHelper.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class ScrollViewerTemplateHelper : IDisposable
-  {
-
-    public ScrollViewerTemplateHelper(
-      ScrollViewer scrollViewer,
-      Action<Orientation> dragScrollBeginCallback,
-      Action<Orientation> dragScrollEndCallback )
-    {
-      if( scrollViewer == null )
-        throw new ArgumentNullException( "scrollViewer" );
-
-      m_scrollViewer = scrollViewer;
-      m_dragScrollBeginCallback = dragScrollBeginCallback;
-      m_dragScrollEndCallback = dragScrollEndCallback;
-    }
-
-    #region VerticalScrollBar Property
-
-    public ScrollBar VerticalScrollBar
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region HorizontalScrollBar Property
-
-    public ScrollBar HorizontalScrollBar
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    public ScrollBar GetScrollBar( Orientation orientation )
-    {
-      return ( orientation == Orientation.Vertical )
-        ? this.VerticalScrollBar
-        : this.HorizontalScrollBar;
-    }
-
-    public void RefreshTemplate()
-    {
-      this.UnregisterEvents();
-
-      var template = m_scrollViewer.Template;
-      if( template != null )
-      {
-        this.HorizontalScrollBar = template.FindName( "PART_HorizontalScrollBar", m_scrollViewer ) as ScrollBar;
-        this.VerticalScrollBar = template.FindName( "PART_VerticalScrollBar", m_scrollViewer ) as ScrollBar;
-      }
-
-      if( m_dragScrollBeginCallback != null || m_dragScrollEndCallback != null )
-      {
-        this.RegisterEvents();
-      }
-    }
-
-    public void Dispose()
-    {
-      this.UnregisterEvents();
-
-      m_dragScrollBeginCallback = null;
-      m_dragScrollEndCallback = null;
-    }
-
-    private void RegisterEvents()
-    {
-      if( this.VerticalScrollBar != null )
-      {
-        this.VerticalScrollBar.IsMouseCaptureWithinChanged += ScrollBar_IsMouseCaptureWithinChanged;
-      }
-
-      if( this.HorizontalScrollBar != null )
-      {
-        this.HorizontalScrollBar.IsMouseCaptureWithinChanged += ScrollBar_IsMouseCaptureWithinChanged;
-      }
-    }
-
-    private void UnregisterEvents()
-    {
-      if( this.VerticalScrollBar != null )
-      {
-        this.VerticalScrollBar.IsMouseCaptureWithinChanged -= ScrollBar_IsMouseCaptureWithinChanged;
-      }
-
-      if( this.HorizontalScrollBar != null )
-      {
-        this.HorizontalScrollBar.IsMouseCaptureWithinChanged -= ScrollBar_IsMouseCaptureWithinChanged;
-      }
-    }
-
-    private void ScrollBar_IsMouseCaptureWithinChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      var scrollBar = sender as ScrollBar;
-
-      if( scrollBar == null )
-        return;
-
-      if( scrollBar != this.HorizontalScrollBar
-        && scrollBar != this.VerticalScrollBar )
-      {
-        Debug.Fail( "Unknown scrollbar" );
-        return;
-      }
-
-      var scrollThumb = Mouse.Captured as Thumb;
-
-      if( scrollThumb == null )
-        return;
-
-      if( scrollBar.Track == null )
-        return;
-
-      if( scrollBar.Track.Thumb != scrollThumb )
-        return;
-
-      m_currentScrollOrientation = ( scrollBar == this.VerticalScrollBar ) ? Orientation.Vertical : Orientation.Horizontal;
-
-      if( m_dragScrollEndCallback != null )
-      {
-        // Register to LostMouseCapture to be sure to hide the ScrollTip when the ScrollThumb lost the focus
-        scrollThumb.LostMouseCapture += new MouseEventHandler( this.ScrollThumb_LostMouseCapture );
-      }
-
-      if( m_dragScrollBeginCallback != null )
-      {
-
-        m_dragScrollBeginCallback( m_currentScrollOrientation );
-      }
-
-    }
-
-
-    private void ScrollThumb_LostMouseCapture( object sender, MouseEventArgs e )
-    {
-      Thumb scrollBarThumb = sender as Thumb;
-
-      Debug.Assert( scrollBarThumb != null );
-
-      if( scrollBarThumb != null )
-        scrollBarThumb.LostMouseCapture -= new MouseEventHandler( this.ScrollThumb_LostMouseCapture );
-
-      if( m_dragScrollEndCallback != null )
-      {
-        m_dragScrollEndCallback( m_currentScrollOrientation );
-      }
-    }
-
-    #region Fields
-
-    private ScrollViewer m_scrollViewer;
-    private Action<Orientation> m_dragScrollBeginCallback;
-    private Action<Orientation> m_dragScrollEndCallback;
-    private Orientation m_currentScrollOrientation;
-    #endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollingCellsDecorator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollingCellsDecorator.cs
deleted file mode 100644
index d4e616cc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollingCellsDecorator.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  internal class ScrollingCellsDecorator : Decorator
-  {
-    #region Constructors
-
-    static ScrollingCellsDecorator()
-    {
-      KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata(
-        typeof( ScrollingCellsDecorator ),
-        new FrameworkPropertyMetadata( KeyboardNavigationMode.Local ) );
-
-      // Binding used to affect the AnimatedSplitterTranslationBinding only
-      // when performing an animated Column reordering
-      AreColumnsBeingReorderedBinding = new Binding();
-      AreColumnsBeingReorderedBinding.RelativeSource = new RelativeSource( RelativeSourceMode.Self );
-      AreColumnsBeingReorderedBinding.Path = new PropertyPath( "(0).(1)",
-        DataGridControl.DataGridContextProperty,
-        TableflowView.AreColumnsBeingReorderedProperty );
-
-      AreColumnsBeingReorderedBinding.Mode = BindingMode.OneWay;
-    }
-
-    public ScrollingCellsDecorator()
-    {
-      this.Focusable = false;
-
-      BindingOperations.SetBinding(
-         this,
-         ScrollingCellsDecorator.AreColumnsBeingReorderedProperty,
-         ScrollingCellsDecorator.AreColumnsBeingReorderedBinding );
-    }
-
-    #endregion
-
-    #region SplitterOffset Public Property
-
-    public static readonly DependencyProperty SplitterOffsetProperty = DependencyProperty.Register(
-      "SplitterOffset",
-      typeof( double ),
-      typeof( ScrollingCellsDecorator ),
-      new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.AffectsArrange ) );
-
-    public double SplitterOffset
-    {
-      get
-      {
-        return ( double )this.GetValue( ScrollingCellsDecorator.SplitterOffsetProperty );
-      }
-      set
-      {
-        this.SetValue( ScrollingCellsDecorator.SplitterOffsetProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ParentScrollViewer Private Property
-
-    private ScrollViewer ParentScrollViewer
-    {
-      get
-      {
-        if( m_scrollViewer == null )
-        {
-          m_scrollViewer = TableViewScrollViewer.GetParentScrollViewer( this );
-        }
-
-        return m_scrollViewer;
-      }
-    }
-
-    #endregion
-
-    #region AreColumnsBeingReordered Property
-
-    internal static readonly DependencyProperty AreColumnsBeingReorderedProperty = DependencyProperty.Register(
-      "AreColumnsBeingReordered",
-      typeof( bool ),
-      typeof( ScrollingCellsDecorator ),
-      new FrameworkPropertyMetadata(
-        ( bool )false,
-        new PropertyChangedCallback( ScrollingCellsDecorator.OnAreColumnsBeingReorderedChanged ) ) );
-
-    internal bool AreColumnsBeingReordered
-    {
-      get
-      {
-        return ( bool )this.GetValue( ScrollingCellsDecorator.AreColumnsBeingReorderedProperty );
-      }
-      set
-      {
-        this.SetValue( ScrollingCellsDecorator.AreColumnsBeingReorderedProperty, value );
-      }
-    }
-
-    private static void OnAreColumnsBeingReorderedChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ScrollingCellsDecorator decorator = sender as ScrollingCellsDecorator;
-
-      if( decorator == null )
-        return;
-
-
-      if( ( bool )e.NewValue )
-      {
-        decorator.SetSplitterOffsetBinding();
-      }
-      else
-      {
-        decorator.ClearSplitterOffsetBinding();
-      }
-    }
-
-    #endregion
-
-    #region Protected Methods
-
-    protected override Size ArrangeOverride( Size arrangeSize )
-    {
-      // We need to take ScrollingCellsDecoratorClipOffset into consideration
-      // in case an animated column reordering is in progress
-      double clipOffset = this.SplitterOffset;
-
-      //Width of Rect cannot be less then 0.
-      double widthOffset = Math.Max( 0, arrangeSize.Width - clipOffset );
-
-      // Try to get the RectangleGeometry from the Clip
-      // to avoid recreating one per call
-      RectangleGeometry clip = this.Clip as RectangleGeometry;
-
-      if( clip == null )
-      {
-        clip = new RectangleGeometry();
-        this.Clip = clip;
-      }
-
-      clip.Rect = new Rect( clipOffset, -0.5d, widthOffset, arrangeSize.Height + 1d );
-
-      return base.ArrangeOverride( arrangeSize );
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void SetSplitterOffsetBinding()
-    {
-      if( m_splitterOffsetBinding == null )
-      {
-        // Binding used to know if there was a splitter translation to enlarge
-        // or reduce the Clip region of the Decorator
-        m_splitterOffsetBinding = new Binding();
-        m_splitterOffsetBinding.Source = this;
-        m_splitterOffsetBinding.Path = new PropertyPath( "(0).(1).X",
-          DataGridControl.DataGridContextProperty,
-          TableflowView.FixedColumnSplitterTranslationProperty );
-
-        m_splitterOffsetBinding.Mode = BindingMode.OneWay;
-      }
-
-      BindingOperations.SetBinding(
-          this,
-          ScrollingCellsDecorator.SplitterOffsetProperty,
-          m_splitterOffsetBinding );
-    }
-
-    private void ClearSplitterOffsetBinding()
-    {
-      BindingOperations.ClearBinding( this,
-        ScrollingCellsDecorator.SplitterOffsetProperty );
-    }
-
-
-    #endregion
-
-    #region Private Fields
-
-    private ScrollViewer m_scrollViewer; // = null;
-    private Binding m_splitterOffsetBinding; // = null;
-    private static Binding AreColumnsBeingReorderedBinding; // = null;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs
deleted file mode 100644
index 977d8fbf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs
+++ /dev/null
@@ -1,520 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Input;
-using System.Windows.Threading;
-using Xceed.Utils.Math;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class SynchronizedScrollViewer : ScrollViewer, DataGridScrollViewer.IDeferableScrollChanged
-  {
-    #region Constructors
-
-    static SynchronizedScrollViewer()
-    {
-      ScrollViewer.HorizontalScrollBarVisibilityProperty.OverrideMetadata( typeof( SynchronizedScrollViewer ), new FrameworkPropertyMetadata( ScrollBarVisibility.Hidden ) );
-      ScrollViewer.VerticalScrollBarVisibilityProperty.OverrideMetadata( typeof( SynchronizedScrollViewer ), new FrameworkPropertyMetadata( ScrollBarVisibility.Hidden ) );
-
-      // By default, we never want item scrolling.
-      ScrollViewer.CanContentScrollProperty.OverrideMetadata( typeof( SynchronizedScrollViewer ), new FrameworkPropertyMetadata( false ) );
-    }
-
-    public SynchronizedScrollViewer()
-    {
-      // ScrollViewer binds these three properties to the TemplatedParent properties. 
-      // Changing their default value using only OverrideMetadata would not work.
-      this.HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden;
-      this.VerticalScrollBarVisibility = ScrollBarVisibility.Hidden;
-    }
-
-    #endregion
-
-    #region DataGridScrollViewer.IDeferableScrollChanged Implementation
-
-    bool DataGridScrollViewer.IDeferableScrollChanged.DeferScrollChanged
-    {
-      get
-      {
-        return m_deferScrollChange;
-      }
-      set
-      {
-
-        var valueChanged = ( m_deferScrollChange != value );
-
-        m_deferScrollChange = value;
-
-        if( m_mainScrollViewer == null )
-          return;
-
-        if( !m_deferScrollChange && valueChanged )
-        {
-          var scrollOrientation = this.ScrollOrientation;
-
-          if( ( scrollOrientation & ScrollOrientation.Horizontal ) == ScrollOrientation.Horizontal )
-          {
-            this.ScrollToHorizontalOffset( m_mainScrollViewer.HorizontalOffset );
-          }
-
-          if( ( scrollOrientation & ScrollOrientation.Vertical ) == ScrollOrientation.Vertical )
-          {
-            this.ScrollToVerticalOffset( m_mainScrollViewer.VerticalOffset );
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region ScrollOrientation property
-
-    public static readonly DependencyProperty ScrollOrientationProperty = DependencyProperty.Register(
-      "ScrollOrientation",
-      typeof( ScrollOrientation ),
-      typeof( SynchronizedScrollViewer ),
-      new PropertyMetadata( ScrollOrientation.Horizontal ) );
-
-    public ScrollOrientation ScrollOrientation
-    {
-      get
-      {
-        return ( ScrollOrientation )this.GetValue( SynchronizedScrollViewer.ScrollOrientationProperty );
-      }
-
-      set
-      {
-        this.SetValue( SynchronizedScrollViewer.ScrollOrientationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region LimitScrolling Internal Property
-
-    internal static readonly DependencyProperty LimitScrollingProperty = DependencyProperty.Register(
-      "LimitScrolling",
-      typeof( bool ),
-      typeof( SynchronizedScrollViewer ),
-      new UIPropertyMetadata( true ) );
-
-    internal bool LimitScrolling
-    {
-      get
-      {
-        return ( bool )this.GetValue( SynchronizedScrollViewer.LimitScrollingProperty );
-      }
-      set
-      {
-        this.SetValue( SynchronizedScrollViewer.LimitScrollingProperty, value );
-      }
-    }
-
-    #endregion
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( this.TemplatedParent != m_mainScrollViewer )
-      {
-        if( m_mainScrollViewer != null )
-        {
-          m_mainScrollViewer.ScrollChanged -= new ScrollChangedEventHandler( this.OnMainScrollViewer_ScrollChanged );
-        }
-
-        m_mainScrollViewer = this.TemplatedParent as ScrollViewer;
-
-        if( m_mainScrollViewer != null )
-        {
-          m_mainScrollViewer.ScrollChanged += new ScrollChangedEventHandler( this.OnMainScrollViewer_ScrollChanged );
-        }
-      }
-    }
-
-    protected override void OnScrollChanged( ScrollChangedEventArgs e )
-    {
-      e.Handled = true;
-
-      base.OnScrollChanged( e );
-
-      // m_mainScrollViewer will remain null in design mode and if it's null, nothing to update
-      if( m_mainScrollViewer == null )
-        return;
-
-      // Sometimes, a row in the SynchronizedScrollViewer will scroll by itself,
-      // not triggered by the main ScrollViewer scrolling. In that case, we want
-      // to update the main ScrollViewer. A typical example is when a Row's cell is 
-      // brought into view by, let's say, activating the cell editor.
-      var invalidateMainScrollViewerMeasure = false;
-
-      // If the Extent is 0, there is no reason to update the main ScrollViewer offset since this means there are no children.
-      if( this.CanScrollHorizontally() )
-      {
-        invalidateMainScrollViewerMeasure = invalidateMainScrollViewerMeasure || !DoubleUtil.AreClose( 0, e.ExtentWidthChange );
-
-        this.BeginUpdateMainScrollViewer( e );
-      }
-
-      // If the Extent is 0, there is no reason to update the main ScrollViewer offset since this means there are no children.
-      if( this.CanScrollVertically() )
-      {
-        invalidateMainScrollViewerMeasure = invalidateMainScrollViewerMeasure || !DoubleUtil.AreClose( 0, e.ExtentHeightChange );
-
-        this.BeginUpdateMainScrollViewer( e );
-      }
-
-      // In some situations, the Extent*Change event is received AFTER the 
-      // layout pass of the mainScrollViewer is done. Since the measure of the
-      // mainScrollViewer uses the SynchronizedScrollViewer Extent size, we must
-      // call InvalidateMeasure on the mainScrollViewer to ensure it is correctly
-      // layouted
-      if( invalidateMainScrollViewerMeasure )
-      {
-        m_mainScrollViewer.InvalidateMeasure();
-      }
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      switch( e.Key )
-      {
-        // Handle the System key definition (basically with ALT key pressed)
-        case Key.System:
-          this.HandlePreviewSystemKey( e );
-          break;
-
-        case Key.Tab:
-          this.HandlePreviewTabKey( e );
-          break;
-
-        case Key.PageUp:
-          this.HandlePreviewPageUpKey( e );
-          break;
-
-        case Key.PageDown:
-          this.HandlePreviewPageDownKey( e );
-          break;
-
-        case Key.Home:
-          this.HandlePreviewHomeKey( e );
-          break;
-
-        case Key.End:
-          this.HandlePreviewEndKey( e );
-          break;
-
-        case Key.Up:
-          this.HandlePreviewUpKey( e );
-          break;
-
-        case Key.Down:
-          this.HandlePreviewDownKey( e );
-          break;
-
-        case Key.Left:
-          this.HandlePreviewLeftKey( e );
-          break;
-
-        case Key.Right:
-          this.HandlePreviewRightKey( e );
-          break;
-
-        default:
-          base.OnPreviewKeyDown( e );
-          break;
-      }
-    }
-
-    protected virtual void HandlePreviewSystemKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewTabKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewLeftKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewRightKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewUpKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewDownKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewPageUpKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewPageDownKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewHomeKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewEndKey( KeyEventArgs e )
-    {
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      switch( e.Key )
-      {
-        // Handle the System key definition (basically with ALT key pressed)
-        case Key.System:
-          this.HandleSystemKey( e );
-          break;
-
-        case Key.Tab:
-          this.HandleTabKey( e );
-          break;
-
-        case Key.PageUp:
-          this.HandlePageUpKey( e );
-          break;
-
-        case Key.PageDown:
-          this.HandlePageDownKey( e );
-          break;
-
-        case Key.Home:
-          this.HandleHomeKey( e );
-          break;
-
-        case Key.End:
-          this.HandleEndKey( e );
-          break;
-
-        case Key.Up:
-          this.HandleUpKey( e );
-          break;
-
-        case Key.Down:
-          this.HandleDownKey( e );
-          break;
-
-        case Key.Left:
-          this.HandleLeftKey( e );
-          break;
-
-        case Key.Right:
-          this.HandleRightKey( e );
-          break;
-
-        default:
-          base.OnKeyDown( e );
-          break;
-      }
-    }
-
-    protected virtual void HandleSystemKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandleTabKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePageUpKey( KeyEventArgs e )
-    {
-      // Ensure to at least process the PageUp as Key.Up
-      // to avoid the TableViewScrollViewer to process the key
-      // directly without moving the focus.
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( Key.Up );
-
-      // We were not able to move focus out of the 
-      // SynchronizedScrollViewer but the focus is still inside.
-      // Mark the key as handled to avoid the DataGridScrollViewer
-      // to process the PageUp.
-      if( !e.Handled && this.IsKeyboardFocusWithin )
-      {
-        e.Handled = true;
-      }
-    }
-
-    protected virtual void HandlePageDownKey( KeyEventArgs e )
-    {
-      // Ensure to at least process the PageDown as Key.Down
-      // to avoid the TableViewScrollViewer to process the key
-      // directly without moving the focus.
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( Key.Down );
-
-      // We were not able to move focus out of the 
-      // SynchronizedScrollViewer but the focus is still inside.
-      // Mark the key as handled to avoid the DataGridScrollViewer
-      // to process the PageDown.
-      if( !e.Handled && this.IsKeyboardFocusWithin )
-      {
-        e.Handled = true;
-      }
-    }
-
-    protected virtual void HandleHomeKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandleEndKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandleUpKey( KeyEventArgs e )
-    {
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
-    }
-
-    protected virtual void HandleDownKey( KeyEventArgs e )
-    {
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
-    }
-
-    protected virtual void HandleLeftKey( KeyEventArgs e )
-    {
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
-    }
-
-    protected virtual void HandleRightKey( KeyEventArgs e )
-    {
-      e.Handled = DataGridItemsHost.ProcessMoveFocus( e.Key );
-    }
-
-    private bool CanScrollHorizontally()
-    {
-      return ( ( this.ScrollOrientation & ScrollOrientation.Horizontal ) == ScrollOrientation.Horizontal )
-          && ( this.ExtentWidth > 0d );
-    }
-
-    private bool CanScrollVertically()
-    {
-      return ( ( this.ScrollOrientation & ScrollOrientation.Vertical ) == ScrollOrientation.Vertical )
-          && ( this.ExtentHeight > 0d );
-    }
-
-    private void BeginUpdateMainScrollViewer( ScrollChangedEventArgs e )
-    {
-      if( m_scrollChangedEventArgs == null )
-      {
-        m_scrollChangedEventArgs = e;
-      }
-
-      if( m_updateMainScrollViewer == null )
-      {
-        m_updateMainScrollViewer = this.Dispatcher.BeginInvoke( new Action( this.UpdateMainScrollViewer ), DispatcherPriority.Send );
-      }
-    }
-
-    private void UpdateMainScrollViewer()
-    {
-      var e = m_scrollChangedEventArgs;
-
-      m_updateMainScrollViewer = null;
-      m_scrollChangedEventArgs = null;
-
-      if( ( m_mainScrollViewer == null ) || ( e == null ) )
-        return;
-
-      if( this.CanScrollHorizontally() && ( e.HorizontalOffset != m_mainScrollViewer.HorizontalOffset ) )
-      {
-        m_mainScrollViewer.ScrollToHorizontalOffset( e.HorizontalOffset );
-      }
-
-      if( this.CanScrollVertically() && ( e.VerticalOffset != m_mainScrollViewer.VerticalOffset ) )
-      {
-        m_mainScrollViewer.ScrollToVerticalOffset( e.VerticalOffset );
-      }
-    }
-
-    private void OnMainScrollViewer_ScrollChanged( object sender, ScrollChangedEventArgs e )
-    {
-      if( ( e.OriginalSource != m_mainScrollViewer ) || m_deferScrollChange )
-        return;
-
-      var orientation = this.ScrollOrientation;
-      var limitScrolling = this.LimitScrolling;
-
-      // If the Extent is 0, there is no reason to update the main ScrollViewer offset since this means there are no children.
-      if( this.CanScrollHorizontally() )
-      {
-        var offset = ( limitScrolling ) ? Math.Min( e.HorizontalOffset, this.ExtentWidth - this.ViewportWidth ) : e.HorizontalOffset;
-
-        if( offset != this.HorizontalOffset )
-        {
-          // We keep the original ScrollChangedEventArgs because when we'll update
-          // our offset, it might be less than what was asked in the first place. Even
-          // if this doesn't make sense to us, it might be ok for the m_mainScrollViewer
-          // to scroll to that value. Since changing our offset will trigger the OnScrollChanged
-          // that will update the m_mainScrollViewer, we want to changer it's offset to 
-          // the right value.
-          m_scrollChangedEventArgs = e;
-          this.ScrollToHorizontalOffset( offset );
-        }
-      }
-
-      // If the Extent is 0, there is no reason to update the main ScrollViewer offset since this means there are no children.
-      if( this.CanScrollVertically() )
-      {
-        var offset = ( limitScrolling ) ? Math.Min( e.VerticalOffset, this.ExtentHeight - this.ViewportHeight ) : e.VerticalOffset;
-
-        if( offset != this.VerticalOffset )
-        {
-          // We keep the original ScrollChangedEventArgs because when we'll update
-          // our offset, it might be less than what was asked in the first place. Even
-          // if this doesn't make sense to us, it might be ok for the m_mainScrollViewer
-          // to scroll to that value. Since changing our offset will trigger the OnScrollChanged
-          // that will update the m_mainScrollViewer, we want to changer it's offset to 
-          // the right value.
-          m_scrollChangedEventArgs = e;
-          this.ScrollToVerticalOffset( offset );
-        }
-      }
-    }
-
-    #region Private Fields
-
-    private ScrollViewer m_mainScrollViewer; //null
-    private bool m_deferScrollChange; //false 
-    private ScrollChangedEventArgs m_scrollChangedEventArgs; //null
-    private DispatcherOperation m_updateMainScrollViewer; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs
deleted file mode 100644
index 0b564811..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs
+++ /dev/null
@@ -1,949 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.IO;
-using System.Security;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class TableView : UIViewBase
-  {
-    // We must add a setter since this value is used as default value of a DependencyObject which will be instanciated before the static constructor is called
-    internal static Cursor DefaultFixedColumnSplitterCursor
-    {
-      get
-      {
-        if( TableView.DefaultFixedColumnSplitterCursorCache == null )
-        {
-          try
-          {
-            var uri = new Uri( _XceedVersionInfo.CurrentAssemblyPackUri + ";component/FixedColumnSplitter.cur" );
-            var info = Application.GetResourceStream( uri );
-
-            if( info != null )
-            {
-              TableView.DefaultFixedColumnSplitterCursorCache = new Cursor( info.Stream );
-            }
-          }
-          catch( SecurityException )
-          {
-          }
-          catch( UriFormatException )
-          {
-          }
-          catch( IOException )
-          {
-          }
-          finally
-          {
-            if( TableView.DefaultFixedColumnSplitterCursorCache == null )
-            {
-              TableView.DefaultFixedColumnSplitterCursorCache = Cursors.SizeWE;
-            }
-          }
-        }
-
-        return TableView.DefaultFixedColumnSplitterCursorCache;
-      }
-    }
-
-    private static Cursor DefaultFixedColumnSplitterCursorCache;
-
-    internal static Cursor DefaultRowSelectorResizeNorthSouthCursor = Cursors.SizeNS;
-    internal static Cursor DefaultRowSelectorResizeWestEastCursor = Cursors.SizeWE;
-
-    static TableView()
-    {
-      FrameworkContentElement.DefaultStyleKeyProperty.OverrideMetadata( typeof( TableView ), new FrameworkPropertyMetadata( TableView.GetDefaultStyleKey( typeof( TableView ), null ) ) );
-
-      TableView.CompensationOffsetProperty = TableView.CompensationOffsetPropertyKey.DependencyProperty;
-
-      TableView.DefaultColumnManagerRowTemplate = new DataTemplate();
-      TableView.DefaultColumnManagerRowTemplate.VisualTree = new FrameworkElementFactory( typeof( ColumnManagerRow ) );
-      TableView.DefaultColumnManagerRowTemplate.Seal();
-
-      TableView.DefaultGroupByControlTemplate = new DataTemplate();
-      FrameworkElementFactory groupByControl = new FrameworkElementFactory( typeof( HierarchicalGroupByControl ) );
-      groupByControl.SetValue( TableView.CanScrollHorizontallyProperty, false );
-      TableView.DefaultGroupByControlTemplate.VisualTree = groupByControl;
-      TableView.DefaultGroupByControlTemplate.Seal();
-    }
-
-    public TableView()
-    {
-    }
-
-    #region AutoFillLastPage Property
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AutoFillLastPageProperty = DependencyProperty.RegisterAttached(
-      "AutoFillLastPage",
-      typeof( bool ),
-      typeof( TableView ),
-      new PropertyMetadata( true ) );
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public bool AutoFillLastPage
-    {
-      get
-      {
-        return ( bool )this.GetValue( TableView.AutoFillLastPageProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.AutoFillLastPageProperty, value );
-      }
-    }
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static bool GetAutoFillLastPage( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableView.AutoFillLastPageProperty );
-    }
-
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static void SetAutoFillLastPage( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableView.AutoFillLastPageProperty, value );
-    }
-
-    #endregion
-
-    #region CanScrollHorizontally Attached Property
-
-    public static readonly DependencyProperty CanScrollHorizontallyProperty = DependencyProperty.RegisterAttached(
-      "CanScrollHorizontally",
-      typeof( bool ),
-      typeof( TableView ),
-      new UIPropertyMetadata( true, new PropertyChangedCallback( TableView.OnCanScrollHorizontallyChanged ) ) );
-
-    public static bool GetCanScrollHorizontally( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableView.CanScrollHorizontallyProperty );
-    }
-
-    public static void SetCanScrollHorizontally( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableView.CanScrollHorizontallyProperty, value );
-    }
-
-    private static void OnCanScrollHorizontallyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      // This property makes sense (only works) for potentially visible element; UIElement.
-      var element = sender as FrameworkElement;
-      if( element == null )
-        return;
-
-      TableViewScrollViewer.SetFixedTranslateTransform( element, ( bool )e.NewValue );
-    }
-
-    #endregion
-
-    #region CompensationOffset Attached Property
-
-    internal static readonly DependencyPropertyKey CompensationOffsetPropertyKey = DependencyProperty.RegisterAttachedReadOnly(
-      "CompensationOffset",
-      typeof( double ),
-      typeof( TableView ),
-      new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    internal static readonly DependencyProperty CompensationOffsetProperty;
-
-    internal static double GetCompensationOffset( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableView.CompensationOffsetProperty );
-    }
-
-    internal static void SetCompensationOffset( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableView.CompensationOffsetPropertyKey, value );
-    }
-
-    #endregion
-
-    // View properties
-
-    #region ColumnStretchMinWidth Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty ColumnStretchMinWidthProperty = DependencyProperty.RegisterAttached(
-      "ColumnStretchMinWidth",
-      typeof( double ),
-      typeof( TableView ),
-      new UIPropertyMetadata( 50d ),
-      new ValidateValueCallback( TableView.ValidateColumnStretchMinWidthCallback ) );
-
-    public double ColumnStretchMinWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( TableView.ColumnStretchMinWidthProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.ColumnStretchMinWidthProperty, value );
-      }
-    }
-
-    public static double GetColumnStretchMinWidth( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableView.ColumnStretchMinWidthProperty );
-    }
-
-    public static void SetColumnStretchMinWidth( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableView.ColumnStretchMinWidthProperty, value );
-    }
-
-    internal static bool ValidateColumnStretchMinWidthCallback( object value )
-    {
-      double doubleValue = ( double )value;
-
-      if( doubleValue < 0d )
-        return false;
-
-      if( double.IsInfinity( doubleValue ) )
-        return false;
-
-      if( double.IsNaN( doubleValue ) )
-        return false;
-
-      return true;
-    }
-
-    #endregion
-
-    #region ColumnStretchMode Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty ColumnStretchModeProperty = DependencyProperty.RegisterAttached(
-      "ColumnStretchMode",
-      typeof( ColumnStretchMode ),
-      typeof( TableView ),
-      new UIPropertyMetadata( ColumnStretchMode.None, new PropertyChangedCallback( TableView.ColumnStretchModeChanged ) ) );
-
-    public ColumnStretchMode ColumnStretchMode
-    {
-      get
-      {
-        return ( ColumnStretchMode )this.GetValue( TableView.ColumnStretchModeProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.ColumnStretchModeProperty, value );
-      }
-    }
-
-    public static ColumnStretchMode GetColumnStretchMode( DependencyObject obj )
-    {
-      return ( ColumnStretchMode )obj.GetValue( TableView.ColumnStretchModeProperty );
-    }
-
-    public static void SetColumnStretchMode( DependencyObject obj, ColumnStretchMode value )
-    {
-      obj.SetValue( TableView.ColumnStretchModeProperty, value );
-    }
-
-    private static void ColumnStretchModeChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      DataGridContext dataGridContext = sender as DataGridContext;
-
-      System.Diagnostics.Debug.Assert( ( dataGridContext != null ) || ( sender is TableView ) || ( sender is DetailConfiguration ), "ColumnStretchMode is currently only handled on TableView, DetailConfiguration and DataGridContext." );
-
-      if( ( dataGridContext != null ) && ( dataGridContext.VisibleColumns.Count > 0 ) )
-      {
-        // When ColumnStretchMode changes, the DesiredWidth columns will not be the
-        // same. Reset all DesiredWidth.
-        foreach( ColumnBase column in dataGridContext.VisibleColumns )
-        {
-          column.ClearValue( Column.DesiredWidthProperty );
-        }
-
-        // The previous ClearValues don't necessary have an effect. For instance, if a 
-        // MaxWidth was in effect for the previous stretch mode or if there are no * in 
-        // "None" stretch mode. Force a refresh by assigning a dummy value to the 
-        // DesiredWidth of the new stretch mode related Column that will be ultimately 
-        // modified by VirtualizingStackPanel.MeasureOverride.
-        switch( ( ColumnStretchMode )e.NewValue )
-        {
-          case ColumnStretchMode.First:
-            TableView.TouchColumnWidth( dataGridContext.VisibleColumns[ 0 ] );
-            break;
-
-          case ColumnStretchMode.Last:
-            TableView.TouchColumnWidth( dataGridContext.VisibleColumns[ dataGridContext.VisibleColumns.Count - 1 ] );
-            break;
-
-          case ColumnStretchMode.All:
-            {
-              foreach( ColumnBase column in dataGridContext.VisibleColumns )
-              {
-                // One column.ActualWidth modification is enough to trigger a new 
-                // Measure pass. Stop at the first effective "touch".
-                if( TableView.TouchColumnWidth( column ) )
-                  break;
-              }
-            }
-            break;
-
-          case ColumnStretchMode.None:
-            {
-              foreach( ColumnBase column in dataGridContext.VisibleColumns )
-              {
-                if( column.Width.UnitType == ColumnWidthUnitType.Star )
-                {
-                  // One column.ActualWidth modification is enough to trigger a new 
-                  // Measure pass. Stop at the first effective "touch".
-                  if( TableView.TouchColumnWidth( column ) )
-                    break;
-                }
-              }
-            }
-            break;
-        }
-      }
-    }
-
-    private static bool TouchColumnWidth( ColumnBase column )
-    {
-      bool modified = false;
-
-      if( column != null )
-      {
-        double oldActualWidth = column.ActualWidth;
-
-        // Assign a temporary value to DesiredWidth (different from ActualWidth) 
-        // to force a new Measure pass.
-        if( column.ActualWidth > column.MinWidth )
-        {
-          column.DesiredWidth = column.MinWidth;
-        }
-        else
-        {
-          column.DesiredWidth = column.ActualWidth + 1d;
-        }
-
-        modified = !Xceed.Utils.Math.DoubleUtil.AreClose( oldActualWidth, column.ActualWidth );
-      }
-
-      return modified;
-    }
-
-    #endregion
-
-    #region RemoveColumnStretchingOnResize Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty RemoveColumnStretchingOnResizeProperty = DependencyProperty.RegisterAttached(
-      "RemoveColumnStretchingOnResize",
-      typeof( bool ),
-      typeof( TableView ),
-      new UIPropertyMetadata( false ) );
-
-    public bool RemoveColumnStretchingOnResize
-    {
-      get
-      {
-        return ( bool )this.GetValue( TableView.RemoveColumnStretchingOnResizeProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.RemoveColumnStretchingOnResizeProperty, value );
-      }
-    }
-
-    public static bool GetRemoveColumnStretchingOnResize( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableView.RemoveColumnStretchingOnResizeProperty );
-    }
-
-    public static void SetRemoveColumnStretchingOnResize( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableView.RemoveColumnStretchingOnResizeProperty, value );
-    }
-
-    #endregion
-
-    #region FixedColumnCount Property
-
-    [ViewProperty( ViewPropertyMode.RoutedNoFallback, FlattenDetailBindingMode.MasterOneWay )]
-    public static readonly DependencyProperty FixedColumnCountProperty = DependencyProperty.RegisterAttached(
-      "FixedColumnCount",
-      typeof( int ),
-      typeof( TableView ),
-      new UIPropertyMetadata( 0 ),
-      new ValidateValueCallback( TableView.ValidateFixedColumnCountCallback ) );
-
-    public int FixedColumnCount
-    {
-      get
-      {
-        return ( int )this.GetValue( TableView.FixedColumnCountProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.FixedColumnCountProperty, value );
-      }
-    }
-
-    private static bool ValidateFixedColumnCountCallback( object value )
-    {
-      return ( ( int )value >= 0 );
-    }
-
-    public static int GetFixedColumnCount( DependencyObject obj )
-    {
-      return ( int )obj.GetValue( TableView.FixedColumnCountProperty );
-    }
-
-    public static void SetFixedColumnCount( DependencyObject obj, int value )
-    {
-      obj.SetValue( TableView.FixedColumnCountProperty, value );
-    }
-
-    #endregion
-
-    #region FixedColumnDropMarkPen Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty FixedColumnDropMarkPenProperty = DependencyProperty.RegisterAttached(
-      "FixedColumnDropMarkPen",
-      typeof( Pen ),
-      typeof( TableView ) );
-
-    public Pen FixedColumnDropMarkPen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( TableView.FixedColumnDropMarkPenProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.FixedColumnDropMarkPenProperty, value );
-      }
-    }
-
-    public static Pen GetFixedColumnDropMarkPen( DependencyObject obj )
-    {
-      return ( Pen )obj.GetValue( TableView.FixedColumnDropMarkPenProperty );
-    }
-
-    public static void SetFixedColumnDropMarkPen( DependencyObject obj, Pen value )
-    {
-      obj.SetValue( TableView.FixedColumnDropMarkPenProperty, value );
-    }
-
-    #endregion
-
-    #region HorizontalGridLineBrush Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty HorizontalGridLineBrushProperty = DependencyProperty.RegisterAttached(
-      "HorizontalGridLineBrush",
-      typeof( Brush ),
-      typeof( TableView ),
-      new PropertyMetadata( null ) );
-
-    public Brush HorizontalGridLineBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( TableView.HorizontalGridLineBrushProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.HorizontalGridLineBrushProperty, value );
-      }
-    }
-
-    public static Brush GetHorizontalGridLineBrush( DependencyObject obj )
-    {
-      return ( Brush )obj.GetValue( TableView.HorizontalGridLineBrushProperty );
-    }
-
-    public static void SetHorizontalGridLineBrush( DependencyObject obj, Brush value )
-    {
-      obj.SetValue( TableView.HorizontalGridLineBrushProperty, value );
-    }
-
-    #endregion
-
-    #region HorizontalGridLineThickness Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty HorizontalGridLineThicknessProperty = DependencyProperty.RegisterAttached(
-      "HorizontalGridLineThickness",
-      typeof( double ),
-      typeof( TableView ),
-      new PropertyMetadata() );
-
-    public double HorizontalGridLineThickness
-    {
-      get
-      {
-        return ( double )this.GetValue( TableView.HorizontalGridLineThicknessProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.HorizontalGridLineThicknessProperty, value );
-      }
-    }
-
-    public static double GetHorizontalGridLineThickness( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableView.HorizontalGridLineThicknessProperty );
-    }
-
-    public static void SetHorizontalGridLineThickness( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableView.HorizontalGridLineThicknessProperty, value );
-    }
-
-    #endregion
-
-    #region VerticalGridLineBrush Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty VerticalGridLineBrushProperty = DependencyProperty.RegisterAttached(
-      "VerticalGridLineBrush",
-      typeof( Brush ),
-      typeof( TableView ),
-      new PropertyMetadata( null ) );
-
-    public Brush VerticalGridLineBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( TableView.VerticalGridLineBrushProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.VerticalGridLineBrushProperty, value );
-      }
-    }
-
-    public static Brush GetVerticalGridLineBrush( DependencyObject obj )
-    {
-      return ( Brush )obj.GetValue( TableView.VerticalGridLineBrushProperty );
-    }
-
-    public static void SetVerticalGridLineBrush( DependencyObject obj, Brush value )
-    {
-      obj.SetValue( TableView.VerticalGridLineBrushProperty, value );
-    }
-
-    #endregion
-
-    #region VerticalGridLineThickness Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty VerticalGridLineThicknessProperty = DependencyProperty.RegisterAttached(
-      "VerticalGridLineThickness",
-      typeof( double ),
-      typeof( TableView ),
-      new PropertyMetadata() );
-
-    public double VerticalGridLineThickness
-    {
-      get
-      {
-        return ( double )this.GetValue( TableView.VerticalGridLineThicknessProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.VerticalGridLineThicknessProperty, value );
-      }
-    }
-
-    public static double GetVerticalGridLineThickness( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableView.VerticalGridLineThicknessProperty );
-    }
-
-    public static void SetVerticalGridLineThickness( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableView.VerticalGridLineThicknessProperty, value );
-    }
-
-    #endregion
-
-    #region AllowRowResize Property
-
-    //Note: This property is exceptional, effectivelly, while this is a property that configures the View, it is not an attached property
-    //      This has the result that it is not settable on any other thing than a TableView (cannot be configured differently for details).
-    //      The property keeps on working as intended since it is a DP and we rely on the "Attached" property mechanism only so that the 
-    //      property can be set on DetailConfigurations.
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AllowRowResizeProperty = DependencyProperty.Register(
-      "AllowRowResize",
-      typeof( bool ),
-      typeof( TableView ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool AllowRowResize
-    {
-      get
-      {
-        return ( bool )this.GetValue( TableView.AllowRowResizeProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.AllowRowResizeProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region RowSelectorPaneWidth Property
-
-    //Note: This property is exceptional, effectivelly, while this is a property that configures the View, it is not an attached property
-    //      This has the result that it is not settable on any other thing than a TableView (cannot be configured differently for details).
-    //      The property keeps on working as intended since it is a DP and we rely on the "Attached" property mechanism only so that the 
-    //      property can be set on DetailConfigurations.
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty RowSelectorPaneWidthProperty = TableViewScrollViewer.RowSelectorPaneWidthProperty.AddOwner( typeof( TableView ) );
-
-    public double RowSelectorPaneWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( TableView.RowSelectorPaneWidthProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.RowSelectorPaneWidthProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ShowRowSelectorPane Property
-
-    //Note: This property is exceptional, effectivelly, while this is a property that configures the View, it is not an attached property
-    //      This has the result that it is not settable on any other thing than a TableView (cannot be configured differently for details).
-    //      The property keeps on working as intended since it is a DP and we rely on the "Attached" property mechanism only so that the 
-    //      property can be set on DetailConfigurations.
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ShowRowSelectorPaneProperty = DependencyProperty.Register(
-      "ShowRowSelectorPane",
-      typeof( bool ),
-      typeof( TableView ),
-      new PropertyMetadata( true ) );
-
-    public bool ShowRowSelectorPane
-    {
-      get
-      {
-        return ( bool )this.GetValue( TableView.ShowRowSelectorPaneProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.ShowRowSelectorPaneProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region GroupLevelIndicatorWidth Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty GroupLevelIndicatorWidthProperty = DependencyProperty.RegisterAttached(
-      "GroupLevelIndicatorWidth",
-      typeof( double ),
-      typeof( TableView ),
-      new UIPropertyMetadata() );
-
-    public double GroupLevelIndicatorWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( TableView.GroupLevelIndicatorWidthProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.GroupLevelIndicatorWidthProperty, value );
-      }
-    }
-
-    public static double GetGroupLevelIndicatorWidth( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableView.GroupLevelIndicatorWidthProperty );
-    }
-
-    public static void SetGroupLevelIndicatorWidth( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableView.GroupLevelIndicatorWidthProperty, value );
-    }
-
-    #endregion
-
-    #region DetailIndicatorWidth Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty DetailIndicatorWidthProperty = DependencyProperty.RegisterAttached(
-      "DetailIndicatorWidth",
-      typeof( double ),
-      typeof( TableView ),
-      new UIPropertyMetadata() );
-
-    public double DetailIndicatorWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( TableView.DetailIndicatorWidthProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.DetailIndicatorWidthProperty, value );
-      }
-    }
-
-    public static double GetDetailIndicatorWidth( DependencyObject obj )
-    {
-      return ( double )obj.GetValue( TableView.DetailIndicatorWidthProperty );
-    }
-
-    public static void SetDetailIndicatorWidth( DependencyObject obj, double value )
-    {
-      obj.SetValue( TableView.DetailIndicatorWidthProperty, value );
-    }
-
-    #endregion
-
-    #region IsColumnVirtualizationEnabled Property
-
-    [Obsolete( "The IsColumnVirtualizationEnabled property is obsolete and has been replaced by the ColumnVirtualizationMode property.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty IsColumnVirtualizationEnabledProperty = DependencyProperty.RegisterAttached(
-      "IsColumnVirtualizationEnabled",
-      typeof( bool ),
-      typeof( TableView ),
-      new UIPropertyMetadata( true ) );
-
-    [Obsolete( "The IsColumnVirtualizationEnabled property is obsolete and has been replaced by the ColumnVirtualizationMode property.", false )]
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public bool IsColumnVirtualizationEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( TableView.IsColumnVirtualizationEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.IsColumnVirtualizationEnabledProperty, value );
-      }
-    }
-
-    public static bool GetIsColumnVirtualizationEnabled( DependencyObject obj )
-    {
-#pragma warning disable 618
-      return ( bool )obj.GetValue( TableView.IsColumnVirtualizationEnabledProperty );
-#pragma warning restore 618
-    }
-
-    public static void SetIsColumnVirtualizationEnabled( DependencyObject obj, bool value )
-    {
-#pragma warning disable 618
-      obj.SetValue( TableView.IsColumnVirtualizationEnabledProperty, value );
-#pragma warning restore 618
-    }
-
-    #endregion
-
-    #region ColumnVirtualizationMode Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ColumnVirtualizationModeProperty = DependencyProperty.RegisterAttached(
-      "ColumnVirtualizationMode",
-      typeof( ColumnVirtualizationMode ),
-      typeof( TableView ),
-      new FrameworkPropertyMetadata( ColumnVirtualizationMode.Recycling ) );
-
-    public ColumnVirtualizationMode ColumnVirtualizationMode
-    {
-      get
-      {
-        return ( ColumnVirtualizationMode )this.GetValue( TableView.ColumnVirtualizationModeProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.ColumnVirtualizationModeProperty, value );
-      }
-    }
-
-    public static ColumnVirtualizationMode GetColumnVirtualizationMode( DependencyObject obj )
-    {
-      return ( ColumnVirtualizationMode )obj.GetValue( TableView.ColumnVirtualizationModeProperty );
-    }
-
-    public static void SetColumnVirtualizationMode( DependencyObject obj, ColumnVirtualizationMode value )
-    {
-      obj.SetValue( TableView.ColumnVirtualizationModeProperty, value );
-    }
-
-    #endregion
-
-    #region IsAlternatingRowStyleEnabled Property
-
-    [ViewProperty( ViewPropertyMode.Routed, FlattenDetailBindingMode.MasterOneWay )]
-    public static readonly DependencyProperty IsAlternatingRowStyleEnabledProperty = DependencyProperty.RegisterAttached(
-      "IsAlternatingRowStyleEnabled",
-      typeof( bool ),
-      typeof( TableView ),
-      new UIPropertyMetadata( false ) );
-
-    public bool IsAlternatingRowStyleEnabled
-    {
-      get
-      {
-        return TableView.GetIsAlternatingRowStyleEnabled( this );
-      }
-      set
-      {
-        TableView.SetIsAlternatingRowStyleEnabled( this, value );
-      }
-    }
-
-    public static bool GetIsAlternatingRowStyleEnabled( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( TableView.IsAlternatingRowStyleEnabledProperty );
-    }
-
-    public static void SetIsAlternatingRowStyleEnabled( DependencyObject obj, bool value )
-    {
-      obj.SetValue( TableView.IsAlternatingRowStyleEnabledProperty, value );
-    }
-
-    #endregion
-
-    #region AutoScrollInterval Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AutoScrollIntervalProperty = DependencyProperty.RegisterAttached(
-      "AutoScrollInterval",
-      typeof( int ),
-      typeof( TableView ),
-      new FrameworkPropertyMetadata( 100 ) );
-
-    public static int GetAutoScrollInterval( DependencyObject obj )
-    {
-      return ( int )obj.GetValue( TableView.AutoScrollIntervalProperty );
-    }
-
-    public static void SetAutoScrollInterval( DependencyObject obj, int value )
-    {
-      obj.SetValue( TableView.AutoScrollIntervalProperty, value );
-    }
-
-    #endregion
-
-    #region AutoScrollThreshold Attached Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    internal static readonly DependencyProperty AutoScrollThresholdProperty = DependencyProperty.RegisterAttached(
-      "AutoScrollThreshold",
-      typeof( int ),
-      typeof( TableView ),
-      new FrameworkPropertyMetadata( 5 ) );
-
-    internal static int GetAutoScrollThreshold( DependencyObject obj )
-    {
-      return ( int )obj.GetValue( TableView.AutoScrollThresholdProperty );
-    }
-
-    internal static void SetAutoScrollThreshold( DependencyObject obj, int value )
-    {
-      obj.SetValue( TableView.AutoScrollThresholdProperty, value );
-    }
-
-    #endregion
-
-    #region RowSelectorResizeNorthSouthCursor Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty RowSelectorResizeNorthSouthCursorProperty = DependencyProperty.Register(
-      "RowSelectorResizeNorthSouthCursor",
-      typeof( Cursor ),
-      typeof( TableView ),
-      new FrameworkPropertyMetadata( TableView.DefaultRowSelectorResizeNorthSouthCursor ) );
-
-    public Cursor RowSelectorResizeNorthSouthCursor
-    {
-      get
-      {
-        return ( Cursor )this.GetValue( TableView.RowSelectorResizeNorthSouthCursorProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.RowSelectorResizeNorthSouthCursorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region RowSelectorResizeWestEastCursor Property
-
-    [ViewProperty( ViewPropertyMode.Routed )]
-    public static readonly DependencyProperty RowSelectorResizeWestEastCursorProperty = DependencyProperty.Register(
-      "RowSelectorResizeWestEastCursor",
-      typeof( Cursor ),
-      typeof( TableView ),
-      new FrameworkPropertyMetadata( TableView.DefaultRowSelectorResizeWestEastCursor ) );
-
-    public Cursor RowSelectorResizeWestEastCursor
-    {
-      get
-      {
-        return ( Cursor )this.GetValue( TableView.RowSelectorResizeWestEastCursorProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.RowSelectorResizeWestEastCursorProperty, value );
-      }
-    }
-
-    #endregion
-
-    protected override void AddDefaultHeadersFooters()
-    {
-      this.FixedHeaders.Insert( 0, TableView.DefaultColumnManagerRowTemplate );
-      this.FixedHeaders.Insert( 0, TableView.DefaultGroupByControlTemplate );
-    }
-
-    internal override ColumnVirtualizationManager CreateColumnVirtualizationManager( DataGridContext dataGridContext )
-    {
-      Debug.Assert( dataGridContext != null );
-
-      return new TableViewColumnVirtualizationManager( dataGridContext );
-    }
-
-    private static readonly DataTemplate DefaultColumnManagerRowTemplate;
-    private static readonly DataTemplate DefaultGroupByControlTemplate;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewEndPageInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewEndPageInfo.cs
deleted file mode 100644
index 5fea2421..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewEndPageInfo.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal sealed class TableViewEndPageInfo : TableViewPartialPageInfo
-  {
-    #region Constructor
-
-    internal TableViewEndPageInfo( int value )
-    {
-      if( value < 0 )
-        throw new ArgumentException( "value must be greater than or equal to zero.", "value" );
-
-      m_value = value;
-    }
-
-    #endregion
-
-    #region Start Property
-
-    public override int Start
-    {
-      get
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    #endregion
-
-    #region End Property
-
-    public override int End
-    {
-      get
-      {
-        return m_value;
-      }
-    }
-
-    private readonly int m_value;
-
-    #endregion
-
-    protected override int GetHashCodeImpl()
-    {
-      return m_value;
-    }
-
-    protected override bool EqualsImpl( TableViewPageInfo obj )
-    {
-      var page = obj as TableViewEndPageInfo;
-      if( object.ReferenceEquals( page, null ) )
-        return false;
-
-      return ( page.m_value == m_value );
-    }
-
-    public override bool TryGetStart( out int value )
-    {
-      value = 0;
-
-      return false;
-    }
-
-    public override bool TryGetEnd( out int value )
-    {
-      value = m_value;
-
-      return true;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewFullPageInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewFullPageInfo.cs
deleted file mode 100644
index 5a673fdc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewFullPageInfo.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal sealed class TableViewFullPageInfo : TableViewPageInfo
-  {
-    #region Constructor
-
-    internal TableViewFullPageInfo( int start, int end, double size )
-    {
-      if( start < 0 )
-        throw new ArgumentException( "start must be greater than or equal to zero.", "start" );
-
-      if( end < 0 )
-        throw new ArgumentException( "end must be greater than or equal to zero.", "end" );
-
-      if( end < start )
-        throw new ArgumentException( "end must be greater than or equal to start.", "end" );
-
-      if( size < 0 )
-        throw new ArgumentException( "size must be greater than or equal to zero.", "size" );
-
-      m_start = start;
-      m_end = end;
-      m_size = size;
-    }
-
-    #endregion
-
-    #region Start Property
-
-    public override int Start
-    {
-      get
-      {
-        return m_start;
-      }
-    }
-
-    private readonly int m_start;
-
-    #endregion
-
-    #region End Property
-
-    public override int End
-    {
-      get
-      {
-        return m_end;
-      }
-    }
-
-    private readonly int m_end;
-
-    #endregion
-
-    #region Length Property
-
-    public override int Length
-    {
-      get
-      {
-        return m_end - m_start + 1;
-      }
-    }
-
-    #endregion
-
-    #region Size Property
-
-    public override double Size
-    {
-      get
-      {
-        return m_size;
-      }
-    }
-
-    private readonly double m_size;
-
-    #endregion
-
-    public override bool TryGetStart( out int value )
-    {
-      value = m_start;
-
-      return true;
-    }
-
-    public override bool TryGetEnd( out int value )
-    {
-      value = m_end;
-
-      return true;
-    }
-
-    protected override int GetHashCodeImpl()
-    {
-      return ( m_start ^ m_end );
-    }
-
-    protected override bool EqualsImpl( TableViewPageInfo obj )
-    {
-      var page = obj as TableViewFullPageInfo;
-      if( object.ReferenceEquals( page, null ) )
-        return false;
-
-      return ( page.m_start == m_start )
-          && ( page.m_end == m_end )
-          && ( page.m_size == m_size );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewHeaderFooterPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewHeaderFooterPanel.cs
deleted file mode 100644
index 25506c84..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewHeaderFooterPanel.cs
+++ /dev/null
@@ -1,414 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class TableViewHeaderFooterPanel : StackPanel
-  {
-    #region Constructor
-
-    public TableViewHeaderFooterPanel()
-    {
-      this.AddHandler( FrameworkElement.RequestBringIntoViewEvent, new RequestBringIntoViewEventHandler( this.OnRequestBringIntoView ) );
-    }
-
-    #endregion
-
-    #region ParentDataGridControl Private Property
-
-    private DataGridControl ParentDataGridControl
-    {
-      get
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-        if( dataGridContext == null )
-          return null;
-
-        return dataGridContext.DataGridControl;
-      }
-    }
-
-    #endregion
-
-    #region PreviewKeyDown and KeyDown handling overrides
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      switch( e.Key )
-      {
-        case Key.Tab:
-          this.HandlePreviewTabKey( e );
-          break;
-
-        case Key.Home:
-          this.HandlePreviewHomeKey( e );
-          break;
-
-        case Key.End:
-          this.HandlePreviewEndKey( e );
-          break;
-
-        case Key.Left:
-          this.HandlePreviewLeftKey( e );
-          break;
-
-        case Key.Right:
-          this.HandlePreviewRightKey( e );
-          break;
-
-        default:
-          base.OnPreviewKeyDown( e );
-          break;
-      }
-    }
-
-    protected virtual void HandlePreviewTabKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      var dataGridContext = dataGridControl.CurrentContext;
-      if( dataGridContext == null )
-        return;
-
-      var container = dataGridContext.GetContainerFromItem( dataGridContext.InternalCurrentItem );
-      if( container == null )
-        return;
-
-      var tabbingMode = KeyboardNavigation.GetTabNavigation( container );
-      if( tabbingMode == KeyboardNavigationMode.None )
-        return;
-
-      if( ( Keyboard.Modifiers == ModifierKeys.None ) || ( Keyboard.Modifiers == ModifierKeys.Shift ) )
-      {
-        DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-
-        //Force the "inline" relayout of the panel
-        //This has no effect if the panel do not have to be updated.
-        this.UpdateLayout();
-      }
-    }
-
-    protected virtual void HandlePreviewLeftKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewRightKey( KeyEventArgs e )
-    {
-      DataGridItemsHost.BringIntoViewKeyboardFocusedElement();
-      this.UpdateLayout();
-    }
-
-    protected virtual void HandlePreviewHomeKey( KeyEventArgs e )
-    {
-    }
-
-    protected virtual void HandlePreviewEndKey( KeyEventArgs e )
-    {
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      switch( e.Key )
-      {
-        case Key.Tab:
-          this.HandleTabKey( e );
-          break;
-
-        case Key.Home:
-          this.HandleHomeKey( e );
-          break;
-
-        case Key.End:
-          this.HandleEndKey( e );
-          break;
-
-        case Key.Left:
-          this.HandleLeftKey( e );
-          break;
-
-        case Key.Right:
-          this.HandleRightKey( e );
-          break;
-
-        default:
-          base.OnKeyDown( e );
-          break;
-      }
-    }
-
-    protected virtual void HandleTabKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      var dataGridContext = dataGridControl.CurrentContext;
-      if( dataGridContext == null )
-        return;
-
-      e.Handled = NavigationHelper.HandleTabKey( dataGridControl, dataGridContext, e.OriginalSource as FrameworkElement, e.KeyboardDevice );
-    }
-
-    protected virtual void HandleHomeKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      bool ctrlPressed = ( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control );
-      if( !ctrlPressed )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( ( dataGridControl == null ) || ( dataGridControl.NavigationBehavior != NavigationBehavior.CellOnly ) )
-        return;
-
-      NavigationHelper.MoveFocusToFirstVisibleColumn( dataGridControl.CurrentContext );
-
-      e.Handled = true;
-    }
-
-    protected virtual void HandleEndKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      bool ctrlPressed = ( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control );
-      if( !ctrlPressed )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( ( dataGridControl == null ) || ( dataGridControl.NavigationBehavior != NavigationBehavior.CellOnly ) )
-        return;
-
-      NavigationHelper.MoveFocusToLastVisibleColumn( dataGridControl.CurrentContext );
-
-      e.Handled = true;
-    }
-
-    protected virtual void HandleLeftKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusLeft( dataGridControl.CurrentContext );
-    }
-
-    protected virtual void HandleRightKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusRight( dataGridControl.CurrentContext );
-    }
-
-    #endregion
-
-    #region BringIntoView Methods
-
-    private void OnRequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      Debug.Assert( this == sender );
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      // Prevent a BringIntoView to be requested twice when setting the focus on a cell.
-      if( dataGridControl.SettingFocusOnCell )
-      {
-        e.Handled = true;
-        return;
-      }
-
-      // Let the ScrollViewer handle this if the grid isn't virtualized.
-      var scrollViewer = TreeHelper.FindParent<ScrollViewer>( this );
-      if( ( scrollViewer == null ) || !scrollViewer.CanContentScroll )
-        return;
-
-      var targetVisual = e.TargetObject as Visual;
-      if( targetVisual == null )
-        return;
-
-      // Let the ScrollViewer handle this if the target is the container (i.e. HeaderFooterItem).
-      var container = this.GetContainerFromElement( targetVisual );
-      if( ( container == null ) || ( container == targetVisual ) )
-        return;
-
-      Debug.Assert( this.Children.Contains( container ) );
-
-      e.Handled = true;
-
-      var targetRect = e.TargetRect;
-      if( targetRect.IsEmpty )
-      {
-        var uiElement = TreeHelper.FindParent<UIElement>( targetVisual, true );
-
-        // If we have a container, we surely have a UIElement.
-        Debug.Assert( uiElement != null );
-
-        targetVisual = uiElement;
-        targetRect = new Rect( 0d, 0d, Math.Min( uiElement.RenderSize.Width, scrollViewer.ViewportWidth ), 0d );
-      }
-
-      var area = targetVisual.TransformToAncestor( container ).TransformBounds( targetRect );
-
-      if( area.Left < scrollViewer.HorizontalOffset )
-      {
-        scrollViewer.ScrollToHorizontalOffset( area.Left );
-      }
-      else if( area.Right > scrollViewer.HorizontalOffset + scrollViewer.ViewportWidth )
-      {
-        scrollViewer.ScrollToHorizontalOffset( Math.Min( area.Left, ( area.Right - scrollViewer.ViewportWidth ) ) );
-      }
-    }
-
-    #endregion
-
-    protected override Size ArrangeOverride( Size arrangeSize )
-    {
-      Size finalSize = base.ArrangeOverride( arrangeSize );
-
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl dataGridControl = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      RowSelectorPane rowSelectorPane = null;
-
-      // dataGridControl can be null in design-time
-      if( dataGridControl != null )
-      {
-        TableViewScrollViewer scrollViewer = dataGridControl.ScrollViewer as TableViewScrollViewer;
-        rowSelectorPane = ( scrollViewer != null ) ? scrollViewer.RowSelectorPane : null;
-      }
-
-      if( rowSelectorPane == null )
-        return finalSize;
-
-      Visibility rowSelectorPaneVisibility = ( Visibility )rowSelectorPane.GetValue( RowSelectorPane.VisibilityProperty );
-
-      if( rowSelectorPaneVisibility != Visibility.Visible )
-        return finalSize;
-
-      foreach( UIElement child in this.InternalChildren )
-      {
-        Vector offset = VisualTreeHelper.GetOffset( child );
-        Size desiredSize = child.DesiredSize;
-
-        rowSelectorPane.SetRowSelectorPosition( child, new Rect( offset.X, offset.Y, desiredSize.Width, desiredSize.Height ), this );
-      }
-
-      return finalSize;
-    }
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      Size restrictedMeasureSize;
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        restrictedMeasureSize = new Size( availableSize.Width, double.PositiveInfinity );
-
-        if( availableSize.Width != Double.PositiveInfinity )
-          dataGridContext.FixedHeaderFooterViewPortSize = restrictedMeasureSize;
-      }
-      else
-      {
-        restrictedMeasureSize = new Size( double.PositiveInfinity, availableSize.Height );
-
-        if( availableSize.Height != Double.PositiveInfinity )
-          dataGridContext.FixedHeaderFooterViewPortSize = restrictedMeasureSize;
-      }
-
-      foreach( UIElement child in this.Children )
-      {
-        if( ( child is HeaderFooterItem ) && ( typeof( Row ).IsAssignableFrom( ( ( HeaderFooterItem )child ).VisualRootElementType ) ) )
-        {
-          dataGridContext.ColumnStretchingManager.ColumnStretchingCalculated = false;
-
-          // Calling Measure with the Viewport's width will have the effect of 
-          // distributing the extra space (see FixedCellPanel's MeasureOverride). 
-          // Eventually, the FixedCellPanel will receive an adjusted viewport 
-          // width (where GroupLevelIndicator's width et al will be substracted).
-          child.Measure( restrictedMeasureSize );
-
-          if( dataGridContext.ColumnStretchingManager.ColumnStretchingCalculated )
-            break;
-        }
-      }
-
-      return base.MeasureOverride( availableSize );
-    }
-
-    private UIElement GetContainerFromElement( DependencyObject element )
-    {
-      if( element == null )
-        return null;
-
-      var uiElement = TreeHelper.FindParent<UIElement>( element, true );
-      if( uiElement == null )
-        return null;
-
-      if( this.Children.Contains( uiElement ) )
-        return uiElement;
-
-      foreach( UIElement container in this.Children )
-      {
-        if( container.IsAncestorOf( uiElement ) )
-          return container;
-      }
-
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs
deleted file mode 100644
index 6b70fb7b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs
+++ /dev/null
@@ -1,3005 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Utils.Collections;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public class TableViewItemsHost : DataGridItemsHost, IScrollInfo, IDeferableScrollInfoRefresh
-  {
-    static TableViewItemsHost()
-    {
-      KeyboardNavigation.DirectionalNavigationProperty.OverrideMetadata(
-        typeof( TableViewItemsHost ),
-        new FrameworkPropertyMetadata( KeyboardNavigationMode.Local ) );
-
-      CommandManager.RegisterClassCommandBinding( typeof( TableViewItemsHost ),
-        new CommandBinding( ComponentCommands.MoveFocusForward,
-          TableViewItemsHost.MoveFocusForwardExecuted, TableViewItemsHost.MoveFocusForwardCanExecute ) );
-
-      CommandManager.RegisterClassCommandBinding( typeof( TableViewItemsHost ),
-        new CommandBinding( ComponentCommands.MoveFocusBack,
-          TableViewItemsHost.MoveFocusBackExecuted, TableViewItemsHost.MoveFocusBackCanExecute ) );
-
-      CommandManager.RegisterClassCommandBinding( typeof( TableViewItemsHost ),
-        new CommandBinding( ComponentCommands.MoveFocusUp,
-          TableViewItemsHost.MoveFocusUpExecuted, TableViewItemsHost.MoveFocusUpCanExecute ) );
-
-      CommandManager.RegisterClassCommandBinding( typeof( TableViewItemsHost ),
-        new CommandBinding( ComponentCommands.MoveFocusDown,
-          TableViewItemsHost.MoveFocusDownExecuted, TableViewItemsHost.MoveFocusDownCanExecute ) );
-    }
-
-    public TableViewItemsHost()
-    {
-      this.AddHandler( FrameworkElement.RequestBringIntoViewEvent, new RequestBringIntoViewEventHandler( this.OnRequestBringIntoView ) );
-    }
-
-    #region Orientation Property
-
-    [Obsolete( "The Orientation property is obsolete. Only a vertical orientation is supported.", false )]
-    public static readonly DependencyProperty OrientationProperty =
-        DependencyProperty.Register( "Orientation", typeof( Orientation ), typeof( TableViewItemsHost ), new UIPropertyMetadata( Orientation.Vertical ) );
-
-    [Obsolete( "The Orientation property is obsolete. Only a vertical orientation is supported.", false )]
-    public Orientation Orientation
-    {
-      get
-      {
-#pragma warning disable 618
-        return ( Orientation )this.GetValue( TableViewItemsHost.OrientationProperty );
-#pragma warning restore 618
-      }
-      set
-      {
-#pragma warning disable 618
-        this.SetValue( TableViewItemsHost.OrientationProperty, value );
-#pragma warning restore 618
-      }
-    }
-
-    #endregion
-
-    #region StableScrollingEnabled Property
-
-    [Obsolete( "The StableScrollingEnabled property is obsolete.", false )]
-    public static readonly DependencyProperty StableScrollingEnabledProperty =
-        DependencyProperty.Register( "StableScrollingEnabled", typeof( bool ), typeof( TableViewItemsHost ), new UIPropertyMetadata( true ) );
-
-    [Obsolete( "The StableScrollingEnabled property is obsolete.", false )]
-    public bool StableScrollingEnabled
-    {
-      get
-      {
-#pragma warning disable 618
-        return ( bool )this.GetValue( TableViewItemsHost.StableScrollingEnabledProperty );
-#pragma warning restore 618
-      }
-      set
-      {
-#pragma warning disable 618
-        this.SetValue( TableViewItemsHost.StableScrollingEnabledProperty, value );
-#pragma warning restore 618
-      }
-    }
-
-    #endregion
-
-    #region StableScrollingProportion Property
-
-    [Obsolete( "The StableScrollingProportion property is obsolete.", false )]
-    public static readonly DependencyProperty StableScrollingProportionProperty =
-        DependencyProperty.Register( "StableScrollingProportion", typeof( double ), typeof( TableViewItemsHost ), new UIPropertyMetadata( 0.5d ) );
-
-    [Obsolete( "The StableScrollingProportion property is obsolete.", false )]
-    public double StableScrollingProportion
-    {
-      get
-      {
-#pragma warning disable 618
-        return ( double )this.GetValue( TableViewItemsHost.StableScrollingProportionProperty );
-#pragma warning restore 618
-      }
-      set
-      {
-#pragma warning disable 618
-        this.SetValue( TableViewItemsHost.StableScrollingProportionProperty, value );
-#pragma warning restore 618
-      }
-    }
-
-    #endregion
-
-    #region ScrollInfo Property
-
-    internal IScrollInfo ScrollInfo
-    {
-      get
-      {
-        return ( IScrollInfo )this;
-      }
-    }
-
-    #endregion
-
-    #region PreviousTabNavigationMode ( private attached property )
-
-    private static readonly DependencyProperty PreviousTabNavigationModeProperty = DependencyProperty.RegisterAttached(
-      "PreviousTabNavigationMode",
-      typeof( KeyboardNavigationMode ),
-      typeof( TableViewItemsHost ),
-      new FrameworkPropertyMetadata( ( KeyboardNavigationMode )KeyboardNavigationMode.None ) );
-
-    private static KeyboardNavigationMode GetPreviousTabNavigationMode( DependencyObject d )
-    {
-      return ( KeyboardNavigationMode )d.GetValue( TableViewItemsHost.PreviousTabNavigationModeProperty );
-    }
-
-    private static void SetPreviousTabNavigationMode( DependencyObject d, KeyboardNavigationMode value )
-    {
-      d.SetValue( TableViewItemsHost.PreviousTabNavigationModeProperty, value );
-    }
-
-    #endregion
-
-    #region PreviousDirectionalNavigationMode ( private attached property )
-
-    private static readonly DependencyProperty PreviousDirectionalNavigationModeProperty = DependencyProperty.RegisterAttached(
-      "PreviousDirectionalNavigationMode",
-      typeof( KeyboardNavigationMode ),
-      typeof( TableViewItemsHost ),
-      new FrameworkPropertyMetadata( ( KeyboardNavigationMode )KeyboardNavigationMode.None ) );
-
-    private static KeyboardNavigationMode GetPreviousDirectionalNavigationMode( DependencyObject d )
-    {
-      return ( KeyboardNavigationMode )d.GetValue( TableViewItemsHost.PreviousDirectionalNavigationModeProperty );
-    }
-
-    private static void SetPreviousDirectionalNavigationMode( DependencyObject d, KeyboardNavigationMode value )
-    {
-      d.SetValue( TableViewItemsHost.PreviousDirectionalNavigationModeProperty, value );
-    }
-
-    #endregion
-
-    #region RowSelectorPane Property
-
-    private RowSelectorPane RowSelectorPane
-    {
-      get
-      {
-        var scrollViewer = this.ScrollInfo.ScrollOwner as TableViewScrollViewer;
-        if( scrollViewer == null )
-          return null;
-
-        return scrollViewer.RowSelectorPane;
-      }
-    }
-
-    private bool IsRowSelectorPaneVisible()
-    {
-      var rowSelectorPane = this.RowSelectorPane;
-
-      return ( rowSelectorPane != null )
-          && ( rowSelectorPane.Visibility == Visibility.Visible );
-    }
-
-    #endregion
-
-    #region Measure/Arrange Methods
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      m_cachedContainerDesiredWidth.Clear();
-      m_cachedContainerRealDesiredWidth.Clear();
-      m_autoWidthCalculatedDataGridContextList.Clear();
-      m_lastMeasureAvailableSize = availableSize;
-
-      var generatedPage = this.GeneratePageAndUpdateIScrollInfoValues( availableSize, true );
-
-      return this.GetNewDesiredSize( generatedPage );
-    }
-
-    private void MeasureContainer( UIElement container )
-    {
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( container );
-
-      string dataGridContextName = this.GetDataGridContextName( container, dataGridContext );
-      bool containerIsRow = this.ContainerIsRow( container );
-
-      if( ( !m_autoWidthCalculatedDataGridContextList.Contains( dataGridContextName ) )
-        && ( containerIsRow ) )
-      {
-        dataGridContext.ColumnStretchingManager.ColumnStretchingCalculated = false;
-
-        // Calling Measure with the Viewport's width will have the effect of 
-        // distributing the extra space (see FixedCellPanel's MeasureOverride). 
-        // Eventually, the FixedCellPanel will receive an adjusted viewport 
-        // width (where GroupLevelIndicator's width et al will be substracted).
-        container.Measure( new Size( m_lastMeasureAvailableSize.Width, double.PositiveInfinity ) );
-
-        if( dataGridContext.ColumnStretchingManager.ColumnStretchingCalculated )
-        {
-          // We only calculate once per detail.
-          m_autoWidthCalculatedDataGridContextList.Add( dataGridContextName );
-        }
-      }
-      else
-      {
-        // We invalidate the CellsHostPanel of the row and all is parent to ensure the
-        // size is correctly evaluated when we have some auto stretching column.
-        container.InvalidateMeasure();
-
-        var row = Row.FromContainer( container );
-        if( row != null )
-        {
-          UIElement itemToInvalidate = row.CellsHostPanel;
-
-          while( ( itemToInvalidate != null ) && ( itemToInvalidate != container ) )
-          {
-            itemToInvalidate.InvalidateMeasure();
-            itemToInvalidate = VisualTreeHelper.GetParent( itemToInvalidate ) as UIElement;
-          }
-        }
-      }
-
-      // We always measure the container with infinity so that we'll arrange each container,
-      // for a DataGridContext, with the maximum needed for that context.
-      container.Measure( new Size( double.PositiveInfinity, double.PositiveInfinity ) );
-
-      double desiredSize = container.DesiredSize.Width;
-      double cachedSize;
-
-      if( m_cachedContainerDesiredWidth.TryGetValue( dataGridContextName, out cachedSize ) )
-      {
-        // Keep the largest size!
-        if( cachedSize < desiredSize )
-        {
-          m_cachedContainerDesiredWidth[ dataGridContextName ] = desiredSize;
-        }
-      }
-      else
-      {
-        // Cache the size for the context.
-        m_cachedContainerDesiredWidth.Add( dataGridContextName, desiredSize );
-      }
-
-      PassiveLayoutDecorator decorator = this.GetPassiveLayoutDecorator( container as HeaderFooterItem );
-      if( decorator != null )
-      {
-        desiredSize = decorator.RealDesiredSize.Width;
-
-        if( m_cachedContainerRealDesiredWidth.TryGetValue( dataGridContextName, out cachedSize ) )
-        {
-          // Keep the largest size!
-          if( cachedSize < desiredSize )
-          {
-            m_cachedContainerRealDesiredWidth[ dataGridContextName ] = desiredSize;
-          }
-        }
-        else
-        {
-          // Cache the size for the context.
-          m_cachedContainerRealDesiredWidth.Add( dataGridContextName, desiredSize );
-        }
-      }
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      HashSet<UIElement> layoutedContainers = new HashSet<UIElement>();
-
-      if( m_lastGeneratedPage != TableViewPage.Empty )
-      {
-        var showRowSelector = this.IsRowSelectorPaneVisible();
-        var innerPage = m_lastGeneratedPage.InnerPage;
-        var startIndex = innerPage.Start;
-        var endIndex = innerPage.End;
-        var verticalOffset = 0d;
-
-        foreach( var container in ( from ci in m_layoutedContainers
-                                    let realizedIndex = ci.RealizedIndex
-                                    where ( realizedIndex >= startIndex )
-                                       && ( realizedIndex <= endIndex )
-                                    select ci.Container ) )
-        {
-          layoutedContainers.Add( container );
-
-          this.ArrangeContainer( container, -m_horizontalOffset, verticalOffset, showRowSelector );
-
-          verticalOffset += container.RenderSize.Height;
-        }
-      }
-
-      // Hide the containers that are not visible in the viewport.
-      foreach( var container in this.Children )
-      {
-        if( layoutedContainers.Contains( container ) )
-          continue;
-
-        this.ArrangeContainerOutOfView( container );
-      }
-
-      CommandManager.InvalidateRequerySuggested();
-
-      // The call to Mouse.Synchronize must not start dragging rows.
-      // Update the mouse status to make sure no container has invalid mouse over status.
-      // Only do this when the mouse is over the panel, to prevent unescessary update when scrolling with thumb.
-      if( this.IsMouseOver )
-      {
-        var dataGridControl = this.ParentDataGridControl;
-        if( dataGridControl != null )
-        {
-          using( dataGridControl.InhibitDrag() )
-          {
-            Mouse.Synchronize();
-          }
-        }
-      }
-
-      m_lastLayoutedPage = m_lastGeneratedPage;
-      m_indexToBringIntoView = TableViewItemsHost.NullIndex;
-
-      return finalSize;
-    }
-
-    private void ArrangeContainer( UIElement container, double horizontalOffset, double verticalOffset, bool showRowSelector )
-    {
-      var origin = new Point( horizontalOffset, verticalOffset );
-      var dataGridContext = DataGridControl.GetDataGridContext( container );
-      var dataGridContextName = this.GetDataGridContextName( container, dataGridContext );
-      var containerSize = new Size( this.GetContainerWidth( dataGridContextName ), container.DesiredSize.Height );
-
-      container.Arrange( new Rect( origin, containerSize ) );
-
-      this.SetCompensationOffset( dataGridContext, container, containerSize.Width );
-
-      if( showRowSelector )
-      {
-        this.SetRowSelector( container, origin, containerSize );
-      }
-    }
-
-    private void ArrangeContainerOutOfView( UIElement container )
-    {
-      container.Arrange( TableViewItemsHost.OutOfViewRect );
-
-      this.FreeRowSelector( container );
-    }
-
-    private PassiveLayoutDecorator GetPassiveLayoutDecorator( HeaderFooterItem item )
-    {
-      if( ( item == null ) || ( VisualTreeHelper.GetChildrenCount( item ) == 0 ) )
-        return null;
-
-      var child = VisualTreeHelper.GetChild( item, 0 );
-      if( child == null )
-        return null;
-
-      var decorator = child as PassiveLayoutDecorator;
-      if( ( decorator == null ) && ( VisualTreeHelper.GetChildrenCount( child ) > 0 ) )
-      {
-        decorator = VisualTreeHelper.GetChild( child, 0 ) as PassiveLayoutDecorator;
-      }
-
-      return decorator;
-    }
-
-    private double GetContainerWidth( string dataGridContextName )
-    {
-      double synchronizedWidth = this.GetSynchronizedExtentWidth();
-      double desiredWidth = 0;
-
-      bool sizeCached = m_cachedContainerDesiredWidth.TryGetValue( dataGridContextName, out desiredWidth );
-      if( !sizeCached )
-      {
-        desiredWidth = synchronizedWidth;
-      }
-
-      if( string.IsNullOrEmpty( dataGridContextName ) ) // master level 
-      {
-        //for the master level, I want to consider the Synchronized Extent size as well.
-        desiredWidth = Math.Max( synchronizedWidth, desiredWidth );
-      }
-
-      if( desiredWidth == 0 )
-      {
-        m_cachedContainerRealDesiredWidth.TryGetValue( dataGridContextName, out desiredWidth );
-      }
-
-      return desiredWidth;
-    }
-
-    private double GetSynchronizedExtentWidth()
-    {
-      var scrollViewer = this.ScrollInfo.ScrollOwner as DataGridScrollViewer;
-      if( scrollViewer == null )
-        return 0d;
-
-      return scrollViewer.SynchronizedScrollViewersWidth;
-    }
-
-    private void SetCompensationOffset( DataGridContext dataGridContext, UIElement container, double desiredWidth )
-    {
-      double compensationOffset = Math.Max(
-        0,
-        ( ( m_horizontalOffset + Math.Min( m_viewportWidth, desiredWidth ) ) - desiredWidth ) );
-
-      TableView.SetCompensationOffset( container, compensationOffset );
-
-      // Affect the CompensationOffset on the DataGridContext for the TableViewColumnVirtualizationManager
-      // to bind to this value
-      TableView.SetCompensationOffset( dataGridContext, compensationOffset );
-    }
-
-    private void SetRowSelector( UIElement container, Point translationPoint, Size size )
-    {
-      var rowSelectorPane = this.RowSelectorPane;
-      if( rowSelectorPane == null )
-        return;
-
-      rowSelectorPane.SetRowSelectorPosition( container, new Rect( translationPoint, size ), this );
-    }
-
-    private void FreeRowSelector( UIElement container )
-    {
-      var rowSelectorPane = this.RowSelectorPane;
-      if( rowSelectorPane == null )
-        return;
-
-      rowSelectorPane.FreeRowSelector( container );
-    }
-
-    private double GetMaxDesiredWidth()
-    {
-      double maxDesiredWidth = 0d;
-
-      foreach( var item in m_cachedContainerDesiredWidth )
-      {
-        var desiredWidth = item.Value;
-        if( desiredWidth == 0 )
-        {
-          m_cachedContainerRealDesiredWidth.TryGetValue( item.Key, out desiredWidth );
-        }
-
-        if( desiredWidth > maxDesiredWidth )
-        {
-          maxDesiredWidth = desiredWidth;
-        }
-      }
-
-      return maxDesiredWidth;
-    }
-
-    private Size GetNewDesiredSize( TableViewPage pageInfo )
-    {
-      double desiredHeight;
-      double availableHeight = m_lastMeasureAvailableSize.Height;
-
-      if( pageInfo == TableViewPage.Empty )
-      {
-        desiredHeight = 0d;
-      }
-      // The current generated page displays only a subset of the data source. 
-      else if( pageInfo.InnerPage.Length < this.ScrollInfo.ExtentHeight )
-      {
-        if( double.IsPositiveInfinity( availableHeight ) )
-        {
-          desiredHeight = pageInfo.InnerPage.Size;
-        }
-        else
-        {
-          desiredHeight = availableHeight;
-        }
-      }
-      // The current generated page displays all containers.
-      else
-      {
-        var pageHeight = pageInfo.OuterPage.Size;
-
-        if( double.IsPositiveInfinity( availableHeight ) )
-        {
-          desiredHeight = pageHeight;
-        }
-        else
-        {
-          desiredHeight = Math.Min( availableHeight, pageHeight );
-        }
-      }
-
-      return new Size( m_viewportWidth, desiredHeight );
-    }
-
-    #endregion
-
-    #region Containers Methods
-
-    private bool ContainerIsRow( UIElement container )
-    {
-      if( container is Row )
-        return true;
-
-      var headerFooterItem = container as HeaderFooterItem;
-      if( headerFooterItem != null )
-        return typeof( Row ).IsAssignableFrom( headerFooterItem.VisualRootElementType );
-
-      return false;
-    }
-
-    private string GetDataGridContextName( UIElement container, DataGridContext dataGridContext )
-    {
-      return ( dataGridContext.SourceDetailConfiguration != null )
-        ? dataGridContext.SourceDetailConfiguration.RelationName
-        : string.Empty;
-    }
-
-    private TableViewPage GeneratePage( TableViewStartPageInfo pageInfo, double availableHeight, bool forceMeasure )
-    {
-      // The generator can be null if we're in design mode.
-      var generator = this.CustomItemContainerGenerator;
-      if( generator == null )
-        return m_lastGeneratedPage;
-
-      var generatePage = ( forceMeasure )
-                      || ( m_lastGeneratedPage == TableViewPage.Empty )
-                      || ( m_lastGeneratedPage.InnerPage.Start != pageInfo.Start )
-                      || ( Math.Abs( m_lastGeneratedPage.ViewportHeight - availableHeight ) < 1d );
-
-      if( !generatePage )
-        return m_lastGeneratedPage;
-
-      var pageGenerator = new TopBottomPageGenerator( this, pageInfo.Start, availableHeight, forceMeasure );
-
-      return this.GeneratePage( pageGenerator );
-    }
-
-    private TableViewPage GeneratePage( TableViewEndPageInfo pageInfo, double availableHeight, bool forceMeasure )
-    {
-      // The generator can be null if we're in design mode.
-      var generator = this.CustomItemContainerGenerator;
-      if( generator == null )
-        return m_lastGeneratedPage;
-
-      var pageGenerator = new BottomTopPageGenerator( this, pageInfo.End, availableHeight, forceMeasure );
-
-      return this.GeneratePage( pageGenerator );
-    }
-
-    private TableViewPage GeneratePage( PageGenerator pageGenerator )
-    {
-      var pageResult = pageGenerator.Generate( m_layoutedContainers, m_lastGeneratedPage );
-
-      // Replace the layouted containers.
-      m_layoutedContainers.Clear();
-      m_layoutedContainers.AddRange( pageResult.LayoutedContainers );
-      m_layoutedContainers.Sort();
-
-      m_lastGeneratedPage = pageResult.PageInfo;
-
-      return m_lastGeneratedPage;
-    }
-
-    private void RecycleContainer( ICustomItemContainerGenerator generator, UIElement element, int realizedIndex, bool clearContainer = true )
-    {
-      if( !clearContainer )
-      {
-        var container = element as IDataGridItemContainer;
-        if( container != null )
-        {
-          container.IsRecyclingCandidate = true;
-        }
-      }
-      else
-      {
-        this.ClearContainer( element );
-      }
-
-      if( ( generator != null ) && ( realizedIndex >= 0 ) )
-      {
-        try
-        {
-          var position = generator.GeneratorPositionFromIndex( realizedIndex );
-          generator.Remove( position, 1 );
-        }
-        catch
-        {
-          Debug.Fail( "Unable to remove container for realized index " + realizedIndex );
-        }
-      }
-    }
-
-    private void CleanRecyclingCandidates()
-    {
-      var generator = this.CustomItemContainerGenerator as CustomItemContainerGenerator;
-      generator.CleanRecyclingCandidates();
-    }
-
-    private UIElement GenerateContainer( ICustomItemContainerGenerator generator, int index, bool forceMeasure )
-    {
-      bool isNewlyRealized;
-      var container = ( UIElement )generator.GenerateNext( out isNewlyRealized );
-      if( container == null )
-        return null;
-
-      if( isNewlyRealized )
-      {
-        var collection = this.Children;
-        if( !collection.Contains( container ) )
-        {
-          collection.Add( container );
-        }
-
-        this.EnableElementNavigation( container );
-        KeyboardNavigation.SetTabIndex( container, index );
-        this.PrepareContainer( container );
-        this.MeasureContainer( container );
-      }
-      else if( forceMeasure )
-      {
-        this.MeasureContainer( container );
-      }
-
-      return container;
-    }
-
-    private void DisableElementNavigation( UIElement child )
-    {
-      //get previous values and store them on the container (attached)
-      TableViewItemsHost.SetPreviousDirectionalNavigationMode( child, KeyboardNavigation.GetDirectionalNavigation( child ) );
-      TableViewItemsHost.SetPreviousTabNavigationMode( child, KeyboardNavigation.GetTabNavigation( child ) );
-
-      KeyboardNavigation.SetDirectionalNavigation( child, KeyboardNavigationMode.None );
-      KeyboardNavigation.SetTabNavigation( child, KeyboardNavigationMode.None );
-    }
-
-    private void EnableElementNavigation( UIElement child )
-    {
-      //checking only one of the 2 properties... This is because they are set together.
-      if( child.ReadLocalValue( TableViewItemsHost.PreviousDirectionalNavigationModeProperty ) != DependencyProperty.UnsetValue )
-      {
-        KeyboardNavigation.SetDirectionalNavigation( child, TableViewItemsHost.GetPreviousDirectionalNavigationMode( child ) );
-        KeyboardNavigation.SetTabNavigation( child, TableViewItemsHost.GetPreviousTabNavigationMode( child ) );
-      }
-      //If unset, then nothing to do in this method!
-    }
-
-    private void PrepareContainer( UIElement container )
-    {
-      container.ClearValue( UIElement.VisibilityProperty );
-
-      var dataItemStore = Xceed.Wpf.DataGrid.CustomItemContainerGenerator.GetDataItemProperty( container );
-      if( ( dataItemStore == null ) || dataItemStore.IsEmpty )
-        return;
-
-      var dataItem = dataItemStore.Data;
-      if( dataItem == null )
-        return;
-
-      // Prepare the container.
-      this.ParentDataGridControl.PrepareItemContainer( container, dataItem );
-    }
-
-    private void ClearContainer( UIElement container )
-    {
-      this.DisableElementNavigation( container );
-      this.FreeRowSelector( container );
-
-      container.Visibility = Visibility.Collapsed;
-
-      // The call to DataGridControl.ClearItemContainer will be done by the CustomItemContainerGenerator.
-    }
-
-    #endregion
-
-    #region Scrolling Management
-
-    internal void InvalidateScrollInfo()
-    {
-      var scrollOwner = this.ScrollInfo.ScrollOwner;
-      if( scrollOwner == null )
-        return;
-
-      scrollOwner.InvalidateScrollInfo();
-    }
-
-    private void GeneratePageAndUpdateIScrollInfoValues()
-    {
-      if( this.CachedRootDataGridContext != null )
-      {
-        var generatedPage = this.GeneratePageAndUpdateIScrollInfoValues( m_lastMeasureAvailableSize, false );
-        var newDesiredSize = this.GetNewDesiredSize( generatedPage );
-
-        if( newDesiredSize != this.DesiredSize )
-        {
-          this.InvalidateMeasure();
-        }
-        else
-        {
-          this.InvalidateArrange();
-        }
-      }
-    }
-
-    private TableViewPage GeneratePageAndUpdateIScrollInfoValues( Size availableSize, bool forceMeasure )
-    {
-      // We must ensure the VerticalOffset is valid according
-      // to the actual viewport height in case the VerticalOffset
-      // is greater than the new viewportHeight.
-      var scrollInfo = this.ScrollInfo;
-
-      double maxOffset = Math.Max( 0d, scrollInfo.ExtentHeight - 1 );
-      double offset = Math.Max( Math.Min( m_verticalOffset, maxOffset ), 0d );
-
-      if( offset != m_verticalOffset )
-      {
-        this.SetVerticalOffsetCore( offset );
-      }
-
-      int verticalOffset = ( int )m_verticalOffset;
-      TableViewPage generatedPage;
-
-      if( m_indexToBringIntoView >= 0 )
-      {
-        int intOffset = Math.Min( m_indexToBringIntoView, ( int )maxOffset );
-
-        if( ( m_lastLayoutedPage == TableViewPage.Empty ) || ( intOffset < m_lastLayoutedPage.InnerPage.Start ) )
-        {
-          generatedPage = this.GeneratePage( new TableViewStartPageInfo( intOffset ), availableSize.Height, forceMeasure );
-        }
-        else
-        {
-          generatedPage = this.GeneratePage( new TableViewEndPageInfo( intOffset ), availableSize.Height, forceMeasure );
-        }
-      }
-      else
-      {
-        generatedPage = this.GeneratePage( new TableViewStartPageInfo( verticalOffset ), availableSize.Height, forceMeasure );
-      }
-
-      // CALCULATE THE EXTENT WIDTH
-      m_extentWidth = Math.Max( this.GetMaxDesiredWidth(), this.GetSynchronizedExtentWidth() );
-
-      // CALCULATE THE VIEWPORT WIDTH
-      m_viewportWidth = Double.IsInfinity( availableSize.Width ) ? m_extentWidth : Math.Min( m_extentWidth, availableSize.Width );
-
-      if( generatedPage != TableViewPage.Empty )
-      {
-        this.SetVerticalOffsetCore( generatedPage.InnerPage.Start );
-      }
-
-      this.InvalidateScrollInfo();
-
-      return generatedPage;
-    }
-
-    private void ScrollByHorizontalOffset( double offset )
-    {
-      this.ScrollToHorizontalOffset( this.ScrollInfo.HorizontalOffset + offset );
-    }
-
-    private void ScrollToHorizontalOffset( double offset )
-    {
-      IScrollInfo scrollInfo = this.ScrollInfo;
-
-      double maxOffset = Math.Max( scrollInfo.ExtentWidth - scrollInfo.ViewportWidth, 0 );
-      offset = Math.Max( offset, 0 );
-      offset = Math.Min( offset, maxOffset );
-
-      if( scrollInfo.HorizontalOffset == offset )
-        return;
-
-      m_horizontalOffset = offset;
-      this.InvalidateArrange();
-      this.InvalidateScrollInfo();
-    }
-
-    private void ScrollByVerticalOffset( double offset )
-    {
-      this.ScrollToVerticalOffset( this.ScrollInfo.VerticalOffset + offset );
-    }
-
-    private void ScrollToVerticalOffset( double offset )
-    {
-      IScrollInfo scrollInfo = this.ScrollInfo;
-      double maxOffset = Math.Max( scrollInfo.ExtentHeight - 1, 0 );
-      offset = Math.Max( offset, 0 );
-      offset = Math.Min( offset, maxOffset );
-
-      if( scrollInfo.VerticalOffset == offset )
-        return;
-
-      this.SetVerticalOffsetCore( offset );
-      this.InvalidateLayoutFromScrollingHelper();
-    }
-
-    private void SetVerticalOffsetCore( double offset )
-    {
-      m_verticalOffset = offset;
-    }
-
-    private bool SetCurrent( int index, bool changeColumn )
-    {
-      bool isDataRow;
-      return this.SetCurrent( index, changeColumn, out isDataRow );
-    }
-
-    private bool SetCurrent( int index, bool changeColumn, out bool isDataRow )
-    {
-      var generator = this.CustomItemContainerGenerator;
-      var position = generator.GeneratorPositionFromIndex( index );
-      var container = default( UIElement );
-
-      using( generator.StartAt( position, GeneratorDirection.Forward, true ) )
-      {
-        container = this.GenerateContainer( generator, index, false );
-      }
-
-      isDataRow = false;
-
-      if( container != null )
-      {
-        isDataRow = ( container is DataRow );
-
-        if( m_layoutedContainers.IndexOfContainer( container ) < 0 )
-        {
-          m_layoutedContainers.Add( new LayoutedContainerInfo( index, container ) );
-        }
-
-        var dataGridContext = DataGridControl.GetDataGridContext( container );
-        var currentContext = dataGridContext.DataGridControl.CurrentContext;
-        var column = default( ColumnBase );
-
-        if( changeColumn )
-        {
-          column = dataGridContext.CurrentColumn;
-
-          if( isDataRow )
-          {
-            if( ( currentContext != dataGridContext ) && dataGridContext.AreDetailsFlatten )
-            {
-              column = dataGridContext.GetMatchingColumn( currentContext, currentContext.CurrentColumn ) ?? column;
-            }
-
-            if( ( column == null ) || ( !column.CanBeCurrentWhenReadOnly && column.ReadOnly ) )
-            {
-              var focusableIndex = NavigationHelper.GetFirstVisibleFocusableColumnIndex( dataGridContext );
-              if( focusableIndex >= 0 )
-              {
-                column = dataGridContext.VisibleColumns[ focusableIndex ];
-              }
-            }
-          }
-        }
-
-        try
-        {
-          if( currentContext != null )
-          {
-            currentContext.EndEdit();
-          }
-        }
-        catch( DataGridException )
-        {
-          return false;
-        }
-
-        var containerIndex = generator.GetRealizedIndexForContainer( container );
-        if( containerIndex >= 0 )
-        {
-          if( dataGridContext.DataGridControl.SetFocusHelper( container, column, true, true ) )
-          {
-            generator.SetCurrentIndex( containerIndex );
-            return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
-    #endregion
-
-    #region BringIntoView Methods
-
-    private void OnRequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-    {
-      TableViewItemsHost.ProcessRequestBringIntoView( this,
-        Orientation.Vertical,
-        0.5, // Default StableScrollingProportion
-        e );
-    }
-
-    private bool FocusContainerOrPreviousFocusable( UIElement focusedContainer, bool changeColumn )
-    {
-      int firstIndex = 0;
-      int focusedIndex = this.CustomItemContainerGenerator.GetRealizedIndexForContainer( focusedContainer );
-      int desiredIndex = focusedIndex - 1;
-
-      System.Diagnostics.Debug.Assert( focusedIndex > -1, "How come the realized index is -1?!?" );
-
-      bool currentChanged = false;
-
-      if( desiredIndex != focusedIndex )
-      {
-        DataGridControl dataGridControl = this.ParentDataGridControl;
-        int cannotFocusCount = 0;
-
-        // We want to find the first element that can receive focus upward.
-        while( ( desiredIndex >= 0 ) && ( !currentChanged ) )
-        {
-          bool isDataRow;
-          currentChanged = this.SetCurrent( desiredIndex, changeColumn, out isDataRow );
-
-          if( !currentChanged )
-          {
-            if( dataGridControl.HasValidationError )
-              return false;
-
-            if( isDataRow )
-            {
-              cannotFocusCount++;
-
-              if( cannotFocusCount > TableViewItemsHost.MaxDataRowFailFocusCount )
-                return false;
-            }
-          }
-
-          // We succeded in changing the current.
-          if( currentChanged )
-            break;
-
-          // We already are at the first index and still not focused on a new container.
-          if( desiredIndex == firstIndex )
-          {
-            //Let's keep the focus on the last focused container.
-            currentChanged = this.SetCurrent( focusedIndex, changeColumn, out isDataRow );
-            break;
-          }
-
-          desiredIndex--;
-        }
-
-        if( m_lastGeneratedPage != TableViewPage.Empty )
-        {
-          // We will use MoveFocus if the focused index is currently in view.
-          if( ( !currentChanged ) && ( focusedIndex >= m_lastGeneratedPage.InnerPage.Start ) && ( focusedIndex <= m_lastGeneratedPage.InnerPage.End ) )
-          {
-            currentChanged = this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Up ) );
-          }
-        }
-      }
-
-      return currentChanged;
-    }
-
-    private bool FocusIndexOrPreviousFocusable( int desiredIndex, int minimumIndex, bool changeColumn )
-    {
-      bool currentChanged = false;
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      int cannotFocusCount = 0;
-
-      // We want to find the first element that can receive focus upward.
-      while( ( desiredIndex >= 0 ) && ( !currentChanged ) )
-      {
-        bool isDataRow;
-        currentChanged = this.SetCurrent( desiredIndex, changeColumn, out isDataRow );
-
-        if( !currentChanged )
-        {
-          if( dataGridControl.HasValidationError )
-            return false;
-
-          if( isDataRow )
-          {
-            cannotFocusCount++;
-
-            if( cannotFocusCount > TableViewItemsHost.MaxDataRowFailFocusCount )
-              return false;
-          }
-        }
-
-        // We succeded in changing the current or we're already at the first index? Then nothing we can do.
-        if( ( currentChanged ) || ( desiredIndex == minimumIndex ) )
-          break;
-
-        desiredIndex--;
-      }
-
-      return currentChanged;
-    }
-
-    private bool FocusContainerOrNextFocusable( UIElement focusedContainer, bool changeColumn )
-    {
-      int lastIndex = this.CustomItemContainerGenerator.ItemCount - 1;
-      int focusedIndex = this.CustomItemContainerGenerator.GetRealizedIndexForContainer( focusedContainer );
-      int desiredIndex = focusedIndex + 1;
-
-      System.Diagnostics.Debug.Assert( focusedIndex > -1, "How come the realized index is -1?!?" );
-
-      bool currentChanged = false;
-
-      if( desiredIndex != focusedIndex )
-      {
-        DataGridControl dataGridControl = this.ParentDataGridControl;
-        int cannotFocusCount = 0;
-
-        // We want to find the first element that can receive focus downward.
-        while( ( desiredIndex <= lastIndex ) && ( !currentChanged ) )
-        {
-          bool isDataRow;
-          currentChanged = this.SetCurrent( desiredIndex, changeColumn, out isDataRow );
-
-          if( !currentChanged )
-          {
-            if( dataGridControl.HasValidationError )
-              return false;
-
-            if( isDataRow )
-            {
-              cannotFocusCount++;
-
-              if( cannotFocusCount > TableViewItemsHost.MaxDataRowFailFocusCount )
-                return false;
-            }
-          }
-
-          // We succeded in changing the current.
-          if( currentChanged )
-            break;
-
-          // We already are at the last index and still not focused on a new container.
-          if( desiredIndex == lastIndex )
-          {
-            //Let's keep the focus on the last focused container.
-            currentChanged = this.SetCurrent( focusedIndex, changeColumn, out isDataRow );
-          }
-
-          desiredIndex++;
-        }
-
-        if( m_lastGeneratedPage != TableViewPage.Empty )
-        {
-          // We will use MoveFocus if the focused index is currently in view.
-          if( ( !currentChanged ) && ( focusedIndex >= m_lastGeneratedPage.InnerPage.Start ) && ( focusedIndex <= m_lastGeneratedPage.InnerPage.End ) )
-          {
-            currentChanged = this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Down ) );
-          }
-        }
-      }
-
-      return currentChanged;
-    }
-
-    private bool FocusIndexOrNextFocusable( int desiredIndex, int maximumIndex, bool changeColumn )
-    {
-      bool currentChanged = false;
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      int cannotFocusCount = 0;
-
-      // We want to find the first element that can receive focus downward.
-      while( ( desiredIndex <= maximumIndex ) && ( !currentChanged ) )
-      {
-        bool isDataRow;
-        currentChanged = this.SetCurrent( desiredIndex, changeColumn, out isDataRow );
-
-        if( !currentChanged )
-        {
-          if( dataGridControl.HasValidationError )
-            return false;
-
-          if( isDataRow )
-          {
-            cannotFocusCount++;
-
-            if( cannotFocusCount > TableViewItemsHost.MaxDataRowFailFocusCount )
-              return false;
-          }
-        }
-
-        // We succeded in changing the current or we're already at the first index? Then nothing we can do.
-        if( ( currentChanged ) || ( desiredIndex == maximumIndex ) )
-          break;
-
-        desiredIndex++;
-      }
-
-      return currentChanged;
-    }
-
-    #endregion
-
-    #region DataGridItemsHost Overrides
-
-    protected override void OnItemsAdded()
-    {
-      // We are calling InvalidateMeasure to regenerate the current 
-      // page and forcing the recycling of out-of-view containers.
-      this.InvalidateMeasure();
-    }
-
-    protected override void OnItemsRemoved( IList<DependencyObject> containers )
-    {
-      // We are calling InvalidateMeasure to regenerate the current 
-      // page and forcing the recycling of out-of-view containers.
-      this.InvalidateMeasure();
-    }
-
-    protected override void OnItemsReset()
-    {
-      // We are calling InvalidateMeasure to regenerate the current 
-      // page and forcing the recycling of out-of-view containers.
-      this.InvalidateMeasure();
-    }
-
-    protected override void OnContainersRemoved( IList<DependencyObject> removedContainers )
-    {
-      foreach( UIElement container in removedContainers )
-      {
-        this.ClearContainer( container );
-
-        // Avoid checking if Children already contains the element. No exception will be thrown if the item is not found.
-        // This ensures to parse all children only one time.
-        this.Children.Remove( container );
-
-        int index = m_layoutedContainers.IndexOfContainer( container );
-        if( index > -1 )
-        {
-          m_layoutedContainers.RemoveAt( index );
-        }
-      }
-    }
-
-    protected override void OnRecyclingCandidatesCleaned( IList<DependencyObject> recyclingCandidates )
-    {
-      foreach( UIElement candidate in recyclingCandidates )
-      {
-        this.ClearContainer( candidate );
-      }
-    }
-
-    #endregion
-
-    #region PreviewKeyDown and KeyDown Handling
-
-    protected override void HandleTabKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      var dataGridContext = dataGridControl.CurrentContext;
-      if( dataGridContext == null )
-        return;
-
-      e.Handled = NavigationHelper.HandleTabKey( dataGridControl, dataGridContext, e.OriginalSource as FrameworkElement, e.KeyboardDevice );
-    }
-
-    protected override void HandleLeftKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusLeft( dataGridControl.CurrentContext );
-    }
-
-    protected override void HandleRightKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      var dataGridControl = this.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusRight( dataGridControl.CurrentContext );
-    }
-
-    protected override void HandleUpKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = this.MoveFocusUp();
-    }
-
-    protected override void HandleDownKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = this.MoveFocusDown();
-    }
-
-    protected override void HandlePageUpKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = true;
-
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-      bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        this.MoveToFirstOverallUIElement( changeCurrentColumn );
-        return;
-      }
-
-      UIElement focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( this, Keyboard.FocusedElement as DependencyObject );
-
-      if( ( focusedContainer == null ) || ( navigationBehavior == NavigationBehavior.None ) )
-      {
-        // We just need to scroll one page up.
-        this.ScrollInfo.ScrollOwner.PageUp();
-        return;
-      }
-
-      int focusedContainerRealizedIndex = this.CustomItemContainerGenerator.GetRealizedIndexForContainer( focusedContainer );
-
-      if( focusedContainerRealizedIndex == 0 )
-      {
-        this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Up ) );
-      }
-      else
-      {
-        this.InvalidateMeasure();
-
-        var generatedPage = this.GeneratePage( new TableViewEndPageInfo( focusedContainerRealizedIndex ), this.RenderSize.Height, false );
-
-        if( generatedPage != TableViewPage.Empty )
-        {
-          int initialDesiredIndex = generatedPage.InnerPage.Start;
-          this.SetVerticalOffsetCore( initialDesiredIndex );
-
-          if( focusedContainerRealizedIndex != initialDesiredIndex )
-          {
-            int desiredPageUpIndex = initialDesiredIndex;
-            bool isDataRow = false;
-
-            // SetCurrent on the desired index or down until BEFORE the focused container.
-            while( ( !dataGridControl.HasValidationError ) && ( !isDataRow ) && ( desiredPageUpIndex < focusedContainerRealizedIndex ) )
-            {
-              if( this.SetCurrent( desiredPageUpIndex, changeCurrentColumn, out isDataRow ) )
-                return;
-
-              desiredPageUpIndex++;
-            }
-
-            if( ( dataGridControl.HasValidationError ) || ( isDataRow ) )
-              return;
-
-            // No container were focused while processing indexes from focused to initialDesiredIndex, try SetCurrent on indexes samller than the initial up to 0
-            desiredPageUpIndex = initialDesiredIndex - 1;
-            isDataRow = false;
-
-            while( ( !dataGridControl.HasValidationError ) && ( !isDataRow ) && ( desiredPageUpIndex > 0 ) )
-            {
-              if( this.SetCurrent( desiredPageUpIndex, changeCurrentColumn, out isDataRow ) )
-                return;
-
-              desiredPageUpIndex--;
-            }
-
-            // If not container was successfuly focused, set focus back to the current UIElement.
-            this.SetCurrent( focusedContainerRealizedIndex, changeCurrentColumn, out isDataRow );
-          }
-        }
-      }
-    }
-
-    protected override void HandlePageDownKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      e.Handled = true;
-
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-      bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        this.MoveToLastOverallUIElement( changeCurrentColumn );
-        return;
-      }
-
-      UIElement focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( this, Keyboard.FocusedElement as DependencyObject );
-
-      // No focused container or no navigation allowed
-      if( ( focusedContainer == null ) || ( navigationBehavior == NavigationBehavior.None ) )
-      {
-        // We just need to scroll one page down.
-        this.ScrollInfo.ScrollOwner.PageDown();
-        return;
-      }
-
-      int focusedContainerRealizedIndex = this.CustomItemContainerGenerator.GetRealizedIndexForContainer( focusedContainer );
-      int maxIndex = this.CustomItemContainerGenerator.ItemCount - 1;
-
-      if( focusedContainerRealizedIndex == maxIndex )
-      {
-        this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Down ) );
-      }
-      else
-      {
-        this.InvalidateMeasure();
-
-        var generatedPage = this.GeneratePage( new TableViewStartPageInfo( focusedContainerRealizedIndex ), this.RenderSize.Height, false );
-
-        if( generatedPage != TableViewPage.Empty )
-        {
-          this.SetVerticalOffsetCore( generatedPage.InnerPage.Start );
-          int initialDesiredIndex;
-
-          // Last row not totally visible, take the one before the last
-          if( ( generatedPage.InnerPage.Size > this.RenderSize.Height ) && ( generatedPage.InnerPage.Length > 1 ) )
-          {
-            initialDesiredIndex = generatedPage.InnerPage.End - 1;
-          }
-          else
-          {
-            initialDesiredIndex = generatedPage.InnerPage.End;
-          }
-
-          if( focusedContainerRealizedIndex != initialDesiredIndex )
-          {
-            int desiredPageDownIndex = initialDesiredIndex;
-            bool isDataRow = false;
-
-            // SetCurrent on the desired index or up until BEFORE the focused container.
-            while( ( !dataGridControl.HasValidationError ) && ( !isDataRow ) && ( desiredPageDownIndex > focusedContainerRealizedIndex ) )
-            {
-              if( this.SetCurrent( desiredPageDownIndex, changeCurrentColumn, out isDataRow ) )
-                return;
-
-              desiredPageDownIndex--;
-            }
-
-            if( ( dataGridControl.HasValidationError ) || ( isDataRow ) )
-              return;
-
-            desiredPageDownIndex = initialDesiredIndex + 1;
-            isDataRow = false;
-
-            // No container were focused while processing indexes from focused to initialDesiredIndex, try SetCurrent on indexes higher than the initial down to maxIndex
-            while( ( !dataGridControl.HasValidationError ) && ( !isDataRow ) && ( desiredPageDownIndex <= maxIndex ) )
-            {
-              if( this.SetCurrent( desiredPageDownIndex, changeCurrentColumn, out isDataRow ) )
-                return;
-
-              desiredPageDownIndex++;
-            }
-
-            // If not container was successfuly focused, set focus back to the current UIElement.
-            this.SetCurrent( focusedContainerRealizedIndex, changeCurrentColumn, out isDataRow );
-          }
-        }
-      }
-    }
-
-    protected override void HandleHomeKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        DataGridControl dataGridControl = this.ParentDataGridControl;
-        IScrollInfo scrollInfo = this.ScrollInfo;
-        NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-        bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-        if( navigationBehavior != NavigationBehavior.None )
-        {
-          this.MoveToFirstOverallUIElement( changeCurrentColumn );
-
-          if( navigationBehavior == NavigationBehavior.CellOnly )
-          {
-            this.MoveToFirstVisibleColumn();
-          }
-        }
-        else
-        {
-          scrollInfo.ScrollOwner.ScrollToTop();
-        }
-
-        // In all cases, we must scroll to the left end of the panel.
-        scrollInfo.ScrollOwner.ScrollToLeftEnd();
-      }
-      else
-      {
-        // This should be handled by a parent.
-        return;
-      }
-
-      e.Handled = true;
-    }
-
-    protected override void HandleEndKey( KeyEventArgs e )
-    {
-      if( e.Handled )
-        return;
-
-      if( ( e.KeyboardDevice.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
-      {
-        DataGridControl dataGridControl = this.ParentDataGridControl;
-        IScrollInfo scrollInfo = this.ScrollInfo;
-        NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-        bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-        if( navigationBehavior != NavigationBehavior.None )
-        {
-          this.MoveToLastOverallUIElement( changeCurrentColumn );
-
-          if( navigationBehavior == NavigationBehavior.CellOnly )
-          {
-            this.MoveToLastVisibleColumn();
-          }
-        }
-        else
-        {
-          scrollInfo.ScrollOwner.ScrollToBottom();
-        }
-
-        // In all cases, we must scroll to the right end of the panel.
-        scrollInfo.ScrollOwner.ScrollToRightEnd();
-      }
-      else
-      {
-        // This should be handled by a parent.
-        return;
-      }
-
-      e.Handled = true;
-    }
-
-    private void MoveToFirstOverallUIElement( bool changeCurrentColumn )
-    {
-      // Simply scroll to top.
-      this.ScrollInfo.ScrollOwner.ScrollToTop();
-
-      //Try to focus on first UIElement.
-      if( !this.SetCurrent( 0, changeCurrentColumn ) )
-      {
-        //If not focusable, find the next one downward.
-        CustomItemContainerGenerator generator = this.CustomItemContainerGenerator as CustomItemContainerGenerator;
-        this.FocusIndexOrNextFocusable( 1, generator.RealizedContainers.Count - 1, changeCurrentColumn );
-      }
-    }
-
-    private void MoveToLastOverallUIElement( bool changeCurrentColumn )
-    {
-      // Simply scroll to end
-      this.ScrollInfo.ScrollOwner.ScrollToBottom();
-
-      CustomItemContainerGenerator generator = this.CustomItemContainerGenerator as CustomItemContainerGenerator;
-      int lastItemIndex = generator.ItemCount - 1;
-
-      //Try to focus on last UIElement.
-      if( !this.SetCurrent( lastItemIndex, changeCurrentColumn ) )
-      {
-        //If not focusable, find the next one upward.
-        int minimumIndex = lastItemIndex - generator.RealizedContainers.Count;
-        this.FocusIndexOrPreviousFocusable( lastItemIndex, minimumIndex, changeCurrentColumn );
-      }
-    }
-
-    private void MoveToFirstVisibleColumn()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-
-      if( dataGridControl == null )
-        return;
-
-      DataGridContext currentDataGridContext = dataGridControl.CurrentContext;
-      ReadOnlyColumnCollection visibleColumnsCollection = ( ReadOnlyColumnCollection )currentDataGridContext.VisibleColumns;
-
-      int visibleColumnsCollectionCount = visibleColumnsCollection.Count;
-
-      // The previous SetCurrent will only select the first row. The CurrentColumn
-      // is left unchanged. We must set the current column to the first one.
-
-      if( ( currentDataGridContext != null ) && ( visibleColumnsCollectionCount > 0 ) )
-      {
-        int firstVisibleFocusableColumnIndex;
-        bool focusableColumnFound = false;
-
-        Row currentRow = currentDataGridContext.CurrentRow;
-
-        if( currentRow != null )
-        {
-          for( firstVisibleFocusableColumnIndex = 0; firstVisibleFocusableColumnIndex < visibleColumnsCollectionCount; firstVisibleFocusableColumnIndex++ )
-          {
-            if( currentRow.Cells[ visibleColumnsCollection[ firstVisibleFocusableColumnIndex ] ].GetCalculatedCanBeCurrent() )
-            {
-              focusableColumnFound = true;
-              break;
-            }
-          }
-
-          if( focusableColumnFound )
-          {
-            try
-            {
-              currentDataGridContext.SetCurrentColumnAndChangeSelection(
-                currentDataGridContext.VisibleColumns[ firstVisibleFocusableColumnIndex ] );
-            }
-            catch( DataGridException )
-            {
-              // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-              // any other GridException.
-            }
-          }
-        }
-      }
-    }
-
-    private void MoveToLastVisibleColumn()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-
-      if( dataGridControl == null )
-        return;
-
-      DataGridContext currentDataGridContext = dataGridControl.CurrentContext;
-      ReadOnlyColumnCollection visibleColumnsCollection = ( ReadOnlyColumnCollection )currentDataGridContext.VisibleColumns;
-
-      int visibleColumnsCollectionCount = visibleColumnsCollection.Count;
-
-      // The previous SetCurrent will only select the first row. The CurrentColumn
-      // is left unchanged. We must set the current column to the last one.
-
-      if( ( visibleColumnsCollection != null ) && ( visibleColumnsCollectionCount > 0 ) )
-      {
-        bool focusableColumnFound = false;
-        int lastVisibleFocusableColumnIndex;
-
-        Row currentRow = currentDataGridContext.CurrentRow;
-
-        if( currentRow != null )
-        {
-          for( lastVisibleFocusableColumnIndex = visibleColumnsCollectionCount - 1; lastVisibleFocusableColumnIndex >= 0; lastVisibleFocusableColumnIndex-- )
-          {
-            if( currentRow.Cells[ visibleColumnsCollection[ lastVisibleFocusableColumnIndex ] ].GetCalculatedCanBeCurrent() )
-            {
-              focusableColumnFound = true;
-              break;
-            }
-          }
-
-          if( focusableColumnFound )
-          {
-            try
-            {
-              currentDataGridContext.SetCurrentColumnAndChangeSelection(
-                currentDataGridContext.VisibleColumns[ lastVisibleFocusableColumnIndex ] );
-            }
-            catch( DataGridException )
-            {
-              // We swallow the exception if it occurs because of a validation error or Cell was read-only or
-              // any other GridException.
-            }
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region ICustomVirtualizingPanel Members
-
-    protected override void BringIntoViewCore( int index )
-    {
-      if( !this.DelayBringIntoView )
-      {
-        if( m_lastGeneratedPage == TableViewPage.Empty )
-          return;
-
-        var pageInfo = m_lastGeneratedPage.InnerPage;
-        if( ( index >= pageInfo.Start ) && ( index < pageInfo.End ) )
-          return;
-      }
-
-      this.InvalidateMeasure();
-
-      m_indexToBringIntoView = index;
-    }
-
-    #endregion
-
-    #region IScrollInfo Members
-
-    bool IScrollInfo.CanHorizontallyScroll
-    {
-      get;
-      set;
-    }
-
-    bool IScrollInfo.CanVerticallyScroll
-    {
-      get;
-      set;
-    }
-
-    double IScrollInfo.ExtentHeight
-    {
-      get
-      {
-        return ( this.CachedRootDataGridContext != null ) ? this.CustomItemContainerGenerator.ItemCount : 0;
-      }
-    }
-
-    private double m_extentWidth;
-    double IScrollInfo.ExtentWidth
-    {
-      get
-      {
-        return m_extentWidth;
-      }
-    }
-
-    private double m_horizontalOffset;
-    double IScrollInfo.HorizontalOffset
-    {
-      get
-      {
-        return m_horizontalOffset;
-      }
-    }
-
-    void IScrollInfo.SetHorizontalOffset( double offset )
-    {
-      if( offset == m_horizontalOffset )
-        return;
-
-      this.ScrollToHorizontalOffset( offset );
-    }
-
-    private ScrollViewer m_scrollOwner;
-    ScrollViewer IScrollInfo.ScrollOwner
-    {
-      get
-      {
-        return m_scrollOwner;
-      }
-      set
-      {
-        m_scrollOwner = value;
-      }
-    }
-
-    private double m_verticalOffset;
-    double IScrollInfo.VerticalOffset
-    {
-      get
-      {
-        return m_verticalOffset;
-      }
-    }
-
-    void IScrollInfo.SetVerticalOffset( double offset )
-    {
-      if( offset == m_verticalOffset )
-        return;
-
-      this.ScrollToVerticalOffset( offset );
-    }
-
-    double IScrollInfo.ViewportHeight
-    {
-      get
-      {
-        if( m_lastGeneratedPage == TableViewPage.Empty )
-          return 0d;
-
-        var pageInfo = m_lastGeneratedPage.InnerPage;
-        var viewportHeight = m_lastGeneratedPage.ViewportHeight;
-
-        if( pageInfo.Size > viewportHeight )
-          return Math.Max( 1, pageInfo.Length - 1 );
-
-        return Math.Max( 1, pageInfo.Length );
-      }
-    }
-
-    private double m_viewportWidth;
-    double IScrollInfo.ViewportWidth
-    {
-      get
-      {
-        return m_viewportWidth;
-      }
-    }
-
-    void IScrollInfo.LineDown()
-    {
-      this.ScrollByVerticalOffset( 1 );
-    }
-
-    void IScrollInfo.LineLeft()
-    {
-      this.ScrollByHorizontalOffset( ScrollViewerHelper.PixelScrollingCount * -1 );
-    }
-
-    void IScrollInfo.LineRight()
-    {
-      this.ScrollByHorizontalOffset( ScrollViewerHelper.PixelScrollingCount );
-    }
-
-    void IScrollInfo.LineUp()
-    {
-      this.ScrollByVerticalOffset( -1 );
-    }
-
-    void IScrollInfo.MouseWheelDown()
-    {
-      this.ScrollByVerticalOffset( SystemParameters.WheelScrollLines );
-    }
-
-    void IScrollInfo.MouseWheelLeft()
-    {
-      this.ScrollByHorizontalOffset( SystemParameters.WheelScrollLines * ScrollViewerHelper.PixelScrollingCount * -1 );
-    }
-
-    void IScrollInfo.MouseWheelRight()
-    {
-      this.ScrollByHorizontalOffset( SystemParameters.WheelScrollLines * ScrollViewerHelper.PixelScrollingCount );
-    }
-
-    void IScrollInfo.MouseWheelUp()
-    {
-      this.ScrollByVerticalOffset( SystemParameters.WheelScrollLines * -1 );
-    }
-
-    void IScrollInfo.PageDown()
-    {
-      if( m_lastGeneratedPage == TableViewPage.Empty )
-        return;
-
-      var pageInfo = m_lastGeneratedPage.InnerPage;
-      var viewportHeight = m_lastGeneratedPage.ViewportHeight;
-      var newOffset = pageInfo.End;
-
-      // We only have one row and it is bigger than the view port.
-      if( ( pageInfo.Length == 1 ) && ( pageInfo.Size > viewportHeight ) )
-      {
-        int itemCount = ( int )( ( IScrollInfo )this ).ExtentHeight;
-
-        if( newOffset + 1 < itemCount )
-        {
-          newOffset++;
-        }
-      }
-
-      this.SetVerticalOffsetCore( newOffset );
-      this.GeneratePageAndUpdateIScrollInfoValues();
-    }
-
-    void IScrollInfo.PageLeft()
-    {
-      this.ScrollByHorizontalOffset( this.ScrollInfo.ViewportWidth * -1 );
-    }
-
-    void IScrollInfo.PageRight()
-    {
-      this.ScrollByHorizontalOffset( this.ScrollInfo.ViewportWidth );
-    }
-
-    void IScrollInfo.PageUp()
-    {
-      if( m_lastGeneratedPage == TableViewPage.Empty )
-        return;
-
-      var pageInfo = m_lastGeneratedPage.InnerPage;
-      var viewportHeight = m_lastGeneratedPage.ViewportHeight;
-
-      m_indexToBringIntoView = pageInfo.Start;
-
-      // We only have one row and it is bigger than the view port.
-      if( ( pageInfo.Length == 1 ) && ( pageInfo.Size > viewportHeight ) )
-      {
-        if( m_indexToBringIntoView > 0 )
-        {
-          m_indexToBringIntoView--;
-        }
-      }
-
-      this.GeneratePageAndUpdateIScrollInfoValues();
-    }
-
-    Rect IScrollInfo.MakeVisible( Visual visual, Rect rectangle )
-    {
-      UIElement container = DataGridItemsHost.GetItemsHostContainerFromElement( this, visual );
-
-      if( container != null )
-      {
-        Rect rectangleInItemsHost = visual.TransformToAncestor( this ).TransformBounds( rectangle );
-        rectangle = visual.TransformToAncestor( container ).TransformBounds( rectangle );
-
-        if( ( rectangleInItemsHost.Bottom > this.RenderSize.Height ) || ( rectangleInItemsHost.Top < 0 ) )
-        {
-          // Make sure that the item is vertically visible.
-          ICustomItemContainerGenerator generator = this.CustomItemContainerGenerator;
-
-          if( generator != null )
-          {
-            int itemIndex = generator.GetRealizedIndexForContainer( container );
-
-            if( itemIndex != -1 )
-            {
-              // This will make sure to scroll to the right offsets.
-              ICustomVirtualizingPanel virtualizingPanel = ( ICustomVirtualizingPanel )this;
-              virtualizingPanel.BringIntoView( itemIndex );
-            }
-          }
-        }
-      }
-
-      // Make sure that the item is horizontally visible.
-      IScrollInfo scrollInfo = this.ScrollInfo;
-
-      if( rectangle.Left < scrollInfo.HorizontalOffset )
-      {
-        this.ScrollToHorizontalOffset( rectangle.Left );
-      }
-      else if( rectangle.Right > scrollInfo.HorizontalOffset + scrollInfo.ViewportWidth )
-      {
-        this.ScrollToHorizontalOffset(
-          Math.Min( rectangle.Left, ( rectangle.Right - scrollInfo.ViewportWidth ) ) );
-      }
-
-      return rectangle;
-    }
-
-    #endregion
-
-    #region IDeferableScrollInfoRefresh Members
-
-    IDisposable IDeferableScrollInfoRefresh.DeferScrollInfoRefresh( Orientation orientation )
-    {
-      if( orientation == Orientation.Vertical )
-        return new LayoutSuspendedHelper( this );
-
-      return null;
-    }
-
-    #endregion
-
-    internal static bool ComputedCanScrollHorizontally( FrameworkElement target, DataGridItemsHost itemsHost )
-    {
-      Debug.Assert( target != null );
-
-      bool retval = true;
-
-      DependencyObject visual = target;
-
-      do
-      {
-        retval = TableView.GetCanScrollHorizontally( visual );
-
-        if( retval )
-        {
-          visual = TreeHelper.GetParent( visual );
-        }
-      }
-      while( ( visual != null ) && ( visual != itemsHost ) && ( retval ) );
-
-      return retval;
-    }
-
-    internal static double GetVisibleDimensionForRequestBringIntoViewTarget( double targetDimension, double targetToItemsHostOffset, double viewportDimension )
-    {
-      // The items left upper corner is in the Viewport
-      if( targetToItemsHostOffset >= 0 )
-      {
-        // The item is totally visible since its actual dimension is less than the viewport
-        if( ( targetToItemsHostOffset + targetDimension ) <= viewportDimension )
-        {
-          // This will force the function to "cancel" the BringIntoView
-          // because the width to BringIntoView will be the viewport
-          return viewportDimension;
-        }
-        else
-        {
-          // Item is not totally visible, calculate how much place it occupies in the viewport.
-          return viewportDimension - targetToItemsHostOffset;
-        }
-      }
-      else
-      {
-        // This items left upper corner is at the left side of the viewPort
-        double itemActualVisibleValue = targetDimension - targetToItemsHostOffset;
-
-        if( itemActualVisibleValue > viewportDimension )
-        {
-          // Limit the value of itemActualVisibleValue to the viewport size (to prevent eventual bugs [even if nothing is visible on the horizon for this])
-          itemActualVisibleValue = viewportDimension;
-        }
-
-        return itemActualVisibleValue;
-      }
-    }
-
-    internal static double CorrectBringIntoViewRectFromVisibleDimensionAndAcceptableThreshold(
-      double actualVisibleDimension,
-      double acceptableDimensionThreshold,
-      double targetToItemsHostPosition,
-      double targetToTemplatedParentDimension,
-      double itemsHostOffset )
-    {
-      // The visible dimension is greater or equal than the acceptable threshold
-      if( actualVisibleDimension >= acceptableDimensionThreshold )
-      {
-        return itemsHostOffset - targetToTemplatedParentDimension;
-      }
-      else
-      {
-        // Calculate the starting point of the rectangle to view. 
-        return Math.Max( 0, targetToItemsHostPosition * -1 );
-      }
-    }
-
-    internal static bool TargetRequiresBringIntoView( double targetToItemsHostPosition, double targetDesiredSizeDimension, double itemsHostRenderSizeDimension )
-    {
-      //If the Offset is negative, then it's sure its not totally visible
-      if( targetToItemsHostPosition < 0 )
-      {
-        return true;
-      }
-      else if( ( targetDesiredSizeDimension < itemsHostRenderSizeDimension )
-               && ( ( targetToItemsHostPosition + targetDesiredSizeDimension ) > itemsHostRenderSizeDimension ) )
-      {
-        return true;
-      }
-
-      return false;
-    }
-
-    internal static void ProcessRequestBringIntoView(
-      DataGridItemsHost itemsHost,
-      Orientation orientation,
-      double stableScrollingProportion,
-      RequestBringIntoViewEventArgs e )
-    {
-      IScrollInfo scrollInfo = itemsHost as IScrollInfo;
-
-      if( scrollInfo == null )
-        return;
-
-      // Only perform this if we are virtualizing.  
-      // If not, the ScrollViewer will take care of bringing the item into view.
-      if( ( scrollInfo.ScrollOwner == null ) || ( !scrollInfo.ScrollOwner.CanContentScroll ) )
-        return;
-
-      // If we are explicitly setting the focus on a cell, we don't want to bring it into view.
-      // A bringIntoView would cause the HorizontalOffset to change is not a wanted behavior.
-      // Therefore, flag the Request as handled and do nothing.
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( itemsHost );
-
-      DataGridControl dataGridControl = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      if( ( dataGridControl != null ) && ( dataGridControl.SettingFocusOnCell ) )
-      {
-        e.Handled = true;
-        return;
-      }
-
-      // Only perform this if the object is NOT a Cell and was not passed a specific rectangle.
-      if( ( e.TargetObject is Cell ) || ( e.TargetRect != Rect.Empty ) )
-        return;
-
-      // Before performing calculations, ensure that the element is a FrameworkElement.
-      FrameworkElement target = e.TargetObject as FrameworkElement;
-
-      if( ( target == null ) || ( !target.IsDescendantOf( itemsHost ) ) )
-        return;
-
-      // Mark the routed event as handled, since under even the worst circumstances, 
-      // a new event will be raised.
-      e.Handled = true;
-
-      // Ensure to get the offset of the target visual element
-      // according to its Container when it is not directly 
-      // a Container. This is to avoid horizontal scrolling when
-      // the NavigationBehavior is None and that the CellsHost
-      // request the focus when there are HierarchicalGroupLevelIndicators
-      // and/or GroupLevelIndicators present in the Container.
-      // This extra space must be taken into consideration, not
-      // only the offset between the target and the ItemsHost.
-      Point targetToParentContainer = TableViewItemsHost.OriginPoint;
-      FrameworkElement targetParentContainer = DataGridItemsHost.GetItemsHostContainerFromElement( itemsHost, target ) as FrameworkElement;
-
-      if( ( targetParentContainer != null ) && ( target != targetParentContainer ) )
-      {
-        targetToParentContainer = target.TranslatePoint( TableViewItemsHost.OriginPoint,
-                                                         targetParentContainer );
-      }
-
-      Point targetToItemsHostPosition = target.TranslatePoint( TableViewItemsHost.OriginPoint, itemsHost );
-      double acceptableThreshold;
-      double actualVisibleValue;
-
-      //Calculate the VisibleWidth/Height of the object within the Viewport.
-      if( orientation == Orientation.Vertical )
-      {
-        acceptableThreshold = scrollInfo.ViewportWidth * stableScrollingProportion;
-
-        actualVisibleValue = TableViewItemsHost.GetVisibleDimensionForRequestBringIntoViewTarget(
-          target.ActualWidth,
-          targetToItemsHostPosition.X,
-          scrollInfo.ViewportWidth );
-      }
-      else
-      {
-        acceptableThreshold = scrollInfo.ViewportHeight * stableScrollingProportion;
-
-        actualVisibleValue = TableViewItemsHost.GetVisibleDimensionForRequestBringIntoViewTarget(
-          target.ActualHeight,
-          targetToItemsHostPosition.Y,
-          scrollInfo.ViewportHeight );
-      }
-
-      Rect newRect = newRect = new Rect( 0, 0, target.ActualWidth, target.ActualHeight );
-
-      // After the visible proportion of the object is calculated, compare it with threshold
-      if( actualVisibleValue < acceptableThreshold )
-      {
-        // The required threshold is not visible, modify the bounds of the rectangle 
-        // to bring the desired threshold.
-        if( orientation == Orientation.Vertical )
-        {
-          if( targetToItemsHostPosition.X >= 0 )
-          {
-            newRect.Width = Math.Min( acceptableThreshold, target.ActualWidth );
-          }
-          else
-          {
-            newRect.X = Math.Max( 0, target.ActualWidth - acceptableThreshold );
-          }
-        }
-        else
-        {
-          if( targetToItemsHostPosition.Y >= 0 )
-          {
-            newRect.Height = Math.Min( acceptableThreshold, target.ActualHeight );
-          }
-          else
-          {
-            newRect.Y = Math.Max( 0, target.ActualHeight - acceptableThreshold );
-          }
-        }
-
-        target.BringIntoView( newRect );
-
-        return;
-      }
-
-      bool needBringIntoView = false;
-
-      // Determine if the item is totally or partially visible on the main scrolling axis.             
-      if( orientation == Orientation.Vertical )
-      {
-        needBringIntoView = TableViewItemsHost.TargetRequiresBringIntoView(
-          targetToItemsHostPosition.Y,
-          target.DesiredSize.Height,
-          itemsHost.RenderSize.Height );
-      }
-      else
-      {
-        needBringIntoView = TableViewItemsHost.TargetRequiresBringIntoView(
-          targetToItemsHostPosition.X,
-          target.DesiredSize.Width,
-          itemsHost.RenderSize.Width );
-      }
-
-      // Extra properties that must be verified to conclude
-      // the container must be put into view or not
-      if( itemsHost is TableflowViewItemsHost )
-      {
-        // TableflowViewItemsHost must take Clip into consideration
-        // since this means the container is not fully visible
-        // and maybe under a Sticky container
-        needBringIntoView |= ( target.GetValue( UIElement.ClipProperty ) != null );
-
-        if( !needBringIntoView )
-        {
-          // If the container is sticky, we must ensure all subsequent containers 
-          // wil be correctly layouted and visible. e.g.: the GroupHeaderControl 
-          // hides the 1st group value and the 2nd one is partially visible.
-          // If the container to bring into view is the sticky GroupHeaderControl,
-          // the 1st and 2nd group values must be completely visible
-          needBringIntoView |= TableflowViewItemsHost.GetIsSticky( target );
-        }
-      }
-
-      if( !needBringIntoView )
-        return;
-
-      // The goal is to preserve the actual opposed axis scrolling
-      if( orientation == Orientation.Vertical )
-      {
-        //if the item to be brough into view is part of the elements in a TableView that do no scroll
-        if( ( dataGridControl != null )
-          && ( dataGridControl.GetView() is TableView )
-          && ( !TableViewItemsHost.ComputedCanScrollHorizontally( target, itemsHost ) ) )
-        {
-          // Nothing to do since the item can't scroll horizontally, use 0 as newRect.X
-          // and ensure to use the container as BringIntoView target since it can't 
-          // scroll horizontally
-          if( targetToParentContainer != null )
-          {
-            target = targetParentContainer;
-
-            // Ensure that the offset to bring into view
-            // is the HorizontalOffset since it does not
-            // scroll Horizontally.
-            newRect.X = scrollInfo.HorizontalOffset;
-          }
-        }
-        else
-        {
-          newRect.X = TableViewItemsHost.CorrectBringIntoViewRectFromVisibleDimensionAndAcceptableThreshold(
-            actualVisibleValue,
-            acceptableThreshold,
-            targetToItemsHostPosition.X,
-            targetToParentContainer.X,
-            scrollInfo.HorizontalOffset );
-        }
-
-        // If the rectangle of the object goes beyond the Viewport
-        if( newRect.Right > scrollInfo.ViewportWidth )
-        {
-          // Subtract what goes beyond!
-          newRect.Width = newRect.Width
-            - ( newRect.Width - scrollInfo.ViewportWidth )
-            - Math.Max( targetToItemsHostPosition.X, 0 );
-        }
-      }
-      else
-      {
-        newRect.Y = TableViewItemsHost.CorrectBringIntoViewRectFromVisibleDimensionAndAcceptableThreshold(
-          actualVisibleValue,
-          acceptableThreshold,
-          targetToItemsHostPosition.Y,
-          targetToParentContainer.Y,
-          scrollInfo.VerticalOffset );
-
-        // If the rectangle of the object goes beyond the Viewport
-        if( newRect.Bottom > scrollInfo.ViewportHeight )
-        {
-          // Subtract what goes beyond!
-          newRect.Height = newRect.Height
-            - ( newRect.Height - scrollInfo.ViewportHeight )
-            - Math.Max( targetToItemsHostPosition.Y, 0 );
-        }
-      }
-
-      target.BringIntoView( newRect );
-    }
-
-    private static double MakeRectVisible(
-     double rectMinimum,
-     double rectMaximum,
-     double rectDimension,
-     double itemsHostViewport,
-     double itemsHostOffset,
-     out bool scrollRequired )
-    {
-      scrollRequired = true;
-
-      // Check if the beginning of the rectangle is before the "offset"
-      if( rectMinimum < itemsHostOffset )
-      {
-        // Then make the origin of the rectangle visible (independent of dimension)
-        return rectMinimum;
-      }
-      //if the bottom of the rectangle is not visible
-      else if( rectMaximum > ( itemsHostOffset + itemsHostViewport ) )
-      {
-        // And the rectangle is greater than viewport
-        if( rectDimension > itemsHostViewport )
-        {
-          // Make the origin of the rectangle visible
-          return rectMinimum;
-        }
-        else
-        {
-          //align the bottom of the rectangle at the bottom edge of the viewport.
-          return rectMaximum - itemsHostViewport;
-        }
-      }
-
-      scrollRequired = false;
-      return 0;
-    }
-
-    private static void MoveFocusForwardExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      var itemsHost = ( TableViewItemsHost )sender;
-      var dataGridControl = itemsHost.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusRight( dataGridControl.CurrentContext );
-    }
-
-    private static void MoveFocusForwardCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private static void MoveFocusBackExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      var itemsHost = ( TableViewItemsHost )sender;
-      var dataGridControl = itemsHost.ParentDataGridControl;
-      if( dataGridControl == null )
-        return;
-
-      e.Handled = NavigationHelper.MoveFocusLeft( dataGridControl.CurrentContext );
-    }
-
-    private static void MoveFocusBackCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private static void MoveFocusUpExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      e.Handled = ( ( TableViewItemsHost )sender ).MoveFocusUp();
-    }
-
-    private static void MoveFocusUpCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private static void MoveFocusDownExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      e.Handled = ( ( TableViewItemsHost )sender ).MoveFocusDown();
-    }
-
-    private static void MoveFocusDownCanExecute( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-      e.Handled = true;
-    }
-
-    private bool MoveFocusUp()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      UIElement focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( this, Keyboard.FocusedElement as DependencyObject );
-
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-      bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-      if( ( focusedContainer == null ) ||
-        ( navigationBehavior == NavigationBehavior.None ) )
-      {
-        // We just need to scroll one line up.
-        this.ScrollInfo.ScrollOwner.LineUp();
-      }
-      else
-      {
-        this.FocusContainerOrPreviousFocusable( focusedContainer, changeCurrentColumn );
-      }
-
-      return true;
-    }
-
-    private bool MoveFocusDown()
-    {
-      DataGridControl dataGridControl = this.ParentDataGridControl;
-      UIElement focusedContainer = DataGridItemsHost.GetItemsHostContainerFromElement( this, Keyboard.FocusedElement as DependencyObject );
-
-      NavigationBehavior navigationBehavior = dataGridControl.NavigationBehavior;
-      bool changeCurrentColumn = ( navigationBehavior == NavigationBehavior.CellOnly );
-
-      if( ( focusedContainer == null ) ||
-        ( navigationBehavior == NavigationBehavior.None ) )
-      {
-        // We just need to scroll one line down.
-        this.ScrollInfo.ScrollOwner.LineDown();
-      }
-      else
-      {
-        this.FocusContainerOrNextFocusable( focusedContainer, changeCurrentColumn );
-      }
-
-      return true;
-    }
-
-    private void InvalidateLayoutFromScrollingHelper()
-    {
-      if( m_layoutSuspended.IsSet )
-      {
-        m_layoutInvalidatedDuringSuspend = true;
-        return;
-      }
-
-      this.GeneratePageAndUpdateIScrollInfoValues();
-    }
-
-    private const int MaxDataRowFailFocusCount = 50;
-    private const int NullIndex = int.MinValue;
-
-    private static readonly Point OriginPoint = new Point( 0d, 0d );
-    private static readonly Size EmptySize = new Size( 0d, 0d );
-    private static readonly Rect OutOfViewRect = new Rect( new Point( -999999d, -999999d ), TableViewItemsHost.EmptySize );
-
-    private readonly LayoutedContainerInfoList m_layoutedContainers = new LayoutedContainerInfoList();
-
-    private TableViewPage m_lastGeneratedPage = TableViewPage.Empty;
-    private TableViewPage m_lastLayoutedPage = TableViewPage.Empty;
-
-    private readonly Dictionary<string, double> m_cachedContainerDesiredWidth = new Dictionary<string, double>();
-    private readonly Dictionary<string, double> m_cachedContainerRealDesiredWidth = new Dictionary<string, double>();
-
-    private readonly HashSet<string> m_autoWidthCalculatedDataGridContextList = new HashSet<string>();
-
-    private Size m_lastMeasureAvailableSize = TableViewItemsHost.EmptySize;
-    private int m_indexToBringIntoView = TableViewItemsHost.NullIndex;
-
-    private AutoResetFlag m_layoutSuspended = AutoResetFlagFactory.Create( false );
-    private bool m_layoutInvalidatedDuringSuspend;
-
-    #region LayoutSuspendedHelper Private Class
-
-    private sealed class LayoutSuspendedHelper : IDisposable
-    {
-      public LayoutSuspendedHelper( TableViewItemsHost owner )
-      {
-        if( owner == null )
-          throw new ArgumentNullException( "owner" );
-
-        m_owner = owner;
-        m_disposable = owner.m_layoutSuspended.Set();
-      }
-
-      void IDisposable.Dispose()
-      {
-        this.Dispose( true );
-        GC.SuppressFinalize( this );
-      }
-
-      private void Dispose( bool disposing )
-      {
-        var owner = Interlocked.Exchange( ref m_owner, null );
-        if( owner == null )
-          return;
-
-        if( m_disposable != null )
-        {
-          m_disposable.Dispose();
-          m_disposable = null;
-        }
-
-        if( !owner.m_layoutSuspended.IsSet && owner.m_layoutInvalidatedDuringSuspend )
-        {
-          owner.InvalidateMeasure();
-        }
-      }
-
-      ~LayoutSuspendedHelper()
-      {
-        this.Dispose( false );
-      }
-
-      private TableViewItemsHost m_owner;
-      private IDisposable m_disposable;
-    }
-
-    #endregion
-
-    #region TableViewPageResult Private Class
-
-    private sealed class TableViewPageResult
-    {
-      internal TableViewPageResult( TableViewPage pageInfo, IEnumerable<LayoutedContainerInfo> layoutedContainers )
-      {
-        if( pageInfo == null )
-          throw new ArgumentNullException( "pageInfo" );
-
-        if( layoutedContainers == null )
-          throw new ArgumentNullException( "layoutedContainers" );
-
-        m_pageInfo = pageInfo;
-        m_layoutedContainers = layoutedContainers;
-      }
-
-      internal TableViewPage PageInfo
-      {
-        get
-        {
-          return m_pageInfo;
-        }
-      }
-
-      internal IEnumerable<LayoutedContainerInfo> LayoutedContainers
-      {
-        get
-        {
-          return m_layoutedContainers;
-        }
-      }
-
-      private readonly TableViewPage m_pageInfo;
-      private readonly IEnumerable<LayoutedContainerInfo> m_layoutedContainers;
-    }
-
-    #endregion
-
-    #region Range Private Struct
-
-    private struct Range
-    {
-      internal static readonly Range Empty = new Range( true );
-
-      private Range( bool isEmpty )
-      {
-        m_start = -1;
-        m_end = -1;
-      }
-
-      internal Range( int start, int end )
-      {
-        if( start < 0 )
-          throw new ArgumentException( "The value must be greater than or equal to zero.", "start" );
-
-        if( end < 0 )
-          throw new ArgumentException( "The value must be greater than or equal to zero.", "end" );
-
-        if( start > end )
-          throw new ArgumentException( "The start value must be lesser than or equal to the end value.", "start" );
-
-        m_start = start;
-        m_end = end;
-      }
-
-      public int Start
-      {
-        get
-        {
-          if( m_start < 0 )
-            return 0;
-
-          return m_start;
-        }
-      }
-
-      public int End
-      {
-        get
-        {
-          if( m_end < 0 )
-            return 0;
-
-          return m_end;
-        }
-      }
-
-      public bool IsEmpty
-      {
-        get
-        {
-          return ( m_start < 0 );
-        }
-      }
-
-      public int Length
-      {
-        get
-        {
-          if( this.IsEmpty )
-            return 0;
-
-          return ( m_end - m_start + 1 );
-        }
-      }
-
-      public static bool operator ==( Range x, Range y )
-      {
-        return object.Equals( x, y );
-      }
-
-      public static bool operator !=( Range x, Range y )
-      {
-        return !( x == y );
-      }
-
-      public override int GetHashCode()
-      {
-        return this.Start ^ this.End;
-      }
-
-      public override bool Equals( object obj )
-      {
-        if( !( obj is Range ) )
-          return false;
-
-        var range = ( Range )obj;
-
-        if( this.IsEmpty )
-          return range.IsEmpty;
-
-        return ( !range.IsEmpty )
-            && ( range.m_start == m_start )
-            && ( range.m_end == m_end );
-      }
-
-      internal Range SetStart( int value )
-      {
-        if( this.IsEmpty )
-          throw new InvalidOperationException();
-
-        if( value > m_end )
-          return Range.Empty;
-
-        return new Range( value, m_end );
-      }
-
-      internal Range SetEnd( int value )
-      {
-        if( this.IsEmpty )
-          throw new InvalidOperationException();
-
-        if( value < m_start )
-          return Range.Empty;
-
-        return new Range( m_start, value );
-      }
-
-      private readonly int m_start;
-      private readonly int m_end;
-    }
-
-    #endregion
-
-    #region PageGenerator Private Class
-
-    private abstract class PageGenerator
-    {
-      protected PageGenerator( TableViewItemsHost itemsHost, int startIndex, double availableHeight, bool forceMeasure )
-      {
-        if( itemsHost == null )
-          throw new ArgumentNullException( "itemsHost" );
-
-        m_itemsHost = itemsHost;
-        m_startIndex = startIndex;
-        m_availableHeight = availableHeight;
-        m_forceMeasure = forceMeasure;
-      }
-
-      protected abstract TableViewPage GenerateContainers( int startIndex, int itemCount, double availableHeight, double extendedHeight, bool fillLastPage );
-
-      protected LayoutedContainerInfo CreateContainer( int realizedIndex )
-      {
-        if( ( realizedIndex < 0 ) || ( realizedIndex >= m_itemCount ) )
-          return null;
-
-        this.RecycleCandidates( realizedIndex );
-
-        var position = m_generator.GeneratorPositionFromIndex( realizedIndex );
-        using( m_generator.StartAt( position, GeneratorDirection.Forward, true ) )
-        {
-          var container = m_itemsHost.GenerateContainer( m_generator, realizedIndex, m_forceMeasure );
-          if( container == null )
-            return null;
-
-          m_remainingViewportHeight -= container.DesiredSize.Height;
-          m_nonRecyclableContainers.Remove( container );
-          m_oldLayoutedContainers.Remove( container );
-
-          var containerInfo = new LayoutedContainerInfo( realizedIndex, container );
-          m_newLayoutedContainers.Add( containerInfo );
-
-          return containerInfo;
-        }
-      }
-
-      internal TableViewPageResult Generate( IEnumerable<LayoutedContainerInfo> layoutedContainers, TableViewPage lastGeneratedPage )
-      {
-        m_generator = m_itemsHost.CustomItemContainerGenerator;
-        Debug.Assert( m_generator != null );
-
-        m_generator.IsRecyclingEnabled = true;
-
-        // We call ItemCount before any other call to make sure the internal state of the generator is up-to-date.
-        m_itemCount = m_generator.ItemCount;
-
-        var lastGeneratedPageSize = lastGeneratedPage.OuterPage.Length;
-        m_nonRecyclableContainers = new HashSet<UIElement>();
-        m_oldLayoutedContainers = new Dictionary<UIElement, int>( lastGeneratedPageSize );
-        m_newLayoutedContainers = null;
-
-        // Figure out the realized index of all currently layouted containers.
-        foreach( var container in layoutedContainers.Select( item => item.Container ) )
-        {
-          var newRealizedIndex = m_generator.GetRealizedIndexForContainer( container );
-
-          if( !m_itemsHost.CanRecycleContainer( container ) )
-          {
-            m_nonRecyclableContainers.Add( container );
-            m_oldLayoutedContainers.Add( container, newRealizedIndex );
-          }
-          else if( newRealizedIndex >= 0 )
-          {
-            m_oldLayoutedContainers.Add( container, newRealizedIndex );
-          }
-          // The container is lost, recycle it.
-          else
-          {
-            m_itemsHost.RecycleContainer( m_generator, container, newRealizedIndex );
-          }
-        }
-
-        TableViewPageResult result;
-
-        if( m_itemCount > 0 )
-        {
-          m_newLayoutedContainers = new List<LayoutedContainerInfo>( lastGeneratedPageSize );
-
-          var extendedHeight = Math.Max( m_availableHeight, lastGeneratedPage.ViewportHeight );
-
-          this.PrepareRecycleCandidates( extendedHeight );
-
-          var dataGridContext = DataGridControl.GetDataGridContext( m_itemsHost );
-          var fillLastPage = ( dataGridContext != null ) && TableView.GetAutoFillLastPage( dataGridContext );
-          var pageInfo = this.GenerateContainers( m_startIndex, m_itemCount, m_availableHeight, extendedHeight, fillLastPage );
-
-          // Keep active the containers that cannot be recycled by putting them in the layouted containers collection.
-          foreach( var entry in m_nonRecyclableContainers )
-          {
-            int realizedIndex;
-            if( !m_oldLayoutedContainers.TryGetValue( entry, out realizedIndex ) )
-              continue;
-
-            m_oldLayoutedContainers.Remove( entry );
-            m_newLayoutedContainers.Add( new LayoutedContainerInfo( realizedIndex, entry ) );
-          }
-
-          result = new TableViewPageResult( pageInfo, m_newLayoutedContainers );
-        }
-        else
-        {
-          result = new TableViewPageResult( TableViewPage.Empty, Enumerable.Empty<LayoutedContainerInfo>() );
-        }
-
-        // Recycle the containers that have not been reused.
-        foreach( var entry in m_oldLayoutedContainers )
-        {
-          m_itemsHost.RecycleContainer( m_generator, entry.Key, entry.Value );
-        }
-
-        m_itemsHost.CleanRecyclingCandidates();
-
-        return result;
-      }
-
-      private void PrepareRecycleCandidates( double extendedHeight )
-      {
-        m_recycleCandidates = ( from entry in m_oldLayoutedContainers
-                                orderby entry.Value
-                                select entry.Key ).ToArray();
-
-        var count = m_recycleCandidates.Length;
-
-        m_recycleCandidatesRealizedIndex = new int[ count ];
-        m_recycleCandidatesHeight = new DoubleFenwickTree( count );
-
-        for( int i = 0; i < count; i++ )
-        {
-          var container = m_recycleCandidates[ i ];
-
-          m_recycleCandidatesRealizedIndex[ i ] = m_oldLayoutedContainers[ container ];
-          m_recycleCandidatesHeight[ i ] = container.DesiredSize.Height;
-        }
-
-        if( count > 0 )
-        {
-          m_lowerRecycleCandidatesRange = new Range( 0, count - 1 );
-          m_upperRecycleCandidatesRange = new Range( 0, count - 1 );
-        }
-        else
-        {
-          m_lowerRecycleCandidatesRange = Range.Empty;
-          m_upperRecycleCandidatesRange = Range.Empty;
-        }
-
-        m_remainingViewportHeight = extendedHeight;
-      }
-
-      private void RecycleCandidates( int realizedIndex )
-      {
-        if( m_lowerRecycleCandidatesRange.IsEmpty && m_upperRecycleCandidatesRange.IsEmpty )
-          return;
-
-        var pivot = Array.BinarySearch( m_recycleCandidatesRealizedIndex, realizedIndex );
-        if( pivot < 0 )
-        {
-          pivot = ~pivot;
-
-          if( !m_upperRecycleCandidatesRange.IsEmpty && ( m_upperRecycleCandidatesRange.Start < pivot ) )
-          {
-            m_upperRecycleCandidatesRange = m_upperRecycleCandidatesRange.SetStart( pivot );
-          }
-        }
-        else
-        {
-          if( !m_upperRecycleCandidatesRange.IsEmpty && ( m_upperRecycleCandidatesRange.Start <= pivot ) )
-          {
-            m_upperRecycleCandidatesRange = m_upperRecycleCandidatesRange.SetStart( pivot + 1 );
-          }
-        }
-
-        if( !m_lowerRecycleCandidatesRange.IsEmpty && ( m_lowerRecycleCandidatesRange.End >= pivot ) )
-        {
-          m_lowerRecycleCandidatesRange = m_lowerRecycleCandidatesRange.SetEnd( pivot - 1 );
-        }
-
-        while( !m_lowerRecycleCandidatesRange.IsEmpty )
-        {
-          var index = m_lowerRecycleCandidatesRange.Start;
-          var container = m_recycleCandidates[ index ];
-
-          // The container may no longer be a candidate if it has been reused already.
-          if( m_oldLayoutedContainers.ContainsKey( container ) )
-          {
-            var distance = ( m_lowerRecycleCandidatesRange.Length > 1 )
-                             ? m_recycleCandidatesHeight.GetRunningSum( index + 1, m_lowerRecycleCandidatesRange.End )
-                             : 0d;
-
-            if( distance < m_remainingViewportHeight )
-              break;
-
-            this.RecycleCandidate( container );
-          }
-
-          m_lowerRecycleCandidatesRange = m_lowerRecycleCandidatesRange.SetStart( index + 1 );
-        }
-
-        while( !m_upperRecycleCandidatesRange.IsEmpty )
-        {
-          var index = m_upperRecycleCandidatesRange.End;
-          var container = m_recycleCandidates[ index ];
-
-          // The container may no longer be a candidate if it has been reused already.
-          if( m_oldLayoutedContainers.ContainsKey( container ) )
-          {
-            var distance = ( m_upperRecycleCandidatesRange.Length > 1 )
-                             ? m_recycleCandidatesHeight.GetRunningSum( m_upperRecycleCandidatesRange.Start, index - 1 )
-                             : 0d;
-
-            if( distance < m_remainingViewportHeight )
-              break;
-
-            this.RecycleCandidate( container );
-          }
-
-          m_upperRecycleCandidatesRange = m_upperRecycleCandidatesRange.SetEnd( index - 1 );
-        }
-      }
-
-      private void RecycleCandidate( UIElement container )
-      {
-        //Do not recycle the focused container
-        if( m_nonRecyclableContainers.Contains( container ) )
-          return;
-
-        int realizedIndex;
-        if( !m_oldLayoutedContainers.TryGetValue( container, out realizedIndex ) )
-          return;
-
-        m_oldLayoutedContainers.Remove( container );
-        m_itemsHost.RecycleContainer( m_generator, container, realizedIndex, false );
-      }
-
-      private readonly TableViewItemsHost m_itemsHost;
-      private readonly int m_startIndex;
-      private readonly double m_availableHeight;
-      private readonly bool m_forceMeasure;
-
-      private ICustomItemContainerGenerator m_generator;
-      private int m_itemCount;
-      private HashSet<UIElement> m_nonRecyclableContainers;
-      private Dictionary<UIElement, int> m_oldLayoutedContainers;
-      private List<LayoutedContainerInfo> m_newLayoutedContainers;
-
-      private UIElement[] m_recycleCandidates;
-      private int[] m_recycleCandidatesRealizedIndex;
-      private DoubleFenwickTree m_recycleCandidatesHeight;
-      private Range m_lowerRecycleCandidatesRange;
-      private Range m_upperRecycleCandidatesRange;
-      private double m_remainingViewportHeight;
-    }
-
-    #endregion
-
-    #region TopBottomPageGenerator Private Class
-
-    private sealed class TopBottomPageGenerator : PageGenerator
-    {
-      internal TopBottomPageGenerator( TableViewItemsHost itemsHost, int startIndex, double availableHeight, bool forceMeasure )
-        : base( itemsHost, startIndex, availableHeight, forceMeasure )
-      {
-      }
-
-      protected override TableViewPage GenerateContainers( int startIndex, int itemCount, double availableHeight, double extendedHeight, bool fillLastPage )
-      {
-        var innerStartIndex = startIndex;
-        var innerEndIndex = startIndex;
-        var innerContainersHeight = 0d;
-        var outerStartIndex = startIndex;
-        var outerEndIndex = startIndex;
-        var outerContainersHeight = 0d;
-        var remainingInnerContainersHeight = availableHeight;
-        var remainingOuterContainersHeight = extendedHeight;
-
-        Debug.Assert( remainingInnerContainersHeight <= remainingOuterContainersHeight );
-
-        for( int i = innerStartIndex; ( remainingOuterContainersHeight > 0d ) && ( i < itemCount ); i++ )
-        {
-          var containerInfo = this.CreateContainer( i );
-          if( containerInfo == null )
-            break;
-
-          var containerHeight = containerInfo.Container.DesiredSize.Height;
-
-          if( remainingInnerContainersHeight > 0d )
-          {
-            innerEndIndex = i;
-            innerContainersHeight += containerHeight;
-            remainingInnerContainersHeight -= containerHeight;
-          }
-
-          outerEndIndex = i;
-          outerContainersHeight += containerHeight;
-          remainingOuterContainersHeight -= containerHeight;
-        }
-
-        if( fillLastPage )
-        {
-          for( int i = innerStartIndex - 1; ( remainingOuterContainersHeight > 0d ) && ( i >= 0 ); i-- )
-          {
-            var containerInfo = this.CreateContainer( i );
-            if( containerInfo == null )
-              break;
-
-            var containerHeight = containerInfo.Container.DesiredSize.Height;
-
-            if( containerHeight <= remainingInnerContainersHeight )
-            {
-              innerStartIndex = i;
-              innerContainersHeight += containerHeight;
-              remainingInnerContainersHeight -= containerHeight;
-            }
-
-            outerStartIndex = i;
-            outerContainersHeight += containerHeight;
-            remainingOuterContainersHeight -= containerHeight;
-          }
-        }
-
-        return new TableViewPage(
-          new TableViewFullPageInfo( innerStartIndex, innerEndIndex, innerContainersHeight ),
-          new TableViewFullPageInfo( outerStartIndex, outerEndIndex, outerContainersHeight ),
-          availableHeight );
-      }
-    }
-
-    #endregion
-
-    #region BottomTopPageGenerator Private Class
-
-    private sealed class BottomTopPageGenerator : PageGenerator
-    {
-      internal BottomTopPageGenerator( TableViewItemsHost itemsHost, int startIndex, double availableHeight, bool forceMeasure )
-        : base( itemsHost, startIndex, availableHeight, forceMeasure )
-      {
-      }
-
-      protected override TableViewPage GenerateContainers( int startIndex, int itemCount, double availableHeight, double extendedHeight, bool fillLastPage )
-      {
-        var innerStartIndex = startIndex;
-        var innerEndIndex = startIndex;
-        var innerContainersHeight = 0d;
-        var outerStartIndex = startIndex;
-        var outerEndIndex = startIndex;
-        var outerContainersHeight = 0d;
-        var remainingInnerContainersHeight = availableHeight;
-        var remainingOuterContainersHeight = extendedHeight;
-
-        Debug.Assert( remainingInnerContainersHeight <= remainingOuterContainersHeight );
-
-        for( int i = innerEndIndex; ( remainingOuterContainersHeight > 0d ) && ( i >= 0 ); i-- )
-        {
-          var containerInfo = this.CreateContainer( i );
-          if( containerInfo == null )
-            break;
-
-          var containerHeight = containerInfo.Container.DesiredSize.Height;
-
-          outerStartIndex = i;
-          outerContainersHeight += containerHeight;
-
-          if( containerHeight > remainingInnerContainersHeight )
-          {
-            // The inner page must at least contain one container before we consider layouting in the other direction.
-            if( innerContainersHeight != 0d )
-              break;
-          }
-
-          innerStartIndex = i;
-          innerContainersHeight += containerHeight;
-          remainingInnerContainersHeight -= containerHeight;
-          remainingOuterContainersHeight -= containerHeight;
-        }
-
-        for( int i = innerEndIndex + 1; ( remainingOuterContainersHeight > 0d ) && ( i < itemCount ); i++ )
-        {
-          var containerInfo = this.CreateContainer( i );
-          if( containerInfo == null )
-            break;
-
-          var containerHeight = containerInfo.Container.DesiredSize.Height;
-
-          if( remainingInnerContainersHeight > 0d )
-          {
-            innerEndIndex = i;
-            innerContainersHeight += containerHeight;
-            remainingInnerContainersHeight -= containerHeight;
-          }
-
-          outerEndIndex = i;
-          outerContainersHeight += containerHeight;
-          remainingOuterContainersHeight -= containerHeight;
-        }
-
-        return new TableViewPage(
-          new TableViewFullPageInfo( innerStartIndex, innerEndIndex, innerContainersHeight ),
-          new TableViewFullPageInfo( outerStartIndex, outerEndIndex, outerContainersHeight ),
-          availableHeight );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPage.cs
deleted file mode 100644
index c8602144..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPage.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal sealed class TableViewPage
-  {
-    #region Static Fields
-
-    internal static readonly TableViewPage Empty = new TableViewPage();
-
-    #endregion
-
-    #region Constructors
-
-    internal TableViewPage( TableViewFullPageInfo innerPage, TableViewFullPageInfo outerPage, double viewportHeight )
-    {
-      if( innerPage == null )
-        throw new ArgumentNullException( "innerPage" );
-
-      if( outerPage == null )
-        throw new ArgumentNullException( "outerPage" );
-
-      if( innerPage.Start < outerPage.Start )
-        throw new ArgumentException("The inner page must be a subset of the outer page.", "innerPage");
-
-      if( innerPage.End > outerPage.End )
-        throw new ArgumentException( "The inner page must be a subset of the outer page.", "innerPage" );
-
-      if( viewportHeight < 0d )
-        throw new ArgumentException( "viewportHeight must be greater than to equal to zero.", "viewportHeight" );
-
-      m_innerPage = innerPage;
-      m_outerPage = outerPage;
-      m_viewportHeight = viewportHeight;
-    }
-
-    private TableViewPage()
-    {
-      m_innerPage = TableViewPageInfo.Empty;
-      m_outerPage = TableViewPageInfo.Empty;
-    }
-
-    #endregion
-
-    #region InnerPage Property
-
-    public TableViewPageInfo InnerPage
-    {
-      get
-      {
-        return m_innerPage;
-      }
-    }
-
-    private readonly TableViewPageInfo m_innerPage;
-
-    #endregion
-
-    #region OuterPage Property
-
-    public TableViewPageInfo OuterPage
-    {
-      get
-      {
-        return m_outerPage;
-      }
-    }
-
-    private readonly TableViewPageInfo m_outerPage;
-
-    #endregion
-
-    #region ViewportHeight Property
-
-    public double ViewportHeight
-    {
-      get
-      {
-        return m_viewportHeight;
-      }
-    }
-
-    private readonly double m_viewportHeight; //0d
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPageInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPageInfo.cs
deleted file mode 100644
index 729a0b03..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPageInfo.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal abstract class TableViewPageInfo : IEquatable<TableViewPageInfo>
-  {
-    #region Static Fields
-
-    internal static readonly TableViewPageInfo Empty = new EmptyPageInfo();
-
-    #endregion
-
-    #region Constructor
-
-    protected TableViewPageInfo()
-    {
-    }
-
-    #endregion
-
-    #region Start Property
-
-    public abstract int Start
-    {
-      get;
-    }
-
-    #endregion
-
-    #region End Property
-
-    public abstract int End
-    {
-      get;
-    }
-
-    #endregion
-
-    #region Length Property
-
-    public abstract int Length
-    {
-      get;
-    }
-
-    #endregion
-
-    #region Size Property
-
-    public abstract double Size
-    {
-      get;
-    }
-
-    #endregion
-
-    public static bool operator ==( TableViewPageInfo objA, TableViewPageInfo objB )
-    {
-      if( object.ReferenceEquals( objA, null ) )
-        return object.ReferenceEquals( objB, null );
-
-      return objA.Equals( objB );
-    }
-
-    public static bool operator !=( TableViewPageInfo objA, TableViewPageInfo objB )
-    {
-      return !( objA == objB );
-    }
-
-    public sealed override int GetHashCode()
-    {
-      return this.GetHashCodeImpl();
-    }
-
-    public sealed override bool Equals( object obj )
-    {
-      return this.Equals( obj as TableViewPageInfo );
-    }
-
-    public bool Equals( TableViewPageInfo obj )
-    {
-      if( object.ReferenceEquals( obj, null ) )
-        return false;
-
-      if( object.ReferenceEquals( obj, this ) )
-        return true;
-
-      if( obj.GetHashCode() != this.GetHashCode() )
-        return false;
-
-      return this.EqualsImpl( obj );
-    }
-
-    public abstract bool TryGetStart( out int value );
-    public abstract bool TryGetEnd( out int value );
-
-    protected abstract int GetHashCodeImpl();
-    protected abstract bool EqualsImpl( TableViewPageInfo obj );
-
-    #region EmptyPageInfo Private Class
-
-    private sealed class EmptyPageInfo : TableViewPageInfo
-    {
-      public override int Start
-      {
-        get
-        {
-          throw new NotSupportedException();
-        }
-      }
-
-      public override int End
-      {
-        get
-        {
-          throw new NotSupportedException();
-        }
-      }
-
-      public override int Length
-      {
-        get
-        {
-          return 0;
-        }
-      }
-
-      public override double Size
-      {
-        get
-        {
-          return 0d;
-        }
-      }
-
-      protected override int GetHashCodeImpl()
-      {
-        return 0;
-      }
-
-      protected override bool EqualsImpl( TableViewPageInfo obj )
-      {
-        return object.ReferenceEquals( obj, this );
-      }
-
-      public override bool TryGetStart( out int value )
-      {
-        value = 0;
-
-        return false;
-      }
-
-      public override bool TryGetEnd( out int value )
-      {
-        value = 0;
-
-        return false;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPartialPageInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPartialPageInfo.cs
deleted file mode 100644
index 8bcd9e34..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewPartialPageInfo.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal abstract class TableViewPartialPageInfo : TableViewPageInfo
-  {
-    #region Length Property
-
-    public sealed override int Length
-    {
-      get
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    #endregion
-
-    #region Size Property
-
-    public sealed override double Size
-    {
-      get
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs
deleted file mode 100644
index 4343ed28..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs
+++ /dev/null
@@ -1,378 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Utils.Wpf;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  [TemplatePart( Name = "PART_RowSelectorPane", Type = typeof( RowSelectorPane ) )]
-  public class TableViewScrollViewer : DataGridScrollViewer
-  {
-    static TableViewScrollViewer()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( TableViewScrollViewer ), new FrameworkPropertyMetadata( typeof( TableViewScrollViewer ) ) );
-
-      TableViewScrollViewer.HorizontalScrollBarVisibilityHintProperty = TableViewScrollViewer.HorizontalScrollBarVisibilityHintPropertyKey.DependencyProperty;
-      TableViewScrollViewer.StoredFixedTransformProperty = TableViewScrollViewer.StoredFixedTransformPropertyKey.DependencyProperty;
-    }
-
-    public TableViewScrollViewer()
-    {
-      ExecutedRoutedEventHandler executedRoutedEventHandler = new ExecutedRoutedEventHandler( this.OnScrollCommand );
-      CanExecuteRoutedEventHandler canExecuteRoutedEventHandler = new CanExecuteRoutedEventHandler( this.OnQueryScrollCommand );
-
-      this.CommandBindings.Add(
-        new CommandBinding( ScrollBar.PageLeftCommand,
-        executedRoutedEventHandler,
-        canExecuteRoutedEventHandler ) );
-
-      this.CommandBindings.Add(
-        new CommandBinding( ScrollBar.PageRightCommand,
-        executedRoutedEventHandler,
-        canExecuteRoutedEventHandler ) );
-    }
-
-    #region RowSelectorPaneWidth Property
-
-    public static readonly DependencyProperty RowSelectorPaneWidthProperty = DependencyProperty.Register(
-      "RowSelectorPaneWidth",
-      typeof( double ),
-      typeof( TableViewScrollViewer ),
-      new FrameworkPropertyMetadata( 20d ) );
-
-    public double RowSelectorPaneWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( TableViewScrollViewer.RowSelectorPaneWidthProperty );
-      }
-      set
-      {
-        this.SetValue( TableViewScrollViewer.RowSelectorPaneWidthProperty, value );
-      }
-    }
-
-    #endregion RowSelectorPaneWidth Property
-
-    #region ShowRowSelectorPane Property
-
-    public static readonly DependencyProperty ShowRowSelectorPaneProperty = DependencyProperty.Register(
-      "ShowRowSelectorPane",
-      typeof( bool ),
-      typeof( TableViewScrollViewer ),
-      new FrameworkPropertyMetadata( true ) );
-
-    public bool ShowRowSelectorPane
-    {
-      get
-      {
-        return ( bool )this.GetValue( TableViewScrollViewer.ShowRowSelectorPaneProperty );
-      }
-      set
-      {
-        this.SetValue( TableViewScrollViewer.ShowRowSelectorPaneProperty, value );
-      }
-    }
-
-    #endregion ShowRowSelectorPane Property
-
-    #region HorizontalScrollBarVisibilityHint Property
-
-    private static readonly DependencyPropertyKey HorizontalScrollBarVisibilityHintPropertyKey = DependencyProperty.RegisterReadOnly(
-      "HorizontalScrollBarVisibilityHint",
-      typeof( ScrollBarVisibility ),
-      typeof( TableViewScrollViewer ),
-      new FrameworkPropertyMetadata( ScrollBarVisibility.Auto ) );
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public static readonly DependencyProperty HorizontalScrollBarVisibilityHintProperty;
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    public ScrollBarVisibility HorizontalScrollBarVisibilityHint
-    {
-      get
-      {
-        return ( ScrollBarVisibility )this.GetValue( TableViewScrollViewer.HorizontalScrollBarVisibilityHintProperty );
-      }
-    }
-
-    private void SetHorizontalScrollBarVisibilityHint( ScrollBarVisibility value )
-    {
-      this.SetValue( TableViewScrollViewer.HorizontalScrollBarVisibilityHintPropertyKey, value );
-    }
-
-    private void ResetHorizontalScrollBarVisibilityHint()
-    {
-      this.ClearValue( TableViewScrollViewer.HorizontalScrollBarVisibilityHintPropertyKey );
-    }
-
-    #endregion HorizontalScrollBarVisibilityHint Property
-
-    #region StoredFixedTransform Attached Property
-
-    internal static readonly DependencyPropertyKey StoredFixedTransformPropertyKey = DependencyProperty.RegisterAttachedReadOnly( "StoredFixedTransform",
-      typeof( Transform ),
-      typeof( TableViewScrollViewer ),
-      new UIPropertyMetadata( null ) );
-
-    internal static readonly DependencyProperty StoredFixedTransformProperty;
-
-    internal static Transform GetStoredFixedTransform( ScrollViewer obj )
-    {
-      Transform actualValue = ( Transform )obj.GetValue( TableViewScrollViewer.StoredFixedTransformProperty );
-
-      if( actualValue == null )
-      {
-        actualValue = TableViewScrollViewer.CreateFixedPanelTransform( obj );
-        TableViewScrollViewer.SetStoredFixedTransform( obj, actualValue );
-      }
-
-      return actualValue;
-    }
-
-    internal static void SetStoredFixedTransform( ScrollViewer obj, Transform value )
-    {
-      obj.SetValue( TableViewScrollViewer.StoredFixedTransformPropertyKey, value );
-    }
-
-    #endregion StoredFixedTransform Attached Property
-
-    #region RowSelectorPane Property
-
-    internal RowSelectorPane RowSelectorPane
-    {
-      get
-      {
-        return m_rowSelectorPane;
-      }
-    }
-
-    private RowSelectorPane m_rowSelectorPane;
-
-    #endregion
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      m_rowSelectorPane = this.Template.FindName( "PART_RowSelectorPane", this ) as RowSelectorPane;
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      this.UpdateHorizontalScrollBarVisibilityHint( constraint );
-
-      return base.MeasureOverride( constraint );
-    }
-
-    internal static void SetFixedTranslateTransform( FrameworkElement element, bool canScrollHorizontally )
-    {
-      if( element == null )
-        throw new ArgumentNullException( "element" );
-
-      if( !TableViewScrollViewer.SetFixedTranslateTransformCore( element, canScrollHorizontally ) )
-      {
-        if( !element.IsLoaded )
-        {
-          // The method failed to apply the translate transform because it could not find a ScrollViewer
-          // among its ancestors.  Try again when the element will be loaded in case it wasn't in the
-          // VisualTree.
-          element.Loaded += new RoutedEventHandler( TableViewScrollViewer.OnFixedElementLoaded );
-        }
-      }
-    }
-
-    internal static ScrollViewer GetParentScrollViewer( DependencyObject obj )
-    {
-      DependencyObject parent = TreeHelper.GetParent( obj );
-      ScrollViewer parentScrollViewer = parent as ScrollViewer;
-
-      while( ( parent != null ) && ( parentScrollViewer == null ) )
-      {
-        parent = TreeHelper.GetParent( parent );
-        parentScrollViewer = parent as ScrollViewer;
-      }
-
-      return parentScrollViewer;
-    }
-
-    internal static TableViewScrollViewer GetParentTableViewScrollViewer( DependencyObject obj )
-    {
-      DependencyObject parent = TreeHelper.GetParent( obj );
-      TableViewScrollViewer parentScrollViewer = parent as TableViewScrollViewer;
-
-      while( ( parent != null ) && ( parentScrollViewer == null ) )
-      {
-        parent = TreeHelper.GetParent( parent );
-        parentScrollViewer = parent as TableViewScrollViewer;
-      }
-
-      return parentScrollViewer;
-    }
-
-    internal static Transform CreateFixedPanelTransform( ScrollViewer parentScrollViewer )
-    {
-      TranslateTransform newTransform = new TranslateTransform();
-
-      Binding horizontalOffsetBinding = new Binding();
-      horizontalOffsetBinding.Source = parentScrollViewer;
-      horizontalOffsetBinding.Path = new PropertyPath( ScrollViewer.HorizontalOffsetProperty );
-
-      BindingOperations.SetBinding( newTransform, TranslateTransform.XProperty, horizontalOffsetBinding );
-
-      return newTransform;
-    }
-
-    private static bool SetFixedTranslateTransformCore( FrameworkElement element, bool canScrollHorizontally )
-    {
-      Debug.Assert( element != null );
-
-      var parentScrollViewer = TableViewScrollViewer.GetParentScrollViewer( element ) as ScrollViewer;
-      if( parentScrollViewer == null )
-        return false;
-
-      var fixedTransform = TableViewScrollViewer.GetStoredFixedTransform( parentScrollViewer );
-      Debug.Assert( fixedTransform != null );
-
-      if( canScrollHorizontally )
-      {
-        if( element.RenderTransform == fixedTransform )
-        {
-          element.ClearValue( UIElement.RenderTransformProperty );
-        }
-      }
-      else
-      {
-        element.RenderTransform = fixedTransform;
-      }
-
-      return true;
-    }
-
-    private static void OnFixedElementLoaded( object sender, RoutedEventArgs e )
-    {
-      var element = sender as FrameworkElement;
-      if( element == null )
-        return;
-
-      element.Loaded -= new RoutedEventHandler( TableViewScrollViewer.OnFixedElementLoaded );
-
-      TableViewScrollViewer.SetFixedTranslateTransformCore( element, TableView.GetCanScrollHorizontally( element ) );
-    }
-
-    private void OnQueryScrollCommand( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = true;
-    }
-
-    private void OnScrollCommand( object sender, ExecutedRoutedEventArgs e )
-    {
-      double scrollingViewport = this.ViewportWidth;
-      FixedCellPanel cellPanel = this.LocateFixedCellPanel( this );
-
-      if( cellPanel != null )
-      {
-        scrollingViewport -= cellPanel.GetFixedWidth();
-      }
-
-      if( e.Command == ScrollBar.PageLeftCommand )
-      {
-        double newOffset = Math.Max( this.HorizontalOffset - scrollingViewport, 0d );
-        this.ScrollToHorizontalOffset( newOffset );
-        e.Handled = true;
-      }
-      else if( e.Command == ScrollBar.PageRightCommand )
-      {
-        double newOffset = Math.Min( this.HorizontalOffset + scrollingViewport, this.ScrollableWidth );
-        this.ScrollToHorizontalOffset( newOffset );
-        e.Handled = true;
-      }
-      else
-      {
-        System.Diagnostics.Debug.Assert( false );
-      }
-    }
-
-    private FixedCellPanel LocateFixedCellPanel( DependencyObject obj )
-    {
-      if( obj == null )
-        return null;
-
-      for( int i = VisualTreeHelper.GetChildrenCount( obj ) - 1; i >= 0; i-- )
-      {
-        var child = VisualTreeHelper.GetChild( obj, i );
-        var foundPanel = child as FixedCellPanel;
-
-        if( foundPanel != null )
-          return foundPanel;
-
-        foundPanel = this.LocateFixedCellPanel( child );
-
-        if( foundPanel != null )
-        {
-          // The FixedCellPanel found can be one of the recycled container in the visual tree
-          var dataGridContext = DataGridControl.GetDataGridContext( foundPanel );
-          if( dataGridContext != null )
-          {
-            if( dataGridContext.GetItemFromContainer( foundPanel ) != null )
-              return foundPanel;
-          }
-        }
-      }
-
-      return null;
-    }
-
-    private void UpdateHorizontalScrollBarVisibilityHint( Size viewport )
-    {
-      bool isContentLargerThanViewport = false;
-
-      var viewportWidth = viewport.Width;
-      if( !double.IsInfinity( viewportWidth ) )
-      {
-        var dataGridContext = DataGridControl.GetDataGridContext( this );
-        if( dataGridContext != null )
-        {
-          var columnVirtualizationManager = dataGridContext.GetColumnVirtualizationManagerOrNull() as TableViewColumnVirtualizationManagerBase;
-          if( columnVirtualizationManager != null )
-          {
-            isContentLargerThanViewport = ( columnVirtualizationManager.VisibleColumnsWidth > viewportWidth );
-          }
-        }
-      }
-
-      if( isContentLargerThanViewport )
-      {
-        this.SetHorizontalScrollBarVisibilityHint( ScrollBarVisibility.Visible );
-      }
-      else
-      {
-        this.ResetHorizontalScrollBarVisibilityHint();
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewStartPageInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewStartPageInfo.cs
deleted file mode 100644
index 14b2d4bd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewStartPageInfo.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  internal sealed class TableViewStartPageInfo : TableViewPartialPageInfo
-  {
-    #region Constructor
-
-    internal TableViewStartPageInfo( int value )
-    {
-      if( value < 0 )
-        throw new ArgumentException( "value must be greater than or equal to zero.", "value" );
-
-      m_value = value;
-    }
-
-    #endregion
-
-    #region Start Property
-
-    public override int Start
-    {
-      get
-      {
-        return m_value;
-      }
-    }
-
-    private readonly int m_value;
-
-    #endregion
-
-    #region End Property
-
-    public override int End
-    {
-      get
-      {
-        throw new NotSupportedException();
-      }
-    }
-
-    #endregion
-
-    protected override int GetHashCodeImpl()
-    {
-      return m_value;
-    }
-
-    protected override bool EqualsImpl( TableViewPageInfo obj )
-    {
-      var page = obj as TableViewStartPageInfo;
-      if( object.ReferenceEquals( page, null ) )
-        return false;
-
-      return ( page.m_value == m_value );
-    }
-
-    public override bool TryGetStart( out int value )
-    {
-      value = m_value;
-
-      return true;
-    }
-
-    public override bool TryGetEnd( out int value )
-    {
-      value = 0;
-
-      return false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TargetViewAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TargetViewAttribute.cs
deleted file mode 100644
index 7ee79e4d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TargetViewAttribute.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  [AttributeUsage( AttributeTargets.Class, Inherited = true, AllowMultiple = true )]
-  public sealed class TargetViewAttribute : Attribute
-  {
-    public TargetViewAttribute( Type viewType )
-    {
-      if( !typeof( ViewBase ).IsAssignableFrom( viewType ) )
-        throw new ArgumentException( "The specified view type must be derived from ViewBase.", "viewType" );
-
-      m_viewType = viewType;
-    }
-
-    public Type ViewType
-    {
-      get
-      {
-        return m_viewType;
-      }
-    }
-
-    private Type m_viewType;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs
deleted file mode 100644
index 8a83b171..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.DataGrid.Markup;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  [TypeConverter( typeof( ThemeConverter ) )]
-  public abstract class Theme : DependencyObject
-  {
-    public bool IsViewSupported( Type viewType )
-    {
-      return Theme.IsViewSupported( viewType, this.GetType() );
-    }
-
-    public static bool IsViewSupported( Type viewType, Type themeType )
-    {
-      object[] attributes = themeType.GetCustomAttributes( typeof( TargetViewAttribute ), true );
-
-      foreach( TargetViewAttribute attribute in attributes )
-      {
-        if( attribute.ViewType == viewType )
-          return true;
-      }
-
-      return false;
-    }
-
-    protected virtual ThemeKey CreateDefaultStyleKey( Type viewType, Type elementType )
-    {
-      return new ThemeKey( viewType, this.GetType(), elementType );
-    }
-
-    internal ThemeKey GetDefaultStyleKey( Type viewType, Type elementType )
-    {
-      return this.CreateDefaultStyleKey( viewType, elementType );
-    }
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class ClassicSystemColorTheme : Theme
-  {
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class LunaNormalColorTheme : Theme
-  {
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class LunaHomesteadTheme : Theme
-  {
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class LunaMetallicTheme : Theme
-  {
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class AeroNormalColorTheme : Theme
-  {
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class RoyaleNormalColorTheme : Theme
-  {
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class ZuneNormalColorTheme : Theme
-  {
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class Windows7Theme : Theme
-  {
-  }
-
-  [TargetView( typeof( TableflowView ) )]
-  [TargetView( typeof( TableView ) )]
-  public class Windows8Theme : Theme
-  {
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UICellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UICellCollection.cs
deleted file mode 100644
index 53d3abe7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UICellCollection.cs
+++ /dev/null
@@ -1,525 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  // This class manages the various panel of a FixedCellPanel and the Logical/Visual 
-  // Parent of the elements added to it. More precisely :
-  // - The logical parent of all the elements added to this collection will be the 
-  //   FixedCellPanel.
-  // - An element added or inserted will be either added to the "fixed" sub panel or the
-  //   "scrolling" sub panel, according to its index. Thus, the element's Visual Parent 
-  //   will either be the fixed or the scrolling sub panel.
-  // - When removing or inserting elements, some other elements may see their parent 
-  //   change. From the fixed sub panel to the scrolling sub panel or vice versa.
-  // - As long as the elements are added to FixedCellSubPanel objects (like our 
-  //   m_fixedPanel and m_scrollingPanel), this Visual vs Logical parent management will 
-  //   work.
-  // - The collapsed elements are not considered when counting the number of fixed 
-  //   elements, even 'though they can be found in the m_fixedPanel. This also means that
-  //   for a FixedCellCount of 0, there can still be some (collapsed) element in m_fixedPanel.
-  internal class UICellCollection : UIElementCollection
-  {
-    // The visualParent is passed to the base constructor because it is mandatory, but 
-    // the element's visual parent will always be either the fixed or the scrolling sub 
-    // panel. This is one of the reason why we don't use the base implementation of this
-    // class functions.
-    public UICellCollection( Panel fixedPanel, Panel scrollingPanel, FixedCellPanel parentFixedCellPanel )
-      : base( parentFixedCellPanel, parentFixedCellPanel )
-    {
-      if( fixedPanel == null )
-        throw new ArgumentNullException( "fixedPanel" );
-      if( scrollingPanel == null )
-        throw new ArgumentNullException( "scrollingPanel" );
-      if( parentFixedCellPanel == null )
-        throw new ArgumentNullException( "logicalParent" );
-
-      m_fixedPanel = fixedPanel;
-      m_scrollingPanel = scrollingPanel;
-      m_parentFixedCellPanel = parentFixedCellPanel;
-    }
-
-    public override int Add( UIElement element )
-    {
-      int itemsCount = this.Count;
-
-      if( this.GetFixedVisibleChildrenCount() < m_parentFixedCellPanel.FixedCellCount )
-      {
-        m_fixedPanel.Children.Add( element );
-      }
-      else
-      {
-        m_scrollingPanel.Children.Add( element );
-      }
-
-      this.SetLogicalParent( element );
-      this.IncrementVersion();
-
-      return itemsCount; // The old items count is necessarily the new element's index.
-    }
-
-    public override int Capacity
-    {
-      get
-      {
-        Debug.Fail( "Check to see if the caller does something meaningful with this. We don't want to implement this property." );
-        return 0;
-      }
-      set
-      {
-        Debug.Fail( "Check to see if the caller does something meaningful with this. We don't want to implement this property." );
-      }
-    }
-
-    public override void Clear()
-    {
-      int itemsCount = this.Count;
-
-      if( itemsCount > 0 )
-      {
-        UIElement[] elementArray = new UIElement[ itemsCount ];
-        this.CopyTo( elementArray, 0 );
-        m_fixedPanel.Children.Clear();
-        m_scrollingPanel.Children.Clear();
-
-        // Only clear the logical parent once the elements are no longer attached.
-        UIElement element = null;
-        for( int i = 0; i < itemsCount; i++ )
-        {
-          element = elementArray[ i ];
-
-          if( element != null )
-            this.ClearLogicalParent( element );
-        }
-
-        this.IncrementVersion();
-      }
-    }
-
-    public override bool Contains( UIElement element )
-    {
-      return ( ( m_scrollingPanel.Children.Contains( element ) ) || 
-               ( m_fixedPanel.Children.Contains( element ) ) );
-    }
-
-    public override void CopyTo( Array array, int index )
-    {
-      int fixedItemsCount = m_fixedPanel.Children.Count;
-      int scrollingItemsCount = m_scrollingPanel.Children.Count;
-
-      if( array == null )
-        throw new ArgumentNullException( "array" );
-
-      if( array.Rank != 1 )
-        throw new ArgumentException( "The destination array must be one-dimensional (Rank == 1)." );
-
-      if( ( index < 0 ) || ( array.Length - index < fixedItemsCount + scrollingItemsCount ) )
-        throw new ArgumentException( "The array size, given the provided index, cannot accommodate this collection element count." );
-
-      for( int i = 0; i < fixedItemsCount; i++ )
-      {
-        array.SetValue( m_fixedPanel.Children[ i ], i + index );
-      }
-
-      for( int i = 0; i < scrollingItemsCount; i++ )
-      {
-        array.SetValue( m_scrollingPanel.Children[ i ], fixedItemsCount + i + index );
-      }
-    }
-
-    public override void CopyTo( UIElement[] array, int index )
-    {
-      this.CopyTo( ( Array )array, index );
-    }
-
-    public override int Count
-    {
-      get
-      {
-        return m_fixedPanel.Children.Count + m_scrollingPanel.Children.Count;
-      }
-    }
-
-    public override IEnumerator GetEnumerator()
-    {
-      return new CellEnumerator( this );
-    }
-
-    public override int IndexOf( UIElement element )
-    {
-      int index = m_scrollingPanel.Children.IndexOf( element );
-
-      if( index >= 0 )
-      {
-        index += m_fixedPanel.Children.Count;
-      }
-      else
-      {
-        index = m_fixedPanel.Children.IndexOf( element );
-      }
-
-      return index;
-    }
-
-    public override void Insert( int index, UIElement element )
-    {
-      int itemsCount = this.Count;
-
-      if( index > itemsCount )
-        index = itemsCount;
-
-      if( ( index < m_fixedPanel.Children.Count ) || ( itemsCount == m_fixedPanel.Children.Count ) )
-      {
-        m_fixedPanel.Children.Insert( index, element );
-      }
-      else
-      {
-        m_scrollingPanel.Children.Insert( index - m_fixedPanel.Children.Count, element );
-      }
-
-      if( element.Visibility != Visibility.Collapsed )
-      {
-        int fixedPanelLastChildIndex = m_fixedPanel.Children.Count - 1;
-        int fixedCellCount = m_parentFixedCellPanel.FixedCellCount;
-
-        // If necessary, move some elements (one visible and possibly some collapsed) 
-        // from the fixed panel to the scrolling panel.
-        while( this.GetFixedVisibleChildrenCount() > fixedCellCount )
-        {
-          UIElement bumpedElement = m_fixedPanel.Children[ fixedPanelLastChildIndex ];
-
-          m_fixedPanel.Children.RemoveAt( fixedPanelLastChildIndex );
-          m_scrollingPanel.Children.Insert( 0, bumpedElement );
-          // The logical parent has not changed. We don't have to call SetLogicalParent.
-          fixedPanelLastChildIndex--;
-        }
-      }
-
-      this.SetLogicalParent( element );
-      this.IncrementVersion();
-    }
-
-    public override bool IsSynchronized
-    {
-      get
-      {
-        return m_scrollingPanel.Children.IsSynchronized;
-      }
-    }
-
-    public override object SyncRoot
-    {
-      get
-      {
-        return m_scrollingPanel.Children.SyncRoot;
-      }
-    }
-
-    public override void Remove( UIElement element )
-    {
-      int indexOfElement = m_scrollingPanel.Children.IndexOf( element );
-
-      if( indexOfElement >= 0 )
-      {
-        m_scrollingPanel.Children.RemoveAt( indexOfElement );
-      }
-      else
-      {
-        indexOfElement = m_fixedPanel.Children.IndexOf( element );
-
-        if( indexOfElement >= 0 )
-        {
-          m_fixedPanel.Children.RemoveAt( indexOfElement );
-
-          int scrollingPanelChildrenCount = m_scrollingPanel.Children.Count;
-
-          // If necessary, move some elements (one visible and possibly some collapsed) 
-          // from the scrolling panel to the fixed panel.
-          if( scrollingPanelChildrenCount > 0 )
-          {
-            int fixedCellCount = m_parentFixedCellPanel.FixedCellCount;
-
-            while( ( this.GetFixedVisibleChildrenCount() < fixedCellCount ) && ( scrollingPanelChildrenCount > 0 ) )
-            {
-              UIElement bumpedElement = m_scrollingPanel.Children[ 0 ];
-
-              m_scrollingPanel.Children.RemoveAt( 0 );
-              m_fixedPanel.Children.Add( bumpedElement );
-              // The logical parent has not changed. We don't have to call SetLogicalParent.
-              scrollingPanelChildrenCount--;
-            }
-          }
-        }
-        else
-        {
-          Debug.Assert( false, "Tried to remove an element that is not a child of the FixedCellPanel" );
-        }
-      }
-
-      this.ClearLogicalParent( element );
-      this.IncrementVersion();
-    }
-
-    public override void RemoveAt( int index )
-    {
-      if( ( index >= this.Count ) || ( index < 0 ) )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be less than count and greater than zero." ); 
-
-      int fixedPanelChildrenCount = m_fixedPanel.Children.Count;
-
-      if( index < fixedPanelChildrenCount )
-      {
-        this.Remove( m_fixedPanel.Children[ index ] );
-      }
-      else
-      {
-        this.Remove( m_scrollingPanel.Children[ index - fixedPanelChildrenCount ] );
-      }
-    }
-
-    public override void RemoveRange( int index, int count )
-    {
-      Debug.Fail( "This method has not been optimized because it should never be called." );
-
-      if( index < 0 )
-        throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero." ); 
-
-      if( count < 0 )
-        throw new ArgumentOutOfRangeException( "count", count, "count must be greater than or equal to zero." ); 
-
-      if( this.Count - index < count )
-        throw new ArgumentException( "The specified index and count are greater than the size of this collection." ); 
-
-      for( int i = 0; i < count; i++ )
-      {
-        this.RemoveAt( index );
-      }
-    }
-
-    public override UIElement this[ int index ]
-    {
-      get
-      {
-        if( index < 0 )
-          throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero." ); 
-
-        if( index >= this.Count )
-          throw new ArgumentOutOfRangeException( "index", index, "index must be less than the count of elements in this collection." ); 
-
-        int fixedPanelChildrenCount = m_fixedPanel.Children.Count;
-
-        if( index < fixedPanelChildrenCount )
-        {
-          return m_fixedPanel.Children[ index ];
-        }
-        else
-        {
-          return m_scrollingPanel.Children[ index - fixedPanelChildrenCount ];
-        }
-      }
-
-      set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "value" );
-
-        if( index < 0 )
-          throw new ArgumentOutOfRangeException( "index", index, "index must be greater than or equal to zero." );
-
-        if( index >= this.Count )
-          throw new ArgumentOutOfRangeException( "index", index, "index must be less than the count of elements in this collection." ); 
-
-        int fixedPanelChildrenCount = m_fixedPanel.Children.Count;
-
-        UIElement oldElement = null;
-
-        if( index < fixedPanelChildrenCount )
-        {
-          oldElement = m_fixedPanel.Children[ index ];
-          m_fixedPanel.Children[ index ] = value;
-        }
-        else
-        {
-          oldElement = m_scrollingPanel.Children[ index - fixedPanelChildrenCount ];
-          m_scrollingPanel.Children[ index - fixedPanelChildrenCount ] = value;
-        }
-
-        this.SetLogicalParent( value );
-        this.IncrementVersion();
-
-        if( oldElement != null )
-          this.ClearLogicalParent( oldElement );
-      }
-    }
-
-    // Update the content of the two panels (fixed and scrolling) when the 
-    // FixedColumnCount has changed.
-    public void UpdatePanels()
-    {
-      int fixedVisibleChildrenCount = this.GetFixedVisibleChildrenCount();
-      int fixedCellCount = m_parentFixedCellPanel.FixedCellCount;
-
-      if( fixedVisibleChildrenCount > fixedCellCount )
-      {
-        UIElement element;
-
-        while( fixedVisibleChildrenCount > fixedCellCount )
-        {
-          element = m_fixedPanel.Children[ m_fixedPanel.Children.Count - 1 ];
-          m_fixedPanel.Children.RemoveAt( m_fixedPanel.Children.Count - 1 );
-          m_scrollingPanel.Children.Insert( 0, element );
-          // The logical parent has not changed. We don't have to call SetLogicalParent.
-          if( element.Visibility != Visibility.Collapsed )
-            fixedVisibleChildrenCount--;
-        }
-
-        this.IncrementVersion();
-      }
-      else if( ( fixedVisibleChildrenCount < fixedCellCount ) && ( m_scrollingPanel.Children.Count > 0 ) )
-      {
-        UIElement element;
-
-        while( ( fixedVisibleChildrenCount < fixedCellCount ) && ( m_scrollingPanel.Children.Count > 0 ) )
-        {
-          element = m_scrollingPanel.Children[ 0 ];
-          m_scrollingPanel.Children.RemoveAt( 0 );
-          m_fixedPanel.Children.Add( element );
-          // The logical parent has not changed. We don't have to call SetLogicalParent.
-          if( element.Visibility != Visibility.Collapsed )
-            fixedVisibleChildrenCount++;
-        }
-
-        this.IncrementVersion();
-      }
-    }
-
-    private int GetFixedVisibleChildrenCount()
-    {
-      int fixedVisibleChildrenCount = 0;
-
-      foreach( UIElement child in m_fixedPanel.Children )
-      {
-        if( child.Visibility != Visibility.Collapsed )
-          fixedVisibleChildrenCount++;
-      }
-
-      return fixedVisibleChildrenCount;
-    }
-
-    private void IncrementVersion()
-    {
-      unchecked
-      {
-        m_version++;
-      }
-    }
-
-    #region Private Class CellEnumerator
-
-    // A IEnumerator class optimized to work with the UICellCollection.
-    private class CellEnumerator : IEnumerator
-    {
-      public CellEnumerator( UICellCollection cellCollection )
-      {
-        if( cellCollection == null )
-          throw new ArgumentNullException( "cellCollection" );
-
-        m_cellCollection = cellCollection;
-        m_version = cellCollection.m_version;
-        m_itemsCount = cellCollection.Count;
-        m_fixedCellCount = cellCollection.m_fixedPanel.Children.Count;
-        this.Reset();
-      }
-
-      public object Current
-      {
-        get
-        {
-          if( m_index < 0 )
-            throw new InvalidOperationException( "The enumerator has not been started." ); 
-
-          if( m_index >= m_itemsCount )
-            throw new InvalidOperationException( "The enumerator has reached the end." ); 
-
-          return m_current;
-        }
-      }
-
-      public bool MoveNext()
-      {
-        if( m_version != m_cellCollection.m_version )
-          throw new InvalidOperationException( "The collection has changed." );
-
-        bool result = false;
-
-        if( m_index < m_itemsCount )
-        {
-          m_index++;
-
-          if( m_index < m_itemsCount )
-          {
-            if( m_index < m_fixedCellCount )
-            {
-              m_current = m_cellCollection.m_fixedPanel.Children[ m_index ];
-            }
-            else
-            {
-              m_current = m_cellCollection.m_scrollingPanel.Children[ m_index - m_fixedCellCount ];
-            }
-
-            result = true;
-          }
-          else
-          {
-            m_current = null;
-          }
-        }
-
-        return result;
-      }
-
-      public void Reset()
-      {
-        if( m_version != m_cellCollection.m_version )
-          throw new InvalidOperationException( "The collection has changed." ); 
-
-        m_index = -1;
-        m_current = null;
-      }
-
-      private UICellCollection m_cellCollection;
-      private int m_index;
-      private UIElement m_current;
-      private int m_version;
-      private int m_itemsCount;
-      private int m_fixedCellCount;
-    }
-
-    #endregion Private Class CellEnumerator
-
-    private Panel m_fixedPanel;
-    private Panel m_scrollingPanel;
-    private FixedCellPanel m_parentFixedCellPanel;
-    private int m_version;
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs
deleted file mode 100644
index 6b98ad30..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs
+++ /dev/null
@@ -1,483 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Security;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  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
-    // before the static constructor is called
-    internal static Cursor DefaultGroupDraggedOutsideCursor
-    {
-      get
-      {
-        if( UIViewBase.DefaultGroupDraggedOutsiedCursorCache == null )
-        {
-          try
-          {
-            var uri = new Uri( _XceedVersionInfo.CurrentAssemblyPackUri + ";component/NoDrop.cur" );
-            var info = Application.GetResourceStream( uri );
-
-            if( info != null )
-            {
-              UIViewBase.DefaultGroupDraggedOutsiedCursorCache = new Cursor( info.Stream );
-            }
-          }
-          catch( SecurityException )
-          {
-          }
-          catch( UriFormatException )
-          {
-          }
-          catch( IOException )
-          {
-          }
-          finally
-          {
-            if( UIViewBase.DefaultGroupDraggedOutsiedCursorCache == null )
-            {
-              UIViewBase.DefaultGroupDraggedOutsiedCursorCache = Cursors.No;
-            }
-          }
-        }
-
-        return UIViewBase.DefaultGroupDraggedOutsiedCursorCache;
-      }
-    }
-
-    private static Cursor DefaultGroupDraggedOutsiedCursorCache; // = null;
-
-    internal static Cursor DefaultColumnResizeWestEastCursor = Cursors.SizeWE;
-    internal static Cursor DefaultCannotDropDraggedElementCursor = Cursors.No;
-
-    #endregion
-
-    #region DropMarkPen Attached Property
-
-    public static readonly DependencyProperty DropMarkPenProperty = DependencyProperty.RegisterAttached(
-      "DropMarkPen",
-      typeof( Pen ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static Pen GetDropMarkPen( DependencyObject obj )
-    {
-      return ( Pen )obj.GetValue( UIViewBase.DropMarkPenProperty );
-    }
-
-    public static void SetDropMarkPen( DependencyObject obj, Pen value )
-    {
-      obj.SetValue( UIViewBase.DropMarkPenProperty, value );
-    }
-
-    #endregion
-
-    #region DropMarkOrientation Attached Property
-
-    public static readonly DependencyProperty DropMarkOrientationProperty = DependencyProperty.RegisterAttached(
-      "DropMarkOrientation",
-      typeof( DropMarkOrientation ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( DropMarkOrientation.Default, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static DropMarkOrientation GetDropMarkOrientation( DependencyObject obj )
-    {
-      return ( DropMarkOrientation )obj.GetValue( UIViewBase.DropMarkOrientationProperty );
-    }
-
-    public static void SetDropMarkOrientation( DependencyObject obj, DropMarkOrientation value )
-    {
-      obj.SetValue( UIViewBase.DropMarkOrientationProperty, value );
-    }
-
-    #endregion
-
-    #region ShowScrollTip Property
-
-    public static readonly DependencyProperty ShowScrollTipProperty = DependencyProperty.Register(
-      "ShowScrollTip",
-      typeof( bool ),
-      typeof( UIViewBase ) );
-
-    public bool ShowScrollTip
-    {
-      get
-      {
-        return ( bool )this.GetValue( UIViewBase.ShowScrollTipProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.ShowScrollTipProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DefaultDropMarkPen Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty DefaultDropMarkPenProperty = DependencyProperty.Register(
-      "DefaultDropMarkPen",
-      typeof( Pen ),
-      typeof( UIViewBase ),
-      new UIPropertyMetadata( null ) );
-
-    public Pen DefaultDropMarkPen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( UIViewBase.DefaultDropMarkPenProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.DefaultDropMarkPenProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DefaultDropMarkOrientation Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty DefaultDropMarkOrientationProperty = DependencyProperty.Register(
-      "DefaultDropMarkOrientation",
-      typeof( DropMarkOrientation ),
-      typeof( UIViewBase ),
-      new UIPropertyMetadata( DropMarkOrientation.Vertical ) );
-
-    public DropMarkOrientation DefaultDropMarkOrientation
-    {
-      get
-      {
-        return ( DropMarkOrientation )this.GetValue( UIViewBase.DefaultDropMarkOrientationProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.DefaultDropMarkOrientationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CurrentItemGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty CurrentItemGlyphProperty = DependencyProperty.Register(
-      "CurrentItemGlyph",
-      typeof( DataTemplate ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate CurrentItemGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( UIViewBase.CurrentItemGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.CurrentItemGlyphProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EditingRowGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty EditingRowGlyphProperty = DependencyProperty.Register(
-      "EditingRowGlyph",
-      typeof( DataTemplate ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate EditingRowGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( UIViewBase.EditingRowGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.EditingRowGlyphProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ValidationErrorGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ValidationErrorGlyphProperty = DependencyProperty.Register(
-      "ValidationErrorGlyph",
-      typeof( DataTemplate ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate ValidationErrorGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( UIViewBase.ValidationErrorGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.ValidationErrorGlyphProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ScrollTipContentTemplate Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ScrollTipContentTemplateProperty = DependencyProperty.Register(
-      "ScrollTipContentTemplate",
-      typeof( DataTemplate ),
-      typeof( UIViewBase ) );
-
-    public DataTemplate ScrollTipContentTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( UIViewBase.ScrollTipContentTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.ScrollTipContentTemplateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ScrollTipContentTemplateSelector Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ScrollTipContentTemplateSelectorProperty = DependencyProperty.Register(
-      "ScrollTipContentTemplateSelector",
-      typeof( DataTemplateSelector ),
-      typeof( UIViewBase ) );
-
-    public DataTemplateSelector ScrollTipContentTemplateSelector
-    {
-      get
-      {
-        return ( DataTemplateSelector )this.GetValue( UIViewBase.ScrollTipContentTemplateSelectorProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.ScrollTipContentTemplateSelectorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsConnectionStateGlyphEnabled Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty IsConnectionStateGlyphEnabledProperty = DependencyProperty.Register(
-      "IsConnectionStateGlyphEnabled",
-      typeof( bool ),
-      typeof( UIViewBase ),
-      new PropertyMetadata( true ) );
-
-    public bool IsConnectionStateGlyphEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( UIViewBase.IsConnectionStateGlyphEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.IsConnectionStateGlyphEnabledProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ConnectionStateLoadingGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ConnectionStateLoadingGlyphProperty = DependencyProperty.Register(
-      "ConnectionStateLoadingGlyph",
-      typeof( DataTemplate ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate ConnectionStateLoadingGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( UIViewBase.ConnectionStateLoadingGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.ConnectionStateLoadingGlyphProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ConnectionStateCommittingGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ConnectionStateCommittingGlyphProperty = DependencyProperty.Register(
-      "ConnectionStateCommittingGlyph",
-      typeof( DataTemplate ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate ConnectionStateCommittingGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( UIViewBase.ConnectionStateCommittingGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.ConnectionStateCommittingGlyphProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ConnectionStateErrorGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ConnectionStateErrorGlyphProperty = DependencyProperty.Register(
-      "ConnectionStateErrorGlyph",
-      typeof( DataTemplate ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate ConnectionStateErrorGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( UIViewBase.ConnectionStateErrorGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.ConnectionStateErrorGlyphProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region BusyCursor Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty BusyCursorProperty = DependencyProperty.Register(
-      "BusyCursor",
-      typeof( Cursor ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( Cursors.Wait ) );
-
-    public Cursor BusyCursor
-    {
-      get
-      {
-        return ( Cursor )this.GetValue( UIViewBase.BusyCursorProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.BusyCursorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region CannotDropDraggedElementCursor Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty CannotDropDraggedElementCursorProperty = DependencyProperty.Register(
-      "CannotDropDraggedElementCursor",
-      typeof( Cursor ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( Cursors.No ) );
-
-    public Cursor CannotDropDraggedElementCursor
-    {
-      get
-      {
-        return ( Cursor )this.GetValue( UIViewBase.CannotDropDraggedElementCursorProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.CannotDropDraggedElementCursorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ColumnResizeWestEastCursor Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ColumnResizeWestEastCursorProperty = DependencyProperty.Register(
-      "ColumnResizeWestEastCursor",
-      typeof( Cursor ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( UIViewBase.DefaultColumnResizeWestEastCursor ) );
-
-    public Cursor ColumnResizeWestEastCursor
-    {
-      get
-      {
-        return ( Cursor )this.GetValue( UIViewBase.ColumnResizeWestEastCursorProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.ColumnResizeWestEastCursorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region RemovingGroupCursor Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty RemovingGroupCursorProperty = DependencyProperty.Register(
-      "RemovingGroupCursor",
-      typeof( Cursor ),
-      typeof( UIViewBase ),
-      new FrameworkPropertyMetadata( UIViewBase.DefaultGroupDraggedOutsideCursor ) );
-
-    public Cursor RemovingGroupCursor
-    {
-      get
-      {
-        return ( Cursor )this.GetValue( UIViewBase.RemovingGroupCursorProperty );
-      }
-      set
-      {
-        this.SetValue( UIViewBase.RemovingGroupCursorProperty, value );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs
deleted file mode 100644
index c5b7df74..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs
+++ /dev/null
@@ -1,554 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Windows;
-using Xceed.Wpf.DataGrid.Markup;
-
-namespace Xceed.Wpf.DataGrid.Views
-{
-  public abstract class ViewBase : FrameworkContentElement
-  {
-    #region Static Members
-
-    internal static object GetDefaultStyleKey( Type viewType, Type elementType )
-    {
-      return new ThemeKey( viewType, null, elementType );
-    }
-
-    private static object GetDefaultStyleKey( Type viewType, Theme theme, Type elementType )
-    {
-      if( theme == null )
-        return ViewBase.GetDefaultStyleKey( viewType, elementType );
-
-      return theme.GetDefaultStyleKey( viewType, elementType );
-    }
-
-    #endregion Static Members
-
-    static ViewBase()
-    {
-      ViewBase.FixedHeadersProperty = ViewBase.FixedHeadersPropertyKey.DependencyProperty;
-      ViewBase.HeadersProperty = ViewBase.HeadersPropertyKey.DependencyProperty;
-      ViewBase.FootersProperty = ViewBase.FootersPropertyKey.DependencyProperty;
-      ViewBase.FixedFootersProperty = ViewBase.FixedFootersPropertyKey.DependencyProperty;
-    }
-
-    protected ViewBase()
-    {
-      this.SetValue( ViewBase.HeadersPropertyKey, new ObservableCollection<DataTemplate>() );
-      this.SetValue( ViewBase.FootersPropertyKey, new ObservableCollection<DataTemplate>() );
-      this.SetValue( ViewBase.FixedHeadersPropertyKey, new ObservableCollection<DataTemplate>() );
-      this.SetValue( ViewBase.FixedFootersPropertyKey, new ObservableCollection<DataTemplate>() );
-
-      object newDefaultStyleKey = this.GetDefaultStyleKey( null );
-      if( !object.Equals( newDefaultStyleKey, this.DefaultStyleKey ) )
-      {
-        this.DefaultStyleKey = newDefaultStyleKey;
-      }
-    }
-
-    #region Theme Property
-
-    public static readonly DependencyProperty ThemeProperty =
-      DependencyProperty.Register(
-      "Theme",
-      typeof( Theme ),
-      typeof( ViewBase ),
-      new PropertyMetadata( null,
-        new PropertyChangedCallback( ViewBase.ThemeChangedCallback ),
-        new CoerceValueCallback( ViewBase.ThemeCoerceValueCallback ) ) );
-
-    public Theme Theme
-    {
-      get
-      {
-        // We don't use the GetStyledValue because this property will never support styling.
-        return ( Theme )this.GetValue( ViewBase.ThemeProperty );
-      }
-      set
-      {
-        this.SetValue( ViewBase.ThemeProperty, value );
-      }
-    }
-
-    internal event DependencyPropertyChangedEventHandler ThemeChanged;
-
-    private void OnThemeChanged( DependencyPropertyChangedEventArgs e )
-    {
-      var handler = this.ThemeChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, e );
-    }
-
-    private static void ThemeChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ViewBase view = ( ViewBase )sender;
-
-      object newDefaultStyleKey = view.GetDefaultStyleKey( null );
-
-      if( !object.Equals( newDefaultStyleKey, view.DefaultStyleKey ) )
-      {
-        view.ClearValue( FrameworkContentElement.DefaultStyleKeyProperty );
-
-        if( !object.Equals( newDefaultStyleKey, view.DefaultStyleKey ) )
-        {
-          view.DefaultStyleKey = newDefaultStyleKey;
-        }
-      }
-
-      view.OnThemeChanged( e );
-    }
-
-    private static object ThemeCoerceValueCallback( DependencyObject sender, object newValue )
-    {
-      Theme newTheme = ( Theme )newValue;
-
-      if( newTheme != null )
-      {
-        if( !newTheme.IsViewSupported( sender.GetType() ) )
-          throw new ArgumentException( "This view is not supported by the specified theme (" + sender.GetType().Name + ")." );
-      }
-
-      return newValue;
-    }
-
-    #endregion Theme Property
-
-    #region Headers Property
-
-    private static readonly DependencyPropertyKey HeadersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Headers", typeof( ObservableCollection<DataTemplate> ), typeof( ViewBase ), new UIPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty HeadersProperty;
-
-    public ObservableCollection<DataTemplate> Headers
-    {
-      get
-      {
-        return ( ObservableCollection<DataTemplate> )this.GetValue( ViewBase.HeadersProperty );
-      }
-    }
-
-    #endregion Headers Property
-
-    #region Footers Property
-
-    private static readonly DependencyPropertyKey FootersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "Footers", typeof( ObservableCollection<DataTemplate> ), typeof( ViewBase ), new UIPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty FootersProperty;
-
-    public ObservableCollection<DataTemplate> Footers
-    {
-      get
-      {
-        return ( ObservableCollection<DataTemplate> )this.GetValue( ViewBase.FootersProperty );
-      }
-    }
-
-    #endregion Footers Property
-
-    #region FixedHeaders Property
-
-    private static readonly DependencyPropertyKey FixedHeadersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "FixedHeaders", typeof( ObservableCollection<DataTemplate> ), typeof( ViewBase ), new UIPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty FixedHeadersProperty;
-
-    public ObservableCollection<DataTemplate> FixedHeaders
-    {
-      get
-      {
-        return ( ObservableCollection<DataTemplate> )this.GetValue( ViewBase.FixedHeadersProperty );
-      }
-    }
-
-    #endregion FixedHeaders Property
-
-    #region FixedFooters Property
-
-    private static readonly DependencyPropertyKey FixedFootersPropertyKey =
-        DependencyProperty.RegisterReadOnly( "FixedFooters", typeof( ObservableCollection<DataTemplate> ), typeof( ViewBase ), new UIPropertyMetadata( null ) );
-
-    public static readonly DependencyProperty FixedFootersProperty;
-
-    public ObservableCollection<DataTemplate> FixedFooters
-    {
-      get
-      {
-        return ( ObservableCollection<DataTemplate> )this.GetValue( ViewBase.FixedFootersProperty );
-      }
-    }
-
-    #endregion FixedFooters Property
-
-    #region GroupLevelConfigurations Read-Only Property
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration property is obsolete and has been replaced by the DataGridControl.GroupConfigurationSelector and DefaultGroupConfiguration properties. ", true )]
-    public static readonly DependencyProperty GroupLevelConfigurationsProperty;
-
-    [Browsable( false )]
-    [EditorBrowsable( EditorBrowsableState.Never )]
-    [Obsolete( "The GroupLevelConfiguration property is obsolete and has been replaced by the DataGridControl.GroupConfigurationSelector and DefaultGroupConfiguration properties. ", true )]
-    public GroupLevelConfigurationCollection GroupLevelConfigurations
-    {
-      get
-      {
-        return null;
-      }
-    }
-
-    #endregion GroupLevelConfigurations Read-Only Property
-
-    #region AscendingSortGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty AscendingSortGlyphProperty =
-      DependencyProperty.Register( "AscendingSortGlyph",
-      typeof( DataTemplate ),
-      typeof( ViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate AscendingSortGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ViewBase.AscendingSortGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( ViewBase.AscendingSortGlyphProperty, value );
-      }
-    }
-
-    #endregion AscendingSortGlyph Property
-
-    #region DescendingSortGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty DescendingSortGlyphProperty =
-      DependencyProperty.Register( "DescendingSortGlyph",
-      typeof( DataTemplate ),
-      typeof( ViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate DescendingSortGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ViewBase.DescendingSortGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( ViewBase.DescendingSortGlyphProperty, value );
-      }
-    }
-
-    #endregion SortOrderGlyph Property
-
-    #region ExpandGroupGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty ExpandGroupGlyphProperty =
-      DependencyProperty.Register( "ExpandGroupGlyph",
-      typeof( DataTemplate ),
-      typeof( ViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate ExpandGroupGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ViewBase.ExpandGroupGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( ViewBase.ExpandGroupGlyphProperty, value );
-      }
-    }
-
-    #endregion ExpandGroupGlyph Property
-
-    #region CollapseGroupGlyph Property
-
-    [ViewProperty( ViewPropertyMode.ViewOnly )]
-    public static readonly DependencyProperty CollapseGroupGlyphProperty =
-      DependencyProperty.Register( "CollapseGroupGlyph",
-      typeof( DataTemplate ),
-      typeof( ViewBase ),
-      new FrameworkPropertyMetadata( null ) );
-
-    public DataTemplate CollapseGroupGlyph
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( ViewBase.CollapseGroupGlyphProperty );
-      }
-      set
-      {
-        this.SetValue( ViewBase.CollapseGroupGlyphProperty, value );
-      }
-    }
-
-    #endregion CollapseGroupGlyph Property
-
-    #region UseDefaultHeadersFooters Property
-
-    // This property cannot be configured differently for details and won't be used with 
-    // ViewBinding: don't assign a ViewProperty attribute.
-    public static readonly DependencyProperty UseDefaultHeadersFootersProperty =
-        DependencyProperty.Register( "UseDefaultHeadersFooters", typeof( bool ), typeof( ViewBase ), new PropertyMetadata( true ) );
-
-    public bool UseDefaultHeadersFooters
-    {
-      get
-      {
-        return ( bool )this.GetValue( TableView.UseDefaultHeadersFootersProperty );
-      }
-      set
-      {
-        this.SetValue( TableView.UseDefaultHeadersFootersProperty, value );
-      }
-    }
-
-    #endregion UseDefaultHeadersFooters Property
-
-    #region IsLastItem Attached Property
-
-    public static readonly DependencyProperty IsLastItemProperty = DependencyProperty.RegisterAttached(
-      "IsLastItem", typeof( bool ), typeof( ViewBase ),
-      new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static bool GetIsLastItem( DependencyObject obj )
-    {
-      return ( bool )obj.GetValue( ViewBase.IsLastItemProperty );
-    }
-
-    public static void SetIsLastItem( DependencyObject obj, bool value )
-    {
-      obj.SetValue( ViewBase.IsLastItemProperty, value );
-    }
-
-    #endregion IsLastItem Attached Property
-
-    #region PreserveContainerSize Property
-
-    internal static readonly DependencyProperty PreserveContainerSizeProperty = DependencyProperty.Register(
-      "PreserveContainerSize",
-      typeof( bool ),
-      typeof( ViewBase ),
-      new FrameworkPropertyMetadata( true ) );
-
-    internal bool PreserveContainerSize
-    {
-      get
-      {
-        return ( bool )this.GetValue( ViewBase.PreserveContainerSizeProperty );
-      }
-      set
-      {
-        this.SetValue( ViewBase.PreserveContainerSizeProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewTypeForThemeKey Property
-
-    protected virtual Type ViewTypeForThemeKey
-    {
-      get
-      {
-        return this.GetType();
-      }
-    }
-
-    #endregion
-
-    #region Protected Methods
-
-    protected virtual void AddDefaultHeadersFooters()
-    {
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal virtual ColumnVirtualizationManager CreateColumnVirtualizationManager( DataGridContext dataGridContext )
-    {
-      Debug.Assert( dataGridContext != null );
-
-      return new ColumnVirtualizationManager( dataGridContext );
-    }
-
-    internal void InvokeAddDefaultHeadersFooters()
-    {
-      if( !m_defaultHeadersFootersAdded )
-      {
-        m_defaultHeadersFootersAdded = true;
-        this.AddDefaultHeadersFooters();
-      }
-    }
-
-    internal object GetDefaultStyleKey( Type elementType )
-    {
-      return ViewBase.GetDefaultStyleKey( this.ViewTypeForThemeKey, this.Theme, elementType );
-    }
-
-    internal IEnumerable<ViewPropertyStruct> GetViewProperties()
-    {
-      //This will ensure that the GetViewPropertiesCore will be called only once by instance of view (optimization to avoir re-doing it all the time ).
-      if( m_viewProperties == null )
-      {
-        m_viewProperties = this.GetViewPropertiesCore( ViewPropertyMode.ViewOnly ).ToArray();
-      }
-
-      return m_viewProperties;
-    }
-
-    internal IEnumerable<ViewPropertyStruct> GetSharedProperties()
-    {
-      //This will ensure that the GetViewPropertiesCore will be called only once by instance of view (optimization to avoir re-doing it all the time ).
-      if( m_sharedProperties == null )
-      {
-        m_sharedProperties = this.GetViewPropertiesCore( ViewPropertyMode.Routed ).ToArray();
-      }
-
-      return m_sharedProperties;
-    }
-
-    internal IEnumerable<ViewPropertyStruct> GetSharedNoFallbackProperties()
-    {
-      //This will ensure that the GetViewPropertiesCore will be called only once by instance of view (optimization to avoir re-doing it all the time ).
-      if( m_sharedNoFallbackProperties == null )
-      {
-        m_sharedNoFallbackProperties = this.GetViewPropertiesCore( ViewPropertyMode.RoutedNoFallback ).ToArray();
-      }
-
-      return m_sharedNoFallbackProperties;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private static ViewPropertyAttribute GetViewPropertyAttribute( MemberInfo memberInfo )
-    {
-      if( memberInfo == null )
-        return null;
-
-      var attributes = memberInfo.GetCustomAttributes( typeof( ViewPropertyAttribute ), true );
-      if( ( attributes == null ) || ( attributes.GetLength( 0 ) != 1 ) )
-        return null;
-
-      return ( ViewPropertyAttribute )attributes[ 0 ];
-    }
-
-    private IEnumerable<ViewPropertyStruct> GetViewPropertiesCore( ViewPropertyMode viewPropertyMode )
-    {
-      var fields = this.GetType().GetFields( BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy );
-      foreach( FieldInfo field in fields )
-      {
-        //Filter out any public static field that is not a DependencyProperty ( no examples )
-        if( field.FieldType != typeof( DependencyProperty ) )
-          continue;
-
-        //Filter out all DependencyProperty that doesn't match the ViewPropertyMode.
-        var attribute = ViewBase.GetViewPropertyAttribute( field );
-        if( ( attribute == null ) || ( attribute.ViewPropertyMode != viewPropertyMode ) )
-          continue;
-
-        var dependencyProperty = ( DependencyProperty )field.GetValue( null ); // parameter is ignored for static fields.
-        Debug.Assert( dependencyProperty != null );
-
-        if( dependencyProperty.ReadOnly )
-          throw new InvalidOperationException( "An attempt was made to return a read-only property. Dependency properties returned by ViewBase.GetViewPropertiesCore() cannot be read-only." );
-
-        yield return new ViewPropertyStruct( dependencyProperty, attribute.ViewPropertyMode, attribute.FlattenDetailBindingMode );
-      }
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    private IEnumerable<ViewPropertyStruct> m_viewProperties; // = null
-    private IEnumerable<ViewPropertyStruct> m_sharedProperties; // = null
-    private IEnumerable<ViewPropertyStruct> m_sharedNoFallbackProperties; // = null
-    private bool m_defaultHeadersFootersAdded; // = false 
-
-    #endregion
-
-    #region ViewPropertyStruct Nested Type
-
-    internal struct ViewPropertyStruct
-    {
-      internal ViewPropertyStruct( DependencyProperty dependencyProperty )
-      {
-        if( dependencyProperty == null )
-          throw new ArgumentNullException( "dependencyProperty" );
-
-        this.DependencyProperty = dependencyProperty;
-        this.ViewPropertyMode = ViewPropertyMode.None;
-        this.FlattenDetailBindingMode = FlattenDetailBindingMode.Default;
-      }
-
-      internal ViewPropertyStruct(
-        DependencyProperty dependencyProperty,
-        ViewPropertyMode viewPropertyMode,
-        FlattenDetailBindingMode flattenDetailBindingMode )
-      {
-        if( dependencyProperty == null )
-          throw new ArgumentNullException( "dependencyProperty" );
-
-        this.DependencyProperty = dependencyProperty;
-        this.ViewPropertyMode = viewPropertyMode;
-        this.FlattenDetailBindingMode = flattenDetailBindingMode;
-      }
-
-      internal readonly DependencyProperty DependencyProperty;
-      internal readonly ViewPropertyMode ViewPropertyMode;
-      internal readonly FlattenDetailBindingMode FlattenDetailBindingMode;
-
-      public override bool Equals( object obj )
-      {
-        if( !( obj is ViewPropertyStruct ) )
-          return false;
-
-        return ( this.DependencyProperty == ( ( ViewPropertyStruct )obj ).DependencyProperty );
-      }
-
-      public override int GetHashCode()
-      {
-        return this.DependencyProperty.GetHashCode();
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewPropertyAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewPropertyAttribute.cs
deleted file mode 100644
index 5e316b80..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewPropertyAttribute.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.DataGrid.Views
-{
-  [AttributeUsage( AttributeTargets.Field, AllowMultiple = false )] // Applies only to the fields that store the DependencyProperties
-  public sealed class ViewPropertyAttribute : Attribute
-  {
-    #region Constructors
-
-    public ViewPropertyAttribute( ViewPropertyMode viewPropertyMode )
-      : this( viewPropertyMode, FlattenDetailBindingMode.Default )
-    {
-    }
-
-    internal ViewPropertyAttribute( ViewPropertyMode viewPropertyMode, FlattenDetailBindingMode flattenDetailBindingMode )
-    {
-      m_viewPropertyMode = viewPropertyMode;
-      m_flattenDetailBindingMode = flattenDetailBindingMode;
-    }
-
-    #endregion
-
-    #region ViewPropertyMode Property
-
-    public ViewPropertyMode ViewPropertyMode
-    {
-      get
-      {
-        return m_viewPropertyMode;
-      }
-    }
-
-    private readonly ViewPropertyMode m_viewPropertyMode = ViewPropertyMode.None;
-
-    #endregion
-
-    #region FlattenDetailBindingMode Internal Property
-
-    internal FlattenDetailBindingMode FlattenDetailBindingMode
-    {
-      get
-      {
-        return m_flattenDetailBindingMode;
-      }
-    }
-
-    private readonly FlattenDetailBindingMode m_flattenDetailBindingMode = FlattenDetailBindingMode.Default;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs
deleted file mode 100644
index 22e0b236..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs
+++ /dev/null
@@ -1,1415 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Windows;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xceed.Wpf.DataGrid
-{
-  internal class VirtualizingCellCollection : CellCollection
-  {
-    internal VirtualizingCellCollection( Row parentRow )
-      : base( new VirtualizingItemsList() )
-    {
-      if( parentRow == null )
-        throw new ArgumentNullException( "parentRow" );
-
-      m_parentRow = parentRow;
-      m_cells = new CellSet( parentRow );
-      m_readOnlyCellsCollection = new ReadOnlyCollection<Cell>( m_cells );
-
-      // We must assign the VirtualizingCellCollection of the VirtualizingItemsList manually
-      ( ( VirtualizingItemsList )this.Items ).SetParent( this );
-    }
-
-    #region Cells Property
-
-    internal ICollection<Cell> Cells
-    {
-      get
-      {
-        return m_readOnlyCellsCollection;
-      }
-    }
-
-    private readonly ICollection<Cell> m_readOnlyCellsCollection;
-
-    #endregion
-
-    #region BindedCells Property
-
-    internal ICollection<Cell> BindedCells
-    {
-      get
-      {
-        return m_bindedCells.Values;
-      }
-    }
-
-    #endregion
-
-    #region VirtualizedCells Property
-
-    internal ICollection<Cell> VirtualizedCells
-    {
-      get
-      {
-        return m_unbindedCells.Values;
-      }
-    }
-
-    #endregion
-
-    #region DataGridContext Private Property
-
-    private DataGridContext DataGridContext
-    {
-      get
-      {
-        return DataGridControl.GetDataGridContext( m_parentRow );
-      }
-    }
-
-    #endregion
-
-    #region Columns Private Property
-
-    private ColumnCollection Columns
-    {
-      get
-      {
-        if( this.DataGridContext == null )
-          return null;
-
-        return this.DataGridContext.Columns;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdating Property
-
-    internal bool IsUpdating
-    {
-      get
-      {
-        return m_isUpdating.IsSet;
-      }
-    }
-
-    internal IDisposable SetIsUpdating()
-    {
-      return m_isUpdating.Set();
-    }
-
-    private readonly AutoResetFlag m_isUpdating = AutoResetFlagFactory.Create();
-
-    #endregion
-
-    #region VirtualizationMode property
-
-    internal ColumnVirtualizationMode VirtualizationMode
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region CollectionChanged Event
-
-    internal event EventHandler CollectionChanged;
-
-    private void NotifyCollectionChanged()
-    {
-      var handler = this.CollectionChanged;
-      if( handler == null )
-        return;
-
-      handler.Invoke( this, EventArgs.Empty );
-    }
-
-    #endregion
-
-    public override Cell this[ ColumnBase column ]
-    {
-      get
-      {
-        if( column == null )
-          return null;
-
-        var columns = this.Columns;
-        if( columns == null )
-          return null;
-
-        var match = columns[ column.FieldName ];
-        if( match == null )
-          return null;
-
-        Debug.Assert( match == column );
-
-        return this.GetCell( column, true );
-      }
-    }
-
-    public override Cell this[ string fieldName ]
-    {
-      get
-      {
-        return this.GetCell( this.GetColumn( fieldName ), true );
-      }
-    }
-
-    protected override void InsertItem( int index, Cell item )
-    {
-      this.InternalInsert( index, item );
-    }
-
-    protected override void RemoveItem( int index )
-    {
-      this.InternalRemoveAt( index );
-    }
-
-    protected override void SetItem( int index, Cell item )
-    {
-      throw new NotSupportedException();
-    }
-
-    protected override void ClearItems()
-    {
-      this.InternalClear();
-    }
-
-    internal override void InternalAdd( Cell cell )
-    {
-      this.InternalAddCore( cell );
-    }
-
-    internal override void InternalClear()
-    {
-      //Try to be GC friendly
-      if( m_recyclingBins != null )
-      {
-        foreach( var recycleBin in m_recyclingBins.Values )
-        {
-          recycleBin.Clear();
-        }
-        m_recyclingBins.Clear();
-      }
-      m_recyclingBins = null;
-
-      if( m_freeCells != null )
-      {
-        m_freeCells.Clear();
-        m_freeCells.TrimExcess();
-      }
-      m_freeCells = null;
-
-      m_bindedCells.Clear();
-      m_unbindedCells.Clear();
-      m_unprocessedCells.Clear();
-      m_cells.Clear();
-    }
-
-    internal override void InternalInsert( int index, Cell cell )
-    {
-      this.InternalAddCore( cell );
-    }
-
-    internal override void InternalRemove( Cell cell )
-    {
-      this.InternalRemoveCore( cell, true );
-    }
-
-    internal override void InternalRemoveAt( int index )
-    {
-      ColumnBase column = this.Columns[ index ];
-      if( column == null )
-        return;
-
-      Cell cell;
-      if( !m_bindedCells.TryGetValue( column.FieldName, out cell ) )
-        return;
-
-      this.InternalRemoveCore( cell, true );
-    }
-
-    internal override void InternalSetCell( int index, Cell cell )
-    {
-      throw new NotSupportedException();
-    }
-
-    internal void Release( Cell cell )
-    {
-      if( cell == null )
-        return;
-
-      // Remove the target cell from the binded cells.
-      this.ReleaseCore( cell );
-
-      cell.Visibility = Visibility.Collapsed;
-    }
-
-    internal Cell GetCell( string fieldName, bool prepareCell )
-    {
-      if( string.IsNullOrEmpty( fieldName ) )
-        return null;
-
-      Cell cell;
-      if( this.TryGetBindedCell( fieldName, prepareCell, out cell ) )
-        return cell;
-
-      return this.CreateOrRecoverCell( fieldName );
-    }
-
-    internal Cell GetCell( ColumnBase column, bool prepareCell )
-    {
-      if( column == null )
-        return null;
-
-      Cell cell;
-      if( this.TryGetBindedCell( column, prepareCell, out cell ) )
-        return cell;
-
-      return this.CreateOrRecoverCell( column, this.DataGridContext );
-    }
-
-    internal bool TryGetBindedCell( string fieldName, out Cell cell )
-    {
-      return this.TryGetBindedCell( fieldName, true, out cell );
-    }
-
-    internal bool TryGetBindedCell( ColumnBase column, out Cell cell )
-    {
-      return this.TryGetBindedCell( column, true, out cell );
-    }
-
-    internal bool TryGetBindedCell( string fieldName, bool prepareCell, out Cell cell )
-    {
-      return this.TryGetBindedCell( this.GetColumn( fieldName ), prepareCell, out cell );
-    }
-
-    internal bool TryGetBindedCell( ColumnBase column, bool prepareCell, out Cell cell )
-    {
-      cell = null;
-      if( column == null )
-        return false;
-
-      if( !m_bindedCells.TryGetValue( column.FieldName, out cell ) )
-        return false;
-
-      if( prepareCell )
-      {
-        this.PrepareCell( cell, column, this.DataGridContext );
-      }
-
-      return true;
-    }
-
-    internal bool TryGetCreatedCell( string fieldName, out Cell cell )
-    {
-      if( m_bindedCells.TryGetValue( fieldName, out cell ) )
-        return true;
-
-      //The required cell may have been added in xaml, but may still not be added to the binded cells.  If this is the case, add it now.
-      if( m_unprocessedCells.TryGetValue( fieldName, out cell ) )
-      {
-        m_unprocessedCells.Remove( fieldName );
-        cell = m_parentRow.PrepareUnbindedCell( this.GetColumn( fieldName ), cell );
-
-        m_bindedCells.Add( fieldName, cell );
-
-        return true;
-      }
-
-      return false;
-    }
-
-    internal void MergeFreeCells()
-    {
-      if( m_freeCells == null )
-        return;
-
-      var dataGridContext = this.DataGridContext;
-      var columns = this.Columns;
-
-      foreach( Cell cell in m_freeCells )
-      {
-        this.MergeFreeCell( cell, dataGridContext, columns );
-      }
-
-      //Try to be GC friendly
-      m_freeCells.Clear();
-      m_freeCells.TrimExcess();
-      m_freeCells = null;
-
-      m_freeCellsHaveBeenMerged = true;
-    }
-
-    internal bool HasVirtualizedCell( string fieldName )
-    {
-      if( string.IsNullOrWhiteSpace( fieldName ) )
-        return false;
-
-      if( m_bindedCells.ContainsKey( fieldName ) )
-        return true;
-
-      if( m_unbindedCells.ContainsKey( fieldName ) )
-        return true;
-
-      return false;
-    }
-
-    internal Cell AddVirtualizedCell( ColumnBase column )
-    {
-      var fieldName = column.FieldName;
-      Cell cell;
-      var addToCells = true;
-
-      if( m_unprocessedCells.TryGetValue( fieldName, out cell ) )
-      {
-        //A cell was provided in xaml
-        m_unprocessedCells.Remove( fieldName );
-        addToCells = false;
-      }
-
-      //If no cell was provided, this will generate one.
-      cell = m_parentRow.PrepareUnbindedCell( column, cell );
-
-      m_unbindedCells.Add( fieldName, cell );
-
-      //A new generated cell must be added to the CellSet.  If it was provided through xaml, it is already added.
-      if( addToCells )
-      {
-        m_cells.Add( cell );
-      }
-
-      return cell;
-    }
-
-    internal void RemoveVirtualizedCell( ColumnBase column )
-    {
-      Cell cell;
-      var binded = true;
-
-      if( !this.TryGetBindedCell( column, false, out cell ) )
-      {
-        binded = false;
-        this.TryRecoverCell( column, out cell, false );
-      }
-
-      if( cell != null )
-      {
-        //Only remove cells that can be generated without any unique configuration (e.g. no custom template, no ResultPropertyName, etc..)
-        if( this.CanBeRemoved( cell ) )
-        {
-          this.InternalRemoveCore( cell, binded );
-        }
-        else
-        {
-          if( binded )
-          {
-            m_bindedCells.Remove( cell.FieldName );
-            cell.Visibility = Visibility.Collapsed;
-            cell.RemoveContentBinding();
-          }
-          m_unprocessedCells.Add( cell.FieldName, cell );
-        }
-      }
-    }
-
-    internal void BindRecycledCells( ColumnCollection columns )
-    {
-      if( m_recyclingBins == null )
-        return;
-
-      Cell cell;
-
-      if( columns != null )
-      {
-        foreach( ColumnBase column in columns )
-        {
-          if( m_bindedCells.ContainsKey( column.FieldName ) )
-            continue;
-
-          if( this.TryGetRecycledCell( column, out cell ) )
-          {
-            cell.ClearValue( Cell.VisibilityProperty );
-            m_bindedCells.Add( cell.FieldName, cell );
-          }
-        }
-      }
-
-      this.ClearRecycleBins();
-    }
-
-    internal void BindVirtualizedCells()
-    {
-      foreach( KeyValuePair<string, Cell> item in m_unbindedCells )
-      {
-        var cell = item.Value;
-        cell.ClearValue( Cell.VisibilityProperty );
-        m_bindedCells.Add( item.Key, cell );
-      }
-      m_unbindedCells.Clear();
-
-      foreach( KeyValuePair<string, Cell> item in m_unprocessedCells )
-      {
-        var cell = m_parentRow.PrepareUnbindedCell( this.GetColumn( item.Key ), item.Value );
-        cell.ClearValue( Cell.VisibilityProperty );
-        m_bindedCells.Add( item.Key, cell );
-      }
-      m_unprocessedCells.Clear();
-    }
-
-    internal void ClearOutOfViewBindedCells( List<Cell> cells )
-    {
-      foreach( Cell cell in cells )
-      {
-        if( this.CanBeRemoved( cell ) )
-        {
-          this.InternalRemoveCore( cell, true );
-          continue;
-        }
-
-        //No need to add the cell's fieldName to the FixedCellPanel.PermanentScrollingFieldNames,
-        //for FixedCellPanel.UpdateChildren() will take care of it in the next layout pass.
-        cell.RemoveContentBinding();
-      }
-    }
-
-    internal void ClearVirtualizedCells()
-    {
-      foreach( Cell cell in m_unbindedCells.Values )
-      {
-        if( this.CanBeRemoved( cell ) )
-        {
-          this.InternalRemoveCore( cell );
-          continue;
-        }
-
-        //No need to add the cell's fieldName to the FixedCellPanel.PermanentScrollingFieldNames,
-        //for FixedCellPanel.UpdateChildren() will take care of it in the next layout pass.
-        cell.RemoveContentBinding();
-        cell.Arrange( new Rect( 0, 0, 0, 0 ) );
-        cell.ClearValue( Cell.VisibilityProperty );
-        m_bindedCells.Add( cell.FieldName, cell );
-      }
-
-      m_unbindedCells.Clear();
-
-      foreach( Cell cell in m_unprocessedCells.Values )
-      {
-        if( this.CanBeRemoved( cell ) )
-        {
-          this.InternalRemoveCore( cell );
-          continue;
-        }
-
-        var fieldName = cell.FieldName;
-        m_parentRow.PrepareUnbindedCell( this.GetColumn( fieldName ), cell );
-        cell.Arrange( new Rect( 0, 0, 0, 0 ) );
-        cell.ClearValue( Cell.VisibilityProperty );
-        m_bindedCells.Add( fieldName, cell );
-      }
-
-      m_unprocessedCells.Clear();
-    }
-
-    internal void VirtualizeRecycledCells()
-    {
-      if( m_recyclingBins == null )
-        return;
-
-      foreach( LinkedList<Cell> recycleBin in m_recyclingBins.Values )
-      {
-        foreach( Cell cell in recycleBin )
-        {
-          if( !m_unbindedCells.ContainsKey( cell.FieldName ) )
-          {
-            m_unbindedCells.Add( cell.FieldName, cell );
-            continue;
-          }
-
-          Debug.Fail( "Why is there a cell with the same fieldname already present in the unbindedCells?" );
-          this.InternalRemoveCore( cell );
-        }
-        recycleBin.Clear();
-      }
-
-      m_recyclingBins.Clear();
-      m_recyclingBins = null;
-    }
-
-    internal void SynchronizeRecyclingBinsWithRecyclingGroups( IEnumerable<ColumnBase> visibleColumns )
-    {
-      if( m_recyclingBins == null )
-        return;
-
-      //Get the recycling groups of visible columns only
-      var recyclingGroups = new List<object>();
-      foreach( ColumnBase column in visibleColumns )
-      {
-        var recyclingGroup = this.GetRecyclingGroup( column );
-        if( !recyclingGroups.Contains( recyclingGroup ) )
-        {
-          recyclingGroups.Add( recyclingGroup );
-        }
-      }
-
-      //Clear cells and remove recycleBins not linked to a currently used recyclingGroup.
-      var unusedRecyclingGroups = new List<object>();
-      foreach( KeyValuePair<object, LinkedList<Cell>> item in m_recyclingBins )
-      {
-        var recyclingGroup = item.Key;
-        if( recyclingGroups.Contains( recyclingGroup ) )
-          continue;
-
-        unusedRecyclingGroups.Add( recyclingGroup );
-        var recycleBin = item.Value;
-        foreach( Cell cell in recycleBin )
-        {
-          this.InternalRemoveCore( cell );
-        }
-        recycleBin.Clear();
-      }
-
-      foreach( object recyclingGroup in unusedRecyclingGroups )
-      {
-        m_recyclingBins.Remove( recyclingGroup );
-      }
-    }
-
-    private bool CanBeRemoved( Cell cell )
-    {
-      // Calling this method assumes it is for cells that are handled by the FixedCellPanel, which does not handle template cells,
-      // thus no need to check if it is one through Row.GetIsTemplateCell( cell ).
-      return ( cell.CanBeRecycled ) && ( cell.CanBeCollapsed );
-    }
-
-    private void ReleaseCore( Cell cell )
-    {
-      Debug.Assert( !VirtualizingCellCollection.IsFreeCell( cell ), "Should always have a field name" );
-
-      m_bindedCells.Remove( cell.FieldName );
-
-      switch( this.VirtualizationMode )
-      {
-        case ColumnVirtualizationMode.None:
-          {
-            //Not virtualizing
-            this.InternalRemoveCore( cell );
-            break;
-          }
-
-        case ColumnVirtualizationMode.Recycling:
-          {
-            // If recycling, put the cell into the appropriate recycle bin.
-            var recyclingGroup = this.GetRecyclingGroup( this.GetColumn( cell ) );
-            var recycleBin = this.GetRecycleBinOrNew( recyclingGroup );
-
-            // A released cell shouldn't be in the recycle bin already.
-            Debug.Assert( !recycleBin.Contains( cell ) );
-            recycleBin.Add( cell );
-            break;
-          }
-
-        case ColumnVirtualizationMode.Virtualizing:
-          {
-            //Virtualizing with no recycling
-            m_unbindedCells.Add( cell.FieldName, cell );
-            break;
-          }
-      }
-    }
-
-    private void InternalAddCore( Cell cell )
-    {
-      //This method should be invoked only to add cells provided by the user through Row.Cells, in xaml for instance.
-      //For template cells, an other mechanism is used (See Row.OnApplyTemplate()).
-      Debug.Assert( cell != null );
-
-      //If a cell is provided in code behind, the user must provide a fieldname, and therefore it can be merged right away.
-      if( m_freeCellsHaveBeenMerged )
-      {
-        this.MergeFreeCell( cell, this.DataGridContext, this.Columns );
-        return;
-      }
-
-      if( m_freeCells == null )
-      {
-        m_freeCells = new List<Cell>( 1 );
-      }
-
-      m_freeCells.Add( cell );
-      m_cells.Add( cell );
-    }
-
-    private void InternalRemoveCore( Cell cell, bool unbind = false )
-    {
-      Debug.Assert( !VirtualizingCellCollection.IsFreeCell( cell ), "Should always have a field name" );
-
-      if( unbind )
-      {
-        m_bindedCells.Remove( cell.FieldName );
-      }
-
-      m_cells.Remove( cell );
-      m_parentRow.RemoveFromVisualTree( cell );
-
-      //This must absolutely be done once every collection has removed the cell, for the ParentColumn will be set to null, thus the FieldName will be lost.
-      cell.CleanUpOnRemove();
-    }
-
-    private Cell CreateOrRecoverCell( string fieldName )
-    {
-      return this.CreateOrRecoverCell( this.GetColumn( fieldName ), this.DataGridContext );
-    }
-
-    private Cell CreateOrRecoverCell( ColumnBase column, DataGridContext dataGridContext )
-    {
-      Cell cell;
-      if( !this.TryRecoverCell( column, out cell, true ) )
-      {
-        // Create a new cell if a suitable cell was not found.
-        cell = m_parentRow.ProvideCell( column );
-        Debug.Assert( cell != null );
-
-        //Add the new cell to the CellSet
-        m_cells.Add( cell );
-      }
-      else
-      {
-        //The current local value must be cleared instead of setting a new local value to give a chance for a style to set a value.
-        cell.ClearValue( Cell.VisibilityProperty );
-      }
-
-      // Make sure the cell is initialized and prepared to be used.
-      this.PrepareCell( cell, column, dataGridContext );
-
-      //Once the fieldname is updated, add it to the dictionary
-      m_bindedCells.Add( cell.FieldName, cell );
-
-      //Need to notify only when cells are not already binded, since the binded cells will get properly measured and arranged by the Virtualizing/FixedCellSubPanel(s).
-      if( !this.IsUpdating )
-      {
-        this.NotifyCollectionChanged();
-      }
-
-      return cell;
-    }
-
-    private void PrepareCell( Cell cell, ColumnBase column, DataGridContext dataGridContext )
-    {
-      //context can be null when the DataGridCollectionView directly has a list of Xceed.Wpf.DataGrid.DataRow
-      if( ( cell == null ) || ( dataGridContext == null ) )
-        return;
-
-      // Initialize the cell in case it hasn't been initialized or in case of a column change.
-      cell.Initialize( dataGridContext, m_parentRow, column );
-
-      // Certain non recycling cells like StatCell must not be (re)prepared if their binding is not set, for performance reasons.
-      if( cell.HasAliveContentBinding )
-      {
-        // Make sure the cell is prepared before leaving this method.
-        cell.PrepareContainer( dataGridContext, m_parentRow.DataContext );
-      }
-    }
-
-    private bool TryRecoverCell( ColumnBase column, out Cell cell, bool includeUnprocessedCells )
-    {
-      cell = null;
-
-      if( column == null )
-        return false;
-
-      switch( this.VirtualizationMode )
-      {
-        case ColumnVirtualizationMode.Recycling:
-          {
-            return this.TryGetRecycledCell( column, out cell );
-          }
-
-        case ColumnVirtualizationMode.Virtualizing:
-          {
-            //When not recycling, get the cell already created for the required column.
-            if( ( m_unbindedCells.Count > 0 ) && ( m_unbindedCells.TryGetValue( column.FieldName, out cell ) ) )
-            {
-              m_unbindedCells.Remove( column.FieldName );
-              return true;
-            }
-
-            //It may still be unprocessed (provided in xaml), so process it now.
-            if( ( m_unprocessedCells.Count > 0 ) && ( includeUnprocessedCells ) && ( m_unprocessedCells.TryGetValue( column.FieldName, out cell ) ) )
-            {
-              m_unprocessedCells.Remove( column.FieldName );
-              cell = m_parentRow.PrepareUnbindedCell( column, cell );
-              return true;
-            }
-
-            return false;
-          }
-
-        default:
-          {
-            //Not virtualizing
-            return false;
-          }
-      }
-    }
-
-    private bool TryGetRecycledCell( ColumnBase column, out Cell cell )
-    {
-      cell = null;
-
-      if( m_recyclingBins == null )
-        return false;
-
-      // Make sure the cell recycling group is up-to-date.
-      var dataGridContext = this.DataGridContext;
-      if( dataGridContext != null )
-      {
-        var propertyDescription = ItemsSourceHelper.CreateOrGetPropertyDescriptionFromColumn( dataGridContext, column, null );
-        ItemsSourceHelper.UpdateColumnFromPropertyDescription( column, dataGridContext.DataGridControl.DefaultCellEditors, dataGridContext.AutoCreateForeignKeyConfigurations, propertyDescription );
-      }
-
-      var recyclingGroup = this.GetRecyclingGroup( column );
-      var recycleBin = default( LinkedList<Cell> );
-
-      if( m_recyclingBins.TryGetValue( recyclingGroup, out recycleBin ) )
-      {
-        // Try to recycle a cell that has already the appropriate column in order to minimize the cell's initialization time.
-        var targetNode = default( LinkedListNode<Cell> );
-
-        for( var node = recycleBin.Last; node != null; node = node.Previous )
-        {
-          targetNode = node;
-
-          if( targetNode.Value.ParentColumn == column )
-            break;
-        }
-
-        // From here, the target node is either:
-        //   1. The cell with minimal initialization time.
-        //   2. The oldest cell.
-        //   3. null in case of an empty bin.
-        if( targetNode != null )
-        {
-          cell = targetNode.Value;
-          recycleBin.Remove( targetNode );
-        }
-      }
-
-      return ( cell != null );
-    }
-
-    private void MergeFreeCell( Cell cell, DataGridContext dataGridContext, ColumnCollection columns )
-    {
-      var fieldName = cell.FieldName;
-
-      // Make sure the field name is valid and there is no other cell using it.
-      this.CheckCellFieldName( fieldName );
-      this.CheckCellAlreadyExists( fieldName );
-
-      // Cells added in xaml (e.g a StatCell) must be added to the visual tree right away, even if they are not visible for the moment,
-      // to make sure any binding defined on a property works correctly.
-      m_parentRow.AddToVisualTree( cell );
-
-      //These cell will need further processing when not recycling before they can be used as BindedCells.
-      if( this.VirtualizationMode == ColumnVirtualizationMode.Virtualizing )
-      {
-        m_unprocessedCells.Add( fieldName, cell );
-        return;
-      }
-
-      //This following calls will be done for unprocessedCells when actually using them.
-      cell.PrepareDefaultStyleKey( dataGridContext.DataGridControl.GetView() );
-
-      //It is possible a cell provided through Row.Cells does not correspond to any actual column in the grid, so do not prepare it.
-      var parentColumn = columns[ cell.FieldName ];
-      if( parentColumn != null )
-      {
-        cell.Initialize( dataGridContext, m_parentRow, parentColumn );
-        cell.PrepareContainer( dataGridContext, m_parentRow.DataContext );
-      }
-
-      m_bindedCells.Add( fieldName, cell );
-    }
-
-    private ColumnBase GetColumn( Cell cell )
-    {
-      if( cell == null )
-        return null;
-
-      var column = cell.ParentColumn;
-      if( column == null )
-      {
-        column = this.GetColumn( cell.FieldName );
-      }
-
-      return column;
-    }
-
-    private ColumnBase GetColumn( string fieldName )
-    {
-      if( ( this.Columns == null ) || ( string.IsNullOrEmpty( fieldName ) ) )
-        return null;
-
-      return this.Columns[ fieldName ];
-    }
-
-    private object GetRecyclingGroup( ColumnBase column )
-    {
-      return column.GetCellRecyclingGroupOrDefault();
-    }
-
-    private ICollection<Cell> GetRecycleBinOrNew( object recyclingGroup )
-    {
-      if( m_recyclingBins == null )
-      {
-        m_recyclingBins = new Dictionary<object, LinkedList<Cell>>();
-      }
-
-      LinkedList<Cell> recycleBin;
-
-      if( !m_recyclingBins.TryGetValue( recyclingGroup, out recycleBin ) )
-      {
-        recycleBin = new LinkedList<Cell>();
-        m_recyclingBins.Add( recyclingGroup, recycleBin );
-      }
-
-      return recycleBin;
-    }
-
-    private void ClearRecycleBins()
-    {
-      foreach( LinkedList<Cell> recycleBin in m_recyclingBins.Values )
-      {
-        foreach( Cell cell in recycleBin )
-        {
-          this.InternalRemoveCore( cell );
-        }
-        recycleBin.Clear();
-      }
-
-      m_recyclingBins.Clear();
-      m_recyclingBins = null;
-    }
-
-    private void CheckFieldName( string fieldName )
-    {
-      if( string.IsNullOrEmpty( fieldName ) )
-        throw new DataGridInternalException( "A field name is required.", this.DataGridContext.DataGridControl );
-    }
-
-    private void CheckCellFieldName( string fieldName )
-    {
-      if( string.IsNullOrEmpty( fieldName ) )
-        throw new DataGridInternalException( "A Cell should always have a FieldName.", this.DataGridContext.DataGridControl );
-    }
-
-    private void CheckCellAlreadyExists( string fieldName )
-    {
-      var alreadyExists = false;
-
-      if( this.VirtualizationMode == ColumnVirtualizationMode.Virtualizing )
-      {
-        alreadyExists = m_unprocessedCells.ContainsKey( fieldName );
-
-        if( !alreadyExists )
-        {
-          alreadyExists = m_unbindedCells.ContainsKey( fieldName );
-        }
-      }
-
-      if( !alreadyExists )
-      {
-        alreadyExists = m_bindedCells.ContainsKey( fieldName );
-      }
-
-      if( alreadyExists )
-      {
-        this.ThrowCellAlreadyExists( fieldName );
-      }
-    }
-
-    private void ThrowCellAlreadyExists( string fieldName )
-    {
-      throw new DataGridInternalException( string.Format( "A cell with FieldName {0} already exists.", fieldName ), this.DataGridContext.DataGridControl );
-    }
-
-    private static bool IsFreeCell( Cell cell )
-    {
-      Debug.Assert( cell != null );
-
-      return string.IsNullOrEmpty( cell.FieldName );
-    }
-
-    private readonly Row m_parentRow;
-    private readonly ICollection<Cell> m_cells;
-
-    // This Dictionary is used as a caching system to optimize lookup when virtualizing instead of parsing every columns looking for the fieldname,
-    // e.g.: looking for the last one when 1000 cells in the parent row. When virtualizing, only the cell visible in the viewport will be contained
-    // within this collection speeding the lookup.
-    private readonly Dictionary<string, Cell> m_bindedCells = new Dictionary<string, Cell>();
-
-    //This Dictionary is used in combinations with m_bindedCells when virtualizing without recycling. It contains cells assigned to a column, but not currently in view.
-    private readonly Dictionary<string, Cell> m_unbindedCells = new Dictionary<string, Cell>();
-
-    //This Dictionary is used to temporarily store FreeCells until they are correctly prepared and added to the designated dictionnary (binded or unbinded cells)
-    private readonly Dictionary<string, Cell> m_unprocessedCells = new Dictionary<string, Cell>();
-
-    // This Dictionary contains the recycling queues for the cells ready to be recycled.
-    private Dictionary<object, LinkedList<Cell>> m_recyclingBins; //null
-
-    // This collection is used to store cells that are added to the Collection before the FieldName and/or ParentColumn being set.
-    // This occurs when defining a Row with Cell in XAML during a BeginInit / EndInit.
-    private List<Cell> m_freeCells; //null
-    private bool m_freeCellsHaveBeenMerged = false;
-
-    #region VirtualizingCellCollectionEnumerator Nested Type
-
-    private class VirtualizingCellCollectionEnumerator : IEnumerator<Cell>, IEnumerator
-    {
-      internal VirtualizingCellCollectionEnumerator( VirtualizingCellCollection collection )
-      {
-        if( collection == null )
-          throw new ArgumentNullException( "collection" );
-
-        m_collection = collection;
-
-        this.Reset();
-      }
-
-      public Cell Current
-      {
-        get
-        {
-          return m_current;
-        }
-      }
-
-      object IEnumerator.Current
-      {
-        get
-        {
-          return this.Current;
-        }
-      }
-
-      public bool MoveNext()
-      {
-        if( m_collection == null )
-          throw new ObjectDisposedException( string.Empty );
-
-        var count = m_collection.Count;
-        m_index = Math.Min( m_index + 1, count );
-
-        if( m_index < count )
-        {
-          m_current = m_collection[ m_index ];
-        }
-        else
-        {
-          m_current = null;
-        }
-
-        return ( m_current != null );
-      }
-
-      public void Reset()
-      {
-        m_index = -1;
-        m_current = null;
-      }
-
-      void IDisposable.Dispose()
-      {
-        m_collection = null;
-        m_current = null;
-      }
-
-      private VirtualizingCellCollection m_collection;
-      private int m_index;
-      private Cell m_current; // = null;
-    }
-
-    #endregion
-
-    #region VirtualizingItemsList Nested Type
-
-    // This class is used to force the Collection<T>.Items.Count to return the total number of columns. Every other method except this[index] are not supported 
-    private class VirtualizingItemsList : IList<Cell>
-    {
-      internal VirtualizingItemsList()
-      {
-      }
-
-      internal void SetParent( VirtualizingCellCollection collection )
-      {
-        if( collection == null )
-          throw new ArgumentNullException( "collection" );
-
-        if( m_collection != null )
-          throw new InvalidOperationException();
-
-        m_collection = collection;
-      }
-
-      int ICollection<Cell>.Count
-      {
-        get
-        {
-          ColumnCollection columns = this.Columns;
-          if( columns != null )
-            return columns.Count;
-
-          return 0;
-        }
-      }
-
-      bool ICollection<Cell>.IsReadOnly
-      {
-        get
-        {
-          return false;
-        }
-      }
-
-      Cell IList<Cell>.this[ int index ]
-      {
-        get
-        {
-          var cell = default( Cell );
-          var columns = this.Columns;
-
-          if( columns != null )
-          {
-            var column = columns[ index ];
-
-            if( column != null )
-            {
-              cell = m_collection[ column ];
-            }
-          }
-          else
-          {
-            Debug.Fail( "An unprepared Row was asked for Cell" );
-          }
-
-          return cell;
-        }
-        set
-        {
-          throw new NotSupportedException();
-        }
-      }
-
-      private ColumnCollection Columns
-      {
-        get
-        {
-          if( m_collection == null )
-            return null;
-
-          return m_collection.Columns;
-        }
-      }
-
-      int IList<Cell>.IndexOf( Cell item )
-      {
-        if( item == null )
-          return -1;
-
-        var columns = this.Columns;
-
-        if( columns == null )
-          return -1;
-
-        string fieldName = item.FieldName;
-        var column = columns[ fieldName ];
-
-        if( column == null )
-          return -1;
-
-        return columns.IndexOf( column );
-      }
-
-      void IList<Cell>.Insert( int index, Cell item )
-      {
-        throw new NotSupportedException();
-      }
-
-      void IList<Cell>.RemoveAt( int index )
-      {
-        throw new NotSupportedException();
-      }
-
-      void ICollection<Cell>.Add( Cell item )
-      {
-        throw new NotSupportedException();
-      }
-
-      void ICollection<Cell>.Clear()
-      {
-        throw new NotSupportedException();
-      }
-
-      bool ICollection<Cell>.Contains( Cell item )
-      {
-        if( item == null )
-          return false;
-
-        string fieldName = item.FieldName;
-        var columns = this.Columns;
-
-        if( columns != null )
-          return ( columns[ fieldName ] != null );
-
-        Debug.Fail( "An unprepared Row was asked for Cell" );
-
-        return false;
-      }
-
-      void ICollection<Cell>.CopyTo( Cell[] array, int arrayIndex )
-      {
-        throw new NotSupportedException();
-      }
-
-      bool ICollection<Cell>.Remove( Cell item )
-      {
-        throw new NotSupportedException();
-      }
-
-      IEnumerator<Cell> IEnumerable<Cell>.GetEnumerator()
-      {
-        return new VirtualizingCellCollectionEnumerator( m_collection );
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return new VirtualizingCellCollectionEnumerator( m_collection );
-      }
-
-      private VirtualizingCellCollection m_collection;
-    }
-
-    #endregion
-
-    #region ReadOnlyCollection Nested Type
-
-    private sealed class ReadOnlyCollection<T> : ICollection<T>
-    {
-      internal ReadOnlyCollection( ICollection<T> collection )
-      {
-        if( collection == null )
-          throw new ArgumentNullException( "collection" );
-
-        m_collection = collection;
-      }
-
-      int ICollection<T>.Count
-      {
-        get
-        {
-          return m_collection.Count;
-        }
-      }
-
-      bool ICollection<T>.IsReadOnly
-      {
-        get
-        {
-          return true;
-        }
-      }
-
-      void ICollection<T>.Add( T item )
-      {
-        throw new NotSupportedException();
-      }
-
-      void ICollection<T>.Clear()
-      {
-        throw new NotSupportedException();
-      }
-
-      bool ICollection<T>.Contains( T item )
-      {
-        return m_collection.Contains( item );
-      }
-
-      void ICollection<T>.CopyTo( T[] array, int arrayIndex )
-      {
-        m_collection.CopyTo( array, arrayIndex );
-      }
-
-      bool ICollection<T>.Remove( T item )
-      {
-        throw new NotSupportedException();
-      }
-
-      IEnumerator<T> IEnumerable<T>.GetEnumerator()
-      {
-        return m_collection.GetEnumerator();
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return m_collection.GetEnumerator();
-      }
-
-      private readonly ICollection<T> m_collection;
-    }
-
-    #endregion
-
-    #region CellSet Nested Type
-
-    private sealed class CellSet : ICollection<Cell>, IWeakEventListener
-    {
-      internal CellSet( Row parentRow )
-      {
-        Debug.Assert( parentRow != null );
-
-        m_parentRow = parentRow;
-      }
-
-      public int Count
-      {
-        get
-        {
-          return m_collection.Count;
-        }
-      }
-
-      bool ICollection<Cell>.IsReadOnly
-      {
-        get
-        {
-          return false;
-        }
-      }
-
-      public bool Contains( Cell item )
-      {
-        return m_collection.Contains( item );
-      }
-
-      public void Add( Cell item )
-      {
-        Debug.Assert( item != null );
-
-        m_collection.Add( item );
-
-        this.RegisterBringIntoView( item );
-      }
-
-      public bool Remove( Cell item )
-      {
-        Debug.Assert( item != null );
-
-        if( !m_collection.Remove( item ) )
-          return false;
-
-        this.UnregisterBringIntoView( item );
-
-        return true;
-      }
-
-      public void Clear()
-      {
-        foreach( var item in m_collection )
-        {
-          this.UnregisterBringIntoView( item );
-        }
-
-        m_collection.Clear();
-        m_collection.TrimExcess();
-      }
-
-      private void RegisterBringIntoView( Cell item )
-      {
-        RequestBringIntoViewWeakEventManager.AddListener( item, this );
-      }
-
-      private void UnregisterBringIntoView( Cell item )
-      {
-        RequestBringIntoViewWeakEventManager.RemoveListener( item, this );
-      }
-
-      private void OnRequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-      {
-        if( e.Handled )
-          return;
-
-        var targetCell = ( Cell )sender;
-        Debug.Assert( targetCell != null );
-        Debug.Assert( m_collection.Contains( targetCell ) );
-
-        if( ( targetCell != e.TargetObject ) && !targetCell.IsAncestorOf( e.TargetObject ) )
-          return;
-
-        // Do not process the bring into view for a templated cell.
-        if( Row.GetIsTemplateCell( targetCell ) )
-          return;
-
-        var targetRow = targetCell.ParentRow;
-        Debug.Assert( ( targetRow == null ) || ( targetRow == m_parentRow ) );
-
-        var targetHost = ( targetRow != null ) ? targetRow.CellsHostPanel as IVirtualizingCellsHost : null;
-
-        e.Handled = ( targetHost != null )
-                 && ( targetHost.BringIntoView( targetCell, e ) );
-      }
-
-      void ICollection<Cell>.CopyTo( Cell[] array, int arrayIndex )
-      {
-        m_collection.CopyTo( array, arrayIndex );
-      }
-
-      IEnumerator<Cell> IEnumerable<Cell>.GetEnumerator()
-      {
-        return m_collection.GetEnumerator();
-      }
-
-      IEnumerator IEnumerable.GetEnumerator()
-      {
-        return m_collection.GetEnumerator();
-      }
-
-      bool IWeakEventListener.ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-      {
-        if( managerType == typeof( RequestBringIntoViewWeakEventManager ) )
-        {
-          this.OnRequestBringIntoView( sender, ( RequestBringIntoViewEventArgs )e );
-          return true;
-        }
-
-        return false;
-      }
-
-      private readonly HashSet<Cell> m_collection = new HashSet<Cell>();
-      private readonly Row m_parentRow;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingStackPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingStackPanel.cs
deleted file mode 100644
index 406cff4a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingStackPanel.cs
+++ /dev/null
@@ -1,2103 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Utils.Wpf;
-using System.Collections.Generic;
-
-namespace Xceed.Wpf.DataGrid
-{
-  [Obsolete( "The VirtualizingStackPanel class is obsolete and has been replaced by the TableViewItemsHost class.", false )]
-  public sealed class VirtualizingStackPanel : DataGridVirtualizingPanel, ICustomVirtualizingPanel, IScrollInfo, IDeferableScrollInfoRefresh
-  {
-    private const int CleanupThreshold = 100; //100 ms max cleanup time.
-
-    public VirtualizingStackPanel()
-    {
-      this.AddHandler( FrameworkElement.RequestBringIntoViewEvent, new RequestBringIntoViewEventHandler( OnRequestBringIntoView ) );
-    }
-
-    #region Orientation Property
-
-    public static readonly DependencyProperty OrientationProperty =
-        DependencyProperty.Register( "Orientation", typeof( Orientation ), typeof( VirtualizingStackPanel ), new UIPropertyMetadata( Orientation.Vertical ) );
-
-    public Orientation Orientation
-    {
-      get
-      {
-        return ( Orientation )this.GetValue( VirtualizingStackPanel.OrientationProperty );
-      }
-      set
-      {
-        this.SetValue( VirtualizingStackPanel.OrientationProperty, value );
-      }
-    }
-
-    #endregion Orientation Property
-
-    #region StableScrollingEnabled Property
-
-    public static readonly DependencyProperty StableScrollingEnabledProperty =
-        DependencyProperty.Register( "StableScrollingEnabled", typeof( bool ), typeof( VirtualizingStackPanel ), new UIPropertyMetadata( true ) );
-
-    public bool StableScrollingEnabled
-    {
-      get
-      {
-        return ( bool )this.GetValue( VirtualizingStackPanel.StableScrollingEnabledProperty );
-      }
-      set
-      {
-        this.SetValue( VirtualizingStackPanel.StableScrollingEnabledProperty, value );
-      }
-    }
-
-    #endregion StableScrollingEnabled Property
-
-    #region StableScrollingProportion Property
-
-    public static readonly DependencyProperty StableScrollingProportionProperty =
-        DependencyProperty.Register( "StableScrollingProportion", typeof( double ), typeof( VirtualizingStackPanel ), new UIPropertyMetadata( 0.5d ) );
-
-    public double StableScrollingProportion
-    {
-      get
-      {
-        return ( double )this.GetValue( VirtualizingStackPanel.StableScrollingProportionProperty );
-      }
-      set
-      {
-        this.SetValue( VirtualizingStackPanel.StableScrollingProportionProperty, value );
-      }
-    }
-
-    #endregion StableScrollingProportion Property
-
-    #region UsedSurface Property
-
-    private static readonly DependencyProperty UsedSurfaceProperty =
-        DependencyProperty.Register( "UsedSurface", typeof( Rect ), typeof( VirtualizingStackPanel ), new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    private Rect UsedSurface
-    {
-      get
-      {
-        return ( Rect )this.GetValue( VirtualizingStackPanel.UsedSurfaceProperty );
-      }
-      set
-      {
-        this.SetValue( VirtualizingStackPanel.UsedSurfaceProperty, value );
-      }
-    }
-
-    #endregion UsedSurface Property
-
-    #region ContentBorderBrush Property
-
-    public static readonly DependencyProperty ContentBorderBrushProperty =
-        DependencyProperty.Register( "ContentBorderBrush", typeof( Brush ), typeof( VirtualizingStackPanel ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush ContentBorderBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( VirtualizingStackPanel.ContentBorderBrushProperty );
-      }
-      set
-      {
-        this.SetValue( VirtualizingStackPanel.ContentBorderBrushProperty, value );
-      }
-    }
-
-    #endregion ContentBorderBrush Property
-
-    #region ContentBorderThickness Property
-
-    public static readonly DependencyProperty ContentBorderThicknessProperty =
-        DependencyProperty.Register( "ContentBorderThickness", typeof( Thickness ), typeof( VirtualizingStackPanel ), new FrameworkPropertyMetadata( DefaultThickness, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.AffectsArrange ) );
-
-    public Thickness ContentBorderThickness
-    {
-      get
-      {
-        return ( Thickness )this.GetValue( VirtualizingStackPanel.ContentBorderThicknessProperty );
-      }
-      set
-      {
-        this.SetValue( VirtualizingStackPanel.ContentBorderThicknessProperty, value );
-      }
-    }
-
-    #endregion ContentBorderThickness Property
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      UIElementCollection children = this.Children;
-      IItemContainerGenerator generator = this.CustomItemContainerGenerator;
-      Orientation orientation = this.Orientation;
-      GeneratorPosition firstItemGenPos;
-
-      if( generator == null )
-      {
-        // In design mode, there won't be any CustomItemContainerGenerator to work with 
-        // when editing the style of VirtualizingStackPanel but, strangely, 
-        // GetIsInDesignMode can return false.
-        Debug.WriteLineIf( !DesignerProperties.GetIsInDesignMode( this ), "Missing generator in VirtualizingStackPanel.ArrangeOverride()" );
-        firstItemGenPos = new GeneratorPosition( 0, 0 );
-      }
-      else
-      {
-        //retrieve the Generator position for the first visible item
-        firstItemGenPos = generator.GeneratorPositionFromIndex( ( int )( ( orientation == Orientation.Vertical ) ? this.VerticalOffset : this.HorizontalOffset ) );
-      }
-
-      //from that generator position, the Index is the child index in the children collection.
-
-      Point offset = new Point();
-      Rect itemRect = new Rect();
-
-      Point bottomRight = new Point();
-      Point topLeft = new Point();
-
-      double compensationOffset;
-      double compensationSize;
-      double compensationItemSize;
-
-      //place the "opposed" direction's offset to the initial offset.
-      if( orientation == Orientation.Vertical )
-      {
-        // ****************************************
-        // The Starting offset is set to 0.05 so that layout is not "perfectly" aligned with start of panel.
-        // This is because a perfect layout sometimes cause glitches in the keyboard navigation for items of a different layout.
-        //****************************************
-        if( this.VerticalOffset != 0 )
-        {
-          offset.Y = 0.05;
-        }
-        else
-        {
-          offset.Y = this.ContentBorderThickness.Top;
-        }
-
-        if( this.HorizontalOffset != 0 )
-        {
-          offset.X = -this.HorizontalOffset;
-        }
-        else
-        {
-          offset.X = this.ContentBorderThickness.Left;
-        }
-
-        //set the "starting" endpoint for the ContentBorder to the extent coordinates.
-        //for this case, I cannot rely on the ExtentHeight for the bottomRight.Y
-        bottomRight.X = this.ExtentWidth;
-
-        compensationOffset = this.HorizontalOffset;
-      }
-      else
-      {
-        //****************************************
-        // The Starting offset is set to 0.05 so that layout is not "perfectly" aligned with start of panel.
-        // This is because a perfect layout sometimes cause glitches in the keyboard navigation for items of a different layout.
-        //****************************************
-        if( this.HorizontalOffset != 0 )
-        {
-          offset.X = 0.05;
-        }
-        else
-        {
-          offset.X = this.ContentBorderThickness.Left;
-        }
-
-        if( this.VerticalOffset != 0 )
-        {
-          offset.Y = -this.VerticalOffset;
-        }
-        else
-        {
-          offset.Y = this.ContentBorderThickness.Top;
-        }
-
-        //set the "starting" endpoint for the ContentBorder to the extent coordinates.
-        //for this case, I cannot rely on the ExtentHeight for the bottomRight.X
-        bottomRight.Y = this.ExtentHeight;
-
-        compensationOffset = this.VerticalOffset;
-      }
-
-      bool limitInSize = false;
-
-
-      //cycle through all the children, starting from that one
-      for( int i = firstItemGenPos.Index; i < children.Count; i++ )
-      {
-        if( i >= 0 )
-        {
-          UIElement item = children[ i ];
-          DataGridContext itemContext = DataGridControl.GetDataGridContext( item );
-          string itemContextName = ( itemContext.SourceDetailConfiguration == null ) ? "" : itemContext.SourceDetailConfiguration.RelationName;
-
-          itemRect.X = offset.X;
-          itemRect.Y = offset.Y;
-
-          if( orientation == Orientation.Vertical )
-          {
-            compensationItemSize = this.GetCorrectedItemWidth( itemContextName, finalSize );
-
-            itemRect.Width = compensationItemSize;
-            compensationSize = Math.Min( this.ViewportWidth, compensationItemSize );
-
-            itemRect.Height = item.DesiredSize.Height;
-
-            offset.Y += itemRect.Height;
-
-            //Update the SurfaceRect with the coordinates of item just placed.
-            bottomRight.Y = itemRect.Bottom;
-            if( itemRect.Right > bottomRight.X )
-            {
-              bottomRight.X = itemRect.Right;
-            }
-          }
-          else
-          {
-            itemRect.Width = item.DesiredSize.Width;
-
-            compensationItemSize = this.GetCorrectedItemHeight( itemContextName, finalSize );
-
-            itemRect.Height = compensationItemSize;
-            compensationSize = Math.Min( this.ViewportHeight, compensationItemSize );
-
-            itemRect.Height = Math.Max( m_extent.Height, item.DesiredSize.Height );
-
-            offset.X += itemRect.Width;
-
-            //Update the SurfaceRect with the coordinates of item just placed.
-            bottomRight.X = itemRect.Right;
-            if( itemRect.Bottom > bottomRight.Y )
-            {
-              bottomRight.Y = itemRect.Bottom;
-            }
-          }
-
-          TableView.SetCompensationOffset( item, Math.Max( 0, ( ( compensationOffset + compensationSize ) - compensationItemSize ) ) );
-          item.Arrange( itemRect );
-        }
-      }
-
-      //reset the "opposed" direction's offset to the initial offset.
-      if( orientation == Orientation.Vertical )
-      {
-        //****************************************
-        // The Starting offset is set to 0.05 so that layout is not "perfectly" aligned with start of panel.
-        // This is because a perfect layout sometimes cause glitches in the keyboard navigation for items of a different layout.
-        //****************************************
-        if( this.VerticalOffset != 0 )
-        {
-          offset.Y = 0.05;
-        }
-        else
-        {
-          offset.Y = this.ContentBorderThickness.Top;
-        }
-
-        if( this.HorizontalOffset != 0 )
-        {
-          offset.X = -this.HorizontalOffset;
-        }
-        else
-        {
-          offset.X = this.ContentBorderThickness.Left;
-        }
-
-        topLeft.X = offset.X;
-      }
-      else
-      {
-        //****************************************
-        // The Starting offset is set to 0.05 so that layout is not "perfectly" aligned with start of panel.
-        // This is because a perfect layout sometimes cause glitches in the keyboard navigation for items of a different layout.
-        //****************************************
-        if( this.HorizontalOffset != 0 )
-        {
-          offset.X = 0.05;
-        }
-        else
-        {
-          offset.X = this.ContentBorderThickness.Left;
-        }
-
-        if( this.VerticalOffset != 0 )
-        {
-          offset.Y = -this.VerticalOffset;
-        }
-        else
-        {
-          offset.Y = this.ContentBorderThickness.Top;
-        }
-
-        topLeft.Y = offset.Y;
-      }
-
-      //cycle through all the items "prior" the first visible and place them before the first one
-      for( int i = firstItemGenPos.Index - 1; i >= 0; i-- )
-      {
-        UIElement item = children[ i ];
-        DataGridContext itemContext = DataGridControl.GetDataGridContext( item );
-        string itemContextName = ( itemContext.SourceDetailConfiguration == null ) ? "" : itemContext.SourceDetailConfiguration.RelationName;
-
-        limitInSize = ( itemContext.ParentDataGridContext != null );
-
-        if( orientation == Orientation.Vertical )
-        {
-          compensationItemSize = this.GetCorrectedItemWidth( itemContextName, finalSize );
-
-          itemRect.Width = compensationItemSize;
-          compensationSize = Math.Min( this.ViewportWidth, compensationItemSize );
-
-          itemRect.Height = item.DesiredSize.Height;
-
-          offset.Y -= itemRect.Height;
-
-          //Update the SurfaceRect with the coordinates of item just placed.
-          topLeft.Y = offset.Y;
-        }
-        else
-        {
-          itemRect.Width = item.DesiredSize.Width;
-
-          compensationItemSize = this.GetCorrectedItemHeight( itemContextName, finalSize );
-
-          itemRect.Height = compensationItemSize;
-          compensationSize = Math.Min( this.ViewportHeight, compensationItemSize );
-
-          offset.X -= itemRect.Width;
-
-          //Update the SurfaceRect with the coordinates of item just placed.
-          topLeft.X = itemRect.X;
-        }
-
-        itemRect.X = offset.X;
-        itemRect.Y = offset.Y;
-
-        TableView.SetCompensationOffset( item, Math.Max( 0, ( ( compensationOffset + compensationSize ) - compensationItemSize ) ) );
-        item.Arrange( itemRect );
-
-      }
-
-      Rect surfaceRect = new Rect( topLeft, bottomRight );
-      if( this.UsedSurface != surfaceRect )
-      {
-        this.UsedSurface = surfaceRect;
-      }
-
-      return finalSize;
-
-    }
-
-    private double GetSynchronizedExtentWidth()
-    {
-      DataGridScrollViewer dgScrollViewer = m_owner as DataGridScrollViewer;
-      if( dgScrollViewer != null )
-      {
-        return dgScrollViewer.SynchronizedScrollViewersWidth;
-      }
-      return m_extent.Width;
-    }
-
-    private double GetCorrectedItemWidth( string itemContextName, Size arrangeSize )
-    {
-      double retval;
-
-      double synchronizedWidth = this.GetSynchronizedExtentWidth();
-      double extentWidth = Math.Max( synchronizedWidth, m_extent.Width );
-
-      bool foundContextName = m_desiredSizeDictionary.TryGetValue( itemContextName, out retval );
-
-      //if the itemContextName is not present in the desiredSizeDictionary
-      // OR
-      //if the desiredSize is real close to 0 
-      if( ( foundContextName == false ) || ( Xceed.Utils.Math.DoubleUtil.AreClose( retval, 0d ) == true ) )
-      {
-        //I take a look at the previous sizes dictionary.
-        if( m_previousSizeDictionary.TryGetValue( itemContextName, out retval ) == false )
-        {
-          //If the entry is not found in the previous sizes dictionary, then take the largest between the extentWidth or the arrangeSize.
-          retval = Math.Max( extentWidth, arrangeSize.Width );
-        }
-      }
-      else
-      {
-        //Now, if the itemContextName was found in the desiredSize dictionary AND it was larger than 0
-        //Store the value in the previousSizes dictionary
-        m_previousSizeDictionary[ itemContextName ] = retval;
-      }
-
-      if( string.IsNullOrEmpty( itemContextName ) == true ) // master level 
-      {
-        //for the master level, I want to consider the Synchronized Extent size as well.
-        retval = Math.Max( synchronizedWidth, retval );        
-      }
-
-      return retval;
-    }
-
-    private double GetSynchronizedExtentHeight()
-    {
-      DataGridScrollViewer dgScrollViewer = m_owner as DataGridScrollViewer;
-      if( dgScrollViewer != null )
-      {
-        return dgScrollViewer.SynchronizedScrollViewersHeight;
-      }
-      return m_extent.Height;
-    }
-
-    private double GetCorrectedItemHeight( string itemContextName, Size arrangeSize )
-    {
-      double retval;
-
-      double synchronizedHeight = this.GetSynchronizedExtentHeight();
-      double extentHeight = Math.Max( synchronizedHeight, m_extent.Height );
-
-      bool foundContextName = m_desiredSizeDictionary.TryGetValue( itemContextName, out retval );
-
-      //if the itemContextName is not present in the desiredSizeDictionary
-      // OR
-      //if the desiredSize is real close to 0 
-      if( ( foundContextName == false ) || ( Xceed.Utils.Math.DoubleUtil.AreClose( retval, 0d ) == true ) )
-      {
-        //I take a look at the previous sizes dictionary.
-        if( m_previousSizeDictionary.TryGetValue( itemContextName, out retval ) == false )
-        {
-          //If the entry is not found in the previous sizes dictionary, then take the largest between the extentWidth or the arrangeSize.
-          retval = Math.Max( extentHeight, arrangeSize.Height );
-        }
-      }
-      else
-      {
-        //Now, if the itemContextName was found in the desiredSize dictionary AND it was larger than 0
-        //Store the value in the previousSizes dictionary
-        m_previousSizeDictionary[ itemContextName ] = retval;
-      }
-
-      if( string.IsNullOrEmpty( itemContextName ) == true ) // master level 
-      {
-        //for the master level, I want to consider the Synchronized Extent size as well.
-        retval = Math.Max( synchronizedHeight, retval );
-      }
-
-      return retval;
-    }
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      UIElementCollection children = this.Children;
-      IItemContainerGenerator generator = this.CustomItemContainerGenerator;
-      List<int> calculatedAutoWidthContextLevels = new List<int>();
-
-      if( generator == null )
-      {
-        // In design mode, there won't be any CustomItemContainerGenerator to work with 
-        // when editing the style of VirtualizingStackPanel but, strangely, 
-        // GetIsInDesignMode can return false.
-        Debug.WriteLineIf( !DesignerProperties.GetIsInDesignMode( this ), "Missing generator in VirtualizingStackPanel.MeasureOverride()" );
-        return new Size( 20, 20 );
-      }
-
-      //clear the dictionary that holds the "maximum desired size" for the different DataGridContexts.
-      m_desiredSizeDictionary.Clear();
-
-      bool invalidateScrollInfo = false;
-
-      Orientation orientation = this.Orientation;
-
-      int numberItems = this.ItemCount;
-
-      //retrieve the index of the first item to layout
-      int firstVisibleIndex = ( int )( ( orientation == Orientation.Vertical ) ? this.VerticalOffset : this.HorizontalOffset );
-
-      // If the item offset is past the last item in the items list, then use the last item... (move the offset)
-      if( firstVisibleIndex >= numberItems )
-      {
-        firstVisibleIndex = Math.Max( 0, numberItems - 1 );
-
-        if( orientation == Orientation.Vertical )
-        {
-          m_offset.Y = firstVisibleIndex;
-        }
-        else
-        {
-          m_offset.X = firstVisibleIndex;
-        }
-      }
-
-      bool newlyRealized = false;
-      double actualSize = 0.0d;
-      Size desiredSize = new Size( 0, 0 );
-      Size restrictedMeasureSize;
-
-      // We need to set the viewPort width while calling MeasureOverride
-      // to be able to virtualize Columns
-      if( orientation == Orientation.Vertical )
-      {
-        restrictedMeasureSize = new Size( availableSize.Width, double.PositiveInfinity );
-        m_viewport.Width = availableSize.Width;
-      }
-      else
-      {
-        restrictedMeasureSize = new Size( double.PositiveInfinity, availableSize.Height );
-        m_viewport.Height = availableSize.Height;
-      }
-
-      //get the generator position for the first visible index
-      GeneratorPosition firstItemGeneratorPosition = generator.GeneratorPositionFromIndex( firstVisibleIndex );
-
-      // Get index where we would insert the child for this position. If the item is realized
-      // (position.Offset == 0), it's just position.Index, otherwise we have to add one to
-      // insert after the corresponding child
-      int childIndex = ( firstItemGeneratorPosition.Offset == 0 ) ? firstItemGeneratorPosition.Index : firstItemGeneratorPosition.Index + 1;
-      int itemsCount = 0;
-
-      //if the items collection for the ItemsControl is not empty!.
-      if( numberItems > 0 )
-      {
-        //this flag indicates if one item was placed but was only partially visible (or not at all)
-        bool busted = false;
-
-        using( generator.StartAt( firstItemGeneratorPosition, GeneratorDirection.Forward, true ) )
-        {
-          bool quitLoop = false;
-          DataGridContext dataGridContext;
-          // The rowDesiredSizeCalculated flag is necessary for ColumnStretchMode because
-          // the first row measurement will calculate and modify the columns ActualWidth.
-          // Consequently, this row will have the correct DesiredSize (using the correct
-          // ActualWidths). However, another Row in the same "measure pass" may not 
-          // consider the new ActualWidths immediately (due to UIElement.Measure 
-          // optimisation). With this flag, the first Row will be taking into account 
-          // when determining the largest opposed size, but the following realized Rows
-          // will be ignored. This will always work because all the rows have the same 
-          // opposed size (the same width when the orientation is vertical).
-          bool rowDesiredSizeCalculated = false;
-
-          do
-          {
-            //If we reached the end of the possible items
-            if( ( firstVisibleIndex + itemsCount ) >= numberItems )
-            {
-              //exit loop
-              quitLoop = true;
-            }
-            else
-            {
-              UIElement item = ( UIElement )generator.GenerateNext( out newlyRealized );
-
-              if( item == null )
-              {
-                quitLoop = true;
-              }
-              else
-              {
-
-                //if the items was just realized
-                if( newlyRealized == true )
-                {
-                  // Figure out if we need to insert the child at the end or somewhere in the middle
-                  if( childIndex >= children.Count )
-                  {
-                    base.AddInternalChild( item );
-                  }
-                  else
-                  {
-                    base.InsertInternalChild( childIndex, item );
-                  }
-
-                  //prepare the new item container
-                  generator.PrepareItemContainer( item );
-                }
-
-                itemsCount++;
-                childIndex++;
-                dataGridContext = DataGridControl.GetDataGridContext( item );
-
-                if( !calculatedAutoWidthContextLevels.Contains( dataGridContext.DetailLevel ) )
-                {
-                  bool isRow = item is Row;
-
-                  if( ( !isRow ) && ( item is HeaderFooterItem ) )
-                    isRow = typeof( Row ).IsAssignableFrom( ( ( HeaderFooterItem )item ).VisualRootElementType );
-
-                  if( isRow )
-                  {
-                    dataGridContext.ColumnStretchingManager.ColumnStretchingCalculated = false;
-                    // Calling Measure with the Viewport's width will have the effect of 
-                    // distributing the extra space (see FixedCellPanel's MeasureOverride). 
-                    // Eventually, the FixedCellPanel will receive an adjusted viewport 
-                    // width (where GroupLevelIndicator's width et al will be substracted).
-                    item.Measure( restrictedMeasureSize );
-
-                    if( dataGridContext.ColumnStretchingManager.ColumnStretchingCalculated )
-                      calculatedAutoWidthContextLevels.Add( dataGridContext.DetailLevel );
-
-                    // We still need to measure using infinity in case that the row is alone 
-                    // in its panel.
-                  }
-                }
-
-                item.Measure( VirtualizingStackPanel.InfiniteSize );
-
-                string dataGridContextName = ( dataGridContext.SourceDetailConfiguration != null ) ? dataGridContext.SourceDetailConfiguration.RelationName : string.Empty;
-
-                if( m_desiredSizeDictionary.ContainsKey( dataGridContextName ) == false )
-                {
-                  m_desiredSizeDictionary.Add( dataGridContextName, 0d );
-                }
-
-                //if the orientation is "Vertical"
-                if( orientation == Orientation.Vertical )
-                {
-                  //and the width of the item is the largest found yet
-                  if( item.DesiredSize.Width > m_desiredSizeDictionary[ dataGridContextName ] )
-                  {
-                    //remember the width as the largest found!
-                    if( ( !rowDesiredSizeCalculated ) || !( item is Row ) )
-                      m_desiredSizeDictionary[ dataGridContextName ] = item.DesiredSize.Width;
-                  }
-
-                  //offset the coordinate by the height of the item.
-                  actualSize += item.DesiredSize.Height;
-
-                  if( ( actualSize > availableSize.Height ) && ( itemsCount != 1 ) ) //the second condition is there to prevent a size 0 viewport (and to make sure at least 1 post item is generated)
-                  {
-                    //partially visible rows are not part of the viewport.
-                    quitLoop = true;
-                    busted = true;
-                  }
-                }
-                else
-                {
-                  //and the Height of the item is the largest found yet
-                  if( item.DesiredSize.Height > m_desiredSizeDictionary[ dataGridContextName ] )
-                  {
-                    //remember the Height as the largest found!
-                    if( ( !rowDesiredSizeCalculated ) || !( item is Row ) )
-                      m_desiredSizeDictionary[ dataGridContextName ] = item.DesiredSize.Height;
-                  }
-
-                  //offset the coordinate by the Width of the item.
-                  actualSize += item.DesiredSize.Width;
-
-                  if( ( actualSize > availableSize.Width ) && ( itemsCount != 1 ) ) //the second condition is there to prevent a size 0 viewport (and to make sure at least 1 post item is generated)
-                  {
-                    //partially visible rows are not part of the viewport.
-                    quitLoop = true;
-                    busted = true;
-                  }
-                }
-
-                if( ( !rowDesiredSizeCalculated ) && ( item is Row ) )
-                  rowDesiredSizeCalculated = true;
-              }
-            }
-
-          }
-          while( quitLoop == false );
-        } //end using!
-
-        //from this point, it is possible to calculate the Viewport and the extent sizes
-        double maxOpposedSize = this.ComputeMaxOpposedSize();
-
-        if( orientation == Orientation.Vertical )
-        {
-          double synchronizedExtentWidth = 0;
-          DataGridScrollViewer dgsv = this.ScrollOwner as DataGridScrollViewer;
-          if( dgsv != null )
-          {
-            synchronizedExtentWidth = dgsv.SynchronizedScrollViewersWidth;
-          }
-
-          //if the calculated width of the viewport is larger than available size,
-          //use the available size as the viewport... otherwise, take the calculated size
-          // If the availableSize is Infinity, use the greater of the calculated sizes 
-          // (either the grid body or headers/footers, aka SynchronizedScrollViewers).
-          double tmpWidth = ( Double.IsInfinity( availableSize.Width ) == false ) ? availableSize.Width : Math.Max( maxOpposedSize, synchronizedExtentWidth );
-          if( m_viewport.Width != tmpWidth )
-          {
-            m_viewport.Width = tmpWidth;
-            invalidateScrollInfo = true;
-          }
-
-          int tmpHeight = ( busted == false ) ? itemsCount : itemsCount - 1; //-1 since I generate 1 more than required
-          if( m_viewport.Height != tmpHeight )
-          {
-            m_viewport.Height = tmpHeight;
-            invalidateScrollInfo = true;
-          }
-
-          // Determine this Panel's extent
-          maxOpposedSize = Math.Max( maxOpposedSize, synchronizedExtentWidth );
-
-          if( m_extent.Width != maxOpposedSize )
-          {
-            m_extent.Width = maxOpposedSize;
-            invalidateScrollInfo = true;
-          }
-
-          if( m_extent.Height != numberItems )
-          {
-            m_extent.Height = numberItems;
-            invalidateScrollInfo = true;
-          }
-
-          if( ( this.HorizontalOffset + this.ViewportWidth ) > this.ExtentWidth )
-          {
-            m_offset.X = Math.Max( 0.0d, ( this.ExtentWidth - this.ViewportWidth ) );
-            invalidateScrollInfo = true;
-          }
-
-          //this sets the desiredSize of the Panel according to the values gathered during the Measure of all elements.
-          desiredSize.Height = Math.Min( availableSize.Height, actualSize );
-          desiredSize.Width = Math.Min( availableSize.Width, maxOpposedSize );
-        }
-        else
-        {
-          double synchronizedExtentHeight = 0;
-          DataGridScrollViewer dgsv = this.ScrollOwner as DataGridScrollViewer;
-          if( dgsv != null )
-          {
-            synchronizedExtentHeight = dgsv.SynchronizedScrollViewersHeight;
-          }
-
-          //if the calculated Height of the viewport is larger than available size,
-          //use the available size as the viewport... otherwise, take the calculated size
-          // If the availableSize is Infinity, use the greater of the calculated sizes 
-          // (either the grid body or headers/footers, aka SynchronizedScrollViewers).
-          double tmpHeight = ( Double.IsInfinity( availableSize.Height ) == false ) ? availableSize.Height : Math.Max( maxOpposedSize, synchronizedExtentHeight );
-          if( m_viewport.Height != tmpHeight )
-          {
-            m_viewport.Height = tmpHeight;
-            invalidateScrollInfo = true;
-          }
-
-          int tmpWidth = ( busted == false ) ? itemsCount : itemsCount - 1; //-1 since I generated 1 more than required
-          if( m_viewport.Width != tmpWidth )
-          {
-            m_viewport.Width = tmpWidth;
-            invalidateScrollInfo = true;
-          }
-
-          // Determine this Panel's extent
-          maxOpposedSize = Math.Max( maxOpposedSize, synchronizedExtentHeight );
-
-          if( m_extent.Height != maxOpposedSize )
-          {
-            m_extent.Height = maxOpposedSize;
-            invalidateScrollInfo = true;
-          }
-
-          if( m_extent.Width != numberItems )
-          {
-            m_extent.Width = numberItems;
-            invalidateScrollInfo = true;
-          }
-
-          if( ( this.VerticalOffset + this.ViewportHeight ) > this.ExtentHeight )
-          {
-            m_offset.Y = Math.Max( 0.0d, ( this.ExtentHeight - this.ViewportHeight ) );
-            invalidateScrollInfo = true;
-          }
-
-          //this sets the desiredSize of the Panel according to the values gathered during the Measure of all elements.
-          desiredSize.Width = Math.Min( availableSize.Width, actualSize );
-          desiredSize.Height = Math.Min( availableSize.Height, maxOpposedSize );
-        }
-
-        //finally, generate the pre-item!
-        if( firstVisibleIndex > 0 )
-        {
-          GeneratorPosition preItemGeneratorPos = generator.GeneratorPositionFromIndex( firstVisibleIndex - 1 );
-          int preChildIndex = ( preItemGeneratorPos.Offset == 0 ) ? preItemGeneratorPos.Index : preItemGeneratorPos.Index + 1;
-
-          using( generator.StartAt( preItemGeneratorPos, GeneratorDirection.Backward, true ) )
-          {
-            UIElement item = ( UIElement )generator.GenerateNext( out newlyRealized );
-
-            //if the items was just realized
-            if( newlyRealized == true )
-            {
-              // Figure out if we need to insert the child at the end or somewhere in the middle
-              if( preChildIndex >= children.Count )
-              {
-                base.AddInternalChild( item );
-              }
-              else
-              {
-                base.InsertInternalChild( preChildIndex, item );
-              }
-
-              //prepare the new item container
-              generator.PrepareItemContainer( item );
-            }
-
-            //measure with the available size... 
-            item.Measure( VirtualizingStackPanel.InfiniteSize );
-          } //end using
-        }//end if firstVisibleIndex > 0
-
-        //set the members that will indicate to the cleaning function what items are truly used.
-        m_actualFirstItem = ( firstVisibleIndex > 0 ) ? firstVisibleIndex - 1 : 0;
-        m_actualLastItem = firstVisibleIndex + itemsCount - 1;
-
-      } //end if numberItems > 0
-      else
-      {
-        if( orientation == Orientation.Vertical )
-        {
-          double synchronizedWidth = 0;
-          DataGridScrollViewer dgsv = this.ScrollOwner as DataGridScrollViewer;
-          if( dgsv != null )
-          {
-            synchronizedWidth = dgsv.SynchronizedScrollViewersWidth;
-          }
-
-          m_extent.Width = synchronizedWidth;
-          m_viewport.Width = availableSize.Width;
-          m_extent.Height = 0;
-        }
-        else
-        {
-          double synchronizedHeight = 0;
-          DataGridScrollViewer dgsv = this.ScrollOwner as DataGridScrollViewer;
-          if( dgsv != null )
-          {
-            synchronizedHeight = dgsv.SynchronizedScrollViewersHeight;
-          }
-
-          m_extent.Height = synchronizedHeight;
-          m_viewport.Height = availableSize.Height;
-          m_extent.Width = 0;
-        }
-
-        invalidateScrollInfo = true;
-
-        //indicate to the cleaning function that everything need to be cleaned!
-        m_actualFirstItem = -1;
-        m_actualLastItem = -1;
-      }
-
-      //if one of the parameters of the IScrollInfo interface was changed, then Invalidate the ScrollInfo owner!
-      if( ( invalidateScrollInfo == true ) && ( m_owner != null ) )
-      {
-        m_owner.InvalidateScrollInfo();
-      }
-
-      //call this so that the Cleanup is triggered with the latest parameters 
-      this.SetupCleaning();
-
-      return desiredSize;
-    }
-
-    private double ComputeMaxOpposedSize()
-    {
-      double actualMax = 0d;
-      foreach( double value in m_desiredSizeDictionary.Values )
-      {
-        if( value > actualMax )
-          actualMax = value;
-      }
-
-      return actualMax;
-    }
-
-    protected override void OnRender( DrawingContext drawingContext )
-    {
-      base.OnRender( drawingContext );
-
-      Brush contentBrush = this.ContentBorderBrush;
-      Thickness contentThickness = this.ContentBorderThickness;
-      Rect usedSurface = this.UsedSurface;
-
-      if( ( contentBrush != null ) && ( usedSurface != Rect.Empty ) )
-      {
-        Pen myPen = new Pen( contentBrush, contentThickness.Left );
-
-        GuidelineSet gls = new GuidelineSet();
-        gls.GuidelinesX.Add( 0 );
-        gls.GuidelinesX.Add( usedSurface.Right );
-        gls.GuidelinesY.Add( 0 );
-        gls.GuidelinesY.Add( usedSurface.Bottom );
-
-        drawingContext.PushGuidelineSet( gls );
-
-        if( contentThickness.Left > 0 )
-        {
-          drawingContext.DrawLine( myPen, new Point( 0 + ( contentThickness.Left / 2 ), 0 ), new Point( 0 + ( contentThickness.Left / 2 ), usedSurface.Bottom + contentThickness.Top ) );
-        }
-
-        if( contentThickness.Top > 0 )
-        {
-          if( myPen.Thickness != contentThickness.Top )
-          {
-            myPen = new Pen( contentBrush, contentThickness.Top );
-          }
-
-          drawingContext.DrawLine( myPen, new Point( 0, 0 + ( contentThickness.Top / 2 ) ), new Point( usedSurface.Right + contentThickness.Left, 0 + ( contentThickness.Top / 2 ) ) );
-        }
-
-        if( contentThickness.Right > 0 )
-        {
-          if( myPen.Thickness != contentThickness.Right )
-          {
-            myPen = new Pen( contentBrush, contentThickness.Right );
-          }
-
-          drawingContext.DrawLine( myPen, new Point( usedSurface.Right + ( contentThickness.Right / 2 ), 0 ), new Point( usedSurface.Right + ( contentThickness.Right / 2 ), usedSurface.Bottom + contentThickness.Top ) );
-        }
-
-        if( contentThickness.Bottom > 0 )
-        {
-          if( myPen.Thickness != contentThickness.Bottom )
-          {
-            myPen = new Pen( contentBrush, contentThickness.Bottom );
-          }
-
-          drawingContext.DrawLine( myPen, new Point( 0, usedSurface.Bottom + ( contentThickness.Bottom / 2 ) ), new Point( usedSurface.Right + contentThickness.Left, usedSurface.Bottom + ( contentThickness.Bottom / 2 ) ) );
-        }
-
-        drawingContext.Pop();
-      }
-    }
-
-    protected override void BringIndexIntoView( int index )
-    {
-      ( ( ICustomVirtualizingPanel )this ).BringIntoView( index );
-    }
-
-    protected override void OnClearChildren()
-    {
-      base.OnClearChildren();
-    }
-
-    private void SetupCleaning()
-    {
-      //this function is used to setup the cleaninp of the old containers in the least possible
-      //intrusive way so that measure can return without processing the cleanup inline.
-
-      //making the Cleanup asynchronous will somehow delay a little bit the Virtualization of cells, 
-      //but, were trying to reach the best compromise between recycling and generation of items.
-      m_currentCleanupIndex = this.Children.Count - 1;
-
-      if( m_cleanupOperation == null )
-      {
-        m_cleanupOperation = this.Dispatcher.BeginInvoke( ( ( DispatcherPriority )m_initialCleanupPriority ), new CleanupHandler( DoCleanup ) );
-      }
-      else
-      {
-        m_cleanupPriorityModifier = this.CalculateCleanupPriorityModifier();
-
-        if( m_cleanupPriorityModifier > 0 )
-        {
-          m_cleanupOperation.Abort();
-          m_cleanupOperation = this.Dispatcher.BeginInvoke( ( ( DispatcherPriority )m_initialCleanupPriority + m_cleanupPriorityModifier ), new CleanupHandler( DoCleanup ) );
-        }
-      }
-
-    }
-
-    private void DoCleanup()
-    {
-      bool finished = this.CleanupWorker();
-      if( finished == false )
-      {
-        m_cleanupPriorityModifier = this.CalculateCleanupPriorityModifier();
-        m_cleanupOperation = this.Dispatcher.BeginInvoke( ( ( DispatcherPriority )m_initialCleanupPriority + m_cleanupPriorityModifier ), new CleanupHandler( DoCleanup ) );
-      }
-      else
-      {
-        m_cleanupOperation = null;
-      }
-    }
-
-    private bool CleanupWorker()
-    {
-      bool retval = true;
-
-      UIElementCollection children = this.InternalChildren;
-      IItemContainerGenerator generator = this.CustomItemContainerGenerator;
-
-      if( generator != null )
-      {
-        int viewportSize = this.GetViewportSize();
-
-        if( ( m_actualFirstItem == m_actualLastItem ) && ( m_actualFirstItem == -1 ) )
-        {
-          this.RemoveInternalChildRange( 0, children.Count );
-          generator.RemoveAll();
-        }
-        else
-        {
-          int startTick = Environment.TickCount;
-
-          while( m_currentCleanupIndex >= 0 )
-          {
-            GeneratorPosition childGeneratorPos = new GeneratorPosition( m_currentCleanupIndex, 0 );
-            int itemIndex = generator.IndexFromGeneratorPosition( childGeneratorPos );
-
-            if( ( itemIndex < ( m_actualFirstItem - viewportSize ) || itemIndex > ( m_actualLastItem + viewportSize ) ) && itemIndex != -1 )
-            {
-              DependencyObject focusScope = FocusManager.GetFocusScope( children[ m_currentCleanupIndex ] );
-              DependencyObject focusedElement = FocusManager.GetFocusedElement( focusScope ) as DependencyObject;
-
-              if( ( focusedElement == null ) || ( !TreeHelper.IsDescendantOf( focusedElement, children[ m_currentCleanupIndex ] ) ) )
-              {
-                RemoveInternalChildRange( m_currentCleanupIndex, 1 );
-                generator.Remove( childGeneratorPos, 1 );
-              }
-            }
-
-            m_currentCleanupIndex--;
-
-            if( Environment.TickCount - startTick > CleanupThreshold )
-            {
-              retval = false;
-              break;
-            }
-          }
-        }
-      }
-
-      return retval;
-    }
-
-    private int CalculateCleanupPriorityModifier()
-    {
-      int viewportSize = this.GetViewportSize();
-
-      //Notes on the Algo: ViewportSize * 3 is because we want to keep 1 page before and after the actual viewport.
-      //Notes on the Algo: 10 - m_initialCleanupPriority is because we do not want the modifier to go beyond the scope of the enum...
-      return ( int )Math.Min( Math.Floor( this.InternalChildren.Count / ( viewportSize * 3d ) ) - 1, ( 10 - m_initialCleanupPriority ) );
-    }
-
-    private int GetViewportSize()
-    {
-      return ( int )( ( this.Orientation == Orientation.Vertical ) ? this.ViewportHeight : this.ViewportWidth );
-    }
-
-    private Rect MakeVisible( int childIndex, int index, Rect rectangle )
-    {
-      this.BringIndexIntoViewHelper( childIndex, index );
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        //check if the beginning of the rectangle is before the "offset"
-        if( rectangle.Left < this.HorizontalOffset )
-        {
-          //then make the origin of the rectangle visible (independent of width)
-          this.SetHorizontalOffset( rectangle.Left );
-        }
-        //if the right side of the rectangle is not visible
-        else if( rectangle.Right > ( this.HorizontalOffset + this.ViewportWidth ) )
-        {
-          //and the rectangle is larger than viewport
-          if( rectangle.Width > this.ViewportWidth )
-          {
-            //make the origin of the rectangle visible
-            this.SetHorizontalOffset( rectangle.Left );
-          }
-          //and rectangle is not larger than viewport
-          else
-          {
-            //align the right side of the rectangle at the rightmost edge of the viewport.
-            this.SetHorizontalOffset( rectangle.Right - this.ViewportWidth );
-          }
-        }
-
-      }
-      else
-      {
-        //check if the beginning of the rectangle is before the "offset"
-        if( rectangle.Top < this.VerticalOffset )
-        {
-          //then make the origin of the rectangle visible (independent of height)
-          this.SetVerticalOffset( rectangle.Top );
-        }
-        //if the bottom of the rectangle is not visible
-        else if( rectangle.Bottom > ( this.VerticalOffset + this.ViewportHeight ) )
-        {
-          //and the rectangle is higher than viewport
-          if( rectangle.Height > this.ViewportHeight )
-          {
-            //make the origin of the rectangle visible
-            this.SetVerticalOffset( rectangle.Top );
-          }
-          //and rectangle is not higher than viewport
-          else
-          {
-            //align the bottom of the rectangle at the bottom edge of the viewport.
-            this.SetVerticalOffset( rectangle.Bottom - this.ViewportHeight );
-          }
-        }
-      }
-
-      return rectangle;
-    }
-
-    private void BringIndexIntoViewHelper( int childIndex, int itemIndex )
-    {
-      IItemContainerGenerator generator = this.CustomItemContainerGenerator;
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        //Only do stuff if the item is out of the viewport.
-        if( itemIndex < this.VerticalOffset )
-        {
-          //this is easy, just set the item as the first one.
-          this.SetVerticalOffset( itemIndex );
-        }
-        else if( itemIndex >= this.VerticalOffset + this.ViewportHeight )
-        {
-          //this is a little trickier... I need to determine the best possible offset to display the item passed.
-          int desiredChildIndex = childIndex;
-          int desiredOffset = itemIndex;
-          double cachedActualHeight = this.ActualHeight;
-          double totalHeight = 0;
-          bool passedOnce = false;
-
-          do
-          {
-            //add the height of the current element to the total calculated height
-            totalHeight += this.Children[ desiredChildIndex ].RenderSize.Height;
-
-            //if the calculated height is still lower that the size of the viewport (render size)
-            if( totalHeight < cachedActualHeight )
-            {
-              int currentIndex = generator.IndexFromGeneratorPosition( new GeneratorPosition( desiredChildIndex, 0 ) );
-              //if the container is not for the "next" item in line... 
-              if( currentIndex != desiredOffset )
-              {
-                desiredOffset++;
-                break;
-              }
-              else
-              {
-                desiredChildIndex--;
-                desiredOffset--;
-                passedOnce = true;
-              }
-            }
-            else if( passedOnce == true )
-            {
-              //since we exceeded the constraint, go back one step
-              desiredOffset++;
-            }
-
-            if( desiredOffset < 0 )
-            {
-              desiredOffset = 0;
-              break;
-            }
-
-            if( desiredChildIndex < 0 )
-            {
-              break;
-            }
-
-
-          }
-          while( totalHeight < cachedActualHeight );
-
-          this.SetVerticalOffset( ( double )desiredOffset );
-        }
-      }
-      else
-      {
-        //Only do stuff if the item is out of the viewport.
-        if( itemIndex < this.HorizontalOffset )
-        {
-          //this is easy, just set the item as the first one.
-          this.SetHorizontalOffset( itemIndex );
-        }
-        else if( itemIndex > this.HorizontalOffset + this.ViewportWidth )
-        {
-          //this is a little trickier... I need to determine the best possible offset to display the item passed.
-          int desiredChildIndex = childIndex;
-          int desiredOffset = itemIndex;
-          double cachedActualWidth = this.ActualWidth;
-          double totalWidth = 0;
-          bool passedOnce = false;
-
-          do
-          {
-            //add the height of the current element to the total calculated height
-            totalWidth += this.Children[ desiredChildIndex ].RenderSize.Width;
-
-            //if the calculated height is still lower that the size of the viewport (render size)
-            if( totalWidth < cachedActualWidth )
-            {
-              int currentIndex = generator.IndexFromGeneratorPosition( new GeneratorPosition( desiredChildIndex, 0 ) );
-              //if the container is not for the "next" item in line... 
-              if( currentIndex != desiredOffset )
-              {
-                desiredOffset++;
-                break;
-              }
-              else
-              {
-                desiredChildIndex--;
-                desiredOffset--;
-                passedOnce = true;
-              }
-            }
-            else if( passedOnce == true )
-            {
-              //since we exceeded the constraint, go back one step
-              desiredOffset++;
-            }
-
-            if( desiredOffset < 0 )
-            {
-              desiredOffset = 0;
-              break;
-            }
-
-            if( desiredChildIndex < 0 )
-            {
-              break;
-            }
-
-          }
-          while( totalWidth < cachedActualWidth );
-
-          this.SetHorizontalOffset( ( double )desiredOffset );
-        }
-      }
-    }
-
-    private void OnRequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-    {
-      // Only perform this if we are virtualizing.  
-      // If not, the ScrollViewer will take care of bringing the item into view.
-      if( ( this.ScrollOwner == null ) || ( !this.ScrollOwner.CanContentScroll ) )
-        return;
-
-      // Only perform this if the StableScrolling feature is enabled.
-      if( !this.StableScrollingEnabled )
-        return;
-
-      // If we are explicitly setting the focus on a cell, we don't want to bring it into view.
-      // A bringIntoView would cause the HorizontalOffset to change is not a wanted behavior.
-      // Therefore, flag the Request as handled and do nothing.
-      DataGridContext dataGridContext = DataGridControl.GetDataGridContext( this );
-
-      DataGridControl dataGridControl = ( dataGridContext != null )
-        ? dataGridContext.DataGridControl
-        : null;
-
-      if( ( dataGridControl != null ) && ( dataGridControl.SettingFocusOnCell ) )
-      {
-        e.Handled = true;
-        return;
-      }
-
-      // Only perform this if the object is NOT a Cell and was not passed a specific rectangle.
-      if( ( e.TargetObject is Cell ) || ( e.TargetRect != Rect.Empty ) )
-        return;
-
-      // Before performing calculations, ensure that the element is a UIElement.
-      FrameworkElement target = e.TargetObject as FrameworkElement;
-
-      if( ( target == null ) || ( target.IsDescendantOf( this ) == false ) )
-        return;
-
-      Orientation orientation = this.Orientation;
-
-      //mark the routed event as handled, since under even the worst circumstances, a new event will be raised.
-      e.Handled = true;
-
-      double acceptableThreshold;
-      double actualVisibleValue;
-
-      GeneralTransform itemToPanel = target.TransformToAncestor( this );
-      Point itemOrigin = itemToPanel.Transform( new Point( 0, 0 ) );
-
-      //Calculate the VisibleWidth/Height of the object within the Viewport.
-      if( orientation == Orientation.Vertical )
-      {
-        acceptableThreshold = this.ViewportWidth * this.StableScrollingProportion;
-
-        //item offset is positive in the viewport.
-        if( itemOrigin.X >= 0 )
-        {
-          //if the item is totally visible
-          if( target.ActualWidth + itemOrigin.X <= this.ViewportWidth )
-          {
-            //this will force the function to "cancel" the BringIntoView
-            actualVisibleValue = this.ViewportWidth;
-          }
-          else
-          {
-            //item is not totally visible, calculate how much place it occupies in the viewport.
-            actualVisibleValue = this.ViewportWidth - itemOrigin.X;
-          }
-        }
-        //item offset is negative
-        else
-        {
-          actualVisibleValue = target.ActualWidth - itemOrigin.X;
-          if( actualVisibleValue > this.ViewportWidth )
-          {
-            //limit the value of actualVisibleValue to the Viewport size (to prevent eventual bugs [even if nothing is visible on the horizon for this])
-            actualVisibleValue = this.ViewportWidth;
-          }
-        }
-      }
-      else
-      {
-        acceptableThreshold = this.ViewportHeight * this.StableScrollingProportion;
-
-        //item offset is positive in the viewport.
-        if( itemOrigin.Y >= 0 )
-        {
-          //if the item is totally visible
-          if( target.ActualHeight + itemOrigin.Y <= this.ViewportHeight )
-          {
-            //this will force the function to "cancel" the BringIntoView
-            actualVisibleValue = this.ViewportHeight;
-          }
-          else
-          {
-            //item is not totally visible, calculate how much place it occupies in the viewport.
-            actualVisibleValue = this.ViewportHeight - itemOrigin.Y;
-          }
-        }
-        //item offset is negative
-        else
-        {
-          actualVisibleValue = target.ActualHeight - itemOrigin.Y;
-          if( actualVisibleValue > this.ViewportHeight )
-          {
-            //limit the value of actualVisibleValue to the Viewport size (to prevent eventual bugs [even if nothing is visible on the horizon for this])
-            actualVisibleValue = this.ViewportHeight;
-          }
-        }
-      }
-
-      bool needBringIntoView = false;
-      Rect newRect = new Rect( 0, 0, target.ActualWidth, target.ActualHeight );
-
-      //After the proportion visible from the object is calculated, compare with threshold
-      if( actualVisibleValue < acceptableThreshold )
-      {
-        needBringIntoView = true;
-        //the required threshold is not visible, modify the bounds of the rectangle 
-        //to bring at Max, the desired threshold.
-        if( orientation == Orientation.Vertical )
-        {
-          if( itemOrigin.X >= 0 )
-          {
-            newRect.Width = Math.Min( acceptableThreshold, target.ActualWidth );
-          }
-          else
-          {
-            newRect.X = target.ActualWidth - acceptableThreshold;
-            if( newRect.X < 0 )
-            {
-              newRect.X = 0;
-            }
-          }
-        }
-        else
-        {
-          if( itemOrigin.Y >= 0 )
-          {
-            newRect.Height = Math.Min( acceptableThreshold, target.ActualHeight );
-          }
-          else
-          {
-            newRect.Y = target.ActualHeight - acceptableThreshold;
-            if( newRect.Y < 0 )
-            {
-              newRect.Y = 0;
-            }
-          }
-        }//end else orientation is Horizontal
-      } // end if actuallyVisible < acceptable threshold
-      else
-      {
-        //Determine if the item is totally or partially visible on the main scrolling axis.             
-        if( orientation == Orientation.Vertical )
-        {
-          //If the Offset is negative, then it's sure its not totally visible
-          if( itemOrigin.Y < 0 )
-          {
-            needBringIntoView = true;
-          }
-          else if( ( ( itemOrigin.Y + target.DesiredSize.Height ) > this.RenderSize.Height ) && ( target.DesiredSize.Height < this.RenderSize.Height ) )
-          {
-            needBringIntoView = true;
-          }
-        }
-        else
-        {
-          //If the Offset is negative, then it's sure its not totally visible
-          if( itemOrigin.X < 0 )
-          {
-            needBringIntoView = true;
-          }
-          else if( ( ( itemOrigin.X + target.DesiredSize.Width ) > this.RenderSize.Width ) && ( target.DesiredSize.Width < this.RenderSize.Width ) )
-          {
-            needBringIntoView = true;
-          }
-        }
-
-        //if the item need to be scrolled in view
-        if( needBringIntoView == true )
-        {
-          //the goal is to preserve the actual opposed axis scrolling
-          if( orientation == Orientation.Vertical )
-          {
-            //calculate the starting point of the rectangle to view.
-            newRect.X = itemOrigin.X * -1;
-            if( newRect.X < 0 )
-            {
-              newRect.X = 0;
-            }
-
-            //if the item to be brough into view is part of the elements in a TableView that do no scroll
-            if( ( dataGridControl != null )
-              && ( dataGridControl.GetView() is TableView )
-              && ( this.ComputedCanScrollHorizontally( target ) == false ) )
-            {
-              //then do not change the HorizontalOffset... set the same on the object as previously availlable.
-              newRect.X = this.HorizontalOffset;
-            }
-
-
-            //if the rectangle of the object goes beyond the Viewport
-            if( newRect.Right > this.ViewportWidth )
-            {
-              //subtract what goes beyond!
-              newRect.Width = newRect.Width - ( newRect.Width - this.ViewportWidth ) - Math.Max( itemOrigin.X, 0 );
-            }
-          }
-          else
-          {
-            //calculate the staring point if the rectangle to view.
-            newRect.Y = itemOrigin.Y * -1;
-            if( newRect.Y < 0 )
-            {
-              newRect.Y = 0;
-            }
-
-            //if the rectangle of the object goes beyond the Viewport
-            if( newRect.Bottom > this.ViewportHeight )
-            {
-              //subtract what goes beyond!
-              newRect.Height = newRect.Height - ( newRect.Height - this.ViewportHeight ) - Math.Max( itemOrigin.Y, 0 );
-            }
-          }
-        } // end if needBringIntoView == true
-      } // end else 
-
-
-      //Call a new BringIntoView on the target element
-      if( needBringIntoView == true )
-        target.BringIntoView( newRect );
-    }
-
-    private bool ComputedCanScrollHorizontally( FrameworkElement target )
-    {
-      Debug.Assert( target != null );
-
-      bool retval = true;
-
-      DependencyObject visual = target;
-
-      do
-      {
-        retval = TableView.GetCanScrollHorizontally( visual );
-
-        if( retval == true )
-        {
-          visual = TreeHelper.GetParent( visual );
-        }
-      }
-      while( ( visual != null ) && ( visual != this ) && ( retval == true ) );
-
-      return retval;
-    }
-
-    private void InvalidateMeasureHelper( Orientation orientation )
-    {
-      if( ( m_layoutSuspended == true ) && ( m_layoutSuspendedOrientation == orientation ) )
-      {
-        m_layoutInvalidated = true;
-      }
-      else
-      {
-        this.InvalidateMeasure();
-
-        m_layoutInvalidated = false;
-      }
-
-    }
-
-    #region ICustomVirtualizingPanel Members
-
-    void ICustomVirtualizingPanel.BringIntoView( int index )
-    {
-      if( this.Orientation == Orientation.Vertical )
-      {
-        //if the item is the first item out of the viewport (partially visible)
-        if( index == ( this.VerticalOffset + this.ViewportHeight ) )
-        {
-          //shift the Viewport 1 item up
-          this.SetVerticalOffset( this.VerticalOffset + 1 );
-        }
-        else
-        {
-          //otherwise, if the item is below or above viewport, then bring it as the first item in the viewport
-          if( ( index < this.VerticalOffset ) || ( index > this.VerticalOffset + this.ViewportHeight ) )
-          {
-            this.SetVerticalOffset( index );
-          }
-        }
-      }
-      else
-      {
-        //if the item is the first item out of the viewport (partially visible)
-        if( index == ( this.HorizontalOffset + this.ViewportWidth ) )
-        {
-          //shift the Viewport 1 item up
-          this.SetHorizontalOffset( this.HorizontalOffset + 1 );
-        }
-        else
-        {
-          //otherwise, if the item is below or above viewport, then bring it as the first item in the viewport
-          if( ( index < this.HorizontalOffset ) || ( index > this.HorizontalOffset + this.ViewportWidth ) )
-          {
-            this.SetHorizontalOffset( index );
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region IScrollInfo Members
-
-    public bool CanHorizontallyScroll
-    {
-      get
-      {
-        return m_canHScroll;
-      }
-      set
-      {
-        m_canHScroll = value;
-      }
-    }
-
-    public bool CanVerticallyScroll
-    {
-      get
-      {
-        return m_canVScroll;
-      }
-      set
-      {
-        m_canVScroll = value;
-      }
-    }
-
-    public double ExtentHeight
-    {
-      get
-      {
-        return m_extent.Height;
-      }
-    }
-
-    public double ExtentWidth
-    {
-      get
-      {
-        return m_extent.Width;
-      }
-    }
-
-    public double HorizontalOffset
-    {
-      get
-      {
-        return m_offset.X;
-      }
-    }
-
-    public void LineDown()
-    {
-      double verticalOffset = this.VerticalOffset;
-
-      // Prevent scrolling if we are already showing the last item.
-      if( this.ExtentHeight <= ( verticalOffset + this.ViewportHeight ) )
-        return;
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        this.SetVerticalOffset( verticalOffset + 1 );
-      }
-      else
-      {
-        this.SetVerticalOffset( verticalOffset + ScrollViewerHelper.PixelScrollingCount );
-      }
-    }
-
-    public void LineLeft()
-    {
-      if( this.Orientation == Orientation.Horizontal )
-      {
-        this.SetHorizontalOffset( this.HorizontalOffset - 1 );
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.HorizontalOffset - ScrollViewerHelper.PixelScrollingCount );
-      }
-    }
-
-    public void LineRight()
-    {
-      double horizontalOffset = this.HorizontalOffset;
-
-      // Prevent scrolling if we are already showing the last item.
-      if( this.ExtentWidth <= ( horizontalOffset + this.ViewportWidth ) )
-        return;
-
-      if( this.Orientation == Orientation.Horizontal )
-      {
-        this.SetHorizontalOffset( horizontalOffset + 1 );
-      }
-      else
-      {
-        this.SetHorizontalOffset( horizontalOffset + ScrollViewerHelper.PixelScrollingCount );
-      }
-    }
-
-    public void LineUp()
-    {
-      if( this.Orientation == Orientation.Vertical )
-      {
-        this.SetVerticalOffset( this.VerticalOffset - 1 );
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset - ScrollViewerHelper.PixelScrollingCount );
-      }
-    }
-
-    public Rect MakeVisible( Visual visual, Rect rectangle )
-    {
-      UIElementCollection children = this.InternalChildren;
-      IItemContainerGenerator generator = this.CustomItemContainerGenerator;
-
-      Rect actualRect = rectangle;
-
-      //determine the index of the internal child for this visual
-      int internalChildIndex = children.IndexOf( ( UIElement )visual );
-
-      //if the visual is not a direct child of the panel
-      if( internalChildIndex == -1 )
-      {
-        bool foundAncestor = false;
-        //cycle through all the visual children of the panel
-        foreach( UIElement element in children )
-        {
-          //if the visual child of the panel is the ancestor of the given visual
-          if( element.IsAncestorOf( visual ) == true )
-          {
-            //store the visual child index
-            internalChildIndex = children.IndexOf( element );
-
-            //transform the given rectangle into the actual child coordinate system
-            actualRect = visual.TransformToAncestor( element ).TransformBounds( rectangle );
-
-            foundAncestor = true;
-            break;
-          }
-        }
-
-        Debug.Assert( foundAncestor == true, "Cannot find the actual child for the given Visual" );
-      }
-
-      int itemIndex = generator.IndexFromGeneratorPosition( new GeneratorPosition( internalChildIndex, 0 ) );
-
-      if( itemIndex != -1 )
-      {
-        return MakeVisible( internalChildIndex, itemIndex, actualRect );
-      }
-      else
-      {
-        return actualRect;
-      }
-    }
-
-    public void MouseWheelDown()
-    {
-      double verticalOffset = this.VerticalOffset;
-
-      // Prevent scrolling if we are already showing the last item.
-      if( this.ExtentHeight <= ( verticalOffset + this.ViewportHeight ) )
-        return;
-
-      if( this.Orientation == Orientation.Vertical )
-      {
-        this.SetVerticalOffset( verticalOffset + SystemParameters.WheelScrollLines );
-      }
-      else
-      {
-        this.SetVerticalOffset( verticalOffset
-          + ( SystemParameters.WheelScrollLines * ScrollViewerHelper.PixelScrollingCount ) );
-      }
-    }
-
-    public void MouseWheelLeft()
-    {
-      if( this.Orientation == Orientation.Horizontal )
-      {
-        this.SetHorizontalOffset( this.HorizontalOffset - SystemParameters.WheelScrollLines );
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.HorizontalOffset
-          - ( SystemParameters.WheelScrollLines * ScrollViewerHelper.PixelScrollingCount ) );
-      }
-    }
-
-    public void MouseWheelRight()
-    {
-      double horizontalOffset = this.HorizontalOffset;
-
-      // Prevent scrolling if we are already showing the last item.
-      if( this.ExtentWidth <= ( horizontalOffset + this.ViewportWidth ) )
-        return;
-
-      if( this.Orientation == Orientation.Horizontal )
-      {
-        this.SetHorizontalOffset( horizontalOffset + SystemParameters.WheelScrollLines );
-      }
-      else
-      {
-        this.SetHorizontalOffset( horizontalOffset
-          + ( SystemParameters.WheelScrollLines * ScrollViewerHelper.PixelScrollingCount ) );
-      }
-    }
-
-    public void MouseWheelUp()
-    {
-      if( this.Orientation == Orientation.Vertical )
-      {
-        this.SetVerticalOffset( this.VerticalOffset - SystemParameters.WheelScrollLines );
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset
-          - ( SystemParameters.WheelScrollLines * ScrollViewerHelper.PixelScrollingCount ) );
-      }
-    }
-
-    public void PageDown()
-    {
-      double scrollOffset = ( this.ViewportHeight + this.VerticalOffset );
-
-      // Prevent scrolling if we are already showing the last item.
-      if( this.ExtentHeight <= scrollOffset )
-        return;
-
-      this.SetVerticalOffset( scrollOffset );
-    }
-
-    public void PageLeft()
-    {
-      this.SetHorizontalOffset( this.HorizontalOffset - this.ViewportWidth );
-    }
-
-    public void PageRight()
-    {
-      double scrollOffset = ( this.HorizontalOffset + this.ViewportWidth );
-
-      // Prevent scrolling if we are already showing the last item.
-      if( this.ExtentWidth <= scrollOffset )
-        return;
-
-      this.SetHorizontalOffset( scrollOffset );
-    }
-
-    public void PageUp()
-    {
-      this.SetVerticalOffset( this.VerticalOffset - this.ViewportHeight );
-    }
-
-    public ScrollViewer ScrollOwner
-    {
-      get
-      {
-        return m_owner;
-      }
-      set
-      {
-        m_owner = value;
-      }
-    }
-
-    public void SetHorizontalOffset( double offset )
-    {
-      bool invalidate = false;
-
-      Orientation orientation = this.Orientation;
-
-      if( Double.IsInfinity( offset ) == true )
-      {
-        if( offset == Double.PositiveInfinity )
-        {
-          if( orientation == Orientation.Horizontal )
-          {
-            offset = this.ExtentWidth - 1;
-          }
-          else
-          {
-            offset = this.ExtentWidth - this.ViewportWidth;
-          }
-        }
-        else //negative infinity
-        {
-          offset = 0;
-        }
-      }
-      else
-      {
-        double width = ( orientation == Orientation.Vertical ) ? this.ExtentWidth : this.ItemCount;
-
-        if( offset < 0 || m_viewport.Width >= width )
-        {
-          offset = 0;
-        }
-        else
-        {
-          if( orientation == Orientation.Horizontal )
-          {
-            if( offset >= width )
-            {
-              offset = width - 1;
-            }
-          }
-          else
-          {
-            if( offset > ( width - m_viewport.Width ) )
-            {
-              offset = width - m_viewport.Width;
-            }
-          }
-        }
-      }
-
-      if( m_offset.X != offset )
-      {
-        m_offset.X = offset;
-        invalidate = true;
-      }
-
-      if( invalidate == true )
-      {
-        if( m_owner != null )
-          m_owner.InvalidateScrollInfo();
-
-        this.InvalidateMeasureHelper( Orientation.Horizontal );
-      }
-    }
-
-    public void SetVerticalOffset( double offset )
-    {
-      bool invalidate = false;
-
-      Orientation orientation = this.Orientation;
-
-      if( Double.IsInfinity( offset ) == true )
-      {
-        if( offset == Double.PositiveInfinity )
-        {
-          if( orientation == Orientation.Vertical )
-          {
-            offset = this.ExtentHeight - 1;
-          }
-          else
-          {
-            offset = this.ExtentHeight - this.ViewportHeight;
-          }
-        }
-        else //negative infinity
-        {
-          offset = 0;
-        }
-      }
-      else
-      {
-        double height = ( orientation == Orientation.Horizontal ) ? this.ExtentHeight : this.ItemCount;
-
-        if( offset < 0 || m_viewport.Height >= height )
-        {
-          offset = 0;
-        }
-        else
-        {
-          if( orientation == Orientation.Vertical )
-          {
-            if( offset >= height )
-            {
-              offset = height - 1;
-            }
-          }
-          else
-          {
-            if( offset > ( height - m_viewport.Height ) )
-            {
-              offset = height - m_viewport.Height;
-            }
-          }
-        }
-      }
-
-      if( m_offset.Y != offset )
-      {
-        m_offset.Y = offset;
-        invalidate = true;
-      }
-
-      if( invalidate == true )
-      {
-        if( m_owner != null )
-          m_owner.InvalidateScrollInfo();
-
-        this.InvalidateMeasureHelper( Orientation.Vertical );
-      }
-    }
-
-    public double VerticalOffset
-    {
-      get
-      {
-        return m_offset.Y;
-      }
-    }
-
-    public double ViewportHeight
-    {
-      get
-      {
-        return m_viewport.Height;
-      }
-    }
-
-    public double ViewportWidth
-    {
-      get
-      {
-        return m_viewport.Width;
-      }
-    }
-
-    #endregion
-
-    #region IDeferableScrollInfoRefresh Members
-
-    IDisposable IDeferableScrollInfoRefresh.DeferScrollInfoRefresh( Orientation orientation )
-    {
-      if( this.Orientation == orientation )
-      {
-        return new LayoutSuspendedHelper( this, orientation );
-      }
-
-      return null;
-    }
-
-    #endregion
-
-    private bool m_canHScroll = false;
-    private bool m_canVScroll = false;
-    private ScrollViewer m_owner = null;
-    private Size m_extent = new Size( 0, 0 );
-    private Size m_viewport = new Size( 0, 0 );
-    private Point m_offset = new Point( 0, 0 );
-
-    private int m_actualFirstItem = -1;
-    private int m_actualLastItem = -1;
-
-    //Those 3 members are used in conjunction with the IDeferableScrollInfoRefresh interface
-    private bool m_layoutSuspended; // = false
-    private Orientation m_layoutSuspendedOrientation;
-    private bool m_layoutInvalidated; // = false
-
-    private DispatcherOperation m_cleanupOperation = null;
-    private int m_currentCleanupIndex = -1;
-
-    private int m_initialCleanupPriority = ( ( int )DispatcherPriority.Background );
-    private int m_cleanupPriorityModifier = 0;
-
-    private Dictionary<string, double> m_desiredSizeDictionary = new Dictionary<string, double>();
-    private Dictionary<string, double> m_previousSizeDictionary = new Dictionary<string, double>();
-
-    private delegate void CleanupHandler();
-
-    private static readonly Thickness DefaultThickness = new Thickness();
-    private static readonly Size InfiniteSize = new Size( Double.PositiveInfinity, Double.PositiveInfinity );
-
-    private sealed class LayoutSuspendedHelper : IDisposable
-    {
-      public LayoutSuspendedHelper( VirtualizingStackPanel panel, Orientation orientation )
-      {
-        if( panel == null )
-          throw new ArgumentNullException( "panel" );
-
-        m_panel = panel;
-
-        m_panel.m_layoutSuspendedOrientation = orientation;
-        m_panel.m_layoutSuspended = true;
-      }
-
-      #region IDisposable Members
-
-      public void Dispose()
-      {
-        m_panel.m_layoutSuspended = false;
-
-        if( m_panel.m_layoutInvalidated == true )
-        {
-          m_panel.InvalidateMeasureHelper( m_panel.m_layoutSuspendedOrientation );
-        }
-      }
-
-      #endregion
-
-      private VirtualizingStackPanel m_panel; // = null
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
deleted file mode 100644
index fd0a9e87..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
+++ /dev/null
@@ -1,113 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net8.0-windows</TargetFramework>
-		<OutputType>Library</OutputType>
-		<IsWebBootstrapper>false</IsWebBootstrapper>
-		<AssemblyOriginatorKeyFile>
-		</AssemblyOriginatorKeyFile>
-		<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>
-		<ApplicationRevision>0</ApplicationRevision>
-		<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-		<UseApplicationTrust>false</UseApplicationTrust>
-		<BootstrapperEnabled>true</BootstrapperEnabled>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-		<UseWPF>true</UseWPF>
-		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-		<ImplicitUsings>disable</ImplicitUsings>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<OutputPath>.\bin\Debug\</OutputPath>
-		<DefineConstants>TRACE;DEBUG;XBAP_FRIENDLY</DefineConstants>
-		<DocumentationFile>
-		</DocumentationFile>
-		<NoWarn>1699</NoWarn>
-		<BaseAddress>125829120</BaseAddress>
-		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<DebugSymbols>true</DebugSymbols>
-		<OutputPath>.\bin\Release\</OutputPath>
-		<DefineConstants>TRACE;CODE_ANALYSIS;XBAP_FRIENDLY</DefineConstants>
-		<DocumentationFile>
-		</DocumentationFile>
-		<NoWarn>1699</NoWarn>
-		<RunCodeAnalysis>false</RunCodeAnalysis>
-		<CodeAnalysisRules>
-		</CodeAnalysisRules>
-		<BaseAddress>125829120</BaseAddress>
-		<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-	</PropertyGroup>
-	<ItemGroup>
-		<Reference Update="System.Core">
-			<RequiredTargetFramework>3.5</RequiredTargetFramework>
-		</Reference>
-		<Reference Update="UIAutomationProvider">
-			<RequiredTargetFramework>3.0</RequiredTargetFramework>
-		</Reference>
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="NoDrop.cur" />
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Include="DataGridControl.icon.16x16.bmp" />
-	</ItemGroup>
-	<ItemGroup>
-		<BootstrapperPackage Include=".NETFramework,Version=v4.0">
-			<Visible>False</Visible>
-			<ProductName>Microsoft .NET Framework 4 %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.VisualBasic.PowerPacks.10.0">
-			<Visible>False</Visible>
-			<ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-			<Install>true</Install>
-		</BootstrapperPackage>
-		<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-			<Visible>False</Visible>
-			<ProductName>Windows Installer 3.1</ProductName>
-			<Install>true</Install>
-		</BootstrapperPackage>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj" />
-	</ItemGroup>
-	<Target Name="GenSerializationAssembly" DependsOnTargets="AssignTargetPaths;Compile;ResolveKeySource" Inputs="$(MSBuildAllProjects);@(IntermediateAssembly)" Outputs="$(OutputPath)$(_SGenDllName)">
-		<SGen BuildAssemblyName="$(TargetFileName)" BuildAssemblyPath="$(OutputPath)" References="@(ReferencePath)" ShouldGenerateSerializer="true" UseProxyTypes="false" KeyContainer="$(KeyContainerName)" KeyFile="..\..\SolutionItems\Xceed.snk" DelaySign="$(DelaySign)" ToolPath="$(SGenToolPath)">
-			<Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
-		</SGen>
-		<CreateItem Include="$(TargetDir)$(TargetName)*.*;">
-			<Output TaskParameter="Include" ItemName="FilesToCopy" />
-		</CreateItem>
-		<Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(SolutionDir)\Bin\$(ConfigurationName)" />
-		<Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(SolutionDir)\Installer\DataGrid\Sources\Xceed\Xceed DataGrid for WPF Professional Edition\Bin" />
-	</Target>
-	<Target Name="AfterBuild" Condition="Exists('C:\Program Files\Microsoft SDKs\Windows\v7.0A\Bin\sgen.exe') AND '$(Revision)'!=''" DependsOnTargets="GenSerializationAssembly" />
-	<ItemGroup>
-		<PackageReference Include="EntityFramework" Version="6.4.4" />
-		<PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
-		<PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
-		<PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0" />
-		<PackageReference Include="System.ServiceModel.NetTcp" Version="8.0.0" />
-		<PackageReference Include="System.ServiceModel.Security" Version="6.0.0" />
-		<PackageReference Include="System.ServiceModel.Federation" Version="8.0.0" />
-	</ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml
deleted file mode 100644
index 36b7800c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.cs
deleted file mode 100644
index 6074267c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Column.GenericContentTemplateSelectorResources.g.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma checksum "..\..\Column.GenericContentTemplateSelectorResources.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BD9C873536475BFAAFD9882C16762C43A0262504"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-
-
-namespace Xceed.Wpf.DataGrid {
-    
-    
-    internal partial class GenericContentTemplateSelectorResources : System.Windows.ResourceDictionary, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/column.genericcontenttemplateselectorresources.xaml" +
-                    "", System.UriKind.Relative);
-            
-            #line 1 "..\..\Column.GenericContentTemplateSelectorResources.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.baml
deleted file mode 100644
index c1d826ff..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.cs
deleted file mode 100644
index 0f9c8090..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/DefaultCellEditorSelector.g.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma checksum "..\..\DefaultCellEditorSelector.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "646EA40B7B056C9B73D1C184B3D7949C0ADEAA5A"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.Toolkit;
-
-
-namespace Xceed.Wpf.DataGrid {
-    
-    
-    internal partial class DefaultCellEditorSelector : System.Windows.FrameworkElement, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/defaultcelleditorselector.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\DefaultCellEditorSelector.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.baml
deleted file mode 100644
index 5c96d588..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.cs
deleted file mode 100644
index b6948a5f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Views/DataGridControlBackgroundBrushesResources.g.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma checksum "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FE0E81405605C977E5F2D5B0199385384BF75E0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-
-
-namespace Xceed.Wpf.DataGrid.Views {
-    
-    
-    internal partial class DataGridControlBackgroundBrushesResources : System.Windows.ResourceDictionary, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.DataGrid;component/views/datagridcontrolbackgroundbrushesresources.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\Views\DataGridControlBackgroundBrushesResources.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt
deleted file mode 100644
index 64ea0105..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Column.GenericContentTemplateSelectorResources.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\DefaultCellEditorSelector.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Views\DataGridControlBackgroundBrushesResources.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Column.GenericContentTemplateSelectorResources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\DefaultCellEditorSelector.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\aero.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\aero2.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\TableflowView.Aero.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\Aero.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\Aero.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\Resources\TableView.Aero.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero\TableView.Aero.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\classic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\TableflowView.Classic.systemcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.systemcolor.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\Resources\Classic.systemcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Classic\TableView.Classic.systemcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\TableflowView.GridElementTemplates.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\Common.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Common\TableView.GridElementTemplates.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Controls\TableViewScrollViewer.generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.homestead.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.metallic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableflowView.Luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\TableflowView.Royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\TableView.Windows7.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\Windows7.Controls.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\Resources\Windows7.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\TableflowView.Windows7.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Windows7\TableView.Windows7.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\Aero2.normalcolor.Controls.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\Resources\Aero2.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\TableflowView.Aero2.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Aero2\TableView.Aero2.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\zune.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\TableflowView.Zune.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\Zune.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\Zune.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\Resources\TableView.Zune.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Zune\TableView.Zune.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.homestead.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.metallic.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\Luna.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\Resources\TableView.Luna.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.homestead.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.metallic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Luna\TableView.Luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\Royale.normalcolor.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\Royale.Resources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\Resources\TableView.Royale.Graphics.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\themes\Royale\TableView.Royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Views\DataGridControlBackgroundBrushesResources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\Xceed.Wpf.DataGrid.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.g.resources
deleted file mode 100644
index 8e344446..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.lref
deleted file mode 100644
index 9ed6815c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/Xceed.Wpf.DataGrid_MarkupCompile.lref
+++ /dev/null
@@ -1,60 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Column.GenericContentTemplateSelectorResources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\DefaultCellEditorSelector.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\aero2.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableflowView.Aero.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\Aero.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\Resources\TableView.Aero.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero\TableView.Aero.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\classic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableflowView.Classic.systemcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\Resources\Classic.systemcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Classic\TableView.Classic.systemcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableflowView.GridElementTemplates.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\Common.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Common\TableView.GridElementTemplates.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Controls\TableViewScrollViewer.generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.homestead.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.metallic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableflowView.Luna.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableflowView.Royale.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\TableView.Windows7.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Controls.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\Resources\Windows7.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableflowView.Windows7.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Windows7\TableView.Windows7.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\TableView.Aero2.normalcolor.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Controls.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\Resources\Aero2.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableflowView.Aero2.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Aero2\TableView.Aero2.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\zune.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableflowView.Zune.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\Zune.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\Resources\TableView.Zune.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Zune\TableView.Zune.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.homestead.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.metallic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\luna.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.homestead.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.metallic.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\Luna.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\Resources\TableView.Luna.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.homestead.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.metallic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Luna\TableView.Luna.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\royale.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.normalcolor.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\Royale.Resources.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\Resources\TableView.Royale.Graphics.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\themes\Royale\TableView.Royale.normalcolor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.DataGrid\Views\DataGridControlBackgroundBrushesResources.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.Resources.baml
deleted file mode 100644
index 64359bcd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.normalcolor.Resources.baml
deleted file mode 100644
index 9dbedb74..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/Aero.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/TableView.Aero.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/TableView.Aero.Graphics.baml
deleted file mode 100644
index c0b6572d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/Resources/TableView.Aero.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableView.Aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableView.Aero.normalcolor.baml
deleted file mode 100644
index b4ebbd18..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableView.Aero.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableflowView.Aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableflowView.Aero.normalcolor.baml
deleted file mode 100644
index 87bba28f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero/TableflowView.Aero.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml
deleted file mode 100644
index eebd4cfc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Controls.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml
deleted file mode 100644
index 3d66fc12..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/Aero2.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml
deleted file mode 100644
index 0f322b68..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableView.Aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableView.Aero2.normalcolor.baml
deleted file mode 100644
index e188fc34..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableView.Aero2.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableflowView.Aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableflowView.Aero2.normalcolor.baml
deleted file mode 100644
index db72b5b6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Aero2/TableflowView.Aero2.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.Resources.baml
deleted file mode 100644
index e5d45d2b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Graphics.baml
deleted file mode 100644
index 6caf96e2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Resources.baml
deleted file mode 100644
index 05aff231..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/Resources/Classic.systemcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableView.Classic.systemcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableView.Classic.systemcolor.baml
deleted file mode 100644
index 2df73889..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableView.Classic.systemcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableflowView.Classic.systemcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableflowView.Classic.systemcolor.baml
deleted file mode 100644
index 4e0a11eb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Classic/TableflowView.Classic.systemcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Common.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Common.Resources.baml
deleted file mode 100644
index 516f3763..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Common.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Graphics.baml
deleted file mode 100644
index e077ab60..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableView.GridElementTemplates.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableView.GridElementTemplates.baml
deleted file mode 100644
index 561532c5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableView.GridElementTemplates.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableflowView.GridElementTemplates.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableflowView.GridElementTemplates.baml
deleted file mode 100644
index b2c38bec..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Common/TableflowView.GridElementTemplates.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Controls/TableViewScrollViewer.generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Controls/TableViewScrollViewer.generic.baml
deleted file mode 100644
index 5076fc1b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Controls/TableViewScrollViewer.generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.Resources.baml
deleted file mode 100644
index d20f0e74..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.homestead.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.homestead.Resources.baml
deleted file mode 100644
index b5e99209..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.homestead.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.metallic.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.metallic.Resources.baml
deleted file mode 100644
index 51415902..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.metallic.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.normalcolor.Resources.baml
deleted file mode 100644
index d59bb836..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/Luna.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/TableView.Luna.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/TableView.Luna.Graphics.baml
deleted file mode 100644
index 5757fa41..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/Resources/TableView.Luna.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.homestead.baml
deleted file mode 100644
index bb01801e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.metallic.baml
deleted file mode 100644
index 984a6e03..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.normalcolor.baml
deleted file mode 100644
index 076e649c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableView.Luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.homestead.baml
deleted file mode 100644
index 1b4bf3e9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.metallic.baml
deleted file mode 100644
index 68ec3290..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.normalcolor.baml
deleted file mode 100644
index 3dd362dd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Luna/TableflowView.Luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.Resources.baml
deleted file mode 100644
index 9b5a5ef8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.normalcolor.Resources.baml
deleted file mode 100644
index ece697bb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/Royale.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/TableView.Royale.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/TableView.Royale.Graphics.baml
deleted file mode 100644
index c85d98f3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/Resources/TableView.Royale.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableView.Royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableView.Royale.normalcolor.baml
deleted file mode 100644
index 513ea033..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableView.Royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableflowView.Royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableflowView.Royale.normalcolor.baml
deleted file mode 100644
index 839546d9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Royale/TableflowView.Royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/TableView.Windows7.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/TableView.Windows7.Graphics.baml
deleted file mode 100644
index d195f85c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/TableView.Windows7.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Controls.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Controls.baml
deleted file mode 100644
index cd4df751..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Controls.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Resources.baml
deleted file mode 100644
index 2f2e84be..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/Resources/Windows7.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableView.Windows7.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableView.Windows7.baml
deleted file mode 100644
index b8769e73..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableView.Windows7.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableflowView.Windows7.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableflowView.Windows7.baml
deleted file mode 100644
index 38a2dee6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Windows7/TableflowView.Windows7.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/TableView.Zune.Graphics.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/TableView.Zune.Graphics.baml
deleted file mode 100644
index c85d98f3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/TableView.Zune.Graphics.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.Resources.baml
deleted file mode 100644
index 9b5a5ef8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.normalcolor.Resources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.normalcolor.Resources.baml
deleted file mode 100644
index 6ecc4adf..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/Resources/Zune.normalcolor.Resources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableView.Zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableView.Zune.normalcolor.baml
deleted file mode 100644
index 47f9e9be..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableView.Zune.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableflowView.Zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableflowView.Zune.normalcolor.baml
deleted file mode 100644
index 7e62c133..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/Zune/TableflowView.Zune.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero.normalcolor.baml
deleted file mode 100644
index 7617345b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero2.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero2.normalcolor.baml
deleted file mode 100644
index 43d98bcd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/aero2.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/classic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/classic.baml
deleted file mode 100644
index 269679ba..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/classic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/generic.baml
deleted file mode 100644
index 874cfa2b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.homestead.baml
deleted file mode 100644
index 7827be79..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.metallic.baml
deleted file mode 100644
index e9863b09..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.normalcolor.baml
deleted file mode 100644
index ec9a76e4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/royale.normalcolor.baml
deleted file mode 100644
index d435ed7d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/zune.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/zune.normalcolor.baml
deleted file mode 100644
index 214c8483..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/obj/Release/themes/zune.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/sn.snk and /dev/null differ
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
deleted file mode 100644
index ae69bff0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.Resources.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:cnv="clr-namespace:Xceed.Wpf.DataGrid.Converters">
-
-   <!-- =================================================================== -->
-   <!-- Utility Resources                                                   -->
-   <!-- =================================================================== -->
-
-   <Thickness x:Key="columnManagerCellPadding"
-              Left="3"
-              Top="0"
-              Right="3"
-              Bottom="2" />
-
-   <Thickness x:Key="groupHeaderPadding"
-              Left="8"
-              Top="1"
-              Right="8"
-              Bottom="3" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index ccc95ca7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml
+++ /dev/null
@@ -1,520 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<!-- =======================================================================
-  Xceed DataGrid for WPF - CUSTOMIZATION CODE - Default Styles and Templates
-  Copyright (c) 2007-2017 Xceed Software Inc.
-
-  [Aero.normalcolor.Resources.xaml]
-
-  This file is part of the Xceed DataGrid for WPF product. The use and
-  distribution of this Customization Code is subject to the terms
-  and conditions refering to "Customization Code" that are specified in
-  the XCEED SOFTWARE LICENSE AGREEMENT accompanying this product.
-======================================================================= -->
-
-<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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="Navy" />
-
-   <SolidColorBrush x:Key="errorBackgroundBrush"
-                    Color="Red" />
-
-   <SolidColorBrush x:Key="errorForegroundBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                 Color="#FFFFAA0F" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
-   <LinearGradientBrush x:Key="hotInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-      <GradientStop Offset="1"
-                    Color="#F3FAFD" />
-      <GradientStop Offset="0"
-                    Color="#E2F3FC" />
-   </LinearGradientBrush>
-
-   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
-   <LinearGradientBrush x:Key="hotSelectionInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-      <GradientStop Offset="1"
-                    Color="#E8F6FD" />
-      <GradientStop Offset="0"
-                    Color="#C4E8FA" />
-   </LinearGradientBrush>
-
-   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
-   <LinearGradientBrush x:Key="inactiveSelectionInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-      <GradientStop Offset="1"
-                    Color="#F8F8F8" />
-      <GradientStop Offset="0"
-                    Color="#E5E5E5" />
-   </LinearGradientBrush>
-
-   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
-   <LinearGradientBrush x:Key="rowSelectorHotBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-      <GradientStop Offset="0"
-                    Color="#F2F9FC" />
-      <GradientStop Offset="0.956"
-                    Color="#DDEEF7" />
-   </LinearGradientBrush>
-
-   <!--same as in file TableflowView.Aero.normalcolor.xaml-->
-   <SolidColorBrush x:Key="hotSelectionRowBorderBrush"
-                    Color="#B6E6FB" />
-
-
-   <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
-   <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
-   <Pen x:Key="dropMarkPen"
-        Brush="{x:Static SystemColors.HighlightBrush}"
-        Thickness="7" />
-
-   <DataTemplate x:Key="groupByItemAscendingSortGlyph">
-      <Canvas Height="4"
-              Width="7">
-         <Path Opacity="1"
-               Data="M 3.59375,0.15625 C3.59375,0.15625 7,4 7,4 7,4 0,4 0,4 0,4 3.59375,0.15625 3.59375,0.15625 z"
-               Fill="{Binding RelativeSource={RelativeSource Self},Path=(TextElement.Foreground)}" />
-
-         <Path Opacity="1"
-               Data="M 0.5,3.5 C0.5,3.5 3.5,0.5 3.5,0.5 "
-               Stroke="{Binding RelativeSource={RelativeSource Self},Path=(TextElement.Foreground)}"
-               StrokeThickness="1" />
-      </Canvas>
-   </DataTemplate>
-
-   <DataTemplate x:Key="groupByItemDescendingSortGlyph">
-      <Canvas Height="4"
-              Width="7">
-         <Path Opacity="1"
-               Data="M 3.59375,4 C3.59375,4 7,0.15625 7,0.15625 7,0.15625 0,0.15625 0,0.15625 0,0.15625 3.59375,4 3.59375,4 z"
-               Fill="{Binding RelativeSource={RelativeSource Self},Path=(TextElement.Foreground)}" />
-
-         <Path Opacity="1"
-               Data="M 0.5,0.5 C0.5,0.5 3.5,3.5 3.5,3.5 "
-               Stroke="{Binding RelativeSource={RelativeSource Self},Path=(TextElement.Foreground)}"
-               StrokeThickness="1" />
-      </Canvas>
-   </DataTemplate>
-
-   <!-- ValueConverter that is used to map GridLineThickness properties (of type double)
-        to Thickness structures that we can set to BorderThickness properties in the templates. -->
-   <conv:ThicknessConverter x:Key="thicknessConverter" />
-
-
-   <!--**************************
-    * TEMPLATE: GroupByControl
-    ************************** -->
-   <ControlTemplate x:Key="aeroNormalColorGroupByControlTemplate"
-                    TargetType="local:GroupByControl">
-
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-
-         <Grid>
-            <Grid>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="0.53*"/>
-                  <RowDefinition Height="0.27*"/>
-                  <RowDefinition Height="0.2*"/>
-               </Grid.RowDefinitions>
-
-               <Border Grid.RowSpan="3">
-                  <Border.Background>
-                     <LinearGradientBrush StartPoint="0,0.5"
-                                          EndPoint="1,0.5">
-                        <GradientStop Offset="0"
-                                      Color="#044875"/>
-                        <GradientStop Offset="1"
-                                      Color="#196C77" />
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-
-               <Border Grid.Row="2">
-                  <Border.Background>
-                     <LinearGradientBrush StartPoint="0.5,0"
-                                          EndPoint="0.5,1">
-                        <GradientStop Offset="0"
-                                      Color="#008CC1C6"/>
-                        <GradientStop Offset="0.5"
-                                      Color="#0F85BDC2"/>
-                        <GradientStop Offset="0.96"
-                                      Color="#AE80BBBF" />
-                        <GradientStop Offset="1"
-                                      Color="#B280BBBF" />
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-
-               <Border Grid.Row="0">
-                  <Border.Background>
-                     <LinearGradientBrush StartPoint="0.5,1"
-                                          EndPoint="0.5,0">
-                        <GradientStop Offset="0"
-                                      Color="#26FFFFFF"/>
-                        <GradientStop Offset="1"
-                                      Color="#B1FFFFFF"/>
-                        <GradientStop Offset="0.643"
-                                      Color="#66FFFFFF"/>
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-
-               <!--This element has to be external to avoid being overlapped by the gradients-->
-               <Border Grid.RowSpan="3"
-                       BorderThickness="1"
-                       BorderBrush="#093442">
-
-                  <Border Grid.RowSpan="3"
-                          BorderThickness="1"
-                          BorderBrush="#7FFFFFFF"/>
-               </Border>
-
-            </Grid>
-
-            <Border Opacity="0.5"
-                    Background="{TemplateBinding Background}"/>
-
-            <!-- This ContentPresenter displays the value of the NoGroupContent property
-                 of the GroupByControl. This content must only be displayed when there are
-                 no groups present, so we set its Visibility to Collapsed by default and
-                 it is made visible via a trigger. -->
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Margin="{TemplateBinding Padding}"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed" />
-
-            <!-- The GroupByControl is an ItemsControl, so it must have an ItemsPresenter in its
-                 Template in order to layout and show its child items. The default ItemsPanel
-                 of the GroupByControl is a "StaircasePanel", which layout its items in a
-                 staircase-like pattern and draws connecting lines between the items. -->
-            <ItemsPresenter Margin="{TemplateBinding Padding}" />
-
-         </Grid>
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When there are no groups, make the NoGroupContent visible. -->
-         <Trigger Property="HasItems"
-                  Value="False">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible"/>
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="aeroNormalColorGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-
-         <Grid>
-            <Border x:Name="border1"
-                    BorderBrush="#1AFFFFFF"
-                    CornerRadius="2"
-                    BorderThickness="1"/>
-
-            <Border x:Name="border2"
-                    BorderBrush="#80022841"
-                    CornerRadius="2"
-                    BorderThickness="1"
-                    Margin="1"/>
-
-            <Border x:Name="border3"
-                    BorderBrush="#34FFFFFF"
-                    CornerRadius="2"
-                    BorderThickness="1"
-                    Margin="2"/>
-
-            <Border x:Name="topGradient"
-                    Height="17"
-                    VerticalAlignment="Top">
-               <Border.Background>
-                  <LinearGradientBrush StartPoint="0.5,1"
-                                       EndPoint="0.503,0.039">
-                     <GradientStop Offset="0"
-                                   Color="#00FFFFFF"/>
-                     <GradientStop Offset="1"
-                                   Color="#4CFFFFFF"/>
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border x:Name="bottomGradient"
-                    Margin="2">
-               <Border.Background>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-                     <GradientStop Offset="0"
-                                   Color="#99FFFFFF"/>
-                     <GradientStop Offset="0.17"
-                                   Color="#99FFFFFF"/>
-                     <GradientStop Offset="1"
-                                   Color="#00FFFFFF"/>
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.48747"
-                                         CenterY="1.21575"
-                                         Angle="-90"/>
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Border.Background>
-
-               <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-               <StackPanel Orientation="Horizontal"
-                           Margin="{TemplateBinding Padding}">
-
-                  <ContentPresenter Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                  <ContentPresenter x:Name="sortGlyphPresenter"
-                                    Margin="6,0,0,0"
-                                    Content="{x:Null}"
-                                    ContentTemplate="{StaticResource groupByItemAscendingSortGlyph}"
-                                    Visibility="Hidden" />
-
-               </StackPanel>
-
-            </Border>
-         </Grid>
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="border1"
-                    Property="BorderBrush"
-                    Value="#4DFFFFFF"/>
-
-            <Setter TargetName="border2"
-                    Property="BorderBrush"
-                    Value="#52022841"/>
-
-            <Setter TargetName="border3"
-                    Property="BorderBrush"
-                    Value="#71FFFFFF"/>
-
-            <Setter TargetName="topGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.503,1.013"
-                                       EndPoint="0.503,0.039">
-                     <GradientStop Offset="0"
-                                   Color="#19FFFFFF"/>
-                     <GradientStop Offset="1"
-                                   Color="#99FFFFFF"/>
-                  </LinearGradientBrush>
-
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="bottomGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-                     <GradientStop Offset="0.0195"
-                                   Color="#FFFFFFFF"/>
-                     <GradientStop Offset="0.169"
-                                   Color="#FFFFFFFF"/>
-                     <GradientStop Offset="1"
-                                   Color="#00FFFFFF"/>
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.487447"
-                                         CenterY="1.21575"
-                                         Angle="-90"/>
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="border1"
-                    Property="BorderBrush"
-                    Value="#4DFFFFFF"/>
-
-            <Setter TargetName="border2"
-                    Property="BorderBrush"
-                    Value="#AE022841"/>
-
-            <Setter TargetName="border3"
-                    Property="BorderBrush">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.542,0.999"
-                                       EndPoint="0.542,0.0231">
-                     <GradientStop Offset="0"
-                                   Color="#0A2F3B"/>
-                     <GradientStop Offset="0.509"
-                                   Color="#0A2F3B"/>
-                     <GradientStop Offset="0.524"
-                                   Color="#4D6B79"/>
-                     <GradientStop Offset="1"
-                                   Color="#4D6B79"/>
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="topGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.503339,1.0131"
-                                       EndPoint="0.503339,0.0388058">
-                     <GradientStop Offset="0"
-                                   Color="#17699EB5"/>
-                     <GradientStop Offset="1"
-                                   Color="#FF5E8799"/>
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="bottomGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-
-                     <GradientStop Offset="0.019"
-                                   Color="#FF000000"/>
-                     <GradientStop Offset="0.169"
-                                   Color="#FF000000"/>
-                     <GradientStop Offset="1"
-                                   Color="#33000000"/>
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.487447"
-                                         CenterY="1.21575"
-                                         Angle="-90"/>
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible"/>
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Descending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource groupByItemDescendingSortGlyph}"/>
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible"/>
-
-         </DataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ScrollTip
-    ************************** -->
-   <ControlTemplate x:Key="scrollTipTemplate"
-                    TargetType="local:ScrollTip">
-
-      <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}"
-            HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
-
-         <Border BorderThickness="1,1,1,1"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 Background="{TemplateBinding Background}"
-                 CornerRadius="8"/>
-
-         <Border BorderThickness="1,1,1,1"
-                 Margin="1,1,1,1"
-                 BorderBrush="#FFFFFFFF"
-                 CornerRadius="8">
-
-            <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/Aero/Resources/TableView.Aero.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml
deleted file mode 100644
index c345fcf3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml
+++ /dev/null
@@ -1,242 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Aero uses the same graphics as Luna, so reuse the same ResourceDictionary. -->
-      <markup:DataGridThemeResourceDictionary Source="../../Luna/Resources/TableView.Luna.Graphics.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <DataTemplate x:Key="ascendingSortGlyph">
-      <Canvas Height="4"
-              Width="7">
-         <Path Opacity="1"
-               Data="M 3.59375,0.15625 C3.59375,0.15625 7,4 7,4 7,4 0,4 0,4 0,4 3.59375,0.15625 3.59375,0.15625 z">
-            <Path.Fill>
-               <LinearGradientBrush
-                  StartPoint="0.285,-0.0406"
-                  EndPoint="0.476,0.869">
-                  <GradientStop Offset="0" 
-                                Color="#406274"/>
-                  <GradientStop Offset="0.972"
-                                Color="#C3E4F5" />
-               </LinearGradientBrush>
-            </Path.Fill>
-         </Path>
-         <Path Opacity="1"
-               Data="M 0.5,3.5 C0.5,3.5 3.5,0.5 3.5,0.5 "
-               Stroke="#406274"
-               StrokeThickness="1" />
-      </Canvas>
-   </DataTemplate>
-
-  <DataTemplate x:Key="descendingSortGlyph">
-    <Canvas Height="4"
-            Width="7">
-      <Path Opacity="1"
-            Data="M 3.59375,4 C3.59375,4 7,0.15625 7,0.15625 7,0.15625 0,0.15625 0,0.15625 0,0.15625 3.59375,4 3.59375,4 z">
-        <Path.Fill>
-          <LinearGradientBrush StartPoint="0,-0.040"
-                               EndPoint="0.669,-0.040">
-            <LinearGradientBrush.GradientStops>
-              <GradientStopCollection>
-                <GradientStop Offset="0"
-                              Color="#3D6F89" />
-                <GradientStop Offset="0.961"
-                              Color="#A6D8F3" />
-              </GradientStopCollection>
-            </LinearGradientBrush.GradientStops>
-          </LinearGradientBrush>
-        </Path.Fill>
-      </Path>
-      <Path Opacity="1"
-            Data="M 0.5,0.5 C0.5,0.5 3.5,3.5 3.5,3.5 "
-            Stroke="#406274"
-            StrokeThickness="1" />
-    </Canvas>
-  </DataTemplate>
-
-  <DataTemplate x:Key="collapseGroupGlyph">
-      <Grid Height="15"
-            Width="15">
-
-         <Ellipse x:Name="mouseOverEllipse"
-                  Stretch="Fill"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch"
-                  Fill="Transparent"/>
-
-         <Canvas>
-            <Path Data="M 7.46875,5.125 C7.46875,5.125 11,9 11,9 11,9 11,10 11,10 11,10 9,10 9,10 9,10 7.625,7.84375 7.625,7.84375 7.625,7.84375 6,10 6,10 6,10 4,10 4,10 4,10 4,9 4,9 4,9 7.46875,5.125 7.46875,5.125 z"
-                  Fill="#000262" />
-         </Canvas>
-      </Grid>
-
-      <DataTemplate.Triggers>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=(ButtonBase.IsMouseOver)}" 
-                      Value="True">
-
-            <Setter TargetName="mouseOverEllipse"
-                    Property="Stroke"
-                    Value="#688DC4" />
-
-            <Setter TargetName="mouseOverEllipse"
-                    Property="Fill">
-
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.466,1"
-                                       GradientOrigin="0.466,1"
-                                       RadiusX="0.9875"
-                                       RadiusY="0.9875">
-                     <GradientStop Offset="0" 
-                                   Color="#CAF0E5"/>
-                     <GradientStop Offset="0.244"
-                                   Color="#B9E3E7" />
-                     <GradientStop Offset="0.3"
-                                   Color="#9ACEDE" />
-                     <GradientStop Offset="0.489"
-                                   Color="#5E97C3" />
-                     <GradientStop Offset="0.789" 
-                                   Color="#C5E1E6"/>
-                     <GradientStop Offset="0.983"
-                                   Color="#FFFFFF" />
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=(ButtonBase.IsPressed)}" 
-                      Value="True">
-
-            <Setter TargetName="mouseOverEllipse"
-                    Property="Fill">
-
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.467,1"
-                                       GradientOrigin="0.467,1"
-                                       RadiusX="0.9875"
-                                       RadiusY="0.9875">
-                     <GradientStop Offset="0" 
-                                   Color="#EAFFFF"/>
-                     <GradientStop Offset="0.161" 
-                                   Color="#FFFFFF"/>
-                     <GradientStop Offset="0.361" 
-                                   Color="#D1F7FC"/>
-                     <GradientStop Offset="0.538" 
-                                   Color="#B0DDEE"/>
-                     <GradientStop Offset="0.694"
-                                   Color="#D4EDF8" />
-                     <GradientStop Offset="0.994" 
-                                   Color="#FFFFFF"/>
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </DataTrigger>
-
-      </DataTemplate.Triggers>
-   </DataTemplate>
-
-   <DataTemplate x:Key="expandGroupGlyph">
-      <Grid Height="15"
-            Width="15">
-
-         <Ellipse x:Name="mouseOverEllipse"
-                  Stretch="Fill"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch"
-                  Fill="Transparent"/>
-
-         <Canvas>
-            <Path Data="M 7.46875,11 C7.46875,11 11,7.125 11,7.125 11,7.125 11,6.125 11,6.125 11,6.125 9,6.125 9,6.125 9,6.125 7.625,8.28125 7.625,8.28125 7.625,8.28125 6,6.125 6,6.125 6,6.125 4,6.125 4,6.125 4,6.125 4,7.125 4,7.125 4,7.125 7.46875,11 7.46875,11 z"
-                  Fill="#000262" />
-         </Canvas>
-      </Grid>
-
-      <DataTemplate.Triggers>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=(ButtonBase.IsMouseOver)}" 
-                      Value="True">
-
-            <Setter TargetName="mouseOverEllipse"
-                    Property="Stroke"
-                    Value="#688DC4" />
-
-            <Setter TargetName="mouseOverEllipse"
-                    Property="Fill">
-
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.466,1"
-                                       GradientOrigin="0.466,1"
-                                       RadiusX="0.9875"
-                                       RadiusY="0.9875">
-                     <GradientStop Offset="0" 
-                                   Color="#CAF0E5"/>
-                     <GradientStop Offset="0.244"
-                                   Color="#B9E3E7" />
-                     <GradientStop Offset="0.3"
-                                   Color="#9ACEDE" />
-                     <GradientStop Offset="0.489"
-                                   Color="#5E97C3" />
-                     <GradientStop Offset="0.789" 
-                                   Color="#C5E1E6"/>
-                     <GradientStop Offset="0.983"
-                                   Color="#FFFFFF" />
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=(ButtonBase.IsPressed)}" 
-                      Value="True">
-
-            <Setter TargetName="mouseOverEllipse"
-                    Property="Fill">
-
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.467,1"
-                                       GradientOrigin="0.467,1"
-                                       RadiusX="0.9875"
-                                       RadiusY="0.9875">
-                     <GradientStop Offset="0" 
-                                   Color="#EAFFFF"/>
-                     <GradientStop Offset="0.161" 
-                                   Color="#FFFFFF"/>
-                     <GradientStop Offset="0.361" 
-                                   Color="#D1F7FC"/>
-                     <GradientStop Offset="0.538" 
-                                   Color="#B0DDEE"/>
-                     <GradientStop Offset="0.694"
-                                   Color="#D4EDF8" />
-                     <GradientStop Offset="0.994" 
-                                   Color="#FFFFFF"/>
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </DataTrigger>
-
-      </DataTemplate.Triggers>
-   </DataTemplate>
-
-</ResourceDictionary>
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
deleted file mode 100644
index 780cd1cd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml
+++ /dev/null
@@ -1,2789 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant and color-scheme independant theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Aero.Resources.xaml" />
-
-      <!-- Include the view dependant and color-scheme independant theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Aero.Graphics.xaml" />
-
-      <!-- Include the view independant and color-scheme dependant theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Aero.normalcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-   <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-   <conv:ThicknessConverter x:Key="thicknessConverter" />
-   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
-                            InverseValue="True" />
-   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
-
-   <SolidColorBrush x:Key="hotRowBorderBrush"
-                    Color="#CDEFFE" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="hotOuterRowBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8FCFD" />
-
-      <GradientStop Offset="1"
-                    Color="#EFF8FD" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="hotInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-
-      <GradientStop Offset="1"
-                    Color="#F3FAFD" />
-
-      <GradientStop Offset="0"
-                    Color="#E2F3FC" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="selectionRowBorderBrush"
-                    Color="#99DEFD" />
-
-   <LinearGradientBrush x:Key="selectionOuterRowBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#E7F5FD" />
-
-      <GradientStop Offset="1"
-                    Color="#F6FBFD" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="selectionInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-
-      <GradientStop Offset="1"
-                    Color="#F1F8FD" />
-
-      <GradientStop Offset="0"
-                    Color="#D5EFFC" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="inactiveSelectionRowBorderBrush"
-                    Color="#D9D9D9" />
-
-   <LinearGradientBrush x:Key="inactiveSelectionOuterRowBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FAFAFB" />
-
-      <GradientStop Offset="1"
-                    Color="#F0F0F0" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="inactiveSelectionInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-
-      <GradientStop Offset="1"
-                    Color="#F8F8F8" />
-
-      <GradientStop Offset="0"
-                    Color="#E5E5E5" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="hotSelectionRowBorderBrush"
-                    Color="#B6E6FB" />
-
-   <LinearGradientBrush x:Key="hotSelectionOuterRowBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F2F9FD" />
-
-      <GradientStop Offset="1"
-                    Color="#DEF1FC" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="hotSelectionInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-
-      <GradientStop Offset="1"
-                    Color="#E8F6FD" />
-
-      <GradientStop Offset="0"
-                    Color="#C4E8FA" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="verticalHeaderBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FFFFFF" />
-
-      <GradientStop Offset="1"
-                    Color="#F0F1F4" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="horizontalHeaderBackgroundBrush"
-                        StartPoint="0.5,0.99074"
-                        EndPoint="0.5,0.0370377">
-
-      <GradientStop Offset="0.589"
-                    Color="#F1F2F4" />
-
-      <GradientStop Offset="0.609"
-                    Color="#FFFFFF" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="rowSelectorBorderBrush"
-                    Color="#D5D5D5" />
-
-   <SolidColorBrush x:Key="rowSelectorDelimiterBorderBrush"
-                    Color="#FCFCFD" />
-
-   <LinearGradientBrush x:Key="rowSelectorBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FFFFFF" />
-
-      <GradientStop Offset="1"
-                    Color="#F0F1F4" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSelectorHotBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#F2F9FC" />
-      <GradientStop Offset="0.956"
-                    Color="#DDEEF7" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSelectorPressedBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#AACEE1" />
-
-      <GradientStop Offset="1"
-                    Color="#8BD0F5" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerCellBorderBrush"
-                        StartPoint="0.482673,0.99074"
-                        EndPoint="0.482673,0.0370377">
-
-      <GradientStop Offset="0"
-                    Color="#D5D5D5" />
-
-      <GradientStop Offset="0.029"
-                    Color="#D5D5D5" />
-
-      <GradientStop Offset="0.0498"
-                    Color="#DEDFE1" />
-
-      <GradientStop Offset="0.585"
-                    Color="#DEDFE1" />
-
-      <GradientStop Offset="0.604"
-                    Color="#F2F2F2" />
-
-      <GradientStop Offset="1"
-                    Color="#F2F2F2" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="columnManagerCellDelimiterBorderBrush"
-                    Color="White" />
-
-   <LinearGradientBrush x:Key="columnManagerCellBackgroundBrush"
-                        StartPoint="0.482673,0.99074"
-                        EndPoint="0.482673,0.0370377">
-
-      <GradientStop Offset="0"
-                    Color="#F1F2F4" />
-
-      <GradientStop Offset="0.589"
-                    Color="#F1F2F4" />
-
-      <GradientStop Offset="0.609"
-                    Color="#FFFFFF" />
-
-      <GradientStop Offset="1"
-                    Color="#FFFFFF" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="columnManagerCellHotBorderBrush"
-                    Color="#96D9F9" />
-
-   <LinearGradientBrush x:Key="columnManagerCellHotBackgroundBrush"
-                        StartPoint="0.483,0.99"
-                        EndPoint="0.483,0.037">
-
-      <GradientStop Offset="0"
-                    Color="#DDEEF7" />
-
-      <GradientStop Offset="0.589"
-                    Color="#DDEEF7" />
-
-      <GradientStop Offset="0.609"
-                    Color="#F2F9FC" />
-
-      <GradientStop Offset="1"
-                    Color="#F2F9FC" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerCellPressedBorderBrush"
-                        StartPoint="0.483,0.991"
-                        EndPoint="0.483,0.037">
-
-      <GradientStop Offset="0"
-                    Color="#93C9E3" />
-
-      <GradientStop Offset="0.0292"
-                    Color="#93C9E3" />
-
-      <GradientStop Offset="0.0498"
-                    Color="#69BBE3" />
-
-      <GradientStop Offset="0.585"
-                    Color="#69BBE3" />
-
-      <GradientStop Offset="0.604"
-                    Color="#88CBEB" />
-
-      <GradientStop Offset="1"
-                    Color="#88CBEB" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerCellPressedBackgroundBrush"
-                        StartPoint="0.482,0.990"
-                        EndPoint="0.483,0.037">
-
-      <GradientStop Offset="0"
-                    Color="#BCECFE" />
-
-      <GradientStop Offset="0.589"
-                    Color="#BCECFE" />
-
-      <GradientStop Offset="0.609"
-                    Color="#E3F7FF" />
-
-      <GradientStop Offset="1"
-                    Color="#E3F7FF" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="White" />
-
-   <Pen x:Key="groupByConnectionLinePen"
-        Thickness="2"
-        Pen.Brush="White" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    TargetType="local:RowSelector">
-
-      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-               <Viewbox MaxHeight="16"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Margin="{TemplateBinding Padding}"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-               </Viewbox>
-
-               <!-- This is the two white lines we see at top and bottom of the RowSelector Item. More visible on MouseOver -->
-               <Border BorderThickness="0,1,0,1"
-                       Margin="0,1,0,0"
-                       BorderBrush="{StaticResource rowSelectorDelimiterBorderBrush}"
-                       Opacity="0.4" />
-
-            </Grid>
-         </Border>
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource rowSelectorHotBackgroundBrush}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource rowSelectorPressedBackgroundBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: Row 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowTemplate"
-                    TargetType="local:Row">
-
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-
-            <!-- CellsHost panel -->
-            <ColumnDefinition Width="*" />
-         </Grid.ColumnDefinitions>
-
-         <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
-                                                    Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <Border x:Name="outerBackground"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <Border x:Name="rowBorder"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 BorderThickness="1"
-                 CornerRadius="3"
-                 views:TableView.CanScrollHorizontally="False">
-            <Border x:Name="innerBackground"
-                    BorderThickness="1"
-                    CornerRadius="2" />
-         </Border>
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- This trigger is used to display Mouse Over look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: DataRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewDataRowTemplate"
-                    TargetType="local:DataRow">
-
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-
-            <!-- CellsHost panel -->
-            <ColumnDefinition Width="*" />
-         </Grid.ColumnDefinitions>
-
-         <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
-                                                    Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <Border x:Name="outerBackground"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <Border x:Name="rowBorder"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 BorderThickness="1"
-                 CornerRadius="3"
-                 views:TableView.CanScrollHorizontally="False">
-            <Border x:Name="innerBackground"
-                    BorderThickness="1"
-                    CornerRadius="2" />
-         </Border>
-
-         <Button x:Name="detailsToggle"
-                 Grid.Column="2"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Margin="2"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- This trigger is used to display the Active Selection look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="True" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource selectionRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource selectionOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- This trigger is used to display the Inactive Selection look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="False" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
-                          Value="False" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource inactiveSelectionRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource inactiveSelectionOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- This trigger is used to display Mouse Over look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- This trigger is used to display Mouse Over + Selected look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotSelectionRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotSelectionOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotSelectionInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- 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" />
-               <Condition Value="True"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </MultiDataTrigger>
-
-         <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" />
-               <Condition Value="False"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewColumnManagerRowTemplate"
-                    TargetType="local:ColumnManagerRow">
-
-      <!-- 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 Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False"
-                                                    Background="{TemplateBinding Background}" />
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Background="{TemplateBinding Background}" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <Decorator x:Name="indentationDecorator"
-                    Grid.Column="3">
-            <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>
-
-   <!--**************************
-    * TEMPLATE: Cell 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewCellTemplate"
-                    TargetType="local:Cell">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid>
-               <Border x:Name="cellBorder"
-                       BorderThickness="1"
-                       CornerRadius="3"
-                       Visibility="Collapsed">
-                  <Border x:Name="innerBackground"
-                          BorderThickness="1"
-                          CornerRadius="2">
-
-                  </Border>
-               </Border>
-
-               <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Margin="{TemplateBinding Padding}" />
-            </Grid>
-         </Border>
-
-         <Border x:Name="currentBorder"
-                 BorderBrush="Transparent"
-                 BorderThickness="1" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g., background/foreground) of the Cell to reflect specific
-              states (e.g., IsCurrent), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitly set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <!-- When the Cell is Current, we want to change its background/foreground to the appropriate brushes.
-              We do this only when the cell does not have a validation error because we must give priority
-              to the CellErrorStyle (if present).-->
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="False" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="True" />
-
-               <Condition Property="CellErrorStyle"
-                          Value="{x:Null}" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsCurrent}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="currentBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource selectionRowBorderBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
-              the Row's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsCurrent}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="currentBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource inactiveSelectionRowBorderBrush}" />
-
-         </MultiDataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).SelectionUnit}"
-                      Value="Cell">
-
-            <Setter TargetName="cellBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="currentBorder"
-                    Property="Visibility"
-                    Value="Collapsed" />
-
-         </DataTrigger>
-
-         <!-- This trigger is used to display Mouse Over look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).SelectionUnit}"
-                          Value="Cell" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="cellBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotRowBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource hotOuterRowBackgroundBrush}" />
-
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- This trigger is used to display Mouse Over + Selected look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).SelectionUnit}"
-                          Value="Cell" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="cellBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotSelectionRowBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource hotSelectionOuterRowBackgroundBrush}" />
-
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotSelectionInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource selectionOuterRowBackgroundBrush}" />
-
-            <Setter TargetName="cellBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource selectionRowBorderBrush}" />
-
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource inactiveSelectionOuterRowBackgroundBrush}" />
-
-            <Setter TargetName="cellBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource inactiveSelectionRowBorderBrush}" />
-
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-    <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
-    <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    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}">
-
-            <DockPanel>
-
-               <Grid>
-
-                  <DockPanel Margin="{TemplateBinding Padding}">
-
-                     <StackPanel Orientation="Horizontal"
-                                 DockPanel.Dock="Top"
-                                 HorizontalAlignment="Center">
-                        <ContentPresenter x:Name="sortGlyphPresenter"
-                                          Content="{x:Null}"
-                                          ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                          VerticalAlignment="Top"
-                                          Visibility="Hidden" />
-                     </StackPanel>
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                        <Border x:Name="thumbToggleBackgroundBorder"
-                                Grid.Column="1"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="0"
-                                Background="{StaticResource horizontalHeaderBackgroundBrush}">
-
-                           <ToggleButton x:Name="toggleButton"
-                                         Focusable="False"
-                                         VerticalAlignment="Stretch"
-                                         Visibility="Collapsed"
-                                         Margin="2,0,0,0"
-                                         Opacity="0.5" />
-
-                        </Border>
-                     </Grid>
-
-                  </DockPanel>
-
-                  <Border x:Name="delimiterBorder"
-                          BorderThickness="1,0,1,0"
-                          BorderBrush="{StaticResource rowSelectorDelimiterBorderBrush}" />
-               </Grid>
-
-            </DockPanel>
-
-         </Border>
-
-         <!-- Thumb that is used to resize the Column. -->
-         <Thumb x:Name="PART_ColumnResizerThumbLeft"
-                Style="{StaticResource invisibleThumbStyle}"
-                HorizontalAlignment="Left" />
-
-         <!-- Thumb that is used to resize the Column. -->
-         <Thumb x:Name="PART_ColumnResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                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="19,0,0,0" />
-         </MultiDataTrigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource columnManagerCellHotBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="delimiterBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource columnManagerCellHotBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="delimiterBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </DataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource columnManagerCellHotBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="delimiterBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource columnManagerCellPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-
-            <Setter TargetName="delimiterBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupHeaderControl
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupHeaderControlTemplate"
-                    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 intAdditionConverter}, 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}" />
-
-                  <!-- Blue line that is traced across the GroupHeader, following the content -->
-                  <Rectangle Fill="#B0BFDE"
-                             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: HierarchicalGroupByControl
-    ************************** -->
-
-   <!-- TreeViewItem Style to avoid displaying Expander and avoid selection and click -->
-   <Style x:Key="hierarchicalGroupByControlTreeViewItemStyle"
-          TargetType="{x:Type TreeViewItem}">
-      <Style.Resources>
-         <conv:TreeViewLineConverter x:Key="LineConverter" />
-      </Style.Resources>
-
-      <Setter Property="IsExpanded"
-              Value="True" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="Visibility">
-         <Setter.Value>
-            <PriorityBinding>
-               <Binding Path="."
-                        Converter="{StaticResource notDetailConfigConverter}"
-                        ConverterParameter="{x:Type local:DetailConfiguration}" />
-               <Binding Path="Visible"
-                        Converter="{StaticResource booleanToVisibilityConverter}" />
-            </PriorityBinding>
-
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TreeViewItem}">
-               <Grid ShowGridLines="False">
-                  <Grid.ColumnDefinitions>
-
-                     <!--This ColumnDefinition is required for stair spacing-->
-                     <ColumnDefinition Width="20" />
-                     <ColumnDefinition Width="Auto" />
-                     <ColumnDefinition Width="*" />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="*" />
-                     <RowDefinition MaxHeight="1" />
-                     <RowDefinition Height="*" />
-                     <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-
-                  <Border BorderThickness="{TemplateBinding Border.BorderThickness}"
-                          Padding="{TemplateBinding Control.Padding}"
-                          BorderBrush="{TemplateBinding Border.BorderBrush}"
-                          Background="{TemplateBinding Panel.Background}"
-                          Name="treeViewItemBorder"
-                          SnapsToDevicePixels="True"
-                          VerticalAlignment="Center"
-                          Grid.Column="1"
-                          Grid.RowSpan="3">
-
-                     <!--Will contain DetailGroupByConrol-->
-
-                     <ContentPresenter Content="{TemplateBinding HeaderedContentControl.Header}"
-                                       ContentTemplate="{TemplateBinding HeaderedContentControl.HeaderTemplate}"
-                                       ContentSource="Header"
-                                       Name="PART_Header"
-                                       HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
-                                       SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"
-                                       Margin="2,0,2,0" />
-                  </Border>
-
-                  <ItemsPresenter Name="ItemsHost"
-                                  Grid.Column="1"
-                                  Grid.Row="3"
-                                  Grid.ColumnSpan="2" />
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsExpanded"
-                           Value="false">
-                     <Setter TargetName="ItemsHost"
-                             Property="Visibility"
-                             Value="Collapsed" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <ControlTemplate x:Key="tableViewAeroNormalColorHierarchicalGroupByControlTemplate"
-                    TargetType="local:HierarchicalGroupByControl">
-      <ControlTemplate.Resources>
-         <!--this style is set to avoid having implicit treeview style
-             overide the HierarchicalGroupByControl's TreeView-->
-         <Style TargetType="TreeView" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-
-            <!-- HierarchicalGroupByControl -->
-            <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="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Grid.Column="2">
-
-            <Grid>
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="0.53*" />
-                     <RowDefinition Height="0.27*" />
-                     <RowDefinition Height="0.2*" />
-                  </Grid.RowDefinitions>
-
-                  <Border Grid.RowSpan="3">
-                     <Border.Background>
-                        <LinearGradientBrush StartPoint="0,0.5"
-                                             EndPoint="1,0.5">
-                           <GradientStop Offset="0"
-                                         Color="#044875" />
-                           <GradientStop Offset="1"
-                                         Color="#196C77" />
-                        </LinearGradientBrush>
-                     </Border.Background>
-                  </Border>
-
-                  <Border Grid.Row="2">
-                     <Border.Background>
-                        <LinearGradientBrush StartPoint="0.5,0"
-                                             EndPoint="0.5,1">
-                           <GradientStop Offset="0"
-                                         Color="#008CC1C6" />
-                           <GradientStop Offset="0.5"
-                                         Color="#0F85BDC2" />
-                           <GradientStop Offset="0.96"
-                                         Color="#AE80BBBF" />
-                           <GradientStop Offset="1"
-                                         Color="#B280BBBF" />
-                        </LinearGradientBrush>
-                     </Border.Background>
-                  </Border>
-
-                  <Border Grid.Row="0">
-                     <Border.Background>
-                        <LinearGradientBrush StartPoint="0.5,1"
-                                             EndPoint="0.5,0">
-                           <GradientStop Offset="0"
-                                         Color="#26FFFFFF" />
-                           <GradientStop Offset="1"
-                                         Color="#B1FFFFFF" />
-                           <GradientStop Offset="0.643"
-                                         Color="#66FFFFFF" />
-                        </LinearGradientBrush>
-                     </Border.Background>
-                  </Border>
-
-                  <!--This element has to be external to avoid being overlapped by the gradients-->
-                  <Border Grid.RowSpan="3"
-                          BorderThickness="1"
-                          BorderBrush="#093442">
-
-                     <Border Grid.RowSpan="3"
-                             BorderThickness="1"
-                             BorderBrush="#7FFFFFFF" />
-                  </Border>
-
-               </Grid>
-
-               <StackPanel Orientation="Horizontal">
-
-                  <TreeView x:Name="PART_HierarchicalGroupByControlTreeView"
-                            ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="Transparent"
-                            Focusable="False">
-
-                     <TreeViewItem Header="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext)}"
-                                   HeaderTemplate="{StaticResource dataGridContextTemplate}"
-                                   ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DetailConfigurations}"
-                                   ItemTemplate="{StaticResource detailConfigurationTemplate}"
-                                   ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                                   IsExpanded="True" />
-
-                  </TreeView>
-
-                  <!-- This ContentPresenter displays the value of the NoGroupContent property
-                 of the GroupByControl. This content must only be displayed when there are
-                 no groups present, so we set its Visibility to Collapsed by default and
-                 it is made visible via a trigger. -->
-                  <ContentPresenter x:Name="noGroupContentPresenter"
-                                    Content="{TemplateBinding NoGroupContent}"
-                                    VerticalAlignment="Center"
-                                    Visibility="Collapsed"
-                                    Margin="5,0,0,0" />
-
-               </StackPanel>
-               <!-- The GroupByControl is an ItemsControl, so it must have an ItemsPresenter in its
-                 Template in order to layout and show its child items. The default ItemsPanel
-                 of the GroupByControl is a "StaircasePanel", which layout its items in a
-                 staircase-like pattern and draws connecting lines between the items. -->
-               <ItemsPresenter Margin="{TemplateBinding Padding}" />
-
-            </Grid>
-         </Border>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=HasGroups}"
-                      Value="True">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-            <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewAeroNormalColorHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}"
-                  Margin="0,4,0,4">
-
-         <Grid VerticalAlignment="Top"
-               HorizontalAlignment="Center"
-               Margin="0,0,0,0">
-
-            <Border x:Name="border1"
-                    BorderBrush="#1AFFFFFF"
-                    CornerRadius="2"
-                    BorderThickness="1">
-
-               <Border x:Name="border2"
-                       BorderBrush="#80022841"
-                       CornerRadius="2"
-                       BorderThickness="1">
-
-                  <Border x:Name="border3"
-                          BorderBrush="#34FFFFFF"
-                          CornerRadius="2"
-                          BorderThickness="1">
-
-                     <TextBlock x:Name="titleTextBlock"
-                                Text="{TemplateBinding Title}"
-                                Foreground="White"
-                                Margin="3,0,3,0" />
-                  </Border>
-               </Border>
-            </Border>
-         </Grid>
-
-         <ItemsPresenter Margin="2,0,0,0"
-                         VerticalAlignment="Bottom"
-                         HorizontalAlignment="Right" />
-
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="aeroNormalColorHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-
-         <Grid>
-            <Border x:Name="border1"
-                    BorderBrush="#1AFFFFFF"
-                    CornerRadius="2"
-                    BorderThickness="1" />
-
-            <Border x:Name="border2"
-                    BorderBrush="#80022841"
-                    CornerRadius="2"
-                    BorderThickness="1"
-                    Margin="1" />
-
-            <Border x:Name="border3"
-                    BorderBrush="#34FFFFFF"
-                    CornerRadius="2"
-                    BorderThickness="1"
-                    Margin="2" />
-
-            <Border x:Name="topGradient"
-                    Height="17"
-                    VerticalAlignment="Top">
-               <Border.Background>
-                  <LinearGradientBrush StartPoint="0.5,1"
-                                       EndPoint="0.503,0.039">
-                     <GradientStop Offset="0"
-                                   Color="#00FFFFFF" />
-                     <GradientStop Offset="1"
-                                   Color="#4CFFFFFF" />
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border x:Name="bottomGradient"
-                    Margin="2">
-               <Border.Background>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-                     <GradientStop Offset="0"
-                                   Color="#99FFFFFF" />
-                     <GradientStop Offset="0.17"
-                                   Color="#99FFFFFF" />
-                     <GradientStop Offset="1"
-                                   Color="#00FFFFFF" />
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.48747"
-                                         CenterY="1.21575"
-                                         Angle="-90" />
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Border.Background>
-
-               <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-               <StackPanel Orientation="Horizontal"
-                           Margin="{TemplateBinding Padding}"
-                           TextElement.Foreground="White">
-
-                  <ContentPresenter Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                  <ContentPresenter x:Name="sortGlyphPresenter"
-                                    Margin="6,0,4,0"
-                                    Content="{x:Null}"
-                                    ContentTemplate="{StaticResource groupByItemAscendingSortGlyph}"
-                                    Visibility="Hidden" />
-
-               </StackPanel>
-
-            </Border>
-         </Grid>
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="border1"
-                    Property="BorderBrush"
-                    Value="#4DFFFFFF" />
-
-            <Setter TargetName="border2"
-                    Property="BorderBrush"
-                    Value="#52022841" />
-
-            <Setter TargetName="border3"
-                    Property="BorderBrush"
-                    Value="#71FFFFFF" />
-
-            <Setter TargetName="topGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.503,1.013"
-                                       EndPoint="0.503,0.039">
-                     <GradientStop Offset="0"
-                                   Color="#19FFFFFF" />
-                     <GradientStop Offset="1"
-                                   Color="#99FFFFFF" />
-                  </LinearGradientBrush>
-
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="bottomGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-                     <GradientStop Offset="0.0195"
-                                   Color="#FFFFFFFF" />
-                     <GradientStop Offset="0.169"
-                                   Color="#FFFFFFFF" />
-                     <GradientStop Offset="1"
-                                   Color="#00FFFFFF" />
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.487447"
-                                         CenterY="1.21575"
-                                         Angle="-90" />
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="border1"
-                    Property="BorderBrush"
-                    Value="#4DFFFFFF" />
-
-            <Setter TargetName="border2"
-                    Property="BorderBrush"
-                    Value="#AE022841" />
-
-            <Setter TargetName="border3"
-                    Property="BorderBrush">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.542,0.999"
-                                       EndPoint="0.542,0.0231">
-                     <GradientStop Offset="0"
-                                   Color="#0A2F3B" />
-                     <GradientStop Offset="0.509"
-                                   Color="#0A2F3B" />
-                     <GradientStop Offset="0.524"
-                                   Color="#4D6B79" />
-                     <GradientStop Offset="1"
-                                   Color="#4D6B79" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="topGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.503339,1.0131"
-                                       EndPoint="0.503339,0.0388058">
-                     <GradientStop Offset="0"
-                                   Color="#17699EB5" />
-                     <GradientStop Offset="1"
-                                   Color="#FF5E8799" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="bottomGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-
-                     <GradientStop Offset="0.019"
-                                   Color="#FF000000" />
-                     <GradientStop Offset="0.169"
-                                   Color="#FF000000" />
-                     <GradientStop Offset="1"
-                                   Color="#33000000" />
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.487447"
-                                         CenterY="1.21575"
-                                         Angle="-90" />
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Descending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource groupByItemDescendingSortGlyph}" />
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-      </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="tableViewAeroNormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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 tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableViewForcedAeroNormalColorGridControlStyle"
-          BasedOn="{StaticResource tableViewAeroNormalColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Aero;V4.0.0.0;31bf3856ad364e35;component\themes/aero.normalcolor.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource verticalHeaderBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableViewAeroNormalColorRowSelectorStyle"
-          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="BorderBrush"
-              Value="{StaticResource rowSelectorBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="Center" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="Top" />
-
-      <Setter Property="Padding"
-              Value="2" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewRowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewRowTemplate}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F1F2F4" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewAeroNormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewAeroNormalColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource horizontalHeaderBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <!-- We don't want to display a RowSelector for the ColumnManagerRow. -->
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerRowTemplate}" />
-
-      <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="tableViewAeroNormalColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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 tableViewCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewAeroNormalColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorColumnManagerCellStyle"
-          TargetType="local:ColumnManagerCell">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource columnManagerCellBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- In TableView, 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorGroupByControlStyle"
-          TargetType="local:GroupByControl">
-
-      <Setter Property="Foreground"
-              Value="{StaticResource groupByControlForegroundBrush}" />
-
-      <!-- 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 TableView, a height of at least 25 is appropriate for the GroupByControl. -->
-      <Setter Property="MinHeight"
-              Value="25" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource aeroNormalColorGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Padding"
-              Value="{StaticResource columnManagerCellPadding}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource aeroNormalColorGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <!-- Set the GroupHeaderControl's background to Transparent to make it hit-testable. -->
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- The GroupHeaderControl itself must not be focusable. The main Border inside its Template will
-           be made Focusable because it holds the various InputBindings that make the
-           GroupHeaderControl work. -->
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupHeaderControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorDetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewAeroNormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewAeroNormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewAeroNormalColorHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <!-- The Background property must be set for DragManager to work properly -->
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="White" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="ConnectionLinePen"
-              Value="{StaticResource groupByConnectionLinePen}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewAeroNormalColorHierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <!--The Background property must be set for DragManager to work properly-->
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource columnManagerCellPadding}" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource aeroNormalColorHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableViewAeroNormalColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FFA9DAF6"
-                             Offset="0" />
-
-               <GradientStop Color="#FFD9F0FC"
-                             Offset="0.5" />
-
-               <GradientStop Color="#FFE8F5FD"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF3C7FB1" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="Black" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewAeroNormalColorDefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <Setter Property="DefaultDropMarkPen"
-              Value="{StaticResource dropMarkPen}" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource hotRowBorderBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="0" />
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource hotRowBorderBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="0" />
-
-      <!-- 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:TableView, ThemeType=views:AeroNormalColorTheme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewAeroNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewForcedAeroNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewAeroNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewAeroNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewAeroNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewAeroNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewAeroNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewAeroNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewAeroNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewAeroNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewAeroNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAeroNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewAeroNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewAeroNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewAeroNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewAeroNormalColorHierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 98b1c01d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml
+++ /dev/null
@@ -1,3217 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant and color-scheme independant theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Aero.Resources.xaml" />
-
-      <!-- Include the view dependant and color-scheme independant theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Aero.Graphics.xaml" />
-
-      <!-- Include the view independant and color-scheme dependant theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Aero.normalcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-   <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-   <conv:ThicknessConverter x:Key="thicknessConverter" />
-   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
-                            InverseValue="True" />
-   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="hotRowBorderBrush"
-                    Color="#CDEFFE" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="hotOuterRowBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8FCFD" />
-
-      <GradientStop Offset="1"
-                    Color="#EFF8FD" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="hotInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-
-      <GradientStop Offset="1"
-                    Color="#F3FAFD" />
-
-      <GradientStop Offset="0"
-                    Color="#E2F3FC" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="selectionRowBorderBrush"
-                    Color="#99DEFD" />
-
-   <LinearGradientBrush x:Key="selectionOuterRowBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#E7F5FD" />
-
-      <GradientStop Offset="1"
-                    Color="#F6FBFD" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="selectionInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-
-      <GradientStop Offset="1"
-                    Color="#F1F8FD" />
-
-      <GradientStop Offset="0"
-                    Color="#D5EFFC" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="inactiveSelectionRowBorderBrush"
-                    Color="#D9D9D9" />
-
-   <LinearGradientBrush x:Key="inactiveSelectionOuterRowBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FAFAFB" />
-
-      <GradientStop Offset="1"
-                    Color="#F0F0F0" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="inactiveSelectionInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-
-      <GradientStop Offset="1"
-                    Color="#F8F8F8" />
-
-      <GradientStop Offset="0"
-                    Color="#E5E5E5" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="hotSelectionRowBorderBrush"
-                    Color="#B6E6FB" />
-
-   <LinearGradientBrush x:Key="hotSelectionOuterRowBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F2F9FD" />
-
-      <GradientStop Offset="1"
-                    Color="#DEF1FC" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="hotSelectionInnerRowBackgroundBrush"
-                        StartPoint="0.5,1"
-                        EndPoint="0.5,0">
-
-      <GradientStop Offset="1"
-                    Color="#E8F6FD" />
-
-      <GradientStop Offset="0"
-                    Color="#C4E8FA" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="verticalHeaderBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FFFFFF" />
-
-      <GradientStop Offset="1"
-                    Color="#F0F1F4" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="horizontalHeaderBackgroundBrush"
-                        StartPoint="0.5,0.99074"
-                        EndPoint="0.5,0.0370377">
-
-      <GradientStop Offset="0.589"
-                    Color="#F1F2F4" />
-
-      <GradientStop Offset="0.609"
-                    Color="#FFFFFF" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="rowSelectorBorderBrush"
-                    Color="#D5D5D5" />
-
-   <SolidColorBrush x:Key="rowSelectorDelimiterBorderBrush"
-                    Color="#FCFCFD" />
-
-   <LinearGradientBrush x:Key="rowSelectorBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FFFFFF" />
-
-      <GradientStop Offset="1"
-                    Color="#F0F1F4" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSelectorHotBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#F2F9FC" />
-      <GradientStop Offset="0.956"
-                    Color="#DDEEF7" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSelectorPressedBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#AACEE1" />
-
-      <GradientStop Offset="1"
-                    Color="#8BD0F5" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerCellBorderBrush"
-                        StartPoint="0.482673,0.99074"
-                        EndPoint="0.482673,0.0370377">
-
-      <GradientStop Offset="0"
-                    Color="#D5D5D5" />
-
-      <GradientStop Offset="0.029"
-                    Color="#D5D5D5" />
-
-      <GradientStop Offset="0.0498"
-                    Color="#DEDFE1" />
-
-      <GradientStop Offset="0.585"
-                    Color="#DEDFE1" />
-
-      <GradientStop Offset="0.604"
-                    Color="#F2F2F2" />
-
-      <GradientStop Offset="1"
-                    Color="#F2F2F2" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="columnManagerCellDelimiterBorderBrush"
-                    Color="White" />
-
-   <LinearGradientBrush x:Key="columnManagerCellBackgroundBrush"
-                        StartPoint="0.482673,0.99074"
-                        EndPoint="0.482673,0.0370377">
-
-      <GradientStop Offset="0"
-                    Color="#F1F2F4" />
-
-      <GradientStop Offset="0.589"
-                    Color="#F1F2F4" />
-
-      <GradientStop Offset="0.609"
-                    Color="#FFFFFF" />
-
-      <GradientStop Offset="1"
-                    Color="#FFFFFF" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="columnManagerCellHotBorderBrush"
-                    Color="#96D9F9" />
-
-   <LinearGradientBrush x:Key="columnManagerCellHotBackgroundBrush"
-                        StartPoint="0.483,0.99"
-                        EndPoint="0.483,0.037">
-
-      <GradientStop Offset="0"
-                    Color="#DDEEF7" />
-
-      <GradientStop Offset="0.589"
-                    Color="#DDEEF7" />
-
-      <GradientStop Offset="0.609"
-                    Color="#F2F9FC" />
-
-      <GradientStop Offset="1"
-                    Color="#F2F9FC" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerCellPressedBorderBrush"
-                        StartPoint="0.483,0.991"
-                        EndPoint="0.483,0.037">
-
-      <GradientStop Offset="0"
-                    Color="#93C9E3" />
-
-      <GradientStop Offset="0.0292"
-                    Color="#93C9E3" />
-
-      <GradientStop Offset="0.0498"
-                    Color="#69BBE3" />
-
-      <GradientStop Offset="0.585"
-                    Color="#69BBE3" />
-
-      <GradientStop Offset="0.604"
-                    Color="#88CBEB" />
-
-      <GradientStop Offset="1"
-                    Color="#88CBEB" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerCellPressedBackgroundBrush"
-                        StartPoint="0.482,0.990"
-                        EndPoint="0.483,0.037">
-
-      <GradientStop Offset="0"
-                    Color="#BCECFE" />
-
-      <GradientStop Offset="0.589"
-                    Color="#BCECFE" />
-
-      <GradientStop Offset="0.609"
-                    Color="#E3F7FF" />
-
-      <GradientStop Offset="1"
-                    Color="#E3F7FF" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="White" />
-
-   <Pen x:Key="groupByConnectionLinePen"
-        Thickness="2"
-        Pen.Brush="White" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationControlTemplate"
-                    TargetType="{x:Type local:GroupNavigationControl}">
-
-      <Grid>
-         <Border x:Name="outlineBorder"
-                 BorderBrush="#FF03395B"
-                 BorderThickness="1"
-                 Background="#00FFFFFF"
-                 CornerRadius="4"
-                 Opacity="0" />
-         <Border x:Name="innerBorder"
-                 BorderBrush="#CC82B9D8"
-                 BorderThickness="1"
-                 CornerRadius="3"
-                 Margin="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="#CC82B9D8"
-                    Margin="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="innerBorder"
-                    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="innerBorder"
-                    Property="Opacity"
-                    Value="1" />
-            <Setter TargetName="seperator"
-                    Property="Visibility"
-                    Value="Visible" />
-         </Trigger>
-
-         <Trigger Property="IsEnabled"
-                  Value="False">
-            <Setter Property="Opacity"
-                    TargetName="outlineBorder"
-                    Value="0" />
-            <Setter Property="Opacity"
-                    TargetName="innerBorder"
-                    Value="0" />
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationButton
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
-                    TargetType="{x:Type local:GroupNavigationButton}">
-      <Grid>
-         <Border x:Name="outerBorder"
-                 BorderBrush="#FF03395B"
-                 BorderThickness="1"
-                 Background="#00FFFFFF"
-                 CornerRadius="4"
-                 Opacity="0" />
-         <Border x:Name="innerBorder"
-                 BorderBrush="#CC82B9D8"
-                 BorderThickness="1"
-                 CornerRadius="3"
-                 Margin="1"
-                 Opacity="0" />
-
-         <ContentPresenter Margin="4,2,4,2" />
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter Property="Opacity"
-                    TargetName="outerBorder"
-                    Value="1" />
-            <Setter Property="Opacity"
-                    TargetName="innerBorder"
-                    Value="1" />
-         </Trigger>
-         <Trigger Property="IsEnabled"
-                  Value="False">
-            <Setter Property="Opacity"
-                    TargetName="outerBorder"
-                    Value="0" />
-            <Setter Property="Opacity"
-                    TargetName="innerBorder"
-                    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 x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-               <Viewbox MaxHeight="16"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Margin="{TemplateBinding Padding}"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-               </Viewbox>
-
-               <!-- This is the two white lines we see at top and bottom of the RowSelector Item. More visible on MouseOver -->
-               <Border BorderThickness="0,1,0,1"
-                       Margin="0,1,0,0"
-                       BorderBrush="{StaticResource rowSelectorDelimiterBorderBrush}"
-                       Opacity="0.4" />
-
-            </Grid>
-         </Border>
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource rowSelectorHotBackgroundBrush}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource rowSelectorPressedBackgroundBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: Row 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewRowTemplate"
-                    TargetType="local:Row">
-
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-
-            <!-- CellsHost panel -->
-            <ColumnDefinition Width="*" />
-         </Grid.ColumnDefinitions>
-
-         <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
-                                                    Grid.Column="0" />
-
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <Border x:Name="outerBackground"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <Border x:Name="rowBorder"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 BorderThickness="1"
-                 CornerRadius="3"
-                 views:TableView.CanScrollHorizontally="False">
-            <Border x:Name="innerBackground"
-                    BorderThickness="1"
-                    CornerRadius="2" />
-         </Border>
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- This trigger is used to display Mouse Over look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <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: DataRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewDataRowTemplate"
-                    TargetType="local:DataRow">
-
-      <!-- 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>
-
-         <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
-                                                    Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <Border x:Name="outerBackground"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <Border x:Name="rowBorder"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 BorderThickness="1"
-                 CornerRadius="3"
-                 views:TableView.CanScrollHorizontally="False">
-            <Border x:Name="innerBackground"
-                    BorderThickness="1"
-                    CornerRadius="2" />
-         </Border>
-
-         <!-- Button that is used to expand/collapse the details. -->
-         <Button x:Name="detailsToggle"
-                 Grid.Column="2"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Margin="2"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- This trigger is used to display the Active Selection look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="True" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource selectionRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource selectionOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- This trigger is used to display the Inactive Selection look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="False" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
-                          Value="False" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource inactiveSelectionRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource inactiveSelectionOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- This trigger is used to display Mouse Over look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- This trigger is used to display Mouse Over + Selected look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rowBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotSelectionRowBorderBrush}" />
-            <Setter TargetName="outerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotSelectionOuterRowBackgroundBrush}" />
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotSelectionInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- 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" />
-               <Condition Value="True"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </MultiDataTrigger>
-
-         <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" />
-               <Condition Value="False"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewColumnManagerRowTemplate"
-                    TargetType="local:ColumnManagerRow">
-
-      <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 Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False"
-                                                    Background="{TemplateBinding Background}" />
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Background="{TemplateBinding Background}" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <Decorator x:Name="indentationDecorator"
-                    Grid.Column="3">
-            <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>
-
-   <!--**************************
-    * TEMPLATE: Cell 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewCellTemplate"
-                    TargetType="local:Cell">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid>
-               <Border x:Name="cellBorder"
-                       BorderThickness="1"
-                       CornerRadius="3"
-                       Visibility="Collapsed">
-                  <Border x:Name="innerBackground"
-                          BorderThickness="1"
-                          CornerRadius="2">
-
-                  </Border>
-               </Border>
-
-               <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                           Margin="{TemplateBinding Padding}" />
-            </Grid>
-         </Border>
-
-         <Border x:Name="currentBorder"
-                 BorderBrush="Transparent"
-                 BorderThickness="1" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g., background/foreground) of the Cell to reflect specific
-              states (e.g., IsCurrent), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitly set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <!-- When the Cell is Current, we want to change its background/foreground to the appropriate brushes.
-              We do this only when the cell does not have a validation error because we must give priority
-              to the CellErrorStyle (if present).-->
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="False" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="True" />
-
-               <Condition Property="CellErrorStyle"
-                          Value="{x:Null}" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsCurrent}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="currentBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource selectionRowBorderBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
-              the Row's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsCurrent}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="currentBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource inactiveSelectionRowBorderBrush}" />
-
-         </MultiDataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).SelectionUnit}"
-                      Value="Cell">
-
-            <Setter TargetName="cellBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="currentBorder"
-                    Property="Visibility"
-                    Value="Collapsed" />
-
-         </DataTrigger>
-
-         <!-- This trigger is used to display Mouse Over look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).SelectionUnit}"
-                          Value="Cell" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="cellBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotRowBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource hotOuterRowBackgroundBrush}" />
-
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- This trigger is used to display Mouse Over + Selected look -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).SelectionUnit}"
-                          Value="Cell" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="cellBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource hotSelectionRowBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource hotSelectionOuterRowBackgroundBrush}" />
-
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{StaticResource hotSelectionInnerRowBackgroundBrush}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource selectionOuterRowBackgroundBrush}" />
-
-            <Setter TargetName="cellBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource selectionRowBorderBrush}" />
-
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource inactiveSelectionOuterRowBackgroundBrush}" />
-
-            <Setter TargetName="cellBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource inactiveSelectionRowBorderBrush}" />
-
-            <Setter TargetName="innerBackground"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-    <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
-    <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <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}">
-
-            <DockPanel>
-
-               <Grid>
-
-                  <DockPanel Margin="{TemplateBinding Padding}">
-
-                     <StackPanel Orientation="Horizontal"
-                                 DockPanel.Dock="Top"
-                                 HorizontalAlignment="Center">
-                        <ContentPresenter x:Name="sortGlyphPresenter"
-                                          Content="{x:Null}"
-                                          ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                          VerticalAlignment="Top"
-                                          Visibility="Hidden" />
-                     </StackPanel>
-                     <Grid>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="*" />
-                           <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                        <Border x:Name="thumbToggleBackgroundBorder"
-                                Grid.Column="1"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="0"
-                                Background="{StaticResource horizontalHeaderBackgroundBrush}">
-
-                           <ToggleButton x:Name="toggleButton"
-                                         Focusable="False"
-                                         VerticalAlignment="Stretch"
-                                         Visibility="Collapsed"
-                                         Margin="2,0,0,0"
-                                         Opacity="0.5" />
-
-                        </Border>
-                     </Grid>
-
-                  </DockPanel>
-
-                  <Border x:Name="delimiterBorder"
-                          BorderThickness="1,0,1,0"
-                          BorderBrush="{StaticResource rowSelectorDelimiterBorderBrush}" />
-               </Grid>
-
-            </DockPanel>
-
-         </Border>
-
-         <!-- Thumb that is used to resize the Column. -->
-         <Thumb x:Name="PART_ColumnResizerThumbLeft"
-                Style="{StaticResource invisibleThumbStyle}"
-                HorizontalAlignment="Left" />
-
-         <!-- Thumb that is used to resize the Column. -->
-         <Thumb x:Name="PART_ColumnResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                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="19,0,0,0" />
-         </MultiDataTrigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource columnManagerCellHotBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="delimiterBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource columnManagerCellHotBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="delimiterBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </DataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource columnManagerCellHotBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-            <Setter TargetName="delimiterBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellHotBackgroundBrush}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource columnManagerCellPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-
-            <Setter TargetName="delimiterBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupHeaderControl
-    ************************** -->
-   <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">
-         <!-- 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 intAdditionConverter}, 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}" />
-
-                  <!-- Blue line that is traced across the GroupHeader, following the content -->
-                  <Rectangle Fill="#B0BFDE"
-                             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 intAdditionConverter}, ConverterParameter=-1}" />
-
-            <Grid>
-               <Border x:Name="outerBorder"
-                       BorderBrush="#FF03395B"
-                       BorderThickness="0,1,0,1">
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="0.5*" />
-                        <RowDefinition Height="0.5*" />
-                     </Grid.RowDefinitions>
-                     <Border Grid.RowSpan="2">
-                        <Border.Background>
-                           <LinearGradientBrush EndPoint="0,0.5"
-                                                StartPoint="1,0.5">
-                              <GradientStop Color="#FF196C77"
-                                            Offset="0" />
-                              <GradientStop Color="#FF065F99"
-                                            Offset="1" />
-                           </LinearGradientBrush>
-                        </Border.Background>
-                     </Border>
-                     <Border Opacity="0.2"
-                             Grid.RowSpan="2">
-                        <Border.Background>
-                           <LinearGradientBrush EndPoint="0.5,0.5"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#CCFFFFFF"
-                                            Offset="1" />
-                              <GradientStop Color="#4CFFFFFF"
-                                            Offset="1" />
-                           </LinearGradientBrush>
-                        </Border.Background>
-                     </Border>
-                  </Grid>
-               </Border>
-
-               <!-- 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"
-                                       TextElement.Foreground="{TemplateBinding Foreground}"
-                                       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: HierarchicalGroupByControl
-    ************************** -->
-
-   <!-- TreeViewItem Style to avoid displaying Expander and avoid selection and click -->
-   <Style x:Key="hierarchicalGroupByControlTreeViewItemStyle"
-          TargetType="{x:Type TreeViewItem}">
-      <Style.Resources>
-         <conv:TreeViewLineConverter x:Key="LineConverter" />
-      </Style.Resources>
-
-      <Setter Property="IsExpanded"
-              Value="True" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="Visibility">
-         <Setter.Value>
-            <PriorityBinding>
-               <Binding Path="."
-                        Converter="{StaticResource notDetailConfigConverter}"
-                        ConverterParameter="{x:Type local:DetailConfiguration}" />
-               <Binding Path="Visible"
-                        Converter="{StaticResource booleanToVisibilityConverter}" />
-            </PriorityBinding>
-
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TreeViewItem}">
-               <Grid ShowGridLines="False">
-                  <Grid.ColumnDefinitions>
-
-                     <!--This ColumnDefinition is required for stair spacing-->
-                     <ColumnDefinition Width="20" />
-                     <ColumnDefinition Width="Auto" />
-                     <ColumnDefinition Width="*" />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="*" />
-                     <RowDefinition MaxHeight="1" />
-                     <RowDefinition Height="*" />
-                     <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-
-                  <Border BorderThickness="{TemplateBinding Border.BorderThickness}"
-                          Padding="{TemplateBinding Control.Padding}"
-                          BorderBrush="{TemplateBinding Border.BorderBrush}"
-                          Background="{TemplateBinding Panel.Background}"
-                          Name="treeViewItemBorder"
-                          SnapsToDevicePixels="True"
-                          VerticalAlignment="Center"
-                          Grid.Column="1"
-                          Grid.RowSpan="3">
-
-                     <!--Will contain DetailGroupByConrol-->
-
-                     <ContentPresenter Content="{TemplateBinding HeaderedContentControl.Header}"
-                                       ContentTemplate="{TemplateBinding HeaderedContentControl.HeaderTemplate}"
-                                       ContentSource="Header"
-                                       Name="PART_Header"
-                                       HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
-                                       SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"
-                                       Margin="2,0,2,0" />
-                  </Border>
-
-                  <ItemsPresenter Name="ItemsHost"
-                                  Grid.Column="1"
-                                  Grid.Row="3"
-                                  Grid.ColumnSpan="2" />
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsExpanded"
-                           Value="false">
-                     <Setter TargetName="ItemsHost"
-                             Property="Visibility"
-                             Value="Collapsed" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <ControlTemplate x:Key="tableflowViewAeroNormalColorHierarchicalGroupByControlTemplate"
-                    TargetType="local:HierarchicalGroupByControl">
-      <ControlTemplate.Resources>
-         <!--this style is set to avoid having implicit treeview style
-             overide the HierarchicalGroupByControl's TreeView-->
-         <Style TargetType="TreeView" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-
-            <!-- HierarchicalGroupByControl -->
-            <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="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Grid.Column="2">
-
-            <Grid>
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="0.53*" />
-                     <RowDefinition Height="0.27*" />
-                     <RowDefinition Height="0.2*" />
-                  </Grid.RowDefinitions>
-
-                  <Border Grid.RowSpan="3">
-                     <Border.Background>
-                        <LinearGradientBrush StartPoint="0,0.5"
-                                             EndPoint="1,0.5">
-                           <GradientStop Offset="0"
-                                         Color="#044875" />
-                           <GradientStop Offset="1"
-                                         Color="#196C77" />
-                        </LinearGradientBrush>
-                     </Border.Background>
-                  </Border>
-
-                  <Border Grid.Row="2">
-                     <Border.Background>
-                        <LinearGradientBrush StartPoint="0.5,0"
-                                             EndPoint="0.5,1">
-                           <GradientStop Offset="0"
-                                         Color="#008CC1C6" />
-                           <GradientStop Offset="0.5"
-                                         Color="#0F85BDC2" />
-                           <GradientStop Offset="0.96"
-                                         Color="#AE80BBBF" />
-                           <GradientStop Offset="1"
-                                         Color="#B280BBBF" />
-                        </LinearGradientBrush>
-                     </Border.Background>
-                  </Border>
-
-                  <Border Grid.Row="0">
-                     <Border.Background>
-                        <LinearGradientBrush StartPoint="0.5,1"
-                                             EndPoint="0.5,0">
-                           <GradientStop Offset="0"
-                                         Color="#26FFFFFF" />
-                           <GradientStop Offset="1"
-                                         Color="#B1FFFFFF" />
-                           <GradientStop Offset="0.643"
-                                         Color="#66FFFFFF" />
-                        </LinearGradientBrush>
-                     </Border.Background>
-                  </Border>
-
-                  <!--This element has to be external to avoid being overlapped by the gradients-->
-                  <Border Grid.RowSpan="3"
-                          BorderThickness="1"
-                          BorderBrush="#093442">
-
-                     <Border Grid.RowSpan="3"
-                             BorderThickness="1"
-                             BorderBrush="#7FFFFFFF" />
-                  </Border>
-
-               </Grid>
-
-               <StackPanel Orientation="Horizontal">
-
-                  <TreeView x:Name="PART_HierarchicalGroupByControlTreeView"
-                            ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="Transparent"
-                            Focusable="False">
-
-                     <TreeViewItem Header="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext)}"
-                                   HeaderTemplate="{StaticResource dataGridContextTemplate}"
-                                   ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DetailConfigurations}"
-                                   ItemTemplate="{StaticResource detailConfigurationTemplate}"
-                                   ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                                   IsExpanded="True" />
-
-                  </TreeView>
-
-                  <!-- This ContentPresenter displays the value of the NoGroupContent property
-                 of the GroupByControl. This content must only be displayed when there are
-                 no groups present, so we set its Visibility to Collapsed by default and
-                 it is made visible via a trigger. -->
-                  <ContentPresenter x:Name="noGroupContentPresenter"
-                                    Content="{TemplateBinding NoGroupContent}"
-                                    VerticalAlignment="Center"
-                                    Visibility="Collapsed"
-                                    Margin="5,0,0,0" />
-
-               </StackPanel>
-               <!-- The GroupByControl is an ItemsControl, so it must have an ItemsPresenter in its
-                 Template in order to layout and show its child items. The default ItemsPanel
-                 of the GroupByControl is a "StaircasePanel", which layout its items in a
-                 staircase-like pattern and draws connecting lines between the items. -->
-               <ItemsPresenter Margin="{TemplateBinding Padding}" />
-
-            </Grid>
-         </Border>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=HasGroups}"
-                      Value="True">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-            <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewAeroNormalColorHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}"
-                  Margin="0,4,0,4">
-
-         <Grid VerticalAlignment="Top"
-               HorizontalAlignment="Center"
-               Margin="0,0,0,0">
-
-            <Border x:Name="border1"
-                    BorderBrush="#1AFFFFFF"
-                    CornerRadius="2"
-                    BorderThickness="1">
-
-               <Border x:Name="border2"
-                       BorderBrush="#80022841"
-                       CornerRadius="2"
-                       BorderThickness="1">
-
-                  <Border x:Name="border3"
-                          BorderBrush="#34FFFFFF"
-                          CornerRadius="2"
-                          BorderThickness="1">
-
-                     <TextBlock x:Name="titleTextBlock"
-                                Text="{TemplateBinding Title}"
-                                Foreground="White"
-                                Margin="3,0,3,0" />
-                  </Border>
-               </Border>
-            </Border>
-         </Grid>
-
-         <ItemsPresenter Margin="2,0,0,0"
-                         VerticalAlignment="Bottom"
-                         HorizontalAlignment="Right" />
-
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="aeroNormalColorHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-
-         <Grid>
-            <Border x:Name="border1"
-                    BorderBrush="#1AFFFFFF"
-                    CornerRadius="2"
-                    BorderThickness="1" />
-
-            <Border x:Name="border2"
-                    BorderBrush="#80022841"
-                    CornerRadius="2"
-                    BorderThickness="1"
-                    Margin="1" />
-
-            <Border x:Name="border3"
-                    BorderBrush="#34FFFFFF"
-                    CornerRadius="2"
-                    BorderThickness="1"
-                    Margin="2" />
-
-            <Border x:Name="topGradient"
-                    Height="17"
-                    VerticalAlignment="Top">
-               <Border.Background>
-                  <LinearGradientBrush StartPoint="0.5,1"
-                                       EndPoint="0.503,0.039">
-                     <GradientStop Offset="0"
-                                   Color="#00FFFFFF" />
-                     <GradientStop Offset="1"
-                                   Color="#4CFFFFFF" />
-                  </LinearGradientBrush>
-               </Border.Background>
-            </Border>
-
-            <Border x:Name="bottomGradient"
-                    Margin="2">
-               <Border.Background>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-                     <GradientStop Offset="0"
-                                   Color="#99FFFFFF" />
-                     <GradientStop Offset="0.17"
-                                   Color="#99FFFFFF" />
-                     <GradientStop Offset="1"
-                                   Color="#00FFFFFF" />
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.48747"
-                                         CenterY="1.21575"
-                                         Angle="-90" />
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Border.Background>
-
-               <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-               <StackPanel Orientation="Horizontal"
-                           Margin="{TemplateBinding Padding}"
-                           TextElement.Foreground="White">
-
-                  <ContentPresenter Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                  <ContentPresenter x:Name="sortGlyphPresenter"
-                                    Margin="6,0,4,0"
-                                    Content="{x:Null}"
-                                    ContentTemplate="{StaticResource groupByItemAscendingSortGlyph}"
-                                    Visibility="Hidden" />
-
-               </StackPanel>
-
-            </Border>
-         </Grid>
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="border1"
-                    Property="BorderBrush"
-                    Value="#4DFFFFFF" />
-
-            <Setter TargetName="border2"
-                    Property="BorderBrush"
-                    Value="#52022841" />
-
-            <Setter TargetName="border3"
-                    Property="BorderBrush"
-                    Value="#71FFFFFF" />
-
-            <Setter TargetName="topGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.503,1.013"
-                                       EndPoint="0.503,0.039">
-                     <GradientStop Offset="0"
-                                   Color="#19FFFFFF" />
-                     <GradientStop Offset="1"
-                                   Color="#99FFFFFF" />
-                  </LinearGradientBrush>
-
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="bottomGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-                     <GradientStop Offset="0.0195"
-                                   Color="#FFFFFFFF" />
-                     <GradientStop Offset="0.169"
-                                   Color="#FFFFFFFF" />
-                     <GradientStop Offset="1"
-                                   Color="#00FFFFFF" />
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.487447"
-                                         CenterY="1.21575"
-                                         Angle="-90" />
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="border1"
-                    Property="BorderBrush"
-                    Value="#4DFFFFFF" />
-
-            <Setter TargetName="border2"
-                    Property="BorderBrush"
-                    Value="#AE022841" />
-
-            <Setter TargetName="border3"
-                    Property="BorderBrush">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.542,0.999"
-                                       EndPoint="0.542,0.0231">
-                     <GradientStop Offset="0"
-                                   Color="#0A2F3B" />
-                     <GradientStop Offset="0.509"
-                                   Color="#0A2F3B" />
-                     <GradientStop Offset="0.524"
-                                   Color="#4D6B79" />
-                     <GradientStop Offset="1"
-                                   Color="#4D6B79" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="topGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.503339,1.0131"
-                                       EndPoint="0.503339,0.0388058">
-                     <GradientStop Offset="0"
-                                   Color="#17699EB5" />
-                     <GradientStop Offset="1"
-                                   Color="#FF5E8799" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="bottomGradient"
-                    Property="Background">
-
-               <Setter.Value>
-                  <RadialGradientBrush RadiusX="0.550205"
-                                       RadiusY="1.03782"
-                                       Center="0.487447,1.21575"
-                                       GradientOrigin="0.487447,1.21575">
-
-                     <GradientStop Offset="0.019"
-                                   Color="#FF000000" />
-                     <GradientStop Offset="0.169"
-                                   Color="#FF000000" />
-                     <GradientStop Offset="1"
-                                   Color="#33000000" />
-
-                     <RadialGradientBrush.RelativeTransform>
-                        <RotateTransform CenterX="0.487447"
-                                         CenterY="1.21575"
-                                         Angle="-90" />
-                     </RadialGradientBrush.RelativeTransform>
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Descending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource groupByItemDescendingSortGlyph}" />
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-      </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="tableflowViewAeroNormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableflowViewForcedAeroNormalColorGridControlStyle"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Aero;V4.0.0.0;31bf3856ad364e35;component\themes/aero.normalcolor.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource verticalHeaderBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorRowSelectorStyle"
-          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="BorderBrush"
-              Value="{StaticResource rowSelectorBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="Center" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="Top" />
-
-      <Setter Property="Padding"
-              Value="2" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowTemplate}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F1F2F4" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource horizontalHeaderBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <!-- We don't want to display a RowSelector for the ColumnManagerRow. -->
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <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 x:Key="tableflowViewAeroNormalColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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="tableflowViewAeroNormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorColumnManagerCellStyle"
-          TargetType="local:ColumnManagerCell">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource columnManagerCellBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorGroupByControlStyle"
-          TargetType="local:GroupByControl">
-
-      <Setter Property="Foreground"
-              Value="{StaticResource groupByControlForegroundBrush}" />
-
-      <!-- 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="Padding"
-              Value="8" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource aeroNormalColorGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Padding"
-              Value="{StaticResource columnManagerCellPadding}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource aeroNormalColorGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <!-- Set the GroupHeaderControl's background to Transparent to make it hit-testable. -->
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource selectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource inactiveSelectionInnerRowBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- The GroupHeaderControl itself must not be focusable. The main Border inside its Template will
-           be made Focusable because it holds 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}" />
-
-            <Setter Property="Foreground"
-                    Value="White" />
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <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="tableflowViewAeroNormalColorDetailIndicatorStyle"
-          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="tableflowViewAeroNormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableflowViewAeroNormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewAeroNormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <!-- The Background property must be set for DragManager to work properly -->
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="White" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="ConnectionLinePen"
-              Value="{StaticResource groupByConnectionLinePen}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByControlTemplate}" />
-
-      <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="tableflowViewAeroNormalColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <!--The Background property must be set for DragManager to work properly-->
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource columnManagerCellPadding}" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource aeroNormalColorHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorGroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorGroupNavigationControlItemStyle"
-          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="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-                     <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="tableflowViewAeroNormalColorGroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableflowViewAeroNormalColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FFA9DAF6"
-                             Offset="0" />
-
-               <GradientStop Color="#FFD9F0FC"
-                             Offset="0.5" />
-
-               <GradientStop Color="#FFE8F5FD"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF3C7FB1" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="Black" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewAeroNormalColorDefaultValues"
-          TargetType="views:TableflowView">
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <Setter Property="DefaultDropMarkPen"
-              Value="{StaticResource dropMarkPen}" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource hotRowBorderBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="0" />
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource hotRowBorderBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="0" />
-
-      <!-- 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:AeroNormalColorTheme}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewForcedAeroNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:AeroNormalColorTheme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Controls.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Controls.xaml
deleted file mode 100644
index 770c765a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Controls.xaml
+++ /dev/null
@@ -1,2186 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Aero2.normalcolor.Resources.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <LinearGradientBrush x:Key="NormalBrush"
-                        EndPoint="0,1"
-                        StartPoint="0,0">
-      <GradientStop Color="#EEE"
-                    Offset="0.0" />
-      <GradientStop Color="#CCC"
-                    Offset="1.0" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="DisabledForegroundBrush"
-                    Color="#888" />
-   <SolidColorBrush x:Key="DisabledBackgroundBrush"
-                    Color="#EEE" />
-
-   <ControlTemplate x:Key="ComboBoxTextBox"
-                    TargetType="{x:Type TextBox}">
-
-      <!-- This must be named as PART_ContentHost -->
-      <Border x:Name="PART_ContentHost"
-              Focusable="False"
-              Background="{TemplateBinding Background}" />
-   </ControlTemplate>
-
-   <!--These Brushes are the basic light and dark borders for the controls-->
-   <SolidColorBrush x:Key="basicWhiteBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="basicBlackBorderBrush"
-                    Color="Black" />
-
-   <!-- Used for Checkmark, Radio button, TreeViewItem, Expander ToggleButton glyphs -->
-   <SolidColorBrush x:Key="aero2NormalColorGlyphBrush"
-                    Color="#444" />
-
-   <SolidColorBrush x:Key="glyphDefaultBordeBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="scrollbarGlyphBordeBrush"
-                    Color="White" />
-
-   <LinearGradientBrush x:Key="checkBoxBorderDefaultBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#3F1686D8"
-                    Offset="0" />
-      <GradientStop Offset="0.53"
-                    Color="#001686D8" />
-      <GradientStop Color="#3F1686D8"
-                    Offset="0.987" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="checkBoxPathDefaultBackgroundBrush"
-                        EndPoint="0.6,0.75"
-                        StartPoint="0,0">
-      <GradientStop Color="#7F1686D8" />
-      <GradientStop Offset="1"
-                    Color="#001686D8" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="checkBoxPathMouseOverBackgroundBrush"
-                        EndPoint="0.6,0.75"
-                        StartPoint="0,0">
-      <GradientStop Color="White" />
-      <GradientStop Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="checkBoxBorderPressedBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#BF1686D8" />
-      <GradientStop Offset="0.53" />
-      <GradientStop Color="#BF1686D8"
-                    Offset="0.987" />
-      <GradientStop Color="#7F56A7E2"
-                    Offset="0.252" />
-      <GradientStop Color="#7F56A7E2"
-                    Offset="0.756" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="buttonOutsideBorderDefaultBorderBrush"
-                    Color="#FFAAAAAA" />
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderDefaultBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FF0280E0"
-                    Offset="0.51" />
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderDefaultVerticalBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FF0280E0"
-                    Offset="0.51" />
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="buttonInsideBorderIsMouseOverBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="buttonInsideBorderIsPressedBorderBrush"
-                    Color="White" />
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderIsPressedBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FF015EC8"
-                    Offset="0.5" />
-      <GradientStop Color="#FF0283E2"
-                    Offset="0.49" />
-      <GradientStop Color="#FF015EC8"
-                    Offset="1" />
-      <GradientStop Color="#FF0283E2"
-                    Offset="0.003" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderIsPressedVerticalBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FF015EC8"
-                    Offset="0.5" />
-      <GradientStop Color="#FF0283E2"
-                    Offset="0.49" />
-      <GradientStop Color="#FF015EC8"
-                    Offset="1" />
-      <GradientStop Color="#FF0283E2"
-                    Offset="0.003" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderIsMouseOverBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FF31B7FF"
-                    Offset="0.49" />
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderIsMouseOverVerticalBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FF31B7FF"
-                    Offset="0.49" />
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="buttonOutsideBorderDisabledBorderBrush"
-                    Color="#AAA" />
-
-   <SolidColorBrush x:Key="buttonOutsideBorderDisabledBackgroundBrush"
-                    Color="#EEE" />
-
-   <!-- Used for background of ScrollViewer, TreeView, ListBox, Expander, TextBox, Tab Control -->
-   <SolidColorBrush x:Key="windowDefaultBackgroundBrush"
-                    Color="#FFFFFFFF" />
-
-   <SolidColorBrush x:Key="repeatButtonBorderDefaultBackgrounBrush"
-                    Color="Transparent" />
-
-   <DataTemplate x:Key="leafGlyph">
-      <Viewbox RenderTransformOrigin="0.5,0.5">
-         <Viewbox.LayoutTransform>
-            <RotateTransform Angle="133" />
-         </Viewbox.LayoutTransform>
-         <Grid Width="32.737"
-               Height="23.022">
-            <Path Stretch="Fill"
-                  Width="27.518"
-                  Data="F1M359.521,63.197C359.521,63.197,365.377,73.922,387.039,72.272L387.039,72.272C382.633,66.602,375.129,60.384,367.609,60.385L367.609,60.385C364.865,60.385,362.119,61.213,359.521,63.197"
-                  HorizontalAlignment="Right"
-                  Margin="0,0,1,10.962">
-               <Path.Fill>
-                  <LinearGradientBrush EndPoint="0.954,0.925"
-                                       StartPoint="0.041,0.212">
-                     <GradientStop Color="#3FA0FF00"
-                                   Offset="0" />
-                     <GradientStop Color="#FF35D16A"
-                                   Offset="0.504" />
-                     <GradientStop Color="#FF269B4E"
-                                   Offset="0.991" />
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-            <Path Stretch="Fill"
-                  Width="16.811"
-                  Data="F1M371.038,82.379C371.038,82.379,387.183,87.576,387.849,73.688L387.849,73.688C386.354,73.428,385.138,73.309,384.133,73.309L384.133,73.309C377.22,73.309,380.281,78.91,371.038,82.379"
-                  HorizontalAlignment="Right"
-                  Margin="0,13,0,0"
-                  VerticalAlignment="Top"
-                  Height="10.022">
-               <Path.Fill>
-                  <LinearGradientBrush EndPoint="0.944,0.199"
-                                       StartPoint="0.014,1.019">
-                     <GradientStop Color="#3FA0FF00"
-                                   Offset="0" />
-                     <GradientStop Color="#FF35D16A"
-                                   Offset="0.496" />
-                     <GradientStop Color="#FF269B4E"
-                                   Offset="0.991" />
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-            <Path Stretch="Fill"
-                  Width="24.737"
-                  Data="F1M354.892,78.722C364.253,87.011,375.045,79.608,379.629,73.713L379.629,73.713C376.149,72.569,373.047,72.116,370.317,72.116L370.317,72.116C359.895,72.115,354.892,78.722,354.892,78.722"
-                  HorizontalAlignment="Right"
-                  Margin="0,12,8,0"
-                  VerticalAlignment="Top"
-                  Height="10.306">
-               <Path.Fill>
-                  <LinearGradientBrush EndPoint="0.93,0.231"
-                                       StartPoint="0.046,0.686">
-                     <GradientStop Color="#3FA0FF00"
-                                   Offset="0" />
-                     <GradientStop Color="#FF35D16A"
-                                   Offset="0.526" />
-                     <GradientStop Color="#FF269B4E"
-                                   Offset="0.996" />
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-         </Grid>
-      </Viewbox>
-   </DataTemplate>
-
-   <!-- Radio Button -->
-   <Style TargetType="{x:Type RadioButton}">
-
-      <Setter Property="SnapsToDevicePixels"
-              Value="true" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type RadioButton}">
-
-               <!-- BulletDecorator is used to provide baseline alignment between the checkmark and the Content -->
-               <BulletDecorator Background="Transparent">
-
-                  <BulletDecorator.Bullet>
-
-                     <Grid Width="13"
-                           Height="13">
-
-                        <Ellipse x:Name="EllipseOutside"
-                                 Fill="{StaticResource checkBoxOutsideBorderDefaultBackgroundBrush}"
-                                 Stroke="{StaticResource checkBoxOutsideBorderDefaultBorderBrush}"
-                                 StrokeThickness="1" />
-
-                        <Ellipse x:Name="EllipseInside"
-                                 Fill="{StaticResource checkBoxInsideBorderDefaultBackgroundBrush}"
-                                 Stroke="{StaticResource checkBoxInsideBorderDefaultBorderBrush}"
-                                 StrokeThickness="1"
-                                 HorizontalAlignment="Stretch"
-                                 Margin="2,2,2,2"
-                                 Width="Auto" />
-
-                        <Ellipse x:Name="CheckMark"
-                                 Margin="4"
-                                 Fill="{StaticResource glyphDefaultBordeBrush}" />
-                     </Grid>
-
-                  </BulletDecorator.Bullet>
-
-                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    Margin="{TemplateBinding Padding}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    RecognizesAccessKey="True" />
-
-               </BulletDecorator>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsChecked"
-                           Value="false">
-
-                     <Setter Property="Visibility"
-                             Value="Collapsed"
-                             TargetName="CheckMark" />
-                  </Trigger>
-
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsMouseOverBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsMouseOverBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsMouseOverBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsMouseOverBackgroundBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsPressed"
-                           Value="true">
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsPressedBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsPressedBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsPressedBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsPressedBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="#80000000" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsEnabledBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsEnabledBackgroundBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsEnabledBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsEnabledBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- checkBoxWindows8 -->
-
-   <Style TargetType="{x:Type CheckBox}">
-
-      <Setter Property="SnapsToDevicePixels"
-              Value="true" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type CheckBox}">
-               <Border>
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="13" />
-                     </Grid.ColumnDefinitions>
-                     <Border Name="Border"
-                             Margin="1"
-                             Grid.Column="0"
-                             Grid.ColumnSpan="4" />
-
-                     <Grid HorizontalAlignment="Center"
-                           VerticalAlignment="Center"
-                           Width="13"
-                           Height="13">
-
-                        <Border Background="#FFD1ECFF"
-                                CornerRadius="1"
-                                Margin="1" />
-
-                        <Border x:Name="insideBorder"
-                                Margin="1"
-                                BorderBrush="White"
-                                BorderThickness="1"
-                                CornerRadius="1"
-                                Background="{StaticResource checkBoxBorderDefaultBackgroundBrush}" />
-
-                        <Path x:Name="CheckBoxPath"
-                              Stroke="{x:Null}"
-                              Stretch="Fill"
-                              Margin="0.976,0.985,0.978,1.024"
-                              Fill="{StaticResource checkBoxPathDefaultBackgroundBrush}"
-                              Data="M0.89013951,21.53754 C0.89013951,22.13754 0.92765297,3.68705 1.0012841,2.92993 1.2523327,0.34849 -3.6053779,-0.02693 23.25,-0.01368 46.88465,-0.00203 353.22295,0.01789 368.74551,-0.01368 399.32761,-0.0759 393.45345,-0.35295 392.87051,4.81326 366.3499,4.83686 234.23724,4.3665 163.26526,7.74613 92.293281,11.12575 15.63336,16.94202 12.222291,22.88633 10.979058,22.89814 7.5156977,23.01335 3.751176,22.50587 -0.013345688,21.99839 0.89013951,21.32853 0.89013951,21.53754 z" />
-
-                        <Border BorderBrush="Black"
-                                BorderThickness="1"
-                                CornerRadius="2" />
-                     </Grid>
-
-                     <Border Name="Check"
-                             Width="13"
-                             Height="13"
-                             Margin="6,0,6,0"
-                             Background="Transparent"
-                             BorderThickness="1"
-                             BorderBrush="Transparent">
-                        <Path Name="CheckMark"
-                              Visibility="Hidden"
-                              SnapsToDevicePixels="False"
-                              Fill="{StaticResource glyphDefaultBordeBrush}"
-                              Height="11"
-                              Width="10"
-                              Stretch="Fill"
-                              Opacity="1"
-                              Data="M 9.58416748046875,0 C9.58416748046875,0 10,0.6159515380859375 10,0.6159515380859375 8.7657470703125,1.540008544921875 8.419189453125,2.9010162353515625 6.96038818359375,4.698974609375 5.5015869140625,6.4969329833984375 4.602294921875,9.774444580078125 4.602294921875,9.774444580078125 4.602294921875,9.774444580078125 3.9029541015625,10.2296142578125 3.9029541015625,10.2296142578125 3.419921875,10.55328369140625 3.01983642578125,10.810089111328125 2.70257568359375,11 2.581787109375,10.676483154296875 2.114166259765625,9.48345947265625 1.46875,8.5 0.8125,7.5 0.4044189453125,6.9029998779296875 0,6.7393035888671875 0.667236328125,5.9750518798828125 1.8385009765625,5.592926025390625 1.8385009765625,5.592926025390625 1.8385009765625,5.592926025390625 3.555908203125,7.8286285400390625 3.555908203125,7.8286285400390625 4.3878173828125,6.349609375 4.5516357421875,4.8782501220703125 6.04742431640625,3.4145355224609375 7.543212890625,1.9508209228515625 8.055419921875,0.8126373291015625 9.58416748046875,0 z" />
-                     </Border>
-                     <ContentPresenter Name="HeaderHost"
-                                       Grid.Column="1"
-                                       VerticalAlignment="Center"
-                                       ContentSource="Header"
-                                       RecognizesAccessKey="True"
-                                       Content="{TemplateBinding Content}"
-                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-                     <Setter TargetName="CheckBoxPath"
-                             Property="Fill"
-                             Value="{StaticResource checkBoxPathMouseOverBackgroundBrush}" />
-                  </Trigger>
-                  <Trigger Property="IsPressed"
-                           Value="true">
-                     <Setter TargetName="CheckBoxPath"
-                             Property="Fill"
-                             Value="{StaticResource checkBoxPathDefaultBackgroundBrush}" />
-                     <Setter TargetName="insideBorder"
-                             Property="Background"
-                             Value="{StaticResource checkBoxBorderPressedBackgroundBrush}" />
-                  </Trigger>
-                  <Trigger Property="IsChecked"
-                           Value="true">
-                     <Setter TargetName="CheckMark"
-                             Property="Visibility"
-                             Value="Visible" />
-                  </Trigger>
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-                     <Setter Property="Foreground"
-                             Value="#DADADA" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- Expander 
-	 This uses the Simpler ExpanderToggleButton. It sets Visibility on the ContentPresenter to expand
-	 Limitations : The Simple Expander only expands down -->
-
-   <!-- Expander ToggleButton - This Button is used by the Expander control. When it is toggled it switches visibility on the Up_Arrow and Down_Arrow -->
-   <ControlTemplate x:Key="toggleButtonControllAero2NormalColor"
-                    TargetType="{x:Type ToggleButton}">
-
-      <Grid>
-         <Border Background="Transparent" />
-
-         <Border CornerRadius="4"
-                 BorderBrush="Black"
-                 BorderThickness="1,0,0,1"
-                 MinHeight="16"
-                 MinWidth="16"
-                 SnapsToDevicePixels="True"
-                 HorizontalAlignment="Center"
-                 VerticalAlignment="Center"
-                 IsHitTestVisible="False"
-                 Margin="0,0,4,0">
-            <Border x:Name="toggleDecorator"
-                    CornerRadius="3"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    BorderThickness="1,0,0,1"
-                    SnapsToDevicePixels="True">
-               <Path Data="M 0 0 L 4 4 L 8 0 Z"
-                     Fill="{StaticResource aero2NormalColorGlyphBrush}"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     IsHitTestVisible="False"
-                     Margin="0,2,2,0" />
-            </Border>
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-
-            <Setter Property="Background"
-                    TargetName="toggleDecorator">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Offset="0" />
-                     <GradientStop Color="White"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsChecked"
-                  Value="true">
-
-            <Setter Property="Background"
-                    TargetName="toggleDecorator">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Offset="1" />
-                     <GradientStop Color="#FF04A2F7"
-                                   Offset="0" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsEnabled"
-                  Value="False">
-
-            <Setter Property="Opacity"
-                    Value="0.3"
-                    TargetName="toggleDecorator" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type Expander}">
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type Expander}">
-
-               <Grid>
-
-                  <Grid.RowDefinitions>
-
-                     <RowDefinition Height="Auto" />
-
-                     <RowDefinition x:Name="ContentRow"
-                                    Height="*" />
-
-                  </Grid.RowDefinitions>
-
-                  <Border x:Name="Border"
-                          Grid.Row="0"
-                          Background="{StaticResource windowDefaultBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="0,0,0,0">
-
-                     <Grid>
-
-                        <Grid.ColumnDefinitions>
-
-                           <ColumnDefinition Width="20" />
-
-                           <ColumnDefinition Width="*" />
-
-                        </Grid.ColumnDefinitions>
-
-                        <ToggleButton Template="{StaticResource toggleButtonControllAero2NormalColor}"
-                                      Background="{StaticResource NormalBrush}"
-                                      IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                      OverridesDefaultStyle="True" />
-
-                        <ContentPresenter Grid.Column="1"
-                                          Margin="4"
-                                          RecognizesAccessKey="True"
-                                          ContentSource="Header" />
-
-                     </Grid>
-
-                  </Border>
-
-                  <Border x:Name="ExpandSite"
-                          Visibility="Collapsed"
-                          Grid.Row="1"
-                          Background="{StaticResource windowDefaultBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="1,0,1,1"
-                          CornerRadius="0,0,0,0">
-
-                     <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       Margin="{TemplateBinding Padding}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Focusable="false" />
-
-                  </Border>
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsExpanded"
-                           Value="True">
-
-                     <Setter Property="Visibility"
-                             Value="Visible"
-                             TargetName="ExpandSite" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- ScrollBar  This makes use of Thumb, RepeatButton and ScrollRepeatButton -->
-
-   <!-- Repeat Button - This is used by ScrollBar for the up and down buttons -->
-   <Style x:Key="increaseDecreaseRepeatButtonAero2NormalColor"
-          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="{StaticResource buttonOutsideBorderDefaultVerticalBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="1"
-                          CornerRadius="3" />
-
-                  <ContentPresenter x:Name="ContentPresenter"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-
-               </Grid>
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderIsMouseOverVerticalBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsPressed"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderIsPressedVerticalBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style x:Key="increaseDecreaseHorizontalRepeatButtonAero2NormalColor"
-          TargetType="{x:Type RepeatButton}"
-          BasedOn="{StaticResource increaseDecreaseRepeatButtonAero2NormalColor}">
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type RepeatButton}">
-
-               <Grid>
-
-                  <Border x:Name="Border"
-                          Background="{StaticResource buttonOutsideBorderDefaultBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="1"
-                          CornerRadius="3" />
-
-                  <ContentPresenter x:Name="ContentPresenter"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-
-               </Grid>
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderIsMouseOverBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsPressed"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderIsPressedBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- Thumb - The Thumb is the draggable part of the Scrollbar -->
-   <Style x:Key="thumbAero2NormalColor"
-          TargetType="{x:Type Thumb}">
-
-      <Setter Property="OverridesDefaultStyle"
-              Value="True" />
-
-      <Setter Property="IsTabStop"
-              Value="False" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Thumb}">
-               <Grid x:Name="Grid"
-                     Margin="0,0,0,0">
-                  <Rectangle x:Name="Rectangle"
-                             HorizontalAlignment="Stretch"
-                             VerticalAlignment="Stretch"
-                             Width="Auto"
-                             Height="Auto"
-                             RadiusX="3"
-                             RadiusY="3"
-                             Fill="{StaticResource buttonOutsideBorderDefaultVerticalBackgroundBrush}"
-                             Stroke="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver"
-                           Value="True">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderIsMouseOverVerticalBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsDragging"
-                           Value="True">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderIsPressedVerticalBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style x:Key="horizontalthumbAero2NormalColor"
-          TargetType="{x:Type Thumb}"
-          BasedOn="{StaticResource thumbAero2NormalColor}">
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Thumb}">
-               <Grid x:Name="Grid"
-                     Margin="0,0,0,0">
-                  <Rectangle x:Name="Rectangle"
-                             HorizontalAlignment="Stretch"
-                             VerticalAlignment="Stretch"
-                             Width="Auto"
-                             Height="Auto"
-                             RadiusX="3"
-                             RadiusY="3"
-                             Fill="{StaticResource buttonOutsideBorderDefaultBackgroundBrush}"
-                             Stroke="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver"
-                           Value="True">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderIsMouseOverBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsDragging"
-                           Value="True">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderIsPressedBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- ScrollRepeatButton Style - This RepeatButton is used above and below the Thumb in the Scrollbar. They are set to transparent si that they do not show over the scrollbar -->
-   <Style x:Key="repeatButtonPageUpDownAero2NormalColor"
-          TargetType="{x:Type RepeatButton}">
-
-      <Setter Property="OverridesDefaultStyle"
-              Value="True" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="IsTabStop"
-              Value="false" />
-
-      <Setter Property="Focusable"
-              Value="false" />
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type RepeatButton}">
-
-               <Grid>
-                  <Rectangle Fill="{StaticResource repeatButtonBorderDefaultBackgrounBrush}" />
-               </Grid>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style TargetType="{x:Type ScrollBar}">
-
-      <Setter Property="Stylus.IsFlicksEnabled"
-              Value="false" />
-
-      <Setter Property="Stylus.IsPressAndHoldEnabled"
-              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="Background"
-              Value="#FFD1ECFF" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ScrollBar}">
-               <Grid x:Name="GridRoot"
-                     Background="{TemplateBinding Background}">
-
-                  <Grid.RowDefinitions>
-
-                     <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
-
-                     <RowDefinition Height="0.00001*" />
-
-                     <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
-
-                  </Grid.RowDefinitions>
-
-                  <Border Grid.RowSpan="3"
-                          BorderBrush="#FFAAAAAA"
-                          BorderThickness="1" />
-
-                  <RepeatButton x:Name="DecreaseRepeat"
-                                Style="{StaticResource increaseDecreaseRepeatButtonAero2NormalColor}"
-                                Command="ScrollBar.LineUpCommand">
-                     <Grid>
-
-                        <Path x:Name="DecreaseArrow"
-                              Stroke="{x:Null}"
-                              StrokeThickness="1"
-                              Data="M 0 4 L 8 4 L 4 0 Z"
-                              Fill="{StaticResource scrollbarGlyphBordeBrush}" />
-
-                     </Grid>
-
-                  </RepeatButton>
-
-                  <!-- Track is a special layout container which sizes the thumb and the repeat button which do jump scrolling either side of it -->
-
-                  <Track x:Name="PART_Track"
-                         Grid.Row="1"
-                         IsDirectionReversed="true">
-
-                     <Track.Thumb>
-
-                        <Thumb Style="{StaticResource thumbAero2NormalColor}" />
-
-                     </Track.Thumb>
-
-                     <Track.IncreaseRepeatButton>
-
-                        <RepeatButton x:Name="PageUp"
-                                      Style="{StaticResource repeatButtonPageUpDownAero2NormalColor}"
-                                      Command="ScrollBar.PageDownCommand" />
-
-                     </Track.IncreaseRepeatButton>
-
-                     <Track.DecreaseRepeatButton>
-
-                        <RepeatButton x:Name="PageDown"
-                                      Style="{StaticResource repeatButtonPageUpDownAero2NormalColor}"
-                                      Command="ScrollBar.PageUpCommand" />
-
-                     </Track.DecreaseRepeatButton>
-
-                  </Track>
-
-                  <RepeatButton x:Name="IncreaseRepeat"
-                                Grid.Row="2"
-                                Style="{StaticResource increaseDecreaseRepeatButtonAero2NormalColor}"
-                                Command="ScrollBar.LineDownCommand">
-
-                     <Grid>
-
-                        <Path x:Name="IncreaseArrow"
-                              Stroke="{x:Null}"
-                              StrokeThickness="1"
-                              Data="M 0 0 L 4 4 L 8 0 Z"
-                              Fill="{StaticResource scrollbarGlyphBordeBrush}" />
-
-                     </Grid>
-
-                  </RepeatButton>
-
-               </Grid>
-            </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="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type ScrollBar}">
-                     <Grid x:Name="GridRoot"
-                           Background="{TemplateBinding Background}">
-
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
-                           <ColumnDefinition Width="0.00001*" />
-                           <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
-                        </Grid.ColumnDefinitions>
-
-                        <Border Grid.ColumnSpan="3"
-                                BorderBrush="#FFAAAAAA"
-                                BorderThickness="1" />
-
-                        <RepeatButton x:Name="DecreaseRepeat"
-                                      Style="{StaticResource increaseDecreaseHorizontalRepeatButtonAero2NormalColor}"
-                                      Command="ScrollBar.LineLeftCommand">
-                           <Grid>
-                              <Grid.LayoutTransform>
-                                 <RotateTransform Angle="-90" />
-                              </Grid.LayoutTransform>
-
-                              <Path x:Name="DecreaseArrow"
-                                    Stroke="{x:Null}"
-                                    StrokeThickness="1"
-                                    Data="M 0 4 L 8 4 L 4 0 Z"
-                                    Fill="{StaticResource scrollbarGlyphBordeBrush}" />
-
-                           </Grid>
-
-                        </RepeatButton>
-
-                        <!-- Track is a special layout container which sizes the thumb and the repeat button which do jump scrolling either side of it -->
-
-                        <Track x:Name="PART_Track"
-                               Grid.Column="1">
-
-                           <Track.Thumb>
-
-                              <Thumb Style="{StaticResource horizontalthumbAero2NormalColor}" />
-
-                           </Track.Thumb>
-
-                           <Track.IncreaseRepeatButton>
-
-                              <RepeatButton x:Name="PageRight"
-                                            Style="{StaticResource repeatButtonPageUpDownAero2NormalColor}"
-                                            Command="ScrollBar.PageRightCommand" />
-
-                           </Track.IncreaseRepeatButton>
-
-                           <Track.DecreaseRepeatButton>
-
-                              <RepeatButton x:Name="PageLeft"
-                                            Style="{StaticResource repeatButtonPageUpDownAero2NormalColor}"
-                                            Command="ScrollBar.PageLeftCommand" />
-
-                           </Track.DecreaseRepeatButton>
-
-                        </Track>
-
-                        <RepeatButton x:Name="IncreaseRepeat"
-                                      Grid.Column="2"
-                                      Style="{StaticResource increaseDecreaseHorizontalRepeatButtonAero2NormalColor}"
-                                      Command="ScrollBar.LineRightCommand">
-
-                           <Grid>
-                              <Grid.LayoutTransform>
-                                 <RotateTransform Angle="-90" />
-                              </Grid.LayoutTransform>
-
-                              <Path x:Name="IncreaseArrow"
-                                    Stroke="{x:Null}"
-                                    StrokeThickness="1"
-                                    Data="M 0 0 L 4 4 L 8 0 Z"
-                                    Fill="{StaticResource scrollbarGlyphBordeBrush}" />
-
-                           </Grid>
-
-                        </RepeatButton>
-
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!-- Simple Button - This control sets brushes on each state. Note that these brushes must be listed above since they are static resources -->
-   <Style TargetType="{x:Type Button}">
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type Button}">
-
-               <!-- We use Grid as a root because it is easy to add more elements to customize the button -->
-               <Grid x:Name="Grid">
-
-                  <Border Background="#FFD1ECFF"
-                          CornerRadius="3"
-                          BorderThickness="1"
-                          BorderBrush="{StaticResource basicBlackBorderBrush}">
-                     <Border x:Name="insideBorder"
-                             CornerRadius="2"
-                             BorderThickness="1"
-                             BorderBrush="{StaticResource basicWhiteBorderBrush}">
-                        <Border.Background>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#3F1686D8"
-                                            Offset="0" />
-                              <GradientStop Offset="0.53"
-                                            Color="#001686D8" />
-                              <GradientStop Color="#3F1686D8"
-                                            Offset="0.987" />
-                           </LinearGradientBrush>
-                        </Border.Background>
-
-                        <Path x:Name="ClearFilterPath"
-                              Stroke="{x:Null}"
-                              Stretch="Fill"
-                              HorizontalAlignment="Stretch"
-                              Width="Auto"
-                              Data="M0.02,0.54 C0.02,0.55 0.02,0.09 0.03,0.07 0.03,0.01 -0.09,0 0.58,0 1.17,0 8.83,0 9.22,0 9.98,0 9.84,-0.01 9.82,0.12 9.16,0.12 5.86,0.11 4.08,0.19 2.30,0.28 0.39,0.42 0.31,0.57 0.27,0.57 0.19,0.58 0.09,0.56 0,0.55 0.02,0.53 0.02,0.53 z">
-                           <Path.Fill>
-                              <LinearGradientBrush EndPoint="0.6,0.75"
-                                                   StartPoint="0,0">
-                                 <GradientStop Color="#7F1686D8" />
-                                 <GradientStop Offset="1"
-                                               Color="#001686D8" />
-                              </LinearGradientBrush>
-                           </Path.Fill>
-                        </Path>
-                     </Border>
-                  </Border>
-
-                  <Border x:Name="mouseOverEffect"
-                          Margin="1"
-                          CornerRadius="3"
-                          Opacity="0">
-                     <Border.Background>
-                        <RadialGradientBrush Center="0.5,0.7"
-                                             GradientOrigin="0.5,1"
-                                             RadiusX="0.6"
-                                             RadiusY="0.8">
-                           <GradientStop Color="#BFFFFFFF"
-                                         Offset="0.3" />
-                           <GradientStop Offset="0.7"
-                                         Color="#33FFFFFF" />
-                           <GradientStop Color="#4CFFFFFF"
-                                         Offset="0.4" />
-                           <GradientStop Color="White"
-                                         Offset="0.06" />
-                        </RadialGradientBrush>
-                     </Border.Background>
-                  </Border>
-
-                  <!-- Content Presenter is where the text content etc is placed by the control -->
-                  <!-- The bindings are useful so that the control can be parameterized without editing the template -->
-                  <ContentPresenter x:Name="buttonContent"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    Margin="{TemplateBinding Padding}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    RecognizesAccessKey="True" />
-
-               </Grid>
-
-               <!--Each state sets a brush on the Border in the template -->
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-
-                     <Setter Property="Opacity"
-                             TargetName="mouseOverEffect"
-                             Value="1" />
-                  </Trigger>
-
-                  <Trigger Property="IsPressed"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="insideBorder">
-                        <Setter.Value>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#BF1686D8"
-                                            Offset="0" />
-                              <GradientStop Offset="0.5" />
-                              <GradientStop Color="#BF1686D8"
-                                            Offset="1" />
-                           </LinearGradientBrush>
-                        </Setter.Value>
-                     </Setter>
-
-                     <Setter Property="Opacity"
-                             TargetName="mouseOverEffect"
-                             Value="0" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="True" />
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter TargetName="buttonContent"
-                             Property="TextElement.Foreground"
-                             Value="#868686" />
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                     <Setter Property="Background"
-                             TargetName="insideBorder">
-                        <Setter.Value>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#3FFFFFFF"
-                                            Offset="0" />
-                              <GradientStop Offset="0.5" />
-                              <GradientStop Color="#3FFFFFFF"
-                                            Offset="1" />
-                           </LinearGradientBrush>
-                        </Setter.Value>
-                     </Setter>
-
-                     <Setter Property="BorderBrush"
-                             TargetName="insideBorder"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="ClearFilterPath">
-                        <Setter.Value>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#3FFFFFFF"
-                                            Offset="0" />
-                              <GradientStop Offset="0.5" />
-                              <GradientStop Color="#3FFFFFFF"
-                                            Offset="1" />
-                           </LinearGradientBrush>
-                        </Setter.Value>
-                     </Setter>
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- ComboBox 
-	This uses the ComboBoxToggleButton to expand and collapse a Popup control
-	SimpleScrollViewer to allow items to be scrolled and SimpleComboBoxItem to define the look of each item 
-	The Popup shows a list of items in a StackPanel-->
-
-   <!-- ComboBox Toggle Button - This is used in ComboBox to expand and collapse the ComboBox Popup-->
-   <ControlTemplate x:Key="toggleButtonControlAero2NormalColor"
-                    TargetType="{x:Type ToggleButton}">
-      <Grid>
-
-         <Grid.ColumnDefinitions>
-
-            <ColumnDefinition />
-
-            <ColumnDefinition Width="Auto" />
-
-         </Grid.ColumnDefinitions>
-
-         <Border Background="Transparent"
-                 Grid.ColumnSpan="2" />
-
-         <Border CornerRadius="4"
-                 BorderBrush="Black"
-                 BorderThickness="1,0,0,1"
-                 MinHeight="16"
-                 MinWidth="16"
-                 SnapsToDevicePixels="True"
-                 HorizontalAlignment="Center"
-                 VerticalAlignment="Center"
-                 Grid.Column="1"
-                 IsHitTestVisible="False"
-                 Margin="0,0,4,0">
-            <Border x:Name="toggleDecorator"
-                    CornerRadius="3"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    BorderThickness="1,0,0,1"
-                    SnapsToDevicePixels="True">
-               <Path Data="M 0 0 L 4 4 L 8 0 Z"
-                     Fill="{StaticResource aero2NormalColorGlyphBrush}"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     IsHitTestVisible="False"
-                     Margin="0,2,2,0" />
-            </Border>
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-
-            <Setter Property="Background"
-                    TargetName="toggleDecorator">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Offset="0" />
-                     <GradientStop Color="White"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsChecked"
-                  Value="true">
-
-            <Setter Property="Background"
-                    TargetName="toggleDecorator">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Offset="1" />
-                     <GradientStop Color="#FF04A2F7"
-                                   Offset="0" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsEnabled"
-                  Value="False">
-
-            <Setter Property="Opacity"
-                    Value="0.3"
-                    TargetName="toggleDecorator" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!-- ScrollViewer 
-	ScrollViewer is a Grid control which has a ContentPresenter and a Horizontal and Vertical ScrollBar 
-	It is used by ListBox, MenuItem, ComboBox, and TreeView -->
-   <Style x:Key="ScrollViewerAero2NormalColor"
-          TargetType="{x:Type ScrollViewer}">
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type ScrollViewer}">
-
-               <Grid Background="{TemplateBinding Background}">
-
-                  <Grid.ColumnDefinitions>
-
-                     <ColumnDefinition Width="*" />
-
-                     <ColumnDefinition Width="Auto" />
-
-                  </Grid.ColumnDefinitions>
-
-                  <Grid.RowDefinitions>
-
-                     <RowDefinition Height="*" />
-
-                     <RowDefinition Height="Auto" />
-
-                  </Grid.RowDefinitions>
-
-                  <ScrollContentPresenter Grid.Column="0"
-                                          Grid.Row="0"
-                                          Margin="{TemplateBinding Padding}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          CanContentScroll="{TemplateBinding CanContentScroll}" />
-
-                  <!-- The visibility of the ScrollBars is controlled by the implementation fo the control -->
-                  <ScrollBar x:Name="PART_HorizontalScrollBar"
-                             Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                             Grid.Column="0"
-                             Grid.Row="1"
-                             Orientation="Horizontal"
-                             Value="{Binding Path=HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             ViewportSize="{TemplateBinding ViewportWidth}"
-                             Minimum="0"
-                             Maximum="{TemplateBinding ScrollableWidth}"
-                             AutomationProperties.AutomationId="HorizontalScrollBar" />
-
-                  <ScrollBar x:Name="PART_VerticalScrollBar"
-                             Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                             Grid.Column="1"
-                             Grid.Row="0"
-                             Orientation="Vertical"
-                             Value="{Binding Path=VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             ViewportSize="{TemplateBinding ViewportHeight}"
-                             Minimum="0"
-                             Maximum="{TemplateBinding ScrollableHeight}"
-                             AutomationProperties.AutomationId="VerticalScrollBar" />
-
-               </Grid>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style x:Key="aero2NormalColorComboBoxStyle"
-          TargetType="{x:Type ComboBox}">
-
-      <Setter Property="SnapsToDevicePixels"
-              Value="true" />
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type ComboBox}">
-
-               <Grid>
-
-                  <!-- The ToggleButton is databound to the ComboBox itself to toggle IsDropDownOpen -->
-                  <ToggleButton x:Name="ToggleButton"
-                                Grid.Column="2"
-                                Template="{StaticResource toggleButtonControlAero2NormalColor}"
-                                Focusable="false"
-                                IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                ClickMode="Press" />
-
-                  <ContentPresenter x:Name="ContentSite"
-                                    HorizontalAlignment="Left"
-                                    Margin="3,2,23,3"
-                                    TextElement.Foreground="Black"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding SelectionBoxItem}"
-                                    ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                    IsHitTestVisible="False" />
-
-                  <!-- The TextBox must be named PART_EditableTextBox or ComboBox will not recognize it -->
-                  <TextBox x:Name="PART_EditableTextBox"
-                           Visibility="Hidden"
-                           Template="{StaticResource ComboBoxTextBox}"
-                           HorizontalAlignment="Left"
-                           Margin="3,2,23,3"
-                           Style="{x:Null}"
-                           VerticalAlignment="Center"
-                           Focusable="True"
-                           Background="Transparent"
-                           IsReadOnly="{TemplateBinding IsReadOnly}" />
-
-                  <!-- The Popup shows the list of items in the ComboBox. IsOpen is databound to IsDropDownOpen which is toggled via the ComboBoxToggleButton -->
-                  <Popup x:Name="Popup"
-                         IsOpen="{TemplateBinding IsDropDownOpen}"
-                         Placement="Bottom"
-                         Focusable="False"
-                         AllowsTransparency="True"
-                         PopupAnimation="Slide">
-
-                     <Grid x:Name="DropDown"
-                           MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                           MinWidth="{TemplateBinding ActualWidth}"
-                           SnapsToDevicePixels="True">
-
-                        <Border x:Name="DropDownBorder"
-                                BorderBrush="{StaticResource basicBlackBorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                           <Border BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                                   BorderThickness="1"
-                                   CornerRadius="4">
-                              <Border.Background>
-                                 <LinearGradientBrush EndPoint="0.979,0.046"
-                                                      StartPoint="-0.019,1.017">
-                                    <GradientStop Color="#FF1686D8"
-                                                  Offset="1" />
-                                    <GradientStop Color="#FF06397B"
-                                                  Offset="0.297" />
-                                 </LinearGradientBrush>
-                              </Border.Background>
-                           </Border>
-                        </Border>
-
-                        <ScrollViewer Margin="4,6,4,6"
-                                      Style="{StaticResource ScrollViewerAero2NormalColor}"
-                                      SnapsToDevicePixels="True"
-                                      HorizontalScrollBarVisibility="Auto"
-                                      VerticalScrollBarVisibility="Auto"
-                                      CanContentScroll="True">
-
-                           <!-- The StackPanel is used to display the children by setting IsItemsHost to be True -->
-                           <StackPanel IsItemsHost="True"
-                                       KeyboardNavigation.DirectionalNavigation="Contained"
-                                       TextElement.Foreground="White" />
-
-                        </ScrollViewer>
-
-                     </Grid>
-
-                  </Popup>
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-                  <!-- This forces the DropDown to have a minimum size if it is empty -->
-                  <Trigger Property="HasItems"
-                           Value="false">
-
-                     <Setter Property="MinHeight"
-                             Value="95"
-                             TargetName="DropDownBorder" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsGrouping"
-                           Value="true">
-
-                     <Setter Property="ScrollViewer.CanContentScroll"
-                             Value="false" />
-
-                  </Trigger>
-                  <Trigger Property="AllowsTransparency"
-                           SourceName="Popup"
-                           Value="true">
-
-                     <Setter Property="CornerRadius"
-                             Value="4"
-                             TargetName="DropDownBorder" />
-
-                     <Setter Property="Margin"
-                             Value="0,2,0,0"
-                             TargetName="DropDownBorder" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEditable"
-                           Value="true">
-
-                     <Setter Property="IsTabStop"
-                             Value="false" />
-
-                     <Setter Property="Visibility"
-                             Value="Visible"
-                             TargetName="PART_EditableTextBox" />
-
-                     <Setter Property="Visibility"
-                             Value="Hidden"
-                             TargetName="ContentSite" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style TargetType="{x:Type ComboBox}"
-          BasedOn="{StaticResource aero2NormalColorComboBoxStyle}" />
-
-   <!-- Simple TextBox -->
-   <Style x:Key="textBoxAero2NormalColor"
-          TargetType="{x:Type TextBox}">
-
-      <Setter Property="KeyboardNavigation.TabNavigation"
-              Value="None" />
-
-      <Setter Property="FocusVisualStyle"
-              Value="{x:Null}" />
-
-      <Setter Property="AllowDrop"
-              Value="true" />
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type TextBox}">
-
-               <Grid>
-
-                  <Border x:Name="Border"
-                          Background="{StaticResource windowDefaultBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="1"
-                          Padding="2"
-                          CornerRadius="0,0,0,0">
-
-                     <!-- The implementation places the Content into the ScrollViewer. It must be named PART_ContentHost for the control to function -->
-                     <ScrollViewer Margin="0"
-                                   x:Name="PART_ContentHost"
-                                   Style="{StaticResource ScrollViewerAero2NormalColor}"
-                                   Background="{TemplateBinding Background}" />
-                  </Border>
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-
-                     <Setter Property="Background"
-                             Value="{StaticResource DisabledBackgroundBrush}"
-                             TargetName="Border" />
-
-                     <Setter Property="BorderBrush"
-                             Value="{StaticResource DisabledBackgroundBrush}"
-                             TargetName="Border" />
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style TargetType="{x:Type ComboBoxItem}">
-
-      <Setter Property="Padding"
-              Value="3,0,3,0" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-
-               <Border x:Name="Bd"
-                       SnapsToDevicePixels="true"
-                       Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsHighlighted"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Bd"
-                             Value="#FF86E9F9" />
-
-                     <Setter Property="Foreground"
-                             Value="Black" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-      <Style.Triggers>
-         <Trigger Property="IsVisible"
-                  Value="True">
-            <Setter Property="HorizontalContentAlignment"
-                    Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-            <Setter Property="VerticalContentAlignment"
-                    Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="DefaultItemContainerStyle"
-          TargetType="{x:Type ComboBoxItem}">
-
-      <Setter Property="Foreground"
-              Value="White" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-               <Border x:Name="blackBorder"
-                       Background="{TemplateBinding Background}"
-                       BorderThickness="1"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       CornerRadius="4">
-                  <Border x:Name="whiteBorder"
-                          Background="Transparent"
-                          BorderThickness="1"
-                          BorderBrush="Transparent"
-                          CornerRadius="3">
-                     <ContentPresenter />
-                  </Border>
-               </Border>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsSelected"
-                           Value="True">
-                     <Setter TargetName="blackBorder"
-                             Property="BorderBrush"
-                             Value="{StaticResource basicBlackBorderBrush}" />
-                     <Setter TargetName="whiteBorder"
-                             Property="BorderBrush"
-                             Value="{StaticResource basicWhiteBorderBrush}" />
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="aero2NormalColorRepeatButton"
-          TargetType="{x:Type RepeatButton}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type RepeatButton}">
-               <Border Background="Transparent">
-                  <ContentPresenter x:Name="glyphZone">
-                     <ContentPresenter.Content>
-                        <Canvas x:Name="leftArrowCanvas"
-                                Height="11"
-                                Width="13">
-                           <Path Stroke="Black"
-                                 Data="M0.97,1.19 C1.97,0.00 12.08,0.00 12.96,1.19 C13.85,2.38 8.31,10.50 7.01,10.50 C5.72,10.50 0.00,2.38 0.97,1.19 z" />
-                           <Path Data="M1.91,1.80 C2.44,0.88 11.95,0.88 12.03,1.80 C12.81,2.04 7.55,9.73 7.01,9.46 C6.47,9.68 1.02,2.05 1.91,1.80 z">
-                              <Path.Fill>
-                                 <RadialGradientBrush>
-                                    <GradientStop Color="White"
-                                                  Offset="1" />
-                                    <GradientStop Offset="0.4" />
-                                 </RadialGradientBrush>
-                              </Path.Fill>
-                              <Path.Stroke>
-                                 <LinearGradientBrush EndPoint="0.5,1"
-                                                      StartPoint="0.5,0">
-                                    <GradientStop Color="White"
-                                                  Offset="0" />
-                                    <GradientStop Color="White"
-                                                  Offset="1" />
-                                    <GradientStop Offset="0.52" />
-                                 </LinearGradientBrush>
-                              </Path.Stroke>
-                           </Path>
-                        </Canvas>
-                     </ContentPresenter.Content>
-                  </ContentPresenter>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--**************************
-    * Style: MenuItem(ContextMenu)
-    ************************** -->
-
-   <ControlTemplate x:Key="aero2NormalColorMenuItem"
-                    TargetType="{x:Type MenuItem}">
-      <Border>
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"
-                                 SharedSizeGroup="Icon" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto"
-                                 SharedSizeGroup="Shortcut" />
-               <ColumnDefinition Width="13" />
-            </Grid.ColumnDefinitions>
-            <Border Name="Border"
-                    Margin="1"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="4" />
-            <ContentPresenter Name="Icon"
-                              Margin="6,0,6,0"
-                              VerticalAlignment="Center"
-                              ContentSource="Icon" />
-            <Border Name="Check"
-                    Width="13"
-                    Height="13"
-                    Visibility="Collapsed"
-                    Margin="6,0,6,0"
-                    Background="Transparent"
-                    BorderThickness="1"
-                    BorderBrush="Transparent">
-               <Path Name="CheckMark"
-                     Visibility="Hidden"
-                     SnapsToDevicePixels="False"
-                     Fill="{StaticResource scrollbarGlyphBordeBrush}"
-                     Height="11"
-                     Width="10"
-                     Stretch="Fill"
-                     Opacity="1"
-                     Data="M 9.58416748046875,0 C9.58416748046875,0 10,0.6159515380859375 10,0.6159515380859375 8.7657470703125,1.540008544921875 8.419189453125,2.9010162353515625 6.96038818359375,4.698974609375 5.5015869140625,6.4969329833984375 4.602294921875,9.774444580078125 4.602294921875,9.774444580078125 4.602294921875,9.774444580078125 3.9029541015625,10.2296142578125 3.9029541015625,10.2296142578125 3.419921875,10.55328369140625 3.01983642578125,10.810089111328125 2.70257568359375,11 2.581787109375,10.676483154296875 2.114166259765625,9.48345947265625 1.46875,8.5 0.8125,7.5 0.4044189453125,6.9029998779296875 0,6.7393035888671875 0.667236328125,5.9750518798828125 1.8385009765625,5.592926025390625 1.8385009765625,5.592926025390625 1.8385009765625,5.592926025390625 3.555908203125,7.8286285400390625 3.555908203125,7.8286285400390625 4.3878173828125,6.349609375 4.5516357421875,4.8782501220703125 6.04742431640625,3.4145355224609375 7.543212890625,1.9508209228515625 8.055419921875,0.8126373291015625 9.58416748046875,0 z" />
-            </Border>
-            <ContentPresenter Name="HeaderHost"
-                              Grid.Column="1"
-                              VerticalAlignment="Center"
-                              ContentSource="Header"
-                              RecognizesAccessKey="True" />
-            <TextBlock x:Name="InputGestureText"
-                       Grid.Column="2"
-                       Text="{TemplateBinding InputGestureText}"
-                       Margin="5,2,0,2"
-                       DockPanel.Dock="Right" />
-         </Grid>
-      </Border>
-      <ControlTemplate.Triggers>
-         <Trigger Property="Icon"
-                  Value="{x:Null}">
-            <Setter TargetName="Icon"
-                    Property="Visibility"
-                    Value="Hidden" />
-         </Trigger>
-         <Trigger Property="IsChecked"
-                  Value="true">
-            <Setter TargetName="CheckMark"
-                    Property="Visibility"
-                    Value="Visible" />
-         </Trigger>
-         <Trigger Property="IsCheckable"
-                  Value="true">
-            <Setter TargetName="Check"
-                    Property="Visibility"
-                    Value="Visible" />
-            <Setter TargetName="Icon"
-                    Property="Visibility"
-                    Value="Hidden" />
-         </Trigger>
-         <Trigger Property="IsEnabled"
-                  Value="false">
-            <Setter Property="Foreground"
-                    Value="#DADADA" />
-         </Trigger>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter TargetName="Border"
-                    Property="Background"
-                    Value="#FF86E9F9" />
-            <Setter TargetName="CheckMark"
-                    Property="Fill"
-                    Value="Black" />
-            <Setter Property="TextElement.Foreground"
-                    Value="Black" />
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
-
-   <!--**************************
-    * Style: MenuItemScrollViewer (ContextMenu)
-    ************************** -->
-
-   <Style x:Key="MenuItemScrollViewer"
-          TargetType="{x:Type ScrollViewer}">
-
-      <Setter Property="VerticalScrollBarVisibility"
-              Value="Auto" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ScrollViewer}">
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="15" />
-                     <RowDefinition Height="*" />
-                     <RowDefinition Height="15" />
-                  </Grid.RowDefinitions>
-
-                  <ScrollContentPresenter Grid.RowSpan="3" />
-                  <RepeatButton x:Name="topRepeatButton"
-                                Height="15"
-                                Style="{StaticResource increaseDecreaseRepeatButtonAero2NormalColor}"
-                                Command="ScrollBar.LineUpCommand"
-                                ClickMode="Hover"
-                                Grid.Row="0">
-                     <Grid	Height="10"
-                           Width="5"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center">
-                        <Canvas Width="9"
-                                Height="5">
-                           <Path Opacity="1"
-                                 Data="M 4.53125,0.15625 C4.53125,0.15625 9,5 9,5 9,5 0,5 0,5 0,5 4.53125,0.15625 4.53125,0.15625 z"
-                                 Fill="{StaticResource glyphDefaultBordeBrush}" />
-                        </Canvas>
-
-                     </Grid>
-                     <RepeatButton.Visibility>
-                        <MultiBinding FallbackValue="Visibility.Collapsed"
-                                      Converter="{StaticResource MenuScrollingVisibilityConverter}"
-                                      ConverterParameter="0">
-                           <Binding Path="ComputedVerticalScrollBarVisibility"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="VerticalOffset"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="ExtentHeight"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="ViewportHeight"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                        </MultiBinding>
-                     </RepeatButton.Visibility>
-                  </RepeatButton>
-
-                  <RepeatButton x:Name="bottomRepeatButton"
-                                Height="15"
-                                Style="{StaticResource increaseDecreaseRepeatButtonAero2NormalColor}"
-                                Command="ScrollBar.LineDownCommand"
-                                ClickMode="Hover"
-                                Grid.Row="2">
-                     <RepeatButton.Visibility>
-                        <MultiBinding FallbackValue="Visibility.Collapsed"
-                                      Converter="{StaticResource MenuScrollingVisibilityConverter}"
-                                      ConverterParameter="100">
-                           <Binding Path="ComputedVerticalScrollBarVisibility"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="VerticalOffset"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="ExtentHeight"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="ViewportHeight"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                        </MultiBinding>
-                     </RepeatButton.Visibility>
-                     <Grid	Height="10"
-                           Width="5"
-                           RenderTransformOrigin="0.5,0.5"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center">
-                        <Canvas Width="9"
-                                Height="5">
-                           <Path Opacity="1"
-                                 Data="M 4.53125,0.15625 C4.53125,0.15625 9,5 9,5 9,5 0,5 0,5 0,5 4.53125,0.15625 4.53125,0.15625 z"
-                                 Fill="{StaticResource glyphDefaultBordeBrush}" />
-                        </Canvas>
-                        <Grid.RenderTransform>
-                           <RotateTransform Angle="180" />
-                        </Grid.RenderTransform>
-                     </Grid>
-                  </RepeatButton>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Resources.xaml
deleted file mode 100644
index fca8aac1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/Aero2.normalcolor.Resources.xaml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="defaultBackgroundBrush"
-                    Color="White" />
-   <SolidColorBrush x:Key="defaultForegroundBrush"
-                    Color="#FF151C55" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <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="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/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.xaml
deleted file mode 100644
index 21a5f6d9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/Resources/TableView.Aero2.normalcolor.Graphics.xaml
+++ /dev/null
@@ -1,256 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the standard graphics -->
-      <markup:DataGridThemeResourceDictionary Source="../../Common/Graphics.xaml" />
-
-      <!-- Needs Windows8 Resources -->
-      <markup:DataGridThemeResourceDictionary Source="Aero2.normalColor.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/Aero2/TableView.Aero2.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableView.Aero2.normalcolor.xaml
deleted file mode 100644
index 08870b22..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableView.Aero2.normalcolor.xaml
+++ /dev/null
@@ -1,1799 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<!-- =======================================================================
-  Xceed DataGrid for WPF - CUSTOMIZATION CODE - Default Styles and Templates
-  Copyright (c) 2007-2017 Xceed Software Inc.
-
-  [TableView.Aero2.normalcolor.xaml]
-
-  This file is part of the Xceed DataGrid for WPF product. The use and
-  distribution of this Customization Code is subject to the terms
-  and conditions refering to "Customization Code" that are specified in
-  the XCEED SOFTWARE LICENSE AGREEMENT accompanying this product.
-======================================================================= -->
-<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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.normalcolor.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Aero2.normalcolor.Graphics.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-      <!-- Control Styles used in the Grid Control -->
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Transparent" />
-
-   <!-- ****************************************** -->
-   <!-- 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" />
-
-   <!--<SolidColorBrush x:Key="rowSelectionBorderBrush" Color="#FF26A0DA" />-->
-   <!--<SolidColorBrush x:Key="rowMouseOverBorderBrush" Color="#FF70C0E7" />-->
-   <!--<SolidColorBrush x:Key="rowMouseOverSelectionBorderBrush" Color="#FF66A7E8" />-->
-   <!--<SolidColorBrush x:Key="rowInactiveSelectionBorderBrush" Color="#FFDEDEDE" />-->
-
-   <!-- 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: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    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 
-    ************************** -->
-   <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    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" />
-                     </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" />
-                                 <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"
-                                                Grid.Column="1"
-                                                Content="{x:Null}"
-                                                ContentTemplate="{x:Null}" />
-                           </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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
-                    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="tableViewHierarchicalGroupByControlNodeTemplate"
-                    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="tableViewHierarchicalGroupByItemTemplate"
-                    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
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupHeaderControlTemplate"
-                    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 intAdditionConverter}, 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>
-               <Grid>
-                  <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>
-               </Grid>
-            </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: ColumnManagerRow
-    ************************** -->
-   <ControlTemplate x:Key="tableViewColumnManagerRowTemplate"
-                    TargetType="local:ColumnManagerRow">
-
-      <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}" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2,4,2,0"
-                           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>
-
-   <!--**************************
-    * TEMPLATE: GroupLevelIndicatorPane
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupLevelIndicatorPaneTemplate"
-                    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="tableViewAero2NormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <!--<Style.Resources>
-            <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.NormalColor.Controls.xaml" />
-        </Style.Resources>-->
-
-      <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 tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorRowSelectorPaneStyle"
-          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="tableViewAero2NormalColorRowSelectorStyle"
-          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 tableViewRowSelectorTemplate}" />
-
-      <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 (but not when the Row is an InsertionRow. -->
-         <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="tableViewAero2NormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FontFamily"
-              Value="{StaticResource defaultFontFamily}" />
-
-      <Setter Property="FontSize"
-              Value="{StaticResource defaultFontSize}" />
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <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 tableViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <!-- case 150388: The foreground property set in a user implicit style may not always be applied.  We noticed that
-                         the issue doesn't occur when we assign a value for the foreground property in the default style.
-                         Since we don't want to stop an inherited value to be propagated, we bind the property to the
-                         parent's property.-->
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <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="tableViewAero2NormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataRowTemplate}" />
-
-      <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="tableViewAero2NormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}">
-
-      <!-- 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 tableViewColumnManagerRowTemplate}" />
-
-      <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="tableViewAero2NormalColorCellStyle"
-          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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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 tableViewCellTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewAero2NormalColorCellStyle}">
-
-      <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="tableViewAero2NormalColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
-
-      <Style.Triggers>
-
-         <Trigger Property="IsBeingDragged"
-                  Value="True">
-            <Setter Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-         </Trigger>
-
-      </Style.Triggers>
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorGroupByControlStyle"
-          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 TableView, 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 tableViewGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorGroupByItemStyle"
-          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 tableViewGroupByItemTemplate}" />
-
-      <!-- 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="tableViewAero2NormalColorGroupHeaderControlStyle"
-          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" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-      <!-- 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 tableViewGroupHeaderControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorGroupLevelIndicatorStyle"
-          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 tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorDetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewAero2NormalColorHierarchicalGroupByControlNodeStyle"
-          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 tableViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorHierarchicalGroupByControlStyle"
-          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 TableView, 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 tableViewCommonHierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewAero2NormalColorHierarchicalGroupByItemStyle"
-          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 tableViewHierarchicalGroupByItemTemplate}" />
-
-      <!-- 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="tableViewAero2NormalColorScrollTipStyle"
-          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>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewAero2NormalColorDefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:TableView, ThemeType=views:Windows8Theme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewAero2NormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewAero2NormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewAero2NormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewAero2NormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewAero2NormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewAero2NormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableflowView.Aero2.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableflowView.Aero2.normalcolor.xaml
deleted file mode 100644
index 12bbca44..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero2/TableflowView.Aero2.normalcolor.xaml
+++ /dev/null
@@ -1,2150 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.normalcolor.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme dependant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Aero2.normalcolor.Graphics.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-      <!-- Control Styles used in the Grid Control -->
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Transparent" />
-
-   <!-- ****************************************** -->
-   <!-- 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" />
-
-   <!--<SolidColorBrush x:Key="rowSelectionBorderBrush" Color="#FF26A0DA" />-->
-   <!--<SolidColorBrush x:Key="rowMouseOverBorderBrush" Color="#FF70C0E7" />-->
-   <!--<SolidColorBrush x:Key="rowMouseOverSelectionBorderBrush" Color="#FF66A7E8" />-->
-   <!--<SolidColorBrush x:Key="rowInactiveSelectionBorderBrush" Color="#FFDEDEDE" />-->
-
-   <!-- 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 
-    ************************** -->
-   <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <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" />
-                                 <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"
-                                                Grid.Column="1"
-                                                Content="{x:Null}"
-                                                ContentTemplate="{x:Null}" />
-                           </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>
-
-      </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
-    ************************** -->
-   <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 intAdditionConverter}, 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>
-               <Grid>
-                  <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>
-               </Grid>
-            </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 intAdditionConverter}, 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
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewColumnManagerRowTemplate"
-                    TargetType="local:ColumnManagerRow">
-
-      <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}" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2,4,2,0"
-                           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>
-
-   <!--**************************
-    * TEMPLATE: GroupLevelIndicatorPane
-    ************************** -->
-   <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="tableflowViewAero2NormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <!--<Style.Resources>
-            <markup:DataGridThemeResourceDictionary Source="Resources/Aero2.NormalColor.Controls.xaml" />
-        </Style.Resources>-->
-
-      <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="tableflowViewAero2NormalColorRowSelectorPaneStyle"
-          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="tableflowViewAero2NormalColorRowSelectorStyle"
-          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 (but not when the Row is an InsertionRow. -->
-         <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="tableflowViewAero2NormalColorRowStyle"
-          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="Transparent" />
-
-      <!-- case 150388: The foreground property set in a user implicit style may not always be applied.  We noticed that
-                         the issue doesn't occur when we assign a value for the foreground property in the default style.
-                         Since we don't want to stop an inherited value to be propagated, we bind the property to the
-                         parent's property.-->
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <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="tableflowViewAero2NormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataRowTemplate}" />
-
-      <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="tableflowViewAero2NormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowStyle}">
-
-      <!-- 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="tableflowViewAero2NormalColorCellStyle"
-          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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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="tableflowViewAero2NormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorCellStyle}">
-
-      <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="tableflowViewAero2NormalColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <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="tableflowViewAero2NormalColorGroupByControlStyle"
-          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="tableflowViewAero2NormalColorGroupByItemStyle"
-          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="tableflowViewAero2NormalColorGroupHeaderControlStyle"
-          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" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-      <!-- 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="tableflowViewAero2NormalColorGroupLevelIndicatorStyle"
-          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="tableflowViewAero2NormalColorDetailIndicatorStyle"
-          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="tableflowViewAero2NormalColorGroupLevelIndicatorPaneStyle"
-          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="tableflowViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewAero2NormalColorHierarchicalGroupByControlNodeStyle"
-          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="tableflowViewAero2NormalColorHierarchicalGroupByControlStyle"
-          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="tableflowViewAero2NormalColorHierarchicalGroupByItemStyle"
-          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="tableflowViewAero2NormalColorScrollTipStyle"
-          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="tableflowViewAero2NormalColorGroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewAero2NormalColorGroupNavigationControlItemStyle"
-          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="tableflowViewAero2NormalColorGroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewAero2NormalColorDefaultValues"
-          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 tableflowViewAero2NormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 1b85cdb9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.Resources.xaml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the standard graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Classic.systemcolor.Graphics.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Utility Resources                                                   -->
-   <!-- =================================================================== -->
-
-</ResourceDictionary>
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
deleted file mode 100644
index cfb5dcd3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Graphics.xaml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup">
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the standard graphics -->
-      <markup:DataGridThemeResourceDictionary Source="../../Common/Graphics.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Glyphs                                                              -->
-   <!-- (Override some resources defined in the common resources).           -->
-   <!-- =================================================================== -->
-
-   <!-- Glyph that is displayed in the RowSelector for a Row that has a validation error. -->
-   <DataTemplate x:Key="validationErrorGlyph">
-      <Grid
-         Height="14"
-         Width="14">
-         <Path
-            Margin="0,0,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="14"
-            Width="14"
-            Stretch="Fill"
-            Opacity="1"
-            Data="M 0,7 C0,3.13397216796875 3.1339569091796875,0 7,0 10.866043090820312,0 14,3.13397216796875 14,7 14,10.866058349609375 10.866043090820312,14 7,14 3.1339569091796875,14 0,10.866058349609375 0,7 z"
-            Stroke="#990000"
-            StrokeThickness="1">
-            <Path.Fill>
-               <LinearGradientBrush
-                  StartPoint="0.14285714285714285,0.14285714285714285"
-                  EndPoint="0.8392857142857143,0.8839285714285714">
-                  <LinearGradientBrush.GradientStops>
-                     <GradientStopCollection>
-                        <GradientStop
-                           Color="#FF990000"
-                           Offset="0" />
-                        <GradientStop
-                           Color="#FFff0000"
-                           Offset="0.9944440126419067" />
-                     </GradientStopCollection>
-                  </LinearGradientBrush.GradientStops>
-               </LinearGradientBrush>
-            </Path.Fill>
-         </Path>
-         <Path
-            Margin="1,1,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="12"
-            Width="12"
-            Stretch="Fill"
-            Opacity="0.5019607843137255"
-            Data="M 1,7 C1,3.686248779296875 3.686249017715454,1 7,1 10.313751220703125,1 13,3.686248779296875 13,7 13,10.313751220703125 10.313751220703125,13 7,13 3.686249017715454,13 1,10.313751220703125 1,7 z"
-            Stroke="#ffffff"
-            StrokeThickness="1" />
-         <Path
-            Margin="5,1.125,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="7.875"
-            Width="3.8125"
-            Stretch="Fill"
-            Opacity="1"
-            Data="M 5,1.125 C5,1.125 8.8125,1.1875 8.8125,1.1875 8.8125,1.1875 8,9 8,9 8,9 6,9 6,9 6,9 5,1.125 5,1.125 z"
-            Fill="#ffffff" />
-         <Path
-            Margin="5.5,10,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="3"
-            Width="3"
-            Stretch="Fill"
-            Opacity="1"
-            Data="M 5.5,11.5 C5.5,10.671562194824219 6.171562194824219,10 7,10 7.828437805175781,10 8.5,10.671562194824219 8.5,11.5 8.5,12.328437805175781 7.828437805175781,13 7,13 6.171562194824219,13 5.5,12.328437805175781 5.5,11.5 z"
-            Stroke="#ffffff"
-            StrokeThickness="1"
-            Fill="#ffffff" />
-      </Grid>
-   </DataTemplate>
-
-</ResourceDictionary>
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
deleted file mode 100644
index 69ed6263..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="errorBackgroundBrush"
-                    Color="Red" />
-
-   <SolidColorBrush x:Key="errorForegroundBrush"
-                    Color="White" />
-
-   <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
-   <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113453. -->
-   <Pen x:Key="dropMarkPen"
-        Brush="{x:Static SystemColors.HighlightBrush}"
-        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/Classic/TableView.Classic.systemcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml
deleted file mode 100644
index e441016a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml
+++ /dev/null
@@ -1,1502 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant and color-scheme independant theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Classic.Resources.xaml" />
-
-      <!-- Include the view independant and color-scheme dependant theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Classic.systemcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    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>
-
-               <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Top"
-                          Height="1"
-                          Margin="2,0,2,0" />
-
-               <Rectangle x:Name="bottomBorder"
-                          Fill="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                          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>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter TargetName="bottomBorder"
-                    Property="Fill"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                          HorizontalAlignment="Left"
-                          VerticalAlignment="Stretch"
-                          Width="1"
-                          Margin="0,2,0,2" />
-
-               <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                          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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <Border x:Name="borderToggleBackground"
-                                Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
-                                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" />
-                                 <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">
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Border x:Name="outerBorder"
-              BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-              Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
-              BorderThickness="0,0,1,1"
-              Padding="1,1,0,0">
-
-         <Border x:Name="innerBorder"
-                 BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                 BorderThickness="0,0,1,1"
-                 Margin="1,1,0,0"
-                 Background="{TemplateBinding Background}"
-                 Padding="{TemplateBinding Padding}">
-
-            <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-            <StackPanel x:Name="contentPanel"
-                        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 explicitly set its Content property to Null to prevent the XAML parser
-                    from implicitly setting it to its TemplatedParent's Content. -->
-               <ContentPresenter x:Name="sortGlyphPresenter"
-                                 Content="{x:Null}"
-                                 ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                 Margin="6,0,0,0"
-                                 Visibility="Hidden" />
-
-            </StackPanel>
-
-         </Border>
-
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderBrush"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" />
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="outerBorder"
-                    Property="Padding"
-                    Value="0" />
-
-            <Setter TargetName="innerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="innerBorder"
-                    Property="Margin"
-                    Value="0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="3" />
-
-         </Border>
-
-         <ItemsPresenter Margin="0,0,0,0" />
-
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-      <Grid>
-
-         <Border x:Name="outerBorder"
-                 BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-                 Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
-                 BorderThickness="0,0,1,1"
-                 Padding="1,1,0,0">
-
-            <Border x:Name="innerBorder"
-                    BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                    BorderThickness="0,0,1,1"
-                    Margin="1,1,0,0"
-                    Background="{TemplateBinding Background}"
-                    Padding="{TemplateBinding Padding}">
-
-               <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-               <StackPanel x:Name="contentPanel"
-                           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 explicitly set its Content property to Null to prevent the XAML parser
-                    from implicitly setting it to its TemplatedParent's Content. -->
-                  <ContentPresenter x:Name="sortGlyphPresenter"
-                                    Content="{x:Null}"
-                                    ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                    Margin="6,0,0,0"
-                                    Visibility="Hidden" />
-
-               </StackPanel>
-
-            </Border>
-
-         </Border>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderBrush"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" />
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="outerBorder"
-                    Property="Padding"
-                    Value="0" />
-
-            <Setter TargetName="innerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="innerBorder"
-                    Property="Margin"
-                    Value="0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-      </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="tableViewClassicSystemColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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 tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableViewForcedClassicSystemColorGridControlStyle"
-          BasedOn="{StaticResource tableViewClassicSystemColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Classic;V4.0.0.0;31bf3856ad364e35;component\themes/classic.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableViewClassicSystemColorRowSelectorStyle"
-          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 tableViewRowSelectorTemplate}" />
-
-      <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>
-
-      </Style.Triggers>
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#EDEDED" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewClassicSystemColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewClassicSystemColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerRowTemplate}" />
-
-      <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="tableViewClassicSystemColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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 tableViewCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewClassicSystemColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
-
-      <Style.Triggers>
-
-         <Trigger Property="IsBeingDragged"
-                  Value="True">
-
-            <Setter Property="Background"
-                    Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-         </Trigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorGroupByControlStyle"
-          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 TableView, a height of at least 25 is appropriate for the GroupByControl. -->
-      <Setter Property="MinHeight"
-              Value="25" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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 tableViewGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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 tableViewGroupHeaderControlTemplate}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,0" />
-
-      <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorDetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableViewClassicSystemColorHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewClassicSystemColorHierarchicalGroupByControlNodeStyle"
-          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 tableViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorHierarchicalGroupByControlStyle"
-          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 TableView, a height of at least 25 is appropriate for the GroupByControl. -->
-      <Setter Property="MinHeight"
-              Value="25" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableViewClassicSystemColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewClassicSystemColorDefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:TableView, ThemeType=views:ClassicSystemColorTheme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewClassicSystemColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewForcedClassicSystemColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewClassicSystemColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewClassicSystemColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewClassicSystemColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewClassicSystemColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewClassicSystemColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewClassicSystemColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewClassicSystemColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewClassicSystemColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewClassicSystemColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewClassicSystemColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewClassicSystemColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewClassicSystemColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewClassicSystemColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewClassicSystemColorHierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 21edb308..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml
+++ /dev/null
@@ -1,1865 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant and color-scheme independant theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Classic.Resources.xaml" />
-
-      <!-- Include the view independant and color-scheme dependant theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Classic.systemcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- 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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                 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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                    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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                 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>
-
-               <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Top"
-                          Height="1"
-                          Margin="2,0,2,0" />
-
-               <Rectangle x:Name="bottomBorder"
-                          Fill="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                          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>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter TargetName="bottomBorder"
-                    Property="Fill"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                          HorizontalAlignment="Left"
-                          VerticalAlignment="Stretch"
-                          Width="1"
-                          Margin="0,2,0,2" />
-
-               <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                          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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <Border x:Name="borderToggleBackground"
-                                Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
-                                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" />
-                                 <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">
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Border x:Name="outerBorder"
-              BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-              Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
-              BorderThickness="0,0,1,1"
-              Padding="1,1,0,0">
-
-         <Border x:Name="innerBorder"
-                 BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                 BorderThickness="0,0,1,1"
-                 Margin="1,1,0,0"
-                 Background="{TemplateBinding Background}"
-                 Padding="{TemplateBinding Padding}">
-
-            <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-            <StackPanel x:Name="contentPanel"
-                        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 explicitly set its Content property to Null to prevent the XAML parser
-                    from implicitly setting it to its TemplatedParent's Content. -->
-               <ContentPresenter x:Name="sortGlyphPresenter"
-                                 Content="{x:Null}"
-                                 ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                 Margin="6,0,0,0"
-                                 Visibility="Hidden" />
-
-            </StackPanel>
-
-         </Border>
-
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderBrush"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" />
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="outerBorder"
-                    Property="Padding"
-                    Value="0" />
-
-            <Setter TargetName="innerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="innerBorder"
-                    Property="Margin"
-                    Value="0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="3" />
-
-         </Border>
-
-         <ItemsPresenter Margin="0,0,0,0" />
-
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-      <Grid>
-
-         <Border x:Name="outerBorder"
-                 BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-                 Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
-                 BorderThickness="0,0,1,1"
-                 Padding="1,1,0,0">
-
-            <Border x:Name="innerBorder"
-                    BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                    BorderThickness="0,0,1,1"
-                    Margin="1,1,0,0"
-                    Background="{TemplateBinding Background}"
-                    Padding="{TemplateBinding Padding}">
-
-               <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-               <StackPanel x:Name="contentPanel"
-                           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 explicitly set its Content property to Null to prevent the XAML parser
-                    from implicitly setting it to its TemplatedParent's Content. -->
-                  <ContentPresenter x:Name="sortGlyphPresenter"
-                                    Content="{x:Null}"
-                                    ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                    Margin="6,0,0,0"
-                                    Visibility="Hidden" />
-
-               </StackPanel>
-
-            </Border>
-
-         </Border>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderBrush"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" />
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="outerBorder"
-                    Property="Padding"
-                    Value="0" />
-
-            <Setter TargetName="innerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="innerBorder"
-                    Property="Margin"
-                    Value="0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-      </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 intAdditionConverter}, ConverterParameter=-1}" />
-
-            <Grid>
-               <Border Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-               <!-- 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>
-
-   <!-- =================================================================== -->
-   <!-- 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="tableflowViewClassicSystemColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableflowViewForcedClassicSystemColorGridControlStyle"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Classic;V4.0.0.0;31bf3856ad364e35;component\themes/classic.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableflowViewClassicSystemColorRowSelectorStyle"
-          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>
-
-      </Style.Triggers>
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <!-- case 150388: The foreground property set in a user implicit style may not always be applied.  We noticed that
-                         the issue doesn't occur when we assign a value for the foreground property in the default style.
-                         Since we don't want to stop an inherited value to be propagated, we bind the property to the
-                         parent's property.-->
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#EDEDED" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <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="tableflowViewClassicSystemColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <!-- case 150388: The foreground property set in a user implicit style may not always be applied.  We noticed that
-                         the issue doesn't occur when we assign a value for the foreground property in the default style.
-                         Since we don't want to stop an inherited value to be propagated, we bind the property to the
-                         parent's property. -->
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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="tableflowViewClassicSystemColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Left}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
-
-      <Style.Triggers>
-
-         <Trigger Property="IsBeingDragged"
-                  Value="True">
-            <Setter Property="Background"
-                    Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-         </Trigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AreColumnsBeingReordered}"
-                      Value="True">
-            <Setter Property="Background"
-                    Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-         </DataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorGroupByControlStyle"
-          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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewClassicSystemColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-         </DataTrigger>
-
-         <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="tableflowViewClassicSystemColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,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="tableflowViewClassicSystemColorDetailIndicatorStyle"
-          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="tableflowViewClassicSystemColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewClassicSystemColorHierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewClassicSystemColorHierarchicalGroupByControlNodeStyle"
-          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="tableflowViewClassicSystemColorHierarchicalGroupByControlStyle"
-          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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewClassicSystemColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorGroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewClassicSystemColorGroupNavigationControlItemStyle"
-          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="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-                     <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="tableflowViewClassicSystemColorGroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewClassicSystemColorDefaultValues"
-          TargetType="views:TableflowView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              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:ClassicSystemColorTheme}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewForcedClassicSystemColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ClassicSystemColorTheme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml
deleted file mode 100644
index 312b9c12..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml
+++ /dev/null
@@ -1,585 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views"
-                    xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
-                    xmlns:mscorlib="clr-namespace:System;assembly=mscorlib">
-
-   <conv:StringFormatMultiConverter x:Key="stringFormatMultiConverter" />
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-   <conv:LevelToOpacityConverter x:Key="levelToOpacityConverter" />
-   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
-   <conv:ThicknessConverter x:Key="thicknessConverter" />
-   <conv:EmptyStringToBooleanConverter x:Key="emptyStringToBooleanConverter" />
-   <conv:SourceDataConverter x:Key="sourceDataConverter" />
-
-   <!-- DownArrow -->
-   <Path x:Key="downArrow"
-         Data="M454.165,177.507L422.165,212.46 390.165,177.507 454.165,177.507z"
-         Stretch="Uniform"
-         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
-         Width="16"
-         Height="24" />
-
-   <!-- UpArrow -->
-   <Path x:Key="upArrow"
-         Data="M167.5,212.46L199.5,177.507 231.5,212.46 167.5,212.46z"
-         Stretch="Uniform"
-         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
-         Width="16"
-         Height="24" />
-
-   <!-- Visible icon -->
-   <Path x:Key="visibleIcon"
-         x:Shared="False"
-         Data="M10.666975,3.7209997C11.811488,3.7209999 12.74,4.6494002 12.74,5.7939548 12.74,6.9385099 11.811488,7.8670001 10.666975,7.8670001 9.5224209,7.8670001 8.5939999,6.9385099 8.5939999,5.7939548 8.5939999,4.6494002 9.5224209,3.7209999 10.666975,3.7209997z M10.6665,1.4661931C8.2771845,1.4661933 6.3384409,3.4050867 6.3384409,5.7944998 6.3384409,8.1851625 8.2771845,10.122937 10.6665,10.122937 13.055855,10.122937 14.994618,8.1851625 14.994618,5.7944998 14.994618,3.4050867 13.055855,1.4661933 10.6665,1.4661931z M10.6665,0C16.557089,-5.0623953E-08 21.333,5.7944998 21.333,5.7944998 21.333,5.7944998 16.557089,11.589 10.6665,11.589 4.7761602,11.589 0,5.7944998 0,5.7944998 0,5.7944998 4.7761602,-5.0623953E-08 10.6665,0z"
-         Stretch="Uniform"
-         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
-         Width="16"
-         Height="16" />
-
-   <!-- Delete icon -->
-   <Path x:Key="deleteIcon"
-         x:Shared="False"
-         Data="M33.978,27.679999L33.978,58.098995 41.374,58.098995 41.374,27.679999z M14.841001,27.679999L14.841001,58.098995 22.237,58.098995 22.237,27.679999z M4.0320003,22.430001L52.183002,22.430001 52.183002,63.995998 4.0320003,63.995998z M15.974001,0L40.194999,0 40.194999,7.7200003 56.166999,7.7200003 56.166999,15.995 0,15.995 0,7.7200003 15.974001,7.7200003z"
-         Stretch="Uniform"
-         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
-         Width="16"
-         Height="12" />
-
-   <!-- Insert Group icon -->
-   <Path x:Key="insertGroupIcon"
-         x:Shared="False"
-         Data="M19.833,0L32.501,0 32.501,19.833999 52.334,19.833999 52.334,32.500999 32.501,32.500999 32.501,52.333 19.833,52.333 19.833,32.500999 0,32.500999 0,19.833999 19.833,19.833999z"
-         Stretch="Uniform"
-         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
-         Width="16"
-         Height="12" />
-
-   <!-- Rename Group icon -->
-   <Path x:Key="renameGroupIcon"
-         x:Shared="False"
-         Data="M0,44.439791L18.98951,54.569246 0.47998798,62.66881z M17.428029,12.359973L36.955557,23.568769 21.957478,49.686174 20.847757,46.346189 15.11851,45.756407 14.138656,42.166935 8.5292659,41.966761 6.9493899,38.037481 2.4399572,38.477377z M26.812517,0.0009765625C27.350616,-0.012230873,27.875986,0.10826397,28.348372,0.3782568L42.175028,8.3180408C43.85462,9.2780154,44.234529,11.777948,43.02482,13.89789L41.375219,16.767812 21.460039,5.3381228 23.10964,2.4582005C23.979116,0.941679,25.437378,0.034730911,26.812517,0.0009765625z"
-         Stretch="Uniform"
-         Fill="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}"
-         Width="16"
-         Height="12" />
-
-   <!-- Style applied to the Thumbs that are used to resize the columns and rows.
-        The Thumb's template is an empty Grid with a Transparent background to
-        make it hit-testable. -->
-   <Style x:Key="invisibleThumbStyle"
-          TargetType="Thumb">
-
-      <Setter Property="MinWidth"
-              Value="{DynamicResource {x:Static SystemParameters.ResizeFrameVerticalBorderWidthKey}}" />
-
-      <Setter Property="MinHeight"
-              Value="{DynamicResource {x:Static SystemParameters.ResizeFrameHorizontalBorderHeightKey}}" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-
-            <ControlTemplate TargetType="Thumb">
-               <Grid Background="Transparent" />
-            </ControlTemplate>
-
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!-- ControlTemplated applied to the Button that is used in the DataRows
-        to expand/collapse Details. -->
-   <ControlTemplate x:Key="detailsExpanderButtonTemplate"
-                    TargetType="Button">
-      <ContentPresenter x:Name="expanderGlyphPresenter"
-                        Content="{x:Null}"
-                        ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).CollapseGroupGlyph}" />
-
-      <ControlTemplate.Triggers>
-         <Trigger Property="local:DataGridControl.HasExpandedDetails"
-                  Value="False">
-            <Setter TargetName="expanderGlyphPresenter"
-                    Property="ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}" />
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!-- ControlTemplated applied to the ToggleButton that is used in the GroupHeaders
-        to expand/collapse groups. -->
-   <ControlTemplate x:Key="groupExpanderToggleButtonTemplate"
-                    TargetType="ToggleButton">
-
-      <ContentPresenter x:Name="expanderGlyphPresenter"
-                        Content="{x:Null}"
-                        ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).CollapseGroupGlyph}" />
-
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsChecked"
-                  Value="False">
-            <Setter TargetName="expanderGlyphPresenter"
-                    Property="ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}" />
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <DataTemplate x:Key="defaultGroupTemplate">
-      <StackPanel Orientation="Horizontal"
-                  VerticalAlignment="Center">
-
-         <ContentPresenter Content="{Binding Title}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.TitleTemplate}"
-                           ContentTemplateSelector="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.TitleTemplateSelector}"
-                           VerticalAlignment="Center" />
-
-         <TextBlock Text=": "
-                    VerticalAlignment="Center" />
-         <ContentPresenter ContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.ValueTemplate}"
-                           ContentTemplateSelector="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.ValueTemplateSelector}"
-                           VerticalAlignment="Center">
-            <ContentPresenter.Content>
-               <MultiBinding Converter="{StaticResource stringFormatMultiConverter}">
-                  <Binding Path="Value" />
-                  <Binding Path="DataContext.ValueStringFormat"
-                           RelativeSource="{RelativeSource TemplatedParent}" />
-                  <Binding Path="DataContext.ValueStringFormatCulture"
-                           RelativeSource="{RelativeSource TemplatedParent}" />
-               </MultiBinding>
-            </ContentPresenter.Content>
-         </ContentPresenter>
-
-         <TextBlock Text=" ("
-                    VerticalAlignment="Center" />
-         <TextBlock Text="{Binding ItemCount}"
-                    VerticalAlignment="Center" />
-         <TextBlock Text=" "
-                    VerticalAlignment="Center" />
-         <TextBlock x:Name="suffixRun"
-                    Text="items"
-                    VerticalAlignment="Center" />
-         <TextBlock Text=")"
-                    VerticalAlignment="Center" />
-
-      </StackPanel>
-
-      <DataTemplate.Triggers>
-         <DataTrigger Binding="{Binding ItemCount}"
-                      Value="1">
-            <Setter TargetName="suffixRun"
-                    Property="Text"
-                    Value="item" />
-         </DataTrigger>
-      </DataTemplate.Triggers>
-   </DataTemplate>
-
-   <DataTemplate x:Key="stickyGroupTemplate">
-      <DataTemplate.Resources>
-         <DataTemplate x:Key="detailedGroupItemContentTemplate">
-            <StackPanel Orientation="Horizontal"
-                        VerticalAlignment="Center">
-               <ContentControl ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplate}"
-                               ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplateSelector}"
-                               TextBlock.FontWeight="Bold"
-                               VerticalAlignment="Center">
-                  <ContentControl.Content>
-                     <MultiBinding Converter="{StaticResource stringFormatMultiConverter}">
-                        <Binding Path="(local:GroupNavigationControl.Group).Value"
-                                 RelativeSource="{RelativeSource Self}" />
-                        <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormat"
-                                 RelativeSource="{RelativeSource Self}" />
-                        <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormatCulture"
-                                 RelativeSource="{RelativeSource Self}" />
-                     </MultiBinding>
-                  </ContentControl.Content>
-               </ContentControl>
-
-               <TextBlock Text=" ("
-                          VerticalAlignment="Center" />
-               <TextBlock Text="{Binding ItemCount}"
-                          VerticalAlignment="Center" />
-               <TextBlock Text=" "
-                          VerticalAlignment="Center" />
-               <TextBlock x:Name="suffixRun"
-                          Text="items"
-                          VerticalAlignment="Center" />
-               <TextBlock Text=")"
-                          VerticalAlignment="Center" />
-
-            </StackPanel>
-
-            <DataTemplate.Triggers>
-               <DataTrigger Binding="{Binding ItemCount}"
-                            Value="1">
-                  <Setter TargetName="suffixRun"
-                          Property="Text"
-                          Value="item" />
-               </DataTrigger>
-            </DataTemplate.Triggers>
-         </DataTemplate>
-
-         <DataTemplate x:Key="groupItemContentTemplate">
-            <ContentControl ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplate}"
-                            ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(local:GroupNavigationControl.Group).ValueTemplateSelector}">
-               <ContentControl.Content>
-                  <MultiBinding Converter="{StaticResource stringFormatMultiConverter}">
-                     <Binding Path="(local:GroupNavigationControl.Group).Value"
-                              RelativeSource="{RelativeSource Self}" />
-                     <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormat"
-                              RelativeSource="{RelativeSource Self}" />
-                     <Binding Path="(local:GroupNavigationControl.Group).ValueStringFormatCulture"
-                              RelativeSource="{RelativeSource Self}" />
-                  </MultiBinding>
-               </ContentControl.Content>
-            </ContentControl>
-         </DataTemplate>
-
-         <DataTemplate x:Key="parentGroupTemplate">
-            <local:GroupNavigationControl Group="{Binding}"
-                                          MainItemTemplate="{StaticResource groupItemContentTemplate}"
-                                          ItemTemplate="{StaticResource groupItemContentTemplate}" />
-         </DataTemplate>
-      </DataTemplate.Resources>
-
-      <StackPanel Orientation="Horizontal">
-         <ItemsControl ItemsSource="{Binding Path=ParentGroups}"
-                       ItemTemplate="{StaticResource parentGroupTemplate}"
-                       Focusable="False">
-            <ItemsControl.ItemsPanel>
-               <ItemsPanelTemplate>
-                  <StackPanel Orientation="Horizontal"
-                              IsItemsHost="True" />
-               </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-         </ItemsControl>
-
-         <local:GroupNavigationControl Group="{Binding}"
-                                       MainItemTemplate="{StaticResource detailedGroupItemContentTemplate}"
-                                       ItemTemplate="{StaticResource groupItemContentTemplate}" />
-      </StackPanel>
-   </DataTemplate>
-
-   <DataTemplate DataType="{x:Type local:Group}">
-      <!-- This ContentControl must be focusable false to avoid getting the focus 
-           when performing KeyboardNavigation -->
-      <ContentControl x:Name="groupContentPresenter"
-                      Focusable="False"
-                      Content="{Binding}"
-                      ContentTemplate="{StaticResource defaultGroupTemplate}" />
-
-      <DataTemplate.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.View, Converter={x:Static conv:TypeToBooleanConverter.Singleton}, ConverterParameter={x:Type views:TableflowView}}"
-                      Value="True">
-            <Setter Property="ContentTemplate"
-                    Value="{StaticResource stickyGroupTemplate}"
-                    TargetName="groupContentPresenter" />
-         </DataTrigger>
-      </DataTemplate.Triggers>
-   </DataTemplate>
-
-   <!-- Default DataTemplate for displaying a GroupLevelDescription (e.g. in a GroupByItem) -->
-   <DataTemplate DataType="{x:Type local:GroupLevelDescription}">
-
-      <ContentPresenter Content="{Binding Title}"
-                        ContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.TitleTemplate}" />
-
-   </DataTemplate>
-
-   <Thickness x:Key="cellPadding"
-              Left="2"
-              Top="2"
-              Right="2"
-              Bottom="2" />
-
-
-   <DataTemplate x:Key="connectionStateLoadingGlyph">
-      <DataTemplate.Resources>
-         <SolidColorBrush Color="Black"
-                          x:Key="backgroundBrushAdoners" />
-
-         <Storyboard x:Key="loadingStoryboard"
-                     RepeatBehavior="Forever">
-            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                           Storyboard.TargetName="path"
-                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-               <SplineDoubleKeyFrame KeyTime="00:00:00"
-                                     Value="0" />
-               <SplineDoubleKeyFrame KeyTime="00:00:00.5000000"
-                                     Value="-10.5" />
-            </DoubleAnimationUsingKeyFrames>
-            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                           Storyboard.TargetName="path"
-                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-               <SplineDoubleKeyFrame KeyTime="00:00:00"
-                                     Value="0" />
-               <SplineDoubleKeyFrame KeyTime="00:00:00.5000000"
-                                     Value="17.5" />
-            </DoubleAnimationUsingKeyFrames>
-            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                           Storyboard.TargetName="path2"
-                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-               <SplineDoubleKeyFrame KeyTime="00:00:00"
-                                     Value="0" />
-               <SplineDoubleKeyFrame KeyTime="00:00:00.5000000"
-                                     Value="20.875" />
-            </DoubleAnimationUsingKeyFrames>
-            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                           Storyboard.TargetName="path3"
-                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-               <SplineDoubleKeyFrame KeyTime="00:00:00"
-                                     Value="0" />
-               <SplineDoubleKeyFrame KeyTime="00:00:00.5000000"
-                                     Value="-17.5" />
-            </DoubleAnimationUsingKeyFrames>
-            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                           Storyboard.TargetName="path3"
-                                           Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-               <SplineDoubleKeyFrame KeyTime="00:00:00"
-                                     Value="0" />
-               <SplineDoubleKeyFrame KeyTime="00:00:00.5000000"
-                                     Value="-10.375" />
-            </DoubleAnimationUsingKeyFrames>
-            <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-               <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="Black" />
-            </ColorAnimationUsingKeyFrames>
-            <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path2"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-               <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="Black" />
-            </ColorAnimationUsingKeyFrames>
-            <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path3"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-               <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="Black" />
-            </ColorAnimationUsingKeyFrames>
-         </Storyboard>
-
-      </DataTemplate.Resources>
-      <Grid x:Name="rootLayout"
-            Background="Transparent">
-         <Canvas Width="27.466"
-                 Height="24.066">
-
-            <Canvas>
-               <Path x:Name="path"
-                     Fill="Black"
-                     Data="F1 M 17.067,3.300 C 17.067,5.123 15.589,6.600 13.767,6.600 C 11.944,6.600 10.467,5.123 10.467,3.300 C 10.467,1.478 11.944,0.000 13.767,0.000 C 15.589,0.000 17.067,1.478 17.067,3.300 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-                  <Path.RenderTransform>
-                     <TransformGroup>
-                        <ScaleTransform />
-                        <SkewTransform />
-                        <RotateTransform />
-                        <TranslateTransform />
-                     </TransformGroup>
-                  </Path.RenderTransform>
-               </Path>
-               <Path x:Name="path2"
-                     Fill="Black"
-                     Data="F1 M 6.600,20.767 C 6.600,22.590 5.123,24.066 3.300,24.066 C 1.478,24.066 0.000,22.590 0.000,20.767 C 0.000,18.944 1.478,17.467 3.300,17.467 C 5.123,17.467 6.600,18.944 6.600,20.767 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-                  <Path.RenderTransform>
-                     <TransformGroup>
-                        <ScaleTransform />
-                        <SkewTransform />
-                        <RotateTransform />
-                        <TranslateTransform />
-                     </TransformGroup>
-                  </Path.RenderTransform>
-               </Path>
-               <Path x:Name="path3"
-                     Fill="Black"
-                     Data="F1 M 27.466,20.767 C 27.466,22.590 25.989,24.066 24.167,24.066 C 22.344,24.066 20.867,22.590 20.867,20.767 C 20.867,18.944 22.344,17.467 24.167,17.467 C 25.989,17.467 27.466,18.944 27.466,20.767 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-                  <Path.RenderTransform>
-                     <TransformGroup>
-                        <ScaleTransform />
-                        <SkewTransform />
-                        <RotateTransform />
-                        <TranslateTransform />
-                     </TransformGroup>
-                  </Path.RenderTransform>
-               </Path>
-            </Canvas>
-         </Canvas>
-         <Grid.ToolTip>
-            <ToolTip x:Name="errorToolTip"
-                     Visibility="Collapsed">
-               <ContentPresenter />
-            </ToolTip>
-         </Grid.ToolTip>
-      </Grid>
-      <DataTemplate.Triggers>
-         <DataTrigger Binding="{Binding Path=Visibility, RelativeSource={RelativeSource Self}}"
-                      Value="Visible">
-            <DataTrigger.EnterActions>
-               <BeginStoryboard Storyboard="{StaticResource loadingStoryboard}"
-                                Name="storyboard" />
-            </DataTrigger.EnterActions>
-            <DataTrigger.ExitActions>
-               <StopStoryboard BeginStoryboardName="storyboard" />
-               <RemoveStoryboard BeginStoryboardName="storyboard" />
-            </DataTrigger.ExitActions>
-         </DataTrigger>
-      </DataTemplate.Triggers>
-   </DataTemplate>
-
-   <DataTemplate x:Key="connectionStateErrorGlyph">
-      <DataTemplate.Resources>
-         <SolidColorBrush Color="Black"
-                          x:Key="backgroundBrushAdoners" />
-         <Storyboard x:Key="errorStoryboard"
-                     RepeatBehavior="Forever">
-            <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-               <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="#FF970000" />
-               <SplineColorKeyFrame KeyTime="00:00:00.5000000"
-                                    Value="Red" />
-               <SplineColorKeyFrame KeyTime="00:00:01"
-                                    Value="#FF970000" />
-               <SplineColorKeyFrame KeyTime="00:00:01.5000000"
-                                    Value="Red" />
-               <SplineColorKeyFrame KeyTime="00:00:02"
-                                    Value="#FF970000" />
-            </ColorAnimationUsingKeyFrames>
-            <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path2"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-               <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="#FF970000" />
-               <SplineColorKeyFrame KeyTime="00:00:00.5000000"
-                                    Value="Red" />
-               <SplineColorKeyFrame KeyTime="00:00:01"
-                                    Value="#FF970000" />
-               <SplineColorKeyFrame KeyTime="00:00:01.5000000"
-                                    Value="Red" />
-               <SplineColorKeyFrame KeyTime="00:00:02"
-                                    Value="#FF970000" />
-            </ColorAnimationUsingKeyFrames>
-            <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path3"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-               <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="#FF970000" />
-               <SplineColorKeyFrame KeyTime="00:00:00.5000000"
-                                    Value="Red" />
-               <SplineColorKeyFrame KeyTime="00:00:01"
-                                    Value="#FF970000" />
-               <SplineColorKeyFrame KeyTime="00:00:01.5000000"
-                                    Value="Red" />
-               <SplineColorKeyFrame KeyTime="00:00:02"
-                                    Value="#FF970000" />
-            </ColorAnimationUsingKeyFrames>
-         </Storyboard>
-
-      </DataTemplate.Resources>
-      <Grid x:Name="rootLayout"
-            Background="Transparent">
-         <Canvas Width="27.466"
-                 Height="24.066">
-
-            <Canvas>
-               <Path x:Name="path"
-                     Fill="Black"
-                     Data="F1 M 17.067,3.300 C 17.067,5.123 15.589,6.600 13.767,6.600 C 11.944,6.600 10.467,5.123 10.467,3.300 C 10.467,1.478 11.944,0.000 13.767,0.000 C 15.589,0.000 17.067,1.478 17.067,3.300 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-                  <Path.RenderTransform>
-                     <TransformGroup>
-                        <ScaleTransform />
-                        <SkewTransform />
-                        <RotateTransform />
-                        <TranslateTransform />
-                     </TransformGroup>
-                  </Path.RenderTransform>
-               </Path>
-               <Path x:Name="path2"
-                     Fill="Black"
-                     Data="F1 M 6.600,20.767 C 6.600,22.590 5.123,24.066 3.300,24.066 C 1.478,24.066 0.000,22.590 0.000,20.767 C 0.000,18.944 1.478,17.467 3.300,17.467 C 5.123,17.467 6.600,18.944 6.600,20.767 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-                  <Path.RenderTransform>
-                     <TransformGroup>
-                        <ScaleTransform />
-                        <SkewTransform />
-                        <RotateTransform />
-                        <TranslateTransform />
-                     </TransformGroup>
-                  </Path.RenderTransform>
-               </Path>
-               <Path x:Name="path3"
-                     Fill="Black"
-                     Data="F1 M 27.466,20.767 C 27.466,22.590 25.989,24.066 24.167,24.066 C 22.344,24.066 20.867,22.590 20.867,20.767 C 20.867,18.944 22.344,17.467 24.167,17.467 C 25.989,17.467 27.466,18.944 27.466,20.767 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-                  <Path.RenderTransform>
-                     <TransformGroup>
-                        <ScaleTransform />
-                        <SkewTransform />
-                        <RotateTransform />
-                        <TranslateTransform />
-                     </TransformGroup>
-                  </Path.RenderTransform>
-               </Path>
-            </Canvas>
-         </Canvas>
-         <Grid.ToolTip>
-            <ToolTip x:Name="errorToolTip"
-                     Visibility="Collapsed">
-               <ContentPresenter />
-            </ToolTip>
-         </Grid.ToolTip>
-      </Grid>
-      <DataTemplate.Triggers>
-         <DataTrigger Binding="{Binding}"
-                      Value="Error">
-            <Setter TargetName="rootLayout"
-                    Property="Visibility"
-                    Value="Visible" />
-            <Setter Property="Visibility"
-                    TargetName="errorToolTip"
-                    Value="Visible" />
-            <Setter TargetName="errorToolTip"
-                    Property="Content"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.ConnectionError}" />
-            <DataTrigger.EnterActions>
-               <BeginStoryboard Storyboard="{StaticResource errorStoryboard}"
-                                Name="storyboard" />
-            </DataTrigger.EnterActions>
-            <DataTrigger.ExitActions>
-               <StopStoryboard BeginStoryboardName="storyboard" />
-               <RemoveStoryboard BeginStoryboardName="storyboard" />
-            </DataTrigger.ExitActions>
-         </DataTrigger>
-      </DataTemplate.Triggers>
-   </DataTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml
deleted file mode 100644
index 23c32eff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml
+++ /dev/null
@@ -1,315 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <!-- =================================================================== -->
-   <!-- Glyphs                                                              -->
-   <!-- =================================================================== -->
-
-   <!-- Glyph that is displayed in a ColumnManagerCell or GroupByItem when an ascending sort is applied to a column. -->
-   <DataTemplate x:Key="ascendingSortGlyph">
-      <Border Width="9"
-              Height="5">
-         <Path Opacity="1"
-               Data="M 4.53125,0.15625 C4.53125,0.15625 9,5 9,5 9,5 0,5 0,5 0,5 4.53125,0.15625 4.53125,0.15625 z"
-               Fill="{Binding RelativeSource={RelativeSource Self},Path=(TextElement.Foreground)}"/>
-      </Border>
-   </DataTemplate>
-
-   <!-- Glyph that is displayed in a ColumnManagerCell or GroupByItem when a descending sort is applied to a column. -->
-   <DataTemplate x:Key="descendingSortGlyph">
-      <Border Width="9"
-              Height="5">
-         <Path Opacity="1"
-               Data="M 4.53125,5 C4.53125,5 9,0.15625 9,0.15625 9,0.15625 0,0.15625 0,0.15625 0,0.15625 4.53125,5 4.53125,5 z"
-               Fill="{Binding RelativeSource={RelativeSource Self},Path=(TextElement.Foreground)}"/>
-      </Border>
-   </DataTemplate>
-
-  <!-- Glyph that is displayed in the group headers to expand the group. -->
-   <DataTemplate x:Key="expandGroupGlyph">
-      <Canvas Width="9"
-              Height="9">
-         <Path Canvas.Left="0"
-               Canvas.Top="0"
-               Height="9"
-               Width="9"
-               Stretch="Fill"
-               Opacity="1"
-               Data="M -0.16668701171875,0.5 C-0.16668701171875,0.5 8.83331298828125,0.5 8.83331298828125,0.5 8.83331298828125,0.5 8.83331298828125,9.5 8.83331298828125,9.5 8.83331298828125,9.5 -0.16668701171875,9.5 -0.16668701171875,9.5 -0.16668701171875,9.5 -0.16668701171875,0.5 -0.16668701171875,0.5 z"
-               Stroke="#8e997d"
-               StrokeThickness="1">
-            <Path.Fill>
-               <LinearGradientBrush
-                  StartPoint="0.90740966796875,0.8333333333333334"
-                  EndPoint="0.0925937228732639,0.05555555555555555">
-                  <LinearGradientBrush.GradientStops>
-                     <GradientStopCollection>
-                        <GradientStop Color="#FFc3baaa"
-                                      Offset="0" />
-                        <GradientStop Color="#FFfcfcfb"
-                                      Offset="0.9888888597488403" />
-                     </GradientStopCollection>
-                  </LinearGradientBrush.GradientStops>
-               </LinearGradientBrush>
-            </Path.Fill>
-         </Path>
-         <Path Canvas.Left="2"
-               Canvas.Top="4"
-               Height="1"
-               Width="5"
-               Stretch="Fill"
-               Opacity="1"
-               Data="M 6.5,4.5 C6.5,4.5 2.5,4.5 2.5,4.5 "
-               Stroke="#000000"
-               StrokeThickness="1" />
-         <Path Canvas.Left="4"
-               Canvas.Top="2"
-               Height="5"
-               Width="1"
-               Stretch="Fill"
-               Opacity="1"
-               Data="M 4,6 C4,6 4,2 4,2 "
-               Stroke="#000000"
-               StrokeThickness="1" />
-      </Canvas>
-   </DataTemplate>
-
-   <!-- Glyph that is displayed in the group headers to collapse the group. -->
-   <DataTemplate x:Key="collapseGroupGlyph">
-      <Canvas Width="9"
-              Height="9">
-         <Path Canvas.Left="0"
-               Canvas.Top="0"
-               Height="9"
-               Width="9"
-               Stretch="Fill"
-               Opacity="1"
-               Data="M -0.16668701171875,0.5 C-0.16668701171875,0.5 8.83331298828125,0.5 8.83331298828125,0.5 8.83331298828125,0.5 8.83331298828125,9.5 8.83331298828125,9.5 8.83331298828125,9.5 -0.16668701171875,9.5 -0.16668701171875,9.5 -0.16668701171875,9.5 -0.16668701171875,0.5 -0.16668701171875,0.5 z"
-               Stroke="#8e997d"
-               StrokeThickness="1">
-            <Path.Fill>
-               <LinearGradientBrush StartPoint="0.90740966796875,0.8333333333333334"
-                                    EndPoint="0.0925937228732639,0.05555555555555555">
-                  <LinearGradientBrush.GradientStops>
-                     <GradientStopCollection>
-                        <GradientStop Color="#FFc3baaa"
-                                      Offset="0" />
-                        <GradientStop Color="#FFfcfcfb"
-                                      Offset="0.9888888597488403" />
-                     </GradientStopCollection>
-                  </LinearGradientBrush.GradientStops>
-               </LinearGradientBrush>
-            </Path.Fill>
-         </Path>
-         <Path Canvas.Left="2"
-               Canvas.Top="4"
-               Height="1"
-               Width="5"
-               Stretch="Fill"
-               Opacity="1"
-               Data="M 6.5,4.5 C6.5,4.5 2.5,4.5 2.5,4.5 "
-               Stroke="#000000"
-               StrokeThickness="1" />
-      </Canvas>
-   </DataTemplate>
-
-   <!-- Glyph that is displayed in the RowSelector for a Row that is current. -->
-   <DataTemplate x:Key="currentItemGlyph">
-      <Path Margin="0,2,0,0" 
-            Opacity="1"
-            Data="M 5,4.46875 C5,4.46875 0,0 0,0 0,0 0,9 0,9 0,9 5,4.46875 5,4.46875 z"
-            Fill="{Binding RelativeSource={RelativeSource Self},Path=(TextElement.Foreground)}"/>
-   </DataTemplate>
-
-   <!-- Glyph that is displayed in the RowSelector for a Row that is being edited. -->
-   <DataTemplate x:Key="editingRowGlyph">
-         <Grid x:Name="crayon"
-               Width="13.505371"
-               Height="14.666504"
-               ClipToBounds="True">
-
-            <Path StrokeThickness="1"
-                  Stroke="#FF000000"
-                  StrokeMiterLimit="1.000000"
-                  Fill="#FF000000"
-                  Data="F1 M 12.135254,4.105469 C 12.135254,4.105469 12.223145,4.213867 11.980957,4.479492 C 11.737793,4.745117 11.596191,4.601563 11.596191,4.601563 C 11.596191,4.601563 11.737793,4.810547 11.451660,5.027832 C 11.125488,5.274902 11.052246,5.104004 11.052246,5.104004 L 4.039551,12.810059 L 0.383301,14.247559 L 1.508301,10.403809 L 8.457520,2.768555 C 8.457520,2.768555 8.359863,2.593262 8.545410,2.390137 C 8.730957,2.187012 8.994629,2.227539 8.994629,2.227539 C 8.994629,2.227539 8.830566,2.077637 9.065918,1.819824 C 9.301270,1.561523 9.486816,1.688477 9.486816,1.688477 L 10.667480,0.318848 C 10.845215,0.124512 11.529785,0.332031 12.334473,1.066406 C 13.139160,1.800781 13.376465,2.435059 13.199707,2.628906 L 12.110840,3.942871 L 12.135254,4.105469 Z"
-                  x:Name="contourCrayon"/>
-
-
-
-            <Path Data="F1 M 10.698730,0.381348 C 10.876465,0.187012 11.561035,0.394531 12.365723,1.128906 C 13.170410,1.863281 13.407715,2.497559 13.230957,2.691406 L 11.875488,4.176270 C 11.698730,4.370117 11.387207,4.375000 11.182129,4.186523 L 9.396973,2.558105 C 9.189941,2.370117 9.166504,2.060059 9.344238,1.866211 L 10.698730,0.381348 Z"
-                  x:Name="boutEfface">
-               <Path.Fill>
-                  <LinearGradientBrush MappingMode="Absolute"
-                                       StartPoint="308.197266,411.454590"
-                                       EndPoint="311.275574,409.867828">
-                     <LinearGradientBrush.Transform>
-                        <MatrixTransform Matrix="0.965100,0.261800,0.261800,-0.965100,-395.200104,317.410736" />
-                     </LinearGradientBrush.Transform>
-                     <GradientStop Offset="0.000000"
-                                   Color="#FFFEFEFE"/>
-                     <GradientStop Offset="0.504348"
-                                   Color="#FFD3D3D3"/>
-                     <GradientStop Offset="1.000000"
-                                   Color="#FF717171"/>
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-
-            <Path Fill="#FFFFFFFF"
-                  Data="F1 M 3.095703,11.226074 C 4.587402,12.587402 3.999023,12.801270 3.999023,12.801270 L 0.330566,14.286621 L 1.487305,10.477051 C 1.487305,10.477051 1.604004,9.864746 3.095703,11.226074 Z"
-                  x:Name="pointeBeige"/>
-
-            <Path Fill="#FF343434"
-                  Data="F1 M 10.754395,3.897949 L 11.291504,4.816895 L 4.040039,12.763184 L 3.503418,11.844238 L 10.754395,3.897949 Z"
-                  x:Name="couleur3"/>
-
-            <Path Fill="#FF696969"
-                  Data="F1 M 9.699707,2.935059 L 10.777832,3.918945 L 3.527344,11.865723 L 2.449219,10.882324 L 9.699707,2.935059 Z"
-                  x:Name="couleur2"/>
-
-            <Path Fill="#FFABABAB"
-                  Data="F1 M 8.736816,2.485352 L 9.699707,2.935059 L 2.449219,10.882324 L 1.484863,10.432129 L 8.736816,2.485352 Z"
-                  x:Name="couleur1"/>
-
-            <Path Data="F1 M 8.607910,2.296387 C 8.793457,2.093262 9.057129,2.133789 9.057129,2.133789 C 9.057129,2.133789 8.893066,1.983887 9.128418,1.726074 C 9.363770,1.467773 9.549316,1.594727 9.549316,1.594727 C 9.549316,1.594727 10.244629,1.885254 10.985840,2.562500 C 11.727051,3.238770 12.197754,4.011719 12.197754,4.011719 C 12.197754,4.011719 12.285645,4.120117 12.043457,4.385742 C 11.800293,4.651367 11.658691,4.507813 11.658691,4.507813 C 11.658691,4.507813 11.800293,4.716797 11.514160,4.934082 C 11.187988,5.181152 11.114746,5.010254 11.114746,5.010254 C 11.114746,5.010254 10.846191,4.324707 10.044434,3.593750 C 9.242676,2.861816 8.520020,2.674805 8.520020,2.674805 C 8.520020,2.674805 8.422363,2.499512 8.607910,2.296387 Z"
-                  x:Name="boutMetalEfface">
-               <Path.Fill>
-                  <LinearGradientBrush MappingMode="Absolute"
-                                       StartPoint="306.663086,410.784668"
-                                       EndPoint="310.914825,408.500153">
-                     <LinearGradientBrush.Transform>
-                        <MatrixTransform Matrix="0.965100,0.261800,0.261800,-0.965100,-395.200104,317.410736" />
-                     </LinearGradientBrush.Transform>
-                     <GradientStop Offset="0.000000"
-                                   Color="#ffb1b1b1"/>
-                     <GradientStop Offset="0.504348"
-                                   Color="#ff787878"/>
-                     <GradientStop Offset="1.000000"
-                                   Color="#ff3e3e3e"/>
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-
-            <Path Fill="#ff000000"
-                  Data="F1 M 2.227051,13.505371 L 0.734863,12.976074 L 0.330566,14.286621 L 1.582031,13.785645 L 2.227051,13.505371 Z"
-                  x:Name="boutMine"/>
-
-
-         </Grid>
-   </DataTemplate>
-
-   <!-- Glyph that is displayed in the RowSelector for a Row that has a validation error. -->
-   <DataTemplate x:Key="validationErrorGlyph">
-      <Grid
-         Height="14"
-         Width="14">
-         <Path
-            Margin="0,0,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="14"
-            Width="14"
-            Stretch="Fill"
-            Opacity="1"
-            Data="M 0,7 C0,3.13397216796875 3.1339569091796875,0 7,0 10.866043090820312,0 14,3.13397216796875 14,7 14,10.866058349609375 10.866043090820312,14 7,14 3.1339569091796875,14 0,10.866058349609375 0,7 z"
-            Stroke="#990000"
-            StrokeThickness="1">
-            <Path.Fill>
-               <LinearGradientBrush
-                  StartPoint="0.14285714285714285,0.14285714285714285"
-                  EndPoint="0.8392857142857143,0.8839285714285714">
-                  <LinearGradientBrush.GradientStops>
-                     <GradientStopCollection>
-                        <GradientStop
-                           Color="#FF990000"
-                           Offset="0" />
-                        <GradientStop
-                           Color="#FFff0000"
-                           Offset="0.9944440126419067" />
-                     </GradientStopCollection>
-                  </LinearGradientBrush.GradientStops>
-               </LinearGradientBrush>
-            </Path.Fill>
-         </Path>
-         <Path
-            Margin="-0.3838682472705841,-0.38386160135269165,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="12.929575026035309"
-            Width="13.883868247270584"
-            Stretch="Fill"
-            Opacity="1"
-            Data="M 0.5,10.5 C-1.433029055595398,6.91009521484375 -0.08990500122308731,2.433013916015625 3.5,0.5 7.08990478515625,-1.4330140352249146 11.566986083984375,-0.0899050235748291 13.5,3.5 9.75,4 6.25,5.625 6.25,5.625 6.25,5.625 2.25,9.375 3.75,12.375 4.022385120391846,12.919769287109375 2.25,12.125 0.5,10.5 z">
-            <Path.Fill>
-               <RadialGradientBrush
-                  Center="0.4598047268653376,0.4163989605622471"
-                  GradientOrigin="0.4598047268653376,0.4163989605622471"
-                  RadiusX="0.9047176497478938"
-                  RadiusY="0.3101879325380103">
-                  <RadialGradientBrush.GradientStops>
-                     <GradientStopCollection>
-                        <GradientStop
-                           Color="#3affffff"
-                           Offset="0" />
-                        <GradientStop
-                           Color="#7fffffff"
-                           Offset="0.9888889789581299" />
-                     </GradientStopCollection>
-                  </RadialGradientBrush.GradientStops>
-               </RadialGradientBrush>
-            </Path.Fill>
-         </Path>
-         <Path
-            Margin="1,1,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="12"
-            Width="12"
-            Stretch="Fill"
-            Opacity="0.5019607843137255"
-            Data="M 1,7 C1,3.686248779296875 3.686249017715454,1 7,1 10.313751220703125,1 13,3.686248779296875 13,7 13,10.313751220703125 10.313751220703125,13 7,13 3.686249017715454,13 1,10.313751220703125 1,7 z"
-            Stroke="#ffffff"
-            StrokeThickness="1" />
-         <Path
-            Margin="5,1.125,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="7.875"
-            Width="3.8125"
-            Stretch="Fill"
-            Opacity="1"
-            Data="M 5,1.125 C5,1.125 8.8125,1.1875 8.8125,1.1875 8.8125,1.1875 8,9 8,9 8,9 6,9 6,9 6,9 5,1.125 5,1.125 z"
-            Fill="#ffffff" />
-         <Path
-            Margin="5.5,10,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Height="3"
-            Width="3"
-            Stretch="Fill"
-            Opacity="1"
-            Data="M 5.5,11.5 C5.5,10.671562194824219 6.171562194824219,10 7,10 7.828437805175781,10 8.5,10.671562194824219 8.5,11.5 8.5,12.328437805175781 7.828437805175781,13 7,13 6.171562194824219,13 5.5,12.328437805175781 5.5,11.5 z"
-            Stroke="#ffffff"
-            StrokeThickness="1"
-            Fill="#ffffff" />
-      </Grid>
-   </DataTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml
deleted file mode 100644
index f1c9e225..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml
+++ /dev/null
@@ -1,1523 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-      <markup:DataGridThemeResourceDictionary Source="Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-   <conv:ThicknessConverter x:Key="thicknessConverter" />
-   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
-                            InverseValue="True" />
-   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
-
-   <Style x:Key="tableViewRowFocusVisualStyle"
-          TargetType="IFrameworkInputElement">
-      <Setter Property="Control.Template">
-         <Setter.Value>
-            <ControlTemplate>
-               <Rectangle Stroke="#FF000000"
-                          StrokeThickness="1"
-                          StrokeDashArray="1 2"
-                          Margin="{Binding RelativeSource={RelativeSource AncestorType={x:Type ScrollViewer}}, Path=HorizontalOffset, Converter={StaticResource thicknessConverter}, ConverterParameter='Left'}"
-                          SnapsToDevicePixels="True" />
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <!--**************************
-    * TEMPLATE: DataGridControl 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewDataGridControlTemplate"
-                    TargetType="local:DataGridControl">
-      <Grid>
-         <Border Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <!-- The AdornerDecorator will allow visual cues for Drag & Drop operations. -->
-            <AdornerDecorator x:Name="PART_DragDropAdornerDecorator">
-               <!-- The TableViewScrollViewer takes care of laying out the various sections of
-                       a DataGrid in TableView: FixedHeaders, FixedFooters, RowSelectorPane, etc. -->
-               <views:TableViewScrollViewer x:Name="PART_ScrollViewer"
-                                            ShowRowSelectorPane="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ShowRowSelectorPane}"
-                                            RowSelectorPaneWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RowSelectorPaneWidth}"
-                                            Padding="{TemplateBinding Padding}">
-
-                  <views:TableViewItemsHost />
-               </views:TableViewScrollViewer>
-            </AdornerDecorator>
-         </Border>
-         <Grid x:Name="connectionStateGrid"
-               HorizontalAlignment="Right"
-               VerticalAlignment="Bottom"
-               Margin="0,0,25,25"
-               Height="30"
-               Width="30">
-            <ContentPresenter x:Name="connectionStateLoadingContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ConnectionStateLoadingGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-            <ContentPresenter x:Name="connectionStateCommittingContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ConnectionStateCommittingGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-            <ContentPresenter x:Name="connectionStateErrorContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ConnectionStateErrorGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-         </Grid>
-      </Grid>
-      <ControlTemplate.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).IsConnectionStateGlyphEnabled}"
-                      Value="False">
-            <Setter TargetName="connectionStateGrid"
-                    Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Loading">
-            <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-            <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Committing">
-            <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-         </DataTrigger>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Error">
-            <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-            <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    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}"
-                 Padding="{TemplateBinding Padding}">
-
-            <ContentPresenter x:Name="contentPresenter"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-         </Border>
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: Row 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowTemplate"
-                    TargetType="local:Row">
-
-      <!-- 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. -->
-
-      <!-- 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" />
-            <!-- MasterDetail ToggleButton -->
-            <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="2"
-                 Grid.ColumnSpan="2"
-                 views:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2,4,2,0"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-      </Grid>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: DataRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewDataRowTemplate"
-                    TargetType="local:DataRow">
-
-      <!-- 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:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-    </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" />
-            <!-- MasterDetail ToggleButton -->
-            <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="2"
-                 Grid.ColumnSpan="2"
-                 views:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <!-- ToggleButton that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Grid.Column="2"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Margin="2,4,2,0"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
-              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="True" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
-              the Row's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="False" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
-                          Value="False" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- 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" />
-               <Condition Value="True"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </MultiDataTrigger>
-
-         <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" />
-               <Condition Value="False"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewColumnManagerRowTemplate"
-                    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. -->
-
-      <!-- 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}" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2,4,2,0"
-                           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: Cell 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewCellTemplate"
-                    TargetType="local:Cell">
-
-      <!-- A basic Cell Template requires at least a ContentPresenter that is used to display the Cell's Content.
-           This ContentPresenter is usually placed inside a Border who is responsible for painting the gridlines. -->
-
-      <Border x:Name="rootBorder"
-              Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}">
-
-         <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g. background/foreground) of the Cell to reflect specific
-              states (e.g. IsCurrent), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <!-- When the Cell is Current, we want to change its background/foreground to the appropriate brushes.
-              We do this only when the cell does not have a validation error because we must give priority
-              to the CellErrorStyle (if present).-->
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="False" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="True" />
-
-               <Condition Property="CellErrorStyle"
-                          Value="{x:Null}" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <!-- When the Cell is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-
-    <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- We don't use the base Cell Template for the ColumnManagerCell because it need more elements
-           to function properly: a Thumb named "PART_ColumnResizerThumb" that is used to resize the
-           ColumnManagerCells's ParentColumn.Width and a glyph that represents the Column's SortDirection. -->
-
-      <Border  BorderBrush="{TemplateBinding BorderBrush}"
-               BorderThickness="{TemplateBinding BorderThickness}">
-
-         <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-         <Grid>
-
-            <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Stretch"
-                       Width="1"
-                       Margin="0,2,0,2" />
-
-            <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                       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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                             BorderThickness="1,0,0,0"
-                             Margin="0,4,0,4"
-                             Background="Transparent"
-                             Visibility="Collapsed">
-
-                        <Border x:Name="toggleDelimeterBorder2"
-                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,0,0,0"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                        </Border>
-
-                     </Border>
-
-                     <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}">
-
-                        <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                        <StackPanel x:Name="contentPanel"
-                                    Orientation="Horizontal">
-
-                           <!-- Same ContentPresenter as in the base Cell Template. -->
-                           <local:CellContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                           <!-- ContentPresenter that is used to display the sort glyph.
-                          We explicitly set its Content property to Null to prevent the XAML parser
-                          from implicitly setting it to its TemplatedParent's Content. -->
-                           <ContentPresenter x:Name="sortGlyphPresenter"
-                                             Content="{x:Null}"
-                                             ContentTemplate="{x:Null}" />
-
-                        </StackPanel>
-                     </Border>
-
-                  </Grid>
-
-               </Border>
-
-            </DockPanel>
-
-            <!-- 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>
-
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByControl
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByControlTemplate"
-                    TargetType="local:GroupByControl">
-
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}">
-
-         <!-- This Grid is used to position the ItemsPresenter over the ContentPresenter in charge
-              of displaying the NoGroupContent. -->
-         <Grid>
-
-            <!-- This ContentPresenter displays the value of the NoGroupContent property
-                 of the GroupByControl. This content must only be displayed when there are
-                 no groups present, so we set its Visibility to Collapsed by default and
-                 it is made visible via a trigger. -->
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed" />
-
-            <!-- The GroupByControl is an ItemsControl, so it must have an ItemsPresenter in its
-                 Template in order to layout and show its child items. The default ItemsPanel
-                 of the GroupByControl is a "StaircasePanel", which layout its items in a
-                 staircase-like pattern and draws connecting lines between the items. -->
-            <ItemsPresenter />
-
-         </Grid>
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When there are no groups, make the NoGroupContent visible. -->
-         <Trigger Property="HasItems"
-                  Value="False">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Border 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}" />
-
-         </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: GroupHeaderControl
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupHeaderControlTemplate"
-                    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 intAdditionConverter}, 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>
-
-               <!-- This StackPanel is used to layout the ToggleButton and the GroupHeaderControl. -->
-               <StackPanel Orientation="Horizontal">
-
-                  <!-- ToggleButton that is used to expand/collapse the group. -->
-                  <ToggleButton Template="{StaticResource groupExpanderToggleButtonTemplate}"
-                                OverridesDefaultStyle="True"
-                                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 Margin="3,0,0,0"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </StackPanel>
-            </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: GroupLevelIndicator
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupLevelIndicatorTemplate"
-                    TargetType="local:GroupLevelIndicator">
-
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}" />
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: DetailIndicator
-    ************************** -->
-   <ControlTemplate x:Key="tableViewDetailIndicatorTemplate"
-                    TargetType="local:DetailIndicator">
-
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}" />
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupLevelIndicatorPane
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupLevelIndicatorPaneTemplate"
-                    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'}" />
-
-         <Border x:Name="verticalBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 Padding="{TemplateBinding Padding}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Left'}">
-            <StackPanel x:Name="PART_GroupLevelIndicatorHost"
-                        Orientation="Horizontal" />
-         </Border>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-               <Condition Property="IsLeaf"
-                          Value="True" />
-               <Condition Property="views:ViewBase.IsLastItem"
-                          Value="True" />
-               <Condition Property="local:DataGridControl.HasExpandedDetails"
-                          Value="False" />
-            </MultiTrigger.Conditions>
-            <Setter TargetName="horizontalBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter TargetName="verticalBorder"
-                    Property="Margin"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Bottom'}" />
-         </MultiTrigger>
-
-         <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>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupLevelIndicatorPane
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupLevelIndicatorPaneTemplate"
-                    TargetType="local:HierarchicalGroupLevelIndicatorPane">
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-         <StackPanel x:Name="PART_GroupLevelIndicatorHost"
-                     Orientation="Horizontal" />
-      </Border>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControl
-    ************************** -->
-
-   <!-- DataTemplate for DataGridContext displayed inside the HierarchicalGroupByControl -->
-   <HierarchicalDataTemplate x:Key="dataGridContextTemplate"
-                             DataType="{x:Type local:DataGridContext}"
-                             ItemsSource="{Binding Path=DetailConfigurations}">
-
-      <local:HierarchicalGroupByControlNode x:Name="groupByControlNode"
-                                            ItemsSource="{Binding Path=GroupLevelDescriptions}"
-                                            Title="{Binding Path=SourceDetailConfiguration.Title}" />
-
-      <!-- Trigger to bind Title to the DataGridContext.DataGridControl.ItemsSourceName if DataGridContext.ParentDataGridContext is null -->
-      <HierarchicalDataTemplate.Triggers>
-         <DataTrigger Binding="{Binding Path=SourceDetailConfiguration}"
-                      Value="{x:Null}">
-            <Setter TargetName="groupByControlNode"
-                    Property="Title">
-               <Setter.Value>
-                  <Binding Path="DataGridControl.ItemsSourceName" />
-               </Setter.Value>
-            </Setter>
-         </DataTrigger>
-      </HierarchicalDataTemplate.Triggers>
-
-   </HierarchicalDataTemplate>
-
-   <!-- DataTemplate for DetailConfiguration displayed inside the HierarchicalGroupByControlNode -->
-   <HierarchicalDataTemplate x:Key="detailConfigurationTemplate"
-                             DataType="{x:Type local:DetailConfiguration}"
-                             ItemsSource="{Binding Path=DetailConfigurations}">
-
-      <local:HierarchicalGroupByControlNode ItemsSource="{Binding Path=GroupLevelDescriptions}"
-                                            Title="{Binding Title}" />
-   </HierarchicalDataTemplate>
-
-   <conv:TypeToVisibilityConverter x:Key="notDetailConfigConverter"
-                                   Visibility="Visible"
-                                   SetVisibilityWhenTrue="False" />
-
-   <BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter" />
-
-   <!-- TreeViewItem Style to avoid displaying Expander and avoid selection and click -->
-   <Style x:Key="hierarchicalGroupByControlTreeViewItemStyle"
-          TargetType="{x:Type TreeViewItem}">
-
-      <Setter Property="IsExpanded"
-              Value="True" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="Visibility">
-         <Setter.Value>
-            <PriorityBinding>
-               <Binding Path="."
-                        Converter="{StaticResource notDetailConfigConverter}"
-                        ConverterParameter="{x:Type local:DetailConfiguration}" />
-               <Binding Path="Visible"
-                        Converter="{StaticResource booleanToVisibilityConverter}" />
-            </PriorityBinding>
-
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TreeViewItem}">
-               <Grid>
-                  <Grid.ColumnDefinitions>
-
-                     <!--This ColumnDefinition is required for stair spacing-->
-                     <ColumnDefinition Width="19" />
-                     <ColumnDefinition Width="Auto" />
-                     <ColumnDefinition Width="*" />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition />
-                  </Grid.RowDefinitions>
-
-                  <Border BorderThickness="{TemplateBinding Border.BorderThickness}"
-                          Padding="{TemplateBinding Control.Padding}"
-                          BorderBrush="{TemplateBinding Border.BorderBrush}"
-                          Background="{TemplateBinding Panel.Background}"
-                          Name="treeViewItemBorder"
-                          SnapsToDevicePixels="True"
-                          Grid.Column="1">
-
-                     <!--Will contain DetailGroupByConrol-->
-
-                     <ContentPresenter Content="{TemplateBinding HeaderedContentControl.Header}"
-                                       ContentTemplate="{TemplateBinding HeaderedContentControl.HeaderTemplate}"
-                                       ContentSource="Header"
-                                       Name="PART_Header"
-                                       HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
-                                       SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
-                  </Border>
-
-                  <ItemsPresenter Name="ItemsHost"
-                                  Grid.Column="1"
-                                  Grid.Row="1"
-                                  Grid.ColumnSpan="2" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <ControlTemplate x:Key="tableViewCommonHierarchicalGroupByControlTemplate"
-                    TargetType="local:HierarchicalGroupByControl">
-      <ControlTemplate.Resources>
-         <!--this style is set to avoid having implicit treeview style
-             overide the HierarchicalGroupByControl's TreeView-->
-         <Style TargetType="TreeView" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-
-            <!-- HierarchicalGroupByControl -->
-            <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="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-         <StackPanel Grid.Column="2"
-                     Orientation="Horizontal">
-
-            <TreeView x:Name="PART_HierarchicalGroupByControlTreeView"
-                      ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                      Background="Transparent"
-                      BorderBrush="Transparent"
-                      Focusable="False">
-
-               <TreeViewItem Header="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext)}"
-                             HeaderTemplate="{StaticResource dataGridContextTemplate}"
-                             ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DetailConfigurations}"
-                             ItemTemplate="{StaticResource detailConfigurationTemplate}"
-                             ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                             IsExpanded="True" />
-            </TreeView>
-
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed"
-                              Margin="5,0,0,0" />
-
-         </StackPanel>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=HasGroups}"
-                      Value="True">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-            <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate"
-                    TargetType="local:HierarchicalGroupByControl">
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-
-            <!-- HierarchicalGroupByControl -->
-            <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="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-         <local:GroupByControl Grid.Column="2"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               Background="{TemplateBinding Background}"
-                               BorderThickness="{TemplateBinding BorderThickness}"
-                               AllowGroupingModification="{TemplateBinding AllowGroupingModification}"
-                               AllowSort="{TemplateBinding AllowSort}"
-                               ConnectionLinePen="{TemplateBinding ConnectionLinePen}"
-                               NoGroupContent="{TemplateBinding NoGroupContent}"
-                               views:TableView.CanScrollHorizontally="True" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-            <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <TextBlock x:Name="titleTextBlock"
-                    Text="{TemplateBinding Title}"
-                    Margin="0,0,10,0" />
-
-         <ItemsPresenter Margin="0,0,0,10" />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Border x:Name="outerBorder"
-              BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-              Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
-              BorderThickness="0,0,1,1"
-              Padding="1,1,0,0">
-
-         <Border x:Name="innerBorder"
-                 BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                 BorderThickness="0,0,1,1"
-                 Margin="1,1,0,0"
-                 Background="{TemplateBinding Background}"
-                 Padding="{TemplateBinding Padding}">
-
-            <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-            <StackPanel x:Name="contentPanel"
-                        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 explicitly set its Content property to Null to prevent the XAML parser
-                    from implicitly setting it to its TemplatedParent's Content. -->
-               <ContentPresenter x:Name="sortGlyphPresenter"
-                                 Content="{x:Null}"
-                                 ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                 Margin="6,0,0,0"
-                                 Visibility="Hidden" />
-
-            </StackPanel>
-
-         </Border>
-
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderBrush"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" />
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="outerBorder"
-                    Property="Padding"
-                    Value="0" />
-
-            <Setter TargetName="innerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="innerBorder"
-                    Property="Margin"
-                    Value="0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ScrollTip
-    ************************** -->
-   <ControlTemplate x:Key="tableViewScrollTipTemplate"
-                    TargetType="{x:Type local:ScrollTip}">
-      <ContentPresenter VerticalAlignment="Center"
-                        HorizontalAlignment="Right"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-   </ControlTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml
deleted file mode 100644
index 334ea8e0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml
+++ /dev/null
@@ -1,1662 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-      <markup:DataGridThemeResourceDictionary Source="Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <Style x:Key="tableflowViewRowFocusVisualStyle"
-          TargetType="IFrameworkInputElement">
-      <Style.Resources>
-         <conv:ThicknessConverter x:Key="thicknessConverter" />
-      </Style.Resources>
-
-      <Setter Property="Control.Template">
-         <Setter.Value>
-            <ControlTemplate>
-               <Rectangle Stroke="#FF000000"
-                          StrokeThickness="1"
-                          StrokeDashArray="1 2"
-                          Margin="{Binding RelativeSource={RelativeSource AncestorType={x:Type ScrollViewer}}, Path=HorizontalOffset, Converter={StaticResource thicknessConverter}, ConverterParameter='Left'}"
-                          SnapsToDevicePixels="True" />
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
-                            InverseValue="True" />
-
-   <!--**************************
-    * TEMPLATE: DataGridControl 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewDataGridControlTemplate"
-                    TargetType="local:DataGridControl">
-      <Grid>
-         <Border Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <!-- The AdornerDecorator will allow visual cues for Drag & Drop operations. -->
-            <AdornerDecorator x:Name="PART_DragDropAdornerDecorator">
-               <!-- The TableViewScrollViewer takes care of laying out the various sections of
-                       a DataGrid in TableflowView: FixedHeaders, FixedFooters, RowSelectorPane, etc. -->
-               <views:TableViewScrollViewer x:Name="PART_ScrollViewer"
-                                            ShowRowSelectorPane="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ShowRowSelectorPane}"
-                                            RowSelectorPaneWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RowSelectorPaneWidth}"
-                                            Padding="{TemplateBinding Padding}">
-
-                  <views:TableflowViewItemsHost />
-
-               </views:TableViewScrollViewer>
-            </AdornerDecorator>
-         </Border>
-         <Grid x:Name="connectionStateGrid"
-               HorizontalAlignment="Right"
-               VerticalAlignment="Bottom"
-               Margin="0,0,25,25"
-               Height="30"
-               Width="30">
-            <ContentPresenter x:Name="connectionStateLoadingContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ConnectionStateLoadingGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-            <ContentPresenter x:Name="connectionStateCommittingContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ConnectionStateCommittingGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-            <ContentPresenter x:Name="connectionStateErrorContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ConnectionStateErrorGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-         </Grid>
-      </Grid>
-      <ControlTemplate.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).IsConnectionStateGlyphEnabled}"
-                      Value="False">
-            <Setter TargetName="connectionStateGrid"
-                    Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Loading">
-            <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-            <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Committing">
-            <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-         </DataTrigger>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Error">
-            <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-            <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
-      </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}"
-                 Padding="{TemplateBinding Padding}">
-
-            <ContentPresenter x:Name="contentPresenter"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-         </Border>
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: Row 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewRowTemplate"
-                    TargetType="local:Row">
-
-      <!-- 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:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-      </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" />
-            <!-- MasterDetail ToggleButton -->
-            <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="2"
-                 Grid.ColumnSpan="2"
-                 views:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <!-- 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" />
-
-         <!-- This TextBlock is used to ensure that the DesiredSize for 
-         the Row will never fall below the Height of a String using the inherited font size and face-->
-         <TextBlock Text=""
-                    Visibility="Hidden"
-                    Grid.Column="3"
-                    Margin="{TemplateBinding BorderThickness}" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
-              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
-              the Row's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- 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" />
-               <Condition Value="True"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </MultiDataTrigger>
-
-         <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" />
-               <Condition Value="False"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: DataRow 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewDataRowTemplate"
-                   TargetType="local:DataRow">
-
-    <!-- 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. -->
-
-    <!-- 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" />
-        <!-- MasterDetail ToggleButton -->
-        <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="2"
-              Grid.ColumnSpan="2"
-              views:TableView.CanScrollHorizontally="False"
-              Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}" />
-
-      <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                 views:TableView.CanScrollHorizontally="False" />
-
-      <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this Row is part of a group. -->
-      <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                     views:TableView.CanScrollHorizontally="False"
-                                     Grid.Column="1" />
-
-      <!-- ToggleButton that is used to expand/collapse details. -->
-      <Button x:Name="detailsToggle"
-              Grid.Column="2"
-              Template="{StaticResource detailsExpanderButtonTemplate}"
-              VerticalAlignment="Top"
-              Margin="2,4,2,0"
-              OverridesDefaultStyle="True"
-              Focusable="False"
-              Visibility="Collapsed"
-              views:TableView.CanScrollHorizontally="False" />
-
-      <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-      <views:FixedCellPanel x:Name="PART_CellsHost"
-                            Grid.Column="3"
-                            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}" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-
-      <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
-              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-      <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                     Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="rootBorder"
-                Property="Background"
-                Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-        <Setter TargetName="rootGrid"
-                Property="TextElement.Foreground"
-                Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-      </MultiDataTrigger>
-
-      <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
-              the Row's background/foreground to the appropriate brushes. -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                     Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                     Value="False" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
-                     Value="False" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="rootBorder"
-                Property="Background"
-                Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-        <Setter TargetName="rootGrid"
-                Property="TextElement.Foreground"
-                Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-      </MultiDataTrigger>
-
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: ColumnManagerRow 
-    ************************** -->
-   <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: Cell 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewCellTemplate"
-                    TargetType="local:Cell">
-
-      <!-- A basic Cell Template requires at least a ContentPresenter that is used to display the Cell's Content.
-           This ContentPresenter is usually placed inside a Border who is responsible for painting the gridlines. -->
-
-      <Grid>
-         <Border x:Name="gridLinesBorder" />
-
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}">
-
-            <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-         </Border>
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g. background/foreground) of the Cell to reflect specific
-              states (e.g. IsCurrent), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <!-- When the Cell is Current, we want to change its background/foreground to the appropriate brushes.
-              We do this only when the cell does not have a validation error because we must give priority
-              to the CellErrorStyle (if present).-->
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="False" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="True" />
-
-               <Condition Property="CellErrorStyle"
-                          Value="{x:Null}" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <!-- When the Cell is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell's content is Null and the row is not being edited, we want to ensure that the row/cell
-              will preserve a minimum height based on the current font size for the row/cell. To do this, we override
-              the ContentPresenter's content binding and replace it with an empty string (""), the textbox generated 
-              this way will then size to the default text's height. When trigger is not active anymore, default binding
-              is restored automatically. -->
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-            <Setter Property="Visibility"
-                    Value="Collapsed" />
-         </DataTrigger>
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AreColumnsBeingReordered}"
-                          Value="True" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="gridLinesBorder"
-                    Property="BorderBrush"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}" />
-
-            <Setter TargetName="gridLinesBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Left'}" />
-
-            <Setter TargetName="gridLinesBorder"
-                    Property="Margin"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource inverseThicknessConverter},ConverterParameter='Left'}" />
-
-         </MultiDataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-    <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
-    <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- We don't use the base Cell Template for the ColumnManagerCell because it need more elements
-           to function properly: a Thumb named "PART_ColumnResizerThumb" that is used to resize the
-           ColumnManagerCells's ParentColumn.Width and a glyph that represents the Column's SortDirection. -->
-      <Grid>
-
-         <Border x:Name="gridLinesBorder" />
-
-         <Border  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-
-            <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-            <Grid>
-
-               <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                          HorizontalAlignment="Left"
-                          VerticalAlignment="Stretch"
-                          Width="1"
-                          Margin="0,2,0,2" />
-
-               <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                          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="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <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}">
-
-                           <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                           <StackPanel x:Name="contentPanel"
-                                       Orientation="Horizontal">
-
-                              <!-- Same ContentPresenter as in the base Cell Template. -->
-                              <local:CellContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                              <!-- ContentPresenter that is used to display the sort glyph.
-                          We explicitly set its Content property to Null to prevent the XAML parser
-                          from implicitly setting it to its TemplatedParent's Content. -->
-                              <ContentPresenter x:Name="sortGlyphPresenter"
-                                                Content="{x:Null}"
-                                                ContentTemplate="{x:Null}" />
-                           </StackPanel>
-                        </Border>
-
-                     </Grid>
-
-                  </Border>
-
-               </DockPanel>
-
-               <!-- 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>
-
-         </Border>
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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>
-
-         <!-- To display the left vertical grid line when doing animated Column reordering -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AreColumnsBeingReordered}"
-                          Value="True" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="gridLinesBorder"
-                    Property="BorderBrush"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}" />
-
-            <Setter TargetName="gridLinesBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Left'}" />
-
-            <Setter TargetName="gridLinesBorder"
-                    Property="Margin"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource inverseThicknessConverter},ConverterParameter='Left'}" />
-
-         </MultiDataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupByControlTemplate"
-                    TargetType="local:GroupByControl">
-
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}">
-
-         <!-- This Grid is used to position the ItemsPresenter over the ContentPresenter in charge
-              of displaying the NoGroupContent. -->
-         <Grid>
-
-            <!-- This ContentPresenter displays the value of the NoGroupContent property
-                 of the GroupByControl. This content must only be displayed when there are
-                 no groups present, so we set its Visibility to Collapsed by default and
-                 it is made visible via a trigger. -->
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed" />
-
-            <!-- The GroupByControl is an ItemsControl, so it must have an ItemsPresenter in its
-                 Template in order to layout and show its child items. The default ItemsPanel
-                 of the GroupByControl is a "StaircasePanel", which layout its items in a
-                 staircase-like pattern and draws connecting lines between the items. -->
-            <ItemsPresenter />
-
-         </Grid>
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When there are no groups, make the NoGroupContent visible. -->
-         <Trigger Property="HasItems"
-                  Value="False">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Border 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}" />
-
-         </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: GroupHeaderControl
-    ************************** -->
-   <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">
-         <!-- 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}" />
-
-            <!-- 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>
-
-               <!-- This StackPanel is used to layout the ToggleButton and the GroupHeaderControl. -->
-               <StackPanel Orientation="Horizontal">
-
-                  <!-- ToggleButton that is used to expand/collapse the group. -->
-                  <ToggleButton Template="{StaticResource groupExpanderToggleButtonTemplate}"
-                                OverridesDefaultStyle="True"
-                                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 Margin="3,0,0,0"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </StackPanel>
-            </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: GroupLevelIndicator
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupLevelIndicatorTemplate"
-                    TargetType="local:GroupLevelIndicator">
-
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}" />
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: DetailIndicator
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewDetailIndicatorTemplate"
-                    TargetType="local:DetailIndicator">
-
-      <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}" />
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupLevelIndicatorPane
-    ************************** -->
-   <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'}" />
-
-         <Border x:Name="verticalBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 Padding="{TemplateBinding Padding}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Left'}">
-            <StackPanel x:Name="PART_GroupLevelIndicatorHost"
-                        Orientation="Horizontal" />
-         </Border>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-               <Condition Property="IsLeaf"
-                          Value="True" />
-               <Condition Property="views:ViewBase.IsLastItem"
-                          Value="True" />
-               <Condition Property="local:DataGridControl.HasExpandedDetails"
-                          Value="False" />
-            </MultiTrigger.Conditions>
-            <Setter TargetName="horizontalBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter TargetName="verticalBorder"
-                    Property="Margin"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Bottom'}" />
-         </MultiTrigger>
-
-         <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>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupLevelIndicatorPane
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupLevelIndicatorPaneTemplate"
-                    TargetType="local:HierarchicalGroupLevelIndicatorPane">
-      <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-         <StackPanel x:Name="PART_GroupLevelIndicatorHost"
-                     Orientation="Horizontal" />
-      </Border>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControl
-    ************************** -->
-
-   <!-- DataTemplate for DataGridContext displayed inside the HierarchicalGroupByControl -->
-   <HierarchicalDataTemplate x:Key="dataGridContextTemplate"
-                             DataType="{x:Type local:DataGridContext}"
-                             ItemsSource="{Binding Path=DetailConfigurations}">
-
-      <local:HierarchicalGroupByControlNode x:Name="groupByControlNode"
-                                            ItemsSource="{Binding Path=GroupLevelDescriptions}"
-                                            Title="{Binding Path=SourceDetailConfiguration.Title}" />
-
-      <!-- Trigger to bind Title to the DataGridContext.DataGridControl.ItemsSourceName if DataGridContext.ParentDataGridContext is null -->
-      <HierarchicalDataTemplate.Triggers>
-         <DataTrigger Binding="{Binding Path=SourceDetailConfiguration}"
-                      Value="{x:Null}">
-            <Setter TargetName="groupByControlNode"
-                    Property="Title">
-               <Setter.Value>
-                  <Binding Path="DataGridControl.ItemsSourceName" />
-               </Setter.Value>
-            </Setter>
-         </DataTrigger>
-      </HierarchicalDataTemplate.Triggers>
-
-   </HierarchicalDataTemplate>
-
-   <!-- DataTemplate for DetailConfiguration displayed inside the HierarchicalGroupByControlNode -->
-   <HierarchicalDataTemplate x:Key="detailConfigurationTemplate"
-                             DataType="{x:Type local:DetailConfiguration}"
-                             ItemsSource="{Binding Path=DetailConfigurations}">
-
-      <local:HierarchicalGroupByControlNode ItemsSource="{Binding Path=GroupLevelDescriptions}"
-                                            Title="{Binding Title}" />
-   </HierarchicalDataTemplate>
-
-   <conv:TypeToVisibilityConverter x:Key="notDetailConfigConverter"
-                                   Visibility="Visible"
-                                   SetVisibilityWhenTrue="False" />
-
-   <BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter" />
-
-   <!-- TreeViewItem Style to avoid displaying Expander and avoid selection and click -->
-   <Style x:Key="hierarchicalGroupByControlTreeViewItemStyle"
-          TargetType="{x:Type TreeViewItem}">
-
-      <Setter Property="IsExpanded"
-              Value="True" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="Visibility">
-         <Setter.Value>
-            <PriorityBinding>
-               <Binding Path="."
-                        Converter="{StaticResource notDetailConfigConverter}"
-                        ConverterParameter="{x:Type local:DetailConfiguration}" />
-               <Binding Path="Visible"
-                        Converter="{StaticResource booleanToVisibilityConverter}" />
-            </PriorityBinding>
-
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TreeViewItem}">
-               <Grid>
-                  <Grid.ColumnDefinitions>
-
-                     <!--This ColumnDefinition is required for stair spacing-->
-                     <ColumnDefinition Width="19" />
-                     <ColumnDefinition Width="Auto" />
-                     <ColumnDefinition Width="*" />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition />
-                  </Grid.RowDefinitions>
-
-                  <Border BorderThickness="{TemplateBinding Border.BorderThickness}"
-                          Padding="{TemplateBinding Control.Padding}"
-                          BorderBrush="{TemplateBinding Border.BorderBrush}"
-                          Background="{TemplateBinding Panel.Background}"
-                          Name="treeViewItemBorder"
-                          SnapsToDevicePixels="True"
-                          Grid.Column="1">
-
-                     <!--Will contain DetailGroupByConrol-->
-
-                     <ContentPresenter Content="{TemplateBinding HeaderedContentControl.Header}"
-                                       ContentTemplate="{TemplateBinding HeaderedContentControl.HeaderTemplate}"
-                                       ContentSource="Header"
-                                       Name="PART_Header"
-                                       HorizontalAlignment="{TemplateBinding Control.HorizontalContentAlignment}"
-                                       SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
-                  </Border>
-
-                  <ItemsPresenter Name="ItemsHost"
-                                  Grid.Column="1"
-                                  Grid.Row="1"
-                                  Grid.ColumnSpan="2" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <ControlTemplate x:Key="tableflowViewCommonHierarchicalGroupByControlTemplate"
-                    TargetType="local:HierarchicalGroupByControl">
-      <ControlTemplate.Resources>
-         <!--this style is set to avoid having implicit treeview style
-             overide the HierarchicalGroupByControl's TreeView-->
-         <Style TargetType="TreeView" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-
-            <!-- HierarchicalGroupByControl -->
-            <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="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-         <StackPanel Grid.Column="2"
-                     Orientation="Horizontal">
-
-            <TreeView x:Name="PART_HierarchicalGroupByControlTreeView"
-                      ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                      Background="Transparent"
-                      BorderBrush="Transparent"
-                      Focusable="False">
-
-               <TreeViewItem Header="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext)}"
-                             HeaderTemplate="{StaticResource dataGridContextTemplate}"
-                             ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DetailConfigurations}"
-                             ItemTemplate="{StaticResource detailConfigurationTemplate}"
-                             ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                             IsExpanded="True" />
-            </TreeView>
-
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed"
-                              Margin="5,0,0,0" />
-
-         </StackPanel>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=HasGroups}"
-                      Value="True">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-            <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="tableflowViewCommonHierarchicalGroupByControlOldGroupByControlTemplate"
-                    TargetType="local:HierarchicalGroupByControl">
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-
-            <!-- HierarchicalGroupByControl -->
-            <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="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-         <local:GroupByControl Grid.Column="2"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               Background="{TemplateBinding Background}"
-                               BorderThickness="{TemplateBinding BorderThickness}"
-                               AllowGroupingModification="{TemplateBinding AllowGroupingModification}"
-                               AllowSort="{TemplateBinding AllowSort}"
-                               ConnectionLinePen="{TemplateBinding ConnectionLinePen}"
-                               NoGroupContent="{TemplateBinding NoGroupContent}"
-                               views:TableView.CanScrollHorizontally="True" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-            <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <TextBlock x:Name="titleTextBlock"
-                    Text="{TemplateBinding Title}"
-                    Margin="0,0,10,0" />
-
-         <ItemsPresenter Margin="0,0,0,10" />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Border x:Name="outerBorder"
-              BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-              Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
-              BorderThickness="0,0,1,1"
-              Padding="1,1,0,0">
-
-         <Border x:Name="innerBorder"
-                 BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                 BorderThickness="0,0,1,1"
-                 Margin="1,1,0,0"
-                 Background="{TemplateBinding Background}"
-                 Padding="{TemplateBinding Padding}">
-
-            <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-            <StackPanel x:Name="contentPanel"
-                        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 explicitly set its Content property to Null to prevent the XAML parser
-                    from implicitly setting it to its TemplatedParent's Content. -->
-               <ContentPresenter x:Name="sortGlyphPresenter"
-                                 Content="{x:Null}"
-                                 ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                 Margin="6,0,0,0"
-                                 Visibility="Hidden" />
-
-            </StackPanel>
-
-         </Border>
-
-      </Border>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderBrush"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" />
-
-            <Setter TargetName="outerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="outerBorder"
-                    Property="Padding"
-                    Value="0" />
-
-            <Setter TargetName="innerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="innerBorder"
-                    Property="Margin"
-                    Value="0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-         </Trigger>
-
-         <!-- 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=SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ScrollTip
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewScrollTipTemplate"
-                    TargetType="{x:Type local:ScrollTip}">
-      <ContentPresenter VerticalAlignment="Center"
-                        HorizontalAlignment="Right"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-   </ControlTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml
deleted file mode 100644
index 11cd9bdf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml
+++ /dev/null
@@ -1,179 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<!-- =======================================================================
-  Xceed DataGrid for WPF - CUSTOMIZATION CODE - Default Styles and Templates
-  Copyright (c) 2007-2017 Xceed Software Inc.
-
-  [TableViewScrollViewer.generic.xaml]
-
-  This file is part of the Xceed DataGrid for WPF product. The use and
-  distribution of this Customization Code is subject to the terms
-  and conditions refering to "Customization Code" that are specified in
-  the XCEED SOFTWARE LICENSE AGREEMENT accompanying this product.
-======================================================================= -->
-
-<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:views="clr-namespace:Xceed.Wpf.DataGrid.Views"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters">
-
-   <Style TargetType="{x:Type views:TableViewScrollViewer}">
-
-      <Setter Property="VerticalScrollBarVisibility"
-              Value="Visible" />
-
-      <Setter Property="HorizontalScrollBarVisibility"
-              Value="{Binding HorizontalScrollBarVisibilityHint, RelativeSource={RelativeSource Self}}" />
-
-      <Setter Property="CanContentScroll"
-              Value="True" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type views:TableViewScrollViewer}">
-
-               <!-- Root Grid that layout the "content" and the Scrollbars -->
-               <Grid>
-                  <Grid.ColumnDefinitions>
-                     <!-- Content -->
-                     <ColumnDefinition />
-
-                     <!-- Vertical ScrollBar -->
-                     <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid.RowDefinitions>
-                     <!-- Content -->
-                     <RowDefinition />
-
-                     <!-- Horizontal ScrollBar -->
-                     <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-
-                  <!-- Content -->
-
-                  <Grid Margin="{TemplateBinding Padding}">
-                     <Grid.ColumnDefinitions>
-                        <!-- RowSelectorPane-->
-                        <ColumnDefinition Width="Auto" />
-
-                        <!-- ScrollContentPresenter -->
-                        <ColumnDefinition />
-                     </Grid.ColumnDefinitions>
-
-                     <Grid.RowDefinitions>
-                        <!-- Fixed Headers -->
-                        <RowDefinition Height="Auto" />
-
-                        <!-- ScrollContentPresenter -->
-                        <RowDefinition />
-
-                        <!-- Fixed Footers -->
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-
-                     <!-- RowSelectorPane -->
-
-                     <local:RowSelectorPane x:Name="PART_RowSelectorPane"
-                                            Grid.Column="0"
-                                            Grid.Row="0"
-                                            Grid.RowSpan="3"
-                                            Width="{TemplateBinding RowSelectorPaneWidth}" />
-
-                     <!-- Fixed Headers -->
-
-                     <views:SynchronizedScrollViewer x:Name="fixedHeaderScrollViewer"
-                                                     Grid.Column="1"
-                                                     Grid.Row="0"
-                                                     views:TableViewScrollViewer.SynchronizedScrollViewerPosition="Top"
-                                                     Focusable="False">
-                        <!-- Using a TableViewHeaderFooterPanel will enable the columns 
-                             auto width feature. -->
-                        <views:TableViewHeaderFooterPanel local:DataGridControl.IsFixedHeadersHost="True"
-                                                          Orientation="Vertical"
-                                                          HorizontalAlignment="Left" />
-
-                     </views:SynchronizedScrollViewer>
-
-                     <!-- Fixed Footers -->
-
-                     <views:SynchronizedScrollViewer  x:Name="fixedFooterScrollViewer"
-                                                      Grid.Column="1"
-                                                      Grid.Row="2"
-                                                      views:TableViewScrollViewer.SynchronizedScrollViewerPosition="Bottom"
-                                                      Focusable="False">
-                        <!-- Using a TableViewHeaderFooterPanel will enable the columns 
-                             auto width feature. -->
-                        <views:TableViewHeaderFooterPanel local:DataGridControl.IsFixedFootersHost="True"
-                                                          Orientation="Vertical"
-                                                          HorizontalAlignment="Left" />
-
-                     </views:SynchronizedScrollViewer>
-
-                     <!-- ScrollContentPresenter (data rows) -->
-
-                     <ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
-                                             Grid.Column="1"
-                                             Grid.Row="1"
-                                             CanContentScroll="{TemplateBinding CanContentScroll}" />
-
-                  </Grid>
-
-                  <!-- ScrollBars -->
-
-                  <ScrollBar x:Name="PART_HorizontalScrollBar"
-                             Grid.Column="0"
-                             Grid.Row="1"
-                             Orientation="Horizontal"
-                             Maximum="{TemplateBinding ScrollViewer.ScrollableWidth}"
-                             Value="{TemplateBinding ScrollViewer.HorizontalOffset}"
-                             ViewportSize="{TemplateBinding ScrollViewer.ViewportWidth}"
-                             Visibility="{TemplateBinding ScrollViewer.ComputedHorizontalScrollBarVisibility}" />
-
-                  <ScrollBar x:Name="PART_VerticalScrollBar"
-                             Grid.Column="1"
-                             Grid.Row="0"
-                             Orientation="Vertical"
-                             Maximum="{TemplateBinding ScrollViewer.ScrollableHeight}"
-                             Value="{TemplateBinding ScrollViewer.VerticalOffset}"
-                             ViewportSize="{TemplateBinding ScrollViewer.ViewportHeight}"
-                             Visibility="{TemplateBinding ScrollViewer.ComputedVerticalScrollBarVisibility}" />
-
-                  <!-- ScrollTip only displayed when scrolling -->
-                  <local:ScrollTip Visibility="Collapsed"
-                                   Content="{x:Null}"
-                                   ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ScrollTipContentTemplate}"
-                                   ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ScrollTipContentTemplateSelector}" />
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-                  <Trigger Property="ShowRowSelectorPane"
-                           Value="False">
-
-                     <Setter TargetName="PART_RowSelectorPane"
-                             Property="Visibility"
-                             Value="Collapsed" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
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
deleted file mode 100644
index 47a54c96..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.Resources.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:cnv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-  <!-- =================================================================== -->
-  <!-- Utility Resources                                                   -->
-  <!-- =================================================================== -->
-  <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                   Color="#C6C7B5" />
-
-  <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                   Color="White" />
-
-   <Thickness x:Key="columnManagerCellPadding"
-             Left="2"
-             Top="2"
-             Right="4"
-             Bottom="5" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index a016d396..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="#7F9DB9" />
-
-   <SolidColorBrush x:Key="errorBackgroundBrush"
-                    Color="Red" />
-
-   <SolidColorBrush x:Key="errorForegroundBrush"
-                    Color="White" />
-
-   <!-- same as in TableflowView.Luna.homestead.xaml-->
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#EBEADB" />
-
-   <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
-   <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
-   <Pen x:Key="dropMarkPen"
-        Brush="{x:Static SystemColors.HighlightBrush}"
-        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}"/>
-
-         <Border BorderThickness="1,1,1,1"
-                 Margin="1,1,1,1"
-                 BorderBrush="#99FFFFFF">
-
-            <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/Luna/Resources/Luna.metallic.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml
deleted file mode 100644
index 9315f999..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="#7F9DB9" />
-
-   <SolidColorBrush x:Key="errorBackgroundBrush"
-                    Color="Red" />
-
-   <SolidColorBrush x:Key="errorForegroundBrush"
-                    Color="White" />
-
-   <!-- same as in TableflowView.Luna.metallic.xaml-->
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#F9FAFD" />
-
-   <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
-   <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
-   <Pen x:Key="dropMarkPen"
-        Brush="{x:Static SystemColors.HighlightBrush}"
-        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}"/>
-
-         <Border BorderThickness="1,1,1,1"
-                 Margin="1,1,1,1"
-                 BorderBrush="#7FFFFFFF">
-
-            <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/Luna/Resources/Luna.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml
deleted file mode 100644
index 43324919..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="#7F9DB9" />
-
-   <SolidColorBrush x:Key="errorBackgroundBrush"
-                    Color="Red" />
-
-   <SolidColorBrush x:Key="errorForegroundBrush"
-                    Color="White" />
-
-   <!-- same as in TableflowView.Luna.normalcolor.xaml-->
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#EBEADB" />
-
-   <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
-   <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
-   <Pen x:Key="dropMarkPen"
-        Brush="{x:Static SystemColors.HighlightBrush}"
-        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}"/>
-
-         <Border BorderThickness="1,1,1,1"
-                 Margin="1,1,1,1"
-                 BorderBrush="#4CFFFFFF">
-
-            <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/Luna/Resources/TableView.Luna.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/TableView.Luna.Graphics.xaml
deleted file mode 100644
index e3cccaf6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/TableView.Luna.Graphics.xaml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the standard graphics -->
-      <markup:DataGridThemeResourceDictionary Source="../../Common/Graphics.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Glyphs                                                              -->
-   <!-- (Override some resources defined in the common resouces).           -->
-   <!-- =================================================================== -->
-
-   <!-- Glyph that is displayed in the RowSelector for a Row that is being edited. -->
-   <DataTemplate x:Key="editingRowGlyph">
-      <Grid Width="13.505371"
-            Height="14.666504">
-         <!-- Layer 1/<Path> -->
-         <Path StrokeThickness="0.500000"
-               Stroke="#ff535353"
-               StrokeMiterLimit="1.000000"
-               Fill="#ffffffff"
-               Data="F1 M 12.135254,4.105469 C 12.135254,4.105469 12.223145,4.213867 11.980957,4.479492 C 11.737793,4.745117 11.596191,4.601563 11.596191,4.601563 C 11.596191,4.601563 11.737793,4.810547 11.451660,5.027832 C 11.125488,5.274902 11.052246,5.104004 11.052246,5.104004 L 4.039551,12.810059 L 0.383301,14.247559 L 1.508301,10.403809 L 8.457520,2.768555 C 8.457520,2.768555 8.359863,2.593262 8.545410,2.390137 C 8.730957,2.187012 8.994629,2.227539 8.994629,2.227539 C 8.994629,2.227539 8.830566,2.077637 9.065918,1.819824 C 9.301270,1.561523 9.486816,1.688477 9.486816,1.688477 L 10.667480,0.318848 C 10.845215,0.124512 11.529785,0.332031 12.334473,1.066406 C 13.139160,1.800781 13.376465,2.435059 13.199707,2.628906 L 12.110840,3.942871 L 12.135254,4.105469 Z"/>
-
-         <!-- Layer 1/<Path> -->
-         <Path Data="F1 M 10.698730,0.381348 C 10.876465,0.187012 11.561035,0.394531 12.365723,1.128906 C 13.170410,1.863281 13.407715,2.497559 13.230957,2.691406 L 11.875488,4.176270 C 11.698730,4.370117 11.387207,4.375000 11.182129,4.186523 L 9.396973,2.558105 C 9.189941,2.370117 9.166504,2.060059 9.344238,1.866211 L 10.698730,0.381348 Z">
-            <Path.Fill>
-               <LinearGradientBrush MappingMode="Absolute"
-                                    StartPoint="308.197266,411.454590"
-                                    EndPoint="311.275574,409.867828">
-                  <LinearGradientBrush.GradientStops>
-                     <GradientStop Offset="0.000000"
-                                   Color="#fff498b0"/>
-                     <GradientStop Offset="0.504348"
-                                   Color="#ffd6547f"/>
-                     <GradientStop Offset="1.000000"
-                                   Color="#ffb70f4e"/>
-                  </LinearGradientBrush.GradientStops>
-                  <LinearGradientBrush.Transform>
-                     <MatrixTransform Matrix="0.965100,0.261800,0.261800,-0.965100,-395.200104,317.410736" />
-                  </LinearGradientBrush.Transform>
-               </LinearGradientBrush>
-            </Path.Fill>
-         </Path>
-
-         <!-- Layer 1/<Path> -->
-         <Path Fill="#ffeccb99"
-               Data="F1 M 3.095703,11.226074 C 4.587402,12.587402 3.999023,12.801270 3.999023,12.801270 L 0.330566,14.286621 L 1.487305,10.477051 C 1.487305,10.477051 1.604004,9.864746 3.095703,11.226074 Z"/>
-
-         <!-- Layer 1/<Path> -->
-         <Path Fill="#ff323232"
-               Data="F1 M 10.754395,3.897949 L 11.291504,4.816895 L 4.040039,12.763184 L 3.503418,11.844238 L 10.754395,3.897949 Z"/>
-
-         <!-- Layer 1/<Path> -->
-         <Path Fill="#ff989898"
-               Data="F1 M 9.699707,2.935059 L 10.777832,3.918945 L 3.527344,11.865723 L 2.449219,10.882324 L 9.699707,2.935059 Z"/>
-
-         <!-- Layer 1/<Path> -->
-         <Path Fill="#ffcbcbcb"
-               Data="F1 M 8.736816,2.485352 L 9.699707,2.935059 L 2.449219,10.882324 L 1.484863,10.432129 L 8.736816,2.485352 Z"/>
-
-         <!-- Layer 1/<Path> -->
-         <Path Data="F1 M 8.607910,2.296387 C 8.793457,2.093262 9.057129,2.133789 9.057129,2.133789 C 9.057129,2.133789 8.893066,1.983887 9.128418,1.726074 C 9.363770,1.467773 9.549316,1.594727 9.549316,1.594727 C 9.549316,1.594727 10.244629,1.885254 10.985840,2.562500 C 11.727051,3.238770 12.197754,4.011719 12.197754,4.011719 C 12.197754,4.011719 12.285645,4.120117 12.043457,4.385742 C 11.800293,4.651367 11.658691,4.507813 11.658691,4.507813 C 11.658691,4.507813 11.800293,4.716797 11.514160,4.934082 C 11.187988,5.181152 11.114746,5.010254 11.114746,5.010254 C 11.114746,5.010254 10.846191,4.324707 10.044434,3.593750 C 9.242676,2.861816 8.520020,2.674805 8.520020,2.674805 C 8.520020,2.674805 8.422363,2.499512 8.607910,2.296387 Z">
-            <Path.Fill>
-               <LinearGradientBrush MappingMode="Absolute"
-                                    StartPoint="306.663086,410.784668"
-                                    EndPoint="310.914825,408.500153">
-                  <LinearGradientBrush.GradientStops>
-                     <GradientStop Offset="0.000000"
-                                   Color="#ffb1b1b1"/>
-                     <GradientStop Offset="0.504348"
-                                   Color="#ff787878"/>
-                     <GradientStop Offset="1.000000"
-                                   Color="#ff3e3e3e"/>
-                  </LinearGradientBrush.GradientStops>
-                  <LinearGradientBrush.Transform>
-                     <MatrixTransform Matrix="0.965100,0.261800,0.261800,-0.965100,-395.200104,317.410736" />
-                  </LinearGradientBrush.Transform>
-               </LinearGradientBrush>
-            </Path.Fill>
-         </Path>
-
-         <!-- Layer 1/<Path> -->
-         <Path Fill="#ff000000"
-               Data="F1 M 2.227051,13.505371 L 0.734863,12.976074 L 0.330566,14.286621 L 1.582031,13.785645 L 2.227051,13.505371 Z"/>
-      </Grid>
-   </DataTemplate>
-
-</ResourceDictionary>
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
deleted file mode 100644
index d7c66cca..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml
+++ /dev/null
@@ -1,1793 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Luna.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.homestead.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#EBEADB" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="#C7C5B2" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#FAF8F3" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#A5A597" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHighlightVerticalBorderBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ECE9D8" />
-
-      <GradientStop Offset="1"
-                    Color="#CBC7B8" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHighlightHorizontalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-
-      <GradientStop Offset="0"
-                    Color="#ECE9D8" />
-
-      <GradientStop Offset="1"
-                    Color="#CBC7B8" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush"
-                    Color="#CF7225" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush"
-                    Color="#E3914F" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush"
-                    Color="#CF7225" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush"
-                    Color="#E3914F" />
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ACA899" />
-      <GradientStop Offset="1"
-                    Color="#D6D3CD" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    TargetType="local:RowSelector">
-
-      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-      <Grid>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <Border x:Name="rightBorder"
-                 Width="3"
-                 HorizontalAlignment="Right"
-                 Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBorder"
-                    Property="CornerRadius"
-                    Value="0,3,3,0" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <ToggleButton x:Name="toggleButton"
-                                      VerticalAlignment="Stretch"
-                                      Focusable="False"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0"
-                                      Opacity="0.5" />
-                     </Grid>
-
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <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>
-
-               <Border x:Name="bottomBorder"
-                       Height="3"
-                       VerticalAlignment="Bottom"
-                       Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="rightPressedBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerPressedBorderBrush}"
-                       Visibility="Hidden"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="1" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0"
-                       Margin="1,0,1,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-
-               </Border>
-
-            </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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,3" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,0,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="rightPressedBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Border x:Name="bottomBorder"
-                       Height="3"
-                       VerticalAlignment="Bottom" />
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,3" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Border x:Name="bottomBorder"
-                       Height="3"
-                       VerticalAlignment="Bottom" />
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,3" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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="tableViewLunaHomesteadGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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 tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableViewForcedLunaHomesteadGridControlStyle"
-          BasedOn="{StaticResource tableViewLunaHomesteadGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Luna;V4.0.0.0;31bf3856ad364e35;component\themes/luna.homestead.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableViewLunaHomesteadRowSelectorStyle"
-          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 tableViewRowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F2F1E7" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaHomesteadRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaHomesteadRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerRowTemplate}" />
-
-      <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="tableViewLunaHomesteadCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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 tableViewCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaHomesteadCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- In TableView, 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadGroupByControlStyle"
-          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 TableView, 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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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 tableViewGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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 tableViewGroupHeaderControlTemplate}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,0" />
-
-      <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadDetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableViewLunaHomesteadHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewLunaHomesteadHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableViewLunaHomesteadScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FFC7CDAC"
-                             Offset="0" />
-
-               <GradientStop Color="#FFE8ECD1"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF849072" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="Black" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewLunaHomesteadDefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:TableView, ThemeType=views:LunaHomesteadTheme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewLunaHomesteadDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewForcedLunaHomesteadGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewLunaHomesteadRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewLunaHomesteadRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewLunaHomesteadRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaHomesteadDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaHomesteadColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewLunaHomesteadCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaHomesteadDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewLunaHomesteadColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewLunaHomesteadDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaHomesteadHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewLunaHomesteadScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewLunaHomesteadHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewLunaHomesteadHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewLunaHomesteadHierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 2033fa87..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml
+++ /dev/null
@@ -1,2079 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Luna.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.metallic.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#F9FAFD" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="#C6C7B5" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#FAF8F3" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#A5A597" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHighlightVerticalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="1,0">
-
-      <GradientStop Offset="0"
-                    Color="#F9FAFD" />
-
-      <GradientStop Offset="1"
-                    Color="#BDBECE" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHighlightHorizontalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-
-      <GradientStop Offset="0"
-                    Color="#F9FAFD" />
-
-      <GradientStop Offset="1"
-                    Color="#BDBECE" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ACA899" />
-      <GradientStop Offset="1"
-                    Color="#D6D3CD" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    TargetType="local:RowSelector">
-
-      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-      <Grid>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-         <Grid x:Name="rightBorder"
-               Width="3"
-               HorizontalAlignment="Right">
-
-            <Grid.RowDefinitions>
-               <RowDefinition Height="3" />
-               <RowDefinition />
-               <RowDefinition Height="3" />
-            </Grid.RowDefinitions>
-
-            <Border x:Name="topRightBorder"
-                    Grid.Row="0"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="middleRightBorder"
-                    Grid.Row="1"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="bottomRightBorder"
-                    Grid.Row="2"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-         </Grid>
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- topRightBorder -->
-            <Setter TargetName="topRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="CornerRadius"
-                    Value="0,3,0,0" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush1}" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush1}" />
-
-            <!-- middleRightBorder -->
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush2}" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush2}" />
-
-            <!-- bottomRightBorder -->
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,0" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush3}" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush3}" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <ToggleButton x:Name="toggleButton"
-                                      VerticalAlignment="Stretch"
-                                      Focusable="False"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0"
-                                      Opacity="0.5" />
-                     </Grid>
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <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>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     IsHitTestVisible="False"
-                     Grid.ColumnSpan="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-               </Grid>
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       Grid.ColumnSpan="3"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="rightPressedBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerPressedBorderBrush}"
-                       Visibility="Hidden"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="1" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0"
-                       Margin="1,0,1,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-
-               </Border>
-
-            </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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,0,3" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorcharder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,0" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,0,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,0" />
-
-            <Setter TargetName="rightPressedBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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="tableViewLunaMetallicGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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 tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableViewForcedLunaMetallicGridControlStyle"
-          BasedOn="{StaticResource tableViewLunaMetallicGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Luna;V4.0.0.0;31bf3856ad364e35;component\themes/luna.metallic.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableViewLunaMetallicRowSelectorStyle"
-          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 tableViewRowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F2F1E7" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaMetallicRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaMetallicRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerRowTemplate}" />
-
-      <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="tableViewLunaMetallicCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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 tableViewCellTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaMetallicCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- In TableView, 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicGroupByControlStyle"
-          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 TableView, 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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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 tableViewGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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 tableViewGroupHeaderControlTemplate}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,0" />
-
-      <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicDetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableViewLunaMetallicHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewLunaMetallicHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableViewLunaMetallicScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FFD7D7E3"
-                             Offset="0" />
-
-               <GradientStop Color="#FFFEFEFE"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF666666" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewLunaMetallicDefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:TableView, ThemeType=views:LunaMetallicTheme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewLunaMetallicDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewForcedLunaMetallicGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewLunaMetallicRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewLunaMetallicRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewLunaMetallicRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaMetallicDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaMetallicColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewLunaMetallicCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaMetallicDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewLunaMetallicColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewLunaMetallicDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DetailConfiguration}"
-          TargetType="local:DetailConfiguration"
-          BasedOn="{StaticResource tableViewLunaMetallicDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaMetallicHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewLunaMetallicScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewLunaMetallicHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewLunaMetallicHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewLunaMetallicHierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index b9c4767f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml
+++ /dev/null
@@ -1,2081 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Luna.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.normalcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#EBEADB" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="#C6C7B5" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#FAF8F3" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#A5A597" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHighlightVerticalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="1,0">
-
-      <GradientStop Offset="0"
-                    Color="#ECE9D8" />
-
-      <GradientStop Offset="1"
-                    Color="#CBC7B8" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHighlightHorizontalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-
-      <GradientStop Offset="0"
-                    Color="#ECE9D8" />
-
-      <GradientStop Offset="1"
-                    Color="#CBC7B8" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ACA899" />
-      <GradientStop Offset="1"
-                    Color="#D6D3CD" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!--**************************
-     * Temporary Templates and Styles
-      **************************-->
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    TargetType="local:RowSelector">
-
-      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-      <Grid>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-         <Grid x:Name="rightBorder"
-               Width="3"
-               HorizontalAlignment="Right">
-
-            <Grid.RowDefinitions>
-               <RowDefinition Height="3" />
-               <RowDefinition />
-               <RowDefinition Height="3" />
-            </Grid.RowDefinitions>
-
-            <Border x:Name="topRightBorder"
-                    Grid.Row="0"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="middleRightBorder"
-                    Grid.Row="1"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="bottomRightBorder"
-                    Grid.Row="2"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-         </Grid>
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- topRightBorder -->
-            <Setter TargetName="topRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="CornerRadius"
-                    Value="0,3,0,0" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush1}" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush1}" />
-
-            <!-- middleRightBorder -->
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush2}" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush2}" />
-
-            <!-- bottomRightBorder -->
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,0" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush3}" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush3}" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Grid x:Name="toggleGridZone">
-
-                           <Border x:Name="toggleDelimeterBorder"
-                                   BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,4,0,4"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                              <Border x:Name="toggleDelimeterBorder2"
-                                      BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                      BorderThickness="1,0,0,0"
-                                      Margin="0,0,0,0"
-                                      Background="Transparent"
-                                      Visibility="Collapsed">
-
-                              </Border>
-
-                           </Border>
-
-                           <ToggleButton x:Name="toggleButton"
-                                         VerticalAlignment="Stretch"
-                                         Focusable="False"
-                                         Visibility="Collapsed"
-                                         Margin="2,0,0,0" />
-                        </Grid>
-
-                     </Grid>
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-                       we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <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>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     IsHitTestVisible="False"
-                     Grid.ColumnSpan="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-               </Grid>
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       Grid.ColumnSpan="3"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="rightPressedBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerPressedBorderBrush}"
-                       Visibility="Hidden"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="1" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0"
-                       Margin="1,0,1,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- Thumb that is used to resize the Column. -->
-         <Thumb x:Name="PART_ColumnResizerThumbLeft"
-                Style="{StaticResource invisibleThumbStyle}"
-                HorizontalAlignment="Left" />
-
-         <!-- Thumb that is used to resize the Column. -->
-         <Thumb x:Name="PART_ColumnResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,0,3" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorcharder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,0" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,0,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,0" />
-
-            <Setter TargetName="rightPressedBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!-- =================================================================== -->
-   <!-- Styles required by some grid elements                               -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * STYLE: CellErrorStyle 
-    ************************** -->
-   <Style x:Key="cellErrorStyle"
-          TargetType="local:Cell">
-
-      <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="tableViewLunaNormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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 tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableViewForcedLunaNormalColorGridControlStyle"
-          BasedOn="{StaticResource tableViewLunaNormalColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Luna;V4.0.0.0;31bf3856ad364e35;component\themes/luna.normalcolor.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableViewLunaNormalColorRowSelectorStyle"
-          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 tableViewRowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F2F1E7" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerRowTemplate}" />
-
-      <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="tableViewLunaNormalColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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 tableViewCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaNormalColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- In TableView, 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorGroupByControlStyle"
-          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 TableView, 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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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 tableViewGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <!-- 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 tableViewGroupHeaderControlTemplate}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,0" />
-
-      <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorDetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableViewLunaNormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewLunaNormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableViewLunaNormalColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FF7B9ADE"
-                             Offset="0" />
-
-               <GradientStop Color="#FFA5C3F7"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF0260EE" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewLunaNormalColorDefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:TableView, ThemeType=views:LunaNormalColorTheme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewLunaNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewForcedLunaNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewLunaNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewLunaNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewLunaNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewLunaNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 072e47ee..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml
+++ /dev/null
@@ -1,2207 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Luna.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.homestead.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#EBEADB" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="#C7C5B2" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#FAF8F3" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#A5A597" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHighlightVerticalBorderBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ECE9D8" />
-
-      <GradientStop Offset="1"
-                    Color="#CBC7B8" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHighlightHorizontalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-
-      <GradientStop Offset="0"
-                    Color="#ECE9D8" />
-
-      <GradientStop Offset="1"
-                    Color="#CBC7B8" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush"
-                    Color="#CF7225" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush"
-                    Color="#E3914F" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush"
-                    Color="#CF7225" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush"
-                    Color="#E3914F" />
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ACA899" />
-      <GradientStop Offset="1"
-                    Color="#D6D3CD" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationControlTemplate"
-                    TargetType="{x:Type local:GroupNavigationControl}">
-
-      <Grid>
-         <Border x:Name="outlineBorder"
-                 BorderBrush="#FF8C8A8C"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Offset="0"
-                                Color="#FFEBEADB" />
-                  <GradientStop Offset="1"
-                                Color="#FFD6D2C2" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <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 headerDelimiterDarkBorderBrush}"
-                    Margin="0,4,0,4"
-                    Visibility="Hidden">
-               <Border BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}" />
-            </Border>
-
-            <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 SourceName="PART_Button"
-                  Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="outlineBorder"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="outlineBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Offset="1"
-                                   Color="#FFEBEADB" />
-                     <GradientStop Offset="0"
-                                   Color="#FFD6D2C2" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationButton
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
-                    TargetType="{x:Type local:GroupNavigationButton}">
-      <Grid>
-         <Border x:Name="border"
-                 BorderBrush="#FF8C8A8C"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Offset="0"
-                                Color="#FFEBEADB" />
-                  <GradientStop Offset="1"
-                                Color="#FFD6D2C2" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <ContentPresenter Margin="4,2,4,2" />
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-         <Trigger Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="border"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Offset="1"
-                                   Color="#FFEBEADB" />
-                     <GradientStop Offset="0"
-                                   Color="#FFD6D2C2" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </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>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <Border x:Name="rightBorder"
-                 Width="3"
-                 HorizontalAlignment="Right"
-                 Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBorder"
-                    Property="CornerRadius"
-                    Value="0,3,3,0" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <ToggleButton x:Name="toggleButton"
-                                      VerticalAlignment="Stretch"
-                                      Focusable="False"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0"
-                                      Opacity="0.5" />
-                     </Grid>
-
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <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>
-
-               <Border x:Name="bottomBorder"
-                       Height="3"
-                       VerticalAlignment="Bottom"
-                       Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="rightPressedBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerPressedBorderBrush}"
-                       Visibility="Hidden"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="1" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0"
-                       Margin="1,0,1,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-
-               </Border>
-
-            </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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,3" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,0,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="rightPressedBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Border x:Name="bottomBorder"
-                       Height="3"
-                       VerticalAlignment="Bottom" />
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,3" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Border x:Name="bottomBorder"
-                       Height="3"
-                       VerticalAlignment="Bottom" />
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush}" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,3" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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 intAdditionConverter}, ConverterParameter=-1}" />
-
-            <Grid>
-               <Border BorderThickness="0,1,0,1">
-                  <Border.BorderBrush>
-                     <LinearGradientBrush StartPoint="0.5,1"
-                                          EndPoint="0.5,0">
-                        <GradientStop Color="#FFEBEADB"
-                                      Offset="0" />
-                        <GradientStop Color="#FF393421"
-                                      Offset="1" />
-                     </LinearGradientBrush>
-                  </Border.BorderBrush>
-                  <Border.Background>
-                     <LinearGradientBrush StartPoint="0.5,0"
-                                          EndPoint="0.5,1">
-                        <GradientStop Offset="0"
-                                      Color="#FFEBEADB" />
-                        <GradientStop Offset="1"
-                                      Color="#FFD6D2C2" />
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-
-               <!-- 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>
-
-   <!-- =================================================================== -->
-   <!-- 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="tableflowViewLunaHomesteadGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableflowViewForcedLunaHomesteadGridControlStyle"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Luna;V4.0.0.0;31bf3856ad364e35;component\themes/luna.homestead.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableflowViewLunaHomesteadRowSelectorStyle"
-          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>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F2F1E7" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <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="tableflowViewLunaHomesteadCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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="tableflowViewLunaHomesteadDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadGroupByControlStyle"
-          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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewLunaHomesteadGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-         </DataTrigger>
-
-         <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="tableflowViewLunaHomesteadGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,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="tableflowViewLunaHomesteadDetailIndicatorStyle"
-          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="tableflowViewLunaHomesteadGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewLunaHomesteadHierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewLunaHomesteadHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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="tableflowViewLunaHomesteadHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FFC7CDAC"
-                             Offset="0" />
-
-               <GradientStop Color="#FFE8ECD1"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF849072" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="Black" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadGroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewLunaHomesteadGroupNavigationControlItemStyle"
-          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="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-                     <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="tableflowViewLunaHomesteadGroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewLunaHomesteadDefaultValues"
-          TargetType="views:TableflowView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:LunaHomesteadTheme}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewForcedLunaHomesteadGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaHomesteadTheme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index de0687a4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml
+++ /dev/null
@@ -1,2495 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Luna.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.metallic.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#F9FAFD" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="#C6C7B5" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#FAF8F3" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#A5A597" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHighlightVerticalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="1,0">
-
-      <GradientStop Offset="0"
-                    Color="#F9FAFD" />
-
-      <GradientStop Offset="1"
-                    Color="#BDBECE" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHighlightHorizontalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-
-      <GradientStop Offset="0"
-                    Color="#F9FAFD" />
-
-      <GradientStop Offset="1"
-                    Color="#BDBECE" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ACA899" />
-      <GradientStop Offset="1"
-                    Color="#D6D3CD" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationControlTemplate"
-                    TargetType="{x:Type local:GroupNavigationControl}">
-
-      <Grid>
-         <Border x:Name="outlineBorder"
-                 BorderBrush="#808080"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Color="#D0D1D2"
-                                Offset="1" />
-                  <GradientStop Color="#E8E9EB"
-                                Offset="0" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <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 headerDelimiterDarkBorderBrush}"
-                    Margin="0,4,0,4"
-                    Visibility="Hidden">
-               <Border BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}" />
-            </Border>
-
-            <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 SourceName="PART_Button"
-                  Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="outlineBorder"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="outlineBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Color="#D0D1D2"
-                                   Offset="0" />
-                     <GradientStop Color="#E8E9EB"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationButton
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
-                    TargetType="{x:Type local:GroupNavigationButton}">
-      <Grid>
-         <Border x:Name="border"
-                 BorderBrush="#808080"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Color="#D0D1D2"
-                                Offset="1" />
-                  <GradientStop Color="#E8E9EB"
-                                Offset="0" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <ContentPresenter Margin="4,2,4,2" />
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-         <Trigger Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="border"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Color="#D0D1D2"
-                                   Offset="0" />
-                     <GradientStop Color="#E8E9EB"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </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>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-         <Grid x:Name="rightBorder"
-               Width="3"
-               HorizontalAlignment="Right">
-
-            <Grid.RowDefinitions>
-               <RowDefinition Height="3" />
-               <RowDefinition />
-               <RowDefinition Height="3" />
-            </Grid.RowDefinitions>
-
-            <Border x:Name="topRightBorder"
-                    Grid.Row="0"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="middleRightBorder"
-                    Grid.Row="1"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="bottomRightBorder"
-                    Grid.Row="2"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-         </Grid>
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- topRightBorder -->
-            <Setter TargetName="topRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="CornerRadius"
-                    Value="0,3,0,0" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush1}" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush1}" />
-
-            <!-- middleRightBorder -->
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush2}" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush2}" />
-
-            <!-- bottomRightBorder -->
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,0" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush3}" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush3}" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <ToggleButton x:Name="toggleButton"
-                                      VerticalAlignment="Stretch"
-                                      Focusable="False"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0"
-                                      Opacity="0.5" />
-                     </Grid>
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <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>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     IsHitTestVisible="False"
-                     Grid.ColumnSpan="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-               </Grid>
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       Grid.ColumnSpan="3"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="rightPressedBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerPressedBorderBrush}"
-                       Visibility="Hidden"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="1" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0"
-                       Margin="1,0,1,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-
-               </Border>
-
-            </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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,0,3" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorcharder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,0" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,0,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,0" />
-
-            <Setter TargetName="rightPressedBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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 intAdditionConverter}, ConverterParameter=-1}" />
-
-            <Grid>
-               <Border BorderThickness="0,1,0,1">
-                  <Border.BorderBrush>
-                     <LinearGradientBrush StartPoint="0.5,1"
-                                          EndPoint="0.5,0">
-                        <GradientStop Color="#B9BBCA"
-                                      Offset="0" />
-                        <GradientStop Color="#DFDFDF"
-                                      Offset="1" />
-                     </LinearGradientBrush>
-                  </Border.BorderBrush>
-                  <Border.Background>
-                     <LinearGradientBrush StartPoint="0.5,0"
-                                          EndPoint="0.5,1">
-                        <GradientStop Color="#D0D1D2"
-                                      Offset="1" />
-                        <GradientStop Color="#E8E9EB"
-                                      Offset="0" />
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-               <!-- 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>
-
-   <!-- =================================================================== -->
-   <!-- 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="tableflowViewLunaMetallicGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableflowViewForcedLunaMetallicGridControlStyle"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Luna;V4.0.0.0;31bf3856ad364e35;component\themes/luna.metallic.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableflowViewLunaMetallicRowSelectorStyle"
-          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>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F2F1E7" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaMetallicRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataRowTemplate}" />
-
-   </Style>
-
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaMetallicRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <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="tableflowViewLunaMetallicCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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="tableflowViewLunaMetallicDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaMetallicCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicGroupByControlStyle"
-          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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewLunaMetallicGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-         </DataTrigger>
-
-         <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="tableflowViewLunaMetallicGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,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="tableflowViewLunaMetallicDetailIndicatorStyle"
-          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="tableflowViewLunaMetallicGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewLunaMetallicHierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewLunaMetallicHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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="tableflowViewLunaMetallicHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FFD7D7E3"
-                             Offset="0" />
-
-               <GradientStop Color="#FFFEFEFE"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF666666" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicGroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewLunaMetallicGroupNavigationControlItemStyle"
-          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="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-                     <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="tableflowViewLunaMetallicGroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewLunaMetallicDefaultValues"
-          TargetType="views:TableflowView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:LunaMetallicTheme}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewForcedLunaMetallicGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewLunaMetallicRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewLunaMetallicRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewLunaMetallicRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaMetallicColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewLunaMetallicCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewLunaMetallicColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:DetailConfiguration}"
-          TargetType="local:DetailConfiguration"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewLunaMetallicScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaMetallicTheme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationControlItemStyle}" />
-
-
-</ResourceDictionary>
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
deleted file mode 100644
index ae50e8a6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml
+++ /dev/null
@@ -1,2493 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Luna.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Luna.normalcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#EBEADB" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="#C6C7B5" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#FAF8F3" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#A5A597" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHighlightVerticalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="1,0">
-
-      <GradientStop Offset="0"
-                    Color="#ECE9D8" />
-
-      <GradientStop Offset="1"
-                    Color="#CBC7B8" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHighlightHorizontalBorderBrush"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-
-      <GradientStop Offset="0"
-                    Color="#ECE9D8" />
-
-      <GradientStop Offset="1"
-                    Color="#CBC7B8" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ACA899" />
-      <GradientStop Offset="1"
-                    Color="#D6D3CD" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!--**************************
-     * Temporary Templates and Styles
-      **************************-->
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationControlTemplate"
-                    TargetType="{x:Type local:GroupNavigationControl}">
-
-      <Grid>
-         <Border x:Name="outlineBorder"
-                 BorderBrush="#FF8C8A8C"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Offset="0"
-                                Color="#FFEBEADB" />
-                  <GradientStop Offset="1"
-                                Color="#FFD6D2C2" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <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 headerDelimiterDarkBorderBrush}"
-                    Margin="0,4,0,4"
-                    Visibility="Hidden">
-               <Border BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}" />
-            </Border>
-
-            <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 SourceName="PART_Button"
-                  Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="outlineBorder"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="outlineBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Offset="1"
-                                   Color="#FFEBEADB" />
-                     <GradientStop Offset="0"
-                                   Color="#FFD6D2C2" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationButton
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
-                    TargetType="{x:Type local:GroupNavigationButton}">
-      <Grid>
-         <Border x:Name="border"
-                 BorderBrush="#FF8C8A8C"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Offset="0"
-                                Color="#FFEBEADB" />
-                  <GradientStop Offset="1"
-                                Color="#FFD6D2C2" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <ContentPresenter Margin="4,2,4,2" />
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-         <Trigger Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="border"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Offset="1"
-                                   Color="#FFEBEADB" />
-                     <GradientStop Offset="0"
-                                   Color="#FFD6D2C2" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </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>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-         <Grid x:Name="rightBorder"
-               Width="3"
-               HorizontalAlignment="Right">
-
-            <Grid.RowDefinitions>
-               <RowDefinition Height="3" />
-               <RowDefinition />
-               <RowDefinition Height="3" />
-            </Grid.RowDefinitions>
-
-            <Border x:Name="topRightBorder"
-                    Grid.Row="0"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="middleRightBorder"
-                    Grid.Row="1"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="bottomRightBorder"
-                    Grid.Row="2"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-         </Grid>
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- topRightBorder -->
-            <Setter TargetName="topRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="CornerRadius"
-                    Value="0,3,0,0" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush1}" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush1}" />
-
-            <!-- middleRightBorder -->
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush2}" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush2}" />
-
-            <!-- bottomRightBorder -->
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,0" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush3}" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush3}" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Grid x:Name="toggleGridZone">
-
-                           <Border x:Name="toggleDelimeterBorder"
-                                   BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,4,0,4"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                              <Border x:Name="toggleDelimeterBorder2"
-                                      BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                      BorderThickness="1,0,0,0"
-                                      Margin="0,0,0,0"
-                                      Background="Transparent"
-                                      Visibility="Collapsed">
-
-                              </Border>
-
-                           </Border>
-
-                           <ToggleButton x:Name="toggleButton"
-                                         VerticalAlignment="Stretch"
-                                         Focusable="False"
-                                         Visibility="Collapsed"
-                                         Margin="2,0,0,0"
-                                         Opacity="0.5" />
-                        </Grid>
-
-                     </Grid>
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-                       we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <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>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     IsHitTestVisible="False"
-                     Grid.ColumnSpan="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-               </Grid>
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       Grid.ColumnSpan="3"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="rightPressedBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerPressedBorderBrush}"
-                       Visibility="Hidden"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="1" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0"
-                       Margin="1,0,1,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- Thumb that is used to resize the Column. -->
-         <Thumb x:Name="PART_ColumnResizerThumbLeft"
-                Style="{StaticResource invisibleThumbStyle}"
-                HorizontalAlignment="Left" />
-
-         <!-- Thumb that is used to resize the Column. -->
-         <Thumb x:Name="PART_ColumnResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,0,3" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorcharder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="CornerRadius"
-                    Value="0,0,3,0" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,0,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,0" />
-
-            <Setter TargetName="rightPressedBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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 intAdditionConverter}, ConverterParameter=-1}" />
-
-            <Grid>
-               <Border BorderThickness="0,1,0,1">
-                  <Border.BorderBrush>
-                     <LinearGradientBrush StartPoint="0.5,1"
-                                          EndPoint="0.5,0">
-                        <GradientStop Color="#FFEBEADB"
-                                      Offset="0" />
-                        <GradientStop Color="#FF393421"
-                                      Offset="1" />
-                     </LinearGradientBrush>
-                  </Border.BorderBrush>
-                  <Border.Background>
-                     <LinearGradientBrush StartPoint="0.5,0"
-                                          EndPoint="0.5,1">
-                        <GradientStop Offset="0"
-                                      Color="#FFEBEADB" />
-                        <GradientStop Offset="1"
-                                      Color="#FFD6D2C2" />
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-
-               <!-- 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>
-
-   <!-- =================================================================== -->
-   <!-- Styles required by some grid elements                               -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * STYLE: CellErrorStyle 
-    ************************** -->
-   <Style x:Key="cellErrorStyle"
-          TargetType="local:Cell">
-
-      <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="tableflowViewLunaNormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableflowViewForcedLunaNormalColorGridControlStyle"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Luna;V4.0.0.0;31bf3856ad364e35;component\themes/luna.normalcolor.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableflowViewLunaNormalColorRowSelectorStyle"
-          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>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F2F1E7" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <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="tableflowViewLunaNormalColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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="tableflowViewLunaNormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorGroupByControlStyle"
-          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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewLunaNormalColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <!-- 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>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-         </DataTrigger>
-
-         <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="tableflowViewLunaNormalColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,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="tableflowViewLunaNormalColorDetailIndicatorStyle"
-          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="tableflowViewLunaNormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewLunaNormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewLunaNormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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="tableflowViewLunaNormalColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FF7B9ADE"
-                             Offset="0" />
-
-               <GradientStop Color="#FFA5C3F7"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF0260EE" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorGroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewLunaNormalColorGroupNavigationControlItemStyle"
-          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="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-                     <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="tableflowViewLunaNormalColorGroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewLunaNormalColorDefaultValues"
-          TargetType="views:TableflowView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:LunaNormalColorTheme}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewForcedLunaNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:LunaNormalColorTheme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlItemStyle}" />  
-
-</ResourceDictionary>
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
deleted file mode 100644
index 5299c927..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.Resources.xaml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:cnv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <!-- =================================================================== -->
-   <!-- Utility Resources                                                   -->
-   <!-- =================================================================== -->
-
-   <Thickness x:Key="columnManagerCellPadding"
-              Left="2"
-              Top="2"
-              Right="4"
-              Bottom="5" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 3b634382..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="#7F9DB9" />
-
-   <SolidColorBrush x:Key="errorBackgroundBrush"
-                    Color="Red" />
-
-   <SolidColorBrush x:Key="errorForegroundBrush"
-                    Color="White" />
-
-   <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
-   <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
-   <Pen x:Key="dropMarkPen"
-        Brush="{x:Static SystemColors.HighlightBrush}"
-        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}"/>
-
-         <Border BorderThickness="1,1,1,1"
-                 Margin="1,1,1,1"
-                 BorderBrush="#66FFFFFF">
-
-            <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/Royale/Resources/TableView.Royale.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/TableView.Royale.Graphics.xaml
deleted file mode 100644
index 65d5fa30..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/TableView.Royale.Graphics.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Royale uses the same graphics as Luna, so reuse the same ResourceDictionary. -->
-      <markup:DataGridThemeResourceDictionary Source="../../Luna/Resources/TableView.Luna.Graphics.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>
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
deleted file mode 100644
index 961fb8f7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml
+++ /dev/null
@@ -1,2046 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Royale.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Royale.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Royale.normalcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#FEFEFE" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="#C6C7B5" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#FAF8F3" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#A5A597" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="headerHighlightVerticalBorderBrush"
-                    Color="#DEDEDF" />
-
-   <SolidColorBrush x:Key="headerHighlightHorizontalBorderBrush"
-                    Color="#DEDEDF" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ACA899" />
-      <GradientStop Offset="1"
-                    Color="#D6D3CD" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    TargetType="local:RowSelector">
-
-      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-      <Grid>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-         <Grid x:Name="rightBorder"
-               Width="3"
-               HorizontalAlignment="Right">
-
-            <Grid.RowDefinitions>
-               <RowDefinition Height="3" />
-               <RowDefinition />
-               <RowDefinition Height="3" />
-            </Grid.RowDefinitions>
-
-            <Border x:Name="topRightBorder"
-                    Grid.Row="0"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="middleRightBorder"
-                    Grid.Row="1"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="bottomRightBorder"
-                    Grid.Row="2"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-         </Grid>
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- topRightBorder -->
-            <Setter TargetName="topRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="CornerRadius"
-                    Value="0" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush1}" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush1}" />
-
-            <!-- middleRightBorder -->
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush2}" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush2}" />
-
-            <!-- bottomRightBorder -->
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="CornerRadius"
-                    Value="0" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush3}" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush3}" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <ToggleButton x:Name="toggleButton"
-                                      VerticalAlignment="Stretch"
-                                      Focusable="False"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0"
-                                      Opacity="0.5" />
-                     </Grid>
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <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>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-               </Grid>
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="rightPressedBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerPressedBorderBrush}"
-                       Visibility="Hidden"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="1" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0"
-                       Margin="1,0,1,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="CornerRadius"
-                    Value="0" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="CornerRadius"
-                    Value="0" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rightPressedBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,0,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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="tableViewRoyaleNormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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 tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableViewForcedRoyaleNormalColorGridControlStyle"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Royale;V4.0.0.0;31bf3856ad364e35;component\themes/royale.normalcolor.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableViewRoyaleNormalColorRowSelectorStyle"
-          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 tableViewRowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F2F1E7" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerRowTemplate}" />
-
-      <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="tableViewRoyaleNormalColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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 tableViewCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- In TableView, 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorGroupByControlStyle"
-          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 TableView, 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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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 tableViewGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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 tableViewGroupHeaderControlTemplate}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,0" />
-
-      <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorDetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableViewRoyaleNormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewRoyaleNormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableViewRoyaleNormalColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,0"
-                                 StartPoint="0.5,1">
-               <GradientStop Color="#FF3569BF"
-                             Offset="0" />
-
-               <GradientStop Color="#FF8CC2E5"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF254394" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="Black" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewRoyaleNormalColorDefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:TableView, ThemeType=views:RoyaleNormalColorTheme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewForcedRoyaleNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorHierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 86908039..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml
+++ /dev/null
@@ -1,2458 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Royale.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Royale.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Royale.normalcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <SolidColorBrush x:Key="headerBackgroundBrush"
-                    Color="#FEFEFE" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="#C6C7B5" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#FAF8F3" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#A5A597" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="headerHighlightVerticalBorderBrush"
-                    Color="#DEDEDF" />
-
-   <SolidColorBrush x:Key="headerHighlightHorizontalBorderBrush"
-                    Color="#DEDEDF" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FCE0A6" />
-
-      <GradientStop Offset="1"
-                    Color="#FCC247" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#ACA899" />
-      <GradientStop Offset="1"
-                    Color="#D6D3CD" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationControlTemplate"
-                    TargetType="{x:Type local:GroupNavigationControl}">
-
-      <Grid>
-         <Border x:Name="outlineBorder"
-                 BorderBrush="#808080"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Color="#D0D1D2"
-                                Offset="1" />
-                  <GradientStop Color="#E8E9EB"
-                                Offset="0" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <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 headerDelimiterDarkBorderBrush}"
-                    Margin="0,4,0,4"
-                    Visibility="Hidden">
-               <Border BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}" />
-            </Border>
-
-            <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 SourceName="PART_Button"
-                  Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="outlineBorder"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="outlineBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Color="#D0D1D2"
-                                   Offset="0" />
-                     <GradientStop Color="#E8E9EB"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationButton
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
-                    TargetType="{x:Type local:GroupNavigationButton}">
-      <Grid>
-         <Border x:Name="border"
-                 BorderBrush="#808080"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Color="#D0D1D2"
-                                Offset="1" />
-                  <GradientStop Color="#E8E9EB"
-                                Offset="0" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <ContentPresenter Margin="4,2,4,2" />
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-         <Trigger Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="border"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Color="#D0D1D2"
-                                   Offset="0" />
-                     <GradientStop Color="#E8E9EB"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </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>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-         <Grid x:Name="rightBorder"
-               Width="3"
-               HorizontalAlignment="Right">
-
-            <Grid.RowDefinitions>
-               <RowDefinition Height="3" />
-               <RowDefinition />
-               <RowDefinition Height="3" />
-            </Grid.RowDefinitions>
-
-            <Border x:Name="topRightBorder"
-                    Grid.Row="0"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="middleRightBorder"
-                    Grid.Row="1"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-            <Border x:Name="bottomRightBorder"
-                    Grid.Row="2"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-         </Grid>
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- topRightBorder -->
-            <Setter TargetName="topRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="CornerRadius"
-                    Value="0" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush1}" />
-
-            <Setter TargetName="topRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush1}" />
-
-            <!-- middleRightBorder -->
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush2}" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush2}" />
-
-            <!-- bottomRightBorder -->
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="CornerRadius"
-                    Value="0" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush3}" />
-
-            <Setter TargetName="bottomRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush3}" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <ToggleButton x:Name="toggleButton"
-                                      VerticalAlignment="Stretch"
-                                      Focusable="False"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0"
-                                      Opacity="0.5" />
-                     </Grid>
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <ColumnDefinition Width="Auto" />
-                              </Grid.ColumnDefinitions>
-
-                              <!-- Same ContentPresenter as in the base Cell Template. -->
-                              <local:CellContentPresenter Grid.Column="0"
-                                                          x:Name="PART_CellContentPresenter" />
-
-                              <!-- 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>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-               </Grid>
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="rightPressedBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerPressedBorderBrush}"
-                       Visibility="Hidden"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="1" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0"
-                       Margin="1,0,1,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="CornerRadius"
-                    Value="0" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="CornerRadius"
-                    Value="0" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rightPressedBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,0,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="3"
-                     VerticalAlignment="Bottom">
-
-                  <Grid.ColumnDefinitions>
-                     <ColumnDefinition Width="8" />
-                     <ColumnDefinition />
-                     <ColumnDefinition Width="10" />
-                  </Grid.ColumnDefinitions>
-
-                  <Border x:Name="leftBottomBorder"
-                          Grid.Column="0" />
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1" />
-
-                  <Border x:Name="rightBottomBorder"
-                          Grid.Column="2" />
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- leftBottomBorder -->
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderThickness"
-                    Value="1,1,0,1" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush1}" />
-
-            <Setter TargetName="leftBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush1}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <!-- rightBottomBorder -->
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush3}" />
-
-            <Setter TargetName="rightBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush3}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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 intAdditionConverter}, ConverterParameter=-1}" />
-
-            <Grid>
-               <Border BorderThickness="0,1,0,1">
-                  <Border.BorderBrush>
-                     <LinearGradientBrush StartPoint="0.5,1"
-                                          EndPoint="0.5,0">
-                        <GradientStop Color="#B9BBCA"
-                                      Offset="0" />
-                        <GradientStop Color="#DFDFDF"
-                                      Offset="1" />
-                     </LinearGradientBrush>
-                  </Border.BorderBrush>
-                  <Border.Background>
-                     <LinearGradientBrush StartPoint="0.5,0"
-                                          EndPoint="0.5,1">
-                        <GradientStop Color="#D0D1D2"
-                                      Offset="1" />
-                        <GradientStop Color="#E8E9EB"
-                                      Offset="0" />
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-
-               <!-- 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>
-
-   <!-- =================================================================== -->
-   <!-- 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="tableflowViewRoyaleNormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableflowViewForcedRoyaleNormalColorGridControlStyle"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Royale;V4.0.0.0;31bf3856ad364e35;component\themes/royale.normalcolor.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableflowViewRoyaleNormalColorRowSelectorStyle"
-          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>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#F2F1E7" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <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 x:Key="tableflowViewRoyaleNormalColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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="tableflowViewRoyaleNormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorGroupByControlStyle"
-          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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewRoyaleNormalColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-         </DataTrigger>
-
-         <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="tableflowViewRoyaleNormalColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,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="tableflowViewRoyaleNormalColorDetailIndicatorStyle"
-          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="tableflowViewRoyaleNormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewRoyaleNormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewRoyaleNormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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="tableflowViewRoyaleNormalColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,0"
-                                 StartPoint="0.5,1">
-               <GradientStop Color="#FF3569BF"
-                             Offset="0" />
-
-               <GradientStop Color="#FF8CC2E5"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="#FF254394" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="Black" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorGroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewRoyaleNormalColorGroupNavigationControlItemStyle"
-          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="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-                     <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="tableflowViewRoyaleNormalColorGroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewRoyaleNormalColorDefaultValues"
-          TargetType="views:TableflowView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:RoyaleNormalColorTheme}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewForcedRoyaleNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:RoyaleNormalColorTheme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index a3250856..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/TableView.Windows7.Graphics.xaml
+++ /dev/null
@@ -1,859 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the standard graphics -->
-      <markup:DataGridThemeResourceDictionary Source="../../Common/Graphics.xaml" />
-
-      <!-- Needs Windows7 Resources -->
-      <markup:DataGridThemeResourceDictionary Source="Windows7.Resources.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Glyph that is displayed in the group headers to expand the group. -->
-   <DataTemplate x:Key="expandGroupGlyph">
-      <Grid>
-         <Border Background="Transparent"
-                 MinHeight="24"
-                 MinWidth="24"
-                 SnapsToDevicePixels="True">
-            <Border CornerRadius="4"
-                    BorderBrush="{StaticResource basicBlackBorderBrush}"
-                    BorderThickness="0,0,1,1"
-                    MinHeight="16"
-                    MinWidth="16"
-                    SnapsToDevicePixels="True"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center">
-               <Border CornerRadius="3"
-                       BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                       BorderThickness="0,0,1,1"
-                       SnapsToDevicePixels="True">
-               </Border>
-            </Border>
-         </Border>
-
-         <Path  VerticalAlignment="Center"
-                HorizontalAlignment="Center"
-                Height="2"
-                Width="10"
-                Stretch="Fill"
-                Opacity="1"
-                Data="M 6.5,4.5 C6.5,4.5 2.5,4.5 2.5,4.5 "
-                Stroke="#888"
-                StrokeThickness="2"
-                SnapsToDevicePixels="True" />
-         <Path VerticalAlignment="Center"
-               HorizontalAlignment="Center"
-               Height="10"
-               Width="2"
-               Stretch="Fill"
-               Opacity="1"
-               Data="M 4,6 C4,6 4,2 4,2 "
-               Stroke="#888"
-               StrokeThickness="2"
-               SnapsToDevicePixels="True" />
-      </Grid>
-   </DataTemplate>
-
-   <!-- Glyph that is displayed in the group headers to collapse the group. -->
-   <DataTemplate x:Key="collapseGroupGlyph">
-      <Grid>
-         <Border Background="Transparent"
-                 MinHeight="24"
-                 MinWidth="24"
-                 SnapsToDevicePixels="True">
-            <Border CornerRadius="4"
-                    BorderBrush="{StaticResource basicBlackBorderBrush}"
-                    BorderThickness="0,0,1,1"
-                    MinHeight="16"
-                    MinWidth="16"
-                    SnapsToDevicePixels="True"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Center">
-               <Border CornerRadius="3"
-                       BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                       BorderThickness="0,0,1,1"
-                       SnapsToDevicePixels="True">
-               </Border>
-            </Border>
-         </Border>
-
-         <Path VerticalAlignment="Center"
-               HorizontalAlignment="Center"
-               Height="2"
-               Width="10"
-               Stretch="Fill"
-               Opacity="1"
-               Data="M 6.5,4.5 C6.5,4.5 2.5,4.5 2.5,4.5 "
-               Stroke="#888"
-               StrokeThickness="2"
-               SnapsToDevicePixels="True" />
-      </Grid>
-   </DataTemplate>
-
-   <DataTemplate x:Key="CurvyLeavesPattern">
-      <Grid>
-         <Viewbox x:Name="Flare"
-                  HorizontalAlignment="Left"
-                  Opacity="0.6">
-            <Viewbox.LayoutTransform>
-               <ScaleTransform ScaleX="0.5"
-                               ScaleY="0.5" />
-            </Viewbox.LayoutTransform>
-            <Grid Width="866.084"
-                  Height="163.792">
-               <Ellipse HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="313.49,0.667,0,0"
-                        Width="123"
-                        Height="123"
-                        Stroke="#4CFFFFFF" />
-               <Ellipse HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="337.427,24.684,0,0"
-                        Width="75"
-                        Height="75">
-                  <Ellipse.Stroke>
-                     <LinearGradientBrush EndPoint="0.895,0.2"
-                                          StartPoint="0.104,0.778">
-                        <GradientStop Color="#26FFFFFF"
-                                      Offset="0" />
-                        <GradientStop Offset="1" />
-                     </LinearGradientBrush>
-                  </Ellipse.Stroke>
-                  <Ellipse.Fill>
-                     <RadialGradientBrush GradientOrigin="0.49,0.507"
-                                          RadiusX="0.541"
-                                          RadiusY="0.541">
-                        <GradientStop Color="White"
-                                      Offset="0" />
-                        <GradientStop Offset="1" />
-                     </RadialGradientBrush>
-                  </Ellipse.Fill>
-               </Ellipse>
-               <Ellipse Margin="187.939,75.046,0,0"
-                        Stroke="#33FFFFFF"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Width="59.5"
-                        Height="59.5">
-                  <Ellipse.Fill>
-                     <RadialGradientBrush RadiusX="0.541"
-                                          RadiusY="0.541">
-                        <GradientStop Color="#4CFFFFFF"
-                                      Offset="1" />
-                        <GradientStop />
-                     </RadialGradientBrush>
-                  </Ellipse.Fill>
-               </Ellipse>
-               <Ellipse Margin="171.942,96.857,0,0"
-                        Stroke="#33FFFFFF"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Width="32"
-                        Height="32">
-                  <Ellipse.Fill>
-                     <RadialGradientBrush RadiusX="0.541"
-                                          RadiusY="0.541">
-                        <GradientStop Color="White"
-                                      Offset="0" />
-                        <GradientStop Offset="1" />
-                     </RadialGradientBrush>
-                  </Ellipse.Fill>
-               </Ellipse>
-               <Ellipse Margin="296.971,61.068,0,0"
-                        Stroke="#33FFFFFF"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Width="35"
-                        Height="35">
-                  <Ellipse.Fill>
-                     <RadialGradientBrush RadiusX="0.541"
-                                          RadiusY="0.541">
-                        <GradientStop Color="#4CFFFFFF"
-                                      Offset="1" />
-                        <GradientStop />
-                     </RadialGradientBrush>
-                  </Ellipse.Fill>
-               </Ellipse>
-               <Ellipse HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="22.985,149.299,0,0"
-                        Width="11"
-                        Height="11"
-                        Stroke="#33FFFFFF">
-                  <Ellipse.Fill>
-                     <RadialGradientBrush RadiusX="0.541"
-                                          RadiusY="0.541">
-                        <GradientStop Color="White"
-                                      Offset="0" />
-                        <GradientStop Offset="1" />
-                     </RadialGradientBrush>
-                  </Ellipse.Fill>
-               </Ellipse>
-               <Ellipse HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="36.238,96.456,0,0"
-                        Width="90.5"
-                        Height="90.5"
-                        Stroke="#4CFFFFFF" />
-               <Ellipse HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="28.339,142.129,0,0"
-                        Width="22"
-                        Height="22"
-                        Stroke="#33FFFFFF">
-                  <Ellipse.Fill>
-                     <RadialGradientBrush RadiusX="0.541"
-                                          RadiusY="0.541">
-                        <GradientStop Color="White"
-                                      Offset="0" />
-                        <GradientStop Offset="1" />
-                     </RadialGradientBrush>
-                  </Ellipse.Fill>
-               </Ellipse>
-               <Ellipse HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Margin="102.244,106.818,0,0"
-                        Width="46"
-                        Stroke="#33FFFFFF"
-                        Height="46">
-                  <Ellipse.Fill>
-                     <RadialGradientBrush RadiusX="0.541"
-                                          RadiusY="0.541">
-                        <GradientStop Color="#4CFFFFFF"
-                                      Offset="1" />
-                        <GradientStop />
-                     </RadialGradientBrush>
-                  </Ellipse.Fill>
-               </Ellipse>
-            </Grid>
-         </Viewbox>
-
-         <Grid x:Name="Grass_leaves"
-               Grid.Column="1"
-               Height="75"
-               VerticalAlignment="Top"
-               HorizontalAlignment="Left"
-               Margin="0,7,0,0">
-            <Path Fill="#FF00A650"
-                  Stretch="Fill"
-                  Width="30.741"
-                  Data="F1M540.6982,138.001C553.6532,135.091,562.4752,122.194,558.6512,109.082C556.0552,100.184,544.5032,93.977,535.7882,98.163C525.6892,103.015,526.6392,120.203,538.0642,122.718C546.0712,124.48,553.8842,110.772,543.9042,109.651C543.6492,109.622,542.7772,110.055,543.2962,110.113C547.8912,110.629,548.4872,114.183,546.8052,117.825C543.2172,125.598,534.3632,121.912,531.2322,116.122C526.0932,106.617,533.3492,96.245,543.8822,97.64C552.4502,98.774,557.8442,106.086,558.6342,114.272C559.6992,125.321,550.9672,135.276,540.5932,137.606C540.0112,137.737,540.1262,138.13,540.6982,138.001"
-                  HorizontalAlignment="Left"
-                  Margin="455,11,0,22" />
-            <Path Fill="#FF5BBA47"
-                  Stretch="Fill"
-                  Width="89.374"
-                  Data="F1M121.3755,127.6689C125.3635,123.3199,131.7005,120.4709,136.9745,118.1959C144.0475,115.1449,151.1635,112.2079,158.2335,109.1439C174.6375,102.0359,198.9355,98.2259,206.7695,118.8979C209.1435,125.1619,208.1095,132.6559,203.9635,137.9119C199.3905,143.7089,190.2005,145.7729,184.0255,141.4859C178.0835,137.3609,178.6505,128.4649,182.1785,123.0689C185.3985,118.1449,191.6865,118.1989,195.1925,122.3349C197.5325,125.0949,198.4945,130.5499,193.2795,131.1359C192.6285,131.2089,192.0345,131.9239,193.0475,131.8099C199.7965,131.0519,199.5515,124.6119,195.3055,120.4709C190.6945,115.9739,182.8345,119.2159,180.1545,124.1739C176.3235,131.2589,177.8495,140.5869,185.8835,143.7279C191.6015,145.9619,198.5145,143.6389,203.0995,140.0449C210.2755,134.4219,210.7065,123.9809,207.2795,116.2199C203.0105,106.5519,193.2975,102.8029,183.4015,102.4609C170.6595,102.0219,158.9665,108.3009,147.6285,113.1849C138.5625,117.0899,129.9235,120.2169,121.9815,126.1869C121.3465,126.6639,120.5855,127.1149,120.0445,127.7059C119.6745,128.1079,121.1035,127.9659,121.3755,127.6689"
-                  HorizontalAlignment="Left"
-                  Margin="47.984,16.788,0,16.046" />
-            <Path Stretch="Fill"
-                  Width="522.667"
-                  Data="F1 M72,147 L72,153.66685 C72,153.66685 143.25,116.325 161.75,109.5 L161.75,109.5 C177.979,103.513 209.5,88.25 295.666,87.667 L295.666,87.667 C368.668,87.173 481.5,129 524.334,139 L524.334,139 C557.768,146.806 585.282,106.467 594.667,93.667 L594.667,93.667 C593.5,93 569.25,135 532.25,137 L532.25,137 C495.25,139 429.834,93.916 303.5,86.25 L303.5,86.25 C296.791,85.843 290.16,85.65 283.584,85.651 L283.584,85.651 C166.312,85.657 72,147 72,147"
-                  HorizontalAlignment="Left"
-                  Margin="0,0,0,6.979">
-               <Path.Fill>
-                  <LinearGradientBrush EndPoint="1,0.5"
-                                       StartPoint="0,0.5">
-                     <GradientStop Color="#FF6EBE44"
-                                   Offset="0" />
-                     <GradientStop Color="#FF1FA048"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-            <Viewbox x:Name="Leaf1"
-                     Stretch="Fill"
-                     RenderTransformOrigin="0.5,0.5"
-                     Width="16.108"
-                     HorizontalAlignment="Left"
-                     Margin="132,21,0,0"
-                     VerticalAlignment="Top"
-                     Height="10.673">
-               <Viewbox.RenderTransform>
-                  <TransformGroup>
-                     <ScaleTransform />
-                     <SkewTransform />
-                     <RotateTransform Angle="-173.62" />
-                     <TranslateTransform />
-                  </TransformGroup>
-               </Viewbox.RenderTransform>
-               <Grid Width="32.737"
-                     Height="23.022">
-                  <Path Stretch="Fill"
-                        Width="27.518"
-                        Data="F1M359.521,63.197C359.521,63.197,365.377,73.922,387.039,72.272L387.039,72.272C382.633,66.602,375.129,60.384,367.609,60.385L367.609,60.385C364.865,60.385,362.119,61.213,359.521,63.197"
-                        HorizontalAlignment="Right"
-                        Margin="0,0,1,10.962">
-                     <Path.Fill>
-                        <LinearGradientBrush EndPoint="0.954,0.925"
-                                             StartPoint="0.041,0.212">
-                           <GradientStop Color="#3FA0FF00"
-                                         Offset="0" />
-                           <GradientStop Color="#FF35D16A"
-                                         Offset="0.504" />
-                           <GradientStop Color="#FF269B4E"
-                                         Offset="0.991" />
-                        </LinearGradientBrush>
-                     </Path.Fill>
-                  </Path>
-                  <Path Stretch="Fill"
-                        Width="16.811"
-                        Data="F1M371.038,82.379C371.038,82.379,387.183,87.576,387.849,73.688L387.849,73.688C386.354,73.428,385.138,73.309,384.133,73.309L384.133,73.309C377.22,73.309,380.281,78.91,371.038,82.379"
-                        HorizontalAlignment="Right"
-                        Margin="0,13,0,0"
-                        VerticalAlignment="Top"
-                        Height="10.022">
-                     <Path.Fill>
-                        <LinearGradientBrush EndPoint="0.944,0.199"
-                                             StartPoint="0.014,1.019">
-                           <GradientStop Color="#3FA0FF00"
-                                         Offset="0" />
-                           <GradientStop Color="#FF35D16A"
-                                         Offset="0.496" />
-                           <GradientStop Color="#FF269B4E"
-                                         Offset="0.991" />
-                        </LinearGradientBrush>
-                     </Path.Fill>
-                  </Path>
-                  <Path Stretch="Fill"
-                        Width="24.737"
-                        Data="F1M354.892,78.722C364.253,87.011,375.045,79.608,379.629,73.713L379.629,73.713C376.149,72.569,373.047,72.116,370.317,72.116L370.317,72.116C359.895,72.115,354.892,78.722,354.892,78.722"
-                        HorizontalAlignment="Right"
-                        Margin="0,12,8,0"
-                        VerticalAlignment="Top"
-                        Height="10.306">
-                     <Path.Fill>
-                        <LinearGradientBrush EndPoint="0.93,0.231"
-                                             StartPoint="0.046,0.686">
-                           <GradientStop Color="#3FA0FF00"
-                                         Offset="0" />
-                           <GradientStop Color="#FF35D16A"
-                                         Offset="0.526" />
-                           <GradientStop Color="#FF269B4E"
-                                         Offset="0.996" />
-                        </LinearGradientBrush>
-                     </Path.Fill>
-                  </Path>
-               </Grid>
-            </Viewbox>
-            <Viewbox x:Name="Leaf2"
-                     Stretch="Fill"
-                     RenderTransformOrigin="0.5,0.5"
-                     Width="16.108"
-                     HorizontalAlignment="Left"
-                     Margin="498,14,0,0"
-                     VerticalAlignment="Top"
-                     Height="10.673">
-               <Viewbox.RenderTransform>
-                  <TransformGroup>
-                     <ScaleTransform />
-                     <SkewTransform />
-                     <RotateTransform Angle="-269.879" />
-                     <TranslateTransform />
-                  </TransformGroup>
-               </Viewbox.RenderTransform>
-               <Grid Width="32.737"
-                     Height="23.022">
-                  <Path Stretch="Fill"
-                        Width="27.518"
-                        Data="F1M359.521,63.197C359.521,63.197,365.377,73.922,387.039,72.272L387.039,72.272C382.633,66.602,375.129,60.384,367.609,60.385L367.609,60.385C364.865,60.385,362.119,61.213,359.521,63.197"
-                        HorizontalAlignment="Right"
-                        Margin="0,0,1,10.962">
-                     <Path.Fill>
-                        <LinearGradientBrush EndPoint="0.954,0.925"
-                                             StartPoint="0.041,0.212">
-                           <GradientStop Color="#3FA0FF00"
-                                         Offset="0" />
-                           <GradientStop Color="#FF35D16A"
-                                         Offset="0.504" />
-                           <GradientStop Color="#FF269B4E"
-                                         Offset="0.991" />
-                        </LinearGradientBrush>
-                     </Path.Fill>
-                  </Path>
-                  <Path Stretch="Fill"
-                        Width="16.811"
-                        Data="F1M371.038,82.379C371.038,82.379,387.183,87.576,387.849,73.688L387.849,73.688C386.354,73.428,385.138,73.309,384.133,73.309L384.133,73.309C377.22,73.309,380.281,78.91,371.038,82.379"
-                        HorizontalAlignment="Right"
-                        Margin="0,13,0,0"
-                        VerticalAlignment="Top"
-                        Height="10.022">
-                     <Path.Fill>
-                        <LinearGradientBrush EndPoint="0.944,0.199"
-                                             StartPoint="0.014,1.019">
-                           <GradientStop Color="#3FA0FF00"
-                                         Offset="0" />
-                           <GradientStop Color="#FF35D16A"
-                                         Offset="0.496" />
-                           <GradientStop Color="#FF269B4E"
-                                         Offset="0.991" />
-                        </LinearGradientBrush>
-                     </Path.Fill>
-                  </Path>
-                  <Path Stretch="Fill"
-                        Width="24.737"
-                        Data="F1M354.892,78.722C364.253,87.011,375.045,79.608,379.629,73.713L379.629,73.713C376.149,72.569,373.047,72.116,370.317,72.116L370.317,72.116C359.895,72.115,354.892,78.722,354.892,78.722"
-                        HorizontalAlignment="Right"
-                        Margin="0,12,8,0"
-                        VerticalAlignment="Top"
-                        Height="10.306">
-                     <Path.Fill>
-                        <LinearGradientBrush EndPoint="0.93,0.231"
-                                             StartPoint="0.046,0.686">
-                           <GradientStop Color="#3FA0FF00"
-                                         Offset="0" />
-                           <GradientStop Color="#FF35D16A"
-                                         Offset="0.526" />
-                           <GradientStop Color="#FF269B4E"
-                                         Offset="0.996" />
-                        </LinearGradientBrush>
-                     </Path.Fill>
-                  </Path>
-               </Grid>
-            </Viewbox>
-         </Grid>
-         <Grid x:Name="Lines"
-               Grid.Column="1">
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M43,68 C43,68 245.53611,13.753317 359.53611,29.752914 470.0638,45.26518 497.85877,64.467052 588.51969,64.906471 672.11894,65.311664 741.86615,17.449004 818.02132,15.252065 895.26789,13.023642 914,41.000148 973.5,49.499997 1028.9372,57.419455 1063.5,38.499995 1063.5,38.499995">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="White"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M0,64 C0,64 108.5,-17.5 245.5,1.5 382.5,20.5 528.16667,71.500007 625.5,61.50001 714.65768,52.339977 888.5,-1.4997391 967.5,6.5002331 1046.5,14.500205 1103.5,46.500094 1169.5,46.500094 1235.5,46.500094 1247.5,18.500191 1247.5,18.500191">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="White"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-         </Grid>
-         <Grid x:Name="GlowPath"
-               VerticalAlignment="Top"
-               Height="60"
-               Grid.Column="1"
-               Width="1000"
-               HorizontalAlignment="Left">
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,3,0,5">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#99FFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,2,0,6">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#7FFFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,1,0,7">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#3FFFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,0,0,8">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#26FFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,4">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#B2FFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,5,0,3">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#99FFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,6,0,2">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#7FFFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,7,0,1">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#3FFFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-            <Path Stretch="Fill"
-                  StrokeEndLineCap="Flat"
-                  StrokeLineJoin="Miter"
-                  StrokeMiterLimit="4"
-                  StrokeStartLineCap="Flat"
-                  StrokeThickness="1"
-                  Data="M1,24 C1,24 87.5,62.833 165.5,63.5 220.57974,63.971002 340.5,39.499869 417.5,26.499979 494.5,13.500089 574.83333,5.5001563 645.5,25.499987 686.34562,37.059971 741.5,51.499767 808.5,53.499751 875.5,55.499734 950.5,30.499945 950.5,30.499945"
-                  Margin="0,8,0,0">
-               <Path.Stroke>
-                  <LinearGradientBrush EndPoint="1.011,0.574"
-                                       StartPoint="0.001,0.73">
-                     <GradientStop Color="#26FFFFFF"
-                                   Offset="0" />
-                     <GradientStop Offset="1" />
-                  </LinearGradientBrush>
-               </Path.Stroke>
-            </Path>
-         </Grid>
-      </Grid>
-   </DataTemplate>
-
-   <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/Windows7/Resources/Windows7.Controls.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml
deleted file mode 100644
index b14c11c8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml
+++ /dev/null
@@ -1,2224 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Windows7.Resources.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <LinearGradientBrush x:Key="NormalBrush"
-                        EndPoint="0,1"
-                        StartPoint="0,0">
-      <GradientStop Color="#EEE"
-                    Offset="0.0" />
-      <GradientStop Color="#CCC"
-                    Offset="1.0" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="DisabledForegroundBrush"
-                    Color="#888" />
-   <SolidColorBrush x:Key="DisabledBackgroundBrush"
-                    Color="#EEE" />
-
-   <ControlTemplate x:Key="ComboBoxTextBox"
-                    TargetType="{x:Type TextBox}">
-
-      <!-- This must be named as PART_ContentHost -->
-      <Border x:Name="PART_ContentHost"
-              Focusable="False"
-              Background="{TemplateBinding Background}" />
-   </ControlTemplate>
-
-   <!-- Used for Checkmark, Radio button, TreeViewItem, Expander ToggleButton glyphs -->
-   <SolidColorBrush x:Key="windows7GlyphBrush"
-                    Color="#444" />
-
-   <SolidColorBrush x:Key="glyphDefaultBordeBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="scrollbarGlyphBordeBrush"
-                    Color="White" />
-
-   <LinearGradientBrush x:Key="checkBoxBorderDefaultBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#3F1686D8"
-                    Offset="0" />
-      <GradientStop Offset="0.53"
-                    Color="#001686D8" />
-      <GradientStop Color="#3F1686D8"
-                    Offset="0.987" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="checkBoxPathDefaultBackgroundBrush"
-                        EndPoint="0.6,0.75"
-                        StartPoint="0,0">
-      <GradientStop Color="#7F1686D8" />
-      <GradientStop Offset="1"
-                    Color="#001686D8" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="checkBoxPathMouseOverBackgroundBrush"
-                        EndPoint="0.6,0.75"
-                        StartPoint="0,0">
-      <GradientStop Color="White" />
-      <GradientStop Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="checkBoxBorderPressedBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#BF1686D8" />
-      <GradientStop Offset="0.53" />
-      <GradientStop Color="#BF1686D8"
-                    Offset="0.987" />
-      <GradientStop Color="#7F56A7E2"
-                    Offset="0.252" />
-      <GradientStop Color="#7F56A7E2"
-                    Offset="0.756" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="buttonOutsideBorderDefaultBorderBrush"
-                    Color="#FFAAAAAA" />
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderDefaultBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FF0280E0"
-                    Offset="0.51" />
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderDefaultVerticalBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FF0280E0"
-                    Offset="0.51" />
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="buttonInsideBorderIsMouseOverBorderBrush"
-                    Color="White" />
-
-   <SolidColorBrush x:Key="buttonInsideBorderIsPressedBorderBrush"
-                    Color="White" />
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderIsPressedBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FF015EC8"
-                    Offset="0.5" />
-      <GradientStop Color="#FF0283E2"
-                    Offset="0.49" />
-      <GradientStop Color="#FF015EC8"
-                    Offset="1" />
-      <GradientStop Color="#FF0283E2"
-                    Offset="0.003" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderIsPressedVerticalBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FF015EC8"
-                    Offset="0.5" />
-      <GradientStop Color="#FF0283E2"
-                    Offset="0.49" />
-      <GradientStop Color="#FF015EC8"
-                    Offset="1" />
-      <GradientStop Color="#FF0283E2"
-                    Offset="0.003" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderIsMouseOverBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FF31B7FF"
-                    Offset="0.49" />
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="buttonOutsideBorderIsMouseOverVerticalBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FF31B7FF"
-                    Offset="0.49" />
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="buttonOutsideBorderDisabledBorderBrush"
-                    Color="#AAA" />
-
-   <SolidColorBrush x:Key="buttonOutsideBorderDisabledBackgroundBrush"
-                    Color="#EEE" />
-
-   <!-- Used for background of ScrollViewer, TreeView, ListBox, Expander, TextBox, Tab Control -->
-   <SolidColorBrush x:Key="windowDefaultBackgroundBrush"
-                    Color="#FFFFFFFF" />
-
-   <SolidColorBrush x:Key="repeatButtonBorderDefaultBackgrounBrush"
-                    Color="Transparent" />
-
-   <!--These Brushes are the basic light and dark borders for the controls-->
-   <LinearGradientBrush x:Key="basicWhiteBorderBrush"
-                        EndPoint="1.11,1.10"
-                        StartPoint="-0.03,-0.04">
-      <GradientStop Color="White" />
-      <GradientStop Offset="1"
-                    Color="White" />
-      <GradientStop Offset="0.5" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="basicBlackBorderBrush"
-                        EndPoint="1.18,1.16"
-                        StartPoint="-0.21,-0.19">
-      <GradientStop Color="Black"
-                    Offset="1" />
-      <GradientStop Color="#00000000"
-                    Offset="0.47" />
-      <GradientStop Color="Black" />
-   </LinearGradientBrush>
-
-   <!-- Used for DatePicker-->
-   <LinearGradientBrush x:Key="SelectedDatePickerItemBorderBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="White"
-                    Offset="0.509" />
-      <GradientStop Color="#7FFFFFFF"
-                    Offset="1" />
-      <GradientStop Offset="0"
-                    Color="#7FFFFFFF" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="SelectedDatePickerItemBackground"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#FFA8F5FB"
-                    Offset="0.703" />
-      <GradientStop Color="White"
-                    Offset="0.293" />
-   </LinearGradientBrush>
-
-   <DataTemplate x:Key="leafGlyph">
-      <Viewbox RenderTransformOrigin="0.5,0.5">
-         <Viewbox.LayoutTransform>
-            <RotateTransform Angle="133" />
-         </Viewbox.LayoutTransform>
-         <Grid Width="32.737"
-               Height="23.022">
-            <Path Stretch="Fill"
-                  Width="27.518"
-                  Data="F1M359.521,63.197C359.521,63.197,365.377,73.922,387.039,72.272L387.039,72.272C382.633,66.602,375.129,60.384,367.609,60.385L367.609,60.385C364.865,60.385,362.119,61.213,359.521,63.197"
-                  HorizontalAlignment="Right"
-                  Margin="0,0,1,10.962">
-               <Path.Fill>
-                  <LinearGradientBrush EndPoint="0.954,0.925"
-                                       StartPoint="0.041,0.212">
-                     <GradientStop Color="#3FA0FF00"
-                                   Offset="0" />
-                     <GradientStop Color="#FF35D16A"
-                                   Offset="0.504" />
-                     <GradientStop Color="#FF269B4E"
-                                   Offset="0.991" />
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-            <Path Stretch="Fill"
-                  Width="16.811"
-                  Data="F1M371.038,82.379C371.038,82.379,387.183,87.576,387.849,73.688L387.849,73.688C386.354,73.428,385.138,73.309,384.133,73.309L384.133,73.309C377.22,73.309,380.281,78.91,371.038,82.379"
-                  HorizontalAlignment="Right"
-                  Margin="0,13,0,0"
-                  VerticalAlignment="Top"
-                  Height="10.022">
-               <Path.Fill>
-                  <LinearGradientBrush EndPoint="0.944,0.199"
-                                       StartPoint="0.014,1.019">
-                     <GradientStop Color="#3FA0FF00"
-                                   Offset="0" />
-                     <GradientStop Color="#FF35D16A"
-                                   Offset="0.496" />
-                     <GradientStop Color="#FF269B4E"
-                                   Offset="0.991" />
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-            <Path Stretch="Fill"
-                  Width="24.737"
-                  Data="F1M354.892,78.722C364.253,87.011,375.045,79.608,379.629,73.713L379.629,73.713C376.149,72.569,373.047,72.116,370.317,72.116L370.317,72.116C359.895,72.115,354.892,78.722,354.892,78.722"
-                  HorizontalAlignment="Right"
-                  Margin="0,12,8,0"
-                  VerticalAlignment="Top"
-                  Height="10.306">
-               <Path.Fill>
-                  <LinearGradientBrush EndPoint="0.93,0.231"
-                                       StartPoint="0.046,0.686">
-                     <GradientStop Color="#3FA0FF00"
-                                   Offset="0" />
-                     <GradientStop Color="#FF35D16A"
-                                   Offset="0.526" />
-                     <GradientStop Color="#FF269B4E"
-                                   Offset="0.996" />
-                  </LinearGradientBrush>
-               </Path.Fill>
-            </Path>
-         </Grid>
-      </Viewbox>
-   </DataTemplate>
-
-   <!-- Radio Button -->
-   <Style TargetType="{x:Type RadioButton}">
-
-      <Setter Property="SnapsToDevicePixels"
-              Value="true" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type RadioButton}">
-
-               <!-- BulletDecorator is used to provide baseline alignment between the checkmark and the Content -->
-               <BulletDecorator Background="Transparent">
-
-                  <BulletDecorator.Bullet>
-
-                     <Grid Width="13"
-                           Height="13">
-
-                        <Ellipse x:Name="EllipseOutside"
-                                 Fill="{StaticResource checkBoxOutsideBorderDefaultBackgroundBrush}"
-                                 Stroke="{StaticResource checkBoxOutsideBorderDefaultBorderBrush}"
-                                 StrokeThickness="1" />
-
-                        <Ellipse x:Name="EllipseInside"
-                                 Fill="{StaticResource checkBoxInsideBorderDefaultBackgroundBrush}"
-                                 Stroke="{StaticResource checkBoxInsideBorderDefaultBorderBrush}"
-                                 StrokeThickness="1"
-                                 HorizontalAlignment="Stretch"
-                                 Margin="2,2,2,2"
-                                 Width="Auto" />
-
-                        <Ellipse x:Name="CheckMark"
-                                 Margin="4"
-                                 Fill="{StaticResource glyphDefaultBordeBrush}" />
-                     </Grid>
-
-                  </BulletDecorator.Bullet>
-
-                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    Margin="{TemplateBinding Padding}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    RecognizesAccessKey="True" />
-
-               </BulletDecorator>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsChecked"
-                           Value="false">
-
-                     <Setter Property="Visibility"
-                             Value="Collapsed"
-                             TargetName="CheckMark" />
-                  </Trigger>
-
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsMouseOverBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsMouseOverBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsMouseOverBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsMouseOverBackgroundBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsPressed"
-                           Value="true">
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsPressedBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsPressedBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsPressedBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsPressedBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="#80000000" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsEnabledBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseInside"
-                             Value="{StaticResource checkBoxInsideBorderIsEnabledBackgroundBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsEnabledBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="EllipseOutside"
-                             Value="{StaticResource checkBoxOutsideBorderIsEnabledBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- checkBoxWindows7 -->
-
-   <Style TargetType="{x:Type CheckBox}">
-
-      <Setter Property="SnapsToDevicePixels"
-              Value="true" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type CheckBox}">
-               <Border>
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="13" />
-                     </Grid.ColumnDefinitions>
-                     <Border Name="Border"
-                             Margin="1"
-                             Grid.Column="0"
-                             Grid.ColumnSpan="4" />
-
-                     <Grid HorizontalAlignment="Center"
-                           VerticalAlignment="Center"
-                           Width="13"
-                           Height="13">
-
-                        <Border Background="#FFD1ECFF"
-                                CornerRadius="1"
-                                Margin="1" />
-
-                        <Border x:Name="insideBorder"
-                                Margin="1"
-                                BorderBrush="White"
-                                BorderThickness="1"
-                                CornerRadius="1"
-                                Background="{StaticResource checkBoxBorderDefaultBackgroundBrush}" />
-
-                        <Path x:Name="CheckBoxPath"
-                              Stroke="{x:Null}"
-                              Stretch="Fill"
-                              Margin="0.976,0.985,0.978,1.024"
-                              Fill="{StaticResource checkBoxPathDefaultBackgroundBrush}"
-                              Data="M0.89013951,21.53754 C0.89013951,22.13754 0.92765297,3.68705 1.0012841,2.92993 1.2523327,0.34849 -3.6053779,-0.02693 23.25,-0.01368 46.88465,-0.00203 353.22295,0.01789 368.74551,-0.01368 399.32761,-0.0759 393.45345,-0.35295 392.87051,4.81326 366.3499,4.83686 234.23724,4.3665 163.26526,7.74613 92.293281,11.12575 15.63336,16.94202 12.222291,22.88633 10.979058,22.89814 7.5156977,23.01335 3.751176,22.50587 -0.013345688,21.99839 0.89013951,21.32853 0.89013951,21.53754 z" />
-
-                        <Border BorderBrush="Black"
-                                BorderThickness="1"
-                                CornerRadius="2" />
-                     </Grid>
-
-                     <Border Name="Check"
-                             Width="13"
-                             Height="13"
-                             Margin="6,0,6,0"
-                             Background="Transparent"
-                             BorderThickness="1"
-                             BorderBrush="Transparent">
-                        <Path Name="CheckMark"
-                              Visibility="Hidden"
-                              SnapsToDevicePixels="False"
-                              Fill="{StaticResource glyphDefaultBordeBrush}"
-                              Height="11"
-                              Width="10"
-                              Stretch="Fill"
-                              Opacity="1"
-                              Data="M 9.58416748046875,0 C9.58416748046875,0 10,0.6159515380859375 10,0.6159515380859375 8.7657470703125,1.540008544921875 8.419189453125,2.9010162353515625 6.96038818359375,4.698974609375 5.5015869140625,6.4969329833984375 4.602294921875,9.774444580078125 4.602294921875,9.774444580078125 4.602294921875,9.774444580078125 3.9029541015625,10.2296142578125 3.9029541015625,10.2296142578125 3.419921875,10.55328369140625 3.01983642578125,10.810089111328125 2.70257568359375,11 2.581787109375,10.676483154296875 2.114166259765625,9.48345947265625 1.46875,8.5 0.8125,7.5 0.4044189453125,6.9029998779296875 0,6.7393035888671875 0.667236328125,5.9750518798828125 1.8385009765625,5.592926025390625 1.8385009765625,5.592926025390625 1.8385009765625,5.592926025390625 3.555908203125,7.8286285400390625 3.555908203125,7.8286285400390625 4.3878173828125,6.349609375 4.5516357421875,4.8782501220703125 6.04742431640625,3.4145355224609375 7.543212890625,1.9508209228515625 8.055419921875,0.8126373291015625 9.58416748046875,0 z" />
-                     </Border>
-                     <ContentPresenter Name="HeaderHost"
-                                       Grid.Column="1"
-                                       VerticalAlignment="Center"
-                                       ContentSource="Header"
-                                       RecognizesAccessKey="True"
-                                       Content="{TemplateBinding Content}"
-                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-                  </Grid>
-               </Border>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-                     <Setter TargetName="CheckBoxPath"
-                             Property="Fill"
-                             Value="{StaticResource checkBoxPathMouseOverBackgroundBrush}" />
-                  </Trigger>
-                  <Trigger Property="IsPressed"
-                           Value="true">
-                     <Setter TargetName="CheckBoxPath"
-                             Property="Fill"
-                             Value="{StaticResource checkBoxPathDefaultBackgroundBrush}" />
-                     <Setter TargetName="insideBorder"
-                             Property="Background"
-                             Value="{StaticResource checkBoxBorderPressedBackgroundBrush}" />
-                  </Trigger>
-                  <Trigger Property="IsChecked"
-                           Value="true">
-                     <Setter TargetName="CheckMark"
-                             Property="Visibility"
-                             Value="Visible" />
-                  </Trigger>
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-                     <Setter Property="Foreground"
-                             Value="#DADADA" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- Expander 
-	 This uses the Simpler ExpanderToggleButton. It sets Visibility on the ContentPresenter to expand
-	 Limitations : The Simple Expander only expands down -->
-
-   <!-- Expander ToggleButton - This Button is used by the Expander control. When it is toggled it switches visibility on the Up_Arrow and Down_Arrow -->
-   <ControlTemplate x:Key="toggleButtonControllWindows7"
-                    TargetType="{x:Type ToggleButton}">
-
-      <Grid>
-         <Border Background="Transparent" />
-
-         <Border CornerRadius="4"
-                 BorderBrush="Black"
-                 BorderThickness="1,0,0,1"
-                 MinHeight="16"
-                 MinWidth="16"
-                 SnapsToDevicePixels="True"
-                 HorizontalAlignment="Center"
-                 VerticalAlignment="Center"
-                 IsHitTestVisible="False"
-                 Margin="0,0,4,0">
-            <Border x:Name="toggleDecorator"
-                    CornerRadius="3"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    BorderThickness="1,0,0,1"
-                    SnapsToDevicePixels="True">
-               <Path Data="M 0 0 L 4 4 L 8 0 Z"
-                     Fill="{StaticResource windows7GlyphBrush}"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     IsHitTestVisible="False"
-                     Margin="0,2,2,0" />
-            </Border>
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-
-            <Setter Property="Background"
-                    TargetName="toggleDecorator">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Offset="0" />
-                     <GradientStop Color="White"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsChecked"
-                  Value="true">
-
-            <Setter Property="Background"
-                    TargetName="toggleDecorator">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Offset="1" />
-                     <GradientStop Color="#FF04A2F7"
-                                   Offset="0" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsEnabled"
-                  Value="False">
-
-            <Setter Property="Opacity"
-                    Value="0.3"
-                    TargetName="toggleDecorator" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type Expander}">
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type Expander}">
-
-               <Grid>
-
-                  <Grid.RowDefinitions>
-
-                     <RowDefinition Height="Auto" />
-
-                     <RowDefinition x:Name="ContentRow"
-                                    Height="*" />
-
-                  </Grid.RowDefinitions>
-
-                  <Border x:Name="Border"
-                          Grid.Row="0"
-                          Background="{StaticResource windowDefaultBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="0,0,0,0">
-
-                     <Grid>
-
-                        <Grid.ColumnDefinitions>
-
-                           <ColumnDefinition Width="20" />
-
-                           <ColumnDefinition Width="*" />
-
-                        </Grid.ColumnDefinitions>
-
-                        <ToggleButton Template="{StaticResource toggleButtonControllWindows7}"
-                                      Background="{StaticResource NormalBrush}"
-                                      IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                      OverridesDefaultStyle="True" />
-
-                        <ContentPresenter Grid.Column="1"
-                                          Margin="4"
-                                          RecognizesAccessKey="True"
-                                          ContentSource="Header" />
-
-                     </Grid>
-
-                  </Border>
-
-                  <Border x:Name="ExpandSite"
-                          Visibility="Collapsed"
-                          Grid.Row="1"
-                          Background="{StaticResource windowDefaultBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="1,0,1,1"
-                          CornerRadius="0,0,0,0">
-
-                     <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       Margin="{TemplateBinding Padding}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                       Focusable="false" />
-
-                  </Border>
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsExpanded"
-                           Value="True">
-
-                     <Setter Property="Visibility"
-                             Value="Visible"
-                             TargetName="ExpandSite" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- ScrollBar  This makes use of Thumb, RepeatButton and ScrollRepeatButton -->
-
-   <!-- Repeat Button - This is used by ScrollBar for the up and down buttons -->
-   <Style x:Key="increaseDecreaseRepeatButtonWindows7"
-          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="{StaticResource buttonOutsideBorderDefaultVerticalBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="1"
-                          CornerRadius="3" />
-
-                  <ContentPresenter x:Name="ContentPresenter"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-
-               </Grid>
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderIsMouseOverVerticalBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsPressed"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderIsPressedVerticalBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style x:Key="increaseDecreaseHorizontalRepeatButtonWindows7"
-          TargetType="{x:Type RepeatButton}"
-          BasedOn="{StaticResource increaseDecreaseRepeatButtonWindows7}">
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type RepeatButton}">
-
-               <Grid>
-
-                  <Border x:Name="Border"
-                          Background="{StaticResource buttonOutsideBorderDefaultBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="1"
-                          CornerRadius="3" />
-
-                  <ContentPresenter x:Name="ContentPresenter"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-
-               </Grid>
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderIsMouseOverBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsPressed"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderIsPressedBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                     <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="BorderBrush"
-                             TargetName="Border"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- Thumb - The Thumb is the draggable part of the Scrollbar -->
-   <Style x:Key="thumbWindows7"
-          TargetType="{x:Type Thumb}">
-
-      <Setter Property="OverridesDefaultStyle"
-              Value="True" />
-
-      <Setter Property="IsTabStop"
-              Value="False" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Thumb}">
-               <Grid x:Name="Grid"
-                     Margin="0,0,0,0">
-                  <Rectangle x:Name="Rectangle"
-                             HorizontalAlignment="Stretch"
-                             VerticalAlignment="Stretch"
-                             Width="Auto"
-                             Height="Auto"
-                             RadiusX="3"
-                             RadiusY="3"
-                             Fill="{StaticResource buttonOutsideBorderDefaultVerticalBackgroundBrush}"
-                             Stroke="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver"
-                           Value="True">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderIsMouseOverVerticalBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsDragging"
-                           Value="True">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderIsPressedVerticalBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style x:Key="horizontalThumbWindows7"
-          TargetType="{x:Type Thumb}"
-          BasedOn="{StaticResource thumbWindows7}">
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type Thumb}">
-               <Grid x:Name="Grid"
-                     Margin="0,0,0,0">
-                  <Rectangle x:Name="Rectangle"
-                             HorizontalAlignment="Stretch"
-                             VerticalAlignment="Stretch"
-                             Width="Auto"
-                             Height="Auto"
-                             RadiusX="3"
-                             RadiusY="3"
-                             Fill="{StaticResource buttonOutsideBorderDefaultBackgroundBrush}"
-                             Stroke="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver"
-                           Value="True">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderIsMouseOverBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDisabledBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsDragging"
-                           Value="True">
-
-                     <Setter Property="Fill"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderIsPressedBackgroundBrush}" />
-
-                     <Setter Property="Stroke"
-                             TargetName="Rectangle"
-                             Value="{StaticResource buttonOutsideBorderDefaultBorderBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- ScrollRepeatButton Style - This RepeatButton is used above and below the Thumb in the Scrollbar. They are set to transparent si that they do not show over the scrollbar -->
-   <Style x:Key="repeatButtonPageUpDownWindows7"
-          TargetType="{x:Type RepeatButton}">
-
-      <Setter Property="OverridesDefaultStyle"
-              Value="True" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="IsTabStop"
-              Value="false" />
-
-      <Setter Property="Focusable"
-              Value="false" />
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type RepeatButton}">
-
-               <Grid>
-                  <Rectangle Fill="{StaticResource repeatButtonBorderDefaultBackgrounBrush}" />
-               </Grid>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style TargetType="{x:Type ScrollBar}">
-
-      <Setter Property="Stylus.IsFlicksEnabled"
-              Value="false" />
-
-      <Setter Property="Stylus.IsPressAndHoldEnabled"
-              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="Background"
-              Value="#FFD1ECFF" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ScrollBar}">
-               <Grid x:Name="GridRoot"
-                     Background="{TemplateBinding Background}">
-
-                  <Grid.RowDefinitions>
-
-                     <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
-
-                     <RowDefinition Height="0.00001*" />
-
-                     <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
-
-                  </Grid.RowDefinitions>
-
-                  <Border Grid.RowSpan="3"
-                          BorderBrush="#FFAAAAAA"
-                          BorderThickness="1" />
-
-                  <RepeatButton x:Name="DecreaseRepeat"
-                                Style="{StaticResource increaseDecreaseRepeatButtonWindows7}"
-                                Command="ScrollBar.LineUpCommand">
-                     <Grid>
-
-                        <Path x:Name="DecreaseArrow"
-                              Stroke="{x:Null}"
-                              StrokeThickness="1"
-                              Data="M 0 4 L 8 4 L 4 0 Z"
-                              Fill="{StaticResource scrollbarGlyphBordeBrush}" />
-
-                     </Grid>
-
-                  </RepeatButton>
-
-                  <!-- Track is a special layout container which sizes the thumb and the repeat button which do jump scrolling either side of it -->
-
-                  <Track x:Name="PART_Track"
-                         Grid.Row="1"
-                         IsDirectionReversed="true">
-
-                     <Track.Thumb>
-
-                        <Thumb Style="{StaticResource thumbWindows7}" />
-
-                     </Track.Thumb>
-
-                     <Track.IncreaseRepeatButton>
-
-                        <RepeatButton x:Name="PageUp"
-                                      Style="{StaticResource repeatButtonPageUpDownWindows7}"
-                                      Command="ScrollBar.PageDownCommand" />
-
-                     </Track.IncreaseRepeatButton>
-
-                     <Track.DecreaseRepeatButton>
-
-                        <RepeatButton x:Name="PageDown"
-                                      Style="{StaticResource repeatButtonPageUpDownWindows7}"
-                                      Command="ScrollBar.PageUpCommand" />
-
-                     </Track.DecreaseRepeatButton>
-
-                  </Track>
-
-                  <RepeatButton x:Name="IncreaseRepeat"
-                                Grid.Row="2"
-                                Style="{StaticResource increaseDecreaseRepeatButtonWindows7}"
-                                Command="ScrollBar.LineDownCommand">
-
-                     <Grid>
-
-                        <Path x:Name="IncreaseArrow"
-                              Stroke="{x:Null}"
-                              StrokeThickness="1"
-                              Data="M 0 0 L 4 4 L 8 0 Z"
-                              Fill="{StaticResource scrollbarGlyphBordeBrush}" />
-
-                     </Grid>
-
-                  </RepeatButton>
-
-               </Grid>
-            </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="Template">
-               <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type ScrollBar}">
-                     <Grid x:Name="GridRoot"
-                           Background="{TemplateBinding Background}">
-
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
-                           <ColumnDefinition Width="0.00001*" />
-                           <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
-                        </Grid.ColumnDefinitions>
-
-                        <Border Grid.ColumnSpan="3"
-                                BorderBrush="#FFAAAAAA"
-                                BorderThickness="1" />
-
-                        <RepeatButton x:Name="DecreaseRepeat"
-                                      Style="{StaticResource increaseDecreaseHorizontalRepeatButtonWindows7}"
-                                      Command="ScrollBar.LineLeftCommand">
-                           <Grid>
-                              <Grid.LayoutTransform>
-                                 <RotateTransform Angle="-90" />
-                              </Grid.LayoutTransform>
-
-                              <Path x:Name="DecreaseArrow"
-                                    Stroke="{x:Null}"
-                                    StrokeThickness="1"
-                                    Data="M 0 4 L 8 4 L 4 0 Z"
-                                    Fill="{StaticResource scrollbarGlyphBordeBrush}" />
-
-                           </Grid>
-
-                        </RepeatButton>
-
-                        <!-- Track is a special layout container which sizes the thumb and the repeat button which do jump scrolling either side of it -->
-
-                        <Track x:Name="PART_Track"
-                               Grid.Column="1">
-
-                           <Track.Thumb>
-
-                              <Thumb Style="{StaticResource horizontalThumbWindows7}" />
-
-                           </Track.Thumb>
-
-                           <Track.IncreaseRepeatButton>
-
-                              <RepeatButton x:Name="PageRight"
-                                            Style="{StaticResource repeatButtonPageUpDownWindows7}"
-                                            Command="ScrollBar.PageRightCommand" />
-
-                           </Track.IncreaseRepeatButton>
-
-                           <Track.DecreaseRepeatButton>
-
-                              <RepeatButton x:Name="PageLeft"
-                                            Style="{StaticResource repeatButtonPageUpDownWindows7}"
-                                            Command="ScrollBar.PageLeftCommand" />
-
-                           </Track.DecreaseRepeatButton>
-
-                        </Track>
-
-                        <RepeatButton x:Name="IncreaseRepeat"
-                                      Grid.Column="2"
-                                      Style="{StaticResource increaseDecreaseHorizontalRepeatButtonWindows7}"
-                                      Command="ScrollBar.LineRightCommand">
-
-                           <Grid>
-                              <Grid.LayoutTransform>
-                                 <RotateTransform Angle="-90" />
-                              </Grid.LayoutTransform>
-
-                              <Path x:Name="IncreaseArrow"
-                                    Stroke="{x:Null}"
-                                    StrokeThickness="1"
-                                    Data="M 0 0 L 4 4 L 8 0 Z"
-                                    Fill="{StaticResource scrollbarGlyphBordeBrush}" />
-
-                           </Grid>
-
-                        </RepeatButton>
-
-                     </Grid>
-                  </ControlTemplate>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!-- Simple Button - This control sets brushes on each state. Note that these brushes must be listed above since they are static resources -->
-   <Style TargetType="{x:Type Button}">
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type Button}">
-
-               <!-- We use Grid as a root because it is easy to add more elements to customize the button -->
-               <Grid x:Name="Grid">
-
-                  <Border Background="#FFD1ECFF"
-                          CornerRadius="3"
-                          BorderThickness="1"
-                          BorderBrush="{StaticResource basicBlackBorderBrush}">
-                     <Border x:Name="insideBorder"
-                             CornerRadius="2"
-                             BorderThickness="1"
-                             BorderBrush="{StaticResource basicWhiteBorderBrush}">
-                        <Border.Background>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#3F1686D8"
-                                            Offset="0" />
-                              <GradientStop Offset="0.53"
-                                            Color="#001686D8" />
-                              <GradientStop Color="#3F1686D8"
-                                            Offset="0.987" />
-                           </LinearGradientBrush>
-                        </Border.Background>
-
-                        <Path x:Name="ClearFilterPath"
-                              Stroke="{x:Null}"
-                              Stretch="Fill"
-                              HorizontalAlignment="Stretch"
-                              Width="Auto"
-                              Data="M0.02,0.54 C0.02,0.55 0.02,0.09 0.03,0.07 0.03,0.01 -0.09,0 0.58,0 1.17,0 8.83,0 9.22,0 9.98,0 9.84,-0.01 9.82,0.12 9.16,0.12 5.86,0.11 4.08,0.19 2.30,0.28 0.39,0.42 0.31,0.57 0.27,0.57 0.19,0.58 0.09,0.56 0,0.55 0.02,0.53 0.02,0.53 z">
-                           <Path.Fill>
-                              <LinearGradientBrush EndPoint="0.6,0.75"
-                                                   StartPoint="0,0">
-                                 <GradientStop Color="#7F1686D8" />
-                                 <GradientStop Offset="1"
-                                               Color="#001686D8" />
-                              </LinearGradientBrush>
-                           </Path.Fill>
-                        </Path>
-                     </Border>
-                  </Border>
-
-                  <Border x:Name="mouseOverEffect"
-                          Margin="1"
-                          CornerRadius="3"
-                          Opacity="0">
-                     <Border.Background>
-                        <RadialGradientBrush Center="0.5,0.7"
-                                             GradientOrigin="0.5,1"
-                                             RadiusX="0.6"
-                                             RadiusY="0.8">
-                           <GradientStop Color="#BFFFFFFF"
-                                         Offset="0.3" />
-                           <GradientStop Offset="0.7"
-                                         Color="#33FFFFFF" />
-                           <GradientStop Color="#4CFFFFFF"
-                                         Offset="0.4" />
-                           <GradientStop Color="White"
-                                         Offset="0.06" />
-                        </RadialGradientBrush>
-                     </Border.Background>
-                  </Border>
-
-                  <!-- Content Presenter is where the text content etc is placed by the control -->
-                  <!-- The bindings are useful so that the control can be parameterized without editing the template -->
-                  <ContentPresenter x:Name="buttonContent"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    Margin="{TemplateBinding Padding}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    RecognizesAccessKey="True" />
-
-               </Grid>
-
-               <!--Each state sets a brush on the Border in the template -->
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-
-                     <Setter Property="Opacity"
-                             TargetName="mouseOverEffect"
-                             Value="1" />
-                  </Trigger>
-
-                  <Trigger Property="IsPressed"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="insideBorder">
-                        <Setter.Value>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#BF1686D8"
-                                            Offset="0" />
-                              <GradientStop Offset="0.5" />
-                              <GradientStop Color="#BF1686D8"
-                                            Offset="1" />
-                           </LinearGradientBrush>
-                        </Setter.Value>
-                     </Setter>
-
-                     <Setter Property="Opacity"
-                             TargetName="mouseOverEffect"
-                             Value="0" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="True" />
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter TargetName="buttonContent"
-                             Property="TextElement.Foreground"
-                             Value="#868686" />
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                     <Setter Property="Background"
-                             TargetName="insideBorder">
-                        <Setter.Value>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#3FFFFFFF"
-                                            Offset="0" />
-                              <GradientStop Offset="0.5" />
-                              <GradientStop Color="#3FFFFFFF"
-                                            Offset="1" />
-                           </LinearGradientBrush>
-                        </Setter.Value>
-                     </Setter>
-
-                     <Setter Property="BorderBrush"
-                             TargetName="insideBorder"
-                             Value="{StaticResource buttonOutsideBorderDisabledBorderBrush}" />
-
-                     <Setter Property="Fill"
-                             TargetName="ClearFilterPath">
-                        <Setter.Value>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="0.5,0">
-                              <GradientStop Color="#3FFFFFFF"
-                                            Offset="0" />
-                              <GradientStop Offset="0.5" />
-                              <GradientStop Color="#3FFFFFFF"
-                                            Offset="1" />
-                           </LinearGradientBrush>
-                        </Setter.Value>
-                     </Setter>
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <!-- ComboBox 
-	This uses the ComboBoxToggleButton to expand and collapse a Popup control
-	SimpleScrollViewer to allow items to be scrolled and SimpleComboBoxItem to define the look of each item 
-	The Popup shows a list of items in a StackPanel-->
-
-   <!-- ComboBox Toggle Button - This is used in ComboBox to expand and collapse the ComboBox Popup-->
-   <ControlTemplate x:Key="toggleButtonControlWindows7"
-                    TargetType="{x:Type ToggleButton}">
-      <Grid>
-
-         <Grid.ColumnDefinitions>
-
-            <ColumnDefinition />
-
-            <ColumnDefinition Width="Auto" />
-
-         </Grid.ColumnDefinitions>
-
-         <Border Background="Transparent"
-                 Grid.ColumnSpan="2" />
-
-         <Border CornerRadius="4"
-                 BorderBrush="Black"
-                 BorderThickness="1,0,0,1"
-                 MinHeight="16"
-                 MinWidth="16"
-                 SnapsToDevicePixels="True"
-                 HorizontalAlignment="Center"
-                 VerticalAlignment="Center"
-                 Grid.Column="1"
-                 IsHitTestVisible="False"
-                 Margin="0,0,4,0">
-            <Border x:Name="toggleDecorator"
-                    CornerRadius="3"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    BorderThickness="1,0,0,1"
-                    SnapsToDevicePixels="True">
-               <Path Data="M 0 0 L 4 4 L 8 0 Z"
-                     Fill="{StaticResource windows7GlyphBrush}"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     IsHitTestVisible="False"
-                     Margin="0,2,2,0" />
-            </Border>
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-
-            <Setter Property="Background"
-                    TargetName="toggleDecorator">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Offset="0" />
-                     <GradientStop Color="White"
-                                   Offset="1" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsChecked"
-                  Value="true">
-
-            <Setter Property="Background"
-                    TargetName="toggleDecorator">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Offset="1" />
-                     <GradientStop Color="#FF04A2F7"
-                                   Offset="0" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </Trigger>
-
-         <Trigger Property="IsEnabled"
-                  Value="False">
-
-            <Setter Property="Opacity"
-                    Value="0.3"
-                    TargetName="toggleDecorator" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!-- ScrollViewer 
-	ScrollViewer is a Grid control which has a ContentPresenter and a Horizontal and Vertical ScrollBar 
-	It is used by ListBox, MenuItem, ComboBox, and TreeView -->
-   <Style x:Key="ScrollViewerWindows7"
-          TargetType="{x:Type ScrollViewer}">
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type ScrollViewer}">
-
-               <Grid Background="{TemplateBinding Background}">
-
-                  <Grid.ColumnDefinitions>
-
-                     <ColumnDefinition Width="*" />
-
-                     <ColumnDefinition Width="Auto" />
-
-                  </Grid.ColumnDefinitions>
-
-                  <Grid.RowDefinitions>
-
-                     <RowDefinition Height="*" />
-
-                     <RowDefinition Height="Auto" />
-
-                  </Grid.RowDefinitions>
-
-                  <ScrollContentPresenter Grid.Column="0"
-                                          Grid.Row="0"
-                                          Margin="{TemplateBinding Padding}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          CanContentScroll="{TemplateBinding CanContentScroll}" />
-
-                  <!-- The visibility of the ScrollBars is controlled by the implementation fo the control -->
-                  <ScrollBar x:Name="PART_HorizontalScrollBar"
-                             Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                             Grid.Column="0"
-                             Grid.Row="1"
-                             Orientation="Horizontal"
-                             Value="{Binding Path=HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             ViewportSize="{TemplateBinding ViewportWidth}"
-                             Minimum="0"
-                             Maximum="{TemplateBinding ScrollableWidth}"
-                             AutomationProperties.AutomationId="HorizontalScrollBar" />
-
-                  <ScrollBar x:Name="PART_VerticalScrollBar"
-                             Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                             Grid.Column="1"
-                             Grid.Row="0"
-                             Orientation="Vertical"
-                             Value="{Binding Path=VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                             ViewportSize="{TemplateBinding ViewportHeight}"
-                             Minimum="0"
-                             Maximum="{TemplateBinding ScrollableHeight}"
-                             AutomationProperties.AutomationId="VerticalScrollBar" />
-
-               </Grid>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style TargetType="{x:Type ScrollViewer}"
-          BasedOn="{StaticResource ScrollViewerWindows7}" />
-
-   <Style x:Key="windows7ComboBoxStyle"
-          TargetType="{x:Type ComboBox}">
-
-      <Setter Property="SnapsToDevicePixels"
-              Value="true" />
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type ComboBox}">
-
-               <Grid>
-
-                  <!-- The ToggleButton is databound to the ComboBox itself to toggle IsDropDownOpen -->
-                  <ToggleButton x:Name="ToggleButton"
-                                Grid.Column="2"
-                                Template="{StaticResource toggleButtonControlWindows7}"
-                                Focusable="false"
-                                IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                ClickMode="Press" />
-
-                  <ContentPresenter x:Name="ContentSite"
-                                    HorizontalAlignment="Left"
-                                    Margin="3,2,23,3"
-                                    TextElement.Foreground="Black"
-                                    VerticalAlignment="Center"
-                                    Content="{TemplateBinding SelectionBoxItem}"
-                                    ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                                    IsHitTestVisible="False" />
-
-                  <!-- The TextBox must be named PART_EditableTextBox or ComboBox will not recognize it -->
-                  <TextBox x:Name="PART_EditableTextBox"
-                           Visibility="Hidden"
-                           Template="{StaticResource ComboBoxTextBox}"
-                           HorizontalAlignment="Left"
-                           Margin="3,2,23,3"
-                           Style="{x:Null}"
-                           VerticalAlignment="Center"
-                           Focusable="True"
-                           Background="Transparent"
-                           IsReadOnly="{TemplateBinding IsReadOnly}" />
-
-                  <!-- The Popup shows the list of items in the ComboBox. IsOpen is databound to IsDropDownOpen which is toggled via the ComboBoxToggleButton -->
-                  <Popup x:Name="Popup"
-                         IsOpen="{TemplateBinding IsDropDownOpen}"
-                         Placement="Bottom"
-                         Focusable="False"
-                         AllowsTransparency="True"
-                         PopupAnimation="Slide">
-
-                     <Grid x:Name="DropDown"
-                           MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                           MinWidth="{TemplateBinding ActualWidth}"
-                           SnapsToDevicePixels="True">
-
-                        <Border x:Name="DropDownBorder"
-                                BorderBrush="{StaticResource basicBlackBorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                           <Border BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                                   BorderThickness="1"
-                                   CornerRadius="4">
-                              <Border.Background>
-                                 <LinearGradientBrush EndPoint="0.979,0.046"
-                                                      StartPoint="-0.019,1.017">
-                                    <GradientStop Color="#FF1686D8"
-                                                  Offset="1" />
-                                    <GradientStop Color="#FF06397B"
-                                                  Offset="0.297" />
-                                 </LinearGradientBrush>
-                              </Border.Background>
-                           </Border>
-                        </Border>
-
-                        <ScrollViewer Margin="4,6,4,6"
-                                      Style="{StaticResource ScrollViewerWindows7}"
-                                      SnapsToDevicePixels="True"
-                                      HorizontalScrollBarVisibility="Auto"
-                                      VerticalScrollBarVisibility="Auto"
-                                      CanContentScroll="True">
-
-                           <!-- The StackPanel is used to display the children by setting IsItemsHost to be True -->
-                           <StackPanel IsItemsHost="True"
-                                       KeyboardNavigation.DirectionalNavigation="Contained"
-                                       TextElement.Foreground="White" />
-
-                        </ScrollViewer>
-
-                     </Grid>
-
-                  </Popup>
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-                  <!-- This forces the DropDown to have a minimum size if it is empty -->
-                  <Trigger Property="HasItems"
-                           Value="false">
-
-                     <Setter Property="MinHeight"
-                             Value="95"
-                             TargetName="DropDownBorder" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsGrouping"
-                           Value="true">
-
-                     <Setter Property="ScrollViewer.CanContentScroll"
-                             Value="false" />
-
-                  </Trigger>
-                  <Trigger Property="AllowsTransparency"
-                           SourceName="Popup"
-                           Value="true">
-
-                     <Setter Property="CornerRadius"
-                             Value="4"
-                             TargetName="DropDownBorder" />
-
-                     <Setter Property="Margin"
-                             Value="0,2,0,0"
-                             TargetName="DropDownBorder" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEditable"
-                           Value="true">
-
-                     <Setter Property="IsTabStop"
-                             Value="false" />
-
-                     <Setter Property="Visibility"
-                             Value="Visible"
-                             TargetName="PART_EditableTextBox" />
-
-                     <Setter Property="Visibility"
-                             Value="Hidden"
-                             TargetName="ContentSite" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style TargetType="{x:Type ComboBox}"
-          BasedOn="{StaticResource windows7ComboBoxStyle}" />
-
-   <!-- Simple TextBox -->
-   <Style x:Key="textBoxWindows7"
-          TargetType="{x:Type TextBox}">
-
-      <Setter Property="KeyboardNavigation.TabNavigation"
-              Value="None" />
-
-      <Setter Property="FocusVisualStyle"
-              Value="{x:Null}" />
-
-      <Setter Property="AllowDrop"
-              Value="true" />
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type TextBox}">
-
-               <Grid>
-
-                  <Border x:Name="Border"
-                          Background="{StaticResource windowDefaultBackgroundBrush}"
-                          BorderBrush="{StaticResource buttonOutsideBorderDefaultBorderBrush}"
-                          BorderThickness="1"
-                          Padding="2"
-                          CornerRadius="0,0,0,0">
-
-                     <!-- The implementation places the Content into the ScrollViewer. It must be named PART_ContentHost for the control to function -->
-                     <ScrollViewer Margin="0"
-                                   x:Name="PART_ContentHost"
-                                   Style="{StaticResource ScrollViewerWindows7}"
-                                   Background="{TemplateBinding Background}" />
-                  </Border>
-
-               </Grid>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-
-                     <Setter Property="Background"
-                             Value="{StaticResource DisabledBackgroundBrush}"
-                             TargetName="Border" />
-
-                     <Setter Property="BorderBrush"
-                             Value="{StaticResource DisabledBackgroundBrush}"
-                             TargetName="Border" />
-
-                     <Setter Property="Foreground"
-                             Value="{StaticResource DisabledForegroundBrush}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-   </Style>
-
-   <Style TargetType="{x:Type ComboBoxItem}">
-
-      <Setter Property="Padding"
-              Value="3,0,3,0" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Template">
-
-         <Setter.Value>
-
-            <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-
-               <Border x:Name="Bd"
-                       SnapsToDevicePixels="true"
-                       Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsHighlighted"
-                           Value="true">
-
-                     <Setter Property="Background"
-                             TargetName="Bd"
-                             Value="#FF86E9F9" />
-
-                     <Setter Property="Foreground"
-                             Value="Black" />
-
-                  </Trigger>
-
-                  <Trigger Property="IsEnabled"
-                           Value="false">
-
-                     <Setter Property="Foreground"
-                             Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-
-            </ControlTemplate>
-
-         </Setter.Value>
-
-      </Setter>
-
-      <Style.Triggers>
-         <Trigger Property="IsVisible"
-                  Value="True">
-            <Setter Property="HorizontalContentAlignment"
-                    Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-            <Setter Property="VerticalContentAlignment"
-                    Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-   <Style x:Key="DefaultItemContainerStyle"
-          TargetType="{x:Type ComboBoxItem}">
-
-      <Setter Property="Foreground"
-              Value="White" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-               <Border x:Name="blackBorder"
-                       Background="{TemplateBinding Background}"
-                       BorderThickness="1"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       CornerRadius="4">
-                  <Border x:Name="whiteBorder"
-                          Background="Transparent"
-                          BorderThickness="1"
-                          BorderBrush="Transparent"
-                          CornerRadius="3">
-                     <ContentPresenter />
-                  </Border>
-               </Border>
-
-               <ControlTemplate.Triggers>
-
-                  <Trigger Property="IsSelected"
-                           Value="True">
-                     <Setter TargetName="blackBorder"
-                             Property="BorderBrush"
-                             Value="{StaticResource basicBlackBorderBrush}" />
-                     <Setter TargetName="whiteBorder"
-                             Property="BorderBrush"
-                             Value="{StaticResource basicWhiteBorderBrush}" />
-                  </Trigger>
-
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="Windows7RepeatButton"
-          TargetType="{x:Type RepeatButton}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type RepeatButton}">
-               <Border Background="Transparent">
-                  <ContentPresenter x:Name="glyphZone">
-                     <ContentPresenter.Content>
-                        <Canvas x:Name="leftArrowCanvas"
-                                Height="11"
-                                Width="13">
-                           <Path Stroke="Black"
-                                 Data="M0.97,1.19 C1.97,0.00 12.08,0.00 12.96,1.19 C13.85,2.38 8.31,10.50 7.01,10.50 C5.72,10.50 0.00,2.38 0.97,1.19 z" />
-                           <Path Data="M1.91,1.80 C2.44,0.88 11.95,0.88 12.03,1.80 C12.81,2.04 7.55,9.73 7.01,9.46 C6.47,9.68 1.02,2.05 1.91,1.80 z">
-                              <Path.Fill>
-                                 <RadialGradientBrush>
-                                    <GradientStop Color="White"
-                                                  Offset="1" />
-                                    <GradientStop Offset="0.4" />
-                                 </RadialGradientBrush>
-                              </Path.Fill>
-                              <Path.Stroke>
-                                 <LinearGradientBrush EndPoint="0.5,1"
-                                                      StartPoint="0.5,0">
-                                    <GradientStop Color="White"
-                                                  Offset="0" />
-                                    <GradientStop Color="White"
-                                                  Offset="1" />
-                                    <GradientStop Offset="0.52" />
-                                 </LinearGradientBrush>
-                              </Path.Stroke>
-                           </Path>
-                        </Canvas>
-                     </ContentPresenter.Content>
-                  </ContentPresenter>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-
-   <!--**************************
-    * Style: MenuItem(ContextMenu)
-    ************************** -->
-
-   <ControlTemplate x:Key="Windows7MenuItem"
-                    TargetType="{x:Type MenuItem}">
-      <Border>
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"
-                                 SharedSizeGroup="Icon" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto"
-                                 SharedSizeGroup="Shortcut" />
-               <ColumnDefinition Width="13" />
-            </Grid.ColumnDefinitions>
-            <Border Name="Border"
-                    Margin="1"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="4" />
-            <ContentPresenter Name="Icon"
-                              Margin="6,0,6,0"
-                              VerticalAlignment="Center"
-                              ContentSource="Icon" />
-            <Border Name="Check"
-                    Width="13"
-                    Height="13"
-                    Visibility="Collapsed"
-                    Margin="6,0,6,0"
-                    Background="Transparent"
-                    BorderThickness="1"
-                    BorderBrush="Transparent">
-               <Path Name="CheckMark"
-                     Visibility="Hidden"
-                     SnapsToDevicePixels="False"
-                     Fill="{StaticResource scrollbarGlyphBordeBrush}"
-                     Height="11"
-                     Width="10"
-                     Stretch="Fill"
-                     Opacity="1"
-                     Data="M 9.58416748046875,0 C9.58416748046875,0 10,0.6159515380859375 10,0.6159515380859375 8.7657470703125,1.540008544921875 8.419189453125,2.9010162353515625 6.96038818359375,4.698974609375 5.5015869140625,6.4969329833984375 4.602294921875,9.774444580078125 4.602294921875,9.774444580078125 4.602294921875,9.774444580078125 3.9029541015625,10.2296142578125 3.9029541015625,10.2296142578125 3.419921875,10.55328369140625 3.01983642578125,10.810089111328125 2.70257568359375,11 2.581787109375,10.676483154296875 2.114166259765625,9.48345947265625 1.46875,8.5 0.8125,7.5 0.4044189453125,6.9029998779296875 0,6.7393035888671875 0.667236328125,5.9750518798828125 1.8385009765625,5.592926025390625 1.8385009765625,5.592926025390625 1.8385009765625,5.592926025390625 3.555908203125,7.8286285400390625 3.555908203125,7.8286285400390625 4.3878173828125,6.349609375 4.5516357421875,4.8782501220703125 6.04742431640625,3.4145355224609375 7.543212890625,1.9508209228515625 8.055419921875,0.8126373291015625 9.58416748046875,0 z" />
-            </Border>
-            <ContentPresenter Name="HeaderHost"
-                              Grid.Column="1"
-                              VerticalAlignment="Center"
-                              ContentSource="Header"
-                              RecognizesAccessKey="True" />
-            <TextBlock x:Name="InputGestureText"
-                       Grid.Column="2"
-                       Text="{TemplateBinding InputGestureText}"
-                       Margin="5,2,0,2"
-                       DockPanel.Dock="Right" />
-         </Grid>
-      </Border>
-      <ControlTemplate.Triggers>
-         <Trigger Property="Icon"
-                  Value="{x:Null}">
-            <Setter TargetName="Icon"
-                    Property="Visibility"
-                    Value="Hidden" />
-         </Trigger>
-         <Trigger Property="IsChecked"
-                  Value="true">
-            <Setter TargetName="CheckMark"
-                    Property="Visibility"
-                    Value="Visible" />
-         </Trigger>
-         <Trigger Property="IsCheckable"
-                  Value="true">
-            <Setter TargetName="Check"
-                    Property="Visibility"
-                    Value="Visible" />
-            <Setter TargetName="Icon"
-                    Property="Visibility"
-                    Value="Hidden" />
-         </Trigger>
-         <Trigger Property="IsEnabled"
-                  Value="false">
-            <Setter Property="Foreground"
-                    Value="#DADADA" />
-         </Trigger>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter TargetName="Border"
-                    Property="Background"
-                    Value="#FF86E9F9" />
-            <Setter TargetName="CheckMark"
-                    Property="Fill"
-                    Value="Black" />
-            <Setter Property="TextElement.Foreground"
-                    Value="Black" />
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
-
-   <!--**************************
-    * Style: MenuItemScrollViewer (ContextMenu)
-    ************************** -->
-
-   <Style x:Key="MenuItemScrollViewer"
-          TargetType="{x:Type ScrollViewer}">
-
-      <Setter Property="VerticalScrollBarVisibility"
-              Value="Auto" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ScrollViewer}">
-               <Grid>
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="15" />
-                     <RowDefinition Height="*" />
-                     <RowDefinition Height="15" />
-                  </Grid.RowDefinitions>
-
-                  <ScrollContentPresenter Grid.RowSpan="3" />
-                  <RepeatButton x:Name="topRepeatButton"
-                                Height="15"
-                                Style="{StaticResource increaseDecreaseRepeatButtonWindows7}"
-                                Command="ScrollBar.LineUpCommand"
-                                ClickMode="Hover"
-                                Grid.Row="0">
-                     <Grid	Height="10"
-                           Width="5"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center">
-                        <Canvas Width="9"
-                                Height="5">
-                           <Path Opacity="1"
-                                 Data="M 4.53125,0.15625 C4.53125,0.15625 9,5 9,5 9,5 0,5 0,5 0,5 4.53125,0.15625 4.53125,0.15625 z"
-                                 Fill="{StaticResource glyphDefaultBordeBrush}" />
-                        </Canvas>
-
-                     </Grid>
-                     <RepeatButton.Visibility>
-                        <MultiBinding FallbackValue="Visibility.Collapsed"
-                                      Converter="{StaticResource MenuScrollingVisibilityConverter}"
-                                      ConverterParameter="0">
-                           <Binding Path="ComputedVerticalScrollBarVisibility"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="VerticalOffset"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="ExtentHeight"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="ViewportHeight"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                        </MultiBinding>
-                     </RepeatButton.Visibility>
-                  </RepeatButton>
-
-                  <RepeatButton x:Name="bottomRepeatButton"
-                                Height="15"
-                                Style="{StaticResource increaseDecreaseRepeatButtonWindows7}"
-                                Command="ScrollBar.LineDownCommand"
-                                ClickMode="Hover"
-                                Grid.Row="2">
-                     <RepeatButton.Visibility>
-                        <MultiBinding FallbackValue="Visibility.Collapsed"
-                                      Converter="{StaticResource MenuScrollingVisibilityConverter}"
-                                      ConverterParameter="100">
-                           <Binding Path="ComputedVerticalScrollBarVisibility"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="VerticalOffset"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="ExtentHeight"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                           <Binding Path="ViewportHeight"
-                                    RelativeSource="{RelativeSource TemplatedParent}" />
-                        </MultiBinding>
-                     </RepeatButton.Visibility>
-                     <Grid	Height="10"
-                           Width="5"
-                           RenderTransformOrigin="0.5,0.5"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center">
-                        <Canvas Width="9"
-                                Height="5">
-                           <Path Opacity="1"
-                                 Data="M 4.53125,0.15625 C4.53125,0.15625 9,5 9,5 9,5 0,5 0,5 0,5 4.53125,0.15625 4.53125,0.15625 z"
-                                 Fill="{StaticResource glyphDefaultBordeBrush}" />
-                        </Canvas>
-                        <Grid.RenderTransform>
-                           <RotateTransform Angle="180" />
-                        </Grid.RenderTransform>
-                     </Grid>
-                  </RepeatButton>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
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
deleted file mode 100644
index 4e50bcf0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml
+++ /dev/null
@@ -1,476 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="dataGridControlBackgroundBrush"
-                    Color="#E5EFFF" />
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="gridControlBackgroundBrush"
-                    Color="Transparent" />
-
-   <SolidColorBrush x:Key="gridControlForegroundBrush"
-                    Color="White" />
-
-   <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="#BBFFFFFF" />
-
-   <!--These Brushes are the basic light and dark borders for the controls-->
-   <LinearGradientBrush x:Key="basicWhiteBorderBrush"
-                        EndPoint="1.11,1.10"
-                        StartPoint="-0.03,-0.04">
-      <GradientStop Color="White" />
-      <GradientStop Offset="1"
-                    Color="White" />
-      <GradientStop Offset="0.5" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="basicBlackBorderBrush"
-                        EndPoint="1.18,1.16"
-                        StartPoint="-0.21,-0.19">
-      <GradientStop Color="Black"
-                    Offset="1" />
-      <GradientStop Color="#00000000"
-                    Offset="0.47" />
-      <GradientStop Color="Black" />
-   </LinearGradientBrush>
-
-   <!-- 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" />
-
-   <!-- Same as in TableflowView.Windows7.xaml-->
-   <SolidColorBrush x:Key="currentCellBackgroundBrush"
-                    Color="#7FFFFFFF" />
-
-   <!-- Same as in TableflowView.Windows7.xaml-->
-   <SolidColorBrush x:Key="rowSelectionBackgroundBrush"
-                    Color="#FF3EBCF6" />
-
-   <!-- Same as in TableflowView.Windows7.xaml-->
-   <LinearGradientBrush x:Key="rowInactiveSelectionBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FFD9D9D9"
-                    Offset="0" />
-      <GradientStop Color="#FF9A9A9A"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <!--**************************
-    * TEMPLATE: Button (for GroupByControl bubbles)
-    ************************** -->
-   <ControlTemplate x:Key="groupByControlBubbleTemplate"
-                    TargetType="ContentControl">
-      <Grid>
-         <Ellipse x:Name="main">
-            <Ellipse.Fill>
-               <RadialGradientBrush GradientOrigin="0.12,0.725"
-                                    RadiusX="0.51"
-                                    RadiusY="0.51">
-                  <GradientStop Offset="0"
-                                Color="White" />
-                  <GradientStop Offset="1" />
-               </RadialGradientBrush>
-            </Ellipse.Fill>
-            <Ellipse.Stroke>
-               <LinearGradientBrush EndPoint="1.011,0.574"
-                                    StartPoint="0.001,0.73">
-                  <GradientStop Color="White"
-                                Offset="0" />
-                  <GradientStop Offset="1" />
-               </LinearGradientBrush>
-            </Ellipse.Stroke>
-         </Ellipse>
-
-         <Ellipse x:Name="drop1"
-                  Width="6"
-                  HorizontalAlignment="Center"
-                  RenderTransformOrigin="0.5,0.5"
-                  VerticalAlignment="Center"
-                  Height="6"
-                  Opacity="0">
-            <Ellipse.RenderTransform>
-               <TranslateTransform />
-            </Ellipse.RenderTransform>
-            <Ellipse.Fill>
-               <RadialGradientBrush GradientOrigin="0.12,0.725"
-                                    RadiusX="0.51"
-                                    RadiusY="0.51">
-                  <GradientStop Offset="0" />
-                  <GradientStop Offset="1"
-                                Color="#3FFFFFFF" />
-               </RadialGradientBrush>
-            </Ellipse.Fill>
-            <Ellipse.Stroke>
-               <LinearGradientBrush EndPoint="1.011,0.574"
-                                    StartPoint="0.001,0.73">
-                  <GradientStop Color="#7FFFFFFF"
-                                Offset="0" />
-                  <GradientStop Offset="1" />
-               </LinearGradientBrush>
-            </Ellipse.Stroke>
-         </Ellipse>
-         <Ellipse x:Name="drop2"
-                  Width="6"
-                  HorizontalAlignment="Center"
-                  RenderTransformOrigin="0.5,0.5"
-                  VerticalAlignment="Center"
-                  Height="6"
-                  Opacity="0">
-            <Ellipse.RenderTransform>
-               <TranslateTransform />
-            </Ellipse.RenderTransform>
-            <Ellipse.Fill>
-               <RadialGradientBrush GradientOrigin="0.12,0.725"
-                                    RadiusX="0.51"
-                                    RadiusY="0.51">
-                  <GradientStop Offset="0" />
-                  <GradientStop Offset="1"
-                                Color="#3FFFFFFF" />
-               </RadialGradientBrush>
-            </Ellipse.Fill>
-            <Ellipse.Stroke>
-               <LinearGradientBrush EndPoint="1.011,0.574"
-                                    StartPoint="0.001,0.73">
-                  <GradientStop Color="#7FFFFFFF"
-                                Offset="0" />
-                  <GradientStop Offset="1" />
-               </LinearGradientBrush>
-            </Ellipse.Stroke>
-         </Ellipse>
-         <Ellipse x:Name="drop3"
-                  Width="6"
-                  HorizontalAlignment="Center"
-                  RenderTransformOrigin="0.5,0.5"
-                  VerticalAlignment="Center"
-                  Height="6"
-                  Opacity="0">
-            <Ellipse.RenderTransform>
-               <TranslateTransform />
-            </Ellipse.RenderTransform>
-            <Ellipse.Fill>
-               <RadialGradientBrush GradientOrigin="0.12,0.725"
-                                    RadiusX="0.51"
-                                    RadiusY="0.51">
-                  <GradientStop Offset="0" />
-                  <GradientStop Offset="1"
-                                Color="#3FFFFFFF" />
-               </RadialGradientBrush>
-            </Ellipse.Fill>
-            <Ellipse.Stroke>
-               <LinearGradientBrush EndPoint="1.011,0.574"
-                                    StartPoint="0.001,0.73">
-                  <GradientStop Color="#7FFFFFFF"
-                                Offset="0" />
-                  <GradientStop Offset="1" />
-               </LinearGradientBrush>
-            </Ellipse.Stroke>
-         </Ellipse>
-         <Ellipse x:Name="drop4"
-                  Width="6"
-                  HorizontalAlignment="Center"
-                  RenderTransformOrigin="0.5,0.5"
-                  VerticalAlignment="Center"
-                  Height="6"
-                  Opacity="0">
-            <Ellipse.RenderTransform>
-               <TranslateTransform />
-            </Ellipse.RenderTransform>
-            <Ellipse.Fill>
-               <RadialGradientBrush GradientOrigin="0.12,0.725"
-                                    RadiusX="0.51"
-                                    RadiusY="0.51">
-                  <GradientStop Offset="0" />
-                  <GradientStop Offset="1"
-                                Color="#3FFFFFFF" />
-               </RadialGradientBrush>
-            </Ellipse.Fill>
-            <Ellipse.Stroke>
-               <LinearGradientBrush EndPoint="1.011,0.574"
-                                    StartPoint="0.001,0.73">
-                  <GradientStop Color="#7FFFFFFF"
-                                Offset="0" />
-                  <GradientStop Offset="1" />
-               </LinearGradientBrush>
-            </Ellipse.Stroke>
-         </Ellipse>
-      </Grid>
-
-      <ControlTemplate.Triggers>
-         <EventTrigger RoutedEvent="ContentControl.MouseLeftButtonDown">
-            <BeginStoryboard>
-               <Storyboard>
-
-                  <BooleanAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                  Storyboard.TargetProperty="(UIElement.IsHitTestVisible)">
-                     <DiscreteBooleanKeyFrame KeyTime="00:00:00"
-                                              Value="False" />
-                     <DiscreteBooleanKeyFrame KeyTime="00:05:00"
-                                              Value="True" />
-                  </BooleanAnimationUsingKeyFrames>
-                  <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                Storyboard.TargetName="main"
-                                                Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                     <LinearColorKeyFrame KeyTime="00:00:00.05"
-                                          Value="#7FFFFFFF" />
-                     <LinearColorKeyFrame KeyTime="00:00:00.14"
-                                          Value="Transparent" />
-                     <LinearColorKeyFrame KeyTime="00:04:59.9"
-                                          Value="Transparent" />
-                     <LinearColorKeyFrame KeyTime="00:05:00"
-                                          Value="#3FFFFFFF" />
-                  </ColorAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="main"
-                                                 Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Offset)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.05"
-                                           Value="0.85" />
-                     <LinearDoubleKeyFrame KeyTime="00:04:59.9"
-                                           Value="0.85" />
-                     <LinearDoubleKeyFrame KeyTime="00:05:00"
-                                           Value="0" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <PointAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                Storyboard.TargetName="main"
-                                                Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.StartPoint)">
-                     <LinearPointKeyFrame KeyTime="00:00:00.05"
-                                          Value="0.001,0.73" />
-                     <LinearPointKeyFrame KeyTime="00:00:00.1"
-                                          Value="0.649,-0.186" />
-                     <LinearPointKeyFrame KeyTime="00:00:00.14"
-                                          Value="0.3161,0.6263" />
-                     <LinearPointKeyFrame KeyTime="00:00:00.15"
-                                          Value="1.625,0.196" />
-                     <LinearPointKeyFrame KeyTime="00:00:00.2"
-                                          Value="1.369,0.28" />
-                     <LinearPointKeyFrame KeyTime="00:04:59.9"
-                                          Value="1.369,0.28" />
-                     <LinearPointKeyFrame KeyTime="00:05:00"
-                                          Value="0.001,0.73" />
-                  </PointAnimationUsingKeyFrames>
-                  <PointAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                Storyboard.TargetName="main"
-                                                Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.EndPoint)">
-                     <LinearPointKeyFrame KeyTime="00:00:00.05"
-                                          Value="1.011,0.574" />
-                     <LinearPointKeyFrame KeyTime="00:00:00.2"
-                                          Value="1.013,0.354" />
-                     <LinearPointKeyFrame KeyTime="00:04:59.9"
-                                          Value="1.013,0.354" />
-                     <LinearPointKeyFrame KeyTime="00:05:00"
-                                          Value="1.011,0.574" />
-                  </PointAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="main"
-                                                 Storyboard.TargetProperty="(UIElement.Opacity)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.0"
-                                           Value="1" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.1"
-                                           Value="0.33" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.2"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:04:59.9"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:05:00"
-                                           Value="1" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop1"
-                                                 Storyboard.TargetProperty="(UIElement.Opacity)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.24"
-                                           Value="1" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.6"
-                                           Value="0" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop1"
-                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.24"
-                                           Value="3.375" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.6"
-                                           Value="18.9375" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop1"
-                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.24"
-                                           Value="-12" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.6"
-                                           Value="-2.625" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop2"
-                                                 Storyboard.TargetProperty="(UIElement.Opacity)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.2"
-                                           Value="1" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.5"
-                                           Value="0" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop2"
-                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.2"
-                                           Value="-11.0625" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.5"
-                                           Value="-25.5" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop2"
-                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.2"
-                                           Value="-11.0625" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.5"
-                                           Value="-10.5" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop3"
-                                                 Storyboard.TargetProperty="(UIElement.Opacity)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.28"
-                                           Value="1" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.7"
-                                           Value="0" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop3"
-                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.28"
-                                           Value="9.375" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.7"
-                                           Value="18.75" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop3"
-                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.28"
-                                           Value="-12.1875" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.7"
-                                           Value="-2.25" />
-
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop4"
-                                                 Storyboard.TargetProperty="(UIElement.Opacity)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.2"
-                                           Value="1" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.7"
-                                           Value="0" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop4"
-                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.2"
-                                           Value="-1" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.7"
-                                           Value="-55" />
-                  </DoubleAnimationUsingKeyFrames>
-                  <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                                 Storyboard.TargetName="drop4"
-                                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)">
-                     <LinearDoubleKeyFrame KeyTime="00:00:00"
-                                           Value="0" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.2"
-                                           Value="-30" />
-                     <LinearDoubleKeyFrame KeyTime="00:00:00.7"
-                                           Value="-20" />
-                  </DoubleAnimationUsingKeyFrames>
-               </Storyboard>
-            </BeginStoryboard>
-         </EventTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * 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}"
-                 CornerRadius="8" />
-
-         <Border BorderThickness="1"
-                 BorderBrush="{StaticResource basicBlackBorderBrush}"
-                 CornerRadius="10">
-            <Border BorderThickness="1"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    CornerRadius="7" />
-         </Border>
-
-         <ContentPresenter VerticalAlignment="Center"
-                           HorizontalAlignment="Right"
-                           Margin="10"
-                           TextElement.Foreground="{TemplateBinding TextElement.Foreground}"
-                           Content="{TemplateBinding Content}"
-                           ContentTemplate="{TemplateBinding ContentTemplate}"
-                           ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-
-      </Grid>
-
-   </ControlTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml
deleted file mode 100644
index b91e8cc5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml
+++ /dev/null
@@ -1,2782 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Windows7.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Windows7.Graphics.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-      <!-- Control Styles used in the Grid Control -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Windows7.Controls.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-   <conv:ThicknessConverter x:Key="thicknessConverter" />
-   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
-                            InverseValue="True" />
-   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
-
-   <Color x:Key="mainGradientColor">
-      #C4DDFF
-   </Color>
-
-   <SolidColorBrush x:Key="rowSelectionBackgroundBrush"
-                    Color="#FF3EBCF6" />
-
-   <!--This brush is used for the columnManagerCell separator line-->
-   <SolidColorBrush x:Key="darkBorderBrush"
-                    Color="#FF04A2F7" />
-
-   <!--This Brush is used for the grid lines color-->
-   <SolidColorBrush x:Key="lightBackgroundBrush"
-                    Color="#DDE0E3" />
-
-   <!--This color is used for the border around groupByItem-->
-   <SolidColorBrush x:Key="borderBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="columnManagerRowBorderBrush"
-                    Color="#6593CF" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <RadialGradientBrush x:Key="rowSelectorBrush"
-                        RadiusX="1"
-                        RadiusY="1"
-                        GradientOrigin="0,0"
-                        Center="0,0">
-      <GradientStop Color="#FFD1ECFF"
-                    Offset="1" />
-      <GradientStop Color="#FF47C6F8"
-                    Offset="0" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSelectorPressedBrush"
-                        StartPoint="1,0.5"
-                        EndPoint="0,0.5">
-      <GradientStop Color="#FF04A2F7" />
-      <GradientStop Offset="0.7" />
-      <GradientStop Offset="0.15"
-                    Color="#0004A2F7" />
-   </LinearGradientBrush>
-
-   <RadialGradientBrush x:Key="columnManagerCellRoundedEffectBrush"
-                        Center="0.51,0.78"
-                        GradientOrigin="0.51,1.17"
-                        RadiusX="0.66"
-                        RadiusY="0.66">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.14" />
-      <GradientStop Offset="0.69"
-                    Color="#331494DF" />
-      <GradientStop Color="#4CFFFFFF"
-                    Offset="0.28" />
-      <GradientStop Color="#001494DF"
-                    Offset="1" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerCellBlackLineBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#00000000"
-                    Offset="1" />
-      <GradientStop Color="#00000000" />
-      <GradientStop Color="Black"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush  x:Key="columnManagerCellWhiteLineBrush"
-                         EndPoint="0.99,0.95"
-                         StartPoint="1,0.11">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.5" />
-      <GradientStop Offset="1" />
-      <GradientStop />
-   </LinearGradientBrush>
-
-   <RadialGradientBrush x:Key="columnManagerCellResizerDecoratorBrush"
-                        RadiusX="0.997"
-                        RadiusY="0.964"
-                        GradientOrigin="-0.477,-0.055">
-      <GradientStop Offset="0.71" />
-      <GradientStop Color="White"
-                    Offset="1" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerRowBackgroundBrush"
-                        StartPoint="-0.01,1.33"
-                        EndPoint="0.57,-10.76">
-      <GradientStop Color="#FF18a6f7"
-                    Offset="0" />
-      <GradientStop Color="#FF47c0f6"
-                    Offset="0.087" />
-      <GradientStop Color="#FF31b6f7"
-                    Offset="0.174" />
-      <GradientStop Color="#FF47C0F6"
-                    Offset="0.268" />
-      <GradientStop Color="#FF23a5fa"
-                    Offset="0.378" />
-      <GradientStop Color="#FF1395f3"
-                    Offset="0.486" />
-      <GradientStop Color="#FF1694f9"
-                    Offset="0.595" />
-      <GradientStop Color="#FF2190f5"
-                    Offset="0.85" />
-      <GradientStop Color="#FF47C0F6"
-                    Offset="0.718" />
-      <GradientStop Color="#FF015EC8"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerRowWhiteBorderBrush"
-                        EndPoint="1.33,1.31"
-                        StartPoint="-0.59,-0.56">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.46" />
-      <GradientStop Color="#33FFFFFF"
-                    Offset="1.00" />
-      <GradientStop Color="#33FFFFFF" />
-   </LinearGradientBrush>
-
-   <RadialGradientBrush x:Key="groupByControlBackgroundBrush"
-                        Center="0.503,0.35"
-                        GradientOrigin="1.1,0.504"
-                        RadiusX="0.523"
-                        RadiusY="2.375">
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-      <GradientStop Color="#FF015EC8"
-                    Offset="0.25" />
-      <GradientStop Color="#FF86E9F9"
-                    Offset="0.682" />
-      <GradientStop Color="#FF013C98"
-                    Offset="0.003" />
-      <GradientStop Color="#FFC9F4FB"
-                    Offset="1" />
-   </RadialGradientBrush>
-   <LinearGradientBrush x:Key="groupByItemBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="White"
-                    Offset="0" />
-      <GradientStop Offset="0.50"
-                    Color="#7FFFFFFF" />
-      <GradientStop Color="White"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <RadialGradientBrush x:Key="groupByItemMouseOverBackgroundBrush"
-                        Center="0.507,0.779"
-                        GradientOrigin="0.51,1.174"
-                        RadiusX="0.664"
-                        RadiusY="0.664">
-      <GradientStop Color="White"
-                    Offset="0.175" />
-      <GradientStop Offset="0.776"
-                    Color="#591494DF" />
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.325" />
-      <GradientStop Color="#4CFFFFFF"
-                    Offset="1" />
-      <GradientStop Color="#3FFFFFFF"
-                    Offset="0.484" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByItemPressedBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="White"
-                    Offset="0" />
-      <GradientStop Offset="0.528"
-                    Color="#FF9ADAFF" />
-      <GradientStop Color="White"
-                    Offset="1" />
-      <GradientStop Color="#FFC1E8FF"
-                    Offset="0.244" />
-      <GradientStop Color="#FFC7EAFF"
-                    Offset="0.785" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="hierarchicalGroupByControlNodeBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#7FFFFFFF"
-                    Offset="0" />
-      <GradientStop Offset="0.53"
-                    Color="#3FFFFFFF" />
-      <GradientStop Color="#7FFFFFFF"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="rowAlternatingBackgroundBrush"
-                    Color="#FFD1ECFF" />
-
-   <LinearGradientBrush x:Key="rowInactiveSelectionBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FFD9D9D9"
-                    Offset="0" />
-      <GradientStop Color="#FF9A9A9A"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSplitterBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0" />
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="1" />
-      <GradientStop Offset="0.5" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="currentCellBackgroundBrush"
-                    Color="#7FFFFFFF" />
-
-   <LinearGradientBrush x:Key="currentCellWhiteBorderBrush"
-                        EndPoint="1.33,1.31"
-                        StartPoint="-0.59,-0.56">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.46" />
-      <GradientStop Color="#33FFFFFF"
-                    Offset="1" />
-      <GradientStop Color="#33FFFFFF" />
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="currentCellBlackBorderBrush"
-                        EndPoint="1.12,1.29"
-                        StartPoint="-0.1,-0.17">
-      <GradientStop Color="#26000000"
-                    Offset="0.48" />
-      <GradientStop Color="Black"
-                    Offset="1" />
-      <GradientStop Color="Black"
-                    Offset="0.01" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="dataGridControlBackgroundBrush"
-                    Color="#E5EFFF" />
-
-   <Pen x:Key="groupByConnectionLinePen"
-        Thickness="1"
-        Pen.Brush="{StaticResource borderBrush}" />
-
-   <Pen x:Key="dropMarkPen"
-        Thickness="6"
-        Brush="{StaticResource rowSelectionBackgroundBrush}" />
-
-   <LinearGradientBrush x:Key="columnChooserBackgroundBrush"
-                        EndPoint="0.979,0.046"
-                        StartPoint="-0.019,1.017">
-      <GradientStop Color="#FF1686D8"
-                    Offset="1" />
-      <GradientStop Color="#FF06397B"
-                    Offset="0.297" />
-   </LinearGradientBrush>
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewWindows7ColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- We don't use the base Cell Template for the ColumnManagerCell because it need more elements
-           to function properly: a Thumb named "PART_ColumnResizerThumb" that is used to resize the
-           ColumnManagerCells's ParentColumn.Width and a glyph that represents the Column's SortDirection. -->
-      <Grid x:Name="Grid"
-            Background="Transparent">
-
-         <Grid x:Name="ColumnResizerDecorator">
-            <Path Stretch="Fill"
-                  HorizontalAlignment="Right"
-                  Height="28"
-                  Width="20"
-                  Fill="{StaticResource columnManagerCellResizerDecoratorBrush}"
-                  Data="M0,28 z L18,28 C19,27 19,27 20,26 L20,2 L18.5,14 C17,25 17,25 0,28 Z" />
-
-            <Grid Height="12"
-                  Width="3"
-                  HorizontalAlignment="Right"
-                  Margin="0,0,3,0">
-               <Grid.Resources>
-                  <DataTemplate x:Key="ResizerDot">
-                     <Grid>
-                        <Border Width="2"
-                                Height="2"
-                                BorderBrush="#55000000"
-                                BorderThickness="1"
-                                VerticalAlignment="Top"
-                                HorizontalAlignment="Left" />
-                        <Border Width="1"
-                                Height="1"
-                                BorderBrush="#55FFFFFF"
-                                BorderThickness="1"
-                                VerticalAlignment="Top"
-                                HorizontalAlignment="Left" />
-                     </Grid>
-                  </DataTemplate>
-               </Grid.Resources>
-
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="*" />
-               </Grid.RowDefinitions>
-
-               <ContentPresenter ContentTemplate="{StaticResource ResizerDot}"
-                                 Grid.Row="0"
-                                 Margin="1,1,0,1" />
-               <ContentPresenter ContentTemplate="{StaticResource ResizerDot}"
-                                 Grid.Row="1"
-                                 Margin="1,1,0,1" />
-               <ContentPresenter ContentTemplate="{StaticResource ResizerDot}"
-                                 Grid.Row="2"
-                                 Margin="1,1,0,1" />
-            </Grid>
-         </Grid>
-
-         <Border x:Name="PressEffect"
-                 Opacity="0"
-                 CornerRadius="5"
-                 Background="{StaticResource columnManagerCellRoundedEffectBrush}" />
-
-         <Border x:Name="BlackLine"
-                 BorderThickness="1,0"
-                 Opacity="0"
-                 CornerRadius="5"
-                 BorderBrush="{StaticResource columnManagerCellBlackLineBrush}">
-            <Border x:Name="WhiteLine"
-                    BorderThickness="1,0"
-                    Opacity="0"
-                    CornerRadius="4"
-                    BorderBrush="{StaticResource columnManagerCellWhiteLineBrush}" />
-         </Border>
-
-         <Grid>
-            <Border x:Name="mainBorder"
-                    Background="Transparent"
-                    Padding="{TemplateBinding Padding}">
-
-               <DockPanel Margin="0,0,4,0">
-
-                  <Grid x:Name="toggleGrid"
-                        DockPanel.Dock="Right"
-                        Visibility="Collapsed"
-                        Margin="0,5,4,0">
-
-                     <ToggleButton x:Name="toggleButton"
-                                   Focusable="False"
-                                   VerticalAlignment="Stretch"
-                                   Margin="2,0,0,0"
-                                   Opacity="0.5" />
-                  </Grid>
-
-                  <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="6" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-
-                     <!-- 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. -->
-                     <StackPanel Orientation="Horizontal"
-                                 Grid.Row="0"
-                                 VerticalAlignment="Center"
-                                 HorizontalAlignment="Center">
-                        <ContentPresenter x:Name="sortGlyphPresenter"
-                                          Content="{x:Null}"
-                                          ContentTemplate="{x:Null}"
-                                          TextElement.Foreground="#FFFFFFFF"/>
-                     </StackPanel>
-
-                     <!-- Same ContentPresenter as in the base Cell Template. -->
-                     <local:CellContentPresenter VerticalAlignment="Center"
-                                                 HorizontalAlignment="Center"
-                                                 Grid.Row="1" />
-
-                  </Grid>
-               </DockPanel>
-            </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>
-      </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=ParentColumn.SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
-
-         </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}" />
-
-         </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>
-
-         <!-- Trigger to set the background and pressed effect depending on state -->
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-            <Trigger.EnterActions>
-               <BeginStoryboard>
-                  <Storyboard>
-                     <DoubleAnimation BeginTime="00:00:00"
-                                      Duration="00:00:00.2"
-                                      Storyboard.TargetName="PressEffect"
-                                      Storyboard.TargetProperty="Opacity"
-                                      To="1" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </Trigger.EnterActions>
-            <Trigger.ExitActions>
-               <BeginStoryboard>
-                  <Storyboard>
-                     <DoubleAnimation BeginTime="00:00:00"
-                                      Duration="00:00:00.5"
-                                      Storyboard.TargetName="PressEffect"
-                                      Storyboard.TargetProperty="Opacity"
-                                      To="0" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </Trigger.ExitActions>
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="true">
-            <Trigger.EnterActions>
-               <BeginStoryboard>
-                  <Storyboard>
-                     <DoubleAnimation BeginTime="00:00:00"
-                                      Duration="00:00:00.02"
-                                      Storyboard.TargetName="PressEffect"
-                                      Storyboard.TargetProperty="Background.(RadialGradientBrush.RadiusY)"
-                                      To="1.44" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </Trigger.EnterActions>
-            <Trigger.ExitActions>
-               <BeginStoryboard>
-                  <Storyboard>
-                     <DoubleAnimation BeginTime="00:00:00"
-                                      Duration="00:00:00.7"
-                                      Storyboard.TargetName="PressEffect"
-                                      Storyboard.TargetProperty="Background.(RadialGradientBrush.RadiusY)"
-                                      To="0.66" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </Trigger.ExitActions>
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: RowSelector
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7RowSelectorTemplate"
-                    TargetType="local:RowSelector">
-
-      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-      <Grid>
-
-         <Border x:Name="mainBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}"
-                 CornerRadius="3"
-                 Margin="0,0,0,1">
-
-            <ContentPresenter x:Name="contentPresenter"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-         </Border>
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-         <Border x:Name="separatorLine"
-                 Height="1"
-                 Background="{StaticResource darkBorderBrush}"
-                 VerticalAlignment="Bottom"
-                 Margin="4,0,4,0" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-            <Setter TargetName="mainBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="-0.413,0.593"
-                                       StartPoint="0.996,0.588">
-                     <GradientStop Color="White"
-                                   Offset="0" />
-                     <GradientStop Offset="0.15" />
-                     <GradientStop Offset="0.7" />
-                     <GradientStop Color="White" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="mainBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource darkBorderBrush}" />
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="mainBorder"
-                    Property="Background"
-                    Value="{StaticResource rowSelectorPressedBrush}" />
-
-            <Setter TargetName="mainBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource darkBorderBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByControl
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7GroupByControlTemplate"
-                    TargetType="local:GroupByControl">
-      <Grid x:Name="mainGrid"
-            Margin="0">
-
-         <Border Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}" />
-
-         <!-- Curly leaves pattern and bubbles -->
-         <ContentPresenter ContentTemplate="{StaticResource CurvyLeavesPattern}"
-                           VerticalAlignment="Stretch"
-                           HorizontalAlignment="Stretch" />
-
-         <Grid>
-            <ContentControl x:Name="bubble1"
-                            VerticalAlignment="Top"
-                            HorizontalAlignment="Left"
-                            Height="40"
-                            Width="40"
-                            Focusable="False"
-                            SnapsToDevicePixels="False"
-                            RenderTransformOrigin="0.5,0.5"
-                            Template="{StaticResource groupByControlBubbleTemplate}">
-               <ContentControl.RenderTransform>
-                  <TranslateTransform X="-40" />
-               </ContentControl.RenderTransform>
-            </ContentControl>
-            <ContentControl x:Name="bubble2"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            Width="25"
-                            Height="25"
-                            Focusable="False"
-                            SnapsToDevicePixels="False"
-                            RenderTransformOrigin="0.5,0.5"
-                            Template="{StaticResource groupByControlBubbleTemplate}">
-               <ContentControl.RenderTransform>
-                  <TranslateTransform X="-25" />
-               </ContentControl.RenderTransform>
-            </ContentControl>
-            <ContentControl x:Name="bubble3"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            Width="15"
-                            Height="15"
-                            Focusable="False"
-                            SnapsToDevicePixels="False"
-                            RenderTransformOrigin="0.5,0.5"
-                            Template="{StaticResource groupByControlBubbleTemplate}">
-               <ContentControl.RenderTransform>
-                  <TranslateTransform X="-15" />
-               </ContentControl.RenderTransform>
-            </ContentControl>
-         </Grid>
-
-         <!-- This Grid is used to position the ItemsPresenter over the ContentPresenter in charge
-              of displaying the NoGroupContent. -->
-         <Grid Margin="{TemplateBinding Padding}">
-
-            <!-- This ContentPresenter displays the value of the NoGroupContent property
-                 of the GroupByControl. This content must only be displayed when there are
-                 no groups present, so we set its Visibility to Collapsed by default and
-                 it is made visible via a trigger. -->
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed"
-                              IsHitTestVisible="False" />
-
-            <!-- The GroupByControl is an ItemsControl, so it must have an ItemsPresenter in its
-                 Template in order to layout and show its child items. The default ItemsPanel
-                 of the GroupByControl is a "StaircasePanel", which layout its items in a
-                 staircase-like pattern and draws connecting lines between the items. -->
-            <ItemsPresenter />
-
-         </Grid>
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When there are no groups, make the NoGroupContent visible. -->
-         <Trigger Property="HasItems"
-                  Value="False">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-         </Trigger>
-
-         <!-- Bubbles Animation -->
-         <EventTrigger SourceName="mainGrid"
-                       RoutedEvent="Grid.Loaded">
-            <EventTrigger.Actions>
-               <BeginStoryboard>
-                  <Storyboard Duration="00:10:00"
-                              RepeatBehavior="Forever"
-                              Timeline.DesiredFrameRate="20">
-                     <DoubleAnimationUsingPath BeginTime="00:00:00"
-                                               Duration="00:05:00"
-                                               Storyboard.TargetName="bubble1"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                               Source="X">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-31,11 C-31,11 82.462368,65.802014 130.5,49.5 178.53763,33.197986 204.06968,7.4634866 267.5,6.5 334.55253,5.4814933 418.45061,50.4996 481.5,50.5 537.08628,50.500353 649.57165,18.872376 721.5,14.5 855.60506,6.3480301 970.42944,34.5 1060.5,34.5 1120.0867,34.5 1256.5,-19.5 1256.5,-19.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimationUsingPath BeginTime="00:00:00"
-                                               Duration="00:05:00"
-                                               Storyboard.TargetName="bubble1"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                               Source="Y">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-31,11 C-31,11 82.462368,65.802014 130.5,49.5 178.53763,33.197986 204.06968,7.4634866 267.5,6.5 334.55253,5.4814933 418.45061,50.4996 481.5,50.5 537.08628,50.500353 649.57165,18.872376 721.5,14.5 855.60506,6.3480301 970.42944,34.5 1060.5,34.5 1120.0867,34.5 1256.5,-19.5 1256.5,-19.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimation BeginTime="00:04:00"
-                                      Duration="00:01:00"
-                                      Storyboard.TargetName="bubble1"
-                                      Storyboard.TargetProperty="(UIElement.Opacity)"
-                                      From="1"
-                                      To="0" />
-                     <DoubleAnimationUsingPath BeginTime="00:01:00"
-                                               Duration="00:04:00"
-                                               Storyboard.TargetName="bubble2"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                               Source="X">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-14.5,51.5 C-14.5,51.5 166.5,8.5 218.5,42.5 270.5,76.5 323.29493,96.682289 372.29493,84.682289 421.29493,72.682289 496.29493,22.682289 537.29493,27.682289 578.29493,32.682289 641.5,55.5 677.5,58.5 713.5,61.5 757.5,36.5 789.5,27.5 821.5,18.5 882.5,44.5 928.5,56.5 974.5,68.5 1042.5,49.5 1074.5,33.5 1106.5,17.5 1161.5,25.5&#xd;&#xa;1185.5,43.5 1209.5,61.5 1271.5,45.5 1271.5,45.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimationUsingPath BeginTime="00:01:00"
-                                               Duration="00:04:00"
-                                               Storyboard.TargetName="bubble2"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                               Source="Y">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-14.5,51.5 C-14.5,51.5 166.5,8.5 218.5,42.5 270.5,76.5 323.29493,96.682289 372.29493,84.682289 421.29493,72.682289 496.29493,22.682289 537.29493,27.682289 578.29493,32.682289 641.5,55.5 677.5,58.5 713.5,61.5 757.5,36.5 789.5,27.5 821.5,18.5 882.5,44.5 928.5,56.5 974.5,68.5 1042.5,49.5 1074.5,33.5 1106.5,17.5 1161.5,25.5&#xd;&#xa;1185.5,43.5 1209.5,61.5 1271.5,45.5 1271.5,45.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimation BeginTime="00:04:00"
-                                      Duration="00:01:00"
-                                      Storyboard.TargetName="bubble2"
-                                      Storyboard.TargetProperty="(UIElement.Opacity)"
-                                      From="1"
-                                      To="0" />
-                     <DoubleAnimationUsingPath BeginTime="00:00:24"
-                                               Duration="00:04:12"
-                                               Storyboard.TargetName="bubble3"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                               Source="X">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-14.5,36.5 C-14.5,36.5 69.5,-4.4998449 121.5,29.500155 173.5,63.500155 250.5,72.500155 299.5,60.500155 348.5,48.500155 418.5,7.5001551 459.5,12.500155 500.5,17.500155 549.32936,71.672597 585.32936,74.672597 621.32936,77.672597 696.5,38.5 728.5,29.5 760.5,20.5 876.5,42.5 922.5,54.5 968.5,66.5 1031.5,35.5 1063.5,19.5 1095.5,3.5 1142.5,41.5&#xd;&#xa;1175.5,42.5 1205.4862,43.408674 1283.5,15.5 1283.5,15.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimationUsingPath BeginTime="00:00:24"
-                                               Duration="00:04:12"
-                                               Storyboard.TargetName="bubble3"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                               Source="Y">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-14.5,36.5 C-14.5,36.5 69.5,-4.4998449 121.5,29.500155 173.5,63.500155 250.5,72.500155 299.5,60.500155 348.5,48.500155 418.5,7.5001551 459.5,12.500155 500.5,17.500155 549.32936,71.672597 585.32936,74.672597 621.32936,77.672597 696.5,38.5 728.5,29.5 760.5,20.5 876.5,42.5 922.5,54.5 968.5,66.5 1031.5,35.5 1063.5,19.5 1095.5,3.5 1142.5,41.5&#xd;&#xa;1175.5,42.5 1205.4862,43.408674 1283.5,15.5 1283.5,15.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimation BeginTime="00:03:36"
-                                      Duration="00:01:00"
-                                      Storyboard.TargetName="bubble3"
-                                      Storyboard.TargetProperty="(UIElement.Opacity)"
-                                      From="1"
-                                      To="0" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </EventTrigger.Actions>
-         </EventTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7GroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="mouseOverEffect"
-                 Opacity="0"
-                 CornerRadius="5"
-                 Background="{StaticResource groupByItemMouseOverBackgroundBrush}" />
-
-         <Border x:Name="mainBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}"
-                 CornerRadius="5">
-
-            <!-- 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}"
-                                 Margin="0,4" />
-
-               <!-- 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="Black" />
-
-            </StackPanel>
-         </Border>
-
-         <Border x:Name="blackBorder"
-                 BorderThickness="1"
-                 BorderBrush="{StaticResource basicBlackBorderBrush}"
-                 CornerRadius="5">
-            <Border x:Name="whiteBorder"
-                    BorderThickness="1"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    CornerRadius="4" />
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-            <Setter TargetName="mouseOverEffect"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="true">
-            <Setter TargetName="mainBorder"
-                    Property="Background"
-                    Value="{StaticResource groupByItemPressedBackgroundBrush}" />
-         </Trigger>
-
-         <!-- 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
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7GroupHeaderControlTemplate"
-                    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 intAdditionConverter}, 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"
-                                Template="{StaticResource groupExpanderToggleButtonTemplate}"
-                                OverridesDefaultStyle="True"
-                                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 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                             HorizontalAlignment="Stretch"
-                             Height="1"
-                             Margin="0,0,0,0">
-                     <Rectangle.Fill>
-                        <LinearGradientBrush EndPoint="1.003,1.074"
-                                             StartPoint="0.003,0.109">
-                           <GradientStop Color="#FF9A9A9A"
-                                         Offset="0" />
-                           <GradientStop Color="Transparent"
-                                         Offset="1" />
-                        </LinearGradientBrush>
-                     </Rectangle.Fill>
-                  </Rectangle>
-               </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: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7HierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Grid>
-
-            <Border Background="{StaticResource hierarchicalGroupByControlNodeBackgroundBrush}"
-                    CornerRadius="5" />
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="4,3,4,3"
-                       Foreground="#154A93"
-                       VerticalAlignment="Center" />
-
-            <Border x:Name="blackBorder"
-                    BorderThickness="1"
-                    BorderBrush="Black"
-                    CornerRadius="5">
-               <Border x:Name="whiteBorder"
-                       BorderThickness="1"
-                       BorderBrush="White"
-                       CornerRadius="4" />
-            </Border>
-
-         </Grid>
-         <ItemsPresenter Margin="0,0,0,0" />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControl
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7HierarchicalGroupByControlTemplate"
-                    TargetType="local:HierarchicalGroupByControl">
-      <ControlTemplate.Resources>
-         <!--this style is set to avoid having implicit treeview style
-             overide the HierarchicalGroupByControl's TreeView-->
-         <Style TargetType="TreeView" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-
-            <!-- HierarchicalGroupByControl -->
-            <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="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-         <ContentPresenter ContentTemplate="{StaticResource CurvyLeavesPattern}"
-                           VerticalAlignment="Stretch"
-                           HorizontalAlignment="Stretch"
-                           Grid.ColumnSpan="3" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-         <StackPanel Grid.Column="2"
-                     Orientation="Horizontal">
-
-            <TreeView x:Name="PART_HierarchicalGroupByControlTreeView"
-                      ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                      Background="Transparent"
-                      BorderBrush="Transparent"
-                      Focusable="False">
-
-               <TreeViewItem Header="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext)}"
-                             HeaderTemplate="{StaticResource dataGridContextTemplate}"
-                             ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DetailConfigurations}"
-                             ItemTemplate="{StaticResource detailConfigurationTemplate}"
-                             ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                             IsExpanded="True" />
-            </TreeView>
-
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed"
-                              Margin="5,0,0,0" />
-
-         </StackPanel>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=HasGroups}"
-                      Value="True">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-            <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7HierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-      <Grid>
-         <Border x:Name="mouseOverEffect"
-                 Opacity="0"
-                 CornerRadius="5"
-                 Background="{StaticResource groupByItemMouseOverBackgroundBrush}" />
-
-         <Border x:Name="mainBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}"
-                 CornerRadius="5">
-
-            <!-- 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}"
-                                 Margin="0,4" />
-
-               <!-- 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="Black" />
-
-            </StackPanel>
-         </Border>
-
-         <Border x:Name="blackBorder"
-                 BorderThickness="1"
-                 BorderBrush="{StaticResource basicBlackBorderBrush}"
-                 CornerRadius="5">
-            <Border x:Name="whiteBorder"
-                    BorderThickness="1"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    CornerRadius="4" />
-         </Border>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-            <Setter TargetName="mouseOverEffect"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="true">
-            <Setter TargetName="mainBorder"
-                    Property="Background"
-                    Value="{StaticResource groupByItemPressedBackgroundBrush}" />
-         </Trigger>
-
-         <!-- 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: Row 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7RowTemplate"
-                    TargetType="local:Row">
-
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- MasterDetail ToggleButton -->
-            <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="2"
-                 Grid.ColumnSpan="2"
-                 views:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2,4,2,0"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
-              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.503,0.35"
-                                       GradientOrigin="1.009,0.295"
-                                       RadiusX="0.636"
-                                       RadiusY="2.375">
-                     <GradientStop Color="#FF04A2F7" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="1" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="0.5" />
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </MultiDataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: DataRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7DataRowTemplate"
-                    TargetType="local:DataRow">
-
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- MasterDetail ToggleButton -->
-            <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="2"
-                 Grid.ColumnSpan="2"
-                 views:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <!-- ToggleButton that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Grid.Column="2"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Margin="2,4,2,0"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
-              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.503,0.35"
-                                       GradientOrigin="1.009,0.295"
-                                       RadiusX="0.636"
-                                       RadiusY="2.375">
-                     <GradientStop Color="#FF04A2F7" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="1" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="0.5" />
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-         </MultiDataTrigger>
-
-         <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="True" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
-              the Row's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="False" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
-                          Value="False" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- 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" />
-               <Condition Value="True"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </MultiDataTrigger>
-
-         <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" />
-               <Condition Value="False"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7ColumnManagerRowTemplate"
-                    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. -->
-
-      <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}" />
-
-         <Border Grid.Column="1"
-                 Grid.ColumnSpan="3"
-                 BorderBrush="Black"
-                 BorderThickness="0,1"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <Border Grid.Column="1"
-                 Grid.ColumnSpan="3"
-                 BorderBrush="{StaticResource columnManagerRowWhiteBorderBrush}"
-                 BorderThickness="0,1"
-                 Margin="0,1"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <!-- 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}" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2,4,2,0"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <Decorator x:Name="indentationDecorator"
-                    Grid.Column="3">
-            <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: Cell 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewWindows7CellTemplate"
-                    TargetType="local:Cell">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}">
-
-            <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-         </Border>
-
-         <Border x:Name="selectionBorder"
-                 BorderBrush="{StaticResource dataGridControlBackgroundBrush}"
-                 BorderThickness="0" />
-
-         <Border x:Name="darkBorder"
-                 BorderBrush="{StaticResource currentCellBlackBorderBrush}"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border x:Name="lightBorder"
-                    BorderBrush="{StaticResource currentCellWhiteBorderBrush}"
-                    BorderThickness="1"
-                    Opacity="0">
-            </Border>
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g., background/foreground) of the Cell to reflect specific
-              states (e.g., IsCurrent), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitly set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).SelectionUnit}"
-                          Value="Cell" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="selectionBorder"
-                    Property="BorderThickness"
-                    Value="1,1,1,0" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.503,0.35"
-                                       GradientOrigin="1.009,0.295"
-                                       RadiusX="0.636"
-                                       RadiusY="2.375">
-                     <GradientStop Color="#FF04A2F7" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="1" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="0.5" />
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Current, we want to change its background/foreground to the appropriate brushes.
-              We do this only when the cell does not have a validation error because we must give priority
-              to the CellErrorStyle (if present).-->
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="False" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="True" />
-
-               <Condition Property="CellErrorStyle"
-                          Value="{x:Null}" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=IsCurrent}"
-                      Value="True">
-
-            <Setter TargetName="darkBorder"
-                    Property="Opacity"
-                    Value="1" />
-            <Setter TargetName="lightBorder"
-                    Property="Opacity"
-                    Value="1" />
-
-         </DataTrigger>
-
-         <!-- When the Cell is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="selectionBorder"
-                    Property="BorderThickness"
-                    Value="1,1,1,0" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="selectionBorder"
-                    Property="BorderThickness"
-                    Value="1,1,1,0" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsCurrent}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-         </MultiDataTrigger>
-
-      </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="tableViewWindows7GridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <markup:DataGridThemeResourceDictionary Source="Resources/Windows7.Controls.xaml" />
-      </Style.Resources>
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{StaticResource dataGridControlBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- This is required to display gridlines of uniform thickness -->
-      <Setter Property="SnapsToDevicePixels"
-              Value="True" />
-
-      <Setter Property="TextElement.FontFamily"
-              Value="Calibri" />
-
-      <Setter Property="CellErrorStyle"
-              Value="{StaticResource cellErrorStyle}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewWindows7RowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource rowSelectorBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource darkBorderBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableViewWindows7RowSelectorStyle"
-          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="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewWindows7RowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row
-    ************************** -->
-   <Style x:Key="tableViewWindows7RowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="Black" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewWindows7RowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-         <!-- 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="tableViewWindows7DataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewWindows7RowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewWindows7DataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableViewWindows7ColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewWindows7RowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-
-      <Setter Property="Background"
-              Value="{StaticResource columnManagerRowBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource gridControlForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource columnManagerRowBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,0,1" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewWindows7ColumnManagerRowTemplate}" />
-
-      <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="tableViewWindows7CellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{StaticResource currentCellBackgroundBrush}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="Black" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <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 tableViewWindows7CellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewWindows7DataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewWindows7CellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableViewWindows7ColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="White" />
-
-      <!-- In TableView, 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="4,3,0,7" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewWindows7ColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableViewWindows7GroupByControlStyle"
-          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 TableView, a height of at least 25 is appropriate for the GroupByControl. -->
-      <Setter Property="MinHeight"
-              Value="25" />
-
-      <Setter Property="ConnectionLinePen"
-              Value="{StaticResource groupByConnectionLinePen}" />
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="Black" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewWindows7GroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewWindows7GroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByItemBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="Black" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewWindows7GroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableViewWindows7GroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="Black" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,0,0" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource borderBrush}" />
-
-      <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 tableViewWindows7GroupHeaderControlTemplate}" />
-
-      <Style.Triggers>
-
-         <Trigger Property="local:GroupLevelIndicatorPane.GroupLevel"
-                  Value="0">
-
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}" />
-
-         </Trigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewWindows7GroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <!--<Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource gridControlForegroundBrush}" />-->
-
-      <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewWindows7DetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewWindows7GroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewWindows7HierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewWindows7HierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="4" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewWindows7HierarchicalGroupByControlStyle"
-          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 TableView, 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="#15428B" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="ConnectionLinePen"
-              Value="{StaticResource groupByConnectionLinePen}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewWindows7HierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewWindows7HierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByItemBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="#154A93" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource borderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableViewWindows7ScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1"
-                                 StartPoint="0.5,0">
-               <GradientStop Color="#FF56D0F9"
-                             Offset="0" />
-               <GradientStop Offset="0.53" />
-               <GradientStop Color="#FF56D0F9"
-                             Offset="0.987" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="Black" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewWindows7DefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource lightBackgroundBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="0" />
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource lightBackgroundBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:TableView, ThemeType=views:Windows7Theme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewWindows7DefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewWindows7GridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewWindows7RowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewWindows7RowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewWindows7RowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewWindows7DataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewWindows7ColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewWindows7CellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewWindows7DataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewWindows7ColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewWindows7GroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewWindows7GroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewWindows7GroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewWindows7GroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewWindows7DetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewWindows7GroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewWindows7HierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewWindows7ScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewWindows7HierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewWindows7HierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:Windows7Theme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewWindows7HierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml
deleted file mode 100644
index 3b7a38a1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml
+++ /dev/null
@@ -1,3231 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Windows7.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Windows7.Graphics.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-      <!-- Control Styles used in the Grid Control -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Windows7.Controls.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <conv:GreaterThanZeroConverter x:Key="greaterThanZeroConverter" />
-   <conv:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-   <conv:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-   <conv:ThicknessConverter x:Key="thicknessConverter" />
-   <conv:ThicknessConverter x:Key="inverseThicknessConverter"
-                            InverseValue="True" />
-   <conv:IntAdditionConverter x:Key="intAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="sortingDirectionToBooleanConverter" />
-
-   <Color x:Key="mainGradientColor">
-      #C4DDFF
-   </Color>
-
-   <SolidColorBrush x:Key="rowSelectionBackgroundBrush"
-                    Color="#FF3EBCF6" />
-
-   <!--This brush is used for the columnManagerCell separator line-->
-   <SolidColorBrush x:Key="darkBorderBrush"
-                    Color="#FF04A2F7" />
-
-   <!--This Brush is used for the grid lines color-->
-   <SolidColorBrush x:Key="lightBackgroundBrush"
-                    Color="#DDE0E3" />
-
-   <!--This color is used for the border around groupByItem-->
-   <SolidColorBrush x:Key="borderBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="columnManagerRowBorderBrush"
-                    Color="#6593CF" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <RadialGradientBrush x:Key="rowSelectorBrush"
-                        RadiusX="1"
-                        RadiusY="1"
-                        GradientOrigin="0,0"
-                        Center="0,0">
-      <GradientStop Color="#FFD1ECFF"
-                    Offset="1" />
-      <GradientStop Color="#FF47C6F8"
-                    Offset="0" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSelectorPressedBrush"
-                        StartPoint="1,0.5"
-                        EndPoint="0,0.5">
-      <GradientStop Color="#FF04A2F7" />
-      <GradientStop Offset="0.7" />
-      <GradientStop Offset="0.15"
-                    Color="#0004A2F7" />
-   </LinearGradientBrush>
-
-   <RadialGradientBrush x:Key="columnManagerCellRoundedEffectBrush"
-                        Center="0.51,0.78"
-                        GradientOrigin="0.51,1.17"
-                        RadiusX="0.66"
-                        RadiusY="0.66">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.14" />
-      <GradientStop Offset="0.69"
-                    Color="#331494DF" />
-      <GradientStop Color="#4CFFFFFF"
-                    Offset="0.28" />
-      <GradientStop Color="#001494DF"
-                    Offset="1" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerCellBlackLineBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#00000000"
-                    Offset="1" />
-      <GradientStop Color="#00000000" />
-      <GradientStop Color="Black"
-                    Offset="0.5" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush  x:Key="columnManagerCellWhiteLineBrush"
-                         EndPoint="0.99,0.95"
-                         StartPoint="1,0.11">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.5" />
-      <GradientStop Offset="1" />
-      <GradientStop />
-   </LinearGradientBrush>
-
-   <RadialGradientBrush x:Key="columnManagerCellResizerDecoratorBrush"
-                        RadiusX="0.997"
-                        RadiusY="0.964"
-                        GradientOrigin="-0.477,-0.055">
-      <GradientStop Offset="0.71" />
-      <GradientStop Color="White"
-                    Offset="1" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerRowBackgroundBrush"
-                        StartPoint="-0.01,1.33"
-                        EndPoint="0.57,-10.76">
-      <GradientStop Color="#FF18a6f7"
-                    Offset="0" />
-      <GradientStop Color="#FF47c0f6"
-                    Offset="0.087" />
-      <GradientStop Color="#FF31b6f7"
-                    Offset="0.174" />
-      <GradientStop Color="#FF47C0F6"
-                    Offset="0.268" />
-      <GradientStop Color="#FF23a5fa"
-                    Offset="0.378" />
-      <GradientStop Color="#FF1395f3"
-                    Offset="0.486" />
-      <GradientStop Color="#FF1694f9"
-                    Offset="0.595" />
-      <GradientStop Color="#FF2190f5"
-                    Offset="0.85" />
-      <GradientStop Color="#FF47C0F6"
-                    Offset="0.718" />
-      <GradientStop Color="#FF015EC8"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="columnManagerRowWhiteBorderBrush"
-                        EndPoint="1.33,1.31"
-                        StartPoint="-0.59,-0.56">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.46" />
-      <GradientStop Color="#33FFFFFF"
-                    Offset="1.00" />
-      <GradientStop Color="#33FFFFFF" />
-   </LinearGradientBrush>
-
-   <RadialGradientBrush x:Key="groupByControlBackgroundBrush"
-                        Center="0.503,0.35"
-                        GradientOrigin="1.1,0.504"
-                        RadiusX="0.523"
-                        RadiusY="2.375">
-      <GradientStop Color="#FF04A2F7"
-                    Offset="0.5" />
-      <GradientStop Color="#FF015EC8"
-                    Offset="0.25" />
-      <GradientStop Color="#FF86E9F9"
-                    Offset="0.682" />
-      <GradientStop Color="#FF013C98"
-                    Offset="0.003" />
-      <GradientStop Color="#FFC9F4FB"
-                    Offset="1" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByItemBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="White"
-                    Offset="0" />
-      <GradientStop Offset="0.50"
-                    Color="#7FFFFFFF" />
-      <GradientStop Color="White"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <RadialGradientBrush x:Key="groupByItemMouseOverBackgroundBrush"
-                        Center="0.507,0.779"
-                        GradientOrigin="0.51,1.174"
-                        RadiusX="0.664"
-                        RadiusY="0.664">
-      <GradientStop Color="White"
-                    Offset="0.175" />
-      <GradientStop Offset="0.776"
-                    Color="#591494DF" />
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.325" />
-      <GradientStop Color="#4CFFFFFF"
-                    Offset="1" />
-      <GradientStop Color="#3FFFFFFF"
-                    Offset="0.484" />
-   </RadialGradientBrush>
-
-   <LinearGradientBrush x:Key="groupByItemPressedBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="White"
-                    Offset="0" />
-      <GradientStop Offset="0.528"
-                    Color="#FF9ADAFF" />
-      <GradientStop Color="White"
-                    Offset="1" />
-      <GradientStop Color="#FFC1E8FF"
-                    Offset="0.244" />
-      <GradientStop Color="#FFC7EAFF"
-                    Offset="0.785" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="hierarchicalGroupByControlNodeBackgroundBrush"
-                        EndPoint="0.5,1"
-                        StartPoint="0.5,0">
-      <GradientStop Color="#7FFFFFFF"
-                    Offset="0" />
-      <GradientStop Offset="0.53"
-                    Color="#3FFFFFFF" />
-      <GradientStop Color="#7FFFFFFF"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="rowAlternatingBackgroundBrush"
-                    Color="#FFD1ECFF" />
-
-   <LinearGradientBrush x:Key="rowInactiveSelectionBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#FFD9D9D9"
-                    Offset="0" />
-      <GradientStop Color="#FF9A9A9A"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSplitterBackgroundBrush"
-                        EndPoint="1,0.5"
-                        StartPoint="0,0.5">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0" />
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="1" />
-      <GradientStop Offset="0.5" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="currentCellBackgroundBrush"
-                    Color="#7FFFFFFF" />
-
-   <LinearGradientBrush x:Key="currentCellWhiteBorderBrush"
-                        EndPoint="1.33,1.31"
-                        StartPoint="-0.59,-0.56">
-      <GradientStop Color="#BFFFFFFF"
-                    Offset="0.46" />
-      <GradientStop Color="#33FFFFFF"
-                    Offset="1" />
-      <GradientStop Color="#33FFFFFF" />
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="currentCellBlackBorderBrush"
-                        EndPoint="1.12,1.29"
-                        StartPoint="-0.1,-0.17">
-      <GradientStop Color="#26000000"
-                    Offset="0.48" />
-      <GradientStop Color="Black"
-                    Offset="1" />
-      <GradientStop Color="Black"
-                    Offset="0.01" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="dataGridControlBackgroundBrush"
-                    Color="#E5EFFF" />
-
-   <Pen x:Key="groupByConnectionLinePen"
-        Thickness="1"
-        Pen.Brush="{StaticResource borderBrush}" />
-
-   <Pen x:Key="dropMarkPen"
-        Thickness="6"
-        Brush="#FF9DDDF9" />
-
-   <LinearGradientBrush x:Key="columnChooserBackgroundBrush"
-                        EndPoint="0.979,0.046"
-                        StartPoint="-0.019,1.017">
-      <GradientStop Color="#FF1686D8"
-                    Offset="1" />
-      <GradientStop Color="#FF06397B"
-                    Offset="0.297" />
-   </LinearGradientBrush>
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7GroupNavigationControlTemplate"
-                    TargetType="{x:Type local:GroupNavigationControl}">
-
-      <Grid>
-
-         <Border x:Name="outlineBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 CornerRadius="4">
-            <Border x:Name="innerBorder"
-                    BorderThickness="0,0,1,1"
-                    CornerRadius="3">
-               <Border.BorderBrush>
-                  <RadialGradientBrush Center="1,3.5"
-                                       GradientOrigin="1,0.5"
-                                       RadiusX="2"
-                                       RadiusY="3">
-                     <GradientStop Color="Transparent"
-                                   Offset="1" />
-                     <GradientStop Color="#FF9A9A9A"
-                                   Offset="0" />
-                  </RadialGradientBrush>
-               </Border.BorderBrush>
-               <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">
-                     <Border.BorderBrush>
-                        <LinearGradientBrush EndPoint="0.5,1"
-                                             StartPoint="-2.419,-0.028">
-                           <GradientStop Offset="0.1" />
-                           <GradientStop Offset="0.9" />
-                           <GradientStop Color="White"
-                                         Offset="0.5" />
-                        </LinearGradientBrush>
-                     </Border.BorderBrush>
-                     <Border BorderThickness="0,0,1,0">
-                        <Border.BorderBrush>
-                           <LinearGradientBrush EndPoint="0.5,1"
-                                                StartPoint="-2.419,-0.028">
-                              <GradientStop Color="#00000000"
-                                            Offset="0.1" />
-                              <GradientStop Color="#00000000"
-                                            Offset="0.9" />
-                              <GradientStop Color="Black"
-                                            Offset="0.5" />
-                           </LinearGradientBrush>
-                        </Border.BorderBrush>
-                     </Border>
-                  </Border>
-
-                  <ToggleButton x:Name="PART_ToggleButton"
-                                Focusable="False"
-                                IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
-                                Grid.Column="2">
-                     <ToggleButton.Template>
-                        <ControlTemplate>
-                           <Border x:Name="toggleButtonBackground"
-                                   CornerRadius="0,2,2,0"
-                                   Background="Transparent">
-                              <Path x:Name="Arrow"
-                                    Fill="Black"
-                                    Margin="7,1,7,1"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    Data="M 0 0 L 4 4 L 0 8 Z" />
-                           </Border>
-
-                           <ControlTemplate.Triggers>
-                              <Trigger Property="ToggleButton.IsChecked"
-                                       Value="True">
-                                 <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>
-            </Border>
-         </Border>
-
-         <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 CornerRadius="5"
-                       BorderThickness="1"
-                       BorderBrush="{StaticResource basicBlackBorderBrush}"
-                       TextElement.Foreground="White"
-                       Background="{StaticResource columnChooserBackgroundBrush}">
-                  <Border BorderThickness="1"
-                          CornerRadius="5"
-                          BorderBrush="{StaticResource basicWhiteBorderBrush}">
-
-                     <ScrollViewer CanContentScroll="True"
-                                   HorizontalScrollBarVisibility="Disabled"
-                                   VerticalScrollBarVisibility="Auto"
-                                   Margin="4">
-                        <!--<ItemsPresenter />-->
-                        <VirtualizingStackPanel IsItemsHost="True"
-                                                Margin="0,0,4,0" />
-                     </ScrollViewer>
-                  </Border>
-               </Border>
-            </Grid>
-         </Popup>
-      </Grid>
-
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter TargetName="innerBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#BF1494DF"
-                                   Offset="1" />
-                     <GradientStop Offset="0.5" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="innerBorder"
-                    Property="BorderBrush">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                     <GradientStop Color="#FFC0C0C0"
-                                   Offset="1" />
-                     <GradientStop Color="#FFC0C0C0"
-                                   Offset="0.5" />
-                     <GradientStop Color="#00C0C0C0"
-                                   Offset="0.49" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-
-         <Trigger Property="IsDropDownOpen"
-                  Value="True">
-            <Setter TargetName="seperator"
-                    Property="Visibility"
-                    Value="Visible" />
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationButton
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
-                    TargetType="{x:Type local:GroupNavigationButton}">
-      <Grid>
-         <Border x:Name="mainBorder"
-                 Background="Transparent"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 CornerRadius="4">
-            <Border x:Name="innerBorder"
-                    BorderThickness="0,0,1,1"
-                    CornerRadius="3">
-               <Border.BorderBrush>
-                  <RadialGradientBrush Center="1,3.5"
-                                       GradientOrigin="1,0.5"
-                                       RadiusX="2"
-                                       RadiusY="3">
-                     <GradientStop Color="Transparent"
-                                   Offset="1" />
-                     <GradientStop Color="#FF9A9A9A"
-                                   Offset="0" />
-                  </RadialGradientBrush>
-               </Border.BorderBrush>
-
-               <ContentPresenter HorizontalAlignment="Center"
-                                 Margin="3"
-                                 VerticalAlignment="Center"
-                                 TextElement.Foreground="{TemplateBinding Foreground}" />
-            </Border>
-         </Border>
-      </Grid>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:IntAdditionConverter x:Key="IntAdditionConverter" />
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableflowViewWindows7ColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- We don't use the base Cell Template for the ColumnManagerCell because it need more elements
-           to function properly: a Thumb named "PART_ColumnResizerThumb" that is used to resize the
-           ColumnManagerCells's ParentColumn.Width and a glyph that represents the Column's SortDirection. -->
-      <Grid x:Name="Grid"
-            Background="Transparent">
-
-         <Grid x:Name="ColumnResizerDecorator">
-            <Path Stretch="Fill"
-                  HorizontalAlignment="Right"
-                  Height="28"
-                  Width="20"
-                  Fill="{StaticResource columnManagerCellResizerDecoratorBrush}"
-                  Data="M0,28 z L18,28 C19,27 19,27 20,26 L20,2 L18.5,14 C17,25 17,25 0,28 Z" />
-
-            <Grid Height="12"
-                  Width="3"
-                  HorizontalAlignment="Right"
-                  Margin="0,0,3,0">
-               <Grid.Resources>
-                  <DataTemplate x:Key="ResizerDot">
-                     <Grid>
-                        <Border Width="2"
-                                Height="2"
-                                BorderBrush="#55000000"
-                                BorderThickness="1"
-                                VerticalAlignment="Top"
-                                HorizontalAlignment="Left" />
-                        <Border Width="1"
-                                Height="1"
-                                BorderBrush="#55FFFFFF"
-                                BorderThickness="1"
-                                VerticalAlignment="Top"
-                                HorizontalAlignment="Left" />
-                     </Grid>
-                  </DataTemplate>
-               </Grid.Resources>
-
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="*" />
-                  <RowDefinition Height="*" />
-               </Grid.RowDefinitions>
-
-               <ContentPresenter ContentTemplate="{StaticResource ResizerDot}"
-                                 Grid.Row="0"
-                                 Margin="1,1,0,1" />
-               <ContentPresenter ContentTemplate="{StaticResource ResizerDot}"
-                                 Grid.Row="1"
-                                 Margin="1,1,0,1" />
-               <ContentPresenter ContentTemplate="{StaticResource ResizerDot}"
-                                 Grid.Row="2"
-                                 Margin="1,1,0,1" />
-            </Grid>
-         </Grid>
-
-         <Border x:Name="PressEffect"
-                 Opacity="0"
-                 CornerRadius="5"
-                 Background="{StaticResource columnManagerCellRoundedEffectBrush}" />
-
-         <Border x:Name="BlackLine"
-                 BorderThickness="1,0"
-                 Opacity="0"
-                 CornerRadius="5"
-                 BorderBrush="{StaticResource columnManagerCellBlackLineBrush}">
-            <Border x:Name="WhiteLine"
-                    BorderThickness="1,0"
-                    Opacity="0"
-                    CornerRadius="4"
-                    BorderBrush="{StaticResource columnManagerCellWhiteLineBrush}" />
-         </Border>
-
-         <Grid>
-            <Border x:Name="mainBorder"
-                    Background="Transparent"
-                    Padding="{TemplateBinding Padding}">
-
-               <DockPanel Margin="0,0,4,0">
-
-                  <Grid x:Name="toggleGrid"
-                        DockPanel.Dock="Right"
-                        Visibility="Collapsed"
-                        Margin="0,5,4,0">
-
-                     <ToggleButton x:Name="toggleButton"
-                                   Focusable="False"
-                                   VerticalAlignment="Stretch"
-                                   Margin="2,0,0,0"
-                                   Opacity="0.5" />
-                  </Grid>
-
-                  <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="6" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-
-                     <!-- 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. -->
-                     <StackPanel Orientation="Horizontal"
-                                 Grid.Row="0"
-                                 VerticalAlignment="Center"
-                                 HorizontalAlignment="Center">
-                        <ContentPresenter x:Name="sortGlyphPresenter"
-                                          Content="{x:Null}"
-                                          ContentTemplate="{x:Null}"
-                                          TextElement.Foreground="#FFFFFFFF" />
-                     </StackPanel>
-
-                     <!-- Same ContentPresenter as in the base Cell Template. -->
-                     <local:CellContentPresenter VerticalAlignment="Center"
-                                                 HorizontalAlignment="Center"
-                                                 Grid.Row="1" />
-
-                  </Grid>
-               </DockPanel>
-            </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>
-      </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=ParentColumn.SortDirection}"
-                      Value="Ascending">
-
-            <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
-
-         </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}" />
-
-         </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>
-
-         <!-- Trigger to set the background and pressed effect depending on state -->
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-            <Trigger.EnterActions>
-               <BeginStoryboard>
-                  <Storyboard>
-                     <DoubleAnimation BeginTime="00:00:00"
-                                      Duration="00:00:00.2"
-                                      Storyboard.TargetName="PressEffect"
-                                      Storyboard.TargetProperty="Opacity"
-                                      To="1" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </Trigger.EnterActions>
-            <Trigger.ExitActions>
-               <BeginStoryboard>
-                  <Storyboard>
-                     <DoubleAnimation BeginTime="00:00:00"
-                                      Duration="00:00:00.5"
-                                      Storyboard.TargetName="PressEffect"
-                                      Storyboard.TargetProperty="Opacity"
-                                      To="0" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </Trigger.ExitActions>
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="true">
-            <Trigger.EnterActions>
-               <BeginStoryboard>
-                  <Storyboard>
-                     <DoubleAnimation BeginTime="00:00:00"
-                                      Duration="00:00:00.02"
-                                      Storyboard.TargetName="PressEffect"
-                                      Storyboard.TargetProperty="Background.(RadialGradientBrush.RadiusY)"
-                                      To="1.44" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </Trigger.EnterActions>
-            <Trigger.ExitActions>
-               <BeginStoryboard>
-                  <Storyboard>
-                     <DoubleAnimation BeginTime="00:00:00"
-                                      Duration="00:00:00.7"
-                                      Storyboard.TargetName="PressEffect"
-                                      Storyboard.TargetProperty="Background.(RadialGradientBrush.RadiusY)"
-                                      To="0.66" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </Trigger.ExitActions>
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: RowSelector
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7RowSelectorTemplate"
-                    TargetType="local:RowSelector">
-
-      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-      <Grid>
-
-         <Border x:Name="mainBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}"
-                 CornerRadius="3"
-                 Margin="0,0,0,1">
-
-            <ContentPresenter x:Name="contentPresenter"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-         </Border>
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-         <Border x:Name="separatorLine"
-                 Height="1"
-                 Background="{StaticResource darkBorderBrush}"
-                 VerticalAlignment="Bottom"
-                 Margin="4,0,4,0" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-            <Setter TargetName="mainBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush EndPoint="-0.413,0.593"
-                                       StartPoint="0.996,0.588">
-                     <GradientStop Color="White"
-                                   Offset="0" />
-                     <GradientStop Offset="0.15" />
-                     <GradientStop Offset="0.7" />
-                     <GradientStop Color="White" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-
-            <Setter TargetName="mainBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource darkBorderBrush}" />
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="mainBorder"
-                    Property="Background"
-                    Value="{StaticResource rowSelectorPressedBrush}" />
-
-            <Setter TargetName="mainBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource darkBorderBrush}" />
-
-         </Trigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: Row 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7RowTemplate"
-                    TargetType="local:Row">
-
-      <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="2"
-                 Grid.ColumnSpan="2"
-                 views:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2,4,2,0"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
-              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.503,0.35"
-                                       GradientOrigin="1.009,0.295"
-                                       RadiusX="0.636"
-                                       RadiusY="2.375">
-                     <GradientStop Color="#FF04A2F7" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="1" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="0.5" />
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </MultiDataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: DataRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7DataRowTemplate"
-                    TargetType="local:DataRow">
-
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- MasterDetail ToggleButton -->
-            <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="2"
-                 Grid.ColumnSpan="2"
-                 views:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                    views:TableView.CanScrollHorizontally="False" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <!-- ToggleButton that is used to expand/collapse the group. -->
-         <Button x:Name="detailsToggle"
-                 Grid.Column="2"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Margin="2,4,2,0"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <views:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               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}" />
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
-              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.503,0.35"
-                                       GradientOrigin="1.009,0.295"
-                                       RadiusX="0.636"
-                                       RadiusY="2.375">
-                     <GradientStop Color="#FF04A2F7" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="1" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="0.5" />
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </MultiDataTrigger>
-
-         <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="True" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
-              the Row's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="False" />
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
-                          Value="False" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-            <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- 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" />
-               <Condition Value="True"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </MultiDataTrigger>
-
-         <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" />
-               <Condition Value="False"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type local:DataRow}}" />
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </MultiDataTrigger>
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7GroupByControlTemplate"
-                    TargetType="local:GroupByControl">
-      <Grid x:Name="mainGrid"
-            Margin="0">
-
-         <Border Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}" />
-
-         <!-- Curly leaves pattern and bubbles -->
-         <Border VerticalAlignment="Stretch"
-                 HorizontalAlignment="Stretch">
-            <Border.Background>
-               <VisualBrush AlignmentX="Left"
-                            Stretch="Uniform">
-                  <VisualBrush.Visual>
-                     <ContentPresenter ContentTemplate="{StaticResource CurvyLeavesPattern}"
-                                       VerticalAlignment="Stretch"
-                                       HorizontalAlignment="Stretch" />
-                  </VisualBrush.Visual>
-               </VisualBrush>
-            </Border.Background>
-         </Border>
-
-         <Grid>
-            <ContentControl x:Name="bubble1"
-                            VerticalAlignment="Top"
-                            HorizontalAlignment="Left"
-                            Height="40"
-                            Width="40"
-                            Focusable="False"
-                            SnapsToDevicePixels="False"
-                            RenderTransformOrigin="0.5,0.5"
-                            Template="{StaticResource groupByControlBubbleTemplate}">
-               <ContentControl.RenderTransform>
-                  <TranslateTransform X="-40" />
-               </ContentControl.RenderTransform>
-            </ContentControl>
-            <ContentControl x:Name="bubble2"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            Width="25"
-                            Height="25"
-                            Focusable="False"
-                            SnapsToDevicePixels="False"
-                            RenderTransformOrigin="0.5,0.5"
-                            Template="{StaticResource groupByControlBubbleTemplate}">
-               <ContentControl.RenderTransform>
-                  <TranslateTransform X="-25" />
-               </ContentControl.RenderTransform>
-            </ContentControl>
-            <ContentControl x:Name="bubble3"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            Width="15"
-                            Height="15"
-                            Focusable="False"
-                            SnapsToDevicePixels="False"
-                            RenderTransformOrigin="0.5,0.5"
-                            Template="{StaticResource groupByControlBubbleTemplate}">
-               <ContentControl.RenderTransform>
-                  <TranslateTransform X="-15" />
-               </ContentControl.RenderTransform>
-            </ContentControl>
-         </Grid>
-
-         <!-- This Grid is used to position the ItemsPresenter over the ContentPresenter in charge
-              of displaying the NoGroupContent. -->
-         <Grid Margin="{TemplateBinding Padding}">
-
-            <!-- This ContentPresenter displays the value of the NoGroupContent property
-                 of the GroupByControl. This content must only be displayed when there are
-                 no groups present, so we set its Visibility to Collapsed by default and
-                 it is made visible via a trigger. -->
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed"
-                              IsHitTestVisible="False" />
-
-            <!-- The GroupByControl is an ItemsControl, so it must have an ItemsPresenter in its
-                 Template in order to layout and show its child items. The default ItemsPanel
-                 of the GroupByControl is a "StaircasePanel", which layout its items in a
-                 staircase-like pattern and draws connecting lines between the items. -->
-            <ItemsPresenter />
-
-         </Grid>
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When there are no groups, make the NoGroupContent visible. -->
-         <Trigger Property="HasItems"
-                  Value="False">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-         </Trigger>
-
-         <!-- Bubbles Animation -->
-         <EventTrigger SourceName="mainGrid"
-                       RoutedEvent="Grid.Loaded">
-            <EventTrigger.Actions>
-               <BeginStoryboard>
-                  <Storyboard Duration="00:10:00"
-                              RepeatBehavior="Forever"
-                              Timeline.DesiredFrameRate="20">
-                     <DoubleAnimationUsingPath BeginTime="00:00:00"
-                                               Duration="00:05:00"
-                                               Storyboard.TargetName="bubble1"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                               Source="X">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-31,11 C-31,11 82.462368,65.802014 130.5,49.5 178.53763,33.197986 204.06968,7.4634866 267.5,6.5 334.55253,5.4814933 418.45061,50.4996 481.5,50.5 537.08628,50.500353 649.57165,18.872376 721.5,14.5 855.60506,6.3480301 970.42944,34.5 1060.5,34.5 1120.0867,34.5 1256.5,-19.5 1256.5,-19.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimationUsingPath BeginTime="00:00:00"
-                                               Duration="00:05:00"
-                                               Storyboard.TargetName="bubble1"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                               Source="Y">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-31,11 C-31,11 82.462368,65.802014 130.5,49.5 178.53763,33.197986 204.06968,7.4634866 267.5,6.5 334.55253,5.4814933 418.45061,50.4996 481.5,50.5 537.08628,50.500353 649.57165,18.872376 721.5,14.5 855.60506,6.3480301 970.42944,34.5 1060.5,34.5 1120.0867,34.5 1256.5,-19.5 1256.5,-19.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimation BeginTime="00:04:00"
-                                      Duration="00:01:00"
-                                      Storyboard.TargetName="bubble1"
-                                      Storyboard.TargetProperty="(UIElement.Opacity)"
-                                      From="1"
-                                      To="0" />
-                     <DoubleAnimationUsingPath BeginTime="00:01:00"
-                                               Duration="00:04:00"
-                                               Storyboard.TargetName="bubble2"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                               Source="X">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-14.5,51.5 C-14.5,51.5 166.5,8.5 218.5,42.5 270.5,76.5 323.29493,96.682289 372.29493,84.682289 421.29493,72.682289 496.29493,22.682289 537.29493,27.682289 578.29493,32.682289 641.5,55.5 677.5,58.5 713.5,61.5 757.5,36.5 789.5,27.5 821.5,18.5 882.5,44.5 928.5,56.5 974.5,68.5 1042.5,49.5 1074.5,33.5 1106.5,17.5 1161.5,25.5&#xd;&#xa;1185.5,43.5 1209.5,61.5 1271.5,45.5 1271.5,45.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimationUsingPath BeginTime="00:01:00"
-                                               Duration="00:04:00"
-                                               Storyboard.TargetName="bubble2"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                               Source="Y">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-14.5,51.5 C-14.5,51.5 166.5,8.5 218.5,42.5 270.5,76.5 323.29493,96.682289 372.29493,84.682289 421.29493,72.682289 496.29493,22.682289 537.29493,27.682289 578.29493,32.682289 641.5,55.5 677.5,58.5 713.5,61.5 757.5,36.5 789.5,27.5 821.5,18.5 882.5,44.5 928.5,56.5 974.5,68.5 1042.5,49.5 1074.5,33.5 1106.5,17.5 1161.5,25.5&#xd;&#xa;1185.5,43.5 1209.5,61.5 1271.5,45.5 1271.5,45.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimation BeginTime="00:04:00"
-                                      Duration="00:01:00"
-                                      Storyboard.TargetName="bubble2"
-                                      Storyboard.TargetProperty="(UIElement.Opacity)"
-                                      From="1"
-                                      To="0" />
-                     <DoubleAnimationUsingPath BeginTime="00:00:24"
-                                               Duration="00:04:12"
-                                               Storyboard.TargetName="bubble3"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"
-                                               Source="X">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-14.5,36.5 C-14.5,36.5 69.5,-4.4998449 121.5,29.500155 173.5,63.500155 250.5,72.500155 299.5,60.500155 348.5,48.500155 418.5,7.5001551 459.5,12.500155 500.5,17.500155 549.32936,71.672597 585.32936,74.672597 621.32936,77.672597 696.5,38.5 728.5,29.5 760.5,20.5 876.5,42.5 922.5,54.5 968.5,66.5 1031.5,35.5 1063.5,19.5 1095.5,3.5 1142.5,41.5&#xd;&#xa;1175.5,42.5 1205.4862,43.408674 1283.5,15.5 1283.5,15.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimationUsingPath BeginTime="00:00:24"
-                                               Duration="00:04:12"
-                                               Storyboard.TargetName="bubble3"
-                                               Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"
-                                               Source="Y">
-                        <DoubleAnimationUsingPath.PathGeometry>
-                           <PathGeometry Figures="M-14.5,36.5 C-14.5,36.5 69.5,-4.4998449 121.5,29.500155 173.5,63.500155 250.5,72.500155 299.5,60.500155 348.5,48.500155 418.5,7.5001551 459.5,12.500155 500.5,17.500155 549.32936,71.672597 585.32936,74.672597 621.32936,77.672597 696.5,38.5 728.5,29.5 760.5,20.5 876.5,42.5 922.5,54.5 968.5,66.5 1031.5,35.5 1063.5,19.5 1095.5,3.5 1142.5,41.5&#xd;&#xa;1175.5,42.5 1205.4862,43.408674 1283.5,15.5 1283.5,15.5" />
-                        </DoubleAnimationUsingPath.PathGeometry>
-                     </DoubleAnimationUsingPath>
-                     <DoubleAnimation BeginTime="00:03:36"
-                                      Duration="00:01:00"
-                                      Storyboard.TargetName="bubble3"
-                                      Storyboard.TargetProperty="(UIElement.Opacity)"
-                                      From="1"
-                                      To="0" />
-                  </Storyboard>
-               </BeginStoryboard>
-            </EventTrigger.Actions>
-         </EventTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7GroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="mouseOverEffect"
-                 Opacity="0"
-                 CornerRadius="5"
-                 Background="{StaticResource groupByItemMouseOverBackgroundBrush}" />
-
-         <Border x:Name="mainBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}"
-                 CornerRadius="5">
-
-            <!-- 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}"
-                                 Margin="0,4" />
-
-               <!-- 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="Black" />
-
-            </StackPanel>
-         </Border>
-
-         <Border x:Name="blackBorder"
-                 BorderThickness="1"
-                 BorderBrush="{StaticResource basicBlackBorderBrush}"
-                 CornerRadius="5">
-            <Border x:Name="whiteBorder"
-                    BorderThickness="1"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    CornerRadius="4" />
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-            <Setter TargetName="mouseOverEffect"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="true">
-            <Setter TargetName="mainBorder"
-                    Property="Background"
-                    Value="{StaticResource groupByItemPressedBackgroundBrush}" />
-         </Trigger>
-
-         <!-- 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
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7GroupHeaderControlTemplate"
-                    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 intAdditionConverter}, 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 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                             HorizontalAlignment="Stretch"
-                             Height="1"
-                             Margin="0,0,0,0">
-                     <Rectangle.Fill>
-                        <LinearGradientBrush EndPoint="1.003,1.074"
-                                             StartPoint="0.003,0.109">
-                           <GradientStop Color="#FF9A9A9A"
-                                         Offset="0" />
-                           <GradientStop Color="Transparent"
-                                         Offset="1" />
-                        </LinearGradientBrush>
-                     </Rectangle.Fill>
-                  </Rectangle>
-               </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="tableflowViewWindows7GroupHeaderTopLevelStickyControlTemplate"
-                    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 intAdditionConverter}, ConverterParameter=-1}" />
-
-            <Grid>
-               <Border BorderThickness="0,0,0,1"
-                       BorderBrush="#44000000">
-                  <Border.Background>
-                     <LinearGradientBrush EndPoint="0.477,0.939"
-                                          StartPoint="0.477,0.111">
-                        <GradientStop Color="#FF9ED7FE" />
-                        <GradientStop Color="#FFD1ECFF"
-                                      Offset="1" />
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-
-               <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
-               <Border x:Name="mainBorder"
-                       Background="{TemplateBinding Background}"
-                       BorderBrush="{StaticResource borderBrush}"
-                       BorderThickness="0,0,0,0"
-                       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>
-
-                  <!-- This StackPanel is used to layout the ToggleButton and the GroupHeaderControl. -->
-                  <StackPanel Orientation="Horizontal">
-
-                     <!-- ToggleButton that is used to expand/collapse the group. -->
-                     <ToggleButton DockPanel.Dock="Left"
-                                   Template="{StaticResource groupExpanderToggleButtonTemplate}"
-                                   OverridesDefaultStyle="True"
-                                   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}" />
-                  </StackPanel>
-               </Border>
-
-               <Border x:Name="topGridLine"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-            </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: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7HierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Grid>
-
-            <Border Background="{StaticResource hierarchicalGroupByControlNodeBackgroundBrush}"
-                    CornerRadius="5" />
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="4,3,4,3"
-                       Foreground="#154A93"
-                       VerticalAlignment="Center" />
-
-            <Border x:Name="blackBorder"
-                    BorderThickness="1"
-                    BorderBrush="Black"
-                    CornerRadius="5">
-               <Border x:Name="whiteBorder"
-                       BorderThickness="1"
-                       BorderBrush="White"
-                       CornerRadius="4" />
-            </Border>
-
-         </Grid>
-         <ItemsPresenter Margin="0,0,0,0" />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7HierarchicalGroupByControlTemplate"
-                    TargetType="local:HierarchicalGroupByControl">
-      <ControlTemplate.Resources>
-         <!--this style is set to avoid having implicit treeview style
-             overide the HierarchicalGroupByControl's TreeView-->
-         <Style TargetType="TreeView" />
-      </ControlTemplate.Resources>
-
-      <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-      <Grid x:Name="rootGrid">
-         <Grid.ColumnDefinitions>
-            <!-- HierarchicalGroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-            <!-- GroupLevelIndicatorPane -->
-            <ColumnDefinition Width="Auto" />
-
-            <!-- HierarchicalGroupByControl -->
-            <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="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-         <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-         <Border VerticalAlignment="Stretch"
-                 HorizontalAlignment="Stretch"
-                 Grid.ColumnSpan="3">
-            <Border.Background>
-               <VisualBrush AlignmentX="Left"
-                            Stretch="Uniform">
-                  <VisualBrush.Visual>
-                     <ContentPresenter ContentTemplate="{StaticResource CurvyLeavesPattern}"
-                                       VerticalAlignment="Stretch"
-                                       HorizontalAlignment="Stretch" />
-                  </VisualBrush.Visual>
-               </VisualBrush>
-            </Border.Background>
-         </Border>
-
-         <local:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-         <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-         <StackPanel Grid.Column="2"
-                     Orientation="Horizontal">
-
-            <TreeView x:Name="PART_HierarchicalGroupByControlTreeView"
-                      ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                      Background="Transparent"
-                      BorderBrush="Transparent"
-                      Focusable="False">
-
-               <TreeViewItem Header="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext)}"
-                             HeaderTemplate="{StaticResource dataGridContextTemplate}"
-                             ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DetailConfigurations}"
-                             ItemTemplate="{StaticResource detailConfigurationTemplate}"
-                             ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                             IsExpanded="True" />
-            </TreeView>
-
-            <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed"
-                              Margin="5,0,0,0" />
-
-         </StackPanel>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=HasGroups}"
-                      Value="True">
-
-            <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-            <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-            <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-      <Grid>
-         <Border x:Name="mouseOverEffect"
-                 Opacity="0"
-                 CornerRadius="5"
-                 Background="{StaticResource groupByItemMouseOverBackgroundBrush}" />
-
-         <Border x:Name="mainBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}"
-                 CornerRadius="5">
-
-            <!-- 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}"
-                                 Margin="0,4" />
-
-               <!-- 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="Black" />
-
-            </StackPanel>
-         </Border>
-
-         <Border x:Name="blackBorder"
-                 BorderThickness="1"
-                 BorderBrush="{StaticResource basicBlackBorderBrush}"
-                 CornerRadius="5">
-            <Border x:Name="whiteBorder"
-                    BorderThickness="1"
-                    BorderBrush="{StaticResource basicWhiteBorderBrush}"
-                    CornerRadius="4" />
-         </Border>
-
-      </Grid>
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="true">
-            <Setter TargetName="mouseOverEffect"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="true">
-            <Setter TargetName="mainBorder"
-                    Property="Background"
-                    Value="{StaticResource groupByItemPressedBackgroundBrush}" />
-         </Trigger>
-
-         <!-- 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: ColumnManagerRow 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7ColumnManagerRowTemplate"
-                    TargetType="local:ColumnManagerRow">
-
-      <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}" />
-
-         <Border Grid.Column="1"
-                 Grid.ColumnSpan="3"
-                 BorderBrush="Black"
-                 BorderThickness="0,1"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <Border Grid.Column="1"
-                 Grid.ColumnSpan="3"
-                 BorderBrush="{StaticResource columnManagerRowWhiteBorderBrush}"
-                 BorderThickness="0,1"
-                 Margin="0,1"
-                 views:TableView.CanScrollHorizontally="False" />
-
-         <!-- 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" />
-         <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        views:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />
-
-         <!-- Space reserved for alignment with data rows. -->
-         <ContentPresenter x:Name="detailsToggle"
-                           Grid.Column="2"
-                           Content="{x:Null}"
-                           ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ExpandGroupGlyph}"
-                           VerticalAlignment="Top"
-                           Margin="2,4,2,0"
-                           OverridesDefaultStyle="True"
-                           Focusable="False"
-                           Visibility="Collapsed"
-                           views:TableView.CanScrollHorizontally="False" />
-
-         <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-         <Decorator x:Name="indentationDecorator"
-                    Grid.Column="3">
-            <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: Cell 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewWindows7CellTemplate"
-                    TargetType="local:Cell">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}">
-            <Grid>
-
-               <local:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               <!-- This Presenter is used to show the glyph watermark for Insertion and Filter rows -->
-               <ContentPresenter x:Name="glyphPresenter"
-                                 Opacity="0.2"
-                                 Grid.Column="3"
-                                 Margin="3,9"
-                                 VerticalAlignment="Top"
-                                 HorizontalAlignment="Left"
-                                 Content="{x:Null}" />
-            </Grid>
-         </Border>
-
-         <Border x:Name="selectionBorder"
-                 BorderBrush="{StaticResource dataGridControlBackgroundBrush}"
-                 BorderThickness="0" />
-
-         <Border x:Name="darkBorder"
-                 BorderBrush="{StaticResource currentCellBlackBorderBrush}"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border x:Name="lightBorder"
-                    BorderBrush="{StaticResource currentCellWhiteBorderBrush}"
-                    BorderThickness="1"
-                    Opacity="0">
-            </Border>
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <!-- When changing the appearance (e.g., background/foreground) of the Cell to reflect specific
-              states (e.g., IsCurrent), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitly set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).SelectionUnit}"
-                          Value="Cell" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="selectionBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <RadialGradientBrush Center="0.503,0.35"
-                                       GradientOrigin="1.009,0.295"
-                                       RadiusX="0.636"
-                                       RadiusY="2.375">
-                     <GradientStop Color="#FF04A2F7" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="1" />
-                     <GradientStop Color="#FF86E9F9"
-                                   Offset="0.5" />
-                  </RadialGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Current, we want to change its background/foreground to the appropriate brushes.
-              We do this only when the cell does not have a validation error because we must give priority
-              to the CellErrorStyle (if present).-->
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="False" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="True" />
-
-               <Condition Property="CellErrorStyle"
-                          Value="{x:Null}" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self},Path=IsCurrent}"
-                      Value="True">
-
-            <Setter TargetName="darkBorder"
-                    Property="Opacity"
-                    Value="1" />
-            <Setter TargetName="lightBorder"
-                    Property="Opacity"
-                    Value="1" />
-
-         </DataTrigger>
-
-         <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsCurrent}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected, we want to change its background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="selectionBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-         </MultiDataTrigger>
-
-         <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background/foreground to the appropriate brushes. -->
-         <MultiDataTrigger>
-            <MultiDataTrigger.Conditions>
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-               <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).(local:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-            </MultiDataTrigger.Conditions>
-
-            <Setter TargetName="selectionBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-         </MultiDataTrigger>
-
-      </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="tableflowViewWindows7GridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <!-- Include ControlTemplates of common controls -->
-      <Style.Resources>
-         <markup:DataGridThemeResourceDictionary Source="Resources/Windows7.Controls.xaml" />
-      </Style.Resources>
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{StaticResource dataGridControlBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- This is required to display gridlines of uniform thickness -->
-      <Setter Property="SnapsToDevicePixels"
-              Value="True" />
-
-      <Setter Property="TextElement.FontFamily"
-              Value="Calibri" />
-
-      <Setter Property="CellErrorStyle"
-              Value="{StaticResource cellErrorStyle}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7RowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource rowSelectorBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource darkBorderBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableflowViewWindows7RowSelectorStyle"
-          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="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7RowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7RowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="Black" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7RowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-         </DataTrigger>
-
-         <!-- 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="tableflowViewWindows7DataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewWindows7RowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7DataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7ColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewWindows7RowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-
-      <Setter Property="Background"
-              Value="{StaticResource columnManagerRowBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource gridControlForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource columnManagerRowBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,0,1" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7ColumnManagerRowTemplate}" />
-
-      <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="tableflowViewWindows7CellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{StaticResource currentCellBackgroundBrush}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="Black" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <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 tableflowViewWindows7CellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7DataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewWindows7CellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7ColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="White" />
-
-      <!-- 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="4,3,0,7" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7ColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7GroupByControlStyle"
-          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="ConnectionLinePen"
-              Value="{StaticResource groupByConnectionLinePen}" />
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="Black" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7GroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7GroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByItemBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="Black" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7GroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7GroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-      <Setter Property="SelectionForeground"
-              Value="Black" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,0,0" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource borderBrush}" />
-
-      <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 tableflowViewWindows7GroupHeaderControlTemplate}" />
-
-      <Style.Triggers>
-         <Trigger Property="local:GroupLevelIndicatorPane.GroupLevel"
-                  Value="0">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}" />
-         </Trigger>
-
-         <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 tableflowViewWindows7GroupHeaderTopLevelStickyControlTemplate}" />
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7GroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <!--<Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource gridControlForegroundBrush}" />-->
-
-      <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="tableflowViewWindows7DetailIndicatorStyle"
-          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="tableflowViewWindows7GroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableflowViewWindows7HierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewWindows7HierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Margin"
-              Value="4" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7HierarchicalGroupByControlNodeTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7HierarchicalGroupByControlStyle"
-          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="#15428B" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="ConnectionLinePen"
-              Value="{StaticResource groupByConnectionLinePen}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7HierarchicalGroupByControlTemplate}" />
-
-      <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="tableflowViewWindows7HierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByItemBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="#154A93" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7GroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Background"
-              Value="Transparent" />
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-      <Setter Property="BorderThickness"
-              Value="0" />
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewWindows7GroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7GroupNavigationControlItemStyle"
-          TargetType="{x:Type local:GroupNavigationControlItem}">
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:GroupNavigationControlItem}">
-               <Grid SnapsToDevicePixels="true">
-                  <Border x:Name="Border"
-                          Background="{TemplateBinding Background}" />
-                  <Border Margin="2">
-                     <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                  </Border>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver"
-                           Value="true">
-                     <Setter Property="Background"
-                             Value="#FF86E9F9" />
-                     <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="tableflowViewWindows7GroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-      <Setter Property="BorderThickness"
-              Value="0" />
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableflowViewWindows7ScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,1"
-                                 StartPoint="0.5,0">
-               <GradientStop Color="#FF56D0F9"
-                             Offset="0" />
-               <GradientStop Offset="0.53" />
-               <GradientStop Color="#FF56D0F9"
-                             Offset="0.987" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush"
-              Value="Transparent" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="Black" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewWindows7DefaultValues"
-          TargetType="views:TableflowView">
-
-      <Setter Property="ContainerHeight"
-              Value="30" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource lightBackgroundBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="0" />
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource lightBackgroundBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="0" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:Windows7Theme}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewWindows7DefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewWindows7GridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewWindows7RowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewWindows7RowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewWindows7RowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewWindows7DataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewWindows7ColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewWindows7CellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewWindows7DataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewWindows7ColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewWindows7GroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewWindows7GroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewWindows7GroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewWindows7GroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewWindows7DetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewWindows7GroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewWindows7HierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewWindows7ScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewWindows7HierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewWindows7HierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewWindows7HierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewWindows7GroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewWindows7GroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows7Theme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewWindows7GroupNavigationControlItemStyle}" />
-
-</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
deleted file mode 100644
index 78b5a5c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/TableView.Zune.Graphics.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Zune uses the same graphics as Luna, so reuse the same ResourceDictionary. -->
-      <markup:DataGridThemeResourceDictionary Source="../../Luna/Resources/TableView.Luna.Graphics.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>
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
deleted file mode 100644
index 5299c927..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.Resources.xaml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:cnv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <!-- =================================================================== -->
-   <!-- Utility Resources                                                   -->
-   <!-- =================================================================== -->
-
-   <Thickness x:Key="columnManagerCellPadding"
-              Left="2"
-              Top="2"
-              Right="4"
-              Bottom="5" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 180900dd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-      <markup:DataGridThemeResourceDictionary Source="/themes/Common/Common.Resources.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="#7F9DB9" />
-
-   <SolidColorBrush x:Key="errorBackgroundBrush"
-                    Color="Red" />
-
-   <SolidColorBrush x:Key="errorForegroundBrush"
-                    Color="White" />
-
-   <!-- Same as in TableflowView.Zune.normalcolor.xaml-->
-   <LinearGradientBrush x:Key="headerBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-      <GradientStop Color="#e2e2e2"
-                    Offset="0" />
-      <GradientStop Color="#e2e2e2"
-                    Offset="0.16" />
-      <GradientStop Color="#DBDBDB"
-                    Offset="0.16" />
-      <GradientStop Color="#DBDBDB"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
-   <!-- We do not use a DynamicResource since this instance of a Pen could be reused via multiple threads. See case: 113402. -->
-   <Pen x:Key="dropMarkPen"
-        Brush="{x:Static SystemColors.HighlightBrush}"
-        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}"/>
-
-         <Border BorderThickness="1,1,1,1"
-                 Margin="1,1,1,1"
-                 BorderBrush="#4CFFFFFF">
-
-            <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/Zune/TableView.Zune.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml
deleted file mode 100644
index 62fdd709..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml
+++ /dev/null
@@ -1,1876 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Zune.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Zune.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Zune.normalcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="#C2C2C2" />
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <LinearGradientBrush x:Key="headerBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Color="#e2e2e2"
-                    Offset="0" />
-
-      <GradientStop Color="#e2e2e2"
-                    Offset="0.16" />
-
-      <GradientStop Color="#DBDBDB"
-                    Offset="0.16" />
-
-      <GradientStop Color="#DBDBDB"
-                    Offset="1" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSelectorBackgroundBrush"
-                        StartPoint="0,0"
-                        EndPoint="1,0">
-
-      <GradientStop Color="#e2e2e2"
-                    Offset="0" />
-
-      <GradientStop Color="#e2e2e2"
-                    Offset="0.16" />
-
-      <GradientStop Color="#DBDBDB"
-                    Offset="0.16" />
-
-      <GradientStop Color="#DBDBDB"
-                    Offset="1" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="Transparent" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="#C2C2C2" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#E6E6E6" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DBDBDB" />
-
-   <SolidColorBrush x:Key="headerHighlightVerticalBorderBrush"
-                    Color="#DEDEDF" />
-
-   <SolidColorBrush x:Key="headerHighlightHorizontalBorderBrush"
-                    Color="#DEDEDF" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FAC746" />
-
-      <GradientStop Offset="1"
-                    Color="#F9B119" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FAC746" />
-
-      <GradientStop Offset="1"
-                    Color="#F9B119" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush2"
-                    Color="#F9B119" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush2"
-                    Color="#FAC746" />
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Color="#8F8F8F"
-                    Offset="0" />
-
-      <GradientStop Color="#B5B5B5"
-                    Offset="0.95" />
-
-      <GradientStop Color="#B6B6B6"
-                    Offset="1" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewRowSelectorTemplate"
-                    TargetType="local:RowSelector">
-
-      <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-      <Grid>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-         <Grid x:Name="rightBorder"
-               Width="3"
-               HorizontalAlignment="Right">
-
-            <Border x:Name="middleRightBorder"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-         </Grid>
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- middleRightBorder -->
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush2}" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush2}" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter TargetName="bottomBorder"
-                    Property="Fill"
-                    Value="{StaticResource headerDelimiterLightBorderBrush}" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <ToggleButton x:Name="toggleButton"
-                                      VerticalAlignment="Stretch"
-                                      Focusable="False"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0" />
-
-                     </Grid>
-
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <ColumnDefinition Width="Auto" />
-                              </Grid.ColumnDefinitions>
-
-                              <!-- Same ContentPresenter as in the base Cell Template. -->
-                              <local: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>
-
-               <!-- This Grid is used to draw the gradient at the bottom of the ColumnManagerCell.-->
-               <Grid x:Name="bottomBorder"
-                     Height="2"
-                     VerticalAlignment="Bottom">
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-               </Grid>
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </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>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,0,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Margin"
-                    Value="0,3,0,0" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="2"
-                     VerticalAlignment="Bottom">
-
-                  <Border x:Name="middleBottomBorder" />
-
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#77FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="2"
-                     VerticalAlignment="Bottom">
-
-                  <Border x:Name="middleBottomBorder" />
-
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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="tableViewZuneNormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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 tableViewDataGridControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableViewForcedZuneNormalColorGridControlStyle"
-          BasedOn="{StaticResource tableViewZuneNormalColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Luna;V4.0.0.0;31bf3856ad364e35;component\themes/luna.metallic.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource rowSelectorBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableViewZuneNormalColorRowSelectorStyle"
-          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 tableViewRowSelectorTemplate}" />
-
-      <Style.Triggers>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#EDEDED" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewZuneNormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewZuneNormalColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerRowTemplate}" />
-
-      <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="tableViewZuneNormalColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- In TableView, 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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 tableViewCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewZuneNormalColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- In TableView, 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorGroupByControlStyle"
-          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 TableView, 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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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 tableViewGroupByControlTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="#DBDBDB" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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 tableViewGroupHeaderControlTemplate}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter Property="Margin"
-                    Value="0,0,0,5" />
-         </DataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="#DBDBDB" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,0" />
-
-      <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorDetailIndicatorStyle"
-          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 tableViewDetailIndicatorTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableViewZuneNormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-      <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="tableViewZuneNormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByControlNodeTemplate}" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlTemplate}" />
-
-      <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 tableViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
-
-         </MultiDataTrigger>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableViewZuneNormalColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FF474747"
-                             Offset="0" />
-
-               <GradientStop Color="#FF7D7D7D"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,0"
-                                 StartPoint="0.5,1">
-               <GradientStop Color="#FF000000"
-                             Offset="0" />
-
-               <GradientStop Color="#FF333333"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="TextElement.Foreground"
-              Value="White" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableViewZuneNormalColorDefaultValues"
-          TargetType="views:TableView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:TableView, ThemeType=views:ZuneNormalColorTheme}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewZuneNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewForcedZuneNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewZuneNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewZuneNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewZuneNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewZuneNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewZuneNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewZuneNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewZuneNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewZuneNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewZuneNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewZuneNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewZuneNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewZuneNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewZuneNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewZuneNormalColorHierarchicalGroupByItemStyle}" />
-
-</ResourceDictionary>
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
deleted file mode 100644
index 690966ce..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml
+++ /dev/null
@@ -1,2292 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
-                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
-                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
-
-   <ResourceDictionary.MergedDictionaries>
-
-      <!-- Include the view independant, color-scheme independant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Zune.Resources.xaml" />
-
-      <!-- Include the view dependant, color-scheme independant, theme graphics -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/TableView.Zune.Graphics.xaml" />
-
-      <!-- Include the view independant, color-scheme dependant, theme resources -->
-      <markup:DataGridThemeResourceDictionary Source="Resources/Zune.normalcolor.Resources.xaml" />
-
-      <!-- Include the standard grid element templates -->
-      <markup:DataGridThemeResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- =================================================================== -->
-   <!-- Resources specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <SolidColorBrush x:Key="gridControlBorderBrush"
-                    Color="#C2C2C2" />
-
-   <SolidColorBrush x:Key="gridLineBrush"
-                    Color="Gray" />
-
-   <LinearGradientBrush x:Key="headerBackgroundBrush"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-
-      <GradientStop Color="#e2e2e2"
-                    Offset="0" />
-
-      <GradientStop Color="#e2e2e2"
-                    Offset="0.16" />
-
-      <GradientStop Color="#DBDBDB"
-                    Offset="0.16" />
-
-      <GradientStop Color="#DBDBDB"
-                    Offset="1" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="rowSelectorBackgroundBrush"
-                        StartPoint="0,0"
-                        EndPoint="1,0">
-
-      <GradientStop Color="#e2e2e2"
-                    Offset="0" />
-
-      <GradientStop Color="#e2e2e2"
-                    Offset="0.16" />
-
-      <GradientStop Color="#DBDBDB"
-                    Offset="0.16" />
-
-      <GradientStop Color="#DBDBDB"
-                    Offset="1" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerForegroundBrush"
-                    Color="Black" />
-
-   <SolidColorBrush x:Key="headerDelimiterDarkBorderBrush"
-                    Color="Transparent" />
-
-   <SolidColorBrush x:Key="headerDelimiterLightBorderBrush"
-                    Color="#C2C2C2" />
-
-   <SolidColorBrush x:Key="headerHotBackgroundBrush"
-                    Color="#E6E6E6" />
-
-   <SolidColorBrush x:Key="headerPressedBorderBrush"
-                    Color="#DEDFD8" />
-
-   <SolidColorBrush x:Key="headerPressedLightInnerHighlightBrush"
-                    Color="#D0D1C9" />
-
-   <SolidColorBrush x:Key="headerPressedDarkInnerHighlightBrush"
-                    Color="#C1C2B8" />
-
-   <SolidColorBrush x:Key="headerPressedBackgroundBrush"
-                    Color="#DBDBDB" />
-
-   <SolidColorBrush x:Key="headerHighlightVerticalBorderBrush"
-                    Color="#DEDEDF" />
-
-   <SolidColorBrush x:Key="headerHighlightHorizontalBorderBrush"
-                    Color="#DEDEDF" />
-
-   <SolidColorBrush x:Key="warningBackgroundBrush"
-                    Color="#FFC400" />
-
-   <SolidColorBrush x:Key="warningForegroundBrush"
-                    Color="Black" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FAC746" />
-
-      <GradientStop Offset="1"
-                    Color="#F9B119" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#FAC746" />
-
-      <GradientStop Offset="1"
-                    Color="#F9B119" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBorderBrush2"
-                    Color="#F9A900" />
-
-   <SolidColorBrush x:Key="headerHotHighlightVerticalBackgroundBrush2"
-                    Color="#FCC247" />
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBorderBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="0"
-                    Color="#F8A900" />
-
-      <GradientStop Offset="1"
-                    Color="#DE9600" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightVerticalBackgroundBrush3"
-                        StartPoint="0,0.5"
-                        EndPoint="0.5,1">
-
-      <GradientStop Offset="1"
-                    Color="#DD9600" />
-
-      <GradientStop Offset="0"
-                    Color="#FCC247" />
-
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="headerHotHighlightHorizontalBorderBrush1"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Offset="0"
-                    Color="#FDE3AB" />
-
-      <GradientStop Offset="1"
-                    Color="#F9A900" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBorderBrush2"
-                    Color="#F9B119" />
-
-   <SolidColorBrush x:Key="headerHotHighlightHorizontalBackgroundBrush2"
-                    Color="#FAC746" />
-
-   <LinearGradientBrush x:Key="groupByControlBackgroundBrush"
-                        StartPoint="0,0.5"
-                        EndPoint="1,0.5">
-
-      <GradientStop Color="#8F8F8F"
-                    Offset="0" />
-
-      <GradientStop Color="#B5B5B5"
-                    Offset="0.95" />
-
-      <GradientStop Color="#B6B6B6"
-                    Offset="1" />
-
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="groupByControlForegroundBrush"
-                    Color="Black" />
-
-   <!-- =================================================================== -->
-   <!-- Templates specific to this View/Theme/ColorScheme                   -->
-   <!-- =================================================================== -->
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationControl
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationControlTemplate"
-                    TargetType="{x:Type local:GroupNavigationControl}">
-
-      <Grid>
-         <Border x:Name="outlineBorder"
-                 BorderBrush="#808080"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Color="#DBDBDB"
-                                Offset="0" />
-                  <GradientStop Color="#B3B3B3"
-                                Offset="1" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <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="#808080"
-                    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" />
-                     </Border>
-                     <ControlTemplate.Triggers>
-                        <Trigger Property="ToggleButton.IsChecked"
-                                 Value="True">
-                           <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 SourceName="PART_Button"
-                  Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="outlineBorder"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="outlineBorder"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Color="#DBDBDB"
-                                   Offset="1" />
-                     <GradientStop Color="#B3B3B3"
-                                   Offset="0" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupNavigationButton
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
-                    TargetType="{x:Type local:GroupNavigationButton}">
-      <Grid>
-         <Border x:Name="border"
-                 BorderBrush="#808080"
-                 BorderThickness="1"
-                 Opacity="0">
-            <Border.Background>
-               <LinearGradientBrush StartPoint="0.5,0"
-                                    EndPoint="0.5,1">
-                  <GradientStop Color="#DBDBDB"
-                                Offset="0" />
-                  <GradientStop Color="#B3B3B3"
-                                Offset="1" />
-               </LinearGradientBrush>
-            </Border.Background>
-         </Border>
-
-         <ContentPresenter Margin="4,2,4,2" />
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="Opacity"
-                    Value="1" />
-         </Trigger>
-         <Trigger Property="IsPressed"
-                  Value="True">
-            <Setter TargetName="border"
-                    Property="BorderBrush"
-                    Value="#FF8C8A8C" />
-            <Setter TargetName="border"
-                    Property="Background">
-               <Setter.Value>
-                  <LinearGradientBrush StartPoint="0.5,0"
-                                       EndPoint="0.5,1">
-                     <GradientStop Color="#DBDBDB"
-                                   Offset="1" />
-                     <GradientStop Color="#B3B3B3"
-                                   Offset="0" />
-                  </LinearGradientBrush>
-               </Setter.Value>
-            </Setter>
-         </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>
-
-         <!-- Since we use a very specific border arrangement to represent the RowSelector,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-         <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </Grid>
-
-         </Border>
-
-         <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-         <Grid x:Name="rightBorder"
-               Width="3"
-               HorizontalAlignment="Right">
-
-            <Border x:Name="middleRightBorder"
-                    Background="{StaticResource headerHighlightVerticalBorderBrush}" />
-
-         </Grid>
-
-         <Rectangle x:Name="topBorder"
-                    Fill="{StaticResource headerDelimiterLightBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <Rectangle x:Name="bottomBorder"
-                    Fill="{StaticResource headerDelimiterDarkBorderBrush}"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Bottom"
-                    Height="1"
-                    Margin="3,0,4,0" />
-
-         <!-- Thumb that is used to resize the Row. -->
-         <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- middleRightBorder -->
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightVerticalBorderBrush2}" />
-
-            <Setter TargetName="middleRightBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightVerticalBackgroundBrush2}" />
-
-            <Setter TargetName="topBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="0,1,1,1" />
-
-            <Setter TargetName="contentPresenter"
-                    Property="Margin"
-                    Value="3,0,0,0" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter TargetName="bottomBorder"
-                    Property="Fill"
-                    Value="{StaticResource headerDelimiterLightBorderBrush}" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-   <conv:SortingDirectionToBooleanConverter x:Key="SortingDirectionToBooleanConverter" />
-
-   <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="local:ColumnManagerCell">
-
-      <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-      <Grid>
-
-         <Border BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-            <Grid>
-
-               <DockPanel>
-
-                  <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-                     <Grid>
-
-                        <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource headerDelimiterDarkBorderBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                           <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                           </Border>
-
-                        </Border>
-
-                        <ToggleButton x:Name="toggleButton"
-                                      VerticalAlignment="Stretch"
-                                      Focusable="False"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0" />
-                     </Grid>
-
-                  </Border>
-
-                  <!-- Since we use a very specific border arrangement to represent the ColumnManagerCell,
-              we do not use the TemplatedParent's BorderBrush and BorderThickness properties.-->
-                  <Border x:Name="rootBorder"
-                          Background="{TemplateBinding Background}">
-
-                     <Grid>
-
-                        <Border Padding="{TemplateBinding Padding}">
-
-                           <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="*" />
-                                 <ColumnDefinition Width="Auto" />
-                                 <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>
-
-               <!-- This Grid is used to draw the gradient at the bottom of the ColumnManagerCell.-->
-               <Grid x:Name="bottomBorder"
-                     Height="2"
-                     VerticalAlignment="Bottom">
-
-                  <Border x:Name="middleBottomBorder"
-                          Grid.Column="1"
-                          Background="{StaticResource headerHighlightHorizontalBorderBrush}" />
-
-               </Grid>
-
-               <Border x:Name="rightBorder"
-                       BorderThickness="0,0,1,0"
-                       BorderBrush="{StaticResource headerDelimiterLightBorderBrush}"
-                       Background="{StaticResource headerDelimiterDarkBorderBrush}"
-                       Margin="0,3,0,4"
-                       VerticalAlignment="Stretch"
-                       HorizontalAlignment="Right"
-                       Width="2" />
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-            </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="18,0,0,0" />
-         </MultiDataTrigger>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,0,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Visibility"
-                    Value="Visible" />
-
-            <Setter TargetName="rightBorder"
-                    Property="Margin"
-                    Value="0,3,0,0" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="thumbToggleBackgroundBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,0" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              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>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: GroupByItem 
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="local:GroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="2"
-                     VerticalAlignment="Bottom">
-
-                  <Border x:Name="middleBottomBorder" />
-
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </ControlTemplate.Triggers>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="local:HierarchicalGroupByControlNode">
-
-      <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-         <Border BorderBrush="{StaticResource gridLineBrush}"
-                 Background="#77FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-            <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="2" />
-         </Border>
-
-         <ItemsPresenter />
-      </StackPanel>
-
-   </ControlTemplate>
-
-   <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-   <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="local:HierarchicalGroupByItem">
-
-      <Grid>
-
-         <Border x:Name="rootBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Background="{TemplateBinding Background}">
-
-            <Grid>
-
-               <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                              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="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}"
-                                       Margin="6,0,0,0"
-                                       Visibility="Hidden" />
-
-                  </StackPanel>
-
-               </Border>
-
-               <Border x:Name="isPressedDarkInnerHighlight"
-                       BorderThickness="1,1,0,0">
-
-                  <Border x:Name="isPressedLightInnerHighlight"
-                          BorderThickness="1,1,0,0" />
-               </Border>
-
-               <!-- This Grid is used to draw the gradient at the right side of the RowSelector.-->
-               <Grid x:Name="bottomBorder"
-                     Height="2"
-                     VerticalAlignment="Bottom">
-
-                  <Border x:Name="middleBottomBorder" />
-
-               </Grid>
-
-            </Grid>
-
-         </Border>
-
-      </Grid>
-
-      <ControlTemplate.Triggers>
-
-         <Trigger Property="IsMouseOver"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotBackgroundBrush}" />
-
-            <!-- middleBottomBorder -->
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderThickness"
-                    Value="0,1,0,1" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerHotHighlightHorizontalBorderBrush2}" />
-
-            <Setter TargetName="middleBottomBorder"
-                    Property="Background"
-                    Value="{StaticResource headerHotHighlightHorizontalBackgroundBrush2}" />
-
-         </Trigger>
-
-         <Trigger Property="IsPressed"
-                  Value="True">
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource headerPressedBackgroundBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedBorderBrush}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="BorderThickness"
-                    Value="1,0,1,1" />
-
-            <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,0" />
-
-            <Setter TargetName="bottomBorder"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-            <Setter TargetName="isPressedLightInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedLightInnerHighlightBrush}" />
-
-            <Setter TargetName="isPressedDarkInnerHighlight"
-                    Property="BorderBrush"
-                    Value="{StaticResource headerPressedDarkInnerHighlightBrush}" />
-
-         </Trigger>
-
-         <!-- 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="Visibility"
-                    Value="Visible" />
-
-         </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="Visibility"
-                    Value="Visible" />
-
-         </DataTrigger>
-
-      </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 intAdditionConverter}, ConverterParameter=-1}" />
-
-            <Grid>
-               <Border BorderThickness="0,1,0,1">
-                  <Border.BorderBrush>
-                     <LinearGradientBrush StartPoint="0.5,1"
-                                          EndPoint="0.5,0">
-                        <GradientStop Color="#B9BBCA"
-                                      Offset="0" />
-                        <GradientStop Color="#DFDFDF"
-                                      Offset="1" />
-                     </LinearGradientBrush>
-                  </Border.BorderBrush>
-                  <Border.Background>
-                     <LinearGradientBrush StartPoint="0.5,0"
-                                          EndPoint="0.5,1">
-                        <GradientStop Color="#D0D1D2"
-                                      Offset="1" />
-                        <GradientStop Color="#E8E9EB"
-                                      Offset="0" />
-                     </LinearGradientBrush>
-                  </Border.Background>
-               </Border>
-
-               <!-- 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>
-
-   <!-- =================================================================== -->
-   <!-- 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="tableflowViewZuneNormalColorGridControlStyle"
-          TargetType="local:DataGridControl">
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridControlBorderBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Background"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="Foreground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <!-- 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: DataGridControl (with hosted controls theming)
-    ************************** -->
-   <Style x:Key="tableflowViewForcedZuneNormalColorGridControlStyle"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGridControlStyle}"
-          TargetType="local:DataGridControl">
-
-      <Style.Resources>
-         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-               <markup:FrameworkThemeResourceDictionary Source="/PresentationFramework.Luna;V4.0.0.0;31bf3856ad364e35;component\themes/luna.metallic.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-         </ResourceDictionary>
-      </Style.Resources>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorRowSelectorPaneStyle"
-          TargetType="local:RowSelectorPane">
-
-      <Setter Property="Background"
-              Value="{StaticResource rowSelectorBackgroundBrush}" />
-
-      <Setter Property="TextElement.Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-   <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
-   <Style x:Key="tableflowViewZuneNormalColorRowSelectorStyle"
-          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>
-
-         <!-- The DataContext of a RowSelector is always set to its corresponding
-              Row/item. This is why we use DataTriggers with no explicit Binding Source
-              when we want to react to properties of the Row/item. -->
-
-         <!-- 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>
-
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorRowStyle"
-          TargetType="local:Row">
-
-      <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- The Row is responsible for drawing the horizontal gridlines. It draws only its top gridline,
-           assuming that the bottom gridline will be drawn by its following row/element -->
-
-      <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineBrush}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowTemplate}" />
-
-      <Setter Property="Background"
-              Value="Transparent" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-         </DataTrigger>
-
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.HasExpandedDetails)}"
-                      Value="True">
-            <Setter Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-         </DataTrigger>
-
-         <!-- 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="#EDEDED" />
-
-         </MultiDataTrigger>
-      </Style.Triggers>
-
-   </Style>
-
-   <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorDataRowStyle"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorRowStyle}">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataRowTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ColumnManagerRow 
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorColumnManagerRowStyle"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorRowStyle}">
-
-      <!-- Use a different background and foreground than the base Row style. -->
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="local:RowSelector.Visible"
-              Value="False" />
-
-      <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="tableflowViewZuneNormalColorCellStyle"
-          TargetType="local:Cell">
-
-      <Setter Property="CurrentBackground"
-              Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-      <Setter Property="CurrentForeground"
-              Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <!-- 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" />
-
-      <Setter Property="Foreground"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentForeground}" />
-
-      <!-- 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="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <!-- 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="tableflowViewZuneNormalColorDataCellStyle"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorCellStyle}" />
-
-   <!--**************************
-    * STYLE: ColumnManagerCell 
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorColumnManagerCellStyle"
-          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" />
-
-      <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Description}" />
-
-      <!-- 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 columnManagerCellPadding}" />
-
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellHorizontalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.CellVerticalContentAlignment, FallbackValue=Stretch}" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupByControl 
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorGroupByControlStyle"
-          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 groupByControlForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="8" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewZuneNormalColorGroupByItemStyle"
-          TargetType="local:GroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupHeaderControl 
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorGroupHeaderControlStyle"
-          TargetType="local:GroupHeaderControl">
-
-      <Setter Property="Background"
-              Value="#DBDBDB" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="SelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-      <Setter Property="SelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-
-      <Setter Property="InactiveSelectionBackground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}" />
-
-      <Setter Property="InactiveSelectionForeground"
-              Value="{DynamicResource {x:Static SystemColors.InactiveCaptionTextBrushKey}}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="views:TableView.CanScrollHorizontally"
-              Value="False" />
-
-      <Setter Property="BorderThickness"
-              Value="0,1,1,0" />
-
-      <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>
-         <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
-                      Value="True">
-
-            <Setter Property="BorderThickness"
-                    Value="0,1,1,1" />
-         </DataTrigger>
-
-         <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="tableflowViewZuneNormalColorGroupLevelIndicatorStyle"
-          TargetType="local:GroupLevelIndicator">
-
-      <Setter Property="Background"
-              Value="#DBDBDB" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="0,0,1,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="tableflowViewZuneNormalColorDetailIndicatorStyle"
-          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="tableflowViewZuneNormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="local:GroupLevelIndicatorPane">
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <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="tableflowViewZuneNormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          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="tableflowViewZuneNormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="local:HierarchicalGroupByControlNode">
-
-      <Setter Property="StairHeight"
-              Value="0" />
-
-      <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-      <Setter Property="Focusable"
-              Value="False" />
-
-      <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByControlNodeTemplate}" />
-
-      <Setter Property="Margin"
-              Value="0,5,0,5" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorHierarchicalGroupByControlStyle"
-          TargetType="local:HierarchicalGroupByControl">
-
-      <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-      <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="tableflowViewZuneNormalColorHierarchicalGroupByItemStyle"
-          TargetType="local:HierarchicalGroupByItem">
-
-      <Setter Property="Background"
-              Value="{StaticResource headerBackgroundBrush}" />
-
-      <Setter Property="Foreground"
-              Value="{StaticResource headerForegroundBrush}" />
-
-      <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-      <Setter Property="BorderBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="BorderThickness"
-              Value="1" />
-
-      <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorScrollTipStyle"
-          TargetType="local:ScrollTip">
-
-      <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-      <Setter Property="Background">
-         <Setter.Value>
-            <LinearGradientBrush StartPoint="0.5,1"
-                                 EndPoint="0.5,0">
-               <GradientStop Color="#FF474747"
-                             Offset="0" />
-
-               <GradientStop Color="#FF7D7D7D"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="BorderBrush">
-         <Setter.Value>
-            <LinearGradientBrush EndPoint="0.5,0"
-                                 StartPoint="0.5,1">
-               <GradientStop Color="#FF000000"
-                             Offset="0" />
-
-               <GradientStop Color="#FF333333"
-                             Offset="1" />
-            </LinearGradientBrush>
-         </Setter.Value>
-      </Setter>
-
-      <Setter Property="TextElement.Foreground"
-              Value="White" />
-
-      <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-      <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorGroupNavigationControlStyle"
-          TargetType="local:GroupNavigationControl">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-   </Style>
-
-   <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-   <Style x:Key="tableflowViewZuneNormalColorGroupNavigationControlItemStyle"
-          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="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-
-                     <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="tableflowViewZuneNormalColorGroupNavigationButtonStyle"
-          TargetType="local:GroupNavigationButton">
-      <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-   </Style>
-
-   <!-- =================================================================== -->
-   <!-- Default values for the View                                         -->
-   <!-- =================================================================== -->
-
-   <Style x:Key="tableflowViewZuneNormalColorDefaultValues"
-          TargetType="views:TableflowView">
-
-      <Setter Property="HorizontalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="VerticalGridLineBrush"
-              Value="{StaticResource gridLineBrush}" />
-
-      <Setter Property="VerticalGridLineThickness"
-              Value="1" />
-
-      <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-      <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-      <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:ZuneNormalColorTheme}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewForcedZuneNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:ZuneNormalColorTheme, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationControlItemStyle}" />
-
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml
deleted file mode 100644
index b7be7f01..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml
+++ /dev/null
@@ -1,224 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Aero/TableflowView.Aero.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Aero/TableView.Aero.normalcolor.xaml"/>
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Generic theme for TableView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewAeroNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewAeroNormalColorGridControlStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewAeroNormalColorRowSelectorPaneStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewAeroNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewAeroNormalColorRowStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewAeroNormalColorDataRowStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewAeroNormalColorColumnManagerRowStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewAeroNormalColorCellStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewAeroNormalColorDataCellStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewAeroNormalColorColumnManagerCellStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupByControlStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupByItemStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupHeaderControlStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupLevelIndicatorStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewAeroNormalColorDetailIndicatorStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAeroNormalColorGroupLevelIndicatorPaneStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAeroNormalColorHierarchicalGroupLevelIndicatorPaneStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewAeroNormalColorScrollTipStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewAeroNormalColorHierarchicalGroupByControlNodeStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewAeroNormalColorHierarchicalGroupByControlStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewAeroNormalColorHierarchicalGroupByItemStyle}"/>
-
-   <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewAeroNormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml
deleted file mode 100644
index 6add0aed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml
+++ /dev/null
@@ -1,220 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Aero2/TableflowView.Aero2.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Aero2/TableView.Aero2.normalcolor.xaml"/>
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Generic theme for TableView -->
-
-   <!--<Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewAero2NormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewAero2NormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewAero2NormalColorDataRowStyle}" />
-
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerRowStyle}" />
-
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewAero2NormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewAero2NormalColorDataCellStyle}" />
-
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewAero2NormalColorColumnManagerCellStyle}" />
-
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewAero2NormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewAero2NormalColorGroupLevelIndicatorPaneStyle}" />
-
-    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewAero2NormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByControlStyle}" />
-
-  <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-         TargetType="local:HierarchicalGroupByItem"
-         BasedOn="{StaticResource tableViewAero2NormalColorHierarchicalGroupByItemStyle}" />-->
-
-  <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml
deleted file mode 100644
index 1063eaf2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml
+++ /dev/null
@@ -1,224 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Classic/TableflowView.Classic.systemcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Classic/TableView.Classic.systemcolor.xaml"/>
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Generic theme for TableView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewClassicSystemColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewClassicSystemColorGridControlStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewClassicSystemColorRowSelectorPaneStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewClassicSystemColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewClassicSystemColorRowStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewClassicSystemColorDataRowStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewClassicSystemColorColumnManagerRowStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewClassicSystemColorCellStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewClassicSystemColorDataCellStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewClassicSystemColorColumnManagerCellStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupByControlStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupByItemStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupHeaderControlStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupLevelIndicatorStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewClassicSystemColorDetailIndicatorStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewClassicSystemColorHierarchicalGroupLevelIndicatorPaneStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewClassicSystemColorGroupLevelIndicatorPaneStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewClassicSystemColorScrollTipStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewClassicSystemColorHierarchicalGroupByControlNodeStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewClassicSystemColorHierarchicalGroupByControlStyle}"/>
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewClassicSystemColorHierarchicalGroupByItemStyle}"/>
-
-   <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="{x:Type local:GroupNavigationButton}"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="{x:Type local:GroupNavigationControl}"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="{x:Type local:GroupNavigationControlItem}"
-          BasedOn="{StaticResource tableflowViewClassicSystemColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml
deleted file mode 100644
index d49a4fff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml
+++ /dev/null
@@ -1,275 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Aero/TableflowView.Aero.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Aero/TableView.Aero.normalcolor.xaml" />
-
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Classic/TableflowView.Classic.systemcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Classic/TableView.Classic.systemcolor.xaml" />
-
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableflowView.Luna.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableView.Luna.normalcolor.xaml" />
-
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableflowView.Luna.homestead.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableView.Luna.homestead.xaml" />
-
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableflowView.Luna.metallic.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableView.Luna.metallic.xaml" />
-
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Royale/TableflowView.Royale.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Royale/TableView.Royale.normalcolor.xaml" />
-
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Zune/TableflowView.Zune.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Zune/TableView.Zune.normalcolor.xaml" />
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Windows7/TableflowView.Windows7.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Windows7/TableView.Windows7.xaml" />
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Aero2/TableflowView.Aero2.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Aero2/TableView.Aero2.normalcolor.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- *******************************************************************************************
-   *****  STYLE              TargetType: CheckBox
-   ************************************************************************************************
-   -->
-    <Style TargetType="{x:Type local:DataGridCheckBox}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:DataGridCheckBox}">
-               <CheckBox x:Name="PART_ChildCheckBox"
-                         Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Content, Mode=OneWay}"
-                         ContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentTemplate, Mode=OneWay}"
-                         ContentTemplateSelector="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=ContentTemplateSelector, Mode=OneWay}"
-                         Focusable="False"
-                         IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsChecked}"
-                         IsThreeState="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsThreeState, Mode=OneWay}"
-                         AutomationProperties.AutomationId="InnerCheckBox" />
-                </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-    <!-- Generic theme for TableView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewLunaNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewLunaNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewLunaNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewLunaNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewLunaNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByItemStyle}" />
-
-   <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml
deleted file mode 100644
index 2da5fb65..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableflowView.Luna.homestead.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableView.Luna.homestead.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Generic theme for TableView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewLunaHomesteadDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewLunaHomesteadGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewLunaHomesteadRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewLunaHomesteadRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewLunaHomesteadRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaHomesteadDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaHomesteadColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewLunaHomesteadCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaHomesteadDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewLunaHomesteadColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewLunaHomesteadDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaHomesteadGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewLunaHomesteadScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewLunaHomesteadHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewLunaHomesteadHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewLunaHomesteadHierarchicalGroupByItemStyle}" />
-
-   <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewLunaHomesteadGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml
deleted file mode 100644
index 630cd4b2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml
+++ /dev/null
@@ -1,224 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableflowView.Luna.metallic.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableView.Luna.metallic.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Generic theme for TableView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewLunaMetallicDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewLunaMetallicGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewLunaMetallicRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewLunaMetallicRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewLunaMetallicRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaMetallicDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaMetallicColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewLunaMetallicCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaMetallicDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewLunaMetallicColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewLunaMetallicDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaMetallicGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaMetallicHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewLunaMetallicScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewLunaMetallicHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewLunaMetallicHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewLunaMetallicHierarchicalGroupByItemStyle}" />
-
-   <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewLunaMetallicRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewLunaMetallicRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewLunaMetallicRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaMetallicColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewLunaMetallicCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewLunaMetallicColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewLunaMetallicDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewLunaMetallicScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaMetallicHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewLunaMetallicGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml
deleted file mode 100644
index bd5ead6d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableflowView.Luna.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Luna/TableView.Luna.normalcolor.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Generic theme for TableView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewLunaNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewLunaNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewLunaNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewLunaNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewLunaNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewLunaNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewLunaNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewLunaNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewLunaNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewLunaNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewLunaNormalColorHierarchicalGroupByItemStyle}" />
-
-   <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewLunaNormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml
deleted file mode 100644
index 1d955ce0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml
+++ /dev/null
@@ -1,224 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Royale/TableflowView.Royale.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Royale/TableView.Royale.normalcolor.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Generic theme for TableView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewRoyaleNormalColorHierarchicalGroupByItemStyle}" />
-
-   <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewRoyaleNormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml
deleted file mode 100644
index 986169b8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml
+++ /dev/null
@@ -1,224 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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) -->
-
-      <markup:DataGridThemeResourceDictionary Source="/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. -->
-
-      <markup:DataGridThemeResourceDictionary Source="/themes/Zune/TableflowView.Zune.normalcolor.xaml" />
-      <markup:DataGridThemeResourceDictionary Source="/themes/Zune/TableView.Zune.normalcolor.xaml" />
-
-   </ResourceDictionary.MergedDictionaries>
-
-   <!-- Generic theme for TableView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView}"
-          TargetType="views:TableView"
-          BasedOn="{StaticResource tableViewZuneNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableViewZuneNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableViewZuneNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableViewZuneNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableViewZuneNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableViewZuneNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableViewZuneNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableViewZuneNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableViewZuneNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableViewZuneNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableViewZuneNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewZuneNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableViewZuneNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableViewZuneNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableViewZuneNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableViewZuneNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableViewZuneNormalColorHierarchicalGroupByItemStyle}" />
-
-   <!-- Generic theme for TableflowView -->
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
-          TargetType="views:TableflowView"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorDefaultValues}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
-          TargetType="local:DataGridControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGridControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
-          TargetType="local:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorRowSelectorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
-          TargetType="local:RowSelector"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorRowSelectorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
-          TargetType="local:Row"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
-          TargetType="local:DataRow"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorDataRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
-          TargetType="local:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorColumnManagerRowStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
-          TargetType="local:Cell"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
-          TargetType="local:DataCell"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorDataCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
-          TargetType="local:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorColumnManagerCellStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
-          TargetType="local:GroupByControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
-          TargetType="local:GroupByItem"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
-          TargetType="local:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupHeaderControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
-          TargetType="local:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupLevelIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
-          TargetType="local:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorDetailIndicatorStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
-          TargetType="local:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
-          TargetType="local:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
-          TargetType="local:ScrollTip"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorScrollTipStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
-          TargetType="local:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupByControlNodeStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
-          TargetType="local:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupByControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
-          TargetType="local:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorHierarchicalGroupByItemStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
-          TargetType="local:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationButtonStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
-          TargetType="local:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationControlStyle}" />
-
-   <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
-          TargetType="local:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewZuneNormalColorGroupNavigationControlItemStyle}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.ico b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.ico
deleted file mode 100644
index 94eeac58..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.ico and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml
deleted file mode 100644
index ee02ab5f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 84c34e12..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/AssemblyVersionInfo.cs
deleted file mode 100644
index 7d793848..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/AssemblyVersionInfo.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-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("Xceed Toolkit for WPF LiveExplorer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct("Xceed Toolkit for WPF")]
-[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
-[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("3.4.0")]
-[assembly: AssemblyFileVersion("3.4.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/CodeBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs
deleted file mode 100644
index 6a9e6c2a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/AutoSelectTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt
deleted file mode 100644
index 81c9135d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/AutoSelectTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt
deleted file mode 100644
index 7c5f24d7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/AvalonDockView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt
deleted file mode 100644
index 1df33371..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.cs.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-
-using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout.Serialization;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views
-{
-  /// <summary>
-  /// Interaction logic for AvalonDockView.xaml
-  /// </summary>
-  public partial class AvalonDockView : DemoView
-  {
-    public AvalonDockView()
-    {
-      InitializeComponent();
-    }
-
-    private void SaveButton_Click( object sender, RoutedEventArgs e )
-    {
-      using( var writer = new StreamWriter( "AvalonDockSavedFile.txt" ) )
-      {
-        var layoutSerializer = new XmlLayoutSerializer( _dockingManager );
-        layoutSerializer.Serialize( writer );
-      }
-    }
-
-    private void LoadButton_Click( object sender, RoutedEventArgs e )
-    {
-      using( var reader = new StreamReader( "AvalonDockSavedFile.txt" ) )
-      {
-        var layoutSerializer = new XmlLayoutSerializer( _dockingManager );
-        layoutSerializer.Deserialize( reader );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt
deleted file mode 100644
index f17aa84b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockView.xaml.txt
+++ /dev/null
@@ -1,168 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="AvalonDock">
-  <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>
-
-    <TextBlock Grid.Row="1"
-               Text="Usage:"
-               Style="{StaticResource Header}" />
-
-    <StackPanel Grid.Row="2">
-      <xcad:DockingManager x:Name="_dockingManager"
-                           MaxHeight="395"
-                           AllowMixedOrientation="True"
-                           BorderBrush="Black"
-                           BorderThickness="1">
-        <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}"
-                                   AutoGenerateProperties="False">
-                  <xctk:PropertyGrid.PropertyDefinitions>
-                    <xctk:PropertyDefinition TargetProperties="Background" />
-                    <xctk:PropertyDefinition TargetProperties="BorderBrush" />
-                    <xctk:PropertyDefinition TargetProperties="BorderThickness" />
-                    <xctk:PropertyDefinition TargetProperties="FontSize" />
-                    <xctk:PropertyDefinition TargetProperties="FontStyle" />
-                    <xctk:PropertyDefinition TargetProperties="Width" />
-                    <xctk:PropertyDefinition TargetProperties="Height" />
-                  </xctk:PropertyGrid.PropertyDefinitions>
-                </xctk:PropertyGrid>
-              </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"
-                                       CanClose="True">
-                  <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>
-
-      <StackPanel Orientation="Horizontal"
-                  HorizontalAlignment="Center">
-        <Button Content="Save AvalonDock"
-                Margin="5"
-                Padding="5"
-                Click="SaveButton_Click" />
-        <Button Content="Load AvalonDock"
-                Margin="5"
-                Padding="5"
-                Click="LoadButton_Click" />
-      </StackPanel>
-    </StackPanel>
-  </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt
deleted file mode 100644
index 54099f48..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.cs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt
deleted file mode 100644
index f620b849..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentTemplateView.xaml.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="../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/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt
deleted file mode 100644
index 02af7688..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.cs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/BusyIndicatorCustomContentView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt
deleted file mode 100644
index 79180dbf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorCustomContentView.xaml.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="../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="../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/CodeFiles/BusyIndicatorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt
deleted file mode 100644
index d1ccd2aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.cs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/BusyIndicatorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt
deleted file mode 100644
index aaa3bece..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/BusyIndicatorView.xaml.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="../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/CodeFiles/ButtonSpinnerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt
deleted file mode 100644
index 2cbdd52f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.cs.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ButtonSpinnerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt
deleted file mode 100644
index 7b8b20b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ButtonSpinnerView.xaml.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/CalculatorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt
deleted file mode 100644
index 77ca355a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.cs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/CalculatorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt
deleted file mode 100644
index 1363f5f8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CalculatorView.xaml.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartAxisView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt
deleted file mode 100644
index 85c4ba11..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.cs.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartAxisView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt
deleted file mode 100644
index bb9fade5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/ChartLegendView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt
deleted file mode 100644
index 4fa944ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.cs.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartLegendView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt
deleted file mode 100644
index ed9dd017..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartLegendView.xaml.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt
deleted file mode 100644
index bfce285f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.cs.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartSeriesBasicTypesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt
deleted file mode 100644
index e9fa3b03..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesBasicTypesView.xaml.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt
deleted file mode 100644
index 638b00b9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt
deleted file mode 100644
index 6b7dca83..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartSeriesDataPointsBindingView.xaml.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xced Toolkit Plus for WPF.
-            </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/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt
deleted file mode 100644
index 62b6964d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartStylingAxesGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt
deleted file mode 100644
index a48b9fe8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingAxesGridView.xaml.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt
deleted file mode 100644
index 60a4bb3d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.cs.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartStylingColumnSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt
deleted file mode 100644
index d6dc938a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingColumnSeriesView.xaml.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt
deleted file mode 100644
index 0e783e8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.cs.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartStylingLineSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt
deleted file mode 100644
index 80a7b183..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingLineSeriesView.xaml.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt
deleted file mode 100644
index 805b5484..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.cs.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChartStylingPieSeriesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt
deleted file mode 100644
index 0380e45a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartStylingPieSeriesView.xaml.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/CheckListsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt
deleted file mode 100644
index cefb3341..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.cs.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/CheckListsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt
deleted file mode 100644
index b899a0b0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/CheckListsView.xaml.txt
+++ /dev/null
@@ -1,279 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-
-    <Grid Grid.Row="0"
-          Margin="5">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-
-      <GroupBox Grid.Column="0"
-                Header="Common Features" >
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="100" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="120" />
-          </Grid.ColumnDefinitions>
-
-          <TextBlock Grid.Row="0"
-                     Grid.Column="0"
-                     Text="Delimiter:"
-                     Margin="2,5,5,5"
-                     VerticalAlignment="Center" />
-          <TextBox x:Name="_delimiter"
-                   Grid.Row="0"
-                   Grid.Column="1"
-                   Margin="5"
-                   Text=","
-                   VerticalAlignment="Center"/>
-
-          <TextBlock Grid.Row="1"
-                     Grid.Column="0"
-                     VerticalAlignment="Center"
-                     Text="ValueMemberPath:"
-                     Margin="2,5,5,5" />
-          <ComboBox x:Name="_valueMemberPath"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="5"
-                    VerticalAlignment="Center"
-                    ItemsSource="{StaticResource personProperties}"
-                    SelectedIndex="0" />
-
-          <TextBlock Grid.Row="2"
-                     Grid.Column="0"
-                     VerticalAlignment="Center"
-                     Text="SelectedValue:"
-                     Margin="2,5,5,5" />
-          <TextBox x:Name="_selectedValue"
-                   Grid.Row="2"
-                   Grid.Column="1"
-                   VerticalAlignment="Center"
-                   Margin="5"
-                   Text="{Binding ElementName=_checkListBox, Path=SelectedValue, Mode=TwoWay}" />
-
-          <TextBlock Grid.Row="3"
-                     Grid.Column="0"
-                     Text="SelectedMemberPath:"
-                     VerticalAlignment="Center"
-                     Margin="2,5,5,5" />
-          <TextBox x:Name="_selectedMemberPath"
-                   Grid.Row="3"
-                   Grid.Column="1"
-                   Margin="5"
-                   VerticalAlignment="Center"
-                   IsEnabled="False"
-                   Text="IsSelected" />
-
-          <TextBlock Grid.Row="0"
-                     Grid.Column="2"
-                     Text="DisplayMemberPath:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <ComboBox x:Name="_displayMemberPath"
-                    Grid.Row="0"
-                    Grid.Column="3"
-                    Margin="5"
-                    Width="110"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    ItemsSource="{StaticResource personProperties}"
-                    SelectedIndex="1" />
-
-          <TextBlock Grid.Row="1"
-                     Grid.Column="2"
-                     Text="IsSelectAllActive:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <CheckBox x:Name="_isSelectAllActive"
-                    Grid.Row="1"
-                    Grid.Column="3"
-                    Margin="5"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    ClickMode="Press"
-                    IsChecked="False"/>
-
-          <TextBlock Grid.Row="2"
-                     Grid.Column="2"
-                     Text="SelectAllContent:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <TextBox x:Name="_selectAllContent"
-                   Grid.Row="2"
-                   Grid.Column="3"
-                   Margin="5"
-                   VerticalAlignment="Center"
-                   Text="SelectAll"
-                   IsEnabled="{Binding IsChecked, ElementName=_isSelectAllActive}"/>
-        </Grid>
-      </GroupBox>
-
-      <GroupBox Grid.Column="1"
-                Header="CheckComboBox Features"
-                Margin="5,0,0,0">
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <TextBlock Grid.Row="0"
-                     Grid.Column="0"
-                     Text="IsEditable:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <CheckBox x:Name="_isEditable"
-                    Grid.Row="0"
-                    Grid.Column="1"
-                    Margin="5"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    ClickMode="Press"
-                    IsChecked="{Binding IsEditable, ElementName=_checkComboBox}" />
-          <TextBlock Grid.Row="1"
-                     Grid.Column="0"
-                     Text="IsDropDownOpen:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <CheckBox x:Name="_isDropDownOpen"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="5"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    ClickMode="Press"
-                    IsChecked="{Binding IsDropDownOpen, ElementName=_checkComboBox}" />
-          <TextBlock Grid.Row="2"
-                     Grid.Column="0"
-                     Text="MaxDropDownHeight:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <xctk:DoubleUpDown x:Name="_maxDropDownHeight"
-                             Grid.Row="2"
-                             Grid.Column="1"
-                             Width="45"
-                             Value="{Binding MaxDropDownHeight, ElementName=_checkComboBox}"
-                             DefaultValue="150"
-                             AllowInputSpecialValues="PositiveInfinity"
-                             Minimum="0"
-                             HorizontalAlignment="Left"
-                             VerticalAlignment="Center"
-                             Margin="5" />
-        </Grid>
-      </GroupBox>
-    </Grid>
-
-
-    <GroupBox Header="Item Models"
-              Grid.Row="1"
-              Margin="5,2,5,2">
-      <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,2,5,2"
-                 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}"
-                         IsSelectAllActive="{Binding ElementName=_isSelectAllActive, Path=IsChecked}"
-                         SelectAllContent="{Binding ElementName=_selectAllContent, Path=Text}"/>
-
-      <TextBlock Text="CheckComboBox Usage:"
-                 Grid.Column="1"
-                 Margin="5,2,5,2"
-                 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}"
-                          IsSelectAllActive="{Binding ElementName=_isSelectAllActive, Path=IsChecked}"
-                          SelectAllContent="{Binding ElementName=_selectAllContent, Path=Text}"
-                          IsEditable="False"
-                          IsDropDownOpen="false"
-                          MaxDropDownHeight="100" />
-    </Grid>
-  </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt
deleted file mode 100644
index 8ab0b09c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.cs.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ChildWindowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt
deleted file mode 100644
index c639a093..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChildWindowView.xaml.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--****************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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" IsEnabled="{Binding IsEnabled, ElementName=_txtLeft}" Style="{StaticResource DisableGrayText}"/>
-            <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" IsEnabled="{Binding IsEnabled, ElementName=_txtTop}" Style="{StaticResource DisableGrayText}"/>
-            <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"  IsEnabled="{Binding IsEnabled, ElementName=_cboWindowStartupLocations}" Style="{StaticResource DisableGrayText}"/>
-            <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 ModalBackgroundBrush="LightGray">
-            <xctk:ChildWindow x:Name="_childWindow"
-                           Width="350"
-                           Height="230"
-                           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/CodeFiles/ColorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt
deleted file mode 100644
index d5055d4f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ColorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt
deleted file mode 100644
index 4dd5e575..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ColorView.xaml.txt
+++ /dev/null
@@ -1,344 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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:sys="clr-namespace:System;assembly=mscorlib"
-                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>
-
-    <ObjectDataProvider x:Key="ColorModeOptions"
-                        MethodName="GetValues"
-                        ObjectType="{x:Type sys:Enum}">
-      <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="xctk:ColorMode" />
-      </ObjectDataProvider.MethodParameters>
-    </ObjectDataProvider>
-
-    <ObjectDataProvider x:Key="AvailableColorsSortingModeOptions"
-                        MethodName="GetValues"
-                        ObjectType="{x:Type sys:Enum}">
-      <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="xctk:ColorSortingMode" />
-      </ObjectDataProvider.MethodParameters>
-    </ObjectDataProvider>
-  </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>
-            <Style TargetType="{x:Type ComboBox}">
-              <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" />
-            <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="ColorMode:" />
-          <ComboBox Grid.Column="1"
-                    Grid.Row="0"
-                    ItemsSource="{Binding Source={StaticResource ColorModeOptions}}"
-                    SelectedItem="{Binding ElementName=_colorPicker, Path=ColorMode, Mode=TwoWay}"
-                    Height="22" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="1"
-                     Text="AvailableColorsHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="1"
-                   Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="2"
-                     Text="RecentColorsHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="2"
-                   Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="3"
-                     Text="StandardColorsHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="3"
-                   Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="4"
-                     Text="AvailableColorsSortingMode:" />
-          <ComboBox Grid.Column="1"
-                    Grid.Row="4"
-                    ItemsSource="{Binding Source={StaticResource AvailableColorsSortingModeOptions}}"
-                    SelectedItem="{Binding ElementName=_colorPicker, Path=AvailableColorsSortingMode, Mode=TwoWay}"
-                    Height="22" />
-
-          <CheckBox Grid.Column="0"
-                    Grid.Row="5"
-                    Grid.ColumnSpan="2"
-                    Content="DisplayColorAndName"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="6"
-                    Grid.ColumnSpan="2"
-                    Content="DisplayColorTooltip"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorTooltip, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="7"
-                    Grid.ColumnSpan="2"
-                    Content="ShowTabHeaders"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowTabHeaders, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="8"
-                    Grid.ColumnSpan="2"
-                    Content="ShowAvailableColors"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="9"
-                    Grid.ColumnSpan="2"
-                    Content="ShowDropDownButton"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="10"
-                    Grid.ColumnSpan="2"
-                    Content="ShowRecentColors"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="11"
-                    Grid.ColumnSpan="2"
-                    Content="ShowStandardColors"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="12"
-                    Grid.ColumnSpan="2"
-                    Content="UsingAlphaChannel"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="13"
-                     Text="MaxDropDownWidth:" />
-          <xctk:IntegerUpDown Grid.Column="1"
-                              Grid.Row="13"
-                              Minimum="50"
-                              Maximum="550"
-                              Value="{Binding ElementName=_colorPicker, Path=MaxDropDownWidth}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="14"
-                     Text="AdvancedButtonHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="14"
-                   Text="{Binding ElementName=_colorPicker, Path=AdvancedButtonHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="15"
-                     Text="StandardButtonHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="15"
-                   Text="{Binding ElementName=_colorPicker, Path=StandardButtonHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="16"
-                     Text="SelectedColorText:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="16"
-                   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/CodeFiles/DataGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt
deleted file mode 100644
index c380b492..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.cs.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/DataGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt
deleted file mode 100644
index fa6d2f2e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DataGridView.xaml.txt
+++ /dev/null
@@ -1,184 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>Toolkit for WPF 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}}" 
-                              AllowDrag="True">           
-            <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}" 
-                             GroupValueTemplate="{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/CodeFiles/DateTimeView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt
deleted file mode 100644
index 5c68a282..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.cs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/DateTimeView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt
deleted file mode 100644
index 886b1a48..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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" />
-      <conv:CustomFormatToBoolConverter x:Key="CustomFormatToBoolConverter" />
-
-      <ObjectDataProvider x:Key="enumDateFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimeFormat"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        <ObjectDataProvider x:Key="enumVisibility" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Visibility" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-       <ObjectDataProvider x:Key="enumKind" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="sys:DateTimeKind" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumCalendarDisplayMode"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="CalendarMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumDateTimePart" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimePart"/>
-         </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" />
-               <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="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" IsEnabled="{Binding IsEnabled, ElementName=_formatString}" Style="{StaticResource DisableGrayText}" />
-            <TextBox x:Name="_formatString" Grid.Row="1" Grid.Column="1" Text="yy MMM dd" Width="190" IsEnabled="{Binding Source={x:Reference _format}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" 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="ClipValueToMinMax:" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_clipValueToMinMax" Grid.Row="4" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>
-            <TextBlock Text="Kind:" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_kind" Grid.Row="5" Grid.Column="1" SelectedIndex="2" ItemsSource="{Binding Source={StaticResource enumKind}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="CalendarDisplayMode:" Grid.Row="6" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_calendarDisplayMode" Grid.Row="6" Grid.Column="1" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumCalendarDisplayMode}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="CalendarWidth:" Grid.Row="7" Grid.Column="0" VerticalAlignment="Center"/>
-            <xctk:DoubleUpDown x:Name="_calendarWidth" Grid.Row="7" Grid.Column="1" Value="178" Minimum="100" Maximum="500" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="ShowDropDownButton:" Grid.Row="8" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_showDropDownButton" Grid.Row="8" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5,5,25,5"/>
-            <TextBlock Text="TimePickerVisibility:" Grid.Row="9" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_timePickerVisibility" Grid.Row="9" Grid.Column="1" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumVisibility}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="TimePickerShowButtonSpinner:" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_timePickerShowButtonSpinner" Grid.Row="10" Grid.Column="1" IsChecked="True" 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="7" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="190" Margin="5"/>
-            <TextBlock Text="Time FormatString:" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_timeFormatString}" Style="{StaticResource DisableGrayText}"/>
-            <TextBox x:Name="_timeFormatString" Grid.Row="1" Grid.Column="3" Text="H:mm" Width="190"  IsEnabled="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" 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"/>
-            <TextBlock Text="Minimum:" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center"/>
-            <xctk:DateTimeUpDown x:Name="_minimum" Grid.Row="3" Grid.Column="3" Format="Custom" FormatString="yyyy/MM/dd HH:mm" Value="2013/01/01T12:00" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="Maximum:" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center"/>
-            <xctk:DateTimeUpDown x:Name="_maximum" Grid.Row="4" Grid.Column="3" Format="Custom" FormatString="yyyy/MM/dd HH:mm" Value="2018/12/31T12:00" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="CurrentDateTimePart:" Grid.Row="5" Grid.Column="2" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_currentDateTimePart" Grid.Row="5" Grid.Column="3" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumDateTimePart}}" Width="190" Margin="5" ToolTip="Must match a DateTimePart of the DateTimePicker Format."/>
-         </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}"
-                                 ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
-                                 TimePickerVisibility="{Binding Source={x:Reference _timePickerVisibility}, Path=SelectedItem}"
-                                 TimePickerShowButtonSpinner="{Binding IsChecked, ElementName=_timePickerShowButtonSpinner}"
-                                 Minimum="{Binding Value, ElementName=_minimum}"
-                                 Maximum="{Binding Value, ElementName=_maximum}"
-                                 Kind="{Binding SelectedItem, ElementName=_kind}"
-                                 CalendarDisplayMode="{Binding SelectedItem, ElementName=_calendarDisplayMode}"
-                                 CalendarWidth="{Binding Value, ElementName=_calendarWidth}"
-                                 ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
-                                 CurrentDateTimePart="{Binding SelectedItem, ElementName=_currentDateTimePart, Mode=TwoWay}"/>
-        </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" />
-                        <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"/>
-                    <TextBlock Grid.Row="3" Text="MaxDropDownHeight:" VerticalAlignment="Center" />
-                    <xctk:DoubleUpDown x:Name="_maxDropDownHeight" Grid.Row="3" Grid.Column="1" Width="100" Value="130" DefaultValue="130" AllowInputSpecialValues="PositiveInfinity" Minimum="0" />
-                 </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}}"
-                                 ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
-                                 Minimum="{Binding Value, ElementName=_minimum}"
-                                 Maximum="{Binding Value, ElementName=_maximum}"
-                                 MaxDropDownHeight="{Binding Value, ElementName=_maxDropDownHeight}"
-                                 ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"/>
-           </StackPanel>
-        </StackPanel>
-    </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.Designer.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.Designer.cs.txt
deleted file mode 100644
index 667ee531..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.Designer.cs.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-//------------------------------------------------------------------------------
-// <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.Samples.PropertyGrid.Views {
-    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 DisplayLocalizationRes {
-
-        private static global::System.Resources.ResourceManager resourceMan;
-
-        private static global::System.Globalization.CultureInfo resourceCulture;
-
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal DisplayLocalizationRes() {
-        }
-
-        /// <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.Samples.PropertyGrid.Views.DisplayLocalizationRes", typeof(DisplayLocalizationRes).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;
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Details.
-        /// </summary>
-        internal static string DetailsCategory {
-            get {
-                return ResourceManager.GetString("DetailsCategory", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Favorite actor 1 (no DisplayName).
-        /// </summary>
-        internal static string FavoriteActor1 {
-            get {
-                return ResourceManager.GetString("FavoriteActor1", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to This property&apos;s type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method..
-        /// </summary>
-        internal static string FavoriteActor1Desc {
-            get {
-                return ResourceManager.GetString("FavoriteActor1Desc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Favorite actor 2 (with DisplayName).
-        /// </summary>
-        internal static string FavoriteActor2 {
-            get {
-                return ResourceManager.GetString("FavoriteActor2", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to This property&apos;s type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized..
-        /// </summary>
-        internal static string FavoriteActor2Desc {
-            get {
-                return ResourceManager.GetString("FavoriteActor2Desc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Favorite actor 3.
-        /// </summary>
-        internal static string FavoriteActor3 {
-            get {
-                return ResourceManager.GetString("FavoriteActor3", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to &quot;(Not listed)&quot; enum value shows that enum values can also be localized..
-        /// </summary>
-        internal static string FavoriteActor3Desc {
-            get {
-                return ResourceManager.GetString("FavoriteActor3Desc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to First name.
-        /// </summary>
-        internal static string FirstName {
-            get {
-                return ResourceManager.GetString("FirstName", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to First name of that person.
-        /// </summary>
-        internal static string FirstNameDesc {
-            get {
-                return ResourceManager.GetString("FirstNameDesc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Information.
-        /// </summary>
-        internal static string InfoCategory {
-            get {
-                return ResourceManager.GetString("InfoCategory", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Last name.
-        /// </summary>
-        internal static string LastName {
-            get {
-                return ResourceManager.GetString("LastName", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Usually the familly name of the person.
-        /// </summary>
-        internal static string LastNameDesc {
-            get {
-                return ResourceManager.GetString("LastNameDesc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to (Not listed).
-        /// </summary>
-        internal static string NotListed {
-            get {
-                return ResourceManager.GetString("NotListed", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.fr.resx.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.fr.resx.txt
deleted file mode 100644
index 3c7a52ca..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.fr.resx.txt
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="DetailsCategory" xml:space="preserve">
-    <value>Détails</value>
-  </data>
-  <data name="FavoriteActor1" xml:space="preserve">
-    <value>Acteur favori 1 (aucun DisplayName)</value>
-  </data>
-  <data name="FavoriteActor1Desc" xml:space="preserve">
-    <value>Le type de cette propriété est un enum où les valeurs n'ont aucun attribut "DisplayName". Les valeurs affichées sont retournées par la méthode ToString().</value>
-  </data>
-  <data name="FavoriteActor2" xml:space="preserve">
-    <value>Acteur favori 2 (avec DisplayName)</value>
-  </data>
-  <data name="FavoriteActor2Desc" xml:space="preserve">
-    <value>Le type de cette propriété est un enum où les valeurs sont décorés avec l'attribut "DisplayName". Les valeurs affichées sont celles spécifiées par l'attribut ExtendedDisplayName.</value>
-  </data>
-  <data name="FavoriteActor3" xml:space="preserve">
-    <value>Acteur favori 3</value>
-  </data>
-  <data name="FavoriteActor3Desc" xml:space="preserve">
-    <value>La valeur "(Non proposé)" démontre que les valeurs des enums peuvent aussi être localisées.</value>
-  </data>
-  <data name="FirstName" xml:space="preserve">
-    <value>Prénom</value>
-  </data>
-  <data name="FirstNameDesc" xml:space="preserve">
-    <value>Prénom de la personne</value>
-  </data>
-  <data name="InfoCategory" xml:space="preserve">
-    <value>Information</value>
-  </data>
-  <data name="LastName" xml:space="preserve">
-    <value>Nom de famille</value>
-  </data>
-  <data name="LastNameDesc" xml:space="preserve">
-    <value>Le nom de famille de la personne</value>
-  </data>
-  <data name="NotListed" xml:space="preserve">
-    <value>(Non proposé)</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.resx.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.resx.txt
deleted file mode 100644
index c38138ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DisplayLocalizationRes.resx.txt
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="DetailsCategory" xml:space="preserve">
-    <value>Details</value>
-  </data>
-  <data name="FavoriteActor1" xml:space="preserve">
-    <value>Favorite actor 1 (no DisplayName)</value>
-  </data>
-  <data name="FavoriteActor1Desc" xml:space="preserve">
-    <value>This property's type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method.</value>
-  </data>
-  <data name="FavoriteActor2" xml:space="preserve">
-    <value>Favorite actor 2 (with DisplayName)</value>
-  </data>
-  <data name="FavoriteActor2Desc" xml:space="preserve">
-    <value>This property's type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized.</value>
-  </data>
-  <data name="FavoriteActor3" xml:space="preserve">
-    <value>Favorite actor 3</value>
-  </data>
-  <data name="FavoriteActor3Desc" xml:space="preserve">
-    <value>"(Not listed)" enum value shows that enum values can also be localized.</value>
-  </data>
-  <data name="FirstName" xml:space="preserve">
-    <value>First name</value>
-  </data>
-  <data name="FirstNameDesc" xml:space="preserve">
-    <value>First name of that person</value>
-  </data>
-  <data name="InfoCategory" xml:space="preserve">
-    <value>Information</value>
-  </data>
-  <data name="LastName" xml:space="preserve">
-    <value>Last name</value>
-  </data>
-  <data name="LastNameDesc" xml:space="preserve">
-    <value>Usually the familly name of the person</value>
-  </data>
-  <data name="NotListed" xml:space="preserve">
-    <value>(Not listed)</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt
deleted file mode 100644
index 583db23c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.cs.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/DropDownSplitButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt
deleted file mode 100644
index a6bab569..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DropDownSplitButtonView.xaml.txt
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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"
-                xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                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>
-  <local:DemoView.Resources>
-    <xctk:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-    <ObjectDataProvider x:Key="DropDownPlacementMode"
-                        MethodName="GetValues"
-                        ObjectType="{x:Type sys:Enum}">
-      <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="PlacementMode" />
-      </ObjectDataProvider.MethodParameters>
-    </ObjectDataProvider>
-  </local:DemoView.Resources>
-
-  <Grid>
-    <StackPanel Margin="10">
-
-      <GroupBox Header="Features"
-                Margin="0,5,0,5">
-        <Grid Margin="5">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-          </Grid.RowDefinitions>
-
-          <!-- 1st Column-->
-          <TextBlock Text="MaxDropDownHeight:"
-                     VerticalAlignment="Center" />
-          <xctk:DoubleUpDown x:Name="maxDropDownHeight"
-                             Grid.Column="1"
-                             Width="60"
-                             Value="500"
-                             AllowInputSpecialValues="PositiveInfinity"
-                             Minimum="0"
-                             HorizontalAlignment="Left"
-                             VerticalAlignment="Center"
-                             Margin="5" />
-
-          <TextBlock Text="DropDown Position: "
-                     Grid.Row="1"
-                     VerticalAlignment="Center" />
-          <ComboBox x:Name="dropDownPosition"
-                    Grid.Column="1"
-                    Grid.Row="1"
-                    ItemsSource="{Binding Source={StaticResource DropDownPlacementMode}}"
-                    SelectedIndex="2"
-                    HorizontalAlignment="Left"
-                    Width="110"
-                    VerticalAlignment="Center"
-                    Margin="5" />
-
-          <!-- 2nd Column-->
-          <TextBlock Text="DropDownContentBackground:"
-                     VerticalAlignment="Center" 
-                     Grid.Column="2"/>
-          <xctk:ColorPicker x:Name="dropDownContentBackground"
-                            Grid.Column="3"
-                            Width="60"
-                            SelectedColor="LightGray"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-        </Grid>
-      </GroupBox>
-
-      <StackPanel>
-        <TextBlock Text="Usage:"
-                   Style="{StaticResource Header}" />
-
-        <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"
-                               MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
-                               DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
-                               DropDownContentBackground="{Binding SelectedColor, ElementName=dropDownContentBackground, Converter={StaticResource ColorToSolidColorBrushConverter}}"
-                               Click="DropDownButton_Click">
-            <xctk:DropDownButton.DropDownContent>
-              <StackPanel>
-                <xctk:ColorCanvas Margin="10"/>
-                <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"
-                            MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
-                            DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
-                            DropDownContentBackground="{Binding SelectedColor, ElementName=dropDownContentBackground, Converter={StaticResource ColorToSolidColorBrushConverter}}"
-                            Click="SplitButton_Click">
-            <xctk:SplitButton.DropDownContent>
-              <StackPanel>
-                <xctk:ColorCanvas Margin="10"/>
-                <Button Click="Button_Click"
-                        Margin="10">OK</Button>
-              </StackPanel>
-            </xctk:SplitButton.DropDownContent>
-          </xctk:SplitButton>
-        </Grid>
-      </StackPanel>
-    </StackPanel>
-  </Grid>
-
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt
deleted file mode 100644
index 6fe084df..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Windows;
-using System.Windows.Data;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views
-{
-  /// <summary>
-  /// Interaction logic for FilePickerView.xaml
-  /// </summary>
-  public partial class FilePickerView : DemoView
-  {
-    public FilePickerView()
-    {
-      InitializeComponent();
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt
deleted file mode 100644
index 79701472..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/FilePickerView.xaml.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views.FilePickerView"
-                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.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views"
-                xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                Title="FilePicker">   
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The FilePicker is a control that can be used to select one or more files in a browsing window.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\FilePicker.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt
deleted file mode 100644
index e1726617..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.cs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views
-{
-  /// <summary>
-  /// Interaction logic for IconButtonView.xaml
-  /// </summary>
-  public partial class IconButtonView : DemoView
-  {
-    public IconButtonView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt
deleted file mode 100644
index 9c5633db..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/IconButtonView.xaml.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views.IconButtonView"
-                 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"
-                 Title="IconButton">
-     <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-            The IconButton control is a Button that contains an icon and some data. The Foreground, Background and BorderBrush can be easily modified with properties while the Icon location is customizable.
-        </Paragraph>
-    </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-      <Image x:Key="Image1"
-             Source="../Resources/PencilTool16.png"
-             Width="20"
-             Margin="5" />
-      <Image x:Key="Image2"
-             Source="../Resources/Default.jpg"
-             Width="25"
-             Margin="5"/>
-
-      <ObjectDataProvider x:Key="ButtonLocationEnumData"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:Location" />
-         </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" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="100" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st Column -->
-            <TextBlock Text="Icon:" 
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
-                      Margin="5"
-                      VerticalContentAlignment="Center"
-                      SelectedValue="{Binding Icon, ElementName=_iconButton}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="None"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Image 1"
-                             Tag="{StaticResource Image1}" />
-               <ComboBoxItem Content="Image 2"
-                             Tag="{StaticResource Image2}" />
-            </ComboBox>
-
-            <TextBlock Grid.Row="1"
-                       Text="Icon Location: "
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
-                      Grid.Row="1"
-                      ItemsSource="{Binding Source={StaticResource ButtonLocationEnumData}}"
-                      SelectedItem="{Binding IconLocation, ElementName=_iconButton}"
-                      Margin="5"
-                      VerticalContentAlignment="Center" />
-
-            <!-- 2nd Column -->
-            <TextBlock Text="MouseOver Foreground:"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MouseOverForeground, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MousePressed Foreground:"
-                       Grid.Row="1"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="1"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MousePressedForeground, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MouseOver Background:"
-                       Grid.Row="2"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="2"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MouseOverBackground, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MousePressed Background:"
-                       Grid.Row="3"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="3"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MousePressedBackground, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MouseOver BorderBrush:"
-                       Grid.Row="4"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="4"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MouseOverBorderBrush, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MousePressed BorderBrush:"
-                       Grid.Row="5"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="5"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MousePressedBorderBrush, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-
-         <xctk:IconButton x:Name="_iconButton"
-                          Content="Test"
-                          Icon="{StaticResource Image1}"
-                          IconLocation="Left"
-                          MouseOverForeground="Black"
-                          MousePressedForeground="White"
-                          MouseOverBackground="LightBlue"
-                          MousePressedBackground="Blue"
-                          MouseOverBorderBrush="LightGray"
-                          MousePressedBorderBrush="LightGray"
-                          Margin="10"
-                          Padding="20,3"
-                          HorizontalAlignment="Center">
-         </xctk:IconButton>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt
deleted file mode 100644
index 35b9b36b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Xceed.Wpf.Samples.SampleData;
-using System.ComponentModel;
-
-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/CodeFiles/ListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt
deleted file mode 100644
index 4b87996c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ListBoxView.xaml.txt
+++ /dev/null
@@ -1,141 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Converters"
-                xmlns:sys="clr-namespace:System;assembly=mscorlib" 
-                VerticalScrollBarVisibility="Disabled"
-                Title="ListBox">
-   <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 />
-            <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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Toolkit Plus for WPF.
-            </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/CodeFiles/MagnifierView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt
deleted file mode 100644
index 4375dee6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.cs.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/MagnifierView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt
deleted file mode 100644
index c25cbc93..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MagnifierView.xaml.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-      <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      <conv:VisibilityConverter x:Key="visibilityConverter" />
-      <xctk:RtfFormatter x:Key="rtfFormatter" />
-      <xctk:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter"/>
-
-      <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="100" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="100" />
-            </Grid.ColumnDefinitions>
-            <!-- First Column-->
-            <TextBlock Text="Zoom Factor:" VerticalAlignment="Center" Margin="5" />
-            <xctk:DoubleUpDown x:Name="_zoomFactor" Grid.Column="1" Value="{Binding ZoomFactor, ElementName=_magnifier}" Minimum="0" Increment="0.1" Maximum="3" FormatString="N1" Margin="5" />
-            <TextBlock Text="IsUsingZoomOnMouseWheel:" Grid.Row="1" VerticalAlignment="Center" Margin="5" />
-            <CheckBox x:Name="_isUsingZoomOnMouseWheel" Grid.Row="1" Grid.Column="1" IsChecked="{Binding IsUsingZoomOnMouseWheel, ElementName=_magnifier}" Margin="5" />
-            <TextBlock Text="ZoomFactorOnMouseWheel:" Grid.Row="2" VerticalAlignment="Center" Margin="5" />
-            <xctk:DoubleUpDown x:Name="_zoomFactorOnMouseWheel" Grid.Row="2" Grid.Column="1" Value="{Binding ZoomFactorOnMouseWheel, ElementName=_magnifier}" Minimum="0" Increment="0.05" Maximum="1" FormatString="N2" Margin="5" />
-            <!-- Second Column-->
-            <TextBlock Grid.Column="2" Text="Frame Type:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <ComboBox x:Name="_frameType" SelectedItem="{Binding FrameType, ElementName=_magnifier}" ItemsSource="{Binding Source={StaticResource enumData}}" Grid.Column="3" 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="{Binding Radius, ElementName=_magnifier}"  Minimum="0" Maximum="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="{Binding Width, ElementName=_magnifier}"  Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" 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="{Binding Height, ElementName=_magnifier}" Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" Margin="5"  />
-            <!-- Third Column -->
-            <TextBlock Text="Border Thickness:" Grid.Column="4" VerticalAlignment="Center" Margin="5" />
-            <xctk:IntegerUpDown x:Name="_borderThickness" Grid.Column="5" Value="{Binding BorderThickness, ElementName=_magnifier, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}" Minimum="0" Maximum="20" Margin="5" />
-            <TextBlock Text="Border Brush:" Grid.Row="1" Grid.Column="4" VerticalAlignment="Center" Margin="5"/>
-            <xctk:ColorPicker x:Name="_colorPicker" Grid.Row="1" Grid.Column="5" Margin="5" SelectedColor="{Binding BorderBrush, ElementName=_magnifier, Converter={StaticResource SolidColorBrushToColorConverter}}"/>
-         </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="80"
-                               ZoomFactor="0.4"
-                               FrameType="Circle"
-                               BorderBrush="#FFC72035"
-                               BorderThickness="2"
-                               Width="160"
-                               Height="160"
-                               IsUsingZoomOnMouseWheel="True"
-                               ZoomFactorOnMouseWheel="0.1"/>
-            </xctk:MagnifierManager.Magnifier>
-         </xctk:RichTextBox>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt
deleted file mode 100644
index 88b5a14e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.cs.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/MaskedTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt
deleted file mode 100644
index b6b70eee..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaskedTextboxView.xaml.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/MaterialButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt
deleted file mode 100644
index 588221a4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.cs.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialButtonView.xaml
-  /// </summary>
-  public partial class MaterialButtonView : MaterialDemoView
-  {
-    public MaterialButtonView()
-    {
-      InitializeComponent();
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt
deleted file mode 100644
index e2c40a4c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialButtonView.xaml.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialButtonView"
-                        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"
-                        Title="MaterialButton">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A Button with a raised animation on mouse over and a customizable ink animation on MousePress. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialButton.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt
deleted file mode 100644
index 38e34326..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialCheckBoxView.xaml
-  /// </summary>
-  public partial class MaterialCheckBoxView : MaterialDemoView
-  {
-    public MaterialCheckBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt
deleted file mode 100644
index 6cac7952..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialCheckBoxView.xaml.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialCheckBoxView"
-                        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"
-                        Title="MaterialCheckBox">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A CheckBox with transition animations when the checked state is changed. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialCheckBox.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt
deleted file mode 100644
index af1f7e8e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialComboBoxView.xaml
-  /// </summary>
-  public partial class MaterialComboBoxView : MaterialDemoView
-  {
-    public MaterialComboBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt
deleted file mode 100644
index b0809e0a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialComboBoxView.xaml.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialComboBoxView"
-                        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"
-                        Title="MaterialComboBox">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>MaterialComboBox is a ComboBox that is using the Material Brushes and contains MaterialComboBoxItems.</Run>
-         <LineBreak />
-         <Run>MaterialComboBoxItems are ComboBoxItems that are using the Material Brushes. They use an ink animation when they are selected.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialComboBox.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt
deleted file mode 100644
index 81972001..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.cs.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialControlsView.xaml
-  /// </summary>
-  public partial class MaterialControlsView : MaterialDemoView
-  {
-
-
-
-    #region Constructors
-
-    public MaterialControlsView()
-    {
-      InitializeComponent();
-    }
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt
deleted file mode 100644
index 4bc64041..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialControlsView.xaml.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialControlsView"
-                        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"
-                        Title="MaterialControls">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The Material controls redefine the base controls by adding smooth animations and special effects. They also combine the base controls together to create new controls.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>The Material controls include a set of complimentary accent brush and foreground.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialControls.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt
deleted file mode 100644
index 40d958bc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.LiveExplorer
-{
-  public class MaterialDemoView : DemoView
-  {
-    #region Constructor
-
-    public MaterialDemoView()
-    {
-
-    }
-
-    #endregion
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt
deleted file mode 100644
index b6b907e8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialDropDownView.xaml
-  /// </summary>
-  public partial class MaterialDropDownView : MaterialDemoView
-  {
-    public MaterialDropDownView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt
deleted file mode 100644
index 791c5136..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDropDownView.xaml.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialDropDownView"
-                        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"
-                        Title="MaterialDropDown">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A DropDownButton from the Xceed Wpf Toolkit with animations when opening the popup. It uses the MaterialButton animations and the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialDropDown.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt
deleted file mode 100644
index 052f0a7d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialFrameView.xaml
-  /// </summary>
-  public partial class MaterialFrameView : DemoView
-  {
-    public MaterialFrameView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt
deleted file mode 100644
index eaa02dff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialFrameView.xaml.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialFrameView"
-                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.MaterialControls.Converters"
-                xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                Title="MaterialFrame">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A ContentControl with a fully customizable shadow that can be modified through Shadow properties or with a Z property that enables predefined shadows.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialFrame.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt
deleted file mode 100644
index 9b6fc8b9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.cs.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialHamburgerView.xaml
-  /// </summary>
-  public partial class MaterialHamburgerView : MaterialDemoView
-  {
-    #region Constructors
-
-    public MaterialHamburgerView()
-    {
-      InitializeComponent();
-    }
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt
deleted file mode 100644
index b49fd2d0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialHamburgerView.xaml.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialHamburgerView"
-                        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.Converters"
-                        Title="MaterialHamburger">
-  <local:DemoView.Description>
-    <Paragraph FontSize="14"
-               FontFamily="Segoe">
-      <Run>A ToggleButton that pops a menu from left, right, top or bottom of a Window (or any FrameworkElement). The menu can be an animated HamburgerMenu or any customized content. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-    </Paragraph>
-  </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialHamburger.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt
deleted file mode 100644
index a16fd422..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialListBoxView.xaml
-  /// </summary>
-  public partial class MaterialListBoxView : MaterialDemoView
-  {
-    public MaterialListBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt
deleted file mode 100644
index 5b19c65b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialListBoxView.xaml.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialListBoxView"
-                        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"
-                        Title="MaterialListBox &amp; MaterialListBoxItem">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>MaterialListBox is a ListBox that is using the Material Brushes and contains MaterialListBoxItems.</Run>
-         <LineBreak />
-         <Run>MaterialListBoxItems are ListBoxItems that are using the Material Brushes. They use an ink animation when they are selected.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialListBox.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt
deleted file mode 100644
index ea5af713..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.cs.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media.Animation;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialProgressBarCircularView.xaml
-  /// </summary>
-  public partial class MaterialProgressBarCircularView : MaterialDemoView
-  {
-    #region Constructors
-
-    public MaterialProgressBarCircularView()
-    {
-      InitializeComponent();
-
-    }
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt
deleted file mode 100644
index 4522cd82..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarCircularView.xaml.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialProgressBarCircularView"
-                        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"
-                        Title="MaterialProgressBarCircular">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A circular ProgressBar that uses the Material Brushes. It contains properties to animate the indeterminate state.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialProgressBarCircular.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt
deleted file mode 100644
index a878cab4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.cs.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media.Animation;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialProgressBarView.xaml
-  /// </summary>
-  public partial class MaterialProgressBarView : MaterialDemoView
-  {
-    #region Constructors
-
-    public MaterialProgressBarView()
-    {
-      InitializeComponent();
-    }
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt
deleted file mode 100644
index eda31f43..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialProgressBarView.xaml.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialProgressBarView"
-                        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"
-                        Title="MaterialProgressBar">   
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A linear ProgressBar that uses the Material Brushes. It contains properties to animate the indeterminate state.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialProgressBar.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt
deleted file mode 100644
index 050091bd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialRadioButtonView.xaml
-  /// </summary>
-  public partial class MaterialRadioButtonView : MaterialDemoView
-  {
-    public MaterialRadioButtonView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt
deleted file mode 100644
index a857899b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialRadioButtonView.xaml.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialRadioButtonView"
-                        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"
-                        Title="MaterialRadioButton">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A RadioButton with transition animations when the checked state is changed. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialRadioButton.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt
deleted file mode 100644
index 6bb26b7e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.cs.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using Xceed.Wpf.Toolkit.Panels;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialSliderView.xaml
-  /// </summary>
-  public partial class MaterialSliderView : MaterialDemoView
-  {
-    public MaterialSliderView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt
deleted file mode 100644
index b4c4a15a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSliderView.xaml.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialSliderView"
-                        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:winConv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
-                        Title="MaterialSlider">
-  <local:DemoView.Description>
-    <Paragraph FontSize="14"
-               FontFamily="Segoe">
-      <Run>A Slider with customizable and animated thumb and bubble that is using the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-    </Paragraph>
-  </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialSlider.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt
deleted file mode 100644
index 850a3059..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialSwitchView.xaml
-  /// </summary>
-  public partial class MaterialSwitchView : MaterialDemoView
-  {
-    public MaterialSwitchView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt
deleted file mode 100644
index de0f18c4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialSwitchView.xaml.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialSwitchView"
-                        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"
-                        Title="MaterialSwitch">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A ToggleSwitch from the Xceed WPF Toolkit with thumb animations when Checked state is changed and that is using the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialSwitch.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt
deleted file mode 100644
index eb49597e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialTabsView.xaml
-  /// </summary>
-  public partial class MaterialTabsView : MaterialDemoView
-  {
-    public MaterialTabsView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt
deleted file mode 100644
index af95f6d0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTabsView.xaml.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialTabsView"
-                        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"
-                        Title="MaterialTabControl &amp; MaterialTabItem">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>MaterialTabControl is a a TabControl with animated transitions when the current selection is changed. Is uses the Material Brushes and contains MaterialTabItems.</Run>
-         <LineBreak />
-         <Run>MaterialTabItems are TabItems that use the Material Brushes and contain customizable ink animations on mouse press.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialTabs.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt
deleted file mode 100644
index 54005b25..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialTextFieldView.xaml
-  /// </summary>
-  public partial class MaterialTextFieldView : MaterialDemoView
-  {
-    public MaterialTextFieldView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt
deleted file mode 100644
index 529e5eef..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialTextFieldView.xaml.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialTextFieldView"
-                        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:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data"
-                        Title="MaterialTextField">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A TextBox containing a customizable animated watermark that remains active when text is entered. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialTextField.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt
deleted file mode 100644
index 06aae47e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialToastView.xaml
-  /// </summary>
-  public partial class MaterialToastView : MaterialDemoView
-  {
-    public MaterialToastView()
-    {
-      InitializeComponent();
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt
deleted file mode 100644
index b1e287d3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToastView.xaml.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialToastView"
-                        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"
-                        Title="MaterialToast">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A ContentControl that can be customized to display a content in any corner of any window or FrameworkElement. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialToast.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt
deleted file mode 100644
index c7069f4b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.cs.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialToolTipView.xaml
-  /// </summary>
-  public partial class MaterialToolTipView : MaterialDemoView
-  {
-    public MaterialToolTipView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt
deleted file mode 100644
index 3cac9b4e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialToolTipView.xaml.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialToolTipView"
-                        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"
-                        Title="MaterialToolTip">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A ToolTip with animations when opening. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialToolTip.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt
deleted file mode 100644
index e6f2523b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2014 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Controls;
-using System;
-using System.Windows.Media;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views
-{
-  /// <summary>
-  /// Interaction logic for MultiCalendarView.xaml
-  /// </summary>
-  public partial class MultiCalendarView : DemoView
-  {
-    public MultiCalendarView()
-    {
-      InitializeComponent();
-    }
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt
deleted file mode 100644
index b93d15b2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-
-<local:DemoView  x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views.MultiCalendarView"
-                 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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 Title="MultiCalendar">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The MultiCalendar combines X Microsoft Calendars that can be positioned in a grid with rows and columns. The selected dates, blackout dates and highlighted dates can be chosen from any calendar. The MultiCalendar will have a fast response no matter how many CalendarDayButtons are selected.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>The Background/Foreground of any CalendarDayButton can be easily customized based on its state(selected/highlighted/blackout/mouseOver/focused/today) and the background of any Calendar can be customized with an image or a brush.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MultiCalendar.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt
deleted file mode 100644
index e32ef1f5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/MultiColumnComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt
deleted file mode 100644
index eb469522..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiColumnComboBoxView.xaml.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/MultiLineTextEditorView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt
deleted file mode 100644
index c2fba5d9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.cs.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/MultiLineTextEditorView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt
deleted file mode 100644
index ac9d417e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiLineTextEditorView.xaml.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/NumericView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt
deleted file mode 100644
index 3a973d11..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.cs.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/NumericView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt
deleted file mode 100644
index b8fbd64c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/NumericView.xaml.txt
+++ /dev/null
@@ -1,469 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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" />
-      <numeric:FormatObject Value="{}{0:N2} °"
-                            DisplayValue="Degrees" />
-    </x:Array>
-
-    <xctk:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-    <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="ButtonSpinnerLocationComboBox"
-                        MethodName="GetValues"
-                        ObjectType="{x:Type sys:Enum}">
-      <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="xctk:Location" />
-      </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" />
-            <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.FocusedMouseOver" />
-            <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="Is Read Only:"
-                     Grid.Row="2"
-                     VerticalAlignment="Center"
-                     ToolTip="Prevent from using button spinners or editing text." />
-          <CheckBox Grid.Row="2"
-                    Grid.Column="1"
-                    IsChecked="{Binding IsReadOnly, 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"
-                    IsEnabled="{Binding IsReadOnly, ElementName=_doubleUpDown, Converter={StaticResource InverseBoolConverter}}" />
-
-          <TextBlock Text="Allow TextInput:"
-                     Grid.Row="4"
-                     VerticalAlignment="Center" />
-          <CheckBox Grid.Row="4"
-                    Grid.Column="1"
-                    IsChecked="{Binding AllowTextInput, ElementName=_doubleUpDown}"
-                    ClickMode="Press"
-                    Margin="5"
-                    VerticalAlignment="Center"
-                    IsEnabled="{Binding IsReadOnly, ElementName=_doubleUpDown, Converter={StaticResource InverseBoolConverter}}" />
-
-          <TextBlock Text="Clip Value to Min Max:"
-                     Grid.Row="5"
-                     VerticalAlignment="Center" />
-          <CheckBox Grid.Row="5"
-                    Grid.Column="1"
-                    IsChecked="{Binding ClipValueToMinMax, ElementName=_doubleUpDown, Mode=TwoWay}"
-                    ClickMode="Press"
-                    Margin="5"
-                    VerticalAlignment="Center" />
-
-          <TextBlock Text="DisplayDefaultValueOnEmptyText:"
-                     Grid.Row="6"
-                     VerticalAlignment="Center" />
-          <CheckBox Grid.Row="6"
-                    Grid.Column="1"
-                    IsChecked="{Binding DisplayDefaultValueOnEmptyText, 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" />
-
-          <TextBlock Grid.Column="2"
-                     Grid.Row="5"
-                     Text="MaxLength"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <xctk:IntegerUpDown Grid.Column="3"
-                              Grid.Row="5"
-                              Minimum="0"
-                              MaxLength="10"
-                              Value="{Binding MaxLength, ElementName=_doubleUpDown}"
-                              VerticalAlignment="Center"
-                              HorizontalAlignment="Stretch"
-                              Margin="5" />
-
-          <!-- 3rd column -->
-          <TextBlock Grid.Column="4"
-                     Text="ButtonSpinnerLocation:"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <ComboBox Grid.Column="5"
-                    ItemsSource="{Binding Source={StaticResource ButtonSpinnerLocationComboBox}}"
-                    SelectedValue="{Binding ButtonSpinnerLocation, ElementName=_doubleUpDown}"
-                    HorizontalAlignment="Stretch"
-                    Margin="5" />
-
-          <TextBlock Grid.Column="4"
-                     Grid.Row="1"
-                     Text="ParsingNumberStyle:"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <ComboBox Grid.Column="5"
-                    Grid.Row="1"
-                    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="2"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <TextBox Grid.Column="5"
-                   Grid.Row="2"
-                   HorizontalAlignment="Stretch"
-                   Margin="5"
-                   Text="{Binding Watermark, ElementName=_doubleUpDown}" />
-
-          <TextBlock Text="Default Value:"
-                     Grid.Column="4"
-                     Grid.Row="3"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <xctk:DoubleUpDown Grid.Column="5"
-                             Grid.Row="3"
-                             Value="{Binding DefaultValue, ElementName=_doubleUpDown}"
-                             AllowInputSpecialValues="Any"
-                             VerticalAlignment="Center"
-                             HorizontalAlignment="Stretch"
-                             Margin="5" />
-
-          <TextBlock Text="Value:"
-                     Grid.Column="4"
-                     Grid.Row="4"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <xctk:DoubleUpDown Grid.Column="5"
-                             Grid.Row="4"
-                             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="5"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <TextBox Grid.Column="5"
-                   Grid.Row="5"
-                   Text="{Binding Text, ElementName=_doubleUpDown}"
-                   VerticalAlignment="Center"
-                   HorizontalAlignment="Stretch"
-                   Margin="5" />
-
-          <!-- last rows -->
-          <TextBlock Text="(DoubleUpDown and SingleUpDown support the AllowInputSpecialValues property)"
-                     Grid.Row="7"
-                     Grid.ColumnSpan="6"
-                     VerticalAlignment="Center"
-                     Margin="0,5,0,0" />
-          <TextBlock Text="Allow Input Special Values:"
-                     VerticalAlignment="Center"
-                     Grid.Row="8"
-                     Grid.ColumnSpan="2" />
-          <ComboBox Grid.Column="2"
-                    Grid.Row="8"
-                    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"
-                           AllowTextInput="True"
-                           IsReadOnly="False"
-                           MouseWheelActiveOnFocus="True"
-                           CultureInfo="en-US"
-                           FormatString="C2"
-                           Increment="0.5"
-                           Maximum="100"
-                           Minimum="0"
-                           MaxLength="0"
-                           DisplayDefaultValueOnEmptyText="False"
-                           ButtonSpinnerLocation="Right"
-                           ParsingNumberStyle="Any"
-                           Watermark="Enter Text"
-                           DefaultValue="10"
-                           Value="25" />
-      </StackPanel>
-
-      <TextBlock Grid.Row="2"
-                 Margin="10,15,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/CodeFiles/PieChartView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt
deleted file mode 100644
index a07464e2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.cs.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PieChartView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt
deleted file mode 100644
index 6bfe94ae..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PieProgressView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt
deleted file mode 100644
index 1554aa94..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.cs.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PieProgressView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt
deleted file mode 100644
index aacf2ed9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieProgressView.xaml.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="#FFC72035"
-                      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/CodeFiles/PieView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt
deleted file mode 100644
index 6a6d2329..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.cs.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PieView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt
deleted file mode 100644
index 47684bc5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieView.xaml.txt
+++ /dev/null
@@ -1,229 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="#FFC72035"
-                    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/CodeFiles/PileFlowPanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt
deleted file mode 100644
index 61624b9b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.cs.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PileFlowPanelView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt
deleted file mode 100644
index 1dd5d9d2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PileFlowPanelView.xaml.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/PropertyGridAttributesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt
deleted file mode 100644
index 6e331da6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.cs.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-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;
-    }
-  }
-
-  [CategoryOrder("Information", 0)]
-  [CategoryOrder( "Conections", 1 )]
-  [CategoryOrder( "Other", 2 )]
-  public abstract class Person : INotifyPropertyChanged
-  {
-    // 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; set; }
-
-    [Category( "Information" )]
-    [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class. In the Plus version, it also depends on the IsMale property to change its foreground and source." )]
-    [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
-    public string FirstName
-    {
-      get{ return _firstName; }
-      set{ _firstName = value; OnPropertyChanged( "FirstName" );}
-    }
-    private string _firstName;
-
-    [Category( "Information" )]
-    [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'LastNameUserControlEditor' user control." )]
-    [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )]
-    [DefaultValue("Friend")]
-    public string LastName
-    {
-      get{ return _lastName; }
-      set{ _lastName = value; OnPropertyChanged( "LastName" );}
-    }
-    private string _lastName;
-
-    [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 ) )]
-    [RefreshProperties( RefreshProperties.All )]    //This will reload the PropertyGrid
-    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;
-    }
-
-    [Range(0d, 10d)]
-    [Category( "Other" )]
-    [DefaultValue(5d)]
-    [Description( "This property uses the [Range(0,10)] and DefaultValue attributes to set the Minimum, Maximum and default properties." )]
-    public double RangeDouble
-    {
-      get;
-      set;
-    }
-
-    public override string ToString()
-    {
-      return FirstName + " " + LastName;
-    }
-
-    public event PropertyChangedEventHandler PropertyChanged;
-    protected void OnPropertyChanged( string propertyName )
-    {
-      if( PropertyChanged != null )
-      {
-        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
-      }
-    }
-  }
-
-  // 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
-  {
-    [Display( Name = "Favorite Sport"
-            , Prompt = "Enter your favorite sport"
-            , Description = "This property uses the Display attribute to set different PropertyItem fields."
-            , GroupName = "Information"
-            , AutoGenerateField = true
-            , AutoGenerateFilter = false )]
-    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/CodeFiles/PropertyGridAttributesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt
deleted file mode 100644
index 6ef4390a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAttributesView.xaml.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/>
-           CategoryOrderAttribute
-         <LineBreak/>
-           EditorAttribute
-         <LineBreak/>
-           NewItemTypesAttribute
-         <LineBreak/>
-           ExpandableObjectAttribute
-         <LineBreak/>
-           ItemsSourceAttribute
-         <LineBreak/>
-           PropertyOrderAttribute
-         <LineBreak/>
-           ParenthesizePropertyNameAttribute
-         <LineBreak/>
-         <LineBreak/>
-         Plus edition Only:
-         <LineBreak />
-         DependsOnAttribute
-         <LineBreak/>
-         (Not demoed here. See corresponding samples)
-         <LineBreak />
-         ExpandedCategoryAttribute
-         <LineBreak/>
-         DefinitionKeyAttribute
-         <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}"
-                         ShowDescriptionByTooltip="True">
-      </xctk:PropertyGrid>      
-
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt
deleted file mode 100644
index 22a7de24..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.cs.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridBindingToStructsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt
deleted file mode 100644
index 83832349..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridBindingToStructsView.xaml.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="*" />
-      </Grid.RowDefinitions>
-
-      <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" Grid.Row="1" 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/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt
deleted file mode 100644
index b3668f36..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.cs.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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();
-      _propertyGrid1.SelectedObject = PersonBase.InitPerson( new PersonNonOrdered() );
-      _propertyGrid2.SelectedObject = PersonBase.InitPerson( new PersonOrdered() );
-    }
-
-    [CategoryOrder( "Information", 1 )]
-    [CategoryOrder( "Hobbies", 2 )]
-    [CategoryOrder( "Connections", 3 )]
-    public class PersonOrdered : PersonBase { }
-
-    public class PersonNonOrdered : PersonBase { }
-
-    public abstract class PersonBase
-    {
-      [Category( "Information" )]
-      public string FirstName { get; set; }
-
-      [Category( "Information" )]
-      public string LastName { get; set; }
-
-      [Category( "Hobbies" )]
-      public bool Baseball { get; set; }
-
-      [Category( "Hobbies" )]
-      public bool Football { get; set; }
-
-      [Category( "Hobbies" )]
-      public bool Basketball { get; set; }
-
-      [Category( "Connections" )]
-      public string Father { get; set; }
-
-      [Category( "Connections" )]
-      public string Mother { get; set; }
-
-      [Category( "Connections" )]
-      public bool HasChildren { get; set; }
-
-      public static PersonBase InitPerson( PersonBase person )
-      {
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.Baseball = true;
-        person.Football = false;
-        person.Basketball = true;
-        person.Father = "William Doe";
-        person.Mother = "Jennifer Doe";
-        person.HasChildren = false;
-        return person;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt
deleted file mode 100644
index 9a3728a3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-        </Paragraph>
-    </local:DemoView.Description>
-
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="*" />
-         <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <Grid HorizontalAlignment="Right">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <TextBlock Text="Non-Ordered Categories:" FontSize="16" FontWeight="Bold" HorizontalAlignment="Stretch" Margin="10"/>
-         <xctk:PropertyGrid x:Name="_propertyGrid1" Grid.Row="1" Width="290" MaxHeight="350" VerticalAlignment="Top" Margin="10"/>
-      </Grid>
-
-      <Grid Grid.Column="1">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <TextBlock Grid.Column="1" Text="Ordered Categories:" FontSize="16" FontWeight="Bold" Margin="10"/>
-         <xctk:PropertyGrid x:Name="_propertyGrid2" Grid.Row="1" Grid.Column="1" Width="290" MaxHeight="350" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10"/>
-      </Grid>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt
deleted file mode 100644
index 26d73f2c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.cs.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridCustomEditorsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt
deleted file mode 100644
index 50b13b1b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomEditorsView.xaml.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt
deleted file mode 100644
index b55e83c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.cs.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridCustomPropertyView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt
deleted file mode 100644
index 9d5be674..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCustomPropertyView.xaml.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt
deleted file mode 100644
index 75bd2ed0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.cs.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.IO;
-using System.Windows;
-using System.Windows.Media;
-
-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.Decimal = ( decimal )2;
-      selectedObject.Double = (double)3;
-      selectedObject.Enum = HorizontalAlignment.Center;
-      selectedObject.FontFamily = new FontFamily( "Arial" );
-      selectedObject.FontStretch = FontStretches.Normal;
-      selectedObject.FontStyle = FontStyles.Italic;
-      selectedObject.FontWeight = FontWeights.Bold;
-      selectedObject.Guid = new Guid( "F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4" );
-      selectedObject.Char = 'T';
-      selectedObject.Int16 = ( short )4;
-      selectedObject.Int32 = (int)5;
-      selectedObject.Int64 = (long)6;
-      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.Dictionary = new Dictionary<int, System.Windows.Media.Color>() { { 22, System.Windows.Media.Color.FromRgb( 255, 0, 0 ) }, { 33, System.Windows.Media.Color.FromRgb( 0, 255, 0 ) } };
-      selectedObject.CollectionOfPerson = new Collection<Person>() { new Person() { Name = "Tom McNeil" }, new Person() { Name = "Mike Campbell" } };
-      selectedObject.Person = new Person() { Name = "John Smith" };
-      selectedObject.SByte = (sbyte) 7;
-      selectedObject.Single = (float)8;
-      selectedObject.String = "this is a string";
-      selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 );      
-      selectedObject.UInt16 = (ushort)9;
-      selectedObject.UInt32 = (uint)10;
-      selectedObject.UInt64 = (ulong)11;
-
-      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# decimal type) This property uses a Decimal as the default editor." )]
-      public decimal Decimal
-      {
-        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 TimeSpanUpDown as the default editor." )]
-      public System.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 Guid as the default editor." )]
-      public Guid Guid { get; set; }
-      [Category( "Non-Numeric Editors" )]
-      [Description( "This property uses a Char as the default editor." )]
-      public Char Char { 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( "(C# IDictionary<T> type) This property uses a CollectionEditor as the default editor." )]
-      public Dictionary<int, System.Windows.Media.Color> Dictionary { get; set; }
-      [Category( "Non-Numeric Editors" )]
-      [Description( "(C# ICollection<T> type) This property uses a CollectionEditor as the default editor." )]
-      public Collection<Person> CollectionOfPerson
-      {
-        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/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt
deleted file mode 100644
index 9ec0fdf4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt
deleted file mode 100644
index 909af452..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.cs.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt
deleted file mode 100644
index 8a04084b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefinitionKeyView.xaml.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt
deleted file mode 100644
index 0d9c5818..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.cs.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt
deleted file mode 100644
index 2d1e7504..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDisplayLocalizationView.xaml.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt
deleted file mode 100644
index eee49ab8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.cs.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-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/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt
deleted file mode 100644
index aaa65396..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorDefinitionsView.xaml.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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:sys="clr-namespace:System.IO;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 />
-         EditorFilePickerDefinition
-         <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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Toolkit Plus for WPF.
-            </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/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt
deleted file mode 100644
index dad71a07..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.cs.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for PropertyGridExpandingNonPrimitivesView.xaml
-  /// </summary>
-  public partial class PropertyGridExpandingNonPrimitivesView : DemoView
-  {
-    public PropertyGridExpandingNonPrimitivesView()
-    {
-      InitializeComponent();
-
-
-    }
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt
deleted file mode 100644
index 677711f1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridExpandingNonPrimitivesView.xaml.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridExpandingNonPrimitivesView"
-                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 allows you to expand non-primitive type properties from the SelectedObject to view or edit their sub-properties. It also allows you to expand collections or lists properties to view their items and drill down on these items properties, directly from the propertyGrid, instead of passing by the CollectionEditor.
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\ExpandingNonPrimitives.png" Width="660" Height="430"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt
deleted file mode 100644
index 71f78f25..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.cs.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt
deleted file mode 100644
index 01ccccb0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridMultiSelectedObjectsView.xaml.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-        </Paragraph>
-    </local:DemoView.Description>
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MultiSelectedObjects.png" Width="660" Height="430"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt
deleted file mode 100644
index 4b858199..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.cs.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt
deleted file mode 100644
index 3375009d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesSourceView.xaml.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt
deleted file mode 100644
index 85dcbe38..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.cs.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridPropertiesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt
deleted file mode 100644
index 62cce170..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertiesView.xaml.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt
deleted file mode 100644
index 8bd236a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.cs.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt
deleted file mode 100644
index 2294aa51..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridSelectedObjectView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.cs.txt
deleted file mode 100644
index 696ff77e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.cs.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridSelectedObjectView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt
deleted file mode 100644
index 22b4ba0e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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"
-                            IsVirtualizing="True"/>
-      </Grid>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt
deleted file mode 100644
index 32f17891..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.cs.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt
deleted file mode 100644
index ce5ade6a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSpecifyingPropertiesView.xaml.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>      
-      <xctk:PropertyGrid x:Name="_propertyGrid"
-                         Width="450" 
-                         MaxHeight="245"
-                         Margin="10"
-                         AutoGenerateProperties="False">
-
-         <xctk:PropertyGrid.PropertyDefinitions>
-            <!-- The following properties will be displayed in the PropertyGrid 
-                 Some properties' data will be overriden-->
-            <xctk:PropertyDefinition TargetProperties="FirstName,PetNames" DisplayOrder="0"/>
-            <xctk:PropertyDefinition TargetProperties="FavoriteColor"
-                                     DisplayName="Shirt Color"
-                                     Category="Clothes"
-                                     Description="The color of the Person's shirt can be changed with the ColorPicker."
-                                     IsExpandable="True">
-               <!--The following properties will be displayed in the "Shirt Color" expandable PropertyItem--> 
-               <xctk:PropertyDefinition.PropertyDefinitions>
-                  <xctk:PropertyDefinition TargetProperties="R,G,B"/>
-               </xctk:PropertyDefinition.PropertyDefinitions>
-            </xctk:PropertyDefinition>
-            <!-- And all properties of type Boolean will be displayed in the PropertyGrid-->
-            <xctk:PropertyDefinition TargetProperties="{x:Type s:Boolean}" DisplayOrder="1"/>
-
-            <!-- This Property won't be displayed -->
-             <xctk:PropertyDefinition TargetProperties="WritingHand" IsBrowsable="False"/>
-         </xctk:PropertyGrid.PropertyDefinitions>
-      </xctk:PropertyGrid>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt
deleted file mode 100644
index 063c4a3c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.cs.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt
deleted file mode 100644
index cddd8e63..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridView.xaml.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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" />
-          <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="Show Sumary:"
-                   VerticalAlignment="Center" />
-        <CheckBox Grid.Column="1"
-                  IsChecked="{Binding ShowSummary, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Shows/Hides the summary panel of the PropertyGrid." />
-        <TextBlock Text="Filter:"
-                   VerticalAlignment="Center"
-                   Grid.Row="1" />
-        <xctk:WatermarkTextBox Grid.Row="1"
-                               Grid.Column="1"
-                               Width="175"
-                               Watermark="Search"
-                               Text="{Binding Filter, ElementName=_propertyGrid, UpdateSourceTrigger=PropertyChanged}"
-                               VerticalAlignment="Center"
-                               Margin="5"
-                               ToolTip="Filters the properties within the PropertyGrid." />
-        <TextBlock Text="IsReadOnly:"
-                   VerticalAlignment="Center"
-                   Grid.Row="2"
-                   Grid.Column="0" />
-        <CheckBox Grid.Row="2"
-                  Grid.Column="1"
-                  IsChecked="{Binding IsReadOnly, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Set the IsReadOnly property to true or false." />
-        <TextBlock Text="ShowPreview:"
-                   VerticalAlignment="Center"
-                   Grid.Row="3"
-                   Grid.Column="0" />
-        <CheckBox Grid.Row="3"
-                  Grid.Column="1"
-                  IsChecked="{Binding ShowPreview, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Shows/Hides the selected object preview." />
-
-        <!--2nd column-->
-        <TextBlock Text="Is Categorized:"
-                   VerticalAlignment="Center"
-                   Grid.Column="2"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Column="3"
-                  IsChecked="{Binding IsCategorized, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Gets/Sets the layout of the PropertyGrid." />
-        <TextBlock Text="Is Misc Category Label Hidden:"
-                   VerticalAlignment="Center"
-                   Grid.Row="1"
-                   Grid.Column="2"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="1"
-                  Grid.Column="3"
-                  IsChecked="{Binding IsMiscCategoryLabelHidden, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Gets/Sets is the Misc Category label should be hidden." />
-        <TextBlock Text="Show Advanced Options:"
-                   VerticalAlignment="Center"
-                   Grid.Row="2"
-                   Grid.Column="2"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="2"
-                  Grid.Column="3"
-                  IsChecked="{Binding ShowAdvancedOptions, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Shows/Hides the advanced options menu next to a property." />
-        <TextBlock Text="UpdateTextBoxSourceOnEnterKey:"
-                   VerticalAlignment="Center"
-                   Grid.Row="3"
-                   Grid.Column="2"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="3"
-                  Grid.Column="3"
-                  IsChecked="{Binding UpdateTextBoxSourceOnEnterKey, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Update the source of a TextBox when True and Enter key is pressed." />
-
-        <!--Third Column-->
-        <TextBlock Text="Show Horizontal ScrollBar:"
-                   VerticalAlignment="Center"
-                   Grid.Column="4"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Column="5"
-                  IsChecked="{Binding ShowHorizontalScrollBar, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Gets/Sets if the horizontal scrollBar will be showned." />
-        <TextBlock Text="HideInheritedProperties:"
-                   VerticalAlignment="Center"
-                   Grid.Row="1"
-                   Grid.Column="4"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="1"
-                  Grid.Column="5"
-                  IsChecked="{Binding HideInheritedProperties, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="When True, inherited properties are hidden." />
-        <TextBlock Text="IsVirtualizing:"
-                   VerticalAlignment="Center"
-                   Grid.Row="2"
-                   Grid.Column="4"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="2"
-                  Grid.Column="5"
-                  IsChecked="{Binding IsVirtualizing, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Set if the PropertyGrid is using virtualization. Using virtualization will load the PropertyGrid faster with large dataSets." />
-      </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="True"
-                           Filter=""
-                           IsCategorized="True"
-                           ShowAdvancedOptions="True"
-                           IsReadOnly="False"
-                           IsVirtualizing="False"
-                           UpdateTextBoxSourceOnEnterKey="True"
-                           IsMiscCategoryLabelHidden="False"
-                           ShowPreview="True"
-                           HideInheritedProperties="False"
-                           ShowHorizontalScrollBar="False"
-                           SelectedObject="{Binding ElementName=_button}">
-        </xctk:PropertyGrid>
-      </Grid>
-    </DockPanel>
-  </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt
deleted file mode 100644
index 51045945..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.cs.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Xceed.Wpf.Toolkit;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views
-{
-  /// <summary>
-  /// Interaction logic for RadialGaugeView.xaml
-  /// </summary>
-  public partial class RadialGaugeView : DemoView
-  {
-    public RadialGaugeView()
-    {
-      InitializeComponent();
-    }
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt
deleted file mode 100644
index 8517a855..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RadialGaugeView.xaml.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views.RadialGaugeView"
-                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:win="clr-namespace:System.Windows.Media;assembly=WindowsBase"
-                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:toolConv="clr-namespace:Xceed.Wpf.Toolkit.Converters;assembly=Xceed.Wpf.Toolkit"
-                Title="Radial Gauge">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The RadialGauge is a fully customizable gauge that can be used to display a current value on a radial or partially radial scaled circle. Markers can be added to highlight specific values. Background portions or border portions of the Radial gauge can also be customized and the pointer can be animated when moving from one value to a new one.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\Gauge.png" Width="600" Height="400"/>
-
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt
deleted file mode 100644
index aeb93258..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.cs.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Controls;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views
-{
-  /// <summary>
-  /// Interaction logic for RangeSliderView.xaml
-  /// </summary>
-  public partial class RangeSliderView : DemoView
-  {
-    public RangeSliderView()
-    {
-      InitializeComponent();
-    }
-
-    private void RangeStyleComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem)
-      {
-        ComboBoxItem item = e.AddedItems[ 0 ] as ComboBoxItem;
-        //A style different from null is chosen
-        if( item.Tag != null )
-        {
-          //LowerRangeBackground is Transparent, force a color
-          if( object.Equals( sender, lowerRangeStyleComboBox ) && ((SolidColorBrush)_rangeSlider.LowerRangeBackground).Color.Equals( Colors.Transparent) )
-          {
-            _rangeSlider.LowerRangeBackground = new SolidColorBrush( Colors.Green );
-          }
-          //RangeBackground is Transparent, force a color
-          else if( object.Equals( sender, rangeStyleComboBox ) && ( ( SolidColorBrush )_rangeSlider.RangeBackground ).Color.Equals( Colors.Transparent ) )
-          {
-            _rangeSlider.RangeBackground = new SolidColorBrush( Colors.Blue );
-          }
-          //HigherRangeBackground is Transparent, force a color
-          else if( object.Equals( sender, higherRangeStyleComboBox ) && ( ( SolidColorBrush )_rangeSlider.HigherRangeBackground ).Color.Equals( Colors.Transparent ) )
-          {
-            _rangeSlider.HigherRangeBackground = new SolidColorBrush( Colors.Green );
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt
deleted file mode 100644
index 3439c940..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt
+++ /dev/null
@@ -1,817 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views.RangeSliderView"
-                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:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters"
-                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                Title="RangeSlider">
-
-   <local:DemoView.Resources>
-
-      <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      <conv:AbsoluteAdditionConverter x:Key="AbsoluteAdditionConverter"/>
-      <conv:RangeSliderEnabledConverter x:Key="RangeSliderEnabledConverter"/>
-
-      <ObjectDataProvider x:Key="TickPlacement"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="TickPlacement" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <ObjectDataProvider x:Key="AutoToolTipPlacement"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="AutoToolTipPlacement" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <Style x:Key="LowerRangeStyle1"
-             TargetType="{x:Type RepeatButton}">
-
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate  TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-
-      </Style>
-
-      <Style x:Key="LowerRangeStyle2"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Ellipse x:Name="MainBorder"
-                              Fill="{TemplateBinding Background}"
-                              Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="LowerRangeStyle3"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="19">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                     <StackPanel x:Name="HorizontalContentPanel"
-                                 Orientation="Horizontal"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Center">
-                        <TextBlock x:Name="TextContentMin"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=Minimum, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                        <TextBlock  Text=" - "
-                                    Foreground="Turquoise"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                        <TextBlock x:Name="TextContentLower"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=LowerValue, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                     </StackPanel>
-                     <StackPanel x:Name="VerticalContentPanel"
-                                 Orientation="Vertical"
-                                 Visibility="Collapsed"
-                                 VerticalAlignment="Center">
-                        <TextBlock Text="L"
-                                   Foreground="White" />
-                     </StackPanel>
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="30" />
-                        <Setter Property="Visibility"
-                                TargetName="VerticalContentPanel"
-                                Value="Visible" />
-                        <Setter Property="Visibility"
-                                TargetName="HorizontalContentPanel"
-                                Value="Collapsed" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="RangeStyle1"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate  TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="RangeStyle2"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Ellipse x:Name="MainBorder"
-                              Fill="{TemplateBinding Background}" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="RangeStyle3"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="19">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                     <StackPanel x:Name="HorizontalContentPanel"
-                                 Orientation="Horizontal"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Center">
-                        <TextBlock x:Name="TextContentLower"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=LowerValue, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                        <TextBlock  Text=" - "
-                                    Foreground="Turquoise"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                        <TextBlock x:Name="TextContentHigher"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=HigherValue, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                     </StackPanel>
-                     <StackPanel x:Name="VerticalContentPanel"
-                                 Orientation="Vertical"
-                                 Visibility="Collapsed"
-                                 VerticalAlignment="Center">
-                        <TextBlock Text="R"
-                                   Foreground="White" />
-                     </StackPanel>
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="TextContentLower"
-                                Property="Foreground"
-                                Value="Fuchsia" />
-                        <Setter TargetName="TextContentHigher"
-                                Property="Foreground"
-                                Value="Fuchsia" />
-                     </Trigger>
-
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="30" />
-                        <Setter Property="Visibility"
-                                TargetName="VerticalContentPanel"
-                                Value="Visible" />
-                        <Setter Property="Visibility"
-                                TargetName="HorizontalContentPanel"
-                                Value="Collapsed" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="HigherRangeStyle1"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate  TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="HigherRangeStyle2"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Ellipse x:Name="MainBorder"
-                              Fill="{TemplateBinding Background}"
-                              Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="HigherRangeStyle3"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="19">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                     <StackPanel x:Name="HorizontalContentPanel"
-                                 Orientation="Horizontal"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Center">
-                        <TextBlock x:Name="TextContentHigher"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=HigherValue, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                        <TextBlock  Text=" - "
-                                    Foreground="Turquoise"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                        <TextBlock x:Name="TextContentMax"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=Maximum, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                     </StackPanel>
-                     <StackPanel x:Name="VerticalContentPanel"
-                                 Orientation="Vertical"
-                                 Visibility="Collapsed"
-                                 VerticalAlignment="Center">
-                        <TextBlock Text="H"
-                                   Foreground="White" />
-                     </StackPanel>
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="30" />
-                        <Setter Property="Visibility"
-                                TargetName="VerticalContentPanel"
-                                Value="Visible" />
-                        <Setter Property="Visibility"
-                                TargetName="HorizontalContentPanel"
-                                Value="Collapsed" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-   </local:DemoView.Resources>
-
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         The RangeSlider control lets you set a range with 2 slider thumbs. The lower limit is marked with the right side of the left thumb while the higher limit is marked with the left side of the right thumb.
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="300" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                Grid.Row="0"
-                Margin="5">
-         <Grid Margin="5">
-            <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="75" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="160" />
-               <ColumnDefinition Width="105" />
-               <ColumnDefinition Width="155" />
-               <ColumnDefinition Width="105" />
-            </Grid.ColumnDefinitions>
-
-            <!-- Column 1 -->
-            <TextBlock Text="Minimum:"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Grid.Column="1"
-                               Value="{Binding Minimum, ElementName=_rangeSlider}"
-                               FormatString="0.00"
-                               Increment="{Binding Step, ElementName=_rangeSlider}"
-                               VerticalAlignment="Center"
-                               Margin="5" />
-
-            <TextBlock Text="Maximum:"
-                       Grid.Row="1"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Value="{Binding Maximum, ElementName=_rangeSlider}"
-                               Grid.Row="1"
-                               Grid.Column="1"
-                               FormatString="0.00"
-                               Increment="{Binding Step, ElementName=_rangeSlider}"
-                               VerticalAlignment="Center"
-                               Margin="5" />
-
-            <TextBlock Text="Lower Value:"
-                       Grid.Row="2"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Value="{Binding LowerValue, ElementName=_rangeSlider }"
-                               Grid.Row="2"
-                               Grid.Column="1"
-                               FormatString="0.00"
-                               Increment="{Binding Step, ElementName=_rangeSlider}"
-                               VerticalAlignment="Center"
-                               Margin="5" />
-
-            <TextBlock Text="Higher Value:"
-                       Grid.Row="3"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Value="{Binding HigherValue, ElementName=_rangeSlider}"
-                               Grid.Row="3"
-                               Grid.Column="1"
-                               FormatString="0.00"
-                               Increment="{Binding Step, ElementName=_rangeSlider}"
-                               VerticalAlignment="Center"
-                               Margin="5" />
-
-            <TextBlock Text="Step:"
-                       Grid.Row="4"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Value="{Binding Step, ElementName=_rangeSlider}"
-                               Grid.Row="4"
-                               Grid.Column="1"
-                               FormatString="0.00"
-                               VerticalAlignment="Center"
-                               Margin="5"
-                               ToolTip="Identify the RangeSlider's size of individual move, when clicking on the LowerRange or HigherRange."/>
-
-            <TextBlock Text="Orientation:"
-                       Grid.Row="5"
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Row="5"
-                      Grid.Column="1"
-                      SelectedIndex="0"
-                      SelectedValue="{Binding Orientation, ElementName=_rangeSlider}"
-                      SelectedValuePath="Content"
-                      VerticalAlignment="Center"
-                      Margin="5">
-               <ComboBoxItem Content="Horizontal" />
-               <ComboBoxItem Content="Vertical" />
-            </ComboBox>
-
-            <!-- Column 2 -->
-            <TextBlock Text="Lower Thumb Background:"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Column="3"
-                              SelectedColor="{Binding LowerThumbBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Higher Thumb Background:"
-                       Grid.Row="1"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Row="1"
-                              Grid.Column="3"
-                              SelectedColor="{Binding HigherThumbBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Lower Range Background:"
-                       Grid.Row="2"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Row="2"
-                              Grid.Column="3"
-                              SelectedColor="{Binding LowerRangeBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Range Background:"
-                       Grid.Row="3"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Row="3"
-                              Grid.Column="3"
-                              SelectedColor="{Binding RangeBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Higher Range Background:"
-                       Grid.Row="4"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Row="4"
-                              Grid.Column="3"
-                              SelectedColor="{Binding HigherRangeBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Auto ToolTip Placement:"
-                       Grid.Row="5"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox Grid.Row="5"
-                      Grid.Column="3"
-                      ItemsSource="{Binding Source={StaticResource AutoToolTipPlacement}}"
-                      SelectedItem="{Binding AutoToolTipPlacement, ElementName=_rangeSlider}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/sets whether a tooltip that contains the current value of a RangeSlider's Thumb displays when the Thumb is pressed. If a tooltip is displayed, this property also specifies the placement of the tooltip.">
-            </ComboBox>
-
-            <TextBlock Text="Auto ToolTip Precision:"
-                       Grid.Row="6"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:IntegerUpDown Value="{Binding AutoToolTipPrecision, ElementName=_rangeSlider}"
-                                Grid.Row="6"
-                                Grid.Column="3"
-                                Minimum="0"
-                                Maximum="10"
-                                VerticalAlignment="Center"
-                                Margin="5"
-                                ToolTip="Gets/sets the number of digits that are displayed to the right side of the decimal point for the Value of a RangeSlider's Thumb in a tooltip." />
-
-            <!-- Column 3 -->
-            <TextBlock Text="Lower Range Style:"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox x:Name="lowerRangeStyleComboBox"
-                      Grid.Column="5"
-                      SelectedIndex="0"
-                      SelectedValue="{Binding LowerRangeStyle, ElementName=_rangeSlider}"
-                      SelectedValuePath="Tag"
-                      SelectionChanged="RangeStyleComboBox_SelectionChanged"
-                      VerticalAlignment="Center"
-                      Margin="5">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Style 1"
-                             Tag="{StaticResource LowerRangeStyle1}" />
-               <ComboBoxItem Content="Style 2"
-                             Tag="{StaticResource LowerRangeStyle2}" />
-               <ComboBoxItem Content="Style 3"
-                             Tag="{StaticResource LowerRangeStyle3}" />
-            </ComboBox>
-
-            <TextBlock Text="Range Style:"
-                       Grid.Row="1"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox x:Name="rangeStyleComboBox"
-                      Grid.Row="1"
-                      Grid.Column="5"
-                      SelectedIndex="0"
-                      SelectedValue="{Binding RangeStyle, ElementName=_rangeSlider}"
-                      SelectedValuePath="Tag"
-                      SelectionChanged="RangeStyleComboBox_SelectionChanged"
-                      VerticalAlignment="Center"
-                      Margin="5">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Style 1"
-                             Tag="{StaticResource RangeStyle1}" />
-               <ComboBoxItem Content="Style 2"
-                             Tag="{StaticResource RangeStyle2}" />
-               <ComboBoxItem Content="Style 3"
-                             Tag="{StaticResource RangeStyle3}" />
-            </ComboBox>
-
-            <TextBlock Text="Higher Range Style:"
-                       Grid.Row="2"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox x:Name="higherRangeStyleComboBox"
-                      Grid.Row="2"
-                      Grid.Column="5"
-                      SelectedIndex="0"
-                      SelectedValue="{Binding HigherRangeStyle, ElementName=_rangeSlider}"
-                      SelectedValuePath="Tag"
-                      SelectionChanged="RangeStyleComboBox_SelectionChanged"
-                      VerticalAlignment="Center"
-                      Margin="5">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Style 1"
-                             Tag="{StaticResource HigherRangeStyle1}" />
-               <ComboBoxItem Content="Style 2"
-                             Tag="{StaticResource HigherRangeStyle2}" />
-               <ComboBoxItem Content="Style 3"
-                             Tag="{StaticResource HigherRangeStyle3}" />
-            </ComboBox>
-
-            <TextBlock Text="Is Deferred Update Values:"
-                       Grid.Row="3"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <CheckBox Grid.Row="3"
-                      Grid.Column="5"
-                      IsChecked="{Binding IsDeferredUpdateValues, ElementName=_rangeSlider}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets if the LowerValue and HigherValue should be updated only on mouse up." />
-
-            <TextBlock Text="Is Snap To Tick Enabled:"
-                       Grid.Row="4"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <CheckBox Grid.Row="4"
-                      Grid.Column="5"
-                      IsChecked="{Binding IsSnapToTickEnabled, ElementName=_rangeSlider}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/sets a value that indicates whether the RangeSlider automatically moves the selected Thumb to the closest tick mark." />
-
-            <TextBlock Text="Tick Placement:"
-                       Grid.Row="5"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox x:Name="_tickPlacementComboBox"
-                      Grid.Row="5"
-                      Grid.Column="5"
-                      ItemsSource="{Binding Source={StaticResource TickPlacement}}"
-                      SelectedItem="{Binding TickPlacement, ElementName=_rangeSlider}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/sets the position of tick marks with respect to the Track of the RangeSlider.">
-            </ComboBox>
-
-            <TextBlock Text="Tick Frequency:"
-                       Grid.Row="6"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5"
-                       IsEnabled="{Binding IsEnabled, ElementName=_tickFrequency}"
-                       Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown x:Name="_tickFrequency"
-                               Value="{Binding TickFrequency, ElementName=_rangeSlider}"
-                               Grid.Row="6"
-                               Grid.Column="5"
-                               FormatString="0.00"
-                               Minimum="0"
-                               VerticalAlignment="Center"
-                               Margin="5"
-                               ToolTip="Gets/sets the interval between tick marks."
-                               IsEnabled="{Binding SelectedItem, ElementName=_tickPlacementComboBox, Converter={StaticResource RangeSliderEnabledConverter}}">
-               <xctk:DoubleUpDown.Maximum>
-                  <MultiBinding Converter="{StaticResource AbsoluteAdditionConverter}">
-                     <Binding ElementName="_rangeSlider"
-                              Path="Minimum" />
-                     <Binding ElementName="_rangeSlider"
-                              Path="Maximum" />
-                  </MultiBinding>
-               </xctk:DoubleUpDown.Maximum>
-            </xctk:DoubleUpDown>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1"
-                  Margin="10">
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-         <xctk:RangeSlider x:Name="_rangeSlider"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center"
-                           Minimum="0"
-                           Maximum="100"
-                           LowerValue="30"
-                           HigherValue="70"
-                           Step="1"
-                           Orientation="Horizontal"
-                           LowerThumbBackground="#FFF0F0F0"
-                           HigherThumbBackground="#FFF0F0F0"
-                           RangeBackground="Transparent"
-                           HigherRangeBackground="Transparent"
-                           LowerRangeBackground="Transparent"
-                           HigherRangeStyle="{x:Null}"
-                           RangeStyle="{x:Null}"
-                           LowerRangeStyle="{x:Null}"
-                           IsDeferredUpdateValues="False"
-                           IsSnapToTickEnabled="False"
-                           TickPlacement="None"
-                           TickFrequency="1"
-                           AutoToolTipPlacement="None"
-                           AutoToolTipPrecision="0">
-            <xctk:RangeSlider.Resources>
-               <Style TargetType="xctk:RangeSlider">
-                  <Style.Triggers>
-                     <Trigger Property="Orientation"
-                              Value="Horizontal">
-                        <Setter Property="Width"
-                                Value="600" />
-                     </Trigger>
-                     <Trigger Property="Orientation"
-                              Value="Vertical">
-                        <Setter Property="Height"
-                                Value="225" />
-                     </Trigger>
-                  </Style.Triggers>
-               </Style>
-            </xctk:RangeSlider.Resources>
-         </xctk:RangeSlider>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt
deleted file mode 100644
index ac3af92c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.cs.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Rating.Views
-{
-  /// <summary>
-  /// Interaction logic for RatingView.xaml
-  /// </summary>
-  public partial class RatingView : DemoView
-  {
-    public RatingView()
-    {
-      InitializeComponent();
-    }
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt
deleted file mode 100644
index 8159f4b5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RatingView.xaml.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views.RatingView"
-                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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                Title="Rating">
-
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The Rating control fills icons to represent a value on a scale. It can be interactive and is also fully customizable.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\Rating.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt
deleted file mode 100644
index 0f97e22a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.cs.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/RichTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt
deleted file mode 100644
index 516f1751..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RichTextboxView.xaml.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/SlideShowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt
deleted file mode 100644
index 80c1eacf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.cs.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Collections.ObjectModel;
-using System.ComponentModel;
-using Xceed.Wpf.Samples.SampleData;
-using System.Windows.Media.Imaging;
-using System.IO;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views
-{
-    /// <summary>
-    /// Interaction logic for SlideShow.xaml
-    /// </summary>
-    public partial class SlideShowView : DemoView
-    {
-        public SlideShowView()
-        {
-            InitializeComponent();
-
-
-        }
-
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt
deleted file mode 100644
index bfce3417..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views.SlideShowView"
-                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:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters;assembly=Xceed.Wpf.Toolkit"
-                Title="SlideShow">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The SlideShow is used to display SlideShowItems in a fashion similar to a diaporama. SlideShowItems are not limited to images and can be built using any UIElement.</Run>
-            <LineBreak />
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\SlideShow.png" Width="600" Height="280"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt
deleted file mode 100644
index e6a0d8ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.cs.txt
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 StyleableWindowView.xaml
-  /// </summary>
-  public partial class StyleableWindowView : DemoView
-  {
-    private const string StandardMsgBoxTitle = "Standard MessageBox";
-    private const string StyledMsgBoxTitle = "Toolkit for WPF styled MessageBox";
-    private const string StyleableWindowTitle = "Toolkit for WPF StyleableWindow";
-    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 StyleableWindowContent = "This is a StyleableWindow 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 StyleableWindowMessage = "StyleableWindow is a standalone window that can be styled just like ChildWindow or MessageBox. This is a feature of the \"Plus\" version.";
-
-    public StyleableWindowView()
-    {
-      InitializeComponent();
-      this.UpdateWindowsStyles(null,null);
-    }
-
-
-    private void OnStyleableWindow_Click( object sender, RoutedEventArgs e )
-    {
-      var msgBox = new Xceed.Wpf.Toolkit.MessageBox();
-      msgBox.DataContext = this.DataContext;
-      msgBox.Text = StyleableWindowMessage;
-      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 StyleableWindow 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 TitleFontSize
-
-    public static readonly DependencyProperty TitleFontSizeProperty =
-        DependencyProperty.Register( "TitleFontSize", typeof( double ), typeof( WindowModel ) );
-
-    public double TitleFontSize
-    {
-      get
-      {
-        return (double)GetValue( TitleFontSizeProperty );
-      }
-      set
-      {
-        SetValue( TitleFontSizeProperty, value );
-      }
-    }
-
-    #endregion //TitleFontSize
-
-    #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/CodeFiles/StyleableWindowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt
deleted file mode 100644
index abbf2cd5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.StyleableWindowView"
-                 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="StyleableWindows" >
-   <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 StyleableWindow, 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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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="CaptionFontSize" Value="{Binding TitleFontSize}" />
-            <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 StyleableWindow.-->
-      <view:WindowModel
-         WindowBackground="#FFC72035"
-         WindowBorderBrush="Black"
-         WindowBorderThickness="2"
-         WindowInactiveBackground="LightGray"
-         WindowOpacity="0.75"
-         WindowStyle="SingleBorderWindow"
-         TitleForeground="Brown"
-         TitleShadowBrush="White"
-         TitleFontSize="15"
-         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="Styleable Window" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch" >
-               <Button Width="160" Height="30" Margin="10" HorizontalAlignment="Center"
-                       Content="Show" Click="OnStyleableWindow_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="Toolkit for WPF 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/CodeFiles/SwitchPanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt
deleted file mode 100644
index 61c45dfd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt
+++ /dev/null
@@ -1,208 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
-
-  }
-
-
-  public class Coordinates
-  {
-    public double X
-    {
-      get;
-      set;
-    }
-    public double Y
-    {
-      get;
-      set;
-    }
-
-    public override string ToString()
-    {
-      return "(" + this.X + ", " + this.Y + ")";
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt
deleted file mode 100644
index 621016f5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.txt
+++ /dev/null
@@ -1,368 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************-->
-<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: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:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters"
-                 xmlns:s="clr-namespace:System;assembly=mscorlib"
-                 xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views"
-                 VerticalScrollBarVisibility="Disabled"
-                 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="#FFC72035" />
-         <Setter Property="Foreground" Value="White" />
-         <Setter Property="Margin" Value="5" />
-         <Setter Property="Width" Value="100" />
-         <Setter Property="Height" Value="100" />
-         <Setter Property="TextAlignment" Value="Center" />
-      </Style>
-
-      <ObjectDataProvider x:Key="orientationCombo" MethodName="GetValues" ObjectType="{x:Type s:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Orientation" />
-            </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>
-
-      <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"/>
-         <Setter Property="ContentTemplate">
-            <Setter.Value>
-               <DataTemplate>
-                  <DockPanel>
-                     <TextBlock DockPanel.Dock="Left" Text="{Binding}" />
-                     <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-                  </DockPanel>
-               </DataTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <s:String x:Key="wrapPanelDescription">Positions elements from left to right or up to down depending on the orientation and the available space. Breaks the content at the end of the line to wrap items to the next line.</s:String>
-      <s:String x:Key="randomPanelDescription">This panel lays out its children with a random location and size.</s:String>
-      <s:String x:Key="canvasPanelDescription">Exactly like WPF's native Canvas panel, except that this panel can animate its children and be used inside a SwitchPanel.</s:String>
-      <s:String x:Key="carouselDescription">Positions the elements in a carousel mode with a centered element in front.</s:String>
-      <s:String x:Key="dockPanelDescription">Exactly like WPF's native DockPanel, except that this panel can animate its children and be used inside a SwitchPanel.</s:String>
-      <s:String x:Key="gridDescription">Exactly like WPF's native Grid panel, except that this panel can animate its children and be used inside a SwitchPanel.</s:String>
-      <s:String x:Key="stackPanelDescription">Exactly like WPF's native StackPanel, except this panel can animate its children and be used inside SwitchPanel.</s:String>
-      <s:String x:Key="stackedStackPanelDescription">Lays out children in a series of stacked stackpanels.</s:String>
-      <s:String x:Key="autoStretchStackPanelDescription">This panel stretches the children in the orientation direction so that they completely fill the panel area.</s:String>
-      <s:String x:Key="relativeCanvasDescription">A Panel which is similar to Canvas but it lays out its children relative to the panel's height and width.</s:String>
-      <s:String x:Key="radialCanvasDescription">Lays out its children in a circle based on panel size and/or properties set.</s:String>
-      <s:String x:Key="cameraPanelDescription">"CameraPanel lays out its children in a 3D-like space. You can give the children a 3D location and set the camera position for the panel.</s:String>
-      <s:String x:Key="perspectivePanelDescription">Perspective panel positions its children in a perspective view with the possibility of rotating the background children.</s:String>
-      <s:String x:Key="animatedTimelinePanelDescription">Defines an area where items are positioned on a timeline.</s:String>
-
-            <conv:ComboBoxToVisibilityConverter x:Key="comboBoxToVisibilityConverter" />
-
-
-
-
-
-
-
-
-
-
-
-
-   </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="Layout:" Margin="0,0,5,0" />
-            <ComboBox x:Name="layoutCombo" SelectedIndex="0" Width="250" SelectionChanged="OnLayoutComboSelectionChanged">
-               <ComboBoxItem>WrapPanel</ComboBoxItem>
-               <ComboBoxItem>RandomPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">Canvas</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">Carousel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">DockPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">Grid</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">StackPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">StackedStackPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">AutoStretchStackPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">RelativeCanvas</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">RadialCanvas</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">CameraPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">PerspectivePanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">AnimatedTimelinePanel</ComboBoxItem>
-            </ComboBox>
-         </Grid>
-      </GroupBox>
-
-      <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="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" />
-            </xctk:SwitchPanel.Layouts>
-            <TextBlock x:Name="_item1" Text="Item #1" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item2" Text="Item #2" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item3" Text="Item #3" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item4" Text="Item #4" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item5" Text="Item #5" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item6" Text="Item #6" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item7" Text="Item #7" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item8" Text="Item #8" Style="{StaticResource panelElement}"/>
-         </xctk:SwitchPanel>
-
-         <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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-                    Click here for more details about Xceed Toolkit Plus for WPF.
-                 </Hyperlink>
-             </TextBlock>
-         </StackPanel>
-
-         <GroupBox Header="WrapPanel Toolbox" 
-                   Background="White"
-                   Grid.Row="3" 
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=0}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                            Text="{StaticResource wrapPanelDescription}" 
-                            Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                            Text="Resize the Window to animate the WrapPanel." 
-                            Margin="10,0" />
-
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Text="Orientation:" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource orientationCombo}}" 
-                              SelectedItem="{Binding Orientation, ElementName=_wrapPanel}"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Grid.Row="1" Text="Is Child Order Reversed:" VerticalAlignment="Center"/>
-                    <CheckBox Grid.Row="1" 
-                              Grid.Column="1" 
-                              IsChecked="{Binding IsChildOrderReversed, ElementName=_wrapPanel}" 
-                              ClickMode="Press" 
-                              VerticalAlignment="Center"
-                              Margin="5"/>
-                    <TextBlock Grid.Column="2" Text="Item Width:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <xctk:DoubleUpDown Grid.Column="3" 
-                                       Value="{Binding ItemWidth, ElementName=_wrapPanel}"
-                                       AllowInputSpecialValues="NaN"
-                                       Width="100"
-                                       Height="20"
-                                       Minimum="0"
-                                       Style="{StaticResource controlInError}"
-                                       VerticalAlignment="Center"
-                                       Margin="5"/>
-                    <TextBlock Grid.Column="2" Grid.Row="1" Text="Item Height:" VerticalAlignment="Center" Margin="10,0,0,0" />
-                    <xctk:DoubleUpDown Grid.Column="3" 
-                                       Grid.Row="1"
-                                       Value="{Binding ItemHeight, ElementName=_wrapPanel}" 
-                                       AllowInputSpecialValues="NaN"
-                                       Width="100"
-                                       Height="20"
-                                       Minimum="0"
-                                       Style="{StaticResource controlInError}"
-                                       VerticalAlignment="Center"
-                                       Margin="5"/>
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-
-         <GroupBox Header="RandomPanel Toolbox" 
-                   Background="White"
-                   Grid.Row="3" 
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=1}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource randomPanelDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Modify the Minimum and Maximum values to affect the children size." 
-                           Margin="10,0" />
-
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Text="Minimum Width:" VerticalAlignment="Center"/>
-                    <xctk:DoubleUpDown x:Name="_minimumWidth"
-                                       Grid.Column="1"
-                                       Value="{Binding MinimumWidth, ElementName=_randomPanel, ValidatesOnExceptions=True}"
-                                       AllowInputSpecialValues="None"
-                                       Minimum="0"
-                                       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 x:Name="_maximumWidth"
-                                       Grid.Column="1"
-                                       Grid.Row="1"
-                                       Value="{Binding MaximumWidth, ElementName=_randomPanel, ValidatesOnExceptions=True}"
-                                       AllowInputSpecialValues="None"
-                                       Minimum="{Binding Value, ElementName=_minimumWidth}"
-                                       Maximum="100"
-                                       Width="100"
-                                       Height="20"
-                                       Style="{StaticResource controlInError}"
-                                       VerticalAlignment="Center"
-                                       Margin="5" />
-                    <TextBlock Grid.Column="2" Text="Minimum Height:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <xctk:DoubleUpDown x:Name="_minimumHeight"
-                                       Grid.Column="3" 
-                                       Value="{Binding MinimumHeight, ElementName=_randomPanel, ValidatesOnExceptions=True}"
-                                       AllowInputSpecialValues="None"
-                                       Minimum="0"
-                                       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 x:Name="_maximumHeight"
-                                       Grid.Column="3" 
-                                       Grid.Row="1"
-                                       Value="{Binding MaximumHeight, ElementName=_randomPanel, ValidatesOnExceptions=True}" 
-                                       AllowInputSpecialValues="None"
-                                       Minimum="{Binding Value, ElementName=_minimumHeight}"
-                                       Maximum="100"
-                                       Width="100"
-                                       Height="20"
-                                       Style="{StaticResource controlInError}"
-                                       VerticalAlignment="Center"
-                                       Margin="5"/>
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-     </Grid>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt
deleted file mode 100644
index 67eb9b0d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.cs.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.IO;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
-{
-  /// <summary>
-  /// Interaction logic for ThemingAvalonDockView.xaml
-  /// </summary>
-  public partial class ThemingAvalonDockView : DemoView
-  {
-
-
-
-    #region constructors
-
-    public ThemingAvalonDockView()
-    {
-      this.Initialized += new EventHandler( AvalonDockControlsThemes_Initialized );
-      InitializeComponent();
-    }
-
-    #endregion
-
-    #region EventHandlers
-
-    private void DefaultComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      AvalonDockComboBoxItem comboBoxItem = sender as AvalonDockComboBoxItem;
-
-      if( comboBoxItem != null )
-      {
-        this.SetOpenSourceImage( comboBoxItem );
-      }
-    }
-
-    private void AvalonDockControlsThemes_Initialized( object sender, EventArgs e )
-    {
-      _themeCombo.SelectedIndex = 0;
-    }
-
-    private void MetroComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      AvalonDockComboBoxItem comboBoxItem = sender as AvalonDockComboBoxItem;
-      if( comboBoxItem != null )
-      {
-        this.SetOpenSourceImage( comboBoxItem );
-      }
-    }
-
-
-
-
-
-
-
-
-
-    #endregion
-
-    #region private Methods
-
-
-     private void SetOpenSourceImage( AvalonDockComboBoxItem comboBoxItem )
-    {
-      if( comboBoxItem != null )
-      {
-        bool isPlusPanel = ( comboBoxItem.ThemeEnum == AvalonDockThemesEnum.Office2007Black 
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.Office2007Blue
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.Office2007Silver
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.Windows10
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.MetroDark
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.MetroLight );
-
-        if( _openSourceScreenShot != null )
-          _openSourceScreenShot.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
-        if( _openSourceTextHyperlink != null )
-          _openSourceTextHyperlink.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
-        if( _dockingManager != null )
-          _dockingManager.Visibility = isPlusPanel ? Visibility.Collapsed : Visibility.Visible;
-
-        if( isPlusPanel )
-        {
-          BitmapImage bitmapImage = new BitmapImage();
-
-          bitmapImage.BeginInit();
-          switch( comboBoxItem.ThemeEnum )
-          {
-            case AvalonDockThemesEnum.Office2007Black:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockOffice2007Black.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.Office2007Blue:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockOffice2007Blue.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.Office2007Silver:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockOffice2007Silver.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.Windows10:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockWindows10.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.MetroDark:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockMetroDark.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.MetroLight:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockMetroLight.png", UriKind.Relative );
-              break;
-            default:
-              throw new InvalidDataException( "LayoutcomboBox.SelectedIndex is not valid." );
-          }
-          bitmapImage.EndInit();
-
-          if( _openSourceScreenShot != null )
-            _openSourceScreenShot.Source = bitmapImage;
-        }
-      }
-    }
-
-
-
-
-
-
-    #endregion
-  }
-
-
-  public enum AvalonDockThemesEnum
-  {
-    Generic,
-    Aero,
-    VS2010,
-    Metro,
-    Office2007Black,
-    Office2007Blue,
-    Office2007Silver,
-    Windows10,
-    MetroDark,
-    MetroLight
-  }
-
-  public class AvalonDockComboBoxItem : ComboBoxItem
-  {
-    public AvalonDockThemesEnum ThemeEnum
-    {
-      get;
-      set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt
deleted file mode 100644
index 3a9b2773..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingAvalonDockView.xaml.txt
+++ /dev/null
@@ -1,319 +0,0 @@
-<!--***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingAvalonDockView"
-                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
-                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                xmlns:s="clr-namespace:System;assembly=mscorlib"
-                xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views"
-                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                Title="Theming AvalonDock"
-                x:Name="_demo">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>Changes the themes of the AvalonDock controls. Available themes are System, Aero, VS2010, Metro, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.AvalonDock.Themes.xxx.dll assemblies are necessary to use these themes.</Run>
-            <LineBreak />
-            <Run>Some features of this sample are only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../ItemTemplates/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-
-
-
-      <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" />
-         <Setter Property="ContentTemplate">
-            <Setter.Value>
-               <DataTemplate>
-                  <DockPanel>
-                     <TextBlock DockPanel.Dock="Left"
-                                Text="{Binding}" />
-                     <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-                  </DockPanel>
-               </DataTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="plusNewItem"
-             TargetType="ComboBoxItem">
-         <Setter Property="HorizontalContentAlignment"
-                 Value="Stretch" />
-         <Setter Property="ContentTemplate">
-            <Setter.Value>
-               <DataTemplate>
-                  <DockPanel>
-                     <TextBlock DockPanel.Dock="Left"
-                                Text="{Binding}" />
-                     <TextBlock TextAlignment="Right"
-                                Style="{StaticResource newSuffix}" />
-                     <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-                  </DockPanel>
-               </DataTemplate>
-            </Setter.Value>
-         </Setter>
-       </Style>
-     </ResourceDictionary>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                Grid.Row="0"
-                Margin="5">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <StackPanel Orientation="Horizontal"
-                        Margin="5">
-               <TextBlock Text="Theme:"
-                          Margin="0,0,10,0"
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="_themeCombo"
-                         SelectedIndex="0"
-                         Width="160"
-                         Height="25">
-                  <view:AvalonDockComboBoxItem Content="Generic"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Generic}"/>
-                  <view:AvalonDockComboBoxItem Content="Aero"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Aero}">
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:AeroTheme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Content="VS2010"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.VS2010}">
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:VS2010Theme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Content="Metro"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Metro}">
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:MetroTheme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
-                                               Content="Office2007 Black"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Black}">
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
-                                               Content="Office2007 Blue"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Blue}">
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
-                                               Content="Office2007 Silver"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Silver}">
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
-                                               Content="Windows 10"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Windows10}">
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem x:Name="metroDarkComboBoxItem"
-                                               Style="{StaticResource plusItem}"
-                                               Content="Metro Dark"
-                                               Selected="MetroComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.MetroDark}">
-                     <!--MetroDark Theme is set in CodeBehind-->
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem x:Name="metroLightComboBoxItem"
-                                               Style="{StaticResource plusItem}"
-                                               Content="Metro Light"
-                                               Selected="MetroComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.MetroLight}">
-                     <!--MetroLight Theme is set in CodeBehind-->
-                  </view:AvalonDockComboBoxItem>
-               </ComboBox>
-            </StackPanel>
-
-
-         </Grid>
-      </GroupBox>
-
-      <TextBlock Grid.Row="1"
-                 Text="Usage:"
-                 Style="{StaticResource Header}" />
-
-      <Border x:Name="SampleBorder"
-              Grid.Row="2">
-         <xcad:DockingManager x:Name="_dockingManager"
-                              MaxHeight="395"
-                              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}"
-                                           AutoGenerateProperties="False">
-                           <xctk:PropertyGrid.PropertyDefinitions>
-                              <xctk:PropertyDefinition TargetProperties="Background" />
-                              <xctk:PropertyDefinition TargetProperties="BorderBrush" />
-                              <xctk:PropertyDefinition TargetProperties="BorderThickness" />
-                              <xctk:PropertyDefinition TargetProperties="FontSize" />
-                              <xctk:PropertyDefinition TargetProperties="FontStyle" />
-                              <xctk:PropertyDefinition TargetProperties="Width" />
-                              <xctk:PropertyDefinition TargetProperties="Height" />
-                           </xctk:PropertyGrid.PropertyDefinitions>
-                        </xctk:PropertyGrid>
-                     </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>
-      </Border>
-
-      <Image x:Name="_openSourceScreenShot" Grid.Row="2" Height="395" Visibility="Collapsed" />
-      <StackPanel x:Name="_openSourceTextHyperlink" Grid.Row="3" Orientation="Horizontal" Visibility="Collapsed">
-            <TextBlock Text="This theme is only available in the &quot;Plus&quot; version. "/>
-            <TextBlock>
-               <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-                  Click here for more details about Xceed Toolkit Plus for WPF.
-               </Hyperlink>
-            </TextBlock>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt
deleted file mode 100644
index 90768ddf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.cs.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ThemingCoreWPFView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt
deleted file mode 100644
index 83482965..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingCoreWPFView.xaml.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.Themes.Office2007.dll or Xceed.Wpf.Themes.Metro.dll assemblies are necessary to use these themes.</Run>
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Toolkit Plus for WPF.
-            </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/CodeFiles/ThemingDataGridView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt
deleted file mode 100644
index 90d31027..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.cs.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Xceed.Wpf.DataGrid.Views;
-
-
-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/CodeFiles/ThemingDataGridView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt
deleted file mode 100644
index b9bbed29..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingDataGridView.xaml.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.DataGrid.Themes.Office2007.dll or Xceed.Wpf.DataGrid.Themes.Metro.dll assemblies are necessary to use these themes.</Run>
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt
deleted file mode 100644
index bb250ed9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.cs.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************/
-
-using System.Diagnostics;
-using System.Windows;
-using System;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Documents;
-
-
-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/CodeFiles/ThemingExtendedToolkitView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt
deleted file mode 100644
index b93b285a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingExtendedToolkitView.xaml.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Toolkit Plus For WPF"
-                 x:Name="_demo">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-         <Run>Changes the themes of the Toolkit for WPF controls. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.Toolkit.Themes.Office2007.dll, Xceed.Wpf.Toolkit.Themes.Windows10.dll or Xceed.Wpf.Toolkit.Themes.Metro.dll assemblies are necessary to use the themes.</Run>
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/ThemingListBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt
deleted file mode 100644
index d5abbe63..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ThemingListBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt
deleted file mode 100644
index 2f64e7bb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ThemingListBoxView.xaml.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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. Available themes are System, Office2007, LiveExplorer, MediaPlayer, Windows10 and Metro with accent color. The Xceed.Wpf.ListBox.Themes.xxx.dll assembly is necessary to use the themes.</Run>
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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/CodeFiles/TimeSpanView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt
deleted file mode 100644
index b7e79593..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.cs.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Toolkit.LiveExplorer.Samples.TimeSpan.Views
-{
-  /// <summary>
-  /// Interaction logic for TimeSpanView.xaml
-  /// </summary>
-  public partial class TimeSpanView : DemoView
-  {
-    public TimeSpanView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt
deleted file mode 100644
index 2e32ea8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimeSpanView.xaml.txt
+++ /dev/null
@@ -1,189 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimeSpan.Views.TimeSpanView"
-                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"
-                Title="TimeSpanUpDown">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         The TimeSpanUpDown controls let you increment or decrement a time over 24 hours. The Format is Days.Hours:Minutes:Seconds.Milliseconds.
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ObjectDataProvider x:Key="enumDateTimePart" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimePart"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                HorizontalAlignment="Stretch">
-         <Grid>
-            <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" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column-->
-            <TextBlock Text="Watermark:"
-                       VerticalAlignment="Center" />
-            <TextBox x:Name="_watermark"
-                     Grid.Column="1"
-                     Text="{Binding Watermark, ElementName=_timeSpanUpDown}"
-                     Width="190"
-                     HorizontalAlignment="Left"
-                     Margin="5,5,25,5" />
-            <TextBlock Grid.Row="1"
-                       Text="ClipValueToMinMax:"
-                       VerticalAlignment="Center" />
-            <CheckBox x:Name="_clipValuetoMinMax"
-                      Grid.Row="1"
-                      Grid.Column="1"
-                      IsChecked="{Binding ClipValueToMinMax, ElementName=_timeSpanUpDown}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,25,5" />
-            <TextBlock Grid.Row="2"
-                       Text="ShowSeconds:"
-                       VerticalAlignment="Center" />
-            <CheckBox x:Name="_showSeconds"
-                      Grid.Row="2"
-                      Grid.Column="1"
-                      IsChecked="{Binding ShowSeconds, ElementName=_timeSpanUpDown}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,25,5" />
-            <TextBlock Grid.Row="3"
-                       Text="FractionalSecondsDigitsCount:"
-                       VerticalAlignment="Center" />
-            <xctk:IntegerUpDown x:Name="_fractionalSecondsDigitsCount"
-                                Grid.Row="3"
-                                Grid.Column="1"
-                                Value="{Binding FractionalSecondsDigitsCount, ElementName=_timeSpanUpDown}"
-                                Maximum="3"
-                                Minimum="0"
-                                HorizontalAlignment="Left"
-                                Margin="5,5,25,5" />
-            <TextBlock Grid.Row="4" 
-                       Text="CurrentDateTimePart:" 
-                       VerticalAlignment="Center"/>
-            <ComboBox x:Name="_currentDateTimePart"
-                      Grid.Row="4"
-                      Grid.Column="1"
-                      ItemsSource="{Binding Source={StaticResource enumDateTimePart}}"
-                      SelectedItem="{Binding CurrentDateTimePart, ElementName=_timeSpanUpDown}"
-                      Margin="5,5,25,5" 
-                      ToolTip="Must match a DateTimePart of the TimeSpanUpDown"/>
-
-            <!-- 2nd column-->
-            <TextBlock Grid.Column="2"
-                       Text="DefaultValue:"
-                       VerticalAlignment="Center"
-                       Margin="5" />
-            <xctk:TimeSpanUpDown x:Name="_defaultValue"
-                                 Grid.Column="3"
-                                 Value="{Binding DefaultValue, ElementName=_timeSpanUpDown}"
-                                 Width="100"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Center"
-                                 Margin="5,5,25,5" />
-            <TextBlock Grid.Row="1"
-                       Grid.Column="2"
-                       Text="Minimum:"
-                       VerticalAlignment="Center"
-                       Margin="5" />
-            <xctk:TimeSpanUpDown x:Name="_minimum"
-                                 Grid.Row="1"
-                                 Grid.Column="3"
-                                 Value="{Binding Minimum, ElementName=_timeSpanUpDown}"
-                                 Width="100"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Center"
-                                 Margin="5,5,25,5" />
-            <TextBlock Grid.Row="2"
-                       Grid.Column="2"
-                       Text="Maximum:"
-                       VerticalAlignment="Center"
-                       Margin="5" />
-            <xctk:TimeSpanUpDown x:Name="_maximum"
-                                 Grid.Row="2"
-                                 Grid.Column="3"
-                                 Value="{Binding Maximum, ElementName=_timeSpanUpDown}"
-                                 Width="100"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Center"
-                                 Margin="5,5,25,5" />
-            <TextBlock Grid.Row="3"
-                       Grid.Column="2"
-                       Text="Step:"
-                       VerticalAlignment="Center"
-                       Margin="5" />
-            <xctk:IntegerUpDown x:Name="_step"
-                                Grid.Row="3"
-                                Grid.Column="3"
-                                Value="{Binding Step, ElementName=_timeSpanUpDown}"
-                                Maximum="10"
-                                Minimum="1"
-                                Width="100"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Margin="5,5,25,5" />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1"
-                  HorizontalAlignment="Left">
-         <TextBlock Text="Usage: "
-                    Margin="0,10,0,0"
-                    Style="{StaticResource Header}" />
-         <xctk:TimeSpanUpDown x:Name="_timeSpanUpDown"
-                              Width="300"
-                              VerticalAlignment="Top"
-                              IsReadOnly="False"
-                              Watermark="Enter text"
-                              DefaultValue="00:00:00"
-                              Maximum="5.00:00:00"
-                              Minimum="-5.00:00:00"
-                              ClipValueToMinMax="False"
-                              ShowSeconds="True"
-                              FractionalSecondsDigitsCount="0"
-                              CurrentDateTimePart="Hour24"
-                              Step="1"/>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.cs.txt
deleted file mode 100644
index a78cce4b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.cs.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/TimelinePanelView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.txt
deleted file mode 100644
index 048b0e1a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TimelinePanelView.xaml.txt
+++ /dev/null
@@ -1,183 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ToggleSwitchView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.cs.txt
deleted file mode 100644
index 48f42067..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.cs.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Controls;
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views
-{
-    /// <summary>
-    /// Interaction logic for ToggleSwitchView.xaml
-    /// </summary>
-    public partial class ToggleSwitchView : DemoView
-    {
-        public ToggleSwitchView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt
deleted file mode 100644
index 11f85407..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views.ToggleSwitchView"
-                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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:localConv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters"
-                Title="ToggleSwitch">
-
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The ToggleSwitch control is a fully customizable on/off switch that can be used to enhance the UI experience.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\ToggleSwitch.png" Width="200" Height="160"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt
deleted file mode 100644
index ec9c2548..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.ComponentModel;
-using System.Data;
-using System.Collections.ObjectModel;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views
-{
-  /// <summary>
-  /// Interaction logic for TokenizedTextBoxView.xaml
-  /// </summary>
-  public partial class TokenizedTextBoxView : DemoView
-  {
-
-
-
-    public TokenizedTextBoxView()
-    {
-
-      InitializeComponent();
-    }
-
-
-
-
-  }
-
-
-
-
-
-
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt
deleted file mode 100644
index 0ed541cb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/TokenizedTextBoxView.xaml.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views.TokenizedTextBoxView"
-                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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                Title="TokenizedTextBox">
-
-    <local:DemoView.Description>
-        <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The TokenizedTextBox lets you display a series of values as tokens. If an ItemsSource is specified, an AutoComplete popup will appear with a filtered list of valid values during edit.</Run>
-            <LineBreak />
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-      </Paragraph>
-    </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\TokenizedTextBox.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt
deleted file mode 100644
index 5301d255..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Controls;
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views
-{
-  /// <summary>
-  /// Interaction logic for WatermarkComboBoxView.xaml
-  /// </summary>
-  public partial class WatermarkComboBoxView : DemoView
-  {
-    public WatermarkComboBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt
deleted file mode 100644
index bd53f0c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkComboBoxView.xaml.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views.WatermarkComboBoxView"
-                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="WatermarkComboBox">
-
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The WatermarkComboBox is a ComboBox with a fully customizable watermark.</Run>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <DataTemplate x:Key="WatermarkComboBoxTemplate1">
-         <Grid>
-            <StackPanel Orientation="Horizontal">
-               <Image Source="..\Resources\PencilTool16.png" />
-               <TextBlock Text="{Binding}"
-                          Foreground="Green"
-                          FontFamily="Sans Serif"
-                          FontWeight="Bold"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Margin="4,0,0,0"/>
-            </StackPanel>           
-         </Grid>
-      </DataTemplate>
-
-      <DataTemplate x:Key="WatermarkComboBoxTemplate2">
-         <Border BorderBrush="Green"
-                 BorderThickness="1">
-            <TextBlock Text="{Binding}"
-                       Foreground="Red"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center" />
-         </Border>
-      </DataTemplate>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                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="Watermark: "
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Column="1"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Center"
-                     Margin="5"
-                     ToolTip="Gets/Sets the watermark when there are no comboBoxItem selected and focus is not on WatermarkComboBox."
-                     Text="{Binding Watermark, ElementName=_watermarkComboBox, UpdateSourceTrigger=PropertyChanged}" />
-            <TextBlock Text="WatermarkTemplate: "
-                       Grid.Row="1"
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
-                      Grid.Row="1"
-                      Width="150"
-                      Margin="5"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      SelectedValue="{Binding WatermarkTemplate, ElementName=_watermarkComboBox}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Template 1"
-                             Tag="{StaticResource WatermarkComboBoxTemplate1}" />
-               <ComboBoxItem Content="Template 2"
-                             Tag="{StaticResource WatermarkComboBoxTemplate2}" />
-            </ComboBox>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1"
-                  Margin="10">
-
-         <TextBlock Text="Usage:"
-                    Margin="10"
-                    Style="{StaticResource Header}" />
-
-         <xctk:WatermarkComboBox x:Name="_watermarkComboBox"
-                                 Margin="10"
-                                 Width="350"
-                                 IsEditable="True"
-                                 Watermark="Choose a ComboBox Item..."
-                                 WatermarkTemplate="{x:Null}"
-                                 VerticalContentAlignment="Center">
-            <ComboBoxItem Content="Red" />
-            <ComboBoxItem Content="Green" />
-            <ComboBoxItem Content="Blue" />
-            <ComboBoxItem Content="Yellow" />
-            <ComboBoxItem Content="Black" />
-         </xctk:WatermarkComboBox>
-
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt
deleted file mode 100644
index d37064fd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
-{
-  /// <summary>
-  /// Interaction logic for WatermarkPasswordBoxView.xaml
-  /// </summary>
-  public partial class WatermarkPasswordBoxView : DemoView
-  {
-    public WatermarkPasswordBoxView()
-    {
-      InitializeComponent();
-    }
-
-    private void WatermarkPasswordBox_PasswordChanged( object sender, System.Windows.RoutedEventArgs e )
-    {
-      var passwordBox = sender as WatermarkPasswordBox;
-      if( passwordBox != null )
-      {
-        _passwordTextBlock.Text = passwordBox.Password;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt
deleted file mode 100644
index 9d8592dc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views.WatermarkPasswordBoxView"
-                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"
-                Title="WatermarkPasswordBox">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         The WatermarkPasswordBox is a PasswordBox where you can enter a secure password and display a watermark when the password is not defined.
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <DataTemplate x:Key="WatermarkTemplate1">
-         <Grid>
-            <TextBlock Text="{Binding}"
-                       Foreground="Blue"
-                       Background="Orange"
-                       FontSize="12"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center" />
-         </Grid>
-      </DataTemplate>
-
-      <DataTemplate x:Key="WatermarkTemplate2">
-         <Border BorderBrush="Red"
-                 BorderThickness="1">
-            <ContentControl Content="{Binding}"
-                            Foreground="DarkRed"
-                            FontWeight="Bold"
-                            Focusable="False"
-                            Margin="4,0,4,0"/>
-         </Border>
-      </DataTemplate>
-   </local:DemoView.Resources>
-
-   <StackPanel>
-      <GroupBox Header="Features">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!--1st Column-->
-            <TextBlock Text="PasswordChar: "
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Column="1"
-                     MaxLength="1"
-                     Text="{Binding PasswordChar, ElementName=_watermarkPasswordBox}"
-                     Width="18"
-                     Margin="5,5,25,5"
-                     HorizontalAlignment="Left"
-                     VerticalAlignment="Center" />
-
-            <TextBlock Grid.Row="1"
-                       Text="Password: "
-                       VerticalAlignment="Center" />
-            <TextBlock Grid.Row="1"
-                       Grid.Column="1"
-                       x:Name="_passwordTextBlock"
-                       Width="190"
-                       Margin="5,5,25,5"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Center" />
-
-            <!--2nd column-->
-            <TextBlock Grid.Column="2"
-                       Text="Watermark: "
-                       Margin="5"
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Column="3"
-                     Text="{Binding Watermark, ElementName=_watermarkPasswordBox}"
-                     Width="190"
-                     Margin="5,5,25,5"
-                     HorizontalAlignment="Left"
-                     VerticalAlignment="Center" />
-
-            <TextBlock Grid.Row="1"
-                       Grid.Column="2"
-                       Text="Watermark Template: "
-                       Margin="5"
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Row="1"
-                      Grid.Column="3"
-                      Width="100"
-                      Margin="5,5,25,5"
-                      SelectedValue="{Binding WatermarkTemplate, ElementName=_watermarkPasswordBox}"
-                      SelectedValuePath="Tag"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Template 1"
-                             Tag="{StaticResource WatermarkTemplate1}" />
-               <ComboBoxItem Content="Template 2"
-                             Tag="{StaticResource WatermarkTemplate2}" />
-            </ComboBox>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel>
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-
-         <StackPanel Margin="10">
-            <TextBlock Text="Default:"
-                       Style="{StaticResource Header}" />
-            <xctk:WatermarkPasswordBox x:Name="_watermarkPasswordBox"
-                                       Margin="5"
-                                       MinWidth="200"
-                                       Watermark="Enter Password here..."
-                                       WatermarkTemplate="{x:Null}"
-                                       PasswordChar='&#9679;'
-                                       MaxLength="10"
-                                       KeepWatermarkOnGotFocus="True"
-                                       PasswordChanged="WatermarkPasswordBox_PasswordChanged" />
-         </StackPanel>
-      </StackPanel>
-   </StackPanel>
-
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt
deleted file mode 100644
index e50a9aa9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.cs.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/WatermarkTextboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt
deleted file mode 100644
index 98ad267c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkTextboxView.xaml.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-
-   <StackPanel>
-      <GroupBox Header="Features">
-         <Grid Margin="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <TextBlock Grid.Column="0"
-                       Text="KeepWatermarkOnGotFocus: "
-                       VerticalAlignment="Center" />
-            <CheckBox Grid.Column="1"
-                      x:Name="_keepWatermarkOnGotFocus"
-                      IsChecked="False"
-                      VerticalAlignment="Center" />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel>
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-
-         <StackPanel Margin="10">
-            <TextBlock Text="Default:"
-                       Style="{StaticResource Header}" />
-            <xctk:WatermarkTextBox Margin="5"
-                                   MinWidth="200"
-                                   Watermark="Enter Text"
-                                   KeepWatermarkOnGotFocus="{Binding IsChecked, ElementName=_keepWatermarkOnGotFocus}"/>
-
-            <TextBlock Text="Image Watermark:"
-                       Style="{StaticResource Header}" />
-            <xctk:WatermarkTextBox Margin="5"
-                                   KeepWatermarkOnGotFocus="{Binding IsChecked, ElementName=_keepWatermarkOnGotFocus}">
-               <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 Text="Custom WatermarkTemplate:"
-                       Style="{StaticResource Header}" />
-            <xctk:WatermarkTextBox Margin="5"
-                                   Watermark="Enter Text"
-                                   KeepWatermarkOnGotFocus="{Binding IsChecked, ElementName=_keepWatermarkOnGotFocus}">
-               <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>
-      </StackPanel>
-   </StackPanel>
-
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt
deleted file mode 100644
index 62b692da..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.cs.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Value.R, item.Color.Value.G, item.Color.Value.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/CodeFiles/WindowContainerView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt
deleted file mode 100644
index 46075034..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WindowContainerView.xaml.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-    </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/CodeFiles/WizardView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt
deleted file mode 100644
index bbe5e301..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/WizardView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt
deleted file mode 100644
index bf6465d9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CodeFiles/ZoomboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt
deleted file mode 100644
index 34097cf5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.cs.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 = System.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/CodeFiles/ZoomboxView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt
deleted file mode 100644
index 0f6d85b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ZoomboxView.xaml.txt
+++ /dev/null
@@ -1,495 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="../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="#FFC72035"
-                                      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=IsUsingScrollBars}">
-                  <TextBlock Text="IsUsingScrollBars"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsChecked="{Binding IsUsingScrollBars}" />
-               </ItemsControl>
-               <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="../Resources/Default.jpg" />
-
-      </xctk:Zoombox>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs
deleted file mode 100644
index 16b042ef..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/CSharpFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/CSharpFormat.cs
deleted file mode 100644
index 628e5ba4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/CSharpFormat.cs
+++ /dev/null
@@ -1,448 +0,0 @@
-#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
- * the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- *   1. The origin of this software must not be misrepresented; you must not
- *      claim that you wrote the original software. If you use this software
- *      in a product, an acknowledgment in the product documentation would be
- *      appreciated but is not required.
- * 
- *   2. Altered source versions must be plainly marked as such, and must not
- *      be misrepresented as being the original software.
- * 
- *   3. This notice may not be removed or altered from any source distribution.
- */
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Windows.Documents;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting
-{
-  public class CSharpFormat : CLikeFormat
-  {
-    /// <summary>
-    /// The list of C# keywords.
-    /// </summary>
-    protected override string Keywords
-    {
-      get
-      {
-        return "abstract as base bool break byte case catch char "
-        + "checked class const continue decimal default delegate do double else "
-        + "enum event explicit extern false finally fixed float for foreach goto "
-        + "if implicit in int interface internal is lock long namespace new null "
-        + "object operator out override partial params private protected public readonly "
-        + "ref return sbyte sealed short sizeof stackalloc static string struct "
-        + "switch this throw true try typeof uint ulong unchecked unsafe ushort "
-        + "using value virtual void volatile where while yield";
-      }
-    }
-
-    /// <summary>
-    /// The list of C# preprocessors.
-    /// </summary>
-    protected override string Preprocessors
-    {
-      get
-      {
-        return "#if #else #elif #endif #define #undef #warning "
-            + "#error #line #region #endregion #pragma";
-      }
-    }
-  }
-
-  /// <summary>
-  /// Provides a base class for formatting languages similar to C.
-  /// </summary>
-  public abstract class CLikeFormat : CodeFormat
-  {
-    /// <summary>
-    /// Regular expression string to match single line and multi-line 
-    /// comments (// and /* */). 
-    /// </summary>
-    protected override string CommentRegEx
-    {
-      get
-      {
-        return @"/\*.*?\*/|//.*?(?=\r|\n)";
-      }
-    }
-
-    /// <summary>
-    /// Regular expression string to match string and character literals. 
-    /// </summary>
-    protected override string StringRegEx
-    {
-      get
-      {
-        return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'";
-      }
-    }
-  }
-
-  /// <summary>
-  /// Provides a base class for formatting most programming languages.
-  /// </summary>
-  public abstract class CodeFormat : SourceFormat
-  {
-    /// <summary>
-    /// Must be overridden to provide a list of keywords defined in 
-    /// each language.
-    /// </summary>
-    /// <remarks>
-    /// Keywords must be separated with spaces.
-    /// </remarks>
-    protected abstract string Keywords
-    {
-      get;
-    }
-
-    /// <summary>
-    /// Can be overridden to provide a list of preprocessors defined in 
-    /// each language.
-    /// </summary>
-    /// <remarks>
-    /// Preprocessors must be separated with spaces.
-    /// </remarks>
-    protected virtual string Preprocessors
-    {
-      get
-      {
-        return "";
-      }
-    }
-
-    /// <summary>
-    /// Must be overridden to provide a regular expression string
-    /// to match strings literals. 
-    /// </summary>
-    protected abstract string StringRegEx
-    {
-      get;
-    }
-
-    /// <summary>
-    /// Must be overridden to provide a regular expression string
-    /// to match comments. 
-    /// </summary>
-    protected abstract string CommentRegEx
-    {
-      get;
-    }
-
-    /// <summary>
-    /// Determines if the language is case sensitive.
-    /// </summary>
-    /// <value><b>true</b> if the language is case sensitive, <b>false</b> 
-    /// otherwise. The default is true.</value>
-    /// <remarks>
-    /// A case-insensitive language formatter must override this 
-    /// property to return false.
-    /// </remarks>
-    public virtual bool CaseSensitive
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    /// <summary/>
-    protected CodeFormat()
-    {
-      //generate the keyword and preprocessor regexes from the keyword lists
-      Regex r;
-      r = new Regex( @"\w+|-\w+|#\w+|@@\w+|#(?:\\(?:s|w)(?:\*|\+)?\w+)+|@\\w\*+" );
-      string regKeyword = r.Replace( Keywords, @"(?<=^|\W)$0(?=\W)" );
-      string regPreproc = r.Replace( Preprocessors, @"(?<=^|\s)$0(?=\s|$)" );
-      r = new Regex( @" +" );
-      regKeyword = r.Replace( regKeyword, @"|" );
-      regPreproc = r.Replace( regPreproc, @"|" );
-
-      if( regPreproc.Length == 0 )
-      {
-        regPreproc = "(?!.*)_{37}(?<!.*)"; //use something quite impossible...
-      }
-
-      //build a master regex with capturing groups
-      StringBuilder regAll = new StringBuilder();
-      regAll.Append( "(" );
-      regAll.Append( CommentRegEx );
-      regAll.Append( ")|(" );
-      regAll.Append( StringRegEx );
-      if( regPreproc.Length > 0 )
-      {
-        regAll.Append( ")|(" );
-        regAll.Append( regPreproc );
-      }
-      regAll.Append( ")|(" );
-      regAll.Append( regKeyword );
-      regAll.Append( ")" );
-
-      RegexOptions caseInsensitive = CaseSensitive ? 0 : RegexOptions.IgnoreCase;
-      CodeRegex = new Regex( regAll.ToString(), RegexOptions.Singleline | caseInsensitive );
-
-      CodeParagraphGlobal = new List<Run>();
-    }
-
-    /// <summary>
-    /// Called to evaluate the HTML fragment corresponding to each 
-    /// matching token in the code.
-    /// </summary>
-    /// <param name="match">The <see cref="Match"/> resulting from a 
-    /// single regular expression match.</param>
-    /// <returns>A string containing the HTML code fragment.</returns>
-    protected override string MatchEval( Match match ) //protected override
-    {
-      if( match.Groups[ 1 ].Success ) //comment
-      {
-        StringReader reader = new StringReader( match.ToString() );
-        StringBuilder sb = new StringBuilder();
-        string line;
-        bool firstLineRead = false;
-        while( ( line = reader.ReadLine() ) != null )
-        {
-          if( firstLineRead )
-            sb.Append( "\r" );
-
-          sb.Append( line );
-          firstLineRead = true;
-        }
-
-        if( !string.IsNullOrEmpty( sb.ToString() ) )
-        {
-          Run r = new Run( sb.ToString() );
-          r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 128, 0 ) );
-          CodeParagraphGlobal.Add( r );
-        }
-        return "::::::";
-      }
-      else if( match.Groups[ 2 ].Success ) //string literal
-      {
-        Run r = new Run( match.ToString() );
-        r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 96, 128 ) );
-
-        CodeParagraphGlobal.Add( r );
-        return "::::::";
-      }
-      else if( match.Groups[ 3 ].Success ) //preprocessor keyword
-      {
-        Run r = new Run( match.ToString() );
-        r.Foreground = new SolidColorBrush( Color.FromRgb( 204, 102, 51 ) );
-
-        CodeParagraphGlobal.Add( r );
-        return "::::::";
-      }
-      else if( match.Groups[ 4 ].Success ) //keyword
-      {
-        Run r = new Run( match.ToString() );
-        r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 0, 255 ) );
-
-        CodeParagraphGlobal.Add( r );
-        return "::::::";
-      }
-      else
-      {
-        return "";
-      }
-    }
-  }
-
-  /// <summary>
-  ///	Provides a base implementation for all code formatters.
-  /// </summary>
-  /// <remarks>
-  /// <para>
-  /// To display the formatted code on your web site, the web page must 
-  /// refer to a stylesheet that defines the formatting for the different 
-  /// CSS classes generated by CSharpFormat:
-  /// .csharpcode, pre, .rem, .kwrd, .str, .op, .preproc, .alt, .lnum.
-  /// </para>
-  /// <para>
-  /// Note that if you have multi-line comments in your source code
-  /// (like /* ... */), the "line numbers" or "alternate line background" 
-  /// options will generate code that is not strictly HTML 4.01 compliant. 
-  /// The code will still look good with IE5+ or Mozilla 0.8+. 
-  /// </para>
-  /// </remarks>
-  public abstract class SourceFormat
-  {
-    /// <summary/>
-    protected SourceFormat()
-    {
-      _tabSpaces = 4;
-      _lineNumbers = false;
-      _alternate = false;
-      _embedStyleSheet = false;
-    }
-
-    private byte _tabSpaces;
-
-    /// <summary>
-    /// Gets or sets the tabs width.
-    /// </summary>
-    /// <value>The number of space characters to substitute for tab 
-    /// characters. The default is <b>4</b>, unless overridden is a 
-    /// derived class.</value>
-    public byte TabSpaces
-    {
-      get
-      {
-        return _tabSpaces;
-      }
-      set
-      {
-        _tabSpaces = value;
-      }
-    }
-
-    private bool _lineNumbers;
-
-    /// <summary>
-    /// Enables or disables line numbers in output.
-    /// </summary>
-    /// <value>When <b>true</b>, line numbers are generated. 
-    /// The default is <b>false</b>.</value>
-    public bool LineNumbers
-    {
-      get
-      {
-        return _lineNumbers;
-      }
-      set
-      {
-        _lineNumbers = value;
-      }
-    }
-
-    private bool _alternate;
-
-    /// <summary>
-    /// Enables or disables alternating line background.
-    /// </summary>
-    /// <value>When <b>true</b>, lines background is alternated. 
-    /// The default is <b>false</b>.</value>
-    public bool Alternate
-    {
-      get
-      {
-        return _alternate;
-      }
-      set
-      {
-        _alternate = value;
-      }
-    }
-
-    private bool _embedStyleSheet;
-
-    /// <summary>
-    /// Enables or disables the embedded CSS style sheet.
-    /// </summary>
-    /// <value>When <b>true</b>, the CSS &lt;style&gt; element is included 
-    /// in the HTML output. The default is <b>false</b>.</value>
-    public bool EmbedStyleSheet
-    {
-      get
-      {
-        return _embedStyleSheet;
-      }
-      set
-      {
-        _embedStyleSheet = value;
-      }
-    }
-
-    /// <summary>
-    /// Transforms a source code string to HTML 4.01.
-    /// </summary>
-    /// <returns>A string containing the HTML formatted code.</returns>
-    public Paragraph FormatCode( string source )
-    {
-      return FormatCode( source, _lineNumbers, _alternate, _embedStyleSheet, false );
-    }
-
-    private Regex codeRegex;
-
-    /// <summary>
-    /// The regular expression used to capture language tokens.
-    /// </summary>
-    protected Regex CodeRegex
-    {
-      get
-      {
-        return codeRegex;
-      }
-      set
-      {
-        codeRegex = value;
-      }
-    }
-
-    private List<Run> codeParagraphGlobal;
-    /// <summary>
-    /// This is a List of Run's that can be added later to the string of code
-    /// </summary>
-    protected List<Run> CodeParagraphGlobal
-    {
-      get
-      {
-        return codeParagraphGlobal;
-      }
-      set
-      {
-        codeParagraphGlobal = value;
-      }
-    }
-
-    /// <summary>
-    /// Called to evaluate the HTML fragment corresponding to each 
-    /// matching token in the code.
-    /// </summary>
-    /// <param name="match">The <see cref="Match"/> resulting from a 
-    /// single regular expression match.</param>
-    /// <returns>A string containing the HTML code fragment.</returns>
-    protected abstract string MatchEval( Match match ); //protected abstract
-
-    //does the formatting job
-    private Paragraph FormatCode( string source, bool lineNumbers,
-        bool alternate, bool embedStyleSheet, bool subCode )
-    {
-      Paragraph codeParagraph = new Paragraph();
-      //replace special characters
-      StringBuilder sb = new StringBuilder( source );
-      //color the code
-      source = codeRegex.Replace( sb.ToString(), new MatchEvaluator( this.MatchEval ) );
-      //codeRegex.Replace(
-      string[] characters = { "::::::" };
-
-      string[] split = source.Split( characters, new StringSplitOptions() );
-      int currentChunk = 0;
-      foreach( string code in split )
-      {
-        currentChunk++;
-        Run r = new Run( code );
-        codeParagraph.Inlines.Add( r );
-        if( ( currentChunk - 1 ) < codeParagraphGlobal.Count )
-        {
-          codeParagraph.Inlines.Add( codeParagraphGlobal[ currentChunk - 1 ] );
-        }
-      }
-
-      return codeParagraph;
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs
deleted file mode 100644
index 5b183532..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-//Author: Nick Kramer [MSFT]
-//Source: http://blogs.msdn.com/b/nickkramer/archive/2006/09/22/766934.aspx
-
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting
-{
-  // XML tokenizer, tokens are designed to match Visual Studio syntax highlighting
-  class XmlTokenizer
-  {
-    private string input;
-    private int position = 0;
-    private XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
-    public static List<XmlToken> Tokenize( string input )
-    {
-      XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
-      XmlTokenizer tokenizer = new XmlTokenizer();
-      return tokenizer.Tokenize( input, ref mode );
-    }
-    public List<XmlToken> Tokenize( string input, ref XmlTokenizerMode _mode )
-    {
-      this.input = input;
-      this.mode = _mode;
-      this.position = 0;
-      List<XmlToken> result = Tokenize();
-      _mode = this.mode;
-      return result;
-    }
-    private List<XmlToken> Tokenize()
-    {
-      List<XmlToken> list = new List<XmlToken>();
-      XmlToken token;
-      do
-      {
-        int previousPosition = position;
-        token = NextToken();
-        string tokenText = input.Substring( previousPosition, token.Length );
-        list.Add( token );
-      }
-      while( token.Kind != XmlTokenKind.EOF );
-      List<string> strings = TokensToStrings( list, input );
-      return list;
-    }
-    private List<string> TokensToStrings( List<XmlToken> list, string input )
-    {
-      List<string> output = new List<string>();
-      int position = 0;
-      foreach( XmlToken token in list )
-      {
-        output.Add( input.Substring( position, token.Length ) );
-        position += token.Length;
-      }
-      return output;
-    }
-    // debugging function
-    public string RemainingText
-    {
-      get
-      {
-        return input.Substring( position );
-      }
-    }
-    private XmlToken NextToken()
-    {
-      if( position >= input.Length )
-        return new XmlToken( XmlTokenKind.EOF, 0 );
-      XmlToken token;
-      switch( mode )
-      {
-        case XmlTokenizerMode.AfterAttributeEquals:
-          token = TokenizeAttributeValue();
-          break;
-        case XmlTokenizerMode.AfterAttributeName:
-          token = TokenizeSimple( "=", XmlTokenKind.Equals, XmlTokenizerMode.AfterAttributeEquals );
-          break;
-        case XmlTokenizerMode.AfterOpen:
-          token = TokenizeName( XmlTokenKind.ElementName, XmlTokenizerMode.InsideElement );
-          break;
-        case XmlTokenizerMode.InsideCData:
-          token = TokenizeInsideCData();
-          break;
-        case XmlTokenizerMode.InsideComment:
-          token = TokenizeInsideComment();
-          break;
-        case XmlTokenizerMode.InsideElement:
-          token = TokenizeInsideElement();
-          break;
-        case XmlTokenizerMode.InsideProcessingInstruction:
-          token = TokenizeInsideProcessingInstruction();
-          break;
-        case XmlTokenizerMode.OutsideElement:
-          token = TokenizeOutsideElement();
-          break;
-        default:
-          token = new XmlToken( XmlTokenKind.EOF, 0 );
-          Debug.Fail( "missing case" );
-          break;
-      }
-      return token;
-    }
-    private bool IsNameCharacter( char character )
-    {
-      // XML rule: Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender
-      bool result = char.IsLetterOrDigit( character ) || character == '.' | character == '-' | character == '_' | character == ':';
-      return result;
-    }
-    private XmlToken TokenizeAttributeValue()
-    {
-      Debug.Assert( mode == XmlTokenizerMode.AfterAttributeEquals );
-      int closePosition = input.IndexOf( input[ position ], position + 1 );
-      XmlToken token = new XmlToken( XmlTokenKind.AttributeValue, closePosition + 1 - position );
-      position = closePosition + 1;
-      mode = XmlTokenizerMode.InsideElement;
-      return token;
-    }
-    private XmlToken TokenizeName( XmlTokenKind kind, XmlTokenizerMode nextMode )
-    {
-      Debug.Assert( mode == XmlTokenizerMode.AfterOpen || mode == XmlTokenizerMode.InsideElement );
-      int i;
-      for( i = position; i < input.Length; i++ )
-        if( !IsNameCharacter( input[ i ] ) )
-          break;
-      XmlToken token = new XmlToken( kind, i - position );
-      mode = nextMode;
-      position = i;
-      return token;
-    }
-    private XmlToken TokenizeElementWhitespace()
-    {
-      int i;
-      for( i = position; i < input.Length; i++ )
-        if( !char.IsWhiteSpace( input[ i ] ) )
-          break;
-      XmlToken token = new XmlToken( XmlTokenKind.ElementWhitespace, i - position );
-      position = i;
-      return token;
-    }
-    private bool StartsWith( string text )
-    {
-      if( position + text.Length > input.Length )
-        return false;
-      else
-        return input.Substring( position, text.Length ) == text;
-    }
-    private XmlToken TokenizeInsideElement()
-    {
-      if( char.IsWhiteSpace( input[ position ] ) )
-        return TokenizeElementWhitespace();
-      else
-        if( StartsWith( "/>" ) )
-          return TokenizeSimple( "/>", XmlTokenKind.SelfClose, XmlTokenizerMode.OutsideElement );
-        else
-          if( StartsWith( ">" ) )
-            return TokenizeSimple( ">", XmlTokenKind.Close, XmlTokenizerMode.OutsideElement );
-          else
-            return TokenizeName( XmlTokenKind.AttributeName, XmlTokenizerMode.AfterAttributeName );
-    }
-    private XmlToken TokenizeText()
-    {
-      Debug.Assert( input[ position ] != '<' );
-      Debug.Assert( input[ position ] != '&' );
-      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
-      int i;
-      for( i = position; i < input.Length; i++ )
-        if( input[ i ] == '<' || input[ i ] == '&' )
-          break;
-      XmlToken token = new XmlToken( XmlTokenKind.TextContent, i - position );
-      position = i;
-      return token;
-    }
-    private XmlToken TokenizeOutsideElement()
-    {
-      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
-      if( position >= input.Length )
-        return new XmlToken( XmlTokenKind.EOF, 0 );
-      switch( input[ position ] )
-      {
-        case '<':
-          return TokenizeOpen();
-        case '&':
-          return TokenizeEntity();
-        default:
-          return TokenizeText();
-      }
-    }
-    private XmlToken TokenizeSimple( string text, XmlTokenKind kind, XmlTokenizerMode nextMode )
-    {
-      XmlToken token = new XmlToken( kind, text.Length );
-      position += text.Length;
-      mode = nextMode;
-      return token;
-    }
-    private XmlToken TokenizeOpen()
-    {
-      Debug.Assert( input[ position ] == '<' );
-      if( StartsWith( "<!--" ) )
-        return TokenizeSimple( "<!--", XmlTokenKind.CommentBegin, XmlTokenizerMode.InsideComment );
-      else
-        if( StartsWith( "<![CDATA[" ) )
-          return TokenizeSimple( "<![CDATA[", XmlTokenKind.CDataBegin, XmlTokenizerMode.InsideCData );
-        else
-          if( StartsWith( "<?" ) )
-            return TokenizeSimple( "<?", XmlTokenKind.OpenProcessingInstruction, XmlTokenizerMode.InsideProcessingInstruction );
-          else
-            if( StartsWith( "</" ) )
-              return TokenizeSimple( "</", XmlTokenKind.OpenClose, XmlTokenizerMode.AfterOpen );
-            else
-              return TokenizeSimple( "<", XmlTokenKind.Open, XmlTokenizerMode.AfterOpen );
-    }
-    private XmlToken TokenizeEntity()
-    {
-      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
-      Debug.Assert( input[ position ] == '&' );
-      XmlToken token = new XmlToken( XmlTokenKind.Entity, input.IndexOf( ';', position ) - position );
-      position += token.Length;
-      return token;
-    }
-    private XmlToken TokenizeInsideProcessingInstruction()
-    {
-      Debug.Assert( mode == XmlTokenizerMode.InsideProcessingInstruction );
-      int tokenend = input.IndexOf( "?>", position );
-      if( position == tokenend )
-      {
-        position += "?>".Length;
-        mode = XmlTokenizerMode.OutsideElement;
-        return new XmlToken( XmlTokenKind.CloseProcessingInstruction, "?>".Length );
-      }
-      else
-      {
-        XmlToken token = new XmlToken( XmlTokenKind.TextContent, tokenend - position );
-        position = tokenend;
-        return token;
-      }
-    }
-    private XmlToken TokenizeInsideCData()
-    {
-      Debug.Assert( mode == XmlTokenizerMode.InsideCData );
-      int tokenend = input.IndexOf( "]]>", position );
-      if( position == tokenend )
-      {
-        position += "]]>".Length;
-        mode = XmlTokenizerMode.OutsideElement;
-        return new XmlToken( XmlTokenKind.CDataEnd, "]]>".Length );
-      }
-      else
-      {
-        XmlToken token = new XmlToken( XmlTokenKind.TextContent, tokenend - position );
-        position = tokenend;
-        return token;
-      }
-    }
-    private XmlToken TokenizeInsideComment()
-    {
-      Debug.Assert( mode == XmlTokenizerMode.InsideComment );
-      int tokenend = input.IndexOf( "-->", position );
-      if( position == tokenend )
-      {
-        position += "-->".Length;
-        mode = XmlTokenizerMode.OutsideElement;
-        return new XmlToken( XmlTokenKind.CommentEnd, "-->".Length );
-      }
-      else
-      {
-        XmlToken token = new XmlToken( XmlTokenKind.CommentText, tokenend - position );
-        position = tokenend;
-        return token;
-      }
-    }
-  }
-
-  // Used so you can restart the tokenizer for the next line of XML
-  enum XmlTokenizerMode
-  {
-    InsideComment,
-    InsideProcessingInstruction,
-    AfterOpen,
-    AfterAttributeName,
-    AfterAttributeEquals,
-    InsideElement,
-    // after element name, before attribute or />
-    OutsideElement,
-    InsideCData
-  }
-
-  struct XmlToken
-  {
-    public XmlTokenKind Kind;
-    public short Length;
-    public XmlToken( XmlTokenKind kind, int length )
-    {
-      Kind = kind;
-      Length = ( short )length;
-    }
-  }
-
-  /*
-      * this file implements a mostly correct XML tokenizer.  The token boundaries
-      * have been chosen to match Visual Studio syntax highlighting, so a few of 
-      * the boundaries are little weird.  (Especially comments) known issues:
-      * 
-      * Doesn't handle DTD's
-      * mediocre handling of processing instructions <? ?> -- it won't crash, 
-      *      but the token boundaries are wrong
-      * Doesn't enforce correct XML
-      * there's probably a few cases where it will die if given in valid XML
-      * 
-      * 
-      * This tokenizer has been designed to be restartable, so you can tokenize
-      * one line of XML at a time.
-      */
-  enum XmlTokenKind
-  {
-    Open,
-    // <
-    Close,
-    //>
-    SelfClose,
-    // />
-    OpenClose,
-    // </
-    ElementName,
-    ElementWhitespace,
-    //whitespace between attributes
-    AttributeName,
-    Equals,
-    // inside attribute
-    AttributeValue,
-    // attribute value
-    CommentBegin,
-    // <!--
-    CommentText,
-    CommentEnd,
-    // -->
-    Entity,
-    // &gt;
-    OpenProcessingInstruction,
-    // <?
-    CloseProcessingInstruction,
-    // ?>
-    CDataBegin,
-    // <![CDATA[
-    CDataEnd,
-    // ]]>
-    TextContent,
-    //WhitespaceContent, // text content that's whitespace.  Space is embedded inside
-    EOF,
-    // end of file
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/Converters/ZeroToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/Converters/ZeroToBoolConverter.cs
deleted file mode 100644
index f4926894..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/Converters/ZeroToBoolConverter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.LiveExplorer.Samples.Converters
-{
-
-
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs
deleted file mode 100644
index 3c75095f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 46b7f466..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 027037d5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
-      Uri uri = new Uri( string.Format( "/CodeFiles/{0}.xaml.txt", viewName ), UriKind.Relative );
-      try
-      {
-        var streamInfo = Application.GetResourceStream( uri );
-        using( StreamReader sr = new StreamReader( streamInfo.Stream ) )
-        {
-          this.XamlText = sr.ReadToEnd();
-        }
-      }
-      catch { }
-    }
-
-    private void SetXamlText( string viewName, string moduleName )
-    {
-      //now we need to append the file extension
-      Uri uri = new Uri( string.Format( "/CodeFiles/{0}.xaml.cs.txt", viewName ), UriKind.Relative );
-      try
-      {
-        var streamInfo = Application.GetResourceStream( uri );
-        using( StreamReader sr = new StreamReader( streamInfo.Stream ) )
-        {
-          this.CSharpText = sr.ReadToEnd();
-        }
-      }
-      catch { }
-    }
-
-    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
deleted file mode 100644
index 5f6e7b87..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 130fce22..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.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
deleted file mode 100644
index 279ed02b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
+++ /dev/null
@@ -1,870 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="Toolkit Plus for WPF - LiveExplorer"
-        Height="778"
-        Width="1300">
-  <Window.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Resources/LiveExplorerScrollViewer.xaml" />
-      </ResourceDictionary.MergedDictionaries>
-
-      <SolidColorBrush x:Key="SampleDefaultBrush">#FFC72035</SolidColorBrush>
-
-      <!--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="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="{StaticResource SampleDefaultBrush}"
-                      Stroke="{StaticResource SampleDefaultBrush}"
-                      Data="{StaticResource TreeArrow}">
-                </Path>
-              </Border>
-              <ControlTemplate.Triggers>
-                <Trigger Property="IsMouseOver"
-                         Value="True">
-                  <Setter TargetName="ExpandPath"
-                          Property="Stroke"
-                          Value="{StaticResource SampleDefaultBrush}" />
-                  <Setter TargetName="ExpandPath"
-                          Property="Fill"
-                          Value="{StaticResource SampleDefaultBrush}" />
-                </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="{StaticResource SampleDefaultBrush}" />
-                  <Setter TargetName="ExpandPath"
-                          Property="Stroke"
-                          Value="{StaticResource SampleDefaultBrush}" />
-                </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="12" />
-        <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" />
-        <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="{StaticResource SampleDefaultBrush}" />
-          </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="{StaticResource SampleDefaultBrush}" />
-                  <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>
-    <Grid Margin="30,30,0,0">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition MinWidth="260"
-                          Width="Auto" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-
-      <Grid.RowDefinitions>
-        <RowDefinition Height="90" />
-        <RowDefinition />
-      </Grid.RowDefinitions>
-
-      <Image Source="Resources/toolkitIcon.png"
-             MouseLeftButtonDown="Image_MouseLeftButtonDown"
-             RenderOptions.BitmapScalingMode="Fant"
-             Width="190"
-             HorizontalAlignment="Left"
-             Margin="24,0,0,0" />
-
-      <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" />
-            </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}" />
-              <core:LiveExplorerTreeViewItem Header="Expanding non-primitives"
-                                             SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridExpandingNonPrimitivesView}"
-                                             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}"
-                                             IsPlusOnlyFeature="True" />
-            </core:LiveExplorerTreeViewItem>
-            <core:LiveExplorerTreeViewItem Header="Using a Custom List"
-                                           SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridPropertiesSourceView}"
-                                           IsPlusOnlyFeature="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}" />
-
-          </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}" IsPlusOnlyFeature="True" />
-
-          <core:LiveExplorerTreeViewItem Header="Check lists"
-                                         SampleType="{x:Type samples:CheckLists.Views.CheckListsView}" />
-          <core:LiveExplorerTreeViewItem Header="Watermark ComboBox"
-                                         SampleType="{x:Type samples:WatermarkComboBox.Views.WatermarkComboBoxView}" />
-          <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="TimeSpan"
-                                         SampleType="{x:Type samples:TimeSpan.Views.TimeSpanView}" />
-          <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 Header="WatermarkPasswordBox"
-                                           SampleType="{x:Type samples:Text.Views.WatermarkPasswordBoxView}" />
-            <core:LiveExplorerTreeViewItem Header="TokenizedTextBox"
-                                           SampleType="{x:Type samples:TokenizedTextBox.Views.TokenizedTextBoxView}"
-                                           IsPlusOnlyFeature="True" />
-          </core:LiveExplorerTreeViewItem>
-          <core:LiveExplorerTreeViewItem Header="Files"
-                                         SampleType="{x:Type samples:FilePicker.Views.FilePickerView}"
-                                         IsPlusOnlyFeature="True" />
-          <core:LiveExplorerTreeViewItem Header="RangeSlider"
-                                         SampleType="{x:Type samples:RangeSlider.Views.RangeSliderView}" />
-          <core:LiveExplorerTreeViewItem Header="Rating"
-                                         SampleType="{x:Type samples:Rating.Views.RatingView}"
-                                         IsPlusOnlyFeature="True" />
-          <core:LiveExplorerTreeViewItem Header="ToggleSwitch"
-                                         SampleType="{x:Type samples:ToggleSwitch.Views.ToggleSwitchView}"
-                                         IsPlusOnlyFeature="True" />
-          <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 Header="IconButton"
-                                         SampleType="{x:Type samples:Button.Views.IconButtonView}" />
-        </core:LiveExplorerTreeViewItem>
-        <core:LiveExplorerTreeViewItem Header="Charts"
-                                       Style="{StaticResource TreeViewHeaderStyle}"
-                                       ItemContainerStyle="{StaticResource TreeViewItemStyle}"
-                                       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="StyleableWindows"
-                                         SampleType="{x:Type samples:Window.Views.StyleableWindowView}" />
-          <core:LiveExplorerTreeViewItem Header="ChildWindow"
-                                         SampleType="{x:Type samples:Window.Views.ChildWindowView}" />
-          <core:LiveExplorerTreeViewItem Header="WindowContainer"
-                                         SampleType="{x:Type samples:Window.Views.WindowContainerView}" />
-        </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 Header="Gauge"
-                                         ItemContainerStyle="{StaticResource TreeViewItemStyle}"
-                                         SampleType="{x:Type samples:Gauge.Views.RadialGaugeView}"
-                                         IsPlusOnlyFeature="True" />
-          <core:LiveExplorerTreeViewItem Header="MultiCalendar"
-                                         IsPlusOnlyFeature="True"
-                                         SampleType="{x:Type samples:MultiCalendar.Views.MultiCalendarView}" />
-          <core:LiveExplorerTreeViewItem Header="Material Controls"
-                                         ItemContainerStyle="{StaticResource TreeViewItemStyle}"
-                                         IsPlusOnlyFeature="True"
-                                         SampleType="{x:Type samples:MaterialControls.Views.MaterialControlsView}"
-                                         IsSelected="True">
-            <core:LiveExplorerTreeViewItem Header="Button"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialButtonView}" />
-            <core:LiveExplorerTreeViewItem Header="CheckBox"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialCheckBoxView}" />
-            <core:LiveExplorerTreeViewItem Header="ComboBox"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialComboBoxView}" />
-            <core:LiveExplorerTreeViewItem Header="DropDown"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialDropDownView}" />
-            <core:LiveExplorerTreeViewItem Header="Frame"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialFrameView}" />
-            <core:LiveExplorerTreeViewItem Header="Hamburger"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialHamburgerView}" />
-            <core:LiveExplorerTreeViewItem Header="ListBox"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialListBoxView}" />
-            <core:LiveExplorerTreeViewItem Header="ProgressBar"
-                                           ItemContainerStyle="{StaticResource TreeViewItemStyle}"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialProgressBarView}">
-              <core:LiveExplorerTreeViewItem Header="Circular"
-                                             SampleType="{x:Type samples:MaterialControls.Views.MaterialProgressBarCircularView}" />
-            </core:LiveExplorerTreeViewItem>
-            <core:LiveExplorerTreeViewItem Header="RadioButton"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialRadioButtonView}" />
-            <core:LiveExplorerTreeViewItem Header="Slider"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialSliderView}" />
-            <core:LiveExplorerTreeViewItem Header="Switch"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialSwitchView}" />
-            <core:LiveExplorerTreeViewItem Header="Tabs"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialTabsView}" />
-            <core:LiveExplorerTreeViewItem Header="TextField"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialTextFieldView}" />
-            <core:LiveExplorerTreeViewItem Header="Toast"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialToastView}" />
-            <core:LiveExplorerTreeViewItem Header="ToolTip"
-                                           SampleType="{x:Type samples:MaterialControls.Views.MaterialToolTipView}" />
-          </core:LiveExplorerTreeViewItem>
-        </core:LiveExplorerTreeViewItem>
-        <core:LiveExplorerTreeViewItem Header="Other"
-                                       Style="{StaticResource TreeViewHeaderStyle}"
-                                       ItemContainerStyle="{StaticResource TreeViewItemStyle}">
-          <core:LiveExplorerTreeViewItem Header="AvalonDock"
-                                         SampleType="{x:Type samples:AvalonDock.Views.AvalonDockView}" />
-          <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}"
-                                         IsPlusOnlyFeature="True" />
-          <core:LiveExplorerTreeViewItem Header="SwitchPanel"
-                                         SampleType="{x:Type samples:Panels.Views.SwitchPanelView}" />
-          <core:LiveExplorerTreeViewItem Header="SlideShow"
-                                         SampleType="{x:Type samples:SlideShow.Views.SlideShowView}"
-                                         IsPlusOnlyFeature="True" />
-        </core:LiveExplorerTreeViewItem>
-
-        <core:LiveExplorerTreeViewItem Header="Theming"
-                                       Style="{StaticResource TreeViewHeaderStyle}"
-                                       ItemContainerStyle="{StaticResource TreeViewItemStyle}">
-          <core:LiveExplorerTreeViewItem Header="Toolkit for WPF controls"
-                                         SampleType="{x:Type samples:Theming.Views.ThemingExtendedToolkitView}"
-                                         IsPlusOnlyFeature="True" />
-          <core:LiveExplorerTreeViewItem Header="AvalonDock Controls"
-                                         SampleType="{x:Type samples:Theming.Views.ThemingAvalonDockView}" />
-          <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" />
-        </core:LiveExplorerTreeViewItem>
-      </TreeView>
-
-      <TextBlock x:Name="VersionTextBlock"
-                 Grid.Column="1"
-                 HorizontalAlignment="Right"
-                 Margin="0,0,17,0"
-                 Foreground="Gray" />
-
-      <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}}}"
-                            Focusable="False">
-                <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="{StaticResource SampleDefaultBrush}" />
-
-                  <!-- Bottom Rectangle text -->
-                  <TextBlock Grid.Row="2"
-                             Foreground="White"
-                             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://xceed.com/xceed-toolkit-plus-for-wpf/"> 
-                              Toolkit Plus 
-                           </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>
-  </Grid>
-</Window>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs
deleted file mode 100644
index 960c036c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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();
-      this.Loaded += new RoutedEventHandler( this.MainWindow_Loaded );
-
-      VersionTextBlock.Text = "Version: " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
-    }
-
-
-    #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 )
-    {
-      this.InitView();
-    }
-
-    #endregion //View
-
-    #endregion //Properties
-
-    #region Event Handler
-
-    void MainWindow_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.InitView();
-    }
-
-    private void OnTreeViewSelectionChanged( object sender, RoutedPropertyChangedEventArgs<Object> e )
-    {
-      this.UpdateSelectedView( e.NewValue as LiveExplorerTreeViewItem );
-    }
-
-    private void UpdateSelectedView( LiveExplorerTreeViewItem treeViewItem )
-    {
-      if( treeViewItem != null )
-      {
-        treeViewItem.IsExpanded = true;
-        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
-
-    #region Methods
-
-    private void InitView()
-    {
-      if( ( _flowDocumentDesc != null ) && ( this.View != null) )
-      {
-        _flowDocumentDesc.Blocks.Clear();
-        if( this.View.Description != null )
-        {
-          _flowDocumentDesc.Blocks.Add( this.View.Description );
-        }
-      }
-      if( _contentScrollViewer != null )
-      {
-        _contentScrollViewer.ScrollToHome();
-      }
-    }
-
-    #endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.Designer.cs
deleted file mode 100644
index 04d2a42d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <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
deleted file mode 100644
index 562a3aac..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 3.4
-    
-    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">3.4</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>3.4</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=3.4.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=3.4.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
deleted file mode 100644
index 39872953..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//------------------------------------------------------------------------------
-// <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;
-            }
-        }
-
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string lastSample {
-            get {
-                return ((string)(this["lastSample"]));
-            }
-            set {
-                this["lastSample"] = value;
-            }
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.settings b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.settings
deleted file mode 100644
index 3b16385f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.settings
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Xceed.Wpf.Toolkit.LiveExplorer.Properties" GeneratedClassName="Settings">
-  <Profiles />
-  <Settings>
-    <Setting Name="lastSample" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
-  </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
deleted file mode 100644
index 8df62083..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/app.manifest
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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
deleted file mode 100644
index 8c67085f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml
+++ /dev/null
@@ -1,547 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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">
-
-   <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
deleted file mode 100644
index 96e97c4f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="#FFC72035" />
-      <Setter Property="Margin" Value="0,5" />
-   </Style>
-
-    <Style x:Key="DisableGrayText" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
-      <Style.Triggers>
-            <Trigger Property="IsEnabled" Value="False">
-               <Setter Property="Foreground" Value="Gray" />
-            </Trigger>
-      </Style.Triggers>
-    </Style>
-
-   <Style x:Key="DisableGrayComboBox"
-          TargetType="ComboBox">
-      <Style.Triggers>
-         <Trigger Property="IsEnabled"
-                  Value="False">
-            <Setter Property="Foreground"
-                    Value="Gray" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/toolkitIcon.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/toolkitIcon.png
deleted file mode 100644
index 11d9de80..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/toolkitIcon.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/xceed_logo.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/xceed_logo.png
deleted file mode 100644
index ee32c016..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/xceed_logo.png and /dev/null 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
deleted file mode 100644
index 7abf41ac..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/address-book--pencil.png and /dev/null 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
deleted file mode 100644
index 621ca402..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/address-book-open.png and /dev/null 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
deleted file mode 100644
index 4821bf49..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/alarm-clock-blue.png and /dev/null 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
deleted file mode 100644
index 75f92b0c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/document.png and /dev/null 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
deleted file mode 100644
index 2c63f2f1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/property-blue.png and /dev/null 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
deleted file mode 100644
index f17aa84b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml
+++ /dev/null
@@ -1,168 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="AvalonDock">
-  <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>
-
-    <TextBlock Grid.Row="1"
-               Text="Usage:"
-               Style="{StaticResource Header}" />
-
-    <StackPanel Grid.Row="2">
-      <xcad:DockingManager x:Name="_dockingManager"
-                           MaxHeight="395"
-                           AllowMixedOrientation="True"
-                           BorderBrush="Black"
-                           BorderThickness="1">
-        <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}"
-                                   AutoGenerateProperties="False">
-                  <xctk:PropertyGrid.PropertyDefinitions>
-                    <xctk:PropertyDefinition TargetProperties="Background" />
-                    <xctk:PropertyDefinition TargetProperties="BorderBrush" />
-                    <xctk:PropertyDefinition TargetProperties="BorderThickness" />
-                    <xctk:PropertyDefinition TargetProperties="FontSize" />
-                    <xctk:PropertyDefinition TargetProperties="FontStyle" />
-                    <xctk:PropertyDefinition TargetProperties="Width" />
-                    <xctk:PropertyDefinition TargetProperties="Height" />
-                  </xctk:PropertyGrid.PropertyDefinitions>
-                </xctk:PropertyGrid>
-              </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"
-                                       CanClose="True">
-                  <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>
-
-      <StackPanel Orientation="Horizontal"
-                  HorizontalAlignment="Center">
-        <Button Content="Save AvalonDock"
-                Margin="5"
-                Padding="5"
-                Click="SaveButton_Click" />
-        <Button Content="Load AvalonDock"
-                Margin="5"
-                Padding="5"
-                Click="LoadButton_Click" />
-      </StackPanel>
-    </StackPanel>
-  </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
deleted file mode 100644
index 1df33371..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-
-using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout.Serialization;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views
-{
-  /// <summary>
-  /// Interaction logic for AvalonDockView.xaml
-  /// </summary>
-  public partial class AvalonDockView : DemoView
-  {
-    public AvalonDockView()
-    {
-      InitializeComponent();
-    }
-
-    private void SaveButton_Click( object sender, RoutedEventArgs e )
-    {
-      using( var writer = new StreamWriter( "AvalonDockSavedFile.txt" ) )
-      {
-        var layoutSerializer = new XmlLayoutSerializer( _dockingManager );
-        layoutSerializer.Serialize( writer );
-      }
-    }
-
-    private void LoadButton_Click( object sender, RoutedEventArgs e )
-    {
-      using( var reader = new StreamReader( "AvalonDockSavedFile.txt" ) )
-      {
-        var layoutSerializer = new XmlLayoutSerializer( _dockingManager );
-        layoutSerializer.Deserialize( reader );
-      }
-    }
-  }
-}
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
deleted file mode 100644
index 041b3026..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Converters/IntegerToTimespanConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 System.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/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Images/CdBurning32.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Images/CdBurning32.png
deleted file mode 100644
index 2f6f4871..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Images/CdBurning32.png and /dev/null differ
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
deleted file mode 100644
index c3f21912..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Resources/Common.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index f620b849..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="../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
deleted file mode 100644
index 54099f48..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 79180dbf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="../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="../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
deleted file mode 100644
index 02af7688..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index aaa3bece..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="../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
deleted file mode 100644
index d1ccd2aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/Resources/Default.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Resources/Default.jpg
deleted file mode 100644
index 112ce2a5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Resources/Default.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Resources/PencilTool16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Resources/PencilTool16.png
deleted file mode 100644
index df0970c4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Resources/PencilTool16.png and /dev/null differ
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
deleted file mode 100644
index 7b8b20b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 2cbdd52f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index a6bab569..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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"
-                xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                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>
-  <local:DemoView.Resources>
-    <xctk:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-    <ObjectDataProvider x:Key="DropDownPlacementMode"
-                        MethodName="GetValues"
-                        ObjectType="{x:Type sys:Enum}">
-      <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="PlacementMode" />
-      </ObjectDataProvider.MethodParameters>
-    </ObjectDataProvider>
-  </local:DemoView.Resources>
-
-  <Grid>
-    <StackPanel Margin="10">
-
-      <GroupBox Header="Features"
-                Margin="0,5,0,5">
-        <Grid Margin="5">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-
-          <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-          </Grid.RowDefinitions>
-
-          <!-- 1st Column-->
-          <TextBlock Text="MaxDropDownHeight:"
-                     VerticalAlignment="Center" />
-          <xctk:DoubleUpDown x:Name="maxDropDownHeight"
-                             Grid.Column="1"
-                             Width="60"
-                             Value="500"
-                             AllowInputSpecialValues="PositiveInfinity"
-                             Minimum="0"
-                             HorizontalAlignment="Left"
-                             VerticalAlignment="Center"
-                             Margin="5" />
-
-          <TextBlock Text="DropDown Position: "
-                     Grid.Row="1"
-                     VerticalAlignment="Center" />
-          <ComboBox x:Name="dropDownPosition"
-                    Grid.Column="1"
-                    Grid.Row="1"
-                    ItemsSource="{Binding Source={StaticResource DropDownPlacementMode}}"
-                    SelectedIndex="2"
-                    HorizontalAlignment="Left"
-                    Width="110"
-                    VerticalAlignment="Center"
-                    Margin="5" />
-
-          <!-- 2nd Column-->
-          <TextBlock Text="DropDownContentBackground:"
-                     VerticalAlignment="Center" 
-                     Grid.Column="2"/>
-          <xctk:ColorPicker x:Name="dropDownContentBackground"
-                            Grid.Column="3"
-                            Width="60"
-                            SelectedColor="LightGray"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Margin="5" />
-        </Grid>
-      </GroupBox>
-
-      <StackPanel>
-        <TextBlock Text="Usage:"
-                   Style="{StaticResource Header}" />
-
-        <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"
-                               MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
-                               DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
-                               DropDownContentBackground="{Binding SelectedColor, ElementName=dropDownContentBackground, Converter={StaticResource ColorToSolidColorBrushConverter}}"
-                               Click="DropDownButton_Click">
-            <xctk:DropDownButton.DropDownContent>
-              <StackPanel>
-                <xctk:ColorCanvas Margin="10"/>
-                <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"
-                            MaxDropDownHeight="{Binding Value, ElementName=maxDropDownHeight}"
-                            DropDownPosition="{Binding SelectedItem, ElementName=dropDownPosition}"
-                            DropDownContentBackground="{Binding SelectedColor, ElementName=dropDownContentBackground, Converter={StaticResource ColorToSolidColorBrushConverter}}"
-                            Click="SplitButton_Click">
-            <xctk:SplitButton.DropDownContent>
-              <StackPanel>
-                <xctk:ColorCanvas Margin="10"/>
-                <Button Click="Button_Click"
-                        Margin="10">OK</Button>
-              </StackPanel>
-            </xctk:SplitButton.DropDownContent>
-          </xctk:SplitButton>
-        </Grid>
-      </StackPanel>
-    </StackPanel>
-  </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
deleted file mode 100644
index 583db23c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/Button/Views/IconButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml
deleted file mode 100644
index 9c5633db..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml
+++ /dev/null
@@ -1,179 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views.IconButtonView"
-                 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"
-                 Title="IconButton">
-     <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-            The IconButton control is a Button that contains an icon and some data. The Foreground, Background and BorderBrush can be easily modified with properties while the Icon location is customizable.
-        </Paragraph>
-    </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-      <Image x:Key="Image1"
-             Source="../Resources/PencilTool16.png"
-             Width="20"
-             Margin="5" />
-      <Image x:Key="Image2"
-             Source="../Resources/Default.jpg"
-             Width="25"
-             Margin="5"/>
-
-      <ObjectDataProvider x:Key="ButtonLocationEnumData"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:Location" />
-         </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" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="100" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st Column -->
-            <TextBlock Text="Icon:" 
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
-                      Margin="5"
-                      VerticalContentAlignment="Center"
-                      SelectedValue="{Binding Icon, ElementName=_iconButton}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="None"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Image 1"
-                             Tag="{StaticResource Image1}" />
-               <ComboBoxItem Content="Image 2"
-                             Tag="{StaticResource Image2}" />
-            </ComboBox>
-
-            <TextBlock Grid.Row="1"
-                       Text="Icon Location: "
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
-                      Grid.Row="1"
-                      ItemsSource="{Binding Source={StaticResource ButtonLocationEnumData}}"
-                      SelectedItem="{Binding IconLocation, ElementName=_iconButton}"
-                      Margin="5"
-                      VerticalContentAlignment="Center" />
-
-            <!-- 2nd Column -->
-            <TextBlock Text="MouseOver Foreground:"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MouseOverForeground, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MousePressed Foreground:"
-                       Grid.Row="1"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="1"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MousePressedForeground, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MouseOver Background:"
-                       Grid.Row="2"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="2"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MouseOverBackground, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MousePressed Background:"
-                       Grid.Row="3"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="3"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MousePressedBackground, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MouseOver BorderBrush:"
-                       Grid.Row="4"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="4"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MouseOverBorderBrush, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-
-            <TextBlock Text="MousePressed BorderBrush:"
-                       Grid.Row="5"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,0,0,0" />
-            <xctk:ColorPicker Grid.Row="5"
-                              Grid.Column="3"
-                              Margin="5"
-                              SelectedColor="{Binding MousePressedBorderBrush, ElementName=_iconButton, Converter={StaticResource SolidColorBrushToColorConverter}}" />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-
-         <xctk:IconButton x:Name="_iconButton"
-                          Content="Test"
-                          Icon="{StaticResource Image1}"
-                          IconLocation="Left"
-                          MouseOverForeground="Black"
-                          MousePressedForeground="White"
-                          MouseOverBackground="LightBlue"
-                          MousePressedBackground="Blue"
-                          MouseOverBorderBrush="LightGray"
-                          MousePressedBorderBrush="LightGray"
-                          Margin="10"
-                          Padding="20,3"
-                          HorizontalAlignment="Center">
-         </xctk:IconButton>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml.cs
deleted file mode 100644
index e1726617..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/IconButtonView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views
-{
-  /// <summary>
-  /// Interaction logic for IconButtonView.xaml
-  /// </summary>
-  public partial class IconButtonView : DemoView
-  {
-    public IconButtonView()
-    {
-      InitializeComponent();
-    }
-  }
-}
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
deleted file mode 100644
index 1363f5f8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 77ca355a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index eaa243f5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Converters/GraduationModeToComboBoxConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index a33d8a87..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartAxis.png and /dev/null 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
deleted file mode 100644
index 86c0c9a7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartBasicTypes.png and /dev/null 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
deleted file mode 100644
index 056d2adf..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartLegend.png and /dev/null 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
deleted file mode 100644
index 244356b8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartSeriesDataPointsBinding.png and /dev/null 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
deleted file mode 100644
index 46e6fa8b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingAxesGrid.png and /dev/null 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
deleted file mode 100644
index 36dfa2b2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingColumnSeries.png and /dev/null 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
deleted file mode 100644
index 07ca989c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingLineSeries.png and /dev/null 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
deleted file mode 100644
index 1adc2616..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingPieSeries.png and /dev/null 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
deleted file mode 100644
index 1c17a46b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/1.bmp and /dev/null 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
deleted file mode 100644
index 2b47be4e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/2.bmp and /dev/null 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
deleted file mode 100644
index 42ff08bd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/3.bmp and /dev/null 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
deleted file mode 100644
index 831f88bd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/4.bmp and /dev/null 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
deleted file mode 100644
index d7577a52..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/5.bmp and /dev/null 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
deleted file mode 100644
index da926722..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/6.bmp and /dev/null 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
deleted file mode 100644
index bb9fade5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 85c4ba11..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index ed9dd017..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 4fa944ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index e9fa3b03..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index bfce285f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 6b7dca83..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xced Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 638b00b9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index a48b9fe8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 62b6964d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index d6dc938a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 60a4bb3d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 80a7b183..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 0e783e8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 0380e45a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 805b5484..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index b899a0b0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml
+++ /dev/null
@@ -1,279 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-
-    <Grid Grid.Row="0"
-          Margin="5">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="*" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-
-      <GroupBox Grid.Column="0"
-                Header="Common Features" >
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="100" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="120" />
-          </Grid.ColumnDefinitions>
-
-          <TextBlock Grid.Row="0"
-                     Grid.Column="0"
-                     Text="Delimiter:"
-                     Margin="2,5,5,5"
-                     VerticalAlignment="Center" />
-          <TextBox x:Name="_delimiter"
-                   Grid.Row="0"
-                   Grid.Column="1"
-                   Margin="5"
-                   Text=","
-                   VerticalAlignment="Center"/>
-
-          <TextBlock Grid.Row="1"
-                     Grid.Column="0"
-                     VerticalAlignment="Center"
-                     Text="ValueMemberPath:"
-                     Margin="2,5,5,5" />
-          <ComboBox x:Name="_valueMemberPath"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="5"
-                    VerticalAlignment="Center"
-                    ItemsSource="{StaticResource personProperties}"
-                    SelectedIndex="0" />
-
-          <TextBlock Grid.Row="2"
-                     Grid.Column="0"
-                     VerticalAlignment="Center"
-                     Text="SelectedValue:"
-                     Margin="2,5,5,5" />
-          <TextBox x:Name="_selectedValue"
-                   Grid.Row="2"
-                   Grid.Column="1"
-                   VerticalAlignment="Center"
-                   Margin="5"
-                   Text="{Binding ElementName=_checkListBox, Path=SelectedValue, Mode=TwoWay}" />
-
-          <TextBlock Grid.Row="3"
-                     Grid.Column="0"
-                     Text="SelectedMemberPath:"
-                     VerticalAlignment="Center"
-                     Margin="2,5,5,5" />
-          <TextBox x:Name="_selectedMemberPath"
-                   Grid.Row="3"
-                   Grid.Column="1"
-                   Margin="5"
-                   VerticalAlignment="Center"
-                   IsEnabled="False"
-                   Text="IsSelected" />
-
-          <TextBlock Grid.Row="0"
-                     Grid.Column="2"
-                     Text="DisplayMemberPath:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <ComboBox x:Name="_displayMemberPath"
-                    Grid.Row="0"
-                    Grid.Column="3"
-                    Margin="5"
-                    Width="110"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    ItemsSource="{StaticResource personProperties}"
-                    SelectedIndex="1" />
-
-          <TextBlock Grid.Row="1"
-                     Grid.Column="2"
-                     Text="IsSelectAllActive:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <CheckBox x:Name="_isSelectAllActive"
-                    Grid.Row="1"
-                    Grid.Column="3"
-                    Margin="5"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    ClickMode="Press"
-                    IsChecked="False"/>
-
-          <TextBlock Grid.Row="2"
-                     Grid.Column="2"
-                     Text="SelectAllContent:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <TextBox x:Name="_selectAllContent"
-                   Grid.Row="2"
-                   Grid.Column="3"
-                   Margin="5"
-                   VerticalAlignment="Center"
-                   Text="SelectAll"
-                   IsEnabled="{Binding IsChecked, ElementName=_isSelectAllActive}"/>
-        </Grid>
-      </GroupBox>
-
-      <GroupBox Grid.Column="1"
-                Header="CheckComboBox Features"
-                Margin="5,0,0,0">
-        <Grid>
-          <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <TextBlock Grid.Row="0"
-                     Grid.Column="0"
-                     Text="IsEditable:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <CheckBox x:Name="_isEditable"
-                    Grid.Row="0"
-                    Grid.Column="1"
-                    Margin="5"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    ClickMode="Press"
-                    IsChecked="{Binding IsEditable, ElementName=_checkComboBox}" />
-          <TextBlock Grid.Row="1"
-                     Grid.Column="0"
-                     Text="IsDropDownOpen:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <CheckBox x:Name="_isDropDownOpen"
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="5"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    ClickMode="Press"
-                    IsChecked="{Binding IsDropDownOpen, ElementName=_checkComboBox}" />
-          <TextBlock Grid.Row="2"
-                     Grid.Column="0"
-                     Text="MaxDropDownHeight:"
-                     VerticalAlignment="Center"
-                     Margin="5" />
-          <xctk:DoubleUpDown x:Name="_maxDropDownHeight"
-                             Grid.Row="2"
-                             Grid.Column="1"
-                             Width="45"
-                             Value="{Binding MaxDropDownHeight, ElementName=_checkComboBox}"
-                             DefaultValue="150"
-                             AllowInputSpecialValues="PositiveInfinity"
-                             Minimum="0"
-                             HorizontalAlignment="Left"
-                             VerticalAlignment="Center"
-                             Margin="5" />
-        </Grid>
-      </GroupBox>
-    </Grid>
-
-
-    <GroupBox Header="Item Models"
-              Grid.Row="1"
-              Margin="5,2,5,2">
-      <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,2,5,2"
-                 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}"
-                         IsSelectAllActive="{Binding ElementName=_isSelectAllActive, Path=IsChecked}"
-                         SelectAllContent="{Binding ElementName=_selectAllContent, Path=Text}"/>
-
-      <TextBlock Text="CheckComboBox Usage:"
-                 Grid.Column="1"
-                 Margin="5,2,5,2"
-                 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}"
-                          IsSelectAllActive="{Binding ElementName=_isSelectAllActive, Path=IsChecked}"
-                          SelectAllContent="{Binding ElementName=_selectAllContent, Path=Text}"
-                          IsEditable="False"
-                          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
deleted file mode 100644
index cefb3341..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 4dd5e575..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml
+++ /dev/null
@@ -1,344 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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:sys="clr-namespace:System;assembly=mscorlib"
-                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>
-
-    <ObjectDataProvider x:Key="ColorModeOptions"
-                        MethodName="GetValues"
-                        ObjectType="{x:Type sys:Enum}">
-      <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="xctk:ColorMode" />
-      </ObjectDataProvider.MethodParameters>
-    </ObjectDataProvider>
-
-    <ObjectDataProvider x:Key="AvailableColorsSortingModeOptions"
-                        MethodName="GetValues"
-                        ObjectType="{x:Type sys:Enum}">
-      <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="xctk:ColorSortingMode" />
-      </ObjectDataProvider.MethodParameters>
-    </ObjectDataProvider>
-  </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>
-            <Style TargetType="{x:Type ComboBox}">
-              <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" />
-            <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="ColorMode:" />
-          <ComboBox Grid.Column="1"
-                    Grid.Row="0"
-                    ItemsSource="{Binding Source={StaticResource ColorModeOptions}}"
-                    SelectedItem="{Binding ElementName=_colorPicker, Path=ColorMode, Mode=TwoWay}"
-                    Height="22" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="1"
-                     Text="AvailableColorsHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="1"
-                   Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="2"
-                     Text="RecentColorsHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="2"
-                   Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="3"
-                     Text="StandardColorsHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="3"
-                   Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="4"
-                     Text="AvailableColorsSortingMode:" />
-          <ComboBox Grid.Column="1"
-                    Grid.Row="4"
-                    ItemsSource="{Binding Source={StaticResource AvailableColorsSortingModeOptions}}"
-                    SelectedItem="{Binding ElementName=_colorPicker, Path=AvailableColorsSortingMode, Mode=TwoWay}"
-                    Height="22" />
-
-          <CheckBox Grid.Column="0"
-                    Grid.Row="5"
-                    Grid.ColumnSpan="2"
-                    Content="DisplayColorAndName"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="6"
-                    Grid.ColumnSpan="2"
-                    Content="DisplayColorTooltip"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorTooltip, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="7"
-                    Grid.ColumnSpan="2"
-                    Content="ShowTabHeaders"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowTabHeaders, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="8"
-                    Grid.ColumnSpan="2"
-                    Content="ShowAvailableColors"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="9"
-                    Grid.ColumnSpan="2"
-                    Content="ShowDropDownButton"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="10"
-                    Grid.ColumnSpan="2"
-                    Content="ShowRecentColors"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="11"
-                    Grid.ColumnSpan="2"
-                    Content="ShowStandardColors"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}" />
-          <CheckBox Grid.Column="0"
-                    Grid.Row="12"
-                    Grid.ColumnSpan="2"
-                    Content="UsingAlphaChannel"
-                    IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="13"
-                     Text="MaxDropDownWidth:" />
-          <xctk:IntegerUpDown Grid.Column="1"
-                              Grid.Row="13"
-                              Minimum="50"
-                              Maximum="550"
-                              Value="{Binding ElementName=_colorPicker, Path=MaxDropDownWidth}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="14"
-                     Text="AdvancedButtonHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="14"
-                   Text="{Binding ElementName=_colorPicker, Path=AdvancedButtonHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="15"
-                     Text="StandardButtonHeader:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="15"
-                   Text="{Binding ElementName=_colorPicker, Path=StandardButtonHeader, Mode=TwoWay}" />
-          <TextBlock Grid.Column="0"
-                     Grid.Row="16"
-                     Text="SelectedColorText:" />
-          <TextBox Grid.Column="1"
-                   Grid.Row="16"
-                   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
deleted file mode 100644
index d5055d4f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/OpenSourceImages/MultiColumnsComboBox.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/MultiColumnsComboBox.png
deleted file mode 100644
index ab49f3c1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/MultiColumnsComboBox.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs
deleted file mode 100644
index 2f369577..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.DataGrid.ValidationRules;
-using System.Windows.Controls;
-using System.Globalization;
-using Xceed.Wpf.DataGrid;
-using System.Data;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid
-{
-  public class UniqueIDCellValidationRule : CellValidationRule
-  {
-    public UniqueIDCellValidationRule()
-    {
-    }
-
-    public override ValidationResult Validate( object value, CultureInfo culture, CellValidationContext context )
-    {
-      // Get the DataItem from the context and cast it to a DataRow
-      DataRowView dataRowView = context.DataItem as DataRowView;
-
-      // Convert the value to a long to make sure it is numerical.
-      // When the value is not numerical, then an InvalidFormatException will be thrown.
-      // We let it pass unhandled to demonstrate that an exception can be thrown when validating
-      // and the grid will handle it nicely.
-      long id = Convert.ToInt64( value, CultureInfo.CurrentCulture );
-
-      // Try to find another row with the same ID
-      System.Data.DataRow[] existingRows = dataRowView.Row.Table.Select( context.Cell.FieldName + "=" + id.ToString( CultureInfo.InvariantCulture ) );
-
-      // If a row is found, we return an error
-      if( ( existingRows.Length != 0 ) && ( existingRows[ 0 ] != dataRowView.Row ) )
-        return new ValidationResult( false, "The value must be unique" );
-
-      // If no row was found, we return a ValidResult
-      return ValidationResult.ValidResult;
-    }
-  }
-}
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
deleted file mode 100644
index fa6d2f2e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml
+++ /dev/null
@@ -1,184 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>Toolkit for WPF 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}}" 
-                              AllowDrag="True">           
-            <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}" 
-                             GroupValueTemplate="{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
deleted file mode 100644
index c380b492..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index eb469522..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index e32ef1f5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CustomFormatToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/CustomFormatToBoolConverter.cs
deleted file mode 100644
index e0a2a563..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/CustomFormatToBoolConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
-{
-  internal class CustomFormatToBoolConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is DateTimeFormat )
-      {
-        return ( DateTimeFormat )value == DateTimeFormat.Custom;
-      }
-
-      return false;
-    }
-
-    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/Converters/DateTimeToTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/DateTimeToTimeSpanConverter.cs
deleted file mode 100644
index 8a25b702..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/DateTimeToTimeSpanConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 System.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
deleted file mode 100644
index 886b1a48..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml
+++ /dev/null
@@ -1,201 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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" />
-      <conv:CustomFormatToBoolConverter x:Key="CustomFormatToBoolConverter" />
-
-      <ObjectDataProvider x:Key="enumDateFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimeFormat"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        <ObjectDataProvider x:Key="enumVisibility" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Visibility" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-       <ObjectDataProvider x:Key="enumKind" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="sys:DateTimeKind" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumCalendarDisplayMode"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="CalendarMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumDateTimePart" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimePart"/>
-         </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" />
-               <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="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" IsEnabled="{Binding IsEnabled, ElementName=_formatString}" Style="{StaticResource DisableGrayText}" />
-            <TextBox x:Name="_formatString" Grid.Row="1" Grid.Column="1" Text="yy MMM dd" Width="190" IsEnabled="{Binding Source={x:Reference _format}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" 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="ClipValueToMinMax:" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_clipValueToMinMax" Grid.Row="4" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>
-            <TextBlock Text="Kind:" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_kind" Grid.Row="5" Grid.Column="1" SelectedIndex="2" ItemsSource="{Binding Source={StaticResource enumKind}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="CalendarDisplayMode:" Grid.Row="6" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_calendarDisplayMode" Grid.Row="6" Grid.Column="1" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumCalendarDisplayMode}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="CalendarWidth:" Grid.Row="7" Grid.Column="0" VerticalAlignment="Center"/>
-            <xctk:DoubleUpDown x:Name="_calendarWidth" Grid.Row="7" Grid.Column="1" Value="178" Minimum="100" Maximum="500" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="ShowDropDownButton:" Grid.Row="8" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_showDropDownButton" Grid.Row="8" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5,5,25,5"/>
-            <TextBlock Text="TimePickerVisibility:" Grid.Row="9" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_timePickerVisibility" Grid.Row="9" Grid.Column="1" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumVisibility}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="TimePickerShowButtonSpinner:" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_timePickerShowButtonSpinner" Grid.Row="10" Grid.Column="1" IsChecked="True" 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="7" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="190" Margin="5"/>
-            <TextBlock Text="Time FormatString:" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_timeFormatString}" Style="{StaticResource DisableGrayText}"/>
-            <TextBox x:Name="_timeFormatString" Grid.Row="1" Grid.Column="3" Text="H:mm" Width="190"  IsEnabled="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" 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"/>
-            <TextBlock Text="Minimum:" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center"/>
-            <xctk:DateTimeUpDown x:Name="_minimum" Grid.Row="3" Grid.Column="3" Format="Custom" FormatString="yyyy/MM/dd HH:mm" Value="2013/01/01T12:00" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="Maximum:" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center"/>
-            <xctk:DateTimeUpDown x:Name="_maximum" Grid.Row="4" Grid.Column="3" Format="Custom" FormatString="yyyy/MM/dd HH:mm" Value="2018/12/31T12:00" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="CurrentDateTimePart:" Grid.Row="5" Grid.Column="2" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_currentDateTimePart" Grid.Row="5" Grid.Column="3" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumDateTimePart}}" Width="190" Margin="5" ToolTip="Must match a DateTimePart of the DateTimePicker Format."/>
-         </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}"
-                                 ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
-                                 TimePickerVisibility="{Binding Source={x:Reference _timePickerVisibility}, Path=SelectedItem}"
-                                 TimePickerShowButtonSpinner="{Binding IsChecked, ElementName=_timePickerShowButtonSpinner}"
-                                 Minimum="{Binding Value, ElementName=_minimum}"
-                                 Maximum="{Binding Value, ElementName=_maximum}"
-                                 Kind="{Binding SelectedItem, ElementName=_kind}"
-                                 CalendarDisplayMode="{Binding SelectedItem, ElementName=_calendarDisplayMode}"
-                                 CalendarWidth="{Binding Value, ElementName=_calendarWidth}"
-                                 ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
-                                 CurrentDateTimePart="{Binding SelectedItem, ElementName=_currentDateTimePart, Mode=TwoWay}"/>
-        </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" />
-                        <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"/>
-                    <TextBlock Grid.Row="3" Text="MaxDropDownHeight:" VerticalAlignment="Center" />
-                    <xctk:DoubleUpDown x:Name="_maxDropDownHeight" Grid.Row="3" Grid.Column="1" Width="100" Value="130" DefaultValue="130" AllowInputSpecialValues="PositiveInfinity" Minimum="0" />
-                 </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}}"
-                                 ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
-                                 Minimum="{Binding Value, ElementName=_minimum}"
-                                 Maximum="{Binding Value, ElementName=_maximum}"
-                                 MaxDropDownHeight="{Binding Value, ElementName=_maxDropDownHeight}"
-                                 ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"/>
-           </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
deleted file mode 100644
index 5c68a282..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/FilePicker/OpenSourceImages/FilePicker.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/OpenSourceImages/FilePicker.png
deleted file mode 100644
index 85fcdff1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/OpenSourceImages/FilePicker.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml
deleted file mode 100644
index 79701472..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views.FilePickerView"
-                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.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views"
-                xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                Title="FilePicker">   
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The FilePicker is a control that can be used to select one or more files in a browsing window.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\FilePicker.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs
deleted file mode 100644
index 6fe084df..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/FilePicker/Views/FilePickerView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Windows;
-using System.Windows.Data;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views
-{
-  /// <summary>
-  /// Interaction logic for FilePickerView.xaml
-  /// </summary>
-  public partial class FilePickerView : DemoView
-  {
-    public FilePickerView()
-    {
-      InitializeComponent();
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/OpenSourceImages/Gauge.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/OpenSourceImages/Gauge.png
deleted file mode 100644
index 6bfb418a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/OpenSourceImages/Gauge.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/arrow.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/arrow.png
deleted file mode 100644
index 79b65a4b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/arrow.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/fuel.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/fuel.jpg
deleted file mode 100644
index fe7b9705..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/fuel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/pointing.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/pointing.jpg
deleted file mode 100644
index f67e45f2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/pointing.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/smiley.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/smiley.png
deleted file mode 100644
index 2ff59e79..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Resources/smiley.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml
deleted file mode 100644
index 8517a855..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views.RadialGaugeView"
-                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:win="clr-namespace:System.Windows.Media;assembly=WindowsBase"
-                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:toolConv="clr-namespace:Xceed.Wpf.Toolkit.Converters;assembly=Xceed.Wpf.Toolkit"
-                Title="Radial Gauge">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The RadialGauge is a fully customizable gauge that can be used to display a current value on a radial or partially radial scaled circle. Markers can be added to highlight specific values. Background portions or border portions of the Radial gauge can also be customized and the pointer can be animated when moving from one value to a new one.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\Gauge.png" Width="600" Height="400"/>
-
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs
deleted file mode 100644
index 51045945..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Gauge/Views/RadialGaugeView.xaml.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Xceed.Wpf.Toolkit;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views
-{
-  /// <summary>
-  /// Interaction logic for RadialGaugeView.xaml
-  /// </summary>
-  public partial class RadialGaugeView : DemoView
-  {
-    public RadialGaugeView()
-    {
-      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
deleted file mode 100644
index e5535133..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 047dc269..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/OpenSourceImages/ListBox.png and /dev/null 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
deleted file mode 100644
index 0bc06f22..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Resources/Netflix_icon.png and /dev/null 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
deleted file mode 100644
index 4b87996c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml
+++ /dev/null
@@ -1,141 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Converters"
-                xmlns:sys="clr-namespace:System;assembly=mscorlib" 
-                VerticalScrollBarVisibility="Disabled"
-                Title="ListBox">
-   <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 />
-            <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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 35b9b36b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Xceed.Wpf.Samples.SampleData;
-using System.ComponentModel;
-
-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
deleted file mode 100644
index f6b1764c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 134759f3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Visibility.Collapsed;
-    }
-
-    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/Resources/SampleText.rtf b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Resources/SampleText.rtf
deleted file mode 100644
index fcd8739b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Resources/SampleText.rtf
+++ /dev/null
@@ -1,9 +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{\fs15\f2 {\b\ltrch "Using Xceed DataGrid for WPF Professional Edition in Microsoft Visual Studio Team System 2010 helped us greatly reduce the time and resources necessary for developing all the data presentation features we needed. Working with Xceed has been a pleasure, and they update the product often and provide innovative new features such as 3D views for visualizing data. We will certainly continue to look at their technology in the future as a complement to our products."}\li0\ri0\sa0\sb0\fi0\ql\par}
-{\fs15\f2 {\ltrch }\li0\ri0\sa0\sb0\fi0\ql\par}
-{\fs15\f2 {\ltrch     - Norman Guadagno, director of product marketing for Microsoft Visual Studio Team System, October 27, 2008}\li0\ri0\sa0\sb0\fi0\ql\par}
-{\fs15\f2 {\ltrch }\li0\ri0\sa0\sb0\fi0\ql\par}
-{\fs15\f2 {\b\ltrch "IBM U2 researched existing third-party solutions and identified Xceed DataGrid for WPF as the most suitable tool. The datagrid\rquote s performance and solid foundation take true advantage of WPF and provide the extensibility required for IBM U2 customers to take their applications to the next level in presentation design and styling."}\li0\ri0\sa0\sb0\fi0\ql\par}
-{\fs15\f2 {\ltrch }\li0\ri0\sa0\sb0\fi0\ql\par}
-{\fs15\f2 {\ltrch     - Vinnie Smith, U2 Tools product manager at IBM, October 27, 2008}\li0\ri0\sa0\sb0\fi0\ql\par}
-}
-}
\ No newline at end of file
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
deleted file mode 100644
index c25cbc93..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml
+++ /dev/null
@@ -1,111 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-      <xctk:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      <conv:VisibilityConverter x:Key="visibilityConverter" />
-      <xctk:RtfFormatter x:Key="rtfFormatter" />
-      <xctk:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter"/>
-
-      <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="100" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="100" />
-            </Grid.ColumnDefinitions>
-            <!-- First Column-->
-            <TextBlock Text="Zoom Factor:" VerticalAlignment="Center" Margin="5" />
-            <xctk:DoubleUpDown x:Name="_zoomFactor" Grid.Column="1" Value="{Binding ZoomFactor, ElementName=_magnifier}" Minimum="0" Increment="0.1" Maximum="3" FormatString="N1" Margin="5" />
-            <TextBlock Text="IsUsingZoomOnMouseWheel:" Grid.Row="1" VerticalAlignment="Center" Margin="5" />
-            <CheckBox x:Name="_isUsingZoomOnMouseWheel" Grid.Row="1" Grid.Column="1" IsChecked="{Binding IsUsingZoomOnMouseWheel, ElementName=_magnifier}" Margin="5" />
-            <TextBlock Text="ZoomFactorOnMouseWheel:" Grid.Row="2" VerticalAlignment="Center" Margin="5" />
-            <xctk:DoubleUpDown x:Name="_zoomFactorOnMouseWheel" Grid.Row="2" Grid.Column="1" Value="{Binding ZoomFactorOnMouseWheel, ElementName=_magnifier}" Minimum="0" Increment="0.05" Maximum="1" FormatString="N2" Margin="5" />
-            <!-- Second Column-->
-            <TextBlock Grid.Column="2" Text="Frame Type:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-            <ComboBox x:Name="_frameType" SelectedItem="{Binding FrameType, ElementName=_magnifier}" ItemsSource="{Binding Source={StaticResource enumData}}" Grid.Column="3" 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="{Binding Radius, ElementName=_magnifier}"  Minimum="0" Maximum="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="{Binding Width, ElementName=_magnifier}"  Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" 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="{Binding Height, ElementName=_magnifier}" Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" Margin="5"  />
-            <!-- Third Column -->
-            <TextBlock Text="Border Thickness:" Grid.Column="4" VerticalAlignment="Center" Margin="5" />
-            <xctk:IntegerUpDown x:Name="_borderThickness" Grid.Column="5" Value="{Binding BorderThickness, ElementName=_magnifier, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}" Minimum="0" Maximum="20" Margin="5" />
-            <TextBlock Text="Border Brush:" Grid.Row="1" Grid.Column="4" VerticalAlignment="Center" Margin="5"/>
-            <xctk:ColorPicker x:Name="_colorPicker" Grid.Row="1" Grid.Column="5" Margin="5" SelectedColor="{Binding BorderBrush, ElementName=_magnifier, Converter={StaticResource SolidColorBrushToColorConverter}}"/>
-         </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="80"
-                               ZoomFactor="0.4"
-                               FrameType="Circle"
-                               BorderBrush="#FFC72035"
-                               BorderThickness="2"
-                               Width="160"
-                               Height="160"
-                               IsUsingZoomOnMouseWheel="True"
-                               ZoomFactorOnMouseWheel="0.1"/>
-            </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
deleted file mode 100644
index 4375dee6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/MaterialControls/Converters/EqualsMinusOneConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs
deleted file mode 100644
index ffaaa4a0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Converters/EqualsMinusOneConverter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Converters
-{
-
-
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs
deleted file mode 100644
index 3ba45b31..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data
-{
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialButton.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialButton.png
deleted file mode 100644
index 0e7536a9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialButton.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialCheckBox.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialCheckBox.png
deleted file mode 100644
index 1944c990..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialCheckBox.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialComboBox.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialComboBox.png
deleted file mode 100644
index 43296603..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialComboBox.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialControls.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialControls.png
deleted file mode 100644
index 6480059c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialControls.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialDropDown.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialDropDown.png
deleted file mode 100644
index d8cd8364..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialDropDown.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialFrame.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialFrame.png
deleted file mode 100644
index 2ad38823..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialFrame.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialHamburger.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialHamburger.png
deleted file mode 100644
index 456ebbac..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialHamburger.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialListBox.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialListBox.png
deleted file mode 100644
index ea0c6be6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialListBox.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialProgressBar.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialProgressBar.png
deleted file mode 100644
index 4bed042c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialProgressBar.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialProgressBarCircular.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialProgressBarCircular.png
deleted file mode 100644
index 6cf81421..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialProgressBarCircular.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialRadioButton.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialRadioButton.png
deleted file mode 100644
index e09b7dbb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialRadioButton.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialSlider.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialSlider.png
deleted file mode 100644
index e4da4a8e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialSlider.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialSwitch.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialSwitch.png
deleted file mode 100644
index 9cb2f430..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialSwitch.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialTabs.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialTabs.png
deleted file mode 100644
index e3572c9d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialTabs.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialTextField.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialTextField.png
deleted file mode 100644
index 66d86724..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialTextField.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialToast.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialToast.png
deleted file mode 100644
index eee81ed6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialToast.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialToolTip.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialToolTip.png
deleted file mode 100644
index ede18800..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/OpenSourceImages/MaterialToolTip.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Business.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Business.png
deleted file mode 100644
index a4162182..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Business.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml
deleted file mode 100644
index 8bc28475..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="ColorItemTemplate">
-      <Rectangle Fill="{Binding}"
-                 Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}"
-                 Height="20" />
-   </DataTemplate>
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/DataGrid.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/DataGrid.png
deleted file mode 100644
index e31df885..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/DataGrid.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/PencilTool16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/PencilTool16.png
deleted file mode 100644
index df0970c4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/PencilTool16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/SFTP.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/SFTP.png
deleted file mode 100644
index f3ccd5c0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/SFTP.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Toolkit.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Toolkit.png
deleted file mode 100644
index 26997fd7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Toolkit.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/WhitePen.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/WhitePen.png
deleted file mode 100644
index 7f1955f5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/WhitePen.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Zip.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Zip.png
deleted file mode 100644
index 20e59569..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/Zip.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/building16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/building16.png
deleted file mode 100644
index 329feeb8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/building16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/italy.4.gif b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/italy.4.gif
deleted file mode 100644
index a2156759..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/italy.4.gif and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml
deleted file mode 100644
index e2c40a4c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialButtonView"
-                        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"
-                        Title="MaterialButton">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A Button with a raised animation on mouse over and a customizable ink animation on MousePress. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialButton.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs
deleted file mode 100644
index 588221a4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialButtonView.xaml.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialButtonView.xaml
-  /// </summary>
-  public partial class MaterialButtonView : MaterialDemoView
-  {
-    public MaterialButtonView()
-    {
-      InitializeComponent();
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml
deleted file mode 100644
index 6cac7952..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialCheckBoxView"
-                        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"
-                        Title="MaterialCheckBox">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A CheckBox with transition animations when the checked state is changed. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialCheckBox.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs
deleted file mode 100644
index 38e34326..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialCheckBoxView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialCheckBoxView.xaml
-  /// </summary>
-  public partial class MaterialCheckBoxView : MaterialDemoView
-  {
-    public MaterialCheckBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml
deleted file mode 100644
index b0809e0a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialComboBoxView"
-                        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"
-                        Title="MaterialComboBox">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>MaterialComboBox is a ComboBox that is using the Material Brushes and contains MaterialComboBoxItems.</Run>
-         <LineBreak />
-         <Run>MaterialComboBoxItems are ComboBoxItems that are using the Material Brushes. They use an ink animation when they are selected.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialComboBox.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs
deleted file mode 100644
index af1f7e8e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialComboBoxView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialComboBoxView.xaml
-  /// </summary>
-  public partial class MaterialComboBoxView : MaterialDemoView
-  {
-    public MaterialComboBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml
deleted file mode 100644
index 4bc64041..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialControlsView"
-                        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"
-                        Title="MaterialControls">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The Material controls redefine the base controls by adding smooth animations and special effects. They also combine the base controls together to create new controls.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>The Material controls include a set of complimentary accent brush and foreground.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialControls.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs
deleted file mode 100644
index 81972001..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialControlsView.xaml.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialControlsView.xaml
-  /// </summary>
-  public partial class MaterialControlsView : MaterialDemoView
-  {
-
-
-
-    #region Constructors
-
-    public MaterialControlsView()
-    {
-      InitializeComponent();
-    }
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs
deleted file mode 100644
index 701fc775..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDemoView.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.LiveExplorer
-{
-  public class MaterialDemoView : DemoView
-  {
-    #region Constructor
-
-    public MaterialDemoView()
-    {
-
-    }
-
-    #endregion
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml
deleted file mode 100644
index 791c5136..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialDropDownView"
-                        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"
-                        Title="MaterialDropDown">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A DropDownButton from the Xceed Wpf Toolkit with animations when opening the popup. It uses the MaterialButton animations and the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialDropDown.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs
deleted file mode 100644
index b6b907e8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialDropDownView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialDropDownView.xaml
-  /// </summary>
-  public partial class MaterialDropDownView : MaterialDemoView
-  {
-    public MaterialDropDownView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml
deleted file mode 100644
index eaa02dff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialFrameView"
-                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.MaterialControls.Converters"
-                xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                Title="MaterialFrame">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A ContentControl with a fully customizable shadow that can be modified through Shadow properties or with a Z property that enables predefined shadows.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialFrame.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs
deleted file mode 100644
index 052f0a7d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialFrameView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialFrameView.xaml
-  /// </summary>
-  public partial class MaterialFrameView : DemoView
-  {
-    public MaterialFrameView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml
deleted file mode 100644
index b49fd2d0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialHamburgerView"
-                        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.Converters"
-                        Title="MaterialHamburger">
-  <local:DemoView.Description>
-    <Paragraph FontSize="14"
-               FontFamily="Segoe">
-      <Run>A ToggleButton that pops a menu from left, right, top or bottom of a Window (or any FrameworkElement). The menu can be an animated HamburgerMenu or any customized content. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-    </Paragraph>
-  </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialHamburger.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs
deleted file mode 100644
index 9b6fc8b9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialHamburgerView.xaml.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialHamburgerView.xaml
-  /// </summary>
-  public partial class MaterialHamburgerView : MaterialDemoView
-  {
-    #region Constructors
-
-    public MaterialHamburgerView()
-    {
-      InitializeComponent();
-    }
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml
deleted file mode 100644
index 5b19c65b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialListBoxView"
-                        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"
-                        Title="MaterialListBox &amp; MaterialListBoxItem">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>MaterialListBox is a ListBox that is using the Material Brushes and contains MaterialListBoxItems.</Run>
-         <LineBreak />
-         <Run>MaterialListBoxItems are ListBoxItems that are using the Material Brushes. They use an ink animation when they are selected.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialListBox.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs
deleted file mode 100644
index a16fd422..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialListBoxView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialListBoxView.xaml
-  /// </summary>
-  public partial class MaterialListBoxView : MaterialDemoView
-  {
-    public MaterialListBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml
deleted file mode 100644
index 4522cd82..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialProgressBarCircularView"
-                        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"
-                        Title="MaterialProgressBarCircular">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A circular ProgressBar that uses the Material Brushes. It contains properties to animate the indeterminate state.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialProgressBarCircular.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs
deleted file mode 100644
index ea5af713..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarCircularView.xaml.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media.Animation;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialProgressBarCircularView.xaml
-  /// </summary>
-  public partial class MaterialProgressBarCircularView : MaterialDemoView
-  {
-    #region Constructors
-
-    public MaterialProgressBarCircularView()
-    {
-      InitializeComponent();
-
-    }
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml
deleted file mode 100644
index eda31f43..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialProgressBarView"
-                        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"
-                        Title="MaterialProgressBar">   
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A linear ProgressBar that uses the Material Brushes. It contains properties to animate the indeterminate state.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialProgressBar.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs
deleted file mode 100644
index a878cab4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialProgressBarView.xaml.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media.Animation;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialProgressBarView.xaml
-  /// </summary>
-  public partial class MaterialProgressBarView : MaterialDemoView
-  {
-    #region Constructors
-
-    public MaterialProgressBarView()
-    {
-      InitializeComponent();
-    }
-
-    #endregion
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml
deleted file mode 100644
index a857899b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialRadioButtonView"
-                        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"
-                        Title="MaterialRadioButton">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A RadioButton with transition animations when the checked state is changed. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialRadioButton.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs
deleted file mode 100644
index 050091bd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialRadioButtonView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialRadioButtonView.xaml
-  /// </summary>
-  public partial class MaterialRadioButtonView : MaterialDemoView
-  {
-    public MaterialRadioButtonView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml
deleted file mode 100644
index b4c4a15a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialSliderView"
-                        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:winConv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
-                        Title="MaterialSlider">
-  <local:DemoView.Description>
-    <Paragraph FontSize="14"
-               FontFamily="Segoe">
-      <Run>A Slider with customizable and animated thumb and bubble that is using the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-    </Paragraph>
-  </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialSlider.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs
deleted file mode 100644
index 6bb26b7e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSliderView.xaml.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using Xceed.Wpf.Toolkit.Panels;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialSliderView.xaml
-  /// </summary>
-  public partial class MaterialSliderView : MaterialDemoView
-  {
-    public MaterialSliderView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml
deleted file mode 100644
index de0f18c4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialSwitchView"
-                        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"
-                        Title="MaterialSwitch">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A ToggleSwitch from the Xceed WPF Toolkit with thumb animations when Checked state is changed and that is using the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialSwitch.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs
deleted file mode 100644
index 850a3059..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialSwitchView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialSwitchView.xaml
-  /// </summary>
-  public partial class MaterialSwitchView : MaterialDemoView
-  {
-    public MaterialSwitchView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml
deleted file mode 100644
index af95f6d0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialTabsView"
-                        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"
-                        Title="MaterialTabControl &amp; MaterialTabItem">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>MaterialTabControl is a a TabControl with animated transitions when the current selection is changed. Is uses the Material Brushes and contains MaterialTabItems.</Run>
-         <LineBreak />
-         <Run>MaterialTabItems are TabItems that use the Material Brushes and contain customizable ink animations on mouse press.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialTabs.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs
deleted file mode 100644
index eb49597e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTabsView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialTabsView.xaml
-  /// </summary>
-  public partial class MaterialTabsView : MaterialDemoView
-  {
-    public MaterialTabsView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml
deleted file mode 100644
index 529e5eef..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialTextFieldView"
-                        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:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data"
-                        Title="MaterialTextField">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A TextBox containing a customizable animated watermark that remains active when text is entered. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialTextField.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs
deleted file mode 100644
index 54005b25..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialTextFieldView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialTextFieldView.xaml
-  /// </summary>
-  public partial class MaterialTextFieldView : MaterialDemoView
-  {
-    public MaterialTextFieldView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml
deleted file mode 100644
index b1e287d3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialToastView"
-                        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"
-                        Title="MaterialToast">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A ContentControl that can be customized to display a content in any corner of any window or FrameworkElement. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialToast.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs
deleted file mode 100644
index 06aae47e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToastView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialToastView.xaml
-  /// </summary>
-  public partial class MaterialToastView : MaterialDemoView
-  {
-    public MaterialToastView()
-    {
-      InitializeComponent();
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml
deleted file mode 100644
index 3cac9b4e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:MaterialDemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views.MaterialToolTipView"
-                        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"
-                        Title="MaterialToolTip">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>A ToolTip with animations when opening. It uses the Material Brushes.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../Resources/CommonResources.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MaterialToolTip.png" Width="600" Height="400"/>
-</local:MaterialDemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs
deleted file mode 100644
index c7069f4b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Views/MaterialToolTipView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
-{
-  /// <summary>
-  /// Interaction logic for MaterialToolTipView.xaml
-  /// </summary>
-  public partial class MaterialToolTipView : MaterialDemoView
-  {
-    public MaterialToolTipView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/OpenSourceImages/MultiCalendar.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/OpenSourceImages/MultiCalendar.png
deleted file mode 100644
index 69500dd7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/OpenSourceImages/MultiCalendar.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/April.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/April.jpg
deleted file mode 100644
index 08127ff7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/April.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/December.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/December.jpg
deleted file mode 100644
index a424fae7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/December.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/February.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/February.jpg
deleted file mode 100644
index fdb3f775..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/February.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/July.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/July.jpg
deleted file mode 100644
index 5c643ad5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/July.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/June.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/June.jpg
deleted file mode 100644
index 6e0676a6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/June.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/March.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/March.jpg
deleted file mode 100644
index b1e2f44f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/March.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/October.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/October.jpg
deleted file mode 100644
index fadb14e4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/October.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/September.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/September.jpg
deleted file mode 100644
index 7297bb04..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Resources/September.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml
deleted file mode 100644
index b93d15b2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-
-<local:DemoView  x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views.MultiCalendarView"
-                 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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 Title="MultiCalendar">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The MultiCalendar combines X Microsoft Calendars that can be positioned in a grid with rows and columns. The selected dates, blackout dates and highlighted dates can be chosen from any calendar. The MultiCalendar will have a fast response no matter how many CalendarDayButtons are selected.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>The Background/Foreground of any CalendarDayButton can be easily customized based on its state(selected/highlighted/blackout/mouseOver/focused/today) and the background of any Calendar can be customized with an image or a brush.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MultiCalendar.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs
deleted file mode 100644
index e6f2523b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2014 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Windows.Controls;
-using System;
-using System.Windows.Media;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views
-{
-  /// <summary>
-  /// Interaction logic for MultiCalendarView.xaml
-  /// </summary>
-  public partial class MultiCalendarView : DemoView
-  {
-    public MultiCalendarView()
-    {
-      InitializeComponent();
-    }
-
-
-
-
-
-
-
-
-
-
-
-  }
-}
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
deleted file mode 100644
index b8fbd64c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml
+++ /dev/null
@@ -1,469 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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" />
-      <numeric:FormatObject Value="{}{0:N2} °"
-                            DisplayValue="Degrees" />
-    </x:Array>
-
-    <xctk:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-    <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="ButtonSpinnerLocationComboBox"
-                        MethodName="GetValues"
-                        ObjectType="{x:Type sys:Enum}">
-      <ObjectDataProvider.MethodParameters>
-        <x:Type TypeName="xctk:Location" />
-      </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" />
-            <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.FocusedMouseOver" />
-            <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="Is Read Only:"
-                     Grid.Row="2"
-                     VerticalAlignment="Center"
-                     ToolTip="Prevent from using button spinners or editing text." />
-          <CheckBox Grid.Row="2"
-                    Grid.Column="1"
-                    IsChecked="{Binding IsReadOnly, 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"
-                    IsEnabled="{Binding IsReadOnly, ElementName=_doubleUpDown, Converter={StaticResource InverseBoolConverter}}" />
-
-          <TextBlock Text="Allow TextInput:"
-                     Grid.Row="4"
-                     VerticalAlignment="Center" />
-          <CheckBox Grid.Row="4"
-                    Grid.Column="1"
-                    IsChecked="{Binding AllowTextInput, ElementName=_doubleUpDown}"
-                    ClickMode="Press"
-                    Margin="5"
-                    VerticalAlignment="Center"
-                    IsEnabled="{Binding IsReadOnly, ElementName=_doubleUpDown, Converter={StaticResource InverseBoolConverter}}" />
-
-          <TextBlock Text="Clip Value to Min Max:"
-                     Grid.Row="5"
-                     VerticalAlignment="Center" />
-          <CheckBox Grid.Row="5"
-                    Grid.Column="1"
-                    IsChecked="{Binding ClipValueToMinMax, ElementName=_doubleUpDown, Mode=TwoWay}"
-                    ClickMode="Press"
-                    Margin="5"
-                    VerticalAlignment="Center" />
-
-          <TextBlock Text="DisplayDefaultValueOnEmptyText:"
-                     Grid.Row="6"
-                     VerticalAlignment="Center" />
-          <CheckBox Grid.Row="6"
-                    Grid.Column="1"
-                    IsChecked="{Binding DisplayDefaultValueOnEmptyText, 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" />
-
-          <TextBlock Grid.Column="2"
-                     Grid.Row="5"
-                     Text="MaxLength"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <xctk:IntegerUpDown Grid.Column="3"
-                              Grid.Row="5"
-                              Minimum="0"
-                              MaxLength="10"
-                              Value="{Binding MaxLength, ElementName=_doubleUpDown}"
-                              VerticalAlignment="Center"
-                              HorizontalAlignment="Stretch"
-                              Margin="5" />
-
-          <!-- 3rd column -->
-          <TextBlock Grid.Column="4"
-                     Text="ButtonSpinnerLocation:"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <ComboBox Grid.Column="5"
-                    ItemsSource="{Binding Source={StaticResource ButtonSpinnerLocationComboBox}}"
-                    SelectedValue="{Binding ButtonSpinnerLocation, ElementName=_doubleUpDown}"
-                    HorizontalAlignment="Stretch"
-                    Margin="5" />
-
-          <TextBlock Grid.Column="4"
-                     Grid.Row="1"
-                     Text="ParsingNumberStyle:"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <ComboBox Grid.Column="5"
-                    Grid.Row="1"
-                    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="2"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <TextBox Grid.Column="5"
-                   Grid.Row="2"
-                   HorizontalAlignment="Stretch"
-                   Margin="5"
-                   Text="{Binding Watermark, ElementName=_doubleUpDown}" />
-
-          <TextBlock Text="Default Value:"
-                     Grid.Column="4"
-                     Grid.Row="3"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <xctk:DoubleUpDown Grid.Column="5"
-                             Grid.Row="3"
-                             Value="{Binding DefaultValue, ElementName=_doubleUpDown}"
-                             AllowInputSpecialValues="Any"
-                             VerticalAlignment="Center"
-                             HorizontalAlignment="Stretch"
-                             Margin="5" />
-
-          <TextBlock Text="Value:"
-                     Grid.Column="4"
-                     Grid.Row="4"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <xctk:DoubleUpDown Grid.Column="5"
-                             Grid.Row="4"
-                             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="5"
-                     VerticalAlignment="Center"
-                     Margin="10,0,0,0" />
-          <TextBox Grid.Column="5"
-                   Grid.Row="5"
-                   Text="{Binding Text, ElementName=_doubleUpDown}"
-                   VerticalAlignment="Center"
-                   HorizontalAlignment="Stretch"
-                   Margin="5" />
-
-          <!-- last rows -->
-          <TextBlock Text="(DoubleUpDown and SingleUpDown support the AllowInputSpecialValues property)"
-                     Grid.Row="7"
-                     Grid.ColumnSpan="6"
-                     VerticalAlignment="Center"
-                     Margin="0,5,0,0" />
-          <TextBlock Text="Allow Input Special Values:"
-                     VerticalAlignment="Center"
-                     Grid.Row="8"
-                     Grid.ColumnSpan="2" />
-          <ComboBox Grid.Column="2"
-                    Grid.Row="8"
-                    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"
-                           AllowTextInput="True"
-                           IsReadOnly="False"
-                           MouseWheelActiveOnFocus="True"
-                           CultureInfo="en-US"
-                           FormatString="C2"
-                           Increment="0.5"
-                           Maximum="100"
-                           Minimum="0"
-                           MaxLength="0"
-                           DisplayDefaultValueOnEmptyText="False"
-                           ButtonSpinnerLocation="Right"
-                           ParsingNumberStyle="Any"
-                           Watermark="Enter Text"
-                           DefaultValue="10"
-                           Value="25" />
-      </StackPanel>
-
-      <TextBlock Grid.Row="2"
-                 Margin="10,15,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
deleted file mode 100644
index 3a973d11..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index b2c54711..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index ee975861..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/AnimatedTimelinePanel.png and /dev/null 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
deleted file mode 100644
index e9e86b1c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/AutoStretchStackPanel.png and /dev/null 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
deleted file mode 100644
index 5741c665..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/CameraPanel.png and /dev/null 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
deleted file mode 100644
index 5eb6a432..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Canvas.png and /dev/null 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
deleted file mode 100644
index 9e9e042b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Carousel.png and /dev/null 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
deleted file mode 100644
index 7a909a9d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/DockPanel.png and /dev/null 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
deleted file mode 100644
index e893d171..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Grid.png and /dev/null 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
deleted file mode 100644
index 3a90355e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/PerspectivePanel.png and /dev/null 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
deleted file mode 100644
index 0cc25405..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/RadialCanvas.png and /dev/null 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
deleted file mode 100644
index 76771ab3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/RelativeCanvas.png and /dev/null 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
deleted file mode 100644
index 58c3ee21..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/StackPanel.png and /dev/null 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
deleted file mode 100644
index 077c49bd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/StackedStackPanel.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml
deleted file mode 100644
index 621016f5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml
+++ /dev/null
@@ -1,368 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************-->
-<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: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:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters"
-                 xmlns:s="clr-namespace:System;assembly=mscorlib"
-                 xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views"
-                 VerticalScrollBarVisibility="Disabled"
-                 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="#FFC72035" />
-         <Setter Property="Foreground" Value="White" />
-         <Setter Property="Margin" Value="5" />
-         <Setter Property="Width" Value="100" />
-         <Setter Property="Height" Value="100" />
-         <Setter Property="TextAlignment" Value="Center" />
-      </Style>
-
-      <ObjectDataProvider x:Key="orientationCombo" MethodName="GetValues" ObjectType="{x:Type s:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Orientation" />
-            </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>
-
-      <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"/>
-         <Setter Property="ContentTemplate">
-            <Setter.Value>
-               <DataTemplate>
-                  <DockPanel>
-                     <TextBlock DockPanel.Dock="Left" Text="{Binding}" />
-                     <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-                  </DockPanel>
-               </DataTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <s:String x:Key="wrapPanelDescription">Positions elements from left to right or up to down depending on the orientation and the available space. Breaks the content at the end of the line to wrap items to the next line.</s:String>
-      <s:String x:Key="randomPanelDescription">This panel lays out its children with a random location and size.</s:String>
-      <s:String x:Key="canvasPanelDescription">Exactly like WPF's native Canvas panel, except that this panel can animate its children and be used inside a SwitchPanel.</s:String>
-      <s:String x:Key="carouselDescription">Positions the elements in a carousel mode with a centered element in front.</s:String>
-      <s:String x:Key="dockPanelDescription">Exactly like WPF's native DockPanel, except that this panel can animate its children and be used inside a SwitchPanel.</s:String>
-      <s:String x:Key="gridDescription">Exactly like WPF's native Grid panel, except that this panel can animate its children and be used inside a SwitchPanel.</s:String>
-      <s:String x:Key="stackPanelDescription">Exactly like WPF's native StackPanel, except this panel can animate its children and be used inside SwitchPanel.</s:String>
-      <s:String x:Key="stackedStackPanelDescription">Lays out children in a series of stacked stackpanels.</s:String>
-      <s:String x:Key="autoStretchStackPanelDescription">This panel stretches the children in the orientation direction so that they completely fill the panel area.</s:String>
-      <s:String x:Key="relativeCanvasDescription">A Panel which is similar to Canvas but it lays out its children relative to the panel's height and width.</s:String>
-      <s:String x:Key="radialCanvasDescription">Lays out its children in a circle based on panel size and/or properties set.</s:String>
-      <s:String x:Key="cameraPanelDescription">"CameraPanel lays out its children in a 3D-like space. You can give the children a 3D location and set the camera position for the panel.</s:String>
-      <s:String x:Key="perspectivePanelDescription">Perspective panel positions its children in a perspective view with the possibility of rotating the background children.</s:String>
-      <s:String x:Key="animatedTimelinePanelDescription">Defines an area where items are positioned on a timeline.</s:String>
-
-            <conv:ComboBoxToVisibilityConverter x:Key="comboBoxToVisibilityConverter" />
-
-
-
-
-
-
-
-
-
-
-
-
-   </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="Layout:" Margin="0,0,5,0" />
-            <ComboBox x:Name="layoutCombo" SelectedIndex="0" Width="250" SelectionChanged="OnLayoutComboSelectionChanged">
-               <ComboBoxItem>WrapPanel</ComboBoxItem>
-               <ComboBoxItem>RandomPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">Canvas</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">Carousel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">DockPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">Grid</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">StackPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">StackedStackPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">AutoStretchStackPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">RelativeCanvas</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">RadialCanvas</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">CameraPanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">PerspectivePanel</ComboBoxItem>
-               <ComboBoxItem Style="{StaticResource plusItem}">AnimatedTimelinePanel</ComboBoxItem>
-            </ComboBox>
-         </Grid>
-      </GroupBox>
-
-      <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="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" />
-            </xctk:SwitchPanel.Layouts>
-            <TextBlock x:Name="_item1" Text="Item #1" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item2" Text="Item #2" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item3" Text="Item #3" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item4" Text="Item #4" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item5" Text="Item #5" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item6" Text="Item #6" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item7" Text="Item #7" Style="{StaticResource panelElement}"/>
-            <TextBlock x:Name="_item8" Text="Item #8" Style="{StaticResource panelElement}"/>
-         </xctk:SwitchPanel>
-
-         <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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-                    Click here for more details about Xceed Toolkit Plus for WPF.
-                 </Hyperlink>
-             </TextBlock>
-         </StackPanel>
-
-         <GroupBox Header="WrapPanel Toolbox" 
-                   Background="White"
-                   Grid.Row="3" 
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=0}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                            Text="{StaticResource wrapPanelDescription}" 
-                            Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                            Text="Resize the Window to animate the WrapPanel." 
-                            Margin="10,0" />
-
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Text="Orientation:" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Column="1"
-                              ItemsSource="{Binding Source={StaticResource orientationCombo}}" 
-                              SelectedItem="{Binding Orientation, ElementName=_wrapPanel}"
-                              Width="100"
-                              Height="22"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-                    <TextBlock Grid.Row="1" Text="Is Child Order Reversed:" VerticalAlignment="Center"/>
-                    <CheckBox Grid.Row="1" 
-                              Grid.Column="1" 
-                              IsChecked="{Binding IsChildOrderReversed, ElementName=_wrapPanel}" 
-                              ClickMode="Press" 
-                              VerticalAlignment="Center"
-                              Margin="5"/>
-                    <TextBlock Grid.Column="2" Text="Item Width:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <xctk:DoubleUpDown Grid.Column="3" 
-                                       Value="{Binding ItemWidth, ElementName=_wrapPanel}"
-                                       AllowInputSpecialValues="NaN"
-                                       Width="100"
-                                       Height="20"
-                                       Minimum="0"
-                                       Style="{StaticResource controlInError}"
-                                       VerticalAlignment="Center"
-                                       Margin="5"/>
-                    <TextBlock Grid.Column="2" Grid.Row="1" Text="Item Height:" VerticalAlignment="Center" Margin="10,0,0,0" />
-                    <xctk:DoubleUpDown Grid.Column="3" 
-                                       Grid.Row="1"
-                                       Value="{Binding ItemHeight, ElementName=_wrapPanel}" 
-                                       AllowInputSpecialValues="NaN"
-                                       Width="100"
-                                       Height="20"
-                                       Minimum="0"
-                                       Style="{StaticResource controlInError}"
-                                       VerticalAlignment="Center"
-                                       Margin="5"/>
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-
-         <GroupBox Header="RandomPanel Toolbox" 
-                   Background="White"
-                   Grid.Row="3" 
-                   Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=1}" 
-                   Margin="10" >
-            <StackPanel>
-                <TextBlock TextWrapping="Wrap"
-                           Text="{StaticResource randomPanelDescription}" 
-                           Margin="10,0" />
-                <TextBlock TextWrapping="Wrap"
-                           Text="Modify the Minimum and Maximum values to affect the children size." 
-                           Margin="10,0" />
-
-                <Grid Margin="5">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-
-                    <TextBlock Text="Minimum Width:" VerticalAlignment="Center"/>
-                    <xctk:DoubleUpDown x:Name="_minimumWidth"
-                                       Grid.Column="1"
-                                       Value="{Binding MinimumWidth, ElementName=_randomPanel, ValidatesOnExceptions=True}"
-                                       AllowInputSpecialValues="None"
-                                       Minimum="0"
-                                       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 x:Name="_maximumWidth"
-                                       Grid.Column="1"
-                                       Grid.Row="1"
-                                       Value="{Binding MaximumWidth, ElementName=_randomPanel, ValidatesOnExceptions=True}"
-                                       AllowInputSpecialValues="None"
-                                       Minimum="{Binding Value, ElementName=_minimumWidth}"
-                                       Maximum="100"
-                                       Width="100"
-                                       Height="20"
-                                       Style="{StaticResource controlInError}"
-                                       VerticalAlignment="Center"
-                                       Margin="5" />
-                    <TextBlock Grid.Column="2" Text="Minimum Height:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <xctk:DoubleUpDown x:Name="_minimumHeight"
-                                       Grid.Column="3" 
-                                       Value="{Binding MinimumHeight, ElementName=_randomPanel, ValidatesOnExceptions=True}"
-                                       AllowInputSpecialValues="None"
-                                       Minimum="0"
-                                       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 x:Name="_maximumHeight"
-                                       Grid.Column="3" 
-                                       Grid.Row="1"
-                                       Value="{Binding MaximumHeight, ElementName=_randomPanel, ValidatesOnExceptions=True}" 
-                                       AllowInputSpecialValues="None"
-                                       Minimum="{Binding Value, ElementName=_minimumHeight}"
-                                       Maximum="100"
-                                       Width="100"
-                                       Height="20"
-                                       Style="{StaticResource controlInError}"
-                                       VerticalAlignment="Center"
-                                       Margin="5"/>
-                </Grid>
-            </StackPanel>
-        </GroupBox>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-     </Grid>
-   </Grid>
-</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
deleted file mode 100644
index 61c45dfd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
-
-  }
-
-
-  public class Coordinates
-  {
-    public double X
-    {
-      get;
-      set;
-    }
-    public double Y
-    {
-      get;
-      set;
-    }
-
-    public override string ToString()
-    {
-      return "(" + this.X + ", " + this.Y + ")";
-    }
-  }
-}
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
deleted file mode 100644
index 4c6580cc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 6bfe94ae..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml
+++ /dev/null
@@ -1,240 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index a07464e2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index aacf2ed9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml
+++ /dev/null
@@ -1,103 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="#FFC72035"
-                      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
deleted file mode 100644
index 1554aa94..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 47684bc5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml
+++ /dev/null
@@ -1,229 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="#FFC72035"
-                    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
deleted file mode 100644
index 6a6d2329..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 259a481a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 6b0551b1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/OpenSourceImages/PileFlowPanel.png and /dev/null 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
deleted file mode 100644
index 1dd5d9d2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 61624b9b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index f88104c0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/CustomProperty.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/CustomProperty.xaml.txt
deleted file mode 100644
index 84860462..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/CustomProperty.xaml.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<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
deleted file mode 100644
index b81c8d40..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.cs.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-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
deleted file mode 100644
index 6ca85062..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.xaml.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-<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
deleted file mode 100644
index e04d94c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/EditorDefinitions.xaml.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-<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/ExpandingNonPrimitives.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/ExpandingNonPrimitives.png
deleted file mode 100644
index c80c4be0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/ExpandingNonPrimitives.png and /dev/null differ
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
deleted file mode 100644
index 5c1bf8ee..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Localization.png and /dev/null 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
deleted file mode 100644
index 19e75b3e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/MultiSelectedObjects.png and /dev/null 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
deleted file mode 100644
index 71d70be0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Properties.cs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-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
deleted file mode 100644
index c134db16..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Properties.xaml.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<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
deleted file mode 100644
index d5acd2ac..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.cs.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-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
deleted file mode 100644
index e7c46b00..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.xaml.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<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
deleted file mode 100644
index 626845cb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
deleted file mode 100644
index 758a73d8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   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 Toolkit for WPF 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.Data;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid
-{
-  /// <summary>
-  /// Interaction logic for LastNameUserControlEditor.xaml
-  /// </summary>
-  public partial class LastNameUserControlEditor : UserControl, ITypeEditor
-  {
-    public LastNameUserControlEditor()
-    {
-      InitializeComponent();
-    }
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( string ), typeof( LastNameUserControlEditor ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault ) );
-    public string Value
-    {
-      get
-      {
-        return ( string )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private void Button_Click( object sender, RoutedEventArgs e )
-    {
-      Value = string.Empty;
-    }
-
-    public FrameworkElement ResolveEditor( Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem propertyItem )
-    {
-      Binding binding = new Binding( "Value" );
-      binding.Source = propertyItem;
-      binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-      BindingOperations.SetBinding( this, LastNameUserControlEditor.ValueProperty, binding );
-      return this;
-    }
-  }
-}
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
deleted file mode 100644
index b8fa7d5f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/woman.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.Designer.cs
deleted file mode 100644
index 667ee531..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.Designer.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-//------------------------------------------------------------------------------
-// <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.Samples.PropertyGrid.Views {
-    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 DisplayLocalizationRes {
-
-        private static global::System.Resources.ResourceManager resourceMan;
-
-        private static global::System.Globalization.CultureInfo resourceCulture;
-
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal DisplayLocalizationRes() {
-        }
-
-        /// <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.Samples.PropertyGrid.Views.DisplayLocalizationRes", typeof(DisplayLocalizationRes).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;
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Details.
-        /// </summary>
-        internal static string DetailsCategory {
-            get {
-                return ResourceManager.GetString("DetailsCategory", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Favorite actor 1 (no DisplayName).
-        /// </summary>
-        internal static string FavoriteActor1 {
-            get {
-                return ResourceManager.GetString("FavoriteActor1", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to This property&apos;s type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method..
-        /// </summary>
-        internal static string FavoriteActor1Desc {
-            get {
-                return ResourceManager.GetString("FavoriteActor1Desc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Favorite actor 2 (with DisplayName).
-        /// </summary>
-        internal static string FavoriteActor2 {
-            get {
-                return ResourceManager.GetString("FavoriteActor2", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to This property&apos;s type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized..
-        /// </summary>
-        internal static string FavoriteActor2Desc {
-            get {
-                return ResourceManager.GetString("FavoriteActor2Desc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Favorite actor 3.
-        /// </summary>
-        internal static string FavoriteActor3 {
-            get {
-                return ResourceManager.GetString("FavoriteActor3", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to &quot;(Not listed)&quot; enum value shows that enum values can also be localized..
-        /// </summary>
-        internal static string FavoriteActor3Desc {
-            get {
-                return ResourceManager.GetString("FavoriteActor3Desc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to First name.
-        /// </summary>
-        internal static string FirstName {
-            get {
-                return ResourceManager.GetString("FirstName", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to First name of that person.
-        /// </summary>
-        internal static string FirstNameDesc {
-            get {
-                return ResourceManager.GetString("FirstNameDesc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Information.
-        /// </summary>
-        internal static string InfoCategory {
-            get {
-                return ResourceManager.GetString("InfoCategory", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Last name.
-        /// </summary>
-        internal static string LastName {
-            get {
-                return ResourceManager.GetString("LastName", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to Usually the familly name of the person.
-        /// </summary>
-        internal static string LastNameDesc {
-            get {
-                return ResourceManager.GetString("LastNameDesc", resourceCulture);
-            }
-        }
-
-        /// <summary>
-        ///   Looks up a localized string similar to (Not listed).
-        /// </summary>
-        internal static string NotListed {
-            get {
-                return ResourceManager.GetString("NotListed", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.fr.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.fr.resx
deleted file mode 100644
index c162964d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.fr.resx
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="DetailsCategory" xml:space="preserve">
-    <value>Détails</value>
-  </data>
-  <data name="FavoriteActor1" xml:space="preserve">
-    <value>Acteur favori 1 (aucun DisplayName)</value>
-  </data>
-  <data name="FavoriteActor1Desc" xml:space="preserve">
-    <value>Le type de cette propriété est un enum où les valeurs n'ont aucun attribut "DisplayName". Les valeurs affichées sont retournées par la méthode ToString().</value>
-  </data>
-  <data name="FavoriteActor2" xml:space="preserve">
-    <value>Acteur favori 2 (avec DisplayName)</value>
-  </data>
-  <data name="FavoriteActor2Desc" xml:space="preserve">
-    <value>Le type de cette propriété est un enum où les valeurs sont décorés avec l'attribut "DisplayName". Les valeurs affichées sont celles spécifiées par l'attribut ExtendedDisplayName.</value>
-  </data>
-  <data name="FavoriteActor3" xml:space="preserve">
-    <value>Acteur favori 3</value>
-  </data>
-  <data name="FavoriteActor3Desc" xml:space="preserve">
-    <value>La valeur "(Non proposé)" démontre que les valeurs des enums peuvent aussi être localisées.</value>
-  </data>
-  <data name="FirstName" xml:space="preserve">
-    <value>Prénom</value>
-  </data>
-  <data name="FirstNameDesc" xml:space="preserve">
-    <value>Prénom de la personne</value>
-  </data>
-  <data name="InfoCategory" xml:space="preserve">
-    <value>Information</value>
-  </data>
-  <data name="LastName" xml:space="preserve">
-    <value>Nom de famille</value>
-  </data>
-  <data name="LastNameDesc" xml:space="preserve">
-    <value>Le nom de famille de la personne</value>
-  </data>
-  <data name="NotListed" xml:space="preserve">
-    <value>(Non proposé)</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.resx
deleted file mode 100644
index d4a8948e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.resx
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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="DetailsCategory" xml:space="preserve">
-    <value>Details</value>
-  </data>
-  <data name="FavoriteActor1" xml:space="preserve">
-    <value>Favorite actor 1 (no DisplayName)</value>
-  </data>
-  <data name="FavoriteActor1Desc" xml:space="preserve">
-    <value>This property's type is an enum whose values have no DisplayName attributes. These values displayed are provided by the ToString() method.</value>
-  </data>
-  <data name="FavoriteActor2" xml:space="preserve">
-    <value>Favorite actor 2 (with DisplayName)</value>
-  </data>
-  <data name="FavoriteActor2Desc" xml:space="preserve">
-    <value>This property's type is an enum whose values are decorated with the ExtendedDisplayName attribute. Combined with the EnumDisplayNameConverter, this allows display values to be customized.</value>
-  </data>
-  <data name="FavoriteActor3" xml:space="preserve">
-    <value>Favorite actor 3</value>
-  </data>
-  <data name="FavoriteActor3Desc" xml:space="preserve">
-    <value>"(Not listed)" enum value shows that enum values can also be localized.</value>
-  </data>
-  <data name="FirstName" xml:space="preserve">
-    <value>First name</value>
-  </data>
-  <data name="FirstNameDesc" xml:space="preserve">
-    <value>First name of that person</value>
-  </data>
-  <data name="InfoCategory" xml:space="preserve">
-    <value>Information</value>
-  </data>
-  <data name="LastName" xml:space="preserve">
-    <value>Last name</value>
-  </data>
-  <data name="LastNameDesc" xml:space="preserve">
-    <value>Usually the familly name of the person</value>
-  </data>
-  <data name="NotListed" xml:space="preserve">
-    <value>(Not listed)</value>
-  </data>
-</root>
\ No newline at end of file
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
deleted file mode 100644
index 6ef4390a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/>
-           CategoryOrderAttribute
-         <LineBreak/>
-           EditorAttribute
-         <LineBreak/>
-           NewItemTypesAttribute
-         <LineBreak/>
-           ExpandableObjectAttribute
-         <LineBreak/>
-           ItemsSourceAttribute
-         <LineBreak/>
-           PropertyOrderAttribute
-         <LineBreak/>
-           ParenthesizePropertyNameAttribute
-         <LineBreak/>
-         <LineBreak/>
-         Plus edition Only:
-         <LineBreak />
-         DependsOnAttribute
-         <LineBreak/>
-         (Not demoed here. See corresponding samples)
-         <LineBreak />
-         ExpandedCategoryAttribute
-         <LineBreak/>
-         DefinitionKeyAttribute
-         <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}"
-                         ShowDescriptionByTooltip="True">
-      </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
deleted file mode 100644
index 6e331da6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-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;
-    }
-  }
-
-  [CategoryOrder("Information", 0)]
-  [CategoryOrder( "Conections", 1 )]
-  [CategoryOrder( "Other", 2 )]
-  public abstract class Person : INotifyPropertyChanged
-  {
-    // 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; set; }
-
-    [Category( "Information" )]
-    [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class. In the Plus version, it also depends on the IsMale property to change its foreground and source." )]
-    [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
-    public string FirstName
-    {
-      get{ return _firstName; }
-      set{ _firstName = value; OnPropertyChanged( "FirstName" );}
-    }
-    private string _firstName;
-
-    [Category( "Information" )]
-    [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'LastNameUserControlEditor' user control." )]
-    [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )]
-    [DefaultValue("Friend")]
-    public string LastName
-    {
-      get{ return _lastName; }
-      set{ _lastName = value; OnPropertyChanged( "LastName" );}
-    }
-    private string _lastName;
-
-    [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 ) )]
-    [RefreshProperties( RefreshProperties.All )]    //This will reload the PropertyGrid
-    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;
-    }
-
-    [Range(0d, 10d)]
-    [Category( "Other" )]
-    [DefaultValue(5d)]
-    [Description( "This property uses the [Range(0,10)] and DefaultValue attributes to set the Minimum, Maximum and default properties." )]
-    public double RangeDouble
-    {
-      get;
-      set;
-    }
-
-    public override string ToString()
-    {
-      return FirstName + " " + LastName;
-    }
-
-    public event PropertyChangedEventHandler PropertyChanged;
-    protected void OnPropertyChanged( string propertyName )
-    {
-      if( PropertyChanged != null )
-      {
-        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
-      }
-    }
-  }
-
-  // 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
-  {
-    [Display( Name = "Favorite Sport"
-            , Prompt = "Enter your favorite sport"
-            , Description = "This property uses the Display attribute to set different PropertyItem fields."
-            , GroupName = "Information"
-            , AutoGenerateField = true
-            , AutoGenerateFilter = false )]
-    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
deleted file mode 100644
index 83832349..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="*" />
-      </Grid.RowDefinitions>
-
-      <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" Grid.Row="1" 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
deleted file mode 100644
index 22a7de24..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 9a3728a3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-        </Paragraph>
-    </local:DemoView.Description>
-
-   <Grid>
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="*" />
-         <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <Grid HorizontalAlignment="Right">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <TextBlock Text="Non-Ordered Categories:" FontSize="16" FontWeight="Bold" HorizontalAlignment="Stretch" Margin="10"/>
-         <xctk:PropertyGrid x:Name="_propertyGrid1" Grid.Row="1" Width="290" MaxHeight="350" VerticalAlignment="Top" Margin="10"/>
-      </Grid>
-
-      <Grid Grid.Column="1">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-
-         <TextBlock Grid.Column="1" Text="Ordered Categories:" FontSize="16" FontWeight="Bold" Margin="10"/>
-         <xctk:PropertyGrid x:Name="_propertyGrid2" Grid.Row="1" Grid.Column="1" Width="290" MaxHeight="350" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10"/>
-      </Grid>
-   </Grid>
-</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
deleted file mode 100644
index b3668f36..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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();
-      _propertyGrid1.SelectedObject = PersonBase.InitPerson( new PersonNonOrdered() );
-      _propertyGrid2.SelectedObject = PersonBase.InitPerson( new PersonOrdered() );
-    }
-
-    [CategoryOrder( "Information", 1 )]
-    [CategoryOrder( "Hobbies", 2 )]
-    [CategoryOrder( "Connections", 3 )]
-    public class PersonOrdered : PersonBase { }
-
-    public class PersonNonOrdered : PersonBase { }
-
-    public abstract class PersonBase
-    {
-      [Category( "Information" )]
-      public string FirstName { get; set; }
-
-      [Category( "Information" )]
-      public string LastName { get; set; }
-
-      [Category( "Hobbies" )]
-      public bool Baseball { get; set; }
-
-      [Category( "Hobbies" )]
-      public bool Football { get; set; }
-
-      [Category( "Hobbies" )]
-      public bool Basketball { get; set; }
-
-      [Category( "Connections" )]
-      public string Father { get; set; }
-
-      [Category( "Connections" )]
-      public string Mother { get; set; }
-
-      [Category( "Connections" )]
-      public bool HasChildren { get; set; }
-
-      public static PersonBase InitPerson( PersonBase person )
-      {
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.Baseball = true;
-        person.Football = false;
-        person.Basketball = true;
-        person.Father = "William Doe";
-        person.Mother = "Jennifer Doe";
-        person.HasChildren = false;
-        return person;
-      }
-    }
-  }
-}
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
deleted file mode 100644
index 50b13b1b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 26d73f2c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 9d5be674..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index b55e83c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 9ec0fdf4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 75bd2ed0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.IO;
-using System.Windows;
-using System.Windows.Media;
-
-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.Decimal = ( decimal )2;
-      selectedObject.Double = (double)3;
-      selectedObject.Enum = HorizontalAlignment.Center;
-      selectedObject.FontFamily = new FontFamily( "Arial" );
-      selectedObject.FontStretch = FontStretches.Normal;
-      selectedObject.FontStyle = FontStyles.Italic;
-      selectedObject.FontWeight = FontWeights.Bold;
-      selectedObject.Guid = new Guid( "F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4" );
-      selectedObject.Char = 'T';
-      selectedObject.Int16 = ( short )4;
-      selectedObject.Int32 = (int)5;
-      selectedObject.Int64 = (long)6;
-      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.Dictionary = new Dictionary<int, System.Windows.Media.Color>() { { 22, System.Windows.Media.Color.FromRgb( 255, 0, 0 ) }, { 33, System.Windows.Media.Color.FromRgb( 0, 255, 0 ) } };
-      selectedObject.CollectionOfPerson = new Collection<Person>() { new Person() { Name = "Tom McNeil" }, new Person() { Name = "Mike Campbell" } };
-      selectedObject.Person = new Person() { Name = "John Smith" };
-      selectedObject.SByte = (sbyte) 7;
-      selectedObject.Single = (float)8;
-      selectedObject.String = "this is a string";
-      selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 );      
-      selectedObject.UInt16 = (ushort)9;
-      selectedObject.UInt32 = (uint)10;
-      selectedObject.UInt64 = (ulong)11;
-
-      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# decimal type) This property uses a Decimal as the default editor." )]
-      public decimal Decimal
-      {
-        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 TimeSpanUpDown as the default editor." )]
-      public System.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 Guid as the default editor." )]
-      public Guid Guid { get; set; }
-      [Category( "Non-Numeric Editors" )]
-      [Description( "This property uses a Char as the default editor." )]
-      public Char Char { 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( "(C# IDictionary<T> type) This property uses a CollectionEditor as the default editor." )]
-      public Dictionary<int, System.Windows.Media.Color> Dictionary { get; set; }
-      [Category( "Non-Numeric Editors" )]
-      [Description( "(C# ICollection<T> type) This property uses a CollectionEditor as the default editor." )]
-      public Collection<Person> CollectionOfPerson
-      {
-        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
deleted file mode 100644
index 8a04084b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 909af452..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 2d1e7504..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 0d9c5818..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index aaa65396..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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:sys="clr-namespace:System.IO;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 />
-         EditorFilePickerDefinition
-         <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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index eee49ab8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
-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/PropertyGridExpandingNonPrimitivesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml
deleted file mode 100644
index 677711f1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridExpandingNonPrimitivesView"
-                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 allows you to expand non-primitive type properties from the SelectedObject to view or edit their sub-properties. It also allows you to expand collections or lists properties to view their items and drill down on these items properties, directly from the propertyGrid, instead of passing by the CollectionEditor.
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\ExpandingNonPrimitives.png" Width="660" Height="430"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs
deleted file mode 100644
index dad71a07..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.xaml.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for PropertyGridExpandingNonPrimitivesView.xaml
-  /// </summary>
-  public partial class PropertyGridExpandingNonPrimitivesView : DemoView
-  {
-    public PropertyGridExpandingNonPrimitivesView()
-    {
-      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
deleted file mode 100644
index 01ccccb0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-        </Paragraph>
-    </local:DemoView.Description>
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\MultiSelectedObjects.png" Width="660" Height="430"/>
-</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
deleted file mode 100644
index 71f78f25..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 3375009d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 4b858199..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 62cce170..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 85dcbe38..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 2294aa51..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 8bd236a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 22b4ba0e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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"
-                            IsVirtualizing="True"/>
-      </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
deleted file mode 100644
index 696ff77e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index ce5ade6a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>      
-      <xctk:PropertyGrid x:Name="_propertyGrid"
-                         Width="450" 
-                         MaxHeight="245"
-                         Margin="10"
-                         AutoGenerateProperties="False">
-
-         <xctk:PropertyGrid.PropertyDefinitions>
-            <!-- The following properties will be displayed in the PropertyGrid 
-                 Some properties' data will be overriden-->
-            <xctk:PropertyDefinition TargetProperties="FirstName,PetNames" DisplayOrder="0"/>
-            <xctk:PropertyDefinition TargetProperties="FavoriteColor"
-                                     DisplayName="Shirt Color"
-                                     Category="Clothes"
-                                     Description="The color of the Person's shirt can be changed with the ColorPicker."
-                                     IsExpandable="True">
-               <!--The following properties will be displayed in the "Shirt Color" expandable PropertyItem--> 
-               <xctk:PropertyDefinition.PropertyDefinitions>
-                  <xctk:PropertyDefinition TargetProperties="R,G,B"/>
-               </xctk:PropertyDefinition.PropertyDefinitions>
-            </xctk:PropertyDefinition>
-            <!-- And all properties of type Boolean will be displayed in the PropertyGrid-->
-            <xctk:PropertyDefinition TargetProperties="{x:Type s:Boolean}" DisplayOrder="1"/>
-
-            <!-- This Property won't be displayed -->
-             <xctk:PropertyDefinition TargetProperties="WritingHand" IsBrowsable="False"/>
-         </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
deleted file mode 100644
index 32f17891..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index cddd8e63..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml
+++ /dev/null
@@ -1,218 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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" />
-          <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="Show Sumary:"
-                   VerticalAlignment="Center" />
-        <CheckBox Grid.Column="1"
-                  IsChecked="{Binding ShowSummary, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Shows/Hides the summary panel of the PropertyGrid." />
-        <TextBlock Text="Filter:"
-                   VerticalAlignment="Center"
-                   Grid.Row="1" />
-        <xctk:WatermarkTextBox Grid.Row="1"
-                               Grid.Column="1"
-                               Width="175"
-                               Watermark="Search"
-                               Text="{Binding Filter, ElementName=_propertyGrid, UpdateSourceTrigger=PropertyChanged}"
-                               VerticalAlignment="Center"
-                               Margin="5"
-                               ToolTip="Filters the properties within the PropertyGrid." />
-        <TextBlock Text="IsReadOnly:"
-                   VerticalAlignment="Center"
-                   Grid.Row="2"
-                   Grid.Column="0" />
-        <CheckBox Grid.Row="2"
-                  Grid.Column="1"
-                  IsChecked="{Binding IsReadOnly, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Set the IsReadOnly property to true or false." />
-        <TextBlock Text="ShowPreview:"
-                   VerticalAlignment="Center"
-                   Grid.Row="3"
-                   Grid.Column="0" />
-        <CheckBox Grid.Row="3"
-                  Grid.Column="1"
-                  IsChecked="{Binding ShowPreview, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Shows/Hides the selected object preview." />
-
-        <!--2nd column-->
-        <TextBlock Text="Is Categorized:"
-                   VerticalAlignment="Center"
-                   Grid.Column="2"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Column="3"
-                  IsChecked="{Binding IsCategorized, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Gets/Sets the layout of the PropertyGrid." />
-        <TextBlock Text="Is Misc Category Label Hidden:"
-                   VerticalAlignment="Center"
-                   Grid.Row="1"
-                   Grid.Column="2"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="1"
-                  Grid.Column="3"
-                  IsChecked="{Binding IsMiscCategoryLabelHidden, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Gets/Sets is the Misc Category label should be hidden." />
-        <TextBlock Text="Show Advanced Options:"
-                   VerticalAlignment="Center"
-                   Grid.Row="2"
-                   Grid.Column="2"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="2"
-                  Grid.Column="3"
-                  IsChecked="{Binding ShowAdvancedOptions, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Shows/Hides the advanced options menu next to a property." />
-        <TextBlock Text="UpdateTextBoxSourceOnEnterKey:"
-                   VerticalAlignment="Center"
-                   Grid.Row="3"
-                   Grid.Column="2"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="3"
-                  Grid.Column="3"
-                  IsChecked="{Binding UpdateTextBoxSourceOnEnterKey, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Update the source of a TextBox when True and Enter key is pressed." />
-
-        <!--Third Column-->
-        <TextBlock Text="Show Horizontal ScrollBar:"
-                   VerticalAlignment="Center"
-                   Grid.Column="4"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Column="5"
-                  IsChecked="{Binding ShowHorizontalScrollBar, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Gets/Sets if the horizontal scrollBar will be showned." />
-        <TextBlock Text="HideInheritedProperties:"
-                   VerticalAlignment="Center"
-                   Grid.Row="1"
-                   Grid.Column="4"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="1"
-                  Grid.Column="5"
-                  IsChecked="{Binding HideInheritedProperties, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="When True, inherited properties are hidden." />
-        <TextBlock Text="IsVirtualizing:"
-                   VerticalAlignment="Center"
-                   Grid.Row="2"
-                   Grid.Column="4"
-                   Margin="10,0,0,0" />
-        <CheckBox Grid.Row="2"
-                  Grid.Column="5"
-                  IsChecked="{Binding IsVirtualizing, ElementName=_propertyGrid}"
-                  VerticalAlignment="Center"
-                  Margin="5"
-                  ToolTip="Set if the PropertyGrid is using virtualization. Using virtualization will load the PropertyGrid faster with large dataSets." />
-      </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="True"
-                           Filter=""
-                           IsCategorized="True"
-                           ShowAdvancedOptions="True"
-                           IsReadOnly="False"
-                           IsVirtualizing="False"
-                           UpdateTextBoxSourceOnEnterKey="True"
-                           IsMiscCategoryLabelHidden="False"
-                           ShowPreview="True"
-                           HideInheritedProperties="False"
-                           ShowHorizontalScrollBar="False"
-                           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
deleted file mode 100644
index 063c4a3c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs
deleted file mode 100644
index 122b9f35..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/AbsoluteAdditionConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-  using System;
-using System.Globalization;
-using System.Linq;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters
-{
-  public class AbsoluteAdditionConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( (values != null) && (values.Count() == 2) )
-      {
-        var min = (double)values[ 0 ];
-        var max = (double)values[ 1 ];
-        return Math.Abs( min ) + Math.Abs( max );
-      }
-
-      return null;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs
deleted file mode 100644
index 298f812a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Converters/RangeSliderEnabledConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ************************************************************************************/
-using System;
-using System.Globalization;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters
-{
-  public class RangeSliderEnabledConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value != null )
-      {
-        var tickPlacement = (TickPlacement)value;
-        return (tickPlacement != TickPlacement.None);
-      }
-      return false;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml
deleted file mode 100644
index 3439c940..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml
+++ /dev/null
@@ -1,817 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views.RangeSliderView"
-                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:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters"
-                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                Title="RangeSlider">
-
-   <local:DemoView.Resources>
-
-      <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      <conv:AbsoluteAdditionConverter x:Key="AbsoluteAdditionConverter"/>
-      <conv:RangeSliderEnabledConverter x:Key="RangeSliderEnabledConverter"/>
-
-      <ObjectDataProvider x:Key="TickPlacement"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="TickPlacement" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <ObjectDataProvider x:Key="AutoToolTipPlacement"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="AutoToolTipPlacement" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <Style x:Key="LowerRangeStyle1"
-             TargetType="{x:Type RepeatButton}">
-
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate  TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-
-      </Style>
-
-      <Style x:Key="LowerRangeStyle2"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Ellipse x:Name="MainBorder"
-                              Fill="{TemplateBinding Background}"
-                              Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="LowerRangeStyle3"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="19">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                     <StackPanel x:Name="HorizontalContentPanel"
-                                 Orientation="Horizontal"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Center">
-                        <TextBlock x:Name="TextContentMin"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=Minimum, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                        <TextBlock  Text=" - "
-                                    Foreground="Turquoise"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                        <TextBlock x:Name="TextContentLower"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=LowerValue, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                     </StackPanel>
-                     <StackPanel x:Name="VerticalContentPanel"
-                                 Orientation="Vertical"
-                                 Visibility="Collapsed"
-                                 VerticalAlignment="Center">
-                        <TextBlock Text="L"
-                                   Foreground="White" />
-                     </StackPanel>
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="30" />
-                        <Setter Property="Visibility"
-                                TargetName="VerticalContentPanel"
-                                Value="Visible" />
-                        <Setter Property="Visibility"
-                                TargetName="HorizontalContentPanel"
-                                Value="Collapsed" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="RangeStyle1"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate  TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="RangeStyle2"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Ellipse x:Name="MainBorder"
-                              Fill="{TemplateBinding Background}" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="RangeStyle3"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="19">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                     <StackPanel x:Name="HorizontalContentPanel"
-                                 Orientation="Horizontal"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Center">
-                        <TextBlock x:Name="TextContentLower"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=LowerValue, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                        <TextBlock  Text=" - "
-                                    Foreground="Turquoise"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                        <TextBlock x:Name="TextContentHigher"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=HigherValue, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                     </StackPanel>
-                     <StackPanel x:Name="VerticalContentPanel"
-                                 Orientation="Vertical"
-                                 Visibility="Collapsed"
-                                 VerticalAlignment="Center">
-                        <TextBlock Text="R"
-                                   Foreground="White" />
-                     </StackPanel>
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="TextContentLower"
-                                Property="Foreground"
-                                Value="Fuchsia" />
-                        <Setter TargetName="TextContentHigher"
-                                Property="Foreground"
-                                Value="Fuchsia" />
-                     </Trigger>
-
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="30" />
-                        <Setter Property="Visibility"
-                                TargetName="VerticalContentPanel"
-                                Value="Visible" />
-                        <Setter Property="Visibility"
-                                TargetName="HorizontalContentPanel"
-                                Value="Collapsed" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="HigherRangeStyle1"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate  TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="HigherRangeStyle2"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="10">
-                     <Ellipse x:Name="MainBorder"
-                              Fill="{TemplateBinding Background}"
-                              Opacity="1" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="10" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="HigherRangeStyle3"
-             TargetType="{x:Type RepeatButton}">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="{x:Type RepeatButton}">
-                  <Grid x:Name="MainGrid"
-                        Height="19">
-                     <Rectangle x:Name="MainBorder"
-                                Fill="{TemplateBinding Background}"
-                                Opacity="1" />
-                     <StackPanel x:Name="HorizontalContentPanel"
-                                 Orientation="Horizontal"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Center">
-                        <TextBlock x:Name="TextContentHigher"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=HigherValue, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                        <TextBlock  Text=" - "
-                                    Foreground="Turquoise"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                        <TextBlock x:Name="TextContentMax"
-                                   Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type xctk:RangeSlider}}, Path=Maximum, StringFormat=\{0:00.00\}}"
-                                   Foreground="White"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center" />
-                     </StackPanel>
-                     <StackPanel x:Name="VerticalContentPanel"
-                                 Orientation="Vertical"
-                                 Visibility="Collapsed"
-                                 VerticalAlignment="Center">
-                        <TextBlock Text="H"
-                                   Foreground="White" />
-                     </StackPanel>
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsMouseOver"
-                              Value="True">
-                        <Setter TargetName="MainBorder"
-                                Property="Opacity"
-                                Value="0.75" />
-                     </Trigger>
-
-                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}"
-                                  Value="Vertical">
-                        <Setter Property="Height"
-                                TargetName="MainGrid"
-                                Value="Auto" />
-                        <Setter Property="Width"
-                                TargetName="MainGrid"
-                                Value="30" />
-                        <Setter Property="Visibility"
-                                TargetName="VerticalContentPanel"
-                                Value="Visible" />
-                        <Setter Property="Visibility"
-                                TargetName="HorizontalContentPanel"
-                                Value="Collapsed" />
-                     </DataTrigger>
-
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-   </local:DemoView.Resources>
-
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         The RangeSlider control lets you set a range with 2 slider thumbs. The lower limit is marked with the right side of the left thumb while the higher limit is marked with the left side of the right thumb.
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="300" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                Grid.Row="0"
-                Margin="5">
-         <Grid Margin="5">
-            <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="75" />
-               <ColumnDefinition Width="100" />
-               <ColumnDefinition Width="160" />
-               <ColumnDefinition Width="105" />
-               <ColumnDefinition Width="155" />
-               <ColumnDefinition Width="105" />
-            </Grid.ColumnDefinitions>
-
-            <!-- Column 1 -->
-            <TextBlock Text="Minimum:"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Grid.Column="1"
-                               Value="{Binding Minimum, ElementName=_rangeSlider}"
-                               FormatString="0.00"
-                               Increment="{Binding Step, ElementName=_rangeSlider}"
-                               VerticalAlignment="Center"
-                               Margin="5" />
-
-            <TextBlock Text="Maximum:"
-                       Grid.Row="1"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Value="{Binding Maximum, ElementName=_rangeSlider}"
-                               Grid.Row="1"
-                               Grid.Column="1"
-                               FormatString="0.00"
-                               Increment="{Binding Step, ElementName=_rangeSlider}"
-                               VerticalAlignment="Center"
-                               Margin="5" />
-
-            <TextBlock Text="Lower Value:"
-                       Grid.Row="2"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Value="{Binding LowerValue, ElementName=_rangeSlider }"
-                               Grid.Row="2"
-                               Grid.Column="1"
-                               FormatString="0.00"
-                               Increment="{Binding Step, ElementName=_rangeSlider}"
-                               VerticalAlignment="Center"
-                               Margin="5" />
-
-            <TextBlock Text="Higher Value:"
-                       Grid.Row="3"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Value="{Binding HigherValue, ElementName=_rangeSlider}"
-                               Grid.Row="3"
-                               Grid.Column="1"
-                               FormatString="0.00"
-                               Increment="{Binding Step, ElementName=_rangeSlider}"
-                               VerticalAlignment="Center"
-                               Margin="5" />
-
-            <TextBlock Text="Step:"
-                       Grid.Row="4"
-                       VerticalAlignment="Center" />
-            <xctk:DoubleUpDown Value="{Binding Step, ElementName=_rangeSlider}"
-                               Grid.Row="4"
-                               Grid.Column="1"
-                               FormatString="0.00"
-                               VerticalAlignment="Center"
-                               Margin="5"
-                               ToolTip="Identify the RangeSlider's size of individual move, when clicking on the LowerRange or HigherRange."/>
-
-            <TextBlock Text="Orientation:"
-                       Grid.Row="5"
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Row="5"
-                      Grid.Column="1"
-                      SelectedIndex="0"
-                      SelectedValue="{Binding Orientation, ElementName=_rangeSlider}"
-                      SelectedValuePath="Content"
-                      VerticalAlignment="Center"
-                      Margin="5">
-               <ComboBoxItem Content="Horizontal" />
-               <ComboBoxItem Content="Vertical" />
-            </ComboBox>
-
-            <!-- Column 2 -->
-            <TextBlock Text="Lower Thumb Background:"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Column="3"
-                              SelectedColor="{Binding LowerThumbBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Higher Thumb Background:"
-                       Grid.Row="1"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Row="1"
-                              Grid.Column="3"
-                              SelectedColor="{Binding HigherThumbBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Lower Range Background:"
-                       Grid.Row="2"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Row="2"
-                              Grid.Column="3"
-                              SelectedColor="{Binding LowerRangeBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Range Background:"
-                       Grid.Row="3"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Row="3"
-                              Grid.Column="3"
-                              SelectedColor="{Binding RangeBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Higher Range Background:"
-                       Grid.Row="4"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:ColorPicker Grid.Row="4"
-                              Grid.Column="3"
-                              SelectedColor="{Binding HigherRangeBackground, ElementName=_rangeSlider, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                              VerticalAlignment="Center"
-                              Margin="5" />
-
-            <TextBlock Text="Auto ToolTip Placement:"
-                       Grid.Row="5"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox Grid.Row="5"
-                      Grid.Column="3"
-                      ItemsSource="{Binding Source={StaticResource AutoToolTipPlacement}}"
-                      SelectedItem="{Binding AutoToolTipPlacement, ElementName=_rangeSlider}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/sets whether a tooltip that contains the current value of a RangeSlider's Thumb displays when the Thumb is pressed. If a tooltip is displayed, this property also specifies the placement of the tooltip.">
-            </ComboBox>
-
-            <TextBlock Text="Auto ToolTip Precision:"
-                       Grid.Row="6"
-                       Grid.Column="2"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <xctk:IntegerUpDown Value="{Binding AutoToolTipPrecision, ElementName=_rangeSlider}"
-                                Grid.Row="6"
-                                Grid.Column="3"
-                                Minimum="0"
-                                Maximum="10"
-                                VerticalAlignment="Center"
-                                Margin="5"
-                                ToolTip="Gets/sets the number of digits that are displayed to the right side of the decimal point for the Value of a RangeSlider's Thumb in a tooltip." />
-
-            <!-- Column 3 -->
-            <TextBlock Text="Lower Range Style:"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox x:Name="lowerRangeStyleComboBox"
-                      Grid.Column="5"
-                      SelectedIndex="0"
-                      SelectedValue="{Binding LowerRangeStyle, ElementName=_rangeSlider}"
-                      SelectedValuePath="Tag"
-                      SelectionChanged="RangeStyleComboBox_SelectionChanged"
-                      VerticalAlignment="Center"
-                      Margin="5">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Style 1"
-                             Tag="{StaticResource LowerRangeStyle1}" />
-               <ComboBoxItem Content="Style 2"
-                             Tag="{StaticResource LowerRangeStyle2}" />
-               <ComboBoxItem Content="Style 3"
-                             Tag="{StaticResource LowerRangeStyle3}" />
-            </ComboBox>
-
-            <TextBlock Text="Range Style:"
-                       Grid.Row="1"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox x:Name="rangeStyleComboBox"
-                      Grid.Row="1"
-                      Grid.Column="5"
-                      SelectedIndex="0"
-                      SelectedValue="{Binding RangeStyle, ElementName=_rangeSlider}"
-                      SelectedValuePath="Tag"
-                      SelectionChanged="RangeStyleComboBox_SelectionChanged"
-                      VerticalAlignment="Center"
-                      Margin="5">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Style 1"
-                             Tag="{StaticResource RangeStyle1}" />
-               <ComboBoxItem Content="Style 2"
-                             Tag="{StaticResource RangeStyle2}" />
-               <ComboBoxItem Content="Style 3"
-                             Tag="{StaticResource RangeStyle3}" />
-            </ComboBox>
-
-            <TextBlock Text="Higher Range Style:"
-                       Grid.Row="2"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox x:Name="higherRangeStyleComboBox"
-                      Grid.Row="2"
-                      Grid.Column="5"
-                      SelectedIndex="0"
-                      SelectedValue="{Binding HigherRangeStyle, ElementName=_rangeSlider}"
-                      SelectedValuePath="Tag"
-                      SelectionChanged="RangeStyleComboBox_SelectionChanged"
-                      VerticalAlignment="Center"
-                      Margin="5">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Style 1"
-                             Tag="{StaticResource HigherRangeStyle1}" />
-               <ComboBoxItem Content="Style 2"
-                             Tag="{StaticResource HigherRangeStyle2}" />
-               <ComboBoxItem Content="Style 3"
-                             Tag="{StaticResource HigherRangeStyle3}" />
-            </ComboBox>
-
-            <TextBlock Text="Is Deferred Update Values:"
-                       Grid.Row="3"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <CheckBox Grid.Row="3"
-                      Grid.Column="5"
-                      IsChecked="{Binding IsDeferredUpdateValues, ElementName=_rangeSlider}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/Sets if the LowerValue and HigherValue should be updated only on mouse up." />
-
-            <TextBlock Text="Is Snap To Tick Enabled:"
-                       Grid.Row="4"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <CheckBox Grid.Row="4"
-                      Grid.Column="5"
-                      IsChecked="{Binding IsSnapToTickEnabled, ElementName=_rangeSlider}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/sets a value that indicates whether the RangeSlider automatically moves the selected Thumb to the closest tick mark." />
-
-            <TextBlock Text="Tick Placement:"
-                       Grid.Row="5"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5" />
-            <ComboBox x:Name="_tickPlacementComboBox"
-                      Grid.Row="5"
-                      Grid.Column="5"
-                      ItemsSource="{Binding Source={StaticResource TickPlacement}}"
-                      SelectedItem="{Binding TickPlacement, ElementName=_rangeSlider}"
-                      VerticalAlignment="Center"
-                      Margin="5"
-                      ToolTip="Gets/sets the position of tick marks with respect to the Track of the RangeSlider.">
-            </ComboBox>
-
-            <TextBlock Text="Tick Frequency:"
-                       Grid.Row="6"
-                       Grid.Column="4"
-                       VerticalAlignment="Center"
-                       Margin="10,5,5,5"
-                       IsEnabled="{Binding IsEnabled, ElementName=_tickFrequency}"
-                       Style="{StaticResource DisableGrayText}"/>
-            <xctk:DoubleUpDown x:Name="_tickFrequency"
-                               Value="{Binding TickFrequency, ElementName=_rangeSlider}"
-                               Grid.Row="6"
-                               Grid.Column="5"
-                               FormatString="0.00"
-                               Minimum="0"
-                               VerticalAlignment="Center"
-                               Margin="5"
-                               ToolTip="Gets/sets the interval between tick marks."
-                               IsEnabled="{Binding SelectedItem, ElementName=_tickPlacementComboBox, Converter={StaticResource RangeSliderEnabledConverter}}">
-               <xctk:DoubleUpDown.Maximum>
-                  <MultiBinding Converter="{StaticResource AbsoluteAdditionConverter}">
-                     <Binding ElementName="_rangeSlider"
-                              Path="Minimum" />
-                     <Binding ElementName="_rangeSlider"
-                              Path="Maximum" />
-                  </MultiBinding>
-               </xctk:DoubleUpDown.Maximum>
-            </xctk:DoubleUpDown>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1"
-                  Margin="10">
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-         <xctk:RangeSlider x:Name="_rangeSlider"
-                           HorizontalAlignment="Center"
-                           VerticalAlignment="Center"
-                           Minimum="0"
-                           Maximum="100"
-                           LowerValue="30"
-                           HigherValue="70"
-                           Step="1"
-                           Orientation="Horizontal"
-                           LowerThumbBackground="#FFF0F0F0"
-                           HigherThumbBackground="#FFF0F0F0"
-                           RangeBackground="Transparent"
-                           HigherRangeBackground="Transparent"
-                           LowerRangeBackground="Transparent"
-                           HigherRangeStyle="{x:Null}"
-                           RangeStyle="{x:Null}"
-                           LowerRangeStyle="{x:Null}"
-                           IsDeferredUpdateValues="False"
-                           IsSnapToTickEnabled="False"
-                           TickPlacement="None"
-                           TickFrequency="1"
-                           AutoToolTipPlacement="None"
-                           AutoToolTipPrecision="0">
-            <xctk:RangeSlider.Resources>
-               <Style TargetType="xctk:RangeSlider">
-                  <Style.Triggers>
-                     <Trigger Property="Orientation"
-                              Value="Horizontal">
-                        <Setter Property="Width"
-                                Value="600" />
-                     </Trigger>
-                     <Trigger Property="Orientation"
-                              Value="Vertical">
-                        <Setter Property="Height"
-                                Value="225" />
-                     </Trigger>
-                  </Style.Triggers>
-               </Style>
-            </xctk:RangeSlider.Resources>
-         </xctk:RangeSlider>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs
deleted file mode 100644
index aeb93258..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/RangeSlider/Views/RangeSliderView.xaml.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Controls;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views
-{
-  /// <summary>
-  /// Interaction logic for RangeSliderView.xaml
-  /// </summary>
-  public partial class RangeSliderView : DemoView
-  {
-    public RangeSliderView()
-    {
-      InitializeComponent();
-    }
-
-    private void RangeStyleComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem)
-      {
-        ComboBoxItem item = e.AddedItems[ 0 ] as ComboBoxItem;
-        //A style different from null is chosen
-        if( item.Tag != null )
-        {
-          //LowerRangeBackground is Transparent, force a color
-          if( object.Equals( sender, lowerRangeStyleComboBox ) && ((SolidColorBrush)_rangeSlider.LowerRangeBackground).Color.Equals( Colors.Transparent) )
-          {
-            _rangeSlider.LowerRangeBackground = new SolidColorBrush( Colors.Green );
-          }
-          //RangeBackground is Transparent, force a color
-          else if( object.Equals( sender, rangeStyleComboBox ) && ( ( SolidColorBrush )_rangeSlider.RangeBackground ).Color.Equals( Colors.Transparent ) )
-          {
-            _rangeSlider.RangeBackground = new SolidColorBrush( Colors.Blue );
-          }
-          //HigherRangeBackground is Transparent, force a color
-          else if( object.Equals( sender, higherRangeStyleComboBox ) && ( ( SolidColorBrush )_rangeSlider.HigherRangeBackground ).Color.Equals( Colors.Transparent ) )
-          {
-            _rangeSlider.HigherRangeBackground = new SolidColorBrush( Colors.Green );
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/OpenSourceImages/Rating.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/OpenSourceImages/Rating.png
deleted file mode 100644
index e5f377b1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/OpenSourceImages/Rating.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml
deleted file mode 100644
index 8159f4b5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views.RatingView"
-                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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                Title="Rating">
-
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The Rating control fills icons to represent a value on a scale. It can be interactive and is also fully customizable.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\Rating.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs
deleted file mode 100644
index ac3af92c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Rating/Views/RatingView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Rating.Views
-{
-  /// <summary>
-  /// Interaction logic for RatingView.xaml
-  /// </summary>
-  public partial class RatingView : DemoView
-  {
-    public RatingView()
-    {
-      InitializeComponent();
-    }
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/OpenSourceImages/SlideShow.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/OpenSourceImages/SlideShow.png
deleted file mode 100644
index 6d2c2628..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/OpenSourceImages/SlideShow.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_1.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_1.jpg
deleted file mode 100644
index aa7d3ef6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_1.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_2.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_2.jpg
deleted file mode 100644
index ef6f5bcd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_2.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_3.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_3.jpg
deleted file mode 100644
index f757843c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_3.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_4.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_4.jpg
deleted file mode 100644
index 98557c86..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_4.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_5.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_5.jpg
deleted file mode 100644
index 39d8c357..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_5.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_6.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_6.jpg
deleted file mode 100644
index eb715166..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_6.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_7.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_7.jpg
deleted file mode 100644
index 11b512e8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_7.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_8.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_8.jpg
deleted file mode 100644
index ad0c4466..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_8.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_9.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_9.jpg
deleted file mode 100644
index 01837d71..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Resources/photo_9.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml
deleted file mode 100644
index bfce3417..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views.SlideShowView"
-                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:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters;assembly=Xceed.Wpf.Toolkit"
-                Title="SlideShow">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The SlideShow is used to display SlideShowItems in a fashion similar to a diaporama. SlideShowItems are not limited to images and can be built using any UIElement.</Run>
-            <LineBreak />
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\SlideShow.png" Width="600" Height="280"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs
deleted file mode 100644
index 80c1eacf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/SlideShow/Views/SlideShowView.xaml.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Collections.ObjectModel;
-using System.ComponentModel;
-using Xceed.Wpf.Samples.SampleData;
-using System.Windows.Media.Imaging;
-using System.IO;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views
-{
-    /// <summary>
-    /// Interaction logic for SlideShow.xaml
-    /// </summary>
-    public partial class SlideShowView : DemoView
-    {
-        public SlideShowView()
-        {
-            InitializeComponent();
-
-
-        }
-
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/OpenSourceImages/TokenizedTextBox.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/OpenSourceImages/TokenizedTextBox.png
deleted file mode 100644
index dede90f0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/OpenSourceImages/TokenizedTextBox.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Resources/PencilTool16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Resources/PencilTool16.png
deleted file mode 100644
index df0970c4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Resources/PencilTool16.png and /dev/null differ
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
deleted file mode 100644
index 7c5f24d7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml
+++ /dev/null
@@ -1,120 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 81c9135d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index b6b70eee..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 88b5a14e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index ac9d417e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index c2fba5d9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 516f1751..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 0f97e22a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/TokenizedTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml
deleted file mode 100644
index 0ed541cb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views.TokenizedTextBoxView"
-                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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                Title="TokenizedTextBox">
-
-    <local:DemoView.Description>
-        <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The TokenizedTextBox lets you display a series of values as tokens. If an ItemsSource is specified, an AutoComplete popup will appear with a filtered list of valid values during edit.</Run>
-            <LineBreak />
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-      </Paragraph>
-    </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\TokenizedTextBox.png" Width="600" Height="400"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs
deleted file mode 100644
index ec9c2548..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/TokenizedTextBoxView.xaml.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.ComponentModel;
-using System.Data;
-using System.Collections.ObjectModel;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views
-{
-  /// <summary>
-  /// Interaction logic for TokenizedTextBoxView.xaml
-  /// </summary>
-  public partial class TokenizedTextBoxView : DemoView
-  {
-
-
-
-    public TokenizedTextBoxView()
-    {
-
-      InitializeComponent();
-    }
-
-
-
-
-  }
-
-
-
-
-
-
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml
deleted file mode 100644
index 9d8592dc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views.WatermarkPasswordBoxView"
-                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"
-                Title="WatermarkPasswordBox">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         The WatermarkPasswordBox is a PasswordBox where you can enter a secure password and display a watermark when the password is not defined.
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <DataTemplate x:Key="WatermarkTemplate1">
-         <Grid>
-            <TextBlock Text="{Binding}"
-                       Foreground="Blue"
-                       Background="Orange"
-                       FontSize="12"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center" />
-         </Grid>
-      </DataTemplate>
-
-      <DataTemplate x:Key="WatermarkTemplate2">
-         <Border BorderBrush="Red"
-                 BorderThickness="1">
-            <ContentControl Content="{Binding}"
-                            Foreground="DarkRed"
-                            FontWeight="Bold"
-                            Focusable="False"
-                            Margin="4,0,4,0"/>
-         </Border>
-      </DataTemplate>
-   </local:DemoView.Resources>
-
-   <StackPanel>
-      <GroupBox Header="Features">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <!--1st Column-->
-            <TextBlock Text="PasswordChar: "
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Column="1"
-                     MaxLength="1"
-                     Text="{Binding PasswordChar, ElementName=_watermarkPasswordBox}"
-                     Width="18"
-                     Margin="5,5,25,5"
-                     HorizontalAlignment="Left"
-                     VerticalAlignment="Center" />
-
-            <TextBlock Grid.Row="1"
-                       Text="Password: "
-                       VerticalAlignment="Center" />
-            <TextBlock Grid.Row="1"
-                       Grid.Column="1"
-                       x:Name="_passwordTextBlock"
-                       Width="190"
-                       Margin="5,5,25,5"
-                       HorizontalAlignment="Left"
-                       VerticalAlignment="Center" />
-
-            <!--2nd column-->
-            <TextBlock Grid.Column="2"
-                       Text="Watermark: "
-                       Margin="5"
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Column="3"
-                     Text="{Binding Watermark, ElementName=_watermarkPasswordBox}"
-                     Width="190"
-                     Margin="5,5,25,5"
-                     HorizontalAlignment="Left"
-                     VerticalAlignment="Center" />
-
-            <TextBlock Grid.Row="1"
-                       Grid.Column="2"
-                       Text="Watermark Template: "
-                       Margin="5"
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Row="1"
-                      Grid.Column="3"
-                      Width="100"
-                      Margin="5,5,25,5"
-                      SelectedValue="{Binding WatermarkTemplate, ElementName=_watermarkPasswordBox}"
-                      SelectedValuePath="Tag"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Template 1"
-                             Tag="{StaticResource WatermarkTemplate1}" />
-               <ComboBoxItem Content="Template 2"
-                             Tag="{StaticResource WatermarkTemplate2}" />
-            </ComboBox>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel>
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-
-         <StackPanel Margin="10">
-            <TextBlock Text="Default:"
-                       Style="{StaticResource Header}" />
-            <xctk:WatermarkPasswordBox x:Name="_watermarkPasswordBox"
-                                       Margin="5"
-                                       MinWidth="200"
-                                       Watermark="Enter Password here..."
-                                       WatermarkTemplate="{x:Null}"
-                                       PasswordChar='&#9679;'
-                                       MaxLength="10"
-                                       KeepWatermarkOnGotFocus="True"
-                                       PasswordChanged="WatermarkPasswordBox_PasswordChanged" />
-         </StackPanel>
-      </StackPanel>
-   </StackPanel>
-
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs
deleted file mode 100644
index d37064fd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkPasswordBoxView.xaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************/
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
-{
-  /// <summary>
-  /// Interaction logic for WatermarkPasswordBoxView.xaml
-  /// </summary>
-  public partial class WatermarkPasswordBoxView : DemoView
-  {
-    public WatermarkPasswordBoxView()
-    {
-      InitializeComponent();
-    }
-
-    private void WatermarkPasswordBox_PasswordChanged( object sender, System.Windows.RoutedEventArgs e )
-    {
-      var passwordBox = sender as WatermarkPasswordBox;
-      if( passwordBox != null )
-      {
-        _passwordTextBlock.Text = passwordBox.Password;
-      }
-    }
-  }
-}
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
deleted file mode 100644
index 98ad267c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-
-   <StackPanel>
-      <GroupBox Header="Features">
-         <Grid Margin="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <TextBlock Grid.Column="0"
-                       Text="KeepWatermarkOnGotFocus: "
-                       VerticalAlignment="Center" />
-            <CheckBox Grid.Column="1"
-                      x:Name="_keepWatermarkOnGotFocus"
-                      IsChecked="False"
-                      VerticalAlignment="Center" />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel>
-         <TextBlock Text="Usage:"
-                    Style="{StaticResource Header}" />
-
-         <StackPanel Margin="10">
-            <TextBlock Text="Default:"
-                       Style="{StaticResource Header}" />
-            <xctk:WatermarkTextBox Margin="5"
-                                   MinWidth="200"
-                                   Watermark="Enter Text"
-                                   KeepWatermarkOnGotFocus="{Binding IsChecked, ElementName=_keepWatermarkOnGotFocus}"/>
-
-            <TextBlock Text="Image Watermark:"
-                       Style="{StaticResource Header}" />
-            <xctk:WatermarkTextBox Margin="5"
-                                   KeepWatermarkOnGotFocus="{Binding IsChecked, ElementName=_keepWatermarkOnGotFocus}">
-               <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 Text="Custom WatermarkTemplate:"
-                       Style="{StaticResource Header}" />
-            <xctk:WatermarkTextBox Margin="5"
-                                   Watermark="Enter Text"
-                                   KeepWatermarkOnGotFocus="{Binding IsChecked, ElementName=_keepWatermarkOnGotFocus}">
-               <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>
-      </StackPanel>
-   </StackPanel>
-
-</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
deleted file mode 100644
index e50a9aa9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 8eb9009f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPicture.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPicture.png
deleted file mode 100644
index ee33bc49..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPicture.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureA.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureA.jpg
deleted file mode 100644
index 2e6fb39c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureA.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureB.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureB.jpg
deleted file mode 100644
index af6c4cbb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureB.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureC.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureC.jpg
deleted file mode 100644
index 30cf87da..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureC.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureD.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureD.jpg
deleted file mode 100644
index c3cd5d33..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureD.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/Working.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/Working.png
deleted file mode 100644
index f3ee5513..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/Working.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/address-book--pencil.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/address-book--pencil.png
deleted file mode 100644
index 7abf41ac..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/address-book--pencil.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/address-book-open.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/address-book-open.png
deleted file mode 100644
index 621ca402..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/address-book-open.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/alarm-clock-blue.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/alarm-clock-blue.png
deleted file mode 100644
index 4821bf49..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/alarm-clock-blue.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/document.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/document.png
deleted file mode 100644
index 75f92b0c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/document.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/property-blue.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/property-blue.png
deleted file mode 100644
index 2c63f2f1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/property-blue.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml
deleted file mode 100644
index 0f2b683e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/ItemTemplates/Common.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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">
-
-   <Style x:Key="newSuffix"
-          TargetType="TextBlock">
-      <Setter Property="Margin"
-              Value="10,0,0,0" />
-      <Setter Property="Text"
-              Value="New" />
-      <Setter Property="FontStyle"
-              Value="Italic" />
-      <Setter Property="FontSize"
-              Value="12" />
-      <Setter Property="BaselineOffset"
-              Value="0" />
-      <Setter Property="Foreground"
-              Value="#ea00ff" />
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockMetroDark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockMetroDark.png
deleted file mode 100644
index 8e2dda87..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockMetroDark.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockMetroLight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockMetroLight.png
deleted file mode 100644
index 1f6ac34b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockMetroLight.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Black.png
deleted file mode 100644
index 9b160601..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Black.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Blue.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Blue.png
deleted file mode 100644
index 2014e286..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Blue.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Silver.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Silver.png
deleted file mode 100644
index 37b68a19..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockOffice2007Silver.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockWindows10.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockWindows10.png
deleted file mode 100644
index c464fdad..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/AvalonDockWindows10.png and /dev/null differ
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
deleted file mode 100644
index 061417cc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/CoreWPFControls.png and /dev/null 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
deleted file mode 100644
index 1c84fdc5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/DataGridControls.png and /dev/null 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
deleted file mode 100644
index b7a0236b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/ExtendedWPFToolkitControls.png and /dev/null 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
deleted file mode 100644
index d9bc69fc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/ListBoxControls.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml
deleted file mode 100644
index 3a9b2773..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml
+++ /dev/null
@@ -1,319 +0,0 @@
-<!--***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingAvalonDockView"
-                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
-                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                xmlns:s="clr-namespace:System;assembly=mscorlib"
-                xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views"
-                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                Title="Theming AvalonDock"
-                x:Name="_demo">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>Changes the themes of the AvalonDock controls. Available themes are System, Aero, VS2010, Metro, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.AvalonDock.Themes.xxx.dll assemblies are necessary to use these themes.</Run>
-            <LineBreak />
-            <Run>Some features of this sample are only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="../ItemTemplates/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-
-
-
-      <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" />
-         <Setter Property="ContentTemplate">
-            <Setter.Value>
-               <DataTemplate>
-                  <DockPanel>
-                     <TextBlock DockPanel.Dock="Left"
-                                Text="{Binding}" />
-                     <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-                  </DockPanel>
-               </DataTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="plusNewItem"
-             TargetType="ComboBoxItem">
-         <Setter Property="HorizontalContentAlignment"
-                 Value="Stretch" />
-         <Setter Property="ContentTemplate">
-            <Setter.Value>
-               <DataTemplate>
-                  <DockPanel>
-                     <TextBlock DockPanel.Dock="Left"
-                                Text="{Binding}" />
-                     <TextBlock TextAlignment="Right"
-                                Style="{StaticResource newSuffix}" />
-                     <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
-                  </DockPanel>
-               </DataTemplate>
-            </Setter.Value>
-         </Setter>
-       </Style>
-     </ResourceDictionary>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                Grid.Row="0"
-                Margin="5">
-         <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <StackPanel Orientation="Horizontal"
-                        Margin="5">
-               <TextBlock Text="Theme:"
-                          Margin="0,0,10,0"
-                          VerticalAlignment="Center" />
-               <ComboBox x:Name="_themeCombo"
-                         SelectedIndex="0"
-                         Width="160"
-                         Height="25">
-                  <view:AvalonDockComboBoxItem Content="Generic"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Generic}"/>
-                  <view:AvalonDockComboBoxItem Content="Aero"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Aero}">
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:AeroTheme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Content="VS2010"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.VS2010}">
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:VS2010Theme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Content="Metro"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Metro}">
-                     <view:AvalonDockComboBoxItem.Tag>
-                        <xcad:MetroTheme />
-                     </view:AvalonDockComboBoxItem.Tag>
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
-                                               Content="Office2007 Black"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Black}">
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
-                                               Content="Office2007 Blue"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Blue}">
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
-                                               Content="Office2007 Silver"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Office2007Silver}">
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem Style="{StaticResource plusItem}"
-                                               Content="Windows 10"
-                                               Selected="DefaultComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.Windows10}">
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem x:Name="metroDarkComboBoxItem"
-                                               Style="{StaticResource plusItem}"
-                                               Content="Metro Dark"
-                                               Selected="MetroComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.MetroDark}">
-                     <!--MetroDark Theme is set in CodeBehind-->
-                  </view:AvalonDockComboBoxItem>
-                  <view:AvalonDockComboBoxItem x:Name="metroLightComboBoxItem"
-                                               Style="{StaticResource plusItem}"
-                                               Content="Metro Light"
-                                               Selected="MetroComboBoxItem_Selected"
-                                               ThemeEnum="{x:Static view:AvalonDockThemesEnum.MetroLight}">
-                     <!--MetroLight Theme is set in CodeBehind-->
-                  </view:AvalonDockComboBoxItem>
-               </ComboBox>
-            </StackPanel>
-
-
-         </Grid>
-      </GroupBox>
-
-      <TextBlock Grid.Row="1"
-                 Text="Usage:"
-                 Style="{StaticResource Header}" />
-
-      <Border x:Name="SampleBorder"
-              Grid.Row="2">
-         <xcad:DockingManager x:Name="_dockingManager"
-                              MaxHeight="395"
-                              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}"
-                                           AutoGenerateProperties="False">
-                           <xctk:PropertyGrid.PropertyDefinitions>
-                              <xctk:PropertyDefinition TargetProperties="Background" />
-                              <xctk:PropertyDefinition TargetProperties="BorderBrush" />
-                              <xctk:PropertyDefinition TargetProperties="BorderThickness" />
-                              <xctk:PropertyDefinition TargetProperties="FontSize" />
-                              <xctk:PropertyDefinition TargetProperties="FontStyle" />
-                              <xctk:PropertyDefinition TargetProperties="Width" />
-                              <xctk:PropertyDefinition TargetProperties="Height" />
-                           </xctk:PropertyGrid.PropertyDefinitions>
-                        </xctk:PropertyGrid>
-                     </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>
-      </Border>
-
-      <Image x:Name="_openSourceScreenShot" Grid.Row="2" Height="395" Visibility="Collapsed" />
-      <StackPanel x:Name="_openSourceTextHyperlink" Grid.Row="3" Orientation="Horizontal" Visibility="Collapsed">
-            <TextBlock Text="This theme is only available in the &quot;Plus&quot; version. "/>
-            <TextBlock>
-               <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-                  Click here for more details about Xceed Toolkit Plus for WPF.
-               </Hyperlink>
-            </TextBlock>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs
deleted file mode 100644
index 67eb9b0d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingAvalonDockView.xaml.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.IO;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
-{
-  /// <summary>
-  /// Interaction logic for ThemingAvalonDockView.xaml
-  /// </summary>
-  public partial class ThemingAvalonDockView : DemoView
-  {
-
-
-
-    #region constructors
-
-    public ThemingAvalonDockView()
-    {
-      this.Initialized += new EventHandler( AvalonDockControlsThemes_Initialized );
-      InitializeComponent();
-    }
-
-    #endregion
-
-    #region EventHandlers
-
-    private void DefaultComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      AvalonDockComboBoxItem comboBoxItem = sender as AvalonDockComboBoxItem;
-
-      if( comboBoxItem != null )
-      {
-        this.SetOpenSourceImage( comboBoxItem );
-      }
-    }
-
-    private void AvalonDockControlsThemes_Initialized( object sender, EventArgs e )
-    {
-      _themeCombo.SelectedIndex = 0;
-    }
-
-    private void MetroComboBoxItem_Selected( object sender, RoutedEventArgs e )
-    {
-      AvalonDockComboBoxItem comboBoxItem = sender as AvalonDockComboBoxItem;
-      if( comboBoxItem != null )
-      {
-        this.SetOpenSourceImage( comboBoxItem );
-      }
-    }
-
-
-
-
-
-
-
-
-
-    #endregion
-
-    #region private Methods
-
-
-     private void SetOpenSourceImage( AvalonDockComboBoxItem comboBoxItem )
-    {
-      if( comboBoxItem != null )
-      {
-        bool isPlusPanel = ( comboBoxItem.ThemeEnum == AvalonDockThemesEnum.Office2007Black 
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.Office2007Blue
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.Office2007Silver
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.Windows10
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.MetroDark
-                          || comboBoxItem.ThemeEnum == AvalonDockThemesEnum.MetroLight );
-
-        if( _openSourceScreenShot != null )
-          _openSourceScreenShot.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
-        if( _openSourceTextHyperlink != null )
-          _openSourceTextHyperlink.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
-        if( _dockingManager != null )
-          _dockingManager.Visibility = isPlusPanel ? Visibility.Collapsed : Visibility.Visible;
-
-        if( isPlusPanel )
-        {
-          BitmapImage bitmapImage = new BitmapImage();
-
-          bitmapImage.BeginInit();
-          switch( comboBoxItem.ThemeEnum )
-          {
-            case AvalonDockThemesEnum.Office2007Black:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockOffice2007Black.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.Office2007Blue:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockOffice2007Blue.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.Office2007Silver:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockOffice2007Silver.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.Windows10:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockWindows10.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.MetroDark:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockMetroDark.png", UriKind.Relative );
-              break;
-            case AvalonDockThemesEnum.MetroLight:
-              bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AvalonDockMetroLight.png", UriKind.Relative );
-              break;
-            default:
-              throw new InvalidDataException( "LayoutcomboBox.SelectedIndex is not valid." );
-          }
-          bitmapImage.EndInit();
-
-          if( _openSourceScreenShot != null )
-            _openSourceScreenShot.Source = bitmapImage;
-        }
-      }
-    }
-
-
-
-
-
-
-    #endregion
-  }
-
-
-  public enum AvalonDockThemesEnum
-  {
-    Generic,
-    Aero,
-    VS2010,
-    Metro,
-    Office2007Black,
-    Office2007Blue,
-    Office2007Silver,
-    Windows10,
-    MetroDark,
-    MetroLight
-  }
-
-  public class AvalonDockComboBoxItem : ComboBoxItem
-  {
-    public AvalonDockThemesEnum ThemeEnum
-    {
-      get;
-      set;
-    }
-  }
-}
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
deleted file mode 100644
index 83482965..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.Themes.Office2007.dll or Xceed.Wpf.Themes.Metro.dll assemblies are necessary to use these themes.</Run>
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 90768ddf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index b9bbed29..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.DataGrid.Themes.Office2007.dll or Xceed.Wpf.DataGrid.Themes.Metro.dll assemblies are necessary to use these themes.</Run>
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index 90d31027..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Xceed.Wpf.DataGrid.Views;
-
-
-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
deleted file mode 100644
index b93b285a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 Toolkit Plus For WPF"
-                 x:Name="_demo">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-         <Run>Changes the themes of the Toolkit for WPF controls. Available themes are System, Office2007, Windows10 and Metro with accent color. The Xceed.Wpf.Toolkit.Themes.Office2007.dll, Xceed.Wpf.Toolkit.Themes.Windows10.dll or Xceed.Wpf.Toolkit.Themes.Metro.dll assemblies are necessary to use the themes.</Run>
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index bb250ed9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  *************************************************************************************/
-
-using System.Diagnostics;
-using System.Windows;
-using System;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Documents;
-
-
-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
deleted file mode 100644
index 2f64e7bb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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. Available themes are System, Office2007, LiveExplorer, MediaPlayer, Windows10 and Metro with accent color. The Xceed.Wpf.ListBox.Themes.xxx.dll assembly is necessary to use the themes.</Run>
-            <LineBreak />
-            <Run>This feature is only available in the "Plus" version.</Run>
-            <LineBreak />
-            <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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
deleted file mode 100644
index d5abbe63..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/TimeSpan/Views/TimeSpanView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml
deleted file mode 100644
index 2e32ea8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml
+++ /dev/null
@@ -1,189 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimeSpan.Views.TimeSpanView"
-                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"
-                Title="TimeSpanUpDown">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         The TimeSpanUpDown controls let you increment or decrement a time over 24 hours. The Format is Days.Hours:Minutes:Seconds.Milliseconds.
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ObjectDataProvider x:Key="enumDateTimePart" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimePart"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                HorizontalAlignment="Stretch">
-         <Grid>
-            <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" />
-            </Grid.ColumnDefinitions>
-
-            <!-- 1st column-->
-            <TextBlock Text="Watermark:"
-                       VerticalAlignment="Center" />
-            <TextBox x:Name="_watermark"
-                     Grid.Column="1"
-                     Text="{Binding Watermark, ElementName=_timeSpanUpDown}"
-                     Width="190"
-                     HorizontalAlignment="Left"
-                     Margin="5,5,25,5" />
-            <TextBlock Grid.Row="1"
-                       Text="ClipValueToMinMax:"
-                       VerticalAlignment="Center" />
-            <CheckBox x:Name="_clipValuetoMinMax"
-                      Grid.Row="1"
-                      Grid.Column="1"
-                      IsChecked="{Binding ClipValueToMinMax, ElementName=_timeSpanUpDown}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,25,5" />
-            <TextBlock Grid.Row="2"
-                       Text="ShowSeconds:"
-                       VerticalAlignment="Center" />
-            <CheckBox x:Name="_showSeconds"
-                      Grid.Row="2"
-                      Grid.Column="1"
-                      IsChecked="{Binding ShowSeconds, ElementName=_timeSpanUpDown}"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      Margin="5,5,25,5" />
-            <TextBlock Grid.Row="3"
-                       Text="FractionalSecondsDigitsCount:"
-                       VerticalAlignment="Center" />
-            <xctk:IntegerUpDown x:Name="_fractionalSecondsDigitsCount"
-                                Grid.Row="3"
-                                Grid.Column="1"
-                                Value="{Binding FractionalSecondsDigitsCount, ElementName=_timeSpanUpDown}"
-                                Maximum="3"
-                                Minimum="0"
-                                HorizontalAlignment="Left"
-                                Margin="5,5,25,5" />
-            <TextBlock Grid.Row="4" 
-                       Text="CurrentDateTimePart:" 
-                       VerticalAlignment="Center"/>
-            <ComboBox x:Name="_currentDateTimePart"
-                      Grid.Row="4"
-                      Grid.Column="1"
-                      ItemsSource="{Binding Source={StaticResource enumDateTimePart}}"
-                      SelectedItem="{Binding CurrentDateTimePart, ElementName=_timeSpanUpDown}"
-                      Margin="5,5,25,5" 
-                      ToolTip="Must match a DateTimePart of the TimeSpanUpDown"/>
-
-            <!-- 2nd column-->
-            <TextBlock Grid.Column="2"
-                       Text="DefaultValue:"
-                       VerticalAlignment="Center"
-                       Margin="5" />
-            <xctk:TimeSpanUpDown x:Name="_defaultValue"
-                                 Grid.Column="3"
-                                 Value="{Binding DefaultValue, ElementName=_timeSpanUpDown}"
-                                 Width="100"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Center"
-                                 Margin="5,5,25,5" />
-            <TextBlock Grid.Row="1"
-                       Grid.Column="2"
-                       Text="Minimum:"
-                       VerticalAlignment="Center"
-                       Margin="5" />
-            <xctk:TimeSpanUpDown x:Name="_minimum"
-                                 Grid.Row="1"
-                                 Grid.Column="3"
-                                 Value="{Binding Minimum, ElementName=_timeSpanUpDown}"
-                                 Width="100"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Center"
-                                 Margin="5,5,25,5" />
-            <TextBlock Grid.Row="2"
-                       Grid.Column="2"
-                       Text="Maximum:"
-                       VerticalAlignment="Center"
-                       Margin="5" />
-            <xctk:TimeSpanUpDown x:Name="_maximum"
-                                 Grid.Row="2"
-                                 Grid.Column="3"
-                                 Value="{Binding Maximum, ElementName=_timeSpanUpDown}"
-                                 Width="100"
-                                 HorizontalAlignment="Left"
-                                 VerticalAlignment="Center"
-                                 Margin="5,5,25,5" />
-            <TextBlock Grid.Row="3"
-                       Grid.Column="2"
-                       Text="Step:"
-                       VerticalAlignment="Center"
-                       Margin="5" />
-            <xctk:IntegerUpDown x:Name="_step"
-                                Grid.Row="3"
-                                Grid.Column="3"
-                                Value="{Binding Step, ElementName=_timeSpanUpDown}"
-                                Maximum="10"
-                                Minimum="1"
-                                Width="100"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Margin="5,5,25,5" />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1"
-                  HorizontalAlignment="Left">
-         <TextBlock Text="Usage: "
-                    Margin="0,10,0,0"
-                    Style="{StaticResource Header}" />
-         <xctk:TimeSpanUpDown x:Name="_timeSpanUpDown"
-                              Width="300"
-                              VerticalAlignment="Top"
-                              IsReadOnly="False"
-                              Watermark="Enter text"
-                              DefaultValue="00:00:00"
-                              Maximum="5.00:00:00"
-                              Minimum="-5.00:00:00"
-                              ClipValueToMinMax="False"
-                              ShowSeconds="True"
-                              FractionalSecondsDigitsCount="0"
-                              CurrentDateTimePart="Hour24"
-                              Step="1"/>
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml.cs
deleted file mode 100644
index b7e79593..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimeSpan/Views/TimeSpanView.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Toolkit.LiveExplorer.Samples.TimeSpan.Views
-{
-  /// <summary>
-  /// Interaction logic for TimeSpanView.xaml
-  /// </summary>
-  public partial class TimeSpanView : DemoView
-  {
-    public TimeSpanView()
-    {
-      InitializeComponent();
-    }
-  }
-}
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
deleted file mode 100644
index 048b0e1a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml
+++ /dev/null
@@ -1,183 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index a78cce4b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/ToggleSwitch/OpenSourceImages/ToggleSwitch.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/OpenSourceImages/ToggleSwitch.png
deleted file mode 100644
index 502bc2e3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/OpenSourceImages/ToggleSwitch.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Resources/PencilTool16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Resources/PencilTool16.png
deleted file mode 100644
index df0970c4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Resources/PencilTool16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml
deleted file mode 100644
index 11f85407..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views.ToggleSwitchView"
-                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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
-                xmlns:localConv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters"
-                Title="ToggleSwitch">
-
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The ToggleSwitch control is a fully customizable on/off switch that can be used to enhance the UI experience.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>This feature is only available in the "Plus" version.</Run>
-         <LineBreak />
-         <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about Xceed Toolkit Plus for WPF.
-         </Hyperlink>
-      </Paragraph>
-   </local:DemoView.Description>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    <Image Source="..\OpenSourceImages\ToggleSwitch.png" Width="200" Height="160"/>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs
deleted file mode 100644
index 48f42067..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ToggleSwitch/Views/ToggleSwitchView.xaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Controls;
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views
-{
-    /// <summary>
-    /// Interaction logic for ToggleSwitchView.xaml
-    /// </summary>
-    public partial class ToggleSwitchView : DemoView
-    {
-        public ToggleSwitchView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Resources/PencilTool16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Resources/PencilTool16.png
deleted file mode 100644
index df0970c4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Resources/PencilTool16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml
deleted file mode 100644
index bd53f0c9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views.WatermarkComboBoxView"
-                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="WatermarkComboBox">
-
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The WatermarkComboBox is a ComboBox with a fully customizable watermark.</Run>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <DataTemplate x:Key="WatermarkComboBoxTemplate1">
-         <Grid>
-            <StackPanel Orientation="Horizontal">
-               <Image Source="..\Resources\PencilTool16.png" />
-               <TextBlock Text="{Binding}"
-                          Foreground="Green"
-                          FontFamily="Sans Serif"
-                          FontWeight="Bold"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Margin="4,0,0,0"/>
-            </StackPanel>           
-         </Grid>
-      </DataTemplate>
-
-      <DataTemplate x:Key="WatermarkComboBoxTemplate2">
-         <Border BorderBrush="Green"
-                 BorderThickness="1">
-            <TextBlock Text="{Binding}"
-                       Foreground="Red"
-                       HorizontalAlignment="Center"
-                       VerticalAlignment="Center" />
-         </Border>
-      </DataTemplate>
-   </local:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features"
-                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="Watermark: "
-                       VerticalAlignment="Center" />
-            <TextBox Grid.Column="1"
-                     HorizontalAlignment="Stretch"
-                     VerticalAlignment="Center"
-                     Margin="5"
-                     ToolTip="Gets/Sets the watermark when there are no comboBoxItem selected and focus is not on WatermarkComboBox."
-                     Text="{Binding Watermark, ElementName=_watermarkComboBox, UpdateSourceTrigger=PropertyChanged}" />
-            <TextBlock Text="WatermarkTemplate: "
-                       Grid.Row="1"
-                       VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
-                      Grid.Row="1"
-                      Width="150"
-                      Margin="5"
-                      HorizontalAlignment="Left"
-                      VerticalAlignment="Center"
-                      SelectedValue="{Binding WatermarkTemplate, ElementName=_watermarkComboBox}"
-                      SelectedValuePath="Tag">
-               <ComboBoxItem Content="Default"
-                             Tag="{x:Null}" />
-               <ComboBoxItem Content="Template 1"
-                             Tag="{StaticResource WatermarkComboBoxTemplate1}" />
-               <ComboBoxItem Content="Template 2"
-                             Tag="{StaticResource WatermarkComboBoxTemplate2}" />
-            </ComboBox>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1"
-                  Margin="10">
-
-         <TextBlock Text="Usage:"
-                    Margin="10"
-                    Style="{StaticResource Header}" />
-
-         <xctk:WatermarkComboBox x:Name="_watermarkComboBox"
-                                 Margin="10"
-                                 Width="350"
-                                 IsEditable="True"
-                                 Watermark="Choose a ComboBox Item..."
-                                 WatermarkTemplate="{x:Null}"
-                                 VerticalContentAlignment="Center">
-            <ComboBoxItem Content="Red" />
-            <ComboBoxItem Content="Green" />
-            <ComboBoxItem Content="Blue" />
-            <ComboBoxItem Content="Yellow" />
-            <ComboBoxItem Content="Black" />
-         </xctk:WatermarkComboBox>
-
-      </StackPanel>
-   </Grid>
-</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs
deleted file mode 100644
index 5301d255..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Controls;
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views
-{
-  /// <summary>
-  /// Interaction logic for WatermarkComboBoxView.xaml
-  /// </summary>
-  public partial class WatermarkComboBoxView : DemoView
-  {
-    public WatermarkComboBoxView()
-    {
-      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
deleted file mode 100644
index 00541040..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 87eadce4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 6af589e2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml
+++ /dev/null
@@ -1,189 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 StyleableWindow 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
deleted file mode 100644
index 953fa3bc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml
+++ /dev/null
@@ -1,106 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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" />
-
-      <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 DisableGrayText}"/>
-         <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 DisableGrayText}"/>
-         <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 DisableGrayText}" />
-         <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 DisableGrayText}" />
-         <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 DisableGrayText}"/>
-         <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="TitleFontSize:"
-                    VerticalAlignment="Center"
-                    IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                    Style="{StaticResource DisableGrayText}" />
-         <xctk:DoubleUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                            Value="{Binding TitleFontSize}"
-                            Minimum="5"
-                            Maximum="50"
-                            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 DisableGrayText}" />
-         <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 DisableGrayText}" />
-         <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" />
-         <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" 
-                    ToolTip="Not applicable to MessageBoxes."/>
-         <CheckBox IsChecked="{Binding CloseButtonVisibility, Converter={StaticResource VisibilityToBoolConverter}}" 
-                   Margin="5,0,0,0"
-                   VerticalAlignment="Center"
-                   ToolTip="Not applicable to MessageBoxes."/>
-      </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
deleted file mode 100644
index 251857b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Value.R, item.Color.Value.G, item.Color.Value.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
deleted file mode 100644
index f44fd9d0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/xceed_icon.png and /dev/null 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
deleted file mode 100644
index c639a093..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--****************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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" IsEnabled="{Binding IsEnabled, ElementName=_txtLeft}" Style="{StaticResource DisableGrayText}"/>
-            <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" IsEnabled="{Binding IsEnabled, ElementName=_txtTop}" Style="{StaticResource DisableGrayText}"/>
-            <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"  IsEnabled="{Binding IsEnabled, ElementName=_cboWindowStartupLocations}" Style="{StaticResource DisableGrayText}"/>
-            <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 ModalBackgroundBrush="LightGray">
-            <xctk:ChildWindow x:Name="_childWindow"
-                           Width="350"
-                           Height="230"
-                           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
deleted file mode 100644
index 8ab0b09c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/StyleableWindowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml
deleted file mode 100644
index abbf2cd5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml
+++ /dev/null
@@ -1,171 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **************************************************************************************-->
-<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.StyleableWindowView"
-                 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="StyleableWindows" >
-   <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 StyleableWindow, 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="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Xceed Toolkit Plus for WPF.
-            </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="CaptionFontSize" Value="{Binding TitleFontSize}" />
-            <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 StyleableWindow.-->
-      <view:WindowModel
-         WindowBackground="#FFC72035"
-         WindowBorderBrush="Black"
-         WindowBorderThickness="2"
-         WindowInactiveBackground="LightGray"
-         WindowOpacity="0.75"
-         WindowStyle="SingleBorderWindow"
-         TitleForeground="Brown"
-         TitleShadowBrush="White"
-         TitleFontSize="15"
-         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="Styleable Window" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch" >
-               <Button Width="160" Height="30" Margin="10" HorizontalAlignment="Center"
-                       Content="Show" Click="OnStyleableWindow_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="Toolkit for WPF 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/StyleableWindowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs
deleted file mode 100644
index e6a0d8ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 StyleableWindowView.xaml
-  /// </summary>
-  public partial class StyleableWindowView : DemoView
-  {
-    private const string StandardMsgBoxTitle = "Standard MessageBox";
-    private const string StyledMsgBoxTitle = "Toolkit for WPF styled MessageBox";
-    private const string StyleableWindowTitle = "Toolkit for WPF StyleableWindow";
-    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 StyleableWindowContent = "This is a StyleableWindow 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 StyleableWindowMessage = "StyleableWindow is a standalone window that can be styled just like ChildWindow or MessageBox. This is a feature of the \"Plus\" version.";
-
-    public StyleableWindowView()
-    {
-      InitializeComponent();
-      this.UpdateWindowsStyles(null,null);
-    }
-
-
-    private void OnStyleableWindow_Click( object sender, RoutedEventArgs e )
-    {
-      var msgBox = new Xceed.Wpf.Toolkit.MessageBox();
-      msgBox.DataContext = this.DataContext;
-      msgBox.Text = StyleableWindowMessage;
-      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 StyleableWindow 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 TitleFontSize
-
-    public static readonly DependencyProperty TitleFontSizeProperty =
-        DependencyProperty.Register( "TitleFontSize", typeof( double ), typeof( WindowModel ) );
-
-    public double TitleFontSize
-    {
-      get
-      {
-        return (double)GetValue( TitleFontSizeProperty );
-      }
-      set
-      {
-        SetValue( TitleFontSizeProperty, value );
-      }
-    }
-
-    #endregion //TitleFontSize
-
-    #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
deleted file mode 100644
index 46075034..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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>
-    </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
deleted file mode 100644
index 62b692da..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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.Value.R, item.Color.Value.G, item.Color.Value.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
deleted file mode 100644
index bf6465d9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--*************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index bbe5e301..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index 2b160390..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index fb84c2e3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index dd99d24c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index c2f1ee15..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/****************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index dd32c773..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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
deleted file mode 100644
index bb0d21a0..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/Default.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/Default.jpg
deleted file mode 100644
index 112ce2a5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/Default.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/ZoomboxProperties.xml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/ZoomboxProperties.xml
deleted file mode 100644
index 1fca1359..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/ZoomboxProperties.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Properties xmlns="">
-<AnimationAccelerationRatio>Gets or sets the acceleration ratio used for scale and pan animations.
-
-By default, transitions from one view to another are animated. This property determines the acceleration ratio of that animation.</AnimationAccelerationRatio>
-<AnimationDecelerationRatio>Gets or sets the deceleration ratio used for scale and pan animations.
-
-By default, transitions from one view to another are animated. This property determines the deceleration ratio of that animation.</AnimationDecelerationRatio>
-<AnimationDuration>Gets or sets the duration used for scale and pan animations.
-
-By default, transitions from one view to another are animated. This property determines the duration of that animation.</AnimationDuration>
-<AreDragModifiersActive>Gets a Boolean value that specifies whether the keys in the DragModifiers collection are currently pressed. It is updated only when the Zoombox has keyboard or cursor focus.
-
-This value is intended for use as a trigger within the Zoombox style. It can be used to change the appearance of the cursor to show that it’s possible to drag (or pan) the content.
-
-This value is not updated in partial trust.</AreDragModifiersActive>
-<AreRelativeZoomModifiersActive>Gets a Boolean value that specifies whether the keys in the RelativeZoomModifiers collection are currently pressed. It is updated only when the Zoombox has keyboard or cursor focus.
-
-This value is intended for use as a trigger within the Zoombox style. It can be used to change the appearance of the cursor to show that it’s possible to scale the content relative to the cursor position. This allows the user to zoom in on a specific point within the content.
-
-This value is not updated in partial trust.</AreRelativeZoomModifiersActive>
-<AreZoomModifiersActive>Gets a Boolean value that specifies whether the keys in the ZoomModifiers collection are currently pressed. It is updated only when the Zoombox has keyboard or cursor focus.
-
-This value is intended for use as a trigger within the Zoombox style. It can be used within the Zoombox control’s style to change the appearance of the cursor to show that it’s possible to zoom in or out using the mouse wheel. The zoom operation occurs relative to the ZoomOrigin point (by default, the center of the content).
-
-This value is not updated in partial trust.</AreZoomModifiersActive>
-<AreZoomToSelectionModifiersActive>Gets a Boolean value that specifies whether the keys in the ZoomToSelectionModifiers collection are currently pressed. It is updated only when the Zoombox has keyboard or cursor focus.
-
-This value is intended for use as a trigger within the Zoombox style. It can be used to show that it’s possible to select a zoom region by pressing the left mouse button and dragging the mouse. Upon release of the mouse button, the Zoombox control will zoom in to the selected region.
-
-By default, the selected region will be centered within the Zoombox control, but this can be changed by altering the HorizontalContentAlignment and VerticalContentAlignment properties.
-
-This value is not updated in partial trust.</AreZoomToSelectionModifiersActive>
-<AutoWrapContentWithViewbox>Gets or sets a Boolean value that determines if the content of the Zoombox is wrapped in a Viewbox.
-
-By default, the content of the Zoombox control will be wrapped within a Viewbox element (unless the content is already a Viewbox). The viewbox ensures that the content does not get clipped by its parent and that it renders correctly within the visual brush used in the view finder.
-
-Some elements, like Image, have built-in viewbox behaviors. This property can be set to False for such elements to prevent the extra wrapping layer. However, if this causes the content to appear incorrectly in the view finder, try setting this property back to True.</AutoWrapContentWithViewbox>
-<CurrentView>Gets the current view for the Zoombox. This is an object of type ZoomboxView.
-
-This property may return an absolute view (given by a position and/or scale value), a region-based view (given by a Rect within the content), or a predefined view, given by one of the static ZoomboxView properties: Center, Empty, Fill, or Fit.</CurrentView>
-<CurrentViewIndex>Gets the index of the current view (see the CurrentView property) within the Zoombox control's view stack (see the ViewStack property).
-
-If the current view is not a member of the view stack, the CurrentViewIndex property returns -1. This will happen if the Zoombox control has a manual view stack (see the ViewStackMode property) and the control has been zoomed or panned away from the selected view. In this case, the ViewStackIndex property can be used to get the index of the selected view. Also, the RefocusView() method can be used to zoom back to the selected view.
-
-If the view stack is disabled, the CurrentViewIndex property always returns -1.</CurrentViewIndex>
-<DragModifiers>Gets or sets a collection of KeyModifier values representing keys that must be pressed to pan the content by dragging it.
-
-All keys must be pressed in order for the operation to occur. If None is specified, the content will be dragged without any modifier keys. If the collection includes Blocked, the content cannot be dragged.
-
-The default value includes only the Ctrl key.</DragModifiers>
-<DragOnPreview>Gets or sets a Boolean value that specifies whether the Zoombox responds to tunneled mouse events (PreviewMouseDown, PreviewMouseMove, and PreviewMouseUp) to pan the content via a mouse drag. If false, panning occurs in response to the bubbled events (MouseDown, MouseMove, and MouseUp).
-
-The default value is false.</DragOnPreview>
-<EffectiveViewStackMode>Gets a ZoomboxViewStackMode value representing the mode that is currently in effect for the view stack. The effective mode will be either Auto, Manual, or Disabled.
-
-For more information, see the ViewStackMode property.</EffectiveViewStackMode>
-<HasBackStack>Gets a Boolean value that specifies whether there are views on the back side of the view stack (see the ViewStack property).</HasBackStack>
-<HasForwardStack>Gets a Boolean value that specifies whether there are views on the forward side of the view stack (see the ViewStack property).</HasForwardStack>
-<IsAnimated>Gets or sets a Boolean value specifying whether transitions between views (scale and pan operations) are animated.
-
-The default value is true.</IsAnimated>
-<IsDraggingContent>Gets a Boolean value that specifies whether the content is currently being panned via a drag operation.</IsDraggingContent>
-<IsSelectingRegion>Gets a Boolean value that specifies whether a zoom region is currently being selected.</IsSelectingRegion>
-<IsUsingScrollBars>Gets/Sets a Boolean value that specifies whether the zoombox's scrollbars are enabled to move the content of the zoombox.</IsUsingScrollBars>
-<MaxScale>Gets or sets a Double value representing the maximum scale factor (or zoom level) that can be applied to the content.</MaxScale>
-<MinScale>Gets or sets a Double value representing the minimum scale factor (or zoom level) that can be applied to the content.</MinScale>
-<NavigateOnPreview>Gets or sets a Boolean value that specifies whether the Zoombox responds to tunneled mouse events (PreviewMouseDown) to navigate through the view stack. If false, navigation occurs in response to bubbled mouse events (MouseDown).
-
-The default value is false.
-
-This setting only impacts the control's response to the forward (XButton2) and back (XButton1) mouse buttons. Note that the control will also navigate in response to the forward (BrowserForward) and back (BrowserBack or Backspace) keyboard keys, but this is enabled via key bindings in an InputBindingCollection within the Resources section of the Zoombox template.</NavigateOnPreview>
-<PanDistance>Gets or sets a Double value that is used to determine how many pixels the content will pan using the PanLeft, PanUp, PanRight, or PanDown Zoombox commands.
-
-The pan commands are hooked up to key strokes using an InputBindingCollection within the Resources section of the Zoombox template. The default key bindings map Shift+Ctrl+Left, Shift+Ctrl+Up, Shift+Ctrl+Right, and Shift+Ctrl+Down to their respective Pan commands.
-
-The keyboard focus must be within the Zoombox to pan the content via the key bindings.
-
-The default value is 5 pixels.</PanDistance>
-<Position>Gets or sets the top-left point of the content within the Zoombox control.
-
-The Position is expressed as a Point within the coordinate space of the Zoombox control.</Position>
-<RelativeZoomModifiers>Gets or sets a collection of KeyModifier values representing keys that must be pressed to zoom the content relative to the current mouse position using the mouse wheel.
-
-All keys must be pressed in order for the operation to occur. If None is specified, the content will be zoomed without any modifier keys. If the collection includes Blocked, the content cannot be zoomed.
-
-The default value is the Ctrl+Alt combination.</RelativeZoomModifiers>
-<Scale>Gets or sets a Double value representing the scale factor (or zoom level) for the content.
-
-A scale value of 1.0 represents the actual content size.</Scale>
-<ViewFinder>Gets a reference to the view finder element within the visual tree of the Zoombox.
-
-The view finder element typically serves as the root of a subtree that contains a ViewFinderDisplay element and several command buttons for changing views. The ViewFinderDisplay element is the element that renders the thumbnail image of the Zoombox content.
-
-The view finder element, if present in the control template, must be named "ViewFinder". The visibility of the view finder element is typically bound to the ViewFinderVisibility attached property.</ViewFinder>
-<ViewFinderVisibility>Gets a Visibility value for the ViewFinder.
-
-This property is typically leveraged by the Zoombox template to control the visibility of the view finder element. In the default Zoombox template, this property is also bound to a toggle button that is used to show and hide the view finder.
-
-This is an attached property because the Zoombox control, itself, does not directly use the property.</ViewFinderVisibility>
-<Viewport>Gets a Rect identifying the portion of the content that is visible in the Zoombox. The viewport is expressed in the coordinate space of the content.</Viewport>
-<ViewStack>Gets the view stack for the Zoombox. This stack can be manually specified, automatically maintained, or disabled entirely, depending on the ViewStackMode property.
-
-The view stack is maintained in an instance of the ZoomboxViewStack class.</ViewStack>
-<ViewStackCount>Gets an integer value representing the number of views in the view stack.</ViewStackCount>
-<ViewStackIndex>Gets or sets the index of the selected view within the view stack.
-
-For a manual stack, a positive ViewStackIndex value does not necessarily indicate that the specified view is the current view. The user may have zoomed or panned away from the view represented by the ViewStackIndex property. The CurrentView property can be used to determine the actual current view. In this case, the CurrentViewIndex will be -1 but the ViewStackIndex will be a positive value. The Refocus command or the RefocusView() method can be used to refocus the selected view on the stack.</ViewStackIndex>
-<ViewStackMode>Gets or sets the mode for the view stack.
-
-The ViewStackMode property determines how the Zoombox will maintain its stack of views for back and forward view navigation. It can be set to any of the following values from the ZoomboxViewStackMode enumeration:
-
-Auto: The control automatically tracks view changes and adds them to the view stack. In this case, every view selected is added to the view stack (in the same manner that visited URLs are added to a browser stack).
-
-Manual: The control uses a manually specified view stack. The views can be directly added to the ViewStack in markup or programmatically. They can also be bound to the Zoombox using the ViewStackSource property.
-
-Default: The control will use one of the other ZoomboxViewStackMode values at runtime. The EffectiveViewStackMode property can be used to determine which mode is actually in effect. If the views in the stack come from a ViewStackSource, then the default mode is Manual; otherwise, the default mode is Auto.
-
-Disabled: The view stack is disabled altogether. In this mode, the ViewStack property will return null. An attempt to add views manually will result in an exception.</ViewStackMode>
-<ViewStackSource>Gets or sets an IEnumerable value representing a collection used to generate a view stack for the Zoombox.
-
-The view stack of a Zoombox is either explicitly set using the ViewStack property or auto-generated based on members of the ViewStackSource collection. In this sense, the ViewStackSource property is analogous to the ItemsSource property for an ItemsControl.
-
-This property can be used to bind the view stack to an observable collection of ZoomboxView objects (or a collection of objects of type string, Point, double, or Rect, which can be directly converted to ZoomboxView objects via the ZoomboxViewConverter class).
-
-When the ViewStackSource property is in use, the ViewStack property is effectively read-only. An attempt to directly modify the ViewStack will result in an exception.
-
-When the ViewStackSource property is set to a non-null collection, the contents of the ViewStack collection is replaced with the views generated from the ViewStackSource.
-
-If the ViewStackSource property is already set, explicitly setting it to null will remove the auto-generated collection of views and the Zoombox will have an empty ViewStack collection. If ViewStackSource is already null, setting it to null has no effect.</ViewStackSource>
-<ZoomModifiers>Gets or sets a collection of KeyModifier values representing keys that must be pressed to zoom the content relative to its ZoomOrigin (by default, the center of the content) using the mouse wheel.
-
-All specified keys must be pressed in order for the operation to occur. If None is specified, the relative zoom will occur without any modifier keys. If the collection includes Blocked, a zoom cannot be performed.
-
-The default value includes only the Ctrl key.</ZoomModifiers>
-<ZoomOnPreview>Gets or sets a Boolean value that specifies whether the Zoombox responds to tunneled mouse events (PreviewMouseWheel) to zoom the content via the mouse wheel. If false, zooming occurs in response to the bubbled events (MouseWheel).
-
-The default value is true.</ZoomOnPreview>
-<ZoomOrigin>Gets or sets the relative position within the content around which Zoom operations occur by default.
-
-This value is used when zooming via the mouse wheel, ZoomIn or ZoomOut commands, or the Zoom() method.</ZoomOrigin>
-<ZoomPercentage>Gets or sets a Double value that is used to determine how much the content will zoom when using the ZoomIn or ZoomOut commands or when zooming via the mouse wheel.
-
-The zoom commands are hooked up to key strokes using an InputBindingCollection within the Resources section of the Zoombox template. The default key bindings map Ctrl+Left and Ctrl+Up to the ZoomOut command and Ctrl+Right and Ctrl+Down to the ZoomIn command.
-
-Keyboard focus must be within the Zoombox to scale the content via the key bindings.
-
-The default value is 5%.</ZoomPercentage>
-<ZoomToSelectionModifiers>Gets or sets a collection of KeyModifier values representing keys that must be pressed to select and zoom to a location of the content using the mouse.
-
-All specified keys must be pressed in order for the operation to occur. If None is specified, the zoom operation will occur without any modifier keys. If the collection includes Blocked, the zoom operation cannot be performed.
-
-The default value includes only the Alt key.</ZoomToSelectionModifiers>
-</Properties>
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
deleted file mode 100644
index 0f6d85b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml
+++ /dev/null
@@ -1,495 +0,0 @@
-<!--**************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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="../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="#FFC72035"
-                                      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=IsUsingScrollBars}">
-                  <TextBlock Text="IsUsingScrollBars"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsChecked="{Binding IsUsingScrollBars}" />
-               </ItemsControl>
-               <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="../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
deleted file mode 100644
index 34097cf5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************************
-
-   Toolkit for WPF
-
-   Copyright (C) 2007-2017 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
-
-   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 = System.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/Service References/NorthwindDataService/Reference.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/Reference.cs
deleted file mode 100644
index 04304ad3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/Reference.cs	
+++ /dev/null
@@ -1,2711 +0,0 @@
-//------------------------------------------------------------------------------
-// <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>
-//------------------------------------------------------------------------------
-
-// Original file name:
-// Generation date: 5/3/2013 1:33:16 PM
-namespace Xceed.Wpf.Toolkit.LiveExplorer.NorthwindDataService
-{
-
-    /// <summary>
-    /// There are no comments for NorthwindEntities in the schema.
-    /// </summary>
-    public partial class NorthwindEntities : global::System.Data.Services.Client.DataServiceContext
-    {
-        /// <summary>
-        /// Initialize a new NorthwindEntities object.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public NorthwindEntities(global::System.Uri serviceRoot) : 
-                base(serviceRoot)
-        {
-            this.ResolveName = new global::System.Func<global::System.Type, string>(this.ResolveNameFromType);
-            this.ResolveType = new global::System.Func<string, global::System.Type>(this.ResolveTypeFromName);
-            this.OnContextCreated();
-        }
-        partial void OnContextCreated();
-        /// <summary>
-        /// Since the namespace configured for this service reference
-        /// in Visual Studio is different from the one indicated in the
-        /// server schema, use type-mappers to map between the two.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected global::System.Type ResolveTypeFromName(string typeName)
-        {
-            if (typeName.StartsWith("NorthwindModel", global::System.StringComparison.Ordinal))
-            {
-                return this.GetType().Assembly.GetType(string.Concat("Xceed.Wpf.Toolkit.LiveExplorer.NorthwindDataService", typeName.Substring(14)), false);
-            }
-            return null;
-        }
-        /// <summary>
-        /// Since the namespace configured for this service reference
-        /// in Visual Studio is different from the one indicated in the
-        /// server schema, use type-mappers to map between the two.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected string ResolveNameFromType(global::System.Type clientType)
-        {
-            if (clientType.Namespace.Equals("Xceed.Wpf.Toolkit.LiveExplorer.NorthwindDataService", global::System.StringComparison.Ordinal))
-            {
-                return string.Concat("NorthwindModel.", clientType.Name);
-            }
-            return null;
-        }
-        /// <summary>
-        /// There are no comments for Categories in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceQuery<Category> Categories
-        {
-            get
-            {
-                if ((this._Categories == null))
-                {
-                    this._Categories = base.CreateQuery<Category>("Categories");
-                }
-                return this._Categories;
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceQuery<Category> _Categories;
-        /// <summary>
-        /// There are no comments for Contacts in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceQuery<Contact> Contacts
-        {
-            get
-            {
-                if ((this._Contacts == null))
-                {
-                    this._Contacts = base.CreateQuery<Contact>("Contacts");
-                }
-                return this._Contacts;
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceQuery<Contact> _Contacts;
-        /// <summary>
-        /// There are no comments for Customers in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceQuery<Customer> Customers
-        {
-            get
-            {
-                if ((this._Customers == null))
-                {
-                    this._Customers = base.CreateQuery<Customer>("Customers");
-                }
-                return this._Customers;
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceQuery<Customer> _Customers;
-        /// <summary>
-        /// There are no comments for Employees in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceQuery<Employee> Employees
-        {
-            get
-            {
-                if ((this._Employees == null))
-                {
-                    this._Employees = base.CreateQuery<Employee>("Employees");
-                }
-                return this._Employees;
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceQuery<Employee> _Employees;
-        /// <summary>
-        /// There are no comments for Order_Details in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceQuery<Order_Detail> Order_Details
-        {
-            get
-            {
-                if ((this._Order_Details == null))
-                {
-                    this._Order_Details = base.CreateQuery<Order_Detail>("Order_Details");
-                }
-                return this._Order_Details;
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceQuery<Order_Detail> _Order_Details;
-        /// <summary>
-        /// There are no comments for Orders in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceQuery<Order> Orders
-        {
-            get
-            {
-                if ((this._Orders == null))
-                {
-                    this._Orders = base.CreateQuery<Order>("Orders");
-                }
-                return this._Orders;
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceQuery<Order> _Orders;
-        /// <summary>
-        /// There are no comments for Products in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceQuery<Product> Products
-        {
-            get
-            {
-                if ((this._Products == null))
-                {
-                    this._Products = base.CreateQuery<Product>("Products");
-                }
-                return this._Products;
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceQuery<Product> _Products;
-        /// <summary>
-        /// There are no comments for Shippers in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceQuery<Shipper> Shippers
-        {
-            get
-            {
-                if ((this._Shippers == null))
-                {
-                    this._Shippers = base.CreateQuery<Shipper>("Shippers");
-                }
-                return this._Shippers;
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceQuery<Shipper> _Shippers;
-        /// <summary>
-        /// There are no comments for Categories in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public void AddToCategories(Category category)
-        {
-            base.AddObject("Categories", category);
-        }
-        /// <summary>
-        /// There are no comments for Contacts in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public void AddToContacts(Contact contact)
-        {
-            base.AddObject("Contacts", contact);
-        }
-        /// <summary>
-        /// There are no comments for Customers in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public void AddToCustomers(Customer customer)
-        {
-            base.AddObject("Customers", customer);
-        }
-        /// <summary>
-        /// There are no comments for Employees in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public void AddToEmployees(Employee employee)
-        {
-            base.AddObject("Employees", employee);
-        }
-        /// <summary>
-        /// There are no comments for Order_Details in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public void AddToOrder_Details(Order_Detail order_Detail)
-        {
-            base.AddObject("Order_Details", order_Detail);
-        }
-        /// <summary>
-        /// There are no comments for Orders in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public void AddToOrders(Order order)
-        {
-            base.AddObject("Orders", order);
-        }
-        /// <summary>
-        /// There are no comments for Products in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public void AddToProducts(Product product)
-        {
-            base.AddObject("Products", product);
-        }
-        /// <summary>
-        /// There are no comments for Shippers in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public void AddToShippers(Shipper shipper)
-        {
-            base.AddObject("Shippers", shipper);
-        }
-    }
-    /// <summary>
-    /// There are no comments for NorthwindModel.Category in the schema.
-    /// </summary>
-    /// <KeyProperties>
-    /// CategoryID
-    /// </KeyProperties>
-    [global::System.Data.Services.Common.EntitySetAttribute("Categories")]
-    [global::System.Data.Services.Common.DataServiceKeyAttribute("CategoryID")]
-    public partial class Category : global::System.ComponentModel.INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Create a new Category object.
-        /// </summary>
-        /// <param name="categoryID">Initial value of CategoryID.</param>
-        /// <param name="categoryName">Initial value of CategoryName.</param>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public static Category CreateCategory(int categoryID, string categoryName)
-        {
-            Category category = new Category();
-            category.CategoryID = categoryID;
-            category.CategoryName = categoryName;
-            return category;
-        }
-        /// <summary>
-        /// There are no comments for Property CategoryID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int CategoryID
-        {
-            get
-            {
-                return this._CategoryID;
-            }
-            set
-            {
-                this.OnCategoryIDChanging(value);
-                this._CategoryID = value;
-                this.OnCategoryIDChanged();
-                this.OnPropertyChanged("CategoryID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _CategoryID;
-        partial void OnCategoryIDChanging(int value);
-        partial void OnCategoryIDChanged();
-        /// <summary>
-        /// There are no comments for Property CategoryName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string CategoryName
-        {
-            get
-            {
-                return this._CategoryName;
-            }
-            set
-            {
-                this.OnCategoryNameChanging(value);
-                this._CategoryName = value;
-                this.OnCategoryNameChanged();
-                this.OnPropertyChanged("CategoryName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _CategoryName;
-        partial void OnCategoryNameChanging(string value);
-        partial void OnCategoryNameChanged();
-        /// <summary>
-        /// There are no comments for Property Description in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Description
-        {
-            get
-            {
-                return this._Description;
-            }
-            set
-            {
-                this.OnDescriptionChanging(value);
-                this._Description = value;
-                this.OnDescriptionChanged();
-                this.OnPropertyChanged("Description");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Description;
-        partial void OnDescriptionChanging(string value);
-        partial void OnDescriptionChanged();
-        /// <summary>
-        /// There are no comments for Property Picture in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public byte[] Picture
-        {
-            get
-            {
-                if ((this._Picture != null))
-                {
-                    return ((byte[])(this._Picture.Clone()));
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            set
-            {
-                this.OnPictureChanging(value);
-                this._Picture = value;
-                this.OnPictureChanged();
-                this.OnPropertyChanged("Picture");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private byte[] _Picture;
-        partial void OnPictureChanging(byte[] value);
-        partial void OnPictureChanged();
-        /// <summary>
-        /// There are no comments for Products in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceCollection<Product> Products
-        {
-            get
-            {
-                return this._Products;
-            }
-            set
-            {
-                this._Products = value;
-                this.OnPropertyChanged("Products");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceCollection<Product> _Products = new global::System.Data.Services.Client.DataServiceCollection<Product>(null, System.Data.Services.Client.TrackingMode.None);
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected virtual void OnPropertyChanged(string property)
-        {
-            if ((this.PropertyChanged != null))
-            {
-                this.PropertyChanged(this, new global::System.ComponentModel.PropertyChangedEventArgs(property));
-            }
-        }
-    }
-    /// <summary>
-    /// There are no comments for NorthwindModel.Contact in the schema.
-    /// </summary>
-    /// <KeyProperties>
-    /// ContactID
-    /// </KeyProperties>
-    [global::System.Data.Services.Common.EntitySetAttribute("Contacts")]
-    [global::System.Data.Services.Common.DataServiceKeyAttribute("ContactID")]
-    public partial class Contact : global::System.ComponentModel.INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Create a new Contact object.
-        /// </summary>
-        /// <param name="contactID">Initial value of ContactID.</param>
-        /// <param name="companyName">Initial value of CompanyName.</param>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public static Contact CreateContact(int contactID, string companyName)
-        {
-            Contact contact = new Contact();
-            contact.ContactID = contactID;
-            contact.CompanyName = companyName;
-            return contact;
-        }
-        /// <summary>
-        /// There are no comments for Property ContactID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int ContactID
-        {
-            get
-            {
-                return this._ContactID;
-            }
-            set
-            {
-                this.OnContactIDChanging(value);
-                this._ContactID = value;
-                this.OnContactIDChanged();
-                this.OnPropertyChanged("ContactID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _ContactID;
-        partial void OnContactIDChanging(int value);
-        partial void OnContactIDChanged();
-        /// <summary>
-        /// There are no comments for Property ContactType in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ContactType
-        {
-            get
-            {
-                return this._ContactType;
-            }
-            set
-            {
-                this.OnContactTypeChanging(value);
-                this._ContactType = value;
-                this.OnContactTypeChanged();
-                this.OnPropertyChanged("ContactType");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ContactType;
-        partial void OnContactTypeChanging(string value);
-        partial void OnContactTypeChanged();
-        /// <summary>
-        /// There are no comments for Property CompanyName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string CompanyName
-        {
-            get
-            {
-                return this._CompanyName;
-            }
-            set
-            {
-                this.OnCompanyNameChanging(value);
-                this._CompanyName = value;
-                this.OnCompanyNameChanged();
-                this.OnPropertyChanged("CompanyName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _CompanyName;
-        partial void OnCompanyNameChanging(string value);
-        partial void OnCompanyNameChanged();
-        /// <summary>
-        /// There are no comments for Property ContactName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ContactName
-        {
-            get
-            {
-                return this._ContactName;
-            }
-            set
-            {
-                this.OnContactNameChanging(value);
-                this._ContactName = value;
-                this.OnContactNameChanged();
-                this.OnPropertyChanged("ContactName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ContactName;
-        partial void OnContactNameChanging(string value);
-        partial void OnContactNameChanged();
-        /// <summary>
-        /// There are no comments for Property ContactTitle in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ContactTitle
-        {
-            get
-            {
-                return this._ContactTitle;
-            }
-            set
-            {
-                this.OnContactTitleChanging(value);
-                this._ContactTitle = value;
-                this.OnContactTitleChanged();
-                this.OnPropertyChanged("ContactTitle");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ContactTitle;
-        partial void OnContactTitleChanging(string value);
-        partial void OnContactTitleChanged();
-        /// <summary>
-        /// There are no comments for Property Address in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Address
-        {
-            get
-            {
-                return this._Address;
-            }
-            set
-            {
-                this.OnAddressChanging(value);
-                this._Address = value;
-                this.OnAddressChanged();
-                this.OnPropertyChanged("Address");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Address;
-        partial void OnAddressChanging(string value);
-        partial void OnAddressChanged();
-        /// <summary>
-        /// There are no comments for Property City in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string City
-        {
-            get
-            {
-                return this._City;
-            }
-            set
-            {
-                this.OnCityChanging(value);
-                this._City = value;
-                this.OnCityChanged();
-                this.OnPropertyChanged("City");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _City;
-        partial void OnCityChanging(string value);
-        partial void OnCityChanged();
-        /// <summary>
-        /// There are no comments for Property Region in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Region
-        {
-            get
-            {
-                return this._Region;
-            }
-            set
-            {
-                this.OnRegionChanging(value);
-                this._Region = value;
-                this.OnRegionChanged();
-                this.OnPropertyChanged("Region");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Region;
-        partial void OnRegionChanging(string value);
-        partial void OnRegionChanged();
-        /// <summary>
-        /// There are no comments for Property PostalCode in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string PostalCode
-        {
-            get
-            {
-                return this._PostalCode;
-            }
-            set
-            {
-                this.OnPostalCodeChanging(value);
-                this._PostalCode = value;
-                this.OnPostalCodeChanged();
-                this.OnPropertyChanged("PostalCode");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _PostalCode;
-        partial void OnPostalCodeChanging(string value);
-        partial void OnPostalCodeChanged();
-        /// <summary>
-        /// There are no comments for Property Country in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Country
-        {
-            get
-            {
-                return this._Country;
-            }
-            set
-            {
-                this.OnCountryChanging(value);
-                this._Country = value;
-                this.OnCountryChanged();
-                this.OnPropertyChanged("Country");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Country;
-        partial void OnCountryChanging(string value);
-        partial void OnCountryChanged();
-        /// <summary>
-        /// There are no comments for Property Phone in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Phone
-        {
-            get
-            {
-                return this._Phone;
-            }
-            set
-            {
-                this.OnPhoneChanging(value);
-                this._Phone = value;
-                this.OnPhoneChanged();
-                this.OnPropertyChanged("Phone");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Phone;
-        partial void OnPhoneChanging(string value);
-        partial void OnPhoneChanged();
-        /// <summary>
-        /// There are no comments for Property Extension in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Extension
-        {
-            get
-            {
-                return this._Extension;
-            }
-            set
-            {
-                this.OnExtensionChanging(value);
-                this._Extension = value;
-                this.OnExtensionChanged();
-                this.OnPropertyChanged("Extension");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Extension;
-        partial void OnExtensionChanging(string value);
-        partial void OnExtensionChanged();
-        /// <summary>
-        /// There are no comments for Property Fax in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Fax
-        {
-            get
-            {
-                return this._Fax;
-            }
-            set
-            {
-                this.OnFaxChanging(value);
-                this._Fax = value;
-                this.OnFaxChanged();
-                this.OnPropertyChanged("Fax");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Fax;
-        partial void OnFaxChanging(string value);
-        partial void OnFaxChanged();
-        /// <summary>
-        /// There are no comments for Property HomePage in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string HomePage
-        {
-            get
-            {
-                return this._HomePage;
-            }
-            set
-            {
-                this.OnHomePageChanging(value);
-                this._HomePage = value;
-                this.OnHomePageChanged();
-                this.OnPropertyChanged("HomePage");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _HomePage;
-        partial void OnHomePageChanging(string value);
-        partial void OnHomePageChanged();
-        /// <summary>
-        /// There are no comments for Property PhotoPath in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string PhotoPath
-        {
-            get
-            {
-                return this._PhotoPath;
-            }
-            set
-            {
-                this.OnPhotoPathChanging(value);
-                this._PhotoPath = value;
-                this.OnPhotoPathChanged();
-                this.OnPropertyChanged("PhotoPath");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _PhotoPath;
-        partial void OnPhotoPathChanging(string value);
-        partial void OnPhotoPathChanged();
-        /// <summary>
-        /// There are no comments for Property Photo in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public byte[] Photo
-        {
-            get
-            {
-                if ((this._Photo != null))
-                {
-                    return ((byte[])(this._Photo.Clone()));
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            set
-            {
-                this.OnPhotoChanging(value);
-                this._Photo = value;
-                this.OnPhotoChanged();
-                this.OnPropertyChanged("Photo");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private byte[] _Photo;
-        partial void OnPhotoChanging(byte[] value);
-        partial void OnPhotoChanged();
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected virtual void OnPropertyChanged(string property)
-        {
-            if ((this.PropertyChanged != null))
-            {
-                this.PropertyChanged(this, new global::System.ComponentModel.PropertyChangedEventArgs(property));
-            }
-        }
-    }
-    /// <summary>
-    /// There are no comments for NorthwindModel.Customer in the schema.
-    /// </summary>
-    /// <KeyProperties>
-    /// CustomerID
-    /// </KeyProperties>
-    [global::System.Data.Services.Common.EntitySetAttribute("Customers")]
-    [global::System.Data.Services.Common.DataServiceKeyAttribute("CustomerID")]
-    public partial class Customer : global::System.ComponentModel.INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Create a new Customer object.
-        /// </summary>
-        /// <param name="customerID">Initial value of CustomerID.</param>
-        /// <param name="acronym">Initial value of Acronym.</param>
-        /// <param name="companyName">Initial value of CompanyName.</param>
-        /// <param name="employeeID">Initial value of EmployeeID.</param>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public static Customer CreateCustomer(int customerID, string acronym, string companyName, int employeeID)
-        {
-            Customer customer = new Customer();
-            customer.CustomerID = customerID;
-            customer.Acronym = acronym;
-            customer.CompanyName = companyName;
-            customer.EmployeeID = employeeID;
-            return customer;
-        }
-        /// <summary>
-        /// There are no comments for Property CustomerID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int CustomerID
-        {
-            get
-            {
-                return this._CustomerID;
-            }
-            set
-            {
-                this.OnCustomerIDChanging(value);
-                this._CustomerID = value;
-                this.OnCustomerIDChanged();
-                this.OnPropertyChanged("CustomerID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _CustomerID;
-        partial void OnCustomerIDChanging(int value);
-        partial void OnCustomerIDChanged();
-        /// <summary>
-        /// There are no comments for Property Acronym in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Acronym
-        {
-            get
-            {
-                return this._Acronym;
-            }
-            set
-            {
-                this.OnAcronymChanging(value);
-                this._Acronym = value;
-                this.OnAcronymChanged();
-                this.OnPropertyChanged("Acronym");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Acronym;
-        partial void OnAcronymChanging(string value);
-        partial void OnAcronymChanged();
-        /// <summary>
-        /// There are no comments for Property CompanyName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string CompanyName
-        {
-            get
-            {
-                return this._CompanyName;
-            }
-            set
-            {
-                this.OnCompanyNameChanging(value);
-                this._CompanyName = value;
-                this.OnCompanyNameChanged();
-                this.OnPropertyChanged("CompanyName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _CompanyName;
-        partial void OnCompanyNameChanging(string value);
-        partial void OnCompanyNameChanged();
-        /// <summary>
-        /// There are no comments for Property ContactName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ContactName
-        {
-            get
-            {
-                return this._ContactName;
-            }
-            set
-            {
-                this.OnContactNameChanging(value);
-                this._ContactName = value;
-                this.OnContactNameChanged();
-                this.OnPropertyChanged("ContactName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ContactName;
-        partial void OnContactNameChanging(string value);
-        partial void OnContactNameChanged();
-        /// <summary>
-        /// There are no comments for Property ContactTitle in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ContactTitle
-        {
-            get
-            {
-                return this._ContactTitle;
-            }
-            set
-            {
-                this.OnContactTitleChanging(value);
-                this._ContactTitle = value;
-                this.OnContactTitleChanged();
-                this.OnPropertyChanged("ContactTitle");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ContactTitle;
-        partial void OnContactTitleChanging(string value);
-        partial void OnContactTitleChanged();
-        /// <summary>
-        /// There are no comments for Property Address in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Address
-        {
-            get
-            {
-                return this._Address;
-            }
-            set
-            {
-                this.OnAddressChanging(value);
-                this._Address = value;
-                this.OnAddressChanged();
-                this.OnPropertyChanged("Address");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Address;
-        partial void OnAddressChanging(string value);
-        partial void OnAddressChanged();
-        /// <summary>
-        /// There are no comments for Property City in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string City
-        {
-            get
-            {
-                return this._City;
-            }
-            set
-            {
-                this.OnCityChanging(value);
-                this._City = value;
-                this.OnCityChanged();
-                this.OnPropertyChanged("City");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _City;
-        partial void OnCityChanging(string value);
-        partial void OnCityChanged();
-        /// <summary>
-        /// There are no comments for Property Region in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Region
-        {
-            get
-            {
-                return this._Region;
-            }
-            set
-            {
-                this.OnRegionChanging(value);
-                this._Region = value;
-                this.OnRegionChanged();
-                this.OnPropertyChanged("Region");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Region;
-        partial void OnRegionChanging(string value);
-        partial void OnRegionChanged();
-        /// <summary>
-        /// There are no comments for Property PostalCode in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string PostalCode
-        {
-            get
-            {
-                return this._PostalCode;
-            }
-            set
-            {
-                this.OnPostalCodeChanging(value);
-                this._PostalCode = value;
-                this.OnPostalCodeChanged();
-                this.OnPropertyChanged("PostalCode");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _PostalCode;
-        partial void OnPostalCodeChanging(string value);
-        partial void OnPostalCodeChanged();
-        /// <summary>
-        /// There are no comments for Property Country in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Country
-        {
-            get
-            {
-                return this._Country;
-            }
-            set
-            {
-                this.OnCountryChanging(value);
-                this._Country = value;
-                this.OnCountryChanged();
-                this.OnPropertyChanged("Country");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Country;
-        partial void OnCountryChanging(string value);
-        partial void OnCountryChanged();
-        /// <summary>
-        /// There are no comments for Property Phone in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Phone
-        {
-            get
-            {
-                return this._Phone;
-            }
-            set
-            {
-                this.OnPhoneChanging(value);
-                this._Phone = value;
-                this.OnPhoneChanged();
-                this.OnPropertyChanged("Phone");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Phone;
-        partial void OnPhoneChanging(string value);
-        partial void OnPhoneChanged();
-        /// <summary>
-        /// There are no comments for Property Fax in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Fax
-        {
-            get
-            {
-                return this._Fax;
-            }
-            set
-            {
-                this.OnFaxChanging(value);
-                this._Fax = value;
-                this.OnFaxChanged();
-                this.OnPropertyChanged("Fax");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Fax;
-        partial void OnFaxChanging(string value);
-        partial void OnFaxChanged();
-        /// <summary>
-        /// There are no comments for Property EmployeeID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int EmployeeID
-        {
-            get
-            {
-                return this._EmployeeID;
-            }
-            set
-            {
-                this.OnEmployeeIDChanging(value);
-                this._EmployeeID = value;
-                this.OnEmployeeIDChanged();
-                this.OnPropertyChanged("EmployeeID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _EmployeeID;
-        partial void OnEmployeeIDChanging(int value);
-        partial void OnEmployeeIDChanged();
-        /// <summary>
-        /// There are no comments for Employee in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public Employee Employee
-        {
-            get
-            {
-                return this._Employee;
-            }
-            set
-            {
-                this._Employee = value;
-                this.OnPropertyChanged("Employee");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private Employee _Employee;
-        /// <summary>
-        /// There are no comments for Orders in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceCollection<Order> Orders
-        {
-            get
-            {
-                return this._Orders;
-            }
-            set
-            {
-                this._Orders = value;
-                this.OnPropertyChanged("Orders");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceCollection<Order> _Orders = new global::System.Data.Services.Client.DataServiceCollection<Order>(null, System.Data.Services.Client.TrackingMode.None);
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected virtual void OnPropertyChanged(string property)
-        {
-            if ((this.PropertyChanged != null))
-            {
-                this.PropertyChanged(this, new global::System.ComponentModel.PropertyChangedEventArgs(property));
-            }
-        }
-    }
-    /// <summary>
-    /// There are no comments for NorthwindModel.Employee in the schema.
-    /// </summary>
-    /// <KeyProperties>
-    /// EmployeeID
-    /// </KeyProperties>
-    [global::System.Data.Services.Common.EntitySetAttribute("Employees")]
-    [global::System.Data.Services.Common.DataServiceKeyAttribute("EmployeeID")]
-    public partial class Employee : global::System.ComponentModel.INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Create a new Employee object.
-        /// </summary>
-        /// <param name="employeeID">Initial value of EmployeeID.</param>
-        /// <param name="lastName">Initial value of LastName.</param>
-        /// <param name="firstName">Initial value of FirstName.</param>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public static Employee CreateEmployee(int employeeID, string lastName, string firstName)
-        {
-            Employee employee = new Employee();
-            employee.EmployeeID = employeeID;
-            employee.LastName = lastName;
-            employee.FirstName = firstName;
-            return employee;
-        }
-        /// <summary>
-        /// There are no comments for Property EmployeeID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int EmployeeID
-        {
-            get
-            {
-                return this._EmployeeID;
-            }
-            set
-            {
-                this.OnEmployeeIDChanging(value);
-                this._EmployeeID = value;
-                this.OnEmployeeIDChanged();
-                this.OnPropertyChanged("EmployeeID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _EmployeeID;
-        partial void OnEmployeeIDChanging(int value);
-        partial void OnEmployeeIDChanged();
-        /// <summary>
-        /// There are no comments for Property LastName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string LastName
-        {
-            get
-            {
-                return this._LastName;
-            }
-            set
-            {
-                this.OnLastNameChanging(value);
-                this._LastName = value;
-                this.OnLastNameChanged();
-                this.OnPropertyChanged("LastName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _LastName;
-        partial void OnLastNameChanging(string value);
-        partial void OnLastNameChanged();
-        /// <summary>
-        /// There are no comments for Property FirstName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string FirstName
-        {
-            get
-            {
-                return this._FirstName;
-            }
-            set
-            {
-                this.OnFirstNameChanging(value);
-                this._FirstName = value;
-                this.OnFirstNameChanged();
-                this.OnPropertyChanged("FirstName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _FirstName;
-        partial void OnFirstNameChanging(string value);
-        partial void OnFirstNameChanged();
-        /// <summary>
-        /// There are no comments for Property Title in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Title
-        {
-            get
-            {
-                return this._Title;
-            }
-            set
-            {
-                this.OnTitleChanging(value);
-                this._Title = value;
-                this.OnTitleChanged();
-                this.OnPropertyChanged("Title");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Title;
-        partial void OnTitleChanging(string value);
-        partial void OnTitleChanged();
-        /// <summary>
-        /// There are no comments for Property TitleOfCourtesy in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string TitleOfCourtesy
-        {
-            get
-            {
-                return this._TitleOfCourtesy;
-            }
-            set
-            {
-                this.OnTitleOfCourtesyChanging(value);
-                this._TitleOfCourtesy = value;
-                this.OnTitleOfCourtesyChanged();
-                this.OnPropertyChanged("TitleOfCourtesy");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _TitleOfCourtesy;
-        partial void OnTitleOfCourtesyChanging(string value);
-        partial void OnTitleOfCourtesyChanged();
-        /// <summary>
-        /// There are no comments for Property BirthDate in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<global::System.DateTime> BirthDate
-        {
-            get
-            {
-                return this._BirthDate;
-            }
-            set
-            {
-                this.OnBirthDateChanging(value);
-                this._BirthDate = value;
-                this.OnBirthDateChanged();
-                this.OnPropertyChanged("BirthDate");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<global::System.DateTime> _BirthDate;
-        partial void OnBirthDateChanging(global::System.Nullable<global::System.DateTime> value);
-        partial void OnBirthDateChanged();
-        /// <summary>
-        /// There are no comments for Property HireDate in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<global::System.DateTime> HireDate
-        {
-            get
-            {
-                return this._HireDate;
-            }
-            set
-            {
-                this.OnHireDateChanging(value);
-                this._HireDate = value;
-                this.OnHireDateChanged();
-                this.OnPropertyChanged("HireDate");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<global::System.DateTime> _HireDate;
-        partial void OnHireDateChanging(global::System.Nullable<global::System.DateTime> value);
-        partial void OnHireDateChanged();
-        /// <summary>
-        /// There are no comments for Property Address in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Address
-        {
-            get
-            {
-                return this._Address;
-            }
-            set
-            {
-                this.OnAddressChanging(value);
-                this._Address = value;
-                this.OnAddressChanged();
-                this.OnPropertyChanged("Address");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Address;
-        partial void OnAddressChanging(string value);
-        partial void OnAddressChanged();
-        /// <summary>
-        /// There are no comments for Property City in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string City
-        {
-            get
-            {
-                return this._City;
-            }
-            set
-            {
-                this.OnCityChanging(value);
-                this._City = value;
-                this.OnCityChanged();
-                this.OnPropertyChanged("City");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _City;
-        partial void OnCityChanging(string value);
-        partial void OnCityChanged();
-        /// <summary>
-        /// There are no comments for Property Region in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Region
-        {
-            get
-            {
-                return this._Region;
-            }
-            set
-            {
-                this.OnRegionChanging(value);
-                this._Region = value;
-                this.OnRegionChanged();
-                this.OnPropertyChanged("Region");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Region;
-        partial void OnRegionChanging(string value);
-        partial void OnRegionChanged();
-        /// <summary>
-        /// There are no comments for Property PostalCode in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string PostalCode
-        {
-            get
-            {
-                return this._PostalCode;
-            }
-            set
-            {
-                this.OnPostalCodeChanging(value);
-                this._PostalCode = value;
-                this.OnPostalCodeChanged();
-                this.OnPropertyChanged("PostalCode");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _PostalCode;
-        partial void OnPostalCodeChanging(string value);
-        partial void OnPostalCodeChanged();
-        /// <summary>
-        /// There are no comments for Property Country in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Country
-        {
-            get
-            {
-                return this._Country;
-            }
-            set
-            {
-                this.OnCountryChanging(value);
-                this._Country = value;
-                this.OnCountryChanged();
-                this.OnPropertyChanged("Country");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Country;
-        partial void OnCountryChanging(string value);
-        partial void OnCountryChanged();
-        /// <summary>
-        /// There are no comments for Property HomePhone in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string HomePhone
-        {
-            get
-            {
-                return this._HomePhone;
-            }
-            set
-            {
-                this.OnHomePhoneChanging(value);
-                this._HomePhone = value;
-                this.OnHomePhoneChanged();
-                this.OnPropertyChanged("HomePhone");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _HomePhone;
-        partial void OnHomePhoneChanging(string value);
-        partial void OnHomePhoneChanged();
-        /// <summary>
-        /// There are no comments for Property Extension in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Extension
-        {
-            get
-            {
-                return this._Extension;
-            }
-            set
-            {
-                this.OnExtensionChanging(value);
-                this._Extension = value;
-                this.OnExtensionChanged();
-                this.OnPropertyChanged("Extension");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Extension;
-        partial void OnExtensionChanging(string value);
-        partial void OnExtensionChanged();
-        /// <summary>
-        /// There are no comments for Property Photo in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public byte[] Photo
-        {
-            get
-            {
-                if ((this._Photo != null))
-                {
-                    return ((byte[])(this._Photo.Clone()));
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            set
-            {
-                this.OnPhotoChanging(value);
-                this._Photo = value;
-                this.OnPhotoChanged();
-                this.OnPropertyChanged("Photo");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private byte[] _Photo;
-        partial void OnPhotoChanging(byte[] value);
-        partial void OnPhotoChanged();
-        /// <summary>
-        /// There are no comments for Property Notes in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Notes
-        {
-            get
-            {
-                return this._Notes;
-            }
-            set
-            {
-                this.OnNotesChanging(value);
-                this._Notes = value;
-                this.OnNotesChanged();
-                this.OnPropertyChanged("Notes");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Notes;
-        partial void OnNotesChanging(string value);
-        partial void OnNotesChanged();
-        /// <summary>
-        /// There are no comments for Property ReportsTo in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<int> ReportsTo
-        {
-            get
-            {
-                return this._ReportsTo;
-            }
-            set
-            {
-                this.OnReportsToChanging(value);
-                this._ReportsTo = value;
-                this.OnReportsToChanged();
-                this.OnPropertyChanged("ReportsTo");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<int> _ReportsTo;
-        partial void OnReportsToChanging(global::System.Nullable<int> value);
-        partial void OnReportsToChanged();
-        /// <summary>
-        /// There are no comments for Property PhotoPath in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string PhotoPath
-        {
-            get
-            {
-                return this._PhotoPath;
-            }
-            set
-            {
-                this.OnPhotoPathChanging(value);
-                this._PhotoPath = value;
-                this.OnPhotoPathChanged();
-                this.OnPropertyChanged("PhotoPath");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _PhotoPath;
-        partial void OnPhotoPathChanging(string value);
-        partial void OnPhotoPathChanged();
-        /// <summary>
-        /// There are no comments for Customers in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceCollection<Customer> Customers
-        {
-            get
-            {
-                return this._Customers;
-            }
-            set
-            {
-                this._Customers = value;
-                this.OnPropertyChanged("Customers");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceCollection<Customer> _Customers = new global::System.Data.Services.Client.DataServiceCollection<Customer>(null, System.Data.Services.Client.TrackingMode.None);
-        /// <summary>
-        /// There are no comments for Employees1 in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceCollection<Employee> Employees1
-        {
-            get
-            {
-                return this._Employees1;
-            }
-            set
-            {
-                this._Employees1 = value;
-                this.OnPropertyChanged("Employees1");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceCollection<Employee> _Employees1 = new global::System.Data.Services.Client.DataServiceCollection<Employee>(null, System.Data.Services.Client.TrackingMode.None);
-        /// <summary>
-        /// There are no comments for Employee1 in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public Employee Employee1
-        {
-            get
-            {
-                return this._Employee1;
-            }
-            set
-            {
-                this._Employee1 = value;
-                this.OnPropertyChanged("Employee1");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private Employee _Employee1;
-        /// <summary>
-        /// There are no comments for Orders in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceCollection<Order> Orders
-        {
-            get
-            {
-                return this._Orders;
-            }
-            set
-            {
-                this._Orders = value;
-                this.OnPropertyChanged("Orders");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceCollection<Order> _Orders = new global::System.Data.Services.Client.DataServiceCollection<Order>(null, System.Data.Services.Client.TrackingMode.None);
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected virtual void OnPropertyChanged(string property)
-        {
-            if ((this.PropertyChanged != null))
-            {
-                this.PropertyChanged(this, new global::System.ComponentModel.PropertyChangedEventArgs(property));
-            }
-        }
-    }
-    /// <summary>
-    /// There are no comments for NorthwindModel.Order_Detail in the schema.
-    /// </summary>
-    /// <KeyProperties>
-    /// OrderID
-    /// ProductID
-    /// </KeyProperties>
-    [global::System.Data.Services.Common.EntitySetAttribute("Order_Details")]
-    [global::System.Data.Services.Common.DataServiceKeyAttribute("OrderID", "ProductID")]
-    public partial class Order_Detail : global::System.ComponentModel.INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Create a new Order_Detail object.
-        /// </summary>
-        /// <param name="orderID">Initial value of OrderID.</param>
-        /// <param name="productID">Initial value of ProductID.</param>
-        /// <param name="unitPrice">Initial value of UnitPrice.</param>
-        /// <param name="quantity">Initial value of Quantity.</param>
-        /// <param name="discount">Initial value of Discount.</param>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public static Order_Detail CreateOrder_Detail(int orderID, int productID, decimal unitPrice, short quantity, float discount)
-        {
-            Order_Detail order_Detail = new Order_Detail();
-            order_Detail.OrderID = orderID;
-            order_Detail.ProductID = productID;
-            order_Detail.UnitPrice = unitPrice;
-            order_Detail.Quantity = quantity;
-            order_Detail.Discount = discount;
-            return order_Detail;
-        }
-        /// <summary>
-        /// There are no comments for Property OrderID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int OrderID
-        {
-            get
-            {
-                return this._OrderID;
-            }
-            set
-            {
-                this.OnOrderIDChanging(value);
-                this._OrderID = value;
-                this.OnOrderIDChanged();
-                this.OnPropertyChanged("OrderID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _OrderID;
-        partial void OnOrderIDChanging(int value);
-        partial void OnOrderIDChanged();
-        /// <summary>
-        /// There are no comments for Property ProductID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int ProductID
-        {
-            get
-            {
-                return this._ProductID;
-            }
-            set
-            {
-                this.OnProductIDChanging(value);
-                this._ProductID = value;
-                this.OnProductIDChanged();
-                this.OnPropertyChanged("ProductID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _ProductID;
-        partial void OnProductIDChanging(int value);
-        partial void OnProductIDChanged();
-        /// <summary>
-        /// There are no comments for Property UnitPrice in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public decimal UnitPrice
-        {
-            get
-            {
-                return this._UnitPrice;
-            }
-            set
-            {
-                this.OnUnitPriceChanging(value);
-                this._UnitPrice = value;
-                this.OnUnitPriceChanged();
-                this.OnPropertyChanged("UnitPrice");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private decimal _UnitPrice;
-        partial void OnUnitPriceChanging(decimal value);
-        partial void OnUnitPriceChanged();
-        /// <summary>
-        /// There are no comments for Property Quantity in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public short Quantity
-        {
-            get
-            {
-                return this._Quantity;
-            }
-            set
-            {
-                this.OnQuantityChanging(value);
-                this._Quantity = value;
-                this.OnQuantityChanged();
-                this.OnPropertyChanged("Quantity");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private short _Quantity;
-        partial void OnQuantityChanging(short value);
-        partial void OnQuantityChanged();
-        /// <summary>
-        /// There are no comments for Property Discount in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public float Discount
-        {
-            get
-            {
-                return this._Discount;
-            }
-            set
-            {
-                this.OnDiscountChanging(value);
-                this._Discount = value;
-                this.OnDiscountChanged();
-                this.OnPropertyChanged("Discount");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private float _Discount;
-        partial void OnDiscountChanging(float value);
-        partial void OnDiscountChanged();
-        /// <summary>
-        /// There are no comments for Order in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public Order Order
-        {
-            get
-            {
-                return this._Order;
-            }
-            set
-            {
-                this._Order = value;
-                this.OnPropertyChanged("Order");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private Order _Order;
-        /// <summary>
-        /// There are no comments for Product in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public Product Product
-        {
-            get
-            {
-                return this._Product;
-            }
-            set
-            {
-                this._Product = value;
-                this.OnPropertyChanged("Product");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private Product _Product;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected virtual void OnPropertyChanged(string property)
-        {
-            if ((this.PropertyChanged != null))
-            {
-                this.PropertyChanged(this, new global::System.ComponentModel.PropertyChangedEventArgs(property));
-            }
-        }
-    }
-    /// <summary>
-    /// There are no comments for NorthwindModel.Order in the schema.
-    /// </summary>
-    /// <KeyProperties>
-    /// OrderID
-    /// </KeyProperties>
-    [global::System.Data.Services.Common.EntitySetAttribute("Orders")]
-    [global::System.Data.Services.Common.DataServiceKeyAttribute("OrderID")]
-    public partial class Order : global::System.ComponentModel.INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Create a new Order object.
-        /// </summary>
-        /// <param name="orderID">Initial value of OrderID.</param>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public static Order CreateOrder(int orderID)
-        {
-            Order order = new Order();
-            order.OrderID = orderID;
-            return order;
-        }
-        /// <summary>
-        /// There are no comments for Property OrderID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int OrderID
-        {
-            get
-            {
-                return this._OrderID;
-            }
-            set
-            {
-                this.OnOrderIDChanging(value);
-                this._OrderID = value;
-                this.OnOrderIDChanged();
-                this.OnPropertyChanged("OrderID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _OrderID;
-        partial void OnOrderIDChanging(int value);
-        partial void OnOrderIDChanged();
-        /// <summary>
-        /// There are no comments for Property CustomerID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<int> CustomerID
-        {
-            get
-            {
-                return this._CustomerID;
-            }
-            set
-            {
-                this.OnCustomerIDChanging(value);
-                this._CustomerID = value;
-                this.OnCustomerIDChanged();
-                this.OnPropertyChanged("CustomerID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<int> _CustomerID;
-        partial void OnCustomerIDChanging(global::System.Nullable<int> value);
-        partial void OnCustomerIDChanged();
-        /// <summary>
-        /// There are no comments for Property EmployeeID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<int> EmployeeID
-        {
-            get
-            {
-                return this._EmployeeID;
-            }
-            set
-            {
-                this.OnEmployeeIDChanging(value);
-                this._EmployeeID = value;
-                this.OnEmployeeIDChanged();
-                this.OnPropertyChanged("EmployeeID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<int> _EmployeeID;
-        partial void OnEmployeeIDChanging(global::System.Nullable<int> value);
-        partial void OnEmployeeIDChanged();
-        /// <summary>
-        /// There are no comments for Property OrderDate in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<global::System.DateTime> OrderDate
-        {
-            get
-            {
-                return this._OrderDate;
-            }
-            set
-            {
-                this.OnOrderDateChanging(value);
-                this._OrderDate = value;
-                this.OnOrderDateChanged();
-                this.OnPropertyChanged("OrderDate");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<global::System.DateTime> _OrderDate;
-        partial void OnOrderDateChanging(global::System.Nullable<global::System.DateTime> value);
-        partial void OnOrderDateChanged();
-        /// <summary>
-        /// There are no comments for Property RequiredDate in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<global::System.DateTime> RequiredDate
-        {
-            get
-            {
-                return this._RequiredDate;
-            }
-            set
-            {
-                this.OnRequiredDateChanging(value);
-                this._RequiredDate = value;
-                this.OnRequiredDateChanged();
-                this.OnPropertyChanged("RequiredDate");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<global::System.DateTime> _RequiredDate;
-        partial void OnRequiredDateChanging(global::System.Nullable<global::System.DateTime> value);
-        partial void OnRequiredDateChanged();
-        /// <summary>
-        /// There are no comments for Property ShippedDate in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<global::System.DateTime> ShippedDate
-        {
-            get
-            {
-                return this._ShippedDate;
-            }
-            set
-            {
-                this.OnShippedDateChanging(value);
-                this._ShippedDate = value;
-                this.OnShippedDateChanged();
-                this.OnPropertyChanged("ShippedDate");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<global::System.DateTime> _ShippedDate;
-        partial void OnShippedDateChanging(global::System.Nullable<global::System.DateTime> value);
-        partial void OnShippedDateChanged();
-        /// <summary>
-        /// There are no comments for Property ShipVia in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<int> ShipVia
-        {
-            get
-            {
-                return this._ShipVia;
-            }
-            set
-            {
-                this.OnShipViaChanging(value);
-                this._ShipVia = value;
-                this.OnShipViaChanged();
-                this.OnPropertyChanged("ShipVia");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<int> _ShipVia;
-        partial void OnShipViaChanging(global::System.Nullable<int> value);
-        partial void OnShipViaChanged();
-        /// <summary>
-        /// There are no comments for Property Freight in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<decimal> Freight
-        {
-            get
-            {
-                return this._Freight;
-            }
-            set
-            {
-                this.OnFreightChanging(value);
-                this._Freight = value;
-                this.OnFreightChanged();
-                this.OnPropertyChanged("Freight");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<decimal> _Freight;
-        partial void OnFreightChanging(global::System.Nullable<decimal> value);
-        partial void OnFreightChanged();
-        /// <summary>
-        /// There are no comments for Property ShipName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ShipName
-        {
-            get
-            {
-                return this._ShipName;
-            }
-            set
-            {
-                this.OnShipNameChanging(value);
-                this._ShipName = value;
-                this.OnShipNameChanged();
-                this.OnPropertyChanged("ShipName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ShipName;
-        partial void OnShipNameChanging(string value);
-        partial void OnShipNameChanged();
-        /// <summary>
-        /// There are no comments for Property ShipAddress in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ShipAddress
-        {
-            get
-            {
-                return this._ShipAddress;
-            }
-            set
-            {
-                this.OnShipAddressChanging(value);
-                this._ShipAddress = value;
-                this.OnShipAddressChanged();
-                this.OnPropertyChanged("ShipAddress");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ShipAddress;
-        partial void OnShipAddressChanging(string value);
-        partial void OnShipAddressChanged();
-        /// <summary>
-        /// There are no comments for Property ShipCity in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ShipCity
-        {
-            get
-            {
-                return this._ShipCity;
-            }
-            set
-            {
-                this.OnShipCityChanging(value);
-                this._ShipCity = value;
-                this.OnShipCityChanged();
-                this.OnPropertyChanged("ShipCity");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ShipCity;
-        partial void OnShipCityChanging(string value);
-        partial void OnShipCityChanged();
-        /// <summary>
-        /// There are no comments for Property ShipRegion in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ShipRegion
-        {
-            get
-            {
-                return this._ShipRegion;
-            }
-            set
-            {
-                this.OnShipRegionChanging(value);
-                this._ShipRegion = value;
-                this.OnShipRegionChanged();
-                this.OnPropertyChanged("ShipRegion");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ShipRegion;
-        partial void OnShipRegionChanging(string value);
-        partial void OnShipRegionChanged();
-        /// <summary>
-        /// There are no comments for Property ShipPostalCode in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ShipPostalCode
-        {
-            get
-            {
-                return this._ShipPostalCode;
-            }
-            set
-            {
-                this.OnShipPostalCodeChanging(value);
-                this._ShipPostalCode = value;
-                this.OnShipPostalCodeChanged();
-                this.OnPropertyChanged("ShipPostalCode");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ShipPostalCode;
-        partial void OnShipPostalCodeChanging(string value);
-        partial void OnShipPostalCodeChanged();
-        /// <summary>
-        /// There are no comments for Property ShipCountry in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ShipCountry
-        {
-            get
-            {
-                return this._ShipCountry;
-            }
-            set
-            {
-                this.OnShipCountryChanging(value);
-                this._ShipCountry = value;
-                this.OnShipCountryChanged();
-                this.OnPropertyChanged("ShipCountry");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ShipCountry;
-        partial void OnShipCountryChanging(string value);
-        partial void OnShipCountryChanged();
-        /// <summary>
-        /// There are no comments for Customer in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public Customer Customer
-        {
-            get
-            {
-                return this._Customer;
-            }
-            set
-            {
-                this._Customer = value;
-                this.OnPropertyChanged("Customer");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private Customer _Customer;
-        /// <summary>
-        /// There are no comments for Employee in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public Employee Employee
-        {
-            get
-            {
-                return this._Employee;
-            }
-            set
-            {
-                this._Employee = value;
-                this.OnPropertyChanged("Employee");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private Employee _Employee;
-        /// <summary>
-        /// There are no comments for Order_Details in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceCollection<Order_Detail> Order_Details
-        {
-            get
-            {
-                return this._Order_Details;
-            }
-            set
-            {
-                this._Order_Details = value;
-                this.OnPropertyChanged("Order_Details");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceCollection<Order_Detail> _Order_Details = new global::System.Data.Services.Client.DataServiceCollection<Order_Detail>(null, System.Data.Services.Client.TrackingMode.None);
-        /// <summary>
-        /// There are no comments for Shipper in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public Shipper Shipper
-        {
-            get
-            {
-                return this._Shipper;
-            }
-            set
-            {
-                this._Shipper = value;
-                this.OnPropertyChanged("Shipper");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private Shipper _Shipper;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected virtual void OnPropertyChanged(string property)
-        {
-            if ((this.PropertyChanged != null))
-            {
-                this.PropertyChanged(this, new global::System.ComponentModel.PropertyChangedEventArgs(property));
-            }
-        }
-    }
-    /// <summary>
-    /// There are no comments for NorthwindModel.Product in the schema.
-    /// </summary>
-    /// <KeyProperties>
-    /// ProductID
-    /// </KeyProperties>
-    [global::System.Data.Services.Common.EntitySetAttribute("Products")]
-    [global::System.Data.Services.Common.DataServiceKeyAttribute("ProductID")]
-    public partial class Product : global::System.ComponentModel.INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Create a new Product object.
-        /// </summary>
-        /// <param name="productID">Initial value of ProductID.</param>
-        /// <param name="productName">Initial value of ProductName.</param>
-        /// <param name="discontinued">Initial value of Discontinued.</param>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public static Product CreateProduct(int productID, string productName, bool discontinued)
-        {
-            Product product = new Product();
-            product.ProductID = productID;
-            product.ProductName = productName;
-            product.Discontinued = discontinued;
-            return product;
-        }
-        /// <summary>
-        /// There are no comments for Property ProductID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int ProductID
-        {
-            get
-            {
-                return this._ProductID;
-            }
-            set
-            {
-                this.OnProductIDChanging(value);
-                this._ProductID = value;
-                this.OnProductIDChanged();
-                this.OnPropertyChanged("ProductID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _ProductID;
-        partial void OnProductIDChanging(int value);
-        partial void OnProductIDChanged();
-        /// <summary>
-        /// There are no comments for Property ProductName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string ProductName
-        {
-            get
-            {
-                return this._ProductName;
-            }
-            set
-            {
-                this.OnProductNameChanging(value);
-                this._ProductName = value;
-                this.OnProductNameChanged();
-                this.OnPropertyChanged("ProductName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _ProductName;
-        partial void OnProductNameChanging(string value);
-        partial void OnProductNameChanged();
-        /// <summary>
-        /// There are no comments for Property CategoryID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<int> CategoryID
-        {
-            get
-            {
-                return this._CategoryID;
-            }
-            set
-            {
-                this.OnCategoryIDChanging(value);
-                this._CategoryID = value;
-                this.OnCategoryIDChanged();
-                this.OnPropertyChanged("CategoryID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<int> _CategoryID;
-        partial void OnCategoryIDChanging(global::System.Nullable<int> value);
-        partial void OnCategoryIDChanged();
-        /// <summary>
-        /// There are no comments for Property QuantityPerUnit in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string QuantityPerUnit
-        {
-            get
-            {
-                return this._QuantityPerUnit;
-            }
-            set
-            {
-                this.OnQuantityPerUnitChanging(value);
-                this._QuantityPerUnit = value;
-                this.OnQuantityPerUnitChanged();
-                this.OnPropertyChanged("QuantityPerUnit");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _QuantityPerUnit;
-        partial void OnQuantityPerUnitChanging(string value);
-        partial void OnQuantityPerUnitChanged();
-        /// <summary>
-        /// There are no comments for Property UnitPrice in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<decimal> UnitPrice
-        {
-            get
-            {
-                return this._UnitPrice;
-            }
-            set
-            {
-                this.OnUnitPriceChanging(value);
-                this._UnitPrice = value;
-                this.OnUnitPriceChanged();
-                this.OnPropertyChanged("UnitPrice");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<decimal> _UnitPrice;
-        partial void OnUnitPriceChanging(global::System.Nullable<decimal> value);
-        partial void OnUnitPriceChanged();
-        /// <summary>
-        /// There are no comments for Property UnitsInStock in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<short> UnitsInStock
-        {
-            get
-            {
-                return this._UnitsInStock;
-            }
-            set
-            {
-                this.OnUnitsInStockChanging(value);
-                this._UnitsInStock = value;
-                this.OnUnitsInStockChanged();
-                this.OnPropertyChanged("UnitsInStock");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<short> _UnitsInStock;
-        partial void OnUnitsInStockChanging(global::System.Nullable<short> value);
-        partial void OnUnitsInStockChanged();
-        /// <summary>
-        /// There are no comments for Property UnitsOnOrder in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<short> UnitsOnOrder
-        {
-            get
-            {
-                return this._UnitsOnOrder;
-            }
-            set
-            {
-                this.OnUnitsOnOrderChanging(value);
-                this._UnitsOnOrder = value;
-                this.OnUnitsOnOrderChanged();
-                this.OnPropertyChanged("UnitsOnOrder");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<short> _UnitsOnOrder;
-        partial void OnUnitsOnOrderChanging(global::System.Nullable<short> value);
-        partial void OnUnitsOnOrderChanged();
-        /// <summary>
-        /// There are no comments for Property ReorderLevel in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Nullable<short> ReorderLevel
-        {
-            get
-            {
-                return this._ReorderLevel;
-            }
-            set
-            {
-                this.OnReorderLevelChanging(value);
-                this._ReorderLevel = value;
-                this.OnReorderLevelChanged();
-                this.OnPropertyChanged("ReorderLevel");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Nullable<short> _ReorderLevel;
-        partial void OnReorderLevelChanging(global::System.Nullable<short> value);
-        partial void OnReorderLevelChanged();
-        /// <summary>
-        /// There are no comments for Property Discontinued in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public bool Discontinued
-        {
-            get
-            {
-                return this._Discontinued;
-            }
-            set
-            {
-                this.OnDiscontinuedChanging(value);
-                this._Discontinued = value;
-                this.OnDiscontinuedChanged();
-                this.OnPropertyChanged("Discontinued");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private bool _Discontinued;
-        partial void OnDiscontinuedChanging(bool value);
-        partial void OnDiscontinuedChanged();
-        /// <summary>
-        /// There are no comments for Property Picture in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public byte[] Picture
-        {
-            get
-            {
-                if ((this._Picture != null))
-                {
-                    return ((byte[])(this._Picture.Clone()));
-                }
-                else
-                {
-                    return null;
-                }
-            }
-            set
-            {
-                this.OnPictureChanging(value);
-                this._Picture = value;
-                this.OnPictureChanged();
-                this.OnPropertyChanged("Picture");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private byte[] _Picture;
-        partial void OnPictureChanging(byte[] value);
-        partial void OnPictureChanged();
-        /// <summary>
-        /// There are no comments for Property PicturePath in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string PicturePath
-        {
-            get
-            {
-                return this._PicturePath;
-            }
-            set
-            {
-                this.OnPicturePathChanging(value);
-                this._PicturePath = value;
-                this.OnPicturePathChanged();
-                this.OnPropertyChanged("PicturePath");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _PicturePath;
-        partial void OnPicturePathChanging(string value);
-        partial void OnPicturePathChanged();
-        /// <summary>
-        /// There are no comments for Category in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public Category Category
-        {
-            get
-            {
-                return this._Category;
-            }
-            set
-            {
-                this._Category = value;
-                this.OnPropertyChanged("Category");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private Category _Category;
-        /// <summary>
-        /// There are no comments for Order_Details in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceCollection<Order_Detail> Order_Details
-        {
-            get
-            {
-                return this._Order_Details;
-            }
-            set
-            {
-                this._Order_Details = value;
-                this.OnPropertyChanged("Order_Details");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceCollection<Order_Detail> _Order_Details = new global::System.Data.Services.Client.DataServiceCollection<Order_Detail>(null, System.Data.Services.Client.TrackingMode.None);
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected virtual void OnPropertyChanged(string property)
-        {
-            if ((this.PropertyChanged != null))
-            {
-                this.PropertyChanged(this, new global::System.ComponentModel.PropertyChangedEventArgs(property));
-            }
-        }
-    }
-    /// <summary>
-    /// There are no comments for NorthwindModel.Shipper in the schema.
-    /// </summary>
-    /// <KeyProperties>
-    /// ShipperID
-    /// </KeyProperties>
-    [global::System.Data.Services.Common.EntitySetAttribute("Shippers")]
-    [global::System.Data.Services.Common.DataServiceKeyAttribute("ShipperID")]
-    public partial class Shipper : global::System.ComponentModel.INotifyPropertyChanged
-    {
-        /// <summary>
-        /// Create a new Shipper object.
-        /// </summary>
-        /// <param name="shipperID">Initial value of ShipperID.</param>
-        /// <param name="companyName">Initial value of CompanyName.</param>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public static Shipper CreateShipper(int shipperID, string companyName)
-        {
-            Shipper shipper = new Shipper();
-            shipper.ShipperID = shipperID;
-            shipper.CompanyName = companyName;
-            return shipper;
-        }
-        /// <summary>
-        /// There are no comments for Property ShipperID in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public int ShipperID
-        {
-            get
-            {
-                return this._ShipperID;
-            }
-            set
-            {
-                this.OnShipperIDChanging(value);
-                this._ShipperID = value;
-                this.OnShipperIDChanged();
-                this.OnPropertyChanged("ShipperID");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private int _ShipperID;
-        partial void OnShipperIDChanging(int value);
-        partial void OnShipperIDChanged();
-        /// <summary>
-        /// There are no comments for Property CompanyName in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string CompanyName
-        {
-            get
-            {
-                return this._CompanyName;
-            }
-            set
-            {
-                this.OnCompanyNameChanging(value);
-                this._CompanyName = value;
-                this.OnCompanyNameChanged();
-                this.OnPropertyChanged("CompanyName");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _CompanyName;
-        partial void OnCompanyNameChanging(string value);
-        partial void OnCompanyNameChanged();
-        /// <summary>
-        /// There are no comments for Property Phone in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public string Phone
-        {
-            get
-            {
-                return this._Phone;
-            }
-            set
-            {
-                this.OnPhoneChanging(value);
-                this._Phone = value;
-                this.OnPhoneChanged();
-                this.OnPropertyChanged("Phone");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private string _Phone;
-        partial void OnPhoneChanging(string value);
-        partial void OnPhoneChanged();
-        /// <summary>
-        /// There are no comments for Orders in the schema.
-        /// </summary>
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public global::System.Data.Services.Client.DataServiceCollection<Order> Orders
-        {
-            get
-            {
-                return this._Orders;
-            }
-            set
-            {
-                this._Orders = value;
-                this.OnPropertyChanged("Orders");
-            }
-        }
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        private global::System.Data.Services.Client.DataServiceCollection<Order> _Orders = new global::System.Data.Services.Client.DataServiceCollection<Order>(null, System.Data.Services.Client.TrackingMode.None);
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        public event global::System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Services.Design", "1.0.0")]
-        protected virtual void OnPropertyChanged(string property)
-        {
-            if ((this.PropertyChanged != null))
-            {
-                this.PropertyChanged(this, new global::System.ComponentModel.PropertyChangedEventArgs(property));
-            }
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/Reference.datasvcmap b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/Reference.datasvcmap
deleted file mode 100644
index 37e8e708..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/Reference.datasvcmap	
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="b0a68de0-12d0-4ced-9f46-c2365c0aa657" xmlns="urn:schemas-microsoft-com:xml-dataservicemap">
-  <MetadataSources>
-    <MetadataSource Address="http://demo.xceed.com/DataGrid_Silverlight/Demo_2.0/Demo_2.0.1/NorthwindDataService.svc" Protocol="http" SourceId="1" />
-  </MetadataSources>
-  <Metadata>
-    <MetadataFile FileName="service.edmx" MetadataType="Edmx" ID="2a12012c-5b3b-46f5-ad05-ea33d3a138a6" SourceId="1" SourceUrl="http://demo.xceed.com/DataGrid_Silverlight/Demo_2.0/Demo_2.0.1/NorthwindDataService.svc" />
-  </Metadata>
-  <Extensions />
-  <Parameters>
-    <Parameter Name="UseDataServiceCollection" Value="true" />
-    <Parameter Name="Version" Value="2.0" />
-  </Parameters>
-</ReferenceGroup>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/service.edmx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/service.edmx
deleted file mode 100644
index 6364ecbd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Service References/NorthwindDataService/service.edmx	
+++ /dev/null
@@ -1,287 +0,0 @@
-<edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx">
-  <edmx:DataServices xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" m:DataServiceVersion="1.0">
-    <Schema Namespace="NorthwindModel" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://schemas.microsoft.com/ado/2008/09/edm">
-      <EntityType Name="Category">
-        <Key>
-          <PropertyRef Name="CategoryID" />
-        </Key>
-        <Property Name="CategoryID" Type="Edm.Int32" Nullable="false" p8:StoreGeneratedPattern="Identity" xmlns:p8="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
-        <Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="Description" Type="Edm.String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
-        <Property Name="Picture" Type="Edm.Binary" Nullable="true" MaxLength="Max" FixedLength="false" />
-        <NavigationProperty Name="Products" Relationship="NorthwindModel.FK_Products_Categories" FromRole="Categories" ToRole="Products" />
-      </EntityType>
-      <EntityType Name="Contact">
-        <Key>
-          <PropertyRef Name="ContactID" />
-        </Key>
-        <Property Name="ContactID" Type="Edm.Int32" Nullable="false" p8:StoreGeneratedPattern="Identity" xmlns:p8="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
-        <Property Name="ContactType" Type="Edm.String" Nullable="true" MaxLength="50" Unicode="true" FixedLength="false" />
-        <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" Unicode="true" FixedLength="false" />
-        <Property Name="ContactName" Type="Edm.String" Nullable="true" MaxLength="30" Unicode="true" FixedLength="false" />
-        <Property Name="ContactTitle" Type="Edm.String" Nullable="true" MaxLength="30" Unicode="true" FixedLength="false" />
-        <Property Name="Address" Type="Edm.String" Nullable="true" MaxLength="60" Unicode="true" FixedLength="false" />
-        <Property Name="City" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="Region" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="PostalCode" Type="Edm.String" Nullable="true" MaxLength="10" Unicode="true" FixedLength="false" />
-        <Property Name="Country" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="Phone" Type="Edm.String" Nullable="true" MaxLength="24" Unicode="true" FixedLength="false" />
-        <Property Name="Extension" Type="Edm.String" Nullable="true" MaxLength="4" Unicode="true" FixedLength="false" />
-        <Property Name="Fax" Type="Edm.String" Nullable="true" MaxLength="24" Unicode="true" FixedLength="false" />
-        <Property Name="HomePage" Type="Edm.String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
-        <Property Name="PhotoPath" Type="Edm.String" Nullable="true" MaxLength="255" Unicode="true" FixedLength="false" />
-        <Property Name="Photo" Type="Edm.Binary" Nullable="true" MaxLength="Max" FixedLength="false" />
-      </EntityType>
-      <EntityType Name="Customer">
-        <Key>
-          <PropertyRef Name="CustomerID" />
-        </Key>
-        <Property Name="CustomerID" Type="Edm.Int32" Nullable="false" p8:StoreGeneratedPattern="Identity" xmlns:p8="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
-        <Property Name="Acronym" Type="Edm.String" Nullable="false" MaxLength="5" Unicode="true" FixedLength="false" />
-        <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" Unicode="true" FixedLength="false" />
-        <Property Name="ContactName" Type="Edm.String" Nullable="true" MaxLength="30" Unicode="true" FixedLength="false" />
-        <Property Name="ContactTitle" Type="Edm.String" Nullable="true" MaxLength="30" Unicode="true" FixedLength="false" />
-        <Property Name="Address" Type="Edm.String" Nullable="true" MaxLength="60" Unicode="true" FixedLength="false" />
-        <Property Name="City" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="Region" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="PostalCode" Type="Edm.String" Nullable="true" MaxLength="10" Unicode="true" FixedLength="false" />
-        <Property Name="Country" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="Phone" Type="Edm.String" Nullable="true" MaxLength="24" Unicode="true" FixedLength="false" />
-        <Property Name="Fax" Type="Edm.String" Nullable="true" MaxLength="24" Unicode="true" FixedLength="false" />
-        <Property Name="EmployeeID" Type="Edm.Int32" Nullable="false" />
-        <NavigationProperty Name="Employee" Relationship="NorthwindModel.FK_Customers_Employees" FromRole="Customers" ToRole="Employees" />
-        <NavigationProperty Name="Orders" Relationship="NorthwindModel.FK_Orders_Customers" FromRole="Customers" ToRole="Orders" />
-      </EntityType>
-      <EntityType Name="Employee">
-        <Key>
-          <PropertyRef Name="EmployeeID" />
-        </Key>
-        <Property Name="EmployeeID" Type="Edm.Int32" Nullable="false" p8:StoreGeneratedPattern="Identity" xmlns:p8="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
-        <Property Name="LastName" Type="Edm.String" Nullable="false" MaxLength="20" Unicode="true" FixedLength="false" />
-        <Property Name="FirstName" Type="Edm.String" Nullable="false" MaxLength="10" Unicode="true" FixedLength="false" />
-        <Property Name="Title" Type="Edm.String" Nullable="true" MaxLength="30" Unicode="true" FixedLength="false" />
-        <Property Name="TitleOfCourtesy" Type="Edm.String" Nullable="true" MaxLength="25" Unicode="true" FixedLength="false" />
-        <Property Name="BirthDate" Type="Edm.DateTime" Nullable="true" />
-        <Property Name="HireDate" Type="Edm.DateTime" Nullable="true" />
-        <Property Name="Address" Type="Edm.String" Nullable="true" MaxLength="60" Unicode="true" FixedLength="false" />
-        <Property Name="City" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="Region" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="PostalCode" Type="Edm.String" Nullable="true" MaxLength="10" Unicode="true" FixedLength="false" />
-        <Property Name="Country" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="HomePhone" Type="Edm.String" Nullable="true" MaxLength="24" Unicode="true" FixedLength="false" />
-        <Property Name="Extension" Type="Edm.String" Nullable="true" MaxLength="4" Unicode="true" FixedLength="false" />
-        <Property Name="Photo" Type="Edm.Binary" Nullable="true" MaxLength="Max" FixedLength="false" />
-        <Property Name="Notes" Type="Edm.String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" />
-        <Property Name="ReportsTo" Type="Edm.Int32" Nullable="true" />
-        <Property Name="PhotoPath" Type="Edm.String" Nullable="true" MaxLength="255" Unicode="true" FixedLength="false" />
-        <NavigationProperty Name="Customers" Relationship="NorthwindModel.FK_Customers_Employees" FromRole="Employees" ToRole="Customers" />
-        <NavigationProperty Name="Employees1" Relationship="NorthwindModel.FK_Employees_Employees" FromRole="Employees" ToRole="Employees1" />
-        <NavigationProperty Name="Employee1" Relationship="NorthwindModel.FK_Employees_Employees" FromRole="Employees1" ToRole="Employees" />
-        <NavigationProperty Name="Orders" Relationship="NorthwindModel.FK_Orders_Employees" FromRole="Employees" ToRole="Orders" />
-      </EntityType>
-      <EntityType Name="Order_Detail">
-        <Key>
-          <PropertyRef Name="OrderID" />
-          <PropertyRef Name="ProductID" />
-        </Key>
-        <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
-        <Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" />
-        <Property Name="Quantity" Type="Edm.Int16" Nullable="false" />
-        <Property Name="Discount" Type="Edm.Single" Nullable="false" />
-        <NavigationProperty Name="Order" Relationship="NorthwindModel.FK_Order_Details_Orders" FromRole="Order_Details" ToRole="Orders" />
-        <NavigationProperty Name="Product" Relationship="NorthwindModel.FK_Order_Details_Products" FromRole="Order_Details" ToRole="Products" />
-      </EntityType>
-      <EntityType Name="Order">
-        <Key>
-          <PropertyRef Name="OrderID" />
-        </Key>
-        <Property Name="OrderID" Type="Edm.Int32" Nullable="false" p8:StoreGeneratedPattern="Identity" xmlns:p8="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
-        <Property Name="CustomerID" Type="Edm.Int32" Nullable="true" />
-        <Property Name="EmployeeID" Type="Edm.Int32" Nullable="true" />
-        <Property Name="OrderDate" Type="Edm.DateTime" Nullable="true" />
-        <Property Name="RequiredDate" Type="Edm.DateTime" Nullable="true" />
-        <Property Name="ShippedDate" Type="Edm.DateTime" Nullable="true" />
-        <Property Name="ShipVia" Type="Edm.Int32" Nullable="true" />
-        <Property Name="Freight" Type="Edm.Decimal" Nullable="true" Precision="19" Scale="4" />
-        <Property Name="ShipName" Type="Edm.String" Nullable="true" MaxLength="40" Unicode="true" FixedLength="false" />
-        <Property Name="ShipAddress" Type="Edm.String" Nullable="true" MaxLength="60" Unicode="true" FixedLength="false" />
-        <Property Name="ShipCity" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="ShipRegion" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <Property Name="ShipPostalCode" Type="Edm.String" Nullable="true" MaxLength="10" Unicode="true" FixedLength="false" />
-        <Property Name="ShipCountry" Type="Edm.String" Nullable="true" MaxLength="15" Unicode="true" FixedLength="false" />
-        <NavigationProperty Name="Customer" Relationship="NorthwindModel.FK_Orders_Customers" FromRole="Orders" ToRole="Customers" />
-        <NavigationProperty Name="Employee" Relationship="NorthwindModel.FK_Orders_Employees" FromRole="Orders" ToRole="Employees" />
-        <NavigationProperty Name="Order_Details" Relationship="NorthwindModel.FK_Order_Details_Orders" FromRole="Orders" ToRole="Order_Details" />
-        <NavigationProperty Name="Shipper" Relationship="NorthwindModel.FK_Orders_Shippers" FromRole="Orders" ToRole="Shippers" />
-      </EntityType>
-      <EntityType Name="Product">
-        <Key>
-          <PropertyRef Name="ProductID" />
-        </Key>
-        <Property Name="ProductID" Type="Edm.Int32" Nullable="false" p8:StoreGeneratedPattern="Identity" xmlns:p8="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
-        <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" Unicode="true" FixedLength="false" />
-        <Property Name="CategoryID" Type="Edm.Int32" Nullable="true" />
-        <Property Name="QuantityPerUnit" Type="Edm.String" Nullable="true" MaxLength="20" Unicode="true" FixedLength="false" />
-        <Property Name="UnitPrice" Type="Edm.Decimal" Nullable="true" Precision="19" Scale="4" />
-        <Property Name="UnitsInStock" Type="Edm.Int16" Nullable="true" />
-        <Property Name="UnitsOnOrder" Type="Edm.Int16" Nullable="true" />
-        <Property Name="ReorderLevel" Type="Edm.Int16" Nullable="true" />
-        <Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" />
-        <Property Name="Picture" Type="Edm.Binary" Nullable="true" MaxLength="Max" FixedLength="false" />
-        <Property Name="PicturePath" Type="Edm.String" Nullable="true" MaxLength="50" Unicode="true" FixedLength="false" />
-        <NavigationProperty Name="Category" Relationship="NorthwindModel.FK_Products_Categories" FromRole="Products" ToRole="Categories" />
-        <NavigationProperty Name="Order_Details" Relationship="NorthwindModel.FK_Order_Details_Products" FromRole="Products" ToRole="Order_Details" />
-      </EntityType>
-      <EntityType Name="Shipper">
-        <Key>
-          <PropertyRef Name="ShipperID" />
-        </Key>
-        <Property Name="ShipperID" Type="Edm.Int32" Nullable="false" p8:StoreGeneratedPattern="Identity" xmlns:p8="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
-        <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" Unicode="true" FixedLength="false" />
-        <Property Name="Phone" Type="Edm.String" Nullable="true" MaxLength="24" Unicode="true" FixedLength="false" />
-        <NavigationProperty Name="Orders" Relationship="NorthwindModel.FK_Orders_Shippers" FromRole="Shippers" ToRole="Orders" />
-      </EntityType>
-      <Association Name="FK_Products_Categories">
-        <End Role="Categories" Type="NorthwindModel.Category" Multiplicity="0..1" />
-        <End Role="Products" Type="NorthwindModel.Product" Multiplicity="*" />
-        <ReferentialConstraint>
-          <Principal Role="Categories">
-            <PropertyRef Name="CategoryID" />
-          </Principal>
-          <Dependent Role="Products">
-            <PropertyRef Name="CategoryID" />
-          </Dependent>
-        </ReferentialConstraint>
-      </Association>
-      <Association Name="FK_Customers_Employees">
-        <End Role="Employees" Type="NorthwindModel.Employee" Multiplicity="1" />
-        <End Role="Customers" Type="NorthwindModel.Customer" Multiplicity="*" />
-        <ReferentialConstraint>
-          <Principal Role="Employees">
-            <PropertyRef Name="EmployeeID" />
-          </Principal>
-          <Dependent Role="Customers">
-            <PropertyRef Name="EmployeeID" />
-          </Dependent>
-        </ReferentialConstraint>
-      </Association>
-      <Association Name="FK_Orders_Customers">
-        <End Role="Customers" Type="NorthwindModel.Customer" Multiplicity="0..1" />
-        <End Role="Orders" Type="NorthwindModel.Order" Multiplicity="*" />
-        <ReferentialConstraint>
-          <Principal Role="Customers">
-            <PropertyRef Name="CustomerID" />
-          </Principal>
-          <Dependent Role="Orders">
-            <PropertyRef Name="CustomerID" />
-          </Dependent>
-        </ReferentialConstraint>
-      </Association>
-      <Association Name="FK_Employees_Employees">
-        <End Role="Employees" Type="NorthwindModel.Employee" Multiplicity="0..1" />
-        <End Role="Employees1" Type="NorthwindModel.Employee" Multiplicity="*" />
-        <ReferentialConstraint>
-          <Principal Role="Employees">
-            <PropertyRef Name="EmployeeID" />
-          </Principal>
-          <Dependent Role="Employees1">
-            <PropertyRef Name="ReportsTo" />
-          </Dependent>
-        </ReferentialConstraint>
-      </Association>
-      <Association Name="FK_Orders_Employees">
-        <End Role="Employees" Type="NorthwindModel.Employee" Multiplicity="0..1" />
-        <End Role="Orders" Type="NorthwindModel.Order" Multiplicity="*" />
-        <ReferentialConstraint>
-          <Principal Role="Employees">
-            <PropertyRef Name="EmployeeID" />
-          </Principal>
-          <Dependent Role="Orders">
-            <PropertyRef Name="EmployeeID" />
-          </Dependent>
-        </ReferentialConstraint>
-      </Association>
-      <Association Name="FK_Order_Details_Orders">
-        <End Role="Orders" Type="NorthwindModel.Order" Multiplicity="1" />
-        <End Role="Order_Details" Type="NorthwindModel.Order_Detail" Multiplicity="*" />
-        <ReferentialConstraint>
-          <Principal Role="Orders">
-            <PropertyRef Name="OrderID" />
-          </Principal>
-          <Dependent Role="Order_Details">
-            <PropertyRef Name="OrderID" />
-          </Dependent>
-        </ReferentialConstraint>
-      </Association>
-      <Association Name="FK_Order_Details_Products">
-        <End Role="Products" Type="NorthwindModel.Product" Multiplicity="1" />
-        <End Role="Order_Details" Type="NorthwindModel.Order_Detail" Multiplicity="*" />
-        <ReferentialConstraint>
-          <Principal Role="Products">
-            <PropertyRef Name="ProductID" />
-          </Principal>
-          <Dependent Role="Order_Details">
-            <PropertyRef Name="ProductID" />
-          </Dependent>
-        </ReferentialConstraint>
-      </Association>
-      <Association Name="FK_Orders_Shippers">
-        <End Role="Shippers" Type="NorthwindModel.Shipper" Multiplicity="0..1" />
-        <End Role="Orders" Type="NorthwindModel.Order" Multiplicity="*" />
-        <ReferentialConstraint>
-          <Principal Role="Shippers">
-            <PropertyRef Name="ShipperID" />
-          </Principal>
-          <Dependent Role="Orders">
-            <PropertyRef Name="ShipVia" />
-          </Dependent>
-        </ReferentialConstraint>
-      </Association>
-    </Schema>
-    <Schema Namespace="Xceed.Silverlight.DataGrid.LiveExplorer.Web" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns="http://schemas.microsoft.com/ado/2008/09/edm">
-      <EntityContainer Name="NorthwindEntities" p7:LazyLoadingEnabled="true" m:IsDefaultEntityContainer="true" xmlns:p7="http://schemas.microsoft.com/ado/2009/02/edm/annotation">
-        <EntitySet Name="Categories" EntityType="NorthwindModel.Category" />
-        <EntitySet Name="Contacts" EntityType="NorthwindModel.Contact" />
-        <EntitySet Name="Customers" EntityType="NorthwindModel.Customer" />
-        <EntitySet Name="Employees" EntityType="NorthwindModel.Employee" />
-        <EntitySet Name="Order_Details" EntityType="NorthwindModel.Order_Detail" />
-        <EntitySet Name="Orders" EntityType="NorthwindModel.Order" />
-        <EntitySet Name="Products" EntityType="NorthwindModel.Product" />
-        <EntitySet Name="Shippers" EntityType="NorthwindModel.Shipper" />
-        <AssociationSet Name="FK_Products_Categories" Association="NorthwindModel.FK_Products_Categories">
-          <End Role="Categories" EntitySet="Categories" />
-          <End Role="Products" EntitySet="Products" />
-        </AssociationSet>
-        <AssociationSet Name="FK_Customers_Employees" Association="NorthwindModel.FK_Customers_Employees">
-          <End Role="Employees" EntitySet="Employees" />
-          <End Role="Customers" EntitySet="Customers" />
-        </AssociationSet>
-        <AssociationSet Name="FK_Orders_Customers" Association="NorthwindModel.FK_Orders_Customers">
-          <End Role="Customers" EntitySet="Customers" />
-          <End Role="Orders" EntitySet="Orders" />
-        </AssociationSet>
-        <AssociationSet Name="FK_Employees_Employees" Association="NorthwindModel.FK_Employees_Employees">
-          <End Role="Employees" EntitySet="Employees" />
-          <End Role="Employees1" EntitySet="Employees" />
-        </AssociationSet>
-        <AssociationSet Name="FK_Orders_Employees" Association="NorthwindModel.FK_Orders_Employees">
-          <End Role="Employees" EntitySet="Employees" />
-          <End Role="Orders" EntitySet="Orders" />
-        </AssociationSet>
-        <AssociationSet Name="FK_Order_Details_Orders" Association="NorthwindModel.FK_Order_Details_Orders">
-          <End Role="Orders" EntitySet="Orders" />
-          <End Role="Order_Details" EntitySet="Order_Details" />
-        </AssociationSet>
-        <AssociationSet Name="FK_Order_Details_Products" Association="NorthwindModel.FK_Order_Details_Products">
-          <End Role="Products" EntitySet="Products" />
-          <End Role="Order_Details" EntitySet="Order_Details" />
-        </AssociationSet>
-        <AssociationSet Name="FK_Orders_Shippers" Association="NorthwindModel.FK_Orders_Shippers">
-          <End Role="Shippers" EntitySet="Shippers" />
-          <End Role="Orders" EntitySet="Orders" />
-        </AssociationSet>
-      </EntityContainer>
-    </Schema>
-  </edmx:DataServices>
-</edmx:Edmx>
\ No newline at end of file
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
deleted file mode 100644
index 1d1b71d9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
+++ /dev/null
@@ -1,622 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <OutputType>WinExe</OutputType>
-    <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 Toolkit Plus for WPF 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>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>App.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj" />
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj" />
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj" />
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj" />
-    <ProjectReference Include="..\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj" />
-    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Service References\NorthwindDataService\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.datasvcmap</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Properties\app.manifest">
-      <SubType>Designer</SubType>
-    </None>
-    <AppDesigner Include="Properties\" />
-    <Resource Include="Samples\Magnifier\Resources\SampleText.rtf" />
-  </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\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>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ServiceReferenceMetadataStorage Include="Service References\NorthwindDataService\">
-      <Type>datasvcmap</Type>
-    </ServiceReferenceMetadataStorage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Service References\NorthwindDataService\Reference.datasvcmap">
-      <Generator>DataServiceClientGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\AutoSelectTextboxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\AutoSelectTextboxView.xaml.txt" />
-    <Resource Include="CodeFiles\AvalonDockView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\AvalonDockView.xaml.txt" />
-    <Resource Include="CodeFiles\BusyIndicatorCustomContentTemplateView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\BusyIndicatorCustomContentTemplateView.xaml.txt" />
-    <Resource Include="CodeFiles\BusyIndicatorCustomContentView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\BusyIndicatorCustomContentView.xaml.txt" />
-    <Resource Include="CodeFiles\BusyIndicatorView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\BusyIndicatorView.xaml.txt" />
-    <Resource Include="CodeFiles\ButtonSpinnerView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ButtonSpinnerView.xaml.txt" />
-    <Resource Include="CodeFiles\CalculatorView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\CalculatorView.xaml.txt" />
-    <Resource Include="CodeFiles\ChartAxisView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChartAxisView.xaml.txt" />
-    <Resource Include="CodeFiles\ChartLegendView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChartLegendView.xaml.txt" />
-    <Resource Include="CodeFiles\ChartSeriesBasicTypesView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChartSeriesBasicTypesView.xaml.txt" />
-    <Resource Include="CodeFiles\ChartSeriesDataPointsBindingView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChartSeriesDataPointsBindingView.xaml.txt" />
-    <Resource Include="CodeFiles\ChartStylingAxesGridView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChartStylingAxesGridView.xaml.txt" />
-    <Resource Include="CodeFiles\ChartStylingColumnSeriesView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChartStylingColumnSeriesView.xaml.txt" />
-    <Resource Include="CodeFiles\ChartStylingLineSeriesView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChartStylingLineSeriesView.xaml.txt" />
-    <Resource Include="CodeFiles\ChartStylingPieSeriesView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChartStylingPieSeriesView.xaml.txt" />
-    <Resource Include="CodeFiles\CheckListsView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\CheckListsView.xaml.txt" />
-    <Resource Include="CodeFiles\ChildWindowView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ChildWindowView.xaml.txt" />
-    <Resource Include="CodeFiles\ColorView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ColorView.xaml.txt" />
-    <Resource Include="CodeFiles\DataGridView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\DataGridView.xaml.txt" />
-    <Resource Include="CodeFiles\DateTimeView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\DateTimeView.xaml.txt" />
-    <Resource Include="CodeFiles\DisplayLocalizationRes.Designer.cs.txt" />
-    <Resource Include="CodeFiles\DropDownSplitButtonView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\DropDownSplitButtonView.xaml.txt" />
-    <Resource Include="CodeFiles\ListBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ListBoxView.xaml.txt" />
-    <Resource Include="CodeFiles\MagnifierView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MagnifierView.xaml.txt" />
-    <Resource Include="CodeFiles\MaskedTextboxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaskedTextboxView.xaml.txt" />
-    <Resource Include="CodeFiles\MultiColumnComboBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MultiColumnComboBoxView.xaml.txt" />
-    <Resource Include="CodeFiles\MultiLineTextEditorView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MultiLineTextEditorView.xaml.txt" />
-    <Resource Include="CodeFiles\NumericView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\NumericView.xaml.txt" />
-    <Resource Include="CodeFiles\PieChartView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PieChartView.xaml.txt" />
-    <Resource Include="CodeFiles\PieProgressView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PieProgressView.xaml.txt" />
-    <Resource Include="CodeFiles\PieView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PieView.xaml.txt" />
-    <Resource Include="CodeFiles\PileFlowPanelView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PileFlowPanelView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridAttributesView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridAttributesView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridBindingToStructsView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridBindingToStructsView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridCategoryOrderView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridCategoryOrderView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridCustomEditorsView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridCustomEditorsView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridCustomPropertyView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridCustomPropertyView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridDefaultEditorsView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridDefaultEditorsView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridDefinitionKeyView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridDefinitionKeyView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridDisplayLocalizationView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridDisplayLocalizationView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridEditorDefinitionsView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridEditorDefinitionsView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridMultiSelectedObjectsView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridMultiSelectedObjectsView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridPropertiesSourceView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridPropertiesSourceView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridPropertiesView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridPropertiesView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridPropertyItemStyleView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridPropertyItemStyleView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridSelectedObjectView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridSelectedObjectView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridSpecifyingPropertiesView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridSpecifyingPropertiesView.xaml.txt" />
-    <Resource Include="CodeFiles\PropertyGridView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridView.xaml.txt" />
-    <Resource Include="CodeFiles\RichTextboxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\RichTextboxView.xaml.txt" />
-    <Resource Include="CodeFiles\SwitchPanelView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\SwitchPanelView.xaml.txt" />
-    <Resource Include="CodeFiles\ThemingCoreWPFView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ThemingCoreWPFView.xaml.txt" />
-    <Resource Include="CodeFiles\ThemingDataGridView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ThemingDataGridView.xaml.txt" />
-    <Resource Include="CodeFiles\ThemingExtendedToolkitView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ThemingExtendedToolkitView.xaml.txt" />
-    <Resource Include="CodeFiles\ThemingListBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ThemingListBoxView.xaml.txt" />
-    <Resource Include="CodeFiles\TimelinePanelView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\TimelinePanelView.xaml.txt" />
-    <Resource Include="CodeFiles\WatermarkTextboxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\WatermarkTextboxView.xaml.txt" />
-    <Resource Include="CodeFiles\WindowContainerView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\WindowContainerView.xaml.txt" />
-    <Resource Include="CodeFiles\WizardView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\WizardView.xaml.txt" />
-    <Resource Include="CodeFiles\ZoomboxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ZoomboxView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Theming\Images\address-book--pencil.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Theming\Images\property-blue.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Theming\Images\address-book-open.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Theming\Images\alarm-clock-blue.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Theming\Images\document.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\ThemingAvalonDockView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ThemingAvalonDockView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockMetroDark.png" />
-    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockMetroLight.png" />
-    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockOffice2007Black.png" />
-    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockOffice2007Blue.png" />
-    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockOffice2007Silver.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\RadialGaugeView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\RadialGaugeView.xaml.txt" />
-    <Resource Include="CodeFiles\RangeSliderView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\RangeSliderView.xaml.txt" />
-    <Resource Include="CodeFiles\RatingView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\RatingView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Gauge\Resources\fuel.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Gauge\Resources\pointing.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Gauge\Resources\arrow.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Gauge\Resources\smiley.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\TimeSpanView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\TimeSpanView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\ToggleSwitchView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\ToggleSwitchView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Gauge\OpenSourceImages\Gauge.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Rating\OpenSourceImages\Rating.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\TokenizedTextBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\TokenizedTextBoxView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\ToggleSwitch\OpenSourceImages\ToggleSwitch.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Text\OpenSourceImages\TokenizedTextBox.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\StyleableWindowView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\StyleableWindowView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\FilePickerView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\FilePickerView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\SlideShowView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\SlideShowView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\FilePicker\OpenSourceImages\FilePicker.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\WatermarkComboBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\WatermarkComboBoxView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\WatermarkComboBox\Resources\PencilTool16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\SlideShow\Resources\photo_1.jpg" />
-    <Resource Include="Samples\SlideShow\Resources\photo_2.jpg" />
-    <Resource Include="Samples\SlideShow\Resources\photo_3.jpg" />
-    <Resource Include="Samples\SlideShow\Resources\photo_4.jpg" />
-    <Resource Include="Samples\SlideShow\Resources\photo_5.jpg" />
-    <Resource Include="Samples\SlideShow\Resources\photo_6.jpg" />
-    <Resource Include="Samples\SlideShow\Resources\photo_7.jpg" />
-    <Resource Include="Samples\SlideShow\Resources\photo_8.jpg" />
-    <Resource Include="Samples\SlideShow\Resources\photo_9.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\SlideShow\OpenSourceImages\SlideShow.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialControlsView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialControlsView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MaterialControls\Resources\WhitePen.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialButtonView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialButtonView.xaml.txt" />
-    <Resource Include="CodeFiles\MaterialSliderView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialSliderView.xaml.txt" />
-    <Resource Include="CodeFiles\MaterialTextFieldView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialTextFieldView.xaml.txt" />
-    <Resource Include="CodeFiles\MaterialToastView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialToastView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialCheckBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialCheckBoxView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MaterialControls\Resources\building16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MaterialControls\Resources\PencilTool16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialRadioButtonView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialRadioButtonView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialProgressBarCircularView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialProgressBarCircularView.xaml.txt" />
-    <Resource Include="CodeFiles\MaterialProgressBarView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialProgressBarView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialTabsView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialTabsView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialFrameView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialFrameView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialSwitchView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialSwitchView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialDropDownView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialDropDownView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialToolTipView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialToolTipView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialListBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialListBoxView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\ToggleSwitch\Resources\PencilTool16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialButton.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialCheckBox.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialControls.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialDropDown.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialFrame.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialListBox.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialProgressBar.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialProgressBarCircular.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialRadioButton.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialSlider.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialSwitch.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialTabs.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialTextField.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialToast.png" />
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialToolTip.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MaterialControls\Resources\italy.4.gif" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialComboBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialComboBoxView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialComboBox.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\WatermarkPasswordBoxView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\WatermarkPasswordBoxView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MultiCalendar\Resources\April.jpg" />
-    <Resource Include="Samples\MultiCalendar\Resources\December.jpg" />
-    <Resource Include="Samples\MultiCalendar\Resources\February.jpg" />
-    <Resource Include="Samples\MultiCalendar\Resources\July.jpg" />
-    <Resource Include="Samples\MultiCalendar\Resources\June.jpg" />
-    <Resource Include="Samples\MultiCalendar\Resources\March.jpg" />
-    <Resource Include="Samples\MultiCalendar\Resources\October.jpg" />
-    <Resource Include="Samples\MultiCalendar\Resources\September.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MultiCalendarView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MultiCalendarView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MultiCalendar\OpenSourceImages\MultiCalendar.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\toolkitIcon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\PropertyGridExpandingNonPrimitivesView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\PropertyGridExpandingNonPrimitivesView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\PropertyGrid\OpenSourceImages\ExpandingNonPrimitives.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockWindows10.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\MaterialHamburgerView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\MaterialHamburgerView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CodeFiles\IconButtonView.xaml.cs.txt" />
-    <Resource Include="CodeFiles\IconButtonView.xaml.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Button\Resources\PencilTool16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\Button\Resources\Default.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MaterialControls\Resources\Business.png" />
-    <Resource Include="Samples\MaterialControls\Resources\DataGrid.png" />
-    <Resource Include="Samples\MaterialControls\Resources\SFTP.png" />
-    <Resource Include="Samples\MaterialControls\Resources\Toolkit.png" />
-    <Resource Include="Samples\MaterialControls\Resources\Zip.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialHamburger.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
-    <PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="8.0.0" />
-    <PackageReference Include="System.ServiceModel.Security" Version="6.0.0" />
-    <PackageReference Include="System.ServiceModel.Federation" Version="8.0.0" />
-  </ItemGroup>
-  <PropertyGroup />
-  <PropertyGroup>
-    <PreBuildEvent>echo Deleting old CodeFiles directory...
-@if exist "$(ProjectDir)CodeFiles" rmdir /s /q "$(ProjectDir)CodeFiles"
-echo Copying sample code files...
-for /d /r "$(ProjectDir)Samples" %25%25a in (Views) do @if exist "%25%25a" xcopy "%25%25a" "$(ProjectDir)CodeFiles" /s /Y /I /q &gt; NUL
-echo Renaming sample code files...
-for /f "tokens=*" %25%25f in ('dir "$(ProjectDir)CodeFiles\*.*" /b') do ( 
-move /y "$(ProjectDir)CodeFiles\%25%25f" "$(ProjectDir)CodeFiles\%25%25f.txt" &gt; NUL
-)
-</PreBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/app.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/app.config
deleted file mode 100644
index a5dd4154..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/app.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-            <setting name="lastSample" serializeAs="String">
-                <value/>
-            </setting>
-        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-    </userSettings>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
deleted file mode 100644
index 23366171..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-            <setting name="lastSample" serializeAs="String">
-                <value/>
-            </setting>
-        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-    </userSettings>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
deleted file mode 100644
index 23366171..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Debug/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-            <setting name="lastSample" serializeAs="String">
-                <value/>
-            </setting>
-        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-    </userSettings>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
deleted file mode 100644
index 85f8d7ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.application" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="Xceed Software Inc." asmv2:product="Xceed Toolkit Plus for WPF LiveExplorer" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" mapFileExtensions="true" />
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.0" profile="Client" supportedRuntime="4.0.30319" />
-    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest" size="17174">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ob1xtL0NFoBuWOm6eWhtN/R2wCI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
deleted file mode 100644
index 23366171..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-            <setting name="lastSample" serializeAs="String">
-                <value/>
-            </setting>
-        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-    </userSettings>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
deleted file mode 100644
index df3d3358..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-  <description asmv2:iconFile="App.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <application />
-  <entryPoint>
-    <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-    <commandLine file="Xceed.Wpf.Toolkit.LiveExplorer.exe" parameters="" />
-  </entryPoint>
-  <trustInfo>
-    <security>
-      <applicationRequestMinimum>
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-      </applicationRequestMinimum>
-      <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>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentOS>
-      <osVersionInfo>
-        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
-      </osVersionInfo>
-    </dependentOS>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.dll" size="427008">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fJ+tiQsbOQwfGd3itpkyUquu3RA=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="de" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>iK9HDffv2Q6qrh3sPkrXxIxhPYQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="es" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5BfdaqLid+/kyJCQX52bEt2rEU8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>FmHDLfKoQyzMD6VzydX31KxFVwQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="hu\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="hu" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>HysaXhpNt3jXo9+ZbwTHhmqc/ZI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="it\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="it" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>wWS+24oJwFk6HrRmBg5TmTuOSrI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="pt-BR\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="pt-BR" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fLJrmg3/6gkuHVpvm48rHU0PQu8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ro\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ro" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>APZdP9nOSFv9/VEayZ7e1u3YQwg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ru\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ru" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dSmBWR4oV60hXzMEcu5Pzv78324=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="sv" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>v9u0pYRMOsstuMutmXdyhxwVSoE=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="zh-Hans" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>aLiV5N9DeMFHFId42Hauinb7z10=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="87040">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>pHMnOAZhLdiVxLW8WVr7oKSNvzc=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79872">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>6HW2YrRgZzx55mSInWqY5G2Rmtg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="84480">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dk2/e/lvOlxMqaSBa7vwkuVMmWY=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435584">
-      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>K9KOIk/JBcp0My6g71prOBaVSso=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Samples.SampleData.dll" size="2506240">
-      <assemblyIdentity name="Xceed.Wpf.Samples.SampleData" version="2.0.13161.5" publicKeyToken="BA83FF368B7563C6" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>h7GeHgNOmosQ3JAdBzkZH1g8UZs=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.dll" size="1104384">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>rzSCAw1wGgE9FFQGxPlp62E0H3E=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16285184">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>e/H+bvBidZ6C9yzoGNEGVxWvT3Q=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll" size="5632">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.resources" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>vsLAPrssl9QqQjMJSoMqV2acKVI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <file name="App.ico" size="31356">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>+gOYudfK6KDh/6TPnBz61fPTSDc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <file name="Xceed.Wpf.Toolkit.LiveExplorer.exe.config" size="1186">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>I+4TtxHlXRDLuy+spjHIoJq5EXc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <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>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application
deleted file mode 100644
index 85f8d7ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.application
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.application" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="Xceed Software Inc." asmv2:product="Xceed Toolkit Plus for WPF LiveExplorer" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" mapFileExtensions="true" />
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.0" profile="Client" supportedRuntime="4.0.30319" />
-    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest" size="17174">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ob1xtL0NFoBuWOm6eWhtN/R2wCI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
deleted file mode 100644
index 23366171..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.config
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-    <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-        </sectionGroup>
-    </configSections>
-    <userSettings>
-        <Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-            <setting name="lastSample" serializeAs="String">
-                <value/>
-            </setting>
-        </Xceed.Wpf.Toolkit.LiveExplorer.Properties.Settings>
-    </userSettings>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="Xceed.Wpf.Toolkit" publicKeyToken="BA83FF368B7563C6" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.2.14066.5" newVersion="2.2.14066.5"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-</configuration>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest
deleted file mode 100644
index df3d3358..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/bin/Release/Xceed.Wpf.Toolkit.LiveExplorer.vshost.exe.manifest
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-  <description asmv2:iconFile="App.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <application />
-  <entryPoint>
-    <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-    <commandLine file="Xceed.Wpf.Toolkit.LiveExplorer.exe" parameters="" />
-  </entryPoint>
-  <trustInfo>
-    <security>
-      <applicationRequestMinimum>
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-      </applicationRequestMinimum>
-      <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>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentOS>
-      <osVersionInfo>
-        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
-      </osVersionInfo>
-    </dependentOS>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.dll" size="427008">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fJ+tiQsbOQwfGd3itpkyUquu3RA=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="de" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>iK9HDffv2Q6qrh3sPkrXxIxhPYQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="es" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5BfdaqLid+/kyJCQX52bEt2rEU8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>FmHDLfKoQyzMD6VzydX31KxFVwQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="hu\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="hu" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>HysaXhpNt3jXo9+ZbwTHhmqc/ZI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="it\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="it" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>wWS+24oJwFk6HrRmBg5TmTuOSrI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="pt-BR\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="pt-BR" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fLJrmg3/6gkuHVpvm48rHU0PQu8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ro\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ro" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>APZdP9nOSFv9/VEayZ7e1u3YQwg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ru\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ru" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dSmBWR4oV60hXzMEcu5Pzv78324=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="sv" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>v9u0pYRMOsstuMutmXdyhxwVSoE=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="zh-Hans" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>aLiV5N9DeMFHFId42Hauinb7z10=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="87040">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>pHMnOAZhLdiVxLW8WVr7oKSNvzc=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79872">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>6HW2YrRgZzx55mSInWqY5G2Rmtg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="84480">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dk2/e/lvOlxMqaSBa7vwkuVMmWY=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435584">
-      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>K9KOIk/JBcp0My6g71prOBaVSso=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Samples.SampleData.dll" size="2506240">
-      <assemblyIdentity name="Xceed.Wpf.Samples.SampleData" version="2.0.13161.5" publicKeyToken="BA83FF368B7563C6" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>h7GeHgNOmosQ3JAdBzkZH1g8UZs=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.dll" size="1104384">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>rzSCAw1wGgE9FFQGxPlp62E0H3E=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16285184">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>e/H+bvBidZ6C9yzoGNEGVxWvT3Q=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll" size="5632">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.resources" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>vsLAPrssl9QqQjMJSoMqV2acKVI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <file name="App.ico" size="31356">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>+gOYudfK6KDh/6TPnBz61fPTSDc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <file name="Xceed.Wpf.Toolkit.LiveExplorer.exe.config" size="1186">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>I+4TtxHlXRDLuy+spjHIoJq5EXc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <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>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
deleted file mode 100644
index b3fe78b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Debug/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Debug\Xceed.Wpf.Toolkit.LiveExplorer.exe.config
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.baml
deleted file mode 100644
index a1d82d8e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.cs
deleted file mode 100644
index d1818617..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/App.g.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "390A483377036FCDA29DB7DD54DF5E9AF95187A7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// App
-    /// </summary>
-    public partial class App : System.Windows.Application {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            
-            #line 19 "..\..\..\App.xaml"
-            this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative);
-            
-            #line default
-            #line hidden
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/app.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\App.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        /// <summary>
-        /// Application Entry Point.
-        /// </summary>
-        [System.STAThreadAttribute()]
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public static void Main() {
-            Xceed.Wpf.Toolkit.LiveExplorer.App app = new Xceed.Wpf.Toolkit.LiveExplorer.App();
-            app.InitializeComponent();
-            app.Run();
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.baml
deleted file mode 100644
index f3d7fa79..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.cs
deleted file mode 100644
index d045b4ec..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/HomeView.g.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-#pragma checksum "..\..\..\HomeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "93F1D27FBDD40851D9AE66FD9A5668B70EA6451C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// HomeView
-    /// </summary>
-    public partial class HomeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/homeview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\HomeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.baml
deleted file mode 100644
index 01f525b4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.cs
deleted file mode 100644
index 7c4779ad..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/MainWindow.g.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3CF1EA66A822C4AC9CFE41DF8032D41B8B03A466"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Core;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer {
-    
-    
-    /// <summary>
-    /// MainWindow
-    /// </summary>
-    public partial class MainWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 453 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TreeView _treeView;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 730 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock VersionTextBlock;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 751 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ScrollViewer _contentScrollViewer;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 808 "..\..\..\MainWindow.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Documents.FlowDocument _flowDocumentDesc;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/mainwindow.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\MainWindow.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 447 "..\..\..\MainWindow.xaml"
-            ((System.Windows.Controls.Image)(target)).MouseLeftButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.Image_MouseLeftButtonDown);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._treeView = ((System.Windows.Controls.TreeView)(target));
-            
-            #line 456 "..\..\..\MainWindow.xaml"
-            this._treeView.SelectedItemChanged += new System.Windows.RoutedPropertyChangedEventHandler<object>(this.OnTreeViewSelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.VersionTextBlock = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 4:
-            this._contentScrollViewer = ((System.Windows.Controls.ScrollViewer)(target));
-            return;
-            case 5:
-            this._flowDocumentDesc = ((System.Windows.Documents.FlowDocument)(target));
-            return;
-            case 6:
-            
-            #line 833 "..\..\..\MainWindow.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/LiveExplorerScrollViewer.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/LiveExplorerScrollViewer.baml
deleted file mode 100644
index 3ff8c459..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/LiveExplorerScrollViewer.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/TextBlockStyles.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/TextBlockStyles.baml
deleted file mode 100644
index 5fb9d95a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Resources/TextBlockStyles.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.baml
deleted file mode 100644
index 0d3bb33b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.cs
deleted file mode 100644
index 6758aea7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/AvalonDock/Views/AvalonDockView.g.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4184003D31925216F3878D31A0A038A151DC8366"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.AvalonDock;
-using Xceed.Wpf.AvalonDock.Controls;
-using Xceed.Wpf.AvalonDock.Converters;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Themes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views {
-    
-    
-    /// <summary>
-    /// AvalonDockView
-    /// </summary>
-    public partial class AvalonDockView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 43 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.DockingManager _dockingManager;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 57 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.Layout.LayoutRoot _layoutRoot;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/avalondock/views/avalondockview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._dockingManager = ((Xceed.Wpf.AvalonDock.DockingManager)(target));
-            return;
-            case 2:
-            this._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
-            return;
-            case 3:
-            
-            #line 160 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 164 "..\..\..\..\..\..\Samples\AvalonDock\Views\AvalonDockView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.LoadButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Resources/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Resources/Common.baml
deleted file mode 100644
index 3c2c4575..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Resources/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml
deleted file mode 100644
index fb3159f2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs
deleted file mode 100644
index 78ba4bd9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.g.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "505A4F840B035C9CE288E78CCEF88ED817BA6293"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorCustomContentTemplateView
-    /// </summary>
-    public partial class BusyIndicatorCustomContentTemplateView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orcustomcontenttemplateview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml
deleted file mode 100644
index 5582a180..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs
deleted file mode 100644
index 6ca5dc27..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.g.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FE941C4EEF1E6592FC87A8051E4E818BF8F917C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorCustomContentView
-    /// </summary>
-    public partial class BusyIndicatorCustomContentView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orcustomcontentview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.baml
deleted file mode 100644
index 4d79ad7a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs
deleted file mode 100644
index 16aaaf8d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/BusyIndicator/Views/BusyIndicatorView.g.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F3CABE2E47D5C9FD537D7CEFF5F2C544158B0465"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views {
-    
-    
-    /// <summary>
-    /// BusyIndicatorView
-    /// </summary>
-    public partial class BusyIndicatorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 58 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isBusy;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 62 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _displayAfter;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/busyindicator/views/busyindicat" +
-                    "orview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\BusyIndicator\Views\BusyIndicatorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._isBusy = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._displayAfter = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.baml
deleted file mode 100644
index 72e4d050..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.cs
deleted file mode 100644
index 16a193b2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/ButtonSpinnerView.g.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D00037D3F411AFF3AF6F807E13314F217BA31C23"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// ButtonSpinnerView
-    /// </summary>
-    public partial class ButtonSpinnerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 62 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _allowSpin;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showButtonSpinner;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/buttonspinnerview." +
-                    "xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._allowSpin = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._showButtonSpinner = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            
-            #line 79 "..\..\..\..\..\..\Samples\Button\Views\ButtonSpinnerView.xaml"
-            ((Xceed.Wpf.Toolkit.ButtonSpinner)(target)).Spin += new System.EventHandler<Xceed.Wpf.Toolkit.SpinEventArgs>(this.ButtonSpinner_Spin);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.baml
deleted file mode 100644
index 98cbaac7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.cs
deleted file mode 100644
index 44fc4b44..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/DropDownSplitButtonView.g.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CCF7AFAB30ED1FAE033D8056CE3C2DF31E2F7D9B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// DropDownSplitButtonView
-    /// </summary>
-    public partial class DropDownSplitButtonView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox dropDownPosition;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 92 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker dropDownContentBackground;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DropDownButton _dropDownButton;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 140 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.SplitButton _splitButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/dropdownsplitbutto" +
-                    "nview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 2:
-            this.dropDownPosition = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 3:
-            this.dropDownContentBackground = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 4:
-            this._dropDownButton = ((Xceed.Wpf.Toolkit.DropDownButton)(target));
-            
-            #line 127 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            this._dropDownButton.Click += new System.Windows.RoutedEventHandler(this.DropDownButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            
-            #line 131 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this._splitButton = ((Xceed.Wpf.Toolkit.SplitButton)(target));
-            
-            #line 150 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            this._splitButton.Click += new System.Windows.RoutedEventHandler(this.SplitButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 7:
-            
-            #line 154 "..\..\..\..\..\..\Samples\Button\Views\DropDownSplitButtonView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.baml
deleted file mode 100644
index 96b5d362..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.cs
deleted file mode 100644
index 2b9f6330..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Button/Views/IconButtonView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "26D524D9CD0D9DCB643D75B9D9BCFCD2D683514F"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views {
-    
-    
-    /// <summary>
-    /// IconButtonView
-    /// </summary>
-    public partial class IconButtonView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IconButton _iconButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/button/views/iconbuttonview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Button\Views\IconButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._iconButton = ((Xceed.Wpf.Toolkit.IconButton)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.baml
deleted file mode 100644
index 6a49af3f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.cs
deleted file mode 100644
index 32307a6f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Calculator/Views/CalculatorView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E87AC7A172AE27C61D008E01DE92F61D305BBBD1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Calculator.Views {
-    
-    
-    /// <summary>
-    /// CalculatorView
-    /// </summary>
-    public partial class CalculatorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 47 "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _precision;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/calculator/views/calculatorview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Calculator\Views\CalculatorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._precision = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.baml
deleted file mode 100644
index be346396..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.cs
deleted file mode 100644
index 7995e4fc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartAxisView.g.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8C804BAC059DE6A9167F0B4AE0B8060C1EC1752D"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartAxisView
-    /// </summary>
-    public partial class ChartAxisView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 23 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartAxisView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartaxisview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartAxisView)(target));
-            return;
-            case 2:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartAxisView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.baml
deleted file mode 100644
index 0a795ae9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.cs
deleted file mode 100644
index e658c128..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartLegendView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5B3473F047D9EBA09D5F80EEF14CBE425E00C9A2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartLegendView
-    /// </summary>
-    public partial class ChartLegendView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartlegendview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\Chart\Views\ChartLegendView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.baml
deleted file mode 100644
index f0b7ebd7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs
deleted file mode 100644
index dc0f4669..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesBasicTypesView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F42D42595B29EAC4CA2F06846B044A39E9A19EF1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartSeriesBasicTypesView
-    /// </summary>
-    public partial class ChartSeriesBasicTypesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartseriesbasictyp" +
-                    "esview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml
deleted file mode 100644
index 8dc0db9b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs
deleted file mode 100644
index e303e8cf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartSeriesDataPointsBindingView.g.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BF7F10BC81C29636C39143B45DEB7CD3DDA62579"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartSeriesDataPointsBindingView
-    /// </summary>
-    public partial class ChartSeriesDataPointsBindingView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartseriesdatapoin" +
-                    "tsbindingview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.baml
deleted file mode 100644
index 3d866a51..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.cs
deleted file mode 100644
index 16113537..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingAxesGridView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5EFECE7A64E470F596F4AAC0D11813D8AD5AE1BC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingAxesGridView
-    /// </summary>
-    public partial class ChartStylingAxesGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingaxesgri" +
-                    "dview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 30 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingAxesGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.baml
deleted file mode 100644
index a5c701a8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs
deleted file mode 100644
index 07f1b051..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingColumnSeriesView.g.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C9998F13EBC3CEE5609463ED34AD14CD16A0D678"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingColumnSeriesView
-    /// </summary>
-    public partial class ChartStylingColumnSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingcolumns" +
-                    "eriesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.baml
deleted file mode 100644
index d5ed77c9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs
deleted file mode 100644
index 7b330a82..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingLineSeriesView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C07A3C4DE4E22FC130473B09CE7667D8AE629495"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingLineSeriesView
-    /// </summary>
-    public partial class ChartStylingLineSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylinglineser" +
-                    "iesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingLineSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.baml
deleted file mode 100644
index cc7759c8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs
deleted file mode 100644
index 6d05c33b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Chart/Views/ChartStylingPieSeriesView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DA9803CB2637FF8978B290CD5C36E0D1C2BE40EE"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views {
-    
-    
-    /// <summary>
-    /// ChartStylingPieSeriesView
-    /// </summary>
-    public partial class ChartStylingPieSeriesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/chart/views/chartstylingpieseri" +
-                    "esview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Chart\Views\ChartStylingPieSeriesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.baml
deleted file mode 100644
index eea96d0f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.cs
deleted file mode 100644
index af4178c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/CheckLists/Views/CheckListsView.g.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "941466095FB32B910BA0A512601E89AB0AA934B5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views {
-    
-    
-    /// <summary>
-    /// CheckListsView
-    /// </summary>
-    public partial class CheckListsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views.CheckListsView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 75 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _delimiter;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _valueMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 100 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectedValue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectedMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _displayMemberPath;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 140 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isSelectAllActive;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 154 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _selectAllContent;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 182 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isEditable;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 195 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isDropDownOpen;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 208 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 245 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CheckListBox _checkListBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 263 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CheckComboBox _checkComboBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/checklists/views/checklistsview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\CheckLists\Views\CheckListsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views.CheckListsView)(target));
-            return;
-            case 2:
-            this._delimiter = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._valueMemberPath = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 4:
-            this._selectedValue = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 5:
-            this._selectedMemberPath = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 6:
-            this._displayMemberPath = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 7:
-            this._isSelectAllActive = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 8:
-            this._selectAllContent = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 9:
-            this._isEditable = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 10:
-            this._isDropDownOpen = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 11:
-            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 12:
-            this._checkListBox = ((Xceed.Wpf.Toolkit.CheckListBox)(target));
-            return;
-            case 13:
-            this._checkComboBox = ((Xceed.Wpf.Toolkit.CheckComboBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.baml
deleted file mode 100644
index 83d013a4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.cs
deleted file mode 100644
index bb15b0bf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Color/Views/ColorView.g.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "83ED4E025BB07DA3C33D787885B15F688164251F"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Color.Views {
-    
-    
-    /// <summary>
-    /// ColorView
-    /// </summary>
-    public partial class ColorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 117 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _R;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 124 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _G;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 131 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _B;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 138 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _A;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 150 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _usingAlphaChannel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 166 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorCanvas _colorCanvas;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 339 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _colorPicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/color/views/colorview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Color\Views\ColorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._R = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 2:
-            this._G = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 3:
-            this._B = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 4:
-            this._A = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 5:
-            this._usingAlphaChannel = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 6:
-            this._colorCanvas = ((Xceed.Wpf.Toolkit.ColorCanvas)(target));
-            return;
-            case 7:
-            this._colorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.baml
deleted file mode 100644
index aec026a5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.cs
deleted file mode 100644
index 8d378346..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/DataGridView.g.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1C826C0FA58D15045E39A3749E2B76613FA36B03"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views {
-    
-    
-    /// <summary>
-    /// DataGridView
-    /// </summary>
-    public partial class DataGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 27 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.DataGridView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 99 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.DataGrid.DataGridControl _dataGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datagrid/views/datagridview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.DataGridView)(target));
-            return;
-            case 2:
-            
-            #line 31 "..\..\..\..\..\..\Samples\DataGrid\Views\DataGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._dataGrid = ((Xceed.Wpf.DataGrid.DataGridControl)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.baml
deleted file mode 100644
index 0856d7e8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs
deleted file mode 100644
index db46c926..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DataGrid/Views/MultiColumnComboBoxView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2C46586B1B83E9616A3E806F86D6795F97D1B157"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views {
-    
-    
-    /// <summary>
-    /// MultiColumnComboBoxView
-    /// </summary>
-    public partial class MultiColumnComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.MultiColumnComboBoxView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datagrid/views/multicolumncombo" +
-                    "boxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.MultiColumnComboBoxView)(target));
-            return;
-            case 2:
-            
-            #line 30 "..\..\..\..\..\..\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.baml
deleted file mode 100644
index bf75611c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.cs
deleted file mode 100644
index 7b34a0a8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/DateTime/Views/DateTimeView.g.cs
+++ /dev/null
@@ -1,354 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AE5461EE3B5F7FDAB21F0D2A6ADAC0C342F18CCC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views {
-    
-    
-    /// <summary>
-    /// DateTimeView
-    /// </summary>
-    public partial class DateTimeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 96 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _format;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 98 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _formatString;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 100 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _watermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 102 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _autoCloseCalendar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 104 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _clipValueToMinMax;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 106 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _kind;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 108 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _calendarDisplayMode;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 110 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _calendarWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showDropDownButton;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 114 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _timePickerVisibility;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 116 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _timePickerShowButtonSpinner;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 119 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _timeFormat;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 121 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _timeFormatString;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 123 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _timeWatermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _minimum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 127 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _maximum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 129 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _currentDateTimePart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimePicker _datetimePicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 173 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _startTime;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 175 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _endTime;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 177 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DateTimeUpDown _timeInterval;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 179 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maxDropDownHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 185 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimePicker _timePicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/datetime/views/datetimeview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\DateTime\Views\DateTimeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._format = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._formatString = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._watermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 4:
-            this._autoCloseCalendar = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 5:
-            this._clipValueToMinMax = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 6:
-            this._kind = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 7:
-            this._calendarDisplayMode = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 8:
-            this._calendarWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 9:
-            this._showDropDownButton = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 10:
-            this._timePickerVisibility = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 11:
-            this._timePickerShowButtonSpinner = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 12:
-            this._timeFormat = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 13:
-            this._timeFormatString = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 14:
-            this._timeWatermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 15:
-            this._minimum = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 16:
-            this._maximum = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 17:
-            this._currentDateTimePart = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 18:
-            this._datetimePicker = ((Xceed.Wpf.Toolkit.DateTimePicker)(target));
-            return;
-            case 19:
-            this._startTime = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 20:
-            this._endTime = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 21:
-            this._timeInterval = ((Xceed.Wpf.Toolkit.DateTimeUpDown)(target));
-            return;
-            case 22:
-            this._maxDropDownHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 23:
-            this._timePicker = ((Xceed.Wpf.Toolkit.TimePicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.baml
deleted file mode 100644
index 59c55589..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.cs
deleted file mode 100644
index cfab40ce..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/FilePicker/Views/FilePickerView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FFD1E0CB98576A25E937EAADC5FAC5693319EA61"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views {
-    
-    
-    /// <summary>
-    /// FilePickerView
-    /// </summary>
-    public partial class FilePickerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/filepicker/views/filepickerview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\FilePicker\Views\FilePickerView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.baml
deleted file mode 100644
index 7ac9ab40..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.cs
deleted file mode 100644
index 5a25360f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Gauge/Views/RadialGaugeView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1B8C9103AC8493381EA7BFE7B224823C95071389"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views {
-    
-    
-    /// <summary>
-    /// RadialGaugeView
-    /// </summary>
-    public partial class RadialGaugeView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/gauge/views/radialgaugeview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\Gauge\Views\RadialGaugeView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.baml
deleted file mode 100644
index ef6cade2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.cs
deleted file mode 100644
index 526a9a8e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ListBox/Views/ListBoxView.g.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D6CD32989CB3B4DE3FB3B90B4A6070685E2A40B1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Converters;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views {
-    
-    
-    /// <summary>
-    /// ListBoxView
-    /// </summary>
-    public partial class ListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/listbox/views/listboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\ListBox\Views\ListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.baml
deleted file mode 100644
index 5ed73908..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.cs
deleted file mode 100644
index 2df61ed9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Magnifier/Views/MagnifierView.g.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2337CE89FBB5BDFC9E1F9DAEC4C05118389761B7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Views {
-    
-    
-    /// <summary>
-    /// MagnifierView
-    /// </summary>
-    public partial class MagnifierView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 67 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _zoomFactor;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 69 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _isUsingZoomOnMouseWheel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 71 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _zoomFactorOnMouseWheel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 74 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _frameType;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 76 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _radius;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _width;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _height;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _borderThickness;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 85 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _colorPicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 91 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RichTextBox _txtContent;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 96 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Magnifier _magnifier;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/magnifier/views/magnifierview.x" +
-                    "aml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Magnifier\Views\MagnifierView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._zoomFactor = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 2:
-            this._isUsingZoomOnMouseWheel = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._zoomFactorOnMouseWheel = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 4:
-            this._frameType = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 5:
-            this._radius = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 6:
-            this._width = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 7:
-            this._height = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 8:
-            this._borderThickness = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 9:
-            this._colorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 10:
-            this._txtContent = ((Xceed.Wpf.Toolkit.RichTextBox)(target));
-            return;
-            case 11:
-            this._magnifier = ((Xceed.Wpf.Toolkit.Magnifier)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Resources/CommonResources.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Resources/CommonResources.baml
deleted file mode 100644
index 35394e1f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Resources/CommonResources.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.baml
deleted file mode 100644
index 901b985e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.cs
deleted file mode 100644
index ff22ae66..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialButtonView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2EAC5164A682FB91B6846992E5B20D52BAB354A9"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialButtonView
-    /// </summary>
-    public partial class MaterialButtonView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "buttonview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialButtonView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.baml
deleted file mode 100644
index cadbbf2e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs
deleted file mode 100644
index e0e9d276..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialCheckBoxView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8BF9F38F89D04BC0EC062D65DCCB906E733D357B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialCheckBoxView
-    /// </summary>
-    public partial class MaterialCheckBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "checkboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.baml
deleted file mode 100644
index f5cf7d7c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs
deleted file mode 100644
index 3795f30e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialComboBoxView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0C9E22FDA71295E0D3EAFD589A1496F4D57B980A"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialComboBoxView
-    /// </summary>
-    public partial class MaterialComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "comboboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialComboBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.baml
deleted file mode 100644
index 199d188d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.cs
deleted file mode 100644
index 55d02931..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialControlsView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "868969B88088DD7201358BBA6922D086A7A39939"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialControlsView
-    /// </summary>
-    public partial class MaterialControlsView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "controlsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialControlsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.baml
deleted file mode 100644
index 19cf382c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.cs
deleted file mode 100644
index 6867ad05..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialDropDownView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "800D4D72EE7A2FEF6622191EB396B2EBBD00A4DA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialDropDownView
-    /// </summary>
-    public partial class MaterialDropDownView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "dropdownview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialDropDownView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.baml
deleted file mode 100644
index a7e567f2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.cs
deleted file mode 100644
index bc5e64f7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialFrameView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "51E00456169AE2C251A2FCFD1961C5DE88301C33"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialFrameView
-    /// </summary>
-    public partial class MaterialFrameView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "frameview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialFrameView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.baml
deleted file mode 100644
index 53d832e8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs
deleted file mode 100644
index 0dbbd96c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialHamburgerView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "413281F20C1136C4FA605EC5668DEEE815490490"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialHamburgerView
-    /// </summary>
-    public partial class MaterialHamburgerView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "hamburgerview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialHamburgerView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.baml
deleted file mode 100644
index 1d4515c4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.cs
deleted file mode 100644
index 34fbc2ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialListBoxView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0F28EC1AF2E636ACBE6BC2FA713AE3449A619D53"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialListBoxView
-    /// </summary>
-    public partial class MaterialListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "listboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml
deleted file mode 100644
index 457b9251..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs
deleted file mode 100644
index 96eb7254..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarCircularView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6CD67C33DF6EB4F77817E02C1C0019D4148D49CE"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialProgressBarCircularView
-    /// </summary>
-    public partial class MaterialProgressBarCircularView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "progressbarcircularview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.baml
deleted file mode 100644
index 9a7a9ce2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs
deleted file mode 100644
index 4ebc13c2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialProgressBarView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A4F97A3BCD49F6ECB5DA19B3E4DE4E1F6F3086B0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialProgressBarView
-    /// </summary>
-    public partial class MaterialProgressBarView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "progressbarview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialProgressBarView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.baml
deleted file mode 100644
index d48e40b5..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs
deleted file mode 100644
index 42652a16..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialRadioButtonView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "94F13CA33AEC1D0FD87E6D178368EE63FF929112"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialRadioButtonView
-    /// </summary>
-    public partial class MaterialRadioButtonView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "radiobuttonview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.baml
deleted file mode 100644
index 0f278dc1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.cs
deleted file mode 100644
index acac5c78..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSliderView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DD445FA49F35D1A0C4A698CE9DA3611C6FA7A06E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialSliderView
-    /// </summary>
-    public partial class MaterialSliderView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "sliderview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSliderView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.baml
deleted file mode 100644
index 47196bc8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.cs
deleted file mode 100644
index f0f407a9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialSwitchView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "04E9529C35C75B82D3098D7B039CA367F8B0B4B8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialSwitchView
-    /// </summary>
-    public partial class MaterialSwitchView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "switchview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialSwitchView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.baml
deleted file mode 100644
index 5e466d40..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.cs
deleted file mode 100644
index cabc08e2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTabsView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E1359ECF655E5AC17BE759F5FE1CC6A5406B599C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialTabsView
-    /// </summary>
-    public partial class MaterialTabsView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "tabsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTabsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.baml
deleted file mode 100644
index 9544b6df..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs
deleted file mode 100644
index c816fba9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialTextFieldView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "523655B7A7BAF4A19B08674CB7A7F7C0053149F8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialTextFieldView
-    /// </summary>
-    public partial class MaterialTextFieldView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "textfieldview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialTextFieldView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.baml
deleted file mode 100644
index 09866039..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.cs
deleted file mode 100644
index 897ae98e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToastView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AA5522E305807B3D55CBC030AB353704C816C2F3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialToastView
-    /// </summary>
-    public partial class MaterialToastView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "toastview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToastView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.baml
deleted file mode 100644
index 876ec085..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.cs
deleted file mode 100644
index 467aacb5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MaterialControls/Views/MaterialToolTipView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BECDDE7ED3349FD930612718F2AE6FB156CFE773"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views {
-    
-    
-    /// <summary>
-    /// MaterialToolTipView
-    /// </summary>
-    public partial class MaterialToolTipView : Xceed.Wpf.Toolkit.LiveExplorer.MaterialDemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/materialcontrols/views/material" +
-                    "tooltipview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\MaterialControls\Views\MaterialToolTipView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.baml
deleted file mode 100644
index 77ab8c5c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.cs
deleted file mode 100644
index 30fe588f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/MultiCalendar/Views/MultiCalendarView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57605BFC1725C0AFBE73E0F01CCD82CC3BA674C9"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views {
-    
-    
-    /// <summary>
-    /// MultiCalendarView
-    /// </summary>
-    public partial class MultiCalendarView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/multicalendar/views/multicalend" +
-                    "arview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 36 "..\..\..\..\..\..\Samples\MultiCalendar\Views\MultiCalendarView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.baml
deleted file mode 100644
index 4678a1b6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.cs
deleted file mode 100644
index bbf99c69..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Numeric/Views/NumericView.g.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B729F3F01DA632A9C8D7CFBD3B8ACAB1A9150B39"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views {
-    
-    
-    /// <summary>
-    /// NumericView
-    /// </summary>
-    public partial class NumericView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views.NumericView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 399 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _doubleUpDown;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 436 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _enterClosesCalculator;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 459 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CalculatorUpDown _calculatorUpDown;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/numeric/views/numericview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Numeric\Views\NumericView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views.NumericView)(target));
-            return;
-            case 2:
-            this._doubleUpDown = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 3:
-            this._enterClosesCalculator = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._calculatorUpDown = ((Xceed.Wpf.Toolkit.CalculatorUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.baml
deleted file mode 100644
index ad22235a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.cs
deleted file mode 100644
index c013ac46..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Panels/Views/SwitchPanelView.g.cs
+++ /dev/null
@@ -1,331 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "A5E53FAD1480C29CA65C0DD98E46866B692A5BA6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views {
-    
-    
-    /// <summary>
-    /// SwitchPanelView
-    /// </summary>
-    public partial class SwitchPanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox layoutCombo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 161 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.SwitchPanel _switchPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.WrapPanel _wrapPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 164 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Panels.RandomPanel _randomPanel;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 166 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 167 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 168 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 169 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item4;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 170 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item5;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 171 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item6;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 172 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item7;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 173 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _item8;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 176 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Image _openSourceScreenShot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 177 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _openSourceScreenShotDesc;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 178 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.StackPanel _openSourceTextHyperlink;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 278 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _minimumWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 290 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maximumWidth;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 303 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _minimumHeight;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 315 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _maximumHeight;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/panels/views/switchpanelview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.layoutCombo = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 130 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            this.layoutCombo.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.OnLayoutComboSelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._switchPanel = ((Xceed.Wpf.Toolkit.Panels.SwitchPanel)(target));
-            
-            #line 161 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            this._switchPanel.ActiveLayoutChanged += new System.Windows.RoutedEventHandler(this.OnSwitchPanelLayoutChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._wrapPanel = ((Xceed.Wpf.Toolkit.Panels.WrapPanel)(target));
-            return;
-            case 4:
-            this._randomPanel = ((Xceed.Wpf.Toolkit.Panels.RandomPanel)(target));
-            return;
-            case 5:
-            this._item1 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 6:
-            this._item2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 7:
-            this._item3 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 8:
-            this._item4 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 9:
-            this._item5 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 10:
-            this._item6 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 11:
-            this._item7 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 12:
-            this._item8 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 13:
-            this._openSourceScreenShot = ((System.Windows.Controls.Image)(target));
-            return;
-            case 14:
-            this._openSourceScreenShotDesc = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 15:
-            this._openSourceTextHyperlink = ((System.Windows.Controls.StackPanel)(target));
-            return;
-            case 16:
-            
-            #line 181 "..\..\..\..\..\..\Samples\Panels\Views\SwitchPanelView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 17:
-            this._minimumWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 18:
-            this._maximumWidth = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 19:
-            this._minimumHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 20:
-            this._maximumHeight = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.baml
deleted file mode 100644
index 1f051c9b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.cs
deleted file mode 100644
index 91f085e1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieChartView.g.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8DB5421F5B54972E615E5155DFAF2B8D6BF16F39"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieChartView
-    /// </summary>
-    public partial class PieChartView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid LayoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ListBox PieDataListBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 139 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Viewbox PiesViewbox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 147 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid PiesGrid;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 150 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie WaterPie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 156 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie LactosePie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 163 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie FatPie;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 170 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie ProteinPie;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/piechartview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieChartView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.LayoutRoot = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.PieDataListBox = ((System.Windows.Controls.ListBox)(target));
-            return;
-            case 3:
-            this.PiesViewbox = ((System.Windows.Controls.Viewbox)(target));
-            return;
-            case 4:
-            this.PiesGrid = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 5:
-            this.WaterPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 6:
-            this.LactosePie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 7:
-            this.FatPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            case 8:
-            this.ProteinPie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.baml
deleted file mode 100644
index 2ebbe21e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.cs
deleted file mode 100644
index 1f0906a4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieProgressView.g.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CEF066AEB8D966767707C2C40A63907BBE30371B"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieProgressView
-    /// </summary>
-    public partial class PieProgressView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid LayoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ProgressBar progressBar;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 94 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button SimulateProgressButton;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/pieprogressview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieProgressView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.LayoutRoot = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 2:
-            this.progressBar = ((System.Windows.Controls.ProgressBar)(target));
-            return;
-            case 3:
-            this.SimulateProgressButton = ((System.Windows.Controls.Button)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.baml
deleted file mode 100644
index a4b83e8f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.cs
deleted file mode 100644
index 757d3d9d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Pie/Views/PieView.g.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5A199BC0E53011756378485BD4B51DDB87CAA705"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views {
-    
-    
-    /// <summary>
-    /// PieView
-    /// </summary>
-    public partial class PieView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 22 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider endAngleSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 145 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider sliceSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 190 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker FillSelector;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 205 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker StrokeSelector;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 216 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Pie pie;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pie/views/pieview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieView)(target));
-            return;
-            case 2:
-            
-            #line 79 "..\..\..\..\..\..\Samples\Pie\Views\PieView.xaml"
-            ((System.Windows.Controls.ComboBox)(target)).SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.endAngleSlider = ((System.Windows.Controls.Slider)(target));
-            return;
-            case 4:
-            this.sliceSlider = ((System.Windows.Controls.Slider)(target));
-            return;
-            case 5:
-            this.FillSelector = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 6:
-            this.StrokeSelector = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 7:
-            this.pie = ((Xceed.Wpf.Toolkit.Pie)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.baml
deleted file mode 100644
index 0fb6efd1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs
deleted file mode 100644
index 9f046c8a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PileFlowPanel/Views/PileFlowPanelView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "960DB9D59449C43DA09D49AF885A6357AF4BDD78"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views {
-    
-    
-    /// <summary>
-    /// PileFlowPanelView
-    /// </summary>
-    public partial class PileFlowPanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/pileflowpanel/views/pileflowpan" +
-                    "elview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml
deleted file mode 100644
index b1dde000..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs
deleted file mode 100644
index 636771da..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Resources/LastNameUserControlEditor.g.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E913F61FB79656ACEDB64F70D561FECC48D3A631"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid {
-    
-    
-    /// <summary>
-    /// LastNameUserControlEditor
-    /// </summary>
-    public partial class LastNameUserControlEditor : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 19 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.LastNameUserControlEditor _uc;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/resources/lastname" +
-                    "usercontroleditor.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._uc = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.LastNameUserControlEditor)(target));
-            return;
-            case 2:
-            
-            #line 22 "..\..\..\..\..\..\Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml
deleted file mode 100644
index 9ddedb75..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs
deleted file mode 100644
index 3d8bef33..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridAttributesView.g.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0623FDD0150C950FB06977EF0F9676B559E4EFE8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridAttributesView
-    /// </summary>
-    public partial class PropertyGridAttributesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridAttributesView demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 93 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "attributesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridAttributesView)(target));
-            return;
-            case 2:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml
deleted file mode 100644
index 9e4e203d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs
deleted file mode 100644
index 79a4e687..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.g.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E802FBF54AE269D40E806F92AA976EFE243F6E08"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridBindingToStructsView
-    /// </summary>
-    public partial class PropertyGridBindingToStructsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 42 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "bindingtostructsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml
deleted file mode 100644
index a3ea2e77..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs
deleted file mode 100644
index 58b0dbb7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.g.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "512AB8D60037112F341C336AFF6EEB2A2B143AF5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCategoryOrderView
-    /// </summary>
-    public partial class PropertyGridCategoryOrderView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 48 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid1;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 58 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid2;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "categoryorderview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid1 = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            case 2:
-            this._propertyGrid2 = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml
deleted file mode 100644
index 242ca0b7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs
deleted file mode 100644
index fd9a8770..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.g.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "CBFD1A4BE9958E5DCCCFEBE06A3CB750281911AB"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCustomEditorsView
-    /// </summary>
-    public partial class PropertyGridCustomEditorsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 44 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "customeditorsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml
deleted file mode 100644
index e6ad46da..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs
deleted file mode 100644
index 727bff33..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "46F8C3EBEE66E5EC040BF1AAE9049BFBDDD3762C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridCustomPropertyView
-    /// </summary>
-    public partial class PropertyGridCustomPropertyView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "custompropertyview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml
deleted file mode 100644
index 014c81b9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs
deleted file mode 100644
index ca951f28..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "8B118C07572544CF801E0DC545158499E00D2705"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDefaultEditorsView
-    /// </summary>
-    public partial class PropertyGridDefaultEditorsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 36 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "defaulteditorsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml
deleted file mode 100644
index def65e2e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs
deleted file mode 100644
index 180256ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "BCB180E70ECD503761A3F4063E2CA8A71AE77F19"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDefinitionKeyView
-    /// </summary>
-    public partial class PropertyGridDefinitionKeyView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "definitionkeyview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 39 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml
deleted file mode 100644
index 08808426..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs
deleted file mode 100644
index b62d4799..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "EFD087F8ABF8FDFA82CD8FA41C1FE34C65D62994"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridDisplayLocalizationView
-    /// </summary>
-    public partial class PropertyGridDisplayLocalizationView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "displaylocalizationview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 37 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml
deleted file mode 100644
index f00da8c1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs
deleted file mode 100644
index 792baaf9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.g.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "33A79C6B1B3142604623BDA581F80AE11866AB28"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridEditorDefinitionsView
-    /// </summary>
-    public partial class PropertyGridEditorDefinitionsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "editordefinitionsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 61 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml
deleted file mode 100644
index 8578e476..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs
deleted file mode 100644
index f3f2ce22..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridExpandingNonPrimitivesView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4BF5D94B7BB623B62713F09D4DA03D484A8220D4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridExpandingNonPrimitivesView
-    /// </summary>
-    public partial class PropertyGridExpandingNonPrimitivesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "expandingnonprimitivesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml
deleted file mode 100644
index 30673bcb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs
deleted file mode 100644
index 928e1a62..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4DE5E5CA8B922893CA1724AD8094B1426C28B70D"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridMultiSelectedObjectsView
-    /// </summary>
-    public partial class PropertyGridMultiSelectedObjectsView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "multiselectedobjectsview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 30 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml
deleted file mode 100644
index d388ae58..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs
deleted file mode 100644
index 54a4f144..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "23C8E55B4A654EACD0BBCEAA36E41076AA4A7CC6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertiesSourceView
-    /// </summary>
-    public partial class PropertyGridPropertiesSourceView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertiessourceview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml
deleted file mode 100644
index d7e8e60d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs
deleted file mode 100644
index 5130e396..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertiesView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AB81972AB4BC2D28D735DB40BB9D7252F71594DA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertiesView
-    /// </summary>
-    public partial class PropertyGridPropertiesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertiesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 35 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml
deleted file mode 100644
index 3dcf7739..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs
deleted file mode 100644
index ac91501b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.g.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DB85370E1749D4E78BE7358EE3A992EC8389FE91"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridPropertyItemStyleView
-    /// </summary>
-    public partial class PropertyGridPropertyItemStyleView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 51 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "propertyitemstyleview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            
-            #line 53 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml"
-            this._propertyGrid.PreparePropertyItem += new Xceed.Wpf.Toolkit.PropertyGrid.PropertyItemEventHandler(this.OnPreparePropertyItem);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml
deleted file mode 100644
index 5755cd0f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs
deleted file mode 100644
index 3a9d5d58..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.g.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "77E7109F76CB0236E81F9B24ACD1CDEDAEA0378C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridSelectedObjectView
-    /// </summary>
-    public partial class PropertyGridSelectedObjectView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 56 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "selectedobjectview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 50 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.Button)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 51 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.TextBox)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 52 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml"
-            ((System.Windows.Controls.CheckBox)(target)).GotFocus += new System.Windows.RoutedEventHandler(this.OnControlGetFocus);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml
deleted file mode 100644
index cbed201f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs
deleted file mode 100644
index e73927c5..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "53E50D68A2D32100FA05F45B3129F35BEC4E7C79"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridSpecifyingPropertiesView
-    /// </summary>
-    public partial class PropertyGridSpecifyingPropertiesView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 31 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "specifyingpropertiesview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.baml
deleted file mode 100644
index 5a58e64a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.cs
deleted file mode 100644
index 143dbaa7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/PropertyGrid/Views/PropertyGridView.g.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D17AE142089464F8385C3B28B5B3E8D98CAA9CD4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
-    
-    
-    /// <summary>
-    /// PropertyGridView
-    /// </summary>
-    public partial class PropertyGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 193 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button _button;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 201 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid _propertyGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/propertygrid/views/propertygrid" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\PropertyGrid\Views\PropertyGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._button = ((System.Windows.Controls.Button)(target));
-            return;
-            case 2:
-            this._propertyGrid = ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.baml
deleted file mode 100644
index 05e0896f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.cs
deleted file mode 100644
index 5e766469..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/RangeSlider/Views/RangeSliderView.g.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E54E6C9158F28D1B24345C70089FF728F0474CE5"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views {
-    
-    
-    /// <summary>
-    /// RangeSliderView
-    /// </summary>
-    public partial class RangeSliderView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 637 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox lowerRangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 660 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox rangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 684 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox higherRangeStyleComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 732 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _tickPlacementComboBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 749 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _tickFrequency;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 775 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RangeSlider _rangeSlider;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/rangeslider/views/rangeslidervi" +
-                    "ew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.lowerRangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 642 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.lowerRangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.rangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 666 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.rangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this.higherRangeStyleComboBox = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 690 "..\..\..\..\..\..\Samples\RangeSlider\Views\RangeSliderView.xaml"
-            this.higherRangeStyleComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.RangeStyleComboBox_SelectionChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this._tickPlacementComboBox = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 5:
-            this._tickFrequency = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 6:
-            this._rangeSlider = ((Xceed.Wpf.Toolkit.RangeSlider)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.baml
deleted file mode 100644
index 93883238..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.cs
deleted file mode 100644
index 551e9db6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Rating/Views/RatingView.g.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5A1C21CC0397875A9917B805332328A1D330BB9C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views {
-    
-    
-    /// <summary>
-    /// RatingView
-    /// </summary>
-    public partial class RatingView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/rating/views/ratingview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Rating\Views\RatingView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.baml
deleted file mode 100644
index 31e3ea40..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.cs
deleted file mode 100644
index d7625a4e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/SlideShow/Views/SlideShowView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "95DC33002323CD8863E7794C4357D04911AF93CA"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views {
-    
-    
-    /// <summary>
-    /// SlideShowView
-    /// </summary>
-    public partial class SlideShowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/slideshow/views/slideshowview.x" +
-                    "aml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\SlideShow\Views\SlideShowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.baml
deleted file mode 100644
index 0f999e77..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.cs
deleted file mode 100644
index 8b1613ce..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/AutoSelectTextboxView.g.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "DB7CF13012BE1B948B6AD10E166DBB97E480F0C7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// AutoSelectTextboxView
-    /// </summary>
-    public partial class AutoSelectTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 46 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _autoSelectBehavior;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 53 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _autoMoveFocus;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/autoselecttextboxvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\AutoSelectTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._autoSelectBehavior = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._autoMoveFocus = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.baml
deleted file mode 100644
index 69c4830c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.cs
deleted file mode 100644
index e60c4ffd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MaskedTextboxView.g.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "802449787E09FE858E463E1A8E3FAB44E3F1F46E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// MaskedTextboxView
-    /// </summary>
-    public partial class MaskedTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 49 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _literals;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 53 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _prompt;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 68 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _mask;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 72 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _value;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 76 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _text;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.MaskedTextBox _maskedTextBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/maskedtextboxview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\MaskedTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._literals = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 2:
-            this._prompt = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._mask = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 4:
-            this._value = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 5:
-            this._text = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 6:
-            this._maskedTextBox = ((Xceed.Wpf.Toolkit.MaskedTextBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.baml
deleted file mode 100644
index c54b7fea..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.cs
deleted file mode 100644
index 8a6fe339..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/MultiLineTextEditorView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "55C827B217CE3D9C9AE341D9D5252846ED4BF0D3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// MultiLineTextEditorView
-    /// </summary>
-    public partial class MultiLineTextEditorView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 52 "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.DataGrid _dataGrid;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/multilinetexteditorv" +
-                    "iew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\MultiLineTextEditorView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._dataGrid = ((System.Windows.Controls.DataGrid)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.baml
deleted file mode 100644
index b3a15992..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.cs
deleted file mode 100644
index 150d07bd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/RichTextboxView.g.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5031BDE822986E7B67194FBF1BAEB91CDD631CF7"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// RichTextboxView
-    /// </summary>
-    public partial class RichTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 48 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _textFormatter;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 54 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _text;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 61 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.RichTextBox _richTextBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/richtextboxview.xaml" +
-                    "", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._textFormatter = ((System.Windows.Controls.ComboBox)(target));
-            
-            #line 48 "..\..\..\..\..\..\Samples\Text\Views\RichTextboxView.xaml"
-            this._textFormatter.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.OnTextFormatterChanged);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._text = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this._richTextBox = ((Xceed.Wpf.Toolkit.RichTextBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.baml
deleted file mode 100644
index 5cfd1579..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.cs
deleted file mode 100644
index d9c0cfed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/TokenizedTextBoxView.g.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7A4A38FD147D6CBC1DE881ABABA24AF9A6B8AD1"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TokenizedTextBox.Views {
-    
-    
-    /// <summary>
-    /// TokenizedTextBoxView
-    /// </summary>
-    public partial class TokenizedTextBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/tokenizedtextboxview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Text\Views\TokenizedTextBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.baml
deleted file mode 100644
index a7068b2c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.cs
deleted file mode 100644
index 179b9ae6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkPasswordBoxView.g.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "03C90A2C3343D96CA8C029FF6CBB2AC9C2864588"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// WatermarkPasswordBoxView
-    /// </summary>
-    public partial class WatermarkPasswordBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock _passwordTextBlock;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 132 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.WatermarkPasswordBox _watermarkPasswordBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/watermarkpasswordbox" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._passwordTextBlock = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 2:
-            this._watermarkPasswordBox = ((Xceed.Wpf.Toolkit.WatermarkPasswordBox)(target));
-            
-            #line 140 "..\..\..\..\..\..\Samples\Text\Views\WatermarkPasswordBoxView.xaml"
-            this._watermarkPasswordBox.PasswordChanged += new System.Windows.RoutedEventHandler(this.WatermarkPasswordBox_PasswordChanged);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.baml
deleted file mode 100644
index be4fc66a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.cs
deleted file mode 100644
index f2ef30c4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Text/Views/WatermarkTextboxView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "059FD34FCB082172FF3FBCB6F4A5A7B8229E3D1C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views {
-    
-    
-    /// <summary>
-    /// WatermarkTextboxView
-    /// </summary>
-    public partial class WatermarkTextboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 40 "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _keepWatermarkOnGotFocus;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/text/views/watermarktextboxview" +
-                    ".xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Text\Views\WatermarkTextboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._keepWatermarkOnGotFocus = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/ItemTemplates/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/ItemTemplates/Common.baml
deleted file mode 100644
index 312235f0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/ItemTemplates/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.baml
deleted file mode 100644
index eb3d5ce3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.cs
deleted file mode 100644
index 034d4173..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingAvalonDockView.g.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "35C17E62EC5A6FCAC3D4DAED30DD19C7F6BBC224"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.AvalonDock;
-using Xceed.Wpf.AvalonDock.Controls;
-using Xceed.Wpf.AvalonDock.Converters;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Themes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingAvalonDockView
-    /// </summary>
-    public partial class ThemingAvalonDockView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 25 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingAvalonDockView _demo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 121 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _themeCombo;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 169 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem metroDarkComboBoxItem;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 176 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem metroLightComboBoxItem;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 194 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Border SampleBorder;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 196 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.DockingManager _dockingManager;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 211 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.AvalonDock.Layout.LayoutRoot _layoutRoot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 309 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Image _openSourceScreenShot;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 310 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.StackPanel _openSourceTextHyperlink;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingavalondock" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingAvalonDockView)(target));
-            return;
-            case 2:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            this._themeCombo = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 4:
-            this.metroDarkComboBoxItem = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem)(target));
-            return;
-            case 5:
-            this.metroLightComboBoxItem = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.AvalonDockComboBoxItem)(target));
-            return;
-            case 6:
-            this.SampleBorder = ((System.Windows.Controls.Border)(target));
-            return;
-            case 7:
-            this._dockingManager = ((Xceed.Wpf.AvalonDock.DockingManager)(target));
-            return;
-            case 8:
-            this._layoutRoot = ((Xceed.Wpf.AvalonDock.Layout.LayoutRoot)(target));
-            return;
-            case 9:
-            this._openSourceScreenShot = ((System.Windows.Controls.Image)(target));
-            return;
-            case 10:
-            this._openSourceTextHyperlink = ((System.Windows.Controls.StackPanel)(target));
-            return;
-            case 11:
-            
-            #line 313 "..\..\..\..\..\..\Samples\Theming\Views\ThemingAvalonDockView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.baml
deleted file mode 100644
index 49e06a5d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.cs
deleted file mode 100644
index e579aa8b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingCoreWPFView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "817B998ADF733508201A9FE809A7651EA52C2D46"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingCoreWPFView
-    /// </summary>
-    public partial class ThemingCoreWPFView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingcorewpfvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Theming\Views\ThemingCoreWPFView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.baml
deleted file mode 100644
index fe248c4d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.cs
deleted file mode 100644
index 8d343050..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingDataGridView.g.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "FA74512DA66E62CADC6D0DD3067E440B8CA6D3A3"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingDataGridView
-    /// </summary>
-    public partial class ThemingDataGridView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingDataGridView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingdatagridvi" +
-                    "ew.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingDataGridView)(target));
-            return;
-            case 2:
-            
-            #line 33 "..\..\..\..\..\..\Samples\Theming\Views\ThemingDataGridView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.baml
deleted file mode 100644
index a78be8e9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs
deleted file mode 100644
index 6214c03d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingExtendedToolkitView.g.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "13799909F50AB8C1245CC79DD8B2B1F1FC4E55D8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Converters;
-using Xceed.Wpf.DataGrid.Markup;
-using Xceed.Wpf.DataGrid.ValidationRules;
-using Xceed.Wpf.DataGrid.Views;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingExtendedToolkitView
-    /// </summary>
-    public partial class ThemingExtendedToolkitView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 24 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingExtendedToolkitView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/themingextendedto" +
-                    "olkitview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingExtendedToolkitView)(target));
-            return;
-            case 2:
-            
-            #line 31 "..\..\..\..\..\..\Samples\Theming\Views\ThemingExtendedToolkitView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.baml
deleted file mode 100644
index 90a5896f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.cs
deleted file mode 100644
index 6dcbc6be..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Theming/Views/ThemingListBoxView.g.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0F14F712321498B8682B879374B0D502200425F6"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views {
-    
-    
-    /// <summary>
-    /// ThemingListBoxView
-    /// </summary>
-    public partial class ThemingListBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingListBoxView _demo;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/theming/views/theminglistboxvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._demo = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingListBoxView)(target));
-            return;
-            case 2:
-            
-            #line 36 "..\..\..\..\..\..\Samples\Theming\Views\ThemingListBoxView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.baml
deleted file mode 100644
index ee32e786..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.cs
deleted file mode 100644
index b24aebd2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimeSpan/Views/TimeSpanView.g.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4A4611646777B562AFBB7C7A9D9996353F66CCE4"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimeSpan.Views {
-    
-    
-    /// <summary>
-    /// TimeSpanView
-    /// </summary>
-    public partial class TimeSpanView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 65 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _watermark;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 74 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _clipValuetoMinMax;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _showSeconds;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 94 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _fractionalSecondsDigitsCount;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 105 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _currentDateTimePart;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 118 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _defaultValue;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 130 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _minimum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 143 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _maximum;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 156 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.IntegerUpDown _step;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 174 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimeSpanUpDown _timeSpanUpDown;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/timespan/views/timespanview.xam" +
-                    "l", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\TimeSpan\Views\TimeSpanView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._watermark = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 2:
-            this._clipValuetoMinMax = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._showSeconds = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._fractionalSecondsDigitsCount = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 5:
-            this._currentDateTimePart = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 6:
-            this._defaultValue = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 7:
-            this._minimum = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 8:
-            this._maximum = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            case 9:
-            this._step = ((Xceed.Wpf.Toolkit.IntegerUpDown)(target));
-            return;
-            case 10:
-            this._timeSpanUpDown = ((Xceed.Wpf.Toolkit.TimeSpanUpDown)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.baml
deleted file mode 100644
index 02208f9a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.cs
deleted file mode 100644
index 9fabfd8c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/TimelinePanel/Views/TimelinePanelView.g.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "43A5F7E8C8DE1F7C2B7994C397DA94C719CA966C"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimelinePanel.Views {
-    
-    
-    /// <summary>
-    /// TimelinePanelView
-    /// </summary>
-    public partial class TimelinePanelView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboOrientation;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 128 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboOverlap;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 131 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _keepOrder;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.TimelinePanel _panel;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/timelinepanel/views/timelinepan" +
-                    "elview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\TimelinePanel\Views\TimelinePanelView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._cboOrientation = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 2:
-            this._cboOverlap = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 3:
-            this._keepOrder = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._panel = ((Xceed.Wpf.Toolkit.TimelinePanel)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.baml
deleted file mode 100644
index 24cd877d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs
deleted file mode 100644
index 77e45230..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/ToggleSwitch/Views/ToggleSwitchView.g.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "05845D13BC86D961F313D3780DCB5AF0BE102725"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views {
-    
-    
-    /// <summary>
-    /// ToggleSwitchView
-    /// </summary>
-    public partial class ToggleSwitchView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/toggleswitch/views/toggleswitch" +
-                    "view.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 34 "..\..\..\..\..\..\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml
deleted file mode 100644
index e1f1f0c2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs
deleted file mode 100644
index 2282f377..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B574E69DFCB4DB37E4E99C8E3986489F6F515A65"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views {
-    
-    
-    /// <summary>
-    /// WatermarkComboBoxView
-    /// </summary>
-    public partial class WatermarkComboBoxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 112 "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.WatermarkComboBox _watermarkComboBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/watermarkcombobox/views/waterma" +
-                    "rkcomboboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._watermarkComboBox = ((Xceed.Wpf.Toolkit.WatermarkComboBox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/FancyStyles.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/FancyStyles.baml
deleted file mode 100644
index 8400bb82..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/FancyStyles.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.baml
deleted file mode 100644
index 6be8286a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.cs
deleted file mode 100644
index f67a3862..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Resources/WindowModelEditor.g.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C0FBE578166A21E44486A54EB31671E3C3EE0627"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources {
-    
-    
-    /// <summary>
-    /// WindowModelEditor
-    /// </summary>
-    public partial class WindowModelEditor : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 26 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources.WindowModelEditor _windowModelEditor;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 89 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _titleShadowBrushColorPicker;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/resources/windowmodeledi" +
-                    "tor.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Resources\WindowModelEditor.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._windowModelEditor = ((Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources.WindowModelEditor)(target));
-            return;
-            case 2:
-            this._titleShadowBrushColorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.baml
deleted file mode 100644
index 8d63530a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.cs
deleted file mode 100644
index fb241112..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/ChildWindowView.g.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0D5A855F74AEC87D958C25FC29AB4B41DEFDF1A2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// ChildWindowView
-    /// </summary>
-    public partial class ChildWindowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 78 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBox _txtCaption;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 80 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock2;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 81 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _txtLeft;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.TextBlock textBlock3;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.DoubleUpDown _txtTop;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 87 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _chkIsModal;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 90 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboWindowStartupLocations;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 93 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.ComboBox _cboWindowState;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 99 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/childwindowview.xa" +
-                    "ml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Window\Views\ChildWindowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._txtCaption = ((System.Windows.Controls.TextBox)(target));
-            return;
-            case 3:
-            this.textBlock2 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 4:
-            this._txtLeft = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 5:
-            this.textBlock3 = ((System.Windows.Controls.TextBlock)(target));
-            return;
-            case 6:
-            this._txtTop = ((Xceed.Wpf.Toolkit.DoubleUpDown)(target));
-            return;
-            case 7:
-            this._chkIsModal = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 8:
-            this._cboWindowStartupLocations = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 9:
-            this._cboWindowState = ((System.Windows.Controls.ComboBox)(target));
-            return;
-            case 10:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.baml
deleted file mode 100644
index b33c59ae..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.cs
deleted file mode 100644
index 5bef453b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/StyleableWindowView.g.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2B875AB5BA984A20829FE5BF94D9A4AFE4415FF8"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// StyleableWindowView
-    /// </summary>
-    public partial class StyleableWindowView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 120 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _enableStyleCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 154 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/styleablewindowvie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 32 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Documents.Hyperlink)(target)).RequestNavigate += new System.Windows.Navigation.RequestNavigateEventHandler(this.Hyperlink_RequestNavigate);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this._enableStyleCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            
-            #line 120 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            this._enableStyleCheckBox.Click += new System.Windows.RoutedEventHandler(this.UpdateWindowsStyles);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 130 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StandardMessageBoxButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            
-            #line 131 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StyledMessageBoxButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            
-            #line 136 "..\..\..\..\..\..\Samples\Window\Views\StyleableWindowView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OnStyleableWindow_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 6:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.baml
deleted file mode 100644
index c3e81559..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.cs
deleted file mode 100644
index 8c697b73..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Window/Views/WindowContainerView.g.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "0EDEFE87BC8FF1C960CFD3B0F15A4408534BF325"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views {
-    
-    
-    /// <summary>
-    /// WindowContainerView
-    /// </summary>
-    public partial class WindowContainerView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 64 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ColorPicker _modalBackgroundColorPicker;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 83 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _childWindowCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 84 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _modalChildWindowCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.CheckBox _messageBoxCheckBox;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 123 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Primitives.WindowContainer _windowContainer;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 125 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _childWindow;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 135 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.ChildWindow _modalChildWindow;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 146 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.MessageBox _messageBox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/window/views/windowcontainervie" +
-                    "w.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._modalBackgroundColorPicker = ((Xceed.Wpf.Toolkit.ColorPicker)(target));
-            return;
-            case 2:
-            this._childWindowCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 3:
-            this._modalChildWindowCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            return;
-            case 4:
-            this._messageBoxCheckBox = ((System.Windows.Controls.CheckBox)(target));
-            
-            #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBoxCheckBox.Checked += new System.Windows.RoutedEventHandler(this.OnMessageBoxCheckBoxChecked);
-            
-            #line default
-            #line hidden
-            
-            #line 85 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBoxCheckBox.Unchecked += new System.Windows.RoutedEventHandler(this.OnMessageBoxCheckBoxUnchecked);
-            
-            #line default
-            #line hidden
-            return;
-            case 5:
-            this._windowContainer = ((Xceed.Wpf.Toolkit.Primitives.WindowContainer)(target));
-            return;
-            case 6:
-            this._childWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            case 7:
-            this._modalChildWindow = ((Xceed.Wpf.Toolkit.ChildWindow)(target));
-            return;
-            case 8:
-            this._messageBox = ((Xceed.Wpf.Toolkit.MessageBox)(target));
-            
-            #line 149 "..\..\..\..\..\..\Samples\Window\Views\WindowContainerView.xaml"
-            this._messageBox.Closed += new System.EventHandler(this.OnMessageBoxClose);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.baml
deleted file mode 100644
index 881f0276..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.cs
deleted file mode 100644
index 9e296960..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Wizard/Views/WizardView.g.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "891F27925C4AF4BE57D303EA8A4460F74E70962E"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views {
-    
-    
-    /// <summary>
-    /// WizardView
-    /// </summary>
-    public partial class WizardView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/wizard/views/wizardview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 29 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            ((Xceed.Wpf.Toolkit.Wizard)(target)).Help += new System.Windows.RoutedEventHandler(this.OnWizardHelp);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 46 "..\..\..\..\..\..\Samples\Wizard\Views\WizardView.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OnButtonClick);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.baml
deleted file mode 100644
index f577eb0b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.cs
deleted file mode 100644
index 817850b7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Samples/Zoombox/Views/ZoomboxView.g.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-#pragma checksum "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3F9453594F4C4342B4FA4B7EB172B0F0282425E0"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters;
-using Xceed.Wpf.Toolkit.Panels;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.Zoombox;
-
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views {
-    
-    
-    /// <summary>
-    /// ZoomboxView
-    /// </summary>
-    public partial class ZoomboxView : Xceed.Wpf.Toolkit.LiveExplorer.DemoView, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 206 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider AccelerationSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 218 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Slider DecelerationSlider;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 482 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.Zoombox.Zoombox zoombox;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit.LiveExplorer;component/samples/zoombox/views/zoomboxview.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this.AccelerationSlider = ((System.Windows.Controls.Slider)(target));
-            
-            #line 210 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            this.AccelerationSlider.ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.CoerceAnimationRatios);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            this.DecelerationSlider = ((System.Windows.Controls.Slider)(target));
-            
-            #line 222 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            this.DecelerationSlider.ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.CoerceAnimationRatios);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 235 "..\..\..\..\..\..\Samples\Zoombox\Views\ZoomboxView.xaml"
-            ((System.Windows.Controls.Slider)(target)).ValueChanged += new System.Windows.RoutedPropertyChangedEventHandler<double>(this.AdjustAnimationDuration);
-            
-            #line default
-            #line hidden
-            return;
-            case 4:
-            this.zoombox = ((Xceed.Wpf.Toolkit.Zoombox.Zoombox)(target));
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
deleted file mode 100644
index 6c05a977..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources
deleted file mode 100644
index c27ca56f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources
deleted file mode 100644
index c5068ba1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.application b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
deleted file mode 100644
index 85f8d7ed..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.application
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.application" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="Xceed Software Inc." asmv2:product="Xceed Toolkit Plus for WPF LiveExplorer" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" mapFileExtensions="true" />
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.0" profile="Client" supportedRuntime="4.0.30319" />
-    <framework targetVersion="4.0" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest" size="17174">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>ob1xtL0NFoBuWOm6eWhtN/R2wCI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
deleted file mode 100644
index 42313f94..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,239 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.config
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.application
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.LiveExplorer.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.DataGrid.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Samples.SampleData.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Aero.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.Metro.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.Themes.VS2010.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.AvalonDock.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.DataGrid.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\de\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\es\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\fr\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\hu\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\it\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\pt-BR\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\ro\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\ru\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\sv\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\Release\zh-Hans\Xceed.Wpf.AvalonDock.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Resources\LiveExplorerScrollViewer.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Resources\TextBlockStyles.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Resources\Common.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Resources\CommonResources.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Resources\LastNameUserControlEditor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\ItemTemplates\Common.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\FancyStyles.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\WindowModelEditor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\App.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\HomeView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\MainWindow.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\AvalonDock\Views\AvalonDockView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\IconButtonView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\ButtonSpinnerView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\DropDownSplitButtonView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Calculator\Views\CalculatorView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartAxisView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartLegendView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesBasicTypesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesDataPointsBindingView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingAxesGridView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingColumnSeriesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingLineSeriesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingPieSeriesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\CheckLists\Views\CheckListsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Color\Views\ColorView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\DataGridView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\MultiColumnComboBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DateTime\Views\DateTimeView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\FilePicker\Views\FilePickerView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Gauge\Views\RadialGaugeView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ListBox\Views\ListBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Magnifier\Views\MagnifierView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialHamburgerView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialComboBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialListBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToolTipView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialDropDownView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSwitchView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialFrameView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTabsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarCircularView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialRadioButtonView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialCheckBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToastView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSliderView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTextFieldView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialButtonView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialControlsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MultiCalendar\Views\MultiCalendarView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Numeric\Views\NumericView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Panels\Views\SwitchPanelView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieChartView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieProgressView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PileFlowPanel\Views\PileFlowPanelView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Resources\LastNameUserControlEditor.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridAttributesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\RangeSlider\Views\RangeSliderView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Rating\Views\RatingView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\SlideShow\Views\SlideShowView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\AutoSelectTextboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MaskedTextboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MultiLineTextEditorView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\RichTextboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkPasswordBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkTextboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingAvalonDockView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingCoreWPFView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingDataGridView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingExtendedToolkitView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingListBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimelinePanel\Views\TimelinePanelView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimeSpan\Views\TimeSpanView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ToggleSwitch\Views\ToggleSwitchView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\TokenizedTextBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Resources\WindowModelEditor.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\ChildWindowView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\StyleableWindowView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\WindowContainerView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Wizard\Views\WizardView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Zoombox\Views\ZoomboxView.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\App.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\HomeView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\MainWindow.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\AvalonDock\Views\AvalonDockView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\BusyIndicator\Views\BusyIndicatorView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\IconButtonView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\ButtonSpinnerView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Button\Views\DropDownSplitButtonView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Calculator\Views\CalculatorView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartAxisView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartLegendView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesBasicTypesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartSeriesDataPointsBindingView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingAxesGridView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingColumnSeriesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingLineSeriesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Chart\Views\ChartStylingPieSeriesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\CheckLists\Views\CheckListsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Color\Views\ColorView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\DataGridView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DataGrid\Views\MultiColumnComboBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\DateTime\Views\DateTimeView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\FilePicker\Views\FilePickerView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Gauge\Views\RadialGaugeView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ListBox\Views\ListBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Magnifier\Views\MagnifierView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialHamburgerView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialComboBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialListBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToolTipView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialDropDownView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSwitchView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialFrameView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTabsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarCircularView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialProgressBarView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialRadioButtonView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialCheckBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialToastView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialSliderView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialTextFieldView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialButtonView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MaterialControls\Views\MaterialControlsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\MultiCalendar\Views\MultiCalendarView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Numeric\Views\NumericView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Panels\Views\SwitchPanelView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieChartView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieProgressView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Pie\Views\PieView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PileFlowPanel\Views\PileFlowPanelView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridAttributesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\PropertyGrid\Views\PropertyGridView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\RangeSlider\Views\RangeSliderView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Rating\Views\RatingView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\SlideShow\Views\SlideShowView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\AutoSelectTextboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MaskedTextboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\MultiLineTextEditorView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\RichTextboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkPasswordBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\WatermarkTextboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingAvalonDockView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingCoreWPFView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingDataGridView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingExtendedToolkitView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Theming\Views\ThemingListBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimelinePanel\Views\TimelinePanelView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\TimeSpan\Views\TimeSpanView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\ToggleSwitch\Views\ToggleSwitchView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Text\Views\TokenizedTextBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\ChildWindowView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\StyleableWindowView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Window\Views\WindowContainerView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Wizard\Views\WizardView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Samples\Zoombox\Views\ZoomboxView.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes.fr.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.application
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.exe
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\Xceed.Wpf.Toolkit.LiveExplorer.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
deleted file mode 100644
index df3d3358..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.exe.manifest
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.exe" version="2.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="x86" type="win32" />
-  <description asmv2:iconFile="App.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <application />
-  <entryPoint>
-    <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-    <commandLine file="Xceed.Wpf.Toolkit.LiveExplorer.exe" parameters="" />
-  </entryPoint>
-  <trustInfo>
-    <security>
-      <applicationRequestMinimum>
-        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
-        <defaultAssemblyRequest permissionSetReference="Custom" />
-      </applicationRequestMinimum>
-      <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>
-    </security>
-  </trustInfo>
-  <dependency>
-    <dependentOS>
-      <osVersionInfo>
-        <os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
-      </osVersionInfo>
-    </dependentOS>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
-      <assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.dll" size="427008">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fJ+tiQsbOQwfGd3itpkyUquu3RA=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="de" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>iK9HDffv2Q6qrh3sPkrXxIxhPYQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="es" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>5BfdaqLid+/kyJCQX52bEt2rEU8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>FmHDLfKoQyzMD6VzydX31KxFVwQ=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="hu\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="hu" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>HysaXhpNt3jXo9+ZbwTHhmqc/ZI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="it\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="it" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>wWS+24oJwFk6HrRmBg5TmTuOSrI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="pt-BR\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="pt-BR" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>fLJrmg3/6gkuHVpvm48rHU0PQu8=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ro\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ro" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>APZdP9nOSFv9/VEayZ7e1u3YQwg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ru\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="ru" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dSmBWR4oV60hXzMEcu5Pzv78324=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="sv\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="sv" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>v9u0pYRMOsstuMutmXdyhxwVSoE=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="zh-Hans\Xceed.Wpf.AvalonDock.resources.dll" size="6144">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.resources" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="zh-Hans" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>aLiV5N9DeMFHFId42Hauinb7z10=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Aero.dll" size="87040">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Aero" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>pHMnOAZhLdiVxLW8WVr7oKSNvzc=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.Metro.dll" size="79872">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.Metro" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>6HW2YrRgZzx55mSInWqY5G2Rmtg=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.AvalonDock.Themes.VS2010.dll" size="84480">
-      <assemblyIdentity name="Xceed.Wpf.AvalonDock.Themes.VS2010" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>dk2/e/lvOlxMqaSBa7vwkuVMmWY=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.DataGrid.dll" size="2435584">
-      <assemblyIdentity name="Xceed.Wpf.DataGrid" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>K9KOIk/JBcp0My6g71prOBaVSso=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Samples.SampleData.dll" size="2506240">
-      <assemblyIdentity name="Xceed.Wpf.Samples.SampleData" version="2.0.13161.5" publicKeyToken="BA83FF368B7563C6" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>h7GeHgNOmosQ3JAdBzkZH1g8UZs=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.dll" size="1104384">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit" version="3.4.0.0" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="msil" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>rzSCAw1wGgE9FFQGxPlp62E0H3E=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Xceed.Wpf.Toolkit.LiveExplorer.exe" size="16285184">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="neutral" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>e/H+bvBidZ6C9yzoGNEGVxWvT3Q=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Xceed.Wpf.Toolkit.LiveExplorer.resources.dll" size="5632">
-      <assemblyIdentity name="Xceed.Wpf.Toolkit.LiveExplorer.resources" version="3.4.6747.17710" publicKeyToken="3E4669D2F30244F4" language="fr" processorArchitecture="x86" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>vsLAPrssl9QqQjMJSoMqV2acKVI=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-  <file name="App.ico" size="31356">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>+gOYudfK6KDh/6TPnBz61fPTSDc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <file name="Xceed.Wpf.Toolkit.LiveExplorer.exe.config" size="1186">
-    <hash>
-      <dsig:Transforms>
-        <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-      </dsig:Transforms>
-      <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-      <dsig:DigestValue>I+4TtxHlXRDLuy+spjHIoJq5EXc=</dsig:DigestValue>
-    </hash>
-  </file>
-  <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>
-</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.g.resources
deleted file mode 100644
index 879e99ca..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
deleted file mode 100644
index 11307a15..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/obj/x86/Release/Xceed.Wpf.Toolkit.LiveExplorer_MarkupCompile.lref
+++ /dev/null
@@ -1,95 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\obj\x86\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\HomeView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\MainWindow.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\AvalonDock\Views\AvalonDockView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\BusyIndicator\Views\BusyIndicatorView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\IconButtonView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\ButtonSpinnerView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Button\Views\DropDownSplitButtonView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Calculator\Views\CalculatorView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartAxisView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartLegendView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesBasicTypesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingAxesGridView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingColumnSeriesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingLineSeriesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Chart\Views\ChartStylingPieSeriesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\CheckLists\Views\CheckListsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Color\Views\ColorView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\DataGridView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DataGrid\Views\MultiColumnComboBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\DateTime\Views\DateTimeView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\FilePicker\Views\FilePickerView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Gauge\Views\RadialGaugeView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ListBox\Views\ListBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Magnifier\Views\MagnifierView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialHamburgerView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialComboBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialListBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToolTipView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialDropDownView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSwitchView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialFrameView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTabsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialProgressBarView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialRadioButtonView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialCheckBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialToastView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialSliderView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialTextFieldView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialButtonView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MaterialControls\Views\MaterialControlsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\MultiCalendar\Views\MultiCalendarView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Numeric\Views\NumericView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Panels\Views\SwitchPanelView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieChartView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieProgressView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Pie\Views\PieView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PileFlowPanel\Views\PileFlowPanelView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\PropertyGrid\Views\PropertyGridView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\RangeSlider\Views\RangeSliderView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Rating\Views\RatingView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\SlideShow\Views\SlideShowView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\AutoSelectTextboxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MaskedTextboxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\MultiLineTextEditorView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\RichTextboxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkPasswordBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\WatermarkTextboxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingAvalonDockView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingCoreWPFView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingDataGridView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingExtendedToolkitView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Theming\Views\ThemingListBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimelinePanel\Views\TimelinePanelView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\TimeSpan\Views\TimeSpanView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\ToggleSwitch\Views\ToggleSwitchView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Text\Views\TokenizedTextBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\ChildWindowView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\StyleableWindowView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Window\Views\WindowContainerView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Wizard\Views\WizardView.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit.LiveExplorer\Samples\Zoombox\Views\ZoomboxView.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/sn.snk and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
index bbd6826e..0be651b7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
@@ -1,129 +1,32 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ***********************************************************************************/
 
-#region Using directives
-
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Windows;
-using System.Windows.Markup;
-
-#endregion
-
-// 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 Toolkit for WPF")]
-[assembly: AssemblyDescription("This assembly implements various Windows Presentation Framework controls.")]
-
-[assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct("Xceed Toolkit for WPF")]
-[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
-[assembly: AssemblyCulture("")]
-
-
-// Needed to enable xbap scenarios
-[assembly: AllowPartiallyTrustedCallers]
-
-// 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)]
-
-
-[assembly: InternalsVisibleTo("Xceed.Wpf.Toolkit.Themes.Office2007" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-[assembly: InternalsVisibleTo("Xceed.Wpf.Toolkit.Themes.Metro" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-[assembly: InternalsVisibleTo("Xceed.Wpf.Toolkit.Themes.Windows10" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-
-
-
-
-//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/toolkit", "xctk")]
-[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")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Attributes")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Commands")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Converters")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Editors")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Panels")]
-
-
-#pragma warning disable 1699
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile(@"sn.snk")]
-[assembly: AssemblyKeyName("")]
-#pragma warning restore 1699
+#pragma warning disable 0436
+[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
+#pragma warning restore 0436
 
 internal static class _XceedVersionInfo
 {
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-    public const string BaseVersion = "3.4";
-    [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 BaseVersion = "3.8";
+  [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.Toolkit/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
index 3316fb13..a469d89f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
index 0b2738c9..7551fb53 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
index cd17a9b2..5f789309 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
index 141fbab9..159eea7a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
index a61532db..621c7b87 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
index de6b0120..b751b2c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 b218170f..b2128bad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
index 3515614b..cfccc4a1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
index 98acb60e..e94a9460 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
index 135a6e80..8fa92e8d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
index b9d00996..44be7fe2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
index a9b30b08..7241a33b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
index b71397d0..49aef4a6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
index 0a7aba23..95948cbd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
index ed8ad412..ad50fb67 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -73,7 +73,6 @@
 
               <Grid x:Name="gridContent"
                     Grid.Column="1"
-                    Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}"
                     Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
                 <Grid.RowDefinitions>
                   <RowDefinition Height="*" />
@@ -97,6 +96,15 @@
             </Grid>
           </Border>
           <ControlTemplate.Triggers>
+            <Trigger Property="ShowButtonSpinner"
+                     Value="False">
+              <Setter Property="Visibility"
+                      Value="Hidden"
+                      TargetName="gridContent" />
+              <Setter Property="Width"
+                      Value="0"
+                      TargetName="gridContent" />
+            </Trigger>
             <Trigger Property="IsMouseOver"
                      Value="True">
               <Setter Property="BorderBrush"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
index 914e129c..e6697469 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -70,7 +70,6 @@
 
               <Grid x:Name="gridContent"
                     Grid.Column="1"
-                    Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}"
                     Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
                 <Grid.RowDefinitions>
                   <RowDefinition Height="*" />
@@ -94,6 +93,15 @@
             </Grid>
           </Border>
           <ControlTemplate.Triggers>
+            <Trigger Property="ShowButtonSpinner"
+                     Value="False">
+              <Setter Property="Visibility"
+                      Value="Hidden"
+                      TargetName="gridContent" />
+              <Setter Property="Width"
+                      Value="0"
+                      TargetName="gridContent" />
+            </Trigger>
             <Trigger Property="IsEnabled"
                      Value="False">
               <Setter Property="Background"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
index cf268030..25786dd8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
index d24c8e08..b8491a5c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
index 6058039e..e392e75f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -343,6 +343,8 @@
             Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
     <Setter Property="BorderThickness"
             Value="1" />
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
     <Setter Property="FocusVisualStyle"
             Value="{x:Null}" />
     <Setter Property="Template">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
index ad78aba3..6f18e4d4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -767,6 +767,8 @@
             Value="#FF949494" />
     <Setter Property="BorderThickness"
             Value="1" />
+    <Setter Property="Foreground"
+            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
     <Setter Property="FocusVisualStyle"
             Value="{x:Null}" />
     <Setter Property="Template">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
index 8e7fd013..6d2c32f3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
index 0160991c..ae588310 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
index 3f3b0b28..3bfebf18 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
index 40781ee5..1ee884ed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
index cfc7a2a5..545fd237 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -64,6 +64,7 @@
                        IsReadOnly="True"
                        Focusable="False"
                        Cursor="Arrow"
+                       IsTabStop="{TemplateBinding IsTabStop}"
                        Margin="{TemplateBinding Padding}"
                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
@@ -107,7 +108,20 @@
               <Setter Property="Cursor"
                       Value="{x:Null}"
                       TargetName="TextBox" />
+              <Setter Property="IsTabStop"
+                      Value="True" />
             </DataTrigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
+                           Value="True" />
+                <Condition Binding="{Binding IsFocused, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter TargetName="TextBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=TextBox}" />
+            </MultiDataTrigger>
           </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
@@ -212,6 +226,11 @@
         <Setter Property="BorderBrush"
                 Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
       </Trigger>
+      <Trigger Property="IsEditable"
+               Value="True">
+        <Setter Property="IsTabStop"
+                Value="False"/>
+      </Trigger>
     </Style.Triggers>
   </Style>
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
index 46000955..ee88b80c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -64,6 +64,7 @@
                        IsReadOnly="True"
                        Focusable="False"
                        Cursor="Arrow"
+                       IsTabStop="{TemplateBinding IsTabStop}"
                        BorderThickness="0"
                        Background="Transparent"
                        Margin="{TemplateBinding Padding}"
@@ -109,7 +110,20 @@
               <Setter Property="Cursor"
                       Value="{x:Null}"
                       TargetName="TextBox" />
+              <Setter Property="IsTabStop"
+                      Value="True" />
             </DataTrigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
+                           Value="True" />
+                <Condition Binding="{Binding IsFocused, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
+                           Value="True" />
+              </MultiDataTrigger.Conditions>
+              <Setter TargetName="TextBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=TextBox}" />
+            </MultiDataTrigger>
           </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
@@ -203,6 +217,13 @@
         </ControlTemplate>
       </Setter.Value>
     </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsEditable"
+               Value="True">
+        <Setter Property="IsTabStop"
+                Value="False" />
+      </Trigger>
+    </Style.Triggers>
   </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
index 6b97c457..1ed68b3f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
index 4d03d107..8f58895e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
index bd3d6c91..2e2dc788 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
index ad27f8ba..609f7dcb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
index 690c9232..045681b2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
index 07209708..d5274d36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
index 2a5bd5ef..52387a31 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
index 7256260d..cb825da8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
index 89c66d09..d484f46d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
index d1f499f6..a093d79c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
index 2ee81a1a..b553af08 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Delete16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Delete16.png
deleted file mode 100644
index dee2496a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Delete16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png
deleted file mode 100644
index 51b048bc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
deleted file mode 100644
index d3c774c2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
+++ /dev/null
@@ -1,705 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using System.Windows.Threading;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_NewItemTypesComboBox, Type = typeof( ComboBox ) )]
-  [TemplatePart( Name = PART_PropertyGrid, Type = typeof( PropertyGrid.PropertyGrid ) )]
-  [TemplatePart( Name = PART_ListBox, Type = typeof( ListBox ) )]
-  public class CollectionControl : Control
-  {
-    private const string PART_NewItemTypesComboBox = "PART_NewItemTypesComboBox";
-    private const string PART_PropertyGrid = "PART_PropertyGrid";
-    private const string PART_ListBox = "PART_ListBox";
-
-    #region Private Members
-
-    private ComboBox _newItemTypesComboBox;
-    private PropertyGrid.PropertyGrid _propertyGrid;
-    private ListBox _listBox;
-
-    #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
-    {
-      get
-      {
-        return ( ObservableCollection<object> )GetValue( ItemsProperty );
-      }
-      set
-      {
-        SetValue( ItemsProperty, value );
-      }
-    }
-
-    #endregion  //Items
-
-    #region ItemsSource Property
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControl ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return (IEnumerable)GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    private static void OnItemsSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      var CollectionControl = ( CollectionControl )d;
-      if( CollectionControl != null )
-        CollectionControl.OnItemSourceChanged( (IEnumerable)e.OldValue, (IEnumerable)e.NewValue );
-    }
-
-    public void OnItemSourceChanged( IEnumerable oldValue, IEnumerable newValue )
-    {
-      if( newValue != null )
-      {
-        var dict = newValue as IDictionary;
-        if( dict != null )
-        {
-          // A Dictionary contains KeyValuePair that can't be edited.
-          // We need to Add EditableKeyValuePairs from DictionaryEntries.
-          foreach( DictionaryEntry item in dict )
-          {
-            var keyType = (item.Key != null) 
-                          ? item.Key.GetType()
-                          : (dict.GetType().GetGenericArguments().Count() > 0) ? dict.GetType().GetGenericArguments()[0] : typeof( object );
-            var valueType = (item.Value != null)
-                          ? item.Value.GetType()
-                          : (dict.GetType().GetGenericArguments().Count() > 1) ? dict.GetType().GetGenericArguments()[ 1 ] : typeof( object );
-            var editableKeyValuePair = ListUtilities.CreateEditableKeyValuePair( item.Key
-                                                                                , keyType
-                                                                                , item.Value
-                                                                                , valueType );
-            this.Items.Add( editableKeyValuePair );
-          }
-        }
-        else
-        {
-          foreach( var item in newValue )
-          {
-            if( item != null )
-            {
-              Items.Add( item );
-            }
-          }
-        }
-      }
-    }
-
-    #endregion  //ItemsSource
-
-    #region ItemsSourceType Property
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion //ItemsSourceType
-
-    #region NewItemType Property
-
-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
-
-    #endregion  //NewItemType
-
-    #region PropertiesLabel Property
-
-    public static readonly DependencyProperty PropertiesLabelProperty = DependencyProperty.Register( "PropertiesLabel", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( "Properties:" ) );
-    public object PropertiesLabel
-    {
-      get
-      {
-        return ( object )GetValue( PropertiesLabelProperty );
-      }
-      set
-      {
-        SetValue( PropertiesLabelProperty, value );
-      }
-    }
-
-    #endregion  //PropertiesLabel
-
-    #region SelectedItem Property
-
-    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public object SelectedItem
-    {
-      get
-      {
-        return ( object )GetValue( SelectedItemProperty );
-      }
-      set
-      {
-        SetValue( SelectedItemProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #region TypeSelectionLabel Property
-
-    public static readonly DependencyProperty TypeSelectionLabelProperty = DependencyProperty.Register( "TypeSelectionLabel", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( "Select type:" ) );
-    public object TypeSelectionLabel
-    {
-      get
-      {
-        return ( object )GetValue( TypeSelectionLabelProperty );
-      }
-      set
-      {
-        SetValue( TypeSelectionLabelProperty, value );
-      }
-    }
-
-    #endregion  //TypeSelectionLabel
-
-    #region EditorDefinitions Property
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #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 );
-      }
-
-      _listBox = this.GetTemplateChild( PART_ListBox ) as ListBox;
-
-      if( _propertyGrid != null )
-      {
-        _propertyGrid.PropertyValueChanged -= this.PropertyGrid_PropertyValueChanged;
-      }
-      _propertyGrid = GetTemplateChild( PART_PropertyGrid ) as PropertyGrid.PropertyGrid;
-      if( _propertyGrid != null )
-      {
-        _propertyGrid.PropertyValueChanged += this.PropertyGrid_PropertyValueChanged;
-      }
-    }
-
-    public PropertyGrid.PropertyGrid PropertyGrid
-    {
-      get
-      {
-        if( _propertyGrid == null )
-        {
-          this.ApplyTemplate();
-        }
-        return _propertyGrid;
-      }
-    }
-
-
-
-
-    #endregion
-
-    #region Constructors
-
-    static CollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionControl ), new FrameworkPropertyMetadata( typeof( CollectionControl ) ) );
-    }
-
-    public CollectionControl()
-    {
-      Items = new ObservableCollection<object>();
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.New, this.AddNew, this.CanAddNew ) );
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Delete, this.Delete, this.CanDelete ) );
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, this.Duplicate, this.CanDuplicate ) );
-      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveDown, this.MoveDown, this.CanMoveDown ) );
-      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveUp, this.MoveUp, this.CanMoveUp ) );
-    }
-
-    #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
-
-    #region ItemMovedDown Event
-
-    public delegate void ItemMovedDownRoutedEventHandler( object sender, ItemEventArgs e );
-
-    public static readonly RoutedEvent ItemMovedDownEvent = EventManager.RegisterRoutedEvent( "ItemMovedDown", RoutingStrategy.Bubble, typeof( ItemMovedDownRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemMovedDownRoutedEventHandler ItemMovedDown
-    {
-      add
-      {
-        AddHandler( ItemMovedDownEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemMovedDownEvent, value );
-      }
-    }
-
-    #endregion //ItemMovedDown Event
-
-    #region ItemMovedUp Event
-
-    public delegate void ItemMovedUpRoutedEventHandler( object sender, ItemEventArgs e );
-
-    public static readonly RoutedEvent ItemMovedUpEvent = EventManager.RegisterRoutedEvent( "ItemMovedUp", RoutingStrategy.Bubble, typeof( ItemMovedUpRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemMovedUpRoutedEventHandler ItemMovedUp
-    {
-      add
-      {
-        AddHandler( ItemMovedUpEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemMovedUpEvent, value );
-      }
-    }
-
-    #endregion //ItemMovedUp Event
-
-    #endregion
-
-    #region EventHandlers
-
-    void NewItemTypesComboBox_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( _newItemTypesComboBox != null )
-        _newItemTypesComboBox.SelectedIndex = 0;
-    }
-
-    private void PropertyGrid_PropertyValueChanged( object sender, PropertyGrid.PropertyValueChangedEventArgs e )
-    {
-      if( _listBox != null )
-      {
-        _listBox.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
-        {
-          _listBox.Items.Refresh();
-        }
-        ) );
-      }
-    }
-
-    #endregion
-
-    #region Commands
-
-    private void AddNew( object sender, ExecutedRoutedEventArgs e )
-    {
-      var newItem = this.CreateNewItem( ( Type )e.Parameter );
-
-      this.AddNewCore( newItem );
-    }
-
-    private void CanAddNew( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var t = e.Parameter as Type;
-      this.CanAddNewCore( t, e );
-    }
-
-    private void CanAddNewCore( Type t, CanExecuteRoutedEventArgs e )
-    {
-      if( ( t != null ) && !this.IsReadOnly )
-      {
-        var isComplexStruct = t.IsValueType && !t.IsEnum && !t.IsPrimitive;
-
-        if( isComplexStruct || ( t.GetConstructor( Type.EmptyTypes ) != null ) )
-        {
-          e.CanExecute = true;
-        }
-      }
-    }
-
-    private void AddNewCore( object newItem )
-    {
-      if( newItem == null )
-        throw new ArgumentNullException( "newItem" );
-
-      var eventArgs = new ItemAddingEventArgs( ItemAddingEvent, newItem );
-      this.RaiseEvent( eventArgs );
-      if( eventArgs.Cancel )
-        return;
-      newItem = eventArgs.Item;
-
-      this.Items.Add( newItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemAddedEvent, newItem ) );
-
-      this.SelectedItem = newItem;
-    }
-
-    private void Delete( object sender, ExecutedRoutedEventArgs e )
-    {
-      var eventArgs = new ItemDeletingEventArgs( ItemDeletingEvent, e.Parameter );
-      this.RaiseEvent( eventArgs );
-      if( eventArgs.Cancel )
-        return;
-
-      this.Items.Remove( e.Parameter );
-
-      this.RaiseEvent( new ItemEventArgs( ItemDeletedEvent, e.Parameter ) );
-    }
-
-    private void CanDelete( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = e.Parameter != null && !this.IsReadOnly;
-    }
-
-    private void Duplicate( object sender, ExecutedRoutedEventArgs e )
-    {
-      var newItem = this.DuplicateItem( e );
-      this.AddNewCore( newItem );
-    }
-
-    private void CanDuplicate( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var t = (e.Parameter != null) ? e.Parameter.GetType() : null;
-      this.CanAddNewCore( t, e );
-    }
-
-    private object DuplicateItem( ExecutedRoutedEventArgs e )
-    {
-      if( e == null )
-        throw new ArgumentNullException( "e" );
-
-      var baseItem = e.Parameter;
-      var newItemType = baseItem.GetType();
-      var newItem = this.CreateNewItem( newItemType );
-
-      var type = newItemType;
-      while( type != null )
-      {
-        var baseProperties = type.GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
-        foreach( var prop in baseProperties )
-        {
-          prop.SetValue( newItem, prop.GetValue( baseItem ) );
-        }
-        type = type.BaseType;
-      }
-
-      return newItem;
-    }
-
-    private void MoveDown( object sender, ExecutedRoutedEventArgs e )
-    {
-      var selectedItem = e.Parameter;
-      var index = Items.IndexOf( selectedItem );
-      Items.RemoveAt( index );
-      Items.Insert( ++index, selectedItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemMovedDownEvent, selectedItem ) );
-
-      this.SelectedItem = selectedItem;
-    }
-
-    private void CanMoveDown( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) && !this.IsReadOnly )
-        e.CanExecute = true;
-    }
-
-    private void MoveUp( object sender, ExecutedRoutedEventArgs e )
-    {
-      var selectedItem = e.Parameter;
-      var index = Items.IndexOf( selectedItem );
-      this.Items.RemoveAt( index );
-      this.Items.Insert( --index, selectedItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemMovedUpEvent, selectedItem ) );
-
-      this.SelectedItem = selectedItem;
-    }
-
-    private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 && !this.IsReadOnly )
-        e.CanExecute = true;
-    }
-
-    #endregion //Commands
-
-    #region Methods
-
-    public void PersistChanges()
-    {
-      this.PersistChanges( this.Items );
-    }
-
-    internal void PersistChanges( IList sourceList )
-    {
-      var collection = ComputeItemsSource();
-      if( collection == null )
-        return;
-
-      //IDictionary<T> and IDictionary
-      if( collection is IDictionary )
-      {
-        //For a Dictionary, we need to parse the list of EditableKeyValuePair and add KeyValuePair to the Dictionary.
-        var dict = (IDictionary)collection;
-        //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-        dict.Clear();
-
-        foreach( var item in sourceList )
-        {
-          var propInfoKey = item.GetType().GetProperty( "Key" );
-          var propInfoValue = item.GetType().GetProperty( "Value" );
-          if( (propInfoKey != null) && (propInfoValue != null) )
-          {
-            dict.Add( propInfoKey.GetValue( item, null ), propInfoValue.GetValue( item, null ) );
-          }
-        }
-      }
-      //IList
-      else if( collection is IList )
-      {
-        var list = (IList)collection;
-
-        //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-        list.Clear();
-
-        if( list.IsFixedSize )
-        {
-          if( sourceList.Count > list.Count )
-            throw new IndexOutOfRangeException("Exceeding array size.");
-
-          for( int i = 0; i < sourceList.Count; ++i )
-            list[ i ] = sourceList[ i ];
-        }
-        else
-        {
-          foreach( var item in sourceList )
-          {
-            list.Add( item );
-          }
-        }
-      }
-      else
-      {
-        //ICollection<T> (or IList<T>)
-        var collectionType = collection.GetType();
-        var iCollectionOfTInterface = collectionType.GetInterfaces().FirstOrDefault( x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof( ICollection<> )) );
-        if( iCollectionOfTInterface != null )
-        {
-          var argumentType = iCollectionOfTInterface.GetGenericArguments().FirstOrDefault();
-          if( argumentType != null )
-          {
-            var iCollectionOfTType = typeof( ICollection<> ).MakeGenericType( argumentType );
-
-            //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-            iCollectionOfTType.GetMethod( "Clear" ).Invoke( collection, null );
-
-            foreach( var item in sourceList )
-            {
-              iCollectionOfTType.GetMethod( "Add" ).Invoke( collection, new object[] { item } );
-            }
-          }
-        }
-      }
-    }
-
-    private IEnumerable CreateItemsSource()
-    {
-      IEnumerable collection = null;
-
-      if( ItemsSourceType != null )
-      {
-        var constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
-        if( constructor != null )
-        {
-          collection = ( IEnumerable )constructor.Invoke( null );
-        }
-        else if( ItemsSourceType.IsArray )
-        {
-          collection = Array.CreateInstance( ItemsSourceType.GetElementType(), Items.Count );
-        }
-      }
-
-      return collection;
-    }
-
-    private object CreateNewItem( Type type )
-    {
-      return Activator.CreateInstance( type );
-    }
-
-    private IEnumerable ComputeItemsSource()
-    {
-      if( ItemsSource == null )
-        ItemsSource = CreateItemsSource();
-
-      return ItemsSource;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
deleted file mode 100644
index 379fa047..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class CollectionControlButton : Button
-  {
-    #region Constructors
-
-    static CollectionControlButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionControlButton ), new FrameworkPropertyMetadata( typeof( CollectionControlButton ) ) );
-    }
-
-    public CollectionControlButton()
-    {
-      this.Click += this.CollectionControlButton_Click;
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region EditorDefinitions Property
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #region IsReadOnly Property
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlButton ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    #endregion  //IsReadOnly
-
-    #region ItemsSource Property
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return ( IEnumerable )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    #endregion  //ItemsSource
-
-    #region ItemsSourceType Property
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion //ItemsSourceType
-
-    #region NewItemTypes Property
-
-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
-
-    #endregion  //NewItemTypes
-
-    #endregion
-
-    #region Base Class Overrides
-
-
-    #endregion
-
-    #region Methods
-
-    private void CollectionControlButton_Click( object sender, RoutedEventArgs e )
-    {
-      var collectionControlDialog = new CollectionControlDialog();
-      var binding = new Binding( "ItemsSource" ) { Source = this, Mode = BindingMode.TwoWay };
-      BindingOperations.SetBinding( collectionControlDialog, CollectionControlDialog.ItemsSourceProperty, binding );
-      collectionControlDialog.NewItemTypes = this.NewItemTypes;
-      collectionControlDialog.ItemsSourceType = this.ItemsSourceType;
-      collectionControlDialog.IsReadOnly = this.IsReadOnly;
-      collectionControlDialog.EditorDefinitions = this.EditorDefinitions;
-      collectionControlDialog.ShowDialog();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
deleted file mode 100644
index aec19954..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:CollectionControlDialogBase x:Class="Xceed.Wpf.Toolkit.CollectionControlDialog"
-                                   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"
-                                   Title="Collection Control"
-                                   Height="400"
-                                   Width="600"
-                                   WindowStartupLocation="CenterScreen">
-
-   <Grid Margin="10">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="*" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <local:CollectionControl x:Name="_collectionControl"
-                               ItemsSourceType="{Binding ItemsSourceType, 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}}"
-                               EditorDefinitions="{Binding EditorDefinitions, 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>
-         <Button Width="75"
-                 Margin="2"
-                 Click="CancelButton_Click"
-                 IsCancel="True">Cancel</Button>
-      </StackPanel>
-
-   </Grid>
-</local:CollectionControlDialogBase>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
deleted file mode 100644
index c85a6ced..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Security;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit
-{
-    public partial class CollectionControlDialogBase :
-      Window
-    {
-    }
-
-    /// <summary>
-    /// Interaction logic for CollectionControlDialog.xaml
-    /// </summary>
-    public partial class CollectionControlDialog : CollectionControlDialogBase
-    {
-        #region Private Members
-
-        private IList originalData = new List<object>();
-
-        #endregion
-
-        #region Properties
-
-        public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register("ItemsSource", typeof(IEnumerable), typeof(CollectionControlDialog), new UIPropertyMetadata(null));
-        public IEnumerable ItemsSource
-        {
-            get
-            {
-                return (IEnumerable)GetValue(ItemsSourceProperty);
-            }
-            set
-            {
-                SetValue(ItemsSourceProperty, value);
-            }
-        }
-
-        public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register("ItemsSourceType", typeof(Type), typeof(CollectionControlDialog), new UIPropertyMetadata(null));
-        public Type ItemsSourceType
-        {
-            get
-            {
-                return (Type)GetValue(ItemsSourceTypeProperty);
-            }
-            set
-            {
-                SetValue(ItemsSourceTypeProperty, value);
-            }
-        }
-
-        public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register("NewItemTypes", typeof(IList), typeof(CollectionControlDialog), new UIPropertyMetadata(null));
-        public IList<Type> NewItemTypes
-        {
-            get
-            {
-                return (IList<Type>)GetValue(NewItemTypesProperty);
-            }
-            set
-            {
-                SetValue(NewItemTypesProperty, value);
-            }
-        }
-
-        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);
-            }
-        }
-
-        public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register("EditorDefinitions", typeof(EditorDefinitionCollection), typeof(CollectionControlDialog), new UIPropertyMetadata(null));
-        public EditorDefinitionCollection EditorDefinitions
-        {
-            get
-            {
-                return (EditorDefinitionCollection)GetValue(EditorDefinitionsProperty);
-            }
-            set
-            {
-                SetValue(EditorDefinitionsProperty, value);
-            }
-        }
-
-        public CollectionControl CollectionControl
-        {
-            get
-            {
-                return _collectionControl;
-            }
-        }
-
-        #endregion //Properties
-
-        #region Constructors
-
-        public CollectionControlDialog()
-        {
-            InitializeComponent();
-        }
-
-        public CollectionControlDialog(Type itemsourceType)
-          : this()
-        {
-            ItemsSourceType = itemsourceType;
-        }
-
-        public CollectionControlDialog(Type itemsourceType, IList<Type> newItemTypes)
-          : this(itemsourceType)
-        {
-            NewItemTypes = newItemTypes;
-        }
-
-        #endregion //Constructors
-
-        #region Overrides
-
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
-
-            //Backup data if case "Cancel" is clicked.
-            if (this.ItemsSource != null)
-            {
-                foreach (var item in this.ItemsSource)
-                {
-                    originalData.Add(this.Clone(item));
-                }
-            }
-        }
-
-        #endregion
-
-        #region Event Handlers
-
-        private void OkButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (this.ItemsSource is IDictionary)
-            {
-                if (!this.AreDictionaryKeysValid())
-                {
-                    MessageBox.Show("All dictionary items should have distinct non-null Key values.", "Warning");
-                    return;
-                }
-            }
-
-            _collectionControl.PersistChanges();
-            this.DialogResult = true;
-            this.Close();
-        }
-
-        private void CancelButton_Click(object sender, RoutedEventArgs e)
-        {
-            _collectionControl.PersistChanges(originalData);
-            this.DialogResult = false;
-            this.Close();
-        }
-
-        #endregion //Event Hanlders
-
-        #region Private Methods
-
-        [SecuritySafeCritical]
-        private object Clone(object source)
-        {
-            if (source == null)
-                return null;
-
-            object result = null;
-            var sourceType = source.GetType();
-
-            if (source is Array)
-            {
-                using (var stream = new MemoryStream())
-                {
-#pragma warning disable SYSLIB0011 // Type or member is obsolete
-                    var formatter = new BinaryFormatter();
-#pragma warning restore SYSLIB0011 // Type or member is obsolete
-                    formatter.Serialize(stream, source);
-                    stream.Seek(0, SeekOrigin.Begin);
-                    result = (Array)formatter.Deserialize(stream);
-                }
-            }
-            // For IDictionary, we need to create EditableKeyValuePair to edit the Key-Value.
-            else if ((this.ItemsSource is IDictionary)
-              && sourceType.IsGenericType
-              && typeof(KeyValuePair<,>).IsAssignableFrom(sourceType.GetGenericTypeDefinition()))
-            {
-                result = this.GenerateEditableKeyValuePair(source);
-            }
-            else
-            {
-                // Initialized a new object with default values
-                try
-                {
-                    result = FormatterServices.GetUninitializedObject(sourceType);
-                }
-                catch (Exception)
-                {
-                }
-
-                var constructor = sourceType.GetConstructor(Type.EmptyTypes);
-                if (constructor != null)
-                {
-                    constructor.Invoke(result, null);
-                }
-                else
-                {
-                    result = source;
-                }
-            }
-            Debug.Assert(result != null);
-            if (result != null)
-            {
-                var properties = sourceType.GetProperties();
-
-                foreach (var propertyInfo in properties)
-                {
-                    var parameters = propertyInfo.GetIndexParameters();
-                    var index = parameters.GetLength(0) == 0 ? null : new object[] { parameters.GetLength(0) - 1 };
-                    var propertyInfoValue = propertyInfo.GetValue(source, index);
-
-                    if (propertyInfo.CanWrite)
-                    {
-                        // Look for nested object
-                        if (propertyInfo.PropertyType.IsClass
-                          && (propertyInfo.PropertyType != typeof(Transform))
-                          && !propertyInfo.PropertyType.Equals(typeof(string)))
-                        {
-                            // We have a Collection/List of T.
-                            if (propertyInfo.PropertyType.IsGenericType)
-                            {
-                                // Clone sub-objects if the T are non-primitive types objects. 
-                                var arg = propertyInfo.PropertyType.GetGenericArguments().FirstOrDefault();
-                                if ((arg != null) && !arg.IsPrimitive && !arg.Equals(typeof(String)) && !arg.IsEnum)
-                                {
-                                    var nestedObject = this.Clone(propertyInfoValue);
-                                    propertyInfo.SetValue(result, nestedObject, null);
-                                }
-                                else
-                                {
-                                    // copy object if the T are primitive types objects.
-                                    propertyInfo.SetValue(result, propertyInfoValue, null);
-                                }
-                            }
-                            else
-                            {
-                                var nestedObject = this.Clone(propertyInfoValue);
-                                if (nestedObject != null)
-                                {
-                                    // For T object included in List/Collections, Add it to the List/Collection of T.
-                                    if (index != null)
-                                    {
-                                        result.GetType().GetMethod("Add").Invoke(result, new[] { nestedObject });
-                                    }
-                                    else
-                                    {
-                                        propertyInfo.SetValue(result, nestedObject, null);
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        {
-                            // For T object included in List/Collections, Add it to the List/Collection of T.
-                            if (index != null)
-                            {
-                                result.GetType().GetMethod("Add").Invoke(result, new[] { propertyInfoValue });
-                            }
-                            else
-                            {
-                                // copy regular object
-                                propertyInfo.SetValue(result, propertyInfoValue, null);
-                            }
-                        }
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        private object GenerateEditableKeyValuePair(object source)
-        {
-            var sourceType = source.GetType();
-            if ((sourceType.GetGenericArguments() == null) || (sourceType.GetGenericArguments().GetLength(0) != 2))
-                return null;
-
-            var propInfoKey = sourceType.GetProperty("Key");
-            var propInfoValue = sourceType.GetProperty("Value");
-            if ((propInfoKey != null) && (propInfoValue != null))
-            {
-                return ListUtilities.CreateEditableKeyValuePair(propInfoKey.GetValue(source, null)
-                                                                  , sourceType.GetGenericArguments()[0]
-                                                                  , propInfoValue.GetValue(source, null)
-                                                                  , sourceType.GetGenericArguments()[1]);
-            }
-            return null;
-        }
-
-        private bool AreDictionaryKeysValid()
-        {
-            var keys = _collectionControl.Items.Select(x =>
-            {
-                var keyType = x.GetType().GetProperty("Key");
-                if (keyType != null)
-                {
-                    return keyType.GetValue(x, null);
-                }
-                return null;
-            });
-
-            return (keys.Distinct().Count() == _collectionControl.Items.Count)
-                   && keys.All(x => x != null);
-        }
-
-        #endregion
-    }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
deleted file mode 100644
index d0ccf3e4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 12d3bb47..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index d8343bdd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index aa45304a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 1fc0ab77..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class PrimitiveTypeCollectionControl : ContentControl
-  {
-    #region Members
-
-    bool _surpressTextChanged;
-    bool _conversionFailed;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-
-    }
-
-    #endregion //IsOpen
-
-    #region ItemsSource
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
-    public IList ItemsSource
-    {
-      get
-      {
-        return ( IList )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    private static void OnItemsSourceChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnItemsSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
-    }
-
-    protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue )
-    {
-      if( newValue == null )
-        return;
-
-      if( ItemsSourceType == null )
-        ItemsSourceType = newValue.GetType();
-
-      if( ItemType == null && newValue.GetType().ContainsGenericParameters )
-        ItemType = newValue.GetType().GetGenericArguments()[ 0 ];
-
-      SetText( 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
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion ItemsSourceType
-
-    #region ItemType
-
-    public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register( "ItemType", typeof( Type ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null ) );
-    public Type ItemType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemTypeProperty, value );
-      }
-    }
-
-    #endregion ItemType
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null, OnTextChanged ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-      if( !_surpressTextChanged )
-        PersistChanges();
-    }
-
-    #endregion //Text
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static PrimitiveTypeCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PrimitiveTypeCollectionControl ), new FrameworkPropertyMetadata( typeof( PrimitiveTypeCollectionControl ) ) );
-    }
-
-    public PrimitiveTypeCollectionControl()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Overrides
-
-
-#endregion
-
-    #region Methods
-
-    private void PersistChanges()
-    {
-      IList list = ComputeItemsSource();
-      if( list == null )
-        return;
-
-      IList items = ComputeItems();
-
-      //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-      list.Clear();
-
-      int counter = 0;
-      foreach( var item in items )
-      {
-        if( list is Array )
-        {
-           ( ( Array )list ).SetValue( item, counter++);
-        }
-        else
-        {
-          list.Add( item );
-        }
-      };
-
-      // if something went wrong during conversion we want to reload the text to show only valid entries
-      if( _conversionFailed )
-        SetText( list );
-    }
-
-    private IList ComputeItems()
-    {
-      IList items = new List<object>();
-
-      if( ItemType == null )
-        return items;
-
-      string[] textArray = Text.Split( '\n' );
-
-      foreach( string s in textArray )
-      {
-        string valueString = s.TrimEnd( '\r' );
-        if( !String.IsNullOrEmpty( valueString ) )
-        {
-          object value = null;
-          try
-          {
-            if( ItemType.IsEnum )
-            {
-              value = Enum.Parse( ItemType, valueString );
-            }
-            else
-            {
-              value = Convert.ChangeType( valueString, ItemType );
-            }
-          }
-          catch
-          {
-            //a conversion failed
-            _conversionFailed = true;
-          }
-
-          if( value != null )
-            items.Add( value );
-        }
-      }
-
-      return items;
-    }
-
-    private IList ComputeItemsSource()
-    {
-      if( ItemsSource == null )
-      {
-        // Save current text since creating the ItemsSource will reset it
-        string currentText = this.Text;
-        ItemsSource = CreateItemsSource();
-        this.Text = currentText;
-      }
-
-      return ItemsSource;
-    }
-
-    private IList CreateItemsSource()
-    {
-      IList list = null;
-
-      if( ItemsSourceType != null )
-      {
-        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
-        list = ( IList )constructor.Invoke( null );
-      }
-
-      return list;
-    }
-
-    private void SetText( IEnumerable collection )
-    {
-      _surpressTextChanged = true;
-      StringBuilder builder = new StringBuilder();
-      foreach( object obj2 in collection )
-      {
-        builder.Append( obj2.ToString() );
-        builder.AppendLine();
-      }
-      Text = builder.ToString().Trim();
-      _surpressTextChanged = false;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 87404edb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,334 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <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}">
-    <Style.Resources>
-      <Style TargetType="ListBox">
-        <Setter Property="ItemTemplate">
-          <Setter.Value>
-            <DataTemplate>
-              <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-            </DataTemplate>
-          </Setter.Value>
-        </Setter>
-      </Style>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CollectionControl}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid  Margin="{TemplateBinding Padding}">
-              <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>
-                <ContentControl Margin="0,0,0,5"
-                                Content="{TemplateBinding TypeSelectionLabel}">
-                </ContentControl>
-                <ComboBox x:Name="PART_NewItemTypesComboBox"
-                          Grid.Row="1"
-                          Margin="0,0,0,3"
-                          HorizontalAlignment="Stretch">
-                  <ComboBox.ItemsSource>
-                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="ItemsSourceType" />
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="NewItemTypes" />
-                    </MultiBinding>
-                  </ComboBox.ItemsSource>
-                  <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                      <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-                    </DataTemplate>
-                  </ComboBox.ItemTemplate>
-                </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}">
-                </Button>
-                <ListBox x:Name="PART_ListBox"
-                         Grid.Row="2"
-                         Grid.ColumnSpan="2"
-                         ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedIndex="0">
-                </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=PART_ListBox}">
-                    <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=PART_ListBox}">
-                    <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=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Delete16.png">
-                    </Image>
-                  </Button>
-                  <Button Margin="0,7,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="Copy"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Duplicate.png">
-                    </Image>
-                  </Button>
-                </StackPanel>
-              </Grid>
-              <Grid Column="1"
-                    Margin="20,0,0,0">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <ContentControl Grid.Column="1"
-                                Content="{TemplateBinding PropertiesLabel}">
-                </ContentControl>
-                <pg:PropertyGrid x:Name="PART_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}}"
-                                 EditorDefinitions="{Binding EditorDefinitions, RelativeSource={RelativeSource TemplatedParent}}"/>
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                      TargetName="PART_NewItemTypesComboBox" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PrimitiveTypeCollectionControl"
-         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="IsTabStop"
-            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}"
-                                     ContentTemplate="{TemplateBinding ContentTemplate}"
-                                     Padding="{TemplateBinding Padding}"
-                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     IsOpen="{TemplateBinding IsOpen}"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     DropDownWidth="{TemplateBinding ActualWidth}" />
-
-          <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>
-
-  <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}" />
-
-  <Style x:Key="CollectionControlButton"
-         TargetType="{x:Type local:CollectionControlButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Left" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="MinHeight"
-            Value="22" />
-    <Setter Property="IsTabStop"
-            Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <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,2.75,2.75,0"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CollectionControlButton}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}">
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:CollectionControlButton}"
-         BasedOn="{StaticResource CollectionControlButton}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
deleted file mode 100644
index 6b1390ff..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
+++ /dev/null
@@ -1,327 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <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}">
-    <Style.Resources>
-      <Style TargetType="ListBox">
-        <Setter Property="ItemTemplate">
-          <Setter.Value>
-            <DataTemplate>
-              <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-            </DataTemplate>
-          </Setter.Value>
-        </Setter>
-      </Style>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CollectionControl}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid Margin="{TemplateBinding Padding}">
-              <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>
-                <ContentControl Margin="0,0,0,5"
-                                Content="{TemplateBinding TypeSelectionLabel}">
-                </ContentControl>
-                <ComboBox x:Name="PART_NewItemTypesComboBox"
-                          Grid.Row="1"
-                          Margin="0,0,0,3"
-                          HorizontalAlignment="Stretch">
-                  <ComboBox.ItemsSource>
-                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="ItemsSourceType" />
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="NewItemTypes" />
-                    </MultiBinding>
-                  </ComboBox.ItemsSource>
-                  <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                      <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-                    </DataTemplate>
-                  </ComboBox.ItemTemplate>
-                </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}" >
-                </Button>
-                <ListBox x:Name="PART_ListBox"
-                         Grid.Row="2"
-                         Grid.ColumnSpan="2"
-                         ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedIndex="0">
-                </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=PART_ListBox}">
-                    <Path Fill="#FF404040"
-                          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=PART_ListBox}">
-                    <Path Fill="#FF404040"
-                          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=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Delete16.png" >
-                    </Image>
-                  </Button>
-                  <Button Margin="0,7,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="Copy"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Duplicate.png">
-                    </Image>
-                  </Button>
-                </StackPanel>
-              </Grid>
-              <Grid Column="1"
-                    Margin="20,0,0,0">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <ContentControl Grid.Column="1"
-                                Content="{TemplateBinding PropertiesLabel}">
-                </ContentControl>
-                <pg:PropertyGrid x:Name="PART_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}}"
-                                 EditorDefinitions="{Binding EditorDefinitions, RelativeSource={RelativeSource TemplatedParent}}"/>
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                      TargetName="PART_NewItemTypesComboBox" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PrimitiveTypeCollectionControl"
-         TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderBrush">
-      <Setter.Value>
-        <LinearGradientBrush 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>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            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}"
-                                     ContentTemplate="{TemplateBinding ContentTemplate}"
-                                     Padding="{TemplateBinding Padding}"
-                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     IsOpen="{TemplateBinding IsOpen}"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     DropDownWidth="{TemplateBinding ActualWidth}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}" />
-
-  <Style x:Key="CollectionControlButton"
-         TargetType="{x:Type local:CollectionControlButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Left" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="MinHeight"
-            Value="22" />
-    <Setter Property="IsTabStop"
-            Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <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,2.75,2.75,0"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CollectionControlButton}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}">
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:CollectionControlButton}"
-         BasedOn="{StaticResource CollectionControlButton}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
index 8ad8ec1e..dffd70c3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
index 8d61bcbb..83ea3e72 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
index 4047e312..6ce3fcfa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -77,7 +77,8 @@
 
   <ControlTemplate x:Key="VerticalSlideThumbTemplate"
                    TargetType="{x:Type Thumb}">
-    <Canvas SnapsToDevicePixels="true">
+    <Canvas SnapsToDevicePixels="true"
+            Background="Transparent">
       <Path x:Name="LeftArrow"
             Stretch="Fill"
             StrokeLineJoin="Round"
@@ -89,11 +90,7 @@
             Height="8">
         <Path.RenderTransform>
           <TransformGroup>
-            <ScaleTransform />
-            <SkewTransform />
-            <RotateTransform />
-            <TranslateTransform Y="6"
-                                X="-3" />
+            <TranslateTransform Y="6" />
           </TransformGroup>
         </Path.RenderTransform>
       </Path>
@@ -108,11 +105,9 @@
             Height="8">
         <Path.RenderTransform>
           <TransformGroup>
-            <ScaleTransform />
-            <SkewTransform />
             <RotateTransform Angle="-180" />
             <TranslateTransform Y="6"
-                                X="8" />
+                                X="9" />
           </TransformGroup>
         </Path.RenderTransform>
       </Path>
@@ -128,7 +123,7 @@
     <Setter Property="Height"
             Value="12" />
     <Setter Property="Width"
-            Value="11" />
+            Value="15" />
     <Setter Property="Foreground"
             Value="Gray" />
     <Setter Property="Template"
@@ -178,6 +173,8 @@
             Value="DarkGray" />
     <Setter Property="BorderThickness"
             Value="1" />
+    <Setter Property="SmallChange"
+            Value="10" />
     <Setter Property="Orientation"
             Value="Vertical" />
     <Setter Property="Background"
@@ -305,6 +302,7 @@
                        Grid.Column="1"
                        Margin="2,0,2,0"
                        VerticalAlignment="Center"
+                       Foreground="{TemplateBinding Foreground}"
                        Style="{StaticResource ColorCanvasTextBoxStyle}">
               </TextBox>
             </Grid>
@@ -342,6 +340,7 @@
             <TextBlock Grid.Row="0"
                        Grid.Column="0"
                        Text="R"
+                       Foreground="{TemplateBinding Foreground}"
                        VerticalAlignment="Center">
             </TextBlock>
             <Slider x:Name="PART_RSlider"
@@ -359,12 +358,14 @@
                               Grid.Column="2"
                               Value="{Binding Value, ElementName=PART_RSlider}"
                               VerticalAlignment="Center"
+                              Foreground="{TemplateBinding Foreground}"
                               Background="Transparent">
             </local:ByteUpDown>
 
             <TextBlock Grid.Row="1"
                        Grid.Column="0"
                        Text="G"
+                       Foreground="{TemplateBinding Foreground}"
                        VerticalAlignment="Center">
             </TextBlock>
             <Slider x:Name="PART_GSlider"
@@ -382,12 +383,14 @@
                               Grid.Column="2"
                               Value="{Binding Value, ElementName=PART_GSlider}"
                               VerticalAlignment="Center"
-                              Background="Transparent">
+                              Background="Transparent"
+                              Foreground="{TemplateBinding Foreground}">
             </local:ByteUpDown>
 
             <TextBlock Grid.Row="2"
                        Grid.Column="0"
                        Text="B"
+                       Foreground="{TemplateBinding Foreground}"
                        VerticalAlignment="Center">
             </TextBlock>
             <Slider x:Name="PART_BSlider"
@@ -405,12 +408,14 @@
                               Grid.Column="3"
                               Value="{Binding Value, ElementName=PART_BSlider}"
                               VerticalAlignment="Center"
-                              Background="Transparent">
+                              Background="Transparent"
+                              Foreground="{TemplateBinding Foreground}">
             </local:ByteUpDown>
 
             <TextBlock Grid.Row="3"
                        Grid.Column="0"
                        Text="A"
+                       Foreground="{TemplateBinding Foreground}"
                        VerticalAlignment="Center"
                        Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
             </TextBlock>
@@ -430,6 +435,7 @@
                               Value="{Binding Value, ElementName=PART_OpacitySlider}"
                               VerticalAlignment="Center"
                               Background="Transparent"
+                              Foreground="{TemplateBinding Foreground}"
                               Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
             </local:ByteUpDown>
           </Grid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
index 2c9d81f4..4a4cc3fb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -164,13 +164,14 @@
     <Setter Property="Height"
             Value="12" />
     <Setter Property="Width"
-            Value="11" />
+            Value="15" />
     <Setter Property="Foreground"
             Value="Gray" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type Thumb}">
-          <Canvas SnapsToDevicePixels="true">
+          <Canvas SnapsToDevicePixels="true"
+                  Background="Transparent">
             <Path x:Name="LeftArrow"
                   Stretch="Fill"
                   StrokeLineJoin="Round"
@@ -182,11 +183,7 @@
                   Height="8">
               <Path.RenderTransform>
                 <TransformGroup>
-                  <ScaleTransform />
-                  <SkewTransform />
-                  <RotateTransform />
-                  <TranslateTransform Y="6"
-                                      X="-3" />
+                  <TranslateTransform Y="6" />
                 </TransformGroup>
               </Path.RenderTransform>
             </Path>
@@ -201,11 +198,9 @@
                   Height="8">
               <Path.RenderTransform>
                 <TransformGroup>
-                  <ScaleTransform />
-                  <SkewTransform />
                   <RotateTransform Angle="-180" />
                   <TranslateTransform Y="6"
-                                      X="8" />
+                                      X="9" />
                 </TransformGroup>
               </Path.RenderTransform>
             </Path>
@@ -392,6 +387,7 @@
                              Grid.Column="1"
                              Margin="2,0,2,0"
                              VerticalAlignment="Center"
+                             Foreground="{TemplateBinding Foreground}"
                              Style="{StaticResource ColorCanvasTextBoxStyle}" >
                     </TextBox>
                   </Grid>
@@ -429,6 +425,7 @@
                   <TextBlock Grid.Row="0"
                              Grid.Column="0"
                              Text="R"
+                             Foreground="{TemplateBinding Foreground}"
                              VerticalAlignment="Center" >
                   </TextBlock>
                   <Slider x:Name="PART_RSlider"
@@ -447,12 +444,14 @@
                                     Grid.Column="2"
                                     Value="{Binding Value, ElementName=PART_RSlider}"
                                     VerticalAlignment="Center"
-                                    Background="Transparent" >
+                                    Background="Transparent"
+                                    Foreground="{TemplateBinding Foreground}">
                   </local:ByteUpDown>
 
                   <TextBlock Grid.Row="1"
                              Grid.Column="0"
                              Text="G"
+                             Foreground="{TemplateBinding Foreground}"
                              VerticalAlignment="Center" >
                   </TextBlock>
                   <Slider x:Name="PART_GSlider"
@@ -471,12 +470,14 @@
                                     Grid.Column="2"
                                     Value="{Binding Value, ElementName=PART_GSlider}"
                                     VerticalAlignment="Center"
-                                    Background="Transparent" >
+                                    Background="Transparent"
+                                    Foreground="{TemplateBinding Foreground}">
                   </local:ByteUpDown>
 
                   <TextBlock Grid.Row="2"
                              Grid.Column="0"
                              Text="B"
+                             Foreground="{TemplateBinding Foreground}"
                              VerticalAlignment="Center" >
                   </TextBlock>
                   <Slider x:Name="PART_BSlider"
@@ -495,12 +496,14 @@
                                     Grid.Column="3"
                                     Value="{Binding Value, ElementName=PART_BSlider}"
                                     VerticalAlignment="Center"
-                                    Background="Transparent" >
+                                    Background="Transparent"
+                                    Foreground="{TemplateBinding Foreground}">
                   </local:ByteUpDown>
 
                   <TextBlock Grid.Row="3"
                              Grid.Column="0"
                              Text="A"
+                             Foreground="{TemplateBinding Foreground}"
                              VerticalAlignment="Center"
                              Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
                   </TextBlock>
@@ -521,6 +524,7 @@
                                     Value="{Binding Value, ElementName=PART_OpacitySlider}"
                                     VerticalAlignment="Center"
                                     Background="Transparent"
+                                    Foreground="{TemplateBinding Foreground}"
                                     Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
                   </local:ByteUpDown>
                 </Grid>
@@ -559,6 +563,8 @@
             Value="DarkGray" />
     <Setter Property="BorderThickness"
             Value="1" />
+    <Setter Property="SmallChange"
+            Value="10" />
     <Setter Property="Orientation"
             Value="Vertical" />
     <Setter Property="Background"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
index 883ef47e..49dcbb67 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
index 23c0a469..48ba347a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -65,22 +65,22 @@ namespace Xceed.Wpf.Toolkit
 
     #region Properties
 
-    #region AdvancedButtonHeader
+    #region AdvancedTabHeader
 
-    public static readonly DependencyProperty AdvancedButtonHeaderProperty = DependencyProperty.Register( "AdvancedButtonHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Advanced" ) );
-    public string AdvancedButtonHeader
+    public static readonly DependencyProperty AdvancedTabHeaderProperty = DependencyProperty.Register( "AdvancedTabHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Advanced" ) );
+    public string AdvancedTabHeader
     {
       get
       {
-        return ( string )GetValue( AdvancedButtonHeaderProperty );
+        return ( string )GetValue( AdvancedTabHeaderProperty );
       }
       set
       {
-        SetValue( AdvancedButtonHeaderProperty, value );
+        SetValue( AdvancedTabHeaderProperty, value );
       }
     }
 
-    #endregion //AdvancedButtonHeader
+    #endregion //AdvancedTabHeader
 
     #region AvailableColors
 
@@ -219,6 +219,57 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //ColorMode
 
+    #region DropDownBackground
+
+    public static readonly DependencyProperty DropDownBackgroundProperty = DependencyProperty.Register( "DropDownBackground", typeof( Brush ), typeof( ColorPicker ), new UIPropertyMetadata( null ) );
+    public Brush DropDownBackground
+    {
+      get
+      {
+        return (Brush)GetValue( DropDownBackgroundProperty );
+      }
+      set
+      {
+        SetValue( DropDownBackgroundProperty, value );
+      }
+    }
+
+    #endregion //DropDownBackground
+
+    #region HeaderBackground
+
+    public static readonly DependencyProperty HeaderBackgroundProperty = DependencyProperty.Register( "HeaderBackground", typeof( Brush ), typeof( ColorPicker ), new UIPropertyMetadata( null ) );
+    public Brush HeaderBackground
+    {
+      get
+      {
+        return (Brush)GetValue( HeaderBackgroundProperty );
+      }
+      set
+      {
+        SetValue( HeaderBackgroundProperty, value );
+      }
+    }
+
+    #endregion //HeaderBackground
+
+    #region HeaderForeground
+
+    public static readonly DependencyProperty HeaderForegroundProperty = DependencyProperty.Register( "HeaderForeground", typeof( Brush ), typeof( ColorPicker ), new UIPropertyMetadata( Brushes.Black ) );
+    public Brush HeaderForeground
+    {
+      get
+      {
+        return (Brush)GetValue( HeaderForegroundProperty );
+      }
+      set
+      {
+        SetValue( HeaderForegroundProperty, value );
+      }
+    }
+
+    #endregion //HeaderForeground
+
     #region IsOpen
 
     public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
@@ -452,22 +503,22 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //ShowDropDownButton
 
-    #region StandardButtonHeader
+    #region StandardTabHeader
 
-    public static readonly DependencyProperty StandardButtonHeaderProperty = DependencyProperty.Register( "StandardButtonHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard" ) );
-    public string StandardButtonHeader
+    public static readonly DependencyProperty StandardTabHeaderProperty = DependencyProperty.Register( "StandardTabHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard" ) );
+    public string StandardTabHeader
     {
       get
       {
-        return ( string )GetValue( StandardButtonHeaderProperty );
+        return ( string )GetValue( StandardTabHeaderProperty );
       }
       set
       {
-        SetValue( StandardButtonHeaderProperty, value );
+        SetValue( StandardTabHeaderProperty, value );
       }
     }
 
-    #endregion //StandardButtonHeader
+    #endregion //StandardTabHeader
 
     #region StandardColors
 
@@ -503,6 +554,40 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //StandardColorsHeader
 
+    #region TabBackground
+
+    public static readonly DependencyProperty TabBackgroundProperty = DependencyProperty.Register( "TabBackground", typeof( Brush ), typeof( ColorPicker ), new UIPropertyMetadata( null ) );
+    public Brush TabBackground
+    {
+      get
+      {
+        return (Brush)GetValue( TabBackgroundProperty );
+      }
+      set
+      {
+        SetValue( TabBackgroundProperty, value );
+      }
+    }
+
+    #endregion //TabBackground
+
+    #region TabForeground
+
+    public static readonly DependencyProperty TabForegroundProperty = DependencyProperty.Register( "TabForeground", typeof( Brush ), typeof( ColorPicker ), new UIPropertyMetadata( Brushes.Black ) );
+    public Brush TabForeground
+    {
+      get
+      {
+        return (Brush)GetValue( TabForegroundProperty );
+      }
+      set
+      {
+        SetValue( TabForegroundProperty, value );
+      }
+    }
+
+    #endregion //TabForeground
+
     #region UsingAlphaChannel
 
     public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorPicker ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
index 370263a6..e06b458a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
@@ -1,43 +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.Controls;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ColorPickerTabItem : TabItem
-  {
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( e.Source == this || !this.IsSelected )
-        return;
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      //Selection on Mouse Up
-      if( e.Source == this || !this.IsSelected )
-      {
-        base.OnMouseLeftButtonDown( e );
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-  }
-}
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ColorPickerTabItem : TabItem
+  {
+    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( e.Source == this || !this.IsSelected )
+      {
+        e.Handled = true;
+        return;
+      }
+
+      base.OnMouseLeftButtonDown( e );
+    }
+
+    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      //Selection on Mouse Up
+      if( e.Source == this || !this.IsSelected )
+      {
+        base.OnMouseLeftButtonDown( e );
+      }
+
+      base.OnMouseLeftButtonUp( e );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
index 30fa8ec5..564309a5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
index ca5926c0..427898e8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -211,11 +211,13 @@
             Value="0" />
     <Setter Property="MaxHeight"
             Value="500" />
+    <!-- ConverterParameter is margin/Padding from Popup-->
+    <Setter Property="Width"
+            Value="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
     <Setter Property="ItemsPanel">
       <Setter.Value>
         <ItemsPanelTemplate>
-          <!-- ConverterParameter is margin/Padding from Popup-->
-          <WrapPanel Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+          <WrapPanel Width="{Binding ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}, Converter={StaticResource AdditionConverter}, ConverterParameter=-4}" />
         </ItemsPanelTemplate>
       </Setter.Value>
     </Setter>
@@ -234,12 +236,12 @@
       <Border x:Name="mainBorder"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="1,1,1,0"
-              Background="#FFF0F0F0"
+              Background="{TemplateBinding Background}"
               Margin="0">
         <Border x:Name="innerBorder"
                 BorderBrush="#ACACAC"
                 BorderThickness="1,1,1,0"
-                Background="#FFF0F0F0"
+                Background="{TemplateBinding Background}"
                 Margin="-1"
                 Opacity="0" />
       </Border>
@@ -250,7 +252,7 @@
                         Margin="{TemplateBinding Padding}"
                         RecognizesAccessKey="True"
                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+                        VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
     </Grid>
     <ControlTemplate.Triggers>
       <MultiDataTrigger>
@@ -291,7 +293,13 @@
     <Setter Property="VerticalContentAlignment"
             Value="Center" />
     <Setter Property="MaxDropDownWidth"
-            Value="218" />
+            Value="250" />
+    <Setter Property="HeaderBackground"
+            Value="AliceBlue"/>
+    <Setter Property="DropDownBackground"
+            Value="{StaticResource PanelBackgroundBrush}"/>
+    <Setter Property="TabBackground"
+            Value="#FFF0F0F0"/>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:ColorPicker}">
@@ -339,7 +347,8 @@
                    HorizontalOffset="1"
                    VerticalOffset="1"
                    PopupAnimation="Slide"
-                   ToolTip="{x:Static sys:String.Empty}">
+                   ToolTip="{x:Static sys:String.Empty}"
+                   Width="{TemplateBinding MaxDropDownWidth}">
               <Popup.Resources>
                 <Style TargetType="ToolTip">
                   <Style.Triggers>
@@ -352,14 +361,16 @@
                 </Style>
               </Popup.Resources>
               <Border BorderThickness="1"
-                      Background="{StaticResource PanelBackgroundBrush}"
+                      Background="{TemplateBinding DropDownBackground}"
                       BorderBrush="{StaticResource PopupDarkBorderBrush}"
                       Padding="3">
                 <TabControl x:Name="ColorPickerTabControl"
                             Background="Transparent"
                             SelectedIndex="{Binding ColorMode, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorModeToTabItemSelectedConverter}}">
                   <local:ColorPickerTabItem x:Name="StandardTabItem"
-                                            Header="{Binding StandardButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Header="{Binding StandardTabHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Background="{TemplateBinding TabBackground}"
+                                            Foreground="{TemplateBinding TabForeground}"
                                             Template="{StaticResource TabItemTemplate}">
                     <Grid x:Name="_colorPaletteHost"
                           Margin="4">
@@ -379,7 +390,8 @@
                             <RowDefinition />
                           </Grid.RowDefinitions>
                           <TextBlock Text="{TemplateBinding AvailableColorsHeader}"
-                                     Background="AliceBlue"
+                                     Background="{TemplateBinding HeaderBackground}"
+                                     Foreground="{TemplateBinding HeaderForeground}"
                                      Padding="2"
                                      Margin="0,0,0,1">
                           </TextBlock>
@@ -400,7 +412,8 @@
                             <RowDefinition Height="Auto" />
                           </Grid.RowDefinitions>
                           <TextBlock Text="{TemplateBinding StandardColorsHeader}"
-                                     Background="AliceBlue"
+                                     Background="{TemplateBinding HeaderBackground}"
+                                     Foreground="{TemplateBinding HeaderForeground}"
                                      Padding="2"
                                      Margin="0,1,0,1">
                           </TextBlock>
@@ -422,7 +435,8 @@
                             <RowDefinition Height="22" />
                           </Grid.RowDefinitions>
                           <TextBlock Text="{TemplateBinding RecentColorsHeader}"
-                                     Background="AliceBlue"
+                                     Background="{TemplateBinding HeaderBackground}"
+                                     Foreground="{TemplateBinding HeaderForeground}"
                                      Padding="2"
                                      Margin="0,1,0,1">
                           </TextBlock>
@@ -436,15 +450,22 @@
                     </Grid>
                   </local:ColorPickerTabItem>
                   <local:ColorPickerTabItem x:Name="AdvancedTabItem"
-                                            Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Header="{Binding AdvancedTabHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Background="{TemplateBinding TabBackground}"
+                                            Foreground="{TemplateBinding TabForeground}"
                                             Template="{StaticResource TabItemTemplate}">
                     <!-- ColorCanvas -->
-                    <Grid x:Name="_colorCanvasHost">
-                      <local:ColorCanvas Background="Transparent"
-                                         BorderThickness="0"
-                                         UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
-                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+                    <!-- ConverterParameter is margin/Padding from Popup-->
+                    <Grid x:Name="_colorCanvasHost"
+                          Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}">
+                      <ScrollViewer HorizontalScrollBarVisibility="Auto"
+                                    VerticalScrollBarVisibility="Hidden">
+                        <local:ColorCanvas Background="Transparent"
+                                           BorderThickness="0"
+                                           Foreground="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}"
+                                           UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                           SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                      </ScrollViewer>
                     </Grid>
                   </local:ColorPickerTabItem>
                 </TabControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
index aa31e288..bcf1b846 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -251,11 +251,13 @@
             Value="0" />
     <Setter Property="MaxHeight"
             Value="500" />
+    <!-- ConverterParameter is margin/Padding from Popup-->
+    <Setter Property="Width"
+            Value="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
     <Setter Property="ItemsPanel">
       <Setter.Value>
         <ItemsPanelTemplate>
-          <!-- ConverterParameter is margin/Padding from Popup-->
-          <WrapPanel Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+          <WrapPanel Width="{Binding ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}, Converter={StaticResource AdditionConverter}, ConverterParameter=-4}" />
         </ItemsPanelTemplate>
       </Setter.Value>
     </Setter>
@@ -274,12 +276,12 @@
       <Border x:Name="mainBorder"
               BorderBrush="{TemplateBinding BorderBrush}"
               BorderThickness="1,1,1,0"
-              Background="#FFF0F0F0"
+              Background="{TemplateBinding Background}"
               Margin="0">
         <Border x:Name="innerBorder"
                 BorderBrush="#ACACAC"
                 BorderThickness="1,1,1,0"
-                Background="#FFF0F0F0"
+                Background="{TemplateBinding Background}"
                 Margin="-1"
                 Opacity="0" />
       </Border>
@@ -325,7 +327,22 @@
     <Setter Property="VerticalContentAlignment"
             Value="Center" />
     <Setter Property="MaxDropDownWidth"
-            Value="218" />
+            Value="250" />
+    <Setter Property="HeaderBackground"
+            Value="AliceBlue" />
+    <Setter Property="DropDownBackground">
+      <Setter.Value>
+        <LinearGradientBrush EndPoint="0.5,1"
+                              StartPoint="0.5,0">
+          <GradientStop Color="#FFFAFBFB"
+                        Offset="0" />
+          <GradientStop Color="#FFF4F4F4"
+                        Offset="1" />
+        </LinearGradientBrush>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="TabBackground"
+            Value="#FFF0F0F0" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:ColorPicker}">
@@ -373,7 +390,8 @@
                    HorizontalOffset="1"
                    VerticalOffset="1"
                    PopupAnimation="Slide"
-                   ToolTip="{x:Static sys:String.Empty}">
+                   ToolTip="{x:Static sys:String.Empty}"
+                   Width="{TemplateBinding MaxDropDownWidth}">
               <Popup.Resources>
                 <Style TargetType="ToolTip">
                   <Style.Triggers>
@@ -386,14 +404,16 @@
                 </Style>
               </Popup.Resources>
               <Border BorderThickness="1"
-                      Background="{StaticResource PopupBackgroundBrush}"
+                      Background="{TemplateBinding DropDownBackground}"
                       BorderBrush="{StaticResource ColorPickerDarkBorderBrush}"
                       Padding="3">
                 <TabControl x:Name="ColorPickerTabControl"
                             Background="Transparent"
                             SelectedIndex="{Binding ColorMode, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorModeToTabItemSelectedConverter}}">
                   <local:ColorPickerTabItem x:Name="StandardTabItem"
-                                            Header="{Binding StandardButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Header="{Binding StandardTabHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Background="{TemplateBinding TabBackground}"
+                                            Foreground="{TemplateBinding TabForeground}"
                                             Template="{StaticResource TabItemTemplate}">
                     <Grid x:Name="_colorPaletteHost"
                           Margin="4">
@@ -413,7 +433,8 @@
                             <RowDefinition />
                           </Grid.RowDefinitions>
                           <TextBlock Text="{TemplateBinding AvailableColorsHeader}"
-                                     Background="AliceBlue"
+                                     Background="{TemplateBinding HeaderBackground}"
+                                     Foreground="{TemplateBinding HeaderForeground}"
                                      Padding="2"
                                      Margin="0,0,0,1" >
                           </TextBlock>
@@ -434,7 +455,8 @@
                             <RowDefinition Height="Auto" />
                           </Grid.RowDefinitions>
                           <TextBlock Text="{TemplateBinding StandardColorsHeader}"
-                                     Background="AliceBlue"
+                                     Background="{TemplateBinding HeaderBackground}"
+                                     Foreground="{TemplateBinding HeaderForeground}"
                                      Padding="2"
                                      Margin="0,1,0,1" >
                           </TextBlock>
@@ -456,7 +478,8 @@
                             <RowDefinition Height="22" />
                           </Grid.RowDefinitions>
                           <TextBlock Text="{TemplateBinding RecentColorsHeader}"
-                                     Background="AliceBlue"
+                                     Background="{TemplateBinding HeaderBackground}"
+                                     Foreground="{TemplateBinding HeaderForeground}"
                                      Padding="2"
                                      Margin="0,1,0,1" >
                           </TextBlock>
@@ -470,15 +493,22 @@
                     </Grid>
                   </local:ColorPickerTabItem>
                   <local:ColorPickerTabItem x:Name="AdvancedTabItem"
-                                            Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Header="{Binding AdvancedTabHeader, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Background="{TemplateBinding TabBackground}"
+                                            Foreground="{TemplateBinding TabForeground}"
                                             Template="{StaticResource TabItemTemplate}">
                     <!-- ColorCanvas -->
-                    <Grid x:Name="_colorCanvasHost">
-                      <local:ColorCanvas Background="Transparent"
-                                         BorderThickness="0"
-                                         UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
-                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
+                    <!-- ConverterParameter is margin/Padding from Popup-->
+                    <Grid x:Name="_colorCanvasHost"
+                          Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}">
+                      <ScrollViewer HorizontalScrollBarVisibility="Auto"
+                                    VerticalScrollBarVisibility="Hidden">
+                        <local:ColorCanvas Background="Transparent"
+                                           BorderThickness="0"
+                                           Foreground="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}"
+                                           UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                           SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                      </ScrollViewer>
                     </Grid>
                   </local:ColorPickerTabItem>
                 </TabControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
index d58c61e5..776a9690 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
index dcd4f140..6e3972aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
@@ -1,46 +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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class AdditionConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( value != null ) && ( parameter != null ) )
-      {
-        var firstValue = ( double )value;
-        var secondValue = double.Parse( parameter as string );
-
-        return firstValue + secondValue;
-      }
-
-      return 0d;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class AdditionConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( ( value != null ) && ( parameter != null ) )
+      {
+        var firstValue = ( double )value;
+        var secondValue = double.Parse( parameter as string );
+
+        return firstValue + secondValue;
+      }
+
+      return 0d;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
index cda549e1..2b610a6d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
index 5d8ff375..f9076a1a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
index e1711fe9..1867d59b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
index b40f1574..b72a9fb6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
index dced284a..e2c0c550 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
@@ -1,37 +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.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class ColorModeToTabItemSelectedConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      var colorMode = ( ColorMode )value;
-      return (colorMode == ColorMode.ColorPalette) ? 0 : 1;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      var index = ( int )value;
-      return ( index == 0 ) ? ColorMode.ColorPalette : ColorMode.ColorCanvas;
-    }
-  }
-}
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   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.Core.Converters
+{
+  public class ColorModeToTabItemSelectedConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      var colorMode = ( ColorMode )value;
+      return (colorMode == ColorMode.ColorPalette) ? 0 : 1;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      var index = ( int )value;
+      return ( index == 0 ) ? ColorMode.ColorPalette : ColorMode.ColorCanvas;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
index efe72b02..a80baa42 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
index 1eb772bc..3035bcd7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
index 390da4cd..9ecc5176 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
index 8a906ad9..b85e1274 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
index 56a6d0c2..48078af7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
index 75650e12..f7494084 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
index d059569e..910a2cf6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
index ed3c07f8..5ef35453 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
index 86cc37b8..1ec2ed3f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
index fdcefa48..51afe73d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
index f78807d0..5bdfb2a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
index e535f3b0..4cbac488 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
index e09d4cff..27075f9d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
index 1135f2f3..fc8e70aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
index bfec6ea8..cab07d34 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
index ae3aaceb..a005a5c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
index c44e86f9..33606c19 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
index 7c376726..582cccc6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
index 9a81349f..c8388ecb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
index 83d0562a..ab598c53 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
index bc7c6151..30508b64 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
index 0e82cf02..a2ec6d7b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
index e1c47a14..e43a9b4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
index cec587da..c6dcb0ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
index 793cb9e1..d4ba10d5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
index 97fc54bf..da34cce8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
index 1d67d3fd..defef0ab 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
@@ -1,24 +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
-
-  ***********************************************************************************/
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public enum Location
-  {
-    Left,
-    Right
-  }
-}
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public enum Location
+  {
+    Left,
+    Right
+  }
+}
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 3ec7e7ba..06bafef8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 c8b9024f..cfaf41ea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 1cc8fcb1..f73dbd95 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 dbb3d684..730249c8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 57f56b0e..3fca370c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 41c3a77a..18cf3a70 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 4b7765a6..982407f4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
index 7a3f193e..b5b68d04 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
index af191752..53ee619b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
index f05278e7..4cf7a415 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
index 9a5459f7..7c97ba88 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
index b4c8ea12..1cc849cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
index 22eed4df..fcc9ff16 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
index 05be50dc..c38d48eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
index 48ef9fc9..81542fc1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
index c00f05bb..d9fd7a9d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
deleted file mode 100644
index a5ba5140..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  public class ContextMenuUtilities
-  {
-    public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached( "OpenOnMouseLeftButtonClick", typeof( bool ), typeof( ContextMenuUtilities ), new FrameworkPropertyMetadata( false, OpenOnMouseLeftButtonClickChanged ) );
-    public static void SetOpenOnMouseLeftButtonClick( FrameworkElement element, bool value )
-    {
-      element.SetValue( OpenOnMouseLeftButtonClickProperty, value );
-    }
-    public static bool GetOpenOnMouseLeftButtonClick( FrameworkElement element )
-    {
-      return ( bool )element.GetValue( OpenOnMouseLeftButtonClickProperty );
-    }
-
-    public static void OpenOnMouseLeftButtonClickChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var control = sender as FrameworkElement;
-      if( control != null )
-      {
-        if( ( bool )e.NewValue )
-        {
-          control.PreviewMouseLeftButtonDown += ContextMenuUtilities.Control_PreviewMouseLeftButtonDown;
-        }
-        else
-        {
-          control.PreviewMouseLeftButtonDown -= ContextMenuUtilities.Control_PreviewMouseLeftButtonDown;
-        }
-      }
-    }
-
-    private static void Control_PreviewMouseLeftButtonDown( object sender, System.Windows.Input.MouseButtonEventArgs e )
-    {
-      var control = sender as FrameworkElement;
-      if( (control != null) && (control.ContextMenu != null) )
-      {
-        // Get PropertyItemBase parent
-        var parent = VisualTreeHelper.GetParent( control );
-        while( parent != null )
-        {
-          var propertyItemBase = parent as PropertyItemBase;
-          if( propertyItemBase != null )
-          {
-            // Set the ContextMenu.DataContext to the PropertyItem associated to the clicked image.
-            control.ContextMenu.DataContext = propertyItemBase;
-            break;
-          }
-          parent = VisualTreeHelper.GetParent( parent );
-        }
-
-        control.ContextMenu.PlacementTarget = control;
-        control.ContextMenu.IsOpen = true;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
index 7749a5ea..3f0c79ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
index f77c43bc..030a3b2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
index 2a6c88cc..47cc397e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
index 89ff8d8d..be1540a9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
index de0e4f27..b71821d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
index 9ab3ee99..d96c6240 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
deleted file mode 100644
index c559e02c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-
-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;
-    }
-
-    internal static Type GetCollectionItemType( Type colType )
-    {
-      Type iCollectionOfT = null;
-      var isCollectionOfT = colType.IsGenericType && (colType.GetGenericTypeDefinition() == typeof( ICollection<> ) );
-      if( isCollectionOfT )
-      {
-        iCollectionOfT = colType;
-      }
-      else
-      {
-        iCollectionOfT = colType.GetInterfaces().FirstOrDefault(( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( ICollection<> ) );
-      }
-
-      return (iCollectionOfT != null)
-        ? iCollectionOfT.GetGenericArguments()[ 0 ]
-        : null;
-    }
-
-    internal static Type[] GetDictionaryItemsType( Type dictType )
-    {
-      var isDict = dictType.IsGenericType 
-        && ((dictType.GetGenericTypeDefinition() == typeof( Dictionary<,>) ) || (dictType.GetGenericTypeDefinition() == typeof( IDictionary<,>) ));
-
-      return isDict
-        ? new Type[] { dictType.GetGenericArguments()[ 0 ], dictType.GetGenericArguments()[ 1 ] }
-        : null;
-    }
-
-    internal static object CreateEditableKeyValuePair( object key, Type keyType, object value, Type valueType )
-    {
-      var itemType = ListUtilities.CreateEditableKeyValuePairType( keyType, valueType );
-      return Activator.CreateInstance( itemType, key, value );
-    }
-
-    internal static Type CreateEditableKeyValuePairType( Type keyType, Type valueType )
-    {
-      //return an EditableKeyValuePair< TKey, TValue> Type from keyType and valueType
-      var itemGenType = typeof( EditableKeyValuePair<,> );
-      Type[] itemGenTypeArgs = { keyType, valueType };
-      return itemGenType.MakeGenericType( itemGenTypeArgs );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
index 613a3f09..d227e78c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
index 510b47c0..f1a53632 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
index 028ad56a..62d9d29b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
index e4b4aa8c..1aa6d6a6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
index 2b80831c..5f46e4bf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
index 7467beb3..715615aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
index bf01e59e..0fc28ef4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
index 28a1720e..40912021 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
index 0c67b3ba..9a06859b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
index b29d30d0..63d0c96a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
index 90f32750..72a32e2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
index 580cd09b..266dc96b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
index 0ae57913..3b9ad7b4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
index c07e4186..2a399350 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs
similarity index 55%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs
index ec30f4b6..9dd41367 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs
@@ -1,11 +1,11 @@
 /*************************************************************************************
-
+   
    Toolkit for WPF
 
-   Copyright (C) 2007-2017 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -13,29 +13,29 @@
    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;
+using System.Windows.Data;
 
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters
+namespace Xceed.Wpf.Toolkit.Converters
 {
-  public class FlagPathConverter : IValueConverter
+  public class BorderThicknessConverter : 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 );
+      // Use the left value on the right as Thickness.
+      var originalThickness = value as Thickness?;
+      if( originalThickness.HasValue )
+        return new Thickness( originalThickness.Value.Left, originalThickness.Value.Top, originalThickness.Value.Left, originalThickness.Value.Bottom );
+
+      return value;
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
     {
-      return DependencyProperty.UnsetValue;
+      throw new NotImplementedException();
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
index 169a40a1..63bba7fd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -306,6 +306,12 @@ namespace Xceed.Wpf.Toolkit
         _calendarIntendedDateTime = null;
       }
 
+      if( _timePicker != null )
+      {
+        // sync TimePicker.TempValue with current DatetimePicker.Value
+        _timePicker.UpdateTempValue( newValue );
+      }
+
       base.OnValueChanged( oldValue, newValue );
     }
 
@@ -401,6 +407,10 @@ namespace Xceed.Wpf.Toolkit
             _calendarTemporaryDateTime = null;
             _calendarIntendedDateTime = null;
           }
+          else if( ( _timePicker != null ) && _timePicker.TempValue.HasValue )
+          {
+            newDate = newDate.Value.Date + _timePicker.TempValue.Value.TimeOfDay;
+          }
           else if( Value != null )
           {
             newDate = newDate.Value.Date + Value.Value.TimeOfDay;
@@ -421,19 +431,24 @@ namespace Xceed.Wpf.Toolkit
           }
         }
 
-        if( this.UpdateValueOnEnterKey )
-        {
-          _fireSelectionChangedEvent = false;
-          this.TextBox.Text = newDate.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-          _fireSelectionChangedEvent = true;
-        }
-        else
-        {
+        //if( this.UpdateValueOnEnterKey )
+        //{
+        //  _fireSelectionChangedEvent = false;
+        //  this.TextBox.Text = newDate.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
+        //  if( _timePicker != null )
+        //  {
+        //    // update TimePicker.TempValue with new Calendar selection.
+        //    _timePicker.UpdateTempValue( newDate );
+        //  }
+        //  _fireSelectionChangedEvent = true;
+        //}
+        //else
+        //{
           if( !object.Equals( newDate, Value ) )
           {
             this.Value = newDate;
           }
-        }
+        //}
       }
     }
 
@@ -443,6 +458,16 @@ namespace Xceed.Wpf.Toolkit
 
       if( _calendar != null )
         _calendar.Focus();
+
+      if( _timePicker != null )
+      {
+        if( this.TextBox != null )
+        {
+          // Set TimePicker.TempValue with current DateTimePicker.TextBox.Text.
+          var initialDate = this.ConvertTextToValue( this.TextBox.Text );
+          _timePicker.UpdateTempValue( initialDate );
+        }
+      }
     }
 
     #endregion //Event Handlers
@@ -455,15 +480,15 @@ namespace Xceed.Wpf.Toolkit
       {
         _calendar.BlackoutDates.Clear();
 
-        if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value != DateTime.MinValue ) )
+        if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value != System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime ) )
         {
           DateTime minDate = this.Minimum.Value;
-          _calendar.BlackoutDates.Add( new CalendarDateRange( DateTime.MinValue, minDate.AddDays( -1 ) ) );
+          _calendar.BlackoutDates.Add( new CalendarDateRange( System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime, minDate.AddDays( -1 ) ) );
         }
-        if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value != DateTime.MaxValue ) )
+        if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value != System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime ) )
         {
           DateTime maxDate = this.Maximum.Value;
-          _calendar.BlackoutDates.Add( new CalendarDateRange( maxDate.AddDays( 1 ), DateTime.MaxValue ) );
+          _calendar.BlackoutDates.Add( new CalendarDateRange( maxDate.AddDays( 1 ), System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime ) );
         }
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
index 55615261..fe76d044 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -20,6 +20,7 @@
                     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"
+                    xmlns:dateConv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
   <ResourceDictionary.MergedDictionaries>
@@ -29,8 +30,9 @@
 
   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+  <dateConv:BorderThicknessConverter x:Key="BorderThicknessConverter" />
 
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
     <ContentControl Content="{Binding}"
                     Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
                     Focusable="False"
@@ -268,6 +270,17 @@
                       Property="FocusManager.FocusedElement"
                       Value="{Binding ElementName=PART_TextBox}" />
             </Trigger>
+            <MultiTrigger>
+               <MultiTrigger.Conditions>
+                  <Condition Property="ShowButtonSpinner"
+                              Value="False" />
+                  <Condition Property="ShowDropDownButton"
+                              Value="False" />
+               </MultiTrigger.Conditions>
+                  <Setter Property="BorderThickness"
+                           Value="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessConverter}}"
+                           TargetName="PART_Spinner"/>
+            </MultiTrigger>
           </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
index 79d3a60e..ede63736 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -20,6 +20,7 @@
                     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"
+                    xmlns:dateConv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
   <ResourceDictionary.MergedDictionaries>
@@ -28,6 +29,7 @@
 
   <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+  <dateConv:BorderThicknessConverter x:Key="BorderThicknessConverter" />
 
   <DataTemplate x:Key="DefaultWatermarkTemplate">
     <ContentControl Content="{Binding}"
@@ -276,7 +278,18 @@
               <Setter Property="Foreground"
                       Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
             </Trigger>
-          </ControlTemplate.Triggers>
+               <MultiTrigger>
+                  <MultiTrigger.Conditions>
+                     <Condition Property="ShowButtonSpinner"
+                                 Value="False" />
+                     <Condition Property="ShowDropDownButton"
+                                 Value="False" />
+                  </MultiTrigger.Conditions>
+                  <Setter Property="BorderThickness"
+                           Value="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessConverter}}"
+                           TargetName="PART_Spinner" />
+               </MultiTrigger>
+            </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
index b5bba325..932a1646 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
index 9f17e145..35ba9e96 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
index 60cf05cc..72abedf6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -23,7 +23,7 @@ namespace Xceed.Wpf.Toolkit
 {
   internal class DateTimeParser
   {
-    public static bool TryParse( string value, string format, DateTime currentDate, CultureInfo cultureInfo, out DateTime result )
+    public static bool TryParse( string value, string format, DateTime currentDate, CultureInfo cultureInfo, bool autoClipTimeParts, out DateTime result )
     {
       bool success = false;
       result = currentDate;
@@ -31,7 +31,9 @@ namespace Xceed.Wpf.Toolkit
       if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( format ) )
         return false;
 
-      var dateTimeString = ComputeDateTimeString( value, format, currentDate, cultureInfo ).Trim();
+      DateTimeParser.UpdateValueFormatForQuotes( ref value, ref format );      
+
+      var dateTimeString = ComputeDateTimeString( value, format, currentDate, cultureInfo, autoClipTimeParts ).Trim();
 
       if( !String.IsNullOrEmpty( dateTimeString ) )
         success = DateTime.TryParse( dateTimeString, cultureInfo.DateTimeFormat, DateTimeStyles.None, out result );
@@ -42,13 +44,32 @@ namespace Xceed.Wpf.Toolkit
       return success;
     }
 
-    private static string ComputeDateTimeString( string dateTime, string format, DateTime currentDate, CultureInfo cultureInfo )
+    private static void UpdateValueFormatForQuotes( ref string value, ref string format )
+    {
+      var quoteStart = format.IndexOf( "'" );
+      if( quoteStart > -1 )
+      {
+        var quoteEnd = format.IndexOf( "'", quoteStart + 1 );
+        if( quoteEnd > -1 )
+        {
+          var quoteContent = format.Substring( quoteStart + 1, quoteEnd - quoteStart - 1 );
+          value = value.Replace( quoteContent, "" );
+          format = format.Remove( quoteStart, quoteEnd - quoteStart + 1 );
+
+          // Use recursive calls for many quote text. 
+          DateTimeParser.UpdateValueFormatForQuotes( ref value, ref format );
+        }
+      }
+    }
+
+    private static string ComputeDateTimeString( string dateTime, string format, DateTime currentDate, CultureInfo cultureInfo, bool autoClipTimeParts )
     {
       Dictionary<string, string> dateParts = GetDateParts( currentDate, cultureInfo );
       string[] timeParts = new string[ 3 ] { currentDate.Hour.ToString(), currentDate.Minute.ToString(), currentDate.Second.ToString() };
       string millisecondsPart = currentDate.Millisecond.ToString();
       string designator = "";
       string[] dateTimeSeparators = new string[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
+      var forcePMDesignator = false;
 
       UpdateSortableDateTimeString( ref dateTime, ref format, cultureInfo );
 
@@ -118,18 +139,50 @@ namespace Xceed.Wpf.Toolkit
             dateParts[ "Year" ] = dateTimeParts[ i ] != "0" ? dateTimeParts[ i ] : "0000";
 
             if( dateParts[ "Year" ].Length == 2 )
-              dateParts[ "Year" ] = string.Format( "{0}{1}", currentDate.Year / 100, dateParts[ "Year" ] );
+            {
+              var yearDigits = int.Parse( dateParts[ "Year" ] );
+              var twoDigitYearMax = cultureInfo.Calendar.TwoDigitYearMax;
+              var hundredDigits = ( yearDigits <= twoDigitYearMax % 100 ) ? twoDigitYearMax / 100 : ( twoDigitYearMax / 100 ) - 1;
+
+              dateParts[ "Year" ] = string.Format( "{0}{1}", hundredDigits, dateParts[ "Year" ] );
+            }
+          }
+          else if( f.Contains( "hh" ) || f.Contains( "HH" ) )
+          {
+            var hourValue = Convert.ToInt32( dateTimeParts[ i ] ) % 24;
+            timeParts[ 0 ] = autoClipTimeParts ? hourValue.ToString() : dateTimeParts[ i ];
           }
           else if( f.Contains( "h" ) || f.Contains( "H" ) )
-            timeParts[ 0 ] = dateTimeParts[ i ];
+          {
+            if( autoClipTimeParts )
+            {
+              var hourValue = Convert.ToInt32( dateTimeParts[ i ] ) % 24;
+              if( hourValue > 11 )
+              {
+                hourValue -= 12;
+                forcePMDesignator = true;
+              }
+              timeParts[ 0 ] = hourValue.ToString();
+            }
+            else
+            {
+              timeParts[ 0 ] = dateTimeParts[ i ];
+            }
+          }
           else if( f.Contains( "m" ) )
-            timeParts[ 1 ] = dateTimeParts[ i ];
+          {
+            var minuteValue = Convert.ToInt32( dateTimeParts[ i ] ) % 60;
+            timeParts[ 1 ] = autoClipTimeParts ? minuteValue.ToString() : dateTimeParts[ i ];
+          }
           else if( f.Contains( "s" ) )
-            timeParts[ 2 ] = dateTimeParts[ i ];
+          {
+            var secondValue = Convert.ToInt32( dateTimeParts[ i ] ) % 60;
+            timeParts[ 2 ] = autoClipTimeParts ? secondValue.ToString() : dateTimeParts[ i ];
+          }
           else if( f.Contains( "f" ) )
             millisecondsPart = dateTimeParts[ i ];
           else if( f.Contains( "t" ) )
-            designator = dateTimeParts[ i ];
+            designator = forcePMDesignator ? "PM" : dateTimeParts[ i ];
         }
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
index bc3b660e..7b326c7e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index 344516f9..7c5dea26 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -20,6 +20,7 @@ using System.Windows;
 using Xceed.Wpf.Toolkit.Primitives;
 using System.Windows.Controls;
 using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Windows.Input;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -34,6 +35,23 @@ namespace Xceed.Wpf.Toolkit
 
     #region Properties
 
+    #region AutoClipTimeParts
+
+    public static readonly DependencyProperty AutoClipTimePartsProperty = DependencyProperty.Register( "AutoClipTimeParts", typeof( bool ), typeof( DateTimeUpDown ), new UIPropertyMetadata( false ) );
+    public bool AutoClipTimeParts
+    {
+      get
+      {
+        return (bool)GetValue( AutoClipTimePartsProperty );
+      }
+      set
+      {
+        SetValue( AutoClipTimePartsProperty, value );
+      }
+    }
+
+    #endregion //AutoClipTimeParts
+
     #region Format
 
     public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( DateTimeFormat ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTimeFormat.FullDateTime, OnFormatChanged ) );
@@ -83,7 +101,7 @@ namespace Xceed.Wpf.Toolkit
       try
       {
         // Test the format string if it is used.
-        DateTime.MinValue.ToString( ( string )value, CultureInfo.CurrentCulture );
+        CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.ToString( (string)value, CultureInfo.CurrentCulture );
       }
       catch
       {
@@ -164,6 +182,16 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Kind
 
+    #region TempValue (Internal)
+
+    internal DateTime? TempValue
+    {
+      get;
+      set;
+    }
+
+    #endregion
+
     #region ContextNow (Private)
 
     internal DateTime ContextNow
@@ -183,8 +211,8 @@ namespace Xceed.Wpf.Toolkit
     static DateTimeUpDown()
     {
       DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( typeof( DateTimeUpDown ) ) );
-      MaximumProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( DateTime.MaxValue ) );
-      MinimumProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( DateTime.MinValue ) );
+      MaximumProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime ) );
+      MinimumProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime ) );
       UpdateValueOnEnterKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( true ) );
     }
 
@@ -316,9 +344,11 @@ namespace Xceed.Wpf.Toolkit
       //this only occurs when the user manually type in a value for the Value Property
       if( info == null )
         info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
+      if( info == null )
+        info = _dateTimeInfoList[ 0 ];
 
-        //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-        //but only if it is not null
+      //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
+      //but only if it is not null
       if( newValue != null )
         ParseValueIntoDateTimeInfo( this.Value );
 
@@ -663,6 +693,17 @@ namespace Xceed.Wpf.Toolkit
       throw new NotSupportedException( "DateTimeUpDown controls do not support modifying UpdateValueOnEnterKey property." );
     }
 
+    protected override void OnKeyDown( KeyEventArgs e )
+    {
+      if( e.Key == Key.Escape )
+      {
+        this.SyncTextAndValueProperties( false, null );
+        e.Handled = true;
+      }
+
+      base.OnKeyDown( e );
+    }
+
 
 #endregion //Base Class Overrides
 
@@ -710,6 +751,8 @@ namespace Xceed.Wpf.Toolkit
       if( currentValue.HasValue )
       {
         var newValue = this.UpdateDateTime( currentValue, step );
+        if( newValue == null )
+          return;
         this.TextBox.Text = newValue.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
       }
       else
@@ -725,6 +768,8 @@ namespace Xceed.Wpf.Toolkit
         //this only occurs when the user manually type in a value for the Value Property
         if( info == null )
           info = ( this.CurrentDateTimePart != DateTimePart.Other ) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
+        if( info == null )
+          info = _dateTimeInfoList[ 0 ];
 
         //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
         this.ParseValueIntoDateTimeInfo( this.ConvertTextToValue( this.TextBox.Text ) );
@@ -830,6 +875,8 @@ namespace Xceed.Wpf.Toolkit
       //this only occurs when the user manually type in a value for the Value Property
       if( info == null )
         info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
+      if( info == null )
+        info = _dateTimeInfoList[ 0 ];
 
       DateTime? result = null;
 
@@ -904,11 +951,12 @@ namespace Xceed.Wpf.Toolkit
       DateTime current = this.ContextNow;
       try
       {
-        current = (this.Value.HasValue)
-                    ? this.Value.Value
-                    : DateTime.Parse( this.ContextNow.ToString(), this.CultureInfo.DateTimeFormat );
+        // TempValue is used when Manipulating TextBox.Text while Value is not updated yet (used in DateTimePicker's TimePicker).
+        current = this.TempValue.HasValue
+                  ? this.TempValue.Value
+                  : this.Value.HasValue ? this.Value.Value : DateTime.Parse( this.ContextNow.ToString(), this.CultureInfo.DateTimeFormat );
 
-        isValid = DateTimeParser.TryParse( text, this.GetFormatString( Format ), current, this.CultureInfo, out result );
+        isValid = DateTimeParser.TryParse( text, this.GetFormatString( Format ), current, this.CultureInfo, this.AutoClipTimeParts, out result );
       }
       catch( FormatException )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
index e60fb629..0725e32f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
index bae925ff..c896174d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
index 11b77e7a..b3f468c0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -375,7 +375,10 @@ namespace Xceed.Wpf.Toolkit
 
     private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
     {
-      CloseDropDown( true );
+      if( !this.IsMouseCaptureWithin )
+      {
+        this.CloseDropDown( true );
+      }
     }
 
     private void DropDownButton_Click( object sender, RoutedEventArgs e )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
index f7faa69a..a4a6e9da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
index a54bfbf6..aca9bcab 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
index 9f08c400..044efff1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
@@ -1,185 +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
-
-  ***********************************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class IconButton : Button
-  {
-    #region Constructors
-
-    static IconButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( IconButton ), new FrameworkPropertyMetadata( typeof( IconButton ) ) );
-    }
-
-    public IconButton()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region Icon
-
-    public static readonly DependencyProperty IconProperty = DependencyProperty.Register( "Icon", typeof( Image ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-    public Image Icon
-    {
-      get
-      {
-        return ( Image )this.GetValue( IconButton.IconProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.IconProperty, value );
-      }
-    }
-
-    #endregion //Icon
-
-    #region IconLocation
-
-    public static readonly DependencyProperty IconLocationProperty = DependencyProperty.Register( "IconLocation", typeof( Location ),
-      typeof( IconButton ), new FrameworkPropertyMetadata( Location.Left ) );
-    public Location IconLocation
-    {
-      get
-      {
-        return ( Location )this.GetValue( IconButton.IconLocationProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.IconLocationProperty, value );
-      }
-    }
-
-    #endregion //IconLocation
-
-    #region MouseOverBackground
-
-    public static readonly DependencyProperty MouseOverBackgroundProperty = DependencyProperty.Register( "MouseOverBackground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverBackgroundProperty, value );
-      }
-    }
-
-    #endregion //MouseOverBackground
-
-    #region MouseOverBorderBrush
-
-    public static readonly DependencyProperty MouseOverBorderBrushProperty = DependencyProperty.Register( "MouseOverBorderBrush", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverBorderBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverBorderBrushProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverBorderBrushProperty, value );
-      }
-    }
-
-    #endregion //MouseOverBorderBrush
-
-    #region MouseOverForeground
-
-    public static readonly DependencyProperty MouseOverForegroundProperty = DependencyProperty.Register( "MouseOverForeground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverForegroundProperty, value );
-      }
-    }
-
-    #endregion //MouseOverForeground
-
-    #region MousePressedBackground
-
-    public static readonly DependencyProperty MousePressedBackgroundProperty = DependencyProperty.Register( "MousePressedBackground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedBackgroundProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedBackground
-
-    #region MousePressedBorderBrush
-
-    public static readonly DependencyProperty MousePressedBorderBrushProperty = DependencyProperty.Register( "MousePressedBorderBrush", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedBorderBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedBorderBrushProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedBorderBrushProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedBorderBrush
-
-    #region MousePressedForeground
-
-    public static readonly DependencyProperty MousePressedForegroundProperty = DependencyProperty.Register( "MousePressedForeground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedForegroundProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedForeground
-
-    #endregion
-  }
-}
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class IconButton : Button
+  {
+    #region Constructors
+
+    static IconButton()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( IconButton ), new FrameworkPropertyMetadata( typeof( IconButton ) ) );
+    }
+
+    public IconButton()
+    {
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    #region Icon
+
+    public static readonly DependencyProperty IconProperty = DependencyProperty.Register( "Icon", typeof( Image ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
+    public Image Icon
+    {
+      get
+      {
+        return ( Image )this.GetValue( IconButton.IconProperty );
+      }
+      set
+      {
+        this.SetValue( IconButton.IconProperty, value );
+      }
+    }
+
+    #endregion //Icon
+
+    #region IconLocation
+
+    public static readonly DependencyProperty IconLocationProperty = DependencyProperty.Register( "IconLocation", typeof( Location ),
+      typeof( IconButton ), new FrameworkPropertyMetadata( Location.Left ) );
+    public Location IconLocation
+    {
+      get
+      {
+        return ( Location )this.GetValue( IconButton.IconLocationProperty );
+      }
+      set
+      {
+        this.SetValue( IconButton.IconLocationProperty, value );
+      }
+    }
+
+    #endregion //IconLocation
+
+    #region MouseOverBackground
+
+    public static readonly DependencyProperty MouseOverBackgroundProperty = DependencyProperty.Register( "MouseOverBackground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
+
+    public Brush MouseOverBackground
+    {
+      get
+      {
+        return ( Brush )this.GetValue( IconButton.MouseOverBackgroundProperty );
+      }
+      set
+      {
+        this.SetValue( IconButton.MouseOverBackgroundProperty, value );
+      }
+    }
+
+    #endregion //MouseOverBackground
+
+    #region MouseOverBorderBrush
+
+    public static readonly DependencyProperty MouseOverBorderBrushProperty = DependencyProperty.Register( "MouseOverBorderBrush", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
+
+    public Brush MouseOverBorderBrush
+    {
+      get
+      {
+        return ( Brush )this.GetValue( IconButton.MouseOverBorderBrushProperty );
+      }
+      set
+      {
+        this.SetValue( IconButton.MouseOverBorderBrushProperty, value );
+      }
+    }
+
+    #endregion //MouseOverBorderBrush
+
+    #region MouseOverForeground
+
+    public static readonly DependencyProperty MouseOverForegroundProperty = DependencyProperty.Register( "MouseOverForeground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
+
+    public Brush MouseOverForeground
+    {
+      get
+      {
+        return ( Brush )this.GetValue( IconButton.MouseOverForegroundProperty );
+      }
+      set
+      {
+        this.SetValue( IconButton.MouseOverForegroundProperty, value );
+      }
+    }
+
+    #endregion //MouseOverForeground
+
+    #region MousePressedBackground
+
+    public static readonly DependencyProperty MousePressedBackgroundProperty = DependencyProperty.Register( "MousePressedBackground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
+
+    public Brush MousePressedBackground
+    {
+      get
+      {
+        return ( Brush )this.GetValue( IconButton.MousePressedBackgroundProperty );
+      }
+      set
+      {
+        this.SetValue( IconButton.MousePressedBackgroundProperty, value );
+      }
+    }
+
+    #endregion  //MousePressedBackground
+
+    #region MousePressedBorderBrush
+
+    public static readonly DependencyProperty MousePressedBorderBrushProperty = DependencyProperty.Register( "MousePressedBorderBrush", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
+
+    public Brush MousePressedBorderBrush
+    {
+      get
+      {
+        return ( Brush )this.GetValue( IconButton.MousePressedBorderBrushProperty );
+      }
+      set
+      {
+        this.SetValue( IconButton.MousePressedBorderBrushProperty, value );
+      }
+    }
+
+    #endregion  //MousePressedBorderBrush
+
+    #region MousePressedForeground
+
+    public static readonly DependencyProperty MousePressedForegroundProperty = DependencyProperty.Register( "MousePressedForeground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
+
+    public Brush MousePressedForeground
+    {
+      get
+      {
+        return ( Brush )this.GetValue( IconButton.MousePressedForegroundProperty );
+      }
+      set
+      {
+        this.SetValue( IconButton.MousePressedForegroundProperty, value );
+      }
+    }
+
+    #endregion  //MousePressedForeground
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
index 6edb1d07..f5ec452e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
@@ -1,166 +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:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-
-  <!-- =============================================================================== -->
-  <!--  IconButton Style                                                               -->
-  <!-- =============================================================================== -->
-  <Style x:Key="FocusVisual">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="2"
-                     SnapsToDevicePixels="true"
-                     Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                     StrokeThickness="1"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:IconButton}">
-    <Setter Property="FocusVisualStyle"
-            Value="{StaticResource FocusVisual}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="Foreground"
-            Value="Black" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="MouseOverForeground"
-            Value="Black" />
-    <Setter Property="MousePressedForeground"
-            Value="Black" />
-    <Setter Property="MouseOverBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-    <Setter Property="MousePressedBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-    <Setter Property="MouseOverBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-    <Setter Property="MousePressedBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Padding"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:IconButton}">
-          <Border x:Name="defaultBorder"
-                  BorderThickness="1"
-                  BorderBrush="Transparent">
-            <Border x:Name="border"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    SnapsToDevicePixels="True">
-              <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    Margin="{TemplateBinding Padding}"
-                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition x:Name="firstColumn"
-                                    Width="Auto" />
-                  <ColumnDefinition x:Name="secondColumn"
-                                    Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <ContentControl x:Name="icon"
-                                Content="{TemplateBinding Icon}"
-                                VerticalAlignment="Center" />
-                <ContentPresenter x:Name="contentPresenter"
-                                  Grid.Column="1"
-                                  Focusable="False"
-                                  RecognizesAccessKey="True"
-                                  VerticalAlignment="Center" />
-              </Grid>
-            </Border>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsDefaulted"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      TargetName="defaultBorder"
-                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MousePressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MousePressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MousePressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="border"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-              <Setter TargetName="border"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IconLocation"
-                     Value="Right">
-              <Setter Property="Width"
-                      Value="*"
-                      TargetName="firstColumn" />
-              <Setter Property="Width"
-                      Value="Auto"
-                      TargetName="secondColumn" />
-              <Setter Property="Grid.Column"
-                      Value="1"
-                      TargetName="icon" />
-              <Setter Property="Grid.Column"
-                      Value="0"
-                      TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
+<!--***********************************************************************************
+
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   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">
+
+
+  <!-- =============================================================================== -->
+  <!--  IconButton Style                                                               -->
+  <!-- =============================================================================== -->
+  <Style x:Key="FocusVisual">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle Margin="2"
+                     SnapsToDevicePixels="true"
+                     Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                     StrokeThickness="1"
+                     StrokeDashArray="1 2" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type local:IconButton}">
+    <Setter Property="FocusVisualStyle"
+            Value="{StaticResource FocusVisual}" />
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+    <Setter Property="Foreground"
+            Value="Black" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="MouseOverForeground"
+            Value="Black" />
+    <Setter Property="MousePressedForeground"
+            Value="Black" />
+    <Setter Property="MouseOverBackground"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+    <Setter Property="MousePressedBackground"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+    <Setter Property="MouseOverBorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
+    <Setter Property="MousePressedBorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Center" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="Padding"
+            Value="1" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:IconButton}">
+          <Border x:Name="defaultBorder"
+                  BorderThickness="1"
+                  BorderBrush="Transparent">
+            <Border x:Name="border"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    SnapsToDevicePixels="True">
+              <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    Margin="{TemplateBinding Padding}"
+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition x:Name="firstColumn"
+                                    Width="Auto" />
+                  <ColumnDefinition x:Name="secondColumn"
+                                    Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <ContentControl x:Name="icon"
+                                Content="{TemplateBinding Icon}"
+                                VerticalAlignment="Center" />
+                <ContentPresenter x:Name="contentPresenter"
+                                  Grid.Column="1"
+                                  Focusable="False"
+                                  RecognizesAccessKey="True"
+                                  VerticalAlignment="Center" />
+              </Grid>
+            </Border>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsDefaulted"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      TargetName="defaultBorder"
+                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="TextElement.Foreground"
+                      TargetName="contentPresenter"
+                      Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Background"
+                      TargetName="border"
+                      Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="BorderBrush"
+                      TargetName="border"
+                      Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsPressed"
+                     Value="True">
+              <Setter Property="TextElement.Foreground"
+                      TargetName="contentPresenter"
+                      Value="{Binding MousePressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Background"
+                      TargetName="border"
+                      Value="{Binding MousePressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="BorderBrush"
+                      TargetName="border"
+                      Value="{Binding MousePressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter TargetName="border"
+                      Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
+              <Setter TargetName="border"
+                      Property="Background"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+              <Setter Property="TextElement.Foreground"
+                      TargetName="contentPresenter"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IconLocation"
+                     Value="Right">
+              <Setter Property="Width"
+                      Value="*"
+                      TargetName="firstColumn" />
+              <Setter Property="Width"
+                      Value="Auto"
+                      TargetName="secondColumn" />
+              <Setter Property="Grid.Column"
+                      Value="1"
+                      TargetName="icon" />
+              <Setter Property="Grid.Column"
+                      Value="0"
+                      TargetName="contentPresenter" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
index 6edb1d07..f5ec452e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
@@ -1,166 +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:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-
-  <!-- =============================================================================== -->
-  <!--  IconButton Style                                                               -->
-  <!-- =============================================================================== -->
-  <Style x:Key="FocusVisual">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="2"
-                     SnapsToDevicePixels="true"
-                     Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                     StrokeThickness="1"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:IconButton}">
-    <Setter Property="FocusVisualStyle"
-            Value="{StaticResource FocusVisual}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="Foreground"
-            Value="Black" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="MouseOverForeground"
-            Value="Black" />
-    <Setter Property="MousePressedForeground"
-            Value="Black" />
-    <Setter Property="MouseOverBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-    <Setter Property="MousePressedBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-    <Setter Property="MouseOverBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-    <Setter Property="MousePressedBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Padding"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:IconButton}">
-          <Border x:Name="defaultBorder"
-                  BorderThickness="1"
-                  BorderBrush="Transparent">
-            <Border x:Name="border"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    SnapsToDevicePixels="True">
-              <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    Margin="{TemplateBinding Padding}"
-                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition x:Name="firstColumn"
-                                    Width="Auto" />
-                  <ColumnDefinition x:Name="secondColumn"
-                                    Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <ContentControl x:Name="icon"
-                                Content="{TemplateBinding Icon}"
-                                VerticalAlignment="Center" />
-                <ContentPresenter x:Name="contentPresenter"
-                                  Grid.Column="1"
-                                  Focusable="False"
-                                  RecognizesAccessKey="True"
-                                  VerticalAlignment="Center" />
-              </Grid>
-            </Border>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsDefaulted"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      TargetName="defaultBorder"
-                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MousePressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MousePressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MousePressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="border"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-              <Setter TargetName="border"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IconLocation"
-                     Value="Right">
-              <Setter Property="Width"
-                      Value="*"
-                      TargetName="firstColumn" />
-              <Setter Property="Width"
-                      Value="Auto"
-                      TargetName="secondColumn" />
-              <Setter Property="Grid.Column"
-                      Value="1"
-                      TargetName="icon" />
-              <Setter Property="Grid.Column"
-                      Value="0"
-                      TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
+<!--***********************************************************************************
+
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   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">
+
+
+  <!-- =============================================================================== -->
+  <!--  IconButton Style                                                               -->
+  <!-- =============================================================================== -->
+  <Style x:Key="FocusVisual">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle Margin="2"
+                     SnapsToDevicePixels="true"
+                     Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                     StrokeThickness="1"
+                     StrokeDashArray="1 2" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+  <Style TargetType="{x:Type local:IconButton}">
+    <Setter Property="FocusVisualStyle"
+            Value="{StaticResource FocusVisual}" />
+    <Setter Property="Background"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+    <Setter Property="BorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+    <Setter Property="Foreground"
+            Value="Black" />
+    <Setter Property="BorderThickness"
+            Value="1" />
+    <Setter Property="MouseOverForeground"
+            Value="Black" />
+    <Setter Property="MousePressedForeground"
+            Value="Black" />
+    <Setter Property="MouseOverBackground"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+    <Setter Property="MousePressedBackground"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+    <Setter Property="MouseOverBorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
+    <Setter Property="MousePressedBorderBrush"
+            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="Center" />
+    <Setter Property="VerticalContentAlignment"
+            Value="Center" />
+    <Setter Property="Padding"
+            Value="1" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type local:IconButton}">
+          <Border x:Name="defaultBorder"
+                  BorderThickness="1"
+                  BorderBrush="Transparent">
+            <Border x:Name="border"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Background="{TemplateBinding Background}"
+                    SnapsToDevicePixels="True">
+              <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                    Margin="{TemplateBinding Padding}"
+                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition x:Name="firstColumn"
+                                    Width="Auto" />
+                  <ColumnDefinition x:Name="secondColumn"
+                                    Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <ContentControl x:Name="icon"
+                                Content="{TemplateBinding Icon}"
+                                VerticalAlignment="Center" />
+                <ContentPresenter x:Name="contentPresenter"
+                                  Grid.Column="1"
+                                  Focusable="False"
+                                  RecognizesAccessKey="True"
+                                  VerticalAlignment="Center" />
+              </Grid>
+            </Border>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsDefaulted"
+                     Value="True">
+              <Setter Property="BorderBrush"
+                      TargetName="defaultBorder"
+                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver"
+                     Value="True">
+              <Setter Property="TextElement.Foreground"
+                      TargetName="contentPresenter"
+                      Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Background"
+                      TargetName="border"
+                      Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="BorderBrush"
+                      TargetName="border"
+                      Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsPressed"
+                     Value="True">
+              <Setter Property="TextElement.Foreground"
+                      TargetName="contentPresenter"
+                      Value="{Binding MousePressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Background"
+                      TargetName="border"
+                      Value="{Binding MousePressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="BorderBrush"
+                      TargetName="border"
+                      Value="{Binding MousePressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                     Value="False">
+              <Setter TargetName="border"
+                      Property="BorderBrush"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
+              <Setter TargetName="border"
+                      Property="Background"
+                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+              <Setter Property="TextElement.Foreground"
+                      TargetName="contentPresenter"
+                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IconLocation"
+                     Value="Right">
+              <Setter Property="Width"
+                      Value="*"
+                      TargetName="firstColumn" />
+              <Setter Property="Width"
+                      Value="Auto"
+                      TargetName="secondColumn" />
+              <Setter Property="Grid.Column"
+                      Value="1"
+                      TargetName="icon" />
+              <Setter Property="Grid.Column"
+                      Value="0"
+                      TargetName="contentPresenter" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+
+</ResourceDictionary>
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 d752ad10..65571708 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
index cd1bfa2c..88381005 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
index 7e1f8d78..3ff5f5df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
index b0ef685c..b436d4af 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
index 88856103..b1a8f9c7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
index 5bad5932..aecadd02 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
deleted file mode 100644
index 7e582501..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class AutoCompletingMaskEventArgs : CancelEventArgs
-  {
-    public AutoCompletingMaskEventArgs( MaskedTextProvider maskedTextProvider, int startPosition, int selectionLength, string input )
-    {
-      m_autoCompleteStartPosition = -1;
-
-      m_maskedTextProvider = maskedTextProvider;
-      m_startPosition = startPosition;
-      m_selectionLength = selectionLength;
-      m_input = input;
-    }
-
-    #region MaskedTextProvider PROPERTY
-
-    private MaskedTextProvider m_maskedTextProvider;  
-
-    public MaskedTextProvider MaskedTextProvider
-    {
-      get { return m_maskedTextProvider; }
-    }
-
-    #endregion MaskedTextProvider PROPERTY
-
-    #region StartPosition PROPERTY
-
-    private int m_startPosition;
-
-    public int StartPosition
-    {
-      get { return m_startPosition; }
-    }
-
-    #endregion StartPosition PROPERTY
-
-    #region SelectionLength PROPERTY
-
-    private int m_selectionLength;
-
-    public int SelectionLength
-    {
-      get { return m_selectionLength; }
-    }
-
-    #endregion SelectionLength PROPERTY
-
-    #region Input PROPERTY
-
-    private string m_input;
-
-    public string Input
-    {
-      get { return m_input; }
-    }
-
-    #endregion Input PROPERTY
-
-
-    #region AutoCompleteStartPosition PROPERTY
-
-    private int m_autoCompleteStartPosition;
-
-    public int AutoCompleteStartPosition
-    {
-      get { return m_autoCompleteStartPosition; }
-      set { m_autoCompleteStartPosition = value; }
-    }
-
-    #endregion AutoCompleteStartPosition PROPERTY
-
-    #region AutoCompleteText PROPERTY
-
-    private string m_autoCompleteText;
-
-    public string AutoCompleteText
-    {
-      get { return m_autoCompleteText; }
-      set { m_autoCompleteText = value; }
-    }
-
-    #endregion AutoCompleteText PROPERTY
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
deleted file mode 100644
index a8cbe8fd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum InsertKeyMode
-  {
-    Default = 0,
-    Insert = 1,
-    Overwrite = 2
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
deleted file mode 100644
index 6114a0cd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum MaskFormat
-  {
-    ExcludePromptAndLiterals,
-    IncludeLiterals,
-    IncludePrompt,
-    IncludePromptAndLiterals
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
deleted file mode 100644
index f9c7932a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ /dev/null
@@ -1,1955 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows;
-using System.Windows.Data;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Windows.Input;
-using System.Diagnostics;
-using System.Windows.Documents;
-using System.Globalization;
-using System.Windows.Controls.Primitives;
-using System.Reflection;
-
-using System.Collections;
-using System.Security;
-using System.Security.Permissions;
-using System.Windows.Automation;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class MaskedTextBox : ValueRangeTextBox
-  {
-    #region STATIC MEMBERS
-
-    private static readonly char[] MaskChars = { '0', '9', '#', 'L', '?', '&', 'C', 'A', 'a', '.', ',', ':', '/', '$', '<', '>', '|', '\\' };
-
-    private static char DefaultPasswordChar = '\0';
-
-    private static string NullMaskString = "<>";
-
-    private static string GetRawText( MaskedTextProvider provider )
-    {
-      return provider.ToString( true, false, false, 0, provider.Length );
-    }
-
-    public static string GetFormatSpecifierFromMask( string mask, IFormatProvider formatProvider )
-    {
-      List<int> notUsed;
-
-      return MaskedTextBox.GetFormatSpecifierFromMask(
-        mask,
-        MaskedTextBox.MaskChars,
-        formatProvider,
-        true,
-        out notUsed );
-    }
-
-    private static string GetFormatSpecifierFromMask(
-      string mask,
-      char[] maskChars,
-      IFormatProvider formatProvider,
-      bool includeNonSeparatorLiteralsInValue,
-      out List<int> unhandledLiteralsPositions )
-    {
-      unhandledLiteralsPositions = new List<int>();
-
-      NumberFormatInfo numberFormatInfo = NumberFormatInfo.GetInstance( formatProvider );
-
-      StringBuilder formatSpecifierBuilder = new StringBuilder( 32 );
-
-      // Space will be considered as a separator literals and will be included 
-      // no matter the value of IncludeNonSeparatorLiteralsInValue.
-      bool lastCharIsLiteralIdentifier = false;
-      int i = 0;
-      int j = 0;
-
-      while( i < mask.Length )
-      {
-        char currentChar = mask[ i ];
-
-        if( ( currentChar == '\\' ) && ( !lastCharIsLiteralIdentifier ) )
-        {
-          lastCharIsLiteralIdentifier = true;
-        }
-        else
-        {
-          if( ( lastCharIsLiteralIdentifier ) || ( Array.IndexOf( maskChars, currentChar ) < 0 ) )
-          {
-            lastCharIsLiteralIdentifier = false;
-
-            // The currentChar was preceeded by a liteal identifier or is not part of the MaskedTextProvider mask chars.
-            formatSpecifierBuilder.Append( '\\' );
-            formatSpecifierBuilder.Append( currentChar );
-
-            if( ( !includeNonSeparatorLiteralsInValue ) && ( currentChar != ' ' ) )
-              unhandledLiteralsPositions.Add( j );
-
-            j++;
-          }
-          else
-          {
-            // The currentChar is part of the MaskedTextProvider mask chars.  
-            if( ( currentChar == '0' ) || ( currentChar == '9' ) || ( currentChar == '#' ) )
-            {
-              formatSpecifierBuilder.Append( '0' );
-              j++;
-            }
-            else if( currentChar == '.' )
-            {
-              formatSpecifierBuilder.Append( '.' );
-              j += numberFormatInfo.NumberDecimalSeparator.Length;
-            }
-            else if( currentChar == ',' )
-            {
-              formatSpecifierBuilder.Append( ',' );
-              j += numberFormatInfo.NumberGroupSeparator.Length;
-            }
-            else if( currentChar == '$' )
-            {
-              string currencySymbol = numberFormatInfo.CurrencySymbol;
-
-              formatSpecifierBuilder.Append( '"' );
-              formatSpecifierBuilder.Append( currencySymbol );
-              formatSpecifierBuilder.Append( '"' );
-
-              for( int k = 0; k < currencySymbol.Length; k++ )
-              {
-                if( !includeNonSeparatorLiteralsInValue )
-                  unhandledLiteralsPositions.Add( j );
-
-                j++;
-              }
-            }
-            else
-            {
-              formatSpecifierBuilder.Append( currentChar );
-
-              if( ( !includeNonSeparatorLiteralsInValue ) && ( currentChar != ' ' ) )
-                unhandledLiteralsPositions.Add( j );
-
-              j++;
-            }
-          }
-        }
-
-        i++;
-      }
-
-      return formatSpecifierBuilder.ToString();
-    }
-
-    #endregion STATIC MEMBERS
-
-    #region CONSTRUCTORS
-
-    static MaskedTextBox()
-    {
-      MaskedTextBox.TextProperty.OverrideMetadata( typeof( MaskedTextBox ),
-        new FrameworkPropertyMetadata(
-        null,
-        new CoerceValueCallback( MaskedTextBox.TextCoerceValueCallback ) ) );
-    }
-
-    public MaskedTextBox()
-    {
-      CommandManager.AddPreviewCanExecuteHandler( this, new CanExecuteRoutedEventHandler( this.OnPreviewCanExecuteCommands ) );
-      CommandManager.AddPreviewExecutedHandler( this, new ExecutedRoutedEventHandler( this.OnPreviewExecutedCommands ) );
-
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Paste, null, new CanExecuteRoutedEventHandler( this.CanExecutePaste ) ) );
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Cut, null, new CanExecuteRoutedEventHandler( this.CanExecuteCut ) ) );
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, null, new CanExecuteRoutedEventHandler( this.CanExecuteCopy ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.ToggleInsert, new ExecutedRoutedEventHandler( this.ToggleInsertExecutedCallback ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.Delete, null, new CanExecuteRoutedEventHandler( this.CanExecuteDelete ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.DeletePreviousWord, null, new CanExecuteRoutedEventHandler( this.CanExecuteDeletePreviousWord ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.DeleteNextWord, null, new CanExecuteRoutedEventHandler( this.CanExecuteDeleteNextWord ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.Backspace, null, new CanExecuteRoutedEventHandler( this.CanExecuteBackspace ) ) );
-
-      System.Windows.DragDrop.AddPreviewQueryContinueDragHandler( this, new QueryContinueDragEventHandler( this.PreviewQueryContinueDragCallback ) );
-      this.AllowDrop = false;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength" )]
-    private void InitializeMaskedTextProvider()
-    {
-      string preInitializedText = this.Text;
-
-      string mask = this.Mask;
-
-      if( mask == string.Empty )
-      {
-        m_maskedTextProvider = this.CreateMaskedTextProvider( MaskedTextBox.NullMaskString );
-        m_maskIsNull = true;
-      }
-      else
-      {
-        m_maskedTextProvider = this.CreateMaskedTextProvider( mask );
-        m_maskIsNull = false;
-      }
-
-      if( ( !m_maskIsNull ) && ( preInitializedText != string.Empty ) )
-      {
-        bool success = m_maskedTextProvider.Add( preInitializedText );
-
-        if( ( !success ) && ( !DesignerProperties.GetIsInDesignMode( this ) ) )
-          throw new InvalidOperationException( "An attempt was made to apply a new mask that cannot be applied to the current text." );
-      }
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region ISupportInitialize
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      this.InitializeMaskedTextProvider();
-
-      this.SetIsMaskCompleted( m_maskedTextProvider.MaskCompleted );
-      this.SetIsMaskFull( m_maskedTextProvider.MaskFull );
-
-      base.OnInitialized( e );
-    }
-
-    #endregion ISupportInitialize
-
-    #region AllowPromptAsInput Property
-
-    public static readonly DependencyProperty AllowPromptAsInputProperty =
-        DependencyProperty.Register( "AllowPromptAsInput", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.AllowPromptAsInputPropertyChangedCallback ) ) );
-
-    public bool AllowPromptAsInput
-    {
-      get
-      {
-        return ( bool )GetValue( AllowPromptAsInputProperty );
-      }
-      set
-      {
-        SetValue( AllowPromptAsInputProperty, value );
-      }
-    }
-
-    private static void AllowPromptAsInputPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider = maskedTextBox.CreateMaskedTextProvider( maskedTextBox.Mask );
-    }
-
-    #endregion AllowPromptAsInput Property
-
-    #region ClipboardMaskFormat Property
-
-    public MaskFormat ClipboardMaskFormat
-    {
-      get
-      {
-        return ( MaskFormat )GetValue( ClipboardMaskFormatProperty );
-      }
-      set
-      {
-        SetValue( ClipboardMaskFormatProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ClipboardMaskFormatProperty =
-        DependencyProperty.Register( "ClipboardMaskFormat", typeof( MaskFormat ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata( MaskFormat.IncludeLiterals ) );
-
-    #endregion ClipboardMaskFormat Property
-
-    #region HidePromptOnLeave Property
-
-    public bool HidePromptOnLeave
-    {
-      get
-      {
-        return ( bool )GetValue( HidePromptOnLeaveProperty );
-      }
-      set
-      {
-        SetValue( HidePromptOnLeaveProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HidePromptOnLeaveProperty =
-        DependencyProperty.Register( "HidePromptOnLeave", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( false ) );
-
-    #endregion HidePromptOnLeave Property
-
-    #region IncludeLiteralsInValue Property
-
-    public bool IncludeLiteralsInValue
-    {
-      get
-      {
-        return ( bool )GetValue( IncludeLiteralsInValueProperty );
-      }
-      set
-      {
-        SetValue( IncludeLiteralsInValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty IncludeLiteralsInValueProperty =
-        DependencyProperty.Register( "IncludeLiteralsInValue", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.InlcudeLiteralsInValuePropertyChangedCallback ) ) );
-
-    private static void InlcudeLiteralsInValuePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      maskedTextBox.RefreshConversionHelpers();
-      maskedTextBox.RefreshValue();
-    }
-
-    #endregion IncludeLiteralsInValue Property
-
-    #region IncludePromptInValue Property
-
-    public bool IncludePromptInValue
-    {
-      get
-      {
-        return ( bool )GetValue( IncludePromptInValueProperty );
-      }
-      set
-      {
-        SetValue( IncludePromptInValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty IncludePromptInValueProperty =
-        DependencyProperty.Register( "IncludePromptInValue", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      false,
-      new PropertyChangedCallback( MaskedTextBox.IncludePromptInValuePropertyChangedCallback ) ) );
-
-    private static void IncludePromptInValuePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      maskedTextBox.RefreshValue();
-    }
-
-    #endregion IncludePromptInValue Property
-
-    #region InsertKeyMode Property
-
-    public InsertKeyMode InsertKeyMode
-    {
-      get
-      {
-        return ( InsertKeyMode )GetValue( InsertKeyModeProperty );
-      }
-      set
-      {
-        SetValue( InsertKeyModeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty InsertKeyModeProperty =
-        DependencyProperty.Register( "InsertKeyMode", typeof( InsertKeyMode ), typeof( MaskedTextBox ), new UIPropertyMetadata( InsertKeyMode.Default ) );
-
-    #endregion InsertKeyMode Property
-
-    #region IsMaskCompleted Read-Only Property
-
-    private static readonly DependencyPropertyKey IsMaskCompletedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsMaskCompleted", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsMaskCompletedProperty = MaskedTextBox.IsMaskCompletedPropertyKey.DependencyProperty;
-
-
-    public bool IsMaskCompleted
-    {
-      get
-      {
-        return ( bool )this.GetValue( MaskedTextBox.IsMaskCompletedProperty );
-      }
-    }
-
-    private void SetIsMaskCompleted( bool value )
-    {
-      this.SetValue( MaskedTextBox.IsMaskCompletedPropertyKey, value );
-    }
-
-    #endregion IsMaskCompleted Read-Only Property
-
-    #region IsMaskFull Read-Only Property
-
-    private static readonly DependencyPropertyKey IsMaskFullPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsMaskFull", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsMaskFullProperty = MaskedTextBox.IsMaskFullPropertyKey.DependencyProperty;
-
-    public bool IsMaskFull
-    {
-      get
-      {
-        return ( bool )this.GetValue( MaskedTextBox.IsMaskFullProperty );
-      }
-    }
-
-    private void SetIsMaskFull( bool value )
-    {
-      this.SetValue( MaskedTextBox.IsMaskFullPropertyKey, value );
-    }
-
-    #endregion IsMaskFull Read-Only Property
-
-    #region Mask Property
-
-    public static readonly DependencyProperty MaskProperty =
-        DependencyProperty.Register( "Mask", typeof( string ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      string.Empty,
-      new PropertyChangedCallback( MaskedTextBox.MaskPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.MaskCoerceValueCallback ) ) );
-
-    public string Mask
-    {
-      get
-      {
-        return ( string )this.GetValue( MaskedTextBox.MaskProperty );
-      }
-      set
-      {
-        this.SetValue( MaskedTextBox.MaskProperty, value );
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    private static object MaskCoerceValueCallback( DependencyObject sender, object value )
-    {
-      if( value == null )
-        value = string.Empty;
-
-      if( value.Equals( string.Empty ) )
-        return value;
-
-      // Validate the text against the would be new Mask.
-
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      bool valid;
-
-      try
-      {
-        MaskedTextProvider provider = maskedTextBox.CreateMaskedTextProvider( ( string )value );
-
-        string rawText = MaskedTextBox.GetRawText( maskedTextBox.m_maskedTextProvider );
-
-        valid = provider.VerifyString( rawText );
-      }
-      catch( Exception exception )
-      {
-        throw new InvalidOperationException( "An error occured while testing the current text against the new mask.", exception );
-      }
-
-      if( !valid )
-        throw new ArgumentException( "The mask cannot be applied to the current text.", "Mask" );
-
-      return value;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength" )]
-    private static void MaskPropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      MaskedTextProvider provider = null;
-
-      string mask = ( string )e.NewValue;
-
-      if( mask == string.Empty )
-      {
-        provider = maskedTextBox.CreateMaskedTextProvider( MaskedTextBox.NullMaskString );
-        maskedTextBox.m_maskIsNull = true;
-        maskedTextBox.Text = "";
-      }
-      else
-      {
-        provider = maskedTextBox.CreateMaskedTextProvider( mask );
-        maskedTextBox.m_maskIsNull = false;
-      }
-
-      maskedTextBox.m_maskedTextProvider = provider;
-
-      maskedTextBox.RefreshConversionHelpers();
-
-      if( maskedTextBox.ValueDataType != null )
-      {
-        string textFromValue = maskedTextBox.GetTextFromValue( maskedTextBox.Value );
-        maskedTextBox.m_maskedTextProvider.Set( textFromValue );
-      }
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion Mask Property
-
-    #region MaskedTextProvider Property
-
-    public MaskedTextProvider MaskedTextProvider
-    {
-      get
-      {
-        if( !m_maskIsNull )
-          return m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        return null;
-      }
-    }
-
-    #endregion MaskedTextProvider Property
-
-    #region PromptChar Property
-
-    public static readonly DependencyProperty PromptCharProperty =
-        DependencyProperty.Register( "PromptChar", typeof( char ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      '_',
-      new PropertyChangedCallback( MaskedTextBox.PromptCharPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.PromptCharCoerceValueCallback ) ) );
-
-    public char PromptChar
-    {
-      get
-      {
-        return ( char )this.GetValue( MaskedTextBox.PromptCharProperty );
-      }
-      set
-      {
-        this.SetValue( MaskedTextBox.PromptCharProperty, value );
-      }
-    }
-
-    private static object PromptCharCoerceValueCallback( object sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      MaskedTextProvider provider = maskedTextBox.m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-      try
-      {
-        provider.PromptChar = ( char )value;
-      }
-      catch( Exception exception )
-      {
-        throw new ArgumentException( "The prompt character is invalid.", exception );
-      }
-
-      return value;
-    }
-
-    private static void PromptCharPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.PromptChar = ( char )e.NewValue;
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion PromptChar Property
-
-    #region RejectInputOnFirstFailure Property
-
-    public bool RejectInputOnFirstFailure
-    {
-      get
-      {
-        return ( bool )GetValue( RejectInputOnFirstFailureProperty );
-      }
-      set
-      {
-        SetValue( RejectInputOnFirstFailureProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty RejectInputOnFirstFailureProperty =
-        DependencyProperty.Register( "RejectInputOnFirstFailure", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( true ) );
-
-    #endregion RejectInputOnFirstFailure Property
-
-    #region ResetOnPrompt Property
-
-    public bool ResetOnPrompt
-    {
-      get
-      {
-        return ( bool )GetValue( ResetOnPromptProperty );
-      }
-      set
-      {
-        SetValue( ResetOnPromptProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ResetOnPromptProperty =
-        DependencyProperty.Register( "ResetOnPrompt", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.ResetOnPromptPropertyChangedCallback ) ) );
-
-    private static void ResetOnPromptPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.ResetOnPrompt = ( bool )e.NewValue;
-    }
-
-    #endregion ResetOnPrompt Property
-
-    #region ResetOnSpace Property
-
-    public bool ResetOnSpace
-    {
-      get
-      {
-        return ( bool )GetValue( ResetOnSpaceProperty );
-      }
-      set
-      {
-        SetValue( ResetOnSpaceProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ResetOnSpaceProperty =
-        DependencyProperty.Register( "ResetOnSpace", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.ResetOnSpacePropertyChangedCallback ) ) );
-
-    private static void ResetOnSpacePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.ResetOnSpace = ( bool )e.NewValue;
-    }
-
-    #endregion ResetOnSpace Property
-
-    #region RestrictToAscii Property
-
-    public bool RestrictToAscii
-    {
-      get
-      {
-        return ( bool )GetValue( RestrictToAsciiProperty );
-      }
-      set
-      {
-        SetValue( RestrictToAsciiProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty RestrictToAsciiProperty =
-        DependencyProperty.Register( "RestrictToAscii", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      false,
-      new PropertyChangedCallback( MaskedTextBox.RestrictToAsciiPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.RestrictToAsciiCoerceValueCallback ) ) );
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    private static object RestrictToAsciiCoerceValueCallback( object sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      if( maskedTextBox.m_maskIsNull )
-        return value;
-
-      bool restrictToAscii = ( bool )value;
-
-      if( !restrictToAscii )
-        return value;
-
-      // Validate the text to make sure that it is only made of Ascii characters.
-
-      MaskedTextProvider provider = maskedTextBox.CreateMaskedTextProvider(
-        maskedTextBox.Mask,
-        maskedTextBox.GetCultureInfo(),
-        maskedTextBox.AllowPromptAsInput,
-        maskedTextBox.PromptChar,
-        MaskedTextBox.DefaultPasswordChar,
-        restrictToAscii );
-
-      if( !provider.VerifyString( maskedTextBox.Text ) )
-        throw new ArgumentException( "The current text cannot be restricted to ASCII characters. The RestrictToAscii property is set to true.", "RestrictToAscii" );
-
-      return restrictToAscii;
-    }
-
-    private static void RestrictToAsciiPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider = maskedTextBox.CreateMaskedTextProvider( maskedTextBox.Mask );
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion RestrictToAscii Property
-
-    #region SkipLiterals Property
-
-    public bool SkipLiterals
-    {
-      get
-      {
-        return ( bool )GetValue( SkipLiteralsProperty );
-      }
-      set
-      {
-        SetValue( SkipLiteralsProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty SkipLiteralsProperty =
-        DependencyProperty.Register( "SkipLiterals", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.SkipLiteralsPropertyChangedCallback ) ) );
-
-    private static void SkipLiteralsPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.SkipLiterals = ( bool )e.NewValue;
-    }
-
-    #endregion SkipLiterals Property
-
-    #region Text Property
-
-    private static object TextCoerceValueCallback( DependencyObject sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( maskedTextBox.IsInIMEComposition )
-      {
-        // In IME Composition.  We must return an uncoerced value or else the IME decorator won't disappear after text input.
-        return value;
-      }
-
-      if( value == null )
-        value = string.Empty;
-
-      if( ( maskedTextBox.IsForcingText ) || ( maskedTextBox.m_maskIsNull ) )
-        return value;
-
-      // Only direct affectation to the Text property or binding of the Text property should
-      // come through here.  All other cases should pre-validate the text and affect it through the ForceText method.
-      string text = maskedTextBox.ValidateText( ( string )value );
-
-      return text;
-    }
-
-    private string ValidateText( string text )
-    {
-      string coercedText = text;
-
-      if( this.RejectInputOnFirstFailure )
-      {
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        int notUsed;
-        MaskedTextResultHint hint;
-
-        //0 – Digit zero to 9[ Required ]
-        //9 – Digit 0 – 9[ Optional ]
-        //A – Alpha Numeric. [Required]
-        //a – Alpha Numeric. [Optional]
-        //L – Letters a-z, A-Z[ Required ]
-        //? – Letters a-z, A-Z[ Optional ]
-        //C – Any non-control character [Optional]
-        //< - When first, all following characters are in lower case.
-        //> - When first, all following characters are in upper case.
-        if( provider.Set( text, out notUsed, out hint ) || provider.Mask.StartsWith( ">" ) || provider.Mask.StartsWith( "<" ) )
-        {
-          coercedText = this.GetFormattedString( provider, text );
-        }
-        else
-        {
-          // Coerce the text to remain the same.
-          coercedText = this.GetFormattedString( m_maskedTextProvider, text );
-
-          // The TextPropertyChangedCallback won't be called.
-          // Therefore, we must sync the maskedTextProvider.
-          m_maskedTextProvider.Set( coercedText );
-        }
-      }
-      else
-      {
-        MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-
-        int caretIndex;
-
-        if( this.CanReplace( provider, text, 0, m_maskedTextProvider.Length, this.RejectInputOnFirstFailure, out caretIndex ) )
-        {
-          coercedText = this.GetFormattedString( provider, text );
-        }
-        else
-        {
-          // Coerce the text to remain the same.
-          coercedText = this.GetFormattedString( m_maskedTextProvider, text );
-
-          // The TextPropertyChangedCallback won't be called.
-          // Therefore, we must sync the maskedTextProvider.
-          m_maskedTextProvider.Set( coercedText );
-        }
-      }
-
-      return coercedText;
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        if( ( this.IsInValueChanged ) || ( !this.IsForcingText ) )
-        {
-          string newText = this.Text;
-
-          if( m_maskIsNull )
-          {
-            this.CaretIndex = newText.Length;
-          }
-          else
-          {
-            m_maskedTextProvider.Set( newText );
-
-            if( m_maskedTextProvider.Mask.StartsWith( ">" ) || m_maskedTextProvider.Mask.StartsWith( "<" ) )
-            {
-              this.CaretIndex = newText.Length;
-            }
-            else
-            {
-              int caretIndex = m_maskedTextProvider.FindUnassignedEditPositionFrom( 0, true );
-
-              if( caretIndex == -1 )
-                caretIndex = m_maskedTextProvider.Length;
-
-              this.CaretIndex = caretIndex;
-            }
-          }
-        }
-      }
-
-      // m_maskedTextProvider can be null in the designer. With WPF 3.5 SP1, sometimes, 
-      // TextChanged will be triggered before OnInitialized is called.
-      if( m_maskedTextProvider != null )
-      {
-        this.SetIsMaskCompleted( m_maskedTextProvider.MaskCompleted );
-        this.SetIsMaskFull( m_maskedTextProvider.MaskFull );
-      }
-
-      base.OnTextChanged( e );
-    }
-
-    #endregion Text Property
-
-
-    #region COMMANDS
-
-    private void OnPreviewCanExecuteCommands( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      RoutedUICommand routedUICommand = e.Command as RoutedUICommand;
-
-      if( ( routedUICommand != null )
-        && ( ( routedUICommand.Name == "Space" ) || ( routedUICommand.Name == "ShiftSpace" ) ) )
-      {
-        if( this.IsReadOnly )
-        {
-          e.CanExecute = false;
-        }
-        else
-        {
-          MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-          int caretIndex;
-          e.CanExecute = this.CanReplace( provider, " ", this.SelectionStart, this.SelectionLength, this.RejectInputOnFirstFailure, out caretIndex );
-        }
-
-        e.Handled = true;
-      }
-      else if( ( e.Command == ApplicationCommands.Undo ) || ( e.Command == ApplicationCommands.Redo ) )
-      {
-        e.CanExecute = false;
-        e.Handled = true;
-      }
-    }
-
-    private void OnPreviewExecutedCommands( object sender, ExecutedRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      if( e.Command == EditingCommands.Delete )
-      {
-        e.Handled = true;
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == EditingCommands.DeleteNextWord )
-      {
-        e.Handled = true;
-        EditingCommands.SelectRightByWord.Execute( null, this as IInputElement );
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == EditingCommands.DeletePreviousWord )
-      {
-        e.Handled = true;
-        EditingCommands.SelectLeftByWord.Execute( null, this as IInputElement );
-        this.Delete( this.SelectionStart, this.SelectionLength, false );
-      }
-      else if( e.Command == EditingCommands.Backspace )
-      {
-        e.Handled = true;
-        this.Delete( this.SelectionStart, this.SelectionLength, false );
-      }
-      else if( e.Command == ApplicationCommands.Cut )
-      {
-        e.Handled = true;
-
-        if( ApplicationCommands.Copy.CanExecute( null, this as IInputElement ) )
-          ApplicationCommands.Copy.Execute( null, this as IInputElement );
-
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == ApplicationCommands.Copy )
-      {
-        e.Handled = true;
-        this.ExecuteCopy();
-      }
-      else if( e.Command == ApplicationCommands.Paste )
-      {
-        e.Handled = true;
-
-        string clipboardContent = ( string )Clipboard.GetDataObject().GetData( "System.String" );
-        this.Replace( clipboardContent, this.SelectionStart, this.SelectionLength );
-      }
-      else
-      {
-        RoutedUICommand routedUICommand = e.Command as RoutedUICommand;
-
-        if( ( routedUICommand != null )
-          && ( ( routedUICommand.Name == "Space" ) || ( routedUICommand.Name == "ShiftSpace" ) ) )
-        {
-          e.Handled = true;
-          this.ProcessTextInput( " " );
-        }
-      }
-    }
-
-    private void CanExecuteDelete( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = this.CanDelete( this.SelectionStart, this.SelectionLength, true, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteDeletePreviousWord( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canDeletePreviousWord = ( !this.IsReadOnly ) && ( EditingCommands.SelectLeftByWord.CanExecute( null, this as IInputElement ) );
-
-      if( canDeletePreviousWord )
-      {
-        int cachedSelectionStart = this.SelectionStart;
-        int cachedSelectionLength = this.SelectionLength;
-
-        EditingCommands.SelectLeftByWord.Execute( null, this as IInputElement );
-
-        canDeletePreviousWord = this.CanDelete( this.SelectionStart, this.SelectionLength, false, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-
-        if( !canDeletePreviousWord )
-        {
-          this.SelectionStart = cachedSelectionStart;
-          this.SelectionLength = cachedSelectionLength;
-        }
-      }
-
-      e.CanExecute = canDeletePreviousWord;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteDeleteNextWord( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canDeleteNextWord = ( !this.IsReadOnly ) && ( EditingCommands.SelectRightByWord.CanExecute( null, this as IInputElement ) );
-
-      if( canDeleteNextWord )
-      {
-        int cachedSelectionStart = this.SelectionStart;
-        int cachedSelectionLength = this.SelectionLength;
-
-        EditingCommands.SelectRightByWord.Execute( null, this as IInputElement );
-
-        canDeleteNextWord = this.CanDelete( this.SelectionStart, this.SelectionLength, true, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-
-        if( !canDeleteNextWord )
-        {
-          this.SelectionStart = cachedSelectionStart;
-          this.SelectionLength = cachedSelectionLength;
-        }
-      }
-
-      e.CanExecute = canDeleteNextWord;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteBackspace( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = this.CanDelete( this.SelectionStart, this.SelectionLength, false, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteCut( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canCut = ( !this.IsReadOnly ) && ( this.SelectionLength > 0 );
-
-      if( canCut )
-      {
-        int endPosition = ( this.SelectionLength > 0 ) ? ( ( this.SelectionStart + this.SelectionLength ) - 1 ) : this.SelectionStart;
-
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        canCut = provider.RemoveAt( this.SelectionStart, endPosition );
-      }
-
-      e.CanExecute = canCut;
-      e.Handled = true;
-
-      if( ( !canCut ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecutePaste( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canPaste = false;
-
-      if( !this.IsReadOnly )
-      {
-        string clipboardContent = string.Empty;
-
-        try
-        {
-          clipboardContent = ( string )Clipboard.GetDataObject().GetData( "System.String" );
-
-          if( clipboardContent != null )
-          {
-            MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-            int caretIndex;
-            canPaste = this.CanReplace( provider, clipboardContent, this.SelectionStart, this.SelectionLength, this.RejectInputOnFirstFailure, out caretIndex );
-          }
-        }
-        catch
-        {
-        }
-      }
-
-      e.CanExecute = canPaste;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteCopy( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = !m_maskedTextProvider.IsPassword;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void ExecuteCopy()
-    {
-      string selectedText = this.GetSelectedText();
-      try
-      {
-        new UIPermission( UIPermissionClipboard.AllClipboard ).Demand();
-
-        if( selectedText.Length == 0 )
-        {
-          Clipboard.Clear();
-        }
-        else
-        {
-          Clipboard.SetText( selectedText );
-        }
-      }
-      catch( SecurityException )
-      {
-      }
-    }
-
-    private void ToggleInsertExecutedCallback( object sender, ExecutedRoutedEventArgs e )
-    {
-      m_insertToggled = !m_insertToggled;
-    }
-
-    #endregion COMMANDS
-
-    #region DRAG DROP
-
-    private void PreviewQueryContinueDragCallback( object sender, QueryContinueDragEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.Action = DragAction.Cancel;
-      e.Handled = true;
-    }
-
-    protected override void OnDragEnter( DragEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        e.Effects = DragDropEffects.None;
-        e.Handled = true;
-      }
-
-      base.OnDragEnter( e );
-    }
-
-    protected override void OnDragOver( DragEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        e.Effects = DragDropEffects.None;
-        e.Handled = true;
-      }
-
-      base.OnDragOver( e );
-    }
-
-    #endregion DRAG DROP
-
-
-    #region VALUE FROM TEXT
-
-    protected override bool QueryValueFromTextCore( string text, out object value )
-    {
-      Type valueDataType = this.ValueDataType;
-
-      if( valueDataType != null )
-      {
-        if( ( m_unhandledLiteralsPositions != null )
-          && ( m_unhandledLiteralsPositions.Count > 0 ) )
-        {
-          text = m_maskedTextProvider.ToString( false, false, true, 0, m_maskedTextProvider.Length );
-
-          for( int i = m_unhandledLiteralsPositions.Count - 1; i >= 0; i-- )
-          {
-            text = text.Remove( m_unhandledLiteralsPositions[ i ], 1 );
-          }
-        }
-      }
-
-      return base.QueryValueFromTextCore( text, out value );
-    }
-
-    #endregion VALUE FROM TEXT
-
-    #region TEXT FROM VALUE
-
-    protected override string QueryTextFromValueCore( object value )
-    {
-      if( ( m_valueToStringMethodInfo != null ) && ( value != null ) )
-      {
-        try
-        {
-          string text = ( string )m_valueToStringMethodInfo.Invoke( value, new object[] { m_formatSpecifier, this.GetActiveFormatProvider() } );
-          return text;
-        }
-        catch
-        {
-        }
-      }
-
-      return base.QueryTextFromValueCore( value );
-    }
-
-    #endregion TEXT FROM VALUE
-
-
-    #region PROTECTED METHODS
-
-    protected virtual char[] GetMaskCharacters()
-    {
-      return MaskedTextBox.MaskChars;
-    }
-
-    private MaskedTextProvider CreateMaskedTextProvider( string mask )
-    {
-      return this.CreateMaskedTextProvider(
-        mask,
-        this.GetCultureInfo(),
-        this.AllowPromptAsInput,
-        this.PromptChar,
-        MaskedTextBox.DefaultPasswordChar,
-        this.RestrictToAscii );
-    }
-
-    protected virtual MaskedTextProvider CreateMaskedTextProvider(
-      string mask,
-      CultureInfo cultureInfo,
-      bool allowPromptAsInput,
-      char promptChar,
-      char passwordChar,
-      bool restrictToAscii )
-    {
-      MaskedTextProvider provider = new MaskedTextProvider(
-        mask,
-        cultureInfo,
-        allowPromptAsInput,
-        promptChar,
-        passwordChar,
-        restrictToAscii );
-
-      provider.ResetOnPrompt = this.ResetOnPrompt;
-      provider.ResetOnSpace = this.ResetOnSpace;
-      provider.SkipLiterals = this.SkipLiterals;
-
-      provider.IncludeLiterals = true;
-      provider.IncludePrompt = true;
-
-      provider.IsPassword = false;
-
-      return provider;
-    }
-
-    internal override void OnIMECompositionEnded( CachedTextInfo cachedTextInfo )
-    {
-      // End of IME Composition.  Restore the critical infos.
-      this.ForceText( cachedTextInfo.Text, false );
-      this.CaretIndex = cachedTextInfo.CaretIndex;
-      this.SelectionStart = cachedTextInfo.SelectionStart;
-      this.SelectionLength = cachedTextInfo.SelectionLength;
-    }
-
-    protected override void OnTextInput( System.Windows.Input.TextCompositionEventArgs e )
-    {
-      if( this.IsInIMEComposition )
-        this.EndIMEComposition();
-
-      if( ( m_maskIsNull ) || ( m_maskedTextProvider == null ) || ( this.IsReadOnly ) )
-      {
-        base.OnTextInput( e );
-        return;
-      }
-
-      e.Handled = true;
-
-      if( this.CharacterCasing == CharacterCasing.Upper )
-      {
-        this.ProcessTextInput( e.Text.ToUpper() );
-      }
-      else if( this.CharacterCasing == CharacterCasing.Lower )
-      {
-        this.ProcessTextInput( e.Text.ToLower() );
-      }
-      else
-      {
-        this.ProcessTextInput( e.Text );
-      }
-
-      base.OnTextInput( e );
-    }
-
-    private void ProcessTextInput( string text )
-    {
-      if( text.Length == 1 )
-      {
-        string textOutput = this.MaskedTextOutput;
-
-        int caretIndex;
-        if( this.PlaceChar( text[ 0 ], this.SelectionStart, this.SelectionLength, this.IsOverwriteMode, out caretIndex ) )
-        {
-          if( this.MaskedTextOutput != textOutput )
-            this.RefreshCurrentText( false );
-
-          this.SelectionStart = caretIndex + 1;
-        }
-        else
-        {
-          if( this.BeepOnError )
-            System.Media.SystemSounds.Beep.Play();
-        }
-
-        if( this.SelectionLength > 0 )
-          this.SelectionLength = 0;
-      }
-      else
-      {
-        this.Replace( text, this.SelectionStart, this.SelectionLength );
-      }
-    }
-
-    protected override void ValidateValue( object value )
-    {
-      base.ValidateValue( value );
-
-      // Validate if it fits in the mask
-      if( !m_maskIsNull )
-      {
-        string representation = this.GetTextFromValue( value );
-
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        if( !provider.VerifyString( representation ) )
-          throw new ArgumentException( "The value representation '" + representation + "' does not match the mask.", "value" );
-      }
-    }
-
-    #endregion PROTECTED METHODS
-
-
-    #region INTERNAL PROPERTIES
-
-    internal bool IsForcingMask
-    {
-      get
-      {
-        return m_forcingMask;
-      }
-    }
-
-    internal string FormatSpecifier
-    {
-      get
-      {
-        return m_formatSpecifier;
-      }
-      set
-      {
-        m_formatSpecifier = value;
-      }
-    }
-
-    internal override bool IsTextReadyToBeParsed
-    {
-      get
-      {
-        return this.IsMaskCompleted;
-      }
-    }
-
-    internal override bool GetIsEditTextEmpty()
-    {
-      if( !m_maskIsNull )
-        return ( this.MaskedTextProvider.AssignedEditPositionCount == 0 );
-      return true;
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
-    internal override string GetCurrentText()
-    {
-      if( m_maskIsNull )
-        return base.GetCurrentText();
-
-      string displayText = this.GetFormattedString( m_maskedTextProvider, this.Text );
-
-      return displayText;
-    }
-
-    internal override string GetParsableText()
-    {
-      if( m_maskIsNull )
-        return base.GetParsableText();
-
-      bool includePrompt = false;
-      bool includeLiterals = true;
-
-      if( this.ValueDataType == typeof( string ) )
-      {
-        includePrompt = this.IncludePromptInValue;
-        includeLiterals = this.IncludeLiteralsInValue;
-      }
-
-      return m_maskedTextProvider
-        .ToString( false, includePrompt, includeLiterals, 0, m_maskedTextProvider.Length );
-    }
-
-    internal override void OnFormatProviderChanged()
-    {
-      MaskedTextProvider provider = new MaskedTextProvider( this.Mask );
-
-      m_maskedTextProvider = provider;
-
-      this.RefreshConversionHelpers();
-      this.RefreshCurrentText( true );
-
-      base.OnFormatProviderChanged();
-    }
-
-    internal override void RefreshConversionHelpers()
-    {
-      Type type = this.ValueDataType;
-
-      if( ( type == null ) || ( !this.IsNumericValueDataType ) )
-      {
-        m_formatSpecifier = null;
-        m_valueToStringMethodInfo = null;
-        m_unhandledLiteralsPositions = null;
-        return;
-      }
-
-      m_valueToStringMethodInfo = type.GetMethod( "ToString", new Type[] { typeof( string ), typeof( IFormatProvider ) } );
-
-      string mask = m_maskedTextProvider.Mask;
-      IFormatProvider activeFormatProvider = this.GetActiveFormatProvider();
-
-      char[] maskChars = this.GetMaskCharacters();
-
-      List<int> unhandledLiteralsPositions;
-
-      m_formatSpecifier = MaskedTextBox.GetFormatSpecifierFromMask(
-        mask,
-        maskChars,
-        activeFormatProvider,
-        this.IncludeLiteralsInValue,
-        out unhandledLiteralsPositions );
-
-      NumberFormatInfo numberFormatInfo = activeFormatProvider.GetFormat( typeof( NumberFormatInfo ) ) as NumberFormatInfo;
-
-      if( numberFormatInfo != null )
-      {
-        string negativeSign = numberFormatInfo.NegativeSign;
-
-        if( m_formatSpecifier.Contains( negativeSign ) )
-        {
-          // We must make sure that the value data type is numeric since we are about to 
-          // set the format specifier to its Positive,Negative,Zero format pattern.
-          // If we do not do this, the negative symbol would double itself when IncludeLiteralsInValue
-          // is set to True and a negative symbol is added to the mask as a literal.
-          Debug.Assert( this.IsNumericValueDataType );
-
-          m_formatSpecifier = m_formatSpecifier + ";" + m_formatSpecifier + ";" + m_formatSpecifier;
-        }
-        else
-        {
-
-        }
-      }
-
-      m_unhandledLiteralsPositions = unhandledLiteralsPositions;
-    }
-
-    internal void SetValueToStringMethodInfo( MethodInfo valueToStringMethodInfo )
-    {
-      m_valueToStringMethodInfo = valueToStringMethodInfo;
-    }
-
-    internal void ForceMask( string mask )
-    {
-      m_forcingMask = true;
-
-      try
-      {
-        this.Mask = mask;
-      }
-      finally
-      {
-        m_forcingMask = false;
-      }
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE PROPERTIES
-
-    private bool IsOverwriteMode
-    {
-      get
-      {
-        if( !m_maskIsNull )
-        {
-          switch( this.InsertKeyMode )
-          {
-            case InsertKeyMode.Default:
-              {
-                return m_insertToggled;
-              }
-
-            case InsertKeyMode.Insert:
-              {
-                return false;
-              }
-
-            case InsertKeyMode.Overwrite:
-              {
-                return true;
-              }
-          }
-        }
-
-        return false;
-      }
-    }
-
-    #endregion PRIVATE PROPERTIES
-
-    #region PRIVATE METHODS
-
-    private bool PlaceChar( char ch, int startPosition, int length, bool overwrite, out int caretIndex )
-    {
-      return this.PlaceChar( m_maskedTextProvider, ch, startPosition, length, overwrite, out caretIndex );
-    }
-
-
-    private bool PlaceChar( MaskedTextProvider provider, char ch, int startPosition, int length, bool overwrite, out int caretPosition )
-    {
-      if( this.ShouldQueryAutoCompleteMask( provider.Clone() as MaskedTextProvider, ch, startPosition ) )
-      {
-        AutoCompletingMaskEventArgs e = new AutoCompletingMaskEventArgs(
-          m_maskedTextProvider.Clone() as MaskedTextProvider,
-          startPosition,
-          length,
-          ch.ToString() );
-
-        this.OnAutoCompletingMask( e );
-
-        if( ( !e.Cancel ) && ( e.AutoCompleteStartPosition > -1 ) )
-        {
-          caretPosition = startPosition;
-
-          // AutoComplete the block.
-          for( int i = 0; i < e.AutoCompleteText.Length; i++ )
-          {
-            if( !this.PlaceCharCore( provider, e.AutoCompleteText[ i ], e.AutoCompleteStartPosition + i, 0, true, out caretPosition ) )
-              return false;
-          }
-
-          caretPosition = e.AutoCompleteStartPosition + e.AutoCompleteText.Length;
-          return true;
-        }
-      }
-
-      return this.PlaceCharCore( provider, ch, startPosition, length, overwrite, out caretPosition );
-    }
-
-    private bool ShouldQueryAutoCompleteMask( MaskedTextProvider provider, char ch, int startPosition )
-    {
-      if( provider.IsEditPosition( startPosition ) )
-      {
-        int nextSeparatorIndex = provider.FindNonEditPositionFrom( startPosition, true );
-
-        if( nextSeparatorIndex != -1 )
-        {
-          if( provider[ nextSeparatorIndex ].Equals( ch ) )
-          {
-            int previousSeparatorIndex = provider.FindNonEditPositionFrom( startPosition, false );
-
-            if( provider.FindUnassignedEditPositionInRange( previousSeparatorIndex, nextSeparatorIndex, true ) != -1 )
-            {
-              return true;
-            }
-          }
-        }
-      }
-
-      return false;
-    }
-
-    protected virtual void OnAutoCompletingMask( AutoCompletingMaskEventArgs e )
-    {
-      if( this.AutoCompletingMask != null )
-        this.AutoCompletingMask( this, e );
-    }
-
-    public event EventHandler<AutoCompletingMaskEventArgs> AutoCompletingMask;
-
-
-    private bool PlaceCharCore( MaskedTextProvider provider, char ch, int startPosition, int length, bool overwrite, out int caretPosition )
-    {
-      caretPosition = startPosition;
-
-      if( startPosition < m_maskedTextProvider.Length )
-      {
-        MaskedTextResultHint notUsed;
-
-        if( length > 0 )
-        {
-          int endPosition = ( startPosition + length ) - 1;
-          return provider.Replace( ch, startPosition, endPosition, out caretPosition, out notUsed );
-        }
-
-        if( overwrite )
-          return provider.Replace( ch, startPosition, out caretPosition, out notUsed );
-
-        return provider.InsertAt( ch, startPosition, out caretPosition, out notUsed );
-      }
-
-      return false;
-    }
-
-    internal void Replace( string text, int startPosition, int selectionLength )
-    {
-      MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-      int tentativeCaretIndex;
-
-      if( this.CanReplace( provider, text, startPosition, selectionLength, this.RejectInputOnFirstFailure, out tentativeCaretIndex ) )
-      {
-        System.Diagnostics.Debug.WriteLine( "Replace caret index to: " + tentativeCaretIndex.ToString() );
-
-        bool mustRefreshText = this.MaskedTextOutput != provider.ToString();
-        m_maskedTextProvider = provider;
-
-        if( mustRefreshText )
-          this.RefreshCurrentText( false );
-
-        this.CaretIndex = tentativeCaretIndex + 1;
-      }
-      else
-      {
-        if( this.BeepOnError )
-          System.Media.SystemSounds.Beep.Play();
-      }
-    }
-
-    internal virtual bool CanReplace( MaskedTextProvider provider, string text, int startPosition, int selectionLength, bool rejectInputOnFirstFailure, out int tentativeCaretIndex )
-    {
-      int endPosition = ( startPosition + selectionLength ) - 1;
-      tentativeCaretIndex = -1;
-
-
-      bool success = false;
-
-      foreach( char ch in text )
-      {
-        if( !m_maskedTextProvider.VerifyEscapeChar( ch, startPosition ) )
-        {
-          int editPositionFrom = provider.FindEditPositionFrom( startPosition, true );
-
-          if( editPositionFrom == MaskedTextProvider.InvalidIndex )
-            break;
-
-          startPosition = editPositionFrom;
-        }
-
-        int length = ( endPosition >= startPosition ) ? 1 : 0;
-        bool overwrite = length > 0;
-
-        if( this.PlaceChar( provider, ch, startPosition, length, overwrite, out tentativeCaretIndex ) )
-        {
-          // Only one successfully inserted character is enough to declare the replace operation successful.
-          success = true;
-
-          startPosition = tentativeCaretIndex + 1;
-        }
-        else if( rejectInputOnFirstFailure )
-        {
-          return false;
-        }
-      }
-
-      if( ( selectionLength > 0 ) && ( startPosition <= endPosition ) )
-      {
-
-        // Erase the remaining of the assigned edit character.
-        int notUsed;
-        MaskedTextResultHint notUsedHint;
-        if( !provider.RemoveAt( startPosition, endPosition, out notUsed, out notUsedHint ) )
-          success = false;
-      }
-
-      return success;
-    }
-
-    private bool CanDelete( int startPosition, int selectionLength, bool deleteForward, MaskedTextProvider provider )
-    {
-      if( this.IsReadOnly )
-        return false;
-
-
-      if( selectionLength == 0 )
-      {
-        if( !deleteForward )
-        {
-          if( startPosition == 0 )
-            return false;
-
-          startPosition--;
-        }
-        else if( ( startPosition + selectionLength ) == provider.Length )
-        {
-          return false;
-        }
-      }
-
-      MaskedTextResultHint notUsed;
-      int tentativeCaretPosition = startPosition;
-
-      int endPosition = ( selectionLength > 0 ) ? ( ( startPosition + selectionLength ) - 1 ) : startPosition;
-
-      bool success = provider.RemoveAt( startPosition, endPosition, out tentativeCaretPosition, out notUsed );
-
-      return success;
-    }
-
-    private void Delete( int startPosition, int selectionLength, bool deleteForward )
-    {
-      if( this.IsReadOnly )
-        return;
-
-
-      if( selectionLength == 0 )
-      {
-        if( !deleteForward )
-        {
-          if( startPosition == 0 )
-            return;
-
-          startPosition--;
-        }
-        else if( ( startPosition + selectionLength ) == m_maskedTextProvider.Length )
-        {
-          return;
-        }
-      }
-
-      MaskedTextResultHint hint;
-      int tentativeCaretPosition = startPosition;
-
-      int endPosition = ( selectionLength > 0 ) ? ( ( startPosition + selectionLength ) - 1 ) : startPosition;
-
-      string oldTextOutput = this.MaskedTextOutput;
-
-      bool success = m_maskedTextProvider.RemoveAt( startPosition, endPosition, out tentativeCaretPosition, out hint );
-
-      if( !success )
-      {
-        if( this.BeepOnError )
-          System.Media.SystemSounds.Beep.Play();
-
-        return;
-      }
-
-      if( this.MaskedTextOutput != oldTextOutput )
-      {
-        this.RefreshCurrentText( false );
-      }
-      else if( selectionLength > 0 )
-      {
-        tentativeCaretPosition = startPosition;
-      }
-      else if( hint == MaskedTextResultHint.NoEffect )
-      {
-        if( deleteForward )
-        {
-          tentativeCaretPosition = m_maskedTextProvider.FindEditPositionFrom( startPosition, true );
-        }
-        else
-        {
-          if( m_maskedTextProvider.FindAssignedEditPositionFrom( startPosition, true ) == MaskedTextProvider.InvalidIndex )
-          {
-            tentativeCaretPosition = m_maskedTextProvider.FindAssignedEditPositionFrom( startPosition, false );
-          }
-          else
-          {
-            tentativeCaretPosition = m_maskedTextProvider.FindEditPositionFrom( startPosition, false );
-          }
-
-          if( tentativeCaretPosition != MaskedTextProvider.InvalidIndex )
-            tentativeCaretPosition++;
-        }
-
-        if( tentativeCaretPosition == MaskedTextProvider.InvalidIndex )
-          tentativeCaretPosition = startPosition;
-      }
-      else if( !deleteForward )
-      {
-        tentativeCaretPosition = startPosition;
-      }
-
-      this.CaretIndex = tentativeCaretPosition;
-    }
-
-    private string MaskedTextOutput
-    {
-      get
-      {
-        System.Diagnostics.Debug.Assert( m_maskedTextProvider.EditPositionCount > 0 );
-
-        return m_maskedTextProvider.ToString();
-      }
-    }
-
-    private string GetRawText()
-    {
-      if( m_maskIsNull )
-        return this.Text;
-
-      return MaskedTextBox.GetRawText( m_maskedTextProvider );
-    }
-
-    private string GetFormattedString( MaskedTextProvider provider, string text )
-    {
-      if( provider.Mask.StartsWith( ">" ) )
-        return text.ToUpper();
-      if( provider.Mask.StartsWith( "<" ) )
-        return text.ToLower();
-
-      //System.Diagnostics.Debug.Assert( provider.EditPositionCount > 0 );
-
-
-      bool includePrompt = ( this.IsReadOnly ) ? false : ( !this.HidePromptOnLeave || this.IsFocused );
-
-      string displayString = provider.ToString( false, includePrompt, true, 0, m_maskedTextProvider.Length );
-
-      return displayString;
-    }
-
-    private string GetSelectedText()
-    {
-      System.Diagnostics.Debug.Assert( !m_maskIsNull );
-
-      int selectionLength = this.SelectionLength;
-
-      if( selectionLength == 0 )
-        return string.Empty;
-
-      bool includePrompt = ( this.ClipboardMaskFormat & MaskFormat.IncludePrompt ) != MaskFormat.ExcludePromptAndLiterals;
-      bool includeLiterals = ( this.ClipboardMaskFormat & MaskFormat.IncludeLiterals ) != MaskFormat.ExcludePromptAndLiterals;
-
-      return m_maskedTextProvider.ToString( true, includePrompt, includeLiterals, this.SelectionStart, selectionLength );
-    }
-
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
-    private MaskedTextProvider m_maskedTextProvider; // = null;
-    private bool m_insertToggled; // = false;
-    private bool m_maskIsNull = true;
-    private bool m_forcingMask; // = false;
-
-    List<int> m_unhandledLiteralsPositions; // = null;
-    private string m_formatSpecifier;
-    private MethodInfo m_valueToStringMethodInfo; // = null;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png
deleted file mode 100644
index 4304d43b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png
deleted file mode 100644
index 35075187..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png
deleted file mode 100644
index dad7dd09..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png
deleted file mode 100644
index ecb7fe86..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
deleted file mode 100644
index 80fdf126..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-using System.Windows.Input;
-using System.Text;
-using System.Security.Permissions;
-using System.Security;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Diagnostics;
-using System.Windows.Media.Imaging;
-using System.Windows.Threading;
-using System.Windows.Interop;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplateVisualState( Name = VisualStates.OK, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [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 ) )]
-  [TemplatePart( Name = PART_WindowControl, Type = typeof( WindowControl ) )]
-  public class MessageBox : WindowControl
-  {
-    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
-
-    /// <summary>
-    /// Tracks the MessageBoxButon value passed into the InitializeContainer method
-    /// </summary>
-    private MessageBoxButton _button = MessageBoxButton.OK;
-
-    /// <summary>
-    /// Tracks the MessageBoxResult to set as the default and focused button
-    /// </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 IntPtr _ownerHandle;
-
-    private WindowControl _windowControl;
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    static MessageBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( MessageBox ), new FrameworkPropertyMetadata( typeof( MessageBox ) ) );
-    }
-
-    public MessageBox()
-    {
-      this.Visibility = Visibility.Collapsed;
-      this.InitHandlers();
-      this.IsVisibleChanged += this.MessageBox_IsVisibleChanged;
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region Protected Properties
-
-    protected Window Container
-    {
-      get { return ( this.Parent as Window ); }
-    }
-
-    #endregion //Protected Properties
-
-    #region Dependency Properties
-
-    #region ButtonRegionBackground
-
-    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 );
-      }
-    }
-
-    #endregion //ButtonRegionBackground
-
-    #region CancelButtonContent
-
-    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Cancel" ) );
-    public object CancelButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( CancelButtonContentProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonContentProperty, value );
-      }
-    }
-
-    #endregion //CancelButtonContent
-
-    #region CancelButtonStyle
-
-    public static readonly DependencyProperty CancelButtonStyleProperty = DependencyProperty.Register( "CancelButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style CancelButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( CancelButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonStyleProperty, value );
-      }
-    }
-
-    #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 ( ImageSource )GetValue( ImageSourceProperty );
-      }
-      set
-      {
-        SetValue( ImageSourceProperty, value );
-      }
-    }
-
-    #endregion //ImageSource
-
-    #region OkButtonContent
-
-    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
-    public object OkButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( OkButtonContentProperty );
-      }
-      set
-      {
-        SetValue( OkButtonContentProperty, value );
-      }
-    }
-
-    #endregion //OkButtonContent
-
-    #region OkButtonStyle
-
-    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 );
-      }
-    }
-
-    #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
-    {
-      get
-      {
-        return ( object )GetValue( NoButtonContentProperty );
-      }
-      set
-      {
-        SetValue( NoButtonContentProperty, value );
-      }
-    }
-
-    #endregion //NoButtonContent
-
-    #region NoButtonStyle
-
-    public static readonly DependencyProperty NoButtonStyleProperty = DependencyProperty.Register( "NoButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style NoButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( NoButtonStyleProperty );
-      }
-      set
-      {
-        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
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    #endregion //Text
-
-    #region YesButtonContent
-
-    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
-    public object YesButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( YesButtonContentProperty );
-      }
-      set
-      {
-        SetValue( YesButtonContentProperty, value );
-      }
-    }
-
-    #endregion //YesButtonContent
-
-    #region YesButtonStyle
-
-    public static readonly DependencyProperty YesButtonStyleProperty = DependencyProperty.Register( "YesButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style YesButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( YesButtonStyleProperty );
-      }
-      set
-      {
-        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>
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      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 );
-
-      Button closeButton = GetMessageBoxButton( PART_CloseButton );
-      if( closeButton != null )
-        closeButton.IsEnabled = !object.Equals( _button, MessageBoxButton.YesNo );
-
-      Button okButton = GetMessageBoxButton( PART_OkButton );
-      if( okButton != null )
-        okButton.IsCancel = object.Equals( _button, MessageBoxButton.OK );
-
-      SetDefaultResult();
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      base.OnPreviewKeyDown( e );
-
-      // Prevent MenuItem shortcuts while MessageBox is active.
-      if( Keyboard.IsKeyDown( Key.LeftAlt ) || Keyboard.IsKeyDown( Key.RightAlt ) )
-      {
-        e.Handled = true;
-      }
-    }
-
-    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
-
-    #region Public Static
-
-    #region Show with Window as Owner
-
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText )
-    {
-      return Show( messageText, string.Empty, MessageBoxButton.OK, (Style)null );
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="owner">A System.Windows.Window that represents the owner of the MessageBox</param>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( Window owner, string messageText )
-    {
-      return Show( owner, messageText, string.Empty, MessageBoxButton.OK, (Style) null );
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and title bar caption; and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption )
-    {
-        return Show(messageText, caption, MessageBoxButton.OK, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption )
-    {
-        return Show(owner, messageText, caption, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, Style messageBoxStyle )
-    {
-      return Show( owner, messageText, caption, MessageBoxButton.OK, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button )
-    {
-        return Show(messageText, caption, button, (Style)null);
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button )
-    {
-        return Show(owner, messageText, caption, button, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-        return Show(messageText, caption, button, icon, (Style)null);
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-        return Show(owner, messageText, caption, button, icon, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-        return Show(messageText, caption, button, icon, defaultResult, (Style)null);
-    }
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
-    /// <param name="defaultResult">A System.Windows.MessageBoxResult value that specifies the default result of the MessageBox.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-        return Show(owner, messageText, caption, button, icon, defaultResult, (Style) null);
-    }
-
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    #endregion //Show with Window as Owner
-
-    #region Show with Window handle as Owner
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText )
-    {
-      return Show( ownerWindowHandle, messageText, string.Empty, MessageBoxButton.OK, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption )
-    {
-      return Show( ownerWindowHandle, messageText, caption, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, Style messageBoxStyle )
-    {
-      return Show( ownerWindowHandle, messageText, caption, MessageBoxButton.OK, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, icon, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, icon, defaultResult, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    #endregion //Show with Window handle as Owner
-
-    #endregion //Public Static
-
-    #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>
-    /// 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 )
-    {
-      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>
-    /// <param name="owner">The Window owner.</param>
-    /// <param name="ownerHandle">The Window Handle owner.</param>
-    /// <param name="text">The text.</param>
-    /// <param name="caption">The caption.</param>
-    /// <param name="button">The button.</param>
-    /// <param name="image">The image.</param>
-    /// <param name="defaultResult">The MessageBox result as default.</param>
-    protected void InitializeMessageBox( Window owner, IntPtr ownerHandle, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult )
-    {
-      Text = text;
-      Caption = caption;
-      _button = button;
-      _defaultResult = defaultResult;
-      _owner = owner;
-      _ownerHandle = ownerHandle;
-      SetImageSource( image );
-    }
-
-    /// <summary>
-    /// Changes the control's visual state(s).
-    /// </summary>
-    /// <param name="name">name of the state</param>
-    /// <param name="useTransitions">True if state transitions should be used.</param>
-    protected void ChangeVisualState( string name, bool useTransitions )
-    {
-      VisualStateManager.GoToState( this, name, 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>
-    private void SetDefaultResult()
-    {
-      var defaultButton = GetDefaultButtonFromDefaultResult();
-      if( defaultButton != null )
-      {
-        defaultButton.IsDefault = true;
-        defaultButton.Focus();
-      }
-    }
-
-    /// <summary>
-    /// Gets the default button from the _defaultResult.
-    /// </summary>
-    /// <returns>The default button that represents the defaultResult</returns>
-    private Button GetDefaultButtonFromDefaultResult()
-    {
-      Button defaultButton = null;
-      switch( _defaultResult )
-      {
-        case MessageBoxResult.Cancel:
-          defaultButton = GetMessageBoxButton( PART_CancelButton );
-          break;
-        case MessageBoxResult.No:
-          defaultButton = GetMessageBoxButton( PART_NoButton );
-          break;
-        case MessageBoxResult.OK:
-          defaultButton = GetMessageBoxButton( PART_OkButton );
-          break;
-        case MessageBoxResult.Yes:
-          defaultButton = GetMessageBoxButton( PART_YesButton );
-          break;
-        case MessageBoxResult.None:
-          defaultButton = GetDefaultButton();
-          break;
-      }
-      return defaultButton;
-    }
-
-    /// <summary>
-    /// Gets the default button.
-    /// </summary>
-    /// <remarks>Used when the _defaultResult is set to None</remarks>
-    /// <returns>The button to use as the default</returns>
-    private Button GetDefaultButton()
-    {
-      Button defaultButton = null;
-      switch( _button )
-      {
-        case MessageBoxButton.OK:
-        case MessageBoxButton.OKCancel:
-          defaultButton = GetMessageBoxButton( PART_OkButton );
-          break;
-        case MessageBoxButton.YesNo:
-        case MessageBoxButton.YesNoCancel:
-          defaultButton = GetMessageBoxButton( PART_YesButton );
-          break;
-      }
-      return defaultButton;
-    }
-
-    /// <summary>
-    /// Gets a message box button.
-    /// </summary>
-    /// <param name="name">The name of the button to get.</param>
-    /// <returns>The button</returns>
-    private Button GetMessageBoxButton( string name )
-    {
-      Button button = GetTemplateChild( name ) as Button;
-      return button;
-    }
-
-    private void ShowMessageBoxCore( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-      this.InitializeMessageBox( null, IntPtr.Zero, 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>
-    /// <param name="messageText">The message text.</param>
-    /// <param name="caption">The caption.</param>
-    /// <param name="button">The button.</param>
-    /// <param name="icon">The icon.</param>
-    /// <param name="defaultResult">The default result.</param>
-    /// <returns></returns>
-    private static MessageBoxResult ShowCore( Window owner, IntPtr ownerHandle, 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." );
-      }
-
-      if( (owner != null) && (ownerHandle != IntPtr.Zero) )
-      {
-        throw new NotSupportedException( "The owner of a MessageBox can't be both a Window and a WindowHandle." );
-      }
-
-      var msgBox = new MessageBox();
-      msgBox.InitializeMessageBox( owner, ownerHandle, messageText, caption, button, icon, defaultResult );
-
-      // Setting the style to null will inhibit any implicit styles      
-      if( messageBoxStyle != null )
-      {
-        msgBox.Style = messageBoxStyle;
-      }
-
-      msgBox.ShowDialog();
-      return msgBox.MessageBoxResult;
-    }
-
-    private delegate Window ComputeOwnerWindowCoreDelegate();
-
-    /// <summary>
-    /// Resolves the owner Window of the MessageBox.
-    /// </summary>
-    /// <returns>the owner Window</returns>
-    private static Window ComputeOwnerWindow()
-    {
-      Window result = null;
-
-      if( Application.Current != null )
-      {
-        if( Application.Current.Dispatcher.CheckAccess() )
-        {
-          result = ComputeOwnerWindowCore();
-        }
-        else
-        {
-          Application.Current.Dispatcher.BeginInvoke( new Action( () =>
-          {
-            result = ComputeOwnerWindowCore();
-          }
-          ) );
-        }
-      }     
-
-      return result;
-    }
-
-    private static Window ComputeOwnerWindowCore()
-    {
-      Window owner = null;
-
-      if( Application.Current != null )
-      {
-        foreach( Window w in Application.Current.Windows )
-        {
-          if( w.IsActive )
-          {
-            owner = w;
-            break;
-          }
-        }
-      }
-
-      return owner;
-    }
-
-    /// <summary>
-    /// Sets the message image source.
-    /// </summary>
-    /// <param name="image">The image to show.</param>
-    private void SetImageSource( MessageBoxImage image )
-    {
-      String iconName = String.Empty;
-
-      switch( image )
-      {
-        case MessageBoxImage.Error:
-          {
-            iconName = "Error48.png";
-            break;
-          }
-        case MessageBoxImage.Information:
-          {
-            iconName = "Information48.png";
-            break;
-          }
-        case MessageBoxImage.Question:
-          {
-            iconName = "Question48.png";
-            break;
-          }
-        case MessageBoxImage.Warning:
-          {
-            iconName = "Warning48.png";
-            break;
-          }
-        case MessageBoxImage.None:
-        default:
-          {
-            return;
-          }
-      }
-
-      // Use this syntax for other themes to get the icons
-      this.ImageSource = new BitmapImage( new Uri( String.Format( "/Xceed.Wpf.Toolkit;component/MessageBox/Icons/{0}", iconName ), UriKind.RelativeOrAbsolute ) );
-    }
-
-    /// <summary>
-    /// Creates the container which will host the MessageBox control.
-    /// </summary>
-    /// <returns></returns>
-    private Window CreateContainer()
-    {
-      var newWindow = new Window();
-      newWindow.AllowsTransparency = true;
-      newWindow.Background = Brushes.Transparent;
-      newWindow.Content = this;
-
-      if( _ownerHandle != IntPtr.Zero )
-      {
-        var windowHelper = new WindowInteropHelper( newWindow ) { Owner = _ownerHandle };
-        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
-      }
-      else
-      {
-        newWindow.Owner = _owner ?? ComputeOwnerWindow();
-        if( newWindow.Owner != null )
-          newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
-        else
-          newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
-      }
-
-      newWindow.ShowInTaskbar = false;
-      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;
-    }
-
-    #endregion //Private
-
-    #endregion //Methods
-
-    #region Event Handlers
-
-    /// <summary>
-    /// 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>
-    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      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;
-
-      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>
-    /// Sets the MessageBoxResult according to the button pressed and then closes the MessageBox.
-    /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
-    private void Button_Click( object sender, RoutedEventArgs e )
-    {
-      Button button = e.OriginalSource as Button;
-
-      if( button == null )
-        return;
-
-      switch( button.Name )
-      {
-        case PART_NoButton:
-          _dialogResult = MessageBoxResult.No;
-          this.Close();
-          break;
-        case PART_YesButton:
-          _dialogResult = MessageBoxResult.Yes;
-          this.Close();
-          break;
-        case PART_CancelButton:
-          _dialogResult = MessageBoxResult.Cancel;
-          this.Close();
-          break;
-        case PART_OkButton:
-          _dialogResult = MessageBoxResult.OK;
-          this.Close();
-          break;
-      }
-
-      e.Handled = true;
-    }
-
-    /// <summary>
-    /// Callack to the Container.Closed event
-    /// </summary>
-    /// <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()
-    {
-      this.Visibility = Visibility.Collapsed;
-      this.OnClosed( EventArgs.Empty );
-    }
-
-    private void MessageBox_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( (bool)e.NewValue )
-      {
-        Action action = () =>
-        {
-          //Focus first Focusable Child element of MessageBox to prevent Tab outside MessageBox.
-          var defaultButton = this.GetDefaultButtonFromDefaultResult();
-          if( defaultButton != null )
-          {
-            defaultButton.Focus();
-          }
-        };
-
-        Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, action );
-      }
-    }
-
-    #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 )
-    {
-      StringBuilder sb = new StringBuilder();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      sb.Append( Caption );
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      sb.Append( Text );
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      switch( _button )
-      {
-        case MessageBoxButton.OK:
-          sb.Append( OkButtonContent.ToString() );
-          break;
-        case MessageBoxButton.OKCancel:
-          sb.Append( OkButtonContent + "     " + CancelButtonContent );
-          break;
-        case MessageBoxButton.YesNo:
-          sb.Append( YesButtonContent + "     " + NoButtonContent );
-          break;
-        case MessageBoxButton.YesNoCancel:
-          sb.Append( YesButtonContent + "     " + NoButtonContent + "     " + CancelButtonContent );
-          break;
-      }
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-
-      try
-      {
-        new UIPermission( UIPermissionClipboard.AllClipboard ).Demand();
-        Clipboard.SetText( sb.ToString() );
-      }
-      catch( SecurityException )
-      {
-        throw new SecurityException();
-      }
-    }
-
-    #endregion COMMANDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
deleted file mode 100644
index 56b91413..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  internal static partial class VisualStates
-  {
-    public const string MessageBoxButtonsGroup = "MessageBoxButtonsGroup";
-    public const string OK = "OK";
-    public const string OKCancel = "OKCancel";
-    public const string YesNo = "YesNo";
-    public const string YesNoCancel = "YesNoCancel";
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 5f514cef..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,238 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="../../Primitives/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}"
-                          CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                          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}">
-              </Image>
-
-              <!-- 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
deleted file mode 100644
index 5c3d3796..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,238 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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/Generic/Common.xaml" />
-    <ResourceDictionary Source="../../Primitives/Themes/Generic/WindowControl.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- MessageBox                                                                      -->
-  <!-- =============================================================================== -->
-
-  <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">
-                        <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}"
-                                CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                                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}" >
-                    </Image>
-
-                    <!-- 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>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
index 39780891..71457650 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
index 2fbc03ae..01c96c6b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
index 378ade61..f8d5af8d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
index 5eb4628f..1af3f92c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
index f18b2847..6ff6574b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -26,6 +26,7 @@ namespace Xceed.Wpf.Toolkit
     static ByteUpDown()
     {
       UpdateMetadata( typeof( ByteUpDown ), ( byte )1, byte.MinValue, byte.MaxValue );
+      MaxLengthProperty.OverrideMetadata( typeof(ByteUpDown), new FrameworkPropertyMetadata( 3 ) );
     }
 
     public ByteUpDown()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
index d197c875..fa0464c1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -19,6 +19,7 @@ using System.Windows;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -262,7 +263,9 @@ namespace Xceed.Wpf.Toolkit
         return this.Value;
       }
 
-      result = this.ConvertTextToValueCore( currentValueText, text );
+      var cleanedText = Regex.Replace(text, "[^0-9.,]", "", RegexOptions.Compiled, TimeSpan.FromMilliseconds(100));
+
+      result = this.ConvertTextToValueCore( currentValueText, cleanedText );
 
       if( this.ClipValueToMinMax )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
index 7806ce2a..26918a87 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
index 8b6e4b85..8e77a3e8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
index 8ba2d64b..8ef94366 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
index e76846ad..1a01c817 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
index 0d9e0de5..45b787cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -69,7 +69,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region FormatString
 
-    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged ) );
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged, OnCoerceFormatString ) );
     public string FormatString
     {
       get
@@ -82,6 +82,20 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+    private static object OnCoerceFormatString( DependencyObject o, object baseValue )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        return numericUpDown.OnCoerceFormatString( (string)baseValue );
+
+      return baseValue;
+    }
+
+    protected virtual string OnCoerceFormatString( string baseValue )
+    {
+      return baseValue ?? string.Empty;
+    }
+
     private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
     {
       NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
index f15e28cf..f74b5ba8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
@@ -1,25 +1,25 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
-  internal class SByteUpDown : CommonNumericUpDown<sbyte>
+  [CLSCompliantAttribute( false )]
+  public class SByteUpDown : CommonNumericUpDown<sbyte>
   {
     #region Constructors
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
index 39ecc075..a7c3ea49 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
index 462a880c..d5814be0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
index c2ecc707..b814437d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -19,7 +19,8 @@ using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
-  internal class UIntegerUpDown : CommonNumericUpDown<uint>
+  [CLSCompliantAttribute(false)]
+  public class UIntegerUpDown : CommonNumericUpDown<uint>
   {
     #region Constructors
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
index 185050cb..db6d16de 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
@@ -1,25 +1,25 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
-  internal class ULongUpDown : CommonNumericUpDown<ulong>
+  [CLSCompliantAttribute( false )]
+  public class ULongUpDown : CommonNumericUpDown<ulong>
   {
     #region Constructors
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
index c3992441..fe2c03c1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
@@ -1,25 +1,25 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
-  internal class UShortUpDown : CommonNumericUpDown<ushort>
+  [CLSCompliantAttribute( false )]
+  public class UShortUpDown : CommonNumericUpDown<ushort>
   {
     #region Constructors
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
index b2e8549f..d7f5a6d2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
index cebeb172..8e888527 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 b118f7fb..aed41241 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -22,7 +22,7 @@ using System.Windows.Input;
 
 namespace Xceed.Wpf.Toolkit.Obselete
 {
-  [Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", true)]
+  [Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", false)]
   public class MaskedTextBox : TextBox
   {
     #region Members
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
index dcc130ef..3c248dd3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
index 538628fe..ba22d71a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
index 3d051719..3e93b670 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
index a89d5edf..b9a3148c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
index ab5f4e85..2c48e49b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
index 66d4acac..776196fe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
index d0fb56c1..257b6eeb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
index a1dd43b0..47882792 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
index 64faa9e4..3af9931b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
index 7d7d53b7..c57bf891 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
index e0410522..177087fd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
index 4a6af9b2..dd014e61 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
index 1d079e2a..715c81a6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
index 3217f008..e660d4c6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
index 7a023c23..a8d8ff4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
index 523041aa..eb8d10d6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
index c5a05da1..6975cbeb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
index b4585aa7..a2ceca2d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
index 01c66fe2..faaae2b1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
index d99909ab..328c74a1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
index 499ebdde..b1d037c5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
index 583e4ab5..cd022028 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
index cd89a90b..e7c234ab 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
index 65b64557..5235268f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
index d72aaa87..48c3a7ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
index 7e5a907a..7c6a0688 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
index 5c98eac3..bf4bd904 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -220,7 +220,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
     protected virtual void PerformMouseSelection()
     {
       var dateTimeInfo = this.GetDateTimeInfo( TextBox.SelectionStart );
-      if( (dateTimeInfo != null) && (dateTimeInfo.Type == DateTimePart.Other) )
+      if( ( dateTimeInfo != null) && (dateTimeInfo.Type == DateTimePart.Other) )
       {
         this.Dispatcher.BeginInvoke( DispatcherPriority.Background, new Action( () =>
         {
@@ -255,7 +255,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
       return _dateTimeInfoList.FirstOrDefault( ( info ) =>info.Type == part );
     }
 
-    internal void Select( DateTimeInfo info )
+    internal virtual void Select( DateTimeInfo info )
     {
       if( (info != null) && !info.Equals( _selectedDateTimeInfo ) && ( this.TextBox != null) && !string.IsNullOrEmpty( this.TextBox.Text ) )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
index e65f57fb..5a63802b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
index 8243acff..c5c9b2ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
index 1e122a0c..a02c136a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
index fe383baf..060976ad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
@@ -1,157 +1,157 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  [TemplatePart( Name = PART_SelectAllSelectorItem, Type = typeof( SelectAllSelectorItem ) )]
-  public class SelectAllSelector : Selector
-  {
-    private const string PART_SelectAllSelectorItem = "PART_SelectAllSelectorItem";
-
-    #region Members
-
-    private SelectAllSelectorItem _selectAllSelecotrItem;
-
-    #endregion
-
-    #region Properties
-
-    #region IsSelectAllActive
-
-    public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register( "IsSelectAllActive", typeof( bool ), typeof( SelectAllSelector ), new UIPropertyMetadata( false, OnIsSelectAllActiveChanged ) );
-    public bool IsSelectAllActive
-    {
-      get
-      {
-        return ( bool )GetValue( IsSelectAllActiveProperty );
-      }
-      set
-      {
-        SetValue( IsSelectAllActiveProperty, value );
-      }
-    }
-
-    private static void OnIsSelectAllActiveChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var selector = o as SelectAllSelector;
-      if( selector != null )
-        selector.OnIsSelectAllActiveChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsSelectAllActiveChanged( bool oldValue, bool newValue )
-    {
-      if( newValue && ( this.Items.Count > 0 ) )
-      {
-        this.UpdateSelectAllSelectorItem();
-      }
-    }
-
-    #endregion //IsSelectAllActive
-
-    #region SelectAllContent
-
-    public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register( "SelectAllContent", typeof( object ), typeof( SelectAllSelector ), new UIPropertyMetadata( "Select All" ) );
-    public object SelectAllContent
-    {
-      get
-      {
-        return ( object )GetValue( SelectAllContentProperty );
-      }
-      set
-      {
-        SetValue( SelectAllContentProperty, value );
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    protected override void OnSelectedItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      base.OnSelectedItemsCollectionChanged( sender, e );
-
-      this.UpdateSelectAllSelectorItem();
-    }
-
-    protected override void OnItemsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      base.OnItemsChanged( e );
-
-      this.UpdateSelectAllSelectorItem();
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      _selectAllSelecotrItem = this.GetTemplateChild( PART_SelectAllSelectorItem ) as SelectAllSelectorItem;
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    public void SelectAll()
-    {
-      foreach( var item in this.ItemsCollection )
-      {
-        if( !this.SelectedItems.Contains( item ) )
-        {
-          this.SelectedItems.Add( item );
-        }
-      }
-    }
-
-    public void UnSelectAll()
-    {
-      this.SelectedItems.Clear();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateSelectAllSelectorItem()
-    {
-      if( _selectAllSelecotrItem != null )
-      {
-        // All items are selected; select the SelectAll option.
-        if( this.Items.Count == this.SelectedItems.Count )
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( true );
-        }
-        // Some items are selected; set the SelectAll option to null.
-        else if( this.SelectedItems.Count > 0 )
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( null );
-        }
-        // No items are selected; unselect the SelectAll option.
-        else
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( false );
-        }
-      }
-    }
-
-    #endregion
-  }
-}
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Collections.Specialized;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  [TemplatePart( Name = PART_SelectAllSelectorItem, Type = typeof( SelectAllSelectorItem ) )]
+  public class SelectAllSelector : Selector
+  {
+    private const string PART_SelectAllSelectorItem = "PART_SelectAllSelectorItem";
+
+    #region Members
+
+    private SelectAllSelectorItem _selectAllSelecotrItem;
+
+    #endregion
+
+    #region Properties
+
+    #region IsSelectAllActive
+
+    public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register( "IsSelectAllActive", typeof( bool ), typeof( SelectAllSelector ), new UIPropertyMetadata( false, OnIsSelectAllActiveChanged ) );
+    public bool IsSelectAllActive
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectAllActiveProperty );
+      }
+      set
+      {
+        SetValue( IsSelectAllActiveProperty, value );
+      }
+    }
+
+    private static void OnIsSelectAllActiveChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      var selector = o as SelectAllSelector;
+      if( selector != null )
+        selector.OnIsSelectAllActiveChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsSelectAllActiveChanged( bool oldValue, bool newValue )
+    {
+      if( newValue && ( this.Items.Count > 0 ) )
+      {
+        this.UpdateSelectAllSelectorItem();
+      }
+    }
+
+    #endregion //IsSelectAllActive
+
+    #region SelectAllContent
+
+    public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register( "SelectAllContent", typeof( object ), typeof( SelectAllSelector ), new UIPropertyMetadata( "Select All" ) );
+    public object SelectAllContent
+    {
+      get
+      {
+        return ( object )GetValue( SelectAllContentProperty );
+      }
+      set
+      {
+        SetValue( SelectAllContentProperty, value );
+      }
+    }
+
+    #endregion
+
+    #endregion
+
+    #region Overrides
+
+    protected override void OnSelectedItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
+    {
+      base.OnSelectedItemsCollectionChanged( sender, e );
+
+      this.UpdateSelectAllSelectorItem();
+    }
+
+    protected override void OnItemsChanged( NotifyCollectionChangedEventArgs e )
+    {
+      base.OnItemsChanged( e );
+
+      this.UpdateSelectAllSelectorItem();
+    }
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      _selectAllSelecotrItem = this.GetTemplateChild( PART_SelectAllSelectorItem ) as SelectAllSelectorItem;
+    }
+
+    #endregion
+
+    #region Public Methods
+
+    public void SelectAll()
+    {
+      foreach( var item in this.ItemsCollection )
+      {
+        if( !this.SelectedItems.Contains( item ) )
+        {
+          this.SelectedItems.Add( item );
+        }
+      }
+    }
+
+    public void UnSelectAll()
+    {
+      this.SelectedItems.Clear();
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    private void UpdateSelectAllSelectorItem()
+    {
+      if( _selectAllSelecotrItem != null )
+      {
+        // All items are selected; select the SelectAll option.
+        if( this.Items.Count == this.SelectedItems.Count )
+        {
+          _selectAllSelecotrItem.ModifyCurrentSelection( true );
+        }
+        // Some items are selected; set the SelectAll option to null.
+        else if( this.SelectedItems.Count > 0 )
+        {
+          _selectAllSelecotrItem.ModifyCurrentSelection( null );
+        }
+        // No items are selected; unselect the SelectAll option.
+        else
+        {
+          _selectAllSelecotrItem.ModifyCurrentSelection( false );
+        }
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
index 9f38410a..09b5e047 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
@@ -1,68 +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
-
-  ***********************************************************************************/
-
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class SelectAllSelectorItem : SelectorItem
-  {
-    #region Members
-
-    private bool _ignoreSelectorChanges = false;
-
-    #endregion
-
-    #region Overrides
-
-    // Do not raise an event when this item is Selected/UnSelected.
-    protected override void OnIsSelectedChanged( bool? oldValue, bool? newValue )
-    {
-      if( _ignoreSelectorChanges )
-        return;
-
-      var templatedParent = this.TemplatedParent as SelectAllSelector;
-      if( templatedParent != null )
-      {
-        if( newValue.HasValue )
-        {
-          // Select All
-          if( newValue.Value )
-          {
-            templatedParent.SelectAll();
-          }
-          // UnSelect All
-          else
-          {
-            templatedParent.UnSelectAll();
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void ModifyCurrentSelection( bool? newSelection )
-    {
-      _ignoreSelectorChanges = true;
-      this.IsSelected = newSelection;
-      _ignoreSelectorChanges = false;
-    }
-
-    #endregion
-  }
-}
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public class SelectAllSelectorItem : SelectorItem
+  {
+    #region Members
+
+    private bool _ignoreSelectorChanges = false;
+
+    #endregion
+
+    #region Overrides
+
+    // Do not raise an event when this item is Selected/UnSelected.
+    protected override void OnIsSelectedChanged( bool? oldValue, bool? newValue )
+    {
+      if( _ignoreSelectorChanges )
+        return;
+
+      var templatedParent = this.TemplatedParent as SelectAllSelector;
+      if( templatedParent != null )
+      {
+        if( newValue.HasValue )
+        {
+          // Select All
+          if( newValue.Value )
+          {
+            templatedParent.SelectAll();
+          }
+          // UnSelect All
+          else
+          {
+            templatedParent.UnSelectAll();
+          }
+        }
+      }
+    }
+
+    #endregion
+
+    #region Internal Methods
+
+    internal void ModifyCurrentSelection( bool? newSelection )
+    {
+      _ignoreSelectorChanges = true;
+      this.IsSelected = newSelection;
+      _ignoreSelectorChanges = false;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
index 78355b2e..900d44df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -623,6 +623,9 @@ namespace Xceed.Wpf.Toolkit.Primitives
     /// <param name="e"></param>
     protected virtual void OnSelectedItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
+      if( _ignoreSelectedItemsCollectionChanged > 0 )
+        return;
+
       if( e.Action == NotifyCollectionChangedAction.Reset )
       {
         if( _internalSelectedItems != null )
@@ -663,9 +666,6 @@ namespace Xceed.Wpf.Toolkit.Primitives
         }
       }
 
-      if( _ignoreSelectedItemsCollectionChanged > 0 )
-        return;
-
       // Keep it simple for now. Just update all
       this.UpdateFromSelectedItems();
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
index 85c0ced8..e4e65117 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
index ccddcb5e..3fc13083 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
index ecfdaddf..ac818d74 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -19,48 +19,69 @@
                     xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
 
-   <!-- =============================================================================== -->
-   <!-- SelectorItem                                                                    -->
-   <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- SelectorItem                                                                    -->
+  <!-- =============================================================================== -->
 
-   <Style TargetType="{x:Type primitives:SelectorItem}">
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="Padding"
-              Value="4,0,0,0" />
-      <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}">
-                  <!-- In Classic Theme, The Foreground shouldn't be applied to Checkmark and Text-->
-                  <CheckBox IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                     <CheckBox.Content>
-                        <ContentControl Content="{TemplateBinding Content}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        Foreground="{TemplateBinding Foreground}" />
-                     </CheckBox.Content>
-                  </CheckBox>
-               </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>
+  <Style TargetType="{x:Type primitives:SelectorItem}">
+    <Setter Property="HorizontalContentAlignment"
+            Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
+    <Setter Property="VerticalContentAlignment"
+            Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
+    <Setter Property="Padding"
+            Value="4,0,0,0" />
+    <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}">
+            <!-- In Classic Theme, The Foreground shouldn't be applied to Checkmark and Text-->
+            <CheckBox x:Name="_checkBox"
+                      IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
+                      Padding="{TemplateBinding Padding}"
+                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+              <CheckBox.Content>
+                <ContentControl Content="{TemplateBinding Content}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Foreground="{TemplateBinding Foreground}"
+                                Focusable="False" />
+              </CheckBox.Content>
+            </CheckBox>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                     Value="true">
+              <Setter TargetName="_background"
+                      Property="Background"
+                      Value="#FFB8E0F3" />
+              <Setter TargetName="_background"
+                      Property="BorderBrush"
+                      Value="#FF26A0DA" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin"
+                     Value="true">
+              <Setter TargetName="_background"
+                      Property="Background"
+                      Value="#FFB8E0F3" />
+              <Setter TargetName="_background"
+                      Property="BorderBrush"
+                      Value="#FF26A0DA" />
+              <Setter TargetName="_checkBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=_checkBox}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
index eaf040a4..1ea70d3a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -83,7 +83,7 @@
                    Source="{TemplateBinding CaptionIcon}"
                    MaxWidth="15"
                    MaxHeight="15"
-                   Margin="0,2,0,2">
+                   Margin="5,2,0,2">
             </Image>
             <Grid x:Name="Title"
                   Grid.Column="2"
@@ -294,9 +294,6 @@
         <Setter Property="BorderBrush"
                 Value="#FFDADADA"
                 TargetName="ContentOuterBorder" />
-        <Setter Property="IsEnabled"
-                Value="False"
-                TargetName="Content" />
       </Trigger>
 
       <!-- Remove the Margin when there's no title to remove the TitleShadow glow effect. -->
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
index 970e66e3..27ee7097 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -16,56 +16,69 @@
 
 <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" >
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
 
-   <!-- =============================================================================== -->
-   <!-- SelectorItem                                                                    -->
-   <!-- =============================================================================== -->
+  <!-- =============================================================================== -->
+  <!-- SelectorItem                                                                    -->
+  <!-- =============================================================================== -->
 
-   <Style TargetType="{x:Type primitives:SelectorItem}">
+  <Style TargetType="{x:Type primitives:SelectorItem}">
 
-      <Setter Property="HorizontalContentAlignment"
-              Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="Padding"
-              Value="4,0,0,0" />
-      <Setter Property="IsTabStop"
-               Value="False" />
+    <Setter Property="HorizontalContentAlignment"
+            Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
+    <Setter Property="VerticalContentAlignment"
+            Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
+    <Setter Property="Padding"
+            Value="4,0,0,0" />
+    <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}">
-                  <!-- In Classic Theme, The Foreground shouldn't be applied to Checkmark and Text-->
-                  <CheckBox IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                     <CheckBox.Content>
-                        <ContentControl Content="{TemplateBinding Content}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        Foreground="{TemplateBinding Foreground}" />
-                     </CheckBox.Content>
-                  </CheckBox>
-               </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>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+          <Border x:Name="_background"
+                  Background="{TemplateBinding Background}"
+                  BorderBrush="{TemplateBinding BorderBrush}"
+                  BorderThickness="{TemplateBinding BorderThickness}">
+            <!-- In Classic Theme, The Foreground shouldn't be applied to Checkmark and Text-->
+            <CheckBox x:Name="_checkBox"
+                      IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
+                      Padding="{TemplateBinding Padding}"
+                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+              <CheckBox.Content>
+                <ContentControl Content="{TemplateBinding Content}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                Foreground="{TemplateBinding Foreground}"
+                                Focusable="False" />
+              </CheckBox.Content>
+            </CheckBox>
+          </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}}" />
+              <Setter TargetName="_checkBox"
+                      Property="FocusManager.FocusedElement"
+                      Value="{Binding ElementName=_checkBox}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
index cb7bd023..08fb2d03 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -88,7 +88,7 @@
                      Source="{TemplateBinding CaptionIcon}"
                      MaxWidth="15"
                      MaxHeight="15"
-                     Margin="0,2,0,2">
+                     Margin="5,2,0,2">
               </Image>
               <Grid x:Name="Title"
                     Grid.Column="2"
@@ -281,9 +281,6 @@
         <Setter Property="BorderBrush"
                 Value="#FF7B7B7B"
                 TargetName="ContentBorder" />
-        <Setter Property="IsEnabled"
-                Value="False"
-                TargetName="Content" />
       </Trigger>
 
       <Trigger Property="IsKeyboardFocusWithin"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
index 5fa821af..d9bce8cd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
index ac2430fc..b1ab9784 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
index 46cb091b..6b4d032a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
index ee4ad3b4..d0f93fd9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
@@ -1,451 +1,433 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    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.Controls;
 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()
+    public class WindowContainer : Canvas
     {
-      // 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 ) );
-    }
+        #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 )
-    {
-      foreach( WindowControl window in this.Children )
-      {
-        window.SetIsActiveInternal( false );
-      }
-      this.SetNextActiveWindow( null );
-    }
+        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;
+        }
 
-    #endregion //Constructors
+        void WindowContainer_Loaded(object sender, RoutedEventArgs e)
+        {
+            foreach (WindowControl window in this.Children)
+            {
+                window.SetIsActiveInternal(false);
+            }
+            this.SetNextActiveWindow(null);
+        }
 
-    #region Members
+        #endregion //Constructors
 
-    private Brush _defaultBackgroundBrush;
-    private bool _isModalBackgroundApplied;
+        #region Members
 
-    #endregion
+        private Brush _defaultBackgroundBrush;
+        private bool _isModalBackgroundApplied;
 
-    #region Properties
+        #endregion
 
-    #region ModalBackgroundBrush
+        #region Properties
 
-    /// <summary>
-    /// Identifies the ModalBackgroundBrush dependency property.
-    /// </summary>
-    // Initialized in the static constructor.
-    public static readonly DependencyProperty ModalBackgroundBrushProperty;
+        #region ModalBackgroundBrush
 
-    /// <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 );
-      }
-    }
+        /// <summary>
+        /// Identifies the ModalBackgroundBrush dependency property.
+        /// </summary>
+        // Initialized in the static constructor.
+        public static readonly DependencyProperty ModalBackgroundBrushProperty;
 
-    private static void OnModalBackgroundBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      WindowContainer windowContainer = ( WindowContainer )d;
-      if( windowContainer != null )
-        windowContainer.OnModalBackgroundBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
-    }
+        /// <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);
+            }
+        }
 
-    protected virtual void OnModalBackgroundBrushChanged( Brush oldValue, Brush newValue )
-    {
-      this.SetModalBackground();
-    }
+        private static void OnModalBackgroundBrushChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            WindowContainer windowContainer = (WindowContainer)d;
+            if (windowContainer != null)
+                windowContainer.OnModalBackgroundBrushChanged((Brush)e.OldValue, (Brush)e.NewValue);
+        }
 
-    #endregion //ModalBackgroundBrush
+        protected virtual void OnModalBackgroundBrushChanged(Brush oldValue, Brush newValue)
+        {
+            this.SetModalBackground();
+        }
 
-    #endregion
+        #endregion //ModalBackgroundBrush
 
-    #region Base Class Override
+        #endregion
 
-    /// <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;
-    }
+        #region Base Class Override
 
-    /// <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 )
+        /// <summary>
+        /// Measure the size of the WindowContainer based on its children.
+        /// </summary>
+        protected override Size MeasureOverride(Size constraint)
         {
-          ( ( ChildWindow )removedChild ).IsModalChanged -= new EventHandler<EventArgs>( this.Child_IsModalChanged );
+            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;
         }
-      }
-
-      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 )
+
+        /// <summary>
+        /// Register and unregister to children events.
+        /// </summary>
+        protected override void OnVisualChildrenChanged(DependencyObject visualAdded, DependencyObject visualRemoved)
         {
-          ( ( ChildWindow )addedChild ).IsModalChanged += new EventHandler<EventArgs>( this.Child_IsModalChanged );
+            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
+        #endregion
 
-    #region Event Handler
+        #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_LeftChanged(object sender, EventArgs e)
+        {
+            WindowControl windowControl = (WindowControl)sender;
+            if (windowControl != null)
+            {
+                windowControl.Left = this.GetRestrictedLeft(windowControl);
+            }
 
-    private void Child_PreviewMouseLeftButtonDown( object sender, RoutedEventArgs e )
-    {
-      WindowControl windowControl = ( WindowControl )sender;
+            Canvas.SetLeft(windowControl, windowControl.Left);
+        }
 
-      WindowControl modalWindow = this.GetModalWindow();
-      if( modalWindow == null )
-      {
-        this.SetNextActiveWindow( windowControl );
-      }
-    }
+        private void Child_TopChanged(object sender, EventArgs e)
+        {
+            WindowControl windowControl = (WindowControl)sender;
+            if (windowControl != null)
+            {
+                windowControl.Top = this.GetRestrictedTop(windowControl);
+            }
 
-    private void Child_IsModalChanged( object sender, EventArgs e )
-    {
-      this.SetModalBackground();
-    }
+            Canvas.SetTop(windowControl, windowControl.Top);
+        }
 
-    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_PreviewMouseLeftButtonDown(object sender, RoutedEventArgs e)
+        {
+            WindowControl windowControl = (WindowControl)sender;
 
-    private void Child_IsKeyboardFocusWithinChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      WindowControl windowControl = ( WindowControl )sender;
-      if( ( bool )e.NewValue )
-      {
-        this.SetNextActiveWindow( windowControl );
-      }
-    }
+            WindowControl modalWindow = this.GetModalWindow();
+            if (modalWindow == null)
+            {
+                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 ) )
+        private void Child_IsModalChanged(object sender, EventArgs e)
         {
-          this.SetChildPos( windowControl );
-          windowControl.IsStartupPositionInitialized = true;
+            this.SetModalBackground();
         }
-      }
-    }
 
-    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 );
-      }
-    }
+        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 ExpandWindowControl( WindowControl windowControl )
-    {
-      if( windowControl != null )
-      {
-        windowControl.Left = 0;
-        windowControl.Top = 0;
-        windowControl.Width = Math.Min( this.ActualWidth, windowControl.MaxWidth );
-        windowControl.Height = Math.Min( this.ActualHeight, windowControl.MaxHeight );
-      }
-    }
+        private void Child_IsKeyboardFocusWithinChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            WindowControl windowControl = (WindowControl)sender;
+            if ((bool)e.NewValue)
+            {
+                this.SetNextActiveWindow(windowControl);
+            }
+        }
 
-    #endregion
+        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;
+                }
+            }
+        }
 
-    #region Private Methods
+        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);
+            }
+        }
 
-    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 );
-      }
-    }
+        #endregion
 
-    private void CenterChild( WindowControl windowControl )
-    {
-      windowControl.UpdateLayout();
-
-      if( ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
-      {
-        windowControl.Left = ( this.ActualWidth - windowControl.ActualWidth ) / 2.0;
-        windowControl.Left += (windowControl.Margin.Left - windowControl.Margin.Right);
-        windowControl.Top = ( this.ActualHeight - windowControl.ActualHeight ) / 2.0;
-        windowControl.Top += ( windowControl.Margin.Top - windowControl.Margin.Bottom );
-      }
-    }
+        #region Private Methods
 
-    private void SetNextActiveWindow( WindowControl windowControl )
-    {
-      if( !this.IsLoaded )
-        return;
-
-      if( this.IsModalWindow( windowControl ) )
-      {
-        this.BringToFront( windowControl );
-      }
-      else
-      {
-        WindowControl modalWindow = this.GetModalWindow();
-        // Modal window is always in front
-        if( modalWindow != null )
+        private void SetChildPos(WindowControl windowControl)
         {
-          this.BringToFront( modalWindow );
+            // A MessageBox with no X and Y will be centered.
+            // A ChildWindow with WindowStartupLocation == Center will be centered.
+            if (((windowControl is ChildWindow) && (((ChildWindow)windowControl).WindowStartupLocation == WindowStartupLocation.Center)))
+            {
+                this.CenterChild(windowControl);
+            }
+            else
+            {
+                Canvas.SetLeft(windowControl, windowControl.Left);
+                Canvas.SetTop(windowControl, windowControl.Top);
+            }
         }
-        else if( windowControl != null )
+
+        private void CenterChild(WindowControl windowControl)
         {
-          this.BringToFront( windowControl );
+            windowControl.UpdateLayout();
+
+            if ((windowControl.ActualWidth != 0) && (windowControl.ActualHeight != 0))
+            {
+                windowControl.Left = (this.ActualWidth - windowControl.ActualWidth) / 2.0;
+                windowControl.Left += (windowControl.Margin.Left - windowControl.Margin.Right);
+                windowControl.Top = (this.ActualHeight - windowControl.ActualHeight) / 2.0;
+                windowControl.Top += (windowControl.Margin.Top - windowControl.Margin.Bottom);
+            }
         }
-        else
+
+        private void SetNextActiveWindow(WindowControl windowControl)
         {
-          this.BringToFront( this.Children.OfType<WindowControl>()
-                            .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) )
-                            .FirstOrDefault( ( x ) => x.Visibility == Visibility.Visible ) );
+            if (!this.IsLoaded)
+                return;
+
+            if (this.IsModalWindow(windowControl))
+            {
+                this.BringToFront(windowControl);
+            }
+            else
+            {
+                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>()
+                                      .OrderByDescending((x) => Canvas.GetZIndex(x))
+                                      .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 );
-
-        this.SetActiveWindow( windowControl );
-      }
-    }
+        private void BringToFront(WindowControl windowControl)
+        {
+            if (windowControl != null)
+            {
+                int maxZIndez = this.Children.OfType<WindowControl>().Max((x) => Canvas.GetZIndex(x));
+                Canvas.SetZIndex(windowControl, maxZIndez + 1);
 
-    private void SetActiveWindow( WindowControl windowControl )
-    {
-      if( windowControl.IsActive )
-        return;
-
-      foreach( WindowControl window in this.Children )
-      {
-        window.SetIsActiveInternal( false );
-      }
-      windowControl.SetIsActiveInternal( true );
-    }
+                this.SetActiveWindow(windowControl);
+            }
+        }
 
-    private bool IsModalWindow( WindowControl windowControl )
-    {
-      return ( ( ( windowControl is MessageBox ) && (windowControl.Visibility == Visibility.Visible) )
-             || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal && ( ( ChildWindow )windowControl).WindowState == WindowState.Open ) );
-    }
+        private void SetActiveWindow(WindowControl windowControl)
+        {
+            if (windowControl.IsActive)
+                return;
+
+            foreach (WindowControl window in this.Children)
+            {
+                window.SetIsActiveInternal(false);
+            }
+            windowControl.SetIsActiveInternal(true);
+        }
 
-    private WindowControl GetModalWindow()
-    {
-      return this.Children.OfType<WindowControl>()
-                      .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) )
-                      .FirstOrDefault( ( x ) => IsModalWindow( x ) && (x.Visibility == Visibility.Visible) );
-    }
+        private bool IsModalWindow(WindowControl windowControl)
+        {
+            return (((windowControl is ChildWindow) && ((ChildWindow)windowControl).IsModal && ((ChildWindow)windowControl).WindowState == WindowState.Open));
+        }
 
-    private double GetRestrictedLeft( WindowControl windowControl )
-    {
-      if( windowControl.Left < 0 )
-        return 0;
+        private WindowControl GetModalWindow()
+        {
+            return this.Children.OfType<WindowControl>()
+                            .OrderByDescending((x) => Canvas.GetZIndex(x))
+                            .FirstOrDefault((x) => IsModalWindow(x) && (x.Visibility == Visibility.Visible));
+        }
 
-      if( ( ( windowControl.Left + windowControl.ActualWidth ) > this.ActualWidth ) && ( this.ActualWidth != 0 ) )
-      {
-        double x = this.ActualWidth - windowControl.ActualWidth;
-        return x < 0 ? 0 : x;
-      }
+        private double GetRestrictedLeft(WindowControl windowControl)
+        {
+            if (windowControl.Left < 0)
+                return 0;
 
-      return windowControl.Left;
-    }
+            if (((windowControl.Left + windowControl.ActualWidth) > this.ActualWidth) && (this.ActualWidth != 0))
+            {
+                double x = this.ActualWidth - windowControl.ActualWidth;
+                return x < 0 ? 0 : x;
+            }
 
-    private double GetRestrictedTop( WindowControl windowControl )
-    {
-      if( windowControl.Top < 0 )
-        return 0;
+            return windowControl.Left;
+        }
 
-      if( ( ( windowControl.Top + windowControl.ActualHeight ) > this.ActualHeight ) && ( this.ActualHeight != 0 ) )
-      {
-        double y = this.ActualHeight - windowControl.ActualHeight;
-        return y < 0 ? 0 : y;
-      }
+        private double GetRestrictedTop(WindowControl windowControl)
+        {
+            if (windowControl.Top < 0)
+                return 0;
 
-      return windowControl.Top;
-    }
+            if (((windowControl.Top + windowControl.ActualHeight) > this.ActualHeight) && (this.ActualHeight != 0))
+            {
+                double y = this.ActualHeight - windowControl.ActualHeight;
+                return y < 0 ? 0 : y;
+            }
 
-    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;
+            return windowControl.Top;
         }
 
-        this.Background = this.ModalBackgroundBrush;
-
-      }
-      else
-      {
-        if( _isModalBackgroundApplied )
+        private void SetModalBackground()
         {
-          this.Background = _defaultBackgroundBrush;
-          _defaultBackgroundBrush = null;
-          _isModalBackgroundApplied = false;
+            // 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
-  }
+        #endregion
+    }
 
 
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
index cd0553b0..a1d4ef01 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
similarity index 57%
rename from ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
index e2c7d4b1..8b729d17 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -17,10 +17,7 @@
 #region Using directives
 
 using System;
-using System.Globalization;
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Windows;
@@ -31,13 +28,13 @@ using System.Windows.Markup;
 // 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 Toolkit for WPF" )]
+[assembly: AssemblyTitle("Xceed Toolkit for WPF")]
 [assembly: AssemblyDescription("This assembly implements various Windows Presentation Framework controls.")]
 
 [assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct( "Xceed Toolkit for WPF" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
-[assembly: AssemblyCulture( "" )]
+[assembly: AssemblyProduct("Xceed Toolkit for WPF")]
+[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2019")]
+[assembly: AssemblyCulture("")]
 
 
 // Needed to enable xbap scenarios
@@ -50,28 +47,6 @@ using System.Windows.Markup;
 [assembly: CLSCompliant(true)]
 
 
-[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Office2007" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Metro" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Windows10" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-
 
 
 
@@ -87,17 +62,17 @@ using System.Windows.Markup;
 
 [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)
+                                               //(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)
+                                              //(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/toolkit", "xctk")]
 [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.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")]
@@ -107,14 +82,10 @@ using System.Windows.Markup;
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Commands")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Converters")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Editors")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox" )]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Panels" )]
-
-
-#pragma warning disable 1699
-[assembly: AssemblyDelaySign( false )]
-[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
-[assembly: AssemblyKeyName( "" )]
-#pragma warning restore 1699
-
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Panels")]
 
+#if NET
+[assembly: System.Runtime.Versioning.TargetPlatform("Windows")]
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows")]
+#endif
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png
deleted file mode 100644
index 0146e932..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png
deleted file mode 100644
index 51510df8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png
deleted file mode 100644
index aeaeab8d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png
deleted file mode 100644
index 0f523fbd..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png
deleted file mode 100644
index 7dd3b491..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png
deleted file mode 100644
index ec521dd4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png
deleted file mode 100644
index 7275c981..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png
deleted file mode 100644
index b3138ba3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png
deleted file mode 100644
index 7a6005d6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
deleted file mode 100644
index fff07349..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  [AttributeUsage( AttributeTargets.Class, AllowMultiple = true )]
-  public class CategoryOrderAttribute : Attribute
-  {
-    #region Properties
-
-    #region Order
-
-    public int Order
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region Category
-
-    public virtual string Category
-    {
-      get
-      {
-        return CategoryValue;
-      }
-    }
-
-    #endregion
-
-    #region CategoryValue
-
-    public string CategoryValue
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #endregion
-
-    #region constructor
-
-    public CategoryOrderAttribute()
-    {
-    }
-
-    public CategoryOrderAttribute( string categoryName, int order )
-      :this()
-    {
-      CategoryValue = categoryName;
-      Order = order;
-    }
-
-    #endregion
-  }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
deleted file mode 100644
index c1fbbe54..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  public class ExpandableObjectAttribute : Attribute
-  {
-    #region Constructors
-
-    public ExpandableObjectAttribute()
-    {
-    }
-
-
-    #endregion
-
-    #region Properties
-
-
-
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
deleted file mode 100644
index 512685fc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  public interface IItemsSource
-  {
-    ItemCollection GetValues();
-  }
-
-  public class Item
-  {
-    public string DisplayName
-    {
-      get;
-      set;
-    }
-    public object Value
-    {
-      get;
-      set;
-    }
-  }
-
-  public class ItemCollection : List<Item>
-  {
-    public void Add( object value )
-    {
-      Item item = new Item();
-      item.DisplayName = value.ToString();
-      item.Value = value;
-      base.Add( item );
-    }
-
-    public void Add( object value, string displayName )
-    {
-      Item newItem = new Item();
-      newItem.DisplayName = displayName;
-      newItem.Value = value;
-      base.Add( newItem );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
deleted file mode 100644
index 420ce78e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  public class ItemsSourceAttribute : Attribute
-  {
-    public Type Type
-    {
-      get;
-      set;
-    }
-
-    public ItemsSourceAttribute( Type type )
-    {
-      var valueSourceInterface = type.GetInterface( typeof( IItemsSource ).FullName );
-      if( valueSourceInterface == null )
-        throw new ArgumentException( "Type must implement the IItemsSource interface.", "type" );
-
-      Type = type;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
deleted file mode 100644
index 0c1179d9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 217ef2dc..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  public enum UsageContextEnum
-  {
-    Alphabetical,
-    Categorized,
-    Both
-  }
-
-  [AttributeUsage( AttributeTargets.Property, AllowMultiple = true, Inherited = true )]
-  public class PropertyOrderAttribute : Attribute
-  {
-    #region Properties
-
-    public int Order
-    {
-      get;
-      set;
-    }
-
-    public UsageContextEnum UsageContext
-    {
-      get;
-      set;
-    }
-
-    public override object TypeId
-    {
-      get
-      {
-        return this;
-      }
-    }
-
-    #endregion
-
-    #region Initialization
-
-    public PropertyOrderAttribute( int order )
-      : this( order, UsageContextEnum.Both )
-    {
-    }
-
-    public PropertyOrderAttribute( int order, UsageContextEnum usageContext )
-    {
-      Order = order;
-      UsageContext = usageContext;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
deleted file mode 100644
index 7e553265..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class CategoryGroupStyleSelector : StyleSelector
-  {
-    public Style SingleDefaultCategoryItemGroupStyle
-    {
-      get;
-      set;
-    }
-    public Style ItemGroupStyle
-    {
-      get;
-      set;
-    }
-
-    public override Style SelectStyle( object item, DependencyObject container )
-    {
-      var group = item as CollectionViewGroup;
-      // Category is not "Misc" => use regular ItemGroupStyle
-      if( (group.Name != null) && !group.Name.Equals( CategoryAttribute.Default.Category ) )
-        return this.ItemGroupStyle;
-
-      // Category is "Misc"
-      while( container != null )
-      {
-        container = VisualTreeHelper.GetParent( container );
-        if( container is ItemsControl )
-          break;
-      }
-
-      var itemsControl = container as ItemsControl;
-      if( itemsControl != null )
-      {
-        // Category is "Misc" and this is the only category => use SingleDefaultCategoryItemGroupContainerStyle
-        if( (itemsControl.Items.Count > 0) && (itemsControl.Items.Groups.Count == 1) )
-          return this.SingleDefaultCategoryItemGroupStyle;
-      }
-
-      // Category is "Misc" and this is NOT the only category => use regular ItemGroupStyle
-      return this.ItemGroupStyle;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
deleted file mode 100644
index b7ecb93a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
-{
-  public class PropertyGridCommands
-  {
-    private static RoutedCommand _clearFilterCommand = new RoutedCommand();
-    public static RoutedCommand ClearFilter
-    {
-      get
-      {
-        return _clearFilterCommand;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
deleted file mode 100644
index c6ef6598..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
-{
-  public static class PropertyItemCommands
-  {
-    private static RoutedCommand _resetValueCommand = new RoutedCommand();
-    public static RoutedCommand ResetValue
-    {
-      get
-      {
-        return _resetValueCommand;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
deleted file mode 100644
index 7e656da3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index f0d191ad..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-    }
-
-    internal bool IsCleaning
-    {
-      get;
-      private set;
-    }
-
-    public virtual void ClearHelper()
-    {
-      this.IsCleaning = true;
-
-      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();
-      }
-      this.IsCleaning = false;
-    }
-
-    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 )
-    {
-      return ( PropertyContainer.EditorDefinitions != null )
-        ? this.CreateCustomEditor( PropertyContainer.EditorDefinitions.GetRecursiveBaseTypes( definitionKey ), propertyItem )
-        : null;
-    }
-
-    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.HideInheritedProperties ) )
-      {
-        this.OnHideInheritedPropertiesChanged();
-      }
-      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 OnHideInheritedPropertiesChanged() { }
-
-    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();
-
-    protected internal virtual void SetPropertiesExpansion( bool isExpanded )
-    {
-      foreach( var item in this.Properties )
-      {
-        var propertyItem = item as PropertyItemBase;
-        if( (propertyItem != null) && propertyItem.IsExpandable )
-        {
-          if( propertyItem.ContainerHelper != null )
-          {
-            propertyItem.ContainerHelper.SetPropertiesExpansion( isExpanded );
-          }
-          propertyItem.IsExpanded = isExpanded;
-        }
-      }
-    }
-
-    protected internal virtual void SetPropertiesExpansion( string propertyName, bool isExpanded )
-    {
-      foreach( var item in this.Properties )
-      {
-        var propertyItem = item as PropertyItemBase;
-        if( (propertyItem != null) && propertyItem.IsExpandable )
-        {
-          if( propertyItem.DisplayName == propertyName )
-          {
-            propertyItem.IsExpanded = isExpanded;
-            break;
-          }
-
-          if( propertyItem.ContainerHelper != null )
-          {
-            propertyItem.ContainerHelper.SetPropertiesExpansion( propertyName, isExpanded );
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
deleted file mode 100644
index 669e01d1..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index c2e68614..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Converters
-{
-  public class ExpandableObjectMarginConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      int childLevel = ( int )value;
-      return new Thickness( childLevel * 15, 0, 0, 0 );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
deleted file mode 100644
index 548c706f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class IsDefaultCategoryConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      string categoryName = value as string;
-      if( categoryName != null )
-      {
-        return ( categoryName == CategoryAttribute.Default.Category );
-      }
-
-      return false;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
deleted file mode 100644
index 7ed0af19..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class IsStringEmptyConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is string )
-      {
-        return string.IsNullOrEmpty( ( string )value );
-      }
-
-      return false;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
deleted file mode 100644
index ad71a2db..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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/ObjectToUIElementConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
deleted file mode 100644
index d74dafdf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class ObjectToUIElementConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is UIElement )
-        return value;
-
-      return new Control();
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
deleted file mode 100644
index e1c31a8f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class PropertyItemEditorConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( values == null ) || ( values.Length != 2 ) )
-        return null;
-
-      var editor = values[ 0 ];
-      var isReadOnly = values[ 1 ] as bool?;
-
-      if( ( editor == null ) || !isReadOnly.HasValue )
-        return editor;
-
-      // Get Editor.IsReadOnly
-      var editorType = editor.GetType();
-      var editorIsReadOnlyPropertyInfo = editorType.GetProperty( "IsReadOnly" );
-      if( editorIsReadOnlyPropertyInfo != null )
-      {
-        // Set Editor.IsReadOnly to PropertyGrid.IsReadOnly.
-        editorIsReadOnlyPropertyInfo.SetValue( editor, isReadOnly, null );
-      }
-      // No Editor.IsReadOnly property, set the Editor.IsEnabled property.
-      else
-      {
-        var editorIsEnabledPropertyInfo = editorType.GetProperty( "IsEnabled" );
-        if( editorIsEnabledPropertyInfo != null )
-        {
-          // Set Editor.IsEnabled to !PropertyGrid.IsReadOnly.
-          editorIsEnabledPropertyInfo.SetValue( editor, !isReadOnly, null );
-        }
-      }
-
-      return editor;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
deleted file mode 100644
index f13b1cbd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Windows;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class SelectedObjectConverter : IValueConverter
-  {
-    private const string ValidParameterMessage = @"parameter must be one of the following strings: 'Type', 'TypeName', 'SelectedObjectName'";
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( parameter == null )
-        throw new ArgumentNullException( "parameter" );
-
-      if( !( parameter is string ) )
-        throw new ArgumentException( SelectedObjectConverter.ValidParameterMessage );
-
-      if( this.CompareParam(parameter, "Type") )
-      {
-        return this.ConvertToType( value, culture );
-      }
-      else if( this.CompareParam( parameter, "TypeName" ) )
-      {
-        return this.ConvertToTypeName( value, culture );
-      }
-      else if( this.CompareParam( parameter, "SelectedObjectName" ) )
-      {
-        return this.ConvertToSelectedObjectName( value, culture );
-      }
-      else
-      {
-        throw new ArgumentException( SelectedObjectConverter.ValidParameterMessage );
-      }
-    }
-
-    private bool CompareParam(object parameter, string parameterValue )
-    {
-      return string.Compare( ( string )parameter, parameterValue, true ) == 0;
-    }
-
-    private object ConvertToType( object value, CultureInfo culture )
-    {
-      return ( value != null )
-        ? value.GetType()
-        : null;
-    }
-
-    private object ConvertToTypeName( object value, CultureInfo culture )
-    {
-      if( value == null )
-        return string.Empty;
-
-      Type newType = value.GetType();
-
-      //ICustomTypeProvider is only available in .net 4.5 and over. Use reflection so the .net 4.0 and .net 3.5 still works.
-      if( newType.GetInterface( "ICustomTypeProvider", true ) != null )
-      {
-        var methodInfo = newType.GetMethod( "GetCustomType" );
-        newType = methodInfo.Invoke( value, null ) as Type;
-      }
-
-      DisplayNameAttribute displayNameAttribute = newType.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
-
-      return (displayNameAttribute == null)
-        ? newType.Name 
-        : displayNameAttribute.DisplayName;
-    }
-
-    private object ConvertToSelectedObjectName( object value, CultureInfo culture )
-    {
-      if( value == null )
-        return String.Empty;
-
-      Type newType = value.GetType();
-      PropertyInfo[] properties = newType.GetProperties();
-      foreach( PropertyInfo property in properties )
-      {
-        if( property.Name == "Name" )
-          return property.GetValue( value, null );
-      }
-
-      return String.Empty;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
deleted file mode 100644
index 25da77bb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-  {
-    #region Constructors
-
-    internal CustomPropertyItem() { }
-
-    internal CustomPropertyItem( bool isPropertyGridCategorized, bool isSortedAlphabetically )
-    {
-      _isPropertyGridCategorized = isPropertyGridCategorized;
-      _isSortedAlphabetically = isSortedAlphabetically;
-    }
-
-
-    #endregion
-
-    #region Properties
-
-    #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 CategoryOrder
-
-    public int CategoryOrder
-    {
-      get
-      {
-        return _categoryOrder;
-      }
-      set
-      {
-        if( _categoryOrder != value )
-        {
-          _categoryOrder = value;
-          // Notify the parent helper since this property may affect ordering.
-          this.RaisePropertyChanged( () => this.CategoryOrder );
-        }
-      }
-    }
-
-    private int _categoryOrder;
-
-    #endregion //CategoryOrder
-
-
-
-
-
-    #region PropertyOrder
-
-    public static readonly DependencyProperty PropertyOrderProperty =
-        DependencyProperty.Register( "PropertyOrder", typeof( int ), typeof( CustomPropertyItem ), new UIPropertyMetadata( 0 ) );
-
-    public int PropertyOrder
-    {
-      get
-      {
-        return ( int )GetValue( PropertyOrderProperty );
-      }
-      set
-      {
-        SetValue( PropertyOrderProperty, value );
-      }
-    }
-
-    #endregion //PropertyOrder
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    protected override Type GetPropertyItemType()
-    {
-      return this.Value.GetType();
-    }
-
-    protected override void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
-    {
-      if( oldValue != null )
-      {
-        oldValue.DataContext = null;
-      }
-
-      //case 166547 : Do not overwrite a custom Editor's DataContext set by the user.
-      if( ( newValue != null ) && ( newValue.DataContext == null ) )
-      {
-        newValue.DataContext = this;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
deleted file mode 100644
index 009dd649..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public abstract class DefinitionBase : DependencyObject
-  {
-    private bool _isLocked;
-
-    internal bool IsLocked
-    {
-      get { return _isLocked; }
-    }
-
-    internal void ThrowIfLocked<TMember>( Expression<Func<TMember>> propertyExpression )
-    {
-      //In XAML, when using any properties of PropertyDefinition, the error of ThrowIfLocked is always thrown => prevent it !
-      if( DesignerProperties.GetIsInDesignMode( this ) )
-        return;
-
-      if( this.IsLocked )
-      {
-        string propertyName = ReflectionHelper.GetPropertyOrFieldName( propertyExpression );
-        string message = string.Format(
-            @"Cannot modify {0} once the definition has beed added to a collection.",
-            propertyName );
-        throw new InvalidOperationException( message );
-      }
-    }
-
-    internal virtual void Lock()
-    {
-      if( !_isLocked )
-      {
-        _isLocked = true;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
deleted file mode 100644
index b1490e1e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 );
-      object elementValue = element.GetValue( elementProp );
-      bool areEquals = false;
-
-      // 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 )
-      {
-        if( ( elementValue != null ) && ( currentValue != null ) )
-        {
-          areEquals = ( elementValue.GetType().IsValueType && currentValue.GetType().IsValueType )
-                      ? elementValue.Equals( currentValue )  // Value Types
-                      : currentValue == element.GetValue( elementProp ); // Reference Types
-        }
-
-        if( !areEquals )
-        {
-          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
deleted file mode 100644
index 3449f5bf..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 81d370be..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public abstract class PropertyDefinitionBase : DefinitionBase
-  {
-    #region Constructors
-
-    internal PropertyDefinitionBase()
-    {
-      _targetProperties = new List<object>();
-      this.PropertyDefinitions = new PropertyDefinitionCollection();
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region TargetProperties
-
-    [TypeConverter(typeof(ListConverter))]
-    public IList TargetProperties 
-    {
-      get { return _targetProperties; }
-      set 
-      {
-        this.ThrowIfLocked( () => this.TargetProperties );
-        _targetProperties = value; 
-      }
-    }
-
-    private IList _targetProperties;
-
-    #endregion
-
-    #region PropertyDefinitions
-
-    public PropertyDefinitionCollection PropertyDefinitions
-    {
-      get
-      {
-        return _propertyDefinitions;
-      }
-      set
-      {
-        this.ThrowIfLocked( () => this.PropertyDefinitions );
-        _propertyDefinitions = value;
-      }
-    }
-
-    private PropertyDefinitionCollection _propertyDefinitions;
-
-    #endregion //PropertyDefinitions
-
-    #endregion
-
-    #region Overrides
-
-    internal override void Lock()
-    {
-      if( this.IsLocked )
-        return;
-
-      base.Lock();
-
-      // 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 );
-        }
-      }
-
-      //In Designer Mode, the Designer is broken if using a ReadOnlyCollection
-      _targetProperties = DesignerProperties.GetIsInDesignMode( this )
-                          ? new Collection<object>( newList )
-                          : new ReadOnlyCollection<object>( newList ) as IList;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
deleted file mode 100644
index 0550f466..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Markup.Primitives;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Reflection;
-using System.Globalization;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal class DescriptorPropertyDefinition : DescriptorPropertyDefinitionBase
-  {
-    #region Members
-
-    private object _selectedObject;
-    private PropertyDescriptor _propertyDescriptor;
-    private DependencyPropertyDescriptor _dpDescriptor;
-    private MarkupObject _markupObject;
-
-    #endregion
-
-    #region Constructor
-
-    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject, IPropertyContainer propertyContainer )
-       : base( propertyContainer.IsCategorized
-             )
-    {
-      this.Init( propertyDescriptor, selectedObject );
-    }
-
-    #endregion
-
-    #region Custom Properties
-
-    internal override PropertyDescriptor PropertyDescriptor
-    {
-      get
-      {
-        return _propertyDescriptor;
-      }
-    }
-
-    private object SelectedObject
-    {
-      get
-      {
-        return _selectedObject;
-      }
-    }
-
-    #endregion
-
-    #region Override Methods
-
-    internal override ObjectContainerHelperBase CreateContainerHelper( IPropertyContainer parent )
-    {
-      return new ObjectContainerHelper( parent, this.Value );
-    }
-
-    internal override void OnValueChanged( object oldValue, object newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-      this.RaiseContainerHelperInvalidated();
-    }
-
-    protected override BindingBase CreateValueBinding()
-    {
-      var selectedObject = this.SelectedObject;
-      var propertyName = this.PropertyDescriptor.Name;
-
-      //Bind the value property with the source object.
-      var binding = new Binding( propertyName )
-      {
-        Source = this.GetValueInstance( selectedObject ),
-        Mode = PropertyDescriptor.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay,
-        ValidatesOnDataErrors = true,
-        ValidatesOnExceptions = true,
-        ConverterCulture = CultureInfo.CurrentCulture 
-      };
-
-      return binding;
-    }
-
-    protected override bool ComputeIsReadOnly()
-    {
-      return PropertyDescriptor.IsReadOnly;
-    }
-
-    internal override ITypeEditor CreateDefaultEditor( PropertyItem propertyItem )
-    {
-      return PropertyGridUtilities.CreateDefaultEditor( PropertyDescriptor.PropertyType, PropertyDescriptor.Converter, propertyItem );
-    }
-
-    protected override bool ComputeCanResetValue()
-    {
-      if( !PropertyDescriptor.IsReadOnly )
-      {
-        var defaultValue = this.ComputeDefaultValueAttribute();
-        if( defaultValue != null)
-          return !defaultValue.Equals( this.Value ); // can Reset if different from defaultValue.
-
-        return PropertyDescriptor.CanResetValue( SelectedObject );
-      }
-
-      return false;
-    }
-
-    protected override object ComputeAdvancedOptionsTooltip()
-    {
-      object tooltip;
-      UpdateAdvanceOptionsForItem( _markupObject, SelectedObject as DependencyObject, _dpDescriptor, out tooltip );
-
-      return tooltip;
-    }
-
-    protected override string ComputeCategory()
-    {
-#if VS2008
-        return PropertyDescriptor.Category;
-#else
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      return ( (displayAttribute != null) && (displayAttribute.GetGroupName() != null) ) ? displayAttribute.GetGroupName() : PropertyDescriptor.Category;
-#endif
-    }
-
-    protected override string ComputeCategoryValue()
-    {
-      return PropertyDescriptor.Category;
-    }
-
-    protected override bool ComputeExpandableAttribute()
-    {
-      return ( bool )this.ComputeExpandableAttributeForItem( PropertyDescriptor );
-    }
-
-    protected override object ComputeDefaultValueAttribute()
-    {
-      return this.ComputeDefaultValueAttributeForItem( PropertyDescriptor );
-    }
-
-    protected override bool ComputeIsExpandable()
-    {
-      return ( this.Value != null )
-        ;
-    }
-
-    protected override IList<Type> ComputeNewItemTypes()
-    {
-      return ( IList<Type> )ComputeNewItemTypesForItem( PropertyDescriptor );
-    }
-    protected override string ComputeDescription()
-    {
-      return ( string )ComputeDescriptionForItem( PropertyDescriptor );
-    }
-
-    protected override int ComputeDisplayOrder( bool isPropertyGridCategorized )
-    {
-      this.IsPropertyGridCategorized = isPropertyGridCategorized;
-      return ( int )ComputeDisplayOrderForItem( PropertyDescriptor );
-    }
-
-    protected override void ResetValue()
-    {
-      this.PropertyDescriptor.ResetValue( this.SelectedObject );
-      base.ResetValue();
-    }
-
-    internal override ITypeEditor CreateAttributeEditor()
-    {
-      var editorAttribute = GetAttribute<EditorAttribute>();
-      if( editorAttribute != null )
-      {
-        Type type = null;
-#if VS2008
-        type = Type.GetType( editorAttribute.EditorTypeName );
-#else
-        try
-        {
-          type = Type.GetType( editorAttribute.EditorTypeName, ( name ) =>
-          {
-            return AppDomain.CurrentDomain.GetAssemblies().Where( l => l.FullName == name.FullName ).FirstOrDefault();
-          }
-          , null, true );
-        }
-        catch( Exception )
-        {
-          type = Type.GetType( editorAttribute.EditorTypeName );
-        }       
-#endif
-
-        // 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>();
-      if( itemsSourceAttribute != null )
-        return new ItemsSourceAttributeEditor( itemsSourceAttribute );
-
-      return null;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private T GetAttribute<T>() where T : Attribute
-    {
-      return PropertyGridUtilities.GetAttribute<T>( PropertyDescriptor );
-    }
-
-    private void Init( 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( SelectedObject );
-    }
-
-    #endregion //Private Methods
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
deleted file mode 100644
index de0d2030..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ /dev/null
@@ -1,703 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Diagnostics;
-using System.ComponentModel;
-using System.Windows.Markup.Primitives;
-using System.Windows.Data;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal abstract class DescriptorPropertyDefinitionBase : DependencyObject
-  {
-    #region Members
-
-    private string _category;
-    private string _categoryValue;
-    private string _description;
-    private string _displayName;
-    private object _defaultValue;
-    private int _displayOrder;
-    private bool _expandableAttribute;
-    private bool _isReadOnly;
-    private IList<Type> _newItemTypes;
-    private IEnumerable<CommandBinding> _commandBindings;
-
-    #endregion
-
-    internal abstract PropertyDescriptor PropertyDescriptor
-    {
-      get;
-    }
-
-    #region Initialization
-
-
-    internal DescriptorPropertyDefinitionBase( bool isPropertyGridCategorized
-                                             )
-    {
-      this.IsPropertyGridCategorized = isPropertyGridCategorized;
-    }
-
-    #endregion
-
-    #region Virtual Methods
-
-    protected virtual string ComputeCategory()
-    {
-      return null;
-    }
-
-    protected virtual string ComputeCategoryValue()
-    {
-      return null;
-    }
-
-    protected virtual string ComputeDescription()
-    {
-      return null;
-    }
-
-
-
-    protected virtual int ComputeDisplayOrder( bool isPropertyGridCategorized )
-    {
-      return int.MaxValue;
-    }
-
-    protected virtual bool ComputeExpandableAttribute()
-    {
-      return false;
-    }
-
-    protected virtual object ComputeDefaultValueAttribute()
-    {
-      return null;
-    }
-
-    protected abstract bool ComputeIsExpandable();
-
-    protected virtual IList<Type> ComputeNewItemTypes()
-    {
-      return null;
-    }
-
-    protected virtual bool ComputeIsReadOnly()
-    {
-      return false;
-    }
-
-    protected virtual bool ComputeCanResetValue()
-    {
-      return false;
-    }
-
-    protected virtual object ComputeAdvancedOptionsTooltip()
-    {
-      return null;
-    }
-
-    protected virtual void ResetValue()
-    {
-      var binding = BindingOperations.GetBindingExpressionBase( this, DescriptorPropertyDefinition.ValueProperty );
-      if( binding != null )
-      {
-        binding.UpdateTarget();
-      }
-    }
-
-    protected abstract BindingBase CreateValueBinding();
-
-    #endregion
-
-    #region Internal Methods
-
-    internal abstract ObjectContainerHelperBase CreateContainerHelper( IPropertyContainer parent );
-
-    internal void RaiseContainerHelperInvalidated()
-    {
-      if( this.ContainerHelperInvalidated != null )
-      {
-        this.ContainerHelperInvalidated( this, EventArgs.Empty );
-      }
-    }
-
-    internal virtual ITypeEditor CreateDefaultEditor( PropertyItem propertyItem )
-    {
-      return null;
-    }
-
-    internal virtual ITypeEditor CreateAttributeEditor()
-    {
-      return null;
-    }
-
-    internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, DependencyObject dependencyObject, DependencyPropertyDescriptor dpDescriptor,
-                                                out object tooltip )
-    {
-      tooltip = StringConstants.Default;
-
-      bool isResource = false;
-      bool isDynamicResource = false;
-
-      var markupProperty = markupObject.Properties.FirstOrDefault( p => p.Name == PropertyName );
-      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(maybe with StaticResourceExtension)
-        isResource = typeof( Style ).IsAssignableFrom( markupProperty.PropertyType );
-        isDynamicResource = typeof( DynamicResourceExtension ).IsAssignableFrom( markupProperty.PropertyType );
-      }
-
-      if( isResource || isDynamicResource )
-      {
-        tooltip = StringConstants.Resource;
-      }
-      else
-      {
-        if( ( dependencyObject != null ) && ( dpDescriptor != null ) )
-        {
-          if( BindingOperations.GetBindingExpressionBase( dependencyObject, dpDescriptor.DependencyProperty ) != null )
-          {
-            tooltip = StringConstants.Databinding;
-          }
-          else
-          {
-            BaseValueSource bvs =
-              DependencyPropertyHelper
-              .GetValueSource( dependencyObject, dpDescriptor.DependencyProperty )
-              .BaseValueSource;
-
-            switch( bvs )
-            {
-              case BaseValueSource.Inherited:
-              case BaseValueSource.DefaultStyle:
-              case BaseValueSource.ImplicitStyleReference:
-                tooltip = StringConstants.Inheritance;
-                break;
-              case BaseValueSource.DefaultStyleTrigger:
-                break;
-              case BaseValueSource.Style:
-                tooltip = StringConstants.StyleSetter;
-                break;
-
-              case BaseValueSource.Local:
-                tooltip = StringConstants.Local;
-                break;
-            }
-          }
-        }
-        else
-        {
-          // When the Value is diferent from the DefaultValue, use the local icon.
-          if( markupProperty != null && !markupProperty.Value.Equals( this.DefaultValue ) )
-          {
-            if( this.DefaultValue != null )
-            {
-              if( !markupProperty.Value.Equals( this.DefaultValue ) )
-              {
-                tooltip = StringConstants.Local;
-              }
-            }
-            else
-            {
-              if( markupProperty.PropertyType.IsValueType )
-              {
-                var defaultValue = Activator.CreateInstance( markupProperty.PropertyType );
-                // When the Value is diferent from the DefaultValue, use the local icon.
-                if( !markupProperty.Value.Equals( defaultValue ) )
-                {
-                  tooltip = StringConstants.Local;
-                }
-              }
-              else
-              {
-                // When the Value is diferent from the DefaultValue, use the local icon.
-                if( !(markupProperty.Value is System.Windows.Markup.NullExtension) )
-                {
-                  tooltip = StringConstants.Local;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    internal void UpdateAdvanceOptions()
-    {
-      // Only set the Tooltip. The Icon will be added in XAML based on the Tooltip.
-      this.AdvancedOptionsTooltip = this.ComputeAdvancedOptionsTooltip();
-    }
-
-    internal void UpdateIsExpandable()
-    {
-      this.IsExpandable = this.ComputeIsExpandable() 
-                          && ( this.ExpandableAttribute
-                             );
-    }
-
-    internal void UpdateValueFromSource()
-    {
-      var bindingExpr = BindingOperations.GetBindingExpressionBase( this, DescriptorPropertyDefinitionBase.ValueProperty );
-      if( bindingExpr != null )
-      {
-        bindingExpr.UpdateTarget();
-      }
-    }
-
-
-
-
-
-    internal object ComputeDescriptionForItem( object item )
-    {
-      PropertyDescriptor pd = item as PropertyDescriptor;
-
-      //We do not simply rely on the "Description" property of PropertyDescriptor
-      //since this value is cached by PropertyDescriptor and the localized version 
-      //(e.g., LocalizedDescriptionAttribute) value can dynamicaly change.
-#if !VS2008
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( pd );
-      if( displayAttribute != null )
-      {
-        return displayAttribute.GetDescription();
-      }
-#endif
-
-      var descriptionAtt = PropertyGridUtilities.GetAttribute<DescriptionAttribute>( pd );
-      return (descriptionAtt != null)
-              ? descriptionAtt.Description
-              : 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;
-#if !VS2008
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      if( displayAttribute != null )
-      {
-        var order = displayAttribute.GetOrder();
-        if( order.HasValue )
-          return displayAttribute.GetOrder();
-      }
-#endif
-
-      List<PropertyOrderAttribute> list = pd.Attributes.OfType<PropertyOrderAttribute>().ToList();
-
-      if( list.Count > 0 )
-      {
-        this.ValidatePropertyOrderAttributes( list );
-
-        if( this.IsPropertyGridCategorized )
-        {
-          var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Categorized)
-                                                    || (x.UsageContext == UsageContextEnum.Both)) );
-          if( attribute != null )
-            return attribute.Order;
-        }
-        else
-        {
-          var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Alphabetical)
-                                                    || (x.UsageContext == UsageContextEnum.Both)) );
-          if( attribute != null )
-            return attribute.Order;
-        }
-      }
-
-      // Max Value. Properties with no order will be displayed last.
-      return int.MaxValue;
-    }
-
-    internal object ComputeExpandableAttributeForItem( object item )
-    {
-      var pd = (PropertyDescriptor)item;
-
-      var attribute = PropertyGridUtilities.GetAttribute<ExpandableObjectAttribute>( pd );
-      return (attribute != null);
-    }
-
-    internal int ComputeDisplayOrderInternal( bool isPropertyGridCategorized )
-    {
-      return this.ComputeDisplayOrder( isPropertyGridCategorized );
-    }
-
-    internal object GetValueInstance( object sourceObject )
-    {
-      ICustomTypeDescriptor customTypeDescriptor = sourceObject as ICustomTypeDescriptor;
-      if( customTypeDescriptor != null )
-        sourceObject = customTypeDescriptor.GetPropertyOwner( PropertyDescriptor );
-
-      return sourceObject;
-    }
-
-    internal object ComputeDefaultValueAttributeForItem( object item )
-    {
-      var pd = ( PropertyDescriptor )item;
-
-      var defaultValue = PropertyGridUtilities.GetAttribute<DefaultValueAttribute>( pd );
-      return ( defaultValue != null ) ? defaultValue.Value : null;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private static void ExecuteResetValueCommand( object sender, ExecutedRoutedEventArgs e )
-    {
-      var affectedPropertyItem = e.Parameter as PropertyItem;
-      if( affectedPropertyItem == null )
-      {
-        affectedPropertyItem = sender as PropertyItem;
-      }
-
-      if( ( affectedPropertyItem != null ) && ( affectedPropertyItem.DescriptorDefinition != null ) )
-      {
-        if( affectedPropertyItem.DescriptorDefinition.ComputeCanResetValue() )
-        {
-          affectedPropertyItem.DescriptorDefinition.ResetValue();
-        }
-      }
-    }
-
-    private static void CanExecuteResetValueCommand( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var affectedPropertyItem = e.Parameter as PropertyItem;
-      if( affectedPropertyItem == null )
-      {
-        affectedPropertyItem = sender as PropertyItem;
-      }
-
-      e.CanExecute = ( (affectedPropertyItem != null) && ( affectedPropertyItem.DescriptorDefinition != null) ) 
-                      ? affectedPropertyItem.DescriptorDefinition.ComputeCanResetValue()
-                      : false;
-    }
-
-    private string ComputeDisplayName()
-    {
-#if VS2008
-        var displayName = PropertyDescriptor.DisplayName;
-#else
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      var displayName = (displayAttribute != null) ? displayAttribute.GetName() : PropertyDescriptor.DisplayName;
-#endif
-
-      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( PropertyDescriptor );
-      if( (attribute != null) && attribute.NeedParenthesis )
-      {
-        displayName = "(" + displayName + ")";
-      }
-
-      return displayName;
-    }
-
-    private void ValidatePropertyOrderAttributes( List<PropertyOrderAttribute> list )
-    {
-      if( list.Count > 0 )
-      {
-        PropertyOrderAttribute both = list.FirstOrDefault( x => x.UsageContext == UsageContextEnum.Both );
-        if( (both != null) && (list.Count > 1) )
-          Debug.Assert( false, "A PropertyItem can't have more than 1 PropertyOrderAttribute when it has UsageContext : Both" );
-      }
-    }
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler ContainerHelperInvalidated;
-
-    #endregion
-
-    #region AdvancedOptionsIcon (DP)
-
-    public static readonly DependencyProperty AdvancedOptionsIconProperty =
-        DependencyProperty.Register( "AdvancedOptionsIcon", typeof( ImageSource ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null ) );
-
-    public ImageSource AdvancedOptionsIcon
-    {
-      get
-      {
-        return (ImageSource)GetValue( AdvancedOptionsIconProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsIconProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AdvancedOptionsTooltip (DP)
-
-    public static readonly DependencyProperty AdvancedOptionsTooltipProperty =
-        DependencyProperty.Register( "AdvancedOptionsTooltip", typeof( object ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null ) );
-
-    public object AdvancedOptionsTooltip
-    {
-      get
-      {
-        return (object)GetValue( AdvancedOptionsTooltipProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsTooltipProperty, value );
-      }
-    }
-
-    #endregion //AdvancedOptionsTooltip
-
-    #region IsExpandable (DP)
-
-    public static readonly DependencyProperty IsExpandableProperty =
-        DependencyProperty.Register( "IsExpandable", typeof( bool ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( false ) );
-
-    public bool IsExpandable
-    {
-      get
-      {
-        return (bool)GetValue( IsExpandableProperty );
-      }
-      set
-      {
-        SetValue( IsExpandableProperty, value );
-      }
-    }
-
-    #endregion //IsExpandable
-
-    public string Category
-    {
-      get
-      {
-        return _category;
-      }
-      internal set
-      {
-        _category = value;
-      }
-    }
-
-    public string CategoryValue
-    {
-      get
-      {
-        return _categoryValue;
-      }
-      internal set
-      {
-        _categoryValue = value;
-      }
-    }
-
-    public IEnumerable<CommandBinding> CommandBindings
-    {
-      get
-      {
-        return _commandBindings;
-      }
-    }
-
-    public string DisplayName
-    {
-      get
-      {
-        return _displayName;
-      }
-      internal set
-      {
-        _displayName = value;
-      }
-    }
-
-    public object DefaultValue
-    {
-      get
-      {
-        return _defaultValue;
-      }
-      set
-      {
-        _defaultValue = value;
-      }
-    }
-
-
-
-    public string Description
-    {
-      get
-      {
-        return _description;
-      }
-      internal set
-      {
-        _description = value;
-      }
-    }
-
-    public int DisplayOrder
-    {
-      get
-      {
-        return _displayOrder;
-      }
-      internal set
-      {
-        _displayOrder = value;
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        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;
-      }
-    }
-
-    internal bool ExpandableAttribute
-    {
-      get
-      {
-        return _expandableAttribute;
-      }
-      set
-      {
-        _expandableAttribute = value;
-        this.UpdateIsExpandable();
-      }
-    }
-
-
-    internal bool IsPropertyGridCategorized
-    {
-      get;
-      set;
-    }
-
-
-
-    #region Value Property (DP)
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null, OnValueChanged ) );
-    public object Value
-    {
-      get
-      {
-        return GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ((DescriptorPropertyDefinitionBase)o).OnValueChanged( e.OldValue, e.NewValue );
-    }
-
-    internal virtual void OnValueChanged( object oldValue, object newValue )
-    {
-      UpdateIsExpandable();
-      UpdateAdvanceOptions();
-
-      // Reset command also affected.
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    #endregion //Value Property
-
-    public virtual void InitProperties()
-    {
-      // Do "IsReadOnly" and PropertyName first since the others may need that value.
-      _isReadOnly = ComputeIsReadOnly();
-      _category = ComputeCategory();
-      _categoryValue = ComputeCategoryValue();
-      _description = ComputeDescription();
-      _displayName = ComputeDisplayName();
-      _defaultValue = ComputeDefaultValueAttribute();
-      _displayOrder = ComputeDisplayOrder( this.IsPropertyGridCategorized );
-      _expandableAttribute = ComputeExpandableAttribute();
-
-
-      _newItemTypes = ComputeNewItemTypes();
-      _commandBindings = new CommandBinding[] { new CommandBinding( PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand ) };
-
-      UpdateIsExpandable();
-      UpdateAdvanceOptions();
-
-      BindingBase valueBinding = this.CreateValueBinding();
-      BindingOperations.SetBinding( this, DescriptorPropertyDefinitionBase.ValueProperty, valueBinding );
-    }
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
deleted file mode 100644
index 862a309e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Generic;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [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
-      {
-        return _properties;
-      }
-      set
-      {
-        _properties = value;
-      }
-    }
-
-    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/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
deleted file mode 100644
index 118102c8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class CheckBoxEditor : TypeEditor<CheckBox>
-  {
-    protected override CheckBox CreateEditor()
-    {
-      return new PropertyGridEditorCheckBox();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.Margin = new Thickness( 5, 0, 0, 0 );
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = CheckBox.IsCheckedProperty;
-    }
-  }
-
-  public class PropertyGridEditorCheckBox : CheckBox
-  {
-    static PropertyGridEditorCheckBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorCheckBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorCheckBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
deleted file mode 100644
index c95e3814..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class CollectionEditor : TypeEditor<CollectionControlButton>
-  {
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = CollectionControlButton.ItemsSourceProperty;
-    }
-
-    protected override CollectionControlButton CreateEditor()
-    {
-      return new PropertyGridEditorCollectionControl();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-
-      var propertyGrid = propertyItem.ParentElement as PropertyGrid;
-      if( propertyGrid != null )
-      {
-        // Use the PropertyGrid.EditorDefinitions for the CollectionControl's propertyGrid.
-        this.Editor.EditorDefinitions = propertyGrid.EditorDefinitions;
-      }
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var type = propertyItem.PropertyType;
-
-      Editor.ItemsSourceType = type;
-
-      if( type.BaseType == typeof( System.Array ) )
-      {
-        Editor.NewItemTypes = new List<Type>() { type.GetElementType() };
-      }
-      else 
-      {
-        if( (propertyItem.DescriptorDefinition != null)
-            && (propertyItem.DescriptorDefinition.NewItemTypes != null)
-            && (propertyItem.DescriptorDefinition.NewItemTypes.Count > 0) )
-        {
-          Editor.NewItemTypes = propertyItem.DescriptorDefinition.NewItemTypes;
-        }
-        else
-        {
-          //Check if we have a Dictionary
-          var dictionaryTypes = ListUtilities.GetDictionaryItemsType( type );
-          if( (dictionaryTypes != null) && (dictionaryTypes.Length == 2) )
-          {
-            // A Dictionary contains KeyValuePair that can't be edited.
-            // We need to create EditableKeyValuePairs.
-            // Create a EditableKeyValuePair< TKey, TValue> type from dictionary generic arguments type
-            var editableKeyValuePairType = ListUtilities.CreateEditableKeyValuePairType( dictionaryTypes[ 0 ], dictionaryTypes[ 1 ] );
-            Editor.NewItemTypes = new List<Type>() { editableKeyValuePairType };
-          }
-          else
-          {
-            //Check if we have a list
-            var listType = ListUtilities.GetListItemType( type );
-            if( listType != null  )
-            {
-              Editor.NewItemTypes = new List<Type>() { listType };
-            }
-            else
-            {
-              //Check if we have a Collection of T
-              var colType = ListUtilities.GetCollectionItemType( type );
-              if( colType != null )
-              {
-                Editor.NewItemTypes = new List<Type>() { colType };
-              }
-            }
-          }
-        }
-      }
-
-      base.ResolveValueBinding( propertyItem );
-    }
-
-  }
-
-  public class PropertyGridEditorCollectionControl : CollectionControlButton
-  {
-    static PropertyGridEditorCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorCollectionControl ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorCollectionControl ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
deleted file mode 100644
index 4bc580c8..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class ColorEditor : TypeEditor<ColorPicker>
-  {
-    protected override ColorPicker CreateEditor()
-    {
-      return new PropertyGridEditorColorPicker();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      Editor.DisplayColorAndName = true;
-    }
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = ColorPicker.SelectedColorProperty;
-    }
-  }
-
-  public class PropertyGridEditorColorPicker : ColorPicker
-  {
-    static PropertyGridEditorColorPicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorColorPicker ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorColorPicker ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
deleted file mode 100644
index 668bd103..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public abstract class ComboBoxEditor : TypeEditor<System.Windows.Controls.ComboBox>
-  {
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
-    }
-
-    protected override System.Windows.Controls.ComboBox CreateEditor()
-    {
-      return new PropertyGridEditorComboBox();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      SetItemsSource( propertyItem );
-      base.ResolveValueBinding( propertyItem );
-    }
-
-    protected abstract IEnumerable CreateItemsSource( PropertyItem propertyItem );
-
-    private void SetItemsSource( PropertyItem propertyItem )
-    {
-      Editor.ItemsSource = CreateItemsSource( propertyItem );
-    }
-  }
-
-  public class PropertyGridEditorComboBox : System.Windows.Controls.ComboBox
-  {
-    static PropertyGridEditorComboBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorComboBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorComboBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
deleted file mode 100644
index a607d481..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Reflection;
-using System.Collections;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class EnumComboBoxEditor : ComboBoxEditor
-  {
-    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      return GetValues( propertyItem.PropertyType );
-    }
-
-    private static object[] GetValues( Type enumType )
-    {
-      List<object> values = new List<object>();
-
-      if( enumType != null )
-      {
-        var fields = enumType.GetFields().Where( x => x.IsLiteral );
-        foreach( FieldInfo field in fields )
-        {
-          // Get array of BrowsableAttribute attributes
-          object[] attrs = field.GetCustomAttributes( typeof( BrowsableAttribute ), false );
-          if( attrs.Length == 1 )
-          {
-            // If attribute exists and its value is false continue to the next field...
-            BrowsableAttribute brAttr = ( BrowsableAttribute )attrs[ 0 ];
-            if( brAttr.Browsable == false )
-              continue;
-          }
-
-          values.Add( field.GetValue( enumType ) );
-        }
-      }
-
-      return values.ToArray();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
deleted file mode 100644
index be62f2c6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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 IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      if( propertyItem.PropertyType == typeof( FontFamily ) )
-        return FontUtilities.Families.OrderBy( x => x.Source);
-      else if( propertyItem.PropertyType == typeof( FontWeight ) )
-        return FontUtilities.Weights;
-      else if( propertyItem.PropertyType == typeof( FontStyle ) )
-        return FontUtilities.Styles;
-      else if( propertyItem.PropertyType == typeof( FontStretch ) )
-        return FontUtilities.Stretches;
-
-      return null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
deleted file mode 100644
index bfeae6ab..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public interface ITypeEditor
-  {
-    FrameworkElement ResolveEditor( PropertyItem propertyItem );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
deleted file mode 100644
index 1b04f93e..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class ItemsSourceAttributeEditor : TypeEditor<System.Windows.Controls.ComboBox>
-  {
-    private readonly ItemsSourceAttribute _attribute;
-
-    public ItemsSourceAttributeEditor( ItemsSourceAttribute attribute )
-    {
-      _attribute = attribute;
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = System.Windows.Controls.ComboBox.SelectedValueProperty;
-    }
-
-    protected override System.Windows.Controls.ComboBox CreateEditor()
-    {
-      return new PropertyGridEditorComboBox();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      SetItemsSource();
-      base.ResolveValueBinding( propertyItem );
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.DisplayMemberPath = "DisplayName";
-      Editor.SelectedValuePath = "Value";
-      if( propertyItem != null )
-      {
-        Editor.IsEnabled = !propertyItem.IsReadOnly;
-      }
-    }
-
-    private void SetItemsSource()
-    {
-      Editor.ItemsSource = CreateItemsSource();
-    }
-
-    private System.Collections.IEnumerable CreateItemsSource()
-    {
-      var instance = Activator.CreateInstance( _attribute.Type );
-      return ( instance as IItemsSource ).GetValues();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
deleted file mode 100644
index 374858f2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class MaskedTextBoxEditor : TypeEditor<MaskedTextBox>
-  {
-    public string Mask
-    {
-      get;
-      set;
-    }
-
-    public Type ValueDataType
-    {
-      get;
-      set;
-    }
-
-    protected override MaskedTextBox CreateEditor()
-    {
-      return new PropertyGridEditorMaskedTextBox();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      this.Editor.ValueDataType = this.ValueDataType;
-      this.Editor.Mask = this.Mask;
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      this.ValueProperty = MaskedTextBox.ValueProperty;
-    }
-  }
-
-  public class PropertyGridEditorMaskedTextBox : MaskedTextBox
-  {
-    static PropertyGridEditorMaskedTextBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorMaskedTextBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorMaskedTextBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
deleted file mode 100644
index bd1097df..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class PrimitiveTypeCollectionEditor : TypeEditor<PrimitiveTypeCollectionControl>
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      Editor.Content = "(Collection)";
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = PrimitiveTypeCollectionControl.ItemsSourceProperty;
-    }
-
-    protected override PrimitiveTypeCollectionControl CreateEditor()
-    {
-      return new PropertyGridEditorPrimitiveTypeCollectionControl();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var type = propertyItem.PropertyType;
-      Editor.ItemsSourceType = type;
-
-      if( type.BaseType == typeof( System.Array ) )
-      {
-        Editor.ItemType = type.GetElementType();
-      }
-      else
-      {
-        var typeArguments = type.GetGenericArguments();
-        if( typeArguments.Length > 0 )
-        {
-          Editor.ItemType = typeArguments[ 0 ];
-        }
-      }
-
-      base.ResolveValueBinding( propertyItem );
-    }
-  }
-
-  public class PropertyGridEditorPrimitiveTypeCollectionControl : PrimitiveTypeCollectionControl
-  {
-    static PropertyGridEditorPrimitiveTypeCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorPrimitiveTypeCollectionControl ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorPrimitiveTypeCollectionControl ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
deleted file mode 100644
index b227bf42..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class SourceComboBoxEditor : ComboBoxEditor
-  {
-    ICollection _collection;
-    TypeConverter _typeConverter;
-
-    public SourceComboBoxEditor( ICollection collection, TypeConverter typeConverter )
-    {
-      _collection = collection;
-      _typeConverter = typeConverter;
-    }
-
-    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      return _collection;
-    }
-
-    protected override IValueConverter CreateValueConverter()
-    {
-      //When using a stringConverter, we need to convert the value
-      if( (_typeConverter != null) && (_typeConverter is StringConverter) )
-        return new SourceComboBoxEditorConverter( _typeConverter );
-      return null;
-    }
-  }
-
-  internal class SourceComboBoxEditorConverter : IValueConverter
-  {
-    private TypeConverter _typeConverter;
-
-    internal SourceComboBoxEditorConverter( TypeConverter typeConverter )
-    {
-      _typeConverter = typeConverter;
-    }
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( _typeConverter != null )
-      {
-        if( _typeConverter.CanConvertTo( typeof(string) ) )
-          return _typeConverter.ConvertTo( value, typeof(string) );
-      }
-      return value;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( _typeConverter != null )
-      {
-        if( _typeConverter.CanConvertFrom( value.GetType() ) )
-          return _typeConverter.ConvertFrom( value );
-      }
-      return value;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
deleted file mode 100644
index 78fad1d7..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class TextBlockEditor : TypeEditor<TextBlock>
-  {
-    protected override TextBlock CreateEditor()
-    {
-      return new PropertyGridEditorTextBlock();
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = TextBlock.TextProperty;
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 );
-      Editor.TextTrimming = TextTrimming.CharacterEllipsis;
-    }
-  }
-
-  public class PropertyGridEditorTextBlock : TextBlock
-  {
-    static PropertyGridEditorTextBlock()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTextBlock ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTextBlock ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
deleted file mode 100644
index 80db8588..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class TextBoxEditor : TypeEditor<WatermarkTextBox>
-  {
-    protected override WatermarkTextBox CreateEditor()
-    {
-      return new PropertyGridEditorTextBox();
-    }
-
-#if !VS2008
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( propertyItem.PropertyDescriptor );
-      if( displayAttribute != null )
-      {
-        this.Editor.Watermark = displayAttribute.GetPrompt();
-      }
-    }
-#endif
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = TextBox.TextProperty;
-    }
-  }
-
-  public class PropertyGridEditorTextBox : WatermarkTextBox
-  {
-    static PropertyGridEditorTextBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTextBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTextBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
deleted file mode 100644
index 6f897009..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Data;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public abstract class TypeEditor<T> : ITypeEditor where T : FrameworkElement, new()
-  {
-    #region Properties
-
-    protected T Editor
-    {
-      get;
-      set;
-    }
-    protected DependencyProperty ValueProperty
-    {
-      get;
-      set;
-    }
-
-    #endregion //Properties
-
-    #region ITypeEditor Members
-
-    public virtual FrameworkElement ResolveEditor( PropertyItem propertyItem )
-    {
-      Editor = this.CreateEditor();
-      SetValueDependencyProperty();
-      SetControlProperties( propertyItem );
-      ResolveValueBinding( propertyItem );
-      return Editor;
-    }
-
-    #endregion //ITypeEditor Members
-
-    #region Methods
-
-    protected virtual T CreateEditor()
-    {
-      return new T();
-    }
-
-    protected virtual IValueConverter CreateValueConverter()
-    {
-      return null;
-    }
-
-    protected virtual void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var _binding = new Binding( "Value" );
-      _binding.Source = propertyItem;
-      _binding.UpdateSourceTrigger = (Editor is InputBase) ? UpdateSourceTrigger.PropertyChanged : UpdateSourceTrigger.Default;
-      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-      _binding.Converter = CreateValueConverter();
-      BindingOperations.SetBinding( Editor, ValueProperty, _binding );
-    }
-
-    protected virtual void SetControlProperties( PropertyItem propertyItem )
-    {
-      //TODO: implement in derived class
-    }
-
-    protected abstract void SetValueDependencyProperty();
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
deleted file mode 100644
index ca121037..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using Xceed.Wpf.Toolkit.Primitives;
-using System;
-using System.Windows;
-using System.Windows.Data;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using System.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class UpDownEditor<TEditor, TType> : TypeEditor<TEditor> where TEditor : UpDownBase<TType>, new()
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.TextAlignment = System.Windows.TextAlignment.Left;
-    }
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = UpDownBase<TType>.ValueProperty;
-    }
-
-#if !VS2008
-    internal void SetMinMaxFromRangeAttribute( PropertyDescriptor propertyDescriptor, TypeConverter converter )
-    {
-      if( propertyDescriptor == null )
-        return;
-
-      var rangeAttribute = PropertyGridUtilities.GetAttribute<RangeAttribute>( propertyDescriptor );
-      if( rangeAttribute != null )
-      {
-        Editor.Maximum = ((TType)converter.ConvertFrom( rangeAttribute.Maximum.ToString() ));
-        Editor.Minimum = ((TType)converter.ConvertFrom( rangeAttribute.Minimum.ToString() ));
-      }
-    }
-#endif
-  }
-
-  public class NumericUpDownEditor<TEditor, TType> : UpDownEditor<TEditor, TType> where TEditor : UpDownBase<TType>, new()
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-
-      var binding = new Binding( "IsInvalid" );
-      binding.Source = this.Editor;
-      binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-      binding.Mode = BindingMode.TwoWay;
-      BindingOperations.SetBinding( propertyItem, PropertyItem.IsInvalidProperty, binding );
-    }
-  }
-
-  public class ByteUpDownEditor : NumericUpDownEditor<ByteUpDown, byte?>
-  {
-    protected override ByteUpDown CreateEditor()
-    {
-      return new PropertyGridEditorByteUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( byte ) ) );
-#endif
-    }
-  }
-
-  public class DecimalUpDownEditor : NumericUpDownEditor<DecimalUpDown, decimal?>
-  {
-    protected override DecimalUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDecimalUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( decimal ) ) );
-#endif
-    }
-  }
-
-  public class DoubleUpDownEditor : NumericUpDownEditor<DoubleUpDown, double?> 
-  {
-    protected override DoubleUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDoubleUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-      Editor.AllowInputSpecialValues = AllowedSpecialValues.Any;
-
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( double ) ) );      
-#endif
-    }
-  }
-
-  public class IntegerUpDownEditor : NumericUpDownEditor<IntegerUpDown, int?>
-  {
-    protected override IntegerUpDown CreateEditor()
-    {
-      return new PropertyGridEditorIntegerUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( int ) ) );
-#endif
-    }
-  }
-
-  public class LongUpDownEditor : NumericUpDownEditor<LongUpDown, long?>
-  {
-    protected override LongUpDown CreateEditor()
-    {
-      return new PropertyGridEditorLongUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( long ) ) );
-#endif
-    }
-  }
-
-  public class ShortUpDownEditor : NumericUpDownEditor<ShortUpDown, short?>
-  {
-    protected override ShortUpDown CreateEditor()
-    {
-      return new PropertyGridEditorShortUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( short ) ) );
-#endif
-    }
-  }
-
-  public class SingleUpDownEditor : NumericUpDownEditor<SingleUpDown, float?> 
-  {
-    protected override SingleUpDown CreateEditor()
-    {
-      return new PropertyGridEditorSingleUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-      Editor.AllowInputSpecialValues = AllowedSpecialValues.Any;
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( float ) ) );
-#endif
-    }
-  }
-
-  public class DateTimeUpDownEditor : UpDownEditor<DateTimeUpDown, DateTime?>
-  {
-    protected override DateTimeUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDateTimeUpDown();
-    }
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( DateTime ) ) );
-#endif
-    }
-  }
-
-  public class TimeSpanUpDownEditor : UpDownEditor<TimeSpanUpDown, TimeSpan?>
-  {
-    protected override TimeSpanUpDown CreateEditor()
-    {
-      return new PropertyGridEditorTimeSpanUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( TimeSpan ) ) );
-#endif
-    }
-  }
-
-  internal class SByteUpDownEditor : NumericUpDownEditor<SByteUpDown, sbyte?>
-  {
-    protected override SByteUpDown CreateEditor()
-    {
-      return new PropertyGridEditorSByteUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( sbyte ) ) );
-#endif
-    }
-  }
-
-  internal class UIntegerUpDownEditor : NumericUpDownEditor<UIntegerUpDown, uint?>
-  {
-    protected override UIntegerUpDown CreateEditor()
-    {
-      return new PropertyGridEditorUIntegerUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( uint ) ) );
-#endif
-    }
-  }
-
-  internal class ULongUpDownEditor : NumericUpDownEditor<ULongUpDown, ulong?>
-  {
-    protected override ULongUpDown CreateEditor()
-    {
-      return new PropertyGridEditorULongUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( ulong ) ) );
-#endif
-    }
-  }
-
-  internal class UShortUpDownEditor : NumericUpDownEditor<UShortUpDown, ushort?>
-  {
-    protected override UShortUpDown CreateEditor()
-    {
-      return new PropertyGridEditorUShortUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( ushort ) ) );
-#endif
-    }
-  }
-
-
-
-  public class PropertyGridEditorByteUpDown : ByteUpDown
-  {
-    static PropertyGridEditorByteUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorByteUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorByteUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDecimalUpDown : DecimalUpDown
-  {
-    static PropertyGridEditorDecimalUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDecimalUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDecimalUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDoubleUpDown : DoubleUpDown
-  {
-    static PropertyGridEditorDoubleUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDoubleUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDoubleUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorIntegerUpDown : IntegerUpDown
-  {
-    static PropertyGridEditorIntegerUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorIntegerUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorIntegerUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorLongUpDown : LongUpDown
-  {
-    static PropertyGridEditorLongUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorLongUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorLongUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorShortUpDown : ShortUpDown
-  {
-    static PropertyGridEditorShortUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorShortUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorShortUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorSingleUpDown : SingleUpDown
-  {
-    static PropertyGridEditorSingleUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorSingleUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorSingleUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDateTimeUpDown : DateTimeUpDown
-  {
-    static PropertyGridEditorDateTimeUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDateTimeUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDateTimeUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorTimeSpanUpDown : TimeSpanUpDown
-  {
-    static PropertyGridEditorTimeSpanUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTimeSpanUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTimeSpanUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorSByteUpDown : SByteUpDown
-  {
-    static PropertyGridEditorSByteUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorSByteUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorSByteUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorUIntegerUpDown : UIntegerUpDown
-  {
-    static PropertyGridEditorUIntegerUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorUIntegerUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorUIntegerUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorULongUpDown : ULongUpDown
-  {
-    static PropertyGridEditorULongUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorULongUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorULongUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorUShortUpDown : UShortUpDown
-  {
-    static PropertyGridEditorUShortUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorUShortUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorUShortUpDown ) ) );
-    }
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
deleted file mode 100644
index 86be8a12..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 8ba7a517..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 IsSortedAlphabetically { get; }
-
-    bool AutoGenerateProperties { get; }
-
-    bool HideInheritedProperties { get; }
-
-    FilterInfo FilterInfo { get; }
-
-    bool? IsPropertyVisible( PropertyDescriptor pd );
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
deleted file mode 100644
index ded4a44d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.ComponentModel;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-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
-        {
-          var descriptors = new List<PropertyDescriptor>();
-          {
-            descriptors = ObjectContainerHelperBase.GetPropertyDescriptors( SelectedObject, this.PropertyContainer.HideInheritedProperties );
-          }
-
-          foreach( var descriptor in descriptors )
-          {
-            var propertyDef = this.GetPropertyDefinition( descriptor );
-            bool isBrowsable = false;
-
-            var isPropertyBrowsable = this.PropertyContainer.IsPropertyVisible( descriptor );
-            if( isPropertyBrowsable.HasValue )
-            {
-              isBrowsable = isPropertyBrowsable.Value;
-            }
-            else
-            {
-#if !VS2008
-              var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( descriptor );
-              if( displayAttribute != null )
-              {
-                var autoGenerateField = displayAttribute.GetAutoGenerateField();
-                isBrowsable = this.PropertyContainer.AutoGenerateProperties 
-                              && ((autoGenerateField.HasValue && autoGenerateField.Value) || !autoGenerateField.HasValue);
-              }
-              else
-#endif
-              {
-                isBrowsable = descriptor.IsBrowsable && this.PropertyContainer.AutoGenerateProperties;
-              }
-
-              if( propertyDef != null )
-              {
-                isBrowsable = propertyDef.IsBrowsable.GetValueOrDefault( isBrowsable );
-              }
-            }
-
-            if( isBrowsable )
-            {
-              var prop = this.CreatePropertyItem( descriptor, propertyDef );
-              if( prop != null )
-              {
-                propertyItems.Add( prop );
-              }
-            }
-          }
-        }
-        catch( Exception e )
-        {
-          //TODO: handle this some how
-          Debug.WriteLine( "Property creation failed." );
-          Debug.WriteLine( e.StackTrace );
-        }
-      }
-
-      return propertyItems;
-    }
-
-
-    private PropertyItem CreatePropertyItem( PropertyDescriptor property, PropertyDefinition propertyDef )
-    {
-      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject, this.PropertyContainer );                                                                                 
-      definition.InitProperties();
-
-      this.InitializeDescriptorDefinition( definition, propertyDef );
-      PropertyItem propertyItem = new PropertyItem( definition );
-      Debug.Assert( SelectedObject != null );
-      propertyItem.Instance = SelectedObject;
-      propertyItem.CategoryOrder = this.GetCategoryOrder( definition.CategoryValue );
-
-      propertyItem.WillRefreshPropertyGrid = this.GetWillRefreshPropertyGrid( property );
-      return propertyItem;
-    }
-
-    private int GetCategoryOrder( object categoryValue )
-    {
-      Debug.Assert( SelectedObject != null );
-
-      if( categoryValue == null )
-        return int.MaxValue;
-
-      int order = int.MaxValue;
-        object selectedObject = SelectedObject;
-        CategoryOrderAttribute[] orderAttributes = ( selectedObject != null )
-          ? ( CategoryOrderAttribute[] )selectedObject.GetType().GetCustomAttributes( typeof( CategoryOrderAttribute ), true )
-          : new CategoryOrderAttribute[ 0 ];
-
-        var orderAttribute = orderAttributes
-          .FirstOrDefault( ( a ) => object.Equals( a.CategoryValue, categoryValue ) );
-
-        if( orderAttribute != null )
-        {
-          order = orderAttribute.Order;
-        }
-
-      return order;
-    }
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
deleted file mode 100644
index 52a29bf2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
+++ /dev/null
@@ -1,565 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-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( false );
-
-    }
-
-    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( true );
-    }
-
-    protected override void OnAutoGeneratePropertiesChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnHideInheritedPropertiesChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnEditorDefinitionsChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnPropertyDefinitionsChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-
-
-
-
-
-    protected internal override void SetPropertiesExpansion( bool isExpanded )
-    {
-      if( this.Properties.Count == 0 )
-      {
-        this.GenerateProperties();
-      }
-
-      base.SetPropertiesExpansion( isExpanded );
-    }
-
-    protected internal override void SetPropertiesExpansion( string propertyName, bool isExpanded )
-    {
-      if( this.Properties.Count == 0 )
-      {
-        this.GenerateProperties();
-      }
-
-      base.SetPropertiesExpansion( propertyName, isExpanded );
-    }
-
-    private void UpdateFilter()
-    {
-      FilterInfo filterInfo = this.PropertyContainer.FilterInfo;
-
-      this.PropertyItems.FilterPredicate = filterInfo.Predicate
-        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString, this.PropertyItems, this.PropertyContainer );
-    }
-
-    private void UpdateCategorization( bool updateSubPropertiesCategorization )
-    {
-      _propertyItemCollection.UpdateCategorization( this.ComputeCategoryGroupDescription(), this.PropertyContainer.IsCategorized, this.PropertyContainer.IsSortedAlphabetically );
-      if( updateSubPropertiesCategorization && (_propertyItemCollection.Count > 0) )
-      {
-        foreach( PropertyItem propertyItem in _propertyItemCollection )
-        {
-          PropertyItemCollection subPropertyItemsCollection = propertyItem.Properties as PropertyItemCollection;
-          if( subPropertyItemsCollection != null )
-          {
-            subPropertyItemsCollection.UpdateCategorization( this.ComputeCategoryGroupDescription(), this.PropertyContainer.IsCategorized, this.PropertyContainer.IsSortedAlphabetically );
-          }
-        }
-      }
-    }
-
-    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();
-
-      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, bool hideInheritedProperties )
-    {
-      PropertyDescriptorCollection descriptors;
-
-      TypeConverter tc = TypeDescriptor.GetConverter( instance );
-      if( tc == null || !tc.GetPropertiesSupported() )
-      {
-        if( instance is ICustomTypeDescriptor )
-        {
-          descriptors = ((ICustomTypeDescriptor)instance).GetProperties();
-        }
-        //ICustomTypeProvider is only available in .net 4.5 and over. Use reflection so the .net 4.0 and .net 3.5 still works.
-        else if( instance.GetType().GetInterface( "ICustomTypeProvider", true ) != null )
-        {
-          var methodInfo = instance.GetType().GetMethod( "GetCustomType" );
-          var result = methodInfo.Invoke( instance, null ) as Type;
-          descriptors = TypeDescriptor.GetProperties( result );
-        }
-        else
-        {
-          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
-        }
-      }
-      else
-      {
-        descriptors = tc.GetProperties( instance );
-      }
-
-      if( ( descriptors != null ) )
-      {
-        var descriptorsProperties = descriptors.Cast<PropertyDescriptor>();
-        if( hideInheritedProperties )
-        {
-          var properties = from p in descriptorsProperties
-                           where p.ComponentType == instance.GetType()
-                           select p;
-          return properties.ToList();
-        }
-        else
-        {
-          return descriptorsProperties.ToList();
-        }
-      }
-
-      return null;
-    }
-
-
-
-
-    protected bool GetWillRefreshPropertyGrid( PropertyDescriptor propertyDescriptor )
-    {
-      if( propertyDescriptor == null )
-        return false;
-
-      var attribute = PropertyGridUtilities.GetAttribute<RefreshPropertiesAttribute>( propertyDescriptor );
-      if( attribute != null )
-        return attribute.RefreshProperties != RefreshProperties.None;
-
-      return false;
-    }
-
-    internal void InitializeDescriptorDefinition(
-      DescriptorPropertyDefinitionBase descriptorDef,
-      PropertyDefinition propertyDefinition )
-    {
-      if( descriptorDef == null )
-        throw new ArgumentNullException( "descriptorDef" );
-
-      if( propertyDefinition == null )
-        return;
-
-      // Values defined on PropertyDefinition have priority on the attributes
-      if( propertyDefinition != null )
-      {
-        if( propertyDefinition.Category != null )
-        {
-          descriptorDef.Category = propertyDefinition.Category;
-          descriptorDef.CategoryValue = propertyDefinition.Category;
-        }
-
-        if( propertyDefinition.Description != null )
-        {
-          descriptorDef.Description = propertyDefinition.Description;
-        }
-        if( propertyDefinition.DisplayName != null )
-        {
-          descriptorDef.DisplayName = propertyDefinition.DisplayName;
-        }
-
-        if( propertyDefinition.DisplayOrder != null )
-        {
-          descriptorDef.DisplayOrder = propertyDefinition.DisplayOrder.Value;
-        }
-
-        if( propertyDefinition.IsExpandable != null )
-        {
-          descriptorDef.ExpandableAttribute = propertyDefinition.IsExpandable.Value;
-        }
-      }
-    }
-
-    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;
-
-      //These properties can vary with the value. They need to be bound.
-      if( pd.PropertyDescriptor.Converter is ExpandableObjectConverter )
-      {
-        propertyItem.IsExpandable = true;
-      }
-      else
-      {
-        SetupDefinitionBinding( propertyItem, PropertyItemBase.IsExpandableProperty, pd, () => pd.IsExpandable, BindingMode.OneWay );
-      }
-      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 );
-        }
-      }
-
-      // PropertyItem.PropertyType's defaultValue equals current PropertyItem's value => set the DefaultValue attribute
-      if( pd.DefaultValue != null )
-      {
-        var typeDefaultValue = this.GetTypeDefaultValue( propertyItem.PropertyType );
-
-        if( ( (propertyItem.Value != null) && propertyItem.Value.Equals( typeDefaultValue ) )
-              || ( (propertyItem.Value == null) && ( typeDefaultValue == propertyItem.Value ) ) ) 
-        {
-#if VS2008
-        propertyItem.Value = pd.DefaultValue;
-#else
-          propertyItem.SetCurrentValue( PropertyItem.ValueProperty, pd.DefaultValue );
-#endif
-        }
-      }
-    }
-
-    private object GetTypeDefaultValue( Type type )
-    {
-      if( type.IsGenericType && type.GetGenericTypeDefinition() == typeof( Nullable<> ) )
-      {
-        type = type.GetProperty( "Value" ).PropertyType;
-      }
-
-      return ( type.IsValueType ? Activator.CreateInstance( type ) : null ) ;
-    }
-
-    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 );
-    }
-
-    internal FrameworkElement GenerateChildrenEditorElement( PropertyItem propertyItem )
-    {
-      FrameworkElement editorElement = null;
-      DescriptorPropertyDefinitionBase pd = propertyItem.DescriptorDefinition;
-      object definitionKey = null;
-      Type definitionKeyAsType = definitionKey as Type;
-      ITypeEditor editor = null;
-
-      if( editor == null )
-        editor = pd.CreateAttributeEditor();
-
-      if( editor != null )
-        editorElement = editor.ResolveEditor( propertyItem );
-
-
-      if( (editorElement == null) && (definitionKey == null) && ( propertyItem.PropertyDescriptor != 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, propertyItem )
-          : pd.CreateDefaultEditor( propertyItem );
-        }
-
-        Debug.Assert( editor != null );
-
-        editorElement = editor.ResolveEditor( propertyItem );
-      }
-
-      return editorElement;
-    }
-
-    internal PropertyDefinition GetPropertyDefinition( PropertyDescriptor descriptor )
-    {
-      PropertyDefinition def = null;
-
-      var propertyDefs = this.PropertyContainer.PropertyDefinitions;
-      if( propertyDefs != null )
-      {
-        def = propertyDefs[ descriptor.Name ];
-        if( def == null )
-        {
-          def = propertyDefs.GetRecursiveBaseTypes( descriptor.PropertyType );
-        }
-      }
-
-      return def;
-    }
-
-
-    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
deleted file mode 100644
index 01b51efb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class PropertyDefinition : PropertyDefinitionBase
-  {
-    private string _name;
-    private bool? _isBrowsable = true;
-    private bool? _isExpandable = null;
-    private string _displayName = null;
-    private string _description = null;
-    private string _category = null;
-    private int? _displayOrder = null;
-
-    [Obsolete(@"Use 'TargetProperties' instead of 'Name'")]
-    public string Name
-    {
-      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; 
-      }
-    }
-
-    public string Category
-    {
-      get { return _category; }
-      set 
-      {
-        this.ThrowIfLocked( () => this.Category );
-        _category = value; 
-      }
-    }
-
-    public string DisplayName
-    {
-      get { return _displayName; }
-      set
-      {
-        this.ThrowIfLocked( () => this.DisplayName );
-        _displayName = value;
-      }
-    }
-
-    public string Description
-    {
-      get { return _description; }
-      set
-      {
-        this.ThrowIfLocked( () => this.Description );
-        _description = value;
-      }
-    }
-
-    public int? DisplayOrder
-    {
-      get { return _displayOrder; }
-      set
-      {
-        this.ThrowIfLocked( () => this.DisplayOrder );
-        _displayOrder = value;
-      }
-    }
-
-    public bool? IsBrowsable
-    {
-      get { return _isBrowsable; }
-      set
-      {
-        this.ThrowIfLocked( () => this.IsBrowsable );
-        _isBrowsable = value;
-      }
-    }
-
-    public bool? IsExpandable
-    {
-      get { return _isExpandable; }
-      set
-      {
-        this.ThrowIfLocked( () => this.IsExpandable );
-        _isExpandable = 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
deleted file mode 100644
index 67c90df6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyDefinitionCollection : PropertyDefinitionBaseCollection<PropertyDefinition>
-  {
-  }
-  public class EditorDefinitionCollection : PropertyDefinitionBaseCollection<EditorDefinitionBase>
-  {
-  }
-
-
-  public abstract class PropertyDefinitionBaseCollection<T> : DefinitionCollectionBase<T> where T : PropertyDefinitionBase
-  {
-    protected PropertyDefinitionBaseCollection()
-    {
-    }
-
-    public virtual T this[ object propertyId ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.TargetProperties.Contains( propertyId ) )
-            return item;
-
-          // Using the special character "*" in a string of TargetProperties will
-          // return all the items containing the string (before or after) the "*".
-          // ex : Prop* will return properties named Prop1, Prop2, Prop3...
-          List<string> stringTargetProperties = item.TargetProperties.OfType<string>().ToList();
-          if( ( stringTargetProperties != null ) && ( stringTargetProperties.Count > 0 ) )
-          {
-            if( propertyId is string )
-            {
-              string stringPropertyID = ( string )propertyId;
-              foreach( var targetPropertyString in stringTargetProperties )
-              {
-                if( targetPropertyString.Contains( "*" ) )
-                {
-                  string searchString = targetPropertyString.Replace( "*", "" );
-                  if( stringPropertyID.StartsWith( searchString ) || stringPropertyID.EndsWith( searchString ) )
-                    return item;
-                }
-              }
-            }
-          }
-          else
-          {
-            //Manage Interfaces
-            var type = propertyId as Type;
-            if( type != null )
-            {
-              foreach( Type targetProperty in item.TargetProperties )
-              {
-                if( targetProperty.IsAssignableFrom( type ) )
-                  return item;
-              }
-            }
-          }
-        }
-
-        return null;
-      }
-    }
-
-    internal T GetRecursiveBaseTypes( Type type )
-    {
-      // If no definition for the current type, fall back on base type editor recursively.
-      T ret = null;
-      while( ret == null && type != null )
-      {
-        ret = this[ type ];
-        type = type.BaseType;
-      }
-      return ret;
-    }
-  }
-
-  public abstract class DefinitionCollectionBase<T> : ObservableCollection<T> where T : DefinitionBase
-  {
-    internal DefinitionCollectionBase()
-    {
-    }
-
-    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/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
deleted file mode 100644
index ff4ee52a..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ /dev/null
@@ -1,1599 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using System.Collections.Specialized;
-using System.Windows.Media;
-using System.Collections.ObjectModel;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [TemplatePart( Name = PART_DragThumb, Type = typeof( Thumb ) )]
-  [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 ContainerHelperBase _containerHelper;
-    private PropertyDefinitionCollection _propertyDefinitions;
-    private WeakEventListener<NotifyCollectionChangedEventArgs> _propertyDefinitionsListener;
-    private WeakEventListener<NotifyCollectionChangedEventArgs> _editorDefinitionsListener;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region AdvancedOptionsMenu
-
-    public static readonly DependencyProperty AdvancedOptionsMenuProperty = DependencyProperty.Register( "AdvancedOptionsMenu", typeof( ContextMenu ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
-    public ContextMenu AdvancedOptionsMenu
-    {
-      get
-      {
-        return ( ContextMenu )GetValue( AdvancedOptionsMenuProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsMenuProperty, value );
-      }
-    }
-
-    #endregion //AdvancedOptionsMenu
-
-    #region AutoGenerateProperties
-
-    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool AutoGenerateProperties
-    {
-      get
-      {
-        return ( bool )GetValue( AutoGeneratePropertiesProperty );
-      }
-      set
-      {
-        SetValue( AutoGeneratePropertiesProperty, value );
-      }
-    }
-
-    #endregion //AutoGenerateProperties
-
-    #region ShowDescriptionByTooltip
-
-    public static readonly DependencyProperty ShowDescriptionByTooltipProperty = DependencyProperty.Register( "ShowDescriptionByTooltip", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowDescriptionByTooltip
-    {
-      get
-      {
-        return ( bool )GetValue( ShowDescriptionByTooltipProperty );
-      }
-      set
-      {
-        SetValue( ShowDescriptionByTooltipProperty, value );
-      }
-    }
-
-    #endregion //ShowDescriptionByTooltip
-
-    #region ShowSummary
-
-    public static readonly DependencyProperty ShowSummaryProperty = DependencyProperty.Register( "ShowSummary", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSummary
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSummaryProperty );
-      }
-      set
-      {
-        SetValue( ShowSummaryProperty, value );
-      }
-    }
-
-    #endregion //ShowSummary
-
-    #region EditorDefinitions
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( null, OnEditorDefinitionsChanged ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    private static void OnEditorDefinitionsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnEditorDefinitionsChanged( ( EditorDefinitionCollection )e.OldValue, ( EditorDefinitionCollection )e.NewValue );
-    }
-
-    protected virtual void OnEditorDefinitionsChanged( EditorDefinitionCollection oldValue, EditorDefinitionCollection newValue )
-    {
-      if( oldValue != null )
-        CollectionChangedEventManager.RemoveListener( oldValue, _editorDefinitionsListener );
-
-      if( newValue != null )
-        CollectionChangedEventManager.AddListener( newValue, _editorDefinitionsListener );
-
-      this.Notify( this.PropertyChanged, () => this.EditorDefinitions );
-    }
-
-    private void OnEditorDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.NotifyEditorDefinitionsCollectionChanged();
-      }
-    }
-
-    #endregion //EditorDefinitions
-
-    #region Filter
-
-    public static readonly DependencyProperty FilterProperty = DependencyProperty.Register( "Filter", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnFilterChanged ) );
-    public string Filter
-    {
-      get
-      {
-        return ( string )GetValue( FilterProperty );
-      }
-      set
-      {
-        SetValue( FilterProperty, value );
-      }
-    }
-
-    private static void OnFilterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnFilterChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnFilterChanged( string oldValue, string 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
-
-    #region FilterWatermark
-
-    public static readonly DependencyProperty FilterWatermarkProperty = DependencyProperty.Register( "FilterWatermark", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( "Search" ) );
-    public string FilterWatermark
-    {
-      get
-      {
-        return ( string )GetValue( FilterWatermarkProperty );
-      }
-      set
-      {
-        SetValue( FilterWatermarkProperty, value );
-      }
-    }
-
-    #endregion //FilterWatermark
-
-    #region HideInheritedProperties
-
-    public static readonly DependencyProperty HideInheritedPropertiesProperty = DependencyProperty.Register( "HideInheritedProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool HideInheritedProperties
-    {
-      get
-      {
-        return ( bool )GetValue( HideInheritedPropertiesProperty );
-      }
-      set
-      {
-        SetValue( HideInheritedPropertiesProperty, value );
-      }
-    }
-
-    #endregion //HideInheritedProperties
-
-    #region IsCategorized
-
-    public static readonly DependencyProperty IsCategorizedProperty = DependencyProperty.Register( "IsCategorized", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true, OnIsCategorizedChanged ) );
-    public bool IsCategorized
-    {
-      get
-      {
-        return ( bool )GetValue( IsCategorizedProperty );
-      }
-      set
-      {
-        SetValue( IsCategorizedProperty, value );
-      }
-    }
-
-    private static void OnIsCategorizedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnIsCategorizedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsCategorizedChanged( bool oldValue, bool newValue )
-    {
-      this.UpdateThumb();
-    }
-
-    #endregion //IsCategorized
-
-    #region IsMiscCategoryLabelHidden
-
-    public static readonly DependencyProperty IsMiscCategoryLabelHiddenProperty = DependencyProperty.Register( "IsMiscCategoryLabelHidden", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool IsMiscCategoryLabelHidden
-    {
-      get
-      {
-        return ( bool )GetValue( IsMiscCategoryLabelHiddenProperty );
-      }
-      set
-      {
-        SetValue( IsMiscCategoryLabelHiddenProperty, value );
-      }
-    }
-
-    #endregion //IsMiscCategoryLabelHidden
-
-    #region IsScrollingToTopAfterRefresh
-
-    public static readonly DependencyProperty IsScrollingToTopAfterRefreshProperty = DependencyProperty.Register( "IsScrollingToTopAfterRefresh", typeof( bool ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( true ) );
-    public bool IsScrollingToTopAfterRefresh
-    {
-      get
-      {
-        return ( bool )GetValue( IsScrollingToTopAfterRefreshProperty );
-      }
-      set
-      {
-        SetValue( IsScrollingToTopAfterRefreshProperty, value );
-      }
-    }
-
-    #endregion //IsScrollingToTopAfterRefresh
-
-    #region IsVirtualizing
-
-    public static readonly DependencyProperty IsVirtualizingProperty = DependencyProperty.Register( "IsVirtualizing", typeof( bool ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( false, OnIsVirtualizingChanged ) );
-    public bool IsVirtualizing
-    {
-      get
-      {
-        return ( bool )GetValue( IsVirtualizingProperty );
-      }
-      set
-      {
-        SetValue( IsVirtualizingProperty, value );
-      }
-    }
-
-    private static void OnIsVirtualizingChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnIsVirtualizingChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsVirtualizingChanged( bool oldValue, bool newValue )
-    {
-      this.UpdateContainerHelper();
-    }
-
-    #endregion //IsVirtualizing
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #region NameColumnWidth
-
-    public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register( "NameColumnWidth", typeof( double ), typeof( PropertyGrid ), new UIPropertyMetadata( 150.0, OnNameColumnWidthChanged ) );
-    public double NameColumnWidth
-    {
-      get
-      {
-        return ( double )GetValue( NameColumnWidthProperty );
-      }
-      set
-      {
-        SetValue( NameColumnWidthProperty, value );
-      }
-    }
-
-    private static void OnNameColumnWidthChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnNameColumnWidthChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnNameColumnWidthChanged( double oldValue, double newValue )
-    {
-      if( _dragThumb != null )
-        ( ( TranslateTransform )_dragThumb.RenderTransform ).X = newValue;
-    }
-
-    #endregion //NameColumnWidth
-
-    #region Properties
-
-    public IList Properties
-    {
-      get
-      {
-        return (_containerHelper != null) ? _containerHelper.Properties : null;
-      }
-    }
-
-    #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
-    {
-      get
-      {
-        return _propertyDefinitions;
-      }
-      set
-      {
-        if( _propertyDefinitions != value )
-        {
-          PropertyDefinitionCollection oldValue = _propertyDefinitions;
-          _propertyDefinitions = value;
-          this.OnPropertyDefinitionsChanged( oldValue, value );
-        }
-      }
-    }
-
-    protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue )
-    {
-      if( oldValue != null )
-        CollectionChangedEventManager.RemoveListener( oldValue, _propertyDefinitionsListener );
-
-      if( newValue != null )
-        CollectionChangedEventManager.AddListener( newValue, _propertyDefinitionsListener );
-
-      this.Notify( this.PropertyChanged, () => this.PropertyDefinitions );
-    }
-
-    private void OnPropertyDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.NotifyPropertyDefinitionsCollectionChanged();
-      }
-      if( this.IsLoaded )
-      {
-        this.UpdateContainerHelper();
-      }
-    }
-
-    #endregion //PropertyDefinitions
-
-    #region IsReadOnly
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    #endregion //ReadOnly
-
-    #region SelectedObject
-
-    public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register( "SelectedObject", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectChanged ) );
-    public object SelectedObject
-    {
-      get
-      {
-        return ( object )GetValue( SelectedObjectProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectProperty, value );
-      }
-    }
-
-    private static void OnSelectedObjectChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyInspector = o as PropertyGrid;
-      if( propertyInspector != null )
-        propertyInspector.OnSelectedObjectChanged( ( object )e.OldValue, ( object )e.NewValue );
-    }
-
-    protected virtual void OnSelectedObjectChanged( object oldValue, object newValue )
-    {
-      // We do not want to process the change now if the grid is initializing (ie. BeginInit/EndInit).
-      if( _initializationCount != 0 )
-      {
-        _hasPendingSelectedObjectChanged = true;
-        return;
-      }
-
-      this.UpdateContainerHelper();
-
-      RaiseEvent( new RoutedPropertyChangedEventArgs<object>( oldValue, newValue, PropertyGrid.SelectedObjectChangedEvent ) );
-    }
-
-    #endregion //SelectedObject
-
-    #region SelectedObjectType
-
-    public static readonly DependencyProperty SelectedObjectTypeProperty = DependencyProperty.Register( "SelectedObjectType", typeof( Type ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectTypeChanged ) );
-    public Type SelectedObjectType
-    {
-      get
-      {
-        return ( Type )GetValue( SelectedObjectTypeProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectTypeProperty, value );
-      }
-    }
-
-    private static void OnSelectedObjectTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnSelectedObjectTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
-    }
-
-    protected virtual void OnSelectedObjectTypeChanged( Type oldValue, Type newValue )
-    {
-    }
-
-    #endregion //SelectedObjectType
-
-    #region SelectedObjectTypeName
-
-    public static readonly DependencyProperty SelectedObjectTypeNameProperty = DependencyProperty.Register( "SelectedObjectTypeName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty ) );
-    public string SelectedObjectTypeName
-    {
-      get
-      {
-        return ( string )GetValue( SelectedObjectTypeNameProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectTypeNameProperty, value );
-      }
-    }
-
-    #endregion //SelectedObjectTypeName
-
-    #region SelectedObjectName
-
-    public static readonly DependencyProperty SelectedObjectNameProperty = DependencyProperty.Register( "SelectedObjectName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty, OnSelectedObjectNameChanged, OnCoerceSelectedObjectName ) );
-    public string SelectedObjectName
-    {
-      get
-      {
-        return ( string )GetValue( SelectedObjectNameProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectNameProperty, value );
-      }
-    }
-
-    private static object OnCoerceSelectedObjectName( DependencyObject o, object baseValue )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-      {
-        if( (propertyGrid.SelectedObject is FrameworkElement) && ( String.IsNullOrEmpty( ( String )baseValue ) ))
-          return "<no name>";
-      }
-
-      return baseValue;
-    }
-
-    private static void OnSelectedObjectNameChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.SelectedObjectNameChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void SelectedObjectNameChanged( string oldValue, string newValue )
-    {
-    }
-
-    #endregion //SelectedObjectName
-
-
-
-
-
-
-
-
-
-
-
-
-    #region 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 ( PropertyItemBase )GetValue( SelectedPropertyItemProperty );
-      }
-      internal set
-      {
-        SetValue( SelectedPropertyItemPropertyKey, value );
-      }
-    }
-
-    private static void OnSelectedPropertyItemChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItemBase )e.OldValue, ( PropertyItemBase )e.NewValue );
-    }
-
-    protected virtual void OnSelectedPropertyItemChanged( PropertyItemBase oldValue, PropertyItemBase newValue )
-    {
-      if( oldValue != null )
-        oldValue.IsSelected = false;
-
-      if( newValue != null )
-        newValue.IsSelected = true;
-
-      this.SelectedProperty = ( (newValue != null) && (_containerHelper != 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.
-      if( _containerHelper != null )
-      {
-        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 ) );
-    public bool ShowAdvancedOptions
-    {
-      get
-      {
-        return ( bool )GetValue( ShowAdvancedOptionsProperty );
-      }
-      set
-      {
-        SetValue( ShowAdvancedOptionsProperty, value );
-      }
-    }
-
-    #endregion //ShowAdvancedOptions
-
-    #region ShowHorizontalScrollBar
-
-    public static readonly DependencyProperty ShowHorizontalScrollBarProperty = DependencyProperty.Register( "ShowHorizontalScrollBar", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowHorizontalScrollBar
-    {
-      get
-      {
-        return ( bool )GetValue( ShowHorizontalScrollBarProperty );
-      }
-      set
-      {
-        SetValue( ShowHorizontalScrollBarProperty, value );
-      }
-    }
-
-    #endregion //ShowHorizontalScrollBar
-
-    #region ShowPreview
-
-    public static readonly DependencyProperty ShowPreviewProperty = DependencyProperty.Register( "ShowPreview", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowPreview
-    {
-      get
-      {
-        return ( bool )GetValue( ShowPreviewProperty );
-      }
-      set
-      {
-        SetValue( ShowPreviewProperty, value );
-      }
-    }
-
-    #endregion //ShowPreview
-
-    #region ShowSearchBox
-
-    public static readonly DependencyProperty ShowSearchBoxProperty = DependencyProperty.Register( "ShowSearchBox", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSearchBox
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSearchBoxProperty );
-      }
-      set
-      {
-        SetValue( ShowSearchBoxProperty, value );
-      }
-    }
-
-    #endregion //ShowSearchBox
-
-    #region ShowSortOptions
-
-    public static readonly DependencyProperty ShowSortOptionsProperty = DependencyProperty.Register( "ShowSortOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSortOptions
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSortOptionsProperty );
-      }
-      set
-      {
-        SetValue( ShowSortOptionsProperty, value );
-      }
-    }
-
-    #endregion //ShowSortOptions
-
-    #region ShowTitle
-
-    public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register( "ShowTitle", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowTitle
-    {
-      get
-      {
-        return ( bool )GetValue( ShowTitleProperty );
-      }
-      set
-      {
-        SetValue( ShowTitleProperty, value );
-      }
-    }
-
-    #endregion //ShowTitle
-
-    #region UpdateTextBoxSourceOnEnterKey
-
-    public static readonly DependencyProperty UpdateTextBoxSourceOnEnterKeyProperty = DependencyProperty.Register( "UpdateTextBoxSourceOnEnterKey", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool UpdateTextBoxSourceOnEnterKey
-    {
-      get
-      {
-        return ( bool )GetValue( UpdateTextBoxSourceOnEnterKeyProperty );
-      }
-      set
-      {
-        SetValue( UpdateTextBoxSourceOnEnterKeyProperty, value );
-      }
-    }
-
-    #endregion //UpdateTextBoxSourceOnEnterKey
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static PropertyGrid()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGrid ), new FrameworkPropertyMetadata( typeof( PropertyGrid ) ) );
-    }
-
-    public PropertyGrid()
-    {
-      _propertyDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnPropertyDefinitionsCollectionChanged );
-      _editorDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnEditorDefinitionsCollectionChanged);     
-      UpdateContainerHelper();
-#if VS2008
-        EditorDefinitions = new EditorDefinitionCollection();
-#else
-      this.SetCurrentValue( PropertyGrid.EditorDefinitionsProperty, new EditorDefinitionCollection() );
-#endif
-
-      PropertyDefinitions = new PropertyDefinitionCollection();      
-      this.PropertyValueChanged += this.PropertyGrid_PropertyValueChanged;
-
-      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 ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _dragThumb != null )
-        _dragThumb.DragDelta -= DragThumb_DragDelta;
-      _dragThumb = GetTemplateChild( PART_DragThumb ) as Thumb;
-      if( _dragThumb != null )
-        _dragThumb.DragDelta += DragThumb_DragDelta;
-
-      if( _containerHelper != null )
-      {
-        _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 
-      //into its ancestor element, Visual Studio displays data warning messages in output window when 
-      //binding engine meets unmatched target type during visual tree traversal though it does the proper 
-      //binding when it receives expected target type during visual tree traversal
-      //ref : http://www.codeproject.com/Tips/124556/How-to-suppress-the-System-Windows-Data-Error-warn
-      TranslateTransform _moveTransform = new TranslateTransform();
-      _moveTransform.X = NameColumnWidth;
-      if( _dragThumb != null )
-      {
-        _dragThumb.RenderTransform = _moveTransform;
-      }
-
-      this.UpdateThumb();
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      var textBox = e.OriginalSource as TextBox;
-
-      //hitting enter on textbox will update value of underlying source if UpdateTextBoxSourceOnEnterKey is true
-      if( (this.SelectedPropertyItem != null) 
-          && (e.Key == Key.Enter)
-          && this.UpdateTextBoxSourceOnEnterKey
-          && (textBox != null)
-          && !textBox.AcceptsReturn )
-      {
-        BindingExpression be = textBox.GetBindingExpression( TextBox.TextProperty );
-        if( be != null )
-          be.UpdateSource();
-      }
-    }
-
-    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 )
-    {
-      PropertyItemBase item = ( PropertyItemBase )args.OriginalSource;
-      if( item.IsSelected )
-      {
-        SelectedPropertyItem = item;
-      }
-      else
-      {
-        if( object.ReferenceEquals( item, SelectedPropertyItem ) )
-        {
-          SelectedPropertyItem = null;
-        }
-      }
-    }
-
-    private void OnPreparePropertyItemInternal( object sender, PropertyItemEventArgs args )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.PrepareChildrenPropertyItem( args.PropertyItem, args.Item );
-      }
-      args.Handled = true;
-    }
-
-    private void OnClearPropertyItemInternal( object sender, PropertyItemEventArgs args )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.ClearChildrenPropertyItem( args.PropertyItem, args.Item );
-      }
-      args.Handled = true;
-    }
-
-    private void DragThumb_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      NameColumnWidth = Math.Min( Math.Max( this.ActualWidth * 0.1, NameColumnWidth + e.HorizontalChange ), this.ActualWidth * 0.9 );
-    }
-
-
-    private void PropertyGrid_PropertyValueChanged( object sender, PropertyValueChangedEventArgs e )
-    {
-      var modifiedPropertyItem = e.OriginalSource as PropertyItem;
-      if( modifiedPropertyItem != null )
-      {
-        // Need to refresh the PropertyGrid Properties.
-        if( modifiedPropertyItem.WillRefreshPropertyGrid )
-        {
-          // Refresh the PropertyGrid...this will set the initial Categories states.
-          this.UpdateContainerHelper();
-        }
-
-        var parentPropertyItem = modifiedPropertyItem.ParentNode as PropertyItem;
-        if( ( parentPropertyItem != null ) && parentPropertyItem.IsExpandable )
-        {
-          //Rebuild Editor for parent propertyItem if one of its sub-propertyItem have changed.
-          this.RebuildEditor( parentPropertyItem );
-        }
-      }
-    }
-
-
-    #endregion //Event Handlers
-
-    #region Commands
-
-    private void ClearFilter( object sender, ExecutedRoutedEventArgs e )
-    {
-      Filter = String.Empty;
-    }
-
-    private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = !String.IsNullOrEmpty( Filter );
-    }
-
-    #endregion //Commands
-
-    #region Methods
-
-
-
-
-
-
-
-
-
-
-
-
-    public double GetScrollPosition()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        return scrollViewer.VerticalOffset;
-      }
-      return 0d;
-    }
-
-    public void ScrollToPosition( double position )
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToVerticalOffset( position );
-      }
-    }
-
-    public void ScrollToTop()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToTop();
-      }
-    }
-
-    public void ScrollToBottom()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToBottom();
-      }
-    }
-
-    public void CollapseAllProperties()
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( false );
-      }
-    }
-
-    public void ExpandAllProperties()
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( true );
-      }
-    }
-
-    public void ExpandProperty( string propertyName )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( propertyName, true );
-      }
-    }
-
-    public void CollapseProperty( string propertyName )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( propertyName, false );
-      }
-    }
-
-    private ScrollViewer GetScrollViewer()
-    {
-      if( (_containerHelper != null) && (_containerHelper.ChildrenItemsControl != null) )
-      {
-        return TreeHelper.FindChild<ScrollViewer>( _containerHelper.ChildrenItemsControl );
-      }
-      return null;
-    }
-
-    private void RebuildEditor( PropertyItem propertyItem )
-    {
-      ObjectContainerHelperBase objectContainerHelperBase = propertyItem.ContainerHelper as ObjectContainerHelperBase;
-      //Re-build the editor to update this propertyItem
-      FrameworkElement editor = objectContainerHelperBase.GenerateChildrenEditorElement( propertyItem );
-      if( editor != null )
-      {
-        // Tag the editor as generated to know if we should clear it.
-        ContainerHelperBase.SetIsGenerated( editor, true );
-        propertyItem.Editor = editor;
-
-        //Update Source of binding and Validation of PropertyItem to update
-        var be = propertyItem.GetBindingExpression( PropertyItem.ValueProperty );
-        if( be != null )
-        {
-          be.UpdateSource();
-          propertyItem.SetRedInvalidBorder( be );
-        }
-      }
-    }
-
-    private void UpdateContainerHelper()
-    {
-      // Keep a backup of the template element and initialize the
-      // new helper with it.
-      ItemsControl childrenItemsControl = null;
-      if( _containerHelper != null )
-      {
-        childrenItemsControl = _containerHelper.ChildrenItemsControl;
-        _containerHelper.ClearHelper();
-        if( _containerHelper is ObjectContainerHelperBase )
-        {
-          // 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 )
-          //{
-            this.AdvancedOptionsMenu = null;
-          //}
-        }
-      }
-
-
-
-
-      if( SelectedObject != null )
-      {
-        _containerHelper = new ObjectContainerHelper( this, SelectedObject );
-        ( ( ObjectContainerHelper )_containerHelper ).GenerateProperties();
-      }
-
-
-      if( _containerHelper != null )
-      {
-        _containerHelper.ChildrenItemsControl = childrenItemsControl;
-      }
-
-      if( this.IsScrollingToTopAfterRefresh )
-      {
-        this.ScrollToTop();
-      }
-
-      // 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 );
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    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 );
-      }
-    }
-
-    /// <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()
-    {
-      if( _containerHelper != null )
-      {
-        _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
-    {
-      add
-      {
-        AddHandler( PropertyValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PropertyValueChangedEvent, value );
-      }
-    }
-    #endregion
-
-    #region SelectedPropertyItemChangedEvent Routed Event
-
-    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<PropertyItemBase> ), typeof( PropertyGrid ) );
-    public event RoutedPropertyChangedEventHandler<PropertyItemBase> SelectedPropertyItemChanged
-    {
-      add
-      {
-        AddHandler( SelectedPropertyItemChangedEvent, value );
-      }
-      remove
-      {
-        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
-    {
-      add
-      {
-        AddHandler( SelectedObjectChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SelectedObjectChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region IsPropertyBrowsable Event
-
-    public event IsPropertyBrowsableHandler IsPropertyBrowsable;
-
-    #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
-
-    #region ISupportInitialize Members
-
-    public override void BeginInit()
-    {
-      base.BeginInit();
-      _initializationCount++;
-    }
-
-    public override void EndInit()
-    {
-      base.EndInit();
-      if( --_initializationCount == 0 )
-      {
-        if( _hasPendingSelectedObjectChanged )
-        {
-          //This will update SelectedObject, Type, Name based on the actual config.
-          this.UpdateContainerHelper();
-          _hasPendingSelectedObjectChanged = false;
-        }
-        if( _containerHelper != null )
-        {
-          _containerHelper.OnEndInit();
-        }
-      }
-    }
-
-    #endregion
-
-    #region IPropertyContainer Members
-
-    FilterInfo IPropertyContainer.FilterInfo
-    {
-      get 
-      {
-        return new FilterInfo()
-        {
-          Predicate = this.CreateFilter(this.Filter),
-          InputString = this.Filter
-        };
-      }
-    }
-
-    ContainerHelperBase IPropertyContainer.ContainerHelper
-    {
-      get
-      {
-        return _containerHelper;
-      }
-    }
-
-    bool IPropertyContainer.IsSortedAlphabetically
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-
-    bool? IPropertyContainer.IsPropertyVisible( PropertyDescriptor pd )
-    {
-      var handler = this.IsPropertyBrowsable;
-      //If anyone is registered to PropertyGrid.IsPropertyBrowsable event
-      if( handler != null )
-      {
-        var isBrowsableArgs = new IsPropertyBrowsableArgs( pd );
-        handler( this, isBrowsableArgs );
-
-        return isBrowsableArgs.IsBrowsable;
-      }
-
-      return null;
-    }
-
-
-
-
-    #endregion
-
-
-    #endregion
-
-  }
-
-  #region PropertyValueChangedEvent Handler/Args
-  public delegate void PropertyValueChangedEventHandler( object sender, PropertyValueChangedEventArgs e );
-  public class PropertyValueChangedEventArgs : RoutedEventArgs
-  {
-    public object NewValue
-    {
-      get;
-      set;
-    }
-    public object OldValue
-    {
-      get;
-      set;
-    }
-
-    public PropertyValueChangedEventArgs( RoutedEvent routedEvent, object source, object oldValue, object newValue )
-      : base( routedEvent, source )
-    {
-      NewValue = newValue;
-      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
-
-  #region IsPropertyArgs class
-
-  public class PropertyArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public PropertyArgs( PropertyDescriptor pd )
-    {
-      this.PropertyDescriptor = pd;
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region PropertyDescriptor Property
-
-    public PropertyDescriptor PropertyDescriptor
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #endregion
-  }
-
-  #endregion
-
-  #region isPropertyBrowsableEvent Handler/Args
-
-  public delegate void IsPropertyBrowsableHandler( object sender, IsPropertyBrowsableArgs e );
-
-  public class IsPropertyBrowsableArgs : PropertyArgs
-  {
-    #region Constructors
-
-    public IsPropertyBrowsableArgs( PropertyDescriptor pd )
-      : base( pd )
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region IsBrowsable Property
-
-    public bool? IsBrowsable
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #endregion
-  }
-
-  #endregion
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
deleted file mode 100644
index ad8afead..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Linq.Expressions;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Controls;
-using System.Reflection;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal class PropertyGridUtilities
-  {
-    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
-    {
-      return property.Attributes.OfType<T>().FirstOrDefault();
-    }
-
-
-
-
-    internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverter typeConverter, PropertyItem propertyItem )
-    {
-      ITypeEditor editor = null;
-
-      var context = new EditorTypeDescriptorContext( null, propertyItem.Instance, propertyItem.PropertyDescriptor );
-      if( (typeConverter != null)
-        && typeConverter.GetStandardValuesSupported( context )
-        && typeConverter.GetStandardValuesExclusive( context )
-        && (propertyType != typeof( bool )) && (propertyType != typeof( bool? )) )  //Bool type always have a BooleanConverter with standardValues : True/False.
-      {
-        var items = typeConverter.GetStandardValues( context );
-        editor = new SourceComboBoxEditor( items, typeConverter );
-      }
-      else 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();
-      else if( propertyType == typeof( double ) || propertyType == typeof( double? ) )
-        editor = new DoubleUpDownEditor();
-      else if( propertyType == typeof( int ) || propertyType == typeof( int? ) )
-        editor = new IntegerUpDownEditor();
-      else if( propertyType == typeof( short ) || propertyType == typeof( short? ) )
-        editor = new ShortUpDownEditor();
-      else if( propertyType == typeof( long ) || propertyType == typeof( long? ) )
-        editor = new LongUpDownEditor();
-      else if( propertyType == typeof( float ) || propertyType == typeof( float? ) )
-        editor = new SingleUpDownEditor();
-      else if( propertyType == typeof( byte ) || propertyType == typeof( byte? ) )
-        editor = new ByteUpDownEditor();
-      else if( propertyType == typeof( sbyte ) || propertyType == typeof( sbyte? ) )
-        editor = new SByteUpDownEditor();
-      else if( propertyType == typeof( uint ) || propertyType == typeof( uint? ) )
-        editor = new UIntegerUpDownEditor();
-      else if( propertyType == typeof( ulong ) || propertyType == typeof( ulong? ) )
-        editor = new ULongUpDownEditor();
-      else if( propertyType == typeof( ushort ) || propertyType == typeof( ushort? ) )
-        editor = new UShortUpDownEditor();
-      else if( propertyType == typeof( DateTime ) || propertyType == typeof( DateTime? ) )
-        editor = new DateTimeUpDownEditor();
-      else if( ( propertyType == typeof( Color ) ) || ( propertyType == typeof( Color? ) ) )
-        editor = new ColorEditor();
-      else if( propertyType.IsEnum )
-        editor = new EnumComboBoxEditor();
-      else if( propertyType == typeof( TimeSpan ) || propertyType == typeof( TimeSpan? ) )
-        editor = new TimeSpanUpDownEditor();
-      else if( propertyType == typeof( FontFamily ) || propertyType == typeof( FontWeight ) || propertyType == typeof( FontStyle ) || propertyType == typeof( FontStretch ) )
-        editor = new FontComboBoxEditor();
-      else if (propertyType == typeof(Guid) || propertyType == typeof(Guid?))
-        editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA" };
-      else if (propertyType == typeof(char) || propertyType == typeof(char?))
-        editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "&" };
-      else if( propertyType == typeof( object ) )
-        // If any type of object is possible in the property, default to the TextBoxEditor.
-        // Useful in some case (e.g., Button.Content).
-        // Can be reconsidered but was the legacy behavior on the PropertyGrid.
-        editor = new TextBoxEditor();
-      else
-      {
-        var listType = ListUtilities.GetListItemType( propertyType );
-
-        // A List of T
-        if( listType != null )
-        {
-          if( !listType.IsPrimitive && !listType.Equals( typeof( String ) ) && !listType.IsEnum )
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
-          else
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.PrimitiveTypeCollectionEditor();
-        }
-        else
-        {
-          var dictionaryType = ListUtilities.GetDictionaryItemsType( propertyType );
-          var collectionType = ListUtilities.GetCollectionItemType( propertyType );
-          // A dictionary of T or a Collection of T or an ICollection
-          if( (dictionaryType != null) || (collectionType != null) || typeof( ICollection ).IsAssignableFrom( propertyType ) )
-          {
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
-          }
-          else
-          {
-            // If the type is not supported, check if there is a converter that supports
-            // string conversion to the object type. Use TextBox in theses cases.
-            // Otherwise, return a TextBlock editor since no valid editor exists.
-            editor = (typeConverter != null && typeConverter.CanConvertFrom( typeof( string ) ))
-              ? (ITypeEditor)new TextBoxEditor()
-              : (ITypeEditor)new TextBlockEditor();
-          }
-        }
-      }
-
-      return editor;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #region Private class
-
-    private class EditorTypeDescriptorContext : ITypeDescriptorContext
-    {
-      IContainer _container;
-      object _instance;
-      PropertyDescriptor _propertyDescriptor;
-
-      internal EditorTypeDescriptorContext( IContainer container, object instance, PropertyDescriptor pd )
-      {
-        _container = container;
-        _instance = instance;
-        _propertyDescriptor = pd;
-      }
-
-      IContainer ITypeDescriptorContext.Container
-      {
-        get
-        {
-          return _container;
-        }
-      }
-      object ITypeDescriptorContext.Instance
-      {
-        get
-        {
-          return _instance;
-        }
-      }
-      PropertyDescriptor ITypeDescriptorContext.PropertyDescriptor
-      {
-        get
-        {
-          return _propertyDescriptor;
-        }
-      }
-
-      void ITypeDescriptorContext.OnComponentChanged()
-      {
-      }
-
-      bool ITypeDescriptorContext.OnComponentChanging()
-      {
-        return false;
-      }
-
-      object IServiceProvider.GetService( Type serviceType )
-      {
-        return null;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
deleted file mode 100644
index e2b90cb2..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq.Expressions;
-using System.Diagnostics;
-using System.Globalization;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [TemplatePart( Name = "content", Type = typeof( ContentControl ) )]
-  public class PropertyItem : CustomPropertyItem
-  {
-    #region Properties
-
-    #region IsReadOnly
-
-    /// <summary>
-    /// Identifies the IsReadOnly dependency property
-    /// </summary>
-    public static readonly DependencyProperty IsReadOnlyProperty =
-        DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
-
-    public bool IsReadOnly
-    {
-      get { return ( bool )GetValue( IsReadOnlyProperty ); }
-      set { SetValue( IsReadOnlyProperty, value ); }
-    }
-
-    #endregion //IsReadOnly
-
-    #region IsInValid
-
-    /// <summary>
-    /// Identifies the IsInvalid dependency property
-    /// </summary>
-    public static readonly DependencyProperty IsInvalidProperty =
-        DependencyProperty.Register( "IsInvalid", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsInvalidChanged ) );
-
-    public bool IsInvalid
-    {
-      get
-      {
-        return ( bool )GetValue( IsInvalidProperty );
-      }
-      internal set
-      {
-        SetValue( IsInvalidProperty, value );
-      }
-    }
-
-    private static void OnIsInvalidChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnIsInvalidChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsInvalidChanged( bool oldValue, bool newValue )
-    {
-      var be = this.GetBindingExpression( PropertyItem.ValueProperty );
-
-      if( newValue )
-      {
-        var validationError = new ValidationError( new InvalidValueValidationRule(), be );
-        validationError.ErrorContent = "Value could not be converted.";
-        Validation.MarkInvalid( be, validationError );
-      }
-      else
-      {
-        Validation.ClearInvalid( be );
-      }
-    }
-
-
-    #endregion // IsInvalid
-
-    #region PropertyDescriptor
-
-    public PropertyDescriptor PropertyDescriptor
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //PropertyDescriptor
-
-    #region PropertyName
-
-    public string PropertyName
-    {
-      get
-      {
-        return (this.DescriptorDefinition != null) ? this.DescriptorDefinition.PropertyName : null;
-      }
-    }
-
-    #endregion
-
-    #region PropertyType
-
-    public Type PropertyType
-    {
-      get
-      {
-        return ( PropertyDescriptor != null )
-          ? PropertyDescriptor.PropertyType
-          : null;
-      }
-    }
-
-    #endregion //PropertyType
-
-    #region DescriptorDefinition
-
-    internal DescriptorPropertyDefinitionBase DescriptorDefinition
-    {
-      get;
-      private set;
-    }
-
-    #endregion DescriptorDefinition    
-
-    #region Instance
-
-    public object Instance
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //Instance
-
-    #endregion //Properties
-
-    #region Overrides
-
-    protected override string GetPropertyItemName()
-    {
-      return this.PropertyName;
-    }
-
-    protected override Type GetPropertyItemType()
-    {
-      return this.PropertyType;
-    }
-
-    protected override void OnIsExpandedChanged( bool oldValue, bool newValue )
-    {
-      if( newValue && this.IsLoaded )
-      {
-        this.GenerateExpandedPropertyItems();
-      }
-    }
-
-    protected override object OnCoerceValueChanged( object baseValue )
-    {
-      // Propagate error from DescriptorPropertyDefinitionBase to PropertyItem.Value
-      // to see the red error rectangle in the propertyGrid.
-      BindingExpression be = this.GetBindingExpression( PropertyItem.ValueProperty );
-      this.SetRedInvalidBorder( be );
-      return baseValue;
-    }
-
-    protected override void OnValueChanged( object oldValue, object newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-
-      // A Default Value is defined and newValue is null => set the Default Value
-      if( ( newValue == null ) && ( this.DescriptorDefinition != null ) && ( this.DescriptorDefinition.DefaultValue != null ) )
-      {
-#if VS2008
-        this.Value = this.DescriptorDefinition.DefaultValue;
-#else
-        this.SetCurrentValue( PropertyItem.ValueProperty, this.DescriptorDefinition.DefaultValue );
-#endif
-      }
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void SetRedInvalidBorder( BindingExpression be )
-    {
-      if( (be != null) && be.DataItem is DescriptorPropertyDefinitionBase )
-      {
-        DescriptorPropertyDefinitionBase descriptor = be.DataItem as DescriptorPropertyDefinitionBase;
-        if( Validation.GetHasError( descriptor ) )
-        {
-          ReadOnlyObservableCollection<ValidationError> errors = Validation.GetErrors( descriptor );
-          Validation.MarkInvalid( be, errors[ 0 ] );
-        }
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void OnDefinitionContainerHelperInvalidated( object sender, EventArgs e )
-    {
-      if( this.ContainerHelper != null )
-      {
-        this.ContainerHelper.ClearHelper();
-      }
-      var helper = this.DescriptorDefinition.CreateContainerHelper( this );
-      this.ContainerHelper = helper;
-      if( this.IsExpanded )
-      {
-        helper.GenerateProperties();
-      }
-    }
-
-    private void Init( DescriptorPropertyDefinitionBase definition )
-    {
-      if( definition == null )
-        throw new ArgumentNullException( "definition" );
-
-      if( this.ContainerHelper != null )
-      {
-        this.ContainerHelper.ClearHelper();
-      }
-      this.DescriptorDefinition = definition;
-      this.ContainerHelper = definition.CreateContainerHelper( this );
-      definition.ContainerHelperInvalidated += new EventHandler( OnDefinitionContainerHelperInvalidated );
-      this.Loaded += this.PropertyItem_Loaded;
-    }
-
-    private void GenerateExpandedPropertyItems()
-    {
-      if( this.IsExpanded )
-      {
-        // This withholds the generation of all PropertyItem instances (recursively)
-        // until the PropertyItem is expanded.
-        var objectContainerHelper = ContainerHelper as ObjectContainerHelperBase;
-        if( objectContainerHelper != null )
-        {
-          objectContainerHelper.GenerateProperties();
-        }
-      }
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    private void PropertyItem_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.GenerateExpandedPropertyItems();
-    }
-
-    #endregion
-
-    #region Constructors
-
-    internal PropertyItem( DescriptorPropertyDefinitionBase definition )
-      : base( definition.IsPropertyGridCategorized, !definition.PropertyType.IsArray )
-    {
-      this.Init( definition );
-    }
-
-    #endregion //Constructors
-
-    private class InvalidValueValidationRule : ValidationRule
-    {
-      public override ValidationResult Validate( object value, CultureInfo cultureInfo )
-      {
-        // Will always return an error.
-        return new ValidationResult( false, null );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
deleted file mode 100644
index 5d80bac9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
+++ /dev/null
@@ -1,602 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-using System.Windows.Media;
-using System.Windows.Data;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-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;
-    internal bool _isPropertyGridCategorized;
-    internal bool _isSortedAlphabetically = true;
-
-    #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 )
-    {
-      PropertyItemBase propertyItem = o as PropertyItemBase;
-      if( propertyItem != null )
-        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
-    }
-
-    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
-    {
-    }
-
-    #endregion //Editor
-
-    #region HighlightedText
-
-    public static readonly DependencyProperty HighlightedTextProperty = DependencyProperty.Register( "HighlightedText", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
-
-    public string HighlightedText
-    {
-      get
-      {
-        return ( string )GetValue( HighlightedTextProperty );
-      }
-      set
-      {
-        SetValue( HighlightedTextProperty, value );
-      }
-    }
-
-    #endregion //HighlightedText
-
-    #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
-      {
-        if( _containerHelper == null )
-        {
-          _containerHelper = new ObjectContainerHelper( this, null );
-        }
-        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
-
-    #region WillRefreshPropertyGrid
-
-    public static readonly DependencyProperty WillRefreshPropertyGridProperty =
-        DependencyProperty.Register( "WillRefreshPropertyGrid", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false ) );
-
-    public bool WillRefreshPropertyGrid
-    {
-      get
-      {
-        return ( bool )GetValue( WillRefreshPropertyGridProperty );
-      }
-      set
-      {
-        SetValue( WillRefreshPropertyGridProperty, value );
-      }
-    }
-
-    #endregion //WillRefreshPropertyGrid
-
-    #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()
-    {
-      this.GotFocus += new RoutedEventHandler( PropertyItemBase_GotFocus );
-      this.RequestBringIntoView += this.PropertyItemBase_RequestBringIntoView;
-      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;
-    }
-
-    private void PropertyItemBase_RequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-    {
-      e.Handled = true;
-    }
-
-    #endregion  //Event Handlers
-
-    #region Methods
-
-    protected virtual Type GetPropertyItemType()
-    {
-      return null;
-    }
-
-    protected virtual string GetPropertyItemName()
-    {
-      return this.DisplayName;
-    }
-
-    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.IsLoaded 
-        && (_parentNode != null) 
-        && !_parentNode.ContainerHelper.IsCleaning)
-      {
-        this.RaisePropertyChanged( e.Property.Name );
-      }
-    }
-
-    private PropertyDefinitionCollection GetPropertItemPropertyDefinitions()
-    {
-      if( (this.ParentNode != null) && (this.ParentNode.PropertyDefinitions != null) )
-      {
-        var name = this.GetPropertyItemName();
-        foreach( var pd in this.ParentNode.PropertyDefinitions )
-        {
-          if( pd.TargetProperties.Contains( name ) )
-          {
-            // PropertyDefinitions contains a PropertyDefinition for this PropertyItem Name => return its PropertyDefinitions.
-            return pd.PropertyDefinitions;
-          }
-          else
-          {
-            var type = this.GetPropertyItemType();
-            if( type != null )
-            {
-              foreach( var targetProperty in pd.TargetProperties )
-              {
-                var targetPropertyType = targetProperty as Type;
-                // PropertyDefinitions contains a PropertyDefinition for this PropertyItem Type => return its PropertyDefinitions.
-                if( (targetPropertyType != null) && targetPropertyType.IsAssignableFrom( type ) )
-                  return pd.PropertyDefinitions;
-              }
-            }
-          }
-        }
-      }
-      return null;
-    }
-
-    #endregion //Methods
-
-    #region IPropertyContainer Members
-
-
-
-
-
-
-    Style IPropertyContainer.PropertyContainerStyle
-    {
-      get { return this.PropertyContainerStyle; }
-    }
-
-    EditorDefinitionCollection IPropertyContainer.EditorDefinitions
-    {
-      get
-      {
-        return (this.ParentNode != null) ? this.ParentNode.EditorDefinitions : null;
-      }
-    }
-
-    PropertyDefinitionCollection IPropertyContainer.PropertyDefinitions
-    {
-      get
-      {
-        return this.GetPropertItemPropertyDefinitions();
-      }
-    }
-
-    ContainerHelperBase IPropertyContainer.ContainerHelper 
-    {
-      get
-      {
-        return this.ContainerHelper;
-      }
-    }
-
-    bool IPropertyContainer.IsCategorized 
-    {
-      get
-      {
-        return _isPropertyGridCategorized;
-      }
-    }
-
-    bool IPropertyContainer.IsSortedAlphabetically
-    {
-      get
-      {
-        return _isSortedAlphabetically;
-      }
-    }
-
-    bool IPropertyContainer.AutoGenerateProperties
-    {
-      get
-      {
-        if( this.ParentNode != null )
-        {
-          var propertyItemPropertyDefinitions = this.GetPropertItemPropertyDefinitions();
-          // No PropertyDefinitions specified : show all properties of this PropertyItem.
-          if( (propertyItemPropertyDefinitions == null) || (propertyItemPropertyDefinitions.Count == 0) )
-            return true;
-
-          // A PropertyDefinitions is specified : show only the properties of the PropertyDefinitions from this PropertyItem.
-          return this.ParentNode.AutoGenerateProperties;
-        }
-        return true;
-      }
-    }
-
-    bool IPropertyContainer.HideInheritedProperties
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    FilterInfo IPropertyContainer.FilterInfo
-    {
-      get { return new FilterInfo(); }
-    }
-
-    bool? IPropertyContainer.IsPropertyVisible( PropertyDescriptor pd )
-    {
-      if( _parentNode != null )
-      {
-        return _parentNode.IsPropertyVisible( pd );
-      }
-
-      return null;
-    }
-
-
-
-#endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
deleted file mode 100644
index 5f54fd2b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using System.Linq;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Reflection;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyItemCollection : ReadOnlyObservableCollection<PropertyItem>
-  {
-    internal static readonly string CategoryPropertyName;
-    internal static readonly string CategoryOrderPropertyName;
-    internal static readonly string PropertyOrderPropertyName;
-    internal static readonly string DisplayNamePropertyName;
-
-    private bool _preventNotification;
-
-    static PropertyItemCollection()
-    {
-      PropertyItem p = null;
-      CategoryPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.Category );
-      CategoryOrderPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.CategoryOrder );
-      PropertyOrderPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.PropertyOrder );
-      DisplayNamePropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.DisplayName );
-    }
-
-    public PropertyItemCollection(ObservableCollection<PropertyItem> editableCollection)
-      :base(editableCollection)
-    {
-      EditableCollection = editableCollection;
-    }
-
-    internal Predicate<object> FilterPredicate
-    {
-      get { return GetDefaultView().Filter; }
-      set { GetDefaultView().Filter = value; }
-    }
-
-    public ObservableCollection<PropertyItem> EditableCollection { get; private set; }
-
-    private ICollectionView GetDefaultView()
-    {
-      return CollectionViewSource.GetDefaultView( this );
-    }
-
-    public void GroupBy( string name )
-    {
-      GetDefaultView().GroupDescriptions.Add( new PropertyGroupDescription( name ) );
-    }
-
-    public void SortBy( string name, ListSortDirection sortDirection )
-    {
-      GetDefaultView().SortDescriptions.Add( new SortDescription( name, sortDirection ) );
-    }
-
-    public void Filter( string text )
-    {
-      Predicate<object> filter = PropertyItemCollection.CreateFilter( text, this.Items, null );
-      GetDefaultView().Filter = filter;
-    }
-
-    protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs args )
-    {
-      if( _preventNotification )
-        return;
-
-      base.OnCollectionChanged( args );
-    }
-
-    internal void UpdateItems( IEnumerable<PropertyItem> newItems )
-    {
-      if( newItems == null )
-        throw new ArgumentNullException( "newItems" );
-
-      _preventNotification = true;
-      using( GetDefaultView().DeferRefresh() )
-      {
-        EditableCollection.Clear();
-        foreach( var item in newItems )
-        {
-          this.EditableCollection.Add( item );
-        }
-      }
-      _preventNotification = false;
-      OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-    }
-
-    internal void UpdateCategorization( GroupDescription groupDescription, bool isPropertyGridCategorized, bool sortAlphabetically )
-    {
-      // Compute Display Order relative to PropertyOrderAttributes on PropertyItem
-      // which could be different in Alphabetical or Categorized mode.
-      foreach( PropertyItem item in this.Items )
-      {
-        item.DescriptorDefinition.DisplayOrder = item.DescriptorDefinition.ComputeDisplayOrderInternal( isPropertyGridCategorized );
-        item.PropertyOrder = item.DescriptorDefinition.DisplayOrder;
-      }
-
-      // Clear view values
-      ICollectionView view = this.GetDefaultView();
-      using( view.DeferRefresh() )
-      {
-        view.GroupDescriptions.Clear();
-        view.SortDescriptions.Clear();
-
-        // Update view values
-        if( groupDescription != null )
-        {
-          view.GroupDescriptions.Add( groupDescription );
-          if( sortAlphabetically )
-          {
-            SortBy( CategoryOrderPropertyName, ListSortDirection.Ascending );
-            SortBy( CategoryPropertyName, ListSortDirection.Ascending );
-          }
-        }
-
-        if( sortAlphabetically )
-        {
-          SortBy( PropertyOrderPropertyName, ListSortDirection.Ascending );
-          SortBy( DisplayNamePropertyName, ListSortDirection.Ascending );
-        }
-      }
-    }
-
-    internal void RefreshView()
-    {
-      GetDefaultView().Refresh();
-    }
-
-    internal static Predicate<object> CreateFilter( string text, IList<PropertyItem> PropertyItems, IPropertyContainer propertyContainer )
-    {
-      Predicate<object> filter = null;
-
-      if( !string.IsNullOrEmpty( text ) )
-      {
-        filter = ( item ) =>
-        {
-          var property = item as PropertyItem;
-          if( property.DisplayName != null )
-          {
-#if !VS2008
-            var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( property.PropertyDescriptor );
-            if( displayAttribute != null )
-            {
-              var canBeFiltered = displayAttribute.GetAutoGenerateFilter();
-              if( canBeFiltered.HasValue && !canBeFiltered.Value )
-                return false;
-            }
-#endif
-            property.HighlightedText = property.DisplayName.ToLower().Contains( text.ToLower() ) ? text : null;
-            return (property.HighlightedText != null);
-          }
-
-          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
deleted file mode 100644
index 2839de49..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Windows;
-using System.ComponentModel;
-
-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
-  {
-    public PropertyItemsControl()
-    {
-      var propertyItemsControlProperties = TypeDescriptor.GetProperties( this, new Attribute[] { new PropertyFilterAttribute( PropertyFilterOptions.All ) } );
-      var prop1 = propertyItemsControlProperties.Find( "VirtualizingPanel.IsVirtualizingWhenGrouping", false );
-      if( prop1 != null )
-      {
-        prop1.SetValue( this, true );
-      }
-      var prop2 = propertyItemsControlProperties.Find( "VirtualizingPanel.CacheLengthUnit", false );
-      if( prop2 != null )
-      {
-        prop2.SetValue( this, Enum.ToObject( prop2.PropertyType, 1 ) );
-      }
-    }
-
-    #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/StringConstants.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
deleted file mode 100644
index dd3ce60c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public static class StringConstants
-  {
-    public static string Local
-    {
-      get { return "Local"; }
-    }
-
-    public static string Resource
-    {
-      get { return "Resource"; }
-    }
-
-    public static string Databinding
-    {
-      get { return "Databinding"; }
-    }
-
-    public static string Inheritance
-    {
-      get { return "Inheritance"; }
-    }
-
-    public static string StyleSetter
-    {
-      get { return "Style Setter"; }
-    }
-
-    public static string Default
-    {
-      get { return "Default"; }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
deleted file mode 100644
index d1445c04..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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/Implementation/TrimmedTextBlock.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
deleted file mode 100644
index d0fbbd9b..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Documents;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class TrimmedTextBlock : TextBlock
-  {
-    #region Constructor
-
-    public TrimmedTextBlock()
-    {
-      this.SizeChanged += this.TrimmedTextBlock_SizeChanged;
-    }
-
-    #endregion
-
-    #region IsTextTrimmed Property
-
-    public static readonly DependencyProperty IsTextTrimmedProperty = DependencyProperty.Register( "IsTextTrimmed", typeof( bool ), typeof( TrimmedTextBlock ), new PropertyMetadata( false, OnIsTextTrimmedChanged ) );
-    public bool IsTextTrimmed
-    {
-      get
-      {
-        return ( bool )GetValue( IsTextTrimmedProperty );
-      }
-      private set
-      {
-        SetValue( IsTextTrimmedProperty, value );
-      }
-    }
-
-    private static void OnIsTextTrimmedChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      var textBlock = d as TrimmedTextBlock;
-      if( textBlock != null )
-      {
-        textBlock.OnIsTextTrimmedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-      }
-    }
-
-    private void OnIsTextTrimmedChanged( bool oldValue, bool newValue )
-    {
-        this.ToolTip = ( newValue ) ? this.Text : null;
-    }
-
-    #endregion
-
-    #region HighlightedBrush
-
-    public static readonly DependencyProperty HighlightedBrushProperty = DependencyProperty.Register( "HighlightedBrush", typeof( Brush ), typeof( TrimmedTextBlock ), new FrameworkPropertyMetadata( Brushes.Yellow ) );
-
-    public Brush HighlightedBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( HighlightedBrushProperty );
-      }
-      set
-      {
-        SetValue( HighlightedBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region HighlightedText
-
-    public static readonly DependencyProperty HighlightedTextProperty = DependencyProperty.Register( "HighlightedText", typeof( string ), typeof( TrimmedTextBlock ), new FrameworkPropertyMetadata( null, HighlightedTextChanged ) );
-
-    public string HighlightedText
-    {
-      get
-      {
-        return ( string )GetValue( HighlightedTextProperty );
-      }
-      set
-      {
-        SetValue( HighlightedTextProperty, value );
-      }
-    }
-
-    private static void HighlightedTextChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var trimmedTextBlock = sender as TrimmedTextBlock;
-      if( trimmedTextBlock != null )
-      {
-        trimmedTextBlock.HighlightedTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-      }
-    }
-
-    protected virtual void HighlightedTextChanged( string oldValue, string newValue )
-    {
-      if( this.Text.Length == 0 )
-        return;
-
-      // Set original text without highlight.
-      if( newValue == null )
-      {
-        var newrRun = new Run( this.Text );
-        this.Inlines.Clear();        
-        this.Inlines.Add( newrRun );
-
-        return;
-      }
-
-      var startHighlightedIndex = this.Text.IndexOf( newValue, StringComparison.InvariantCultureIgnoreCase );
-      var endHighlightedIndex = startHighlightedIndex + newValue.Length;
-
-      var startUnHighlightedText = this.Text.Substring( 0, startHighlightedIndex );
-      var highlightedText = this.Text.Substring( startHighlightedIndex, newValue.Length );
-      var endUnHighlightedText = this.Text.Substring( endHighlightedIndex, this.Text.Length - endHighlightedIndex );
-
-      this.Inlines.Clear();
-
-      // Start Un-Highlighted text
-      var run = new Run( startUnHighlightedText );
-      this.Inlines.Add( run );
-
-      // Highlighted text
-      run = new Run( highlightedText );
-      run.Background = this.HighlightedBrush;
-      this.Inlines.Add( run );
-
-      // End Un-Highlighted text
-      run = new Run( endUnHighlightedText );
-      this.Inlines.Add( run );
-    }
-
-    #endregion
-
-    #region Event Handler
-
-    private void TrimmedTextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
-    {
-      var textBlock = sender as TextBlock;
-      if( textBlock != null )
-      {
-        this.IsTextTrimmed = this.GetIsTextTrimmed( textBlock );
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private bool GetIsTextTrimmed( TextBlock textBlock )
-    {
-      if( textBlock == null )
-        return false;
-      if( textBlock.TextTrimming == TextTrimming.None )
-        return false;
-      if( textBlock.TextWrapping != TextWrapping.NoWrap )
-        return false;
-
-      var textBlockActualWidth = textBlock.ActualWidth;
-      textBlock.Measure( new Size( double.MaxValue, double.MaxValue ) );
-      var textBlockDesiredWidth = textBlock.DesiredSize.Width;
-
-      return ( textBlockActualWidth < textBlockDesiredWidth );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 58950ea9..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,1306 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:editor="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Editors"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    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 Source="../../NumericUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../DateTimeUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../TimeSpanUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../WatermarkTextBox/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../ColorPicker/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../CollectionControl/Themes/Aero2.NormalColor.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- PropertyGrid                                                                    -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:HalfConverter x:Key="HalfConverter" />
-  <conv:NullToBoolConverter x:Key="NullToBoolConverter" />
-  <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
-  <pgconv:ObjectToUIElementConverter x:Key="ObjectToUIElementConverter" />
-  <pgconv:IsStringEmptyConverter x:Key="IsStringEmptyConverter" />
-  <pgconv:IsDefaultCategoryConverter x:Key="IsDefaultCategoryConverter" />
-  <pgconv:SelectedObjectConverter x:Key="objectConverter" />
-  <pgconv:PropertyItemEditorConverter x:Key="PropertyItemEditorConverter" />
-
-  <x:Static x:Key="EmptyString"
-            Member="sys:String.Empty" />
-
-  <!-- PropertyGrid numeric Editors -->
-  <Style x:Key="PropertyGridNumericUpDown"
-         TargetType="{x:Type prim:InputBase}"
-         BasedOn="{StaticResource NumericUpDown}">
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid DateTime Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorDateTimeUpDown}"
-         BasedOn="{StaticResource DateTimeUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TimeSpan Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTimeSpanUpDown}"
-         BasedOn="{StaticResource TimeSpanUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid ComboBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorComboBox}"
-         BasedOn="{StaticResource {x:Type ComboBox}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="Background"
-                Value="Transparent" />
-      </MultiTrigger>
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid CheckBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCheckBox}"
-         BasedOn="{StaticResource {x:Type CheckBox}}">
-    <Setter Property="Margin"
-            Value="5,0,0,0" />
-  </Style>
-
-  <!-- PropertyGrid TextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TextBlock Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBlock}"
-         BasedOn="{StaticResource {x:Type TextBlock}}">
-    <Setter Property="Foreground"
-            Value="Gray" />
-  </Style>
-
-  <!-- PropertyGrid MaskedTextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorMaskedTextBox}"
-         BasedOn="{StaticResource {x:Type TextBox}}">
-  </Style>
-
-  <!-- PropertyGrid ColorPicker Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorColorPicker}"
-         BasedOn="{StaticResource ColorPicker}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowDropDownButton"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- PropertyGrid PrimitiveTypeCollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorPrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-  </Style>
-
-  <!-- PropertyGrid CollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCollectionControl}"
-         BasedOn="{StaticResource CollectionControlButton}">
-  </Style>
-
-  <!-- ===============================================================================   -->
-  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- Internal PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-
-
-  <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>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="20" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <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>
-
-      <ContentPresenter Grid.Column="1" />
-    </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">
-              <ToggleButton Template="{StaticResource ExpanderToggleButton}"
-                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            OverridesDefaultStyle="True">
-                <ContentPresenter Margin="1"
-                                  RecognizesAccessKey="True"
-                                  ContentSource="Header"
-                                  TextElement.FontWeight="Bold" />
-              </ToggleButton>
-            </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>
-
-  <Style x:Key="PropertyItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Style.Resources>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border>
-            <Expander x:Name="expander"
-                      Header="{Binding Name}"
-                      Style="{StaticResource ExpanderStyle}"
-                      IsExpanded="True">
-              <ItemsPresenter />
-            </Expander>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-
-    <Style.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding Name, Converter={StaticResource IsDefaultCategoryConverter}}"
-                     Value="True" />
-          <Condition Binding="{Binding IsMiscCategoryLabelHidden, RelativeSource={RelativeSource AncestorType={x:Type pg:PropertyGrid}}}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type GroupItem}">
-              <!-- No Expander for the Misc Category if IsMiscCategoryLabelHidden == true-->
-              <ItemsPresenter />
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </MultiDataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="SingleDefaultCategoryItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <!-- No Expander for the Misc Category if Misc category is the only category-->
-          <ItemsPresenter />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ContextMenu x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}">
-    <MenuItem Header="Reset Value"
-              Command="commands:PropertyItemCommands.ResetValue"
-              CommandParameter="{Binding}"
-              CommandTarget="{Binding Path=PlacementTarget, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}}"/>
-  </ContextMenu>
-
-  <pg:CategoryGroupStyleSelector x:Key="categoryGroupStyleSelector"
-                                 SingleDefaultCategoryItemGroupStyle="{StaticResource SingleDefaultCategoryItemGroupContainerStyle}"
-                                 ItemGroupStyle="{StaticResource PropertyItemGroupContainerStyle}" />
-
-  <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="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <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}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      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 x:Name="_expandableButton"
-                                  Grid.Column="0"
-                                  Template="{StaticResource ExpanderToggleButton}"
-                                  OverridesDefaultStyle="True"
-                                  IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    </ToggleButton>
-
-                    <pg:TrimmedTextBlock x:Name="_text"
-                                         Grid.Column="1"
-                                         Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HighlightedText="{Binding HighlightedText, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HorizontalAlignment="Stretch"
-                                         VerticalAlignment="Center"
-                                         TextTrimming="CharacterEllipsis"
-                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
-                      </pg:TrimmedTextBlock>
-                  </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}}">
-
-                    <!-- ImageSource is set in Triggers for others Themes to set their proper icons -->
-                    <Image x:Name="_optionsImage"
-                           Width="11"
-                           Height="11"
-                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
-                    </Image>
-                  </Grid>
-                </Grid>
-              </Border>
-
-              <Border x:Name="PART_Editor"
-                      Grid.Column="1"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      KeyboardNavigation.DirectionalNavigation="None"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <Border.ToolTip>
-                  <ToolTip Visibility="Collapsed" />
-                </Border.ToolTip>
-                <ContentControl x:Name="PART_ValueContainer"
-                                Focusable="False"
-                                IsTabStop="False"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <ContentControl.Content>
-                    <MultiBinding Converter="{StaticResource PropertyItemEditorConverter}">
-                      <Binding Path="Editor" 
-                               RelativeSource="{RelativeSource TemplatedParent}" />
-                      <Binding Path="IsReadOnly"
-                               RelativeSource="{RelativeSource AncestorType={x:Type pg:PropertyGrid}}" />
-                    </MultiBinding>
-                  </ContentControl.Content>
-                </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}}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </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}}" />
-              <Setter Property="Foreground"
-                      TargetName="_text"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding ShowDescriptionByTooltip, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                           Value="True" />
-                <Condition Binding="{Binding Description, RelativeSource={RelativeSource Self}, Converter={StaticResource IsStringEmptyConverter}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="ToolTipService.ToolTip"
-                      Value="{Binding Description, RelativeSource={RelativeSource TemplatedParent}}"
-                      TargetName="PART_Name" />
-            </MultiDataTrigger>
-            <Trigger Property="Validation.HasError"
-                     Value="true">
-              <Setter Property="ToolTip"
-                      Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-            </Trigger>
-            <Trigger Property="Visibility"
-                     Value="Visible"
-                     SourceName="_expandableButton">
-              <Setter Property="Focusable"
-                      Value="False" />
-            </Trigger>
-
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Local}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Local11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Resource}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Resource11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Databinding}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Database11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Inheritance}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Inheritance11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.StyleSetter}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Style11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Default}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/AdvancedProperties11.png" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type pg:PropertyGrid}">
-    <Setter Property="AdvancedOptionsMenu"
-            Value="{StaticResource {ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}}" />
-    <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, Converter={StaticResource objectConverter}, ConverterParameter=SelectedObjectName}" />
-    <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 x:Name="selectObjectNamePanel"
-                          Orientation="Horizontal">
-                <Border Background="White"
-                        BorderBrush="Black"
-                        Visibility="{Binding ShowPreview, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        BorderThickness="1"
-                        Width="44"
-                        Height="44"
-                        Margin="6,4,0,4"
-                        Padding="2">
-                  <Rectangle>
-                    <Rectangle.Fill>
-                      <VisualBrush Stretch="Uniform"
-                                   Visual="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ObjectToUIElementConverter}, Path=SelectedObject}" />
-                    </Rectangle.Fill>
-                  </Rectangle>
-                </Border>
-                <StackPanel Orientation="Horizontal"
-                            VerticalAlignment="Center"
-                            Margin="6,2,6,4"
-                            Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
-                                         TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}"
-                        Margin="5,0,0,0">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectName}"
-                                         TextTrimming="CharacterEllipsis">
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                </StackPanel>
-              </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" >
-                      </Image>
-                    </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" >
-                      </Image>
-                    </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}"
-                                            BorderThickness="1">
-                      <local:WatermarkTextBox.Style>
-                        <Style TargetType="Control">
-                          <Setter Property="BorderBrush"
-                                  Value="Transparent" />
-                          <Style.Triggers>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                              <Setter Property="BorderBrush"
-                                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-                            </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" >
-                      </Image>
-                    </Button>
-                  </Grid>
-                </Border>
-              </Grid>
-
-              <Grid Grid.Row="2"
-                    Background="{x:Static SystemColors.WindowBrush}">
-                <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}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource TemplatedParent}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True"
-                                         VerticalAlignment="Top">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer x:Name="ScrollBar"
-                                      Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="Disabled">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                      <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding ShowHorizontalScrollBar, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                     Value="True">
-                          <Setter Property="HorizontalScrollBarVisibility"
-                                  Value="Auto"
-                                  TargetName="ScrollBar" />
-                        </DataTrigger>
-                      </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-
-                <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}}">
-              </GridSplitter>
-              <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>
-                <TextBlock Padding="5 2 2 0"
-                           TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}">
-                </TextBlock>
-              </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
deleted file mode 100644
index 215239fd..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
+++ /dev/null
@@ -1,1425 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:editor="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Editors"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    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:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../NumericUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../DateTimeUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../TimeSpanUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../WatermarkTextBox/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../ColorPicker/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../CollectionControl/Themes/Generic.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- PropertyGrid                                                                    -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:HalfConverter x:Key="HalfConverter" />
-  <conv:NullToBoolConverter x:Key="NullToBoolConverter" />
-  <pgconv:ObjectToUIElementConverter x:Key="ObjectToUIElementConverter" />
-  <pgconv:IsStringEmptyConverter x:Key="IsStringEmptyConverter" />
-  <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
-  <pgconv:IsDefaultCategoryConverter x:Key="IsDefaultCategoryConverter" />
-  <pgconv:SelectedObjectConverter x:Key="objectConverter" />
-  <pgconv:PropertyItemEditorConverter x:Key="PropertyItemEditorConverter" />
-
-  <x:Static x:Key="EmptyString"
-            Member="sys:String.Empty" />
-
-  <!-- PropertyGrid numeric Editors -->
-  <Style x:Key="PropertyGridNumericUpDown"
-         TargetType="{x:Type prim:InputBase}"
-         BasedOn="{StaticResource NumericUpDown}">
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid DateTime Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorDateTimeUpDown}"
-         BasedOn="{StaticResource DateTimeUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TimeSpan Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTimeSpanUpDown}"
-         BasedOn="{StaticResource TimeSpanUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid ComboBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorComboBox}"
-         BasedOn="{StaticResource {x:Type ComboBox}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="Background"
-                Value="Transparent" />
-      </MultiTrigger>
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid CheckBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCheckBox}"
-         BasedOn="{StaticResource {x:Type CheckBox}}">
-    <Setter Property="Margin"
-            Value="5,0,0,0" />
-  </Style>
-
-  <!-- PropertyGrid TextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEnabled"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderThickness"
-                Value="0" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TextBlock Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBlock}"
-         BasedOn="{StaticResource {x:Type TextBlock}}">
-    <Setter Property="Foreground"
-            Value="Gray" />
-  </Style>
-
-  <!-- PropertyGrid MaskedTextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorMaskedTextBox}"
-         BasedOn="{StaticResource {x:Type TextBox}}">
-  </Style>
-
-  <!-- PropertyGrid ColorPicker Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorColorPicker}"
-         BasedOn="{StaticResource {x:Type local:ColorPicker}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowDropDownButton"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- PropertyGrid PrimitiveTypeCollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorPrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-  </Style>
-
-  <!-- PropertyGrid CollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCollectionControl}"
-         BasedOn="{StaticResource CollectionControlButton}">
-  </Style>
-
-  <!-- ===============================================================================   -->
-  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- Internal PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-
-  <SolidColorBrush x:Key="MouseOverBorderBrush"
-                   Color="#FFFFB700" />
-  <LinearGradientBrush x:Key="MouseOverBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFEFBF4" />
-    <GradientStop Offset="0.19"
-                  Color="#FFFDE7CE" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFDDEB8" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFCE6B" />
-    <GradientStop Offset="0.79"
-                  Color="#FFFFDE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFFFEBAA" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="CheckedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="CheckedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFFDCA0" />
-    <GradientStop Offset="0.18"
-                  Color="#FFFFD692" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFC45D" />
-    <GradientStop Offset="1"
-                  Color="#FFFFD178" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="PressedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="PressedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFE3C085" />
-    <GradientStop Offset="0.19"
-                  Color="#FFF4CC89" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5C777" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5BB56" />
-    <GradientStop Offset="0.79"
-                  Color="#FFF4CE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFF3E28D" />
-  </LinearGradientBrush>
-
-  <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="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      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="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </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="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </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="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      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="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </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="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <SolidColorBrush x:Key="GlyphBrush"
-                   Color="#FF31347C" />
-
-  <ControlTemplate x:Key="ExpanderToggleButton"
-                   TargetType="{x:Type ToggleButton}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="20" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <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>
-
-      <ContentPresenter Grid.Column="1" />
-    </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">
-              <ToggleButton Template="{StaticResource ExpanderToggleButton}"
-                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            OverridesDefaultStyle="True">
-                <ContentPresenter Margin="1"
-                                  RecognizesAccessKey="True"
-                                  ContentSource="Header"
-                                  TextElement.FontWeight="Bold" />
-              </ToggleButton>
-            </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>
-
-  <Style x:Key="PropertyItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Style.Resources>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border>
-            <Expander x:Name="expander"
-                      Header="{Binding Name}"
-                      Style="{StaticResource ExpanderStyle}"
-                      IsExpanded="True">
-              <ItemsPresenter />
-            </Expander>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding Name, Converter={StaticResource IsDefaultCategoryConverter}}"
-                     Value="True" />
-          <Condition Binding="{Binding IsMiscCategoryLabelHidden, RelativeSource={RelativeSource AncestorType={x:Type pg:PropertyGrid}}}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type GroupItem}">
-              <!-- No Expander for the Misc Category if IsMiscCategoryLabelHidden == true-->
-              <ItemsPresenter />
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </MultiDataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="SingleDefaultCategoryItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <!-- No Expander for the Misc Category if Misc category is the only category-->
-          <ItemsPresenter />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ContextMenu x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}">
-    <MenuItem Header="Reset Value"
-              Command="commands:PropertyItemCommands.ResetValue"
-              CommandParameter="{Binding}"
-              CommandTarget="{Binding Path=PlacementTarget, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}}"/>
-  </ContextMenu>
-
-  <pg:CategoryGroupStyleSelector x:Key="categoryGroupStyleSelector"
-                                 SingleDefaultCategoryItemGroupStyle="{StaticResource SingleDefaultCategoryItemGroupContainerStyle}"
-                                 ItemGroupStyle="{StaticResource PropertyItemGroupContainerStyle}" />
-
-
-  <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="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <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}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      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 x:Name="_expandableButton"
-                                  Grid.Column="0"
-                                  Template="{StaticResource ExpanderToggleButton}"
-                                  OverridesDefaultStyle="True"
-                                  IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                    </ToggleButton>
-
-                    <pg:TrimmedTextBlock x:Name="_text"
-                                         Grid.Column="1"
-                                         Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HighlightedText="{Binding HighlightedText, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HorizontalAlignment="Stretch"
-                                         VerticalAlignment="Center"
-                                         TextTrimming="CharacterEllipsis"
-                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
-                    </pg:TrimmedTextBlock>
-                  </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}}">
-
-                    <!-- ImageSource is set in Triggers for others Themes to set their proper icons -->
-                    <Image x:Name="_optionsImage"
-                           Width="11"
-                           Height="11"
-                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
-                    </Image>
-                  </Grid>
-                </Grid>
-              </Border>
-
-              <Border x:Name="PART_Editor"
-                      Grid.Column="1"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      KeyboardNavigation.DirectionalNavigation="None"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <Border.ToolTip>
-                  <ToolTip Visibility="Collapsed" />
-                </Border.ToolTip >
-                <ContentControl x:Name="PART_ValueContainer"
-                                Focusable="False"
-                                IsTabStop="False"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <ContentControl.Content>
-                    <MultiBinding Converter="{StaticResource PropertyItemEditorConverter}">
-                      <Binding Path="Editor"
-                               RelativeSource="{RelativeSource TemplatedParent}" />
-                      <Binding Path="IsReadOnly"
-                               RelativeSource="{RelativeSource AncestorType={x:Type pg:PropertyGrid}}" />
-                    </MultiBinding>
-                  </ContentControl.Content>
-                </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}}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-              </Expander>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="PART_Name"
-                      Property="Background"
-                      Value="#CED4DF" />
-            </Trigger>
-            <Trigger Property="IsSelected"
-                     Value="True">
-              <Setter TargetName="PART_Name"
-                      Property="Background"
-                      Value="#43577B" />
-              <Setter TargetName="PART_Name"
-                      Property="TextElement.Foreground"
-                      Value="White" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      TargetName="PART_ValueContainer"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-              <Setter Property="Foreground"
-                      TargetName="_text"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding ShowDescriptionByTooltip, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                           Value="True" />
-                <Condition Binding="{Binding Description, RelativeSource={RelativeSource Self}, Converter={StaticResource IsStringEmptyConverter}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="ToolTipService.ToolTip"
-                      Value="{Binding Description, RelativeSource={RelativeSource TemplatedParent}}"
-                      TargetName="PART_Name" />
-            </MultiDataTrigger>
-            <Trigger Property="Validation.HasError"
-                     Value="true">
-              <Setter Property="ToolTip"
-                      Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-            </Trigger>
-            <Trigger Property="Visibility"
-                     Value="Visible"
-                     SourceName="_expandableButton">
-              <Setter Property="Focusable"
-                      Value="False" />
-            </Trigger>
-
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Local}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Local11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Resource}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Resource11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Databinding}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Database11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Inheritance}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Inheritance11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.StyleSetter}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Style11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Default}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/AdvancedProperties11.png" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type pg:PropertyGrid}">
-    <Setter Property="AdvancedOptionsMenu"
-            Value="{StaticResource {ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}}" />
-    <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}" />
-    <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, Converter={StaticResource objectConverter}, ConverterParameter=SelectedObjectName}" />
-    <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 x:Name="selectObjectNamePanel"
-                          Orientation="Horizontal">
-                <Border Background="White"
-                        BorderBrush="Black"
-                        Visibility="{Binding ShowPreview, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        BorderThickness="1"
-                        Width="44"
-                        Height="44"
-                        Margin="6,4,0,4"
-                        Padding="2">
-                  <Rectangle>
-                    <Rectangle.Fill>
-                      <VisualBrush Stretch="Uniform"
-                                   Visual="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ObjectToUIElementConverter}, Path=SelectedObject}" />
-                    </Rectangle.Fill>
-                  </Rectangle>
-                </Border>
-                <StackPanel Orientation="Horizontal"
-                            VerticalAlignment="Center"
-                            Margin="6,2,6,4"
-                            Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
-                                         TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}"
-                        Margin="5,0,0,0">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectName}"
-                                         TextTrimming="CharacterEllipsis" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                </StackPanel>
-              </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" >
-                      </Image>
-                    </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" >
-                      </Image>
-                    </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}"
-                                            BorderThickness="1">
-                      <local:WatermarkTextBox.Style>
-                        <Style TargetType="Control">
-                          <Setter Property="BorderBrush"
-                                  Value="Transparent" />
-                          <Style.Triggers>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                              <Setter Property="BorderBrush"
-                                      Value="{StaticResource MouseOverBorderBrush}" />
-                            </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" >
-                      </Image>
-                    </Button>
-                  </Grid>
-                </Border>
-              </Grid>
-
-              <Grid Grid.Row="2"
-                    Background="{x:Static SystemColors.WindowBrush}">
-                <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}"
-                                          VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource TemplatedParent}}"
-                                          VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                          ScrollViewer.CanContentScroll="True"
-                                          VerticalAlignment="Top">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer x:Name="ScrollBar"
-                                      Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="Disabled">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                      <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding ShowHorizontalScrollBar, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                     Value="True">
-                          <Setter Property="HorizontalScrollBarVisibility"
-                                  Value="Auto"
-                                  TargetName="ScrollBar" />
-                        </DataTrigger>
-                      </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-
-                <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}}" >
-               </GridSplitter>
-               <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>
-                <TextBlock Padding="5 2 2 0"
-                           TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" >
-                </TextBlock>
-              </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/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
index a36deced..33ce5170 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
index 40528354..31d310e6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -45,7 +45,7 @@ namespace Xceed.Wpf.Toolkit
     private Slider _higherSlider;
     private Track _lowerTrack;
     private Track _higherTrack;
-    private double _deferredUpdateValue;
+    private double? _deferredUpdateValue;
 
     #endregion Members
 
@@ -121,7 +121,8 @@ namespace Xceed.Wpf.Toolkit
     /// Get/Set the Brush for the Range between Higher and Maximum values. (Brush)
     /// </summary>
 
-    public static readonly DependencyProperty HigherRangeBackgroundProperty = DependencyProperty.Register( "HigherRangeBackground", typeof( Brush ), typeof( RangeSlider ) );
+    public static readonly DependencyProperty HigherRangeBackgroundProperty = DependencyProperty.Register( "HigherRangeBackground", typeof( Brush ), typeof( RangeSlider )
+      , new FrameworkPropertyMetadata( Brushes.Transparent ) );
 
     public Brush HigherRangeBackground
     {
@@ -304,7 +305,8 @@ namespace Xceed.Wpf.Toolkit
     /// Get/Set the Brush for the Range between Minimum and Lower values. (Brush)
     /// </summary>
 
-    public static readonly DependencyProperty LowerRangeBackgroundProperty = DependencyProperty.Register( "LowerRangeBackground", typeof( Brush ), typeof( RangeSlider ) );
+    public static readonly DependencyProperty LowerRangeBackgroundProperty = DependencyProperty.Register( "LowerRangeBackground", typeof( Brush ), typeof( RangeSlider )
+      , new FrameworkPropertyMetadata( Brushes.Transparent ) );
 
     public Brush LowerRangeBackground
     {
@@ -552,7 +554,8 @@ namespace Xceed.Wpf.Toolkit
     /// Get/Set the Brush for the Range between Lower and Higher values [active state]. (Brush)
     /// </summary>
 
-    public static readonly DependencyProperty RangeBackgroundProperty = DependencyProperty.Register( "RangeBackground", typeof( Brush ), typeof( RangeSlider ) );
+    public static readonly DependencyProperty RangeBackgroundProperty = DependencyProperty.Register( "RangeBackground", typeof( Brush ), typeof( RangeSlider )
+      , new FrameworkPropertyMetadata( Brushes.Transparent ) );
 
     public Brush RangeBackground
     {
@@ -820,7 +823,7 @@ namespace Xceed.Wpf.Toolkit
       return 0d;
     }
 
-    private void AdjustView()
+    private void AdjustView( bool isHigherValueChanged = false )
     {
       //Coerce values to make them consistent.
       var cv = this.GetCoercedValues();
@@ -844,18 +847,24 @@ namespace Xceed.Wpf.Toolkit
 
       actualWidth -= (lowerSliderThumbWidth + higherSliderThumbWidth);
 
-      this.SetLowerSliderValues( cv.LowerValue, cv.Minimum, cv.Maximum );
-      this.SetHigherSliderValues( cv.HigherValue, cv.Minimum, cv.Maximum );
+      if( !this.IsDeferredUpdateValues || ( _deferredUpdateValue == null ) )
+      {
+        this.SetLowerSliderValues( cv.LowerValue, cv.Minimum, cv.Maximum );
+        this.SetHigherSliderValues( cv.HigherValue, cv.Minimum, cv.Maximum );
+      }
 
       double entireRange = cv.Maximum - cv.Minimum;
 
       if( entireRange > 0 )
       {
-        this.HigherRangeWidth = (actualWidth * (cv.Maximum - cv.HigherValue)) / entireRange;
+        var higherValue = this.IsDeferredUpdateValues && isHigherValueChanged && (_deferredUpdateValue != null ) ? _deferredUpdateValue.Value : cv.HigherValue;
+        var lowerValue = this.IsDeferredUpdateValues && !isHigherValueChanged && ( _deferredUpdateValue != null ) ? _deferredUpdateValue.Value : cv.LowerValue;
+
+        this.HigherRangeWidth = (actualWidth * (cv.Maximum - higherValue ) ) / entireRange;
 
-        this.RangeWidth = (actualWidth * (cv.HigherValue - cv.LowerValue)) / entireRange;
+        this.RangeWidth = (actualWidth * ( higherValue - lowerValue ) ) / entireRange;
 
-        this.LowerRangeWidth = (actualWidth * (cv.LowerValue - cv.Minimum)) / entireRange;
+        this.LowerRangeWidth = (actualWidth * ( lowerValue - cv.Minimum)) / entireRange;
       }
       else
       {
@@ -935,19 +944,19 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-    private void UpdateHigherValue( double value )
+    private void UpdateHigherValue( double? value )
     {
       CoercedValues cv = this.GetCoercedValues();
-      double newValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, value ) );
+      double newValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, value.HasValue ? value.Value : 0d ) );
       newValue = Math.Max( newValue, cv.LowerValue );
       this.SetHigherSliderValues( newValue, null, null );
       this.HigherValue = newValue;
     }
 
-    private void UpdateLowerValue( double value )
+    private void UpdateLowerValue( double? value )
     {
       CoercedValues cv = this.GetCoercedValues();
-      double newValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, value ) );
+      double newValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, value.HasValue ? value.Value : 0d ) );
       newValue = Math.Min( newValue, cv.HigherValue );
       this.SetLowerSliderValues( newValue, null, null );
       this.LowerValue = newValue;
@@ -1035,6 +1044,7 @@ namespace Xceed.Wpf.Toolkit
         else
         {
           _deferredUpdateValue = e.NewValue;
+          this.AdjustView( false );
         }
       }
     }
@@ -1050,6 +1060,7 @@ namespace Xceed.Wpf.Toolkit
         else
         {
           _deferredUpdateValue = e.NewValue;
+          this.AdjustView( true );
         }
       }
     }
@@ -1059,6 +1070,8 @@ namespace Xceed.Wpf.Toolkit
       if( this.IsDeferredUpdateValues )
       {
         this.UpdateHigherValue( _deferredUpdateValue );
+        _deferredUpdateValue = null;
+        this.AdjustView();
       }
     }
 
@@ -1067,6 +1080,8 @@ namespace Xceed.Wpf.Toolkit
       if( this.IsDeferredUpdateValues )
       {
         this.UpdateLowerValue( _deferredUpdateValue );
+        _deferredUpdateValue = null;
+        this.AdjustView();
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
index f4890a1f..a58c326d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
index 95a47482..f8c5a693 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
index ddbdfd46..12749116 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
index bb6d1ff3..66ccc06c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
index aaca7b13..55c669b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
index 30ed667a..abd745c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
index 7bd70583..f0c68e47 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
index e8852f65..0c215aaa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
index 53b19dfa..b60e05c5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
index 1b3c53d9..084a818b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
index 8a6a8f75..c10d5de5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
index 1457bb50..b926f68f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
index 709437b9..faaadb09 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
index e541166f..78e656db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -58,7 +58,8 @@
                 SnapsToDevicePixels="True">
             <chrome:ButtonChrome x:Name="ControlChrome"
                                  Background="{TemplateBinding Background}"
-                                 RenderEnabled="{TemplateBinding IsEnabled}">
+                                 RenderEnabled="{TemplateBinding IsEnabled}"
+                                 BorderThickness="0">
               <Grid>
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="*" />
@@ -96,7 +97,6 @@
                 </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>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
index 7791fcf0..94f953ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -83,7 +83,8 @@
             <chrome:ButtonChrome x:Name="ControlChrome"
                                  Background="{TemplateBinding Background}"
                                  RenderEnabled="{TemplateBinding IsEnabled}"
-                                 CornerRadius="2.75">
+                                 CornerRadius="2.75"
+                                 BorderThickness="0">
               <Grid>
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="*" />
@@ -122,7 +123,6 @@
                 </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>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
index a452b362..4f625fca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/StyleableWindow.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/StyleableWindow.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/StyleableWindow.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
index bee48674..114ce037 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 61e2a4a9..42538f2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
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 124da4c7..09497391 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
index e9ff8926..c29150e5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -36,12 +36,10 @@
       <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/IconButton/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" />
@@ -50,7 +48,6 @@
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/RangeSlider/Themes/Aero2.NormalColor.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/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" />
@@ -58,7 +55,6 @@
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/WatermarkComboBox/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
index a0531d31..937eed58 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
index ec195aa7..26cd5266 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
index 0d24459a..982114da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
index 1f8f2b00..c868c00f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
index 0477349a..d88fc5c1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -35,13 +35,11 @@
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CheckComboBox/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CheckListBox/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ChildWindow/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CollectionControl/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ColorCanvas/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ColorPicker/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DropDownButton/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="IconButton/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Magnifier/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="MessageBox/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DateTimeUpDown/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DateTimePicker/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="MultiLineTextEditor/Themes/Generic.xaml" />
@@ -49,7 +47,6 @@
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Pie/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="RangeSlider/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="SplitButton/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="PropertyGrid/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="RichTextBoxFormatBar/Themes/Generic.xaml" />
 
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="TimePicker/Themes/Generic.xaml" />
@@ -57,6 +54,5 @@
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="WatermarkComboBox/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="WatermarkTextBox/Themes/Generic.xaml" />
       <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Wizard/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Zoombox/Themes/Generic.xaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
index 07fe1414..664e906e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
index f236d736..897f4cd1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
index d0c654f7..4c657f62 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
index 166236e8..644226b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
index f0fd7615..fae9f599 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
index f0fd7615..fae9f599 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
index 6d617a30..38e85255 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
index f0fd7615..fae9f599 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
index f0fd7615..fae9f599 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
index b7baac60..8b8e3229 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
index 41532b30..c27501be 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -16,517 +16,528 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Collections.Generic;
 using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit
 {
-  [TemplatePart( Name = PART_TimeListItems, Type = typeof( ListBox ) )]
-  public class TimePicker : DateTimePickerBase
-  {
-    private const string PART_TimeListItems = "PART_TimeListItems";
-
-    #region Members
-
-    private ListBox _timeListBox;
-    private bool _isListBoxInvalid = true;
-    internal static readonly TimeSpan EndTimeDefaultValue = new TimeSpan( 23, 59, 0 );
-    internal static readonly TimeSpan StartTimeDefaultValue = new TimeSpan( 0, 0, 0 );
-    internal static readonly TimeSpan TimeIntervalDefaultValue = new TimeSpan( 1, 0, 0 );
-
-    #endregion //Members
-
-    #region Properties
-
-    #region EndTime
-
-    public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register( "EndTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( EndTimeDefaultValue, new PropertyChangedCallback( OnEndTimeChanged ), new CoerceValueCallback( OnCoerceEndTime ) ) );
-
-    private static object OnCoerceEndTime( DependencyObject o, object value )
+    [TemplatePart(Name = PART_TimeListItems, Type = typeof(ListBox))]
+    public class TimePicker : DateTimePickerBase
     {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceEndTime( ( TimeSpan )value );
-      else
-        return value;
-    }
+        private const string PART_TimeListItems = "PART_TimeListItems";
 
-    private static void OnEndTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnEndTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
+        #region Members
 
-    protected virtual TimeSpan OnCoerceEndTime( TimeSpan value )
-    {
-      ValidateTime( value );
-      return value;
-    }
+        private ListBox _timeListBox;
+        private bool _isListBoxInvalid = true;
+        internal static readonly TimeSpan EndTimeDefaultValue = new TimeSpan(23, 59, 0);
+        internal static readonly TimeSpan StartTimeDefaultValue = new TimeSpan(0, 0, 0);
+        internal static readonly TimeSpan TimeIntervalDefaultValue = new TimeSpan(1, 0, 0);
 
-    protected virtual void OnEndTimeChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
+        #endregion //Members
 
-    public TimeSpan EndTime
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( EndTimeProperty );
-      }
-      set
-      {
-        SetValue( EndTimeProperty, value );
-      }
-    }
+        #region Properties
 
-    #endregion //EndTime
+        #region EndTime
 
-    #region Format
+        public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register("EndTime", typeof(TimeSpan), typeof(TimePicker), new UIPropertyMetadata(EndTimeDefaultValue, new PropertyChangedCallback(OnEndTimeChanged), new CoerceValueCallback(OnCoerceEndTime)));
 
-    protected override void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat newValue )
-    {
-      base.OnFormatChanged( oldValue, newValue );
-      InvalidateListBoxItems();
-    }
-
-    #endregion //Format
+        private static object OnCoerceEndTime(DependencyObject o, object value)
+        {
+            TimePicker timePicker = o as TimePicker;
+            if (timePicker != null)
+                return timePicker.OnCoerceEndTime((TimeSpan)value);
+            else
+                return value;
+        }
 
-    #region MaxDropDownHeight
+        private static void OnEndTimeChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
+        {
+            TimePicker timePicker = o as TimePicker;
+            if (timePicker != null)
+                timePicker.OnEndTimeChanged((TimeSpan)e.OldValue, (TimeSpan)e.NewValue);
+        }
 
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double ), typeof( TimePicker ), new UIPropertyMetadata( 130d, OnMaxDropDownHeightChanged ) );
-    public double MaxDropDownHeight
-    {
-      get
-      {
-        return ( double )GetValue( MaxDropDownHeightProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownHeightProperty, value );
-      }
-    }
+        protected virtual TimeSpan OnCoerceEndTime(TimeSpan value)
+        {
+            ValidateTime(value);
+            return value;
+        }
 
-    private static void OnMaxDropDownHeightChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnMaxDropDownHeightChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
+        protected virtual void OnEndTimeChanged(TimeSpan oldValue, TimeSpan newValue)
+        {
+            InvalidateListBoxItems();
+        }
 
-    protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
+        public TimeSpan? EndTime
+        {
+            get
+            {
+                return (TimeSpan?)GetValue(EndTimeProperty);
+            }
+            set
+            {
+                SetValue(EndTimeProperty, value);
+            }
+        }
 
-    #endregion
+        #endregion //EndTime
 
-    #region StartTime
+        #region Format
 
-    public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register( "StartTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( StartTimeDefaultValue, new PropertyChangedCallback( OnStartTimeChanged ), new CoerceValueCallback( OnCoerceStartTime ) ) );
+        protected override void OnFormatChanged(DateTimeFormat oldValue, DateTimeFormat newValue)
+        {
+            base.OnFormatChanged(oldValue, newValue);
+            InvalidateListBoxItems();
+        }
 
-    private static object OnCoerceStartTime( DependencyObject o, object value )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceStartTime( ( TimeSpan )value );
-      else
-        return value;
-    }
+        #endregion //Format
 
-    private static void OnStartTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnStartTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
+        #region MaxDropDownHeight
 
-    protected virtual TimeSpan OnCoerceStartTime( TimeSpan value )
-    {
-      ValidateTime( value );
-      return value;
-    }
+        public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register("MaxDropDownHeight", typeof(double), typeof(TimePicker), new UIPropertyMetadata(130d, OnMaxDropDownHeightChanged));
+        public double MaxDropDownHeight
+        {
+            get
+            {
+                return (double)GetValue(MaxDropDownHeightProperty);
+            }
+            set
+            {
+                SetValue(MaxDropDownHeightProperty, value);
+            }
+        }
 
-    protected virtual void OnStartTimeChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
+        private static void OnMaxDropDownHeightChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
+        {
+            TimePicker timePicker = o as TimePicker;
+            if (timePicker != null)
+                timePicker.OnMaxDropDownHeightChanged((double)e.OldValue, (double)e.NewValue);
+        }
 
-    public TimeSpan StartTime
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( StartTimeProperty );
-      }
-      set
-      {
-        SetValue( StartTimeProperty, value );
-      }
-    }
+        protected virtual void OnMaxDropDownHeightChanged(double oldValue, double newValue)
+        {
+            // TODO: Add your property changed side-effects. Descendants can override as well.
+        }
 
+        #endregion
 
-    #endregion //StartTime
+        #region StartTime
 
-    #region TimeInterval
+        public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register("StartTime", typeof(TimeSpan), typeof(TimePicker), new UIPropertyMetadata(StartTimeDefaultValue, new PropertyChangedCallback(OnStartTimeChanged), new CoerceValueCallback(OnCoerceStartTime)));
 
-    public static readonly DependencyProperty TimeIntervalProperty = DependencyProperty.Register( "TimeInterval", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( TimeIntervalDefaultValue, OnTimeIntervalChanged ) );
-    public TimeSpan TimeInterval
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( TimeIntervalProperty );
-      }
-      set
-      {
-        SetValue( TimeIntervalProperty, value );
-      }
-    }
+        private static object OnCoerceStartTime(DependencyObject o, object value)
+        {
+            TimePicker timePicker = o as TimePicker;
+            if (timePicker != null)
+                return timePicker.OnCoerceStartTime((TimeSpan)value);
+            else
+                return value;
+        }
 
-    private static object OnCoerceTimeInterval( DependencyObject o, object value )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceTimeInterval( ( TimeSpan )value );
-      else
-        return value;
-    }
+        private static void OnStartTimeChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
+        {
+            TimePicker timePicker = o as TimePicker;
+            if (timePicker != null)
+                timePicker.OnStartTimeChanged((TimeSpan)e.OldValue, (TimeSpan)e.NewValue);
+        }
 
-    private static void OnTimeIntervalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnTimeIntervalChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
+        protected virtual TimeSpan OnCoerceStartTime(TimeSpan value)
+        {
+            ValidateTime(value);
+            return value;
+        }
 
-    protected virtual TimeSpan OnCoerceTimeInterval( TimeSpan value )
-    {
-      ValidateTime( value );
+        protected virtual void OnStartTimeChanged(TimeSpan oldValue, TimeSpan newValue)
+        {
+            InvalidateListBoxItems();
+        }
 
-      if( value.Ticks == 0L )
-        throw new ArgumentException( "TimeInterval must be greater than zero" );
+        public TimeSpan? StartTime
+        {
+            get
+            {
+                return (TimeSpan)GetValue(StartTimeProperty);
+            }
+            set
+            {
+                SetValue(StartTimeProperty, value);
+            }
+        }
 
-      return value;
-    }
 
+        #endregion //StartTime
 
-    protected virtual void OnTimeIntervalChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
+        #region TimeInterval
 
-    #endregion //TimeInterval
+        public static readonly DependencyProperty TimeIntervalProperty = DependencyProperty.Register("TimeInterval", typeof(TimeSpan), typeof(TimePicker), new UIPropertyMetadata(TimeIntervalDefaultValue, OnTimeIntervalChanged));
+        public TimeSpan? TimeInterval
+        {
+            get
+            {
+                return (TimeSpan?)GetValue(TimeIntervalProperty);
+            }
+            set
+            {
+                SetValue(TimeIntervalProperty, value);
+            }
+        }
 
-    #endregion //Properties
+        private static void OnTimeIntervalChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
+        {
+            TimePicker timePicker = o as TimePicker;
+            if (timePicker != null)
+                timePicker.OnTimeIntervalChanged((TimeSpan)e.OldValue, (TimeSpan)e.NewValue);
+        }
 
-    #region Constructors
+        protected virtual TimeSpan OnCoerceTimeInterval(TimeSpan value)
+        {
+            ValidateTime(value);
 
-    static TimePicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( typeof( TimePicker ) ) );
-      FormatProperty.OverrideMetadata( typeof( TimePicker ), new UIPropertyMetadata( DateTimeFormat.ShortTime ) );
-      UpdateValueOnEnterKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( true ) );
-    }
+            if (value.Ticks == 0L)
+                throw new ArgumentException("TimeInterval must be greater than zero");
 
-    #endregion //Constructors
+            return value;
+        }
 
-    #region Base Class Overrides
 
-    protected override void OnFormatStringChanged( string oldValue, string newValue )
-    {
-      if( this.Format == DateTimeFormat.Custom )
-      {
-        InvalidateListBoxItems();
-      }
-      base.OnFormatStringChanged( oldValue, newValue );
-    }
+        protected virtual void OnTimeIntervalChanged(TimeSpan oldValue, TimeSpan newValue)
+        {
+            InvalidateListBoxItems();
+        }
 
-    protected override void OnMaximumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMaximumChanged( oldValue, newValue );
-      this.InvalidateListBoxItems();
-    }
+        #endregion //TimeInterval
 
+        #endregion //Properties
 
-    protected override void OnMinimumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMinimumChanged( oldValue, newValue );
-      this.InvalidateListBoxItems();
-    }
+        #region Constructors
 
-    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-
-      // ListBox content may be affected if value's date changed and the date was
-      // or is equal to Minimum or Maximum value.
-      bool invalidate = false;
-
-      if( DateTimeUtilities.IsSameDate( this.Minimum, oldValue )
-        != DateTimeUtilities.IsSameDate( this.Minimum, newValue ) )
-      {
-        invalidate = true;
-      }
-
-      if( DateTimeUtilities.IsSameDate( this.Maximum, oldValue )
-        != DateTimeUtilities.IsSameDate( this.Maximum, newValue ) )
-      {
-        invalidate = true;
-      }
-
-      // A value change can affect the display of the listbox items
-      // if the Date part of the value has changed. This is the case when
-      // the display text of the items contains part of the Date values.
-      if( oldValue.GetValueOrDefault().Date != newValue.GetValueOrDefault().Date )
-      {
-        invalidate = true;
-      }
-
-      if( invalidate )
-      {
-        //Invalidate the entire listbox content
-        this.InvalidateListBoxItems();
-      }
-      else
-      {
-        //Just update the selected item
-        this.UpdateListBoxSelectedItem();
-      }
-    }
+        static TimePicker()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(typeof(TimePicker)));
+            FormatProperty.OverrideMetadata(typeof(TimePicker), new UIPropertyMetadata(DateTimeFormat.ShortTime));
+            UpdateValueOnEnterKeyProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(true));
+        }
 
-    protected override void Popup_Opened( object sender, EventArgs e )
-    {
-      base.Popup_Opened( sender, e );
+        #endregion //Constructors
 
-      if( _timeListBox != null )
-      {
-        this.UpdateListBoxItems();
+        #region Base Class Overrides
 
-        var time = (this.Value != null) ? this.Value.Value.TimeOfDay : TimePicker.StartTimeDefaultValue;
-        var nearestItem = this.GetNearestTimeItem( time );
-        if( nearestItem != null )
+        protected override void OnFormatStringChanged(string oldValue, string newValue)
         {
-          _timeListBox.ScrollIntoView( nearestItem );
-          this.UpdateListBoxSelectedItem();
+            if (this.Format == DateTimeFormat.Custom)
+            {
+                InvalidateListBoxItems();
+            }
+            base.OnFormatStringChanged(oldValue, newValue);
         }
-        _timeListBox.Focus();
-      }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      if( this.TextBox != null )
-      {
-        this.TextBox.GotKeyboardFocus -= this.TextBoxSpinner_GotKeyboardFocus;
-      }
-      if( this.Spinner != null )
-      {
-        this.Spinner.GotKeyboardFocus -= this.TextBoxSpinner_GotKeyboardFocus;
-      }
-
-      base.OnApplyTemplate();
-
-      if( this.TextBox != null )
-      {
-        this.TextBox.GotKeyboardFocus += this.TextBoxSpinner_GotKeyboardFocus;
-      }
-      if( this.Spinner != null )
-      {
-        this.Spinner.GotKeyboardFocus += this.TextBoxSpinner_GotKeyboardFocus;
-      }
-
-      if( _timeListBox != null )
-      {
-        _timeListBox.SelectionChanged -= this.TimeListBox_SelectionChanged;
-        _timeListBox.MouseUp -= this.TimeListBox_MouseUp;
-      }
-
-      _timeListBox = this.GetTemplateChild( PART_TimeListItems ) as ListBox;
-
-      if( _timeListBox != null )
-      {
-        _timeListBox.SelectionChanged += this.TimeListBox_SelectionChanged;
-        _timeListBox.MouseUp += this.TimeListBox_MouseUp;
-
-        this.InvalidateListBoxItems();
-      }
-    }
 
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
+        protected override void OnMaximumChanged(DateTime? oldValue, DateTime? newValue)
+        {
+            base.OnMaximumChanged(oldValue, newValue);
+            this.InvalidateListBoxItems();
+        }
 
-    private void TimeListBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count > 0 )
-      {
-        TimeItem selectedTimeListItem = ( TimeItem )e.AddedItems[ 0 ];
-        var time = selectedTimeListItem.Time;
 
-        if( this.UpdateValueOnEnterKey )
+        protected override void OnMinimumChanged(DateTime? oldValue, DateTime? newValue)
         {
-          var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-          var date = currentValue ?? this.ContextNow;
-          var newValue = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
-          this.TextBox.Text = newValue.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
+            base.OnMinimumChanged(oldValue, newValue);
+            this.InvalidateListBoxItems();
         }
-        else
+
+        protected override void OnValueChanged(DateTime? oldValue, DateTime? newValue)
         {
-          var date = this.Value ?? this.ContextNow;
-          this.Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
+            base.OnValueChanged(oldValue, newValue);
+
+            // ListBox content may be affected if value's date changed and the date was
+            // or is equal to Minimum or Maximum value.
+            bool invalidate = false;
+
+            if (DateTimeUtilities.IsSameDate(this.Minimum, oldValue)
+              != DateTimeUtilities.IsSameDate(this.Minimum, newValue))
+            {
+                invalidate = true;
+            }
+
+            if (DateTimeUtilities.IsSameDate(this.Maximum, oldValue)
+              != DateTimeUtilities.IsSameDate(this.Maximum, newValue))
+            {
+                invalidate = true;
+            }
+
+            // A value change can affect the display of the listbox items
+            // if the Date part of the value has changed. This is the case when
+            // the display text of the items contains part of the Date values.
+            if (oldValue.GetValueOrDefault().Date != newValue.GetValueOrDefault().Date)
+            {
+                invalidate = true;
+            }
+
+            if (invalidate)
+            {
+                //Invalidate the entire listbox content
+                this.InvalidateListBoxItems();
+            }
+            else
+            {
+                //Just update the selected item
+                this.UpdateListBoxSelectedItem();
+            }
         }
-      }
-    }
 
-    private void TextBoxSpinner_GotKeyboardFocus( object sender, KeyboardFocusChangedEventArgs e )
-    {
-      this.ClosePopup( true );
-    }
-
-    private void TimeListBox_MouseUp( object sender, MouseButtonEventArgs e )
-    {
-      this.ClosePopup( true );
-    }
+        protected override void Popup_Opened(object sender, EventArgs e)
+        {
+            base.Popup_Opened(sender, e);
+
+            if (_timeListBox != null)
+            {
+                this.UpdateListBoxItems();
+
+                var time = (this.Value != null) ? this.Value.Value.TimeOfDay : TimePicker.StartTimeDefaultValue;
+                var nearestItem = this.GetNearestTimeItem(time);
+                if (nearestItem != null)
+                {
+                    _timeListBox.ScrollIntoView(nearestItem);
+                    this.UpdateListBoxSelectedItem();
+                }
+                _timeListBox.Focus();
+            }
+        }
 
-    #endregion //Event Handlers
+        public override void OnApplyTemplate()
+        {
+            if (this.TextBox != null)
+            {
+                this.TextBox.GotKeyboardFocus -= this.TextBoxSpinner_GotKeyboardFocus;
+            }
+            if (this.Spinner != null)
+            {
+                this.Spinner.GotKeyboardFocus -= this.TextBoxSpinner_GotKeyboardFocus;
+            }
+
+            base.OnApplyTemplate();
+
+            if (this.TextBox != null)
+            {
+                this.TextBox.GotKeyboardFocus += this.TextBoxSpinner_GotKeyboardFocus;
+            }
+            if (this.Spinner != null)
+            {
+                this.Spinner.GotKeyboardFocus += this.TextBoxSpinner_GotKeyboardFocus;
+            }
+
+            if (_timeListBox != null)
+            {
+                _timeListBox.SelectionChanged -= this.TimeListBox_SelectionChanged;
+                _timeListBox.MouseUp -= this.TimeListBox_MouseUp;
+            }
+
+            _timeListBox = this.GetTemplateChild(PART_TimeListItems) as ListBox;
+
+            if (_timeListBox != null)
+            {
+                _timeListBox.SelectionChanged += this.TimeListBox_SelectionChanged;
+                _timeListBox.MouseUp += this.TimeListBox_MouseUp;
+
+                this.InvalidateListBoxItems();
+            }
+        }
 
-    #region Methods
+        #endregion //Base Class Overrides
 
-    private void ValidateTime( TimeSpan time )
-    {
-      if( time.TotalHours >= 24d )
-        throw new ArgumentException( "Time value cannot be greater than or equal to 24 hours." );
-    }
+        #region Internal Methods
 
-    public IEnumerable GenerateTimeListItemsSource()
-    {
-      TimeSpan time = StartTime;
-      TimeSpan endTime = EndTime;
+        internal void UpdateTempValue(DateTime? newDate)
+        {
+            var date = newDate ?? this.ContextNow;
+            // Set TimePicker TextBox (not Value) to DatetimePicker TextBox.
+            if (this.TextBox != null)
+            {
+                this.TextBox.Text = date.ToString(this.GetFormatString(this.Format), this.CultureInfo);
+            }
+            // Set TimePicker TempValue to the same value. 
+            // It will be used when selecting a new date in Calendar (to keep the set time) and
+            // and when incrementing the TimePicker inside a DateTimePicker (to get the current time when Value is not up to date).
+            this.TempValue = date;
+        }
 
-      if( endTime <= time )
-      {
-        endTime = EndTimeDefaultValue;
-        time = StartTimeDefaultValue;
-      }
+        #endregion
 
-      // Limit the content of the list to the Minimum or Maximum
-      // if the date is set to the Minimum or Maximum.
-      if( this.Value.HasValue )
-      {
-        DateTime date = this.Value.Value;
-        DateTime minDate = this.Minimum.GetValueOrDefault( DateTime.MinValue );
-        DateTime maxDate = this.Maximum.GetValueOrDefault( DateTime.MaxValue );
-        TimeSpan minTime = minDate.TimeOfDay;
-        TimeSpan maxTime = maxDate.TimeOfDay;
+        #region Event Handlers
 
-        if( date.Date == minDate.Date && time.Ticks < minTime.Ticks )
+        private void TimeListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-          time = minTime;
+            if (e.AddedItems.Count > 0)
+            {
+                TimeItem selectedTimeListItem = (TimeItem)e.AddedItems[0];
+                var time = selectedTimeListItem.Time;
+
+                //if( this.UpdateValueOnEnterKey )
+                //{
+                //  var currentValue = this.ConvertTextToValue( this.TextBox.Text );
+                //  var date = currentValue ?? this.ContextNow;
+                //  var newValue = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
+                //  this.TextBox.Text = newValue.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
+                //}
+                //else
+                //{
+                var date = this.Value ?? this.ContextNow;
+                this.Value = new DateTime(date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind);
+                //}
+            }
         }
 
-        if( date.Date == maxDate.Date && endTime.Ticks > maxTime.Ticks )
+        private void TextBoxSpinner_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
-          endTime = maxTime;
+            this.ClosePopup(true);
         }
 
-        if( endTime < time )
+        private void TimeListBox_MouseUp(object sender, MouseButtonEventArgs e)
         {
-          time = endTime;
+            this.ClosePopup(true);
         }
-      }
 
+        #endregion //Event Handlers
 
-      TimeSpan timeInterval = TimeInterval;
-      List<TimeItem> timeItemList = new List<TimeItem>();
+        #region Methods
 
-      if( time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0 )
-      {
-        while( time <= endTime )
+        private static void ValidateTime(TimeSpan time)
         {
-          timeItemList.Add( this.CreateTimeItem( time ) );
-          time = time.Add( timeInterval );
+            if (time.TotalHours >= 24d)
+                throw new ArgumentException("Time value cannot be greater than or equal to 24 hours.");
         }
-      }
-      return timeItemList;
-    }
-
-    protected virtual TimeItem CreateTimeItem( TimeSpan time )
-    {
-      var date = Value ?? this.ContextNow;
-      string formatString = this.GetFormatString( (DateTimeFormat)this.Format );
-      return new TimeItem( date.Date.Add( time ).ToString( formatString, CultureInfo ), time );
-    }
 
-    private void UpdateListBoxSelectedItem()
-    {
-      if( _timeListBox != null )
-      {
-        TimeItem time = null;
-        if( Value != null )
+        public IEnumerable GenerateTimeListItemsSource()
         {
-          time = this.CreateTimeItem( Value.Value.TimeOfDay );
-          if( !_timeListBox.Items.Contains( time ) )
-          {
-            time = null;
-          }
+            var time = StartTime;
+            var endTime = EndTime;
+
+            if (endTime <= time)
+            {
+                endTime = EndTimeDefaultValue;
+                time = StartTimeDefaultValue;
+            }
+
+            // Limit the content of the list to the Minimum or Maximum
+            // if the date is set to the Minimum or Maximum.
+            if (this.Value.HasValue)
+            {
+                DateTime date = this.Value.Value;
+                DateTime minDate = this.Minimum.GetValueOrDefault(System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime);
+                DateTime maxDate = this.Maximum.GetValueOrDefault(System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime);
+                TimeSpan minTime = minDate.TimeOfDay;
+                TimeSpan maxTime = maxDate.TimeOfDay;
+
+                if (date.Date == minDate.Date && time.Value.Ticks < minTime.Ticks)
+                {
+                    time = minTime;
+                }
+
+                if (date.Date == maxDate.Date && endTime.Value.Ticks > maxTime.Ticks)
+                {
+                    endTime = maxTime;
+                }
+
+                if (endTime < time)
+                {
+                    time = endTime;
+                }
+            }
+
+
+            var timeInterval = TimeInterval;
+            List<TimeItem> timeItemList = new List<TimeItem>();
+
+            if (time != null && endTime != null && timeInterval != null && timeInterval.Value.Ticks > 0)
+            {
+                while (time <= endTime)
+                {
+                    timeItemList.Add(this.CreateTimeItem(time.Value));
+                    time = time.Value.Add(timeInterval.Value);
+                }
+            }
+            return timeItemList;
         }
 
-        _timeListBox.SelectedItem = time;
-      }
-    }
+        protected virtual TimeItem CreateTimeItem(TimeSpan time)
+        {
+            var date = Value ?? this.ContextNow;
+            string formatString = this.GetFormatString(Format);
+            return new TimeItem(date.Date.Add(time).ToString(formatString, CultureInfo), time);
+        }
 
-    private void InvalidateListBoxItems()
-    {
-      _isListBoxInvalid = true;
-      if( IsOpen )
-      {
-        UpdateListBoxItems();
-      }
-    }
+        private void UpdateListBoxSelectedItem()
+        {
+            if (_timeListBox != null)
+            {
+                TimeItem time = null;
+                if (Value != null)
+                {
+                    time = this.CreateTimeItem(Value.Value.TimeOfDay);
+                    if (!_timeListBox.Items.Contains(time))
+                    {
+                        time = null;
+                    }
+                }
+
+                _timeListBox.SelectedItem = time;
+            }
+        }
 
-    private void UpdateListBoxItems()
-    {
-      if( _timeListBox != null )
-      {
-        if( _isListBoxInvalid )
+        private void InvalidateListBoxItems()
         {
-          _timeListBox.ItemsSource = GenerateTimeListItemsSource();
-          UpdateListBoxSelectedItem();
-          _isListBoxInvalid = false;
+            _isListBoxInvalid = true;
+            if (IsOpen)
+            {
+                UpdateListBoxItems();
+            }
         }
-      }
-    }
 
-    private TimeItem GetNearestTimeItem( TimeSpan time )
-    {
-      if( _timeListBox != null )
-      {
-        int itemCount = _timeListBox.Items.Count;
-        for( int i = 0; i < itemCount; i++ )
+        private void UpdateListBoxItems()
         {
-          TimeItem timeItem = _timeListBox.Items[ i ] as TimeItem;
-          if( timeItem != null )
-          {
-            if( timeItem.Time >= time )
-              return timeItem;
-          }
+            if (_timeListBox != null)
+            {
+                if (_isListBoxInvalid)
+                {
+                    _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+                    UpdateListBoxSelectedItem();
+                    _isListBoxInvalid = false;
+                }
+            }
         }
 
-        //They are all less than the searched time. 
-        //Return the last one. (Should also be the greater one.)
-        if( itemCount > 0 )
+        private TimeItem GetNearestTimeItem(TimeSpan time)
         {
-          return _timeListBox.Items[ itemCount - 1 ] as TimeItem;
+            if (_timeListBox != null)
+            {
+                int itemCount = _timeListBox.Items.Count;
+                for (int i = 0; i < itemCount; i++)
+                {
+                    TimeItem timeItem = _timeListBox.Items[i] as TimeItem;
+                    if (timeItem != null)
+                    {
+                        if (timeItem.Time >= time)
+                        {
+                            return timeItem;
+                        }
+                    }
+                }
+
+                //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;
+                }
+            }
+
+            return null;
         }
-      }
 
-      return null;
+        #endregion //Methods
     }
-
-    #endregion //Methods
-  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
index cd7141c6..dc10609f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -287,10 +287,10 @@
             <!--ToggleButton can be closed when TimePicker is included in DateTimePicker-->
             <MultiDataTrigger>
               <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
                 <Condition Binding="{Binding TemplatedParent, RelativeSource={RelativeSource Self}, Converter={StaticResource ObjectTypeToNameConverter}}"
                            Value="DateTimePicker" />
+                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                           Value="True" />
               </MultiDataTrigger.Conditions>
               <Setter Property="IsHitTestVisible"
                       Value="True"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
index 63daafc1..1b21a44e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -265,10 +265,10 @@
             <!--ToggleButton can be closed when TimePicker is included in DateTimePicker-->
             <MultiDataTrigger>
               <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
                 <Condition Binding="{Binding TemplatedParent, RelativeSource={RelativeSource Self}, Converter={StaticResource ObjectTypeToNameConverter}}"
                            Value="DateTimePicker" />
+                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                           Value="True" />
               </MultiDataTrigger.Conditions>
               <Setter Property="IsHitTestVisible"
                       Value="True"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
index 49629d6f..fad591ea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -20,11 +20,27 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
+using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit
 {
   public class TimeSpanUpDown : DateTimeUpDownBase<TimeSpan?>
   {
+    #region Private Members
+
+    private static int HoursInDay = 24;
+    private static int MinutesInDay = 1440;
+    private static int MinutesInHour = 60;    
+    private static int SecondsInDay = 86400;
+    private static int SecondsInHour = 3600;
+    private static int SecondsInMinute = 60;
+    private static int MilliSecondsInDay = TimeSpanUpDown.SecondsInDay * 1000;
+    private static int MilliSecondsInHour = TimeSpanUpDown.SecondsInHour * 1000;
+    private static int MilliSecondsInMinute = TimeSpanUpDown.SecondsInMinute * 1000;
+    private static int MilliSecondsInSecond = 1000;
+
+    #endregion
+
     #region Constructors
 
     static TimeSpanUpDown()
@@ -80,15 +96,40 @@ namespace Xceed.Wpf.Toolkit
 
     protected virtual void OnFractionalSecondsDigitsCountChanged( int oldValue, int newValue )
     {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      this.SyncTextAndValueProperties( false, this.Text );
+      this.UpdateValue();
     }
 
     #endregion //FractionalSecondsDigitsCount
 
+    #region ShowDays
+
+    public static readonly DependencyProperty ShowDaysProperty = DependencyProperty.Register( "ShowDays", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowDaysChanged ) );
+    public bool ShowDays
+    {
+      get
+      {
+        return (bool)GetValue( ShowDaysProperty );
+      }
+      set
+      {
+        SetValue( ShowDaysProperty, value );
+      }
+    }
+
+    private static void OnShowDaysChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      var timeSpanUpDown = o as TimeSpanUpDown;
+      if( timeSpanUpDown != null )
+        timeSpanUpDown.OnShowDaysChanged( (bool)e.OldValue, (bool)e.NewValue );
+    }
+
+    protected virtual void OnShowDaysChanged( bool oldValue, bool newValue )
+    {
+      this.UpdateValue();
+    }
+
+    #endregion //ShowDays
+
     #region ShowSeconds
 
     public static readonly DependencyProperty ShowSecondsProperty = DependencyProperty.Register( "ShowSeconds", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowSecondsChanged ) );
@@ -113,11 +154,7 @@ namespace Xceed.Wpf.Toolkit
 
     protected virtual void OnShowSecondsChanged( bool oldValue, bool newValue )
     {
-      var value = this.UpdateValueOnEnterKey
-                  ? ( this.TextBox != null ) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      this.SyncTextAndValueProperties( false, this.Text );
+      this.UpdateValue();
     }
 
     #endregion //ShowSeconds
@@ -126,6 +163,26 @@ namespace Xceed.Wpf.Toolkit
 
     #region BaseClass Overrides
 
+    public override bool CommitInput()
+    {
+      var sync = this.SyncTextAndValueProperties( true, Text );
+
+      if( this.UpdateValueOnEnterKey && ( _selectedDateTimeInfo != null ) && ( _dateTimeInfoList != null ) )
+      {
+        // Update SelectedDateTimeInfo and TextBox selection after sync is done.
+        var selectionInfo = _dateTimeInfoList.FirstOrDefault( x => ( x.Type == _selectedDateTimeInfo.Type ) && ( x.Type != DateTimePart.Other ) );
+        _selectedDateTimeInfo = ( selectionInfo != null ) ? selectionInfo : _dateTimeInfoList.FirstOrDefault( x => x.Type != DateTimePart.Other );
+        if( _selectedDateTimeInfo != null )
+        {
+          _fireSelectionChangedEvent = false;
+          this.TextBox.Select( _selectedDateTimeInfo.StartPosition, _selectedDateTimeInfo.Length );
+          _fireSelectionChangedEvent = true;
+        }
+      }
+
+      return sync;
+    }
+
     protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
     {
       var value = this.UpdateValueOnEnterKey
@@ -166,7 +223,7 @@ namespace Xceed.Wpf.Toolkit
       if( this.Value == null )
         return string.Empty;
 
-      return this.ParseValueIntoTimeSpanInfo( this.Value );
+      return this.ParseValueIntoTimeSpanInfo( this.Value, true );
     }
 
     protected override TimeSpan? ConvertTextToValue( string text )
@@ -174,7 +231,74 @@ namespace Xceed.Wpf.Toolkit
       if( string.IsNullOrEmpty( text ) )
         return null;
 
-      TimeSpan timeSpan = TimeSpan.Parse( text );
+      var timeSpan = TimeSpan.MinValue;
+
+      var separators = text.Where( x => x == ':' || x == '.' ).ToList();
+      var stringValues = text.Split( new char[] { ':', '.' } );
+      if( ( stringValues.Count() <= 1 ) || stringValues.Any( x => string.IsNullOrEmpty( x ) ) )
+      {
+        return this.ResetToLastValidValue();
+      }
+
+      var intValues = new int[ stringValues.Count() ];
+      for( int i = 0; i < stringValues.Count(); ++i )
+      {
+        if( !int.TryParse( stringValues[ i ].Replace( "-", "" ), out intValues[ i ] ) )
+        {
+          return this.ResetToLastValidValue();
+        }
+      }
+
+      if( intValues.Count() >= 2 )
+      {
+        var haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' );
+        var haveDays = ( separators.Count() > 1 ) && ( separators.First() == '.' ) && ( intValues.Count() >= 3 );
+
+        if( this.ShowDays )
+        {
+          var days = haveDays ? intValues[ 0 ] : intValues[ 0 ] / 24;
+          if( days > TimeSpan.MaxValue.Days )
+            return this.ResetToLastValidValue();
+          var hours = haveDays ? intValues[ 1 ] : intValues[ 0 ] % 24;
+          if( ( ( days * TimeSpanUpDown.HoursInDay ) + hours ) > TimeSpan.MaxValue.TotalHours )
+            return this.ResetToLastValidValue();
+          var minutes = haveDays ? intValues[ 2 ] : intValues[ 1 ];
+          if( ( ( days * TimeSpanUpDown.MinutesInDay ) + ( hours * TimeSpanUpDown.MinutesInHour ) + minutes ) > TimeSpan.MaxValue.TotalMinutes )
+            return this.ResetToLastValidValue();
+          var seconds = this.ShowSeconds
+                        ? haveDays && ( intValues.Count() >= 4 ) ? intValues[ 3 ] : ( intValues.Count() >= 3 ) ? intValues[ 2 ] : 0
+                        : 0;
+          if( ( ( days * TimeSpanUpDown.SecondsInDay ) + ( hours * TimeSpanUpDown.SecondsInHour ) + ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds )
+            return this.ResetToLastValidValue();
+          var milliseconds = haveMS ? intValues.Last() : 0;
+          if( ( ( days * TimeSpanUpDown.MilliSecondsInDay ) + ( hours * TimeSpanUpDown.MilliSecondsInHour ) + ( minutes * TimeSpanUpDown.MilliSecondsInMinute ) + ( seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds )
+            return this.ResetToLastValidValue();
+
+          timeSpan = new TimeSpan( days, hours, minutes, seconds, milliseconds );
+        }
+        else
+        {
+          var hours = intValues[ 0 ];
+          if( hours > TimeSpan.MaxValue.TotalHours )
+            return this.ResetToLastValidValue();
+          var minutes = intValues[ 1 ];
+          if( ( ( hours * TimeSpanUpDown.MinutesInHour ) + minutes ) > TimeSpan.MaxValue.TotalMinutes )
+            return this.ResetToLastValidValue();
+          var seconds = this.ShowSeconds && ( intValues.Count() >= 3 ) ? intValues[ 2 ] : 0;
+          if( ( ( hours * TimeSpanUpDown.SecondsInHour ) + ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds )
+            return this.ResetToLastValidValue();
+          var milliseconds = haveMS ? intValues.Last() : 0;
+          if( ( ( hours * TimeSpanUpDown.MilliSecondsInHour ) + ( minutes * TimeSpanUpDown.MilliSecondsInMinute ) + ( seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds )
+            return this.ResetToLastValidValue();
+
+          timeSpan = new TimeSpan( 0, hours, minutes, seconds, milliseconds );
+        }
+
+        if( text.StartsWith( "-" ) )
+        {
+          timeSpan = timeSpan.Negate();
+        }
+      }
 
       if( this.ClipValueToMinMax )
       {
@@ -217,30 +341,61 @@ namespace Xceed.Wpf.Toolkit
 
       TimeSpan current = this.Value.HasValue ? this.Value.Value : new TimeSpan();
       TimeSpan result;
-      var success = TimeSpan.TryParse( currentValue, out result );
-      if( !success )
+      // Validate when more than 60 seconds (or more than 60 minutes, or more than 24 hours) are entered.
+      var separators = currentValue.Where( x => x == ':' || x == '.' ).ToList();
+      var stringValues = currentValue.Split( new char[] { ':', '.' } );
+      if( ( stringValues.Count() >= 2 ) && !stringValues.Any( x => string.IsNullOrEmpty( x ) ) )
       {
-        // Validate when more than 60 seconds (or more than 60 minutes, or more than 24 hours) are entered.
-        var separators = currentValue.Where( x => x == ':' || x == '.' ).ToList();
-        var values = currentValue.Split( new char[] { ':', '.' } );
-        if( ( values.Count() >= 2 ) && !values.Any( x => string.IsNullOrEmpty( x ) ) )
+        bool haveDays = (separators.First() == '.') && ( stringValues.Count() >= 3);
+        bool haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' );
+
+        var values = new int[ stringValues.Count() ];
+        for( int i = 0; i < stringValues.Count(); ++i )
         {
-          bool haveDays = separators.First() == '.';
-          bool haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' );
-
-          result = new TimeSpan( haveDays ? int.Parse( values[ 0 ] ) : 0,  //Days
-                                 haveDays ? int.Parse( values[ 1 ] ) : int.Parse( values[ 0 ] ),  //Hours
-                                 haveDays ? int.Parse( values[ 2 ] ) : int.Parse( values[ 1 ] ),  //Minutes
-                                 ( haveDays && this.ShowSeconds ) ? int.Parse( values[ 3 ] ) : this.ShowSeconds ? int.Parse( values[ 2 ] ) : 0,  //Seconds
-                                 haveMS ? int.Parse( values.Last() ) : 0 );  //Milliseconds
+          if( !int.TryParse( stringValues[ i ], out values[ i ] ) )
+          {
+            return;
+          }
         }
-      }
 
-      currentValue = result.ToString();
+        var days = haveDays ? Math.Abs( values[ 0 ] ): 0;
+        if( days > TimeSpan.MaxValue.Days )
+          return;
+        var hours = haveDays ? Math.Abs( values[ 1 ] ) : Math.Abs( values[ 0 ] );
+        if( ( ( days * TimeSpanUpDown.HoursInDay ) + hours) > TimeSpan.MaxValue.TotalHours )
+          return;
+        var minutes = haveDays ? Math.Abs( values[ 2 ] ) : Math.Abs( values[ 1 ] );
+        if( ( ( days * TimeSpanUpDown.MinutesInDay ) + ( hours * TimeSpanUpDown.MinutesInHour ) + minutes ) > TimeSpan.MaxValue.TotalMinutes )
+          return;
+        var seconds = ( haveDays && this.ShowSeconds && ( values.Count() >= 4 ) ) ? Math.Abs( values[ 3 ] ) : this.ShowSeconds && ( values.Count() >= 3 ) ? Math.Abs( values[ 2 ] ) : 0;
+        if( ( ( days * TimeSpanUpDown.SecondsInDay ) + ( hours * TimeSpanUpDown.SecondsInHour ) + ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds )
+          return;
+        var milliseconds = haveMS ? Math.Abs( values.Last() ) : 0;
+        if( ( ( days * TimeSpanUpDown.MilliSecondsInDay ) + ( hours * TimeSpanUpDown.MilliSecondsInHour ) + (minutes * TimeSpanUpDown.MilliSecondsInMinute ) + (seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds )
+          return;
+
+        result = new TimeSpan( days, hours, minutes, seconds, milliseconds );
+        if( values[ 0 ] < 0 )
+        {
+          result = result.Negate();
+        }
 
-      // When text is typed, if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( ( _isTextChangedFromUI && !this.UpdateValueOnEnterKey )
+        currentValue = result.ToString();
+      }
+      else
+      {
+        Debug.Assert( false, "Something went wrong when parsing TimeSpan." );
+        return;
+      }
+
+      var previousValues = ( previousValue != null ) ? previousValue.Split( new char[] { ':', '.' } ) : null;
+      var currentValues = ( currentValue != null ) ? currentValue.Split( new char[] { ':', '.' } ) : null;
+      var canSync = ( previousValues != null ) 
+                    && ( currentValues != null )
+                    && ( previousValues.Length == currentValues.Length )  // same number of time parts.
+                    && ( currentValue.Length == previousValue.Length );   // same number of digits.
+      // When text is typed, Sync Value on Text only when UpdateValueOnEnterKey is false and time format is the same.
+      if( ( _isTextChangedFromUI && !this.UpdateValueOnEnterKey && canSync )
         || !_isTextChangedFromUI )
       {
         this.SyncTextAndValueProperties( true, currentValue );
@@ -263,10 +418,12 @@ namespace Xceed.Wpf.Toolkit
 
     protected override void PerformMouseSelection()
     {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
+      if( !this.UpdateValueOnEnterKey )
+      {
+        this.CommitInput();
+        this.InitializeDateTimeInfoList( this.Value );
+      }
+
       base.PerformMouseSelection();
     }
 
@@ -291,36 +448,39 @@ namespace Xceed.Wpf.Toolkit
         }
       }
 
-      if( value.HasValue && value.Value.Days != 0 )
+      if( this.ShowDays )
       {
-        int dayLength = Math.Abs( value.Value.Days ).ToString().Length;
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Day, Length = dayLength, Format = "dd" } );
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ".", IsReadOnly = true } );
-
-        if( this.TextBox != null )
+        if( value.HasValue && value.Value.Days != 0 )
         {
-          //number of digits for days has changed when selection is not on date part, move TextBox.Selection to keep it on current DateTimeInfo
-          if( hasDay && (dayLength != lastDayInfo.Length) && (_selectedDateTimeInfo.Type != DateTimePart.Day) )
-          {
-            _fireSelectionChangedEvent = false;
-            this.TextBox.SelectionStart = Math.Max( 0, this.TextBox.SelectionStart + (dayLength - lastDayInfo.Length) );
-            _fireSelectionChangedEvent = true;
-          }
-          // Day has been added, move TextBox.Selection to keep it on current DateTimeInfo
-          else if( !hasDay )
+          int dayLength = Math.Abs( value.Value.Days ).ToString().Length;
+          _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Day, Length = dayLength, Format = "dd" } );
+          _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ".", IsReadOnly = true } );
+
+          if( this.TextBox != null )
           {
-            _fireSelectionChangedEvent = false;
-            this.TextBox.SelectionStart += (dayLength + 1);
-            _fireSelectionChangedEvent = true;
+            //number of digits for days has changed when selection is not on date part, move TextBox.Selection to keep it on current DateTimeInfo
+            if( hasDay && ( dayLength != lastDayInfo.Length ) && ( _selectedDateTimeInfo.Type != DateTimePart.Day ) )
+            {
+              _fireSelectionChangedEvent = false;
+              this.TextBox.SelectionStart = Math.Max( 0, this.TextBox.SelectionStart + ( dayLength - lastDayInfo.Length ) );
+              _fireSelectionChangedEvent = true;
+            }
+            // Day has been added, move TextBox.Selection to keep it on current DateTimeInfo
+            else if( !hasDay )
+            {
+              _fireSelectionChangedEvent = false;
+              this.TextBox.SelectionStart += ( dayLength + 1 );
+              _fireSelectionChangedEvent = true;
+            }
           }
         }
-      }
-      // Day has been removed, move TextBox.Selection to keep it on current DateTimeInfo
-      else if( hasDay )
-      {
-        _fireSelectionChangedEvent = false;
-        this.TextBox.SelectionStart = Math.Max( hasNegative ? 1 : 0, this.TextBox.SelectionStart - (lastDayInfo.Length + 1) );
-        _fireSelectionChangedEvent = true;
+        // Day has been removed, move TextBox.Selection to keep it on current DateTimeInfo
+        else if( hasDay )
+        {
+          _fireSelectionChangedEvent = false;
+          this.TextBox.SelectionStart = Math.Max( hasNegative ? 1 : 0, this.TextBox.SelectionStart - ( lastDayInfo.Length + 1 ) );
+          _fireSelectionChangedEvent = true;
+        }
       }
 
       _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Hour24, Length = 2, Format = "hh" } );
@@ -346,7 +506,7 @@ namespace Xceed.Wpf.Toolkit
 
       if( value.HasValue )
       {
-        this.ParseValueIntoTimeSpanInfo( value );
+        this.ParseValueIntoTimeSpanInfo( value, true );
       }
     }
 
@@ -366,12 +526,53 @@ namespace Xceed.Wpf.Toolkit
       return (value1.Value > value2.Value);
     }
 
+    internal override void Select( DateTimeInfo info )
+    {
+      if( this.UpdateValueOnEnterKey )
+      {
+        if( ( info != null ) && !info.Equals( _selectedDateTimeInfo ) && ( this.TextBox != null ) && !string.IsNullOrEmpty( this.TextBox.Text ) )
+        {
+          var separatorToSkipCount = _dateTimeInfoList.IndexOf( info ) / 2;
+          if( separatorToSkipCount < 0 )
+          {
+            base.Select( info );
+          }
+          else
+          {
+            var textValues = this.Text.Split( new char[] { ':', '.' } );
+            var selectionStart = textValues.Take( separatorToSkipCount ).Sum( x => x.Length ) + separatorToSkipCount;
+            var selectionLength = textValues[ separatorToSkipCount ].Length;
+            // Do not select the "-" sign when moving selection with arrows.
+            if( ( separatorToSkipCount == 0 ) && ( textValues.First().StartsWith( "-" ) ) )
+            {
+              selectionStart += 1;
+              selectionLength -= 1;
+            }
+
+            _fireSelectionChangedEvent = false;
+            this.TextBox.Select( selectionStart, selectionLength );
+            _fireSelectionChangedEvent = true;
+            _selectedDateTimeInfo = info;
+#if VS2008
+        this.CurrentDateTimePart = info.Type;
+#else
+            this.SetCurrentValue( DateTimeUpDownBase<TimeSpan?>.CurrentDateTimePartProperty, info.Type );
+#endif
+          }
+        }
+      }
+      else
+      {
+        base.Select( info );
+      }
+    }
+
 
     #endregion
 
     #region Methods
 
-    private string ParseValueIntoTimeSpanInfo( TimeSpan? value )
+    private string ParseValueIntoTimeSpanInfo( TimeSpan? value, bool modifyInfo )
     {
       string text = string.Empty;
 
@@ -379,50 +580,68 @@ namespace Xceed.Wpf.Toolkit
       {
         if( info.Format == null )
         {
-          info.StartPosition = text.Length;
-          info.Length = info.Content.Length;
+          if( modifyInfo )
+          {
+            info.StartPosition = text.Length;
+            info.Length = info.Content.Length;
+          }
           text += info.Content;
         }
         else
         {
           TimeSpan span = TimeSpan.Parse( value.ToString() );
-          info.StartPosition = text.Length;
+          if( modifyInfo )
+          {
+            info.StartPosition = text.Length;
+          }
+          var content = "";
 #if VS2008
           switch (info.Format)
           {
               case "hh":
-                  info.Content = span.Hours.ToString("00");
+                  // Display days and hours or totalHours
+                  content = ( !this.ShowDays && ( span.Days != 0 ) && ( info.Format == "hh" ) )
+                            ? Math.Truncate( Math.Abs( span.TotalHours ) ).ToString("00")
+                            : span.Hours.ToString("00");
                   break;
               case "mm":
-                  info.Content = span.Minutes.ToString("00");
+                  content = span.Minutes.ToString("00");
                   break;
               case "ss":
-                  info.Content = span.Seconds.ToString("00");
+                 content = span.Seconds.ToString("00");
                   break;
               case "dd":
-                  info.Content = span.Days.ToString();
+                  content = span.Days.ToString();
                   break;
               case "%f":
-                  info.Content = (span.Milliseconds / 100).ToString();
+                  content = (span.Milliseconds / 100).ToString();
                   break;
               case "ff":
-                  info.Content = (span.Milliseconds / 10).ToString();
+                 content = (span.Milliseconds / 10).ToString();
                   break;
               case "fff":
-                  info.Content = span.Milliseconds.ToString();
+                 content = span.Milliseconds.ToString();
                   break;
               default:
                   throw new InvalidOperationException("Wrong TimeSpan format");
           }
 #else
-          info.Content = span.ToString( info.Format, this.CultureInfo.DateTimeFormat );
+          // Display days and hours or totalHours
+          content = ( !this.ShowDays && ( span.Days != 0 ) && ( info.Format == "hh" ) )
+                    ? Math.Truncate( Math.Abs( span.TotalHours ) ).ToString()
+                    : span.ToString( info.Format, this.CultureInfo.DateTimeFormat );
 #endif
-          if( info.Format == "dd" )
+
+          if( modifyInfo )
           {
-            info.Content = Convert.ToInt32( info.Content ).ToString();
+            if( info.Format == "dd" )
+            {
+              content = Convert.ToInt32( content ).ToString();
+            }
+            info.Content = content;
+            info.Length = info.Content.Length;
           }
-          info.Length = info.Content.Length;
-          text += info.Content;
+          text += content;
         }
       } );
 
@@ -439,6 +658,8 @@ namespace Xceed.Wpf.Toolkit
         info = (this.CurrentDateTimePart != DateTimePart.Other)
                ? this.GetDateTimeInfo( this.CurrentDateTimePart )
                : (_dateTimeInfoList[ 0 ].Content != "-") ? _dateTimeInfoList[ 0 ] : _dateTimeInfoList[ 1 ]; //Skip negative sign
+        if( info == null )
+          info = _dateTimeInfoList[ 0 ];
       }
 
       TimeSpan? result = null;
@@ -500,21 +721,84 @@ namespace Xceed.Wpf.Toolkit
       // Sync Value on Text only when Enter Key is pressed.
       if( this.UpdateValueOnEnterKey )
       {
+        var newTextBoxContent = string.Empty;
         var currentValue = this.ConvertTextToValue( this.TextBox.Text );
         var newValue = currentValue.HasValue
                        ? this.UpdateTimeSpan( currentValue, step )
                        : this.DefaultValue ?? TimeSpan.Zero;
 
-        if( newValue != null )
+        if( newValue != null && ( _dateTimeInfoList != null) )
         {
-          this.InitializeDateTimeInfoList( newValue );
-          var selectionStart = this.TextBox.SelectionStart;
-          var selectionLength = this.TextBox.SelectionLength;
-#if VS2008
-          this.TextBox.Text = newValue.Value.ToString();
-#else
-          this.TextBox.Text = newValue.Value.ToString( this.GetTimeSpanFormat() );
-#endif
+          var selectionStart = 0;
+          var selectionLength = 0;
+
+          // Start with a negative sign.
+          if( ( newValue.Value.TotalMilliseconds < 0 ) && ( _dateTimeInfoList[ 0 ].Content != "-" ) )
+          {
+            newTextBoxContent = "-";
+          }
+          for( int i = 0; i < _dateTimeInfoList.Count; ++i )
+          {
+            var timePart = _dateTimeInfoList[ i ];
+            // Current timePart is the selected timePart, TextBox selection will start here.
+            if( ( _selectedDateTimeInfo != null ) && ( timePart.Type == _selectedDateTimeInfo.Type ) )
+            {
+              selectionStart = newTextBoxContent.Length;
+            }
+            // Adjust time part start and length.
+            switch( timePart.Type )
+            {
+              case DateTimePart.Day:
+                var dayText = Math.Abs( newValue.Value.Days ).ToString( new string( '0', timePart.Content.Length ) );
+                timePart.StartPosition = newTextBoxContent.Length;
+                timePart.Length = dayText.Length;
+                newTextBoxContent += dayText;
+                break;
+              case DateTimePart.Hour24:
+                var hourText = ( i <= 1 ) 
+                                ? Math.Truncate( Math.Abs( newValue.Value.TotalHours ) ).ToString( new string( '0', timePart.Content.Length ) ) 
+                                : Math.Abs( newValue.Value.Hours) .ToString( new string( '0', timePart.Content.Length ) );
+                timePart.StartPosition = newTextBoxContent.Length;
+                timePart.Length = hourText.Length;
+                newTextBoxContent += hourText;
+                break;
+              case DateTimePart.Minute:
+                var minuteText = ( i <= 1 ) 
+                                  ? Math.Truncate( Math.Abs( newValue.Value.TotalMinutes ) ).ToString( new string( '0', timePart.Content.Length ) ) 
+                                  : Math.Abs( newValue.Value.Minutes ).ToString( new string( '0', timePart.Content.Length ) );
+                timePart.StartPosition = newTextBoxContent.Length;
+                timePart.Length = minuteText.Length;
+                newTextBoxContent += minuteText;
+                break;
+              case DateTimePart.Second:
+                var secondText = ( i <= 1 ) 
+                                  ? Math.Truncate( Math.Abs( newValue.Value.TotalSeconds ) ).ToString( new string( '0', timePart.Content.Length ) ) 
+                                  : Math.Abs( newValue.Value.Seconds ).ToString( new string( '0', timePart.Content.Length ) );
+                timePart.StartPosition = newTextBoxContent.Length;
+                timePart.Length = secondText.Length;
+                newTextBoxContent += secondText;
+                break;
+              case DateTimePart.Millisecond:
+                var millisecondText = ( i <= 1 )
+                                      ? Math.Truncate( Math.Abs( newValue.Value.TotalMilliseconds ) ).ToString( new string( '0', timePart.Content.Length ) ) 
+                                      : Math.Abs( newValue.Value.Milliseconds ).ToString( new string( '0', timePart.Content.Length ) );
+                timePart.StartPosition = newTextBoxContent.Length;
+                timePart.Length = millisecondText.Length;
+                newTextBoxContent += millisecondText;
+                break;
+              case DateTimePart.Other:
+                var otherText = ( ( i == 0 ) && ( newValue.Value.TotalMilliseconds >= 0 ) ) ? "" : timePart.Content;
+                timePart.StartPosition = newTextBoxContent.Length;
+                timePart.Length = otherText.Length;
+                newTextBoxContent += otherText;
+                break;
+            }
+            if( ( _selectedDateTimeInfo != null ) && ( timePart.Type == _selectedDateTimeInfo.Type ) )
+            {
+              selectionLength = newTextBoxContent.Length - selectionStart;
+            }
+          }
+          this.TextBox.Text = newTextBoxContent;
           this.TextBox.Select( selectionStart, selectionLength );
         }
       }
@@ -539,27 +823,6 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#if !VS2008
-    private string GetTimeSpanFormat()
-    {
-      //use this format : "d.hh\:mm\:ss\.fff"
-      var formatParts = _dateTimeInfoList.Select( part =>
-      {
-        if( part.Format == null )
-          return '\\' + part.Content;
-
-        if( part.Format.Contains( 'd' ) )
-        {
-          var dayInfo = _dateTimeInfoList.FirstOrDefault( info => info.Type == DateTimePart.Day );
-          part.Format = string.Join( "", Enumerable.Repeat( "d", dayInfo.Length ) );
-        }
-        return part.Format;
-      } ).ToList();
-
-      return string.Join( "", formatParts );
-    }
-#endif
-
     private bool IsNumber( string str )
     {
       foreach( char c in str )
@@ -571,6 +834,22 @@ namespace Xceed.Wpf.Toolkit
       return true;
     }
 
+    private void UpdateValue()
+    {
+      var value = this.UpdateValueOnEnterKey
+                  ? ( this.TextBox != null ) ? this.ConvertTextToValue( this.TextBox.Text ) : null
+                  : this.Value;
+      this.InitializeDateTimeInfoList( value );
+      this.SyncTextAndValueProperties( false, this.Text );
+    }
+
+    private TimeSpan? ResetToLastValidValue()
+    {
+      // Reset DateTimeInfoList with last valid value.
+      this.InitializeDateTimeInfoList( this.Value );
+      return this.Value;
+    }
+
     #endregion
 
     #region Event Handlers
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
index 5581bb6e..9af366c1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
index fe271781..0cacf85e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
index 74307d71..ba36b8c3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
index f2f56c57..5edff5d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
index 3070064a..cb5a5615 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs
new file mode 100644
index 00000000..aed8a8a0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs
@@ -0,0 +1,69 @@
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2019 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+
+namespace Xceed.Utils.Exceptions
+{
+  internal class ThrowException
+  {
+    private ThrowException()
+    {
+    }
+
+    #region PUBLIC STATIC METHODS
+
+    public static void ThrowArgumentException( string message, string paramName, Exception innerExcept )
+    {
+      #if ( XCEEDCF || SILVERLIGHT || PORTABLE )
+      throw new ArgumentException( message, innerExcept );
+      #else
+      throw new ArgumentException( message, paramName, innerExcept );
+      #endif
+    }
+
+    public static void ThrowArgumentOutOfRangeException( string paramName, object value, string message )
+    {
+      #if ( XCEEDCF || SILVERLIGHT || PORTABLE )
+      throw new ArgumentOutOfRangeException( message );
+      #else
+      throw new ArgumentOutOfRangeException( paramName, value, message );
+      #endif
+    }
+
+    #if !NO_CODE_ANALYSIS
+    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type" )]
+    #endif // !NO_CODE_ANALYSIS
+    public static void ThrowLicenseException( Type type, object instance, string message )
+    {
+      #if PORTABLE || NETCORE
+      throw new Exception( message );
+      #elif ( XCEEDCF || SILVERLIGHT || XAMARIN )
+      throw new SystemException( message );
+      #else
+      #if XBAP_FRIENDLY
+      // Under some circumstances, passing a type to a LicenseException will throw a 
+      // FileNotFoundException on the assembly containing the type.
+      throw new System.ComponentModel.LicenseException( null, instance, message );
+      #else
+      throw new System.ComponentModel.LicenseException( type, instance, message );
+      #endif // XBAP_FRIENDLY
+      #endif // ( XCEEDCF || NETCORE )
+    }
+
+    #endregion PUBLIC STATIC METHODS
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
index 145e2092..9857bbb1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
index 0a61abfe..59c4d118 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
index f0f4b933..4fd16661 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
index f0f4b933..4fd16661 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
index 79249aad..b879cf00 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
@@ -176,6 +176,18 @@ namespace Xceed.Wpf.Toolkit
             }
           }
           break;
+        case Key.Enter:
+          if( this.AcceptsReturn )
+          {
+            // Add input because it's not added by default.
+            this.PasswordInsert( "\r", this.CaretIndex );
+          }
+          // Do not add input when AcceptReturn is False.
+          e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exist
+          break;
+        case Key.Escape:
+          e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exist
+          break;
       }
 
       base.OnPreviewKeyDown( e );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index 58483022..8f11aa40 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
index a486bcc9..390bf52a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
index 844f74f7..e26bb618 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.Icon.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.Icon.bmp
new file mode 100644
index 00000000..76f9520f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.Icon.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
index 6daa0ed2..83f1c7d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
index 06931d6f..d008269f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
index 635e683d..fda73e24 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
index 6351252f..b725312d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
index 0a9d7668..d378e8f8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
@@ -1,14 +1,14 @@
 /*************************************************************************************
+   
+   Toolkit for WPF
 
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
index dbfd0a11..8d003315 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
index fa4a8fa6..dc4258af 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
@@ -1,14 +1,14 @@
 <!--***********************************************************************************
 
-   Extended WPF Toolkit
+   Toolkit for WPF
 
-   Copyright (C) 2007-2013 Xceed Software Inc.
+   Copyright (C) 2007-2019 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
 
    For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
 
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
index 1ad3ec3b..a2078880 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
@@ -1,141 +1,241 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
-		<OutputType>Library</OutputType>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-		<UseWPF>true</UseWPF>
-		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-	</PropertyGroup>
-	<PropertyGroup>
-		<!-- NUGET PACKAGE INFO-->
-		<Title>RenewedVision.Xceed.Wpf.Toolkit</Title>
-		<Version>3.4.0</Version>
-		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-		<RepositoryUrl>https://github.com/renewedvision/wpftoolkit</RepositoryUrl>
-		<RepositoryType>git</RepositoryType>
-		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<PackageId>RenewedVision.Xceed.Wpf.Toolkit</PackageId>
-		<Authors>Xceed, RenewedVision</Authors>
-		<PackageProjectUrl>https://github.com/renewedvision/wpftoolkit</PackageProjectUrl>
-		<PackageLicenseExpression>MS-PL</PackageLicenseExpression>
-		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-	</PropertyGroup>
-	<ItemGroup>
-		<AppDesigner Include="Properties\" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="..\..\..\README.md">
-			<Pack>True</Pack>
-			<PackagePath>\</PackagePath>
-		</None>
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="MessageBox\Icons\Error48.png" />
-		<Resource Include="MessageBox\Icons\Information48.png" />
-		<Resource Include="MessageBox\Icons\Question48.png" />
-		<Resource Include="MessageBox\Icons\Warning48.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\FontColorPicker16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\TextHighlightColorPicker16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="RichTextBoxFormatBar\Images\Bullets16.png" />
-		<Resource Include="RichTextBoxFormatBar\Images\Numbering16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="PropertyGrid\Images\SortAscending16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="PropertyGrid\Images\Categorize16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="PropertyGrid\Images\AdvancedProperties11.png" />
-		<Resource Include="PropertyGrid\Images\Inheritance11.png" />
-		<Resource Include="PropertyGrid\Images\Resource11.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="PropertyGrid\Images\Database11.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="PropertyGrid\Images\Local11.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="PropertyGrid\Images\Style11.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="PropertyGrid\Images\ClearFilter16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="MultiLineTextEditor\Images\Notes16.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<Resource Include="Zoombox\Resources\Zoom.cur" />
-		<Resource Include="Zoombox\Resources\ZoomRelative.cur" />
-	</ItemGroup>
-	<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>
-	<ItemGroup>
-		<Resource Include="CollectionControl\Images\Duplicate.png" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-		<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-	</ItemGroup>
+  <PropertyGroup>
+    <TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
+    <OutputType>Library</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
+  </PropertyGroup>
+  <PropertyGroup>
+	<!-- NUGET PACKAGE INFO-->
+	<Title>RenewedVision.Xceed.Wpf.Toolkit</Title>
+    <Version>3.8.0</Version>
+	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+	<RepositoryUrl>https://github.com/renewedvision/wpftoolkit</RepositoryUrl>
+	<RepositoryType>git</RepositoryType>
+	<PackageReadmeFile>README.md</PackageReadmeFile>
+	<PackageId>RenewedVision.Xceed.Wpf.Toolkit</PackageId>
+	<Authors>Xceed, RenewedVision</Authors>
+	<PackageProjectUrl>https://github.com/renewedvision/wpftoolkit</PackageProjectUrl>
+	<PackageLicenseExpression>MS-PL</PackageLicenseExpression>
+	<PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\..\..\license.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+    <None Include="..\..\..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\FontColorPicker16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\TextHighlightColorPicker16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bullets16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\Numbering16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="MultiLineTextEditor\Images\Notes16.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>
+  <ItemGroup>
+    <EmbeddedResource Include="Calculator\Implementation\Calculator.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="AutoSelectTextBox\Implementation\AutoSelectTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="BusyIndicator\Implementation\BusyIndicator.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ButtonSpinner\Implementation\ButtonSpinner.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CheckComboBox\Implementation\CheckComboBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CalculatorUpDown\Implementation\CalculatorUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CheckListBox\Implementation\CheckListBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ChildWindow\Implementation\ChildWindow.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ColorCanvas\Implementation\ColorCanvas.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ColorPicker\Implementation\ColorPicker.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DateTimePicker\Implementation\DateTimePicker.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DateTimeUpDown\Implementation\DateTimeUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DropDownButton\Implementation\DropDownButton.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="IconButton\Implementation\IconButton.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Magnifier\Implementation\Magnifier.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MultiLineTextEditor\Implementation\MultiLineTextEditor.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\ByteUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\DecimalUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\DoubleUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\IntegerUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\LongUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\SByteUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\ShortUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\SingleUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\UIntegerUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\ULongUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\UShortUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Panels\RandomPanel.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Panels\WrapPanel.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pie\Implementation\Pie.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Primitives\ValueRangeTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Primitives\WindowContainer.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Primitives\WindowControl.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RangeSlider\Implementation\RangeSlider.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RichTextBox\RichTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RichTextBoxFormatBar\RichTextBoxFormatBar.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SplitButton\Implementation\SplitButton.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="StyleableWindow\Implementation\StyleableWindow.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimelinePanel\Implementation\TimelinePanel.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimePicker\Implementation\TimePicker.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimeSpanUpDown\Implementation\TimeSpanUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="WatermarkComboBox\Implementation\WatermarkComboBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="WatermarkPasswordBox\Implementation\WatermarkPasswordBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="WatermarkTextBox\Implementation\WatermarkTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Wizard\Implementation\Wizard.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur
deleted file mode 100644
index f5001727..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur
deleted file mode 100644
index 7df27fd6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 5731a303..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,833 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <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="Black" />
-    <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}">
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <ContentPresenter x:Name="_contentPresenter"
-                              Grid.Row="0"
-                              Grid.Column="0" />
-            <ScrollBar x:Name="PART_VerticalScrollBar"
-                       Grid.Row="0"
-                       Grid.Column="1"
-                       Orientation="Vertical"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <ScrollBar x:Name="PART_HorizontalScrollBar"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Orientation="Horizontal"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <Border Grid.Row="1"
-                    Grid.Column="1"
-                    Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-
-            <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}">
-                    </Image>
-                  </Button>
-                  <Button x:Name="ForwardButton"
-                          Command="local:Zoombox.Forward"
-                          ToolTip="Go Forward"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource NextGlyph}">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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" >
-                    </Image>
-                  </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" >
-                    </Image>
-                  </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" >
-                    </Image>
-                  </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" >
-                    </Image>
-                  </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" >
-                  </Image>
-                </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}">
-                </Image>
-              </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>
-            <Trigger Property="IsUsingScrollBars"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_VerticalScrollBar" />
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_HorizontalScrollBar" />
-            </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
deleted file mode 100644
index fa053728..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
+++ /dev/null
@@ -1,833 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <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="Black" />
-    <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}">
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <ContentPresenter x:Name="_contentPresenter"
-                              Grid.Row="0"
-                              Grid.Column="0" />
-            <ScrollBar x:Name="PART_VerticalScrollBar"
-                       Grid.Row="0"
-                       Grid.Column="1"
-                       Orientation="Vertical"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <ScrollBar x:Name="PART_HorizontalScrollBar"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Orientation="Horizontal"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <Border Grid.Row="1"
-                    Grid.Column="1"
-                    Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-
-            <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}">
-                    </Image>
-                  </Button>
-                  <Button x:Name="ForwardButton"
-                          Command="local:Zoombox.Forward"
-                          ToolTip="Go Forward"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource NextGlyph}">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                  </Image>
-                </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}">
-                </Image>
-              </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>
-            <Trigger Property="IsUsingScrollBars"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_VerticalScrollBar" />
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_HorizontalScrollBar" />
-            </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/Zoombox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
deleted file mode 100644
index d3804e7d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
+++ /dev/null
@@ -1,4058 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Globalization;
-using System.Security;
-using System.Security.Permissions;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  [TemplatePart( Name = PART_VerticalScrollBar, Type = typeof( ScrollBar ) )]
-  [TemplatePart( Name = PART_HorizontalScrollBar, Type = typeof( ScrollBar ) )]
-  public sealed class Zoombox : ContentControl
-  {
-    private const string PART_VerticalScrollBar = "PART_VerticalScrollBar";
-    private const string PART_HorizontalScrollBar = "PART_HorizontalScrollBar";
-    private bool _isUpdatingVisualTree = false;
-
-    #region Constructors
-
-    static Zoombox()
-    {
-      Zoombox.DefaultStyleKeyProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( typeof( Zoombox ) ) );
-      Zoombox.ClipToBoundsProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
-      Zoombox.FocusableProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
-      Zoombox.HorizontalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( HorizontalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
-      Zoombox.VerticalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( VerticalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
-      Zoombox.ContentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceContentValue ) ) );
-    }
-
-    public Zoombox()
-      : base()
-    {
-      try
-      {
-        new UIPermission( PermissionState.Unrestricted ).Demand();
-        _cacheBits[ ( int )CacheBits.HasUIPermission ] = true;
-      }
-      catch( SecurityException )
-      {
-      }
-
-      this.InitCommands();
-
-      // use the LayoutUpdated event to keep the Viewport in sync
-      this.LayoutUpdated += new EventHandler( this.OnLayoutUpdated );
-      this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnSizeChanged ), true );
-
-      this.CoerceValue( Zoombox.ViewStackModeProperty );
-
-      this.Loaded += this.Zoombox_Loaded;
-    }
-
-    #endregion
-
-    #region AnimationAccelerationRatio Property
-
-    public static readonly DependencyProperty AnimationAccelerationRatioProperty =
-      DependencyProperty.Register( "AnimationAccelerationRatio", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0d ), 
-          new ValidateValueCallback( Zoombox.ValidateAccelerationRatio ) );
-
-    public double AnimationAccelerationRatio
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.AnimationAccelerationRatioProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationAccelerationRatioProperty, value );
-      }
-    }
-
-    private static bool ValidateAccelerationRatio( object value )
-    {
-      double newValue = ( double )value;
-      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
-        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationAccelerationRatioOOR" ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region AnimationDecelerationRatio Property
-
-    public static readonly DependencyProperty AnimationDecelerationRatioProperty =
-      DependencyProperty.Register( "AnimationDecelerationRatio", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0d ), 
-          new ValidateValueCallback( Zoombox.ValidateDecelerationRatio ) );
-
-    public double AnimationDecelerationRatio
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.AnimationDecelerationRatioProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationDecelerationRatioProperty, value );
-      }
-    }
-
-    private static bool ValidateDecelerationRatio( object value )
-    {
-      double newValue = ( double )value;
-      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
-        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationDecelerationRatioOOR" ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region AnimationDuration Property
-
-    public static readonly DependencyProperty AnimationDurationProperty =
-      DependencyProperty.Register( "AnimationDuration", typeof( Duration ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( new Duration( TimeSpan.FromMilliseconds( 300 ) ) ) );
-
-    public Duration AnimationDuration
-    {
-      get
-      {
-        return ( Duration )this.GetValue( Zoombox.AnimationDurationProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationDurationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AreDragModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreDragModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreDragModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreDragModifiersActiveProperty = Zoombox.AreDragModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreDragModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreDragModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreDragModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreDragModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreRelativeZoomModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreRelativeZoomModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreRelativeZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreRelativeZoomModifiersActiveProperty = Zoombox.AreRelativeZoomModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreRelativeZoomModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreRelativeZoomModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreRelativeZoomModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreRelativeZoomModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreZoomModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreZoomModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreZoomModifiersActiveProperty = Zoombox.AreZoomModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreZoomModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreZoomModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreZoomModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreZoomModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreZoomToSelectionModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreZoomToSelectionModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreZoomToSelectionModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreZoomToSelectionModifiersActiveProperty = Zoombox.AreZoomToSelectionModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreZoomToSelectionModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreZoomToSelectionModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreZoomToSelectionModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreZoomToSelectionModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AutoWrapContentWithViewbox Property
-
-    public static readonly DependencyProperty AutoWrapContentWithViewboxProperty =
-      DependencyProperty.Register( "AutoWrapContentWithViewbox", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true, 
-          new PropertyChangedCallback( Zoombox.OnAutoWrapContentWithViewboxChanged ) ) );
-
-    public bool AutoWrapContentWithViewbox
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AutoWrapContentWithViewboxProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AutoWrapContentWithViewboxProperty, value );
-      }
-    }
-
-    private static void OnAutoWrapContentWithViewboxChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      o.CoerceValue( Zoombox.ContentProperty );
-    }
-
-    private static object CoerceContentValue( DependencyObject d, object value )
-    {
-      return ( ( Zoombox )d ).CoerceContentValue( value );
-    }
-
-    private object CoerceContentValue( object value )
-    {
-      if( value != null && !( value is UIElement ) && !( ( bool )this.GetValue( DesignerProperties.IsInDesignModeProperty ) ) )
-        throw new InvalidContentException( ErrorMessages.GetMessage( "ZoomboxContentMustBeUIElement" ) );
-
-      object oldContent = _content;
-      if( value != _trueContent || ( this.IsContentWrapped != this.AutoWrapContentWithViewbox ) )
-      {
-        // check whether the content is currently wrapped and needs to be unwrapped
-        if( this.IsContentWrapped && _content is Viewbox && _content != _trueContent )
-        {
-          Viewbox viewbox = ( Viewbox )_content;
-
-          BindingOperations.ClearAllBindings( viewbox );
-          if( viewbox.Child is FrameworkElement )
-          {
-            ( viewbox.Child as FrameworkElement ).RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-          }
-          ( viewbox as Viewbox ).Child = null;
-
-          this.RemoveLogicalChild( viewbox );
-        }
-
-        // make sure the view finder's visual brush is null
-        if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
-        {
-          _viewFinderDisplay.VisualBrush.Visual = null;
-          _viewFinderDisplay.VisualBrush = null;
-        }
-
-        // update the cached content and true content values
-        _content = value as UIElement;
-        _trueContent = value as UIElement;
-
-        // if necessary, unparent the existing content
-        if( _contentPresenter != null && _contentPresenter.Content != null )
-        {
-          _contentPresenter.Content = null;
-        }
-
-        // if necessary, wrap the content
-        this.IsContentWrapped = false;
-        if( this.AutoWrapContentWithViewbox )
-        {
-          // create a viewbox and make it the logical child of the Zoombox
-          Viewbox viewbox = new Viewbox();
-          this.AddLogicalChild( viewbox );
-
-          // now set the new parent to be the viewbox
-          viewbox.Child = value as UIElement;
-          _content = viewbox;
-          viewbox.HorizontalAlignment = HorizontalAlignment.Left;
-          viewbox.VerticalAlignment = VerticalAlignment.Top;
-          this.IsContentWrapped = true;
-        }
-
-        if( ( _content is Viewbox ) && ( this.IsContentWrapped ) && ( _trueContent is FrameworkElement ) )
-        {
-          ( _trueContent as FrameworkElement ).AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-        }
-
-        if( _contentPresenter != null )
-        {
-          _contentPresenter.Content = _content;
-        }
-
-        if( _viewFinderDisplay != null )
-        {
-          this.CreateVisualBrushForViewFinder( _content );
-        }
-        this.UpdateViewFinderDisplayContentBounds();
-      }
-
-      // if the content changes, we need to reset the flags used to first render and arrange the content
-      if( oldContent != _content
-          && this.HasArrangedContentPresenter
-          && this.HasRenderedFirstView )
-      {
-        this.HasArrangedContentPresenter = false;
-        this.HasRenderedFirstView = false;
-        this.RefocusViewOnFirstRender = true;
-        _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
-      }
-      return _content;
-    }
-
-    private UIElement _trueContent; //null
-
-    #endregion
-
-    #region CurrentView Property
-
-    private static readonly DependencyPropertyKey CurrentViewPropertyKey =
-      DependencyProperty.RegisterReadOnly( "CurrentView", typeof( ZoomboxView ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxView.Empty, 
-          new PropertyChangedCallback( Zoombox.OnCurrentViewChanged ) ) );
-
-    public static readonly DependencyProperty CurrentViewProperty = Zoombox.CurrentViewPropertyKey.DependencyProperty;
-
-    public ZoomboxView CurrentView
-    {
-      get
-      {
-        return ( ZoomboxView )this.GetValue( Zoombox.CurrentViewProperty );
-      }
-    }
-
-    private void SetCurrentView( ZoomboxView value )
-    {
-      this.SetValue( Zoombox.CurrentViewPropertyKey, value );
-    }
-
-    private static void OnCurrentViewChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingView )
-      {
-        zoombox.ZoomTo( zoombox.CurrentView );
-      }
-      zoombox.RaiseEvent( new ZoomboxViewChangedEventArgs( e.OldValue as ZoomboxView, e.NewValue as ZoomboxView, zoombox._lastViewIndex, zoombox.CurrentViewIndex ) );
-    }
-
-    #endregion
-
-    #region CurrentViewIndex Property
-
-    private static readonly DependencyPropertyKey CurrentViewIndexPropertyKey =
-      DependencyProperty.RegisterReadOnly( "CurrentViewIndex", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1 ) );
-
-    public static readonly DependencyProperty CurrentViewIndexProperty = Zoombox.CurrentViewIndexPropertyKey.DependencyProperty;
-
-    public int CurrentViewIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.CurrentViewIndexProperty );
-      }
-    }
-
-    internal void SetCurrentViewIndex( int value )
-    {
-      this.SetValue( Zoombox.CurrentViewIndexPropertyKey, value );
-    }
-
-    #endregion
-
-    #region DragModifiers Property
-
-    public static readonly DependencyProperty DragModifiersProperty =
-      DependencyProperty.Register( "DragModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultDragModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection DragModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.DragModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.DragModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultDragModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Ctrl );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region DragOnPreview Property
-
-    public static readonly DependencyProperty DragOnPreviewProperty =
-      DependencyProperty.Register( "DragOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public bool DragOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.DragOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.DragOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EffectiveViewStackMode Property
-
-    private static readonly DependencyPropertyKey EffectiveViewStackModePropertyKey =
-      DependencyProperty.RegisterReadOnly( "EffectiveViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Auto ) );
-
-    public static readonly DependencyProperty EffectiveViewStackModeProperty = Zoombox.EffectiveViewStackModePropertyKey.DependencyProperty;
-
-    public ZoomboxViewStackMode EffectiveViewStackMode
-    {
-      get
-      {
-        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.EffectiveViewStackModeProperty );
-      }
-    }
-
-    private void SetEffectiveViewStackMode( ZoomboxViewStackMode value )
-    {
-      this.SetValue( Zoombox.EffectiveViewStackModePropertyKey, value );
-    }
-
-    #endregion
-
-    #region HasBackStack Property
-
-    private static readonly DependencyPropertyKey HasBackStackPropertyKey =
-      DependencyProperty.RegisterReadOnly( "HasBackStack", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasBackStackProperty = Zoombox.HasBackStackPropertyKey.DependencyProperty;
-
-    public bool HasBackStack
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.HasBackStackProperty );
-      }
-    }
-
-    #endregion
-
-    #region HasForwardStack Property
-
-    private static readonly DependencyPropertyKey HasForwardStackPropertyKey =
-      DependencyProperty.RegisterReadOnly( "HasForwardStack", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasForwardStackProperty = Zoombox.HasForwardStackPropertyKey.DependencyProperty;
-
-    public bool HasForwardStack
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.HasForwardStackProperty );
-      }
-    }
-
-    #endregion
-
-    #region IsAnimated Property
-
-    public static readonly DependencyProperty IsAnimatedProperty =
-      DependencyProperty.Register( "IsAnimated", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true, 
-          ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceIsAnimatedValue ) ) );
-
-    public bool IsAnimated
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsAnimatedProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.IsAnimatedProperty, value );
-      }
-    }
-
-    private static object CoerceIsAnimatedValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      bool result = ( bool )value;
-      if( !zoombox.IsInitialized )
-      {
-        result = false;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region IsDraggingContent Property
-
-    private static readonly DependencyPropertyKey IsDraggingContentPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsDraggingContent", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsDraggingContentProperty = Zoombox.IsDraggingContentPropertyKey.DependencyProperty;
-
-    public bool IsDraggingContent
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsDraggingContentProperty );
-      }
-    }
-
-    private void SetIsDraggingContent( bool value )
-    {
-      this.SetValue( Zoombox.IsDraggingContentPropertyKey, value );
-    }
-
-    #endregion
-
-    #region IsSelectingRegion Property
-
-    private static readonly DependencyPropertyKey IsSelectingRegionPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsSelectingRegion", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsSelectingRegionProperty = Zoombox.IsSelectingRegionPropertyKey.DependencyProperty;
-
-    public bool IsSelectingRegion
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsSelectingRegionProperty );
-      }
-    }
-
-    private void SetIsSelectingRegion( bool value )
-    {
-      this.SetValue( Zoombox.IsSelectingRegionPropertyKey, value );
-    }
-
-    #endregion
-
-    #region IsUsingScrollBars Property
-
-    public static readonly DependencyProperty IsUsingScrollBarsProperty =
-      DependencyProperty.Register( "IsUsingScrollBars", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false, ( PropertyChangedCallback )null ) );
-
-    public bool IsUsingScrollBars
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsUsingScrollBarsProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.IsUsingScrollBarsProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region MaxScale Property
-
-    public static readonly DependencyProperty MaxScaleProperty =
-      DependencyProperty.Register( "MaxScale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 100d, FrameworkPropertyMetadataOptions.AffectsMeasure,
-          new PropertyChangedCallback( Zoombox.OnMaxScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMaxScaleValue ) ) );
-
-    public double MaxScale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.MaxScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.MaxScaleProperty, value );
-      }
-    }
-
-    private static void OnMaxScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.CoerceValue( Zoombox.MinScaleProperty );
-      zoombox.CoerceValue( Zoombox.ScaleProperty );
-    }
-
-    private static object CoerceMaxScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-      if( result < zoombox.MinScale )
-      {
-        result = zoombox.MinScale;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region MinScale Property
-
-    public static readonly DependencyProperty MinScaleProperty =
-      DependencyProperty.Register( "MinScale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0.01d, FrameworkPropertyMetadataOptions.AffectsMeasure,
-          new PropertyChangedCallback( Zoombox.OnMinScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMinScaleValue ) ) );
-
-    public double MinScale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.MinScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.MinScaleProperty, value );
-      }
-    }
-
-    private static void OnMinScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.CoerceValue( Zoombox.MinScaleProperty );
-      zoombox.CoerceValue( Zoombox.ScaleProperty );
-    }
-
-    private static object CoerceMinScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-      if( result > zoombox.MaxScale )
-      {
-        result = zoombox.MaxScale;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region NavigateOnPreview Property
-
-    public static readonly DependencyProperty NavigateOnPreviewProperty =
-      DependencyProperty.Register( "NavigateOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public bool NavigateOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.NavigateOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.NavigateOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region PanDistance Property
-
-    public static readonly DependencyProperty PanDistanceProperty =
-      DependencyProperty.Register( "PanDistance", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 5d ) );
-
-    public double PanDistance
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.PanDistanceProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.PanDistanceProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Position Property
-
-    public static readonly DependencyProperty PositionProperty =
-      DependencyProperty.Register( "Position", typeof( Point ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( PointHelper.Empty, new PropertyChangedCallback( Zoombox.OnPositionChanged ) ) );
-
-    public Point Position
-    {
-      get
-      {
-        return ( Point )this.GetValue( Zoombox.PositionProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.PositionProperty, value );
-      }
-    }
-
-    private static void OnPositionChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingViewport )
-      {
-        Point newPosition = ( Point )e.NewValue;
-        double scale = zoombox.Scale;
-        if( scale > 0 )
-        {
-          zoombox.ZoomTo( new Point( -newPosition.X, -newPosition.Y ) );
-        }
-      }
-    }
-
-    #endregion
-
-    #region RelativeZoomModifiers Property
-
-    public static readonly DependencyProperty RelativeZoomModifiersProperty =
-      DependencyProperty.Register( "RelativeZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultRelativeZoomModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection RelativeZoomModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.RelativeZoomModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.RelativeZoomModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultRelativeZoomModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Ctrl );
-      result.Add( KeyModifier.Alt );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region Scale Property
-
-    public static readonly DependencyProperty ScaleProperty =
-      DependencyProperty.Register( "Scale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( double.NaN, 
-          new PropertyChangedCallback( Zoombox.OnScaleChanged ), new CoerceValueCallback( Zoombox.CoerceScaleValue ) ) );
-
-    public double Scale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.ScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ScaleProperty, value );
-      }
-    }
-
-    private static void OnScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingView )
-      {
-        double newScale = ( double )e.NewValue;
-        zoombox.ZoomTo( newScale );
-      }
-    }
-
-    private static object CoerceScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-
-      if( result < zoombox.MinScale )
-      {
-        result = zoombox.MinScale;
-      }
-
-      if( result > zoombox.MaxScale )
-      {
-        result = zoombox.MaxScale;
-      }
-
-      return result;
-    }
-
-    #endregion
-
-    #region ViewFinder Property
-
-    private static readonly DependencyPropertyKey ViewFinderPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( null, new PropertyChangedCallback( Zoombox.OnViewFinderChanged ) ) );
-
-    public static readonly DependencyProperty ViewFinderProperty = Zoombox.ViewFinderPropertyKey.DependencyProperty;
-
-    public FrameworkElement ViewFinder
-    {
-      get
-      {
-        return ( FrameworkElement )this.GetValue( Zoombox.ViewFinderProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewFinderPropertyKey, value );
-      }
-    }
-
-    private static void OnViewFinderChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewFinderChanged( e );
-    }
-
-    private void OnViewFinderChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.AttachToVisualTree();
-    }
-
-    #endregion
-
-    #region ViewFinderVisibility Attached Property
-
-    public static readonly DependencyProperty ViewFinderVisibilityProperty =
-      DependencyProperty.RegisterAttached( "ViewFinderVisibility", typeof( Visibility ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Visibility.Visible ) );
-
-    public static Visibility GetViewFinderVisibility( DependencyObject d )
-    {
-      return ( Visibility )( d.GetValue( Zoombox.ViewFinderVisibilityProperty ) );
-    }
-
-    public static void SetViewFinderVisibility( DependencyObject d, Visibility value )
-    {
-      d.SetValue( Zoombox.ViewFinderVisibilityProperty, value );
-    }
-
-    #endregion
-
-    #region Viewport Property
-
-    private static readonly DependencyPropertyKey ViewportPropertyKey =
-      DependencyProperty.RegisterReadOnly( "Viewport", typeof( Rect ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Rect.Empty, 
-          new PropertyChangedCallback( Zoombox.OnViewportChanged ) ) );
-
-    public static readonly DependencyProperty ViewportProperty = Zoombox.ViewportPropertyKey.DependencyProperty;
-
-    public Rect Viewport
-    {
-      get
-      {
-        return ( Rect )this.GetValue( Zoombox.ViewportProperty );
-      }
-    }
-
-    private static void OnViewportChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      // keep the Position property in sync with the Viewport
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.Position = new Point( -zoombox.Viewport.Left * zoombox.Scale / zoombox._viewboxFactor, -zoombox.Viewport.Top * zoombox.Scale / zoombox._viewboxFactor );
-    }
-
-    #endregion
-
-    #region ViewStackCount Property
-
-    private static readonly DependencyPropertyKey ViewStackCountPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ViewStackCount", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1,
-          new PropertyChangedCallback( Zoombox.OnViewStackCountChanged ) ) );
-
-    public static readonly DependencyProperty ViewStackCountProperty = Zoombox.ViewStackCountPropertyKey.DependencyProperty;
-
-    public int ViewStackCount
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.ViewStackCountProperty );
-      }
-    }
-
-    internal void SetViewStackCount( int value )
-    {
-      this.SetValue( Zoombox.ViewStackCountPropertyKey, value );
-    }
-
-    private static void OnViewStackCountChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackCountChanged( e );
-    }
-
-    private void OnViewStackCountChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      this.UpdateStackProperties();
-    }
-
-    #endregion
-
-    #region ViewStackIndex Property
-
-    public static readonly DependencyProperty ViewStackIndexProperty =
-      DependencyProperty.Register( "ViewStackIndex", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1,
-          new PropertyChangedCallback( Zoombox.OnViewStackIndexChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackIndexValue ) ) );
-
-    public int ViewStackIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.ViewStackIndexProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewStackIndexProperty, value );
-      }
-    }
-
-    private static void OnViewStackIndexChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackIndexChanged( e );
-    }
-
-    private void OnViewStackIndexChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( !this.IsUpdatingView )
-      {
-        int viewIndex = this.ViewStackIndex;
-        if( viewIndex >= 0 && viewIndex < ViewStack.Count )
-        {
-          // update the current view, but don't allow the new view 
-          // to be added to the view stack
-          this.UpdateView( this.ViewStack[ viewIndex ], true, false, viewIndex );
-        }
-      }
-
-      this.UpdateStackProperties();
-      this.RaiseEvent( new IndexChangedEventArgs( Zoombox.ViewStackIndexChangedEvent, ( int )e.OldValue, ( int )e.NewValue ) );
-    }
-
-    private static object CoerceViewStackIndexValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = d as Zoombox;
-      return ( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled ) ? -1 : value;
-    }
-
-    #endregion
-
-    #region ViewStackMode Property
-
-    public static readonly DependencyProperty ViewStackModeProperty = 
-      DependencyProperty.Register( "ViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Default,
-          new PropertyChangedCallback( Zoombox.OnViewStackModeChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackModeValue ) ) );
-
-    public ZoomboxViewStackMode ViewStackMode
-    {
-      get
-      {
-        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.ViewStackModeProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewStackModeProperty, value );
-      }
-    }
-
-    private static void OnViewStackModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackModeChanged( e );
-    }
-
-    private void OnViewStackModeChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( ( ZoomboxViewStackMode )e.NewValue == ZoomboxViewStackMode.Disabled && _viewStack != null )
-      {
-        _viewStack.ClearViewStackSource();
-        _viewStack = null;
-      }
-    }
-
-    private static object CoerceViewStackModeValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = d as Zoombox;
-      ZoomboxViewStackMode effectiveMode = ( ZoomboxViewStackMode )value;
-
-      // if the effective mode is currently disabled, it must be updated first
-      if( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-      {
-        zoombox.SetEffectiveViewStackMode( effectiveMode );
-      }
-
-      // now determine the correct effective mode
-      if( effectiveMode != ZoomboxViewStackMode.Disabled )
-      {
-        if( effectiveMode == ZoomboxViewStackMode.Default )
-        {
-          effectiveMode = ( zoombox.ViewStack.AreViewsFromSource ? ZoomboxViewStackMode.Manual : ZoomboxViewStackMode.Auto );
-        }
-        if( zoombox.ViewStack.AreViewsFromSource && ( ZoomboxViewStackMode )effectiveMode != ZoomboxViewStackMode.Manual )
-        {
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewModeInvalidForSource" ) );
-        }
-      }
-
-      // update the effective mode
-      zoombox.SetEffectiveViewStackMode( effectiveMode );
-      return value;
-    }
-
-    #endregion
-
-    #region ViewStackSource Property
-
-    public static readonly DependencyProperty ViewStackSourceProperty =
-      DependencyProperty.Register( "ViewStackSource", typeof( IEnumerable ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ( IEnumerable )null,
-          new PropertyChangedCallback( Zoombox.OnViewStackSourceChanged ) ) );
-
-    [Bindable( true )]
-    public IEnumerable ViewStackSource
-    {
-      get
-      {
-        return ( _viewStack == null ) ? null : ViewStack.Source;
-      }
-      set
-      {
-        if( value == null )
-        {
-          this.ClearValue( Zoombox.ViewStackSourceProperty );
-        }
-        else
-        {
-          this.SetValue( Zoombox.ViewStackSourceProperty, value );
-        }
-      }
-    }
-
-    private static void OnViewStackSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      IEnumerable oldValue = ( IEnumerable )e.OldValue;
-      IEnumerable newValue = ( IEnumerable )e.NewValue;
-
-      // We need to know whether the new value represents an explicit null value 
-      // or whether it came from a binding. The latter indicates that we stay in ViewStackSource mode,
-      // but with a null collection.
-      if( e.NewValue == null && !BindingOperations.IsDataBound( d, Zoombox.ViewStackSourceProperty ) )
-      {
-        if( zoombox.ViewStack != null )
-        {
-          zoombox.ViewStack.ClearViewStackSource();
-        }
-      }
-      else
-      {
-        zoombox.ViewStack.SetViewStackSource( newValue );
-      }
-
-      zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-    }
-
-    #endregion
-
-    #region ZoomModifiers Property
-
-    public static readonly DependencyProperty ZoomModifiersProperty =
-      DependencyProperty.Register( "ZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection ZoomModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultZoomModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Shift );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region ZoomOnPreview Property
-
-    public static readonly DependencyProperty ZoomOnPreviewProperty =
-      DependencyProperty.Register( "ZoomOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true ) );
-
-    public bool ZoomOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.ZoomOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomOrigin Property
-
-    public static readonly DependencyProperty ZoomOriginProperty =
-      DependencyProperty.Register( "ZoomOrigin", typeof( Point ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( new Point( 0.5d, 0.5d ) ) );
-
-    public Point ZoomOrigin
-    {
-      get
-      {
-        return ( Point )this.GetValue( Zoombox.ZoomOriginProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOriginProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomPercentage Property
-
-    public static readonly DependencyProperty ZoomPercentageProperty =
-      DependencyProperty.Register( "ZoomPercentage", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 5d ) );
-
-    public double ZoomPercentage
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.ZoomPercentageProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomPercentageProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomOn Property
-
-    public static readonly DependencyProperty ZoomOnProperty =
-      DependencyProperty.Register( "ZoomOn", typeof( ZoomboxZoomOn ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxZoomOn.Content ) );
-
-    public ZoomboxZoomOn ZoomOn
-    {
-      get
-      {
-        return ( ZoomboxZoomOn )this.GetValue( Zoombox.ZoomOnProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOnProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomToSelectionModifiers Property
-
-    public static readonly DependencyProperty ZoomToSelectionModifiersProperty =
-      DependencyProperty.Register( "ZoomToSelectionModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomToSelectionModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection ZoomToSelectionModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomToSelectionModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomToSelectionModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultZoomToSelectionModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Alt );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region KeepContentInBounds Property
-
-    public static readonly DependencyProperty KeepContentInBoundsProperty =
-      DependencyProperty.Register( "KeepContentInBounds", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false, 
-          new PropertyChangedCallback( Zoombox.OnKeepContentInBoundsChanged ) ) );
-
-    public bool KeepContentInBounds
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.KeepContentInBoundsProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.KeepContentInBoundsProperty, value );
-      }
-    }
-
-    private static void OnKeepContentInBoundsChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnKeepContentInBoundsChanged( e );
-    }
-
-    private void OnKeepContentInBoundsChanged( DependencyPropertyChangedEventArgs e )
-    {
-      //
-      // Update view and see if we need to reposition the content
-      //
-      bool oldIsAnimated = this.IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
-      }
-      finally
-      {
-        this.IsAnimated = oldIsAnimated;
-      }
-    }
-
-    #endregion
-
-    #region ViewStack Property
-
-    public ZoomboxViewStack ViewStack
-    {
-      get
-      {
-        if( _viewStack == null && this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-        {
-          _viewStack = new ZoomboxViewStack( this );
-        }
-        return _viewStack;
-      }
-    }
-
-    #endregion
-
-    #region HasArrangedContentPresenter Internal Property
-
-    internal bool HasArrangedContentPresenter
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingView Internal Property
-
-    internal bool IsUpdatingView
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingView ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingView ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ContentOffset Private Property
-
-    private Vector ContentOffset
-    {
-      get
-      {
-        // auto-wrapped content is always left and top aligned
-        if( this.IsContentWrapped || _content == null || !( _content is FrameworkElement ) )
-          return new Vector( 0, 0 );
-
-        double x = 0;
-        double y = 0;
-        Size contentSize = this.ContentRect.Size;
-
-        switch( ( _content as FrameworkElement ).HorizontalAlignment )
-        {
-          case HorizontalAlignment.Center:
-          case HorizontalAlignment.Stretch:
-            x = ( this.RenderSize.Width - contentSize.Width ) / 2;
-            break;
-
-          case HorizontalAlignment.Right:
-            x = this.RenderSize.Width - contentSize.Width;
-            break;
-        }
-
-        switch( ( _content as FrameworkElement ).VerticalAlignment )
-        {
-          case VerticalAlignment.Center:
-          case VerticalAlignment.Stretch:
-            y = ( this.RenderSize.Height - contentSize.Height ) / 2;
-            break;
-
-          case VerticalAlignment.Bottom:
-            y = this.RenderSize.Height - contentSize.Height;
-            break;
-        }
-
-        return new Vector( x, y );
-      }
-    }
-
-    #endregion
-
-    #region ContentRect Private Property
-
-    private Rect ContentRect
-    {
-      get
-      {
-        return ( _content == null ) ? Rect.Empty
-            : new Rect( new Size( _content.RenderSize.Width / _viewboxFactor, _content.RenderSize.Height / _viewboxFactor ) );
-      }
-    }
-
-    #endregion
-
-    #region HasRenderedFirstView Private Property
-
-    private bool HasRenderedFirstView
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasRenderedFirstView ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasRenderedFirstView ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasUIPermission Private Property
-
-    private bool HasUIPermission
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasUIPermission ];
-      }
-    }
-
-    #endregion
-
-    #region IsContentWrapped Private Property
-
-    private bool IsContentWrapped
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsContentWrapped ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsContentWrapped ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsDraggingViewport Private Property
-
-    private bool IsDraggingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsDraggingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsDraggingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsMonitoringInput Private Property
-
-    private bool IsMonitoringInput
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsMonitoringInput ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsMonitoringInput ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsResizingViewport Private Property
-
-    private bool IsResizingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsResizingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsResizingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingViewport Private Property
-
-    private bool IsUpdatingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RefocusViewOnFirstRender Private Property
-
-    private bool RefocusViewOnFirstRender
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ViewFinderDisplayRect Private Property
-
-    private Rect ViewFinderDisplayRect
-    {
-      get
-      {
-        return ( _viewFinderDisplay == null ) ? Rect.Empty
-            : new Rect( new Point( 0, 0 ), new Point( _viewFinderDisplay.RenderSize.Width, _viewFinderDisplay.RenderSize.Height ) );
-      }
-    }
-
-    #endregion
-
-    #region AnimationBeginning Event
-
-    public static readonly RoutedEvent AnimationBeginningEvent = EventManager.RegisterRoutedEvent( "AnimationBeginning", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
-
-    public event RoutedEventHandler AnimationBeginning
-    {
-      add
-      {
-        this.AddHandler( Zoombox.AnimationBeginningEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.AnimationBeginningEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region AnimationCompleted Event
-
-    public static readonly RoutedEvent AnimationCompletedEvent = EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
-
-    public event RoutedEventHandler AnimationCompleted
-    {
-      add
-      {
-        this.AddHandler( Zoombox.AnimationCompletedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.AnimationCompletedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region CurrentViewChanged Event
-
-    public static readonly RoutedEvent CurrentViewChangedEvent = EventManager.RegisterRoutedEvent( "CurrentViewChanged", RoutingStrategy.Bubble, typeof( ZoomboxViewChangedEventHandler ), typeof( Zoombox ) );
-
-    public event ZoomboxViewChangedEventHandler CurrentViewChanged
-    {
-      add
-      {
-        this.AddHandler( Zoombox.CurrentViewChangedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.CurrentViewChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    public event EventHandler<ScrollEventArgs> Scroll;
-
-    #region ViewStackIndexChanged Event
-
-    public static readonly RoutedEvent ViewStackIndexChangedEvent = EventManager.RegisterRoutedEvent( "ViewStackIndexChanged", RoutingStrategy.Bubble, typeof( IndexChangedEventHandler ), typeof( Zoombox ) );
-
-    public event IndexChangedEventHandler ViewStackIndexChanged
-    {
-      add
-      {
-        this.AddHandler( Zoombox.ViewStackIndexChangedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.ViewStackIndexChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region Back Command
-
-    public static RoutedUICommand Back = new RoutedUICommand( "Go Back", "GoBack", typeof( Zoombox ) );
-
-    private void CanGoBack( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStackIndex > 0 );
-    }
-
-    private void GoBack( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoBack();
-    }
-
-    #endregion
-
-    #region Center Command
-
-    public static RoutedUICommand Center = new RoutedUICommand( "Center Content", "Center", typeof( Zoombox ) );
-
-    private void CenterContent( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.CenterContent();
-    }
-
-    #endregion
-
-    #region Fill Command
-
-    public static RoutedUICommand Fill = new RoutedUICommand( "Fill Bounds with Content", "FillToBounds", typeof( Zoombox ) );
-
-    private void FillToBounds( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.FillToBounds();
-    }
-
-    #endregion
-
-    #region Fit Command
-
-    public static RoutedUICommand Fit = new RoutedUICommand( "Fit Content within Bounds", "FitToBounds", typeof( Zoombox ) );
-
-    private void FitToBounds( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.FitToBounds();
-    }
-
-    #endregion
-
-    #region Forward Command
-
-    public static RoutedUICommand Forward = new RoutedUICommand( "Go Forward", "GoForward", typeof( Zoombox ) );
-
-    private void CanGoForward( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStackIndex < this.ViewStack.Count - 1 );
-    }
-
-    private void GoForward( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoForward();
-    }
-
-    #endregion
-
-    #region Home Command
-
-    public static RoutedUICommand Home = new RoutedUICommand( "Go Home", "GoHome", typeof( Zoombox ) );
-
-    private void CanGoHome( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStack.Count > 0 )
-                  && ( this.ViewStackIndex != 0 );
-    }
-
-    private void GoHome( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoHome();
-    }
-
-    #endregion
-
-    #region PanDown Command
-
-    public static RoutedUICommand PanDown = new RoutedUICommand( "Pan Down", "PanDown", typeof( Zoombox ) );
-
-    private void PanDownExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X, _basePosition.Y + PanDistance );
-    }
-
-    #endregion
-
-    #region PanLeft Command
-
-    public static RoutedUICommand PanLeft = new RoutedUICommand( "Pan Left", "PanLeft", typeof( Zoombox ) );
-
-    private void PanLeftExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X - this.PanDistance, _basePosition.Y );
-    }
-
-    #endregion
-
-    #region PanRight Command
-
-    public static RoutedUICommand PanRight = new RoutedUICommand( "Pan Right", "PanRight", typeof( Zoombox ) );
-
-    private void PanRightExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X + this.PanDistance, _basePosition.Y );
-    }
-
-    #endregion
-
-    #region PanUp Command
-
-    public static RoutedUICommand PanUp = new RoutedUICommand( "Pan Up", "PanUp", typeof( Zoombox ) );
-
-    private void PanUpExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X, _basePosition.Y - this.PanDistance );
-    }
-
-    #endregion
-
-    #region Refocus Command
-
-    public static RoutedUICommand Refocus = new RoutedUICommand( "Refocus View", "Refocus", typeof( Zoombox ) );
-
-    private void CanRefocusView( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode == ZoomboxViewStackMode.Manual )
-                  && ( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count )
-                  && ( this.CurrentView != this.ViewStack[ this.ViewStackIndex ] );
-    }
-
-    private void RefocusView( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.RefocusView();
-    }
-
-    #endregion
-
-    #region ZoomIn Command
-
-    public static RoutedUICommand ZoomIn = new RoutedUICommand( "Zoom In", "ZoomIn", typeof( Zoombox ) );
-
-    private void ZoomInExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Zoom( this.ZoomPercentage / 100 );
-    }
-
-    #endregion
-
-    #region ZoomOut Command
-
-    public static RoutedUICommand ZoomOut = new RoutedUICommand( "Zoom Out", "ZoomOut", typeof( Zoombox ) );
-
-    private void ZoomOutExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Zoom( -this.ZoomPercentage / 100 );
-    }
-
-    #endregion
-
-    public void CenterContent()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Center );
-      }
-    }
-
-    public void FillToBounds()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Fill );
-      }
-    }
-
-    public void FitToBounds()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Fit );
-      }
-    }
-
-    public void GoBack()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex > 0 )
-      {
-        this.ViewStackIndex--;
-      }
-    }
-
-    public void GoForward()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex < this.ViewStack.Count - 1 )
-      {
-        this.ViewStackIndex++;
-      }
-    }
-
-    public void GoHome()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex > 0 )
-      {
-        this.ViewStackIndex = 0;
-      }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      this.AttachToVisualTree();
-      base.OnApplyTemplate();
-    }
-
-    public void RefocusView()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count
-          && this.CurrentView != this.ViewStack[ this.ViewStackIndex ] )
-      {
-        this.UpdateView( this.ViewStack[ this.ViewStackIndex ], true, false, this.ViewStackIndex );
-      }
-    }
-
-    public void Zoom( double percentage )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      this.Zoom( percentage, this.GetZoomRelativePoint() );
-    }
-
-    public void Zoom( double percentage, Point relativeTo )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the given point
-      double scale = this.Scale * ( 1 + percentage );
-      this.ZoomTo( scale, relativeTo );
-    }
-
-    public void ZoomTo( Point position )
-    {
-      // if there is nothing to pan, just return
-      if( _content == null )
-        return;
-
-      // zoom to the new region
-      this.ZoomTo( new ZoomboxView( new Point( -position.X, -position.Y ) ) );
-    }
-
-    public void ZoomTo( Rect region )
-    {
-      if( _content == null )
-        return;
-
-      // adjust the current scale and position
-      this.UpdateView( new ZoomboxView( region ), true, true );
-    }
-
-    public void ZoomTo( double scale )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the center of the content within the control
-      this.ZoomTo( scale, true );
-    }
-
-    public void ZoomTo( double scale, Point relativeTo )
-    {
-      this.ZoomTo( scale, relativeTo, true, true );
-    }
-
-    public void ZoomTo( ZoomboxView view )
-    {
-      this.UpdateView( view, true, true );
-    }
-
-    internal void UpdateStackProperties()
-    {
-      this.SetValue( Zoombox.HasBackStackPropertyKey, this.ViewStackIndex > 0 );
-      this.SetValue( Zoombox.HasForwardStackPropertyKey, this.ViewStack.Count > this.ViewStackIndex + 1 );
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      if( _content != null )
-      {
-        // measure visuals according to supplied constraint
-        Size size = base.MeasureOverride( constraint );
-
-        // now re-measure content to let the child be whatever size it desires
-        _content.Measure( new Size( double.PositiveInfinity, double.PositiveInfinity ) );
-        return size;
-      }
-
-
-      // avoid returning infinity
-      if( double.IsInfinity( constraint.Height ) )
-      {
-        constraint.Height = 0;
-      }
-
-      if( double.IsInfinity( constraint.Width ) )
-      {
-        constraint.Width = 0;
-      }
-      return constraint;
-    }
-
-    protected override void OnContentChanged( object oldContent, object newContent )
-    {
-      // disconnect SizeChanged handler from old content
-      if( oldContent is FrameworkElement )
-      {
-        ( oldContent as FrameworkElement ).RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-      }
-      else
-      {
-        this.RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-      }
-
-      // connect SizeChanged handler to new content
-      if( _content is FrameworkElement )
-      {
-        ( _content as FrameworkElement ).AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-      }
-      else
-      {
-        this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-      }
-
-      // update the Visual property of the view finder display panel's VisualBrush
-      if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
-      {
-        _viewFinderDisplay.VisualBrush.Visual = _content;
-      }
-    }
-
-    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      this.MonitorInput();
-      base.OnGotKeyboardFocus( e );
-    }
-
-    protected override void OnLostKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      this.MonitorInput();
-      base.OnLostKeyboardFocus( e );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-      this.CoerceValue( Zoombox.IsAnimatedProperty );
-    }
-
-    protected override void OnRender( DrawingContext drawingContext )
-    {
-      if( this.HasArrangedContentPresenter && !this.HasRenderedFirstView )
-      {
-        this.HasRenderedFirstView = true;
-        if( this.RefocusViewOnFirstRender )
-        {
-          this.RefocusViewOnFirstRender = false;
-          bool oldAnimated = this.IsAnimated;
-          this.IsAnimated = false;
-          try
-          {
-            this.RefocusView();
-          }
-          finally
-          {
-            this.IsAnimated = oldAnimated;
-          }
-        }
-      }
-
-      base.OnRender( drawingContext );
-    }
-
-
-
-
-    private static void RefocusView( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = o as Zoombox;
-      zoombox.UpdateView( zoombox.CurrentView, true, false, zoombox.ViewStackIndex );
-    }
-
-    private void AttachToVisualTree()
-    {
-      if( _isUpdatingVisualTree )
-        return;
-
-      _isUpdatingVisualTree = true;
-
-      // detach from the old tree
-      this.DetachFromVisualTree();
-
-      // create the drag adorner for selection operations
-      _dragAdorner = new DragAdorner( this );
-
-      // check the template for a SelectionBrush resource
-      if( this.Template.Resources.Contains( "SelectionBrush" ) )
-        _dragAdorner.Brush = this.Template.Resources[ "SelectionBrush" ] as Brush;
-
-      // check the template for a SelectionPen resource
-      if( this.Template.Resources.Contains( "SelectionPen" ) )
-        _dragAdorner.Pen = this.Template.Resources[ "SelectionPen" ] as Pen;
-
-      // check the template for key bindings
-      if( this.Template.Resources.Contains( "InputBindings" ) )
-      {
-        InputBindingCollection inputBindings = this.Template.Resources[ "InputBindings" ] as InputBindingCollection;
-        if( inputBindings != null )
-        {
-          this.InputBindings.AddRange( inputBindings );
-        }
-      }
-
-      // locate the content presenter
-      _contentPresenter = VisualTreeHelperEx.FindDescendantByType( this, typeof( ContentPresenter ) ) as ContentPresenter;
-      if( _contentPresenter == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxTemplateNeedsContent" ) );
-
-      _verticalScrollBar = this.GetTemplateChild( PART_VerticalScrollBar ) as ScrollBar;
-      if( _verticalScrollBar == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox vertical scrollBar not found." ) );
-
-      _verticalScrollBar.Scroll += this.VerticalScrollBar_Scroll;
-
-      _horizontalScrollBar = this.GetTemplateChild( PART_HorizontalScrollBar ) as ScrollBar;
-      if( _horizontalScrollBar == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox horizontal scrollBar not found." ) );
-
-      _horizontalScrollBar.Scroll += this.HorizontalScrollBar_Scroll;
-
-      // check the template for an AdornerDecorator
-      AdornerLayer al = null;
-      AdornerDecorator ad = VisualTreeHelperEx.FindDescendantByType( this, typeof( AdornerDecorator ) ) as AdornerDecorator;
-      if( ad != null )
-      {
-        al = ad.AdornerLayer;
-      }
-      else
-      {
-        // look for an inherited adorner layer
-        try
-        {
-          al = AdornerLayer.GetAdornerLayer( this );
-        }
-        catch( Exception )
-        {
-        }
-      }
-
-      // add the drag adorner to the adorner layer
-      if( al != null )
-      {
-        al.Add( _dragAdorner );
-      }
-
-      // TODO: Why is it necessary to walk the visual tree the first time through?
-      // If we don't do the following, the content is not laid out correctly (centered) initially.
-      VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true );
-
-      // User has not defined a ViewFinder, use the one from this template
-      if( this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null )
-      {
-        // set a reference to the ViewFinder element, if present
-        this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement );
-        Zoombox.SetViewFinderVisibility( this, Visibility.Collapsed );
-      }
-      else
-      {
-        //user has defined a ViewFinder, hide the one from this template
-        Zoombox.SetViewFinderVisibility( this, Visibility.Hidden );
-      }
-
-      // locate the view finder display panel
-      if( this.ViewFinder != null )
-      {
-        _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this.ViewFinder, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay;
-      }
-
-      // if a ViewFinder was specified but no display panel is present, throw an exception
-      if( this.ViewFinder != null && _viewFinderDisplay == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxHasViewFinderButNotDisplay" ) );
-
-      // set up the VisualBrush and adorner for the display panel
-      if( _viewFinderDisplay != null )
-      {
-        // create VisualBrush for the view finder display panel
-        this.CreateVisualBrushForViewFinder( _content );
-
-        // hook up event handlers for dragging and resizing the viewport
-        _viewFinderDisplay.MouseMove += new MouseEventHandler( this.ViewFinderDisplayMouseMove );
-        _viewFinderDisplay.MouseLeftButtonDown += new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture );
-        _viewFinderDisplay.MouseLeftButtonUp += new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture );
-
-        // bind the ViewportRect property of the display to the Viewport of the Zoombox
-        Binding binding = new Binding( "Viewport" );
-        binding.Mode = BindingMode.OneWay;
-        binding.Converter = new ViewFinderSelectionConverter( this );
-        binding.Source = this;
-        _viewFinderDisplay.SetBinding( ZoomboxViewFinderDisplay.ViewportRectProperty, binding );
-      }
-
-      this.UpdateViewFinderDisplayContentBounds();
-
-      // set up event handler to run once the content presenter has been arranged
-      _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
-
-      _isUpdatingVisualTree = false;
-    }
-
-    private void CreateVisualBrushForViewFinder( Visual visual )
-    {
-      _viewFinderDisplay.VisualBrush = new VisualBrush( visual );
-      _viewFinderDisplay.VisualBrush.Stretch = Stretch.Uniform;
-      _viewFinderDisplay.VisualBrush.AlignmentX = AlignmentX.Left;
-      _viewFinderDisplay.VisualBrush.AlignmentY = AlignmentY.Top;
-    }
-
-    private void ContentPresenterFirstArranged( object sender, EventArgs e )
-    {
-      // remove the handler
-      _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
-
-      // it's now safe to update the view
-      this.HasArrangedContentPresenter = true;
-      this.InvalidateVisual();
-
-      // temporarily disable animations
-      bool oldAnimated = IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        // set the initial view
-        double scale = this.Scale;
-        Point position = this.Position;
-
-        // if there are items in the ViewStack and a ViewStackIndex is set, use it
-        if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-        {
-          bool isInitialViewSet = false;
-          if( this.ViewStack.Count > 0 )
-          {
-            if( this.ViewStackIndex >= 0 )
-            {
-              if( this.ViewStackIndex > this.ViewStack.Count - 1 )
-              {
-                this.ViewStackIndex = this.ViewStack.Count - 1;
-              }
-              else
-              {
-                this.UpdateView( this.ViewStack[ this.ViewStackIndex ], false, false, this.ViewStackIndex );
-              }
-            }
-            else if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Auto )
-            {
-              // if this is not an auto-stack, then ensure the index is set to a valid value
-              if( this.ViewStackIndex < 0 )
-              {
-                this.ViewStackIndex = 0;
-              }
-            }
-
-            // if a ViewStackIndex has been set, apply the scale and position values, iff different than the default values
-            if( this.ViewStackIndex >= 0 )
-            {
-              isInitialViewSet = true;
-              if( !DoubleHelper.IsNaN( scale ) || !PointHelper.IsEmpty( position ) )
-              {
-                this.UpdateView( new ZoomboxView( scale, position ), false, false );
-              }
-            }
-          }
-
-          if( !isInitialViewSet )
-          {
-            // set initial view according to the scale and position values and push it on the stack, as necessary
-            ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : Scale,
-              PointHelper.IsEmpty( position ) ? new Point() : position );
-
-            if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto )
-            {
-              this.ViewStack.PushView( initialView );
-              this.ViewStackIndex = 0;
-            }
-            else
-            {
-              this.UpdateView( initialView, false, false );
-            }
-          }
-        }
-        else
-        {
-          // just set initial view according to the scale and position values
-          ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : this.Scale, position );
-          this.UpdateView( initialView, false, false );
-        }
-      }
-      finally
-      {
-        IsAnimated = oldAnimated;
-      }
-      //When ViewFinder is modified, this will refresh the ZoomboxViewFinderDisplay
-      this.ZoomTo( this.Scale );
-    }
-
-    private void DetachFromVisualTree()
-    {
-      // remove the drag adorner
-      if( (_dragAdorner != null) && ( AdornerLayer.GetAdornerLayer( this ) != null ) )
-        AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner );
-
-      // remove the layout updated handler, if present
-      if( _contentPresenter != null )
-      {
-        _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
-      }
-
-      //locate the vertical scrollBar
-      if( _verticalScrollBar != null )
-      {
-        _verticalScrollBar.Scroll -= this.VerticalScrollBar_Scroll;
-      }
-
-      //locate the horizontal scrollBar
-      if( _horizontalScrollBar != null )
-      {
-        _horizontalScrollBar.Scroll -= this.HorizontalScrollBar_Scroll;
-      }
-
-      // remove the view finder display panel's visual brush and adorner
-      if( _viewFinderDisplay != null )
-      {
-        _viewFinderDisplay.MouseMove -= new MouseEventHandler( this.ViewFinderDisplayMouseMove );
-        _viewFinderDisplay.MouseLeftButtonDown -= new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture );
-        _viewFinderDisplay.MouseLeftButtonUp -= new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture );
-        BindingOperations.ClearBinding( _viewFinderDisplay, ZoomboxViewFinderDisplay.ViewportRectProperty );
-        _viewFinderDisplay = null;
-      }
-
-      // set object references to null
-      _contentPresenter = null;
-    }
-
-    private void Zoombox_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.SetScrollBars();
-    }
-
-    private void VerticalScrollBar_Scroll( object sender, ScrollEventArgs e )
-    {
-      double diff = -(e.NewValue + _relativePosition.Y);
-
-      if( e.ScrollEventType == ScrollEventType.LargeIncrement )
-      {
-        diff = -_verticalScrollBar.ViewportSize;
-      }
-      else if( e.ScrollEventType == ScrollEventType.LargeDecrement )
-      {
-        diff = _verticalScrollBar.ViewportSize;
-      }
-
-      this.OnDrag( new DragDeltaEventArgs( 0d, diff / this.Scale ), false );
-
-      // Raise the Scroll event to user
-      EventHandler<ScrollEventArgs> handler = this.Scroll;
-      if( handler != null )
-      {
-        handler( this, e );
-      }
-    }
-
-    private void HorizontalScrollBar_Scroll( object sender, ScrollEventArgs e )
-    {
-      double diff = -( e.NewValue + _relativePosition.X );
-      if( e.ScrollEventType == ScrollEventType.LargeIncrement )
-      {
-        diff = -_horizontalScrollBar.ViewportSize;
-      }
-      else if( e.ScrollEventType == ScrollEventType.LargeDecrement )
-      {
-        diff = _horizontalScrollBar.ViewportSize;
-      }
-
-      this.OnDrag( new DragDeltaEventArgs( diff / this.Scale, 0d ), false );
-
-      // Raise the Scroll event to user
-      EventHandler<ScrollEventArgs> handler = this.Scroll;
-      if( handler != null )
-      {
-        handler( this, e );
-      }
-    }
-
-    private void DragDisplayViewport( DragDeltaEventArgs e, bool end )
-    {
-      // get the scale of the view finder display panel, the selection rect, and the VisualBrush rect
-      double scale = _viewFinderDisplay.Scale;
-      Rect viewportRect = _viewFinderDisplay.ViewportRect;
-      Rect vbRect = _viewFinderDisplay.ContentBounds;
-
-      // if the entire content is visible, do nothing
-      if( viewportRect.Contains( vbRect ) )
-        return;
-
-      // ensure that we stay within the bounds of the VisualBrush
-      double dx = e.HorizontalChange;
-      double dy = e.VerticalChange;
-
-      // check left boundary
-      if( viewportRect.Left < vbRect.Left )
-      {
-        dx = Math.Max( 0, dx );
-      }
-      else if( viewportRect.Left + dx < vbRect.Left )
-      {
-        dx = vbRect.Left - viewportRect.Left;
-      }
-
-      // check right boundary
-      if( viewportRect.Right > vbRect.Right )
-      {
-        dx = Math.Min( 0, dx );
-      }
-      else if( viewportRect.Right + dx > vbRect.Left + vbRect.Width )
-      {
-        dx = vbRect.Left + vbRect.Width - viewportRect.Right;
-      }
-
-      // check top boundary
-      if( viewportRect.Top < vbRect.Top )
-      {
-        dy = Math.Max( 0, dy );
-      }
-      else if( viewportRect.Top + dy < vbRect.Top )
-      {
-        dy = vbRect.Top - viewportRect.Top;
-      }
-
-      // check bottom boundary
-      if( viewportRect.Bottom > vbRect.Bottom )
-      {
-        dy = Math.Min( 0, dy );
-      }
-      else if( viewportRect.Bottom + dy > vbRect.Top + vbRect.Height )
-      {
-        dy = vbRect.Top + vbRect.Height - viewportRect.Bottom;
-      }
-
-      // call the main OnDrag handler that is used when dragging the content directly
-      this.OnDrag( new DragDeltaEventArgs( -dx / scale / _viewboxFactor, -dy / scale / _viewboxFactor ), end );
-
-      // for a drag operation, update the origin with each delta
-      _originPoint = _originPoint + new Vector( dx, dy );
-    }
-
-    private void InitCommands()
-    {
-      CommandBinding binding = new CommandBinding( Zoombox.Back, this.GoBack, this.CanGoBack );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Center, this.CenterContent );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Fill, this.FillToBounds );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Fit, this.FitToBounds );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Forward, this.GoForward, this.CanGoForward );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Home, this.GoHome, this.CanGoHome );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanDown, this.PanDownExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanLeft, this.PanLeftExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanRight, this.PanRightExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanUp, this.PanUpExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Refocus, this.RefocusView, this.CanRefocusView );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.ZoomIn, this.ZoomInExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.ZoomOut, this.ZoomOutExecuted );
-      this.CommandBindings.Add( binding );
-    }
-
-    private void MonitorInput()
-    {
-      // cannot pre-process input in partial trust
-      if( this.HasUIPermission )
-      {
-        this.PreProcessInput();
-      }
-    }
-
-    private void OnContentSizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      this.UpdateViewFinderDisplayContentBounds();
-
-      if( this.HasArrangedContentPresenter )
-      {
-        if( this.HasRenderedFirstView )
-        {
-          this.SetScrollBars();
-          this.UpdateView( this.CurrentView, true, false, this.CurrentViewIndex );
-        }
-        else
-        {
-          // if the content size changes after the content presenter has been arranged,
-          // but before the first view is rendered, invalidate the render so we can refocus 
-          // the view on the first render
-          this.RefocusViewOnFirstRender = true;
-          this.InvalidateVisual();
-        }
-      }
-    }
-
-    private void OnDrag( DragDeltaEventArgs e, bool end )
-    {
-      Point relativePosition = _relativePosition;
-      double scale = this.Scale;
-      Point newPosition = relativePosition + ( this.ContentOffset * scale ) + new Vector( e.HorizontalChange * scale, e.VerticalChange * scale );
-      if( this.IsUsingScrollBars )
-      {
-        newPosition.X = Math.Max( Math.Min( newPosition.X, 0d ), -_horizontalScrollBar.Maximum );
-        newPosition.Y = Math.Max( Math.Min( newPosition.Y, 0d ), -_verticalScrollBar.Maximum );
-      }
-
-      // update the transform
-      this.UpdateView( new ZoomboxView( scale, newPosition ), false, end );
-    }
-
-    private void OnLayoutUpdated( object sender, EventArgs e )
-    {
-      this.UpdateViewport();
-    }
-
-    private void OnSelectRegion( DragDeltaEventArgs e, bool end )
-    {
-      // draw adorner rect
-      if( end )
-      {
-        _dragAdorner.Rect = Rect.Empty;
-
-        if( _trueContent != null )
-        {
-          // get the selected region (in the content's coordinate space) based on the adorner's last position and size
-          Rect selection =
-            new Rect(
-              this.TranslatePoint( _dragAdorner.LastPosition, _trueContent ),
-              this.TranslatePoint( _dragAdorner.LastPosition + new Vector( _dragAdorner.LastSize.Width, _dragAdorner.LastSize.Height ), _trueContent ) );
-
-          // zoom to the selection
-          this.ZoomTo( selection );
-        }
-      }
-      else
-      {
-        _dragAdorner.Rect =
-          Rect.Intersect(
-            new Rect(
-              _originPoint,
-              new Vector( e.HorizontalChange, e.VerticalChange ) ),
-            new Rect(
-              new Point( 0, 0 ),
-              new Point( this.RenderSize.Width, this.RenderSize.Height ) ) );
-      }
-    }
-
-    private void OnSizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      if( !this.HasArrangedContentPresenter )
-        return;
-
-      this.SetScrollBars();
-
-      // when the size is changing, the viewbox factor must be updated before updating the view
-      this.UpdateViewboxFactor();
-
-      bool oldIsAnimated = this.IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
-      }
-      finally
-      {
-        this.IsAnimated = oldIsAnimated;
-      }
-    }
-
-    private void SetScrollBars()
-    {
-      if( _content == null || _verticalScrollBar == null || _horizontalScrollBar == null )
-        return;
-
-      var contentSize = ( _content is Viewbox ) ? ( ( Viewbox )_content ).Child.DesiredSize : this.RenderSize;
-
-      _verticalScrollBar.SmallChange = 10d;
-      _verticalScrollBar.LargeChange = 10d;
-      _verticalScrollBar.Minimum = 0d;
-      _verticalScrollBar.ViewportSize = this.RenderSize.Height;
-      _verticalScrollBar.Maximum = contentSize.Height - _verticalScrollBar.ViewportSize;
-
-      _horizontalScrollBar.SmallChange = 10d;
-      _horizontalScrollBar.LargeChange = 10d;
-      _horizontalScrollBar.Minimum = 0d;
-      _horizontalScrollBar.ViewportSize = this.RenderSize.Width;
-      _horizontalScrollBar.Maximum = contentSize.Width - _horizontalScrollBar.ViewportSize;
-    }
-
-    private void PreProcessInput()
-    {
-      // if mouse is over the Zoombox element or if it has keyboard focus, pre-process input 
-      // to update the KeyModifier trigger properties (e.g., DragModifiersAreActive)
-      if( this.IsMouseOver || this.IsKeyboardFocusWithin )
-      {
-        if( !this.IsMonitoringInput )
-        {
-          this.IsMonitoringInput = true;
-          InputManager.Current.PreNotifyInput += new NotifyInputEventHandler( this.PreProcessInput );
-          this.UpdateKeyModifierTriggerProperties();
-        }
-      }
-      else
-      {
-        if( this.IsMonitoringInput )
-        {
-          this.IsMonitoringInput = false;
-          InputManager.Current.PreNotifyInput -= new NotifyInputEventHandler( this.PreProcessInput );
-
-          this.SetAreDragModifiersActive( false );
-          this.SetAreRelativeZoomModifiersActive( false );
-          this.SetAreZoomModifiersActive( false );
-          this.SetAreZoomToSelectionModifiersActive( false );
-        }
-      }
-    }
-
-    private void PreProcessInput( object sender, NotifyInputEventArgs e )
-    {
-      if( e.StagingItem.Input is KeyEventArgs )
-      {
-        this.UpdateKeyModifierTriggerProperties();
-      }
-    }
-
-    private void ProcessMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( this.ZoomToSelectionModifiers.AreActive )
-      {
-        this.SetIsDraggingContent( false );
-        this.SetIsSelectingRegion( true );
-      }
-      else if( this.DragModifiers.AreActive )
-      {
-        this.SetIsSelectingRegion( false );
-        this.SetIsDraggingContent( true );
-      }
-      else
-      {
-        this.SetIsSelectingRegion( false );
-        this.SetIsDraggingContent( false );
-      }
-
-      // if nothing to do, just return
-      if( !this.IsSelectingRegion && !this.IsDraggingContent )
-        return;
-
-      // set the origin point and capture the mouse
-      _originPoint = e.GetPosition( this );
-      _contentPresenter.CaptureMouse();
-      e.Handled = true;
-      if( this.IsDraggingContent )
-      {
-        // execute the Drag operation
-        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), false );
-      }
-      else if( this.IsSelectingRegion )
-      {
-        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), false );
-      }
-    }
-
-    private void ProcessMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( !this.IsDraggingContent && !this.IsSelectingRegion )
-        return;
-
-      bool endDrag = this.IsDraggingContent;
-
-      this.SetIsDraggingContent( false );
-      this.SetIsSelectingRegion( false );
-
-      _originPoint = new Point();
-      _contentPresenter.ReleaseMouseCapture();
-      e.Handled = true;
-
-      if( endDrag )
-      {
-        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), true );
-      }
-      else
-      {
-        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), true );
-      }
-    }
-
-    private void ProcessMouseMove( MouseEventArgs e )
-    {
-      if( e.MouseDevice.LeftButton != MouseButtonState.Pressed )
-        return;
-
-      if( !this.IsDraggingContent && !this.IsSelectingRegion )
-        return;
-
-      Point pos = e.GetPosition( this );
-      e.Handled = true;
-
-      if( this.IsDraggingContent )
-      {
-        Vector delta = ( pos - _originPoint ) / this.Scale;
-        this.OnDrag( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-        _originPoint = pos;
-      }
-      else if( this.IsSelectingRegion )
-      {
-        Vector delta = pos - _originPoint;
-        this.OnSelectRegion( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-      }
-    }
-
-    private void ProcessMouseWheelZoom( MouseWheelEventArgs e )
-    {
-      if( _content == null )
-        return;
-
-      // check modifiers to see if there's work to do
-      bool doZoom = this.ZoomModifiers.AreActive;
-      bool doRelativeZoom = this.RelativeZoomModifiers.AreActive;
-
-      // can't do both, so assume relative zoom
-      if( doZoom && doRelativeZoom )
-      {
-        doZoom = false;
-      }
-
-      if( !( doZoom || doRelativeZoom ) )
-        return;
-
-      e.Handled = true;
-      double percentage = ( ( e.Delta / Zoombox.MOUSE_WHEEL_DELTA ) * this.ZoomPercentage ) / 100;
-
-      // Are we doing a zoom relative to the current mouse position?
-      if( doRelativeZoom )
-      {
-        this.Zoom( percentage, Mouse.GetPosition( _content ) );
-      }
-      else
-      {
-        this.Zoom( percentage );
-      }
-    }
-
-    private void ProcessNavigationButton( RoutedEventArgs e )
-    {
-      if( e is MouseButtonEventArgs )
-      {
-        MouseButtonEventArgs mbea = e as MouseButtonEventArgs;
-        if( mbea.ChangedButton == MouseButton.XButton1
-            || mbea.ChangedButton == MouseButton.XButton2 )
-        {
-          if( mbea.ChangedButton == MouseButton.XButton2 )
-          {
-            this.GoForward();
-          }
-          else
-          {
-            this.GoBack();
-          }
-          mbea.Handled = true;
-        }
-      }
-      else if( e is KeyEventArgs )
-      {
-        KeyEventArgs kea = e as KeyEventArgs;
-        if( kea.Key == Key.Back || kea.Key == Key.BrowserBack || kea.Key == Key.BrowserForward )
-        {
-          if( kea.Key == Key.BrowserForward )
-          {
-            this.GoForward();
-          }
-          else
-          {
-            this.GoBack();
-          }
-          kea.Handled = true;
-        }
-      }
-    }
-
-    private void ResizeDisplayViewport( DragDeltaEventArgs e, ResizeEdge relativeTo )
-    {
-      // get the existing viewport rect and scale
-      Rect viewportRect = _viewFinderDisplay.ViewportRect;
-      double scale = _viewFinderDisplay.Scale;
-
-      // ensure that we stay within the bounds of the VisualBrush
-      double x = Math.Max( _resizeViewportBounds.Left, Math.Min( _resizeDraggingPoint.X + e.HorizontalChange, _resizeViewportBounds.Right ) );
-      double y = Math.Max( _resizeViewportBounds.Top, Math.Min( _resizeDraggingPoint.Y + e.VerticalChange, _resizeViewportBounds.Bottom ) );
-
-      // get the selected region in the coordinate space of the content
-      Point anchorPoint = new Point( _resizeAnchorPoint.X / scale, _resizeAnchorPoint.Y / scale );
-      Vector newRegionVector = new Vector( ( x - _resizeAnchorPoint.X ) / scale / _viewboxFactor, ( y - _resizeAnchorPoint.Y ) / scale / _viewboxFactor );
-      Rect region = new Rect( anchorPoint, newRegionVector );
-
-      // now translate the region from the coordinate space of the content 
-      // to the coordinate space of the content presenter
-      region =
-        new Rect(
-          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
-          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
-
-      // calculate actual scale value
-      double aspectX = this.RenderSize.Width / region.Width;
-      double aspectY = this.RenderSize.Height / region.Height;
-      scale = aspectX < aspectY ? aspectX : aspectY;
-
-      // scale relative to the anchor point
-      this.ZoomTo( scale, anchorPoint, false, false );
-    }
-
-    private void UpdateKeyModifierTriggerProperties()
-    {
-      this.SetAreDragModifiersActive( this.DragModifiers.AreActive );
-      this.SetAreRelativeZoomModifiersActive( this.RelativeZoomModifiers.AreActive );
-      this.SetAreZoomModifiersActive( this.ZoomModifiers.AreActive );
-      this.SetAreZoomToSelectionModifiersActive( this.ZoomToSelectionModifiers.AreActive );
-    }
-
-    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition )
-    {
-      this.UpdateView( view, allowAnimation, allowStackAddition, -1 );
-    }
-
-    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition, int stackIndex )
-    {
-      if( _contentPresenter == null || _content == null || !this.HasArrangedContentPresenter )
-        return;
-
-      // if an absolute view is being used and only a Scale value has been specified,
-      // use the ZoomTo() function to perform a relative zoom
-      if( view.ViewKind == ZoomboxViewKind.Absolute && PointHelper.IsEmpty( view.Position ) )
-      {
-        this.ZoomTo( view.Scale, allowStackAddition );
-        return;
-      }
-
-      // disallow reentrancy
-      if( !this.IsUpdatingView )
-      {
-        this.IsUpdatingView = true;
-        try
-        {
-          // determine the new scale and position
-          double newRelativeScale = _viewboxFactor;
-          Point newRelativePosition = new Point();
-          Rect region = Rect.Empty;
-          switch( view.ViewKind )
-          {
-            case ZoomboxViewKind.Empty:
-              break;
-
-            case ZoomboxViewKind.Absolute:
-              newRelativeScale = DoubleHelper.IsNaN( view.Scale ) ? _relativeScale : view.Scale;
-              newRelativePosition = PointHelper.IsEmpty( view.Position ) ? _relativePosition
-                  : new Point( view.Position.X, view.Position.Y ) - this.ContentOffset * newRelativeScale;
-              break;
-
-            case ZoomboxViewKind.Region:
-              region = view.Region;
-              break;
-
-            case ZoomboxViewKind.Center:
-              {
-                // get the current ContentRect in the coordinate space of the Zoombox control
-                Rect currentContentRect =
-                  new Rect(
-                    _content.TranslatePoint( this.ContentRect.TopLeft, this ),
-                    _content.TranslatePoint( this.ContentRect.BottomRight, this ) );
-
-                // inflate (or deflate) the rect by the appropriate amounts in the x & y directions
-                region = Rect.Inflate( currentContentRect,
-                    ( this.RenderSize.Width / _viewboxFactor - currentContentRect.Width ) / 2,
-                    ( this.RenderSize.Height / _viewboxFactor - currentContentRect.Height ) / 2 );
-
-                // now translate the centered rect back to the coordinate space of the content
-                region = new Rect( this.TranslatePoint( region.TopLeft, _content ), this.TranslatePoint( region.BottomRight, _content ) );
-              }
-              break;
-
-            case ZoomboxViewKind.Fit:
-              region = this.ContentRect;
-              break;
-
-            case ZoomboxViewKind.Fill:
-              region = this.CalculateFillRect();
-              break;
-          }
-
-          if( view.ViewKind != ZoomboxViewKind.Empty )
-          {
-            if( !region.IsEmpty )
-            {   // ZOOMING TO A REGION
-              this.CalculatePositionAndScale( region, ref newRelativePosition, ref newRelativeScale );
-            }
-            else if( view != ZoomboxView.Empty )
-            {   // USING ABSOLUTE POSITION AND SCALE VALUES
-
-              // ensure that the scale value falls within the valid range
-              if( newRelativeScale > MaxScale )
-              {
-                newRelativeScale = MaxScale;
-              }
-              else if( newRelativeScale < MinScale )
-              {
-                newRelativeScale = MinScale;
-              }
-            }
-
-            double currentScale = _relativeScale;
-            double currentX = _relativePosition.X;
-            double currentY = _relativePosition.Y;
-
-            ScaleTransform st = null;
-            TranslateTransform tt = null;
-            TransformGroup tg = null;
-
-            if( _contentPresenter.RenderTransform != Transform.Identity )
-            {
-              tg = _contentPresenter.RenderTransform as TransformGroup;
-              st = tg.Children[ 0 ] as ScaleTransform;
-              tt = tg.Children[ 1 ] as TranslateTransform;
-              currentScale = st.ScaleX;
-              currentX = tt.X;
-              currentY = tt.Y;
-            }
-
-            if( KeepContentInBounds == true )
-            {
-              Rect boundsRect = new Rect( new Size( this.ContentRect.Width * newRelativeScale, this.ContentRect.Height * newRelativeScale ) );
-
-              // Calc viewport rect (should be inside bounds content rect)
-              Point viewportPosition = new Point( -newRelativePosition.X, -newRelativePosition.Y );
-              Rect viewportRect = new Rect( viewportPosition, _contentPresenter.RenderSize );
-
-              if( DoubleHelper.AreVirtuallyEqual( _relativeScale, newRelativeScale ) ) // we are positioning the content, not scaling
-              {
-                // Handle the width and height seperately since the content extent 
-                // could be contained only partially in the viewport.  Also if the viewport is only 
-                // partially contained within the content extent.
-
-                //
-                // Content extent width is greater than the viewport's width (Zoomed in).  Make sure we restrict
-                // the viewport X inside the content.
-                //
-                if( this.IsGreaterThanOrClose( boundsRect.Width, viewportRect.Width ) )
-                {
-                  if( boundsRect.Right < viewportRect.Right )
-                  {
-                    newRelativePosition.X = -( boundsRect.Width - viewportRect.Width );
-                  }
-
-                  if( boundsRect.Left > viewportRect.Left )
-                  {
-                    newRelativePosition.X = 0;
-                  }
-                }
-                //
-                // Viewport width is greater than the content extent's width (Zoomed out).  Make sure we restrict
-                // the content X inside the viewport.
-                //
-                else if( this.IsGreaterThanOrClose( viewportRect.Width, boundsRect.Width ) )
-                {
-                  if( viewportRect.Right < boundsRect.Right )
-                  {
-                    newRelativePosition.X = viewportRect.Width - boundsRect.Width;
-                  }
-
-                  if( viewportRect.Left > boundsRect.Left )
-                  {
-                    newRelativePosition.X = 0;
-                  }
-                }
-
-                //
-                // Content extent height is greater than the viewport's height (Zoomed in).  Make sure we restrict
-                // the viewport Y inside the content.
-                //
-                if( this.IsGreaterThanOrClose( boundsRect.Height, viewportRect.Height ) )
-                {
-                  if( boundsRect.Bottom < viewportRect.Bottom )
-                  {
-                    newRelativePosition.Y = -( boundsRect.Height - viewportRect.Height );
-                  }
-
-                  if( boundsRect.Top > viewportRect.Top )
-                  {
-                    newRelativePosition.Y = 0;
-                  }
-                }
-                //
-                // Viewport height is greater than the content extent's height (Zoomed out).  Make sure we restrict
-                // the content Y inside the viewport.
-                //
-                else if( this.IsGreaterThanOrClose( viewportRect.Height, boundsRect.Height ) )
-                {
-                  if( viewportRect.Bottom < boundsRect.Bottom )
-                  {
-                    newRelativePosition.Y = viewportRect.Height - boundsRect.Height;
-                  }
-
-                  if( viewportRect.Top > boundsRect.Top )
-                  {
-                    newRelativePosition.Y = 0;
-                  }
-                }
-              }
-            }
-
-            st = new ScaleTransform( newRelativeScale / _viewboxFactor, newRelativeScale / _viewboxFactor );
-            tt = new TranslateTransform( newRelativePosition.X, newRelativePosition.Y );
-            tg = new TransformGroup();
-            tg.Children.Add( st );
-            tg.Children.Add( tt );
-
-            _contentPresenter.RenderTransform = tg;
-
-            var initialContentSize = ( _content is Viewbox ) ? ( ( Viewbox )_content ).Child.DesiredSize : this.RenderSize;
-            var scaledContentSize = new Size( initialContentSize.Width * newRelativeScale, initialContentSize.Height * newRelativeScale );
-
-            if( allowAnimation && IsAnimated )
-            {
-              DoubleAnimation daScale = new DoubleAnimation( currentScale, newRelativeScale / _viewboxFactor, AnimationDuration );
-              daScale.AccelerationRatio = this.AnimationAccelerationRatio;
-              daScale.DecelerationRatio = this.AnimationDecelerationRatio;
-
-              DoubleAnimation daTranslateX = new DoubleAnimation( currentX, newRelativePosition.X, AnimationDuration );
-              daTranslateX.AccelerationRatio = this.AnimationAccelerationRatio;
-              daTranslateX.DecelerationRatio = this.AnimationDecelerationRatio;
-
-              DoubleAnimation daTranslateY = new DoubleAnimation( currentY, newRelativePosition.Y, AnimationDuration );
-              daTranslateY.AccelerationRatio = this.AnimationAccelerationRatio;
-              daTranslateY.DecelerationRatio = this.AnimationDecelerationRatio;
-              daTranslateY.CurrentTimeInvalidated += new EventHandler( this.UpdateViewport );
-              daTranslateY.CurrentStateInvalidated += new EventHandler( this.ZoomAnimationCompleted );
-
-              // raise animation beginning event before beginning the animations
-              RaiseEvent( new RoutedEventArgs( AnimationBeginningEvent, this ) );
-
-              st.BeginAnimation( ScaleTransform.ScaleXProperty, daScale );
-              st.BeginAnimation( ScaleTransform.ScaleYProperty, daScale );
-              tt.BeginAnimation( TranslateTransform.XProperty, daTranslateX );
-              tt.BeginAnimation( TranslateTransform.YProperty, daTranslateY );
-
-              if( this.IsUsingScrollBars )
-              {
-                //Vertical scrollBar animations
-                DoubleAnimation verticalMaxAnimation = new DoubleAnimation();
-                verticalMaxAnimation.From = _verticalScrollBar.Maximum;
-                verticalMaxAnimation.To = scaledContentSize.Height - _verticalScrollBar.ViewportSize;
-                verticalMaxAnimation.Duration = AnimationDuration;
-                _verticalScrollBar.BeginAnimation( ScrollBar.MaximumProperty, verticalMaxAnimation );
-
-                DoubleAnimation verticalValueAnimation = new DoubleAnimation();
-                verticalValueAnimation.From = _verticalScrollBar.Value;
-                verticalValueAnimation.To = -newRelativePosition.Y;
-                verticalValueAnimation.Duration = AnimationDuration;
-                verticalValueAnimation.Completed += this.VerticalValueAnimation_Completed;
-                _verticalScrollBar.BeginAnimation( ScrollBar.ValueProperty, verticalValueAnimation );
-
-                //Horizontal scrollBar animations
-                DoubleAnimation horizontalMaxAnimation = new DoubleAnimation();
-                horizontalMaxAnimation.From = _horizontalScrollBar.Maximum;
-                horizontalMaxAnimation.To = scaledContentSize.Width - _horizontalScrollBar.ViewportSize;
-                horizontalMaxAnimation.Duration = AnimationDuration;
-                _horizontalScrollBar.BeginAnimation( ScrollBar.MaximumProperty, horizontalMaxAnimation );
-
-                DoubleAnimation horizontalValueAnimation = new DoubleAnimation();
-                horizontalValueAnimation.From = _horizontalScrollBar.Value;
-                horizontalValueAnimation.To = -newRelativePosition.X;
-                horizontalValueAnimation.Duration = AnimationDuration;
-                horizontalValueAnimation.Completed += this.HorizontalValueAnimation_Completed;
-                _horizontalScrollBar.BeginAnimation( ScrollBar.ValueProperty, horizontalValueAnimation );
-              }
-            }
-            else if( this.IsUsingScrollBars )
-            {
-              //Vertical scrollBar
-              _verticalScrollBar.Maximum = scaledContentSize.Height - _verticalScrollBar.ViewportSize;
-              _verticalScrollBar.Value = -newRelativePosition.Y;
-              //Horizontal scrollBar
-              _horizontalScrollBar.Maximum = scaledContentSize.Width - _horizontalScrollBar.ViewportSize;
-              _horizontalScrollBar.Value = -newRelativePosition.X;
-            }
-
-            // maintain the relative scale and position for dragging and animating purposes
-            _relativePosition = newRelativePosition;
-            _relativeScale = newRelativeScale;
-
-            // update the Scale and Position properties to keep them in sync with the current view
-            this.Scale = newRelativeScale;
-            _basePosition = newRelativePosition + this.ContentOffset * newRelativeScale;
-            this.UpdateViewport();
-          }
-
-          // add the current view to the view stack
-          if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && allowStackAddition )
-          {
-            // if the last view was pushed on the stack within the last 300 milliseconds, discard it
-            // since proximally close views are probably the result of a mouse wheel scroll
-            if( this.ViewStack.Count > 1
-              && Math.Abs( DateTime.Now.Ticks - _lastStackAddition.Ticks ) < TimeSpan.FromMilliseconds( 300 ).Ticks )
-            {
-              this.ViewStack.RemoveAt( this.ViewStack.Count - 1 );
-              _lastStackAddition = DateTime.Now - TimeSpan.FromMilliseconds( 300 );
-            }
-
-            // if the current view is the same as the last view, do nothing
-            if( this.ViewStack.Count > 0 && view == this.ViewStack.SelectedView )
-            {
-              // do nothing
-            }
-            else
-            {
-              // otherwise, push the current view on stack
-              this.ViewStack.PushView( view );
-              this.ViewStackIndex++;
-              stackIndex = this.ViewStackIndex;
-
-              // update the timestamp for the last stack addition
-              _lastStackAddition = DateTime.Now;
-            }
-          }
-
-          // update the stack indices used by CurrentViewChanged event
-          _lastViewIndex = this.CurrentViewIndex;
-          this.SetCurrentViewIndex( stackIndex );
-
-          // set the new view parameters
-          // NOTE: this is the only place where the CurrentView member should be set
-          this.SetCurrentView( view );
-        }
-        finally
-        {
-          this.IsUpdatingView = false;
-        }
-      }
-    }
-
-    private bool IsGreaterThanOrClose( double value1, double value2 )
-    {
-      return value1 <= value2 ? DoubleHelper.AreVirtuallyEqual( value1, value2 ) : true;
-    }
-
-    private Rect CalculateFillRect()
-    {
-      // determine the x-y ratio of the current Viewport
-      double xyRatio = this.RenderSize.Width / this.RenderSize.Height;
-
-      // now find the maximal rect within the ContentRect that has the same ratio
-      double x = 0;
-      double y = 0;
-      double width = this.ContentRect.Width;
-      double height = this.ContentRect.Height;
-      if( xyRatio > width / height )
-      {
-        height = width / xyRatio;
-        y = ( this.ContentRect.Height - height ) / 2;
-      }
-      else
-      {
-        width = height * xyRatio;
-        x = ( this.ContentRect.Width - width ) / 2;
-      }
-
-      return new Rect( x, y, width, height );
-    }
-
-    private void CalculatePositionAndScale( Rect region, ref Point newRelativePosition, ref double newRelativeScale )
-    {
-      // if there is nothing to scale, just return
-      // if the region has no area, just return
-      if( region.Width == 0 || region.Height == 0 )
-        return;
-
-      // verify that the selected region intersects with the content, which prevents 
-      // the scale operation from zooming the content out of the current view
-      if( !this.ContentRect.IntersectsWith( region ) )
-        return;
-
-      // translate the region from the coordinate space of the content 
-      // to the coordinate space of the content presenter
-      region =
-        new Rect(
-          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
-          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
-
-      // calculate actual zoom, which must fit the entire selection 
-      // while maintaining a 1:1 ratio
-      double aspectX = this.RenderSize.Width / region.Width;
-      double aspectY = this.RenderSize.Height / region.Height;
-      newRelativeScale = aspectX < aspectY ? aspectX : aspectY;
-
-      // ensure that the scale value falls within the valid range
-      if( newRelativeScale > this.MaxScale )
-      {
-        newRelativeScale = this.MaxScale;
-      }
-      else if( newRelativeScale < this.MinScale )
-      {
-        newRelativeScale = this.MinScale;
-      }
-
-      // determine the new content position for this zoom operation based 
-      // on HorizontalContentAlignment and VerticalContentAlignment
-      double horizontalOffset = 0;
-      double verticalOffset = 0;
-      switch( this.HorizontalContentAlignment )
-      {
-        case HorizontalAlignment.Center:
-        case HorizontalAlignment.Stretch:
-          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale ) / 2;
-          break;
-
-        case HorizontalAlignment.Right:
-          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale );
-          break;
-      }
-      switch( VerticalContentAlignment )
-      {
-        case VerticalAlignment.Center:
-        case VerticalAlignment.Stretch:
-          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale ) / 2;
-          break;
-
-        case VerticalAlignment.Bottom:
-          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale );
-          break;
-      }
-      newRelativePosition =
-        new Point( -region.TopLeft.X * newRelativeScale, -region.TopLeft.Y * newRelativeScale )
-          + new Vector( horizontalOffset, verticalOffset );
-    }
-
-    private void UpdateViewFinderDisplayContentBounds()
-    {
-      if( _content == null || _trueContent == null || _viewFinderDisplay == null )
-        return;
-
-      this.UpdateViewboxFactor();
-
-      // ensure the display panel has a size
-      Size contentSize = _content.RenderSize;
-      Size viewFinderSize = _viewFinderDisplay.AvailableSize;
-      if( viewFinderSize.Width > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Height, 0d ) )
-      {
-        // update height to accomodate width, while keeping a ratio equal to the actual content
-        viewFinderSize = new Size( viewFinderSize.Width, contentSize.Height * viewFinderSize.Width / contentSize.Width );
-      }
-      else if( viewFinderSize.Height > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Width, 0d ) )
-      {
-        // update width to accomodate height, while keeping a ratio equal to the actual content
-        viewFinderSize = new Size( contentSize.Width * viewFinderSize.Height / contentSize.Height, viewFinderSize.Width );
-      }
-
-      // determine the scale of the view finder display panel
-      double aspectX = viewFinderSize.Width / contentSize.Width;
-      double aspectY = viewFinderSize.Height / contentSize.Height;
-      double scale = aspectX < aspectY ? aspectX : aspectY;
-
-      // determine the rect of the VisualBrush
-      double vbWidth = contentSize.Width * scale;
-      double vbHeight = contentSize.Height * scale;
-
-      // set the ContentBounds and Scale properties on the view finder display panel
-      _viewFinderDisplay.Scale = scale;
-      _viewFinderDisplay.ContentBounds = new Rect( new Size( vbWidth, vbHeight ) );
-    }
-
-    private void UpdateViewboxFactor()
-    {
-      if( _content == null || _trueContent == null )
-        return;
-
-      double contentWidth = _content.RenderSize.Width;
-      double trueContentWidth = _trueContent.RenderSize.Width;
-
-      if( DoubleHelper.AreVirtuallyEqual( contentWidth, 0d ) || DoubleHelper.AreVirtuallyEqual( trueContentWidth, 0d ) )
-      {
-        _viewboxFactor = 1d;
-      }
-      else
-      {
-        _viewboxFactor = contentWidth / trueContentWidth;
-      }
-    }
-
-    private void UpdateViewport()
-    {
-      // if we haven't attached to the visual tree yet or we don't have content, just return
-      if( _contentPresenter == null || _trueContent == null )
-        return;
-
-      this.IsUpdatingViewport = true;
-      try
-      {
-        // calculate the current viewport
-        Rect viewport =
-          new Rect(
-            this.TranslatePoint( new Point( 0d, 0d ), _trueContent ),
-            this.TranslatePoint( new Point( RenderSize.Width, RenderSize.Height ), _trueContent ) );
-
-        // if the viewport has changed, set the Viewport dependency property
-        if( !DoubleHelper.AreVirtuallyEqual( viewport, this.Viewport ) )
-        {
-          this.SetValue( Zoombox.ViewportPropertyKey, viewport );
-        }
-      }
-      finally
-      {
-        this.IsUpdatingViewport = false;
-      }
-    }
-
-    private void UpdateViewport( object sender, EventArgs e )
-    {
-      this.UpdateViewport();
-    }
-
-    private void ViewFinderDisplayBeginCapture( object sender, MouseButtonEventArgs e )
-    {
-      const double ARBITRARY_LARGE_VALUE = 10000000000;
-
-      // if we need to acquire capture, the Tag property of the view finder display panel
-      // will be a ResizeEdge value.
-      if( _viewFinderDisplay.Tag is ResizeEdge )
-      {
-        // if the Tag is ResizeEdge.None, then its a drag operation; otherwise, its a resize
-        if( ( ResizeEdge )_viewFinderDisplay.Tag == ResizeEdge.None )
-        {
-          this.IsDraggingViewport = true;
-        }
-        else
-        {
-          this.IsResizingViewport = true;
-          Vector direction = new Vector();
-          switch( ( ResizeEdge )_viewFinderDisplay.Tag )
-          {
-            case ResizeEdge.TopLeft:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopLeft;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomRight;
-              direction = new Vector( -1, -1 );
-              break;
-
-            case ResizeEdge.TopRight:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopRight;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
-              direction = new Vector( 1, -1 );
-              break;
-
-            case ResizeEdge.BottomLeft:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopRight;
-              direction = new Vector( -1, 1 );
-              break;
-
-            case ResizeEdge.BottomRight:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomRight;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopLeft;
-              direction = new Vector( 1, 1 );
-              break;
-            case ResizeEdge.Left:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              direction = new Vector( -1, 0 );
-              break;
-            case ResizeEdge.Top:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Top );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Bottom );
-              direction = new Vector( 0, -1 );
-              break;
-            case ResizeEdge.Right:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              direction = new Vector( 1, 0 );
-              break;
-            case ResizeEdge.Bottom:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Bottom );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Top );
-              direction = new Vector( 0, 1 );
-              break;
-          }
-          double scale = _viewFinderDisplay.Scale;
-          Rect contentRect = _viewFinderDisplay.ContentBounds;
-          Vector minVector = new Vector( direction.X * ARBITRARY_LARGE_VALUE, direction.Y * ARBITRARY_LARGE_VALUE );
-          Vector maxVector = new Vector( direction.X * contentRect.Width / MaxScale, direction.Y * contentRect.Height / MaxScale );
-          _resizeViewportBounds = new Rect( _resizeAnchorPoint + minVector, _resizeAnchorPoint + maxVector );
-        }
-
-        // store the origin of the operation and acquire capture
-        _originPoint = e.GetPosition( _viewFinderDisplay );
-        _viewFinderDisplay.CaptureMouse();
-        e.Handled = true;
-      }
-    }
-
-    private void ViewFinderDisplayEndCapture( object sender, MouseButtonEventArgs e )
-    {
-      // if a drag or resize is in progress, end it and release capture
-      if( this.IsDraggingViewport || this.IsResizingViewport )
-      {
-        // call the DragDisplayViewport method to end the operation
-        // and store the current position on the stack
-        this.DragDisplayViewport( new DragDeltaEventArgs( 0, 0 ), true );
-
-        // reset the dragging state variables and release capture
-        this.IsDraggingViewport = false;
-        this.IsResizingViewport = false;
-        _originPoint = new Point();
-        _viewFinderDisplay.ReleaseMouseCapture();
-        e.Handled = true;
-      }
-    }
-
-    private void ViewFinderDisplayMouseMove( object sender, MouseEventArgs e )
-    {
-      // if a drag operation is in progress, update the operation
-      if( e.MouseDevice.LeftButton == MouseButtonState.Pressed
-          && ( this.IsDraggingViewport || this.IsResizingViewport ) )
-      {
-        Point pos = e.GetPosition( _viewFinderDisplay );
-        Vector delta = pos - _originPoint;
-        if( this.IsDraggingViewport )
-        {
-          this.DragDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-        }
-        else
-        {
-          this.ResizeDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), ( ResizeEdge )_viewFinderDisplay.Tag );
-        }
-        e.Handled = true;
-      }
-      else
-      {
-        // update the cursor based on the nearest corner
-        Point mousePos = e.GetPosition( _viewFinderDisplay );
-        Rect viewportRect = _viewFinderDisplay.ViewportRect;
-        double cornerDelta = viewportRect.Width * viewportRect.Height > 100 ? 5.0
-            : Math.Sqrt( viewportRect.Width * viewportRect.Height ) / 2;
-
-        // if the mouse is within the Rect and the Rect does not encompass the entire content, set the appropriate cursor
-        if( viewportRect.Contains( mousePos )
-            && !DoubleHelper.AreVirtuallyEqual( Rect.Intersect( viewportRect, _viewFinderDisplay.ContentBounds ), _viewFinderDisplay.ContentBounds ) )
-        {
-          if( PointHelper.DistanceBetween( mousePos, viewportRect.TopLeft ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.TopLeft;
-            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomRight ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.BottomRight;
-            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.TopRight ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.TopRight;
-            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomLeft ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.BottomLeft;
-            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
-          }
-          else if( mousePos.X <= viewportRect.Left + cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Left;
-            _viewFinderDisplay.Cursor = Cursors.SizeWE;
-          }
-          else if( mousePos.Y <= viewportRect.Top + cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Top;
-            _viewFinderDisplay.Cursor = Cursors.SizeNS;
-          }
-          else if( mousePos.X >= viewportRect.Right - cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Right;
-            _viewFinderDisplay.Cursor = Cursors.SizeWE;
-          }
-          else if( mousePos.Y >= viewportRect.Bottom - cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Bottom;
-            _viewFinderDisplay.Cursor = Cursors.SizeNS;
-          }
-          else
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.None;
-            _viewFinderDisplay.Cursor = Cursors.SizeAll;
-          }
-        }
-        else
-        {
-          _viewFinderDisplay.Tag = null;
-          _viewFinderDisplay.Cursor = Cursors.Arrow;
-        }
-      }
-    }
-
-    private void ZoomAnimationCompleted( object sender, EventArgs e )
-    {
-      if( ( sender as AnimationClock ).CurrentState != ClockState.Active )
-      {
-        // remove the event handlers
-        ( sender as AnimationClock ).CurrentStateInvalidated -= new EventHandler( this.ZoomAnimationCompleted );
-        ( sender as AnimationClock ).CurrentTimeInvalidated -= new EventHandler( this.UpdateViewport );
-
-        // raise animation completed event
-        this.RaiseEvent( new RoutedEventArgs( Zoombox.AnimationCompletedEvent, this ) );
-      }
-    }
-
-    private void VerticalValueAnimation_Completed( object sender, EventArgs e )
-    {
-      //When the animaton is completed, with the FillBehavior to HoldEnd, 
-      //the ScrollBarValue will be overriden with the final animation value, preventing future scroll.
-      //To remove it use BeginAnimation with null.
-      //http://msdn.microsoft.com/en-us/library/aa970493(v=vs.110).aspx      
-
-      // only do this when all the overlapped animations are done or limits values reached.
-      if( ( _verticalScrollBar.Value == -_relativePosition.Y )
-        || ( _verticalScrollBar.Value == _verticalScrollBar.Maximum )
-        || ( _verticalScrollBar.Value == _verticalScrollBar.Minimum ) )
-      {
-        var finalValue = _verticalScrollBar.Value;
-        //this will reset Value to original value of animation
-        _verticalScrollBar.BeginAnimation( ScrollBar.ValueProperty, null );
-        //this will set to last value of the animation.
-        _verticalScrollBar.Value = finalValue;
-      }
-    }
-
-    private void HorizontalValueAnimation_Completed( object sender, EventArgs e )
-    {
-      //When the animaton is completed, with the FillBehavior to HoldEnd, 
-      //the ScrollBarValue will be overriden with the final animation value, preventing future scroll.
-      //To remove it use BeginAnimation with null.
-      //http://msdn.microsoft.com/en-us/library/aa970493(v=vs.110).aspx      
-
-      // only do this when all the overlapped animations are done or limits values reached.
-      if( ( _horizontalScrollBar.Value == -_relativePosition.X )
-        || ( _horizontalScrollBar.Value == _horizontalScrollBar.Maximum )
-        || ( _horizontalScrollBar.Value == _horizontalScrollBar.Minimum ) )
-      {
-        var finalValue = _horizontalScrollBar.Value;
-        //this will reset Value to original value of animation
-        _horizontalScrollBar.BeginAnimation( ScrollBar.ValueProperty, null );
-        //this will set to last value of the animation.
-        _horizontalScrollBar.Value = finalValue;
-      }
-    }
-
-    private void ZoomTo( double scale, bool allowStackAddition )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the zoom origin
-      this.ZoomTo( scale, this.GetZoomRelativePoint(), true, allowStackAddition );
-    }
-
-    private void ZoomTo( double scale, Point relativeTo, bool restrictRelativePointToContent, bool allowStackAddition )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      if( double.IsNaN( scale ) )
-        return;
-
-      // if necessary, verify that the relativeTo point falls within the content
-      if( restrictRelativePointToContent && !( new Rect( _content.RenderSize ) ).Contains( relativeTo ) )
-        return;
-
-      // ensure that the scale value falls within the valid range
-      if( scale > this.MaxScale )
-      {
-        scale = this.MaxScale;
-      }
-      else if( scale < this.MinScale )
-      {
-        scale = this.MinScale;
-      }
-
-      // internally, updates are always relative to the Zoombox control
-      Point translateFrom = relativeTo;
-      if( this.HasRenderedFirstView )
-      {
-        // Note that this TranslatePoint approach will not work until the first render occurs
-        relativeTo = _content.TranslatePoint( relativeTo, this );
-
-        // adjust translateFrom based on relativeTo
-        translateFrom = this.TranslatePoint( relativeTo, _contentPresenter );
-      }
-      else if( _contentPresenter != null )
-      {
-        // prior to the first render, just use the ContentPresenter's transform and do not adjust translateFrom
-        if( _contentPresenter.RenderTransform == Transform.Identity )
-        {
-          // in order for this approach to work, we must at least make one pass to update a generic view
-          // with Scale = 1.0 and Position = 0,0
-          this.UpdateView( new ZoomboxView( 1, new Point( 0, 0 ) ), false, false );
-        }
-
-        // now there should be a valid RenderTransform
-        relativeTo = ( _contentPresenter.RenderTransform as Transform ).Transform( relativeTo );
-      }
-
-      // determine the new content position for this zoom operation
-      Point translateTo = new Point( relativeTo.X - ( translateFrom.X * scale / _viewboxFactor ),
-          relativeTo.Y - ( translateFrom.Y * scale / _viewboxFactor ) )
-          + this.ContentOffset * scale / _viewboxFactor;
-      this.UpdateView( new ZoomboxView( scale, translateTo ), !this.IsResizingViewport, allowStackAddition );
-    }
-
-    private Point GetZoomRelativePoint()
-    {
-      Point zoomPoint;
-
-      if( ZoomOn == ZoomboxZoomOn.View )
-      {
-        // Transform the viewport point to the content
-        Point viewportZoomOrigin = new Point();
-
-        viewportZoomOrigin.X = this.Viewport.X + ( this.Viewport.Width * this.ZoomOrigin.X );
-        viewportZoomOrigin.Y = this.Viewport.Y + ( this.Viewport.Height * this.ZoomOrigin.Y );
-
-        Point contentZoomOrigin = _trueContent.TranslatePoint( viewportZoomOrigin, _content );
-
-        if( contentZoomOrigin.X < 0 )
-        {
-          contentZoomOrigin.X = 0;
-        }
-        else if( contentZoomOrigin.X > _content.RenderSize.Width )
-        {
-          contentZoomOrigin.X = _content.RenderSize.Width;
-        }
-
-        if( contentZoomOrigin.Y < 0 )
-        {
-          contentZoomOrigin.Y = 0;
-        }
-        else if( contentZoomOrigin.Y > _content.RenderSize.Height )
-        {
-          contentZoomOrigin.Y = _content.RenderSize.Height;
-        }
-
-        zoomPoint = contentZoomOrigin;
-      }
-      else
-      {
-        zoomPoint = new Point( _content.RenderSize.Width * ZoomOrigin.X, _content.RenderSize.Height * ZoomOrigin.Y );
-      }
-
-      return zoomPoint;
-    }
-
-    #region OnKeyDown Methods
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      if( !this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnKeyDown( e );
-    }
-
-    #endregion
-
-    #region OnMouseDown Methods
-
-    protected override void OnPreviewMouseDown( MouseButtonEventArgs e )
-    {
-      if( this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnPreviewMouseDown( e );
-    }
-
-    protected override void OnMouseDown( MouseButtonEventArgs e )
-    {
-      if( !this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnMouseDown( e );
-    }
-
-    #endregion
-
-    #region OnMouseEnter Methods
-
-    protected override void OnMouseEnter( MouseEventArgs e )
-    {
-      this.MonitorInput();
-
-      base.OnMouseEnter( e );
-    }
-
-    #endregion
-
-    #region OnMouseLeave Methods
-
-    protected override void OnMouseLeave( MouseEventArgs e )
-    {
-      this.MonitorInput();
-
-      base.OnMouseLeave( e );
-    }
-
-    #endregion
-
-    #region OnMouseLeftButton Methods
-
-    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonDown( e );
-      }
-
-      base.OnPreviewMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonDown( e );
-      }
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnPreviewMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonUp( e );
-      }
-
-      base.OnPreviewMouseLeftButtonUp( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonUp( e );
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-
-    #endregion
-
-    #region OnMouseMove Methods
-
-    protected override void OnPreviewMouseMove( MouseEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseMove( e );
-      }
-
-      base.OnPreviewMouseMove( e );
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseMove( e );
-      }
-
-      base.OnMouseMove( e );
-    }
-
-    #endregion
-
-    #region OnMouseWheel Methods
-
-    protected override void OnPreviewMouseWheel( MouseWheelEventArgs e )
-    {
-      if( this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseWheelZoom( e );
-      }
-
-      base.OnPreviewMouseWheel( e );
-    }
-
-    protected override void OnMouseWheel( MouseWheelEventArgs e )
-    {
-      if( !this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseWheelZoom( e );
-      }
-
-      base.OnMouseWheel( e );
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    // the default value for a single mouse wheel delta appears to be 28
-    private static int MOUSE_WHEEL_DELTA = 28;
-
-    // the content control's one and only content presenter
-    private ContentPresenter _contentPresenter = null;
-
-    //The Scrollbars
-    private ScrollBar _verticalScrollBar = null;
-    private ScrollBar _horizontalScrollBar = null;
-
-    // the content of the Zoombox (cast as a UIElement)
-    private UIElement _content = null;
-
-    // the drag adorner used for selecting a region in a zoom-to-selection operation
-    private DragAdorner _dragAdorner = null;
-
-    // the view stack
-    private ZoomboxViewStack _viewStack = null;
-
-    // the view finder display panel
-    // this is used to show the current viewport
-    private ZoomboxViewFinderDisplay _viewFinderDisplay = null;
-
-    // state variables used during drag and select operations
-    private Rect _resizeViewportBounds = Rect.Empty;
-    private Point _resizeAnchorPoint = new Point( 0, 0 );
-    private Point _resizeDraggingPoint = new Point( 0, 0 );
-    private Point _originPoint = new Point( 0, 0 );
-
-    private double _viewboxFactor = 1.0;
-    private double _relativeScale = 1.0;
-    private Point _relativePosition = new Point();
-    private Point _basePosition = new Point();
-
-    // used to track the time delta between stack operations
-    private DateTime _lastStackAddition;
-
-    // used to provide stack index when view changes
-    private int _lastViewIndex = -1;
-
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    #endregion
-
-    #region ViewFinderSelectionConverter Nested Type
-
-    private sealed class ViewFinderSelectionConverter : IValueConverter
-    {
-      public ViewFinderSelectionConverter( Zoombox zoombox )
-      {
-        _zoombox = zoombox;
-      }
-
-      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        Rect viewport = ( Rect )value;
-        if( viewport.IsEmpty )
-          return viewport;
-
-        // adjust the viewport from the coordinate space of the Content element
-        // to the coordinate space of the view finder display panel
-        double scale = _zoombox._viewFinderDisplay.Scale * _zoombox._viewboxFactor;
-        Rect result = new Rect( viewport.Left * scale, viewport.Top * scale,
-            viewport.Width * scale, viewport.Height * scale );
-        result.Offset( _zoombox._viewFinderDisplay.ContentBounds.Left,
-            _zoombox._viewFinderDisplay.ContentBounds.Top );
-        return result;
-      }
-
-      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        return null;
-      }
-
-      private readonly Zoombox _zoombox;
-    }
-
-    #endregion
-
-    #region DragAdorner Nested Type
-
-    internal sealed class DragAdorner : Adorner
-    {
-      public DragAdorner( UIElement adornedElement )
-        : base( adornedElement )
-      {
-        this.ClipToBounds = true;
-      }
-
-      public static readonly DependencyProperty BrushProperty =
-        DependencyProperty.Register( "Brush", typeof( Brush ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-      public Brush Brush
-      {
-        get
-        {
-          return ( Brush )this.GetValue( DragAdorner.BrushProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.BrushProperty, value );
-        }
-      }
-
-      public static readonly DependencyProperty PenProperty =
-        DependencyProperty.Register( "Pen", typeof( Pen ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x7F, 0x3F, 0x3F, 0x3F ) ), 2d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-      public Pen Pen
-      {
-        get
-        {
-          return ( Pen )this.GetValue( DragAdorner.PenProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.PenProperty, value );
-        }
-      }
-
-      public static readonly DependencyProperty RectProperty =
-        DependencyProperty.Register( "Rect", typeof( Rect ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender,
-            new PropertyChangedCallback( DragAdorner.OnRectChanged ) ) );
-
-      public Rect Rect
-      {
-        get
-        {
-          return ( Rect )this.GetValue( DragAdorner.RectProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.RectProperty, value );
-        }
-      }
-
-      private static void OnRectChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-      {
-        DragAdorner dragAdorner = ( DragAdorner )d;
-        Rect rect = ( Rect )e.NewValue;
-
-        // ignore empty values
-        if( rect.IsEmpty )
-          return;
-
-        // if the value is not empty, cache the position and size
-        dragAdorner._cachedPosition = ( ( Rect )e.NewValue ).TopLeft;
-        dragAdorner._cachedSize = ( ( Rect )e.NewValue ).Size;
-      }
-
-      public Point LastPosition
-      {
-        get
-        {
-          return _cachedPosition;
-        }
-      }
-
-      public Size LastSize
-      {
-        get
-        {
-          return _cachedSize;
-        }
-      }
-
-      protected override void OnRender( DrawingContext drawingContext )
-      {
-        drawingContext.DrawRectangle( Brush, Pen, Rect );
-      }
-
-      private Point _cachedPosition;
-      private Size _cachedSize;
-    }
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      IsUpdatingView = 0x00000001,
-      IsUpdatingViewport = 0x00000002,
-      IsDraggingViewport = 0x00000004,
-      IsResizingViewport = 0x00000008,
-      IsMonitoringInput = 0x00000010,
-      IsContentWrapped = 0x00000020,
-      HasArrangedContentPresenter = 0x00000040,
-      HasRenderedFirstView = 0x00000080,
-      RefocusViewOnFirstRender = 0x00000100,
-      HasUIPermission = 0x00000200,
-    }
-
-    #endregion
-
-    #region ResizeEdge Nested Type
-
-    private enum ResizeEdge
-    {
-      None,
-      TopLeft,
-      TopRight,
-      BottomLeft,
-      BottomRight,
-      Left,
-      Top,
-      Right,
-      Bottom,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
deleted file mode 100644
index bdbd47a3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Security;
-using System.Security.Permissions;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxCursors
-  {
-    #region Constructors
-
-    static ZoomboxCursors()
-    {
-      try
-      {
-        new EnvironmentPermission( PermissionState.Unrestricted ).Demand();
-        _zoom = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/Zoom.cur" ) );
-        _zoomRelative = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/ZoomRelative.cur" ) );
-      }
-      catch( SecurityException )
-      {
-        // partial trust, so just use default cursors
-      }
-    }
-
-    #endregion
-
-    #region Zoom Static Property
-
-    public static Cursor Zoom
-    {
-      get
-      {
-        return _zoom;
-      }
-    }
-
-    private static readonly Cursor _zoom = Cursors.Arrow;
-
-    #endregion
-
-    #region ZoomRelative Static Property
-
-    public static Cursor ZoomRelative
-    {
-      get
-      {
-        return _zoomRelative;
-      }
-    }
-
-    private static readonly Cursor _zoomRelative = Cursors.Arrow;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
deleted file mode 100644
index 124a27aa..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  [TypeConverter( typeof( ZoomboxViewConverter ) )]
-  public class ZoomboxView
-  {
-    #region Constructors
-
-    public ZoomboxView()
-    {
-    }
-
-    public ZoomboxView( double scale )
-    {
-      this.Scale = scale;
-    }
-
-    public ZoomboxView( Point position )
-    {
-      this.Position = position;
-    }
-
-    public ZoomboxView( double scale, Point position )
-    {
-      this.Position = position;
-      this.Scale = scale;
-    }
-
-    public ZoomboxView( Rect region )
-    {
-      this.Region = region;
-    }
-
-    public ZoomboxView( double x, double y )
-      : this( new Point( x, y ) )
-    {
-    }
-
-    public ZoomboxView( double scale, double x, double y )
-      : this( scale, new Point( x, y ) )
-    {
-    }
-
-    public ZoomboxView( double x, double y, double width, double height )
-      : this( new Rect( x, y, width, height ) )
-    {
-    }
-
-    #endregion
-
-    #region Empty Static Property
-
-    public static ZoomboxView Empty
-    {
-      get
-      {
-        return _empty;
-      }
-    }
-
-    private static readonly ZoomboxView _empty = new ZoomboxView( ZoomboxViewKind.Empty );
-
-    #endregion
-
-    #region Fill Static Property
-
-    public static ZoomboxView Fill
-    {
-      get
-      {
-        return _fill;
-      }
-    }
-
-    private static readonly ZoomboxView _fill = new ZoomboxView( ZoomboxViewKind.Fill );
-
-    #endregion
-
-    #region Fit Static Property
-
-    public static ZoomboxView Fit
-    {
-      get
-      {
-        return _fit;
-      }
-    }
-
-    private static readonly ZoomboxView _fit = new ZoomboxView( ZoomboxViewKind.Fit );
-
-    #endregion
-
-    #region Center Static Property
-
-    public static ZoomboxView Center
-    {
-      get
-      {
-        return _center;
-      }
-    }
-
-    private static readonly ZoomboxView _center = new ZoomboxView( ZoomboxViewKind.Center );
-
-    #endregion
-
-    #region ViewKind Property
-
-    public ZoomboxViewKind ViewKind
-    {
-      get
-      {
-        if( _kindHeight > 0 )
-        {
-          return ZoomboxViewKind.Region;
-        }
-        else
-        {
-          return ( ZoomboxViewKind )( int )_kindHeight;
-        }
-      }
-    }
-
-    private double _kindHeight = ( int )ZoomboxViewKind.Empty;
-
-    #endregion
-
-    #region Position Property
-
-    public Point Position
-    {
-      get
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "PositionOnlyAccessibleOnAbsolute" ) );
-
-        return new Point( _x, _y );
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        _x = value.X;
-        _y = value.Y;
-        _kindHeight = ( int )ZoomboxViewKind.Absolute;
-      }
-    }
-
-    private double _x = double.NaN;
-    private double _y = double.NaN;
-
-    #endregion
-
-    #region Scale Property
-
-    public double Scale
-    {
-      get
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "ScaleOnlyAccessibleOnAbsolute" ) );
-
-        return _scaleWidth;
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        _scaleWidth = value;
-        _kindHeight = ( int )ZoomboxViewKind.Absolute;
-      }
-    }
-
-    private double _scaleWidth = double.NaN;
-
-    #endregion
-
-    #region Region Property
-
-    public Rect Region
-    {
-      get
-      {
-        // a region view has a positive _typeHeight value
-        if( _kindHeight < 0 )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "RegionOnlyAccessibleOnRegionalView" ) );
-
-        return new Rect( _x, _y, _scaleWidth, _kindHeight );
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Region && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        if( !value.IsEmpty )
-        {
-          _x = value.X;
-          _y = value.Y;
-          _scaleWidth = value.Width;
-          _kindHeight = value.Height;
-        }
-      }
-    }
-
-    #endregion
-
-    public override int GetHashCode()
-    {
-      return _x.GetHashCode() ^ _y.GetHashCode() ^ _scaleWidth.GetHashCode() ^ _kindHeight.GetHashCode();
-    }
-
-    public override bool Equals( object o )
-    {
-      bool result = false;
-      if( o is ZoomboxView )
-      {
-        ZoomboxView other = ( ZoomboxView )o;
-        if( this.ViewKind == other.ViewKind )
-        {
-          switch( this.ViewKind )
-          {
-            case ZoomboxViewKind.Absolute:
-              result = ( DoubleHelper.AreVirtuallyEqual( _scaleWidth, other._scaleWidth ) )
-                    && ( DoubleHelper.AreVirtuallyEqual( Position, other.Position ) );
-              break;
-
-            case ZoomboxViewKind.Region:
-              result = DoubleHelper.AreVirtuallyEqual( Region, other.Region );
-              break;
-
-            default:
-              result = true;
-              break;
-          }
-        }
-      }
-      return result;
-    }
-
-    public override string ToString()
-    {
-      switch( ViewKind )
-      {
-        case ZoomboxViewKind.Empty:
-          return "ZoomboxView: Empty";
-
-        case ZoomboxViewKind.Center:
-          return "ZoomboxView: Center";
-
-        case ZoomboxViewKind.Fill:
-          return "ZoomboxView: Fill";
-
-        case ZoomboxViewKind.Fit:
-          return "ZoomboxView: Fit";
-
-        case ZoomboxViewKind.Absolute:
-          return string.Format( "ZoomboxView: Scale = {0}; Position = ({1}, {2})", _scaleWidth.ToString( "f" ), _x.ToString( "f" ), _y.ToString( "f" ) );
-
-        case ZoomboxViewKind.Region:
-          return string.Format( "ZoomboxView: Region = ({0}, {1}, {2}, {3})", _x.ToString( "f" ), _y.ToString( "f" ), _scaleWidth.ToString( "f" ), _kindHeight.ToString( "f" ) );
-      }
-
-      return base.ToString();
-    }
-
-    private ZoomboxView( ZoomboxViewKind viewType )
-    {
-      _kindHeight = ( int )viewType;
-    }
-
-    #region Operators Methods
-
-    public static bool operator ==( ZoomboxView v1, ZoomboxView v2 )
-    {
-      if( ( object )v1 == null )
-        return ( object )v2 == null;
-
-      if( ( object )v2 == null )
-        return ( object )v1 == null;
-
-      return v1.Equals( v2 );
-    }
-
-    public static bool operator !=( ZoomboxView v1, ZoomboxView v2 )
-    {
-      return !( v1 == v2 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
deleted file mode 100644
index 1575827c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxViewChangedEventArgs : PropertyChangedEventArgs<ZoomboxView>
-  {
-    #region Constructors
-
-    public ZoomboxViewChangedEventArgs(
-      ZoomboxView oldView,
-      ZoomboxView newView,
-      int oldViewStackIndex,
-      int newViewStackIndex )
-      : base( Zoombox.CurrentViewChangedEvent, oldView, newView )
-    {
-      _newViewStackIndex = newViewStackIndex;
-      _oldViewStackIndex = oldViewStackIndex;
-    }
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public int NewViewStackIndex
-    {
-      get
-      {
-        return _newViewStackIndex;
-      }
-    }
-
-    private readonly int _newViewStackIndex = -1;
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public int OldViewStackIndex
-    {
-      get
-      {
-        return _oldViewStackIndex;
-      }
-    }
-
-    private readonly int _oldViewStackIndex = -1;
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public bool IsNewViewFromStack
-    {
-      get
-      {
-        return _newViewStackIndex >= 0;
-      }
-    }
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public bool IsOldViewFromStack
-    {
-      get
-      {
-        return _oldViewStackIndex >= 0;
-      }
-    }
-
-    #endregion
-
-    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
-    {
-      ( ( ZoomboxViewChangedEventHandler )genericHandler )( genericTarget, this );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
deleted file mode 100644
index 1931a414..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Zoombox
-{
-  public delegate void ZoomboxViewChangedEventHandler( object sender, ZoomboxViewChangedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
deleted file mode 100644
index 67cdaa7f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public sealed class ZoomboxViewConverter : TypeConverter
-  {
-    #region Converter Static Property
-
-    internal static ZoomboxViewConverter Converter
-    {
-      get
-      {
-        if( _converter == null )
-        {
-          _converter = new ZoomboxViewConverter();
-        }
-        return _converter;
-      }
-    }
-
-    private static ZoomboxViewConverter _converter; //null
-
-    #endregion
-
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( string ) )
-          || ( type == typeof( double ) )
-          || ( type == typeof( Point ) )
-          || ( type == typeof( Rect ) )
-          || ( base.CanConvertFrom( typeDescriptorContext, type ) );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( string ) )
-          || ( base.CanConvertTo( typeDescriptorContext, type ) );
-    }
-
-    public override object ConvertFrom( 
-      ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value )
-    {
-      ZoomboxView result = null;
-      if( value is double )
-      {
-        result = new ZoomboxView( ( double )value );
-      }
-      else if( value is Point )
-      {
-        result = new ZoomboxView( ( Point )value );
-      }
-      else if( value is Rect )
-      {
-        result = new ZoomboxView( ( Rect )value );
-      }
-      else if( value is string )
-      {
-        if( string.IsNullOrEmpty( ( value as string ).Trim() ) )
-        {
-          result = ZoomboxView.Empty;
-        }
-        else
-        {
-          switch( ( value as string ).Trim().ToLower() )
-          {
-            case "center":
-              result = ZoomboxView.Center;
-              break;
-
-            case "empty":
-              result = ZoomboxView.Empty;
-              break;
-
-            case "fill":
-              result = ZoomboxView.Fill;
-              break;
-
-            case "fit":
-              result = ZoomboxView.Fit;
-              break;
-
-            default:
-              // parse double values; respect the following separators: ' ', ';', or ','
-              List<double> values = new List<double>();
-              foreach( string token in ( value as string ).Split( new char[] { ' ', ';', ',' }, StringSplitOptions.RemoveEmptyEntries ) )
-              {
-                double d;
-                if( double.TryParse( token, out d ) )
-                {
-                  values.Add( d );
-                }
-                if( values.Count >= 4 )
-                {
-                  // disregard additional values
-                  break;
-                }
-              }
-
-              switch( values.Count )
-              {
-                case 1: // scale
-                  result = new ZoomboxView( values[ 0 ] );
-                  break;
-
-                case 2: // x, y
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ] );
-                  break;
-
-                case 3: // scale, x, y
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ] );
-                  break;
-
-                case 4: // x, y, width, height
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ], values[ 3 ] );
-                  break;
-              }
-              break;
-          }
-        }
-      }
-      return ( result == null ? base.ConvertFrom( typeDescriptorContext, cultureInfo, value ) : result );
-    }
-
-    public override object ConvertTo( 
-      ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value, 
-      Type destinationType )
-    {
-      object result = null;
-      ZoomboxView view = value as ZoomboxView;
-
-      if( view != null )
-      {
-        if( destinationType == typeof( string ) )
-        {
-          result = "Empty";
-          switch( view.ViewKind )
-          {
-            case ZoomboxViewKind.Absolute:
-              if( PointHelper.IsEmpty( view.Position ) )
-              {
-                if( !DoubleHelper.IsNaN( view.Scale ) )
-                {
-                  result = view.Scale.ToString();
-                }
-              }
-              else if( DoubleHelper.IsNaN( view.Scale ) )
-              {
-                result = view.Position.X.ToString() + "," + view.Position.Y.ToString();
-              }
-              else
-              {
-                result = view.Scale.ToString() + ","
-                    + view.Position.X.ToString() + ","
-                    + view.Position.Y.ToString();
-              }
-              break;
-
-            case ZoomboxViewKind.Center:
-              result = "Center";
-              break;
-
-            case ZoomboxViewKind.Fill:
-              result = "Fill";
-              break;
-
-            case ZoomboxViewKind.Fit:
-              result = "Fit";
-              break;
-
-            case ZoomboxViewKind.Region:
-              result = view.Region.X.ToString() + ","
-                  + view.Region.Y.ToString() + ","
-                  + view.Region.Width.ToString() + ","
-                  + view.Region.Height.ToString();
-              break;
-          }
-        }
-      }
-      return ( result == null ? base.ConvertTo( typeDescriptorContext, cultureInfo, value, destinationType ) : result );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
deleted file mode 100644
index 52417ed4..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Zoombox
-{
-  public class ZoomboxViewException : Exception
-  {
-    #region Constructors
-
-    public ZoomboxViewException( string message ) 
-      : base( message )
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
deleted file mode 100644
index e2077a89..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxViewFinderDisplay : FrameworkElement
-  {
-    #region Constructors
-
-    static ZoomboxViewFinderDisplay()
-    {
-      ZoomboxViewFinderDisplay.DefaultStyleKeyProperty.OverrideMetadata( typeof( ZoomboxViewFinderDisplay ), new FrameworkPropertyMetadata( typeof( ZoomboxViewFinderDisplay ) ) );
-    }
-
-    public ZoomboxViewFinderDisplay()
-    {
-    }
-
-    #endregion
-
-    #region Background Property
-
-    public static readonly DependencyProperty BackgroundProperty =
-      DependencyProperty.Register( "Background", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0xC0, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush Background
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.BackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.BackgroundProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ContentBounds Property
-
-    private static readonly DependencyPropertyKey ContentBoundsPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ContentBounds", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( ( Rect )Rect.Empty, FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public static readonly DependencyProperty ContentBoundsProperty = ZoomboxViewFinderDisplay.ContentBoundsPropertyKey.DependencyProperty;
-
-    internal Rect ContentBounds
-    {
-      get
-      {
-        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ContentBoundsProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ContentBoundsPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region ShadowBrush Property
-
-    public static readonly DependencyProperty ShadowBrushProperty =
-      DependencyProperty.Register( "ShadowBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0x80, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush ShadowBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportBrush Property
-
-    public static readonly DependencyProperty ViewportBrushProperty =
-      DependencyProperty.Register( "ViewportBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush ViewportBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportPen Property
-
-    public static readonly DependencyProperty ViewportPenProperty =
-      DependencyProperty.Register( "ViewportPen", typeof( Pen ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x80, 0x00, 0x00, 0x00 ) ), 1d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Pen ViewportPen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( ZoomboxViewFinderDisplay.ViewportPenProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportPenProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportRect Property
-
-    public static readonly DependencyProperty ViewportRectProperty =
-      DependencyProperty.Register( "ViewportRect", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Rect ViewportRect
-    {
-      get
-      {
-        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ViewportRectProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportRectProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region VisualBrush Property
-
-    private static readonly DependencyPropertyKey VisualBrushPropertyKey =
-      DependencyProperty.RegisterReadOnly( "VisualBrush", typeof( VisualBrush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( ( VisualBrush )null ) );
-
-    public static readonly DependencyProperty VisualBrushProperty = ZoomboxViewFinderDisplay.VisualBrushPropertyKey.DependencyProperty;
-
-    internal VisualBrush VisualBrush
-    {
-      get
-      {
-        return ( VisualBrush )this.GetValue( ZoomboxViewFinderDisplay.VisualBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.VisualBrushPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region AvailableSize Internal Property
-
-    internal Size AvailableSize
-    {
-      get
-      {
-        return _availableSize;
-      }
-    }
-
-    private Size _availableSize = Size.Empty;
-
-    #endregion
-
-    #region Scale Internal Property
-
-    internal double Scale
-    {
-      get
-      {
-        return _scale;
-      }
-      set
-      {
-        _scale = value;
-      }
-    }
-
-    private double _scale = 1d;
-
-    #endregion
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      // Note that we do not call the Arrange method on any children
-      // because a ViewFinderDisplay has no children
-
-      // the control's RenderSize should always match its DesiredSize
-      return this.DesiredSize;
-    }
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      // Note that we do not call the Measure method on any children
-      // because a ViewFinderDisplay has no children.  It is merely used 
-      // as a surface for the view finder's VisualBrush.
-
-      // store the available size for use by the Zoombox control
-      _availableSize = availableSize;
-
-      // Simulate size-to-content for the display panel by ensuring a width and height
-      // based on the content bounds. Otherwise, the display panel may have no size, since it doesn't 
-      // contain content.
-      double width = DoubleHelper.IsNaN( this.ContentBounds.Width ) ? 0 : Math.Max( 0, this.ContentBounds.Width );
-      double height = DoubleHelper.IsNaN( this.ContentBounds.Height ) ? 0 : Math.Max( 0, this.ContentBounds.Height );
-      Size displayPanelSize = new Size( width, height );
-
-      // Now ensure that the result fits within the available size while maintaining
-      // the width/height ratio of the content bounds
-      if( displayPanelSize.Width > availableSize.Width || displayPanelSize.Height > availableSize.Height )
-      {
-        double aspectX = availableSize.Width / displayPanelSize.Width;
-        double aspectY = availableSize.Height / displayPanelSize.Height;
-        double scale = ( aspectX < aspectY ) ? aspectX : aspectY;
-        displayPanelSize = new Size( displayPanelSize.Width * scale, displayPanelSize.Height * scale );
-      }
-
-      return displayPanelSize;
-    }
-
-    protected override void OnRender( DrawingContext dc )
-    {
-      base.OnRender( dc );
-
-      dc.DrawRectangle( this.Background, null, this.ContentBounds );
-
-      dc.DrawRectangle( this.VisualBrush, null, this.ContentBounds );
-
-      if( this.ViewportRect.IntersectsWith( new Rect( this.RenderSize ) ) )
-      {
-        // draw shadow rectangles over the non-viewport regions
-        Rect r1 = new Rect( new Point( 0, 0 ), new Size( this.RenderSize.Width, Math.Max( 0, this.ViewportRect.Top ) ) );
-        Rect r2 = new Rect( new Point( 0, this.ViewportRect.Top ), new Size( Math.Max( 0, this.ViewportRect.Left ), this.ViewportRect.Height ) );
-        Rect r3 = new Rect( new Point( this.ViewportRect.Right, this.ViewportRect.Top ), new Size( Math.Max( 0, this.RenderSize.Width - this.ViewportRect.Right ), this.ViewportRect.Height ) );
-        Rect r4 = new Rect( new Point( 0, this.ViewportRect.Bottom ), new Size( this.RenderSize.Width, Math.Max( 0, this.RenderSize.Height - this.ViewportRect.Bottom ) ) );
-        dc.DrawRectangle( this.ShadowBrush, null, r1 );
-        dc.DrawRectangle( this.ShadowBrush, null, r2 );
-        dc.DrawRectangle( this.ShadowBrush, null, r3 );
-        dc.DrawRectangle( this.ShadowBrush, null, r4 );
-
-        // draw the rectangle around the viewport region
-        dc.DrawRectangle( this.ViewportBrush, this.ViewportPen, this.ViewportRect );
-      }
-      else
-      {
-        // if no part of the Rect is visible, just draw a 
-        // shadow over the entire content bounds
-        dc.DrawRectangle( this.ShadowBrush, null, new Rect( this.RenderSize ) );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
deleted file mode 100644
index ce90e01c..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Zoombox
-{
-  public enum ZoomboxViewKind
-  {
-    Absolute = -5,
-    Fit = -4,
-    Fill = -3,
-    Center = -2,
-    Empty = -1,
-    Region,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
deleted file mode 100644
index d44acb9d..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
+++ /dev/null
@@ -1,555 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public sealed class ZoomboxViewStack : Collection<ZoomboxView>, IWeakEventListener
-  {
-    #region Constructors
-
-    public ZoomboxViewStack( Zoombox zoombox )
-    {
-      _zoomboxRef = new WeakReference( zoombox );
-    }
-
-    #endregion
-
-    #region SelectedView Property
-
-    public ZoomboxView SelectedView
-    {
-      get
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        return ( currentIndex < 0 || currentIndex > Count - 1 ) ? ZoomboxView.Empty : this[ currentIndex ];
-      }
-    }
-
-    #endregion
-
-    #region AreViewsFromSource Internal Property
-
-    internal bool AreViewsFromSource
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.AreViewsFromSource ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.AreViewsFromSource ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Source Internal Property
-
-    internal IEnumerable Source
-    {
-      get
-      {
-        return _source;
-      }
-    }
-
-    // if the view stack is generated by items within the ViewStackSource collection
-    // of the Zoombox, then we maintain a strong reference to the source
-    private IEnumerable _source; //null
-
-    #endregion
-
-    #region IsChangeFromSource Private Property
-
-    private bool IsChangeFromSource
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsChangeFromSource ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsChangeFromSource ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsMovingViews Private Property
-
-    private bool IsMovingViews
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsMovingViews ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsMovingViews ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsResettingViews Private Property
-
-    private bool IsResettingViews
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsResettingViews ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsResettingViews ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsSettingInitialViewAfterClear Private Property
-
-    private bool IsSettingInitialViewAfterClear
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Zoombox Private Property
-
-    private Zoombox Zoombox
-    {
-      get
-      {
-        return _zoomboxRef.Target as Zoombox;
-      }
-    }
-
-    // maintain a weak reference to the Zoombox that owns the stack
-    private WeakReference _zoomboxRef;
-
-    #endregion
-
-    internal void ClearViewStackSource()
-    {
-      if( this.AreViewsFromSource )
-      {
-        this.AreViewsFromSource = false;
-        this.MonitorSource( false );
-        _source = null;
-        using( new SourceAccess( this ) )
-        {
-          this.Clear();
-        }
-        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-      }
-    }
-
-    internal void PushView( ZoomboxView view )
-    {
-      // clear the forward stack
-      int currentIndex = this.Zoombox.ViewStackIndex;
-      while( this.Count - 1 > currentIndex )
-      {
-        this.RemoveAt( Count - 1 );
-      }
-      this.Add( view );
-    }
-
-    internal void SetViewStackSource( IEnumerable source )
-    {
-      if( _source != source )
-      {
-        this.MonitorSource( false );
-        _source = source;
-        this.MonitorSource( true );
-        this.AreViewsFromSource = true;
-        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-        this.ResetViews();
-      }
-    }
-
-    protected override void ClearItems()
-    {
-      this.VerifyStackModification();
-
-      bool currentDeleted = ( this.Zoombox.CurrentViewIndex >= 0 );
-      base.ClearItems();
-      this.Zoombox.SetViewStackCount( Count );
-
-      // if resetting the views due to a change in the view source collection, just return
-      if( this.IsResettingViews )
-        return;
-
-      if( this.Zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && this.Zoombox.CurrentView != ZoomboxView.Empty )
-      {
-        this.IsSettingInitialViewAfterClear = true;
-        try
-        {
-          this.Add( this.Zoombox.CurrentView );
-        }
-        finally
-        {
-          this.IsSettingInitialViewAfterClear = false;
-        }
-        this.Zoombox.ViewStackIndex = 0;
-        if( currentDeleted )
-        {
-          this.Zoombox.SetCurrentViewIndex( 0 );
-        }
-      }
-      else
-      {
-        this.Zoombox.ViewStackIndex = -1;
-        this.Zoombox.SetCurrentViewIndex( -1 );
-      }
-    }
-
-    protected override void InsertItem( int index, ZoomboxView view )
-    {
-      this.VerifyStackModification();
-
-      if( this.Zoombox.HasArrangedContentPresenter
-          && this.Zoombox.ViewStackIndex >= index
-          && !this.IsSettingInitialViewAfterClear
-          && !this.IsResettingViews
-          && !this.IsMovingViews )
-      {
-        bool oldUpdatingView = this.Zoombox.IsUpdatingView;
-        this.Zoombox.IsUpdatingView = true;
-        try
-        {
-          this.Zoombox.ViewStackIndex++;
-          if( this.Zoombox.CurrentViewIndex != -1 )
-          {
-            this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex + 1 );
-          }
-        }
-        finally
-        {
-          this.Zoombox.IsUpdatingView = oldUpdatingView;
-        }
-      }
-
-      base.InsertItem( index, view );
-      this.Zoombox.SetViewStackCount( Count );
-    }
-
-    protected override void RemoveItem( int index )
-    {
-      this.VerifyStackModification();
-
-      bool currentDeleted = ( this.Zoombox.ViewStackIndex == index );
-      if( !this.IsMovingViews )
-      {
-        // if an item below the current index was deleted 
-        // (or if the last item is currently selected and it was deleted),
-        // adjust the ViewStackIndex and CurrentViewIndex values
-        if( this.Zoombox.HasArrangedContentPresenter
-            && ( this.Zoombox.ViewStackIndex > index
-                || ( currentDeleted && this.Zoombox.ViewStackIndex == this.Zoombox.ViewStack.Count - 1 ) ) )
-        {
-          // if removing the last item, just clear the stack, which ensures the proper
-          // behavior based on the ViewStackMode
-          if( currentDeleted && this.Zoombox.ViewStack.Count == 1 )
-          {
-            this.Clear();
-            return;
-          }
-
-          bool oldUpdatingView = this.Zoombox.IsUpdatingView;
-          this.Zoombox.IsUpdatingView = true;
-          try
-          {
-            this.Zoombox.ViewStackIndex--;
-            if( this.Zoombox.CurrentViewIndex != -1 )
-            {
-              this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex - 1 );
-            }
-          }
-          finally
-          {
-            this.Zoombox.IsUpdatingView = oldUpdatingView;
-          }
-        }
-      }
-
-      base.RemoveItem( index );
-
-      // if the current view was deleted, we may need to update the view index 
-      // (unless a non-stack view is in effect)
-      if( !this.IsMovingViews && currentDeleted && this.Zoombox.CurrentViewIndex != -1 )
-      {
-        this.Zoombox.RefocusView();
-      }
-
-      this.Zoombox.SetViewStackCount( Count );
-    }
-
-    protected override void SetItem( int index, ZoomboxView view )
-    {
-      this.VerifyStackModification();
-
-      base.SetItem( index, view );
-
-      // if the set item is the current item, update the zoombox
-      if( index == this.Zoombox.CurrentViewIndex )
-      {
-        this.Zoombox.RefocusView();
-      }
-    }
-
-    private static ZoomboxView GetViewFromSourceItem( object item )
-    {
-      ZoomboxView view = ( item is ZoomboxView ) ? item as ZoomboxView : ZoomboxViewConverter.Converter.ConvertFrom( item ) as ZoomboxView;
-      if( view == null )
-        throw new InvalidCastException( string.Format( ErrorMessages.GetMessage( "UnableToConvertToZoomboxView" ), item ) );
-
-      return view;
-    }
-
-    private void InsertViews( int index, IList newItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        foreach( object item in newItems )
-        {
-          ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
-          if( index >= this.Count )
-          {
-            this.Add( view );
-          }
-          else
-          {
-            this.Insert( index, view );
-          }
-          index++;
-        }
-      }
-    }
-
-    private void MonitorSource( bool monitor )
-    {
-      if( _source != null && ( _source is INotifyCollectionChanged ) )
-      {
-        if( monitor )
-        {
-          CollectionChangedEventManager.AddListener( _source as INotifyCollectionChanged, this );
-        }
-        else
-        {
-          CollectionChangedEventManager.RemoveListener( _source as INotifyCollectionChanged, this );
-        }
-      }
-    }
-
-    private void MoveViews( int oldIndex, int newIndex, IList movedItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        int indexAfterMove = currentIndex;
-
-        // adjust the current index, if it was affected by the move
-        if( !( ( oldIndex < currentIndex && newIndex < currentIndex )
-            || ( oldIndex > currentIndex && newIndex > currentIndex ) ) )
-        {
-          if( currentIndex >= oldIndex && currentIndex < oldIndex + movedItems.Count )
-          {
-            indexAfterMove += newIndex - oldIndex;
-          }
-          else if( currentIndex >= newIndex )
-          {
-            indexAfterMove += movedItems.Count;
-          }
-        }
-
-        this.IsMovingViews = true;
-        try
-        {
-          for( int i = 0; i < movedItems.Count; i++ )
-          {
-            this.RemoveAt( oldIndex );
-          }
-          for( int i = 0; i < movedItems.Count; i++ )
-          {
-            this.Insert( newIndex + i, ZoomboxViewStack.GetViewFromSourceItem( movedItems[ i ] ) );
-          }
-          if( indexAfterMove != currentIndex )
-          {
-            this.Zoombox.ViewStackIndex = indexAfterMove;
-            this.Zoombox.SetCurrentViewIndex( indexAfterMove );
-          }
-        }
-        finally
-        {
-          this.IsMovingViews = false;
-        }
-      }
-    }
-
-    private void OnSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          this.InsertViews( e.NewStartingIndex, e.NewItems );
-          break;
-
-        case NotifyCollectionChangedAction.Move:
-          this.MoveViews( e.OldStartingIndex, e.NewStartingIndex, e.OldItems );
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          this.RemoveViews( e.OldStartingIndex, e.OldItems );
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          this.ResetViews();
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-          this.ResetViews();
-          break;
-      }
-    }
-
-    private void ResetViews()
-    {
-      using( new SourceAccess( this ) )
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        this.IsResettingViews = true;
-        try
-        {
-          this.Clear();
-          foreach( object item in _source )
-          {
-            ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
-            this.Add( view );
-          }
-
-          currentIndex = Math.Min( Math.Max( 0, currentIndex ), this.Count - 1 );
-
-          this.Zoombox.ViewStackIndex = currentIndex;
-          this.Zoombox.SetCurrentViewIndex( currentIndex );
-          this.Zoombox.RefocusView();
-        }
-        finally
-        {
-          this.IsResettingViews = false;
-        }
-      }
-    }
-
-    private void RemoveViews( int index, IList removedItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        for( int i = 0; i < removedItems.Count; i++ )
-        {
-          this.RemoveAt( index );
-        }
-      }
-    }
-
-    private void VerifyStackModification()
-    {
-      if( this.AreViewsFromSource && !this.IsChangeFromSource )
-        throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewStackCannotBeManipulatedNow" ) );
-    }
-
-    #region IWeakEventListener Members
-
-    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.OnSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    // to save memory, store bool variables in a bit vector
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    #endregion
-
-    #region SourceAccess Nested Type
-
-    private sealed class SourceAccess : IDisposable
-    {
-      public SourceAccess( ZoomboxViewStack viewStack )
-      {
-        _viewStack = viewStack;
-        _viewStack.IsChangeFromSource = true;
-      }
-
-      ~SourceAccess()
-      {
-        this.Dispose();
-      }
-
-      public void Dispose()
-      {
-        _viewStack.IsChangeFromSource = false;
-        _viewStack = null;
-        GC.SuppressFinalize( this );
-      }
-
-      private ZoomboxViewStack _viewStack;
-    }
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      AreViewsFromSource = 0x00000001,
-      IsChangeFromSource = 0x00000002,
-      IsResettingViews = 0x00000004,
-      IsMovingViews = 0x00000008,
-      IsSettingInitialViewAfterClear = 0x00000010,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
deleted file mode 100644
index b2cd4d22..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Zoombox
-{
-  public enum ZoomboxViewStackMode
-  {
-    Auto,
-    Default,
-    Disabled,
-    Manual,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
deleted file mode 100644
index e79fa42f..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Zoombox
-{
-  public enum ZoomboxZoomOn
-  {
-    Content = 1,
-    View,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
deleted file mode 100644
index b526a5b6..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
+++ /dev/null
@@ -1,79 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.i.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index c74b3029..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml
deleted file mode 100644
index d1d519d0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 41d8a27d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml
deleted file mode 100644
index 079ca992..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index ca90bb57..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml
deleted file mode 100644
index 78260e21..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 84dc6814..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml
deleted file mode 100644
index e4f0708e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 16567c75..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml
deleted file mode 100644
index c9ebe999..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 8ce47497..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml
deleted file mode 100644
index 54089b7f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 2ff3ab29..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml
deleted file mode 100644
index 8bae09c0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 4888f686..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml
deleted file mode 100644
index 54f18c78..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml
deleted file mode 100644
index 8455af23..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
deleted file mode 100644
index a3efa890..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F317F2D7BDADD3B25B8299860CBC45BB00787CE2"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Windows.Shell;
-using Xceed.Wpf.Toolkit;
-
-
-namespace Xceed.Wpf.Toolkit {
-    
-    
-    /// <summary>
-    /// CollectionControlDialog
-    /// </summary>
-    public partial class CollectionControlDialog : Xceed.Wpf.Toolkit.CollectionControlDialogBase, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 32 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal Xceed.Wpf.Toolkit.CollectionControl _collectionControl;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit;component/collectioncontrol/implementation/collectioncontroldi" +
-                    "alog.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._collectionControl = ((Xceed.Wpf.Toolkit.CollectionControl)(target));
-            return;
-            case 2:
-            
-            #line 45 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 49 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 27721fe4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml
deleted file mode 100644
index 23a35c1a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 6028cacb..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml
deleted file mode 100644
index 2b63fc0c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fcb35386..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml
deleted file mode 100644
index a96e03c2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index c26d4597..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml
deleted file mode 100644
index 8125912a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 030a322e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml
deleted file mode 100644
index ef8f1f2b..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 7e9ba5b3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml
deleted file mode 100644
index a64deff7..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 136dd1ba..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 670c91da..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml
deleted file mode 100644
index 670c91da..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml
deleted file mode 100644
index f583b7bc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 5fc96cb0..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml
deleted file mode 100644
index ed8407d9..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 6eada85e..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml
deleted file mode 100644
index e58637e1..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 5dfa3d07..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml
deleted file mode 100644
index 22893caf..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index bc8e06ee..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml
deleted file mode 100644
index bc8e06ee..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml
deleted file mode 100644
index a3b3c3b8..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml
deleted file mode 100644
index 127733aa..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml
deleted file mode 100644
index 4ff118e6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml
deleted file mode 100644
index e08faa4d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index d9951a95..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml
deleted file mode 100644
index c104c0ca..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 508a50b3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml
deleted file mode 100644
index fceecb14..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1de6cd22..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml
deleted file mode 100644
index 9bb7e859..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 59886a96..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml
deleted file mode 100644
index 8c6d0464..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml
deleted file mode 100644
index a4c28f10..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml
deleted file mode 100644
index 73c94bd2..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml
deleted file mode 100644
index 73fffc3f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 5b175593..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml
deleted file mode 100644
index 15b1701d..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml
deleted file mode 100644
index a65ffaa6..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml
deleted file mode 100644
index 15d61c8a..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml
deleted file mode 100644
index 0e23d2b4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml
deleted file mode 100644
index 65aaa85f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml
deleted file mode 100644
index 6f9118cc..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml
deleted file mode 100644
index fadb53e3..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml
deleted file mode 100644
index a02da153..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml
deleted file mode 100644
index 0e23d2b4..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml
deleted file mode 100644
index db10e78f..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 52ac9d6c..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml
deleted file mode 100644
index f5d89560..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1dc72223..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml
deleted file mode 100644
index c2a7e0ec..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 4dec1182..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml
deleted file mode 100644
index 4dec1182..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index c6e05e70..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml
deleted file mode 100644
index 5b490c42..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index f9770a59..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml
deleted file mode 100644
index bea18331..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
deleted file mode 100644
index 4f949211..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
deleted file mode 100644
index ed605324..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csprojResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\classic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\SelectorItem.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\WindowControl.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\SelectorItem.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\WindowControl.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Magnifier\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Buttons.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Common.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Glyphs.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Brushes_NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Buttons_NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Brushes.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Buttons.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Common.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Glyphs.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.g.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.pdb
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources
deleted file mode 100644
index 341843ad..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.i.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
deleted file mode 100644
index 87937ca3..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.i.lref
+++ /dev/null
@@ -1,79 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.i.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
deleted file mode 100644
index ea0b55cb..00000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
+++ /dev/null
@@ -1,79 +0,0 @@
-D:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml;;
-FD:\Dev\ExtendedWPFToolkit\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml;;
-
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index a6537f49..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml
deleted file mode 100644
index a6537f49..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/sn.snk and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
index bb02fe09..5a7a337f 100644
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
+++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
@@ -1,61 +1,22 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.10.34928.147
+VisualStudioVersion = 17.11.35327.3
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.DataGrid", "Src\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj", "{63648392-6CE9-4A60-96D4-F9FD718D29B0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock", "Src\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{8976E4A6-FF5F-44C5-AC57-FEDA249DD199}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.VS2010", "Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Metro", "Src\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Aero", "Src\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Release|Mixed Platforms = Release|Mixed Platforms
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{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
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{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
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0B10AFF5-44B4-4ADC-8D05-54B0B866D2BD}
-	EndGlobalSection
 EndGlobal
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
deleted file mode 100644
index c6ea985d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-#pragma warning disable 0436
-[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
-#pragma warning restore 0436
-
-internal static class _XceedVersionInfo
-{
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
-  [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_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
deleted file mode 100644
index 3316fb13..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
deleted file mode 100644
index 0b2738c9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum AutoSelectBehavior
-  {
-    Never,
-    OnFocus
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
deleted file mode 100644
index cd17a9b2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class AutoSelectTextBox : TextBox
-  {
-    public AutoSelectTextBox()
-    {
-    }
-
-    #region AutoSelectBehavior PROPERTY
-
-    public AutoSelectBehavior AutoSelectBehavior
-    {
-      get
-      {
-        return ( AutoSelectBehavior )GetValue( AutoSelectBehaviorProperty );
-      }
-      set
-      {
-        SetValue( AutoSelectBehaviorProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty AutoSelectBehaviorProperty =
-        DependencyProperty.Register( "AutoSelectBehavior", typeof( AutoSelectBehavior ), typeof( AutoSelectTextBox ),
-      new UIPropertyMetadata( AutoSelectBehavior.Never ) );
-
-    #endregion AutoSelectBehavior PROPERTY
-
-    #region AutoMoveFocus PROPERTY
-
-    public bool AutoMoveFocus
-    {
-      get
-      {
-        return ( bool )GetValue( AutoMoveFocusProperty );
-      }
-      set
-      {
-        SetValue( AutoMoveFocusProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty AutoMoveFocusProperty =
-        DependencyProperty.Register( "AutoMoveFocus", typeof( bool ), typeof( AutoSelectTextBox ), new UIPropertyMetadata( false ) );
-
-    #endregion AutoMoveFocus PROPERTY
-
-    #region QueryMoveFocus EVENT
-
-    public static readonly RoutedEvent QueryMoveFocusEvent = EventManager.RegisterRoutedEvent( "QueryMoveFocus",
-                                                                                                RoutingStrategy.Bubble,
-                                                                                                typeof( QueryMoveFocusEventHandler ),
-                                                                                                typeof( AutoSelectTextBox ) );
-    #endregion QueryMoveFocus EVENT
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( !this.AutoMoveFocus )
-      {
-        base.OnPreviewKeyDown( e );
-        return;
-      }
-
-      if( ( e.Key == Key.Left )
-        && ( ( Keyboard.Modifiers == ModifierKeys.None )
-          || ( Keyboard.Modifiers == ModifierKeys.Control ) ) )
-      {
-        e.Handled = this.MoveFocusLeft();
-      }
-
-      if( ( e.Key == Key.Right )
-        && ( ( Keyboard.Modifiers == ModifierKeys.None )
-          || ( Keyboard.Modifiers == ModifierKeys.Control ) ) )
-      {
-        e.Handled = this.MoveFocusRight();
-      }
-
-      if( ( ( e.Key == Key.Up ) || ( e.Key == Key.PageUp ) )
-        && ( ( Keyboard.Modifiers == ModifierKeys.None )
-          || ( Keyboard.Modifiers == ModifierKeys.Control ) ) )
-      {
-        e.Handled = this.MoveFocusUp();
-      }
-
-      if( ( ( e.Key == Key.Down ) || ( e.Key == Key.PageDown ) )
-       && ( ( Keyboard.Modifiers == ModifierKeys.None )
-         || ( Keyboard.Modifiers == ModifierKeys.Control ) ) )
-      {
-        e.Handled = this.MoveFocusDown();
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      base.OnPreviewGotKeyboardFocus( e );
-
-      if( this.AutoSelectBehavior == AutoSelectBehavior.OnFocus )
-      {
-        // If the focus was not in one of our child ( or popup ), we select all the text.
-        if( !TreeHelper.IsDescendantOf( e.OldFocus as DependencyObject, this ) )
-        {
-          this.SelectAll();
-        }
-      }
-    }
-
-    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      base.OnPreviewMouseLeftButtonDown( e );
-
-      if( this.AutoSelectBehavior == AutoSelectBehavior.Never )
-        return;
-
-      if( this.IsKeyboardFocusWithin == false )
-      {
-        this.Focus();
-        e.Handled = true;  //prevent from removing the selection
-      }
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      base.OnTextChanged( e );
-
-      if( !this.AutoMoveFocus )
-        return;
-
-      if( ( this.Text.Length != 0 )
-          && ( this.Text.Length == this.MaxLength )
-          && ( this.CaretIndex == this.MaxLength ) )
-      {
-        if( this.CanMoveFocus( FocusNavigationDirection.Right, true ) == true )
-        {
-          FocusNavigationDirection direction = ( this.FlowDirection == FlowDirection.LeftToRight )
-            ? FocusNavigationDirection.Right
-            : FocusNavigationDirection.Left;
-
-          this.MoveFocus( new TraversalRequest( direction ) );
-        }
-      }
-    }
-
-
-    private bool CanMoveFocus( FocusNavigationDirection direction, bool reachedMax )
-    {
-      QueryMoveFocusEventArgs e = new QueryMoveFocusEventArgs( direction, reachedMax );
-      this.RaiseEvent( e );
-      return e.CanMoveFocus;
-    }
-
-    private bool MoveFocusLeft()
-    {
-      if( this.FlowDirection == FlowDirection.LeftToRight )
-      {
-        //occurs only if the cursor is at the beginning of the text
-        if( ( this.CaretIndex == 0 ) && ( this.SelectionLength == 0 ) )
-        {
-          if( ComponentCommands.MoveFocusBack.CanExecute( null, this ) )
-          {
-            ComponentCommands.MoveFocusBack.Execute( null, this );
-            return true;
-          }
-          else if( this.CanMoveFocus( FocusNavigationDirection.Left, false ) )
-          {
-            this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Left ) );
-            return true;
-          }
-        }
-      }
-      else
-      {
-        //occurs only if the cursor is at the end of the text
-        if( ( this.CaretIndex == this.Text.Length ) && ( this.SelectionLength == 0 ) )
-        {
-          if( ComponentCommands.MoveFocusBack.CanExecute( null, this ) )
-          {
-            ComponentCommands.MoveFocusBack.Execute( null, this );
-            return true;
-          }
-          else if( this.CanMoveFocus( FocusNavigationDirection.Left, false ) )
-          {
-            this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Left ) );
-            return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
-    private bool MoveFocusRight()
-    {
-      if( this.FlowDirection == FlowDirection.LeftToRight )
-      {
-        //occurs only if the cursor is at the beginning of the text
-        if( ( this.CaretIndex == this.Text.Length ) && ( this.SelectionLength == 0 ) )
-        {
-          if( ComponentCommands.MoveFocusForward.CanExecute( null, this ) )
-          {
-            ComponentCommands.MoveFocusForward.Execute( null, this );
-            return true;
-          }
-          else if( this.CanMoveFocus( FocusNavigationDirection.Right, false ) )
-          {
-            this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Right ) );
-            return true;
-          }
-        }
-      }
-      else
-      {
-        //occurs only if the cursor is at the end of the text
-        if( ( this.CaretIndex == 0 ) && ( this.SelectionLength == 0 ) )
-        {
-          if( ComponentCommands.MoveFocusForward.CanExecute( null, this ) )
-          {
-            ComponentCommands.MoveFocusForward.Execute( null, this );
-            return true;
-          }
-          else if( this.CanMoveFocus( FocusNavigationDirection.Right, false ) )
-          {
-            this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Right ) );
-            return true;
-          }
-        }
-      }
-
-      return false;
-    }
-
-    private bool MoveFocusUp()
-    {
-      int lineNumber = this.GetLineIndexFromCharacterIndex( this.SelectionStart );
-
-      //occurs only if the cursor is on the first line
-      if( lineNumber == 0 )
-      {
-        if( ComponentCommands.MoveFocusUp.CanExecute( null, this ) )
-        {
-          ComponentCommands.MoveFocusUp.Execute( null, this );
-          return true;
-        }
-        else if( this.CanMoveFocus( FocusNavigationDirection.Up, false ) )
-        {
-          this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Up ) );
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    private bool MoveFocusDown()
-    {
-      int lineNumber = this.GetLineIndexFromCharacterIndex( this.SelectionStart );
-
-      //occurs only if the cursor is on the first line
-      if( lineNumber == ( this.LineCount - 1 ) )
-      {
-        if( ComponentCommands.MoveFocusDown.CanExecute( null, this ) )
-        {
-          ComponentCommands.MoveFocusDown.Execute( null, this );
-          return true;
-        }
-        else if( this.CanMoveFocus( FocusNavigationDirection.Down, false ) )
-        {
-          this.MoveFocus( new TraversalRequest( FocusNavigationDirection.Down ) );
-          return true;
-        }
-      }
-
-      return false;
-    }
-  }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
deleted file mode 100644
index 141fbab9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1003:UseGenericEventHandlerInstances" )]
-  public delegate void QueryMoveFocusEventHandler( object sender, QueryMoveFocusEventArgs e );
-
-  public class QueryMoveFocusEventArgs : RoutedEventArgs
-  {
-    //default CTOR private to prevent its usage.
-    private QueryMoveFocusEventArgs()
-    {
-    }
-
-    //internal to prevent anybody from building this type of event.
-    internal QueryMoveFocusEventArgs( FocusNavigationDirection direction, bool reachedMaxLength )
-      : base( AutoSelectTextBox.QueryMoveFocusEvent )
-    {
-      m_navigationDirection = direction;
-      m_reachedMaxLength = reachedMaxLength;
-    }
-
-    public FocusNavigationDirection FocusNavigationDirection
-    {
-      get
-      {
-        return m_navigationDirection;
-      }
-    }
-
-    public bool ReachedMaxLength
-    {
-      get
-      {
-        return m_reachedMaxLength;
-      }
-    }
-
-    public bool CanMoveFocus
-    {
-      get
-      {
-        return m_canMove;
-      }
-      set
-      {
-        m_canMove = value;
-      }
-    }
-
-    private FocusNavigationDirection m_navigationDirection;
-    private bool m_reachedMaxLength;
-    private bool m_canMove = true; //defaults to true... if nobody does nothing, then its capable of moving focus.
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
deleted file mode 100644
index a61532db..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
+++ /dev/null
@@ -1,360 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// A control to provide a visual indicator when an application is busy.
-  /// </summary>
-  [TemplateVisualState( Name = VisualStates.StateIdle, GroupName = VisualStates.GroupBusyStatus )]
-  [TemplateVisualState( Name = VisualStates.StateBusy, GroupName = VisualStates.GroupBusyStatus )]
-  [TemplateVisualState( Name = VisualStates.StateVisible, GroupName = VisualStates.GroupVisibility )]
-  [TemplateVisualState( Name = VisualStates.StateHidden, GroupName = VisualStates.GroupVisibility )]
-  [StyleTypedProperty( Property = "OverlayStyle", StyleTargetType = typeof( Rectangle ) )]
-  [StyleTypedProperty( Property = "ProgressBarStyle", StyleTargetType = typeof( ProgressBar ) )]
-  public class BusyIndicator : ContentControl
-  {
-    #region Private Members
-
-    /// <summary>
-    /// Timer used to delay the initial display and avoid flickering.
-    /// </summary>
-    private DispatcherTimer _displayAfterTimer = new DispatcherTimer();
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    static BusyIndicator()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( BusyIndicator ), new FrameworkPropertyMetadata( typeof( BusyIndicator ) ) );
-    }
-
-    public BusyIndicator()
-    {
-      _displayAfterTimer.Tick += DisplayAfterTimerElapsed;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    /// <summary>
-    /// Overrides the OnApplyTemplate method.
-    /// </summary>
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      ChangeVisualState( false );
-    }
-
-
-    #endregion //Base Class Overrides
-
-    #region Properties
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the BusyContent is visible.
-    /// </summary>
-    protected bool IsContentVisible
-    {
-      get;
-      set;
-    }
-
-    #endregion //Properties
-
-    #region Dependency Properties
-
-    #region IsBusy
-
-    /// <summary>
-    /// Identifies the IsBusy dependency property.
-    /// </summary>
-    public static readonly DependencyProperty IsBusyProperty = DependencyProperty.Register(
-        "IsBusy",
-        typeof( bool ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( false, new PropertyChangedCallback( OnIsBusyChanged ) ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating whether the busy indicator should show.
-    /// </summary>
-    public bool IsBusy
-    {
-      get
-      {
-        return ( bool )GetValue( IsBusyProperty );
-      }
-      set
-      {
-        SetValue( IsBusyProperty, value );
-      }
-    }
-
-    /// <summary>
-    /// IsBusyProperty property changed handler.
-    /// </summary>
-    /// <param name="d">BusyIndicator that changed its IsBusy.</param>
-    /// <param name="e">Event arguments.</param>
-    private static void OnIsBusyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( BusyIndicator )d ).OnIsBusyChanged( e );
-    }
-
-    /// <summary>
-    /// IsBusyProperty property changed handler.
-    /// </summary>
-    /// <param name="e">Event arguments.</param>
-    protected virtual void OnIsBusyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( IsBusy )
-      {
-        if( DisplayAfter.Equals( TimeSpan.Zero ) )
-        {
-          // Go visible now
-          IsContentVisible = true;
-        }
-        else
-        {
-          // Set a timer to go visible
-          _displayAfterTimer.Interval = DisplayAfter;
-          _displayAfterTimer.Start();
-        }
-      }
-      else
-      {
-        // No longer visible
-        _displayAfterTimer.Stop();
-        IsContentVisible = false;
-
-        if( this.FocusAfterBusy != null )
-        {
-          this.FocusAfterBusy.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
-          {
-            this.FocusAfterBusy.Focus();
-          }
-          ) );
-        }
-      }
-
-      ChangeVisualState( true );
-    }
-
-    #endregion //IsBusy
-
-    #region Busy Content
-
-    /// <summary>
-    /// Identifies the BusyContent dependency property.
-    /// </summary>
-    public static readonly DependencyProperty BusyContentProperty = DependencyProperty.Register(
-        "BusyContent",
-        typeof( object ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating the busy content to display to the user.
-    /// </summary>
-    public object BusyContent
-    {
-      get
-      {
-        return ( object )GetValue( BusyContentProperty );
-      }
-      set
-      {
-        SetValue( BusyContentProperty, value );
-      }
-    }
-
-    #endregion //Busy Content
-
-    #region Busy Content Template
-
-    /// <summary>
-    /// Identifies the BusyTemplate dependency property.
-    /// </summary>
-    public static readonly DependencyProperty BusyContentTemplateProperty = DependencyProperty.Register(
-        "BusyContentTemplate",
-        typeof( DataTemplate ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating the template to use for displaying the busy content to the user.
-    /// </summary>
-    public DataTemplate BusyContentTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( BusyContentTemplateProperty );
-      }
-      set
-      {
-        SetValue( BusyContentTemplateProperty, value );
-      }
-    }
-
-    #endregion //Busy Content Template
-
-    #region Display After
-
-    /// <summary>
-    /// Identifies the DisplayAfter dependency property.
-    /// </summary>
-    public static readonly DependencyProperty DisplayAfterProperty = DependencyProperty.Register(
-        "DisplayAfter",
-        typeof( TimeSpan ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( TimeSpan.FromSeconds( 0.1 ) ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating how long to delay before displaying the busy content.
-    /// </summary>
-    public TimeSpan DisplayAfter
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( DisplayAfterProperty );
-      }
-      set
-      {
-        SetValue( DisplayAfterProperty, value );
-      }
-    }
-
-    #endregion //Display After
-
-    #region FocusAfterBusy
-
-    /// <summary>
-    /// Identifies the FocusAfterBusy dependency property.
-    /// </summary>
-    public static readonly DependencyProperty FocusAfterBusyProperty = DependencyProperty.Register(
-        "FocusAfterBusy",
-        typeof( Control ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a Control that should get the focus when the busy indicator disapears.
-    /// </summary>
-    public Control FocusAfterBusy
-    {
-      get
-      {
-        return ( Control )GetValue( FocusAfterBusyProperty );
-      }
-      set
-      {
-        SetValue( FocusAfterBusyProperty, value );
-      }
-    }
-
-    #endregion //FocusAfterBusy
-
-    #region Overlay Style
-
-    /// <summary>
-    /// Identifies the OverlayStyle dependency property.
-    /// </summary>
-    public static readonly DependencyProperty OverlayStyleProperty = DependencyProperty.Register(
-        "OverlayStyle",
-        typeof( Style ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating the style to use for the overlay.
-    /// </summary>
-    public Style OverlayStyle
-    {
-      get
-      {
-        return ( Style )GetValue( OverlayStyleProperty );
-      }
-      set
-      {
-        SetValue( OverlayStyleProperty, value );
-      }
-    }
-    #endregion //Overlay Style
-
-    #region ProgressBar Style
-
-    /// <summary>
-    /// Identifies the ProgressBarStyle dependency property.
-    /// </summary>
-    public static readonly DependencyProperty ProgressBarStyleProperty = DependencyProperty.Register(
-        "ProgressBarStyle",
-        typeof( Style ),
-        typeof( BusyIndicator ),
-        new PropertyMetadata( null ) );
-
-    /// <summary>
-    /// Gets or sets a value indicating the style to use for the progress bar.
-    /// </summary>
-    public Style ProgressBarStyle
-    {
-      get
-      {
-        return ( Style )GetValue( ProgressBarStyleProperty );
-      }
-      set
-      {
-        SetValue( ProgressBarStyleProperty, value );
-      }
-    }
-
-    #endregion //ProgressBar Style
-
-    #endregion //Dependency Properties
-
-    #region Methods
-
-    /// <summary>
-    /// Handler for the DisplayAfterTimer.
-    /// </summary>
-    /// <param name="sender">Event sender.</param>
-    /// <param name="e">Event arguments.</param>
-    private void DisplayAfterTimerElapsed( object sender, EventArgs e )
-    {
-      _displayAfterTimer.Stop();
-      IsContentVisible = true;
-      ChangeVisualState( true );
-    }
-
-    /// <summary>
-    /// Changes the control's visual state(s).
-    /// </summary>
-    /// <param name="useTransitions">True if state transitions should be used.</param>
-    protected virtual void ChangeVisualState( bool useTransitions )
-    {
-      VisualStateManager.GoToState( this, IsBusy ? VisualStates.StateBusy : VisualStates.StateIdle, useTransitions );
-      VisualStateManager.GoToState( this, IsContentVisible ? VisualStates.StateVisible : VisualStates.StateHidden, useTransitions );
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
deleted file mode 100644
index de6b0120..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Converters
-{
-  public class ProgressBarWidthConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    { 
-      var contentWidth = ( double )values[ 0 ];
-      var parentMinWidth = ( double )values[ 1 ];
-
-      return Math.Max( contentWidth, parentMinWidth );
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
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
deleted file mode 100644
index b218170f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  internal static partial class VisualStates
-  {
-    /// <summary>
-    /// Busyness group name.
-    /// </summary>
-    public const string GroupBusyStatus = "BusyStatusStates";
-
-    /// <summary>
-    /// Busy state for BusyIndicator.
-    /// </summary>
-    public const string StateBusy = "Busy";
-
-    /// <summary>
-    /// Idle state for BusyIndicator.
-    /// </summary>
-    public const string StateIdle = "Idle";
-
-    /// <summary>
-    /// BusyDisplay group.
-    /// </summary>
-    public const string GroupVisibility = "VisibilityStates";
-
-    /// <summary>
-    /// Visible state name for BusyIndicator.
-    /// </summary>
-    public const string StateVisible = "Visible";
-
-    /// <summary>
-    /// Hidden state name for BusyIndicator.
-    /// </summary>
-    public const string StateHidden = "Hidden";
-  }
-}
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
deleted file mode 100644
index 3515614b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,215 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
-
-  <!-- =============================================================================== -->
-  <!-- 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 x:Name="_grid"
-                      MinWidth="150">
-                  <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  <ContentPresenter x:Name="busyContent"
-                                    Content="{TemplateBinding BusyContent}"
-                                    ContentTemplate="{TemplateBinding BusyContentTemplate}"
-                                    HorizontalAlignment="Center"
-                                    Margin="8" />
-                  <ProgressBar Grid.Row="1"
-                               Style="{TemplateBinding ProgressBarStyle}">
-                    <ProgressBar.Width>
-                      <MultiBinding Converter="{StaticResource ProgressBarWidthConverter}">
-                        <Binding Path="ActualWidth"
-                                 ElementName="busyContent" />
-                        <Binding Path="MinWidth"
-                                 ElementName="_grid" />
-                      </MultiBinding>
-                    </ProgressBar.Width>
-                  </ProgressBar>
-                </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
deleted file mode 100644
index 56e2a734..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ /dev/null
@@ -1,226 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <!-- =============================================================================== -->
-  <!-- BusyIndicator                                                                   -->
-  <!-- =============================================================================== -->
-  <conv:ProgressBarWidthConverter x:Key="ProgressBarWidthConverter" />
-
-  <Style TargetType="{x:Type local:BusyIndicator}">
-    <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">
-      <Setter.Value>
-        <ControlTemplate 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"
-                          CornerRadius="2">
-                    <Border.BorderBrush>
-                      <LinearGradientBrush StartPoint="0.5,0"
-                                           EndPoint="0.5,1">
-                        <GradientStop Color="#FFA3AEB9"
-                                      Offset="0" />
-                        <GradientStop Color="#FF8399A9"
-                                      Offset="0.375" />
-                        <GradientStop Color="#FF718597"
-                                      Offset="0.375" />
-                        <GradientStop Color="#FF617584"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.BorderBrush>
-                    <Border CornerRadius="1.5"
-                            Margin="1">
-                      <Border.Background>
-                        <LinearGradientBrush StartPoint="0.5,0"
-                                             EndPoint="0.5,1">
-                          <GradientStop Color="#FFF6F8F9"
-                                        Offset="0.02" />
-                          <GradientStop Color="#FFB8B8B8"
-                                        Offset="0.996" />
-                        </LinearGradientBrush>
-                      </Border.Background>
-                      <Grid x:Name="_grid"
-                            MinWidth="150">
-                        <Grid.RowDefinitions>
-                          <RowDefinition />
-                          <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <ContentControl Content="{TemplateBinding BusyContent}"
-                                        ContentTemplate="{TemplateBinding BusyContentTemplate}"
-                                        Margin="8"
-                                        HorizontalAlignment="Center" />
-                        <ProgressBar Grid.Row="1"
-                                     Style="{TemplateBinding ProgressBarStyle}">
-                          <ProgressBar.Width>
-                            <MultiBinding Converter="{StaticResource ProgressBarWidthConverter}">
-                              <Binding Path="ActualWidth"
-                                       ElementName="busyContent" />
-                              <Binding Path="MinWidth"
-                                       ElementName="_grid" />
-                            </MultiBinding>
-                          </ProgressBar.Width>
-                        </ProgressBar>
-                      </Grid>
-                    </Border>
-                  </Border>
-                </Grid>
-              </ContentPresenter.Content>
-            </ContentPresenter>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
deleted file mode 100644
index 135a6e80..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Markup;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum Location
-  {
-    Left,
-    Right
-  }
-
-  /// <summary>
-  /// Represents a spinner control that includes two Buttons.
-  /// </summary>
-  [TemplatePart( Name = PART_IncreaseButton, Type = typeof( ButtonBase ) )]
-  [TemplatePart( Name = PART_DecreaseButton, Type = typeof( ButtonBase ) )]
-  [ContentProperty( "Content" )]
-  public class ButtonSpinner : Spinner
-  {
-    private const string PART_IncreaseButton = "PART_IncreaseButton";
-    private const string PART_DecreaseButton = "PART_DecreaseButton";
-
-    #region Properties
-
-    #region AllowSpin
-
-    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true, AllowSpinPropertyChanged ) );
-    public bool AllowSpin
-    {
-      get
-      {
-        return ( bool )GetValue( AllowSpinProperty );
-      }
-      set
-      {
-        SetValue( AllowSpinProperty, value );
-      }
-    }
-
-    private static void AllowSpinPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonSpinner source = d as ButtonSpinner;
-      source.OnAllowSpinChanged( (bool)e.OldValue, (bool)e.NewValue );
-    }
-
-    #endregion //AllowSpin
-
-    #region ButtonSpinnerLocation
-
-    public static readonly DependencyProperty ButtonSpinnerLocationProperty = DependencyProperty.Register( "ButtonSpinnerLocation", typeof( Location ), typeof( ButtonSpinner ), new UIPropertyMetadata( Location.Right ) );
-    public Location ButtonSpinnerLocation
-    {
-      get
-      {
-        return ( Location )GetValue( ButtonSpinnerLocationProperty );
-      }
-      set
-      {
-        SetValue( ButtonSpinnerLocationProperty, value );
-      }
-    }
-
-    #endregion //ButtonSpinnerLocation
-
-    #region Content
-
-    /// <summary>
-    /// Identifies the Content dependency property.
-    /// </summary>
-    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register( "Content", typeof( object ), typeof( ButtonSpinner ), new PropertyMetadata( null, OnContentPropertyChanged ) );
-    public object Content
-    {
-      get
-      {
-        return GetValue( ContentProperty ) as object;
-      }
-      set
-      {
-        SetValue( ContentProperty, value );
-      }
-    }
-
-    /// <summary>
-    /// ContentProperty property changed handler.
-    /// </summary>
-    /// <param name="d">ButtonSpinner that changed its Content.</param>
-    /// <param name="e">Event arguments.</param>
-    private static void OnContentPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonSpinner source = d as ButtonSpinner;
-      source.OnContentChanged( e.OldValue, e.NewValue );
-    }
-
-    #endregion //Content
-
-    #region DecreaseButton
-
-    private ButtonBase _decreaseButton;
-    /// <summary>
-    /// Gets or sets the DecreaseButton template part.
-    /// </summary>
-    private ButtonBase DecreaseButton
-    {
-      get
-      {
-        return _decreaseButton;
-      }
-      set
-      {
-        if( _decreaseButton != null )
-        {
-          _decreaseButton.Click -= OnButtonClick;
-        }
-
-        _decreaseButton = value;
-
-        if( _decreaseButton != null )
-        {
-          _decreaseButton.Click += OnButtonClick;
-        }
-      }
-    }
-
-    #endregion //DecreaseButton
-
-    #region IncreaseButton
-
-    private ButtonBase _increaseButton;
-    /// <summary>
-    /// Gets or sets the IncreaseButton template part.
-    /// </summary>
-    private ButtonBase IncreaseButton
-    {
-      get
-      {
-        return _increaseButton;
-      }
-      set
-      {
-        if( _increaseButton != null )
-        {
-          _increaseButton.Click -= OnButtonClick;
-        }
-
-        _increaseButton = value;
-
-        if( _increaseButton != null )
-        {
-          _increaseButton.Click += OnButtonClick;
-        }
-      }
-    }
-
-    #endregion //IncreaseButton
-
-    #region ShowButtonSpinner
-
-    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true ) );
-    public bool ShowButtonSpinner
-    {
-      get
-      {
-        return ( bool )GetValue( ShowButtonSpinnerProperty );
-      }
-      set
-      {
-        SetValue( ShowButtonSpinnerProperty, value );
-      }
-    }
-
-    #endregion //ShowButtonSpinner
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static ButtonSpinner()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonSpinner ), new FrameworkPropertyMetadata( typeof( ButtonSpinner ) ) );
-    }
-
-    public ButtonSpinner()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      IncreaseButton = GetTemplateChild( PART_IncreaseButton ) as ButtonBase;
-      DecreaseButton = GetTemplateChild( PART_DecreaseButton ) as ButtonBase;
-
-      SetButtonUsage();
-    }
-
-    /// <summary>
-    /// Cancel LeftMouseButtonUp events originating from a button that has
-    /// been changed to disabled.
-    /// </summary>
-    /// <param name="e">The data for the event.</param>
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      base.OnMouseLeftButtonUp( e );
-
-      Point mousePosition;
-      if( IncreaseButton != null && IncreaseButton.IsEnabled == false )
-      {
-        mousePosition = e.GetPosition( IncreaseButton );
-        if( mousePosition.X > 0 && mousePosition.X < IncreaseButton.ActualWidth &&
-            mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.ActualHeight )
-        {
-          e.Handled = true;
-        }
-      }
-
-      if( DecreaseButton != null && DecreaseButton.IsEnabled == false )
-      {
-        mousePosition = e.GetPosition( DecreaseButton );
-        if( mousePosition.X > 0 && mousePosition.X < DecreaseButton.ActualWidth &&
-            mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.ActualHeight )
-        {
-          e.Handled = true;
-        }
-      }
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      switch( e.Key )
-      {
-        case Key.Up:
-          {
-            if( this.AllowSpin )
-            {
-              this.OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, SpinDirection.Increase ) );
-              e.Handled = true;
-            }
-
-            break;
-          }
-        case Key.Down:
-          {
-            if( this.AllowSpin )
-            {
-              this.OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, SpinDirection.Decrease ) );
-              e.Handled = true;
-            }
-
-            break;
-          }
-          case Key.Enter:
-          {
-            //Do not Spin on enter Key when spinners have focus
-            if( ((this.IncreaseButton != null) && (this.IncreaseButton.IsFocused)) 
-              || (( this.DecreaseButton != null ) && this.DecreaseButton.IsFocused ))
-            {
-              e.Handled = true;
-            }
-            break;
-          }
-      }
-    }
-
-    protected override void OnMouseWheel( MouseWheelEventArgs e )
-    {
-      base.OnMouseWheel( e );
-
-      if( !e.Handled && this.AllowSpin )
-      {
-        if( e.Delta != 0 )
-        {
-          var spinnerEventArgs = new SpinEventArgs( Spinner.SpinnerSpinEvent, ( e.Delta < 0 ) ? SpinDirection.Decrease : SpinDirection.Increase, true );
-          this.OnSpin( spinnerEventArgs );
-          e.Handled = spinnerEventArgs.Handled;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Called when valid spin direction changed.
-    /// </summary>
-    /// <param name="oldValue">The old value.</param>
-    /// <param name="newValue">The new value.</param>
-    protected override void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
-    {
-      SetButtonUsage();
-    }
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    /// <summary>
-    /// Handle click event of IncreaseButton and DecreaseButton template parts,
-    /// translating Click to appropriate Spin event.
-    /// </summary>
-    /// <param name="sender">Event sender, should be either IncreaseButton or DecreaseButton template part.</param>
-    /// <param name="e">Event args.</param>
-    private void OnButtonClick( object sender, RoutedEventArgs e )
-    {
-      if( AllowSpin )
-      {
-        SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease;
-        OnSpin( new SpinEventArgs( Spinner.SpinnerSpinEvent, direction ) );
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    /// <summary>
-    /// Occurs when the Content property value changed.
-    /// </summary>
-    /// <param name="oldValue">The old value of the Content property.</param>
-    /// <param name="newValue">The new value of the Content property.</param>
-    protected virtual void OnContentChanged( object oldValue, object newValue )
-    {
-    }
-
-    protected virtual void OnAllowSpinChanged( bool oldValue, bool newValue )
-    {
-      SetButtonUsage();
-    }
-
-    /// <summary>
-    /// Disables or enables the buttons based on the valid spin direction.
-    /// </summary>
-    private void SetButtonUsage()
-    {
-      // buttonspinner adds buttons that spin, so disable accordingly.
-      if( IncreaseButton != null )
-      {
-        IncreaseButton.IsEnabled = AllowSpin && ( ( ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase );
-      }
-
-      if( DecreaseButton != null )
-      {
-        DecreaseButton.IsEnabled = AllowSpin && ( ( ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease );
-      }
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
deleted file mode 100644
index b9d00996..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  /// <summary>
-  /// Represents spin directions that could be initiated by the end-user.
-  /// </summary>
-  /// <QualityBand>Preview</QualityBand>
-  public enum SpinDirection
-  {
-    /// <summary>
-    /// Represents a spin initiated by the end-user in order to Increase a value.
-    /// </summary>
-    Increase = 0,
-
-    /// <summary>
-    /// Represents a spin initiated by the end-user in order to Decrease a value.
-    /// </summary>
-    Decrease = 1
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
deleted file mode 100644
index a9b30b08..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Provides data for the Spinner.Spin event.
-  /// </summary>
-  /// <QualityBand>Preview</QualityBand>
-  public class SpinEventArgs : RoutedEventArgs
-  {
-    /// <summary>
-    /// Gets the SpinDirection for the spin that has been initiated by the 
-    /// end-user.
-    /// </summary>
-    public SpinDirection Direction
-    {
-      get;
-      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>
-    /// <param name="direction">Spin direction.</param>
-    public SpinEventArgs( SpinDirection direction )
-      : base()
-    {
-      Direction = direction;
-    }
-
-    public SpinEventArgs( RoutedEvent routedEvent, SpinDirection direction )
-      : base( routedEvent )
-    {
-      Direction = direction;
-    }
-
-    public SpinEventArgs( SpinDirection direction, bool usingMouseWheel )
-      : base()
-    {
-      Direction = direction;
-      UsingMouseWheel = usingMouseWheel;
-    }
-
-    public SpinEventArgs( RoutedEvent routedEvent, SpinDirection direction, bool usingMouseWheel )
-      : base( routedEvent )
-    {
-      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
deleted file mode 100644
index b71397d0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Base class for controls that represents controls that can spin.
-  /// </summary>
-  public abstract class Spinner : Control
-  {
-    #region Properties
-
-    /// <summary>
-    /// Identifies the ValidSpinDirection dependency property.
-    /// </summary>
-    public static readonly DependencyProperty ValidSpinDirectionProperty = DependencyProperty.Register( "ValidSpinDirection", typeof( ValidSpinDirections ), typeof( Spinner ), new PropertyMetadata( ValidSpinDirections.Increase | ValidSpinDirections.Decrease, OnValidSpinDirectionPropertyChanged ) );
-    public ValidSpinDirections ValidSpinDirection
-    {
-      get
-      {
-        return ( ValidSpinDirections )GetValue( ValidSpinDirectionProperty );
-      }
-      set
-      {
-        SetValue( ValidSpinDirectionProperty, value );
-      }
-    }
-
-    /// <summary>
-    /// ValidSpinDirectionProperty property changed handler.
-    /// </summary>
-    /// <param name="d">ButtonSpinner that changed its ValidSpinDirection.</param>
-    /// <param name="e">Event arguments.</param>
-    private static void OnValidSpinDirectionPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Spinner source = ( Spinner )d;
-      ValidSpinDirections oldvalue = ( ValidSpinDirections )e.OldValue;
-      ValidSpinDirections newvalue = ( ValidSpinDirections )e.NewValue;
-      source.OnValidSpinDirectionChanged( oldvalue, newvalue );
-    }
-
-    #endregion //Properties
-
-    /// <summary>
-    /// Occurs when spinning is initiated by the end-user.
-    /// </summary>
-    public event EventHandler<SpinEventArgs> Spin;
-
-    #region Events
-
-    public static readonly RoutedEvent SpinnerSpinEvent = EventManager.RegisterRoutedEvent( "SpinnerSpin", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Spinner ) );
-
-    public event RoutedEventHandler SpinnerSpin
-    {
-      add
-      {
-        AddHandler( SpinnerSpinEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SpinnerSpinEvent, value );
-      }
-    }
-
-    #endregion
-
-    /// <summary>
-    /// Initializes a new instance of the Spinner class.
-    /// </summary>
-    protected Spinner()
-    {
-    }
-
-    /// <summary>
-    /// Raises the OnSpin event when spinning is initiated by the end-user.
-    /// </summary>
-    /// <param name="e">Spin event args.</param>
-    protected virtual void OnSpin( SpinEventArgs e )
-    {
-      ValidSpinDirections valid = e.Direction == SpinDirection.Increase ? ValidSpinDirections.Increase : ValidSpinDirections.Decrease;
-
-      //Only raise the event if spin is allowed.
-      if( ( ValidSpinDirection & valid ) == valid )
-      {
-        EventHandler<SpinEventArgs> handler = Spin;
-        if( handler != null )
-        {
-          handler( this, e );
-        }
-      }
-    }
-
-    /// <summary>
-    /// Called when valid spin direction changed.
-    /// </summary>
-    /// <param name="oldValue">The old value.</param>
-    /// <param name="newValue">The new value.</param>
-    protected virtual void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
-    {
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
deleted file mode 100644
index 0a7aba23..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  /// <summary>
-  /// Represents spin directions that are valid.
-  /// </summary>
-  [Flags]
-  public enum ValidSpinDirections
-  {
-    /// <summary>
-    /// Can not increase nor decrease.
-    /// </summary>
-    None = 0,
-
-    /// <summary>
-    /// Can increase.
-    /// </summary>
-    Increase = 1,
-
-    /// <summary>
-    /// Can decrease.
-    /// </summary>
-    Decrease = 2
-  }
-}
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
deleted file mode 100644
index ed8ad412..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 x:Name="firstContentColumn"
-                                  Width="*" />
-                <ColumnDefinition x:Name="secondContentColumn"
-                                  Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <ContentPresenter x:Name="contentPresenter"
-                                Focusable="False"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-              <Grid x:Name="gridContent"
-                    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>
-
-                <RepeatButton x:Name="PART_DecreaseButton"
-                              Grid.Row="1"
-                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                              IsTabStop="{TemplateBinding IsTabStop}"
-                              ContentTemplate="{StaticResource DecreaseGlyphNormalKey}">
-                </RepeatButton>
-
-              </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>
-            <Trigger Property="ButtonSpinnerLocation"
-                     Value="Left">
-              <Setter TargetName="firstContentColumn"
-                      Property="Width"
-                      Value="Auto" />
-              <Setter TargetName="secondContentColumn"
-                      Property="Width"
-                      Value="*" />
-              <Setter TargetName="contentPresenter"
-                      Property="Grid.Column"
-                      Value="1" />
-              <Setter TargetName="gridContent"
-                      Property="Grid.Column"
-                      Value="0" />
-            </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
deleted file mode 100644
index 914e129c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
+++ /dev/null
@@ -1,137 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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/Generic/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- ButtonSpinner                                                                   -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:ButtonSpinner}">
-    <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="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 x:Name="firstContentColumn"
-                                  Width="*" />
-                <ColumnDefinition x:Name="secondContentColumn"
-                                  Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <ContentPresenter x:Name="contentPresenter"
-                                Focusable="False"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-              <Grid x:Name="gridContent"
-                    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>
-
-                <RepeatButton x:Name="PART_DecreaseButton"
-                              Grid.Row="1"
-                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                              IsTabStop="{TemplateBinding IsTabStop}"
-                              ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" >
-                </RepeatButton>
-
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <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>
-            <Trigger Property="ButtonSpinnerLocation"
-                     Value="Left">
-              <Setter TargetName="firstContentColumn"
-                      Property="Width"
-                      Value="Auto" />
-              <Setter TargetName="secondContentColumn"
-                      Property="Width"
-                      Value="*" />
-              <Setter TargetName="contentPresenter"
-                      Property="Grid.Column"
-                      Value="1" />
-              <Setter TargetName="gridContent"
-                      Property="Grid.Column"
-                      Value="0" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
deleted file mode 100644
index cf268030..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
+++ /dev/null
@@ -1,582 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_CalculatorButtonPanel, Type = typeof( ContentControl ) )]
-  public class Calculator : Control
-  {
-    private const string PART_CalculatorButtonPanel = "PART_CalculatorButtonPanel";
-
-    #region Members
-
-    private ContentControl _buttonPanel;
-    private bool _showNewNumber = true;
-    private decimal _previousValue;
-    private Operation _lastOperation = Operation.None;
-    private readonly Dictionary<Button, DispatcherTimer> _timers = new Dictionary<Button, DispatcherTimer>();
-
-    #endregion //Members
-
-    #region Enumerations
-
-    public enum CalculatorButtonType
-    {
-      Add,
-      Back,
-      Cancel,
-      Clear,
-      Decimal,
-      Divide,
-      Eight,
-      Equal,
-      Five,
-      Four,
-      Fraction,
-      MAdd,
-      MC,
-      MR,
-      MS,
-      MSub,
-      Multiply,
-      Negate,
-      Nine,
-      None,
-      One,
-      Percent,
-      Seven,
-      Six,
-      Sqrt,
-      Subtract,
-      Three,
-      Two,
-      Zero
-    }
-
-    public enum Operation
-    {
-      Add,
-      Subtract,
-      Divide,
-      Multiply,
-      Percent,
-      Sqrt,
-      Fraction,
-      None,
-      Clear,
-      Negate
-    }
-
-    #endregion //Enumerations
-
-    #region Properties
-
-    #region CalculatorButtonPanelTemplate
-
-    public static readonly DependencyProperty CalculatorButtonPanelTemplateProperty = DependencyProperty.Register( "CalculatorButtonPanelTemplate"
-      , typeof( ControlTemplate ), typeof( Calculator ), new UIPropertyMetadata( null ) );
-    public ControlTemplate CalculatorButtonPanelTemplate
-    {
-      get
-      {
-        return (ControlTemplate)GetValue( CalculatorButtonPanelTemplateProperty );
-      }
-      set
-      {
-        SetValue( CalculatorButtonPanelTemplateProperty, value );
-      }
-    }
-
-    #endregion //CalculatorButtonPanelTemplate
-
-    #region CalculatorButtonType
-
-    public static readonly DependencyProperty CalculatorButtonTypeProperty = DependencyProperty.RegisterAttached( "CalculatorButtonType", typeof( CalculatorButtonType ), typeof( Calculator ), new UIPropertyMetadata( CalculatorButtonType.None, OnCalculatorButtonTypeChanged ) );
-    public static CalculatorButtonType GetCalculatorButtonType( DependencyObject target )
-    {
-      return ( CalculatorButtonType )target.GetValue( CalculatorButtonTypeProperty );
-    }
-    public static void SetCalculatorButtonType( DependencyObject target, CalculatorButtonType value )
-    {
-      target.SetValue( CalculatorButtonTypeProperty, value );
-    }
-    private static void OnCalculatorButtonTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      OnCalculatorButtonTypeChanged( o, ( CalculatorButtonType )e.OldValue, ( CalculatorButtonType )e.NewValue );
-    }
-    private static void OnCalculatorButtonTypeChanged( DependencyObject o, CalculatorButtonType oldValue, CalculatorButtonType newValue )
-    {
-      Button button = o as Button;
-      button.CommandParameter = newValue;
-      if( button.Content == null )
-      {
-        button.Content = CalculatorUtilities.GetCalculatorButtonContent( newValue );
-      }
-    }
-
-    #endregion //CalculatorButtonType
-
-    #region DisplayText
-
-    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( Calculator ), new UIPropertyMetadata( "0", OnDisplayTextChanged ) );
-    public string DisplayText
-    {
-      get
-      {
-        return ( string )GetValue( DisplayTextProperty );
-      }
-      set
-      {
-        SetValue( DisplayTextProperty, value );
-      }
-    }
-
-    private static void OnDisplayTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Calculator calculator = o as Calculator;
-      if( calculator != null )
-        calculator.OnDisplayTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnDisplayTextChanged( string oldValue, string newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //DisplayText
-
-    #region Memory
-
-    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( Calculator ), new UIPropertyMetadata( default( decimal ) ) );
-    public decimal Memory
-    {
-      get
-      {
-        return ( decimal )GetValue( MemoryProperty );
-      }
-      set
-      {
-        SetValue( MemoryProperty, value );
-      }
-    }
-
-    #endregion //Memory
-
-    #region Precision
-
-    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( Calculator ), new UIPropertyMetadata( 6 ) );
-    public int Precision
-    {
-      get
-      {
-        return ( int )GetValue( PrecisionProperty );
-      }
-      set
-      {
-        SetValue( PrecisionProperty, value );
-      }
-    }
-
-    #endregion //Precision
-
-    #region Value
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( decimal? ), typeof( Calculator ), new FrameworkPropertyMetadata( default( decimal ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
-    public decimal? Value
-    {
-      get
-      {
-        return ( decimal? )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Calculator calculator = o as Calculator;
-      if( calculator != null )
-        calculator.OnValueChanged( ( decimal? )e.OldValue, ( decimal? )e.NewValue );
-    }
-
-    protected virtual void OnValueChanged( decimal? oldValue, decimal? newValue )
-    {
-      SetDisplayText( newValue );
-
-      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
-      args.RoutedEvent = ValueChangedEvent;
-      RaiseEvent( args );
-    }
-
-    #endregion //Value
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static Calculator()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( Calculator ), new FrameworkPropertyMetadata( typeof( Calculator ) ) );
-    }
-
-    public Calculator()
-    {
-
-      CommandBindings.Add( new CommandBinding( CalculatorCommands.CalculatorButtonClick, ExecuteCalculatorButtonClick ) );
-      AddHandler( MouseDownEvent, new MouseButtonEventHandler( Calculator_OnMouseDown ), true );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      _buttonPanel = GetTemplateChild( PART_CalculatorButtonPanel ) as ContentControl;
-    }
-
-    protected override void OnTextInput( TextCompositionEventArgs e )
-    {
-      var buttonType = CalculatorUtilities.GetCalculatorButtonTypeFromText( e.Text );
-      if( buttonType != CalculatorButtonType.None )
-      {
-        SimulateCalculatorButtonClick( buttonType );
-        ProcessCalculatorButton( buttonType );
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void Calculator_OnMouseDown( object sender, MouseButtonEventArgs e )
-    {
-      if( !IsFocused )
-      {
-        Focus();
-        e.Handled = true;
-      }
-    }
-
-    void Timer_Tick( object sender, EventArgs e )
-    {
-      DispatcherTimer timer = ( DispatcherTimer )sender;
-      timer.Stop();
-      timer.Tick -= Timer_Tick;
-
-      if( _timers.ContainsValue( timer ) )
-      {
-        var button = _timers.Where( x => x.Value == timer ).Select( x => x.Key ).FirstOrDefault();
-        if( button != null )
-        {
-          VisualStateManager.GoToState( button, button.IsMouseOver ? "MouseOver" : "Normal", true );
-          _timers.Remove( button );
-        }
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    internal void InitializeToValue(decimal? value)
-    {
-      _previousValue = 0;
-      _lastOperation = Operation.None;
-      _showNewNumber = true;
-      Value = value;
-      // Since the display text may be out of sync
-      // with "Value", this call will force the
-      // text update if Value was already equal to
-      // the value parameter.
-      this.SetDisplayText( value );
-    }
-
-    private void Calculate()
-    {
-      if( _lastOperation == Operation.None )
-        return;
-
-      try
-      {
-        Value = Decimal.Round( CalculateValue( _lastOperation ), Precision );
-        SetDisplayText( Value ); //Set DisplayText even when Value doesn't change
-      }
-      catch
-      {
-        Value = null;
-        DisplayText = "ERROR";
-      }
-    }
-
-    private void SetDisplayText( decimal? newValue )
-    {
-      if( newValue.HasValue && ( newValue.Value != 0 ) )
-        DisplayText = newValue.ToString();
-      else
-        DisplayText = "0";
-    }
-
-    private void Calculate( Operation newOperation )
-    {
-      if( !_showNewNumber )
-        Calculate();
-
-      _lastOperation = newOperation;
-    }
-
-    private void Calculate( Operation currentOperation, Operation newOperation )
-    {
-      _lastOperation = currentOperation;
-      Calculate();
-      _lastOperation = newOperation;
-    }
-
-    private decimal CalculateValue( Operation operation )
-    {
-      decimal newValue = decimal.Zero;
-      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
-
-      switch( operation )
-      {
-        case Operation.Add:
-          newValue = CalculatorUtilities.Add( _previousValue, currentValue );
-          break;
-        case Operation.Subtract:
-          newValue = CalculatorUtilities.Subtract( _previousValue, currentValue );
-          break;
-        case Operation.Multiply:
-          newValue = CalculatorUtilities.Multiply( _previousValue, currentValue );
-          break;
-        case Operation.Divide:
-          newValue = CalculatorUtilities.Divide( _previousValue, currentValue );
-          break;
-        //case Operation.Percent:
-        //    newValue = CalculatorUtilities.Percent(_previousValue, currentValue);
-        //    break;
-        case Operation.Sqrt:
-          newValue = CalculatorUtilities.SquareRoot( currentValue );
-          break;
-        case Operation.Fraction:
-          newValue = CalculatorUtilities.Fraction( currentValue );
-          break;
-        case Operation.Negate:
-          newValue = CalculatorUtilities.Negate( currentValue );
-          break;
-        default:
-          newValue = decimal.Zero;
-          break;
-      }
-
-      return newValue;
-    }
-
-    void ProcessBackKey()
-    {
-      string displayText;
-      if( DisplayText.Length > 1 && !( DisplayText.Length == 2 && DisplayText[ 0 ] == '-' ) )
-      {
-        displayText = DisplayText.Remove( DisplayText.Length - 1, 1 );
-      }
-      else
-      {
-        displayText = "0";
-        _showNewNumber = true;
-      }
-
-      DisplayText = displayText;
-    }
-
-    private void ProcessCalculatorButton( CalculatorButtonType buttonType )
-    {
-      if( CalculatorUtilities.IsDigit( buttonType ) )
-        ProcessDigitKey( buttonType );
-      else if( ( CalculatorUtilities.IsMemory( buttonType ) ) )
-        ProcessMemoryKey( buttonType );
-      else
-        ProcessOperationKey( buttonType );
-    }
-
-    private void ProcessDigitKey( CalculatorButtonType buttonType )
-    {
-      if( _showNewNumber )
-        DisplayText = CalculatorUtilities.GetCalculatorButtonContent( buttonType );
-      else
-        DisplayText += CalculatorUtilities.GetCalculatorButtonContent( buttonType );
-
-      _showNewNumber = false;
-    }
-
-    private void ProcessMemoryKey( Calculator.CalculatorButtonType buttonType )
-    {
-      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
-
-      _showNewNumber = true;
-
-      switch( buttonType )
-      {
-        case Calculator.CalculatorButtonType.MAdd:
-          Memory += currentValue;
-          break;
-        case Calculator.CalculatorButtonType.MC:
-          Memory = decimal.Zero;
-          break;
-        case Calculator.CalculatorButtonType.MR:
-          DisplayText = Memory.ToString();
-          _showNewNumber = false;
-          break;
-        case Calculator.CalculatorButtonType.MS:
-          Memory = currentValue;
-          break;
-        case Calculator.CalculatorButtonType.MSub:
-          Memory -= currentValue;
-          break;
-        default:
-          break;
-      }
-    }
-
-    private void ProcessOperationKey( CalculatorButtonType buttonType )
-    {
-      switch( buttonType )
-      {
-        case CalculatorButtonType.Add:
-          Calculate( Operation.Add );
-          break;
-        case CalculatorButtonType.Subtract:
-          Calculate( Operation.Subtract );
-          break;
-        case CalculatorButtonType.Multiply:
-          Calculate( Operation.Multiply );
-          break;
-        case CalculatorButtonType.Divide:
-          Calculate( Operation.Divide );
-          break;
-        case CalculatorButtonType.Percent:
-          if( _lastOperation != Operation.None )
-          {
-            decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
-            decimal newValue = CalculatorUtilities.Percent( _previousValue, currentValue );
-            DisplayText = newValue.ToString();
-          }
-          else
-          {
-            DisplayText = "0";
-            _showNewNumber = true;
-          }
-          return;
-        case CalculatorButtonType.Sqrt:
-          Calculate( Operation.Sqrt, Operation.None );
-          break;
-        case CalculatorButtonType.Fraction:
-          Calculate( Operation.Fraction, Operation.None );
-          break;
-        case CalculatorButtonType.Negate:
-          Calculate( Operation.Negate, Operation.None );
-          break;
-        case CalculatorButtonType.Equal:
-          Calculate( Operation.None );
-          break;
-        case CalculatorButtonType.Clear:
-          Calculate( Operation.Clear, Operation.None );
-          break;
-        case CalculatorButtonType.Cancel:
-          DisplayText = _previousValue.ToString();
-          _lastOperation = Operation.None;
-          _showNewNumber = true;
-          return;
-        case CalculatorButtonType.Back:
-          ProcessBackKey();
-          return;
-        default:
-          break;
-      }
-
-      Decimal.TryParse( DisplayText, out _previousValue );
-      _showNewNumber = true;
-    }
-
-    private void SimulateCalculatorButtonClick( CalculatorButtonType buttonType )
-    {
-      var button = CalculatorUtilities.FindButtonByCalculatorButtonType( _buttonPanel, buttonType );
-      if( button != null )
-      {
-        VisualStateManager.GoToState( button, "Pressed", true );
-        DispatcherTimer timer;
-        if( _timers.ContainsKey( button ) )
-        {
-          timer = _timers[ button ];
-          timer.Stop();
-        }
-        else
-        {
-          timer = new DispatcherTimer();
-          timer.Interval = TimeSpan.FromMilliseconds( 100 );
-          timer.Tick += Timer_Tick;
-          _timers.Add( button, timer );
-        }
-
-        timer.Start();
-      }
-    }
-
-    #endregion //Methods
-
-    #region Events
-
-    //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
-    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( Calculator ) );
-    public event RoutedPropertyChangedEventHandler<object> ValueChanged
-    {
-      add
-      {
-        AddHandler( ValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ValueChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Commands
-
-    private void ExecuteCalculatorButtonClick( object sender, ExecutedRoutedEventArgs e )
-    {
-      var buttonType = ( CalculatorButtonType )e.Parameter;
-      ProcessCalculatorButton( buttonType );
-    }
-
-    #endregion //Commands
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
deleted file mode 100644
index d24c8e08..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public static class CalculatorCommands
-  {
-    private static RoutedCommand _calculatorButtonClickCommand = new RoutedCommand();
-
-    public static RoutedCommand CalculatorButtonClick
-    {
-      get
-      {
-        return _calculatorButtonClickCommand;
-      }
-    }
-  }
-}
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
deleted file mode 100644
index 6058039e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,406 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-
-      <Button Grid.Column="2"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MR"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <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>
-
-      <Button Grid.Column="2"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Cancel"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorClearButtonStyle}">
-      </Button>
-
-      <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>
-
-      <Button Grid.Column="4"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MS"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <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>
-
-      <Button Grid.Column="8"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MSub"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Negate"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Sqrt"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Seven"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Eight"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Nine"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Divide"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Percent"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Four"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Five"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Six"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Multiply"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Fraction"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="One"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Two"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Three"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Subtract"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-
-      <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>
-
-      <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>
-
-      <Button Grid.Column="4"
-              Grid.Row="10"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Decimal"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}">
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="10"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Add"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}">
-      </Button>
-    </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}}">
-                  </TextBlock>
-                </StackPanel>
-              </Border>
-              <ContentControl x:Name="PART_CalculatorButtonPanel"
-                              Grid.Row="1"
-                              Template="{Binding CalculatorButtonPanelTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={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>
-            <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/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
deleted file mode 100644
index ad78aba3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
+++ /dev/null
@@ -1,830 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-  <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
-
-  <Style x:Key="CalculatorOperatorButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="#FF5B636E" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Button}">
-          <Grid x:Name="Control">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_MouseOver"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Pressed"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="contentPresenter"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="MemoryStates">
-                <VisualState x:Name="EmptyMemory" />
-                <VisualState x:Name="MemoryAssigned">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Border1"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Border2"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border Background="White"
-                    BorderBrush="{x:Null}"
-                    BorderThickness="0"
-                    CornerRadius="2"
-                    Margin="0,0,0,-1"
-                    Opacity="0.5" />
-            <Grid x:Name="PART_Default">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF9CA2AB">
-                <Grid>
-                  <Border x:Name="PART_Border1"
-                          BorderThickness="0"
-                          CornerRadius="1"
-                          Margin="1">
-                    <Border.Background>
-                      <LinearGradientBrush EndPoint="0.5,1"
-                                           StartPoint="0.5,0">
-                        <GradientStop Color="#FFEDF1F7"
-                                      Offset="0" />
-                        <GradientStop Color="#FFD5DBE3"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.Background>
-                    <Border BorderThickness="0"
-                            CornerRadius="1"
-                            Margin="2">
-                      <Border.Background>
-                        <LinearGradientBrush EndPoint="0.5,1"
-                                             StartPoint="0.5,0">
-                          <GradientStop Color="#FFEDF1F7"
-                                        Offset="0" />
-                          <GradientStop Color="#FFD5DBE3"
-                                        Offset="1" />
-                        </LinearGradientBrush>
-                      </Border.Background>
-                    </Border>
-                  </Border>
-                  <Border x:Name="PART_Border2"
-                          BorderThickness="0"
-                          CornerRadius="1"
-                          Margin="1"
-                          Opacity="0">
-                    <Border.Background>
-                      <LinearGradientBrush EndPoint="0.5,1"
-                                           StartPoint="0.5,0">
-                        <GradientStop Color="#FF9CA2AB"
-                                      Offset="0" />
-                        <GradientStop Color="#FF9CA2AB"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.Background>
-                    <Border BorderThickness="0"
-                            CornerRadius="1"
-                            Margin="2">
-                      <Border.Background>
-                        <LinearGradientBrush EndPoint="0.5,1"
-                                             StartPoint="0.5,0">
-                          <GradientStop Color="#FFEDF1F7"
-                                        Offset="0" />
-                          <GradientStop Color="#FFD5DBE3"
-                                        Offset="1" />
-                        </LinearGradientBrush>
-                      </Border.Background>
-                    </Border>
-                  </Border>
-                </Grid>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_MouseOver"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF9CA2AB">
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFFDFEFF"
-                                    Offset="0" />
-                      <GradientStop Color="#FFD9DFE8"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_Pressed"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF90959D">
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1"
-                        Background="#FFB5BBC5" />
-              </Border>
-            </Grid>
-            <ContentPresenter x:Name="contentPresenter"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="CalculatorClearButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="#FFBF5254" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Button}">
-          <Grid x:Name="Control">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_MouseOver"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Pressed"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="contentPresenter"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border Background="White"
-                    BorderBrush="{x:Null}"
-                    BorderThickness="0"
-                    CornerRadius="2"
-                    Margin="0,0,0,-1"
-                    Opacity="0.5" />
-            <Grid x:Name="PART_Default">
-              <Border BorderThickness="0"
-                      CornerRadius="2">
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                    <GradientStop Color="#FFC19497"
-                                  Offset="0" />
-                    <GradientStop Color="#FFA67D80"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Border.Background>
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFFDB8B8"
-                                    Offset="0" />
-                      <GradientStop Color="#FFF39998"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_MouseOver"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2">
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                    <GradientStop Color="#FFC19497"
-                                  Offset="0" />
-                    <GradientStop Color="#FFA67D80"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Border.Background>
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFFEC9C9"
-                                    Offset="0" />
-                      <GradientStop Color="#FFEAA4A3"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_Pressed"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF9B6F72">
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1"
-                        Background="#FFE69197" />
-              </Border>
-            </Grid>
-            <ContentPresenter x:Name="contentPresenter"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="CalculatorDigitButtonStyle"
-         TargetType="{x:Type Button}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="#FF2A313A" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Button}">
-          <Grid x:Name="Control">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="MouseOver">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_MouseOver"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Pressed">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="0" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Pressed"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To="1" />
-                  </Storyboard>
-                </VisualState>
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="PART_Default"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                    <DoubleAnimation Duration="0"
-                                     Storyboard.TargetName="contentPresenter"
-                                     Storyboard.TargetProperty="Opacity"
-                                     To=".5" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Border BorderBrush="{x:Null}"
-                    BorderThickness="0"
-                    Background="White"
-                    CornerRadius="3"
-                    Margin="0,0,0,-1"
-                    Opacity="0.5" />
-            <Grid x:Name="PART_Default">
-              <Border BorderThickness="0"
-                      CornerRadius="2">
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                    <GradientStop Color="#FFA9AAAB"
-                                  Offset="0" />
-                    <GradientStop Color="#FF98999A"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Border.Background>
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFF6F7F7"
-                                    Offset="0" />
-                      <GradientStop Color="#FFDEE0E2"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_MouseOver"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2">
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1"
-                                       StartPoint="0.5,0">
-                    <GradientStop Color="#FFA9AAAB"
-                                  Offset="0" />
-                    <GradientStop Color="#FF98999A"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Border.Background>
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1">
-                  <Border.Background>
-                    <LinearGradientBrush EndPoint="0.5,1"
-                                         StartPoint="0.5,0">
-                      <GradientStop Color="#FFFCFCFC"
-                                    Offset="0" />
-                      <GradientStop Color="#FFEEEFF2"
-                                    Offset="1" />
-                    </LinearGradientBrush>
-                  </Border.Background>
-                </Border>
-              </Border>
-            </Grid>
-            <Grid x:Name="PART_Pressed"
-                  Opacity="0">
-              <Border BorderThickness="0"
-                      CornerRadius="2"
-                      Background="#FF87888A">
-                <Border BorderThickness="0"
-                        CornerRadius="1"
-                        Margin="1"
-                        Background="#FFB5BBC5" />
-              </Border>
-            </Grid>
-            <ContentPresenter x:Name="contentPresenter"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </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>
-
-      <Button Grid.Column="2"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MR"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <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>
-
-      <Button Grid.Column="2"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Cancel"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorClearButtonStyle}" >
-      </Button>
-
-      <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>
-
-      <Button Grid.Column="4"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MS"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <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>
-
-      <Button Grid.Column="8"
-              Grid.Row="0"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="MSub"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Negate"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="2"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Sqrt"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Seven"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Eight"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Nine"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Divide"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="4"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Percent"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Four"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Five"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Six"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Multiply"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="8"
-              Grid.Row="6"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Fraction"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="0"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="One"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="2"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Two"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="4"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Three"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="8"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Subtract"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-
-      <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>
-
-      <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>
-
-      <Button Grid.Column="4"
-              Grid.Row="10"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Decimal"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorDigitButtonStyle}" >
-      </Button>
-
-      <Button Grid.Column="6"
-              Grid.Row="10"
-              MinWidth="28"
-              MinHeight="26"
-              local:Calculator.CalculatorButtonType="Add"
-              Command="local:CalculatorCommands.CalculatorButtonClick"
-              Style="{StaticResource CalculatorOperatorButtonStyle}" >
-      </Button>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:Calculator}">
-    <Setter Property="Background">
-      <Setter.Value>
-        <LinearGradientBrush EndPoint="0.5,1"
-                             StartPoint="0.5,0">
-          <GradientStop Color="#FFFAFBFB"
-                        Offset="0" />
-          <GradientStop Color="#FFF4F4F4"
-                        Offset="1" />
-        </LinearGradientBrush>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="BorderBrush"
-            Value="#FF949494" />
-    <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="3">
-            <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="#FF949494"
-                      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}}" >
-                  </TextBlock>
-                </StackPanel>
-              </Border>
-              <ContentControl x:Name="PART_CalculatorButtonPanel"
-                              Grid.Row="1"
-                              Template="{Binding CalculatorButtonPanelTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource CalculatorButtonPanel}}"
-                              DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="PART_Display"
-                      Property="Background"
-                      Value="#E7F5FF" />
-            </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/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
deleted file mode 100644
index 8e7fd013..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls.Primitives;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_CalculatorPopup, Type = typeof( Popup ) )]
-  [TemplatePart( Name = PART_Calculator, Type = typeof( Calculator ) )]
-  public class CalculatorUpDown : DecimalUpDown
-  {
-    private const string PART_CalculatorPopup = "PART_CalculatorPopup";
-    private const string PART_Calculator = "PART_Calculator";
-
-    #region Members
-
-    private Popup _calculatorPopup;
-    private Calculator _calculator;
-    private Decimal? _initialValue;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region DisplayText
-
-    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( CalculatorUpDown ), new UIPropertyMetadata( "0" ) );
-    public string DisplayText
-    {
-      get
-      {
-        return ( string )GetValue( DisplayTextProperty );
-      }
-      set
-      {
-        SetValue( DisplayTextProperty, value );
-      }
-    }
-
-    #endregion //DisplayText
-
-    #region EnterClosesCalculator
-
-    public static readonly DependencyProperty EnterClosesCalculatorProperty = DependencyProperty.Register( "EnterClosesCalculator", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false ) );
-    public bool EnterClosesCalculator
-    {
-      get
-      {
-        return ( bool )GetValue( EnterClosesCalculatorProperty );
-      }
-      set
-      {
-        SetValue( EnterClosesCalculatorProperty, value );
-      }
-    }
-
-    #endregion //EnterClosesCalculator
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      CalculatorUpDown calculatorUpDown = o as CalculatorUpDown;
-      if( calculatorUpDown != null )
-        calculatorUpDown.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-        _initialValue = this.UpdateValueOnEnterKey ? this.ConvertTextToValue( this.TextBox.Text ) : this.Value;
-    }
-
-    #endregion //IsOpen
-
-    #region Memory
-
-    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( CalculatorUpDown ), new UIPropertyMetadata( default( decimal ) ) );
-    public decimal Memory
-    {
-      get
-      {
-        return ( decimal )GetValue( MemoryProperty );
-      }
-      set
-      {
-        SetValue( MemoryProperty, value );
-      }
-    }
-
-    #endregion //Memory
-
-    #region Precision
-
-    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( CalculatorUpDown ), new UIPropertyMetadata( 6 ) );
-    public int Precision
-    {
-      get
-      {
-        return ( int )GetValue( PrecisionProperty );
-      }
-      set
-      {
-        SetValue( PrecisionProperty, value );
-      }
-    }
-
-    #endregion //Precision
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static CalculatorUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CalculatorUpDown ), new FrameworkPropertyMetadata( typeof( CalculatorUpDown ) ) );
-    }
-
-    public CalculatorUpDown()
-    {
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _calculatorPopup != null )
-        _calculatorPopup.Opened -= CalculatorPopup_Opened;
-
-      _calculatorPopup = GetTemplateChild( PART_CalculatorPopup ) as Popup;
-
-      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( _calculator != null )
-      {
-        if( this.IsBetweenMinMax( _calculator.Value ) )
-        {
-          if( this.UpdateValueOnEnterKey )
-          {
-            this.TextBox.Text = ( _calculator.Value != null ) ? _calculator.Value.Value.ToString( this.FormatString, this.CultureInfo ) : null;
-          }
-          else
-          {
-            this.Value = _calculator.Value;
-          }
-        }
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    void CalculatorPopup_Opened( object sender, EventArgs e )
-    {
-      if( _calculator != null )
-      {
-        var initValue = this.UpdateValueOnEnterKey ? this.ConvertTextToValue( this.TextBox.Text ) : this.Value;
-        _calculator.InitializeToValue( initValue );
-        _calculator.Focus();
-      }
-    }
-
-    protected override void OnTextInput( TextCompositionEventArgs e )
-    {
-      if( IsOpen && EnterClosesCalculator )
-      {
-        var buttonType = CalculatorUtilities.GetCalculatorButtonTypeFromText( e.Text );
-        if( buttonType == Calculator.CalculatorButtonType.Equal )
-        {
-          CloseCalculatorUpDown( true );
-        }
-      }
-    }
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          // Calculator will get focus in CalculatorPopup_Opened().
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          CloseCalculatorUpDown( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          if( EnterClosesCalculator )
-          {
-            if( this.UpdateValueOnEnterKey )
-            {
-              this.TextBox.Text = (_initialValue != null) ? _initialValue.Value.ToString( this.FormatString, this.CultureInfo ) : null;
-            }
-            else
-            {
-              this.Value = _initialValue;
-            }
-          }
-          CloseCalculatorUpDown( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseCalculatorUpDown( true );
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void CloseCalculatorUpDown( bool isFocusOnTextBox )
-    {
-      if( IsOpen )
-        IsOpen = false;
-      ReleaseMouseCapture();
-
-      if( isFocusOnTextBox && ( TextBox != null ) )
-        TextBox.Focus();
-    }
-
-    #endregion //Methods
-  }
-}
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
deleted file mode 100644
index 0160991c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,222 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-            </chrome:ButtonChrome>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </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="IsTabStop"
-            Value="False" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <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}"
-                                   ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                   AllowSpin="{TemplateBinding AllowSpin}"
-                                   ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                                   VerticalContentAlignment="Stretch"
-                                   HorizontalAlignment="Stretch">
-                <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}}"
-                                        IsTabStop="True"
-                                        MinWidth="20"
-                                        AcceptsReturn="False"
-                                        Padding="{TemplateBinding Padding}"
-                                        AutoSelectBehavior="{TemplateBinding AutoSelectBehavior}"
-                                        AutoMoveFocus="{TemplateBinding AutoMoveFocus}"
-                                        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}}">
-              </ToggleButton>
-            </Grid>
-            <Popup x:Name="PART_CalculatorPopup"
-                   IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
-                   StaysOpen="False"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <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
deleted file mode 100644
index 3f3b0b28..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
+++ /dev/null
@@ -1,229 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <LinearGradientBrush x:Key="PopupDarkBorderBrush"
-                       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="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style x:Key="CalculatorToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0,2.75,2.75,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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-            </chrome:ButtonChrome>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="Gray"
-                    Focusable="False"
-                    Margin="0,0,3,0" />
-  </DataTemplate>
-
-  <!-- =============================================================================== -->
-  <!-- CalculatorUpDown                                                                -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:CalculatorUpDown}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <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.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <local:ButtonSpinner x:Name="PART_Spinner"
-                                 IsTabStop="False"
-                                 Background="{TemplateBinding Background}"
-                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                 ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                 AllowSpin="{TemplateBinding AllowSpin}"
-                                 ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                                 VerticalContentAlignment="Stretch"
-                                 HorizontalAlignment="Stretch">
-              <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}}"
-                                      IsTabStop="True"
-                                      MinWidth="20"
-                                      AcceptsReturn="False"
-                                      Padding="{TemplateBinding Padding}"
-                                      AutoSelectBehavior="{TemplateBinding AutoSelectBehavior}"
-                                      AutoMoveFocus="{TemplateBinding AutoMoveFocus}"
-                                      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}}" >
-            </ToggleButton>
-            <Popup x:Name="PART_CalculatorPopup"
-                   IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
-                   StaysOpen="False"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PopupBackgroundBrush}"
-                      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="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/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
deleted file mode 100644
index 40781ee5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
+++ /dev/null
@@ -1,402 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Controls;
-using System.Collections.Generic;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_Popup, Type = typeof( Popup ) )]
-  public class CheckComboBox : SelectAllSelector
-  {
-    private const string PART_Popup = "PART_Popup";
-
-    #region Members
-
-    private ValueChangeHelper _displayMemberPathValuesChangeHelper;
-    private bool _ignoreTextValueChanged;
-    private Popup _popup;
-    private List<object> _initialValue = new List<object>();
-
-    #endregion
-
-    #region Constructors
-
-    static CheckComboBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckComboBox ), new FrameworkPropertyMetadata( typeof( CheckComboBox ) ) );
-    }
-
-    public CheckComboBox()
-    {
-
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-      _displayMemberPathValuesChangeHelper = new ValueChangeHelper( this.OnDisplayMemberPathValuesChanged );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region IsEditable
-
-    public static readonly DependencyProperty IsEditableProperty = DependencyProperty.Register( "IsEditable", typeof( bool ), typeof( CheckComboBox )
-      , new UIPropertyMetadata( false ) );
-    public bool IsEditable
-    {
-      get
-      {
-        return (bool)GetValue( IsEditableProperty );
-      }
-      set
-      {
-        SetValue( IsEditableProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( CheckComboBox )
-      , new UIPropertyMetadata( null, OnTextChanged ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var checkComboBox = o as CheckComboBox;
-      if( checkComboBox != null )
-        checkComboBox.OnTextChanged( (string)e.OldValue, (string)e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized || _ignoreTextValueChanged || !this.IsEditable )
-        return;
-
-      this.UpdateFromText();
-    }
-
-    #endregion
-
-    #region IsDropDownOpen
-
-    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register( "IsDropDownOpen", typeof( bool ), typeof( CheckComboBox ), new UIPropertyMetadata( false, OnIsDropDownOpenChanged ) );
-    public bool IsDropDownOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsDropDownOpenProperty );
-      }
-      set
-      {
-        SetValue( IsDropDownOpenProperty, value );
-      }
-    }
-
-    private static void OnIsDropDownOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      CheckComboBox comboBox = o as CheckComboBox;
-      if( comboBox != null )
-        comboBox.OnIsDropDownOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsDropDownOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-      {
-        _initialValue.Clear();
-        foreach( object o in SelectedItems )
-        {
-          _initialValue.Add( o );
-        }
-        base.RaiseEvent( new RoutedEventArgs( CheckComboBox.OpenedEvent, this ) );
-      }
-      else
-      {
-        _initialValue.Clear();
-        base.RaiseEvent( new RoutedEventArgs( CheckComboBox.ClosedEvent, this ) );
-      }
-    }
-
-    #endregion //IsDropDownOpen
-
-    #region MaxDropDownHeight
-
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double ), typeof( CheckComboBox ), new UIPropertyMetadata( SystemParameters.PrimaryScreenHeight / 3.0, OnMaxDropDownHeightChanged ) );
-    public double MaxDropDownHeight
-    {
-      get
-      {
-        return ( double )GetValue( MaxDropDownHeightProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownHeightProperty, value );
-      }
-    }
-
-    private static void OnMaxDropDownHeightChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      CheckComboBox comboBox = o as CheckComboBox;
-      if( comboBox != null )
-        comboBox.OnMaxDropDownHeightChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion
-
-    #endregion //Properties
-
-    #region Base Class Overrides
-
-    protected override void OnSelectedValueChanged( string oldValue, string newValue )
-    {
-      base.OnSelectedValueChanged( oldValue, newValue );
-      UpdateText();
-    }
-
-    protected override void OnDisplayMemberPathChanged( string oldDisplayMemberPath, string newDisplayMemberPath )
-    {
-      base.OnDisplayMemberPathChanged( oldDisplayMemberPath, newDisplayMemberPath );
-      this.UpdateDisplayMemberPathValuesBindings();
-    }
-
-    protected override void OnItemsSourceChanged( System.Collections.IEnumerable oldValue, System.Collections.IEnumerable newValue )
-    {
-      base.OnItemsSourceChanged( oldValue, newValue );
-      this.UpdateDisplayMemberPathValuesBindings();
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _popup != null )
-        _popup.Opened -= Popup_Opened;
-
-      _popup = GetTemplateChild( PART_Popup ) as Popup;
-
-      if( _popup != null )
-        _popup.Opened += Popup_Opened;
-    }
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseDropDown( true );
-    }
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsDropDownOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsDropDownOpen = true;
-          // Popup_Opened() will Focus on ComboBoxItem.
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Enter )
-        {
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          SelectedItems.Clear();
-          foreach( object o in _initialValue )
-            SelectedItems.Add( o );
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void Popup_Opened( object sender, EventArgs e )
-    {
-      UIElement item = ItemContainerGenerator.ContainerFromItem( SelectedItem ) as UIElement;
-      if( (item == null) && (Items.Count > 0) )
-        item = ItemContainerGenerator.ContainerFromItem( Items[0] ) as UIElement;
-      if( item != null )
-        item.Focus();
-    }
-
-    #endregion //Event Handlers
-
-    #region Closed Event
-
-    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "Closed", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( CheckComboBox ) );
-    public event RoutedEventHandler Closed
-    {
-      add
-      {
-        AddHandler( ClosedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ClosedEvent, value );
-      }
-    }
-
-    #endregion //Closed Event
-
-    #region Opened Event
-
-    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "Opened", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( CheckComboBox ) );
-    public event RoutedEventHandler Opened
-    {
-      add
-      {
-        AddHandler( OpenedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( OpenedEvent, value );
-      }
-    }
-
-    #endregion //Opened Event
-
-    #region Methods
-
-    protected virtual void UpdateText()
-    {
-#if VS2008
-      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ).ToString() ).ToArray() ); 
-#else
-      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ) ) );
-#endif
-
-      if( String.IsNullOrEmpty( Text ) || !Text.Equals( newValue ) )
-      {
-        _ignoreTextValueChanged = true;
-#if VS2008
-        Text = newValue;
-#else
-        this.SetCurrentValue( CheckComboBox.TextProperty, newValue );
-#endif
-        _ignoreTextValueChanged = false;
-      }
-    }
-
-    private void UpdateDisplayMemberPathValuesBindings()
-    {
-      _displayMemberPathValuesChangeHelper.UpdateValueSource( ItemsCollection, this.DisplayMemberPath );
-    }
-
-    private void OnDisplayMemberPathValuesChanged()
-    {
-      this.UpdateText();
-    }
-
-    /// <summary>
-    /// Updates the SelectedItems collection based on the content of
-    /// the Text property.
-    /// </summary>
-    private void UpdateFromText()
-    {
-      List<string> selectedValues = null;
-      if( !String.IsNullOrEmpty( this.Text ) )
-      {
-        selectedValues = this.Text.Replace( " ", string.Empty ).Split( new string[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries ).ToList();
-      }
-
-      this.UpdateFromList( selectedValues, this.GetItemDisplayValue );
-    }
-
-    protected object GetItemDisplayValue( object item )
-    {
-      if( String.IsNullOrEmpty( this.DisplayMemberPath ) )
-        return item;
-
-      string[] nameParts = this.DisplayMemberPath.Split( '.' );
-      if( nameParts.Length == 1 )
-      {
-        var property = item.GetType().GetProperty( this.DisplayMemberPath );
-        if( property != null )
-          return property.GetValue( item, null );
-        return item;
-      }
-
-      for( int i = 0; i < nameParts.Count(); ++i )
-      {
-        var type = item.GetType();
-        var info = type.GetProperty( nameParts[ i ] );
-        if( info == null )
-        {
-          return item;
-        }
-
-        if( i == nameParts.Count() - 1 )
-        {
-          return info.GetValue( item, null );
-        }
-        else
-        {
-          item = info.GetValue( item, null );
-        }
-      }
-      return item;
-    }
-
-    private void CloseDropDown( bool isFocusOnComboBox )
-    {
-      if( IsDropDownOpen )
-        IsDropDownOpen = false;
-      ReleaseMouseCapture();
-
-      if( isFocusOnComboBox )
-        Focus();
-    }
-
-#endregion //Methods
-  }
-}
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
deleted file mode 100644
index a3921362..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    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" />
-  <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-  <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="Padding"
-            Value="2" />
-    <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>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
-                                  Width="0" />
-              </Grid.ColumnDefinitions>
-
-              <TextBox x:Name="TextBox"
-                       Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                       Foreground="{TemplateBinding Foreground}"
-                       BorderThickness="0"
-                       Background="Transparent"
-                       IsReadOnly="True"
-                       Focusable="False"
-                       Cursor="Arrow"
-                       Margin="{TemplateBinding Padding}"
-                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                       HorizontalScrollBarVisibility="Hidden"
-                       VerticalScrollBarVisibility="Hidden" >
-              </TextBox>
-              <Grid Grid.Column="1"
-                    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>
-            </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="#AFAFAF" />
-            </Trigger>
-            <DataTrigger Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="False"
-                      TargetName="TextBox" />
-              <Setter Property="Focusable"
-                      Value="True"
-                      TargetName="TextBox" />
-              <Setter Property="Cursor"
-                      Value="{x:Null}"
-                      TargetName="TextBox" />
-            </DataTrigger>
-          </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="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
-          <Grid x:Name="MainGrid"
-                SnapsToDevicePixels="true">
-            <Popup x:Name="PART_Popup"
-                   AllowsTransparency="true"
-                   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>
-                      <StackPanel>
-                        <prim:SelectAllSelectorItem x:Name="PART_SelectAllSelectorItem"
-                                                    Content="{TemplateBinding SelectAllContent}"
-                                                    Visibility="{Binding IsSelectAllActive, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                        <ItemsPresenter x:Name="PART_ItemsPresenter"
-                                        KeyboardNavigation.DirectionalNavigation="Contained"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                      </StackPanel>
-                    </Grid>
-                  </ScrollViewer>
-                </Border>
-              </Grid>
-            </Popup>
-
-            <Border  Background="{TemplateBinding Background}"
-                     BorderBrush="{TemplateBinding BorderBrush}"
-                     BorderThickness="{TemplateBinding BorderThickness}" />
-            <ToggleButton x:Name="PART_DropDownButton"
-                          Content="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          Background="{TemplateBinding Background}"
-                          Focusable="False"
-                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource ComboBoxToggleButton}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
-            </ToggleButton>
-          </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
deleted file mode 100644
index 7311dbfc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-  <SolidColorBrush x:Key="ButtonNormalBorder"
-                   Color="#FF707070" />
-
-  <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="Padding"
-            Value="2" />
-    <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>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
-                                  Width="0" />
-              </Grid.ColumnDefinitions>
-
-              <TextBox x:Name="TextBox"
-                       Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                       Foreground="{TemplateBinding Foreground}"
-                       IsReadOnly="True"
-                       Focusable="False"
-                       Cursor="Arrow"
-                       BorderThickness="0"
-                       Background="Transparent"
-                       Margin="{TemplateBinding Padding}"
-                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                       SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                       HorizontalScrollBarVisibility="Hidden"
-                       VerticalScrollBarVisibility="Hidden" >
-              </TextBox>
-              <Grid Grid.Column="1"
-                    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>
-            </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="#AFAFAF" />
-            </Trigger>
-            <DataTrigger Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type local:CheckComboBox}}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="False"
-                      TargetName="TextBox" />
-              <Setter Property="Focusable"
-                      Value="True"
-                      TargetName="TextBox" />
-              <Setter Property="Cursor"
-                      Value="{x:Null}"
-                      TargetName="TextBox" />
-            </DataTrigger>
-          </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="{StaticResource ButtonNormalBorder}" />
-    <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="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
-          <Grid x:Name="MainGrid"
-                SnapsToDevicePixels="true">
-            <Popup x:Name="PART_Popup"
-                   AllowsTransparency="true"
-                   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>
-                      <StackPanel>
-                        <prim:SelectAllSelectorItem x:Name="PART_SelectAllSelectorItem"
-                                                    Content="{TemplateBinding SelectAllContent}"
-                                                    Visibility="{Binding IsSelectAllActive, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
-                        <ItemsPresenter x:Name="PART_ItemsPresenter"
-                                        KeyboardNavigation.DirectionalNavigation="Contained"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                      </StackPanel>
-                    </Grid>
-                  </ScrollViewer>
-                </Border>
-              </Grid>
-            </Popup>
-
-            <Border Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}" />
-            <ToggleButton x:Name="PART_DropDownButton"
-                          Content="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          Background="{TemplateBinding Background}"
-                          Focusable="False"
-                          IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource ComboBoxToggleButton}"
-                          Padding="{TemplateBinding Padding}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
-            </ToggleButton>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
deleted file mode 100644
index 6b97c457..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class CheckListBox : SelectAllSelector
-  {
-    #region Constructors
-
-    static CheckListBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckListBox ), new FrameworkPropertyMetadata( typeof( CheckListBox ) ) );
-    }
-
-    public CheckListBox()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Override
-
-
-    #endregion
-  }
-}
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
deleted file mode 100644
index 4d03d107..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-  <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:CheckListBox}">
-    <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="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">
-              <StackPanel>
-                <prim:SelectAllSelectorItem x:Name="PART_SelectAllSelectorItem"
-                                            Content="{TemplateBinding SelectAllContent}"
-                                            Visibility="{Binding IsSelectAllActive, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </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
deleted file mode 100644
index bd3d6c91..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-  <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:CheckListBox}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="#FF707070" />
-    <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">
-              <StackPanel>
-                <prim:SelectAllSelectorItem x:Name="PART_SelectAllSelectorItem"
-                                            Content="{TemplateBinding SelectAllContent}"
-                                            Visibility="{Binding IsSelectAllActive, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
-                <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
deleted file mode 100644
index ad27f8ba..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
+++ /dev/null
@@ -1,875 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-#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_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 FrameworkElement _parentContainer;  
-    private Rectangle _modalLayer = new Rectangle();  
-    private Canvas _modalLayerPanel = new Canvas();  
-    private Grid _windowRoot;  
-    private WindowControl _windowControl;
-    private bool _ignorePropertyChanged;
-    private bool _hasChildren;
-    private bool _hasWindowContainer;  
-
-    #endregion //Private Members
-
-    #region Public Properties
-
-    #region DialogResult
-
-    private bool? _dialogResult;
-    /// <summary>
-    /// Gets or sets a value indicating whether the ChildWindow was accepted or canceled.
-    /// </summary>
-    /// <value>
-    /// True if the child window was accepted; false if the child window was
-    /// canceled. The default is null.
-    /// </value>
-    [TypeConverter( typeof( NullableBoolConverter ) )]
-    public bool? DialogResult
-    {
-      get
-      {
-        return _dialogResult;
-      }
-      set
-      {
-        if( _dialogResult != value )
-        {
-          _dialogResult = value;
-          this.Close();
-        }
-      }
-    }
-
-    #endregion //DialogResult
-
-    #region DesignerWindowState
-
-    public static readonly DependencyProperty DesignerWindowStateProperty = DependencyProperty.Register( "DesignerWindowState", typeof( WindowState ), typeof( ChildWindow ), new PropertyMetadata( WindowState.Closed, OnDesignerWindowStatePropertyChanged ) );
-    public WindowState DesignerWindowState
-    {
-      get
-      {
-        return ( WindowState )GetValue( DesignerWindowStateProperty );
-      }
-      set
-      {
-        SetValue( DesignerWindowStateProperty, value );
-      }
-    }
-
-    private static void OnDesignerWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnDesignerWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
-    }
-
-    protected virtual void OnDesignerWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
-    {
-      if( DesignerProperties.GetIsInDesignMode( this ) )
-      {
-        Visibility = newValue == Xceed.Wpf.Toolkit.WindowState.Open ? Visibility.Visible : Visibility.Collapsed;
-      }
-    }
-
-    #endregion //DesignerWindowState
-
-    #region FocusedElement
-
-    public static readonly DependencyProperty FocusedElementProperty = DependencyProperty.Register( "FocusedElement", typeof( FrameworkElement ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
-    public FrameworkElement FocusedElement
-    {
-      get
-      {
-        return ( FrameworkElement )GetValue( FocusedElementProperty );
-      }
-      set
-      {
-        SetValue( FocusedElementProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsModal
-
-    public static readonly DependencyProperty IsModalProperty = DependencyProperty.Register( "IsModal", typeof( bool ), typeof( ChildWindow ), new UIPropertyMetadata( false, new PropertyChangedCallback( OnIsModalPropertyChanged ) ) );
-    public bool IsModal
-    {
-      get
-      {
-        return ( bool )GetValue( IsModalProperty );
-      }
-      set
-      {
-        SetValue( IsModalProperty, value );
-      }
-    }
-
-    private static void OnIsModalPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnIsModalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    internal event EventHandler<EventArgs> IsModalChanged;
-
-    private void OnIsModalChanged( bool oldValue, bool newValue )
-    {
-      EventHandler<EventArgs> handler = IsModalChanged;
-      if( handler != null )
-      {
-        handler( this, EventArgs.Empty );
-      }
-
-      if( !_hasWindowContainer )
-      {
-        if( newValue )
-        {
-          KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
-          ShowModalLayer();
-        }
-        else
-        {
-          KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
-          HideModalLayer();
-        }
-      }
-    }
-
-    #endregion //IsModal
-
-    #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
-      {
-        return ( Brush )GetValue( OverlayBrushProperty );
-      }
-      set
-      {
-        SetValue( OverlayBrushProperty, value );
-      }
-    }
-
-    private static void OnOverlayBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        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;
-    }
-
-    #endregion //OverlayBrush
-
-    #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
-      {
-        return ( double )GetValue( OverlayOpacityProperty );
-      }
-      set
-      {
-        SetValue( OverlayOpacityProperty, value );
-      }
-    }
-
-    private static void OnOverlayOpacityChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        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 WindowStartupLocation
-
-    public static readonly DependencyProperty WindowStartupLocationProperty = DependencyProperty.Register( "WindowStartupLocation", typeof( WindowStartupLocation ), typeof( ChildWindow ), new UIPropertyMetadata( WindowStartupLocation.Manual, OnWindowStartupLocationChanged ) );
-    public WindowStartupLocation WindowStartupLocation
-    {
-      get
-      {
-        return ( WindowStartupLocation )GetValue( WindowStartupLocationProperty );
-      }
-      set
-      {
-        SetValue( WindowStartupLocationProperty, value );
-      }
-    }
-
-    private static void OnWindowStartupLocationChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = o as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnWindowStartupLocationChanged( ( WindowStartupLocation )e.OldValue, ( WindowStartupLocation )e.NewValue );
-    }
-
-    protected virtual void OnWindowStartupLocationChanged( WindowStartupLocation oldValue, WindowStartupLocation newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //WindowStartupLocation
-
-    #region WindowState
-
-    public static readonly DependencyProperty WindowStateProperty = DependencyProperty.Register( "WindowState", typeof( WindowState ), typeof( ChildWindow ), new FrameworkPropertyMetadata( WindowState.Closed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnWindowStatePropertyChanged ) );
-    public WindowState WindowState
-    {
-      get
-      {
-        return ( WindowState )GetValue( WindowStateProperty );
-      }
-      set
-      {
-        SetValue( WindowStateProperty, value );
-      }
-    }
-
-    private static void OnWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = d as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
-    }
-
-    protected virtual void OnWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
-    {
-      if( !DesignerProperties.GetIsInDesignMode( this ) )
-      {
-        if( !_ignorePropertyChanged )
-          SetWindowState( newValue );
-      }
-      else
-      {
-        Visibility = DesignerWindowState == Xceed.Wpf.Toolkit.WindowState.Open ? Visibility.Visible : System.Windows.Visibility.Collapsed;
-      }
-    }
-
-    #endregion //WindowState
-
-    #endregion //Public Properties
-
-    #region Constructors
-
-    static ChildWindow()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ChildWindow ), new FrameworkPropertyMetadata( typeof( ChildWindow ) ) );
-    }
-
-    public ChildWindow()
-    {
-      DesignerWindowState = Xceed.Wpf.Toolkit.WindowState.Open;
-
-      _modalLayer.Fill = OverlayBrush;
-      _modalLayer.Opacity = OverlayOpacity;
-
-      this.IsVisibleChanged += this.ChildWindow_IsVisibleChanged;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    internal override bool AllowPublicIsActiveChange
-    {
-      get { return false; }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _windowControl != null )
-      {
-        _windowControl.HeaderDragDelta -= ( o, e ) => this.OnHeaderDragDelta( e );
-        _windowControl.HeaderIconDoubleClicked -= ( o, e ) => this.OnHeaderIconDoubleClick( 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.OnHeaderIconDoubleClick( e );
-        _windowControl.CloseButtonClicked += ( o, e ) => this.OnCloseButtonClicked( e );
-      }
-
-      this.UpdateBlockMouseInputsPanel();
-
-      _windowRoot = this.GetTemplateChild( PART_WindowRoot ) as Grid;
-      if( _windowRoot != null )
-      {
-        _windowRoot.RenderTransform = _moveTransform;
-      }
-      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
-
-      if( !_hasWindowContainer )
-      {
-        _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();
-            };
-          }
-        }
-
-        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 != null ) ? _root.Resources[ "FocusVisualStyle" ] as Style : null;
-        if( focusStyle != null )
-        {
-          Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
-          focusStyle.Setters.Add( focusStyleDataContext );
-          FocusVisualStyle = focusStyle;
-        }
-#endif
-        if( _root != null )
-        {
-          _root.Children.Add( _modalLayerPanel );
-        }
-      }
-    }
-
-    protected override void OnGotFocus( RoutedEventArgs e )
-    {
-      base.OnGotFocus( e );
-
-      Action action = () =>
-      {
-        if( FocusedElement != null )
-        {
-          _hasChildren = true;
-          FocusedElement.Focus();
-        }
-        else
-        {
-          //Focus first Focusable Child element of ChildWindow
-          var focusableChild = TreeHelper.FindChild<FrameworkElement>( this.Content as DependencyObject, x => x.Focusable );
-          if( focusableChild != null )
-          {
-            _hasChildren = true;
-            focusableChild.Focus();
-          }
-          else
-          {
-            _hasChildren = false;
-          }
-        }
-      };
-
-      Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, action );
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      base.OnPreviewKeyDown( e );
-
-      if( this.IsModal )
-      {
-        // Prevent MenuItem shortcuts while ChildWindow is modal.
-        if( Keyboard.IsKeyDown( Key.LeftAlt ) || Keyboard.IsKeyDown( Key.RightAlt ) )
-        {
-          e.Handled = true;
-        }
-        // Prevent Tab when no children
-        else if( (e.Key == Key.Tab) && !_hasChildren )
-        {
-          e.Handled = true;
-        }
-      }
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      base.OnKeyDown( e );
-
-      if( WindowState == WindowState.Open )
-      {
-        switch( e.Key )
-        {
-          case Key.Left:
-            this.Left -= _horizontalOffset;
-            e.Handled = true;
-            break;
-
-          case Key.Right:
-            this.Left += _horizontalOffset;
-            e.Handled = true;
-            break;
-
-          case Key.Down:
-            this.Top += _verticalOffset;
-            e.Handled = true;
-            break;
-
-          case Key.Up:
-            this.Top -= _verticalOffset;
-            e.Handled = true;
-            break;
-        }
-      }
-    }
-
-    protected override void OnLeftPropertyChanged( double oldValue, double newValue )
-    {
-      base.OnLeftPropertyChanged( oldValue, newValue );
-
-      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
-      if( !_hasWindowContainer )
-      {
-          Left = GetRestrictedLeft();
-        ProcessMove( newValue - oldValue, 0 );
-      }
-    }
-
-    protected override void OnTopPropertyChanged( double oldValue, double newValue )
-    {
-      base.OnTopPropertyChanged( oldValue, newValue );
-
-      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
-      if( !_hasWindowContainer )
-      {
-          Top = GetRestrictedTop();
-        ProcessMove( 0, newValue - oldValue );
-      }
-    }
-
-    internal override void UpdateBlockMouseInputsPanel()
-    {
-      if( _windowControl != null )
-      {
-        _windowControl.IsBlockMouseInputsPanelActive = this.IsBlockMouseInputsPanelActive;
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      e.Handled = true;
-
-      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;
-        }
-      }
-    }
-
-    protected virtual void OnHeaderIconDoubleClick( MouseButtonEventArgs e )
-    {
-      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 )
-      {
-        this.Close();
-      }
-    }
-
-    protected virtual void OnCloseButtonClicked( RoutedEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      e.Handled = true;
-
-      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 ) )
-        return;
-
-      //we only want to set the start position if this is the first time the control has bee initialized
-      if( !_startupPositionInitialized )
-      {
-        ExecuteOpen();
-        _startupPositionInitialized = true;
-      }
-    }
-
-    [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
-      _modalLayer.Height = e.NewSize.Height;
-      _modalLayer.Width = e.NewSize.Width;
-
-      //reposition our window
-      Left = GetRestrictedLeft();
-      Top = GetRestrictedTop();
-    }
-
-    private void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( (bool)e.NewValue && this.IsModal )
-      {
-        this.Focus();
-      }
-    }
-
-
-
-    #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 )
-        return 0;
-
-      if( ( _parentContainer != null ) && (_windowRoot != null) )
-      {
-        if( Left + _windowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
-        {
-          double left = _parentContainer.ActualWidth - _windowRoot.ActualWidth;
-          return left < 0 ? 0 : left;
-        }
-      }
-
-      return Left;
-    }
-
-    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.GetRestrictedTop() instead." )]
-    private double GetRestrictedTop()
-    {
-      if( Top < 0 )
-        return 0;
-
-      if( ( _parentContainer != null ) && ( _windowRoot != null ) )
-      {
-        if( Top + _windowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
-        {
-          double top = _parentContainer.ActualHeight - _windowRoot.ActualHeight;
-          return top < 0 ? 0 : top;
-        }
-      }
-
-      return Top;
-    }
-
-    private void SetWindowState( WindowState state )
-    {
-      switch( state )
-      {
-        case WindowState.Closed:
-          {
-            ExecuteClose();
-            break;
-          }
-        case WindowState.Open:
-          {
-            ExecuteOpen();
-            break;
-          }
-      }
-    }
-
-    private void ExecuteClose()
-    {
-      CancelEventArgs e = new CancelEventArgs();
-      OnClosing( e );
-
-      if( !e.Cancel )
-      {
-        if( !_dialogResult.HasValue )
-          _dialogResult = false;
-
-        OnClosed( EventArgs.Empty );
-      }
-      else
-      {
-        CancelClose();
-      }
-    }
-
-    private void CancelClose()
-    {
-      _dialogResult = null; //when the close is cancelled, DialogResult should be null
-
-      _ignorePropertyChanged = true;
-      WindowState = WindowState.Open; //now reset the window state to open because the close was cancelled
-      _ignorePropertyChanged = false;
-    }
-
-    private void ExecuteOpen()
-    {
-      _dialogResult = null; //reset the dialogResult to null each time the window is opened
-
-      if( !_hasWindowContainer )
-        if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
-          CenterChildWindow(); 
-
-      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;
-
-      if( _parentContainer != null )
-        index = ( int )_parentContainer.GetValue( Canvas.ZIndexProperty );
-
-      SetValue( Canvas.ZIndexProperty, ++index );
-
-      if( IsModal )
-        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 ) && ( _windowRoot != null ) )
-      {
-        _windowRoot.UpdateLayout();
-
-        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 ) )
-      {
-        if( !_modalLayerPanel.Children.Contains( _modalLayer ) )
-          _modalLayerPanel.Children.Add( _modalLayer );
-
-        _modalLayer.Visibility = System.Windows.Visibility.Visible;
-      }
-    }
-
-    [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;
-      _moveTransform.Y += y;
-
-      InvalidateArrange();
-    }
-
-    #endregion //Private
-
-    #region Public
-
-    public void Show()
-    {
-      WindowState = WindowState.Open;
-    }
-
-    public void Close()
-    {
-      WindowState = WindowState.Closed;
-    }
-
-    #endregion //Public
-
-    #endregion //Methods
-
-    #region Events
-
-    /// <summary>
-    /// Occurs when the ChildWindow is closed.
-    /// </summary>
-    public event EventHandler Closed;
-    protected virtual void OnClosed( EventArgs e )
-    {
-      if( Closed != null )
-        Closed( this, e );
-    }
-
-    /// <summary>
-    /// Occurs when the ChildWindow is closing.
-    /// </summary>
-    public event EventHandler<CancelEventArgs> Closing;
-    protected virtual void OnClosing( CancelEventArgs e )
-    {
-      if( Closing != null )
-        Closing( this, 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
deleted file mode 100644
index 690c9232..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum WindowStartupLocation
-  {
-    Center,
-    Manual
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
deleted file mode 100644
index 07209708..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum WindowState
-  {
-    Closed,
-    Open
-  }
-}
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
deleted file mode 100644
index 2a5bd5ef..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,110 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="../../Primitives/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}"
-                                            CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                                            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}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            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
deleted file mode 100644
index 7256260d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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/Generic/Common.xaml" />
-       <ResourceDictionary Source="../../Primitives/Themes/Generic/WindowControl.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-
-   <!-- =============================================================================== -->
-   <!-- ChildWindow                                                                      -->
-   <!-- =============================================================================== -->
-
-   <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"> <!-- 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" />
-                        <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}"
-                                            CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                                            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}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            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/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
deleted file mode 100644
index 89c66d09..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-
-namespace Xceed.Wpf.Toolkit.Chromes
-{
-  public class ButtonChrome : ContentControl
-  {
-    #region CornerRadius
-
-    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register( "CornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnCornerRadiusChanged ) ) );
-    public CornerRadius CornerRadius
-    {
-      get
-      {
-        return ( CornerRadius )GetValue( CornerRadiusProperty );
-      }
-      set
-      {
-        SetValue( CornerRadiusProperty, value );
-      }
-    }
-
-    private static void OnCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
-    }
-
-    protected virtual void OnCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
-    {
-      //we always want the InnerBorderRadius to be one less than the CornerRadius
-      CornerRadius newInnerCornerRadius = new CornerRadius( Math.Max( 0, newValue.TopLeft - 1 ),
-                                                           Math.Max( 0, newValue.TopRight - 1 ),
-                                                           Math.Max( 0, newValue.BottomRight - 1 ),
-                                                           Math.Max( 0, newValue.BottomLeft - 1 ) );
-
-      InnerCornerRadius = newInnerCornerRadius;
-    }
-
-    #endregion //CornerRadius
-
-    #region InnerCornerRadius
-
-    public static readonly DependencyProperty InnerCornerRadiusProperty = DependencyProperty.Register( "InnerCornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnInnerCornerRadiusChanged ) ) );
-    public CornerRadius InnerCornerRadius
-    {
-      get
-      {
-        return ( CornerRadius )GetValue( InnerCornerRadiusProperty );
-      }
-      set
-      {
-        SetValue( InnerCornerRadiusProperty, value );
-      }
-    }
-
-    private static void OnInnerCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnInnerCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
-    }
-
-    protected virtual void OnInnerCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //InnerCornerRadius
-
-    #region RenderChecked
-
-    public static readonly DependencyProperty RenderCheckedProperty = DependencyProperty.Register( "RenderChecked", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderCheckedChanged ) );
-    public bool RenderChecked
-    {
-      get
-      {
-        return ( bool )GetValue( RenderCheckedProperty );
-      }
-      set
-      {
-        SetValue( RenderCheckedProperty, value );
-      }
-    }
-
-    private static void OnRenderCheckedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderCheckedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderCheckedChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderChecked
-
-    #region RenderEnabled
-
-    public static readonly DependencyProperty RenderEnabledProperty = DependencyProperty.Register( "RenderEnabled", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderEnabledChanged ) );
-    public bool RenderEnabled
-    {
-      get
-      {
-        return ( bool )GetValue( RenderEnabledProperty );
-      }
-      set
-      {
-        SetValue( RenderEnabledProperty, value );
-      }
-    }
-
-    private static void OnRenderEnabledChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderEnabledChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderEnabledChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderEnabled
-
-    #region RenderFocused
-
-    public static readonly DependencyProperty RenderFocusedProperty = DependencyProperty.Register( "RenderFocused", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderFocusedChanged ) );
-    public bool RenderFocused
-    {
-      get
-      {
-        return ( bool )GetValue( RenderFocusedProperty );
-      }
-      set
-      {
-        SetValue( RenderFocusedProperty, value );
-      }
-    }
-
-    private static void OnRenderFocusedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderFocusedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderFocusedChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderFocused
-
-    #region RenderMouseOver
-
-    public static readonly DependencyProperty RenderMouseOverProperty = DependencyProperty.Register( "RenderMouseOver", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderMouseOverChanged ) );
-    public bool RenderMouseOver
-    {
-      get
-      {
-        return ( bool )GetValue( RenderMouseOverProperty );
-      }
-      set
-      {
-        SetValue( RenderMouseOverProperty, value );
-      }
-    }
-
-    private static void OnRenderMouseOverChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderMouseOverChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderMouseOverChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderMouseOver
-
-    #region RenderNormal
-
-    public static readonly DependencyProperty RenderNormalProperty = DependencyProperty.Register( "RenderNormal", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderNormalChanged ) );
-    public bool RenderNormal
-    {
-      get
-      {
-        return ( bool )GetValue( RenderNormalProperty );
-      }
-      set
-      {
-        SetValue( RenderNormalProperty, value );
-      }
-    }
-
-    private static void OnRenderNormalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderNormalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderNormalChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderNormal
-
-    #region RenderPressed
-
-    public static readonly DependencyProperty RenderPressedProperty = DependencyProperty.Register( "RenderPressed", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderPressedChanged ) );
-    public bool RenderPressed
-    {
-      get
-      {
-        return ( bool )GetValue( RenderPressedProperty );
-      }
-      set
-      {
-        SetValue( RenderPressedProperty, value );
-      }
-    }
-
-    private static void OnRenderPressedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ButtonChrome buttonChrome = o as ButtonChrome;
-      if( buttonChrome != null )
-        buttonChrome.OnRenderPressedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnRenderPressedChanged( bool oldValue, bool newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //RenderPressed
-
-    #region Contsructors
-
-    static ButtonChrome()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonChrome ), new FrameworkPropertyMetadata( typeof( ButtonChrome ) ) );
-    }
-
-    #endregion //Contsructors
-  }
-}
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
deleted file mode 100644
index d1f499f6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 2ee81a1a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="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}">
-                     <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}}" />
-                  </Border>
-
-                  <Border x:Name="MouseOverVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}">
-                     <Border x:Name="MouseOverInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}}" />
-                  </Border>
-                  <Border x:Name="PressedVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}">
-                     <Border x:Name="PressedInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
-                  </Border>
-
-                  <Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}">
-                     <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}}" />
-                  </Border>
-
-                  <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="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}}" />
-                     <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>
-                     <MultiTrigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.050" Value="1" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.EnterActions>
-                     <MultiTrigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.ExitActions>
-                  </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>
-                     <MultiTrigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.EnterActions>
-                     <MultiTrigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.ExitActions>
-                  </MultiTrigger>
-
-                  <!-- if button is enabled, checked, he 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="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
-                     <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>
-                     <MultiTrigger.EnterActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.25" Value="1" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.EnterActions>
-                     <MultiTrigger.ExitActions>
-                        <BeginStoryboard>
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
-                                    <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Collapsed</Visibility>
-                                    </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
-                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
-                              </DoubleAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </BeginStoryboard>
-                     </MultiTrigger.ExitActions>
-                  </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="InnerBorder" Property="BorderBrush" Value="{x:Null}" />
-                     <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/CollectionControl/Images/Delete16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Delete16.png
deleted file mode 100644
index dee2496a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Delete16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png
deleted file mode 100644
index 51b048bc..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Images/Duplicate.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
deleted file mode 100644
index d3c774c2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
+++ /dev/null
@@ -1,705 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-using System.Windows.Threading;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_NewItemTypesComboBox, Type = typeof( ComboBox ) )]
-  [TemplatePart( Name = PART_PropertyGrid, Type = typeof( PropertyGrid.PropertyGrid ) )]
-  [TemplatePart( Name = PART_ListBox, Type = typeof( ListBox ) )]
-  public class CollectionControl : Control
-  {
-    private const string PART_NewItemTypesComboBox = "PART_NewItemTypesComboBox";
-    private const string PART_PropertyGrid = "PART_PropertyGrid";
-    private const string PART_ListBox = "PART_ListBox";
-
-    #region Private Members
-
-    private ComboBox _newItemTypesComboBox;
-    private PropertyGrid.PropertyGrid _propertyGrid;
-    private ListBox _listBox;
-
-    #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
-    {
-      get
-      {
-        return ( ObservableCollection<object> )GetValue( ItemsProperty );
-      }
-      set
-      {
-        SetValue( ItemsProperty, value );
-      }
-    }
-
-    #endregion  //Items
-
-    #region ItemsSource Property
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControl ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return (IEnumerable)GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    private static void OnItemsSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      var CollectionControl = ( CollectionControl )d;
-      if( CollectionControl != null )
-        CollectionControl.OnItemSourceChanged( (IEnumerable)e.OldValue, (IEnumerable)e.NewValue );
-    }
-
-    public void OnItemSourceChanged( IEnumerable oldValue, IEnumerable newValue )
-    {
-      if( newValue != null )
-      {
-        var dict = newValue as IDictionary;
-        if( dict != null )
-        {
-          // A Dictionary contains KeyValuePair that can't be edited.
-          // We need to Add EditableKeyValuePairs from DictionaryEntries.
-          foreach( DictionaryEntry item in dict )
-          {
-            var keyType = (item.Key != null) 
-                          ? item.Key.GetType()
-                          : (dict.GetType().GetGenericArguments().Count() > 0) ? dict.GetType().GetGenericArguments()[0] : typeof( object );
-            var valueType = (item.Value != null)
-                          ? item.Value.GetType()
-                          : (dict.GetType().GetGenericArguments().Count() > 1) ? dict.GetType().GetGenericArguments()[ 1 ] : typeof( object );
-            var editableKeyValuePair = ListUtilities.CreateEditableKeyValuePair( item.Key
-                                                                                , keyType
-                                                                                , item.Value
-                                                                                , valueType );
-            this.Items.Add( editableKeyValuePair );
-          }
-        }
-        else
-        {
-          foreach( var item in newValue )
-          {
-            if( item != null )
-            {
-              Items.Add( item );
-            }
-          }
-        }
-      }
-    }
-
-    #endregion  //ItemsSource
-
-    #region ItemsSourceType Property
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion //ItemsSourceType
-
-    #region NewItemType Property
-
-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
-
-    #endregion  //NewItemType
-
-    #region PropertiesLabel Property
-
-    public static readonly DependencyProperty PropertiesLabelProperty = DependencyProperty.Register( "PropertiesLabel", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( "Properties:" ) );
-    public object PropertiesLabel
-    {
-      get
-      {
-        return ( object )GetValue( PropertiesLabelProperty );
-      }
-      set
-      {
-        SetValue( PropertiesLabelProperty, value );
-      }
-    }
-
-    #endregion  //PropertiesLabel
-
-    #region SelectedItem Property
-
-    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public object SelectedItem
-    {
-      get
-      {
-        return ( object )GetValue( SelectedItemProperty );
-      }
-      set
-      {
-        SetValue( SelectedItemProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #region TypeSelectionLabel Property
-
-    public static readonly DependencyProperty TypeSelectionLabelProperty = DependencyProperty.Register( "TypeSelectionLabel", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( "Select type:" ) );
-    public object TypeSelectionLabel
-    {
-      get
-      {
-        return ( object )GetValue( TypeSelectionLabelProperty );
-      }
-      set
-      {
-        SetValue( TypeSelectionLabelProperty, value );
-      }
-    }
-
-    #endregion  //TypeSelectionLabel
-
-    #region EditorDefinitions Property
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #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 );
-      }
-
-      _listBox = this.GetTemplateChild( PART_ListBox ) as ListBox;
-
-      if( _propertyGrid != null )
-      {
-        _propertyGrid.PropertyValueChanged -= this.PropertyGrid_PropertyValueChanged;
-      }
-      _propertyGrid = GetTemplateChild( PART_PropertyGrid ) as PropertyGrid.PropertyGrid;
-      if( _propertyGrid != null )
-      {
-        _propertyGrid.PropertyValueChanged += this.PropertyGrid_PropertyValueChanged;
-      }
-    }
-
-    public PropertyGrid.PropertyGrid PropertyGrid
-    {
-      get
-      {
-        if( _propertyGrid == null )
-        {
-          this.ApplyTemplate();
-        }
-        return _propertyGrid;
-      }
-    }
-
-
-
-
-    #endregion
-
-    #region Constructors
-
-    static CollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionControl ), new FrameworkPropertyMetadata( typeof( CollectionControl ) ) );
-    }
-
-    public CollectionControl()
-    {
-      Items = new ObservableCollection<object>();
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.New, this.AddNew, this.CanAddNew ) );
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Delete, this.Delete, this.CanDelete ) );
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, this.Duplicate, this.CanDuplicate ) );
-      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveDown, this.MoveDown, this.CanMoveDown ) );
-      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveUp, this.MoveUp, this.CanMoveUp ) );
-    }
-
-    #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
-
-    #region ItemMovedDown Event
-
-    public delegate void ItemMovedDownRoutedEventHandler( object sender, ItemEventArgs e );
-
-    public static readonly RoutedEvent ItemMovedDownEvent = EventManager.RegisterRoutedEvent( "ItemMovedDown", RoutingStrategy.Bubble, typeof( ItemMovedDownRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemMovedDownRoutedEventHandler ItemMovedDown
-    {
-      add
-      {
-        AddHandler( ItemMovedDownEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemMovedDownEvent, value );
-      }
-    }
-
-    #endregion //ItemMovedDown Event
-
-    #region ItemMovedUp Event
-
-    public delegate void ItemMovedUpRoutedEventHandler( object sender, ItemEventArgs e );
-
-    public static readonly RoutedEvent ItemMovedUpEvent = EventManager.RegisterRoutedEvent( "ItemMovedUp", RoutingStrategy.Bubble, typeof( ItemMovedUpRoutedEventHandler ), typeof( CollectionControl ) );
-    public event ItemMovedUpRoutedEventHandler ItemMovedUp
-    {
-      add
-      {
-        AddHandler( ItemMovedUpEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemMovedUpEvent, value );
-      }
-    }
-
-    #endregion //ItemMovedUp Event
-
-    #endregion
-
-    #region EventHandlers
-
-    void NewItemTypesComboBox_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( _newItemTypesComboBox != null )
-        _newItemTypesComboBox.SelectedIndex = 0;
-    }
-
-    private void PropertyGrid_PropertyValueChanged( object sender, PropertyGrid.PropertyValueChangedEventArgs e )
-    {
-      if( _listBox != null )
-      {
-        _listBox.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
-        {
-          _listBox.Items.Refresh();
-        }
-        ) );
-      }
-    }
-
-    #endregion
-
-    #region Commands
-
-    private void AddNew( object sender, ExecutedRoutedEventArgs e )
-    {
-      var newItem = this.CreateNewItem( ( Type )e.Parameter );
-
-      this.AddNewCore( newItem );
-    }
-
-    private void CanAddNew( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var t = e.Parameter as Type;
-      this.CanAddNewCore( t, e );
-    }
-
-    private void CanAddNewCore( Type t, CanExecuteRoutedEventArgs e )
-    {
-      if( ( t != null ) && !this.IsReadOnly )
-      {
-        var isComplexStruct = t.IsValueType && !t.IsEnum && !t.IsPrimitive;
-
-        if( isComplexStruct || ( t.GetConstructor( Type.EmptyTypes ) != null ) )
-        {
-          e.CanExecute = true;
-        }
-      }
-    }
-
-    private void AddNewCore( object newItem )
-    {
-      if( newItem == null )
-        throw new ArgumentNullException( "newItem" );
-
-      var eventArgs = new ItemAddingEventArgs( ItemAddingEvent, newItem );
-      this.RaiseEvent( eventArgs );
-      if( eventArgs.Cancel )
-        return;
-      newItem = eventArgs.Item;
-
-      this.Items.Add( newItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemAddedEvent, newItem ) );
-
-      this.SelectedItem = newItem;
-    }
-
-    private void Delete( object sender, ExecutedRoutedEventArgs e )
-    {
-      var eventArgs = new ItemDeletingEventArgs( ItemDeletingEvent, e.Parameter );
-      this.RaiseEvent( eventArgs );
-      if( eventArgs.Cancel )
-        return;
-
-      this.Items.Remove( e.Parameter );
-
-      this.RaiseEvent( new ItemEventArgs( ItemDeletedEvent, e.Parameter ) );
-    }
-
-    private void CanDelete( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = e.Parameter != null && !this.IsReadOnly;
-    }
-
-    private void Duplicate( object sender, ExecutedRoutedEventArgs e )
-    {
-      var newItem = this.DuplicateItem( e );
-      this.AddNewCore( newItem );
-    }
-
-    private void CanDuplicate( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var t = (e.Parameter != null) ? e.Parameter.GetType() : null;
-      this.CanAddNewCore( t, e );
-    }
-
-    private object DuplicateItem( ExecutedRoutedEventArgs e )
-    {
-      if( e == null )
-        throw new ArgumentNullException( "e" );
-
-      var baseItem = e.Parameter;
-      var newItemType = baseItem.GetType();
-      var newItem = this.CreateNewItem( newItemType );
-
-      var type = newItemType;
-      while( type != null )
-      {
-        var baseProperties = type.GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
-        foreach( var prop in baseProperties )
-        {
-          prop.SetValue( newItem, prop.GetValue( baseItem ) );
-        }
-        type = type.BaseType;
-      }
-
-      return newItem;
-    }
-
-    private void MoveDown( object sender, ExecutedRoutedEventArgs e )
-    {
-      var selectedItem = e.Parameter;
-      var index = Items.IndexOf( selectedItem );
-      Items.RemoveAt( index );
-      Items.Insert( ++index, selectedItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemMovedDownEvent, selectedItem ) );
-
-      this.SelectedItem = selectedItem;
-    }
-
-    private void CanMoveDown( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) && !this.IsReadOnly )
-        e.CanExecute = true;
-    }
-
-    private void MoveUp( object sender, ExecutedRoutedEventArgs e )
-    {
-      var selectedItem = e.Parameter;
-      var index = Items.IndexOf( selectedItem );
-      this.Items.RemoveAt( index );
-      this.Items.Insert( --index, selectedItem );
-
-      this.RaiseEvent( new ItemEventArgs( ItemMovedUpEvent, selectedItem ) );
-
-      this.SelectedItem = selectedItem;
-    }
-
-    private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 && !this.IsReadOnly )
-        e.CanExecute = true;
-    }
-
-    #endregion //Commands
-
-    #region Methods
-
-    public void PersistChanges()
-    {
-      this.PersistChanges( this.Items );
-    }
-
-    internal void PersistChanges( IList sourceList )
-    {
-      var collection = ComputeItemsSource();
-      if( collection == null )
-        return;
-
-      //IDictionary<T> and IDictionary
-      if( collection is IDictionary )
-      {
-        //For a Dictionary, we need to parse the list of EditableKeyValuePair and add KeyValuePair to the Dictionary.
-        var dict = (IDictionary)collection;
-        //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-        dict.Clear();
-
-        foreach( var item in sourceList )
-        {
-          var propInfoKey = item.GetType().GetProperty( "Key" );
-          var propInfoValue = item.GetType().GetProperty( "Value" );
-          if( (propInfoKey != null) && (propInfoValue != null) )
-          {
-            dict.Add( propInfoKey.GetValue( item, null ), propInfoValue.GetValue( item, null ) );
-          }
-        }
-      }
-      //IList
-      else if( collection is IList )
-      {
-        var list = (IList)collection;
-
-        //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-        list.Clear();
-
-        if( list.IsFixedSize )
-        {
-          if( sourceList.Count > list.Count )
-            throw new IndexOutOfRangeException("Exceeding array size.");
-
-          for( int i = 0; i < sourceList.Count; ++i )
-            list[ i ] = sourceList[ i ];
-        }
-        else
-        {
-          foreach( var item in sourceList )
-          {
-            list.Add( item );
-          }
-        }
-      }
-      else
-      {
-        //ICollection<T> (or IList<T>)
-        var collectionType = collection.GetType();
-        var iCollectionOfTInterface = collectionType.GetInterfaces().FirstOrDefault( x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof( ICollection<> )) );
-        if( iCollectionOfTInterface != null )
-        {
-          var argumentType = iCollectionOfTInterface.GetGenericArguments().FirstOrDefault();
-          if( argumentType != null )
-          {
-            var iCollectionOfTType = typeof( ICollection<> ).MakeGenericType( argumentType );
-
-            //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-            iCollectionOfTType.GetMethod( "Clear" ).Invoke( collection, null );
-
-            foreach( var item in sourceList )
-            {
-              iCollectionOfTType.GetMethod( "Add" ).Invoke( collection, new object[] { item } );
-            }
-          }
-        }
-      }
-    }
-
-    private IEnumerable CreateItemsSource()
-    {
-      IEnumerable collection = null;
-
-      if( ItemsSourceType != null )
-      {
-        var constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
-        if( constructor != null )
-        {
-          collection = ( IEnumerable )constructor.Invoke( null );
-        }
-        else if( ItemsSourceType.IsArray )
-        {
-          collection = Array.CreateInstance( ItemsSourceType.GetElementType(), Items.Count );
-        }
-      }
-
-      return collection;
-    }
-
-    private object CreateNewItem( Type type )
-    {
-      return Activator.CreateInstance( type );
-    }
-
-    private IEnumerable ComputeItemsSource()
-    {
-      if( ItemsSource == null )
-        ItemsSource = CreateItemsSource();
-
-      return ItemsSource;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
deleted file mode 100644
index 379fa047..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class CollectionControlButton : Button
-  {
-    #region Constructors
-
-    static CollectionControlButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionControlButton ), new FrameworkPropertyMetadata( typeof( CollectionControlButton ) ) );
-    }
-
-    public CollectionControlButton()
-    {
-      this.Click += this.CollectionControlButton_Click;
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region EditorDefinitions Property
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    #endregion  //EditorDefinitions
-
-    #region IsReadOnly Property
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlButton ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    #endregion  //IsReadOnly
-
-    #region ItemsSource Property
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return ( IEnumerable )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    #endregion  //ItemsSource
-
-    #region ItemsSourceType Property
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion //ItemsSourceType
-
-    #region NewItemTypes Property
-
-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControlButton ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
-
-    #endregion  //NewItemTypes
-
-    #endregion
-
-    #region Base Class Overrides
-
-
-    #endregion
-
-    #region Methods
-
-    private void CollectionControlButton_Click( object sender, RoutedEventArgs e )
-    {
-      var collectionControlDialog = new CollectionControlDialog();
-      var binding = new Binding( "ItemsSource" ) { Source = this, Mode = BindingMode.TwoWay };
-      BindingOperations.SetBinding( collectionControlDialog, CollectionControlDialog.ItemsSourceProperty, binding );
-      collectionControlDialog.NewItemTypes = this.NewItemTypes;
-      collectionControlDialog.ItemsSourceType = this.ItemsSourceType;
-      collectionControlDialog.IsReadOnly = this.IsReadOnly;
-      collectionControlDialog.EditorDefinitions = this.EditorDefinitions;
-      collectionControlDialog.ShowDialog();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
deleted file mode 100644
index aec19954..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:CollectionControlDialogBase x:Class="Xceed.Wpf.Toolkit.CollectionControlDialog"
-                                   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"
-                                   Title="Collection Control"
-                                   Height="400"
-                                   Width="600"
-                                   WindowStartupLocation="CenterScreen">
-
-   <Grid Margin="10">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="*" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <local:CollectionControl x:Name="_collectionControl"
-                               ItemsSourceType="{Binding ItemsSourceType, 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}}"
-                               EditorDefinitions="{Binding EditorDefinitions, 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>
-         <Button Width="75"
-                 Margin="2"
-                 Click="CancelButton_Click"
-                 IsCancel="True">Cancel</Button>
-      </StackPanel>
-
-   </Grid>
-</local:CollectionControlDialogBase>
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
deleted file mode 100644
index db766804..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Security;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public partial class CollectionControlDialogBase :
-    Window
-  {
-  }
-
-  /// <summary>
-  /// Interaction logic for CollectionControlDialog.xaml
-  /// </summary>
-  public partial class CollectionControlDialog : CollectionControlDialogBase
-  {
-    #region Private Members
-
-    private IList originalData = new List<object>();
-
-    #endregion
-
-    #region Properties
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return ( IEnumerable )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
-    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
-
-    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 );
-      }
-    }
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    public CollectionControl CollectionControl
-    {
-      get
-      {
-        return _collectionControl;
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    public CollectionControlDialog()
-    {
-      InitializeComponent();
-    }
-
-    public CollectionControlDialog( Type itemsourceType )
-      : this()
-    {
-      ItemsSourceType = itemsourceType;
-    }
-
-    public CollectionControlDialog( Type itemsourceType, IList<Type> newItemTypes )
-      : this( itemsourceType )
-    {
-      NewItemTypes = newItemTypes;
-    }
-
-    #endregion //Constructors
-
-    #region Overrides
-
-    protected override void OnSourceInitialized( EventArgs e )
-    {
-      base.OnSourceInitialized( e );
-
-      //Backup data if case "Cancel" is clicked.
-      if( this.ItemsSource != null )
-      {
-        foreach( var item in this.ItemsSource )
-        {
-          originalData.Add( this.Clone( item ) );
-        }
-      }
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    private void OkButton_Click( object sender, RoutedEventArgs e )
-    {
-      if( this.ItemsSource is IDictionary )
-      {
-        if( !this.AreDictionaryKeysValid() )
-        {
-          MessageBox.Show( "All dictionary items should have distinct non-null Key values.", "Warning" );
-          return;
-        }
-      }
-
-      _collectionControl.PersistChanges();
-      this.DialogResult = true;
-      this.Close();
-    }
-
-    private void CancelButton_Click( object sender, RoutedEventArgs e )
-    {
-      _collectionControl.PersistChanges( originalData );
-      this.DialogResult = false;
-      this.Close();
-    }
-
-    #endregion //Event Hanlders
-
-    #region Private Methods
-
-    [SecuritySafeCritical]
-    private object Clone( object source )
-    {
-      if( source == null )
-        return null;
-
-      object result = null;
-      var sourceType = source.GetType();
-
-      if( source is Array )
-      {
-        using( var stream = new MemoryStream() )
-        {
-          var formatter = new BinaryFormatter();
-          formatter.Serialize( stream, source );
-          stream.Seek( 0, SeekOrigin.Begin );
-          result = ( Array )formatter.Deserialize( stream );
-        }
-      }
-      // For IDictionary, we need to create EditableKeyValuePair to edit the Key-Value.
-      else if( ( this.ItemsSource is IDictionary )
-        && sourceType.IsGenericType
-        && typeof( KeyValuePair<,> ).IsAssignableFrom( sourceType.GetGenericTypeDefinition() ) )
-      {
-        result = this.GenerateEditableKeyValuePair( source );
-      }
-      else
-      {
-        // Initialized a new object with default values
-        try
-        {
-          result = FormatterServices.GetUninitializedObject( sourceType );
-        }
-        catch( Exception )
-        {
-        }
-
-        var constructor = sourceType.GetConstructor( Type.EmptyTypes );
-        if( constructor != null )
-        {
-          constructor.Invoke( result, null );
-        }
-        else
-        {
-          result = source;
-        }
-      }
-      Debug.Assert( result != null );
-      if( result != null )
-      {
-        var properties = sourceType.GetProperties();
-
-        foreach( var propertyInfo in properties )
-        {
-          var parameters = propertyInfo.GetIndexParameters();
-          var index = parameters.GetLength( 0 ) == 0 ? null : new object[] { parameters.GetLength( 0 ) - 1 };
-          var propertyInfoValue = propertyInfo.GetValue( source, index );
-
-          if( propertyInfo.CanWrite )
-          {
-            // Look for nested object
-            if( propertyInfo.PropertyType.IsClass
-              && ( propertyInfo.PropertyType != typeof( Transform ) )
-              && !propertyInfo.PropertyType.Equals( typeof( string ) ) )
-            {
-              // We have a Collection/List of T.
-              if( propertyInfo.PropertyType.IsGenericType )
-              {
-                // Clone sub-objects if the T are non-primitive types objects. 
-                var arg = propertyInfo.PropertyType.GetGenericArguments().FirstOrDefault();
-                if( ( arg != null ) && !arg.IsPrimitive && !arg.Equals( typeof( String ) ) && !arg.IsEnum )
-                {
-                  var nestedObject = this.Clone( propertyInfoValue );
-                  propertyInfo.SetValue( result, nestedObject, null );
-                }
-                else
-                {
-                  // copy object if the T are primitive types objects.
-                  propertyInfo.SetValue( result, propertyInfoValue, null );
-                }
-              }
-              else
-              {
-                var nestedObject = this.Clone( propertyInfoValue );
-                if( nestedObject != null )
-                {
-                  // For T object included in List/Collections, Add it to the List/Collection of T.
-                  if( index != null )
-                  {
-                    result.GetType().GetMethod( "Add" ).Invoke( result, new[] { nestedObject } );
-                  }
-                  else
-                  {
-                    propertyInfo.SetValue( result, nestedObject, null );
-                  }
-                }
-              }
-            }
-            else
-            {
-              // For T object included in List/Collections, Add it to the List/Collection of T.
-              if( index != null )
-              {
-                result.GetType().GetMethod( "Add" ).Invoke( result, new[] { propertyInfoValue } );
-              }
-              else
-              {
-                // copy regular object
-                propertyInfo.SetValue( result, propertyInfoValue, null );
-              }
-            }
-          }
-        }
-      }
-
-      return result;
-    }
-
-    private object GenerateEditableKeyValuePair( object source )
-    {
-      var sourceType = source.GetType();
-      if( ( sourceType.GetGenericArguments() == null ) || ( sourceType.GetGenericArguments().GetLength( 0 ) != 2 ) )
-        return null;
-
-      var propInfoKey = sourceType.GetProperty( "Key" );
-      var propInfoValue = sourceType.GetProperty( "Value" );
-      if( ( propInfoKey != null ) && ( propInfoValue != null ) )
-      {
-        return ListUtilities.CreateEditableKeyValuePair( propInfoKey.GetValue( source, null )
-                                                          , sourceType.GetGenericArguments()[ 0 ]
-                                                          , propInfoValue.GetValue( source, null )
-                                                          , sourceType.GetGenericArguments()[ 1 ] );
-      }
-      return null;
-    }
-
-    private bool AreDictionaryKeysValid()
-    {
-      var keys = _collectionControl.Items.Select( x =>
-      {
-        var keyType = x.GetType().GetProperty( "Key" );
-        if( keyType != null )
-        {
-          return keyType.GetValue( x, null );
-        }
-        return null;
-      } );
-
-      return ( keys.Distinct().Count() == _collectionControl.Items.Count )
-             && keys.All( x => x != null );
-    }
-
-    #endregion
-  }
-}
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
deleted file mode 100644
index d0ccf3e4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 12d3bb47..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index d8343bdd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index aa45304a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 1fc0ab77..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class PrimitiveTypeCollectionControl : ContentControl
-  {
-    #region Members
-
-    bool _surpressTextChanged;
-    bool _conversionFailed;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-
-    }
-
-    #endregion //IsOpen
-
-    #region ItemsSource
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
-    public IList ItemsSource
-    {
-      get
-      {
-        return ( IList )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    private static void OnItemsSourceChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnItemsSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
-    }
-
-    protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue )
-    {
-      if( newValue == null )
-        return;
-
-      if( ItemsSourceType == null )
-        ItemsSourceType = newValue.GetType();
-
-      if( ItemType == null && newValue.GetType().ContainsGenericParameters )
-        ItemType = newValue.GetType().GetGenericArguments()[ 0 ];
-
-      SetText( 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
-    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
-    }
-
-    #endregion ItemsSourceType
-
-    #region ItemType
-
-    public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register( "ItemType", typeof( Type ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null ) );
-    public Type ItemType
-    {
-      get
-      {
-        return ( Type )GetValue( ItemTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemTypeProperty, value );
-      }
-    }
-
-    #endregion ItemType
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null, OnTextChanged ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PrimitiveTypeCollectionControl primitiveTypeCollectionControl = o as PrimitiveTypeCollectionControl;
-      if( primitiveTypeCollectionControl != null )
-        primitiveTypeCollectionControl.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-      if( !_surpressTextChanged )
-        PersistChanges();
-    }
-
-    #endregion //Text
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static PrimitiveTypeCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PrimitiveTypeCollectionControl ), new FrameworkPropertyMetadata( typeof( PrimitiveTypeCollectionControl ) ) );
-    }
-
-    public PrimitiveTypeCollectionControl()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Overrides
-
-
-#endregion
-
-    #region Methods
-
-    private void PersistChanges()
-    {
-      IList list = ComputeItemsSource();
-      if( list == null )
-        return;
-
-      IList items = ComputeItems();
-
-      //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
-      list.Clear();
-
-      int counter = 0;
-      foreach( var item in items )
-      {
-        if( list is Array )
-        {
-           ( ( Array )list ).SetValue( item, counter++);
-        }
-        else
-        {
-          list.Add( item );
-        }
-      };
-
-      // if something went wrong during conversion we want to reload the text to show only valid entries
-      if( _conversionFailed )
-        SetText( list );
-    }
-
-    private IList ComputeItems()
-    {
-      IList items = new List<object>();
-
-      if( ItemType == null )
-        return items;
-
-      string[] textArray = Text.Split( '\n' );
-
-      foreach( string s in textArray )
-      {
-        string valueString = s.TrimEnd( '\r' );
-        if( !String.IsNullOrEmpty( valueString ) )
-        {
-          object value = null;
-          try
-          {
-            if( ItemType.IsEnum )
-            {
-              value = Enum.Parse( ItemType, valueString );
-            }
-            else
-            {
-              value = Convert.ChangeType( valueString, ItemType );
-            }
-          }
-          catch
-          {
-            //a conversion failed
-            _conversionFailed = true;
-          }
-
-          if( value != null )
-            items.Add( value );
-        }
-      }
-
-      return items;
-    }
-
-    private IList ComputeItemsSource()
-    {
-      if( ItemsSource == null )
-      {
-        // Save current text since creating the ItemsSource will reset it
-        string currentText = this.Text;
-        ItemsSource = CreateItemsSource();
-        this.Text = currentText;
-      }
-
-      return ItemsSource;
-    }
-
-    private IList CreateItemsSource()
-    {
-      IList list = null;
-
-      if( ItemsSourceType != null )
-      {
-        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
-        list = ( IList )constructor.Invoke( null );
-      }
-
-      return list;
-    }
-
-    private void SetText( IEnumerable collection )
-    {
-      _surpressTextChanged = true;
-      StringBuilder builder = new StringBuilder();
-      foreach( object obj2 in collection )
-      {
-        builder.Append( obj2.ToString() );
-        builder.AppendLine();
-      }
-      Text = builder.ToString().Trim();
-      _surpressTextChanged = false;
-    }
-
-    #endregion //Methods
-  }
-}
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
deleted file mode 100644
index 87404edb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,334 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <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}">
-    <Style.Resources>
-      <Style TargetType="ListBox">
-        <Setter Property="ItemTemplate">
-          <Setter.Value>
-            <DataTemplate>
-              <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-            </DataTemplate>
-          </Setter.Value>
-        </Setter>
-      </Style>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CollectionControl}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid  Margin="{TemplateBinding Padding}">
-              <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>
-                <ContentControl Margin="0,0,0,5"
-                                Content="{TemplateBinding TypeSelectionLabel}">
-                </ContentControl>
-                <ComboBox x:Name="PART_NewItemTypesComboBox"
-                          Grid.Row="1"
-                          Margin="0,0,0,3"
-                          HorizontalAlignment="Stretch">
-                  <ComboBox.ItemsSource>
-                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="ItemsSourceType" />
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="NewItemTypes" />
-                    </MultiBinding>
-                  </ComboBox.ItemsSource>
-                  <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                      <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-                    </DataTemplate>
-                  </ComboBox.ItemTemplate>
-                </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}">
-                </Button>
-                <ListBox x:Name="PART_ListBox"
-                         Grid.Row="2"
-                         Grid.ColumnSpan="2"
-                         ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedIndex="0">
-                </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=PART_ListBox}">
-                    <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=PART_ListBox}">
-                    <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=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Delete16.png">
-                    </Image>
-                  </Button>
-                  <Button Margin="0,7,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="Copy"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Duplicate.png">
-                    </Image>
-                  </Button>
-                </StackPanel>
-              </Grid>
-              <Grid Column="1"
-                    Margin="20,0,0,0">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <ContentControl Grid.Column="1"
-                                Content="{TemplateBinding PropertiesLabel}">
-                </ContentControl>
-                <pg:PropertyGrid x:Name="PART_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}}"
-                                 EditorDefinitions="{Binding EditorDefinitions, RelativeSource={RelativeSource TemplatedParent}}"/>
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                      TargetName="PART_NewItemTypesComboBox" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PrimitiveTypeCollectionControl"
-         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="IsTabStop"
-            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}"
-                                     ContentTemplate="{TemplateBinding ContentTemplate}"
-                                     Padding="{TemplateBinding Padding}"
-                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     IsOpen="{TemplateBinding IsOpen}"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     DropDownWidth="{TemplateBinding ActualWidth}" />
-
-          <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>
-
-  <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}" />
-
-  <Style x:Key="CollectionControlButton"
-         TargetType="{x:Type local:CollectionControlButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Left" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="MinHeight"
-            Value="22" />
-    <Setter Property="IsTabStop"
-            Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <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,2.75,2.75,0"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CollectionControlButton}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}">
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:CollectionControlButton}"
-         BasedOn="{StaticResource CollectionControlButton}" />
-
-</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
deleted file mode 100644
index 6b1390ff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
+++ /dev/null
@@ -1,327 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
-                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <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}">
-    <Style.Resources>
-      <Style TargetType="ListBox">
-        <Setter Property="ItemTemplate">
-          <Setter.Value>
-            <DataTemplate>
-              <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-            </DataTemplate>
-          </Setter.Value>
-        </Setter>
-      </Style>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:CollectionControl}">
-          <Border Background="{TemplateBinding Background}"
-                  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid Margin="{TemplateBinding Padding}">
-              <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>
-                <ContentControl Margin="0,0,0,5"
-                                Content="{TemplateBinding TypeSelectionLabel}">
-                </ContentControl>
-                <ComboBox x:Name="PART_NewItemTypesComboBox"
-                          Grid.Row="1"
-                          Margin="0,0,0,3"
-                          HorizontalAlignment="Stretch">
-                  <ComboBox.ItemsSource>
-                    <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="ItemsSourceType" />
-                      <Binding RelativeSource="{RelativeSource TemplatedParent}"
-                               Path="NewItemTypes" />
-                    </MultiBinding>
-                  </ComboBox.ItemsSource>
-                  <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                      <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-                    </DataTemplate>
-                  </ComboBox.ItemTemplate>
-                </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}" >
-                </Button>
-                <ListBox x:Name="PART_ListBox"
-                         Grid.Row="2"
-                         Grid.ColumnSpan="2"
-                         ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                         SelectedIndex="0">
-                </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=PART_ListBox}">
-                    <Path Fill="#FF404040"
-                          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=PART_ListBox}">
-                    <Path Fill="#FF404040"
-                          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=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Delete16.png" >
-                    </Image>
-                  </Button>
-                  <Button Margin="0,7,0,0"
-                          Style="{StaticResource CollectionControlButtonStyle}"
-                          Command="Copy"
-                          CommandParameter="{Binding SelectedItem, ElementName=PART_ListBox}">
-                    <Image Stretch="None"
-                           Height="16"
-                           Width="16"
-                           Margin="1"
-                           Source="./../Images/Duplicate.png">
-                    </Image>
-                  </Button>
-                </StackPanel>
-              </Grid>
-              <Grid Column="1"
-                    Margin="20,0,0,0">
-                <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-                <ContentControl Grid.Column="1"
-                                Content="{TemplateBinding PropertiesLabel}">
-                </ContentControl>
-                <pg:PropertyGrid x:Name="PART_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}}"
-                                 EditorDefinitions="{Binding EditorDefinitions, RelativeSource={RelativeSource TemplatedParent}}"/>
-              </Grid>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                      TargetName="PART_NewItemTypesComboBox" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="PrimitiveTypeCollectionControl"
-         TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderBrush">
-      <Setter.Value>
-        <LinearGradientBrush 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>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            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}"
-                                     ContentTemplate="{TemplateBinding ContentTemplate}"
-                                     Padding="{TemplateBinding Padding}"
-                                     HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                     IsOpen="{TemplateBinding IsOpen}"
-                                     IsReadOnly="{TemplateBinding IsReadOnly}"
-                                     Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                     VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                     DropDownWidth="{TemplateBinding ActualWidth}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}" />
-
-  <Style x:Key="CollectionControlButton"
-         TargetType="{x:Type local:CollectionControlButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Padding"
-            Value="2,0,0,0" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Left" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-    <Setter Property="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="MinHeight"
-            Value="22" />
-    <Setter Property="IsTabStop"
-            Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <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,2.75,2.75,0"
-                                   RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CollectionControlButton}}"
-                                   RenderMouseOver="{TemplateBinding IsMouseOver}">
-                <Grid x:Name="arrowGlyph"
-                      IsHitTestVisible="False"
-                      Grid.Column="1"
-                      Margin="5">
-                  <Path x:Name="Arrow"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:CollectionControlButton}"
-         BasedOn="{StaticResource CollectionControlButton}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
deleted file mode 100644
index 8ad8ec1e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
+++ /dev/null
@@ -1,635 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.IO;
-using System;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_ColorShadingCanvas, Type = typeof( Canvas ) )]
-  [TemplatePart( Name = PART_ColorShadeSelector, Type = typeof( Canvas ) )]
-  [TemplatePart( Name = PART_SpectrumSlider, Type = typeof( ColorSpectrumSlider ) )]
-  [TemplatePart( Name = PART_HexadecimalTextBox, Type = typeof( TextBox ) )]
-  public class ColorCanvas : Control
-  {
-    private const string PART_ColorShadingCanvas = "PART_ColorShadingCanvas";
-    private const string PART_ColorShadeSelector = "PART_ColorShadeSelector";
-    private const string PART_SpectrumSlider = "PART_SpectrumSlider";
-    private const string PART_HexadecimalTextBox = "PART_HexadecimalTextBox";
-
-    #region Private Members
-
-    private TranslateTransform _colorShadeSelectorTransform = new TranslateTransform();
-    private Canvas _colorShadingCanvas;
-    private Canvas _colorShadeSelector;
-    private ColorSpectrumSlider _spectrumSlider;
-    private TextBox _hexadecimalTextBox;
-    private Point? _currentColorPosition;
-    private bool _surpressPropertyChanged;
-    private bool _updateSpectrumSliderValue = true;
-
-    #endregion //Private Members
-
-    #region Properties
-
-    #region SelectedColor
-
-    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color? ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedColorChanged ) );
-    public Color? SelectedColor
-    {
-      get
-      {
-        return ( Color? )GetValue( SelectedColorProperty );
-      }
-      set
-      {
-        SetValue( SelectedColorProperty, value );
-      }
-    }
-
-    private static void OnSelectedColorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnSelectedColorChanged( ( Color? )e.OldValue, ( Color? )e.NewValue );
-    }
-
-    protected virtual void OnSelectedColorChanged( Color? oldValue, Color? newValue )
-    {
-      SetHexadecimalStringProperty( GetFormatedColorString( newValue ), false );
-      UpdateRGBValues( newValue );
-      UpdateColorShadeSelectorPosition( newValue );
-
-      RoutedPropertyChangedEventArgs<Color?> args = new RoutedPropertyChangedEventArgs<Color?>( oldValue, newValue );
-      args.RoutedEvent = SelectedColorChangedEvent;
-      RaiseEvent( args );
-    }
-
-    #endregion //SelectedColor
-
-    #region RGB
-
-    #region A
-
-    public static readonly DependencyProperty AProperty = DependencyProperty.Register( "A", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )255, OnAChanged ) );
-    public byte A
-    {
-      get
-      {
-        return ( byte )GetValue( AProperty );
-      }
-      set
-      {
-        SetValue( AProperty, value );
-      }
-    }
-
-    private static void OnAChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnAChanged( ( byte )e.OldValue, ( byte )e.NewValue );
-    }
-
-    protected virtual void OnAChanged( byte oldValue, byte newValue )
-    {
-      if( !_surpressPropertyChanged )
-        UpdateSelectedColor();
-    }
-
-    #endregion //A
-
-    #region R
-
-    public static readonly DependencyProperty RProperty = DependencyProperty.Register( "R", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnRChanged ) );
-    public byte R
-    {
-      get
-      {
-        return ( byte )GetValue( RProperty );
-      }
-      set
-      {
-        SetValue( RProperty, value );
-      }
-    }
-
-    private static void OnRChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnRChanged( ( byte )e.OldValue, ( byte )e.NewValue );
-    }
-
-    protected virtual void OnRChanged( byte oldValue, byte newValue )
-    {
-      if( !_surpressPropertyChanged )
-        UpdateSelectedColor();
-    }
-
-    #endregion //R
-
-    #region G
-
-    public static readonly DependencyProperty GProperty = DependencyProperty.Register( "G", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnGChanged ) );
-    public byte G
-    {
-      get
-      {
-        return ( byte )GetValue( GProperty );
-      }
-      set
-      {
-        SetValue( GProperty, value );
-      }
-    }
-
-    private static void OnGChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnGChanged( ( byte )e.OldValue, ( byte )e.NewValue );
-    }
-
-    protected virtual void OnGChanged( byte oldValue, byte newValue )
-    {
-      if( !_surpressPropertyChanged )
-        UpdateSelectedColor();
-    }
-
-    #endregion //G
-
-    #region B
-
-    public static readonly DependencyProperty BProperty = DependencyProperty.Register( "B", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnBChanged ) );
-    public byte B
-    {
-      get
-      {
-        return ( byte )GetValue( BProperty );
-      }
-      set
-      {
-        SetValue( BProperty, value );
-      }
-    }
-
-    private static void OnBChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnBChanged( ( byte )e.OldValue, ( byte )e.NewValue );
-    }
-
-    protected virtual void OnBChanged( byte oldValue, byte newValue )
-    {
-      if( !_surpressPropertyChanged )
-        UpdateSelectedColor();
-    }
-
-    #endregion //B
-
-    #endregion //RGB
-
-    #region HexadecimalString
-
-    public static readonly DependencyProperty HexadecimalStringProperty = DependencyProperty.Register( "HexadecimalString", typeof( string ), typeof( ColorCanvas ), new UIPropertyMetadata( "", OnHexadecimalStringChanged, OnCoerceHexadecimalString ) );
-    public string HexadecimalString
-    {
-      get
-      {
-        return ( string )GetValue( HexadecimalStringProperty );
-      }
-      set
-      {
-        SetValue( HexadecimalStringProperty, value );
-      }
-    }
-
-    private static void OnHexadecimalStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnHexadecimalStringChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnHexadecimalStringChanged( string oldValue, string newValue )
-    {
-      string newColorString = GetFormatedColorString( newValue );
-      string currentColorString = GetFormatedColorString( SelectedColor );
-      if( !currentColorString.Equals( newColorString ) )
-      {
-        Color? col = null;
-        if( !string.IsNullOrEmpty( newColorString ) )
-        {
-          col = ( Color )ColorConverter.ConvertFromString( newColorString );      
-        }
-        UpdateSelectedColor( col );
-      }
-
-      SetHexadecimalTextBoxTextProperty( newValue );
-    }
-
-    private static object OnCoerceHexadecimalString( DependencyObject d, object basevalue )
-    {
-      var colorCanvas = ( ColorCanvas )d;
-      if( colorCanvas == null )
-        return basevalue;
-
-      return colorCanvas.OnCoerceHexadecimalString( basevalue );
-    }
-
-    private object OnCoerceHexadecimalString( object newValue )
-    {
-      var value = newValue as string;
-      string retValue = value;
-
-      try
-      {
-        if( !string.IsNullOrEmpty( retValue ) )
-        {
-          int outValue;
-          // User has entered an hexadecimal value (without the "#" character)... add it.
-          if( Int32.TryParse( retValue, System.Globalization.NumberStyles.HexNumber, null, out outValue ) )
-          {
-            retValue = "#" + retValue;
-          }
-          ColorConverter.ConvertFromString( retValue );
-        }
-      }
-      catch
-      {
-        //When HexadecimalString is changed via Code-Behind and hexadecimal format is bad, throw.
-        throw new InvalidDataException( "Color provided is not in the correct format." );
-      }
-
-      return retValue;
-    }
-
-    #endregion //HexadecimalString
-
-    #region UsingAlphaChannel
-
-    public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
-    public bool UsingAlphaChannel
-    {
-      get
-      {
-        return ( bool )GetValue( UsingAlphaChannelProperty );
-      }
-      set
-      {
-        SetValue( UsingAlphaChannelProperty, value );
-      }
-    }
-
-    private static void OnUsingAlphaChannelPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ColorCanvas colorCanvas = o as ColorCanvas;
-      if( colorCanvas != null )
-        colorCanvas.OnUsingAlphaChannelChanged();
-    }
-
-    protected virtual void OnUsingAlphaChannelChanged()
-    {
-      SetHexadecimalStringProperty( GetFormatedColorString( SelectedColor ), false );
-    }
-
-    #endregion //UsingAlphaChannel
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static ColorCanvas()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorCanvas ), new FrameworkPropertyMetadata( typeof( ColorCanvas ) ) );
-    }
-
-    public ColorCanvas()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _colorShadingCanvas != null )
-      {
-        _colorShadingCanvas.MouseLeftButtonDown -= ColorShadingCanvas_MouseLeftButtonDown;
-        _colorShadingCanvas.MouseLeftButtonUp -= ColorShadingCanvas_MouseLeftButtonUp;
-        _colorShadingCanvas.MouseMove -= ColorShadingCanvas_MouseMove;
-        _colorShadingCanvas.SizeChanged -= ColorShadingCanvas_SizeChanged;
-      }
-
-      _colorShadingCanvas = GetTemplateChild( PART_ColorShadingCanvas ) as Canvas;
-
-      if( _colorShadingCanvas != null )
-      {
-        _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown;
-        _colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp;
-        _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove;
-        _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged;
-      }
-
-      _colorShadeSelector = GetTemplateChild( PART_ColorShadeSelector ) as Canvas;
-
-      if( _colorShadeSelector != null )
-        _colorShadeSelector.RenderTransform = _colorShadeSelectorTransform;
-
-      if( _spectrumSlider != null )
-        _spectrumSlider.ValueChanged -= SpectrumSlider_ValueChanged;
-
-      _spectrumSlider = GetTemplateChild( PART_SpectrumSlider ) as ColorSpectrumSlider;
-
-      if( _spectrumSlider != null )
-        _spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged;
-
-      if( _hexadecimalTextBox != null )
-        _hexadecimalTextBox.LostFocus -= new RoutedEventHandler( HexadecimalTextBox_LostFocus );
-
-      _hexadecimalTextBox = GetTemplateChild( PART_HexadecimalTextBox ) as TextBox;
-
-      if( _hexadecimalTextBox != null )
-        _hexadecimalTextBox.LostFocus += new RoutedEventHandler( HexadecimalTextBox_LostFocus );
-
-      UpdateRGBValues( SelectedColor );
-      UpdateColorShadeSelectorPosition( SelectedColor );
-
-      // When changing theme, HexadecimalString needs to be set since it is not binded.
-      SetHexadecimalTextBoxTextProperty( GetFormatedColorString( SelectedColor ) );
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      base.OnKeyDown( e );
-
-      //hitting enter on textbox will update Hexadecimal string
-      if( e.Key == Key.Enter && e.OriginalSource is TextBox )
-      {
-        TextBox textBox = ( TextBox )e.OriginalSource;
-        if( textBox.Name == PART_HexadecimalTextBox )
-          SetHexadecimalStringProperty( textBox.Text, true );
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    void ColorShadingCanvas_MouseLeftButtonDown( object sender, MouseButtonEventArgs e )
-    {
-      if( _colorShadingCanvas != null )
-      {
-        Point p = e.GetPosition( _colorShadingCanvas );
-        UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
-        _colorShadingCanvas.CaptureMouse();
-        //Prevent from closing ColorCanvas after mouseDown in ListView
-        e.Handled = true;
-      }
-    }
-
-    void ColorShadingCanvas_MouseLeftButtonUp( object sender, MouseButtonEventArgs e )
-    {
-      if( _colorShadingCanvas != null )
-      {
-        _colorShadingCanvas.ReleaseMouseCapture();
-      }
-    }
-
-    void ColorShadingCanvas_MouseMove( object sender, MouseEventArgs e )
-    {
-      if( _colorShadingCanvas != null )
-      {
-        if( e.LeftButton == MouseButtonState.Pressed )
-        {
-          Point p = e.GetPosition( _colorShadingCanvas );
-          UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
-          Mouse.Synchronize();
-        }
-      }
-    }
-
-    void ColorShadingCanvas_SizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      if( _currentColorPosition != null )
-      {
-        Point _newPoint = new Point
-        {
-          X = ( ( Point )_currentColorPosition ).X * e.NewSize.Width,
-          Y = ( ( Point )_currentColorPosition ).Y * e.NewSize.Height
-        };
-
-        UpdateColorShadeSelectorPositionAndCalculateColor( _newPoint, false );
-      }
-    }
-
-    void SpectrumSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
-    {
-      if( (_currentColorPosition != null) && (this.SelectedColor != null) )
-      {
-        CalculateColor( ( Point )_currentColorPosition );
-      }
-    }
-
-    void HexadecimalTextBox_LostFocus( object sender, RoutedEventArgs e )
-    {
-      TextBox textbox = sender as TextBox;
-      SetHexadecimalStringProperty( textbox.Text, true );
-    }
-
-    #endregion //Event Handlers
-
-    #region Events
-
-    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color?> ), typeof( ColorCanvas ) );
-    public event RoutedPropertyChangedEventHandler<Color?> SelectedColorChanged
-    {
-      add
-      {
-        AddHandler( SelectedColorChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SelectedColorChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Methods
-
-    private void UpdateSelectedColor()
-    {
-      SelectedColor = Color.FromArgb( A, R, G, B );
-    }
-
-    private void UpdateSelectedColor( Color? color )
-    {
-      SelectedColor = ( ( color != null ) && color.HasValue ) 
-                      ? (Color?)Color.FromArgb( color.Value.A, color.Value.R, color.Value.G, color.Value.B )
-                      : null;
-    }
-
-    private void UpdateRGBValues( Color? color )
-    {
-      if( ( color == null ) || !color.HasValue )
-        return;
-
-      _surpressPropertyChanged = true;
-
-      A = color.Value.A;
-      R = color.Value.R;
-      G = color.Value.G;
-      B = color.Value.B;
-
-      _surpressPropertyChanged = false;
-    }
-
-    private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool calculateColor )
-    {
-      if( (_colorShadingCanvas == null) || ( _colorShadeSelector == null) )
-        return;
-
-        if( p.Y < 0 )
-        p.Y = 0;
-
-      if( p.X < 0 )
-        p.X = 0;
-
-      if( p.X > _colorShadingCanvas.ActualWidth )
-        p.X = _colorShadingCanvas.ActualWidth;
-
-      if( p.Y > _colorShadingCanvas.ActualHeight )
-        p.Y = _colorShadingCanvas.ActualHeight;
-
-      _colorShadeSelectorTransform.X = p.X - ( _colorShadeSelector.Width / 2 );
-      _colorShadeSelectorTransform.Y = p.Y - ( _colorShadeSelector.Height / 2 );
-
-      p.X = p.X / _colorShadingCanvas.ActualWidth;
-      p.Y = p.Y / _colorShadingCanvas.ActualHeight;
-
-      _currentColorPosition = p;
-
-      if( calculateColor )
-        CalculateColor( p );
-    }
-
-    private void UpdateColorShadeSelectorPosition( Color? color )
-    {
-      if( (_spectrumSlider == null) || (_colorShadingCanvas == null) || (color == null) || !color.HasValue)
-        return;
-
-      _currentColorPosition = null;
-
-      var hsv = ColorUtilities.ConvertRgbToHsv( color.Value.R, color.Value.G, color.Value.B );
-
-      if( _updateSpectrumSliderValue )
-      {
-        _spectrumSlider.Value = 360 - hsv.H;
-      }
-
-      Point p = new Point( hsv.S, 1 - hsv.V );
-
-      _currentColorPosition = p;
-
-      _colorShadeSelectorTransform.X = ( p.X * _colorShadingCanvas.Width ) - 5;
-      _colorShadeSelectorTransform.Y = ( p.Y * _colorShadingCanvas.Height ) - 5;
-    }
-
-    private void CalculateColor( Point p )
-    {
-      if( _spectrumSlider == null )
-        return;
-
-      HsvColor hsv = new HsvColor( 360 - _spectrumSlider.Value, 1, 1 )
-      {
-        S = p.X,
-        V = 1 - p.Y
-      };
-      var currentColor = ColorUtilities.ConvertHsvToRgb( hsv.H, hsv.S, hsv.V );
-      currentColor.A = A;
-      _updateSpectrumSliderValue = false;
-      SelectedColor = currentColor;
-      _updateSpectrumSliderValue = true;
-      SetHexadecimalStringProperty( GetFormatedColorString( SelectedColor ), false );
-    }
-
-    private string GetFormatedColorString( Color? colorToFormat )
-    {
-      if( ( colorToFormat == null ) || !colorToFormat.HasValue )
-        return string.Empty;
-      return ColorUtilities.FormatColorString( colorToFormat.ToString(), UsingAlphaChannel );
-    }
-
-    private string GetFormatedColorString( string stringToFormat )
-    {
-      return ColorUtilities.FormatColorString( stringToFormat, UsingAlphaChannel );
-    }
-
-    private void SetHexadecimalStringProperty( string newValue, bool modifyFromUI )
-    {
-      if( modifyFromUI )
-      {
-        try
-        {
-          if( !string.IsNullOrEmpty( newValue ) )
-          {
-            int outValue;
-            // User has entered an hexadecimal value (without the "#" character)... add it.
-            if( Int32.TryParse( newValue, System.Globalization.NumberStyles.HexNumber, null, out outValue ) )
-            {
-              newValue = "#" + newValue;
-            }
-            ColorConverter.ConvertFromString( newValue );
-          }
-          HexadecimalString = newValue;
-        }
-        catch
-        {
-          //When HexadecimalString is changed via UI and hexadecimal format is bad, keep the previous HexadecimalString.
-          SetHexadecimalTextBoxTextProperty( HexadecimalString );
-        }
-      }
-      else
-      {
-        //When HexadecimalString is changed via Code-Behind, hexadecimal format will be evaluated in OnCoerceHexadecimalString()
-        HexadecimalString = newValue;
-      }
-    }
-
-    private void SetHexadecimalTextBoxTextProperty( string newValue )
-    {
-      if( _hexadecimalTextBox != null )
-        _hexadecimalTextBox.Text = newValue;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
deleted file mode 100644
index 8d61bcbb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_SpectrumDisplay, Type = typeof( Rectangle ) )]
-  public class ColorSpectrumSlider : Slider
-  {
-    private const string PART_SpectrumDisplay = "PART_SpectrumDisplay";
-
-    #region Private Members
-
-    private Rectangle _spectrumDisplay;
-    private LinearGradientBrush _pickerBrush;
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    static ColorSpectrumSlider()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorSpectrumSlider ), new FrameworkPropertyMetadata( typeof( ColorSpectrumSlider ) ) );
-    }
-
-    #endregion //Constructors
-
-    #region Dependency Properties
-
-    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorSpectrumSlider ), new PropertyMetadata( System.Windows.Media.Colors.Transparent ) );
-    public Color SelectedColor
-    {
-      get
-      {
-        return ( Color )GetValue( SelectedColorProperty );
-      }
-      set
-      {
-        SetValue( SelectedColorProperty, value );
-      }
-    }
-
-    #endregion //Dependency Properties
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      _spectrumDisplay = ( Rectangle )GetTemplateChild( PART_SpectrumDisplay );
-      CreateSpectrum();
-      OnValueChanged( Double.NaN, Value );
-    }
-
-    protected override void OnValueChanged( double oldValue, double newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-
-      Color color = ColorUtilities.ConvertHsvToRgb( 360 - newValue, 1, 1 );
-      SelectedColor = color;
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Methods
-
-    private void CreateSpectrum()
-    {
-      _pickerBrush = new LinearGradientBrush();
-      _pickerBrush.StartPoint = new Point( 0.5, 0 );
-      _pickerBrush.EndPoint = new Point( 0.5, 1 );
-      _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation;
-
-      var colorsList = ColorUtilities.GenerateHsvSpectrum();
-
-      double stopIncrement = ( double )1 / (colorsList.Count - 1);
-
-      int i;
-      for( i = 0; i < colorsList.Count; i++ )
-      {
-        _pickerBrush.GradientStops.Add( new GradientStop( colorsList[ i ], i * stopIncrement ) );
-      }
-
-      _pickerBrush.GradientStops[ i - 1 ].Offset = 1.0;
-      if( _spectrumDisplay != null )
-      {
-        _spectrumDisplay.Fill = _pickerBrush;
-      }
-    }
-
-    #endregion //Methods
-  }
-}
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
deleted file mode 100644
index 4047e312..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,475 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Margin="0,8,0,0">
-        <Border x:Name="PART_TrackBackground"
-                Width="15">
-          <Rectangle x:Name="PART_SpectrumDisplay"
-                     Stretch="Fill"
-                     VerticalAlignment="Stretch" />
-        </Border>
-      </Border>
-
-      <Track Name="PART_Track">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
-                        Command="Slider.DecreaseLarge">
-          </RepeatButton>
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}"
-                        Command="Slider.IncreaseLarge">
-          </RepeatButton>
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb Style="{StaticResource VerticalSlideThumbStyle}">
-          </Thumb>
-        </Track.Thumb>
-      </Track>
-    </Grid>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:ColorSpectrumSlider}">
-    <Setter Property="BorderBrush"
-            Value="DarkGray" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Orientation"
-            Value="Vertical" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-    <Setter Property="Minimum"
-            Value="0" />
-    <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 x:Name="SelectedColorBorder"
-                      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}">
-              </TextBox>
-            </Grid>
-          </Border>
-
-          <Border Grid.Column="1"
-                  Grid.RowSpan="2"
-                  Margin="4,-8,0,0"
-                  ClipToBounds="False">
-            <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider"
-                                       VerticalAlignment="Stretch">
-            </local:ColorSpectrumSlider>
-          </Border>
-        </Grid>
-
-        <Border x:Name="RGBBorder"
-                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="44" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Grid.Row="0"
-                       Grid.Column="0"
-                       Text="R"
-                       VerticalAlignment="Center">
-            </TextBlock>
-            <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">
-            </Slider>
-            <local:ByteUpDown Grid.Row="0"
-                              Grid.Column="2"
-                              Value="{Binding Value, ElementName=PART_RSlider}"
-                              VerticalAlignment="Center"
-                              Background="Transparent">
-            </local:ByteUpDown>
-
-            <TextBlock Grid.Row="1"
-                       Grid.Column="0"
-                       Text="G"
-                       VerticalAlignment="Center">
-            </TextBlock>
-            <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">
-            </Slider>
-            <local:ByteUpDown Grid.Row="1"
-                              Grid.Column="2"
-                              Value="{Binding Value, ElementName=PART_GSlider}"
-                              VerticalAlignment="Center"
-                              Background="Transparent">
-            </local:ByteUpDown>
-
-            <TextBlock Grid.Row="2"
-                       Grid.Column="0"
-                       Text="B"
-                       VerticalAlignment="Center">
-            </TextBlock>
-            <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">
-            </Slider>
-            <local:ByteUpDown Grid.Row="2"
-                              Grid.Column="3"
-                              Value="{Binding Value, ElementName=PART_BSlider}"
-                              VerticalAlignment="Center"
-                              Background="Transparent">
-            </local:ByteUpDown>
-
-            <TextBlock Grid.Row="3"
-                       Grid.Column="0"
-                       Text="A"
-                       VerticalAlignment="Center"
-                       Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-            </TextBlock>
-            <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}}">
-            </Slider>
-            <local:ByteUpDown Grid.Row="3"
-                              Grid.Column="3"
-                              Value="{Binding Value, ElementName=PART_OpacitySlider}"
-                              VerticalAlignment="Center"
-                              Background="Transparent"
-                              Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-            </local:ByteUpDown>
-          </Grid>
-        </Border>
-      </Grid>
-    </Border>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-      </Trigger>
-      <Trigger Property="SelectedColor"
-               Value="{x:Null}">
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="PART_ColorShadeSelector" />
-        <Setter Property="Background"
-                Value="Transparent"
-                TargetName="SelectedColorBorder" />
-        <Setter Property="IsEnabled"
-                Value="False"
-                TargetName="RGBBorder" />
-        <Setter Property="TextElement.Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                TargetName="RGBBorder" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </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
deleted file mode 100644
index 2c9d81f4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ /dev/null
@@ -1,616 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Common.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush"
-                       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="ColorCanvasBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground"
-                   Color="#FFE7EAEA" />
-
-  <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#FFAEB1AF"
-                  Offset="0.1" />
-    <GradientStop Color="White"
-                  Offset=".9" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="ThumbStroke"
-                       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="ThumbFill"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFfefefe" />
-        <GradientStop Offset="0.5"
-                      Color="#FFeff1f2" />
-        <GradientStop Offset="1"
-                      Color="#FFd0d6db" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="ThumbMouseOver"
-                   Color="#FFE5F2F6" />
-
-  <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>
-
-  <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>
-
-  <Style x:Key="CustomThumbForSlider"
-         TargetType="{x:Type Thumb}">
-    <Setter Property="OverridesDefaultStyle"
-            Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Thumb}">
-          <Rectangle x:Name="_thumb"
-                     Fill="{StaticResource ThumbFill}"
-                     Stroke="{StaticResource ThumbStroke}"
-                     Height="14"
-                     Width="8"
-                     RadiusX="1"
-                     RadiusY="1" />
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="_thumb"
-                      Property="Rectangle.Fill"
-                      Value="{StaticResource ThumbMouseOver}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <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">
-      <Setter.Value>
-        <ControlTemplate 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>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ColorCanvasSliderStyle"
-         TargetType="{x:Type Slider}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type Slider}">
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Background="{TemplateBinding Background}"
-                  SnapsToDevicePixels="true">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto"
-                               MinHeight="{TemplateBinding MinHeight}" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <TickBar x:Name="TopTick"
-                       Fill="{TemplateBinding Foreground}"
-                       Height="4"
-                       Placement="Top"
-                       Grid.Row="0"
-                       Visibility="Collapsed" />
-              <TickBar x:Name="BottomTick"
-                       Fill="{TemplateBinding Foreground}"
-                       Height="4"
-                       Placement="Bottom"
-                       Grid.Row="2"
-                       Visibility="Collapsed" />
-              <Border x:Name="TrackBackground"
-                      BorderBrush="{StaticResource HorizontalSliderTrackNormalBorder}"
-                      BorderThickness="1"
-                      Background="{StaticResource HorizontalSliderTrackNormalBackground}"
-                      CornerRadius="1"
-                      Height="4.0"
-                      Margin="5,0"
-                      Grid.Row="1"
-                      VerticalAlignment="center">
-                <Canvas Margin="-6,-1">
-                  <Rectangle x:Name="PART_SelectionRange"
-                             Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"
-                             Height="4.0"
-                             Stroke="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-                             StrokeThickness="1.0"
-                             Visibility="Hidden" />
-                </Canvas>
-              </Border>
-              <Track x:Name="PART_Track"
-                     Grid.Row="1">
-                <Track.DecreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.DecreaseLarge}"
-                                Style="{StaticResource SliderRepeatButtonStyle}" >
-                  </RepeatButton>
-                </Track.DecreaseRepeatButton>
-                <Track.IncreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.IncreaseLarge}"
-                                Style="{StaticResource SliderRepeatButtonStyle}" >
-                  </RepeatButton>
-                </Track.IncreaseRepeatButton>
-                <Track.Thumb>
-                  <Thumb x:Name="Thumb"
-                         Style="{StaticResource CustomThumbForSlider}" >
-                  </Thumb>
-                </Track.Thumb>
-              </Track>
-            </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:ColorCanvas}">
-    <Setter Property="Background"
-            Value="{StaticResource ColorCanvasBackgroundBrush}" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource ColorPickerDarkBorderBrush}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate 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 x:Name="SelectedColorBorder"
-                            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}" >
-                    </TextBox>
-                  </Grid>
-                </Border>
-
-                <Border Grid.Column="1"
-                        Grid.RowSpan="2"
-                        Margin="4,-8,0,0"
-                        ClipToBounds="False">
-                  <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider"
-                                             VerticalAlignment="Stretch" >
-                  </local:ColorSpectrumSlider>
-                </Border>
-              </Grid>
-
-              <Border x:Name="RGBBorder"
-                      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="44" />
-                  </Grid.ColumnDefinitions>
-
-                  <TextBlock Grid.Row="0"
-                             Grid.Column="0"
-                             Text="R"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                  <Slider x:Name="PART_RSlider"
-                          Maximum="255"
-                          SmallChange="1"
-                          LargeChange="10"
-                          TickFrequency="1"
-                          Grid.Row="0"
-                          Grid.Column="1"
-                          Margin="4,6,4,6"
-                          Style="{StaticResource ColorCanvasSliderStyle}"
-                          Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                          VerticalAlignment="Center" >
-                  </Slider>
-                  <local:ByteUpDown Grid.Row="0"
-                                    Grid.Column="2"
-                                    Value="{Binding Value, ElementName=PART_RSlider}"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent" >
-                  </local:ByteUpDown>
-
-                  <TextBlock Grid.Row="1"
-                             Grid.Column="0"
-                             Text="G"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                  <Slider x:Name="PART_GSlider"
-                          Maximum="255"
-                          SmallChange="1"
-                          LargeChange="10"
-                          TickFrequency="1"
-                          Grid.Row="1"
-                          Grid.Column="1"
-                          Margin="4,6,4,6"
-                          Style="{StaticResource ColorCanvasSliderStyle}"
-                          Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                          VerticalAlignment="Center" >
-                  </Slider>
-                  <local:ByteUpDown Grid.Row="1"
-                                    Grid.Column="2"
-                                    Value="{Binding Value, ElementName=PART_GSlider}"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent" >
-                  </local:ByteUpDown>
-
-                  <TextBlock Grid.Row="2"
-                             Grid.Column="0"
-                             Text="B"
-                             VerticalAlignment="Center" >
-                  </TextBlock>
-                  <Slider x:Name="PART_BSlider"
-                          Maximum="255"
-                          SmallChange="1"
-                          LargeChange="10"
-                          TickFrequency="1"
-                          Grid.Row="2"
-                          Grid.Column="1"
-                          Margin="4,6,4,6"
-                          Style="{StaticResource ColorCanvasSliderStyle}"
-                          Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                          VerticalAlignment="Center" >
-                  </Slider>
-                  <local:ByteUpDown Grid.Row="2"
-                                    Grid.Column="3"
-                                    Value="{Binding Value, ElementName=PART_BSlider}"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent" >
-                  </local:ByteUpDown>
-
-                  <TextBlock Grid.Row="3"
-                             Grid.Column="0"
-                             Text="A"
-                             VerticalAlignment="Center"
-                             Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                  </TextBlock>
-                  <Slider x:Name="PART_OpacitySlider"
-                          Grid.Row="3"
-                          Grid.Column="1"
-                          Maximum="255"
-                          SmallChange="1"
-                          LargeChange="10"
-                          Margin="4,6,4,6"
-                          Style="{StaticResource ColorCanvasSliderStyle}"
-                          Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                          VerticalAlignment="Center"
-                          Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                  </Slider>
-                  <local:ByteUpDown Grid.Row="3"
-                                    Grid.Column="3"
-                                    Value="{Binding Value, ElementName=PART_OpacitySlider}"
-                                    VerticalAlignment="Center"
-                                    Background="Transparent"
-                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                  </local:ByteUpDown>
-                </Grid>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="SelectedColor"
-                     Value="{x:Null}">
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="PART_ColorShadeSelector" />
-              <Setter Property="Background"
-                      Value="Transparent"
-                      TargetName="SelectedColorBorder" />
-              <Setter Property="IsEnabled"
-                      Value="False"
-                      TargetName="RGBBorder" />
-              <Setter Property="TextElement.Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
-                      TargetName="RGBBorder" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:ColorSpectrumSlider}">
-    <Setter Property="BorderBrush"
-            Value="DarkGray" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="Orientation"
-            Value="Vertical" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-    <Setter Property="Minimum"
-            Value="0" />
-    <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">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
-          <Grid>
-            <Border BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Margin="0,8,0,0">
-              <Border x:Name="PART_TrackBackground"
-                      Width="15">
-                <Rectangle x:Name="PART_SpectrumDisplay"
-                           Stretch="Fill"
-                           VerticalAlignment="Stretch" />
-              </Border>
-            </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>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
deleted file mode 100644
index 883ef47e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ColorItem
-  {
-    public Color? Color
-    {
-      get;
-      set;
-    }
-    public string Name
-    {
-      get;
-      set;
-    }
-
-    public ColorItem( Color? color, string name )
-    {
-      Color = color;
-      Name = name;
-    }
-
-    public override bool Equals(object obj)
-    {
-      var ci = obj as ColorItem;
-      if (ci == null)
-          return false;
-      return ( ci.Color.Equals( Color ) && ci.Name.Equals( Name ) );
-    }
-
-    public override int GetHashCode()
-    {
-      return this.Color.GetHashCode() ^ this.Name.GetHashCode();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
deleted file mode 100644
index 23c0a469..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
+++ /dev/null
@@ -1,806 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum ColorMode
-  {
-    ColorPalette,
-    ColorCanvas
-  }
-
-  public enum ColorSortingMode
-  {
-    Alphabetical,
-    HueSaturationBrightness
-  }
-
-  [TemplatePart( Name = PART_AvailableColors, Type = typeof( ListBox ) )]
-  [TemplatePart( Name = PART_StandardColors, Type = typeof( ListBox ) )]
-  [TemplatePart( Name = PART_RecentColors, Type = typeof( ListBox ) )]
-  [TemplatePart( Name = PART_ColorPickerToggleButton, Type = typeof( ToggleButton ) )]
-  [TemplatePart( Name = PART_ColorPickerPalettePopup, Type = typeof( Popup ) )]
-  public class ColorPicker : Control
-  {
-    private const string PART_AvailableColors = "PART_AvailableColors";
-    private const string PART_StandardColors = "PART_StandardColors";
-    private const string PART_RecentColors = "PART_RecentColors";
-    private const string PART_ColorPickerToggleButton = "PART_ColorPickerToggleButton";
-    private const string PART_ColorPickerPalettePopup = "PART_ColorPickerPalettePopup";
-
-    #region Members
-
-    private ListBox _availableColors;
-    private ListBox _standardColors;
-    private ListBox _recentColors;
-    private ToggleButton _toggleButton;
-    private Popup _popup;
-    private Color? _initialColor;
-    private bool _selectionChanged;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region AdvancedButtonHeader
-
-    public static readonly DependencyProperty AdvancedButtonHeaderProperty = DependencyProperty.Register( "AdvancedButtonHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Advanced" ) );
-    public string AdvancedButtonHeader
-    {
-      get
-      {
-        return ( string )GetValue( AdvancedButtonHeaderProperty );
-      }
-      set
-      {
-        SetValue( AdvancedButtonHeaderProperty, value );
-      }
-    }
-
-    #endregion //AdvancedButtonHeader
-
-    #region AvailableColors
-
-    public static readonly DependencyProperty AvailableColorsProperty = DependencyProperty.Register( "AvailableColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateAvailableColors() ) );
-    public ObservableCollection<ColorItem> AvailableColors
-    {
-      get
-      {
-        return ( ObservableCollection<ColorItem> )GetValue( AvailableColorsProperty );
-      }
-      set
-      {
-        SetValue( AvailableColorsProperty, value );
-      }
-    }
-
-    #endregion //AvailableColors
-
-    #region AvailableColorsSortingMode
-
-    public static readonly DependencyProperty AvailableColorsSortingModeProperty = DependencyProperty.Register( "AvailableColorsSortingMode", typeof( ColorSortingMode ), typeof( ColorPicker ), new UIPropertyMetadata( ColorSortingMode.Alphabetical, OnAvailableColorsSortingModeChanged ) );
-    public ColorSortingMode AvailableColorsSortingMode
-    {
-      get
-      {
-        return ( ColorSortingMode )GetValue( AvailableColorsSortingModeProperty );
-      }
-      set
-      {
-        SetValue( AvailableColorsSortingModeProperty, value );
-      }
-    }
-
-    private static void OnAvailableColorsSortingModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ColorPicker colorPicker = ( ColorPicker )d;
-      if( colorPicker != null )
-        colorPicker.OnAvailableColorsSortingModeChanged( ( ColorSortingMode )e.OldValue, ( ColorSortingMode )e.NewValue );
-    }
-
-    private void OnAvailableColorsSortingModeChanged( ColorSortingMode oldValue, ColorSortingMode newValue )
-    {
-      ListCollectionView lcv = ( ListCollectionView )( CollectionViewSource.GetDefaultView( this.AvailableColors ) );
-      if( lcv != null )
-      {
-        lcv.CustomSort = ( AvailableColorsSortingMode == ColorSortingMode.HueSaturationBrightness )
-                          ? new ColorSorter()
-                          : null;
-      }
-    }
-
-    #endregion //AvailableColorsSortingMode
-
-    #region AvailableColorsHeader
-
-    public static readonly DependencyProperty AvailableColorsHeaderProperty = DependencyProperty.Register( "AvailableColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Available Colors" ) );
-    public string AvailableColorsHeader
-    {
-      get
-      {
-        return ( string )GetValue( AvailableColorsHeaderProperty );
-      }
-      set
-      {
-        SetValue( AvailableColorsHeaderProperty, value );
-      }
-    }
-
-    #endregion //AvailableColorsHeader
-
-    #region ButtonStyle
-
-    public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register( "ButtonStyle", typeof( Style ), typeof( ColorPicker ) );
-    public Style ButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( ButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( ButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //ButtonStyle
-
-    #region DisplayColorAndName
-
-    public static readonly DependencyProperty DisplayColorAndNameProperty = DependencyProperty.Register( "DisplayColorAndName", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
-    public bool DisplayColorAndName
-    {
-      get
-      {
-        return ( bool )GetValue( DisplayColorAndNameProperty );
-      }
-      set
-      {
-        SetValue( DisplayColorAndNameProperty, value );
-      }
-    }
-
-    #endregion //DisplayColorAndName
-
-    #region DisplayColorTooltip
-
-    public static readonly DependencyProperty DisplayColorTooltipProperty = DependencyProperty.Register( "DisplayColorTooltip", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool DisplayColorTooltip
-    {
-      get
-      {
-        return ( bool )GetValue( DisplayColorTooltipProperty );
-      }
-      set
-      {
-        SetValue( DisplayColorTooltipProperty, value );
-      }
-    }
-
-    #endregion //DisplayColorTooltip
-
-    #region ColorMode
-
-    public static readonly DependencyProperty ColorModeProperty = DependencyProperty.Register( "ColorMode", typeof( ColorMode ), typeof( ColorPicker ), new UIPropertyMetadata( ColorMode.ColorPalette ) );
-    public ColorMode ColorMode
-    {
-      get
-      {
-        return ( ColorMode )GetValue( ColorModeProperty );
-      }
-      set
-      {
-        SetValue( ColorModeProperty, value );
-      }
-    }
-
-    #endregion //ColorMode
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ColorPicker colorPicker = (ColorPicker)d;
-      if( colorPicker != null )
-        colorPicker.OnIsOpenChanged( (bool)e.OldValue, (bool)e.NewValue );
-    }
-
-    private void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-      {
-        _initialColor = this.SelectedColor;
-      }
-      RoutedEventArgs args = new RoutedEventArgs( newValue ? OpenedEvent : ClosedEvent, this );
-      this.RaiseEvent( args );
-    }
-
-    #endregion //IsOpen
-
-    #region MaxDropDownWidth
-
-    public static readonly DependencyProperty MaxDropDownWidthProperty = DependencyProperty.Register( "MaxDropDownWidth", typeof( double )
-      , typeof( ColorPicker ), new UIPropertyMetadata( 214d ) );
-    public double MaxDropDownWidth
-    {
-      get
-      {
-        return ( double )GetValue( MaxDropDownWidthProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownWidthProperty, value );
-      }
-    }
-
-    private static void OnMaxDropDownWidthChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var colorPicker = o as ColorPicker;
-      if( colorPicker != null )
-        colorPicker.OnMaxDropDownWidthChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnMaxDropDownWidthChanged( double oldValue, double newValue )
-    {
-
-    }
-
-    #endregion
-
-    #region RecentColors
-
-    public static readonly DependencyProperty RecentColorsProperty = DependencyProperty.Register( "RecentColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( null ) );
-    public ObservableCollection<ColorItem> RecentColors
-    {
-      get
-      {
-        return ( ObservableCollection<ColorItem> )GetValue( RecentColorsProperty );
-      }
-      set
-      {
-        SetValue( RecentColorsProperty, value );
-      }
-    }
-
-    #endregion //RecentColors
-
-    #region RecentColorsHeader
-
-    public static readonly DependencyProperty RecentColorsHeaderProperty = DependencyProperty.Register( "RecentColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Recent Colors" ) );
-    public string RecentColorsHeader
-    {
-      get
-      {
-        return ( string )GetValue( RecentColorsHeaderProperty );
-      }
-      set
-      {
-        SetValue( RecentColorsHeaderProperty, value );
-      }
-    }
-
-    #endregion //RecentColorsHeader
-
-    #region SelectedColor
-
-    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color? ), typeof( ColorPicker ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnSelectedColorPropertyChanged ) ) );
-    public Color? SelectedColor
-    {
-      get
-      {
-        return ( Color? )GetValue( SelectedColorProperty );
-      }
-      set
-      {
-        SetValue( SelectedColorProperty, value );
-      }
-    }
-
-    private static void OnSelectedColorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ColorPicker colorPicker = ( ColorPicker )d;
-      if( colorPicker != null )
-        colorPicker.OnSelectedColorChanged( ( Color? )e.OldValue, ( Color? )e.NewValue );
-    }
-
-    private void OnSelectedColorChanged( Color? oldValue, Color? newValue )
-    {
-      SelectedColorText = GetFormatedColorString( newValue );
-
-      RoutedPropertyChangedEventArgs<Color?> args = new RoutedPropertyChangedEventArgs<Color?>( oldValue, newValue );
-      args.RoutedEvent = ColorPicker.SelectedColorChangedEvent;
-      RaiseEvent( args );
-    }
-
-    #endregion //SelectedColor
-
-    #region SelectedColorText
-
-    public static readonly DependencyProperty SelectedColorTextProperty = DependencyProperty.Register( "SelectedColorText", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "" ) );
-    public string SelectedColorText
-    {
-      get
-      {
-        return ( string )GetValue( SelectedColorTextProperty );
-      }
-      protected set
-      {
-        SetValue( SelectedColorTextProperty, value );
-      }
-    }
-
-    #endregion //SelectedColorText
-
-    #region ShowTabHeaders
-
-    public static readonly DependencyProperty ShowTabHeadersProperty = DependencyProperty.Register( "ShowTabHeaders", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool ShowTabHeaders
-    {
-      get
-      {
-        return ( bool )GetValue( ShowTabHeadersProperty );
-      }
-      set
-      {
-        SetValue( ShowTabHeadersProperty, value );
-      }
-    }
-
-    #endregion //ShowTabHeaders
-
-    #region ShowAvailableColors
-
-    public static readonly DependencyProperty ShowAvailableColorsProperty = DependencyProperty.Register( "ShowAvailableColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool ShowAvailableColors
-    {
-      get
-      {
-        return ( bool )GetValue( ShowAvailableColorsProperty );
-      }
-      set
-      {
-        SetValue( ShowAvailableColorsProperty, value );
-      }
-    }
-
-    #endregion //ShowAvailableColors
-
-    #region ShowRecentColors
-
-    public static readonly DependencyProperty ShowRecentColorsProperty = DependencyProperty.Register( "ShowRecentColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
-    public bool ShowRecentColors
-    {
-      get
-      {
-        return ( bool )GetValue( ShowRecentColorsProperty );
-      }
-      set
-      {
-        SetValue( ShowRecentColorsProperty, value );
-      }
-    }
-
-    #endregion //DisplayRecentColors
-
-    #region ShowStandardColors
-
-    public static readonly DependencyProperty ShowStandardColorsProperty = DependencyProperty.Register( "ShowStandardColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool ShowStandardColors
-    {
-      get
-      {
-        return ( bool )GetValue( ShowStandardColorsProperty );
-      }
-      set
-      {
-        SetValue( ShowStandardColorsProperty, value );
-      }
-    }
-
-    #endregion //DisplayStandardColors
-
-    #region ShowDropDownButton
-
-    public static readonly DependencyProperty ShowDropDownButtonProperty = DependencyProperty.Register( "ShowDropDownButton", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
-    public bool ShowDropDownButton
-    {
-      get
-      {
-        return ( bool )GetValue( ShowDropDownButtonProperty );
-      }
-      set
-      {
-        SetValue( ShowDropDownButtonProperty, value );
-      }
-    }
-
-    #endregion //ShowDropDownButton
-
-    #region StandardButtonHeader
-
-    public static readonly DependencyProperty StandardButtonHeaderProperty = DependencyProperty.Register( "StandardButtonHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard" ) );
-    public string StandardButtonHeader
-    {
-      get
-      {
-        return ( string )GetValue( StandardButtonHeaderProperty );
-      }
-      set
-      {
-        SetValue( StandardButtonHeaderProperty, value );
-      }
-    }
-
-    #endregion //StandardButtonHeader
-
-    #region StandardColors
-
-    public static readonly DependencyProperty StandardColorsProperty = DependencyProperty.Register( "StandardColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateStandardColors() ) );
-    public ObservableCollection<ColorItem> StandardColors
-    {
-      get
-      {
-        return ( ObservableCollection<ColorItem> )GetValue( StandardColorsProperty );
-      }
-      set
-      {
-        SetValue( StandardColorsProperty, value );
-      }
-    }
-
-    #endregion //StandardColors
-
-    #region StandardColorsHeader
-
-    public static readonly DependencyProperty StandardColorsHeaderProperty = DependencyProperty.Register( "StandardColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard Colors" ) );
-    public string StandardColorsHeader
-    {
-      get
-      {
-        return ( string )GetValue( StandardColorsHeaderProperty );
-      }
-      set
-      {
-        SetValue( StandardColorsHeaderProperty, value );
-      }
-    }
-
-    #endregion //StandardColorsHeader
-
-    #region UsingAlphaChannel
-
-    public static readonly DependencyProperty UsingAlphaChannelProperty = DependencyProperty.Register( "UsingAlphaChannel", typeof( bool ), typeof( ColorPicker ), new FrameworkPropertyMetadata( true, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnUsingAlphaChannelPropertyChanged ) ) );
-    public bool UsingAlphaChannel
-    {
-      get
-      {
-        return ( bool )GetValue( UsingAlphaChannelProperty );
-      }
-      set
-      {
-        SetValue( UsingAlphaChannelProperty, value );
-      }
-    }
-
-    private static void OnUsingAlphaChannelPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ColorPicker colorPicker = ( ColorPicker )d;
-      if( colorPicker != null )
-        colorPicker.OnUsingAlphaChannelChanged();
-    }
-
-    private void OnUsingAlphaChannelChanged()
-    {
-      SelectedColorText = GetFormatedColorString( SelectedColor );
-    }
-
-    #endregion //UsingAlphaChannel
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static ColorPicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorPicker ), new FrameworkPropertyMetadata( typeof( ColorPicker ) ) );
-    }
-
-    public ColorPicker()
-    {
-
-#if VS2008
-        this.RecentColors = new ObservableCollection<ColorItem>();
-#else
-      this.SetCurrentValue( ColorPicker.RecentColorsProperty, new ObservableCollection<ColorItem>() );
-#endif
-
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _availableColors != null )
-        _availableColors.SelectionChanged -= Color_SelectionChanged;
-
-      _availableColors = GetTemplateChild( PART_AvailableColors ) as ListBox;
-      if( _availableColors != null )
-        _availableColors.SelectionChanged += Color_SelectionChanged;
-
-      if( _standardColors != null )
-        _standardColors.SelectionChanged -= Color_SelectionChanged;
-
-      _standardColors = GetTemplateChild( PART_StandardColors ) as ListBox;
-      if( _standardColors != null )
-        _standardColors.SelectionChanged += Color_SelectionChanged;
-
-      if( _recentColors != null )
-        _recentColors.SelectionChanged -= Color_SelectionChanged;
-
-      _recentColors = GetTemplateChild( PART_RecentColors ) as ListBox;
-      if( _recentColors != null )
-        _recentColors.SelectionChanged += Color_SelectionChanged;
-
-      if( _popup != null )
-        _popup.Opened -= Popup_Opened;
-
-      _popup = GetTemplateChild( PART_ColorPickerPalettePopup ) as Popup;
-      if( _popup != null )
-        _popup.Opened += Popup_Opened;
-
-      _toggleButton = this.Template.FindName( PART_ColorPickerToggleButton, this ) as ToggleButton;
-    }
-
-    protected override void OnMouseUp( MouseButtonEventArgs e )
-    {
-      base.OnMouseUp( e );
-
-      // Close ColorPicker on MouseUp to prevent action of MouseUp on controls behind the ColorPicker.
-      if( _selectionChanged )
-      {
-        CloseColorPicker( true );
-        _selectionChanged = false;
-      }
-    }
-
-
-#endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          // Focus will be on ListBoxItem in Popup_Opened().
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          CloseColorPicker( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          this.SelectedColor = _initialColor;
-          CloseColorPicker( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseColorPicker( true );
-    }
-
-    private void Color_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      ListBox lb = ( ListBox )sender;
-
-      if( e.AddedItems.Count > 0 )
-      {
-        var colorItem = ( ColorItem )e.AddedItems[ 0 ];
-        SelectedColor = colorItem.Color;
-        if( !string.IsNullOrEmpty( colorItem.Name ) )
-        {
-          this.SelectedColorText = colorItem.Name;
-        }
-        UpdateRecentColors( colorItem );
-        _selectionChanged = true;
-        lb.SelectedIndex = -1; //for now I don't care about keeping track of the selected color
-      }
-    }
-
-    private void Popup_Opened( object sender, EventArgs e )
-    {
-      if( ( _availableColors != null ) && ShowAvailableColors )
-      {
-        FocusOnListBoxItem( _availableColors );
-      }
-      else if( ( _standardColors != null ) && ShowStandardColors )
-        FocusOnListBoxItem( _standardColors );
-      else if( ( _recentColors != null ) && ShowRecentColors )
-        FocusOnListBoxItem( _recentColors );
-    }
-
-    private void FocusOnListBoxItem( ListBox listBox )
-    {
-      ListBoxItem listBoxItem = ( ListBoxItem )listBox.ItemContainerGenerator.ContainerFromItem( listBox.SelectedItem );
-      if( ( listBoxItem == null ) && ( listBox.Items.Count > 0 ) )
-        listBoxItem = ( ListBoxItem )listBox.ItemContainerGenerator.ContainerFromItem( listBox.Items[ 0 ] );
-      if( listBoxItem != null )
-        listBoxItem.Focus();
-    }
-
-    #endregion //Event Handlers
-
-    #region Events
-
-    #region SelectedColorChangedEvent
-
-    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color?> ), typeof( ColorPicker ) );
-    public event RoutedPropertyChangedEventHandler<Color?> SelectedColorChanged
-    {
-      add
-      {
-        AddHandler( SelectedColorChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SelectedColorChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region OpenedEvent
-
-    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "OpenedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( ColorPicker ) );
-    public event RoutedEventHandler Opened
-    {
-      add
-      {
-        AddHandler( OpenedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( OpenedEvent, value );
-      }
-    }
-
-    #endregion //OpenedEvent
-
-    #region ClosedEvent
-
-    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "ClosedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( ColorPicker ) );
-    public event RoutedEventHandler Closed
-    {
-      add
-      {
-        AddHandler( ClosedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ClosedEvent, value );
-      }
-    }
-
-    #endregion //ClosedEvent
-
-    #endregion //Events
-
-    #region Methods
-
-    private void CloseColorPicker( bool isFocusOnColorPicker )
-    {
-      if( IsOpen )
-        IsOpen = false;
-      ReleaseMouseCapture();
-
-      if( isFocusOnColorPicker && ( _toggleButton != null) )
-        _toggleButton.Focus();
-      this.UpdateRecentColors( new ColorItem( SelectedColor, SelectedColorText ) );
-    }
-
-    private void UpdateRecentColors( ColorItem colorItem )
-    {
-      if( !RecentColors.Contains( colorItem ) )
-        RecentColors.Add( colorItem );
-
-      if( RecentColors.Count > 10 ) //don't allow more than ten, maybe make a property that can be set by the user.
-        RecentColors.RemoveAt( 0 );
-    }
-
-    private string GetFormatedColorString( Color? colorToFormat )
-    {
-      if( ( colorToFormat == null ) || !colorToFormat.HasValue )
-        return string.Empty;
-
-      return ColorUtilities.FormatColorString( colorToFormat.Value.GetColorName(), UsingAlphaChannel );
-    }
-
-    private static ObservableCollection<ColorItem> CreateStandardColors()
-    {
-      ObservableCollection<ColorItem> standardColors = new ObservableCollection<ColorItem>();
-      standardColors.Add( new ColorItem( Colors.Transparent, "Transparent" ) );
-      standardColors.Add( new ColorItem( Colors.White, "White" ) );
-      standardColors.Add( new ColorItem( Colors.Gray, "Gray" ) );
-      standardColors.Add( new ColorItem( Colors.Black, "Black" ) );
-      standardColors.Add( new ColorItem( Colors.Red, "Red" ) );
-      standardColors.Add( new ColorItem( Colors.Green, "Green" ) );
-      standardColors.Add( new ColorItem( Colors.Blue, "Blue" ) );
-      standardColors.Add( new ColorItem( Colors.Yellow, "Yellow" ) );
-      standardColors.Add( new ColorItem( Colors.Orange, "Orange" ) );
-      standardColors.Add( new ColorItem( Colors.Purple, "Purple" ) );
-      return standardColors;
-    }
-
-    private static ObservableCollection<ColorItem> CreateAvailableColors()
-    {
-      ObservableCollection<ColorItem> standardColors = new ObservableCollection<ColorItem>();
-
-      foreach( var item in ColorUtilities.KnownColors )
-      {
-        if( !String.Equals( item.Key, "Transparent" ) )
-        {
-          var colorItem = new ColorItem( item.Value, item.Key );
-          if( !standardColors.Contains( colorItem ) )
-            standardColors.Add( colorItem );
-        }
-      }
-
-      return standardColors;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
deleted file mode 100644
index 370263a6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ColorPickerTabItem : TabItem
-  {
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( e.Source == this || !this.IsSelected )
-        return;
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      //Selection on Mouse Up
-      if( e.Source == this || !this.IsSelected )
-      {
-        base.OnMouseLeftButtonDown( e );
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
deleted file mode 100644
index 30fa8ec5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class ColorSorter : IComparer
-  {
-    public int Compare( object firstItem, object secondItem )
-    {
-      if( firstItem == null || secondItem == null )
-        return -1;
-
-      ColorItem colorItem1 = ( ColorItem )firstItem;
-      ColorItem colorItem2 = ( ColorItem )secondItem;
-
-      if( (colorItem1.Color == null) || !colorItem1.Color.HasValue || 
-          (colorItem2.Color == null) || !colorItem2.Color.HasValue )
-        return -1;
-
-      System.Drawing.Color drawingColor1 = System.Drawing.Color.FromArgb( colorItem1.Color.Value.A, colorItem1.Color.Value.R, colorItem1.Color.Value.G, colorItem1.Color.Value.B );
-      System.Drawing.Color drawingColor2 = System.Drawing.Color.FromArgb( colorItem2.Color.Value.A, colorItem2.Color.Value.R, colorItem2.Color.Value.G, colorItem2.Color.Value.B );
-
-      // Compare Hue
-      double hueColor1 = Math.Round( ( double )drawingColor1.GetHue(), 3 );
-      double hueColor2 = Math.Round( ( double )drawingColor2.GetHue(), 3 );
-
-      if( hueColor1 > hueColor2 )
-        return 1;
-      else if( hueColor1 < hueColor2 )
-        return -1;
-      else
-      {
-        // Hue is equal, compare Saturation
-        double satColor1 = Math.Round( ( double )drawingColor1.GetSaturation(), 3 );
-        double satColor2 = Math.Round( ( double )drawingColor2.GetSaturation(), 3 );
-
-        if( satColor1 > satColor2 )
-          return 1;
-        else if( satColor1 < satColor2 )
-          return -1;
-        else
-        {
-          // Saturation is equal, compare Brightness
-          double brightColor1 = Math.Round( ( double )drawingColor1.GetBrightness(), 3 );
-          double brightColor2 = Math.Round( ( double )drawingColor2.GetBrightness(), 3 );
-
-          if( brightColor1 > brightColor2 )
-            return 1;
-          else if( brightColor1 < brightColor2 )
-            return -1;
-        }
-      }
-
-      return 0;
-    }
-  }
-}
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
deleted file mode 100644
index ca5926c0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,502 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-  <conv:AdditionConverter x:Key="AdditionConverter" />
-  <conv:ColorModeToTabItemSelectedConverter x:Key="ColorModeToTabItemSelectedConverter" />
-
-  <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 x:Name="mainGrid"
-                ToolTip="{Binding Name}">
-            <Grid.Resources>
-              <Style TargetType="ToolTip">
-                <Style.Triggers>
-                  <Trigger Property="Content"
-                           Value="{x:Static sys:String.Empty}">
-                    <Setter Property="Visibility"
-                            Value="Collapsed" />
-                  </Trigger>
-                </Style.Triggers>
-              </Style>
-            </Grid.Resources>
-            <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>
-            <DataTrigger Binding="{Binding DisplayColorTooltip, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}}"
-                         Value="False">
-              <Setter Property="ToolTip"
-                      Value="{x:Static sys:String.Empty}"
-                      TargetName="mainGrid" />
-            </DataTrigger>
-          </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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ColorDisplayStyle"
-         TargetType="ContentControl">
-    <Setter Property="Focusable"
-            Value="False" />
-    <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.Triggers>
-      <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                   Value="{x:Null}">
-        <Setter Property="Visibility"
-                Value="Collapsed" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="ColorListStyle"
-         TargetType="ListBox">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="MaxHeight"
-            Value="500" />
-    <Setter Property="ItemsPanel">
-      <Setter.Value>
-        <ItemsPanelTemplate>
-          <!-- ConverterParameter is margin/Padding from Popup-->
-          <WrapPanel Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
-        </ItemsPanelTemplate>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="ItemContainerStyle"
-            Value="{StaticResource ColorItemContainerStyle}" />
-    <Setter Property="ItemTemplate"
-            Value="{StaticResource ColorItemTemplate}" />
-    <Setter Property="SelectionMode"
-            Value="Single" />
-  </Style>
-
-  <ControlTemplate x:Key="TabItemTemplate"
-                   TargetType="{x:Type local:ColorPickerTabItem}">
-    <Grid x:Name="templateRoot"
-          SnapsToDevicePixels="true">
-      <Border x:Name="mainBorder"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="1,1,1,0"
-              Background="#FFF0F0F0"
-              Margin="0">
-        <Border x:Name="innerBorder"
-                BorderBrush="#ACACAC"
-                BorderThickness="1,1,1,0"
-                Background="#FFF0F0F0"
-                Margin="-1"
-                Opacity="0" />
-      </Border>
-      <ContentPresenter x:Name="contentPresenter"
-                        ContentSource="Header"
-                        Focusable="False"
-                        HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                        Margin="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}"
-                     Value="true" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Panel.ZIndex"
-                Value="1" />
-        <Setter Property="Margin"
-                Value="-2,-2,-2,0" />
-        <Setter Property="Opacity"
-                TargetName="innerBorder"
-                Value="1" />
-      </MultiDataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-
-  <!-- =============================================================================== -->
-  <!-- ColorPicker                                                                     -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="ColorPicker"
-         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="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="MaxDropDownWidth"
-            Value="218" />
-    <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">
-                    </TextBlock>
-                  </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"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PanelBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      Padding="3">
-                <TabControl x:Name="ColorPickerTabControl"
-                            Background="Transparent"
-                            SelectedIndex="{Binding ColorMode, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorModeToTabItemSelectedConverter}}">
-                  <local:ColorPickerTabItem x:Name="StandardTabItem"
-                                            Header="{Binding StandardButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Template="{StaticResource TabItemTemplate}">
-                    <Grid x:Name="_colorPaletteHost"
-                          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">
-                          </TextBlock>
-                          <ListBox x:Name="PART_AvailableColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}">
-                          </ListBox>
-                        </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">
-                          </TextBlock>
-                          <ListBox x:Name="PART_StandardColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}">
-                          </ListBox>
-                        </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="22" />
-                          </Grid.RowDefinitions>
-                          <TextBlock Text="{TemplateBinding RecentColorsHeader}"
-                                     Background="AliceBlue"
-                                     Padding="2"
-                                     Margin="0,1,0,1">
-                          </TextBlock>
-                          <ListBox x:Name="PART_RecentColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}">
-                          </ListBox>
-                        </Grid>
-                      </Grid>
-                    </Grid>
-                  </local:ColorPickerTabItem>
-                  <local:ColorPickerTabItem x:Name="AdvancedTabItem"
-                                            Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Template="{StaticResource TabItemTemplate}">
-                    <!-- ColorCanvas -->
-                    <Grid x:Name="_colorCanvasHost">
-                      <local:ColorCanvas Background="Transparent"
-                                         BorderThickness="0"
-                                         UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
-                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
-                    </Grid>
-                  </local:ColorPickerTabItem>
-                </TabControl>
-              </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 Property="ShowTabHeaders"
-                     Value="False">
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="StandardTabItem" />
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="AdvancedTabItem" />
-            </Trigger>
-
-            <Trigger Property="ShowDropDownButton"
-                     Value="False">
-              <Setter Property="BorderThickness"
-                      Value="1" />
-            </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>
-
-  <Style TargetType="{x:Type local:ColorPicker}"
-         BasedOn="{StaticResource ColorPicker}" />
-
-</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
deleted file mode 100644
index aa31e288..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ /dev/null
@@ -1,521 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:sys="clr-namespace:System;assembly=mscorlib"
-                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Common.xaml" />
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <SolidColorBrush x:Key="ButtonHover"
-                   Color="#C2E0FF" />
-  <SolidColorBrush x:Key="ButtonHoverBorder"
-                   Color="#3399FF" />
-  <SolidColorBrush x:Key="ButtonChecked"
-                   Color="#E6F0FA" />
-  <SolidColorBrush x:Key="ButtonPressed"
-                   Color="#99CCFF" />
-  <SolidColorBrush x:Key="ButtonPressedBorder"
-                   Color="#3399FF" />
-
-  <!-- =============================================================================== -->
-  <!-- ColorPicker                                                                     -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-  <conv:AdditionConverter x:Key="AdditionConverter" />
-  <conv:ColorModeToTabItemSelectedConverter x:Key="ColorModeToTabItemSelectedConverter" />
-
-  <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush"
-                       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="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <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 x:Name="mainGrid"
-                ToolTip="{Binding Name}">
-            <Grid.Resources>
-              <Style TargetType="ToolTip">
-                <Style.Triggers>
-                  <Trigger Property="Content"
-                           Value="{x:Static sys:String.Empty}">
-                    <Setter Property="Visibility"
-                            Value="Collapsed" />
-                  </Trigger>
-                </Style.Triggers>
-              </Style>
-            </Grid.Resources>
-            <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="#FFFF0000" />
-              <Setter TargetName="_innerBorder"
-                      Property="BorderBrush"
-                      Value="#FFFFFF00" />
-            </Trigger>
-            <Trigger Property="IsSelected"
-                     Value="True">
-              <Setter TargetName="_outerBorder"
-                      Property="BorderBrush"
-                      Value="#FFFF0000" />
-              <Setter TargetName="_innerBorder"
-                      Property="BorderBrush"
-                      Value="#FFFFFF00" />
-            </Trigger>
-            <DataTrigger Binding="{Binding DisplayColorTooltip, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}}"
-                         Value="False">
-              <Setter Property="ToolTip"
-                      Value="{x:Static sys:String.Empty}"
-                      TargetName="mainGrid" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <DataTemplate x:Key="ColorItemTemplate">
-    <Grid>
-      <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>
-          </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,2.75,2.75,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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="ColorDisplayStyle"
-         TargetType="ContentControl">
-    <Setter Property="Focusable"
-            Value="False" />
-    <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.Triggers>
-      <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                   Value="{x:Null}">
-        <Setter Property="Visibility"
-                Value="Collapsed" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="ColorListStyle"
-         TargetType="ListBox">
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="MaxHeight"
-            Value="500" />
-    <Setter Property="ItemsPanel">
-      <Setter.Value>
-        <ItemsPanelTemplate>
-          <!-- ConverterParameter is margin/Padding from Popup-->
-          <WrapPanel Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource AncestorType={x:Type local:ColorPicker}}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
-        </ItemsPanelTemplate>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="ItemContainerStyle"
-            Value="{StaticResource ColorItemContainerStyle}" />
-    <Setter Property="ItemTemplate"
-            Value="{StaticResource ColorItemTemplate}" />
-    <Setter Property="SelectionMode"
-            Value="Single" />
-  </Style>
-
-  <ControlTemplate x:Key="TabItemTemplate"
-                   TargetType="{x:Type local:ColorPickerTabItem}">
-    <Grid x:Name="templateRoot"
-          SnapsToDevicePixels="true">
-      <Border x:Name="mainBorder"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="1,1,1,0"
-              Background="#FFF0F0F0"
-              Margin="0">
-        <Border x:Name="innerBorder"
-                BorderBrush="#ACACAC"
-                BorderThickness="1,1,1,0"
-                Background="#FFF0F0F0"
-                Margin="-1"
-                Opacity="0" />
-      </Border>
-      <ContentPresenter x:Name="contentPresenter"
-                        ContentSource="Header"
-                        Focusable="False"
-                        HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                        Margin="{TemplateBinding Padding}"
-                        RecognizesAccessKey="True"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}"
-                     Value="true" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Panel.ZIndex"
-                Value="1" />
-        <Setter Property="Margin"
-                Value="-2,-2,-2,0" />
-        <Setter Property="Opacity"
-                TargetName="innerBorder"
-                Value="1" />
-      </MultiDataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:ColorPicker}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource ColorPickerDarkBorderBrush}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="ButtonStyle"
-            Value="{StaticResource ColorPickerToggleButtonStyle}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Stretch" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="MaxDropDownWidth"
-            Value="218" />
-    <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="#FFC9CACA" />
-                    <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}"
-                               VerticalAlignment="Center" >
-                    </TextBlock>
-                  </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"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PopupBackgroundBrush}"
-                      BorderBrush="{StaticResource ColorPickerDarkBorderBrush}"
-                      Padding="3">
-                <TabControl x:Name="ColorPickerTabControl"
-                            Background="Transparent"
-                            SelectedIndex="{Binding ColorMode, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorModeToTabItemSelectedConverter}}">
-                  <local:ColorPickerTabItem x:Name="StandardTabItem"
-                                            Header="{Binding StandardButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Template="{StaticResource TabItemTemplate}">
-                    <Grid x:Name="_colorPaletteHost"
-                          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" >
-                          </TextBlock>
-                          <ListBox x:Name="PART_AvailableColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}" >
-                          </ListBox>
-                        </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" >
-                          </TextBlock>
-                          <ListBox x:Name="PART_StandardColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}" >
-                          </ListBox>
-                        </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="22" />
-                          </Grid.RowDefinitions>
-                          <TextBlock Text="{TemplateBinding RecentColorsHeader}"
-                                     Background="AliceBlue"
-                                     Padding="2"
-                                     Margin="0,1,0,1" >
-                          </TextBlock>
-                          <ListBox x:Name="PART_RecentColors"
-                                   Grid.Row="1"
-                                   ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                   Style="{StaticResource ColorListStyle}" >
-                          </ListBox>
-                        </Grid>
-                      </Grid>
-                    </Grid>
-                  </local:ColorPickerTabItem>
-                  <local:ColorPickerTabItem x:Name="AdvancedTabItem"
-                                            Header="{Binding AdvancedButtonHeader, RelativeSource={RelativeSource TemplatedParent}}"
-                                            Template="{StaticResource TabItemTemplate}">
-                    <!-- ColorCanvas -->
-                    <Grid x:Name="_colorCanvasHost">
-                      <local:ColorCanvas Background="Transparent"
-                                         BorderThickness="0"
-                                         UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}"
-                                         Width="{Binding MaxDropDownWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AdditionConverter}, ConverterParameter=-18}" />
-                    </Grid>
-                  </local:ColorPickerTabItem>
-                </TabControl>
-              </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 Property="ShowTabHeaders"
-                     Value="False">
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="StandardTabItem" />
-              <Setter Property="Visibility"
-                      Value="Collapsed"
-                      TargetName="AdvancedTabItem" />
-            </Trigger>
-
-            <Trigger Property="ShowDropDownButton"
-                     Value="False">
-              <Setter Property="BorderThickness"
-                      Value="1" />
-            </Trigger>
-
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
deleted file mode 100644
index d58c61e5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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/AditionConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
deleted file mode 100644
index dcd4f140..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class AdditionConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( value != null ) && ( parameter != null ) )
-      {
-        var firstValue = ( double )value;
-        var secondValue = double.Parse( parameter as string );
-
-        return firstValue + secondValue;
-      }
-
-      return 0d;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
deleted file mode 100644
index cda549e1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 5d8ff375..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 CalculatorMemoryToVisibilityConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return ( decimal )value == decimal.Zero ? Visibility.Hidden : Visibility.Visible;
-    }
-
-    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/CenterTitleConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
deleted file mode 100644
index e1711fe9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Media;
-using System.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-    public class CenterTitleConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            // Parameters: DesiredSize, WindowWidth, HeaderColumns
-            double titleTextWidth = ((Size)values[0]).Width;
-            double windowWidth = (double)values[1];
-
-            ColumnDefinitionCollection headerColumns = (ColumnDefinitionCollection)values[2];
-            double titleColWidth = headerColumns[2].ActualWidth;
-            double buttonsColWidth = headerColumns[3].ActualWidth;
-
-
-            // Result (1) Title is Centered across all HeaderColumns
-            if ((titleTextWidth + buttonsColWidth * 2) < windowWidth)
-                return 1;
-
-            // Result (2) Title is Centered in HeaderColumns[2]
-            if (titleTextWidth < titleColWidth)
-                return 2;
-
-            // Result (3) Title is Left-Aligned in HeaderColumns[2]
-            return 3;
-        }
-
-        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/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
deleted file mode 100644
index b40f1574..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 be 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/ColorModeToTabItemSelectedConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
deleted file mode 100644
index dced284a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Core.Converters
-{
-  public class ColorModeToTabItemSelectedConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      var colorMode = ( ColorMode )value;
-      return (colorMode == ColorMode.ColorPalette) ? 0 : 1;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      var index = ( int )value;
-      return ( index == 0 ) ? ColorMode.ColorPalette : ColorMode.ColorCanvas;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
deleted file mode 100644
index efe72b02..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class ColorToSolidColorBrushConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    /// <summary>
-    /// Converts a Color to a SolidColorBrush.
-    /// </summary>
-    /// <param name="value">The Color 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 SolidColorBrush. 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 != null )
-        return new SolidColorBrush( ( Color )value );
-
-      return value;
-    }
-
-
-    /// <summary>
-    /// Converts a SolidColorBrush to a Color.
-    /// </summary>
-    /// <remarks>Currently not used in toolkit, but provided for developer use in their own projects</remarks>
-    /// <param name="value">The SolidColorBrush 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 != null )
-        return ( ( SolidColorBrush )value ).Color;
-
-      return value;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
deleted file mode 100644
index 1eb772bc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Toolkit.Core.Converters
-{
-    public class CornerRadiusToDoubleConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double radius = 0.0;
-
-            if (value != null)
-                radius = ((CornerRadius)value).TopLeft;
-
-            return radius;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double radius = 0.0;
-
-            if (value != null)
-                radius = (double)value;
-
-            return new CornerRadius(radius);
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
deleted file mode 100644
index 390da4cd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class HalfConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      double size = ( double )value;
-      double modifier = (parameter != null) ? double.Parse( ( string )parameter ) : 0d;
-      if( modifier != 0 )
-        return Math.Max(0, size - modifier) / 2;
-
-      return ( size / 2 );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
deleted file mode 100644
index 8a906ad9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Toolkit.Core.Converters
-{
-    public class IntToThicknessConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            int thickValue = 0;
-            if (value != null)
-                thickValue = (int)value;
-
-            if (parameter != null)
-            {
-                if (parameter.ToString().ToUpper() == "LEFT")
-                    return new Thickness(thickValue, 0, 0, 0);
-            }
-
-            return new Thickness(thickValue);
-        }
-
-        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/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
deleted file mode 100644
index 56a6d0c2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class InverseBoolConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return !( bool )value;
-    }
-
-    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/Core/Converters/NullToBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
deleted file mode 100644
index 75650e12..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Core.Converters
-{
-  public class NullToBoolConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return (value == null);
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
deleted file mode 100644
index d059569e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class ObjectTypeToNameConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value != null )
-      {
-        if( value is Type )
-        {
-          var displayNameAttribute = ( ( Type )value ).GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
-          return ( displayNameAttribute != null ) ? displayNameAttribute.DisplayName : ( ( Type )value ).Name;
-        }
-
-        var type = value.GetType();
-        var valueString = value.ToString();
-        if( string.IsNullOrEmpty( valueString )
-         || ( valueString == type.UnderlyingSystemType.ToString() ) )
-        {
-          var displayNameAttribute = type.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
-          return ( displayNameAttribute != null ) ? displayNameAttribute.DisplayName : type.Name;
-        }
-
-        return value; 
-      }
-      return null;
-    }
-    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/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
deleted file mode 100644
index ed3c07f8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class RoundedValueConverter : IValueConverter
-  {
-    #region Precision Property
-
-    public int Precision
-    {
-      get
-      {
-        return _precision;
-      }
-      set
-      {
-        _precision = value;
-      }
-    }
-
-    private int _precision = 0;
-
-    #endregion
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is double )
-      {
-        return Math.Round( ( double )value, _precision );
-      }
-      else if( value is Point )
-      {
-        return new Point( Math.Round( ( ( Point )value ).X, _precision ), Math.Round( ( ( Point )value ).Y, _precision ) );
-      }
-      else
-      {
-        return value;
-      }
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return value;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
deleted file mode 100644
index 86cc37b8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class SolidColorBrushToColorConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      SolidColorBrush brush = value as SolidColorBrush;
-      if( brush != null )
-        return brush.Color;
-
-      return default( Color? );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value != null )
-      {
-        Color color = ( Color )value;
-        return new SolidColorBrush( color );
-      }
-
-      return default( SolidColorBrush );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
deleted file mode 100644
index fdcefa48..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class ThicknessSideRemovalConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      var thickness = (Thickness)value;
-      var sideToRemove = int.Parse( (string)parameter );
-      switch( sideToRemove )
-      {
-        case 0: thickness.Left = 0d; break;
-        case 1: thickness.Top = 0d; break;
-        case 2: thickness.Right = 0d; break;
-        case 3: thickness.Bottom = 0d; break;
-        default: throw new InvalidContentException("parameter should be from 0 to 3 to specify the side to remove.");
-      }
-      return thickness;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
deleted file mode 100644
index f78807d0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Toolkit.Core.Converters
-{
-    public class ThicknessToDoubleConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double thickness = 1.0;
-
-            if (value != null)
-                thickness = ((Thickness)value).Top;
-
-            return thickness;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double thickness = 1.0;
-
-            if (value != null)
-                thickness = (double)value;
-
-            return new Thickness(thickness);
-        }
-    }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
deleted file mode 100644
index e535f3b0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Data;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Core.Converters
-{
-  public class VisibilityToBoolConverter : IValueConverter
-  {
-    #region Inverted Property
-
-    public bool Inverted
-    {
-      get
-      {
-        return _inverted;
-      }
-      set
-      {
-        _inverted = value;
-      }
-    }
-
-    private bool _inverted; //false
-
-    #endregion
-
-    #region Not Property
-
-    public bool Not
-    {
-      get
-      {
-        return _not;
-      }
-      set
-      {
-        _not = value;
-      }
-    }
-
-    private bool _not; //false
-
-    #endregion
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return this.Inverted ? this.BoolToVisibility( value ) : this.VisibilityToBool( value );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      return this.Inverted ? this.VisibilityToBool( value ) : this.BoolToVisibility( value );
-    }
-
-    private object VisibilityToBool( object value )
-    {
-      if( !( value is Visibility ) )
-        throw new InvalidOperationException( ErrorMessages.GetMessage( "SuppliedValueWasNotVisibility" ) );
-
-      return ( ( ( Visibility )value ) == Visibility.Visible ) ^ Not;
-    }
-
-    private object BoolToVisibility( object value )
-    {
-      if( !( value is bool ) )
-        throw new InvalidOperationException( ErrorMessages.GetMessage( "SuppliedValueWasNotBool" ) );
-
-      return ( ( bool )value ^ Not ) ? Visibility.Visible : Visibility.Collapsed;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
deleted file mode 100644
index e09d4cff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 1135f2f3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index bfec6ea8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 WizardPageButtonVisibilityConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      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 ];
-
-      Visibility visibility = Visibility.Visible;
-
-      switch( wizardPageVisibility )
-      {
-        case WizardPageButtonVisibility.Inherit:
-          visibility = wizardVisibility;
-          break;
-        case WizardPageButtonVisibility.Collapsed:
-          visibility = Visibility.Collapsed;
-          break;
-        case WizardPageButtonVisibility.Hidden:
-          visibility = Visibility.Hidden;
-          break;
-        case WizardPageButtonVisibility.Visible:
-          visibility = Visibility.Visible;
-          break;
-      }
-
-      return visibility;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
deleted file mode 100644
index ae3aaceb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class EditableKeyValuePair<TKey, TValue> : CustomTypeDescriptor
-  {
-    #region Members
-
-    private PropertyDescriptorCollection _properties;
-
-    #endregion
-
-    #region Properties
-
-    public TKey Key
-    {
-      get;
-      set;
-    }
-
-    public TValue Value
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region Constructors
-
-    //Necessary for adding new items in CollectionEditor
-    public EditableKeyValuePair()
-    {
-      var propertyList = new List<PropertyDescriptor>();
-
-      var KeyDescriptor = TypeDescriptor.CreateProperty( this.GetType(), "Key", typeof( TKey ) );
-      propertyList.Add( KeyDescriptor );
-
-      var ValueDescriptor = TypeDescriptor.CreateProperty( this.GetType(), "Value", typeof( TValue ) );
-      propertyList.Add( ValueDescriptor );
-
-      _properties = new PropertyDescriptorCollection( propertyList.ToArray() );
-    }
-
-    public EditableKeyValuePair( TKey key, TValue value )
-      : this()
-    {
-      this.Key = key;
-      this.Value = value;
-    }
-
-    #endregion
-
-    #region Overrides
-
-    public override PropertyDescriptorCollection GetProperties( Attribute[] attributes )
-    {
-      return this.GetProperties();
-    }
-
-    public override PropertyDescriptorCollection GetProperties()
-    {
-      return _properties;
-    }
-
-    public override object GetPropertyOwner( PropertyDescriptor pd )
-    {
-      return this;
-    }
-
-    public override string ToString()
-    {
-      return "[" + this.Key + "," + this.Value + "]";
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
deleted file mode 100644
index c44e86f9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Resources;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  internal static class ErrorMessages
-  {
-    #region Static Fields
-
-
-    public const string EndAngleCannotBeSetDirectlyInSlice = "EndAngleCannotBeSetDirectlyInSlice";
-    public const string SliceCannotBeSetDirectlyInEndAngle = "SliceCannotBeSetDirectlyInEndAngle";
-    public const string SliceOOR = "SliceOOR";
-    public const string AnimationAccelerationRatioOOR = "AnimationAccelerationRatioOOR";
-    public const string AnimationDecelerationRatioOOR = "AnimationDecelerationRatioOOR";
-    public const string ZoomboxContentMustBeUIElement = "ZoomboxContentMustBeUIElement";
-    public const string ViewModeInvalidForSource = "ViewModeInvalidForSource";
-    public const string ZoomboxTemplateNeedsContent = "ZoomboxTemplateNeedsContent";
-    public const string ZoomboxHasViewFinderButNotDisplay = "ZoomboxHasViewFinderButNotDisplay";
-    public const string PositionOnlyAccessibleOnAbsolute = "PositionOnlyAccessibleOnAbsolute";
-    public const string ZoomboxViewAlreadyInitialized = "ZoomboxViewAlreadyInitialized";
-    public const string ScaleOnlyAccessibleOnAbsolute = "ScaleOnlyAccessibleOnAbsolute";
-    public const string RegionOnlyAccessibleOnRegionalView = "RegionOnlyAccessibleOnRegionalView";
-    public const string UnableToConvertToZoomboxView = "UnableToConvertToZoomboxView";
-    public const string ViewStackCannotBeManipulatedNow = "ViewStackCannotBeManipulatedNow";
-
-
-    public const string SuppliedValueWasNotVisibility = "SuppliedValueWasNotVisibility";
-    public const string NegativeTimeSpanNotSupported = "NegativeTimeSpanNotSupported";
-    public const string NegativeSpeedNotSupported = "NegativeSpeedNotSupported";
-    public const string InvalidRatePropertyAccessed = "InvalidRatePropertyAccessed";
-
-    public const string AlreadyInColumnCollection = "Value already belongs to another 'ColumnDefinitionCollection'.";
-    public const string AlreadyInRowCollection = "Value already belongs to another 'RowDefinitionCollection'.";
-    public const string AlreadyInStackDefinition = "Value already belongs to another 'StackDefinitionCollection'.";
-    public const string ArrayDestTooShort = "'array' destination not long enough.";
-    public const string CollectionDisposed = "Collection was disposed, enumerator operations not valid.";
-    public const string CollectionModified = "Collection was modified; enumeration operation may not execute.";
-    public const string ColumnValueIsReadOnly = "Cannot modify 'ColumnDefinitionCollection' in read-only state.";
-    public const string DefaultAnimatorCantAnimate = "DefaultAnimatorCantAnimate";
-    public const string DefaultAnimationRateAnimationRateDefault = "DefaultAnimationRateAnimationRateDefault";
-    public const string DefaultAnimatorIterativeAnimationDefault = "DefaultAnimatorIterativeAnimationDefault";
-    public const string DestMultidimensional = "Destination is multidimensional. Expected array of rank 1.";
-    public const string EnumerationFinished = "Enumeration already finished.";
-    public const string EnumerationNotStarted = "Enumeration has not started. Call MoveNext.";
-    public const string InvalidDefaultStackLength = "The default stack length must be Auto or an explicit value.";
-    public const string MustBeColumnDefinition = "'ColumnDefinitionCollection' must be type 'ColumnDefinition'.";
-    public const string MustBeRowDefinition = "'RowDefinitionCollection' must be type 'RowDefinition'.";
-    public const string MustBeStackDefinition = "'StackDefinitionCollection' must be type 'StackDefinition'.";
-    public const string RowValueIsReadOnly = "Cannot modify 'StackDefinitionCollection' in read-only state.";
-    public const string StackValueIsReadOnly = "Cannot modify 'StackDefinitionCollection' in read-only state.";
-    public const string UnexpectedType = "Expected type '{0}', got '{1}'.";
-
-
-    private static readonly ResourceManager _resourceManager;
-
-    #endregion
-
-    #region Constructor
-
-    static ErrorMessages()
-    {
-      _resourceManager = new ResourceManager( "Xceed.Wpf.Toolkit.Core.ErrorMessages", typeof( ErrorMessages ).Assembly );
-    }
-
-    #endregion
-
-    public static string GetMessage( string msgId )
-    {
-      return _resourceManager.GetString( msgId );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx
deleted file mode 100644
index 8addfd76..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.resx
+++ /dev/null
@@ -1,228 +0,0 @@
-<?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="AnimationAccelerationRatioOOR" xml:space="preserve">
-    <value>AnimationAccelerationRatio must be between 0.0 and 1.0.</value>
-  </data>
-  <data name="AnimationDecelerationRatioOOR" xml:space="preserve">
-    <value>AnimationDecelerationRatio must be between 0.0 and 1.0.</value>
-  </data>
-  <data name="AnimationStateNeedsHelper" xml:space="preserve">
-    <value>ItemAnimationState can only be used once the animation helper has been assigned</value>
-  </data>
-  <data name="CannotConvertBackToRange" xml:space="preserve">
-    <value>Cannot convert back to a range.</value>
-  </data>
-  <data name="ContainerModelAlreadyRemoved" xml:space="preserve">
-    <value>Container model was already removed from children collection.</value>
-  </data>
-  <data name="DefaultAnimationRateAnimationRateDefault" xml:space="preserve">
-    <value>The DefaultAnimationRate property cannot be set to AnimationRate.Default.  It must have a valid AnimationRate value.</value>
-  </data>
-  <data name="DefaultAnimatorCantAnimate" xml:space="preserve">
-    <value>The DefaultAnimator cannot actually be used for animation.</value>
-  </data>
-  <data name="DefaultAnimatorIterativeAnimationDefault" xml:space="preserve">
-    <value>The DefaultAnimator property cannot be set to IterativeAnimation.Default.  It must be a valid IterativeAnimator value or null.</value>
-  </data>
-  <data name="EndAngleCannotBeSetDirectlyInSlice" xml:space="preserve">
-    <value>The EndAngle property cannot be set directly while a Pie's Mode is Slice. You must set the Slice property instead.</value>
-  </data>
-  <data name="GlassEnabledNeedsFullTrust" xml:space="preserve">
-    <value>GlassEnabled can be set only in Full Trust enviornments</value>
-  </data>
-  <data name="InvalidRatePropertyAccessed" xml:space="preserve">
-    <value>Unable to return a {0} value for an AnimationRate value of '{1}'. This AnimationRate is represented as a {2} value.</value>
-  </data>
-  <data name="ItemMustBeAVisual" xml:space="preserve">
-    <value>item must be a Visual</value>
-  </data>
-  <data name="ItemMustBeMode3DOrVisual3D" xml:space="preserve">
-    <value>item must be either a Model3D or a Visual3D.</value>
-  </data>
-  <data name="MethodNotImplemented" xml:space="preserve">
-    <value>The method or operation is not implemented.</value>
-  </data>
-  <data name="NegativeSpeedNotSupported" xml:space="preserve">
-    <value>Speed must be greater than or equal to zero.</value>
-  </data>
-  <data name="NegativeTimeSpanNotSupported" xml:space="preserve">
-    <value>Duration (TimeSpan) must be greater than or equal to zero.</value>
-  </data>
-  <data name="OperationNotSupported" xml:space="preserve">
-    <value>Operation not supported on the platform</value>
-  </data>
-  <data name="OrderedItemsNeedEveryVisible" xml:space="preserve">
-    <value>orderedItems must contain every item in the visible items.</value>
-  </data>
-  <data name="PositionOnlyAccessibleOnAbsolute" xml:space="preserve">
-    <value>The Position property can only be accessed on an absolute view.</value>
-  </data>
-  <data name="RegionOnlyAccessibleOnRegionalView" xml:space="preserve">
-    <value>The Region property can only be accessed on a region-based view.</value>
-  </data>
-  <data name="ScaleOnlyAccessibleOnAbsolute" xml:space="preserve">
-    <value>The Scale property can only be accessed on an absolute view.</value>
-  </data>
-  <data name="SetNewToValueSetOnCompletedHelper" xml:space="preserve">
-    <value>SetNewToValue set on a completed animation helper</value>
-  </data>
-  <data name="SliceCannotBeSetDirectlyInEndAngle" xml:space="preserve">
-    <value>The Slice property cannot be set directly while a Pie's Mode is EndAngle. You must set the EndAngle property instead.</value>
-  </data>
-  <data name="SliceOOR" xml:space="preserve">
-    <value>Slice must be between 0.0 and 1.0.</value>
-  </data>
-  <data name="SuppliedValueWasNotBool" xml:space="preserve">
-    <value>Error converting from bool value to Visibility value. Supplied value was not of type bool.</value>
-  </data>
-  <data name="SuppliedValueWasNotVisibility" xml:space="preserve">
-    <value>Error converting from Visibility value to bool value. Supplied value was not of type Visibility.</value>
-  </data>
-  <data name="ToAndFromMatrixAreEqual" xml:space="preserve">
-    <value>To and from matrix are equal</value>
-  </data>
-  <data name="UnableToConvertToZoomboxView" xml:space="preserve">
-    <value>Unable to convert object '{0}' to ZoomboxView.</value>
-  </data>
-  <data name="ValueToConvertMustBeNumber" xml:space="preserve">
-    <value>Value to convert must be a number.</value>
-  </data>
-  <data name="ViewModeInvalidForSource" xml:space="preserve">
-    <value>The ViewStackMode must be Default or Manual while ViewStackSource is in use.</value>
-  </data>
-  <data name="ViewStackCannotBeManipulatedNow" xml:space="preserve">
-    <value>The ViewStack cannot be directly manipulated. Operation is not valid while ViewStackSource is in use. Access and modify members of the Zoombox.ViewStackSource instead.</value>
-  </data>
-  <data name="VisibleMustEqualOrdered" xml:space="preserve">
-    <value>VisibleItemCount and orderedItems count must be equal.</value>
-  </data>
-  <data name="ZoomboxContentMustBeUIElement" xml:space="preserve">
-    <value>The Content property of a Zoombox control must specify a UIElement.</value>
-  </data>
-  <data name="ZoomboxHasViewFinderButNotDisplay" xml:space="preserve">
-    <value>The Zoombox template contains a ViewFinder element but it does not contain a ZoomboxViewFinderDisplay element</value>
-  </data>
-  <data name="ZoomboxTemplateNeedsContent" xml:space="preserve">
-    <value>The Zoombox template does not contain a content presenter.</value>
-  </data>
-  <data name="ZoomboxViewAlreadyInitialized" xml:space="preserve">
-    <value>The ZoomboxView instance is already initialized for a different type of view: {0}</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
deleted file mode 100644
index 7c376726..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class IndexChangedEventArgs : PropertyChangedEventArgs<int>
-  {
-    #region Constructors
-
-    public IndexChangedEventArgs( RoutedEvent routedEvent, int oldIndex, int newIndex )
-      : base( routedEvent, oldIndex, newIndex )
-    {
-    }
-
-    #endregion
-
-    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
-    {
-      ( ( IndexChangedEventHandler )genericHandler )( genericTarget, this );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
deleted file mode 100644
index 9a81349f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Core
-{
-  public delegate void IndexChangedEventHandler( object sender, IndexChangedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
deleted file mode 100644
index 83d0562a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input
-{
-  public interface IValidateInput
-  {
-    event InputValidationErrorEventHandler InputValidationError;
-    bool CommitInput();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
deleted file mode 100644
index bc7c6151..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input
-{
-  public delegate void InputValidationErrorEventHandler( object sender, InputValidationErrorEventArgs e );
-
-  public class InputValidationErrorEventArgs : EventArgs
-  {
-    #region Constructors
-
-    public InputValidationErrorEventArgs( Exception e )
-    {
-      Exception = e;
-    }
-
-    #endregion
-
-    #region Exception Property
-
-    public Exception Exception
-    {
-      get
-      {
-        return exception;
-      }
-      private set
-      {
-        exception = value;
-      }
-    }
-
-    private Exception exception;
-
-    #endregion
-
-    #region ThrowException Property
-
-    public bool ThrowException
-    {
-      get
-      {
-        return _throwException;
-      }
-      set
-      {
-        _throwException = value;
-      }
-    }
-
-    private bool _throwException;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
deleted file mode 100644
index 0e82cf02..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Core.Input
-{
-  public enum KeyModifier
-  {
-    None,
-    Blocked,
-    Ctrl,
-    LeftCtrl,
-    RightCtrl,
-    Shift,
-    LeftShift,
-    RightShift,
-    Alt,
-    LeftAlt,
-    RightAlt,
-    Exact,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
deleted file mode 100644
index e1c47a14..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit.Core.Input
-{
-  [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-  public class KeyModifierCollection : Collection<KeyModifier>
-  {
-    #region AreActive Property
-
-    public bool AreActive
-    {
-      get
-      {
-        if( this.Count == 0 )
-          return true;
-
-        // if the Blocked modifier is present, then the action is not allowed
-        // so simply return false
-        if( this.Contains( KeyModifier.Blocked ) )
-          return false;
-
-        if( this.Contains( KeyModifier.Exact ) )
-          return this.IsExactMatch();
-
-        return this.MatchAny();
-      }
-    }
-
-    #endregion
-
-    private static bool IsKeyPressed( KeyModifier modifier, ICollection<Key> keys )
-    {
-      switch( modifier )
-      {
-        case KeyModifier.Alt:
-          return keys.Contains( Key.LeftAlt )
-              || keys.Contains( Key.RightAlt );
-
-        case KeyModifier.LeftAlt:
-          return keys.Contains( Key.LeftAlt );
-
-        case KeyModifier.RightAlt:
-          return keys.Contains( Key.RightAlt );
-
-        case KeyModifier.Ctrl:
-          return keys.Contains( Key.LeftCtrl )
-              || keys.Contains( Key.RightCtrl );
-
-        case KeyModifier.LeftCtrl:
-          return keys.Contains( Key.LeftCtrl );
-
-        case KeyModifier.RightCtrl:
-          return keys.Contains( Key.RightCtrl );
-
-        case KeyModifier.Shift:
-          return keys.Contains( Key.LeftShift )
-              || keys.Contains( Key.RightShift );
-
-        case KeyModifier.LeftShift:
-          return keys.Contains( Key.LeftShift );
-
-        case KeyModifier.RightShift:
-          return keys.Contains( Key.RightShift );
-
-        case KeyModifier.None:
-          return true;
-
-        default:
-          throw new NotSupportedException( "Unknown modifier" );
-      }
-    }
-
-    private static bool HasModifier( Key key, ICollection<KeyModifier> modifiers )
-    {
-      switch( key )
-      {
-        case Key.LeftAlt:
-          return modifiers.Contains( KeyModifier.Alt )
-              || modifiers.Contains( KeyModifier.LeftAlt );
-
-        case Key.RightAlt:
-          return modifiers.Contains( KeyModifier.Alt )
-              || modifiers.Contains( KeyModifier.RightAlt );
-
-        case Key.LeftCtrl:
-          return modifiers.Contains( KeyModifier.Ctrl )
-              || modifiers.Contains( KeyModifier.LeftCtrl );
-
-        case Key.RightCtrl:
-          return modifiers.Contains( KeyModifier.Ctrl )
-              || modifiers.Contains( KeyModifier.RightCtrl );
-
-        case Key.LeftShift:
-          return modifiers.Contains( KeyModifier.Shift )
-              || modifiers.Contains( KeyModifier.LeftShift );
-
-        case Key.RightShift:
-          return modifiers.Contains( KeyModifier.Shift )
-              || modifiers.Contains( KeyModifier.RightShift );
-
-        default:
-          throw new NotSupportedException( "Unknown key" );
-      }
-    }
-
-    private bool IsExactMatch()
-    {
-      HashSet<KeyModifier> modifiers = this.GetKeyModifiers();
-      HashSet<Key> keys = this.GetKeysPressed();
-
-      // No key must be pressed for the modifier None.
-      if( this.Contains( KeyModifier.None ) )
-        return ( modifiers.Count == 0 )
-            && ( keys.Count == 0 );
-
-      // Make sure every modifier has a matching key pressed.
-      foreach( KeyModifier modifier in modifiers )
-      {
-        if( !KeyModifierCollection.IsKeyPressed( modifier, keys ) )
-          return false;
-      }
-
-      // Make sure every key pressed has a matching modifier.
-      foreach( Key key in keys )
-      {
-        if( !KeyModifierCollection.HasModifier( key, modifiers ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    private bool MatchAny()
-    {
-      if( this.Contains( KeyModifier.None ) )
-        return true;
-
-      HashSet<KeyModifier> modifiers = this.GetKeyModifiers();
-      HashSet<Key> keys = this.GetKeysPressed();
-
-      foreach( KeyModifier modifier in modifiers )
-      {
-        if( KeyModifierCollection.IsKeyPressed( modifier, keys ) )
-          return true;
-      }
-
-      return false;
-    }
-
-    private HashSet<KeyModifier> GetKeyModifiers()
-    {
-      HashSet<KeyModifier> modifiers = new HashSet<KeyModifier>();
-
-      foreach( KeyModifier modifier in this )
-      {
-        switch( modifier )
-        {
-          case KeyModifier.Alt:
-          case KeyModifier.LeftAlt:
-          case KeyModifier.RightAlt:
-          case KeyModifier.Ctrl:
-          case KeyModifier.LeftCtrl:
-          case KeyModifier.RightCtrl:
-          case KeyModifier.Shift:
-          case KeyModifier.LeftShift:
-          case KeyModifier.RightShift:
-            {
-              if( !modifiers.Contains( modifier ) )
-              {
-                modifiers.Add( modifier );
-              }
-            }
-            break;
-
-          default:
-            break;
-        }
-      }
-
-      return modifiers;
-    }
-
-    private HashSet<Key> GetKeysPressed()
-    {
-      HashSet<Key> keys = new HashSet<Key>();
-
-      if( Keyboard.IsKeyDown( Key.LeftAlt ) )
-        keys.Add( Key.LeftAlt );
-      if( Keyboard.IsKeyDown( Key.RightAlt ) )
-        keys.Add( Key.RightAlt );
-      if( Keyboard.IsKeyDown( Key.LeftCtrl ) )
-        keys.Add( Key.LeftCtrl );
-      if( Keyboard.IsKeyDown( Key.RightCtrl ) )
-        keys.Add( Key.RightCtrl );
-      if( Keyboard.IsKeyDown( Key.LeftShift ) )
-        keys.Add( Key.LeftShift );
-      if( Keyboard.IsKeyDown( Key.RightShift ) )
-        keys.Add( Key.RightShift );
-
-      return keys;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
deleted file mode 100644
index cec587da..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel.Design.Serialization;
-using System.Globalization;
-using System.Reflection;
-using System.Security;
-
-namespace Xceed.Wpf.Toolkit.Core.Input
-{
-  public sealed class KeyModifierCollectionConverter : TypeConverter
-  {
-    #region Static Fields
-
-    private static readonly TypeConverter _keyModifierConverter = TypeDescriptor.GetConverter( typeof( KeyModifier ) );
-
-    #endregion
-
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return _keyModifierConverter.CanConvertFrom( typeDescriptorContext, type );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( InstanceDescriptor )
-          || type == typeof( KeyModifierCollection )
-          || type == typeof( string ) );
-    }
-
-    public override object ConvertFrom( ITypeDescriptorContext typeDescriptorContext,
-        CultureInfo cultureInfo, object value )
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      string stringValue = value as string;
-
-      // convert null as None
-      if( value == null
-          || ( stringValue != null && stringValue.Trim() == string.Empty ) )
-      {
-        result.Add( KeyModifier.None );
-      }
-      else
-      {
-        // respect the following separators: '+', ' ', '|', or ','
-        foreach( string token in stringValue.Split( new char[] { '+', ' ', '|', ',' },
-                StringSplitOptions.RemoveEmptyEntries ) )
-          result.Add( ( KeyModifier )_keyModifierConverter.ConvertFrom( typeDescriptorContext, cultureInfo, token ) );
-
-        // if nothing added, assume None
-        if( result.Count == 0 )
-          result.Add( KeyModifier.None );
-      }
-      return result;
-    }
-
-    public override object ConvertTo( ITypeDescriptorContext typeDescriptorContext,
-        CultureInfo cultureInfo, object value, Type destinationType )
-    {
-      // special handling for null or an empty collection
-      if( value == null || ( ( KeyModifierCollection )value ).Count == 0 )
-      {
-        if( destinationType == typeof( InstanceDescriptor ) )
-        {
-          object result = null;
-          try
-          {
-            result = ConstructInstanceDescriptor();
-          }
-          catch( SecurityException )
-          {
-          }
-          return result;
-        }
-        else if( destinationType == typeof( string ) )
-        {
-          return _keyModifierConverter.ConvertTo( typeDescriptorContext,
-                  cultureInfo, KeyModifier.None, destinationType );
-        }
-      }
-
-      // return a '+' delimited string containing the modifiers
-      if( destinationType == typeof( string ) )
-      {
-        string result = string.Empty;
-        foreach( KeyModifier modifier in ( KeyModifierCollection )value )
-        {
-          if( result != string.Empty )
-            result = result + '+';
-
-          result = result + _keyModifierConverter.ConvertTo( typeDescriptorContext,
-                  cultureInfo, modifier, destinationType );
-        }
-        return result;
-      }
-
-      // unexpected type requested so return null
-      return null;
-    }
-
-    private static object ConstructInstanceDescriptor()
-    {
-      ConstructorInfo ci = typeof( KeyModifierCollection ).GetConstructor( new Type[] { } );
-      return new InstanceDescriptor( ci, new Object[] { } );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
deleted file mode 100644
index 793cb9e1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Core
-{
-  public class InvalidContentException : Exception
-  {
-    #region Constructors
-
-    public InvalidContentException( string message )
-      : base( message )
-    {
-    }
-
-    public InvalidContentException( string message, Exception innerException )
-      : base( message, innerException )
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
deleted file mode 100644
index 97fc54bf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Core
-{
-  public class InvalidTemplateException : Exception
-  {
-    #region Constructors
-
-    public InvalidTemplateException( string message )
-      : base( message )
-    {
-    }
-
-    public InvalidTemplateException( string message, Exception innerException )
-      : base( message, innerException )
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
deleted file mode 100644
index 1d67d3fd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Core
-{
-  public enum Location
-  {
-    Left,
-    Right
-  }
-}
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
deleted file mode 100644
index 3ec7e7ba..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
+++ /dev/null
@@ -1,346 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Runtime.InteropServices;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  [TypeConverter( typeof( AnimationRateConverter ) )]
-  [StructLayout( LayoutKind.Explicit )]
-  public struct AnimationRate
-  {
-    #region Static Fields
-
-    private static AnimationRate _default = new AnimationRate( true );
-
-    #endregion
-
-    #region Constructors
-
-    public AnimationRate( TimeSpan duration )
-    {
-      if( duration < TimeSpan.Zero )
-      {
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeTimeSpanNotSupported ) );
-      }
-      _speed = 0d;
-      _duration = duration.Ticks;
-      _rateType = RateType.TimeSpan;
-    }
-
-    public AnimationRate( double speed )
-    {
-      if( DoubleHelper.IsNaN( speed ) || speed < 0d )
-      {
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeSpeedNotSupported ) );
-      }
-      _duration = 0;
-      _speed = speed;
-      _rateType = RateType.Speed;
-    }
-
-    private AnimationRate( bool ignore )
-    {
-      _duration = 0;
-      _speed = double.NaN;
-      _rateType = RateType.Speed;
-    }
-
-    #endregion
-
-    #region Default Property
-
-    public static AnimationRate Default
-    {
-      get
-      {
-        return _default;
-      }
-    }
-
-    #endregion
-
-    #region HasDuration Property
-
-    public bool HasDuration
-    {
-      get
-      {
-        return ( _rateType == RateType.TimeSpan );
-      }
-    }
-
-    #endregion
-
-    #region Duration Property
-
-    public TimeSpan Duration
-    {
-      get
-      {
-        if( this.HasDuration )
-          return TimeSpan.FromTicks( _duration );
-
-        throw new InvalidOperationException( 
-          string.Format(
-            ErrorMessages.GetMessage( ErrorMessages.InvalidRatePropertyAccessed ),
-            "Duration", 
-            this, 
-            "Speed" ) );
-      }
-    }
-
-    #endregion
-
-    #region HasSpeed Property
-
-    public bool HasSpeed
-    {
-      get
-      {
-        return ( _rateType == RateType.Speed );
-      }
-    }
-
-    #endregion
-
-    #region Speed Property
-
-    public double Speed
-    {
-      get
-      {
-        if( this.HasSpeed )
-          return _speed;
-
-        throw new InvalidOperationException( 
-          string.Format(
-            ErrorMessages.GetMessage( ErrorMessages.InvalidRatePropertyAccessed ),
-            "Speed", 
-            this, 
-            "Duration" ) );
-      }
-    }
-
-    #endregion
-
-    public AnimationRate Add( AnimationRate animationRate )
-    {
-      return this + animationRate;
-    }
-
-    public override bool Equals( Object value )
-    {
-      if( value == null )
-        return false;
-
-      if( value is AnimationRate )
-        return this.Equals( ( AnimationRate )value );
-
-      return false;
-    }
-
-    public bool Equals( AnimationRate animationRate )
-    {
-      if( this.HasDuration )
-      {
-        if( animationRate.HasDuration )
-          return _duration == animationRate._duration;
-
-        return false;
-      }
-      else // HasSpeed
-      {
-        if( animationRate.HasSpeed )
-        {
-          if( DoubleHelper.IsNaN( _speed ) )
-            return DoubleHelper.IsNaN( animationRate._speed );
-
-          return _speed == animationRate._speed;
-        }
-
-        return false;
-      }
-    }
-
-    public static bool Equals( AnimationRate t1, AnimationRate t2 )
-    {
-      return t1.Equals( t2 );
-    }
-
-    public override int GetHashCode()
-    {
-      if( this.HasDuration )
-        return _duration.GetHashCode();
-
-      return _speed.GetHashCode();
-    }
-
-    public AnimationRate Subtract( AnimationRate animationRate )
-    {
-      return this - animationRate;
-    }
-
-    public override string ToString()
-    {
-      if( this.HasDuration )
-        return TypeDescriptor.GetConverter( _duration ).ConvertToString( _duration );
-
-      return TypeDescriptor.GetConverter( _speed ).ConvertToString( _speed );
-    }
-
-    #region Operators Methods
-
-    public static implicit operator AnimationRate( TimeSpan duration )
-    {
-      if( duration < TimeSpan.Zero )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeTimeSpanNotSupported ) );
-
-      return new AnimationRate( duration );
-    }
-
-    public static implicit operator AnimationRate( double speed )
-    {
-      if( DoubleHelper.IsNaN( speed ) || speed < 0 )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeSpeedNotSupported ) );
-
-      return new AnimationRate( speed );
-    }
-
-    public static implicit operator AnimationRate( int speed )
-    {
-      if( DoubleHelper.IsNaN( speed ) || speed < 0 )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.NegativeSpeedNotSupported ) );
-
-      return new AnimationRate( ( double )speed );
-    }
-
-    public static AnimationRate operator +( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1.HasDuration && t2.HasDuration )
-        return new AnimationRate( t1._duration + t2._duration );
-
-      if( t1.HasSpeed && t2.HasSpeed )
-        return new AnimationRate( t1._speed + t2._speed );
-
-      return ( AnimationRate )0d;
-    }
-
-    public static AnimationRate operator -( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1.HasDuration && t2.HasDuration )
-        return new AnimationRate( t1._duration - t2._duration );
-
-      if( t1.HasSpeed && t2.HasSpeed )
-        return new AnimationRate( t1._speed - t2._speed );
-
-      return ( AnimationRate )0d;
-    }
-
-    public static bool operator ==( AnimationRate t1, AnimationRate t2 )
-    {
-      return t1.Equals( t2 );
-    }
-
-    public static bool operator !=( AnimationRate t1, AnimationRate t2 )
-    {
-      return !( t1.Equals( t2 ) );
-    }
-
-    public static bool operator >( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1.HasDuration && t2.HasDuration )
-        return t1._duration > t2._duration;
-
-      if( t1.HasSpeed && t2.HasSpeed )
-        return ( t1._speed > t2._speed ) && !DoubleHelper.AreVirtuallyEqual( t1._speed, t2._speed );
-
-      // arbitrary: assume a Speed is greater than a Duration
-      return t1.HasSpeed;
-    }
-
-    public static bool operator >=( AnimationRate t1, AnimationRate t2 )
-    {
-      return !( t1 < t2 );
-    }
-
-    public static bool operator <( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1.HasDuration && t2.HasDuration )
-        return t1._duration < t2._duration;
-
-      if( t1.HasSpeed && t2.HasSpeed )
-        return ( t1._speed < t2._speed ) && !DoubleHelper.AreVirtuallyEqual( t1._speed, t2._speed );
-
-      // arbitrary: assume a Speed is greater than a Duration
-      return t1.HasDuration;
-    }
-
-    public static bool operator <=( AnimationRate t1, AnimationRate t2 )
-    {
-      return !( t1 > t2 );
-    }
-
-    public static int Compare( AnimationRate t1, AnimationRate t2 )
-    {
-      if( t1 < t2 )
-        return -1;
-
-      if( t1 > t2 )
-        return 1;
-
-      // Neither is greater than the other
-      return 0;
-    }
-
-    public static AnimationRate Plus( AnimationRate animationRate )
-    {
-      return animationRate;
-    }
-
-    public static AnimationRate operator +( AnimationRate animationRate )
-    {
-      return animationRate;
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    [FieldOffset( 0 )]
-    long _duration;
-    [FieldOffset( 0 )]
-    double _speed;
-    [FieldOffset( 8 )]
-    RateType _rateType;
-
-    #endregion
-
-    #region RateType Nested Type
-
-    private enum RateType
-    {
-      TimeSpan,
-      Speed,
-    }
-
-    #endregion
-  }
-}
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
deleted file mode 100644
index c8b9024f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel.Design.Serialization;
-using System.Globalization;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  public class AnimationRateConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext td, Type t )
-    {
-      return ( t == typeof( string ) )
-          || ( t == typeof( double ) )
-          || ( t == typeof( int ) )
-          || ( t == typeof( TimeSpan ) );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext context, Type destinationType )
-    {
-      return ( destinationType == typeof( InstanceDescriptor ) )
-          || ( destinationType == typeof( string ) )
-          || ( destinationType == typeof( double ) )
-          || ( destinationType == typeof( TimeSpan ) );
-    }
-
-    public override object ConvertFrom(
-      ITypeDescriptorContext td,
-      CultureInfo cultureInfo,
-      object value )
-    {
-      Type valueType = value.GetType();
-      if( value is string )
-      {
-        string stringValue = value as string;
-        if( ( value as string ).Contains( ":" ) )
-        {
-          TimeSpan duration = TimeSpan.Zero;
-          duration = ( TimeSpan )TypeDescriptor.GetConverter( duration ).ConvertFrom( td, cultureInfo, value );
-          return new AnimationRate( duration );
-        }
-        else
-        {
-          double speed = 0;
-          speed = ( double )TypeDescriptor.GetConverter( speed ).ConvertFrom( td, cultureInfo, value );
-          return new AnimationRate( speed );
-        }
-      }
-      else if( valueType == typeof( double ) )
-      {
-        return ( AnimationRate )( double )value;
-      }
-      else if( valueType == typeof( int ) )
-      {
-        return ( AnimationRate )( int )value;
-      }
-      else // TimeSpan
-      {
-        return ( AnimationRate )( TimeSpan )value;
-      }
-    }
-
-    public override object ConvertTo(
-      ITypeDescriptorContext context,
-      CultureInfo cultureInfo,
-      object value,
-      Type destinationType )
-    {
-      if( destinationType != null && value is AnimationRate )
-      {
-        AnimationRate rateValue = ( AnimationRate )value;
-
-        if( destinationType == typeof( InstanceDescriptor ) )
-        {
-          MemberInfo mi;
-          if( rateValue.HasDuration )
-          {
-            mi = typeof( AnimationRate ).GetConstructor( new Type[] { typeof( TimeSpan ) } );
-            return new InstanceDescriptor( mi, new object[] { rateValue.Duration } );
-          }
-          else if( rateValue.HasSpeed )
-          {
-            mi = typeof( AnimationRate ).GetConstructor( new Type[] { typeof( double ) } );
-            return new InstanceDescriptor( mi, new object[] { rateValue.Speed } );
-          }
-        }
-        else if( destinationType == typeof( string ) )
-        {
-          return rateValue.ToString();
-        }
-        else if( destinationType == typeof( double ) )
-        {
-          return rateValue.HasSpeed ? rateValue.Speed : 0.0d;
-        }
-        else if( destinationType == typeof( TimeSpan ) )
-        {
-          return rateValue.HasDuration ? rateValue.Duration : TimeSpan.FromSeconds( 0 );
-        }
-      }
-
-      return base.ConvertTo( context, cultureInfo, value, destinationType );
-    }
-  }
-}
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
deleted file mode 100644
index 1cc8fcb1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  [TypeConverter( typeof( IterativeEquationConverter ) )]
-  public class IterativeEquation<T>
-  {
-    #region Constructors
-
-    public IterativeEquation( IterativeAnimationEquationDelegate<T> equation )
-    {
-      _equation = equation;
-    }
-
-    internal IterativeEquation()
-    {
-    }
-
-    #endregion
-
-    public virtual T Evaluate( TimeSpan currentTime, T from, T to, TimeSpan duration )
-    {
-      return _equation( currentTime, from, to, duration );
-    }
-
-    #region Private Fields
-
-    private readonly IterativeAnimationEquationDelegate<T> _equation;
-
-    #endregion
-  }
-}
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
deleted file mode 100644
index dbb3d684..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media.Animation
-{
-  public delegate T IterativeAnimationEquationDelegate<T>( TimeSpan currentTime, T from, T to, TimeSpan duration );
-}
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
deleted file mode 100644
index 57f56b0e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-
-namespace Xceed.Wpf.Toolkit.Media.Animation
-{
-  public class IterativeEquationConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return type == typeof( string );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return type == typeof( IterativeEquation<double> );
-    }
-
-    public override object ConvertFrom( 
-      ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value )
-    {
-      IterativeEquation<double> result = null;
-
-      if( value is string )
-      {
-        switch( value as string )
-        {
-          case "BackEaseIn":
-            result = PennerEquations.BackEaseIn as IterativeEquation<double>;
-            break;
-          case "BackEaseInOut":
-            result = PennerEquations.BackEaseInOut as IterativeEquation<double>;
-            break;
-          case "BackEaseOut":
-            result = PennerEquations.BackEaseOut as IterativeEquation<double>;
-            break;
-          case "BounceEaseIn":
-            result = PennerEquations.BounceEaseIn as IterativeEquation<double>;
-            break;
-          case "BounceEaseInOut":
-            result = PennerEquations.BounceEaseInOut as IterativeEquation<double>;
-            break;
-          case "BounceEaseOut":
-            result = PennerEquations.BounceEaseOut as IterativeEquation<double>;
-            break;
-          case "CircEaseIn":
-            result = PennerEquations.CircEaseIn as IterativeEquation<double>;
-            break;
-          case "CircEaseInOut":
-            result = PennerEquations.CircEaseInOut as IterativeEquation<double>;
-            break;
-          case "CircEaseOut":
-            result = PennerEquations.CircEaseOut as IterativeEquation<double>;
-            break;
-          case "CubicEaseIn":
-            result = PennerEquations.CubicEaseIn as IterativeEquation<double>;
-            break;
-          case "CubicEaseInOut":
-            result = PennerEquations.CubicEaseInOut as IterativeEquation<double>;
-            break;
-          case "CubicEaseOut":
-            result = PennerEquations.CubicEaseOut as IterativeEquation<double>;
-            break;
-          case "ElasticEaseIn":
-            result = PennerEquations.ElasticEaseIn as IterativeEquation<double>;
-            break;
-          case "ElasticEaseInOut":
-            result = PennerEquations.ElasticEaseInOut as IterativeEquation<double>;
-            break;
-          case "ElasticEaseOut":
-            result = PennerEquations.ElasticEaseOut as IterativeEquation<double>;
-            break;
-          case "ExpoEaseIn":
-            result = PennerEquations.ExpoEaseIn as IterativeEquation<double>;
-            break;
-          case "ExpoEaseInOut":
-            result = PennerEquations.ExpoEaseInOut as IterativeEquation<double>;
-            break;
-          case "ExpoEaseOut":
-            result = PennerEquations.ExpoEaseOut as IterativeEquation<double>;
-            break;
-          case "Linear":
-            result = PennerEquations.Linear as IterativeEquation<double>;
-            break;
-          case "QuadEaseIn":
-            result = PennerEquations.QuadEaseIn as IterativeEquation<double>;
-            break;
-          case "QuadEaseInOut":
-            result = PennerEquations.QuadEaseInOut as IterativeEquation<double>;
-            break;
-          case "QuadEaseOut":
-            result = PennerEquations.QuadEaseOut as IterativeEquation<double>;
-            break;
-          case "QuartEaseIn":
-            result = PennerEquations.QuartEaseIn as IterativeEquation<double>;
-            break;
-          case "QuartEaseInOut":
-            result = PennerEquations.QuartEaseInOut as IterativeEquation<double>;
-            break;
-          case "QuartEaseOut":
-            result = PennerEquations.QuartEaseOut as IterativeEquation<double>;
-            break;
-          case "QuintEaseIn":
-            result = PennerEquations.QuintEaseIn as IterativeEquation<double>;
-            break;
-          case "QuintEaseInOut":
-            result = PennerEquations.QuintEaseInOut as IterativeEquation<double>;
-            break;
-          case "QuintEaseOut":
-            result = PennerEquations.QuintEaseOut as IterativeEquation<double>;
-            break;
-          case "SineEaseIn":
-            result = PennerEquations.SineEaseIn as IterativeEquation<double>;
-            break;
-          case "SineEaseInOut":
-            result = PennerEquations.SineEaseInOut as IterativeEquation<double>;
-            break;
-          case "SineEaseOut":
-            result = PennerEquations.SineEaseOut as IterativeEquation<double>;
-            break;
-        }
-      }
-
-      return result;
-    }
-  }
-}
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
deleted file mode 100644
index 41c3a77a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media.Animation
-{
-  public class PennerEquation : IterativeEquation<double>
-  {
-    #region Constructors
-
-    internal PennerEquation( PennerEquationDelegate pennerImpl )
-    {
-      _pennerImpl = pennerImpl;
-    }
-
-    #endregion
-
-    public override double Evaluate( TimeSpan currentTime, double from, double to, TimeSpan duration )
-    {
-      double t = currentTime.TotalSeconds;
-      double b = from;
-      double c = to - from;
-      double d = duration.TotalSeconds;
-
-      return _pennerImpl( t, b, c, d );
-    }
-
-    #region Private Fields
-
-    private readonly PennerEquationDelegate _pennerImpl;
-
-    #endregion
-
-    #region PennerEquationDelegate Delegate
-
-    internal delegate double PennerEquationDelegate( double t, double b, double c, double d );
-
-    #endregion
-  }
-}
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
deleted file mode 100644
index 4b7765a6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
+++ /dev/null
@@ -1,851 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media.Animation
-{
-  public static class PennerEquations
-  {
-    #region BackEaseIn Static Property
-
-    public static PennerEquation BackEaseIn
-    {
-      get
-      {
-        if( _backEaseIn == null )
-        {
-          _backEaseIn = new PennerEquation( BackEaseInImpl );
-        }
-        return _backEaseIn;
-      }
-    }
-
-    private static PennerEquation _backEaseIn;
-
-    #endregion
-
-    #region BackEaseInOut Static Property
-
-    public static PennerEquation BackEaseInOut
-    {
-      get
-      {
-        if( _backEaseInOut == null )
-        {
-          _backEaseInOut = new PennerEquation( BackEaseInOutImpl );
-        }
-        return _backEaseInOut;
-      }
-    }
-
-    private static PennerEquation _backEaseInOut;
-
-    #endregion
-
-    #region BackEaseOut Static Property
-
-    public static PennerEquation BackEaseOut
-    {
-      get
-      {
-        if( _backEaseOut == null )
-        {
-          _backEaseOut = new PennerEquation( BackEaseOutImpl );
-        }
-        return _backEaseOut;
-      }
-    }
-
-    private static PennerEquation _backEaseOut;
-
-    #endregion
-
-    #region BounceEaseIn Static Property
-
-    public static PennerEquation BounceEaseIn
-    {
-      get
-      {
-        if( _bounceEaseIn == null )
-        {
-          _bounceEaseIn = new PennerEquation( BounceEaseInImpl );
-        }
-        return _bounceEaseIn;
-      }
-    }
-
-    private static PennerEquation _bounceEaseIn;
-
-    #endregion
-
-    #region BounceEaseInOut Static Property
-
-    public static PennerEquation BounceEaseInOut
-    {
-      get
-      {
-        if( _bounceEaseInOut == null )
-        {
-          _bounceEaseInOut = new PennerEquation( BounceEaseInOutImpl );
-        }
-        return _bounceEaseInOut;
-      }
-    }
-
-    private static PennerEquation _bounceEaseInOut;
-
-    #endregion
-
-    #region BounceEaseOut Static Property
-
-    public static PennerEquation BounceEaseOut
-    {
-      get
-      {
-        if( _bounceEaseOut == null )
-        {
-          _bounceEaseOut = new PennerEquation( BounceEaseOutImpl );
-        }
-        return _bounceEaseOut;
-      }
-    }
-
-    private static PennerEquation _bounceEaseOut;
-
-    #endregion
-
-    #region CircEaseIn Static Property
-
-    public static PennerEquation CircEaseIn
-    {
-      get
-      {
-        if( _circEaseIn == null )
-        {
-          _circEaseIn = new PennerEquation( CircEaseInImpl );
-        }
-        return _circEaseIn;
-      }
-    }
-
-    private static PennerEquation _circEaseIn;
-
-    #endregion
-
-    #region CircEaseInOut Static Property
-
-    public static PennerEquation CircEaseInOut
-    {
-      get
-      {
-        if( _circEaseInOut == null )
-        {
-          _circEaseInOut = new PennerEquation( CircEaseInOutImpl );
-        }
-        return _circEaseInOut;
-      }
-    }
-
-    private static PennerEquation _circEaseInOut;
-
-    #endregion
-
-    #region CircEaseOut Static Property
-
-    public static PennerEquation CircEaseOut
-    {
-      get
-      {
-        if( _circEaseOut == null )
-        {
-          _circEaseOut = new PennerEquation( CircEaseOutImpl );
-        }
-        return _circEaseOut;
-      }
-    }
-
-    private static PennerEquation _circEaseOut;
-
-    #endregion
-
-    #region CubicEaseIn Static Property
-
-    public static PennerEquation CubicEaseIn
-    {
-      get
-      {
-        if( _cubicEaseIn == null )
-        {
-          _cubicEaseIn = new PennerEquation( CubicEaseInImpl );
-        }
-        return _cubicEaseIn;
-      }
-    }
-
-    private static PennerEquation _cubicEaseIn;
-
-    #endregion
-
-    #region CubicEaseInOut Static Property
-
-    public static PennerEquation CubicEaseInOut
-    {
-      get
-      {
-        if( _cubicEaseInOut == null )
-        {
-          _cubicEaseInOut = new PennerEquation( CubicEaseInOutImpl );
-        }
-        return _cubicEaseInOut;
-      }
-    }
-
-    private static PennerEquation _cubicEaseInOut;
-
-    #endregion
-
-    #region CubicEaseOut Static Property
-
-    public static PennerEquation CubicEaseOut
-    {
-      get
-      {
-        if( _cubicEaseOut == null )
-        {
-          _cubicEaseOut = new PennerEquation( CubicEaseOutImpl );
-        }
-        return _cubicEaseOut;
-      }
-    }
-
-    private static PennerEquation _cubicEaseOut;
-
-    #endregion
-
-    #region ElasticEaseIn Static Property
-
-    public static PennerEquation ElasticEaseIn
-    {
-      get
-      {
-        if( _elasticEaseIn == null )
-        {
-          _elasticEaseIn = new PennerEquation( ElasticEaseInImpl );
-        }
-        return _elasticEaseIn;
-      }
-    }
-
-    private static PennerEquation _elasticEaseIn;
-
-    #endregion
-
-    #region ElasticEaseInOut Static Property
-
-    public static PennerEquation ElasticEaseInOut
-    {
-      get
-      {
-        if( _elasticEaseInOut == null )
-        {
-          _elasticEaseInOut = new PennerEquation( ElasticEaseInOutImpl );
-        }
-        return _elasticEaseInOut;
-      }
-    }
-
-    private static PennerEquation _elasticEaseInOut;
-
-    #endregion
-
-    #region ElasticEaseOut Static Property
-
-    public static PennerEquation ElasticEaseOut
-    {
-      get
-      {
-        if( _elasticEaseOut == null )
-        {
-          _elasticEaseOut = new PennerEquation( ElasticEaseOutImpl );
-        }
-        return _elasticEaseOut;
-      }
-    }
-
-    private static PennerEquation _elasticEaseOut;
-
-    #endregion
-
-    #region ExpoEaseIn Static Property
-
-    public static PennerEquation ExpoEaseIn
-    {
-      get
-      {
-        if( _expoEaseIn == null )
-        {
-          _expoEaseIn = new PennerEquation( ExpoEaseInImpl );
-        }
-        return _expoEaseIn;
-      }
-    }
-
-    private static PennerEquation _expoEaseIn;
-
-    #endregion
-
-    #region ExpoEaseInOut Static Property
-
-    public static PennerEquation ExpoEaseInOut
-    {
-      get
-      {
-        if( _expoEaseInOut == null )
-        {
-          _expoEaseInOut = new PennerEquation( ExpoEaseInOutImpl );
-        }
-        return _expoEaseInOut;
-      }
-    }
-
-    private static PennerEquation _expoEaseInOut;
-
-    #endregion
-
-    #region ExpoEaseOut Static Property
-
-    public static PennerEquation ExpoEaseOut
-    {
-      get
-      {
-        if( _expoEaseOut == null )
-        {
-          _expoEaseOut = new PennerEquation( ExpoEaseOutImpl );
-        }
-        return _expoEaseOut;
-      }
-    }
-
-    private static PennerEquation _expoEaseOut;
-
-    #endregion
-
-    #region Linear Static Property
-
-    public static PennerEquation Linear
-    {
-      get
-      {
-        if( _linear == null )
-        {
-          _linear = new PennerEquation( LinearImpl );
-        }
-        return _linear;
-      }
-    }
-
-    private static PennerEquation _linear;
-
-    #endregion
-
-    #region QuadEaseIn Static Property
-
-    public static PennerEquation QuadEaseIn
-    {
-      get
-      {
-        if( _quadEaseIn == null )
-        {
-          _quadEaseIn = new PennerEquation( QuadEaseInImpl );
-        }
-        return _quadEaseIn;
-      }
-    }
-
-    private static PennerEquation _quadEaseIn;
-
-    #endregion
-
-    #region QuadEaseInOut Static Property
-
-    public static PennerEquation QuadEaseInOut
-    {
-      get
-      {
-        if( _quadEaseInOut == null )
-        {
-          _quadEaseInOut = new PennerEquation( QuadEaseInOutImpl );
-        }
-        return _quadEaseInOut;
-      }
-    }
-
-    private static PennerEquation _quadEaseInOut;
-
-    #endregion
-
-    #region QuadEaseOut Static Property
-
-    public static PennerEquation QuadEaseOut
-    {
-      get
-      {
-        if( _quadEaseOut == null )
-        {
-          _quadEaseOut = new PennerEquation( QuadEaseOutImpl );
-        }
-        return _quadEaseOut;
-      }
-    }
-
-    private static PennerEquation _quadEaseOut;
-
-    #endregion
-
-    #region QuartEaseIn Static Property
-
-    public static PennerEquation QuartEaseIn
-    {
-      get
-      {
-        if( _quartEaseIn == null )
-        {
-          _quartEaseIn = new PennerEquation( QuartEaseInImpl );
-        }
-        return _quartEaseIn;
-      }
-    }
-
-    private static PennerEquation _quartEaseIn;
-
-    #endregion
-
-    #region QuartEaseInOut Static Property
-
-    public static PennerEquation QuartEaseInOut
-    {
-      get
-      {
-        if( _quartEaseInOut == null )
-        {
-          _quartEaseInOut = new PennerEquation( QuartEaseInOutImpl );
-        }
-        return _quartEaseInOut;
-      }
-    }
-
-    private static PennerEquation _quartEaseInOut;
-
-    #endregion
-
-    #region QuartEaseOut Static Property
-
-    public static PennerEquation QuartEaseOut
-    {
-      get
-      {
-        if( _quartEaseOut == null )
-        {
-          _quartEaseOut = new PennerEquation( QuartEaseOutImpl );
-        }
-        return _quartEaseOut;
-      }
-    }
-
-    private static PennerEquation _quartEaseOut;
-
-    #endregion
-
-    #region QuintEaseIn Static Property
-
-    public static PennerEquation QuintEaseIn
-    {
-      get
-      {
-        if( _quintEaseIn == null )
-        {
-          _quintEaseIn = new PennerEquation( QuintEaseInImpl );
-        }
-        return _quintEaseIn;
-      }
-    }
-
-    private static PennerEquation _quintEaseIn;
-
-    #endregion
-
-    #region QuintEaseInOut Static Property
-
-    public static PennerEquation QuintEaseInOut
-    {
-      get
-      {
-        if( _quintEaseInOut == null )
-        {
-          _quintEaseInOut = new PennerEquation( QuintEaseInOutImpl );
-        }
-        return _quintEaseInOut;
-      }
-    }
-
-    private static PennerEquation _quintEaseInOut;
-
-    #endregion
-
-    #region QuintEaseOut Static Property
-
-    public static PennerEquation QuintEaseOut
-    {
-      get
-      {
-        if( _quintEaseOut == null )
-        {
-          _quintEaseOut = new PennerEquation( QuintEaseOutImpl );
-        }
-        return _quintEaseOut;
-      }
-    }
-
-    private static PennerEquation _quintEaseOut;
-
-    #endregion
-
-    #region SineEaseIn Static Property
-
-    public static PennerEquation SineEaseIn
-    {
-      get
-      {
-        if( _sineEaseIn == null )
-        {
-          _sineEaseIn = new PennerEquation( SineEaseInImpl );
-        }
-        return _sineEaseIn;
-      }
-    }
-
-    private static PennerEquation _sineEaseIn;
-
-    #endregion
-
-    #region SineEaseInOut Static Property
-
-    public static PennerEquation SineEaseInOut
-    {
-      get
-      {
-        if( _sineEaseInOut == null )
-        {
-          _sineEaseInOut = new PennerEquation( SineEaseInOutImpl );
-        }
-        return _sineEaseInOut;
-      }
-    }
-
-    private static PennerEquation _sineEaseInOut;
-
-    #endregion
-
-    #region SineEaseOut Static Property
-
-    public static PennerEquation SineEaseOut
-    {
-      get
-      {
-        if( _sineEaseOut == null )
-        {
-          _sineEaseOut = new PennerEquation( SineEaseOutImpl );
-        }
-        return _sineEaseOut;
-      }
-    }
-
-    private static PennerEquation _sineEaseOut;
-
-    #endregion
-
-    #region Back Equations Methods
-
-    private static double BackEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * ( ( t = t / d - 1 ) * t * ( ( 1.70158 + 1 ) * t + 1.70158 ) + 1 ) + b;
-    }
-
-    private static double BackEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t * ( ( 1.70158 + 1 ) * t - 1.70158 ) + b;
-    }
-
-    private static double BackEaseInOutImpl( double t, double b, double c, double d )
-    {
-      double s = 1.70158;
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * ( t * t * ( ( ( s *= ( 1.525 ) ) + 1 ) * t - s ) ) + b;
-      return c / 2 * ( ( t -= 2 ) * t * ( ( ( s *= ( 1.525 ) ) + 1 ) * t + s ) + 2 ) + b;
-    }
-
-    #endregion
-
-    #region Bounce Equations Methods
-
-    private static double BounceEaseOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d ) < ( 1 / 2.75 ) )
-      {
-        return c * ( 7.5625 * t * t ) + b;
-      }
-      else if( t < ( 2 / 2.75 ) )
-      {
-        return c * ( 7.5625 * ( t -= ( 1.5 / 2.75 ) ) * t + .75 ) + b;
-      }
-      else if( t < ( 2.5 / 2.75 ) )
-      {
-        return c * ( 7.5625 * ( t -= ( 2.25 / 2.75 ) ) * t + .9375 ) + b;
-      }
-      else
-      {
-        return c * ( 7.5625 * ( t -= ( 2.625 / 2.75 ) ) * t + .984375 ) + b;
-      }
-    }
-
-    private static double BounceEaseInImpl( double t, double b, double c, double d )
-    {
-      return c - PennerEquations.BounceEaseOutImpl( d - t, 0, c, d ) + b;
-    }
-
-    private static double BounceEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( t < d / 2 )
-      {
-        return PennerEquations.BounceEaseInImpl( t * 2, 0, c, d ) * .5 + b;
-      }
-      else
-      {
-        return PennerEquations.BounceEaseOutImpl( t * 2 - d, 0, c, d ) * .5 + c * .5 + b;
-      }
-    }
-
-    #endregion
-
-    #region Circular Equations Methods
-
-    private static double CircEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * Math.Sqrt( 1 - ( t = t / d - 1 ) * t ) + b;
-    }
-
-    private static double CircEaseInImpl( double t, double b, double c, double d )
-    {
-      return -c * ( Math.Sqrt( 1 - ( t /= d ) * t ) - 1 ) + b;
-    }
-
-    private static double CircEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return -c / 2 * ( Math.Sqrt( 1 - t * t ) - 1 ) + b;
-
-      return c / 2 * ( Math.Sqrt( 1 - ( t -= 2 ) * t ) + 1 ) + b;
-    }
-
-    #endregion
-
-    #region Cubic Equations Methods
-
-    private static double CubicEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * ( ( t = t / d - 1 ) * t * t + 1 ) + b;
-    }
-
-    private static double CubicEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t * t + b;
-    }
-
-    private static double CubicEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * t * t * t + b;
-
-      return c / 2 * ( ( t -= 2 ) * t * t + 2 ) + b;
-    }
-
-    #endregion
-
-    #region Elastic Equations Methods
-
-    private static double ElasticEaseOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d ) == 1 )
-        return b + c;
-
-      double p = d * .3;
-      double s = p / 4;
-
-      return ( c * Math.Pow( 2, -10 * t ) * Math.Sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) + c + b );
-    }
-
-    private static double ElasticEaseInImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d ) == 1 )
-        return b + c;
-
-      double p = d * .3;
-      double s = p / 4;
-
-      return -( c * Math.Pow( 2, 10 * ( t -= 1 ) ) * Math.Sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) ) + b;
-    }
-
-    private static double ElasticEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) == 2 )
-        return b + c;
-
-      double p = d * ( .3 * 1.5 );
-      double s = p / 4;
-
-      if( t < 1 )
-        return -.5 * ( c * Math.Pow( 2, 10 * ( t -= 1 ) ) * Math.Sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) ) + b;
-      return c * Math.Pow( 2, -10 * ( t -= 1 ) ) * Math.Sin( ( t * d - s ) * ( 2 * Math.PI ) / p ) * .5 + c + b;
-    }
-
-    #endregion
-
-    #region Expo Equations Methods
-
-    private static double ExpoEaseOutImpl( double t, double b, double c, double d )
-    {
-      return ( t == d ) ? b + c : c * ( -Math.Pow( 2, -10 * t / d ) + 1 ) + b;
-    }
-
-    private static double ExpoEaseInImpl( double t, double b, double c, double d )
-    {
-      return ( t == 0 ) ? b : c * Math.Pow( 2, 10 * ( t / d - 1 ) ) + b;
-    }
-
-    private static double ExpoEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( t == 0 )
-        return b;
-
-      if( t == d )
-        return b + c;
-
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * Math.Pow( 2, 10 * ( t - 1 ) ) + b;
-
-      return c / 2 * ( -Math.Pow( 2, -10 * --t ) + 2 ) + b;
-    }
-
-    #endregion
-
-    #region Linear Equations Methods
-
-    private static double LinearImpl( double t, double b, double c, double d )
-    {
-      return c * ( t / d ) + b;
-    }
-
-    #endregion
-
-    #region Quad Equations Methods
-
-    private static double QuadEaseOutImpl( double t, double b, double c, double d )
-    {
-      return -c * ( t /= d ) * ( t - 2 ) + b;
-    }
-
-    private static double QuadEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t + b;
-    }
-
-    private static double QuadEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * t * t + b;
-
-      return -c / 2 * ( ( --t ) * ( t - 2 ) - 1 ) + b;
-    }
-
-    #endregion
-
-    #region Quartic Equations Methods
-
-    private static double QuartEaseOutImpl( double t, double b, double c, double d )
-    {
-      return -c * ( ( t = t / d - 1 ) * t * t * t - 1 ) + b;
-    }
-
-    private static double QuartEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t * t * t + b;
-    }
-
-    private static double QuartEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * t * t * t * t + b;
-
-      return -c / 2 * ( ( t -= 2 ) * t * t * t - 2 ) + b;
-    }
-
-    #endregion
-
-    #region Quintic Equations Methods
-
-    private static double QuintEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * ( ( t = t / d - 1 ) * t * t * t * t + 1 ) + b;
-    }
-
-    private static double QuintEaseInImpl( double t, double b, double c, double d )
-    {
-      return c * ( t /= d ) * t * t * t * t + b;
-    }
-
-    private static double QuintEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * t * t * t * t * t + b;
-      return c / 2 * ( ( t -= 2 ) * t * t * t * t + 2 ) + b;
-    }
-
-    #endregion
-
-    #region Sine Equations Methods
-
-    private static double SineEaseOutImpl( double t, double b, double c, double d )
-    {
-      return c * Math.Sin( t / d * ( Math.PI / 2 ) ) + b;
-    }
-
-    private static double SineEaseInImpl( double t, double b, double c, double d )
-    {
-      return -c * Math.Cos( t / d * ( Math.PI / 2 ) ) + c + b;
-    }
-
-    private static double SineEaseInOutImpl( double t, double b, double c, double d )
-    {
-      if( ( t /= d / 2 ) < 1 )
-        return c / 2 * ( Math.Sin( Math.PI * t / 2 ) ) + b;
-
-      return -c / 2 * ( Math.Cos( Math.PI * --t / 2 ) - 2 ) + b;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
deleted file mode 100644
index 7a3f193e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
deleted file mode 100644
index af191752..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class PropertyChangedEventArgs<T> : RoutedEventArgs
-  {
-    #region Constructors
-
-    public PropertyChangedEventArgs( RoutedEvent Event, T oldValue, T newValue )
-      : base()
-    {
-      _oldValue = oldValue;
-      _newValue = newValue;
-      this.RoutedEvent = Event;
-    }
-
-    #endregion
-
-    #region NewValue Property
-
-    public T NewValue
-    {
-      get
-      {
-        return _newValue;
-      }
-    }
-
-    private readonly T _newValue;
-
-    #endregion
-
-    #region OldValue Property
-
-    public T OldValue
-    {
-      get
-      {
-        return _oldValue;
-      }
-    }
-
-    private readonly T _oldValue;
-
-    #endregion
-
-    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
-    {
-      PropertyChangedEventHandler<T> handler = ( PropertyChangedEventHandler<T> )genericHandler;
-      handler( genericTarget, this );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
deleted file mode 100644
index f05278e7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Core
-{
-  public delegate void PropertyChangedEventHandler<T>( object sender, PropertyChangedEventArgs<T> e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
deleted file mode 100644
index 9a5459f7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class QueryTextFromValueEventArgs : EventArgs
-  {
-    public QueryTextFromValueEventArgs( object value, string text )
-    {
-      m_value = value;
-      m_text = text;
-    }
-
-    #region Value Property
-
-    private object m_value;
-
-    public object Value
-    {
-      get { return m_value; }
-    }
-
-    #endregion Value Property
-
-    #region Text Property
-
-    private string m_text;
-
-    public string Text
-    {
-      get { return m_text; }
-      set { m_text = value; }
-    }
-
-    #endregion Text Property
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
deleted file mode 100644
index b4c8ea12..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class QueryValueFromTextEventArgs : EventArgs
-  {
-    public QueryValueFromTextEventArgs( string text, object value )
-    {
-      m_text = text;
-      m_value = value;
-    }
-
-    #region Text Property
-
-    private string m_text;
-
-    public string Text
-    {
-      get { return m_text; }
-    }
-
-    #endregion Text Property
-
-    #region Value Property
-
-    private object m_value;
-
-    public object Value
-    {
-      get { return m_value; }
-      set { m_value = value; }
-    }
-
-    #endregion Value Property
-
-    #region HasParsingError Property
-
-    private bool m_hasParsingError;
-
-    public bool HasParsingError
-    {
-      get { return m_hasParsingError; }
-      set { m_hasParsingError = value; }
-    }
-
-    #endregion HasParsingError Property
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
deleted file mode 100644
index 22eed4df..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-using System.Windows.Documents;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  /// <summary>
-  /// An adorner that can display one and only one UIElement.  
-  /// That element can be a panel, which contains multiple other elements.
-  /// The element is added to the adorner's visual and logical trees, enabling it to 
-  /// particpate in dependency property value inheritance, amongst other things.
-  /// </summary>
-  internal class UIElementAdorner<TElement> : Adorner where TElement : UIElement
-  {
-    #region Fields
-
-    TElement _child = null;
-    double _offsetLeft = 0;
-    double _offsetTop = 0;
-
-    #endregion // Fields
-
-    #region Constructor
-
-    /// <summary>
-    /// Constructor. 
-    /// </summary>
-    /// <param name="adornedElement">The element to which the adorner will be bound.</param>
-    public UIElementAdorner( UIElement adornedElement )
-      : base( adornedElement )
-    {
-    }
-
-    #endregion // Constructor
-
-    #region Public Interface
-
-    #region Child
-
-    /// <summary>
-    /// Gets/sets the child element hosted in the adorner.
-    /// </summary>
-    public TElement Child
-    {
-      get
-      {
-        return _child;
-      }
-      set
-      {
-        if( value == _child )
-          return;
-
-        if( _child != null )
-        {
-          base.RemoveLogicalChild( _child );
-          base.RemoveVisualChild( _child );
-        }
-
-        _child = value;
-
-        if( _child != null )
-        {
-          base.AddLogicalChild( _child );
-          base.AddVisualChild( _child );
-        }
-      }
-    }
-
-    #endregion // Child
-
-    #region GetDesiredTransform
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    /// <param name="transform"></param>
-    /// <returns></returns>
-    public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
-    {
-      GeneralTransformGroup result = new GeneralTransformGroup();
-      result.Children.Add( base.GetDesiredTransform( transform ) );
-      result.Children.Add( new TranslateTransform( _offsetLeft, _offsetTop ) );
-      return result;
-    }
-
-    #endregion // GetDesiredTransform
-
-    #region OffsetLeft
-
-    /// <summary>
-    /// Gets/sets the horizontal offset of the adorner.
-    /// </summary>
-    public double OffsetLeft
-    {
-      get
-      {
-        return _offsetLeft;
-      }
-      set
-      {
-        _offsetLeft = value;
-        UpdateLocation();
-      }
-    }
-
-    #endregion // OffsetLeft
-
-    #region SetOffsets
-
-    /// <summary>
-    /// Updates the location of the adorner in one atomic operation.
-    /// </summary>
-    public void SetOffsets( double left, double top )
-    {
-      _offsetLeft = left;
-      _offsetTop = top;
-      this.UpdateLocation();
-    }
-
-    #endregion // SetOffsets
-
-    #region OffsetTop
-
-    /// <summary>
-    /// Gets/sets the vertical offset of the adorner.
-    /// </summary>
-    public double OffsetTop
-    {
-      get
-      {
-        return _offsetTop;
-      }
-      set
-      {
-        _offsetTop = value;
-        UpdateLocation();
-      }
-    }
-
-    #endregion // OffsetTop
-
-    #endregion // Public Interface
-
-    #region Protected Overrides
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    /// <param name="constraint"></param>
-    /// <returns></returns>
-    protected override Size MeasureOverride( Size constraint )
-    {
-      if( _child == null )
-        return base.MeasureOverride( constraint );
-
-      _child.Measure( constraint );
-      return _child.DesiredSize;
-    }
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    /// <param name="finalSize"></param>
-    /// <returns></returns>
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      if( _child == null )
-        return base.ArrangeOverride( finalSize );
-
-      _child.Arrange( new Rect( finalSize ) );
-      return finalSize;
-    }
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    protected override IEnumerator LogicalChildren
-    {
-      get
-      {
-        ArrayList list = new ArrayList();
-        if( _child != null )
-          list.Add( _child );
-        return list.GetEnumerator();
-      }
-    }
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    /// <param name="index"></param>
-    /// <returns></returns>
-    protected override Visual GetVisualChild( int index )
-    {
-      return _child;
-    }
-
-    /// <summary>
-    /// Override.
-    /// </summary>
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return _child == null ? 0 : 1;
-      }
-    }
-
-    #endregion // Protected Overrides
-
-    #region Private Helpers
-
-    void UpdateLocation()
-    {
-      AdornerLayer adornerLayer = base.Parent as AdornerLayer;
-      if( adornerLayer != null )
-        adornerLayer.Update( base.AdornedElement );
-    }
-
-    #endregion // Private Helpers
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
deleted file mode 100644
index 05be50dc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  static class CalculatorUtilities
-  {
-    public static Calculator.CalculatorButtonType GetCalculatorButtonTypeFromText( string text )
-    {
-      switch( text )
-      {
-        case "0":
-          return Calculator.CalculatorButtonType.Zero;
-        case "1":
-          return Calculator.CalculatorButtonType.One;
-        case "2":
-          return Calculator.CalculatorButtonType.Two;
-        case "3":
-          return Calculator.CalculatorButtonType.Three;
-        case "4":
-          return Calculator.CalculatorButtonType.Four;
-        case "5":
-          return Calculator.CalculatorButtonType.Five;
-        case "6":
-          return Calculator.CalculatorButtonType.Six;
-        case "7":
-          return Calculator.CalculatorButtonType.Seven;
-        case "8":
-          return Calculator.CalculatorButtonType.Eight;
-        case "9":
-          return Calculator.CalculatorButtonType.Nine;
-        case "+":
-          return Calculator.CalculatorButtonType.Add;
-        case "-":
-          return Calculator.CalculatorButtonType.Subtract;
-        case "*":
-          return Calculator.CalculatorButtonType.Multiply;
-        case "/":
-          return Calculator.CalculatorButtonType.Divide;
-        case "%":
-          return Calculator.CalculatorButtonType.Percent;
-        case "\b":
-          return Calculator.CalculatorButtonType.Back;
-        case "\r":
-        case "=":
-          return Calculator.CalculatorButtonType.Equal;
-      }
-
-      //the check for the decimal is not in the switch statement. To help localize we check against the current culture's decimal seperator
-      if( text == CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator )
-        return Calculator.CalculatorButtonType.Decimal;
-
-      //check for the escape key
-      if( text == ( ( char )27 ).ToString() )
-        return Calculator.CalculatorButtonType.Clear;
-
-      return Calculator.CalculatorButtonType.None;
-    }
-
-    public static Button FindButtonByCalculatorButtonType( DependencyObject parent, Calculator.CalculatorButtonType type )
-    {
-      if( parent == null )
-        return null;
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( parent ); i++ )
-      {
-        var child = VisualTreeHelper.GetChild( parent, i );
-        if( child == null )
-          continue;
-
-        object buttonType = child.GetValue( Button.CommandParameterProperty );
-
-        if( buttonType != null && ( Calculator.CalculatorButtonType )buttonType == type )
-        {
-          return child as Button;
-        }
-        else
-        {
-          var result = FindButtonByCalculatorButtonType( child, type );
-
-          if( result != null )
-            return result;
-        }
-      }
-      return null;
-    }
-
-    public static string GetCalculatorButtonContent( Calculator.CalculatorButtonType type )
-    {
-      string content = string.Empty;
-      switch( type )
-      {
-        case Calculator.CalculatorButtonType.Add:
-          content = "+";
-          break;
-        case Calculator.CalculatorButtonType.Back:
-          content = "Back";
-          break;
-        case Calculator.CalculatorButtonType.Cancel:
-          content = "CE";
-          break;
-        case Calculator.CalculatorButtonType.Clear:
-          content = "C";
-          break;
-        case Calculator.CalculatorButtonType.Decimal:
-          content = CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator;
-          break;
-        case Calculator.CalculatorButtonType.Divide:
-          content = "/";
-          break;
-        case Calculator.CalculatorButtonType.Eight:
-          content = "8";
-          break;
-        case Calculator.CalculatorButtonType.Equal:
-          content = "=";
-          break;
-        case Calculator.CalculatorButtonType.Five:
-          content = "5";
-          break;
-        case Calculator.CalculatorButtonType.Four:
-          content = "4";
-          break;
-        case Calculator.CalculatorButtonType.Fraction:
-          content = "1/x";
-          break;
-        case Calculator.CalculatorButtonType.MAdd:
-          content = "M+";
-          break;
-        case Calculator.CalculatorButtonType.MC:
-          content = "MC";
-          break;
-        case Calculator.CalculatorButtonType.MR:
-          content = "MR";
-          break;
-        case Calculator.CalculatorButtonType.MS:
-          content = "MS";
-          break;
-        case Calculator.CalculatorButtonType.MSub:
-          content = "M-";
-          break;
-        case Calculator.CalculatorButtonType.Multiply:
-          content = "*";
-          break;
-        case Calculator.CalculatorButtonType.Nine:
-          content = "9";
-          break;
-        case Calculator.CalculatorButtonType.None:
-          break;
-        case Calculator.CalculatorButtonType.One:
-          content = "1";
-          break;
-        case Calculator.CalculatorButtonType.Percent:
-          content = "%";
-          break;
-        case Calculator.CalculatorButtonType.Seven:
-          content = "7";
-          break;
-        case Calculator.CalculatorButtonType.Negate:
-          content = "+/-";
-          break;
-        case Calculator.CalculatorButtonType.Six:
-          content = "6";
-          break;
-        case Calculator.CalculatorButtonType.Sqrt:
-          content = "Sqrt";
-          break;
-        case Calculator.CalculatorButtonType.Subtract:
-          content = "-";
-          break;
-        case Calculator.CalculatorButtonType.Three:
-          content = "3";
-          break;
-        case Calculator.CalculatorButtonType.Two:
-          content = "2";
-          break;
-        case Calculator.CalculatorButtonType.Zero:
-          content = "0";
-          break;
-      }
-      return content;
-    }
-
-    public static bool IsDigit( Calculator.CalculatorButtonType buttonType )
-    {
-      switch( buttonType )
-      {
-        case Calculator.CalculatorButtonType.Zero:
-        case Calculator.CalculatorButtonType.One:
-        case Calculator.CalculatorButtonType.Two:
-        case Calculator.CalculatorButtonType.Three:
-        case Calculator.CalculatorButtonType.Four:
-        case Calculator.CalculatorButtonType.Five:
-        case Calculator.CalculatorButtonType.Six:
-        case Calculator.CalculatorButtonType.Seven:
-        case Calculator.CalculatorButtonType.Eight:
-        case Calculator.CalculatorButtonType.Nine:
-        case Calculator.CalculatorButtonType.Decimal:
-          return true;
-        default:
-          return false;
-      }
-    }
-
-    public static bool IsMemory( Calculator.CalculatorButtonType buttonType )
-    {
-      switch( buttonType )
-      {
-        case Calculator.CalculatorButtonType.MAdd:
-        case Calculator.CalculatorButtonType.MC:
-        case Calculator.CalculatorButtonType.MR:
-        case Calculator.CalculatorButtonType.MS:
-        case Calculator.CalculatorButtonType.MSub:
-          return true;
-        default:
-          return false;
-      }
-    }
-
-    public static decimal ParseDecimal( string text )
-    {
-      decimal result; 
-      var success = Decimal.TryParse( text, NumberStyles.Any, CultureInfo.CurrentCulture, out result );
-      return success ? result : decimal.Zero;      
-    }
-
-    public static decimal Add( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber + secondNumber;
-    }
-
-    public static decimal Subtract( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber - secondNumber;
-    }
-
-    public static decimal Multiply( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber * secondNumber;
-    }
-
-    public static decimal Divide( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber / secondNumber;
-    }
-
-    public static decimal Percent( decimal firstNumber, decimal secondNumber )
-    {
-      return firstNumber * secondNumber / 100M;
-    }
-
-    public static decimal SquareRoot( decimal operand )
-    {
-      return Convert.ToDecimal( Math.Sqrt( Convert.ToDouble( operand ) ) );
-    }
-
-    public static decimal Fraction( decimal operand )
-    {
-      return 1 / operand;
-    }
-
-    public static decimal Negate( decimal operand )
-    {
-      return operand * -1M;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
deleted file mode 100644
index 48ef9fc9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class ChangeTypeHelper
-  {
-    internal static object ChangeType( object value, Type conversionType, IFormatProvider provider )
-    {
-      if( conversionType == null )
-      {
-        throw new ArgumentNullException( "conversionType" );
-      }
-      if( conversionType == typeof( Guid ) )
-      {
-        return new Guid( value.ToString() );
-      }
-      else if( conversionType == typeof( Guid? ) )
-      {
-        if( value == null )
-          return null;
-        return new Guid( value.ToString() );
-      }
-      else if( conversionType.IsGenericType && conversionType.GetGenericTypeDefinition().Equals( typeof( Nullable<> ) ) )
-      {
-        if( value == null )
-          return null;
-        NullableConverter nullableConverter = new NullableConverter( conversionType );
-        conversionType = nullableConverter.UnderlyingType;
-      }
-
-      return System.Convert.ChangeType( value, conversionType, provider );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
deleted file mode 100644
index c00f05bb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Reflection;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  static class ColorUtilities
-  {
-    public static readonly Dictionary<string, Color> KnownColors = GetKnownColors();
-
-    public static string GetColorName( this Color color )
-    {
-      string colorName = KnownColors.Where( kvp => kvp.Value.Equals( color ) ).Select( kvp => kvp.Key ).FirstOrDefault();
-
-      if( String.IsNullOrEmpty( colorName ) )
-        colorName = color.ToString();
-
-      return colorName;
-    }
-
-    public static string FormatColorString( string stringToFormat, bool isUsingAlphaChannel )
-    {
-      if( !isUsingAlphaChannel && ( stringToFormat.Length == 9 ) )
-        return stringToFormat.Remove( 1, 2 );
-      return stringToFormat;
-    }
-
-    private static Dictionary<string, Color> GetKnownColors()
-    {
-      var colorProperties = typeof( Colors ).GetProperties( BindingFlags.Static | BindingFlags.Public );
-      return colorProperties.ToDictionary( p => p.Name, p => ( Color )p.GetValue( null, null ) );
-    }
-
-    /// <summary>
-    /// Converts an RGB color to an HSV color.
-    /// </summary>
-    /// <param name="r"></param>
-    /// <param name="g"></param>
-    /// <param name="b"></param>
-    /// <returns></returns>
-    public static HsvColor ConvertRgbToHsv( int r, int g, int b )
-    {
-      double delta, min;
-      double h = 0, s, v;
-
-      min = Math.Min( Math.Min( r, g ), b );
-      v = Math.Max( Math.Max( r, g ), b );
-      delta = v - min;
-
-      if( v == 0.0 )
-      {
-        s = 0;
-      }
-      else
-        s = delta / v;
-
-      if( s == 0 )
-        h = 0.0;
-
-      else
-      {
-        if( r == v )
-          h = ( g - b ) / delta;
-        else if( g == v )
-          h = 2 + ( b - r ) / delta;
-        else if( b == v )
-          h = 4 + ( r - g ) / delta;
-
-        h *= 60;
-        if( h < 0.0 )
-          h = h + 360;
-
-      }
-
-      return new HsvColor
-      {
-        H = h,
-        S = s,
-        V = v / 255
-      };
-    }
-
-    /// <summary>
-    ///  Converts an HSV color to an RGB color.
-    /// </summary>
-    /// <param name="h"></param>
-    /// <param name="s"></param>
-    /// <param name="v"></param>
-    /// <returns></returns>
-    public static Color ConvertHsvToRgb( double h, double s, double v )
-    {
-      double r = 0, g = 0, b = 0;
-
-      if( s == 0 )
-      {
-        r = v;
-        g = v;
-        b = v;
-      }
-      else
-      {
-        int i;
-        double f, p, q, t;
-
-        if( h == 360 )
-          h = 0;
-        else
-          h = h / 60;
-
-        i = ( int )Math.Truncate( h );
-        f = h - i;
-
-        p = v * ( 1.0 - s );
-        q = v * ( 1.0 - ( s * f ) );
-        t = v * ( 1.0 - ( s * ( 1.0 - f ) ) );
-
-        switch( i )
-        {
-          case 0:
-            {
-              r = v;
-              g = t;
-              b = p;
-              break;
-            }
-          case 1:
-            {
-              r = q;
-              g = v;
-              b = p;
-              break;
-            }
-          case 2:
-            {
-              r = p;
-              g = v;
-              b = t;
-              break;
-            }
-          case 3:
-            {
-              r = p;
-              g = q;
-              b = v;
-              break;
-            }
-          case 4:
-            {
-              r = t;
-              g = p;
-              b = v;
-              break;
-            }
-          default:
-            {
-              r = v;
-              g = p;
-              b = q;
-              break;
-            }
-        }
-
-      }
-
-      return Color.FromArgb( 255, ( byte )(  Math.Round(r * 255) ), ( byte )(  Math.Round(g * 255) ), ( byte )(  Math.Round(b * 255) ) );
-    }
-
-    /// <summary>
-    /// Generates a list of colors with hues ranging from 0 360 and a saturation and value of 1. 
-    /// </summary>
-    /// <returns></returns>
-    public static List<Color> GenerateHsvSpectrum()
-    {
-      var colorsList = new List<Color>();
-      int hStep = 60;
-
-      for( int h = 0; h < 360; h+= hStep )
-      {
-        colorsList.Add( ColorUtilities.ConvertHsvToRgb( h, 1, 1 ) );
-      }
-
-      colorsList.Add( ColorUtilities.ConvertHsvToRgb( 0, 1, 1 ) );
-
-      return colorsList;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
deleted file mode 100644
index a5ba5140..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  public class ContextMenuUtilities
-  {
-    public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached( "OpenOnMouseLeftButtonClick", typeof( bool ), typeof( ContextMenuUtilities ), new FrameworkPropertyMetadata( false, OpenOnMouseLeftButtonClickChanged ) );
-    public static void SetOpenOnMouseLeftButtonClick( FrameworkElement element, bool value )
-    {
-      element.SetValue( OpenOnMouseLeftButtonClickProperty, value );
-    }
-    public static bool GetOpenOnMouseLeftButtonClick( FrameworkElement element )
-    {
-      return ( bool )element.GetValue( OpenOnMouseLeftButtonClickProperty );
-    }
-
-    public static void OpenOnMouseLeftButtonClickChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var control = sender as FrameworkElement;
-      if( control != null )
-      {
-        if( ( bool )e.NewValue )
-        {
-          control.PreviewMouseLeftButtonDown += ContextMenuUtilities.Control_PreviewMouseLeftButtonDown;
-        }
-        else
-        {
-          control.PreviewMouseLeftButtonDown -= ContextMenuUtilities.Control_PreviewMouseLeftButtonDown;
-        }
-      }
-    }
-
-    private static void Control_PreviewMouseLeftButtonDown( object sender, System.Windows.Input.MouseButtonEventArgs e )
-    {
-      var control = sender as FrameworkElement;
-      if( (control != null) && (control.ContextMenu != null) )
-      {
-        // Get PropertyItemBase parent
-        var parent = VisualTreeHelper.GetParent( control );
-        while( parent != null )
-        {
-          var propertyItemBase = parent as PropertyItemBase;
-          if( propertyItemBase != null )
-          {
-            // Set the ContextMenu.DataContext to the PropertyItem associated to the clicked image.
-            control.ContextMenu.DataContext = propertyItemBase;
-            break;
-          }
-          parent = VisualTreeHelper.GetParent( parent );
-        }
-
-        control.ContextMenu.PlacementTarget = control;
-        control.ContextMenu.IsOpen = true;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
deleted file mode 100644
index 7749a5ea..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 static class DateTimeUtilities
-  {
-    public static DateTime GetContextNow( DateTimeKind kind )
-    {
-      if( kind == DateTimeKind.Unspecified )
-        return DateTime.SpecifyKind( DateTime.Now, DateTimeKind.Unspecified );
-
-      return ( kind == DateTimeKind.Utc )
-        ? DateTime.UtcNow
-        : DateTime.Now;
-    }
-
-    public static bool IsSameDate( DateTime? date1, DateTime? date2 )
-    {
-      if( date1 == null || date2 == null )
-        return false;
-
-      return ( date1.Value.Date == date2.Value.Date );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
deleted file mode 100644
index f77c43bc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Runtime.InteropServices;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class DoubleHelper
-  {
-    public static bool AreVirtuallyEqual( double d1, double d2 )
-    {
-      if( double.IsPositiveInfinity( d1 ) )
-        return double.IsPositiveInfinity( d2 );
-
-      if( double.IsNegativeInfinity( d1 ) )
-        return double.IsNegativeInfinity( d2 );
-
-      if( IsNaN( d1 ) )
-        return IsNaN( d2 );
-
-      double n = d1 - d2;
-      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
-      return ( -d < n ) && ( d > n );
-    }
-
-    public static bool AreVirtuallyEqual( Size s1, Size s2 )
-    {
-      return ( AreVirtuallyEqual( s1.Width, s2.Width )
-          && AreVirtuallyEqual( s1.Height, s2.Height ) );
-    }
-
-    public static bool AreVirtuallyEqual( Point p1, Point p2 )
-    {
-      return ( AreVirtuallyEqual( p1.X, p2.X )
-          && AreVirtuallyEqual( p1.Y, p2.Y ) );
-    }
-
-    public static bool AreVirtuallyEqual( Rect r1, Rect r2 )
-    {
-      return ( AreVirtuallyEqual( r1.TopLeft, r2.TopLeft )
-          && AreVirtuallyEqual( r1.BottomRight, r2.BottomRight ) );
-    }
-
-    public static bool AreVirtuallyEqual( Vector v1, Vector v2 )
-    {
-      return ( AreVirtuallyEqual( v1.X, v2.X )
-          && AreVirtuallyEqual( v1.Y, v2.Y ) );
-    }
-
-    public static bool AreVirtuallyEqual( Segment s1, Segment s2 )
-    {
-      // note: Segment struct already uses "virtually equal" approach
-      return ( s1 == s2 );
-    }
-
-    public static bool IsNaN( double value )
-    {
-      // used reflector to borrow the high performance IsNan function 
-      // from the WPF MS.Internal namespace
-      NanUnion t = new NanUnion();
-      t.DoubleValue = value;
-
-      UInt64 exp = t.UintValue & 0xfff0000000000000;
-      UInt64 man = t.UintValue & 0x000fffffffffffff;
-
-      return ( exp == 0x7ff0000000000000 || exp == 0xfff0000000000000 ) && ( man != 0 );
-    }
-
-    #region NanUnion Nested Types
-
-    [StructLayout( LayoutKind.Explicit )]
-    private struct NanUnion
-    {
-      [FieldOffset( 0 )]
-      internal double DoubleValue;
-      [FieldOffset( 0 )]
-      internal UInt64 UintValue;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
deleted file mode 100644
index 2a6c88cc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class EllipseHelper
-  {
-    public static Point PointOfRadialIntersection( Rect ellipseRect, double angle )
-    {
-      // given by the formula:
-      //
-      // x =  a cos q,
-      // y =  b sin q,
-      //
-      // where a is the elliptical radius along the major axis
-      //       b is the elliptical radius along the minor axis
-      //       q is the central angle from the major axis
-
-      double a = ellipseRect.Width / 2;
-      double b = ellipseRect.Height / 2;
-
-      // since this is WPF, we can assume angle is currently specified in degrees, so convert to radians
-      double q = angle * Math.PI / 180;
-
-      return RectHelper.Center( ellipseRect ) + new Vector( a * Math.Cos( q ), b * Math.Sin( q ) );
-    }
-
-    public static double RadialDistanceFromCenter( Rect ellipseRect, double angle )
-    {
-      // given by the formula:
-      //
-      //              2 2
-      //   2         a b
-      //  r  = -----------------
-      //        2   2     2   2
-      //       a sin q + b cos q
-      //
-      // where a is the elliptical radius along the major axis
-      //       b is the elliptical radius along the minor axis
-      //       q is the central angle from the major axis
-
-      double a = ellipseRect.Width / 2;
-      double b = ellipseRect.Height / 2;
-
-      // since this is WPF, we can assume angle is currently specified in degrees, so convert to radians
-      double q = angle * Math.PI / 180;
-
-      double sinq = Math.Sin( q );
-      double cosq = Math.Cos( q );
-      return Math.Sqrt( ( a * a * b * b ) / ( ( a * a * sinq * sinq ) + ( b * b * cosq * cosq ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
deleted file mode 100644
index 89ff8d8d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index de0e4f27..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media;
-
-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
deleted file mode 100644
index 9ab3ee99..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Toolkit.Core.Utilities
-{
-  internal class KeyboardUtilities
-  {
-    internal static bool IsKeyModifyingPopupState( KeyEventArgs e )
-    {
-      return ( ( ( ( Keyboard.Modifiers & ModifierKeys.Alt ) == ModifierKeys.Alt ) && ( ( e.SystemKey == Key.Down ) || ( e.SystemKey == Key.Up ) ) )
-            || ( e.Key == Key.F4 ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
deleted file mode 100644
index c559e02c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-
-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;
-    }
-
-    internal static Type GetCollectionItemType( Type colType )
-    {
-      Type iCollectionOfT = null;
-      var isCollectionOfT = colType.IsGenericType && (colType.GetGenericTypeDefinition() == typeof( ICollection<> ) );
-      if( isCollectionOfT )
-      {
-        iCollectionOfT = colType;
-      }
-      else
-      {
-        iCollectionOfT = colType.GetInterfaces().FirstOrDefault(( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( ICollection<> ) );
-      }
-
-      return (iCollectionOfT != null)
-        ? iCollectionOfT.GetGenericArguments()[ 0 ]
-        : null;
-    }
-
-    internal static Type[] GetDictionaryItemsType( Type dictType )
-    {
-      var isDict = dictType.IsGenericType 
-        && ((dictType.GetGenericTypeDefinition() == typeof( Dictionary<,>) ) || (dictType.GetGenericTypeDefinition() == typeof( IDictionary<,>) ));
-
-      return isDict
-        ? new Type[] { dictType.GetGenericArguments()[ 0 ], dictType.GetGenericArguments()[ 1 ] }
-        : null;
-    }
-
-    internal static object CreateEditableKeyValuePair( object key, Type keyType, object value, Type valueType )
-    {
-      var itemType = ListUtilities.CreateEditableKeyValuePairType( keyType, valueType );
-      return Activator.CreateInstance( itemType, key, value );
-    }
-
-    internal static Type CreateEditableKeyValuePairType( Type keyType, Type valueType )
-    {
-      //return an EditableKeyValuePair< TKey, TValue> Type from keyType and valueType
-      var itemGenType = typeof( EditableKeyValuePair<,> );
-      Type[] itemGenTypeArgs = { keyType, valueType };
-      return itemGenType.MakeGenericType( itemGenTypeArgs );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
deleted file mode 100644
index 613a3f09..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class PointHelper
-  {
-    public static double DistanceBetween( Point p1, Point p2 )
-    {
-      return Math.Sqrt( Math.Pow( p1.X - p2.X, 2 ) + Math.Pow( p1.Y - p2.Y, 2 ) );
-    }
-
-    public static Point Empty
-    {
-      get
-      {
-        return new Point( double.NaN, double.NaN );
-      }
-    }
-
-    public static bool IsEmpty( Point point )
-    {
-      return DoubleHelper.IsNaN( point.X ) && DoubleHelper.IsNaN( point.Y );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
deleted file mode 100644
index 510b47c0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 028ad56a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class RectHelper
-  {
-    public static Point Center( Rect rect )
-    {
-      return new Point( rect.Left + rect.Width / 2, rect.Top + rect.Height / 2 );
-    }
-
-    public static Nullable<Point> GetNearestPointOfIntersectionBetweenRectAndSegment( Rect rect, Segment segment, Point point )
-    {
-      Nullable<Point> result = null;
-      double distance = double.PositiveInfinity;
-
-      Segment leftIntersection = segment.Intersection( new Segment( rect.BottomLeft, rect.TopLeft ) );
-      Segment topIntersection = segment.Intersection( new Segment( rect.TopLeft, rect.TopRight ) );
-      Segment rightIntersection = segment.Intersection( new Segment( rect.TopRight, rect.BottomRight ) );
-      Segment bottomIntersection = segment.Intersection( new Segment( rect.BottomRight, rect.BottomLeft ) );
-
-      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, leftIntersection, point );
-      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, topIntersection, point );
-      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, rightIntersection, point );
-      RectHelper.AdjustResultForIntersectionWithSide( ref result, ref distance, bottomIntersection, point );
-
-      return result;
-    }
-
-    public static Rect GetRectCenteredOnPoint( Point center, Size size )
-    {
-      return new Rect( new Point( center.X - size.Width / 2, center.Y - size.Height / 2 ), size );
-    }
-
-    private static void AdjustResultForIntersectionWithSide( ref Nullable<Point> result, ref double distance, Segment intersection, Point point )
-    {
-      if( !intersection.IsEmpty )
-      {
-        if( intersection.Contains( point ) )
-        {
-          distance = 0;
-          result = point;
-          return;
-        }
-
-        double p1Distance = PointHelper.DistanceBetween( point, intersection.P1 );
-        double p2Distance = double.PositiveInfinity;
-        if( !intersection.IsPoint )
-        {
-          p2Distance = PointHelper.DistanceBetween( point, intersection.P2 );
-        }
-
-        if( Math.Min( p1Distance, p2Distance ) < distance )
-        {
-          if( p1Distance < p2Distance )
-          {
-            distance = p1Distance;
-            result = intersection.P1;
-          }
-          else
-          {
-            distance = p2Distance;
-            result = intersection.P2;
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
deleted file mode 100644
index e4b4aa8c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class ReflectionHelper
-  {
-    /// <summary>
-    /// Check the existence of the specified public instance (i.e. non static) property against
-    /// the type of the specified source object. If the property is not defined by the type,
-    /// a debug assertion will fail. Typically used to validate the parameter of a 
-    /// RaisePropertyChanged method.
-    /// </summary>
-    /// <param name="sourceObject">The object for which the type will be checked.</param>
-    /// <param name="propertyName">The name of the property.</param>
-    [System.Diagnostics.Conditional( "DEBUG" )]
-    internal static void ValidatePublicPropertyName( object sourceObject, string propertyName )
-    {
-      if( sourceObject == null )
-        throw new ArgumentNullException( "sourceObject" );
-
-      if( propertyName == null )
-        throw new ArgumentNullException( "propertyName" );
-
-      System.Diagnostics.Debug.Assert( sourceObject.GetType().GetProperty( propertyName, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public ) != null,
-        string.Format( "Public property {0} not found on object of type {1}.", propertyName, sourceObject.GetType().FullName ) );
-    }
-
-    /// <summary>
-    /// Check the existence of the specified instance (i.e. non static) property against
-    /// the type of the specified source object. If the property is not defined by the type,
-    /// a debug assertion will fail. Typically used to validate the parameter of a 
-    /// RaisePropertyChanged method.
-    /// </summary>
-    /// <param name="sourceObject">The object for which the type will be checked.</param>
-    /// <param name="propertyName">The name of the property.</param>
-    [System.Diagnostics.Conditional( "DEBUG" )]
-    internal static void ValidatePropertyName( object sourceObject, string propertyName )
-    {
-      if( sourceObject == null )
-        throw new ArgumentNullException( "sourceObject" );
-
-      if( propertyName == null )
-        throw new ArgumentNullException( "propertyName" );
-
-      System.Diagnostics.Debug.Assert( sourceObject.GetType().GetProperty( propertyName, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic ) != null,
-        string.Format( "Public property {0} not found on object of type {1}.", propertyName, sourceObject.GetType().FullName ) );
-    }
-
-    internal static bool TryGetEnumDescriptionAttributeValue( Enum enumeration, out string description )
-    {
-      try
-      {
-        FieldInfo fieldInfo = enumeration.GetType().GetField( enumeration.ToString() );
-        DescriptionAttribute[] attributes = fieldInfo.GetCustomAttributes( typeof( DescriptionAttribute ), true ) as DescriptionAttribute[];
-        if( ( attributes != null ) && ( attributes.Length > 0 ) )
-        {
-          description = attributes[ 0 ].Description;
-          return true;
-        }
-      }
-      catch
-      {
-      }
-
-      description = String.Empty;
-      return false;
-    }
-
-    [DebuggerStepThrough]
-    internal static string GetPropertyOrFieldName( MemberExpression expression )
-    {
-      string propertyOrFieldName;
-      if( !ReflectionHelper.TryGetPropertyOrFieldName( expression, out propertyOrFieldName ) )
-        throw new InvalidOperationException( "Unable to retrieve the property or field name." );
-
-      return propertyOrFieldName;
-    }
-
-    [DebuggerStepThrough]
-    internal static string GetPropertyOrFieldName<TMember>( Expression<Func<TMember>> expression )
-    {
-      string propertyOrFieldName;
-      if( !ReflectionHelper.TryGetPropertyOrFieldName( expression, out propertyOrFieldName ) )
-        throw new InvalidOperationException( "Unable to retrieve the property or field name." );
-
-      return propertyOrFieldName;
-    }
-
-    [DebuggerStepThrough]
-    internal static bool TryGetPropertyOrFieldName( MemberExpression expression, out string propertyOrFieldName )
-    {
-      propertyOrFieldName = null;
-
-      if( expression == null )
-        return false;
-
-      propertyOrFieldName = expression.Member.Name;
-
-      return true;
-    }
-
-    [DebuggerStepThrough]
-    internal static bool TryGetPropertyOrFieldName<TMember>( Expression<Func<TMember>> expression, out string propertyOrFieldName )
-    {
-      propertyOrFieldName = null;
-
-      if( expression == null )
-        return false;
-
-      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
deleted file mode 100644
index 2b80831c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.IO;
-using System.Reflection;
-using System.Resources;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal class ResourceHelper
-  {
-    internal static Stream LoadResourceStream( Assembly assembly, string resId )
-    {
-      string basename = System.IO.Path.GetFileNameWithoutExtension( assembly.ManifestModule.Name ) + ".g";
-      ResourceManager resourceManager = new ResourceManager( basename, assembly );
-
-      // resource names are lower case and contain only forward slashes
-      resId = resId.ToLower();
-      resId = resId.Replace( '\\', '/' );
-      return ( resourceManager.GetObject( resId ) as Stream );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
deleted file mode 100644
index 7467beb3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class RoutedEventHelper
-  {
-    internal static void RaiseEvent( DependencyObject target, RoutedEventArgs args )
-    {
-      if( target is UIElement )
-      {
-        ( target as UIElement ).RaiseEvent( args );
-      }
-      else if( target is ContentElement )
-      {
-        ( target as ContentElement ).RaiseEvent( args );
-      }
-    }
-
-    internal static void AddHandler( DependencyObject element, RoutedEvent routedEvent, Delegate handler )
-    {
-      UIElement uie = element as UIElement;
-      if( uie != null )
-      {
-        uie.AddHandler( routedEvent, handler );
-      }
-      else
-      {
-        ContentElement ce = element as ContentElement;
-        if( ce != null )
-        {
-          ce.AddHandler( routedEvent, handler );
-        }
-      }
-    }
-
-    internal static void RemoveHandler( DependencyObject element, RoutedEvent routedEvent, Delegate handler )
-    {
-      UIElement uie = element as UIElement;
-      if( uie != null )
-      {
-        uie.RemoveHandler( routedEvent, handler );
-      }
-      else
-      {
-        ContentElement ce = element as ContentElement;
-        if( ce != null )
-        {
-          ce.RemoveHandler( routedEvent, handler );
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
deleted file mode 100644
index bf01e59e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
+++ /dev/null
@@ -1,384 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal struct Segment
-  {
-    #region Constructors
-
-    public Segment( Point point )
-    {
-      _p1 = point;
-      _p2 = point;
-      _isP1Excluded = false;
-      _isP2Excluded = false;
-    }
-
-    public Segment( Point p1, Point p2 )
-    {
-      _p1 = p1;
-      _p2 = p2;
-      _isP1Excluded = false;
-      _isP2Excluded = false;
-    }
-
-    public Segment( Point p1, Point p2, bool excludeP1, bool excludeP2 )
-    {
-      _p1 = p1;
-      _p2 = p2;
-      _isP1Excluded = excludeP1;
-      _isP2Excluded = excludeP2;
-    }
-
-    #endregion
-
-    #region Empty Static Properties
-
-    public static Segment Empty
-    {
-      get
-      {
-        Segment result = new Segment( new Point( 0, 0 ) );
-        result._isP1Excluded = true;
-        result._isP2Excluded = true;
-        return result;
-      }
-    }
-
-    #endregion
-
-    #region P1 Property
-
-    public Point P1
-    {
-      get
-      {
-        return _p1;
-      }
-    }
-
-    #endregion
-
-    #region P2 Property
-
-    public Point P2
-    {
-      get
-      {
-        return _p2;
-      }
-    }
-
-    #endregion
-
-    #region IsP1Excluded Property
-
-    public bool IsP1Excluded
-    {
-      get
-      {
-        return _isP1Excluded;
-      }
-    }
-
-    #endregion
-
-    #region IsP2Excluded Property
-
-    public bool IsP2Excluded
-    {
-      get
-      {
-        return _isP2Excluded;
-      }
-    }
-
-    #endregion
-
-    #region IsEmpty Property
-
-    public bool IsEmpty
-    {
-      get
-      {
-        return DoubleHelper.AreVirtuallyEqual( _p1, _p2 ) && ( _isP1Excluded || _isP2Excluded );
-      }
-    }
-
-    #endregion
-
-    #region IsPoint Property
-
-    public bool IsPoint
-    {
-      get
-      {
-        return DoubleHelper.AreVirtuallyEqual( _p1, _p2 );
-      }
-    }
-
-    #endregion
-
-    #region Length Property
-
-    public double Length
-    {
-      get
-      {
-        return ( this.P2 - this.P1 ).Length;
-      }
-    }
-
-    #endregion
-
-    #region Slope Property
-
-    public double Slope
-    {
-      get
-      {
-        return ( this.P2.X == this.P1.X ) ? double.NaN : ( this.P2.Y - this.P1.Y ) / ( this.P2.X - this.P1.X );
-      }
-    }
-
-    #endregion
-
-    public bool Contains( Point point )
-    {
-      if( IsEmpty )
-        return false;
-
-      // if the point is an endpoint, ensure that it is not excluded
-      if( DoubleHelper.AreVirtuallyEqual( _p1, point ) )
-        return _isP1Excluded;
-
-      if( DoubleHelper.AreVirtuallyEqual( _p2, point ) )
-        return _isP2Excluded;
-
-      bool result = false;
-
-      // ensure that a line through P1 and the point is parallel to the current segment
-      if( DoubleHelper.AreVirtuallyEqual( Slope, new Segment( _p1, point ).Slope ) )
-      {
-        // finally, ensure that the point is between the segment's endpoints
-        result = ( point.X >= Math.Min( _p1.X, _p2.X ) )
-              && ( point.X <= Math.Max( _p1.X, _p2.X ) )
-              && ( point.Y >= Math.Min( _p1.Y, _p2.Y ) )
-              && ( point.Y <= Math.Max( _p1.Y, _p2.Y ) );
-      }
-      return result;
-    }
-
-    public bool Contains( Segment segment )
-    {
-      return ( segment == this.Intersection( segment ) );
-    }
-
-    public override bool Equals( object o )
-    {
-      if( !( o is Segment ) )
-        return false;
-
-      Segment other = ( Segment )o;
-
-      // empty segments are always considered equal
-      if( this.IsEmpty )
-        return other.IsEmpty;
-
-      // segments are considered equal if
-      //    1) the endpoints are equal and equally excluded
-      //    2) the opposing endpoints are equal and equally excluded
-      if( DoubleHelper.AreVirtuallyEqual( _p1, other._p1 ) )
-      {
-        return ( DoubleHelper.AreVirtuallyEqual( _p2, other._p2 )
-             && _isP1Excluded == other._isP1Excluded
-             && _isP2Excluded == other._isP2Excluded );
-      }
-      else
-      {
-        return ( DoubleHelper.AreVirtuallyEqual( _p1, other._p2 )
-             && DoubleHelper.AreVirtuallyEqual( _p2, other._p1 )
-             && _isP1Excluded == other._isP2Excluded
-             && _isP2Excluded == other._isP1Excluded );
-      }
-    }
-
-    public override int GetHashCode()
-    {
-      return _p1.GetHashCode() ^ _p2.GetHashCode() ^ _isP1Excluded.GetHashCode() ^ _isP2Excluded.GetHashCode();
-    }
-
-    public Segment Intersection( Segment segment )
-    {
-      // if either segment is empty, the intersection is also empty
-      if( this.IsEmpty || segment.IsEmpty )
-        return Segment.Empty;
-
-      // if the segments are equal, just return a new equal segment
-      if( this == segment )
-        return new Segment( this._p1, this._p2, this._isP1Excluded, this._isP2Excluded );
-
-      // if either segment is a Point, just see if the point is contained in the other segment
-      if( this.IsPoint )
-        return segment.Contains( this._p1 ) ? new Segment( this._p1 ) : Segment.Empty;
-
-      if( segment.IsPoint )
-        return this.Contains( segment._p1 ) ? new Segment( segment._p1 ) : Segment.Empty;
-
-      // okay, no easy answer, so let's do the math...
-      Point p1 = this._p1;
-      Vector v1 = this._p2 - this._p1;
-      Point p2 = segment._p1;
-      Vector v2 = segment._p2 - segment._p1;
-      Vector endpointVector = p2 - p1;
-
-      double xProd = Vector.CrossProduct( v1, v2 );
-
-      // if segments are not parallel, then look for intersection on each segment
-      if( !DoubleHelper.AreVirtuallyEqual( Slope, segment.Slope ) )
-      {
-        // check for intersection on other segment
-        double s = ( Vector.CrossProduct( endpointVector, v1 ) ) / xProd;
-        if( s < 0 || s > 1 )
-          return Segment.Empty;
-
-        // check for intersection on this segment
-        s = ( Vector.CrossProduct( endpointVector, v2 ) ) / xProd;
-        if( s < 0 || s > 1 )
-          return Segment.Empty;
-
-        // intersection of segments is a point
-        return new Segment( p1 + s * v1 );
-      }
-
-      // segments are parallel
-      xProd = Vector.CrossProduct( endpointVector, v1 );
-      if( xProd * xProd > 1.0e-06 * v1.LengthSquared * endpointVector.LengthSquared )
-      {
-        // segments do not intersect
-        return Segment.Empty;
-      }
-
-      // intersection is overlapping segment
-      Segment result = new Segment();
-
-      // to determine the overlapping segment, create reference segments where the endpoints are *not* excluded
-      Segment refThis = new Segment( this._p1, this._p2 );
-      Segment refSegment = new Segment( segment._p1, segment._p2 );
-
-      // check whether this segment is contained in the other segment
-      bool includeThisP1 = refSegment.Contains( refThis._p1 );
-      bool includeThisP2 = refSegment.Contains( refThis._p2 );
-      if( includeThisP1 && includeThisP2 )
-      {
-        result._p1 = this._p1;
-        result._p2 = this._p2;
-        result._isP1Excluded = this._isP1Excluded || !segment.Contains( this._p1 );
-        result._isP2Excluded = this._isP2Excluded || !segment.Contains( this._p2 );
-        return result;
-      }
-
-      // check whether the other segment is contained in this segment
-      bool includeSegmentP1 = refThis.Contains( refSegment._p1 );
-      bool includeSegmentP2 = refThis.Contains( refSegment._p2 );
-      if( includeSegmentP1 && includeSegmentP2 )
-      {
-        result._p1 = segment._p1;
-        result._p2 = segment._p2;
-        result._isP1Excluded = segment._isP1Excluded || !this.Contains( segment._p1 );
-        result._isP2Excluded = segment._isP2Excluded || !this.Contains( segment._p2 );
-        return result;
-      }
-
-      // the intersection must include one endpoint from this segment and one endpoint from the other segment
-      if( includeThisP1 )
-      {
-        result._p1 = this._p1;
-        result._isP1Excluded = this._isP1Excluded || !segment.Contains( this._p1 );
-      }
-      else
-      {
-        result._p1 = this._p2;
-        result._isP1Excluded = this._isP2Excluded || !segment.Contains( this._p2 );
-      }
-      if( includeSegmentP1 )
-      {
-        result._p2 = segment._p1;
-        result._isP2Excluded = segment._isP1Excluded || !this.Contains( segment._p1 );
-      }
-      else
-      {
-        result._p2 = segment._p2;
-        result._isP2Excluded = segment._isP2Excluded || !this.Contains( segment._p2 );
-      }
-      return result;
-    }
-
-    public override string ToString()
-    {
-      string s = base.ToString();
-
-      if( this.IsEmpty )
-      {
-        s = s + ": {Empty}";
-      }
-      else if( this.IsPoint )
-      {
-        s = s + ", Point: " + _p1.ToString();
-      }
-      else
-      {
-        s = s + ": " + _p1.ToString() + ( _isP1Excluded ? " (excl)" : " (incl)" )
-            + " to " + _p2.ToString() + ( _isP2Excluded ? " (excl)" : " (incl)" );
-      }
-
-      return s;
-    }
-
-    #region Operators Methods
-
-    public static bool operator ==( Segment s1, Segment s2 )
-    {
-      if( ( object )s1 == null )
-        return ( object )s2 == null;
-
-      if( ( object )s2 == null )
-        return ( object )s1 == null;
-
-      return s1.Equals( s2 );
-    }
-
-    public static bool operator !=( Segment s1, Segment s2 )
-    {
-      return !( s1 == s2 );
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    private bool _isP1Excluded;
-    private bool _isP2Excluded;
-    private Point _p1;
-    private Point _p2;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
deleted file mode 100644
index 28a1720e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media;
-using System.Windows.Controls.Primitives;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  internal static class TreeHelper
-  {
-    /// <summary>
-    /// Tries its best to return the specified element's parent. It will 
-    /// try to find, in this order, the VisualParent, LogicalParent, LogicalTemplatedParent.
-    /// It only works for Visual, FrameworkElement or FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element to which to return the parent. It will only 
-    /// work if element is a Visual, a FrameworkElement or a FrameworkContentElement.</param>
-    /// <remarks>If the logical parent is not found (Parent), we check the TemplatedParent
-    /// (see FrameworkElement.Parent documentation). But, we never actually witnessed
-    /// this situation.</remarks>
-    public static DependencyObject GetParent( DependencyObject element )
-    {
-      return TreeHelper.GetParent( element, true );
-    }
-
-    private static DependencyObject GetParent( DependencyObject element, bool recurseIntoPopup )
-    {
-      if( recurseIntoPopup )
-      {
-        // Case 126732 : To correctly detect parent of a popup we must do that exception case
-        Popup popup = element as Popup;
-
-        if( ( popup != null ) && ( popup.PlacementTarget != null ) )
-          return popup.PlacementTarget;
-      }
-
-      Visual visual = element as Visual;
-      DependencyObject parent = ( visual == null ) ? null : VisualTreeHelper.GetParent( visual );
-
-      if( parent == null )
-      {
-        // No Visual parent. Check in the logical tree.
-        FrameworkElement fe = element as FrameworkElement;
-
-        if( fe != null )
-        {
-          parent = fe.Parent;
-
-          if( parent == null )
-          {
-            parent = fe.TemplatedParent;
-          }
-        }
-        else
-        {
-          FrameworkContentElement fce = element as FrameworkContentElement;
-
-          if( fce != null )
-          {
-            parent = fce.Parent;
-
-            if( parent == null )
-            {
-              parent = fce.TemplatedParent;
-            }
-          }
-        }
-      }
-
-      return parent;
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins. This element is not checked.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindParent<T>( DependencyObject startingObject ) where T : DependencyObject
-    {
-      return TreeHelper.FindParent<T>( startingObject, false, null );
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins.</param>
-    /// <param name="checkStartingObject">Should the specified startingObject be checked first.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindParent<T>( DependencyObject startingObject, bool checkStartingObject ) where T : DependencyObject
-    {
-      return TreeHelper.FindParent<T>( startingObject, checkStartingObject, null );
-    }
-
-    /// <summary>
-    /// This will search for a parent of the specified type.
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="startingObject">The node where the search begins.</param>
-    /// <param name="checkStartingObject">Should the specified startingObject be checked first.</param>
-    /// <param name="additionalCheck">Provide a callback to check additional properties 
-    /// of the found elements. Can be left Null if no additional criteria are needed.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    /// <example>Button button = TreeHelper.FindParent&lt;Button&gt;( this, foundChild => foundChild.Focusable );</example>
-    public static T FindParent<T>( DependencyObject startingObject, bool checkStartingObject, Func<T, bool> additionalCheck ) where T : DependencyObject
-    {
-      T foundElement;
-      DependencyObject parent = ( checkStartingObject ? startingObject : TreeHelper.GetParent( startingObject, true ) );
-
-      while( parent != null )
-      {
-        foundElement = parent as T;
-
-        if( foundElement != null )
-        {
-          if( additionalCheck == null )
-          {
-            return foundElement;
-          }
-          else
-          {
-            if( additionalCheck( foundElement ) )
-              return foundElement;
-          }
-        }
-
-        parent = TreeHelper.GetParent( parent, true );
-      }
-
-      return null;
-    }
-
-    /// <summary>
-    /// This will search for a child of the specified type. The search is performed 
-    /// hierarchically, breadth first (as opposed to depth first).
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="parent">The root of the tree to search for. This element itself is not checked.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    public static T FindChild<T>( DependencyObject parent ) where T : DependencyObject
-    {
-      return TreeHelper.FindChild<T>( parent, null );
-    }
-
-    /// <summary>
-    /// This will search for a child of the specified type. The search is performed 
-    /// hierarchically, breadth first (as opposed to depth first).
-    /// </summary>
-    /// <typeparam name="T">The type of the element to find</typeparam>
-    /// <param name="parent">The root of the tree to search for. This element itself is not checked.</param>
-    /// <param name="additionalCheck">Provide a callback to check additional properties 
-    /// of the found elements. Can be left Null if no additional criteria are needed.</param>
-    /// <returns>Returns the found element. Null if nothing is found.</returns>
-    /// <example>Button button = TreeHelper.FindChild&lt;Button&gt;( this, foundChild => foundChild.Focusable );</example>
-    public static T FindChild<T>( DependencyObject parent, Func<T, bool> additionalCheck ) where T : DependencyObject
-    {
-      int childrenCount = VisualTreeHelper.GetChildrenCount( parent );
-      T child;
-
-      for( int index = 0; index < childrenCount; index++ )
-      {
-        child = VisualTreeHelper.GetChild( parent, index ) as T;
-
-        if( child != null )
-        {
-          if( additionalCheck == null )
-          {
-            return child;
-          }
-          else
-          {
-            if( additionalCheck( child ) )
-              return child;
-          }
-        }
-      }
-
-      for( int index = 0; index < childrenCount; index++ )
-      {
-        child = TreeHelper.FindChild<T>( VisualTreeHelper.GetChild( parent, index ), additionalCheck );
-
-        if( child != null )
-          return child;
-      }
-
-      return null;
-    }
-
-    /// <summary>
-    /// Returns true if the specified element is a child of parent somewhere in the visual 
-    /// tree. This method will work for Visual, FrameworkElement and FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element that is potentially a child of the specified parent.</param>
-    /// <param name="parent">The element that is potentially a parent of the specified element.</param>
-    public static bool IsDescendantOf( DependencyObject element, DependencyObject parent )
-    {
-      return TreeHelper.IsDescendantOf( element, parent, true );
-    }
-
-    /// <summary>
-    /// Returns true if the specified element is a child of parent somewhere in the visual 
-    /// tree. This method will work for Visual, FrameworkElement and FrameworkContentElement.
-    /// </summary>
-    /// <param name="element">The element that is potentially a child of the specified parent.</param>
-    /// <param name="parent">The element that is potentially a parent of the specified element.</param>
-    public static bool IsDescendantOf( DependencyObject element, DependencyObject parent, bool recurseIntoPopup )
-    {
-      while( element != null )
-      {
-        if( element == parent )
-          return true;
-
-        element = TreeHelper.GetParent( element, recurseIntoPopup );
-      }
-
-      return false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
deleted file mode 100644
index 0c67b3ba..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  /// <summary>
-  /// This helper class will raise events when a specific
-  /// path value on one or many items changes.
-  /// </summary>
-  internal class ValueChangeHelper : DependencyObject
-  {
-
-    #region Value Property
-    /// <summary>
-    /// This private property serves as the target of a binding that monitors the value of the binding
-    /// of each item in the source.
-    /// </summary>
-    private static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( ValueChangeHelper ), new UIPropertyMetadata( null, OnValueChanged ) );
-    private object Value
-    {
-      get
-      {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      ( ( ValueChangeHelper )sender ).RaiseValueChanged();
-    }
-    #endregion
-
-    public event EventHandler ValueChanged;
-
-    #region Constructor
-
-    public ValueChangeHelper(Action changeCallback)
-    {
-      if( changeCallback == null )
-        throw new ArgumentNullException( "changeCallback" );
-
-      this.ValueChanged += ( s, args ) => changeCallback();
-    }
-
-    #endregion
-
-    #region Methods
-
-    public void UpdateValueSource( object sourceItem, string path )
-    {
-      BindingBase binding = null;
-      if( sourceItem != null && path != null )
-      {
-        binding = new Binding( path ) { Source = sourceItem };
-      }
-
-      this.UpdateBinding( binding );
-    }
-
-    public void UpdateValueSource( IEnumerable sourceItems, string path )
-    {
-      BindingBase binding = null;
-      if( sourceItems != null && path != null )
-      {
-        MultiBinding multiBinding = new MultiBinding();
-        multiBinding.Converter = new BlankMultiValueConverter();
-
-        foreach( var item in sourceItems )
-        {
-          multiBinding.Bindings.Add( new Binding( path ) { Source = item } );
-        }
-
-        binding = multiBinding;
-      }
-
-      this.UpdateBinding( binding );
-    }
-
-    private void UpdateBinding( BindingBase binding )
-    {
-      if( binding != null )
-      {
-        BindingOperations.SetBinding( this, ValueChangeHelper.ValueProperty, binding );
-      }
-      else
-      {
-        this.ClearBinding();
-      }
-    }
-
-    private void ClearBinding()
-    {
-      BindingOperations.ClearBinding( this, ValueChangeHelper.ValueProperty );
-    }
-
-    private void RaiseValueChanged()
-    {
-      if( this.ValueChanged != null )
-      {
-        this.ValueChanged( this, EventArgs.Empty );
-      }
-    }
-
-    #endregion
-
-    #region BlankMultiValueConverter private class
-
-    private class BlankMultiValueConverter : IMultiValueConverter
-    {
-      public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-      {
-        // We will not use the result anyway. We just want the change notification to kick in.
-        // Return a new object to have a different value.
-        return new object();
-      }
-
-      public object[] ConvertBack( object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture )
-      {
-        throw new InvalidOperationException();
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
deleted file mode 100644
index b29d30d0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  public static class VisualTreeHelperEx
-  {
-    public static DependencyObject FindAncestorByType( DependencyObject element, Type type, bool specificTypeOnly )
-    {
-      if( element == null )
-        return null;
-
-      if( specificTypeOnly ? ( element.GetType() == type )
-          : ( element.GetType() == type ) || ( element.GetType().IsSubclassOf( type ) ) )
-        return element;
-
-      return VisualTreeHelperEx.FindAncestorByType( VisualTreeHelper.GetParent( element ), type, specificTypeOnly );
-    }
-
-    public static T FindAncestorByType<T>( DependencyObject depObj ) where T : DependencyObject
-    {
-      if( depObj == null )
-      {
-        return default( T );
-      }
-      if( depObj is T )
-      {
-        return ( T )depObj;
-      }
-
-      T parent = default( T );
-
-      parent = VisualTreeHelperEx.FindAncestorByType<T>( VisualTreeHelper.GetParent( depObj ) );
-
-      return parent;
-    }
-
-    public static Visual FindDescendantByName( Visual element, string name )
-    {
-      if( element != null && ( element is FrameworkElement ) && ( element as FrameworkElement ).Name == name )
-        return element;
-
-      Visual foundElement = null;
-      if( element is FrameworkElement )
-        ( element as FrameworkElement ).ApplyTemplate();
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
-      {
-        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
-        foundElement = VisualTreeHelperEx.FindDescendantByName( visual, name );
-        if( foundElement != null )
-          break;
-      }
-
-      return foundElement;
-    }
-
-    public static Visual FindDescendantByType( Visual element, Type type )
-    {
-      return VisualTreeHelperEx.FindDescendantByType( element, type, true );
-    }
-
-    public static Visual FindDescendantByType( Visual element, Type type, bool specificTypeOnly )
-    {
-      if( element == null )
-        return null;
-
-      if( specificTypeOnly ? ( element.GetType() == type )
-          : ( element.GetType() == type ) || ( element.GetType().IsSubclassOf( type ) ) )
-        return element;
-
-      Visual foundElement = null;
-      if( element is FrameworkElement )
-        ( element as FrameworkElement ).ApplyTemplate();
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
-      {
-        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
-        foundElement = VisualTreeHelperEx.FindDescendantByType( visual, type, specificTypeOnly );
-        if( foundElement != null )
-          break;
-      }
-
-      return foundElement;
-    }
-
-    public static T FindDescendantByType<T>( Visual element ) where T : Visual
-    {
-      Visual temp = VisualTreeHelperEx.FindDescendantByType( element, typeof( T ) );
-
-      return ( T )temp;
-    }
-
-    public static Visual FindDescendantWithPropertyValue( Visual element,
-        DependencyProperty dp, object value )
-    {
-      if( element == null )
-        return null;
-
-      if( element.GetValue( dp ).Equals( value ) )
-        return element;
-
-      Visual foundElement = null;
-      if( element is FrameworkElement )
-        ( element as FrameworkElement ).ApplyTemplate();
-
-      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( element ); i++ )
-      {
-        Visual visual = VisualTreeHelper.GetChild( element, i ) as Visual;
-        foundElement = VisualTreeHelperEx.FindDescendantWithPropertyValue( visual, dp, value );
-        if( foundElement != null )
-          break;
-      }
-
-      return foundElement;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
deleted file mode 100644
index 90f32750..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 580cd09b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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/VersionResourceDictionary.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
deleted file mode 100644
index 0ae57913..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-
-namespace Xceed.Wpf.Toolkit.Core
-{
-  public class VersionResourceDictionary : ResourceDictionary, ISupportInitialize
-  {
-    private int _initializingCount;
-    private string _assemblyName;
-    private string _sourcePath;
-
-
-    public VersionResourceDictionary() { }
-
-    public VersionResourceDictionary(string assemblyName, string sourcePath)
-    {
-      ( ( ISupportInitialize )this ).BeginInit();
-      this.AssemblyName = assemblyName;
-      this.SourcePath = sourcePath;
-      ( ( ISupportInitialize )this ).EndInit();
-    }
-
-    public string AssemblyName
-    {
-      get { return _assemblyName; }
-      set 
-      {
-        this.EnsureInitialization();
-        _assemblyName = value; 
-      }
-    }
-
-    public string SourcePath
-    {
-      get { return _sourcePath; }
-      set 
-      {
-        this.EnsureInitialization();
-        _sourcePath = value; 
-      }
-    }
-
-    private void EnsureInitialization()
-    {
-      if( _initializingCount <= 0 )
-        throw new InvalidOperationException( "VersionResourceDictionary properties can only be set while initializing." );
-    }
-
-    void ISupportInitialize.BeginInit()
-    {
-      base.BeginInit();
-      _initializingCount++;
-    }
-
-    void ISupportInitialize.EndInit()
-    {
-      _initializingCount--;
-      Debug.Assert( _initializingCount >= 0 );
-
-      if( _initializingCount <= 0 )
-      {
-        if( this.Source != null )
-          throw new InvalidOperationException( "Source property cannot be initialized on the VersionResourceDictionary" );
-
-        if( string.IsNullOrEmpty( this.AssemblyName ) || string.IsNullOrEmpty( this.SourcePath ) )
-          throw new InvalidOperationException( "AssemblyName and SourcePath must be set during initialization" );
-
-        //Using an absolute path is necessary in VS2015 for themes different than Windows 8.
-        string uriStr = string.Format( @"pack://application:,,,/{0};v{1};component/{2}", this.AssemblyName, _XceedVersionInfo.Version, this.SourcePath );
-        this.Source = new Uri( uriStr, UriKind.Absolute );
-      }
-
-      base.EndInit();
-    }
-
-
-    private enum InitState
-    {
-      NotInitialized,
-      Initializing,
-      Initialized
-    };
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
deleted file mode 100644
index c07e4186..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 169a40a1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
+++ /dev/null
@@ -1,473 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Input;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Primitives;
-#if VS2008
-using Microsoft.Windows.Controls;
-using Microsoft.Windows.Controls.Primitives;
-#endif
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_Calendar, Type = typeof( Calendar ) )]
-  [TemplatePart( Name = PART_TimeUpDown, Type = typeof( TimePicker ) )]
-  public class DateTimePicker : DateTimePickerBase
-  {
-    private const string PART_Calendar = "PART_Calendar";
-    private const string PART_TimeUpDown = "PART_TimeUpDown";
-
-    #region Members
-
-    private Calendar _calendar;
-    private TimePicker _timePicker;
-    private DateTime? _calendarTemporaryDateTime;
-    private DateTime? _calendarIntendedDateTime;
-
-    #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 CalendarDisplayMode
-
-    public static readonly DependencyProperty CalendarDisplayModeProperty = DependencyProperty.Register( "CalendarDisplayMode", typeof( CalendarMode )
-      , typeof( DateTimePicker ), new UIPropertyMetadata( CalendarMode.Month ) );
-    public CalendarMode CalendarDisplayMode
-    {
-      get
-      {
-        return (CalendarMode)GetValue( CalendarDisplayModeProperty );
-      }
-      set
-      {
-        SetValue( CalendarDisplayModeProperty, value );
-      }
-    }
-
-    #endregion //CalendarDisplayMode
-
-    #region CalendarWidth
-
-    public static readonly DependencyProperty CalendarWidthProperty = DependencyProperty.Register( "CalendarWidth", typeof( double )
-      , typeof( DateTimePicker ), new UIPropertyMetadata( 178d ) );
-    public double CalendarWidth
-    {
-      get
-      {
-        return ( double )GetValue( CalendarWidthProperty );
-      }
-      set
-      {
-        SetValue( CalendarWidthProperty, value );
-      }
-    }
-
-    #endregion //CalendarWidth
-
-    #region TimeFormat
-
-    public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register( "TimeFormat", typeof( DateTimeFormat ), typeof( DateTimePicker ), new UIPropertyMetadata( DateTimeFormat.ShortTime ) );
-    public DateTimeFormat TimeFormat
-    {
-      get
-      {
-        return ( DateTimeFormat )GetValue( TimeFormatProperty );
-      }
-      set
-      {
-        SetValue( TimeFormatProperty, value );
-      }
-    }
-
-    #endregion //TimeFormat
-
-    #region TimeFormatString
-
-    public static readonly DependencyProperty TimeFormatStringProperty = DependencyProperty.Register( "TimeFormatString", typeof( string ), typeof( DateTimePicker ), new UIPropertyMetadata( default( String ) ), IsTimeFormatStringValid );
-    public string TimeFormatString
-    {
-      get
-      {
-        return ( string )GetValue( TimeFormatStringProperty );
-      }
-      set
-      {
-        SetValue( TimeFormatStringProperty, value );
-      }
-    }
-
-    private static bool IsTimeFormatStringValid(object value)
-    {
-      return DateTimeUpDown.IsFormatStringValid( value );
-    }
-
-    #endregion //TimeFormatString
-
-    #region TimePickerAllowSpin
-
-    public static readonly DependencyProperty TimePickerAllowSpinProperty = DependencyProperty.Register( "TimePickerAllowSpin", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( true ) );
-    public bool TimePickerAllowSpin
-    {
-      get
-      {
-        return (bool)GetValue( TimePickerAllowSpinProperty );
-      }
-      set
-      {
-        SetValue( TimePickerAllowSpinProperty, value );
-      }
-    }
-
-    #endregion //TimePickerAllowSpin
-
-    #region TimePickerShowButtonSpinner
-
-    public static readonly DependencyProperty TimePickerShowButtonSpinnerProperty = DependencyProperty.Register( "TimePickerShowButtonSpinner", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( true ) );
-    public bool TimePickerShowButtonSpinner
-    {
-      get
-      {
-        return (bool)GetValue( TimePickerShowButtonSpinnerProperty );
-      }
-      set
-      {
-        SetValue( TimePickerShowButtonSpinnerProperty, value );
-      }
-    }
-
-    #endregion //TimePickerShowButtonSpinner
-
-    #region TimePickerVisibility
-
-    public static readonly DependencyProperty TimePickerVisibilityProperty = DependencyProperty.Register( "TimePickerVisibility", typeof( Visibility ), typeof( DateTimePicker ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility TimePickerVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( TimePickerVisibilityProperty );
-      }
-      set
-      {
-        SetValue( TimePickerVisibilityProperty, value );
-      }
-    }
-
-    #endregion //TimePickerVisibility
-
-    #region TimeWatermark
-
-    public static readonly DependencyProperty TimeWatermarkProperty = DependencyProperty.Register( "TimeWatermark", typeof( object ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
-    public object TimeWatermark
-    {
-      get
-      {
-        return ( object )GetValue( TimeWatermarkProperty );
-      }
-      set
-      {
-        SetValue( TimeWatermarkProperty, value );
-      }
-    }
-
-    #endregion //TimeWatermark
-
-    #region TimeWatermarkTemplate
-
-    public static readonly DependencyProperty TimeWatermarkTemplateProperty = DependencyProperty.Register( "TimeWatermarkTemplate", typeof( DataTemplate ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
-    public DataTemplate TimeWatermarkTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( TimeWatermarkTemplateProperty );
-      }
-      set
-      {
-        SetValue( TimeWatermarkTemplateProperty, value );
-      }
-    }
-
-    #endregion //TimeWatermarkTemplate
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static DateTimePicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimePicker ), new FrameworkPropertyMetadata( typeof( DateTimePicker ) ) );
-      UpdateValueOnEnterKeyProperty.OverrideMetadata( typeof( DateTimePicker ), new FrameworkPropertyMetadata( true ) );
-    }
-
-    public DateTimePicker()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _calendar != null )
-        _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
-
-      _calendar = GetTemplateChild( PART_Calendar ) as Calendar;
-
-      if( _calendar != null )
-      {
-        _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
-        _calendar.SelectedDate = Value ?? null;
-        _calendar.DisplayDate = Value ?? this.ContextNow;
-        this.SetBlackOutDates();
-      }
-
-      if( _timePicker != null )
-      {
-        _timePicker.ValueChanged -= this.TimePicker_ValueChanged;
-      }
-      _timePicker = GetTemplateChild( PART_TimeUpDown ) as TimePicker;
-      if( _timePicker != null )
-      {
-        _timePicker.ValueChanged += this.TimePicker_ValueChanged;
-      }
-    }
-
-    protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
-    {
-      if( Mouse.Captured is CalendarItem)
-      {
-        Mouse.Capture( null );
-
-        // Do not close calendar on Year/Month Selection. Close only on Day selection.
-        if( AutoCloseCalendar && (_calendar != null) && ( _calendar.DisplayMode == CalendarMode.Month ) )
-        {
-          ClosePopup( true );
-        }
-      }
-      base.OnPreviewMouseUp( e );
-    }
-
-    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      //The calendar only select the Date part, not the time part.
-      DateTime? newValueDate = (newValue != null) 
-        ? newValue.Value.Date 
-        : (DateTime?)null;
-
-      if( _calendar != null && _calendar.SelectedDate != newValueDate)
-      {
-        _calendar.SelectedDate = newValueDate;
-        _calendar.DisplayDate = newValue.GetValueOrDefault( this.ContextNow );
-      }
-
-      //If we change any part of the datetime without
-      //using the calendar when the actual date is temporary,
-      //clear the temporary value. 
-      if( (_calendar != null) && (_calendarTemporaryDateTime != null) && (newValue != _calendarTemporaryDateTime ))
-      {
-        _calendarTemporaryDateTime = null;
-        _calendarIntendedDateTime = null;
-      }
-
-      base.OnValueChanged( oldValue, newValue );
-    }
-
-    protected override void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      base.OnIsOpenChanged( oldValue, newValue );
-
-      if( !newValue )
-      {
-        _calendarTemporaryDateTime = null;
-        _calendarIntendedDateTime = null;
-      }
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      //if the calendar is open then we don't want to modify the behavior of navigating the calendar control with the Up/Down keys.
-      if( !IsOpen )
-        base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnMaximumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMaximumChanged( oldValue, newValue );
-
-      this.SetBlackOutDates();
-    }
-
-    protected override void OnMinimumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMinimumChanged( oldValue, newValue );
-
-      this.SetBlackOutDates();
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    protected override void HandleKeyDown( object sender, KeyEventArgs e )
-    {
-      // The base call will handle the Ctrl+Down, Enter and Esc keys
-      // in order to open or close the popup.
-      // Do not close the Calendar if the call is handled
-      // by the TimePicker inside the DateTimePicker template.
-      if( IsOpen
-        && ( _timePicker != null)
-        && _timePicker.IsKeyboardFocusWithin
-        && ( _timePicker.IsOpen || e.Handled ) )
-        return;
-
-      base.HandleKeyDown( sender, e );
-    }
-
-    private void TimePicker_ValueChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
-    {
-      e.Handled = true;
-
-      // if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( this.UpdateValueOnEnterKey )
-      {
-        var newTime = e.NewValue as DateTime?;
-        if( newTime != null )
-        {
-          _fireSelectionChangedEvent = false;
-          var currentDate = this.ConvertTextToValue( this.TextBox.Text );
-          var date = currentDate ?? this.ContextNow;
-          var newValue = new DateTime( date.Year, date.Month, date.Day, newTime.Value.Hour, newTime.Value.Minute, newTime.Value.Second, newTime.Value.Millisecond, date.Kind );
-          this.TextBox.Text = newValue.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-          _fireSelectionChangedEvent = true;
-        }
-      }
-    }
-
-    private void Calendar_SelectedDatesChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count > 0 )
-      {
-        var newDate = ( DateTime? )e.AddedItems[ 0 ];
-
-        if( newDate != null )
-        {
-          //The Calendar will always return a date with an "Unspecified" Kind.
-          //Force the expected kind to the value.
-          newDate = DateTime.SpecifyKind( newDate.Value, this.Kind );
-
-          // 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.
-          if( _calendarIntendedDateTime != null )
-          {
-            newDate = newDate.Value.Date + _calendarIntendedDateTime.Value.TimeOfDay;
-            _calendarTemporaryDateTime = null;
-            _calendarIntendedDateTime = null;
-          }
-          else if( Value != null )
-          {
-            newDate = newDate.Value.Date + Value.Value.TimeOfDay;
-          }
-
-          // Always be sure that the time part of the selected value is always 
-          // within the bound of the min max. The time part could be altered
-          // if the calendar's selected date match the Minimum or Maximum date.
-          // Keep in memory the intended time of day, in case that the selected
-          // calendar date is only transitory (browsing the calendar with the keyboard)
-          var limitedDateTime = this.GetClippedMinMaxValue( newDate );
-
-          if( limitedDateTime.Value != newDate.Value )
-          {
-            _calendarTemporaryDateTime = limitedDateTime;
-            _calendarIntendedDateTime = newDate;
-            newDate = limitedDateTime;
-          }
-        }
-
-        if( this.UpdateValueOnEnterKey )
-        {
-          _fireSelectionChangedEvent = false;
-          this.TextBox.Text = newDate.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-          _fireSelectionChangedEvent = true;
-        }
-        else
-        {
-          if( !object.Equals( newDate, Value ) )
-          {
-            this.Value = newDate;
-          }
-        }
-      }
-    }
-
-    protected override void Popup_Opened( object sender, EventArgs e )
-    {
-      base.Popup_Opened( sender, e );
-
-      if( _calendar != null )
-        _calendar.Focus();
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void SetBlackOutDates()
-    {
-      if( _calendar != null )
-      {
-        _calendar.BlackoutDates.Clear();
-
-        if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value != DateTime.MinValue ) )
-        {
-          DateTime minDate = this.Minimum.Value;
-          _calendar.BlackoutDates.Add( new CalendarDateRange( DateTime.MinValue, minDate.AddDays( -1 ) ) );
-        }
-        if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value != DateTime.MaxValue ) )
-        {
-          DateTime maxDate = this.Maximum.Value;
-          _calendar.BlackoutDates.Add( new CalendarDateRange( maxDate.AddDays( 1 ), DateTime.MaxValue ) );
-        }
-      }
-    }
-
-    #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
deleted file mode 100644
index 6334e716..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,275 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </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="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="TimeWatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="CalendarWidth"
-            Value="178" />
-    <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}"
-                                     ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                     HorizontalContentAlignment="Stretch"
-                                     VerticalContentAlignment="Stretch"
-                                     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}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          MinWidth="20"
-                                          AcceptsReturn="False"
-                                          Padding="{TemplateBinding Padding}"
-                                          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}}"
-                              Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
-                </ToggleButton>
-              </Grid>
-              <Popup x:Name="PART_Popup"
-                     IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}"
-                     StaysOpen="False"
-                     ToolTip="{x:Static sys:String.Empty}">
-                <Popup.Resources>
-                  <Style TargetType="ToolTip">
-                    <Style.Triggers>
-                      <Trigger Property="Content"
-                               Value="{x:Static sys:String.Empty}">
-                        <Setter Property="Visibility"
-                                Value="Collapsed" />
-                      </Trigger>
-                    </Style.Triggers>
-                  </Style>
-                </Popup.Resources>
-                <Border BorderThickness="1"
-                        Background="{StaticResource PanelBackgroundBrush}"
-                        BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                        Padding="3">
-                  <StackPanel>
-                    <toolkit:Calendar x:Name="PART_Calendar"
-                                      BorderThickness="0"
-                                      DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
-                      <toolkit:Calendar.Template>
-                        <ControlTemplate TargetType="{x:Type toolkit:Calendar}">
-                          <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
-                            <StackPanel x:Name="PART_Root"
-                                        HorizontalAlignment="Center">
-                              <toolkit:CalendarItem x:Name="PART_CalendarItem"
-                                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                                    Background="{TemplateBinding Background}"
-                                                    Style="{TemplateBinding CalendarItemStyle}" />
-                            </StackPanel>
-                          </Viewbox>
-                        </ControlTemplate>
-                      </toolkit:Calendar.Template>
-                    </toolkit:Calendar>
-                    <local:TimePicker x:Name="PART_TimeUpDown"
-                                      Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                                      Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
-                                      Format="{TemplateBinding TimeFormat}"
-                                      FormatString="{TemplateBinding TimeFormatString}"
-                                      Kind="{Binding Kind, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}}"
-                                      ClipValueToMinMax="{Binding ClipValueToMinMax, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                      AllowSpin="{TemplateBinding TimePickerAllowSpin}"
-                                      Step="{TemplateBinding Step}"
-                                      ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
-                                      Watermark="{TemplateBinding TimeWatermark}"
-                                      WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
-                                      Visibility="{TemplateBinding TimePickerVisibility}" />
-                  </StackPanel>
-                </Border>
-              </Popup>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <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
deleted file mode 100644
index d2e08202..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ /dev/null
@@ -1,283 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <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">
-    <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="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style x:Key="DateTimePickerToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0,2.75,2.75,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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </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="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="TimeWatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="CalendarWidth"
-            Value="178" />
-    <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}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                     HorizontalContentAlignment="Stretch"
-                                     VerticalContentAlignment="Stretch"
-                                     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}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          MinWidth="20"
-                                          AcceptsReturn="False"
-                                          Padding="{TemplateBinding Padding}"
-                                          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}}"
-                              Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
-                </ToggleButton>
-              </Grid>
-              <Popup x:Name="PART_Popup"
-                     IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}"
-                     StaysOpen="False"
-                     ToolTip="{x:Static sys:String.Empty}">
-                <Popup.Resources>
-                  <Style TargetType="ToolTip">
-                    <Style.Triggers>
-                      <Trigger Property="Content"
-                               Value="{x:Static sys:String.Empty}">
-                        <Setter Property="Visibility"
-                                Value="Collapsed" />
-                      </Trigger>
-                    </Style.Triggers>
-                  </Style>
-                </Popup.Resources>
-                <Border BorderThickness="1"
-                        Background="{StaticResource PopupBackgroundBrush}"
-                        BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                        Padding="3">
-                  <StackPanel>
-                    <toolkit:Calendar x:Name="PART_Calendar"
-                                      BorderThickness="0"
-                                      DisplayMode="{Binding CalendarDisplayMode, RelativeSource={RelativeSource TemplatedParent}}">
-                      <toolkit:Calendar.Template>
-                        <ControlTemplate TargetType="{x:Type toolkit:Calendar}">
-                          <Viewbox Width="{Binding CalendarWidth, RelativeSource={RelativeSource AncestorType={x:Type local:DateTimePicker}}}">
-                            <StackPanel x:Name="PART_Root"
-                                        HorizontalAlignment="Center">
-                              <toolkit:CalendarItem x:Name="PART_CalendarItem"
-                                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                                    Background="{TemplateBinding Background}"
-                                                    Style="{TemplateBinding CalendarItemStyle}" />
-                            </StackPanel>
-                          </Viewbox>
-                        </ControlTemplate>
-                      </toolkit:Calendar.Template>
-                    </toolkit:Calendar>
-                    <local:TimePicker x:Name="PART_TimeUpDown"
-                                      Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                                      Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"
-                                      Format="{TemplateBinding TimeFormat}"
-                                      FormatString="{TemplateBinding TimeFormatString}"
-                                      Kind="{Binding Kind, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Minimum="{Binding Minimum, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Maximum="{Binding Maximum, RelativeSource={RelativeSource TemplatedParent}}"
-                                      ClipValueToMinMax="{Binding ClipValueToMinMax, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                      AllowSpin="{TemplateBinding TimePickerAllowSpin}"
-                                      Step="{TemplateBinding Step}"
-                                      ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
-                                      Watermark="{TemplateBinding TimeWatermark}"
-                                      WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
-                                      Visibility="{TemplateBinding TimePickerVisibility}" />
-                  </StackPanel>
-                </Border>
-              </Popup>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <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/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
deleted file mode 100644
index b5bba325..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum DateTimeFormat
-  {
-    Custom,
-    FullDateTime,
-    LongDate,
-    LongTime,
-    MonthDay,
-    RFC1123,
-    ShortDate,
-    ShortTime,
-    SortableDateTime,
-    UniversalSortableDateTime,
-    YearMonth
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
deleted file mode 100644
index 9f17e145..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  internal class DateTimeInfo
-  {
-    public string Content
-    {
-      get;
-      set;
-    }
-    public string Format
-    {
-      get;
-      set;
-    }
-    public bool IsReadOnly
-    {
-      get;
-      set;
-    }
-    public int Length
-    {
-      get;
-      set;
-    }
-    public int StartPosition
-    {
-      get;
-      set;
-    }
-    public DateTimePart Type
-    {
-      get;
-      set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
deleted file mode 100644
index 60cf05cc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class DateTimeParser
-  {
-    public static bool TryParse( string value, string format, DateTime currentDate, CultureInfo cultureInfo, out DateTime result )
-    {
-      bool success = false;
-      result = currentDate;
-
-      if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( format ) )
-        return false;
-
-      var dateTimeString = ComputeDateTimeString( value, format, currentDate, cultureInfo ).Trim();
-
-      if( !String.IsNullOrEmpty( dateTimeString ) )
-        success = DateTime.TryParse( dateTimeString, cultureInfo.DateTimeFormat, DateTimeStyles.None, out result );
-
-      if( !success )
-        result = currentDate;
-
-      return success;
-    }
-
-    private static string ComputeDateTimeString( string dateTime, string format, DateTime currentDate, CultureInfo cultureInfo )
-    {
-      Dictionary<string, string> dateParts = GetDateParts( currentDate, cultureInfo );
-      string[] timeParts = new string[ 3 ] { currentDate.Hour.ToString(), currentDate.Minute.ToString(), currentDate.Second.ToString() };
-      string millisecondsPart = currentDate.Millisecond.ToString();
-      string designator = "";
-      string[] dateTimeSeparators = new string[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
-
-      UpdateSortableDateTimeString( ref dateTime, ref format, cultureInfo );
-
-      var dateTimeParts = new List<string>();
-      var formats = new List<string>();
-      var isContainingDateTimeSeparators = dateTimeSeparators.Any( s => dateTime.Contains( s ) );
-      if( isContainingDateTimeSeparators )
-      {
-        dateTimeParts = dateTime.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
-        formats = format.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
-      }
-      else
-      {
-        string currentformat = "";
-        string currentString = "";
-        var formatArray = format.ToCharArray();
-        for( int i = 0; i < formatArray.Count(); ++i )
-        {
-          var c = formatArray[ i ];
-          if( !currentformat.Contains( c ) )
-          {
-            if( !string.IsNullOrEmpty( currentformat ) )
-            {
-              formats.Add( currentformat );
-              dateTimeParts.Add( currentString );
-            }
-            currentformat = c.ToString();
-            currentString = (i < dateTime.Length) ? dateTime[ i ].ToString() : "";
-          }
-          else
-          {
-            currentformat = string.Concat( currentformat, c );
-            currentString = string.Concat( currentString, (i < dateTime.Length) ? dateTime[ i ] : '\0' );
-          }
-        }
-        if( !string.IsNullOrEmpty( currentformat ) )
-        {
-          formats.Add( currentformat );
-          dateTimeParts.Add( currentString );
-        }
-      }
-
-      //Auto-complete missing date parts
-      if( dateTimeParts.Count < formats.Count )
-      {
-        while( dateTimeParts.Count != formats.Count  )
-        {
-          dateTimeParts.Add( "0" );
-        }
-      }
-
-      //something went wrong
-      if( dateTimeParts.Count != formats.Count )
-        return string.Empty;
-
-      for( int i = 0; i < formats.Count; i++ )
-      {
-        var f = formats[ i ];
-        if( !f.Contains( "ddd" ) && !f.Contains( "GMT" ) )
-        {
-          if( f.Contains( "M" ) )
-            dateParts[ "Month" ] = dateTimeParts[ i ];
-          else if( f.Contains( "d" ) )
-            dateParts[ "Day" ] = dateTimeParts[ i ];
-          else if( f.Contains( "y" ) )
-          {
-            dateParts[ "Year" ] = dateTimeParts[ i ] != "0" ? dateTimeParts[ i ] : "0000";
-
-            if( dateParts[ "Year" ].Length == 2 )
-              dateParts[ "Year" ] = string.Format( "{0}{1}", currentDate.Year / 100, dateParts[ "Year" ] );
-          }
-          else if( f.Contains( "h" ) || f.Contains( "H" ) )
-            timeParts[ 0 ] = dateTimeParts[ i ];
-          else if( f.Contains( "m" ) )
-            timeParts[ 1 ] = dateTimeParts[ i ];
-          else if( f.Contains( "s" ) )
-            timeParts[ 2 ] = dateTimeParts[ i ];
-          else if( f.Contains( "f" ) )
-            millisecondsPart = dateTimeParts[ i ];
-          else if( f.Contains( "t" ) )
-            designator = dateTimeParts[ i ];
-        }
-      }
-
-      var date = string.Join( cultureInfo.DateTimeFormat.DateSeparator, dateParts.Select( x => x.Value ).ToArray() );
-      var time = string.Join( cultureInfo.DateTimeFormat.TimeSeparator, timeParts );
-      time += "." + millisecondsPart; 
-
-      return String.Format( "{0} {1} {2}", date, time, designator );
-    }
-
-    private static void UpdateSortableDateTimeString( ref string dateTime, ref string format, CultureInfo cultureInfo )
-    {
-      if( format == cultureInfo.DateTimeFormat.SortableDateTimePattern )
-      {
-        format = format.Replace( "'", "" ).Replace( "T", " " );
-        dateTime = dateTime.Replace( "'", "" ).Replace( "T", " " );
-      }
-      else if( format == cultureInfo.DateTimeFormat.UniversalSortableDateTimePattern )
-      {
-        format = format.Replace( "'", "" ).Replace( "Z", "" );
-        dateTime = dateTime.Replace( "'", "" ).Replace( "Z", "" );
-      }
-    }
-
-    private static Dictionary<string, string> GetDateParts( DateTime currentDate, CultureInfo cultureInfo )
-    {
-      Dictionary<string, string> dateParts = new Dictionary<string, string>();
-      var dateTimeSeparators = new[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
-      var dateFormatParts = cultureInfo.DateTimeFormat.ShortDatePattern.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
-      dateFormatParts.ForEach( item =>
-      {
-        string key = string.Empty;
-        string value = string.Empty;
-
-        if( item.Contains( "M" ) )
-        {
-          key = "Month";
-          value = currentDate.Month.ToString();
-        }
-        else if( item.Contains( "d" ) )
-        {
-          key = "Day";
-          value = currentDate.Day.ToString();
-        }
-        else if( item.Contains( "y" ) )
-        {
-          key = "Year";
-          value = currentDate.Year.ToString("D4");
-        }
-        if( !dateParts.ContainsKey( key ) )
-        {
-          dateParts.Add( key, value );
-        }
-      } );
-      return dateParts;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
deleted file mode 100644
index bc3b660e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum DateTimePart
-  {
-    Day,
-    DayName,
-    AmPmDesignator,
-    Millisecond,
-    Hour12,
-    Hour24,
-    Minute,
-    Month,
-    MonthName,
-    Other,
-    Period,
-    TimeZone,
-    Second,
-    Year
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
deleted file mode 100644
index 344516f9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ /dev/null
@@ -1,963 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class DateTimeUpDown : DateTimeUpDownBase<DateTime?>
-  {
-    #region Members
-
-    private DateTime? _lastValidDate; //null
-    private bool _setKindInternal = false;
-
-    #endregion
-
-    #region Properties
-
-    #region Format
-
-    public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( DateTimeFormat ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTimeFormat.FullDateTime, OnFormatChanged ) );
-    public DateTimeFormat Format
-    {
-      get
-      {
-        return ( DateTimeFormat )GetValue( FormatProperty );
-      }
-      set
-      {
-        SetValue( FormatProperty, value );
-      }
-    }
-
-    private static void OnFormatChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
-      if( dateTimeUpDown != null )
-        dateTimeUpDown.OnFormatChanged( ( DateTimeFormat )e.OldValue, ( DateTimeFormat )e.NewValue );
-    }
-
-    protected virtual void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat newValue )
-    {
-      FormatUpdated();
-    }
-
-    #endregion //Format
-
-    #region FormatString
-
-    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( DateTimeUpDown ), new UIPropertyMetadata( default( String ), OnFormatStringChanged ), IsFormatStringValid );
-    public string FormatString
-    {
-      get
-      {
-        return ( string )GetValue( FormatStringProperty );
-      }
-      set
-      {
-        SetValue( FormatStringProperty, value );
-      }
-    }
-
-    internal static bool IsFormatStringValid( object value )
-    {
-      try
-      {
-        // Test the format string if it is used.
-        DateTime.MinValue.ToString( ( string )value, CultureInfo.CurrentCulture );
-      }
-      catch
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
-      if( dateTimeUpDown != null )
-        dateTimeUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
-    {
-        FormatUpdated();
-    }
-
-    #endregion //FormatString
-
-    #region Kind
-
-    public static readonly DependencyProperty KindProperty = DependencyProperty.Register( "Kind", typeof( DateTimeKind ), typeof( DateTimeUpDown ), 
-      new FrameworkPropertyMetadata( DateTimeKind.Unspecified, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnKindChanged ) );
-    public DateTimeKind Kind
-    {
-      get
-      {
-        return ( DateTimeKind )GetValue( KindProperty );
-      }
-      set
-      {
-        SetValue( KindProperty, value );
-      }
-    }
-
-    private static void OnKindChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
-      if( dateTimeUpDown != null )
-        dateTimeUpDown.OnKindChanged( ( DateTimeKind )e.OldValue, ( DateTimeKind )e.NewValue );
-    }
-
-    protected virtual void OnKindChanged( DateTimeKind oldValue, DateTimeKind newValue )
-    {
-      //Upate the value based on kind. (Postpone to EndInit if not yet initialized)
-      if( !_setKindInternal
-        && this.Value != null 
-        && this.IsInitialized )
-      {
-        this.Value = this.ConvertToKind( this.Value.Value, newValue );
-      }
-    }
-
-    private void SetKindInternal( DateTimeKind kind )
-    {
-      _setKindInternal = true;
-      try
-      {
-#if VS2008
-        // Warning : Binding could be lost
-        this.Kind = kind;
-#else
-        //We use SetCurrentValue to not erase the possible underlying 
-        //OneWay Binding. (This will also update correctly any
-        //possible TwoWay bindings).
-        this.SetCurrentValue( DateTimeUpDown.KindProperty, kind );
-#endif
-      }
-      finally
-      {
-        _setKindInternal = false;
-      }
-    }
-
-    #endregion //Kind
-
-    #region ContextNow (Private)
-
-    internal DateTime ContextNow
-    {
-      get
-      {
-        return DateTimeUtilities.GetContextNow( this.Kind );
-      }
-    }
-
-    #endregion
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static DateTimeUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( typeof( DateTimeUpDown ) ) );
-      MaximumProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( DateTime.MaxValue ) );
-      MinimumProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( DateTime.MinValue ) );
-      UpdateValueOnEnterKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( true ) );
-    }
-
-    public DateTimeUpDown()
-    {
-      this.Loaded += this.DateTimeUpDown_Loaded;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override bool CommitInput()
-    {
-      bool isSyncValid = this.SyncTextAndValueProperties( true, Text );
-      _lastValidDate = this.Value;
-      return isSyncValid;
-    }
-
-    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
-    {
-      FormatUpdated();
-    }
-
-    protected override void OnIncrement()
-    {
-      if( this.IsCurrentValueValid() )
-      {
-        this.Increment( this.Step );
-      }
-    }    
-
-    protected override void OnDecrement()
-    {
-      if( this.IsCurrentValueValid() )
-      {
-        this.Increment( -this.Step );
-      }
-    }
-
-    protected override void OnTextChanged( string previousValue, string currentValue )
-    {
-      if( !_processTextChanged )
-        return;
-
-      base.OnTextChanged( previousValue, currentValue );
-    }
-
-    protected override DateTime? ConvertTextToValue( string text )
-    {
-      if( string.IsNullOrEmpty( text ) )
-        return null;
-
-      DateTime result;
-      this.TryParseDateTime( text, out result );
-
-      //Do not force "unspecified" to a time-zone specific
-      //parsed text value. This would result in a lost of precision and
-      //corrupt data. Let the value impose the Kind to the
-      //DateTimePicker. 
-      if( this.Kind != DateTimeKind.Unspecified )
-      {
-
-        //Keep the current kind (Local or Utc) 
-        //by imposing it to the parsed text value.
-        //
-        //Note: A parsed UTC text value may be
-        //      adjusted with a Local kind and time.
-        result = this.ConvertToKind( result, this.Kind );
-      }
-
-      if( this.ClipValueToMinMax )
-      {
-        return this.GetClippedMinMaxValue( result );
-      }
-
-      this.ValidateDefaultMinMax( result );
-
-      return result;
-    }
-
-    protected override string ConvertValueToText()
-    {
-      if( Value == null )
-        return string.Empty;
-
-      return Value.Value.ToString( GetFormatString( Format ), CultureInfo );
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-      if( !IsReadOnly )
-      {
-        if( this.IsLowerThan( this.Value, this.Maximum ) || !this.Value.HasValue || !this.Maximum.HasValue )
-          validDirections = validDirections | ValidSpinDirections.Increase;
-
-        if( this.IsGreaterThan( this.Value, this.Minimum ) || !this.Value.HasValue || !this.Minimum.HasValue )
-          validDirections = validDirections | ValidSpinDirections.Decrease;
-      }
-
-      if( this.Spinner != null )
-        this.Spinner.ValidSpinDirection = validDirections;
-    }
-
-    protected override object OnCoerceValue( object newValue )
-    {
-      //Since only changing the "kind" of a date
-      //Ex. "2001-01-01 12:00 AM, Kind=Utc" to "2001-01-01 12:00 AM Kind=Local"
-      //by setting the "Value" property won't trigger a property changed,
-      //but will call this callback (coerce), we update the Kind here.
-      DateTime? value = ( DateTime? )base.OnCoerceValue( newValue );
-
-      //Let the initialized determine the final "kind" value.
-      if(value != null && this.IsInitialized)
-      {
-        //Update kind based on value kind
-        this.SetKindInternal( value.Value.Kind );
-      }
-
-      return value;
-    }
-
-    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      DateTimeInfo info = _selectedDateTimeInfo;
-
-      //this only occurs when the user manually type in a value for the Value Property
-      if( info == null )
-        info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
-
-        //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-        //but only if it is not null
-      if( newValue != null )
-        ParseValueIntoDateTimeInfo( this.Value );
-
-      base.OnValueChanged( oldValue, newValue );
-
-      if( !_isTextChangedFromUI )
-      {
-        _lastValidDate = newValue;
-      }
-
-      if( TextBox != null )
-      {
-        //we loose our selection when the Value is set so we need to reselect it without firing the selection changed event
-        _fireSelectionChangedEvent = false;
-        TextBox.Select( info.StartPosition, info.Length );
-        _fireSelectionChangedEvent = true;
-      }
-    }
-
-    protected override bool IsCurrentValueValid()
-    {
-      DateTime result;
-
-      if( string.IsNullOrEmpty( this.TextBox.Text ) )
-        return true;
-
-      return this.TryParseDateTime( this.TextBox.Text, out result );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-      if( this.Value != null )
-      {
-        DateTimeKind valueKind = this.Value.Value.Kind;
-
-        if( valueKind != this.Kind )
-        {
-          //Conflit between "Kind" property and the "Value.Kind" value.
-          //Priority to the one that is not "Unspecified".
-          if( this.Kind == DateTimeKind.Unspecified )
-          {
-            this.SetKindInternal( valueKind );
-          }
-          else
-          {
-            this.Value = this.ConvertToKind( this.Value.Value, this.Kind );
-          }
-        }
-      }
-    }
-
-    protected override void PerformMouseSelection()
-    {
-      if( this.UpdateValueOnEnterKey )
-      {
-        this.ParseValueIntoDateTimeInfo( this.ConvertTextToValue( this.TextBox.Text ) );
-      }
-      base.PerformMouseSelection();
-    }
-
-    protected internal override void PerformKeyboardSelection( int nextSelectionStart )
-    {
-      if( this.UpdateValueOnEnterKey )
-      {
-        this.ParseValueIntoDateTimeInfo( this.ConvertTextToValue( this.TextBox.Text ) );
-      }
-      base.PerformKeyboardSelection( nextSelectionStart );
-    }
-
-    protected override void InitializeDateTimeInfoList( DateTime? value )
-    {
-      _dateTimeInfoList.Clear();
-      _selectedDateTimeInfo = null;
-
-      string format = GetFormatString( Format );
-
-      if( string.IsNullOrEmpty( format ) )
-        return;
-
-      while( format.Length > 0 )
-      {
-        int elementLength = GetElementLengthByFormat( format );
-        DateTimeInfo info = null;
-
-        switch( format[ 0 ] )
-        {
-          case '"':
-          case '\'':
-            {
-              int closingQuotePosition = format.IndexOf( format[ 0 ], 1 );
-              info = new DateTimeInfo
-              {
-                IsReadOnly = true,
-                Type = DateTimePart.Other,
-                Length = 1,
-                Content = format.Substring( 1, Math.Max( 1, closingQuotePosition - 1 ) )
-              };
-              elementLength = Math.Max( 1, closingQuotePosition + 1 );
-              break;
-            }
-          case 'D':
-          case 'd':
-            {
-              string d = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                d = "%" + d;
-
-              if( elementLength > 2 )
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = true,
-                  Type = DateTimePart.DayName,
-                  Length = elementLength,
-                  Format = d
-                };
-              else
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = false,
-                  Type = DateTimePart.Day,
-                  Length = elementLength,
-                  Format = d
-                };
-              break;
-            }
-          case 'F':
-          case 'f':
-            {
-              string f = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                f = "%" + f;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Millisecond,
-                Length = elementLength,
-                Format = f
-              };
-              break;
-            }
-          case 'h':
-            {
-              string h = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                h = "%" + h;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Hour12,
-                Length = elementLength,
-                Format = h
-              };
-              break;
-            }
-          case 'H':
-            {
-              string H = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                H = "%" + H;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Hour24,
-                Length = elementLength,
-                Format = H
-              };
-              break;
-            }
-          case 'M':
-            {
-              string M = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                M = "%" + M;
-
-              if( elementLength >= 3 )
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = false,
-                  Type = DateTimePart.MonthName,
-                  Length = elementLength,
-                  Format = M
-                };
-              else
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = false,
-                  Type = DateTimePart.Month,
-                  Length = elementLength,
-                  Format = M
-                };
-              break;
-            }
-          case 'S':
-          case 's':
-            {
-              string s = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                s = "%" + s;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Second,
-                Length = elementLength,
-                Format = s
-              };
-              break;
-            }
-          case 'T':
-          case 't':
-            {
-              string t = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                t = "%" + t;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.AmPmDesignator,
-                Length = elementLength,
-                Format = t
-              };
-              break;
-            }
-          case 'Y':
-          case 'y':
-            {
-              string y = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                y = "%" + y;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Year,
-                Length = elementLength,
-                Format = y
-              };
-              break;
-            }
-          case '\\':
-            {
-              if( format.Length >= 2 )
-              {
-                info = new DateTimeInfo
-                {
-                  IsReadOnly = true,
-                  Content = format.Substring( 1, 1 ),
-                  Length = 1,
-                  Type = DateTimePart.Other
-                };
-                elementLength = 2;
-              }
-              break;
-            }
-          case 'g':
-            {
-              string g = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                g = "%" + g;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = true,
-                Type = DateTimePart.Period,
-                Length = elementLength,
-                Format = format.Substring( 0, elementLength )
-              };
-              break;
-            }
-          case 'm':
-            {
-              string m = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                m = "%" + m;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = false,
-                Type = DateTimePart.Minute,
-                Length = elementLength,
-                Format = m
-              };
-              break;
-            }
-          case 'z':
-            {
-              string z = format.Substring( 0, elementLength );
-              if( elementLength == 1 )
-                z = "%" + z;
-
-              info = new DateTimeInfo
-              {
-                IsReadOnly = true,
-                Type = DateTimePart.TimeZone,
-                Length = elementLength,
-                Format = z
-              };
-              break;
-            }
-          default:
-            {
-              elementLength = 1;
-              info = new DateTimeInfo
-              {
-                IsReadOnly = true,
-                Length = 1,
-                Content = format[ 0 ].ToString(),
-                Type = DateTimePart.Other
-              };
-              break;
-            }
-        }
-
-        _dateTimeInfoList.Add( info );
-        format = format.Substring( elementLength );
-      }
-    }
-
-    protected override bool IsLowerThan( DateTime? value1, DateTime? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return (value1.Value < value2.Value);
-    }
-
-    protected override bool IsGreaterThan( DateTime? value1, DateTime? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return (value1.Value > value2.Value);
-    }
-
-    protected override void OnUpdateValueOnEnterKeyChanged( bool oldValue, bool newValue )
-    {
-      throw new NotSupportedException( "DateTimeUpDown controls do not support modifying UpdateValueOnEnterKey property." );
-    }
-
-
-#endregion //Base Class Overrides
-
-    #region Methods
-
-    public void SelectAll()
-    {
-      _fireSelectionChangedEvent = false;
-      TextBox.SelectAll();
-      _fireSelectionChangedEvent = true;
-    }
-
-    private void FormatUpdated()
-    {
-      InitializeDateTimeInfoList( this.Value );
-      if( Value != null )
-        ParseValueIntoDateTimeInfo( this.Value );
-
-      // Update the Text representation of the value.
-      _processTextChanged = false;
-
-      this.SyncTextAndValueProperties( false, null );
-
-      _processTextChanged = true;
-
-    }
-
-    private static int GetElementLengthByFormat( string format )
-    {
-      for( int i = 1; i < format.Length; i++ )
-      {
-        if( String.Compare( format[ i ].ToString(), format[ 0 ].ToString(), false ) != 0 )
-        {
-          return i;
-        }
-      }
-      return format.Length;
-    }
-
-    private void Increment( int step )
-    {
-      _fireSelectionChangedEvent = false;
-
-      var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-      if( currentValue.HasValue )
-      {
-        var newValue = this.UpdateDateTime( currentValue, step );
-        this.TextBox.Text = newValue.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-      }
-      else
-      {
-        this.TextBox.Text = ( this.DefaultValue != null )
-                            ? this.DefaultValue.Value.ToString( this.GetFormatString( this.Format ), this.CultureInfo )
-                            : this.ContextNow.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-      }
-
-      if( this.TextBox != null )
-      {
-        DateTimeInfo info = _selectedDateTimeInfo;
-        //this only occurs when the user manually type in a value for the Value Property
-        if( info == null )
-          info = ( this.CurrentDateTimePart != DateTimePart.Other ) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
-
-        //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-        this.ParseValueIntoDateTimeInfo( this.ConvertTextToValue( this.TextBox.Text ) );
-
-        //we loose our selection when the Value is set so we need to reselect it without firing the selection changed event
-        this.TextBox.Select( info.StartPosition, info.Length );
-      }
-      _fireSelectionChangedEvent = true;
-
-      this.SyncTextAndValueProperties( true, Text );
-    }
-
-    private void ParseValueIntoDateTimeInfo( DateTime? newDate )
-    {
-      string text = string.Empty;
-
-      _dateTimeInfoList.ForEach( info =>
-      {
-        if( info.Format == null )
-        {
-          info.StartPosition = text.Length;
-          info.Length = info.Content.Length;
-          text += info.Content;
-        }
-        else if( newDate != null )
-        {
-          DateTime date = newDate.Value;
-          info.StartPosition = text.Length;
-          info.Content = date.ToString( info.Format, CultureInfo.DateTimeFormat );
-          info.Length = info.Content.Length;
-          text += info.Content;
-        }
-      } );
-    }
-
-    internal string GetFormatString( DateTimeFormat dateTimeFormat )
-    {
-      switch( dateTimeFormat )
-      {
-        case DateTimeFormat.ShortDate:
-          return CultureInfo.DateTimeFormat.ShortDatePattern;
-        case DateTimeFormat.LongDate:
-          return CultureInfo.DateTimeFormat.LongDatePattern;
-        case DateTimeFormat.ShortTime:
-          return CultureInfo.DateTimeFormat.ShortTimePattern;
-        case DateTimeFormat.LongTime:
-          return CultureInfo.DateTimeFormat.LongTimePattern;
-        case DateTimeFormat.FullDateTime:
-          return CultureInfo.DateTimeFormat.FullDateTimePattern;
-        case DateTimeFormat.MonthDay:
-          return CultureInfo.DateTimeFormat.MonthDayPattern;
-        case DateTimeFormat.RFC1123:
-          return CultureInfo.DateTimeFormat.RFC1123Pattern;
-        case DateTimeFormat.SortableDateTime:
-          return CultureInfo.DateTimeFormat.SortableDateTimePattern;
-        case DateTimeFormat.UniversalSortableDateTime:
-          return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
-        case DateTimeFormat.YearMonth:
-          return CultureInfo.DateTimeFormat.YearMonthPattern;
-        case DateTimeFormat.Custom:
-          {
-            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" );
-      }
-    }
-
-    private DateTime? UpdateDateTime( DateTime? currentDateTime, int value )
-    {
-      DateTimeInfo info = _selectedDateTimeInfo;
-
-      //this only occurs when the user manually type in a value for the Value Property
-      if( info == null )
-        info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
-
-      DateTime? result = null;
-
-      try
-      {
-        switch( info.Type )
-        {
-          case DateTimePart.Year:
-            {
-              result = ( ( DateTime )currentDateTime).AddYears( value );
-              break;
-            }
-          case DateTimePart.Month:
-          case DateTimePart.MonthName:
-            {
-              result = ( ( DateTime )currentDateTime).AddMonths( value );
-              break;
-            }
-          case DateTimePart.Day:
-          case DateTimePart.DayName:
-            {
-              result = ( ( DateTime )currentDateTime).AddDays( value );
-              break;
-            }
-          case DateTimePart.Hour12:
-          case DateTimePart.Hour24:
-            {
-              result = ( ( DateTime )currentDateTime).AddHours( value );
-              break;
-            }
-          case DateTimePart.Minute:
-            {
-              result = ( ( DateTime )currentDateTime).AddMinutes( value );
-              break;
-            }
-          case DateTimePart.Second:
-            {
-              result = ( ( DateTime )currentDateTime).AddSeconds( value );
-              break;
-            }
-          case DateTimePart.Millisecond:
-            {
-              result = ( ( DateTime )currentDateTime).AddMilliseconds( value );
-              break;
-            }
-          case DateTimePart.AmPmDesignator:
-            {
-              result = ( ( DateTime )currentDateTime).AddHours( value * 12 );
-              break;
-            }
-          default:
-            {
-              break;
-            }
-        }
-      }
-      catch
-      {
-        //this can occur if the date/time = 1/1/0001 12:00:00 AM which is the smallest date allowed.
-        //I could write code that would validate the date each and everytime but I think that it would be more
-        //efficient if I just handle the edge case and allow an exeption to occur and swallow it instead.
-      }
-
-      return this.CoerceValueMinMax( result );
-    }
-
-    private bool TryParseDateTime( string text, out DateTime result )
-    {
-      bool isValid = false;
-      result = this.ContextNow;
-
-      DateTime current = this.ContextNow;
-      try
-      {
-        current = (this.Value.HasValue)
-                    ? this.Value.Value
-                    : DateTime.Parse( this.ContextNow.ToString(), this.CultureInfo.DateTimeFormat );
-
-        isValid = DateTimeParser.TryParse( text, this.GetFormatString( Format ), current, this.CultureInfo, out result );
-      }
-      catch( FormatException )
-      {
-        isValid = false;
-      }
-
-      if( !isValid )
-      {
-        isValid = DateTime.TryParseExact( text, this.GetFormatString( this.Format ), this.CultureInfo, DateTimeStyles.None, out result );
-      }
-
-      if( !isValid )
-      {
-        result = ( _lastValidDate != null ) ? _lastValidDate.Value : current;
-      }
-
-      return isValid;
-    }
-
-    private DateTime ConvertToKind( DateTime dateTime, DateTimeKind kind )
-    {
-      //Same kind, just return same value.
-      if( kind == dateTime.Kind )
-        return dateTime;
-
-      //"ToLocalTime()" from an unspecified will assume
-      // That the time was originaly Utc and affect the datetime value. 
-      // Just "Force" the "Kind" instead.
-      if( dateTime.Kind == DateTimeKind.Unspecified 
-        || kind == DateTimeKind.Unspecified )
-        return DateTime.SpecifyKind( dateTime, kind );
-
-      return ( kind == DateTimeKind.Local )
-         ? dateTime.ToLocalTime()
-         : dateTime.ToUniversalTime();
-    }
-
-    #endregion //Methods
-
-    #region Event Handlers
-
-    private void DateTimeUpDown_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( ( this.Format == DateTimeFormat.Custom ) && ( string.IsNullOrEmpty( this.FormatString ) ) )
-      {
-        throw new InvalidOperationException( "A FormatString is necessary when Format is set to Custom." );
-      }
-    }
-
-    #endregion
-  }
-}
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
deleted file mode 100644
index e60fb629..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 x:Key="DateTimeUpDown" 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="IsTabStop" Value="False"/>
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <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}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                    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}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          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>
-                     <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                           <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                           <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                     </MultiDataTrigger>
-                     <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                  Value="True">
-                        <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                     </DataTrigger>
-                     <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>
-
-    <Style TargetType="{x:Type local:DateTimeUpDown}" BasedOn="{StaticResource DateTimeUpDown}" />
-
-</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
deleted file mode 100644
index bae925ff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="Gray"
-                      Focusable="False"
-                      Margin="0,0,3,0" />
-   </DataTemplate>
-
-   <!-- =============================================================================== -->
-   <!-- DateTimeUpDown                                                                  -->
-   <!-- =============================================================================== -->
-
-   <Style x:Key="DateTimeUpDown"
-          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="IsTabStop"
-              Value="False" />
-      <Setter Property="TextAlignment"
-              Value="Right" />
-      <Setter Property="WatermarkTemplate"
-              Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-      <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}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                    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}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          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="IsFocused"
-                           Value="True">
-                     <Setter TargetName="PART_TextBox"
-                             Property="FocusManager.FocusedElement"
-                             Value="{Binding ElementName=PART_TextBox}" />
-                  </Trigger>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                        <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </MultiDataTrigger>
-                  <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                               Value="True">
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </DataTrigger>
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-                     <Setter Property="Foreground"
-                             Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type local:DateTimeUpDown}"
-          BasedOn="{StaticResource DateTimeUpDown}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
deleted file mode 100644
index 11b77e7a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
+++ /dev/null
@@ -1,562 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_DropDownButton, Type = typeof( ToggleButton ) )]
-  [TemplatePart( Name = PART_ContentPresenter, Type = typeof( ContentPresenter ) )]
-  [TemplatePart( Name = PART_Popup, Type = typeof( Popup ) )]
-  public class DropDownButton : ContentControl, ICommandSource
-  {
-    private const string PART_DropDownButton = "PART_DropDownButton";
-    private const string PART_ContentPresenter = "PART_ContentPresenter";
-    private const string PART_Popup = "PART_Popup";
-
-    #region Members 
-
-    private ContentPresenter _contentPresenter;
-    private Popup _popup;
-
-    #endregion
-
-    #region Constructors
-
-    static DropDownButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DropDownButton ), new FrameworkPropertyMetadata( typeof( DropDownButton ) ) );
-
-      EventManager.RegisterClassHandler( typeof( DropDownButton ), AccessKeyManager.AccessKeyPressedEvent, new AccessKeyPressedEventHandler( OnAccessKeyPressed ) );
-    }
-
-    public DropDownButton()
-    {
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    private System.Windows.Controls.Primitives.ButtonBase _button;
-    protected System.Windows.Controls.Primitives.ButtonBase Button
-    {
-      get
-      {
-        return _button;
-      }
-      set
-      {
-        if( _button != null )
-          _button.Click -= DropDownButton_Click;
-
-        _button = value;
-
-        if( _button != null )
-          _button.Click += DropDownButton_Click;
-      }
-    }
-
-    #region DropDownContent
-
-    public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register( "DropDownContent", typeof( object ), typeof( DropDownButton ), new UIPropertyMetadata( null, OnDropDownContentChanged ) );
-    public object DropDownContent
-    {
-      get
-      {
-        return ( object )GetValue( DropDownContentProperty );
-      }
-      set
-      {
-        SetValue( DropDownContentProperty, value );
-      }
-    }
-
-    private static void OnDropDownContentChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DropDownButton dropDownButton = o as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnDropDownContentChanged( ( object )e.OldValue, ( object )e.NewValue );
-    }
-
-    protected virtual void OnDropDownContentChanged( object oldValue, object newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion //DropDownContent
-
-    #region DropDownContentBackground
-
-    public static readonly DependencyProperty DropDownContentBackgroundProperty = DependencyProperty.Register( "DropDownContentBackground", typeof( Brush ), typeof( DropDownButton ), new UIPropertyMetadata( null ) );
-    public Brush DropDownContentBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( DropDownContentBackgroundProperty );
-      }
-      set
-      {
-        SetValue( DropDownContentBackgroundProperty, value );
-      }
-    }
-
-    #endregion //DropDownContentBackground
-
-    #region DropDownPosition
-
-    public static readonly DependencyProperty DropDownPositionProperty = DependencyProperty.Register( "DropDownPosition", typeof( PlacementMode )
-      , typeof( DropDownButton ), new UIPropertyMetadata( PlacementMode.Bottom ) );
-    public PlacementMode DropDownPosition
-    {
-      get
-      {
-        return (PlacementMode)GetValue( DropDownPositionProperty );
-      }
-      set
-      {
-        SetValue( DropDownPositionProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsDefault
-
-    public static readonly DependencyProperty IsDefaultProperty = DependencyProperty.Register( "IsDefault", typeof( bool ), typeof( DropDownButton ), new UIPropertyMetadata( false, OnIsDefaultChanged ) );
-    public bool IsDefault
-    {
-      get
-      {
-        return ( bool )GetValue( IsDefaultProperty );
-      }
-      set
-      {
-        SetValue( IsDefaultProperty, value );
-      }
-    }
-
-    private static void OnIsDefaultChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var dropDownButton = o as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnIsDefaultChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsDefaultChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-      {
-        AccessKeyManager.Register( "\r", this );
-      }
-      else
-      {
-        AccessKeyManager.Unregister( "\r", this );
-      }
-    }
-
-    #endregion //IsDefault
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DropDownButton ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DropDownButton dropDownButton = o as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-        RaiseRoutedEvent( DropDownButton.OpenedEvent );
-      else
-        RaiseRoutedEvent( DropDownButton.ClosedEvent );
-    }
-
-    #endregion //IsOpen
-
-    #region MaxDropDownHeight
-
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double )
-      , typeof( DropDownButton ), new UIPropertyMetadata( SystemParameters.PrimaryScreenHeight / 2.0, OnMaxDropDownHeightChanged ) );
-    public double MaxDropDownHeight
-    {
-      get
-      {
-        return (double)GetValue( MaxDropDownHeightProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownHeightProperty, value );
-      }
-    }
-
-    private static void OnMaxDropDownHeightChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var dropDownButton = o as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnMaxDropDownHeightChanged( (double)e.OldValue, (double)e.NewValue );
-    }
-
-    protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion
-
-    #endregion //Properties
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      this.Button = this.GetTemplateChild( PART_DropDownButton ) as ToggleButton;
-
-      _contentPresenter = GetTemplateChild( PART_ContentPresenter ) as ContentPresenter;
-
-      if( _popup != null )
-        _popup.Opened -= Popup_Opened;
-
-      _popup = GetTemplateChild( PART_Popup ) as Popup;
-
-      if( _popup != null )
-        _popup.Opened += Popup_Opened;
-    }
-
-    protected override void OnIsKeyboardFocusWithinChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnIsKeyboardFocusWithinChanged( e );
-      if( !( bool )e.NewValue )
-      {
-        this.CloseDropDown( false );
-      }
-    }
-
-    protected override void OnGotFocus( RoutedEventArgs e )
-    {
-      base.OnGotFocus( e );
-      if( this.Button != null )
-      {
-        this.Button.Focus();
-      }
-    }
-
-    protected override void OnAccessKey( AccessKeyEventArgs e )
-    {
-      if( e.IsMultiple )
-      {
-        base.OnAccessKey( e );
-      }
-      else
-      {
-        this.OnClick();
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Events
-
-    public static readonly RoutedEvent ClickEvent = EventManager.RegisterRoutedEvent( "Click", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
-    public event RoutedEventHandler Click
-    {
-      add
-      {
-        AddHandler( ClickEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ClickEvent, value );
-      }
-    }
-
-    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "Opened", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
-    public event RoutedEventHandler Opened
-    {
-      add
-      {
-        AddHandler( OpenedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( OpenedEvent, value );
-      }
-    }
-
-    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "Closed", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
-    public event RoutedEventHandler Closed
-    {
-      add
-      {
-        AddHandler( ClosedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ClosedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Event Handlers
-
-    private static void OnAccessKeyPressed( object sender, AccessKeyPressedEventArgs e )
-    {
-      if( !e.Handled && ( e.Scope == null ) && ( e.Target == null ) )
-      {
-        e.Target = sender as DropDownButton;
-      }
-    }
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          // ContentPresenter items will get focus in Popup_Opened().
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Escape )
-        {
-          CloseDropDown( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseDropDown( true );
-    }
-
-    private void DropDownButton_Click( object sender, RoutedEventArgs e )
-    {
-      OnClick();
-    }
-
-    void CanExecuteChanged( object sender, EventArgs e )
-    {
-      CanExecuteChanged();
-    }
-
-    private void Popup_Opened( object sender, EventArgs e )
-    {
-      // Set the focus on the content of the ContentPresenter.
-      if( _contentPresenter != null )
-      {
-        _contentPresenter.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void CanExecuteChanged()
-    {
-      if( Command != null )
-      {
-        RoutedCommand command = Command as RoutedCommand;
-
-        // If a RoutedCommand.
-        if( command != null )
-          IsEnabled = command.CanExecute( CommandParameter, CommandTarget ) ? true : false;
-        // If a not RoutedCommand.
-        else
-          IsEnabled = Command.CanExecute( CommandParameter ) ? true : false;
-      }
-    }
-
-    /// <summary>
-    /// Closes the drop down.
-    /// </summary>
-    private void CloseDropDown( bool isFocusOnButton )
-    {
-      if( IsOpen )
-      {
-        IsOpen = false;
-      }
-      ReleaseMouseCapture();
-
-      if( isFocusOnButton && (this.Button != null) )
-      {
-        Button.Focus();
-      }
-    }
-
-    protected virtual void OnClick()
-    {
-      RaiseRoutedEvent( DropDownButton.ClickEvent );
-      RaiseCommand();
-    }
-
-    /// <summary>
-    /// Raises routed events.
-    /// </summary>
-    private void RaiseRoutedEvent( RoutedEvent routedEvent )
-    {
-      RoutedEventArgs args = new RoutedEventArgs( routedEvent, this );
-      RaiseEvent( args );
-    }
-
-    /// <summary>
-    /// Raises the command's Execute event.
-    /// </summary>
-    private void RaiseCommand()
-    {
-      if( Command != null )
-      {
-        RoutedCommand routedCommand = Command as RoutedCommand;
-
-        if( routedCommand == null )
-          ( ( ICommand )Command ).Execute( CommandParameter );
-        else
-          routedCommand.Execute( CommandParameter, CommandTarget );
-      }
-    }
-
-    /// <summary>
-    /// Unhooks a command from the Command property.
-    /// </summary>
-    /// <param name="oldCommand">The old command.</param>
-    /// <param name="newCommand">The new command.</param>
-    private void UnhookCommand( ICommand oldCommand, ICommand newCommand )
-    {
-      EventHandler handler = CanExecuteChanged;
-      oldCommand.CanExecuteChanged -= handler;
-    }
-
-    /// <summary>
-    /// Hooks up a command to the CanExecuteChnaged event handler.
-    /// </summary>
-    /// <param name="oldCommand">The old command.</param>
-    /// <param name="newCommand">The new command.</param>
-    private void HookUpCommand( ICommand oldCommand, ICommand newCommand )
-    {
-      EventHandler handler = new EventHandler( CanExecuteChanged );
-      canExecuteChangedHandler = handler;
-      if( newCommand != null )
-        newCommand.CanExecuteChanged += canExecuteChangedHandler;
-    }
-
-    #endregion //Methods
-
-    #region ICommandSource Members
-
-    // Keeps a copy of the CanExecuteChnaged handler so it doesn't get garbage collected.
-    private EventHandler canExecuteChangedHandler;
-
-    #region Command
-
-    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( DropDownButton ), new PropertyMetadata( ( ICommand )null, OnCommandChanged ) );
-    [TypeConverter( typeof( CommandConverter ) )]
-    public ICommand Command
-    {
-      get
-      {
-        return ( ICommand )GetValue( CommandProperty );
-      }
-      set
-      {
-        SetValue( CommandProperty, value );
-      }
-    }
-
-    private static void OnCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      DropDownButton dropDownButton = d as DropDownButton;
-      if( dropDownButton != null )
-        dropDownButton.OnCommandChanged( ( ICommand )e.OldValue, ( ICommand )e.NewValue );
-    }
-
-    protected virtual void OnCommandChanged( ICommand oldValue, ICommand newValue )
-    {
-      // If old command is not null, then we need to remove the handlers.
-      if( oldValue != null )
-        UnhookCommand( oldValue, newValue );
-
-      HookUpCommand( oldValue, newValue );
-
-      CanExecuteChanged(); //may need to call this when changing the command parameter or target.
-    }
-
-    #endregion //Command
-
-    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register( "CommandParameter", typeof( object ), typeof( DropDownButton ), new PropertyMetadata( null ) );
-    public object CommandParameter
-    {
-      get
-      {
-        return GetValue( CommandParameterProperty );
-      }
-      set
-      {
-        SetValue( CommandParameterProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register( "CommandTarget", typeof( IInputElement ), typeof( DropDownButton ), new PropertyMetadata( null ) );
-    public IInputElement CommandTarget
-    {
-      get
-      {
-        return ( IInputElement )GetValue( CommandTargetProperty );
-      }
-      set
-      {
-        SetValue( CommandTargetProperty, value );
-      }
-    }
-
-    #endregion //ICommandSource Members
-  }
-}
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
deleted file mode 100644
index f7faa69a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,154 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.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="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="DropDownContentBackground"
-            Value="{StaticResource PanelBackgroundBrush}" />
-    <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"
-                                     Background="{TemplateBinding Background}"
-                                     Foreground="{TemplateBinding Foreground}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     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="9"
-                            Height="5"
-                            Data="{StaticResource DownArrowGeometry}"
-                            Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                            Margin="0,1,0,0" />
-                    </Grid>
-                  </Grid>
-                </chrome:ButtonChrome>
-              </Grid>
-            </ToggleButton>
-
-            <Popup x:Name="PART_Popup"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   Placement="{TemplateBinding DropDownPosition}"
-                   Focusable="False"
-                   IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{TemplateBinding DropDownContentBackground}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                <ScrollViewer x:Name="DropDownScrollViewer"
-                              VerticalScrollBarVisibility="Auto">
-                  <ContentPresenter x:Name="PART_ContentPresenter"
-                                    Content="{TemplateBinding DropDownContent}" />
-                </ScrollViewer>
-              </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
deleted file mode 100644
index a54bfbf6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
+++ /dev/null
@@ -1,174 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <LinearGradientBrush x:Key="PopupDarkBorderBrush"
-                       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="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <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="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="DropDownContentBackground"
-            Value="{StaticResource PopupBackgroundBrush}" />
-    <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"
-                                     Background="{TemplateBinding Background}"
-                                     Foreground="{TemplateBinding Foreground}"
-                                     BorderThickness="{TemplateBinding BorderThickness}"
-                                     BorderBrush="{TemplateBinding BorderBrush}"
-                                     CornerRadius="2.75"
-                                     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="9"
-                            Height="5"
-                            Data="{StaticResource DownArrowGeometry}"
-                            Fill="#FF000000"
-                            Margin="0,1,0,0" />
-                    </Grid>
-                  </Grid>
-                </chrome:ButtonChrome>
-              </Grid>
-            </ToggleButton>
-
-            <Popup x:Name="PART_Popup"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   Placement="{TemplateBinding DropDownPosition}"
-                   Focusable="False"
-                   IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{TemplateBinding DropDownContentBackground}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                <ScrollViewer x:Name="DropDownScrollViewer"
-                              VerticalScrollBarVisibility="Auto">
-                  <ContentPresenter x:Name="PART_ContentPresenter"
-                                    Content="{TemplateBinding DropDownContent}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <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/IconButton/Implementation/IconButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
deleted file mode 100644
index 9f08c400..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
+++ /dev/null
@@ -1,185 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class IconButton : Button
-  {
-    #region Constructors
-
-    static IconButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( IconButton ), new FrameworkPropertyMetadata( typeof( IconButton ) ) );
-    }
-
-    public IconButton()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region Icon
-
-    public static readonly DependencyProperty IconProperty = DependencyProperty.Register( "Icon", typeof( Image ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-    public Image Icon
-    {
-      get
-      {
-        return ( Image )this.GetValue( IconButton.IconProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.IconProperty, value );
-      }
-    }
-
-    #endregion //Icon
-
-    #region IconLocation
-
-    public static readonly DependencyProperty IconLocationProperty = DependencyProperty.Register( "IconLocation", typeof( Location ),
-      typeof( IconButton ), new FrameworkPropertyMetadata( Location.Left ) );
-    public Location IconLocation
-    {
-      get
-      {
-        return ( Location )this.GetValue( IconButton.IconLocationProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.IconLocationProperty, value );
-      }
-    }
-
-    #endregion //IconLocation
-
-    #region MouseOverBackground
-
-    public static readonly DependencyProperty MouseOverBackgroundProperty = DependencyProperty.Register( "MouseOverBackground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverBackgroundProperty, value );
-      }
-    }
-
-    #endregion //MouseOverBackground
-
-    #region MouseOverBorderBrush
-
-    public static readonly DependencyProperty MouseOverBorderBrushProperty = DependencyProperty.Register( "MouseOverBorderBrush", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverBorderBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverBorderBrushProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverBorderBrushProperty, value );
-      }
-    }
-
-    #endregion //MouseOverBorderBrush
-
-    #region MouseOverForeground
-
-    public static readonly DependencyProperty MouseOverForegroundProperty = DependencyProperty.Register( "MouseOverForeground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MouseOverForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MouseOverForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MouseOverForegroundProperty, value );
-      }
-    }
-
-    #endregion //MouseOverForeground
-
-    #region MousePressedBackground
-
-    public static readonly DependencyProperty MousePressedBackgroundProperty = DependencyProperty.Register( "MousePressedBackground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedBackground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedBackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedBackgroundProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedBackground
-
-    #region MousePressedBorderBrush
-
-    public static readonly DependencyProperty MousePressedBorderBrushProperty = DependencyProperty.Register( "MousePressedBorderBrush", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedBorderBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedBorderBrushProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedBorderBrushProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedBorderBrush
-
-    #region MousePressedForeground
-
-    public static readonly DependencyProperty MousePressedForegroundProperty = DependencyProperty.Register( "MousePressedForeground", typeof( Brush ), typeof( IconButton ), new FrameworkPropertyMetadata( null ) );
-
-    public Brush MousePressedForeground
-    {
-      get
-      {
-        return ( Brush )this.GetValue( IconButton.MousePressedForegroundProperty );
-      }
-      set
-      {
-        this.SetValue( IconButton.MousePressedForegroundProperty, value );
-      }
-    }
-
-    #endregion  //MousePressedForeground
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 6edb1d07..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,166 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-
-  <!-- =============================================================================== -->
-  <!--  IconButton Style                                                               -->
-  <!-- =============================================================================== -->
-  <Style x:Key="FocusVisual">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="2"
-                     SnapsToDevicePixels="true"
-                     Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                     StrokeThickness="1"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:IconButton}">
-    <Setter Property="FocusVisualStyle"
-            Value="{StaticResource FocusVisual}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="Foreground"
-            Value="Black" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="MouseOverForeground"
-            Value="Black" />
-    <Setter Property="MousePressedForeground"
-            Value="Black" />
-    <Setter Property="MouseOverBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-    <Setter Property="MousePressedBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-    <Setter Property="MouseOverBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-    <Setter Property="MousePressedBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Padding"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:IconButton}">
-          <Border x:Name="defaultBorder"
-                  BorderThickness="1"
-                  BorderBrush="Transparent">
-            <Border x:Name="border"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    SnapsToDevicePixels="True">
-              <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    Margin="{TemplateBinding Padding}"
-                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition x:Name="firstColumn"
-                                    Width="Auto" />
-                  <ColumnDefinition x:Name="secondColumn"
-                                    Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <ContentControl x:Name="icon"
-                                Content="{TemplateBinding Icon}"
-                                VerticalAlignment="Center" />
-                <ContentPresenter x:Name="contentPresenter"
-                                  Grid.Column="1"
-                                  Focusable="False"
-                                  RecognizesAccessKey="True"
-                                  VerticalAlignment="Center" />
-              </Grid>
-            </Border>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsDefaulted"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      TargetName="defaultBorder"
-                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MousePressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MousePressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MousePressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="border"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-              <Setter TargetName="border"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IconLocation"
-                     Value="Right">
-              <Setter Property="Width"
-                      Value="*"
-                      TargetName="firstColumn" />
-              <Setter Property="Width"
-                      Value="Auto"
-                      TargetName="secondColumn" />
-              <Setter Property="Grid.Column"
-                      Value="1"
-                      TargetName="icon" />
-              <Setter Property="Grid.Column"
-                      Value="0"
-                      TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
deleted file mode 100644
index 6edb1d07..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
+++ /dev/null
@@ -1,166 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-
-  <!-- =============================================================================== -->
-  <!--  IconButton Style                                                               -->
-  <!-- =============================================================================== -->
-  <Style x:Key="FocusVisual">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="2"
-                     SnapsToDevicePixels="true"
-                     Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                     StrokeThickness="1"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:IconButton}">
-    <Setter Property="FocusVisualStyle"
-            Value="{StaticResource FocusVisual}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="Foreground"
-            Value="Black" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="MouseOverForeground"
-            Value="Black" />
-    <Setter Property="MousePressedForeground"
-            Value="Black" />
-    <Setter Property="MouseOverBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
-    <Setter Property="MousePressedBackground"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-    <Setter Property="MouseOverBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-    <Setter Property="MousePressedBorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Center" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="Padding"
-            Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:IconButton}">
-          <Border x:Name="defaultBorder"
-                  BorderThickness="1"
-                  BorderBrush="Transparent">
-            <Border x:Name="border"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    SnapsToDevicePixels="True">
-              <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    Margin="{TemplateBinding Padding}"
-                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition x:Name="firstColumn"
-                                    Width="Auto" />
-                  <ColumnDefinition x:Name="secondColumn"
-                                    Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <ContentControl x:Name="icon"
-                                Content="{TemplateBinding Icon}"
-                                VerticalAlignment="Center" />
-                <ContentPresenter x:Name="contentPresenter"
-                                  Grid.Column="1"
-                                  Focusable="False"
-                                  RecognizesAccessKey="True"
-                                  VerticalAlignment="Center" />
-              </Grid>
-            </Border>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsDefaulted"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      TargetName="defaultBorder"
-                      Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MouseOverForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MouseOverBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MouseOverBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{Binding MousePressedForeground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Background"
-                      TargetName="border"
-                      Value="{Binding MousePressedBackground, RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="BorderBrush"
-                      TargetName="border"
-                      Value="{Binding MousePressedBorderBrush, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter TargetName="border"
-                      Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-              <Setter TargetName="border"
-                      Property="Background"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-              <Setter Property="TextElement.Foreground"
-                      TargetName="contentPresenter"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <Trigger Property="IconLocation"
-                     Value="Right">
-              <Setter Property="Width"
-                      Value="*"
-                      TargetName="firstColumn" />
-              <Setter Property="Width"
-                      Value="Auto"
-                      TargetName="secondColumn" />
-              <Setter Property="Grid.Column"
-                      Value="1"
-                      TargetName="icon" />
-              <Setter Property="Grid.Column"
-                      Value="0"
-                      TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
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
deleted file mode 100644
index d752ad10..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Mag.Converters
-{
-  public class RadiusConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return ( double )value * 2;
-    }
-
-    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/FrameType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
deleted file mode 100644
index cd1bfa2c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum FrameType
-  {
-    Circle,
-    Rectangle
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
deleted file mode 100644
index 7e1f8d78..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
+++ /dev/null
@@ -1,311 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_VisualBrush, Type = typeof( VisualBrush ) )]
-  public class Magnifier : Control
-  {
-    private const double DEFAULT_SIZE = 100d;
-    private const string PART_VisualBrush = "PART_VisualBrush";
-
-    #region Private Members
-
-    private VisualBrush _visualBrush = new VisualBrush();
-
-    #endregion //Private Members
-
-    #region Properties
-
-    #region FrameType
-
-    public static readonly DependencyProperty FrameTypeProperty = DependencyProperty.Register( "FrameType", typeof( FrameType ), typeof( Magnifier ), new UIPropertyMetadata( FrameType.Circle, OnFrameTypeChanged ) );
-    public FrameType FrameType
-    {
-      get
-      {
-        return ( FrameType )GetValue( FrameTypeProperty );
-      }
-      set
-      {
-        SetValue( FrameTypeProperty, value );
-      }
-    }
-
-    private static void OnFrameTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Magnifier m = ( Magnifier )d;
-      m.OnFrameTypeChanged( ( FrameType )e.OldValue, ( FrameType )e.NewValue );
-    }
-
-    protected virtual void OnFrameTypeChanged( FrameType oldValue, FrameType newValue )
-    {
-      this.UpdateSizeFromRadius();
-    }
-
-    #endregion //FrameType
-
-    #region IsUsingZoomOnMouseWheel
-
-    public static readonly DependencyProperty IsUsingZoomOnMouseWheelProperty = DependencyProperty.Register( "IsUsingZoomOnMouseWheel", typeof( bool )
-      , typeof( Magnifier ), new UIPropertyMetadata( true ) );
-    public bool IsUsingZoomOnMouseWheel
-    {
-      get
-      {
-        return (bool)GetValue( IsUsingZoomOnMouseWheelProperty );
-      }
-      set
-      {
-        SetValue( IsUsingZoomOnMouseWheelProperty, value );
-      }
-    }
-
-    #endregion //IsUsingZoomOnMouseWheel
-
-    #region IsFrozen
-
-    public bool IsFrozen
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #region Radius
-
-    public static readonly DependencyProperty RadiusProperty = DependencyProperty.Register( "Radius", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( ( Magnifier.DEFAULT_SIZE / 2 ), new PropertyChangedCallback( OnRadiusPropertyChanged ) ) );
-    public double Radius
-    {
-      get
-      {
-        return ( double )GetValue( RadiusProperty );
-      }
-      set
-      {
-        SetValue( RadiusProperty, value );
-      }
-    }
-
-    private static void OnRadiusPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Magnifier m = ( Magnifier )d;
-      m.OnRadiusChanged( e );
-    }
-
-    protected virtual void OnRadiusChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.UpdateSizeFromRadius();
-    }
-
-    #endregion
-
-    #region Target
-
-    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( UIElement ), typeof( Magnifier ) );
-    public UIElement Target
-    {
-      get
-      {
-        return ( UIElement )GetValue( TargetProperty );
-      }
-      set
-      {
-        SetValue( TargetProperty, value );
-      }
-    }
-
-    #endregion //Target
-
-    #region ViewBox
-
-    internal Rect ViewBox
-    {
-      get
-      {
-        return _visualBrush.Viewbox;
-      }
-      set
-      {
-        _visualBrush.Viewbox = value;
-      }
-    }
-
-    #endregion
-
-    #region ZoomFactor
-
-    public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged), OnValidationCallback );
-    public double ZoomFactor
-    {
-      get
-      {
-        return ( double )GetValue( ZoomFactorProperty );
-      }
-      set
-      {
-        SetValue( ZoomFactorProperty, value );
-      }
-    }
-
-    private static bool OnValidationCallback( object baseValue )
-    {
-      double zoomFactor = ( double )baseValue;
-      return ( zoomFactor >= 0 );
-    }
-
-    private static void OnZoomFactorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Magnifier m = ( Magnifier )d;
-      m.OnZoomFactorChanged( e );
-    }
-
-    protected virtual void OnZoomFactorChanged( DependencyPropertyChangedEventArgs e )
-    {
-      UpdateViewBox();
-    }
-
-    #endregion //ZoomFactor
-
-    #region ZoomFactorOnMouseWheel
-
-    public static readonly DependencyProperty ZoomFactorOnMouseWheelProperty = DependencyProperty.Register( "ZoomFactorOnMouseWheel", typeof( double )
-      , typeof( Magnifier ), new FrameworkPropertyMetadata( 0.1d, OnZoomFactorOnMouseWheelPropertyChanged ), OnZoomFactorOnMouseWheelValidationCallback );
-    public double ZoomFactorOnMouseWheel
-    {
-      get
-      {
-        return (double)GetValue( ZoomFactorOnMouseWheelProperty );
-      }
-      set
-      {
-        SetValue( ZoomFactorOnMouseWheelProperty, value );
-      }
-    }
-
-    private static bool OnZoomFactorOnMouseWheelValidationCallback( object baseValue )
-    {
-      double zoomFactorOnMouseWheel = (double)baseValue;
-      return (zoomFactorOnMouseWheel >= 0);
-    }
-
-    private static void OnZoomFactorOnMouseWheelPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Magnifier m = (Magnifier)d;
-      m.OnZoomFactorOnMouseWheelChanged( e );
-    }
-
-    protected virtual void OnZoomFactorOnMouseWheelChanged( DependencyPropertyChangedEventArgs e )
-    {
-    }
-
-    #endregion //ZoomFactorOnMouseWheel
-
-    #endregion //Properties
-
-    #region Constructors
-
-    /// <summary>
-    /// Initializes static members of the <see cref="Magnifier"/> class.
-    /// </summary>
-    static Magnifier()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( typeof( Magnifier ) ) );
-      HeightProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( Magnifier.DEFAULT_SIZE ) );
-      WidthProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( Magnifier.DEFAULT_SIZE ) );
-    }
-
-    public Magnifier()
-    {
-      this.SizeChanged += new SizeChangedEventHandler( OnSizeChangedEvent );
-    }
-
-    private void OnSizeChangedEvent( object sender, SizeChangedEventArgs e )
-    {
-      UpdateViewBox();
-    }
-
-    private void UpdateSizeFromRadius()
-    {
-      if( this.FrameType == Toolkit.FrameType.Circle )
-      {
-        double newSize = Radius * 2;
-        if(!DoubleHelper.AreVirtuallyEqual( Width, newSize ))
-        {
-          Width = newSize;
-        }
-
-        if(!DoubleHelper.AreVirtuallyEqual( Height, newSize ))
-        {
-          Height = newSize;
-        }
-      }
-    }
-
-    #endregion
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      VisualBrush newBrush = GetTemplateChild( PART_VisualBrush ) as VisualBrush;
-
-      // Just create a brush as placeholder even if there is no such brush.
-      // This avoids having to "if" each access to the _visualBrush member.
-      // Do not keep the current _visualBrush whatsoever to avoid memory leaks.
-      if( newBrush == null )
-      {
-        newBrush = new VisualBrush();
-      }
-
-      newBrush.Viewbox = _visualBrush.Viewbox;
-      _visualBrush = newBrush;
-    }
-
-    #endregion // Base Class Overrides
-
-    #region Public Methods
-
-    public void Freeze( bool freeze )
-    {
-      this.IsFrozen = freeze;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateViewBox()
-    {
-      if( !IsInitialized )
-        return;
-
-      ViewBox = new Rect( 
-        ViewBox.Location, 
-        new Size( ActualWidth * ZoomFactor , ActualHeight * ZoomFactor ) );
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
deleted file mode 100644
index b0ef685c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class MagnifierAdorner : Adorner
-  {
-    #region Members
-
-    private Magnifier _magnifier;
-    private Point _currentMousePosition;
-    private double _currentZoomFactor;
-
-    #endregion
-
-    #region Constructors
-
-    public MagnifierAdorner( UIElement element, Magnifier magnifier )
-      : base( element )
-    {
-      _magnifier = magnifier;
-      _currentZoomFactor = _magnifier.ZoomFactor;
-      UpdateViewBox();
-      AddVisualChild( _magnifier );
-
-      Loaded += ( s, e ) => InputManager.Current.PostProcessInput += OnProcessInput;
-      Unloaded += ( s, e ) => InputManager.Current.PostProcessInput -= OnProcessInput;
-    }
-
-
-    #endregion
-
-    #region Private/Internal methods
-
-    private void OnProcessInput( object sender, ProcessInputEventArgs e )
-    {
-      Point pt = Mouse.GetPosition( this );
-
-      if( (_currentMousePosition == pt) && (_magnifier.ZoomFactor == _currentZoomFactor) )
-        return;
-
-      if( _magnifier.IsFrozen )
-        return;
-
-      _currentMousePosition = pt;
-      _currentZoomFactor = _magnifier.ZoomFactor;
-      UpdateViewBox();
-      InvalidateArrange();
-    }
-
-    internal void UpdateViewBox()
-    {
-      var viewBoxLocation = CalculateViewBoxLocation();
-      _magnifier.ViewBox = new Rect( viewBoxLocation, _magnifier.ViewBox.Size );
-    }
-
-    private Point CalculateViewBoxLocation()
-    {
-      double offsetX = 0, offsetY = 0;
-
-      Point adorner = Mouse.GetPosition( this );
-      Point element = Mouse.GetPosition( AdornedElement );
-
-      offsetX = element.X - adorner.X;
-      offsetY = element.Y - adorner.Y;
-
-      //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 );
-
-      double left = _currentMousePosition.X - ( ( _magnifier.ViewBox.Width / 2 ) + offsetX ) + parentOffset.X;
-      double top = _currentMousePosition.Y - ( ( _magnifier.ViewBox.Height / 2 ) + offsetY ) + parentOffset.Y;
-      return new Point( left, top );
-    }
-
-    #endregion
-
-    #region Overrides
-
-    protected override Visual GetVisualChild( int index )
-    {
-      return _magnifier;
-    }
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return 1;
-      }
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      _magnifier.Measure( constraint );
-      return base.MeasureOverride( constraint );
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      double x = _currentMousePosition.X - ( _magnifier.Width / 2 );
-      double y = _currentMousePosition.Y - ( _magnifier.Height / 2 );
-      _magnifier.Arrange( new Rect( x, y, _magnifier.Width, _magnifier.Height ) );
-      return base.ArrangeOverride( finalSize );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
deleted file mode 100644
index 88856103..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Documents;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class MagnifierManager : DependencyObject
-  {
-    #region Members
-
-    private MagnifierAdorner _adorner;
-    private UIElement _element;
-
-    #endregion //Members
-
-    #region Properties
-
-    public static readonly DependencyProperty CurrentProperty = DependencyProperty.RegisterAttached( "Magnifier", typeof( Magnifier ), typeof( UIElement ), new FrameworkPropertyMetadata( null, OnMagnifierChanged ) );
-    public static void SetMagnifier( UIElement element, Magnifier value )
-    {
-      element.SetValue( CurrentProperty, value );
-    }
-    public static Magnifier GetMagnifier( UIElement element )
-    {
-      return ( Magnifier )element.GetValue( CurrentProperty );
-    }
-
-    private static void OnMagnifierChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      UIElement target = d as UIElement;
-
-      if( target == null )
-        throw new ArgumentException( "Magnifier can only be attached to a UIElement." );
-
-      MagnifierManager manager = new MagnifierManager();
-      manager.AttachToMagnifier( target, e.NewValue as Magnifier );
-    }
-
-    #endregion //Properties
-
-    #region Event Handlers
-
-    private void Element_MouseLeave( object sender, MouseEventArgs e )
-    {
-      var magnifier = MagnifierManager.GetMagnifier( _element ) as Magnifier;
-      if( ( magnifier != null ) && magnifier.IsFrozen )
-        return;
-
-      HideAdorner();
-    }
-
-    private void Element_MouseEnter( object sender, MouseEventArgs e )
-    {
-      ShowAdorner();
-    }
-
-    private void Element_MouseWheel( object sender, MouseWheelEventArgs e )
-    {
-      var magnifier = MagnifierManager.GetMagnifier( _element ) as Magnifier;
-      if( (magnifier != null) && magnifier.IsUsingZoomOnMouseWheel )
-      {
-        if( e.Delta < 0 )
-        {
-          var newValue = magnifier.ZoomFactor + magnifier.ZoomFactorOnMouseWheel;
-#if VS2008
-          magnifier.ZoomFactor = newValue;
-#else
-          magnifier.SetCurrentValue( Magnifier.ZoomFactorProperty, newValue );
-#endif
-        }
-        else if ( e.Delta > 0 )
-        {
-          var newValue = (magnifier.ZoomFactor >= magnifier.ZoomFactorOnMouseWheel) ? magnifier.ZoomFactor - magnifier.ZoomFactorOnMouseWheel : 0d;
-#if VS2008
-          magnifier.ZoomFactor = newValue;
-#else
-          magnifier.SetCurrentValue( Magnifier.ZoomFactorProperty, newValue );
-#endif
-        }
-        _adorner.UpdateViewBox();
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void AttachToMagnifier( UIElement element, Magnifier magnifier )
-    {
-      _element = element;
-      _element.MouseEnter += this.Element_MouseEnter;
-      _element.MouseLeave += this.Element_MouseLeave;
-      _element.MouseWheel += this.Element_MouseWheel;
-
-      magnifier.Target = _element;
-
-      _adorner = new MagnifierAdorner( _element, magnifier );
-    }
-
-    void ShowAdorner()
-    {
-      VerifyAdornerLayer();
-      _adorner.Visibility = Visibility.Visible;
-    }
-
-    bool VerifyAdornerLayer()
-    {
-      if( _adorner.Parent != null )
-        return true;
-
-      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _element );
-      if( layer == null )
-        return false;
-
-      layer.Add( _adorner );
-      return true;
-    }
-
-    void HideAdorner()
-    {
-      if( _adorner.Visibility == Visibility.Visible )
-      {
-        _adorner.Visibility = Visibility.Collapsed;
-      }
-    }
-
-#endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
deleted file mode 100644
index 5bad5932..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Mag.Converters"
-                    xmlns:coreconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-   <!-- =============================================================================== -->
-   <!-- Magnifier                                                                       -->
-   <!-- =============================================================================== -->
-
-   <conv:RadiusConverter x:Key="RadiusConverter" />
-   <coreconv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
-
-   <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
-      <Grid>
-         <Ellipse Fill="{TemplateBinding Background}" />
-         <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" 
-                  StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
-            <Ellipse.Fill>
-               <VisualBrush x:Name="PART_VisualBrush"
-                            ViewboxUnits="Absolute"
-                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Ellipse.Fill>
-         </Ellipse>
-      </Grid>
-   </ControlTemplate>
-
-   <ControlTemplate x:Key="RectangleTemplate" TargetType="{x:Type local:Magnifier}">
-      <Grid Background="{TemplateBinding Background}" >
-         <Rectangle Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
-                    StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
-            <Rectangle.Fill>
-               <VisualBrush x:Name="PART_VisualBrush"
-                            ViewboxUnits="Absolute"
-                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
-            </Rectangle.Fill>
-         </Rectangle>
-      </Grid>
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type local:Magnifier}">
-      <Setter Property="IsHitTestVisible" Value="False" />
-      <Style.Triggers>
-         <Trigger Property="FrameType" Value="Circle">
-            <Setter Property="Template" Value="{StaticResource CircleTemplate}" />
-         </Trigger>
-         <Trigger Property="FrameType" Value="Rectangle">
-            <Setter Property="Template" Value="{StaticResource RectangleTemplate}" />
-         </Trigger>
-      </Style.Triggers>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
deleted file mode 100644
index 7e582501..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class AutoCompletingMaskEventArgs : CancelEventArgs
-  {
-    public AutoCompletingMaskEventArgs( MaskedTextProvider maskedTextProvider, int startPosition, int selectionLength, string input )
-    {
-      m_autoCompleteStartPosition = -1;
-
-      m_maskedTextProvider = maskedTextProvider;
-      m_startPosition = startPosition;
-      m_selectionLength = selectionLength;
-      m_input = input;
-    }
-
-    #region MaskedTextProvider PROPERTY
-
-    private MaskedTextProvider m_maskedTextProvider;  
-
-    public MaskedTextProvider MaskedTextProvider
-    {
-      get { return m_maskedTextProvider; }
-    }
-
-    #endregion MaskedTextProvider PROPERTY
-
-    #region StartPosition PROPERTY
-
-    private int m_startPosition;
-
-    public int StartPosition
-    {
-      get { return m_startPosition; }
-    }
-
-    #endregion StartPosition PROPERTY
-
-    #region SelectionLength PROPERTY
-
-    private int m_selectionLength;
-
-    public int SelectionLength
-    {
-      get { return m_selectionLength; }
-    }
-
-    #endregion SelectionLength PROPERTY
-
-    #region Input PROPERTY
-
-    private string m_input;
-
-    public string Input
-    {
-      get { return m_input; }
-    }
-
-    #endregion Input PROPERTY
-
-
-    #region AutoCompleteStartPosition PROPERTY
-
-    private int m_autoCompleteStartPosition;
-
-    public int AutoCompleteStartPosition
-    {
-      get { return m_autoCompleteStartPosition; }
-      set { m_autoCompleteStartPosition = value; }
-    }
-
-    #endregion AutoCompleteStartPosition PROPERTY
-
-    #region AutoCompleteText PROPERTY
-
-    private string m_autoCompleteText;
-
-    public string AutoCompleteText
-    {
-      get { return m_autoCompleteText; }
-      set { m_autoCompleteText = value; }
-    }
-
-    #endregion AutoCompleteText PROPERTY
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
deleted file mode 100644
index a8cbe8fd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum InsertKeyMode
-  {
-    Default = 0,
-    Insert = 1,
-    Overwrite = 2
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
deleted file mode 100644
index 6114a0cd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public enum MaskFormat
-  {
-    ExcludePromptAndLiterals,
-    IncludeLiterals,
-    IncludePrompt,
-    IncludePromptAndLiterals
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
deleted file mode 100644
index f9c7932a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ /dev/null
@@ -1,1955 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows;
-using System.Windows.Data;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Windows.Input;
-using System.Diagnostics;
-using System.Windows.Documents;
-using System.Globalization;
-using System.Windows.Controls.Primitives;
-using System.Reflection;
-
-using System.Collections;
-using System.Security;
-using System.Security.Permissions;
-using System.Windows.Automation;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class MaskedTextBox : ValueRangeTextBox
-  {
-    #region STATIC MEMBERS
-
-    private static readonly char[] MaskChars = { '0', '9', '#', 'L', '?', '&', 'C', 'A', 'a', '.', ',', ':', '/', '$', '<', '>', '|', '\\' };
-
-    private static char DefaultPasswordChar = '\0';
-
-    private static string NullMaskString = "<>";
-
-    private static string GetRawText( MaskedTextProvider provider )
-    {
-      return provider.ToString( true, false, false, 0, provider.Length );
-    }
-
-    public static string GetFormatSpecifierFromMask( string mask, IFormatProvider formatProvider )
-    {
-      List<int> notUsed;
-
-      return MaskedTextBox.GetFormatSpecifierFromMask(
-        mask,
-        MaskedTextBox.MaskChars,
-        formatProvider,
-        true,
-        out notUsed );
-    }
-
-    private static string GetFormatSpecifierFromMask(
-      string mask,
-      char[] maskChars,
-      IFormatProvider formatProvider,
-      bool includeNonSeparatorLiteralsInValue,
-      out List<int> unhandledLiteralsPositions )
-    {
-      unhandledLiteralsPositions = new List<int>();
-
-      NumberFormatInfo numberFormatInfo = NumberFormatInfo.GetInstance( formatProvider );
-
-      StringBuilder formatSpecifierBuilder = new StringBuilder( 32 );
-
-      // Space will be considered as a separator literals and will be included 
-      // no matter the value of IncludeNonSeparatorLiteralsInValue.
-      bool lastCharIsLiteralIdentifier = false;
-      int i = 0;
-      int j = 0;
-
-      while( i < mask.Length )
-      {
-        char currentChar = mask[ i ];
-
-        if( ( currentChar == '\\' ) && ( !lastCharIsLiteralIdentifier ) )
-        {
-          lastCharIsLiteralIdentifier = true;
-        }
-        else
-        {
-          if( ( lastCharIsLiteralIdentifier ) || ( Array.IndexOf( maskChars, currentChar ) < 0 ) )
-          {
-            lastCharIsLiteralIdentifier = false;
-
-            // The currentChar was preceeded by a liteal identifier or is not part of the MaskedTextProvider mask chars.
-            formatSpecifierBuilder.Append( '\\' );
-            formatSpecifierBuilder.Append( currentChar );
-
-            if( ( !includeNonSeparatorLiteralsInValue ) && ( currentChar != ' ' ) )
-              unhandledLiteralsPositions.Add( j );
-
-            j++;
-          }
-          else
-          {
-            // The currentChar is part of the MaskedTextProvider mask chars.  
-            if( ( currentChar == '0' ) || ( currentChar == '9' ) || ( currentChar == '#' ) )
-            {
-              formatSpecifierBuilder.Append( '0' );
-              j++;
-            }
-            else if( currentChar == '.' )
-            {
-              formatSpecifierBuilder.Append( '.' );
-              j += numberFormatInfo.NumberDecimalSeparator.Length;
-            }
-            else if( currentChar == ',' )
-            {
-              formatSpecifierBuilder.Append( ',' );
-              j += numberFormatInfo.NumberGroupSeparator.Length;
-            }
-            else if( currentChar == '$' )
-            {
-              string currencySymbol = numberFormatInfo.CurrencySymbol;
-
-              formatSpecifierBuilder.Append( '"' );
-              formatSpecifierBuilder.Append( currencySymbol );
-              formatSpecifierBuilder.Append( '"' );
-
-              for( int k = 0; k < currencySymbol.Length; k++ )
-              {
-                if( !includeNonSeparatorLiteralsInValue )
-                  unhandledLiteralsPositions.Add( j );
-
-                j++;
-              }
-            }
-            else
-            {
-              formatSpecifierBuilder.Append( currentChar );
-
-              if( ( !includeNonSeparatorLiteralsInValue ) && ( currentChar != ' ' ) )
-                unhandledLiteralsPositions.Add( j );
-
-              j++;
-            }
-          }
-        }
-
-        i++;
-      }
-
-      return formatSpecifierBuilder.ToString();
-    }
-
-    #endregion STATIC MEMBERS
-
-    #region CONSTRUCTORS
-
-    static MaskedTextBox()
-    {
-      MaskedTextBox.TextProperty.OverrideMetadata( typeof( MaskedTextBox ),
-        new FrameworkPropertyMetadata(
-        null,
-        new CoerceValueCallback( MaskedTextBox.TextCoerceValueCallback ) ) );
-    }
-
-    public MaskedTextBox()
-    {
-      CommandManager.AddPreviewCanExecuteHandler( this, new CanExecuteRoutedEventHandler( this.OnPreviewCanExecuteCommands ) );
-      CommandManager.AddPreviewExecutedHandler( this, new ExecutedRoutedEventHandler( this.OnPreviewExecutedCommands ) );
-
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Paste, null, new CanExecuteRoutedEventHandler( this.CanExecutePaste ) ) );
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Cut, null, new CanExecuteRoutedEventHandler( this.CanExecuteCut ) ) );
-      this.CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, null, new CanExecuteRoutedEventHandler( this.CanExecuteCopy ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.ToggleInsert, new ExecutedRoutedEventHandler( this.ToggleInsertExecutedCallback ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.Delete, null, new CanExecuteRoutedEventHandler( this.CanExecuteDelete ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.DeletePreviousWord, null, new CanExecuteRoutedEventHandler( this.CanExecuteDeletePreviousWord ) ) );
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.DeleteNextWord, null, new CanExecuteRoutedEventHandler( this.CanExecuteDeleteNextWord ) ) );
-
-      this.CommandBindings.Add( new CommandBinding( EditingCommands.Backspace, null, new CanExecuteRoutedEventHandler( this.CanExecuteBackspace ) ) );
-
-      System.Windows.DragDrop.AddPreviewQueryContinueDragHandler( this, new QueryContinueDragEventHandler( this.PreviewQueryContinueDragCallback ) );
-      this.AllowDrop = false;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength" )]
-    private void InitializeMaskedTextProvider()
-    {
-      string preInitializedText = this.Text;
-
-      string mask = this.Mask;
-
-      if( mask == string.Empty )
-      {
-        m_maskedTextProvider = this.CreateMaskedTextProvider( MaskedTextBox.NullMaskString );
-        m_maskIsNull = true;
-      }
-      else
-      {
-        m_maskedTextProvider = this.CreateMaskedTextProvider( mask );
-        m_maskIsNull = false;
-      }
-
-      if( ( !m_maskIsNull ) && ( preInitializedText != string.Empty ) )
-      {
-        bool success = m_maskedTextProvider.Add( preInitializedText );
-
-        if( ( !success ) && ( !DesignerProperties.GetIsInDesignMode( this ) ) )
-          throw new InvalidOperationException( "An attempt was made to apply a new mask that cannot be applied to the current text." );
-      }
-    }
-
-    #endregion CONSTRUCTORS
-
-    #region ISupportInitialize
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      this.InitializeMaskedTextProvider();
-
-      this.SetIsMaskCompleted( m_maskedTextProvider.MaskCompleted );
-      this.SetIsMaskFull( m_maskedTextProvider.MaskFull );
-
-      base.OnInitialized( e );
-    }
-
-    #endregion ISupportInitialize
-
-    #region AllowPromptAsInput Property
-
-    public static readonly DependencyProperty AllowPromptAsInputProperty =
-        DependencyProperty.Register( "AllowPromptAsInput", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.AllowPromptAsInputPropertyChangedCallback ) ) );
-
-    public bool AllowPromptAsInput
-    {
-      get
-      {
-        return ( bool )GetValue( AllowPromptAsInputProperty );
-      }
-      set
-      {
-        SetValue( AllowPromptAsInputProperty, value );
-      }
-    }
-
-    private static void AllowPromptAsInputPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider = maskedTextBox.CreateMaskedTextProvider( maskedTextBox.Mask );
-    }
-
-    #endregion AllowPromptAsInput Property
-
-    #region ClipboardMaskFormat Property
-
-    public MaskFormat ClipboardMaskFormat
-    {
-      get
-      {
-        return ( MaskFormat )GetValue( ClipboardMaskFormatProperty );
-      }
-      set
-      {
-        SetValue( ClipboardMaskFormatProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ClipboardMaskFormatProperty =
-        DependencyProperty.Register( "ClipboardMaskFormat", typeof( MaskFormat ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata( MaskFormat.IncludeLiterals ) );
-
-    #endregion ClipboardMaskFormat Property
-
-    #region HidePromptOnLeave Property
-
-    public bool HidePromptOnLeave
-    {
-      get
-      {
-        return ( bool )GetValue( HidePromptOnLeaveProperty );
-      }
-      set
-      {
-        SetValue( HidePromptOnLeaveProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HidePromptOnLeaveProperty =
-        DependencyProperty.Register( "HidePromptOnLeave", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( false ) );
-
-    #endregion HidePromptOnLeave Property
-
-    #region IncludeLiteralsInValue Property
-
-    public bool IncludeLiteralsInValue
-    {
-      get
-      {
-        return ( bool )GetValue( IncludeLiteralsInValueProperty );
-      }
-      set
-      {
-        SetValue( IncludeLiteralsInValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty IncludeLiteralsInValueProperty =
-        DependencyProperty.Register( "IncludeLiteralsInValue", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.InlcudeLiteralsInValuePropertyChangedCallback ) ) );
-
-    private static void InlcudeLiteralsInValuePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      maskedTextBox.RefreshConversionHelpers();
-      maskedTextBox.RefreshValue();
-    }
-
-    #endregion IncludeLiteralsInValue Property
-
-    #region IncludePromptInValue Property
-
-    public bool IncludePromptInValue
-    {
-      get
-      {
-        return ( bool )GetValue( IncludePromptInValueProperty );
-      }
-      set
-      {
-        SetValue( IncludePromptInValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty IncludePromptInValueProperty =
-        DependencyProperty.Register( "IncludePromptInValue", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      false,
-      new PropertyChangedCallback( MaskedTextBox.IncludePromptInValuePropertyChangedCallback ) ) );
-
-    private static void IncludePromptInValuePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      maskedTextBox.RefreshValue();
-    }
-
-    #endregion IncludePromptInValue Property
-
-    #region InsertKeyMode Property
-
-    public InsertKeyMode InsertKeyMode
-    {
-      get
-      {
-        return ( InsertKeyMode )GetValue( InsertKeyModeProperty );
-      }
-      set
-      {
-        SetValue( InsertKeyModeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty InsertKeyModeProperty =
-        DependencyProperty.Register( "InsertKeyMode", typeof( InsertKeyMode ), typeof( MaskedTextBox ), new UIPropertyMetadata( InsertKeyMode.Default ) );
-
-    #endregion InsertKeyMode Property
-
-    #region IsMaskCompleted Read-Only Property
-
-    private static readonly DependencyPropertyKey IsMaskCompletedPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsMaskCompleted", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsMaskCompletedProperty = MaskedTextBox.IsMaskCompletedPropertyKey.DependencyProperty;
-
-
-    public bool IsMaskCompleted
-    {
-      get
-      {
-        return ( bool )this.GetValue( MaskedTextBox.IsMaskCompletedProperty );
-      }
-    }
-
-    private void SetIsMaskCompleted( bool value )
-    {
-      this.SetValue( MaskedTextBox.IsMaskCompletedPropertyKey, value );
-    }
-
-    #endregion IsMaskCompleted Read-Only Property
-
-    #region IsMaskFull Read-Only Property
-
-    private static readonly DependencyPropertyKey IsMaskFullPropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsMaskFull", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsMaskFullProperty = MaskedTextBox.IsMaskFullPropertyKey.DependencyProperty;
-
-    public bool IsMaskFull
-    {
-      get
-      {
-        return ( bool )this.GetValue( MaskedTextBox.IsMaskFullProperty );
-      }
-    }
-
-    private void SetIsMaskFull( bool value )
-    {
-      this.SetValue( MaskedTextBox.IsMaskFullPropertyKey, value );
-    }
-
-    #endregion IsMaskFull Read-Only Property
-
-    #region Mask Property
-
-    public static readonly DependencyProperty MaskProperty =
-        DependencyProperty.Register( "Mask", typeof( string ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      string.Empty,
-      new PropertyChangedCallback( MaskedTextBox.MaskPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.MaskCoerceValueCallback ) ) );
-
-    public string Mask
-    {
-      get
-      {
-        return ( string )this.GetValue( MaskedTextBox.MaskProperty );
-      }
-      set
-      {
-        this.SetValue( MaskedTextBox.MaskProperty, value );
-      }
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    private static object MaskCoerceValueCallback( DependencyObject sender, object value )
-    {
-      if( value == null )
-        value = string.Empty;
-
-      if( value.Equals( string.Empty ) )
-        return value;
-
-      // Validate the text against the would be new Mask.
-
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      bool valid;
-
-      try
-      {
-        MaskedTextProvider provider = maskedTextBox.CreateMaskedTextProvider( ( string )value );
-
-        string rawText = MaskedTextBox.GetRawText( maskedTextBox.m_maskedTextProvider );
-
-        valid = provider.VerifyString( rawText );
-      }
-      catch( Exception exception )
-      {
-        throw new InvalidOperationException( "An error occured while testing the current text against the new mask.", exception );
-      }
-
-      if( !valid )
-        throw new ArgumentException( "The mask cannot be applied to the current text.", "Mask" );
-
-      return value;
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength" )]
-    private static void MaskPropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      MaskedTextProvider provider = null;
-
-      string mask = ( string )e.NewValue;
-
-      if( mask == string.Empty )
-      {
-        provider = maskedTextBox.CreateMaskedTextProvider( MaskedTextBox.NullMaskString );
-        maskedTextBox.m_maskIsNull = true;
-        maskedTextBox.Text = "";
-      }
-      else
-      {
-        provider = maskedTextBox.CreateMaskedTextProvider( mask );
-        maskedTextBox.m_maskIsNull = false;
-      }
-
-      maskedTextBox.m_maskedTextProvider = provider;
-
-      maskedTextBox.RefreshConversionHelpers();
-
-      if( maskedTextBox.ValueDataType != null )
-      {
-        string textFromValue = maskedTextBox.GetTextFromValue( maskedTextBox.Value );
-        maskedTextBox.m_maskedTextProvider.Set( textFromValue );
-      }
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion Mask Property
-
-    #region MaskedTextProvider Property
-
-    public MaskedTextProvider MaskedTextProvider
-    {
-      get
-      {
-        if( !m_maskIsNull )
-          return m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        return null;
-      }
-    }
-
-    #endregion MaskedTextProvider Property
-
-    #region PromptChar Property
-
-    public static readonly DependencyProperty PromptCharProperty =
-        DependencyProperty.Register( "PromptChar", typeof( char ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      '_',
-      new PropertyChangedCallback( MaskedTextBox.PromptCharPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.PromptCharCoerceValueCallback ) ) );
-
-    public char PromptChar
-    {
-      get
-      {
-        return ( char )this.GetValue( MaskedTextBox.PromptCharProperty );
-      }
-      set
-      {
-        this.SetValue( MaskedTextBox.PromptCharProperty, value );
-      }
-    }
-
-    private static object PromptCharCoerceValueCallback( object sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      MaskedTextProvider provider = maskedTextBox.m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-      try
-      {
-        provider.PromptChar = ( char )value;
-      }
-      catch( Exception exception )
-      {
-        throw new ArgumentException( "The prompt character is invalid.", exception );
-      }
-
-      return value;
-    }
-
-    private static void PromptCharPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.PromptChar = ( char )e.NewValue;
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion PromptChar Property
-
-    #region RejectInputOnFirstFailure Property
-
-    public bool RejectInputOnFirstFailure
-    {
-      get
-      {
-        return ( bool )GetValue( RejectInputOnFirstFailureProperty );
-      }
-      set
-      {
-        SetValue( RejectInputOnFirstFailureProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty RejectInputOnFirstFailureProperty =
-        DependencyProperty.Register( "RejectInputOnFirstFailure", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( true ) );
-
-    #endregion RejectInputOnFirstFailure Property
-
-    #region ResetOnPrompt Property
-
-    public bool ResetOnPrompt
-    {
-      get
-      {
-        return ( bool )GetValue( ResetOnPromptProperty );
-      }
-      set
-      {
-        SetValue( ResetOnPromptProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ResetOnPromptProperty =
-        DependencyProperty.Register( "ResetOnPrompt", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.ResetOnPromptPropertyChangedCallback ) ) );
-
-    private static void ResetOnPromptPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.ResetOnPrompt = ( bool )e.NewValue;
-    }
-
-    #endregion ResetOnPrompt Property
-
-    #region ResetOnSpace Property
-
-    public bool ResetOnSpace
-    {
-      get
-      {
-        return ( bool )GetValue( ResetOnSpaceProperty );
-      }
-      set
-      {
-        SetValue( ResetOnSpaceProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ResetOnSpaceProperty =
-        DependencyProperty.Register( "ResetOnSpace", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.ResetOnSpacePropertyChangedCallback ) ) );
-
-    private static void ResetOnSpacePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.ResetOnSpace = ( bool )e.NewValue;
-    }
-
-    #endregion ResetOnSpace Property
-
-    #region RestrictToAscii Property
-
-    public bool RestrictToAscii
-    {
-      get
-      {
-        return ( bool )GetValue( RestrictToAsciiProperty );
-      }
-      set
-      {
-        SetValue( RestrictToAsciiProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty RestrictToAsciiProperty =
-        DependencyProperty.Register( "RestrictToAscii", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      false,
-      new PropertyChangedCallback( MaskedTextBox.RestrictToAsciiPropertyChangedCallback ),
-      new CoerceValueCallback( MaskedTextBox.RestrictToAsciiCoerceValueCallback ) ) );
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    private static object RestrictToAsciiCoerceValueCallback( object sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return value;
-
-      if( maskedTextBox.m_maskIsNull )
-        return value;
-
-      bool restrictToAscii = ( bool )value;
-
-      if( !restrictToAscii )
-        return value;
-
-      // Validate the text to make sure that it is only made of Ascii characters.
-
-      MaskedTextProvider provider = maskedTextBox.CreateMaskedTextProvider(
-        maskedTextBox.Mask,
-        maskedTextBox.GetCultureInfo(),
-        maskedTextBox.AllowPromptAsInput,
-        maskedTextBox.PromptChar,
-        MaskedTextBox.DefaultPasswordChar,
-        restrictToAscii );
-
-      if( !provider.VerifyString( maskedTextBox.Text ) )
-        throw new ArgumentException( "The current text cannot be restricted to ASCII characters. The RestrictToAscii property is set to true.", "RestrictToAscii" );
-
-      return restrictToAscii;
-    }
-
-    private static void RestrictToAsciiPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider = maskedTextBox.CreateMaskedTextProvider( maskedTextBox.Mask );
-
-      maskedTextBox.RefreshCurrentText( true );
-    }
-
-    #endregion RestrictToAscii Property
-
-    #region SkipLiterals Property
-
-    public bool SkipLiterals
-    {
-      get
-      {
-        return ( bool )GetValue( SkipLiteralsProperty );
-      }
-      set
-      {
-        SetValue( SkipLiteralsProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty SkipLiteralsProperty =
-        DependencyProperty.Register( "SkipLiterals", typeof( bool ), typeof( MaskedTextBox ),
-      new UIPropertyMetadata(
-      true,
-      new PropertyChangedCallback( MaskedTextBox.SkipLiteralsPropertyChangedCallback ) ) );
-
-    private static void SkipLiteralsPropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return;
-
-      if( maskedTextBox.m_maskIsNull )
-        return;
-
-      maskedTextBox.m_maskedTextProvider.SkipLiterals = ( bool )e.NewValue;
-    }
-
-    #endregion SkipLiterals Property
-
-    #region Text Property
-
-    private static object TextCoerceValueCallback( DependencyObject sender, object value )
-    {
-      MaskedTextBox maskedTextBox = sender as MaskedTextBox;
-
-      if( !maskedTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( maskedTextBox.IsInIMEComposition )
-      {
-        // In IME Composition.  We must return an uncoerced value or else the IME decorator won't disappear after text input.
-        return value;
-      }
-
-      if( value == null )
-        value = string.Empty;
-
-      if( ( maskedTextBox.IsForcingText ) || ( maskedTextBox.m_maskIsNull ) )
-        return value;
-
-      // Only direct affectation to the Text property or binding of the Text property should
-      // come through here.  All other cases should pre-validate the text and affect it through the ForceText method.
-      string text = maskedTextBox.ValidateText( ( string )value );
-
-      return text;
-    }
-
-    private string ValidateText( string text )
-    {
-      string coercedText = text;
-
-      if( this.RejectInputOnFirstFailure )
-      {
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        int notUsed;
-        MaskedTextResultHint hint;
-
-        //0 – Digit zero to 9[ Required ]
-        //9 – Digit 0 – 9[ Optional ]
-        //A – Alpha Numeric. [Required]
-        //a – Alpha Numeric. [Optional]
-        //L – Letters a-z, A-Z[ Required ]
-        //? – Letters a-z, A-Z[ Optional ]
-        //C – Any non-control character [Optional]
-        //< - When first, all following characters are in lower case.
-        //> - When first, all following characters are in upper case.
-        if( provider.Set( text, out notUsed, out hint ) || provider.Mask.StartsWith( ">" ) || provider.Mask.StartsWith( "<" ) )
-        {
-          coercedText = this.GetFormattedString( provider, text );
-        }
-        else
-        {
-          // Coerce the text to remain the same.
-          coercedText = this.GetFormattedString( m_maskedTextProvider, text );
-
-          // The TextPropertyChangedCallback won't be called.
-          // Therefore, we must sync the maskedTextProvider.
-          m_maskedTextProvider.Set( coercedText );
-        }
-      }
-      else
-      {
-        MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-
-        int caretIndex;
-
-        if( this.CanReplace( provider, text, 0, m_maskedTextProvider.Length, this.RejectInputOnFirstFailure, out caretIndex ) )
-        {
-          coercedText = this.GetFormattedString( provider, text );
-        }
-        else
-        {
-          // Coerce the text to remain the same.
-          coercedText = this.GetFormattedString( m_maskedTextProvider, text );
-
-          // The TextPropertyChangedCallback won't be called.
-          // Therefore, we must sync the maskedTextProvider.
-          m_maskedTextProvider.Set( coercedText );
-        }
-      }
-
-      return coercedText;
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        if( ( this.IsInValueChanged ) || ( !this.IsForcingText ) )
-        {
-          string newText = this.Text;
-
-          if( m_maskIsNull )
-          {
-            this.CaretIndex = newText.Length;
-          }
-          else
-          {
-            m_maskedTextProvider.Set( newText );
-
-            if( m_maskedTextProvider.Mask.StartsWith( ">" ) || m_maskedTextProvider.Mask.StartsWith( "<" ) )
-            {
-              this.CaretIndex = newText.Length;
-            }
-            else
-            {
-              int caretIndex = m_maskedTextProvider.FindUnassignedEditPositionFrom( 0, true );
-
-              if( caretIndex == -1 )
-                caretIndex = m_maskedTextProvider.Length;
-
-              this.CaretIndex = caretIndex;
-            }
-          }
-        }
-      }
-
-      // m_maskedTextProvider can be null in the designer. With WPF 3.5 SP1, sometimes, 
-      // TextChanged will be triggered before OnInitialized is called.
-      if( m_maskedTextProvider != null )
-      {
-        this.SetIsMaskCompleted( m_maskedTextProvider.MaskCompleted );
-        this.SetIsMaskFull( m_maskedTextProvider.MaskFull );
-      }
-
-      base.OnTextChanged( e );
-    }
-
-    #endregion Text Property
-
-
-    #region COMMANDS
-
-    private void OnPreviewCanExecuteCommands( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      RoutedUICommand routedUICommand = e.Command as RoutedUICommand;
-
-      if( ( routedUICommand != null )
-        && ( ( routedUICommand.Name == "Space" ) || ( routedUICommand.Name == "ShiftSpace" ) ) )
-      {
-        if( this.IsReadOnly )
-        {
-          e.CanExecute = false;
-        }
-        else
-        {
-          MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-          int caretIndex;
-          e.CanExecute = this.CanReplace( provider, " ", this.SelectionStart, this.SelectionLength, this.RejectInputOnFirstFailure, out caretIndex );
-        }
-
-        e.Handled = true;
-      }
-      else if( ( e.Command == ApplicationCommands.Undo ) || ( e.Command == ApplicationCommands.Redo ) )
-      {
-        e.CanExecute = false;
-        e.Handled = true;
-      }
-    }
-
-    private void OnPreviewExecutedCommands( object sender, ExecutedRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      if( e.Command == EditingCommands.Delete )
-      {
-        e.Handled = true;
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == EditingCommands.DeleteNextWord )
-      {
-        e.Handled = true;
-        EditingCommands.SelectRightByWord.Execute( null, this as IInputElement );
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == EditingCommands.DeletePreviousWord )
-      {
-        e.Handled = true;
-        EditingCommands.SelectLeftByWord.Execute( null, this as IInputElement );
-        this.Delete( this.SelectionStart, this.SelectionLength, false );
-      }
-      else if( e.Command == EditingCommands.Backspace )
-      {
-        e.Handled = true;
-        this.Delete( this.SelectionStart, this.SelectionLength, false );
-      }
-      else if( e.Command == ApplicationCommands.Cut )
-      {
-        e.Handled = true;
-
-        if( ApplicationCommands.Copy.CanExecute( null, this as IInputElement ) )
-          ApplicationCommands.Copy.Execute( null, this as IInputElement );
-
-        this.Delete( this.SelectionStart, this.SelectionLength, true );
-      }
-      else if( e.Command == ApplicationCommands.Copy )
-      {
-        e.Handled = true;
-        this.ExecuteCopy();
-      }
-      else if( e.Command == ApplicationCommands.Paste )
-      {
-        e.Handled = true;
-
-        string clipboardContent = ( string )Clipboard.GetDataObject().GetData( "System.String" );
-        this.Replace( clipboardContent, this.SelectionStart, this.SelectionLength );
-      }
-      else
-      {
-        RoutedUICommand routedUICommand = e.Command as RoutedUICommand;
-
-        if( ( routedUICommand != null )
-          && ( ( routedUICommand.Name == "Space" ) || ( routedUICommand.Name == "ShiftSpace" ) ) )
-        {
-          e.Handled = true;
-          this.ProcessTextInput( " " );
-        }
-      }
-    }
-
-    private void CanExecuteDelete( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = this.CanDelete( this.SelectionStart, this.SelectionLength, true, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteDeletePreviousWord( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canDeletePreviousWord = ( !this.IsReadOnly ) && ( EditingCommands.SelectLeftByWord.CanExecute( null, this as IInputElement ) );
-
-      if( canDeletePreviousWord )
-      {
-        int cachedSelectionStart = this.SelectionStart;
-        int cachedSelectionLength = this.SelectionLength;
-
-        EditingCommands.SelectLeftByWord.Execute( null, this as IInputElement );
-
-        canDeletePreviousWord = this.CanDelete( this.SelectionStart, this.SelectionLength, false, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-
-        if( !canDeletePreviousWord )
-        {
-          this.SelectionStart = cachedSelectionStart;
-          this.SelectionLength = cachedSelectionLength;
-        }
-      }
-
-      e.CanExecute = canDeletePreviousWord;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteDeleteNextWord( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canDeleteNextWord = ( !this.IsReadOnly ) && ( EditingCommands.SelectRightByWord.CanExecute( null, this as IInputElement ) );
-
-      if( canDeleteNextWord )
-      {
-        int cachedSelectionStart = this.SelectionStart;
-        int cachedSelectionLength = this.SelectionLength;
-
-        EditingCommands.SelectRightByWord.Execute( null, this as IInputElement );
-
-        canDeleteNextWord = this.CanDelete( this.SelectionStart, this.SelectionLength, true, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-
-        if( !canDeleteNextWord )
-        {
-          this.SelectionStart = cachedSelectionStart;
-          this.SelectionLength = cachedSelectionLength;
-        }
-      }
-
-      e.CanExecute = canDeleteNextWord;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteBackspace( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = this.CanDelete( this.SelectionStart, this.SelectionLength, false, this.MaskedTextProvider.Clone() as MaskedTextProvider );
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteCut( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canCut = ( !this.IsReadOnly ) && ( this.SelectionLength > 0 );
-
-      if( canCut )
-      {
-        int endPosition = ( this.SelectionLength > 0 ) ? ( ( this.SelectionStart + this.SelectionLength ) - 1 ) : this.SelectionStart;
-
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        canCut = provider.RemoveAt( this.SelectionStart, endPosition );
-      }
-
-      e.CanExecute = canCut;
-      e.Handled = true;
-
-      if( ( !canCut ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecutePaste( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      bool canPaste = false;
-
-      if( !this.IsReadOnly )
-      {
-        string clipboardContent = string.Empty;
-
-        try
-        {
-          clipboardContent = ( string )Clipboard.GetDataObject().GetData( "System.String" );
-
-          if( clipboardContent != null )
-          {
-            MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-            int caretIndex;
-            canPaste = this.CanReplace( provider, clipboardContent, this.SelectionStart, this.SelectionLength, this.RejectInputOnFirstFailure, out caretIndex );
-          }
-        }
-        catch
-        {
-        }
-      }
-
-      e.CanExecute = canPaste;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void CanExecuteCopy( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.CanExecute = !m_maskedTextProvider.IsPassword;
-      e.Handled = true;
-
-      if( ( !e.CanExecute ) && ( this.BeepOnError ) )
-        System.Media.SystemSounds.Beep.Play();
-    }
-
-    private void ExecuteCopy()
-    {
-      string selectedText = this.GetSelectedText();
-      try
-      {
-        new UIPermission( UIPermissionClipboard.AllClipboard ).Demand();
-
-        if( selectedText.Length == 0 )
-        {
-          Clipboard.Clear();
-        }
-        else
-        {
-          Clipboard.SetText( selectedText );
-        }
-      }
-      catch( SecurityException )
-      {
-      }
-    }
-
-    private void ToggleInsertExecutedCallback( object sender, ExecutedRoutedEventArgs e )
-    {
-      m_insertToggled = !m_insertToggled;
-    }
-
-    #endregion COMMANDS
-
-    #region DRAG DROP
-
-    private void PreviewQueryContinueDragCallback( object sender, QueryContinueDragEventArgs e )
-    {
-      if( m_maskIsNull )
-        return;
-
-      e.Action = DragAction.Cancel;
-      e.Handled = true;
-    }
-
-    protected override void OnDragEnter( DragEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        e.Effects = DragDropEffects.None;
-        e.Handled = true;
-      }
-
-      base.OnDragEnter( e );
-    }
-
-    protected override void OnDragOver( DragEventArgs e )
-    {
-      if( !m_maskIsNull )
-      {
-        e.Effects = DragDropEffects.None;
-        e.Handled = true;
-      }
-
-      base.OnDragOver( e );
-    }
-
-    #endregion DRAG DROP
-
-
-    #region VALUE FROM TEXT
-
-    protected override bool QueryValueFromTextCore( string text, out object value )
-    {
-      Type valueDataType = this.ValueDataType;
-
-      if( valueDataType != null )
-      {
-        if( ( m_unhandledLiteralsPositions != null )
-          && ( m_unhandledLiteralsPositions.Count > 0 ) )
-        {
-          text = m_maskedTextProvider.ToString( false, false, true, 0, m_maskedTextProvider.Length );
-
-          for( int i = m_unhandledLiteralsPositions.Count - 1; i >= 0; i-- )
-          {
-            text = text.Remove( m_unhandledLiteralsPositions[ i ], 1 );
-          }
-        }
-      }
-
-      return base.QueryValueFromTextCore( text, out value );
-    }
-
-    #endregion VALUE FROM TEXT
-
-    #region TEXT FROM VALUE
-
-    protected override string QueryTextFromValueCore( object value )
-    {
-      if( ( m_valueToStringMethodInfo != null ) && ( value != null ) )
-      {
-        try
-        {
-          string text = ( string )m_valueToStringMethodInfo.Invoke( value, new object[] { m_formatSpecifier, this.GetActiveFormatProvider() } );
-          return text;
-        }
-        catch
-        {
-        }
-      }
-
-      return base.QueryTextFromValueCore( value );
-    }
-
-    #endregion TEXT FROM VALUE
-
-
-    #region PROTECTED METHODS
-
-    protected virtual char[] GetMaskCharacters()
-    {
-      return MaskedTextBox.MaskChars;
-    }
-
-    private MaskedTextProvider CreateMaskedTextProvider( string mask )
-    {
-      return this.CreateMaskedTextProvider(
-        mask,
-        this.GetCultureInfo(),
-        this.AllowPromptAsInput,
-        this.PromptChar,
-        MaskedTextBox.DefaultPasswordChar,
-        this.RestrictToAscii );
-    }
-
-    protected virtual MaskedTextProvider CreateMaskedTextProvider(
-      string mask,
-      CultureInfo cultureInfo,
-      bool allowPromptAsInput,
-      char promptChar,
-      char passwordChar,
-      bool restrictToAscii )
-    {
-      MaskedTextProvider provider = new MaskedTextProvider(
-        mask,
-        cultureInfo,
-        allowPromptAsInput,
-        promptChar,
-        passwordChar,
-        restrictToAscii );
-
-      provider.ResetOnPrompt = this.ResetOnPrompt;
-      provider.ResetOnSpace = this.ResetOnSpace;
-      provider.SkipLiterals = this.SkipLiterals;
-
-      provider.IncludeLiterals = true;
-      provider.IncludePrompt = true;
-
-      provider.IsPassword = false;
-
-      return provider;
-    }
-
-    internal override void OnIMECompositionEnded( CachedTextInfo cachedTextInfo )
-    {
-      // End of IME Composition.  Restore the critical infos.
-      this.ForceText( cachedTextInfo.Text, false );
-      this.CaretIndex = cachedTextInfo.CaretIndex;
-      this.SelectionStart = cachedTextInfo.SelectionStart;
-      this.SelectionLength = cachedTextInfo.SelectionLength;
-    }
-
-    protected override void OnTextInput( System.Windows.Input.TextCompositionEventArgs e )
-    {
-      if( this.IsInIMEComposition )
-        this.EndIMEComposition();
-
-      if( ( m_maskIsNull ) || ( m_maskedTextProvider == null ) || ( this.IsReadOnly ) )
-      {
-        base.OnTextInput( e );
-        return;
-      }
-
-      e.Handled = true;
-
-      if( this.CharacterCasing == CharacterCasing.Upper )
-      {
-        this.ProcessTextInput( e.Text.ToUpper() );
-      }
-      else if( this.CharacterCasing == CharacterCasing.Lower )
-      {
-        this.ProcessTextInput( e.Text.ToLower() );
-      }
-      else
-      {
-        this.ProcessTextInput( e.Text );
-      }
-
-      base.OnTextInput( e );
-    }
-
-    private void ProcessTextInput( string text )
-    {
-      if( text.Length == 1 )
-      {
-        string textOutput = this.MaskedTextOutput;
-
-        int caretIndex;
-        if( this.PlaceChar( text[ 0 ], this.SelectionStart, this.SelectionLength, this.IsOverwriteMode, out caretIndex ) )
-        {
-          if( this.MaskedTextOutput != textOutput )
-            this.RefreshCurrentText( false );
-
-          this.SelectionStart = caretIndex + 1;
-        }
-        else
-        {
-          if( this.BeepOnError )
-            System.Media.SystemSounds.Beep.Play();
-        }
-
-        if( this.SelectionLength > 0 )
-          this.SelectionLength = 0;
-      }
-      else
-      {
-        this.Replace( text, this.SelectionStart, this.SelectionLength );
-      }
-    }
-
-    protected override void ValidateValue( object value )
-    {
-      base.ValidateValue( value );
-
-      // Validate if it fits in the mask
-      if( !m_maskIsNull )
-      {
-        string representation = this.GetTextFromValue( value );
-
-        MaskedTextProvider provider = m_maskedTextProvider.Clone() as MaskedTextProvider;
-
-        if( !provider.VerifyString( representation ) )
-          throw new ArgumentException( "The value representation '" + representation + "' does not match the mask.", "value" );
-      }
-    }
-
-    #endregion PROTECTED METHODS
-
-
-    #region INTERNAL PROPERTIES
-
-    internal bool IsForcingMask
-    {
-      get
-      {
-        return m_forcingMask;
-      }
-    }
-
-    internal string FormatSpecifier
-    {
-      get
-      {
-        return m_formatSpecifier;
-      }
-      set
-      {
-        m_formatSpecifier = value;
-      }
-    }
-
-    internal override bool IsTextReadyToBeParsed
-    {
-      get
-      {
-        return this.IsMaskCompleted;
-      }
-    }
-
-    internal override bool GetIsEditTextEmpty()
-    {
-      if( !m_maskIsNull )
-        return ( this.MaskedTextProvider.AssignedEditPositionCount == 0 );
-      return true;
-    }
-
-    #endregion INTERNAL PROPERTIES
-
-    #region INTERNAL METHODS
-
-    internal override string GetCurrentText()
-    {
-      if( m_maskIsNull )
-        return base.GetCurrentText();
-
-      string displayText = this.GetFormattedString( m_maskedTextProvider, this.Text );
-
-      return displayText;
-    }
-
-    internal override string GetParsableText()
-    {
-      if( m_maskIsNull )
-        return base.GetParsableText();
-
-      bool includePrompt = false;
-      bool includeLiterals = true;
-
-      if( this.ValueDataType == typeof( string ) )
-      {
-        includePrompt = this.IncludePromptInValue;
-        includeLiterals = this.IncludeLiteralsInValue;
-      }
-
-      return m_maskedTextProvider
-        .ToString( false, includePrompt, includeLiterals, 0, m_maskedTextProvider.Length );
-    }
-
-    internal override void OnFormatProviderChanged()
-    {
-      MaskedTextProvider provider = new MaskedTextProvider( this.Mask );
-
-      m_maskedTextProvider = provider;
-
-      this.RefreshConversionHelpers();
-      this.RefreshCurrentText( true );
-
-      base.OnFormatProviderChanged();
-    }
-
-    internal override void RefreshConversionHelpers()
-    {
-      Type type = this.ValueDataType;
-
-      if( ( type == null ) || ( !this.IsNumericValueDataType ) )
-      {
-        m_formatSpecifier = null;
-        m_valueToStringMethodInfo = null;
-        m_unhandledLiteralsPositions = null;
-        return;
-      }
-
-      m_valueToStringMethodInfo = type.GetMethod( "ToString", new Type[] { typeof( string ), typeof( IFormatProvider ) } );
-
-      string mask = m_maskedTextProvider.Mask;
-      IFormatProvider activeFormatProvider = this.GetActiveFormatProvider();
-
-      char[] maskChars = this.GetMaskCharacters();
-
-      List<int> unhandledLiteralsPositions;
-
-      m_formatSpecifier = MaskedTextBox.GetFormatSpecifierFromMask(
-        mask,
-        maskChars,
-        activeFormatProvider,
-        this.IncludeLiteralsInValue,
-        out unhandledLiteralsPositions );
-
-      NumberFormatInfo numberFormatInfo = activeFormatProvider.GetFormat( typeof( NumberFormatInfo ) ) as NumberFormatInfo;
-
-      if( numberFormatInfo != null )
-      {
-        string negativeSign = numberFormatInfo.NegativeSign;
-
-        if( m_formatSpecifier.Contains( negativeSign ) )
-        {
-          // We must make sure that the value data type is numeric since we are about to 
-          // set the format specifier to its Positive,Negative,Zero format pattern.
-          // If we do not do this, the negative symbol would double itself when IncludeLiteralsInValue
-          // is set to True and a negative symbol is added to the mask as a literal.
-          Debug.Assert( this.IsNumericValueDataType );
-
-          m_formatSpecifier = m_formatSpecifier + ";" + m_formatSpecifier + ";" + m_formatSpecifier;
-        }
-        else
-        {
-
-        }
-      }
-
-      m_unhandledLiteralsPositions = unhandledLiteralsPositions;
-    }
-
-    internal void SetValueToStringMethodInfo( MethodInfo valueToStringMethodInfo )
-    {
-      m_valueToStringMethodInfo = valueToStringMethodInfo;
-    }
-
-    internal void ForceMask( string mask )
-    {
-      m_forcingMask = true;
-
-      try
-      {
-        this.Mask = mask;
-      }
-      finally
-      {
-        m_forcingMask = false;
-      }
-    }
-
-    #endregion INTERNAL METHODS
-
-    #region PRIVATE PROPERTIES
-
-    private bool IsOverwriteMode
-    {
-      get
-      {
-        if( !m_maskIsNull )
-        {
-          switch( this.InsertKeyMode )
-          {
-            case InsertKeyMode.Default:
-              {
-                return m_insertToggled;
-              }
-
-            case InsertKeyMode.Insert:
-              {
-                return false;
-              }
-
-            case InsertKeyMode.Overwrite:
-              {
-                return true;
-              }
-          }
-        }
-
-        return false;
-      }
-    }
-
-    #endregion PRIVATE PROPERTIES
-
-    #region PRIVATE METHODS
-
-    private bool PlaceChar( char ch, int startPosition, int length, bool overwrite, out int caretIndex )
-    {
-      return this.PlaceChar( m_maskedTextProvider, ch, startPosition, length, overwrite, out caretIndex );
-    }
-
-
-    private bool PlaceChar( MaskedTextProvider provider, char ch, int startPosition, int length, bool overwrite, out int caretPosition )
-    {
-      if( this.ShouldQueryAutoCompleteMask( provider.Clone() as MaskedTextProvider, ch, startPosition ) )
-      {
-        AutoCompletingMaskEventArgs e = new AutoCompletingMaskEventArgs(
-          m_maskedTextProvider.Clone() as MaskedTextProvider,
-          startPosition,
-          length,
-          ch.ToString() );
-
-        this.OnAutoCompletingMask( e );
-
-        if( ( !e.Cancel ) && ( e.AutoCompleteStartPosition > -1 ) )
-        {
-          caretPosition = startPosition;
-
-          // AutoComplete the block.
-          for( int i = 0; i < e.AutoCompleteText.Length; i++ )
-          {
-            if( !this.PlaceCharCore( provider, e.AutoCompleteText[ i ], e.AutoCompleteStartPosition + i, 0, true, out caretPosition ) )
-              return false;
-          }
-
-          caretPosition = e.AutoCompleteStartPosition + e.AutoCompleteText.Length;
-          return true;
-        }
-      }
-
-      return this.PlaceCharCore( provider, ch, startPosition, length, overwrite, out caretPosition );
-    }
-
-    private bool ShouldQueryAutoCompleteMask( MaskedTextProvider provider, char ch, int startPosition )
-    {
-      if( provider.IsEditPosition( startPosition ) )
-      {
-        int nextSeparatorIndex = provider.FindNonEditPositionFrom( startPosition, true );
-
-        if( nextSeparatorIndex != -1 )
-        {
-          if( provider[ nextSeparatorIndex ].Equals( ch ) )
-          {
-            int previousSeparatorIndex = provider.FindNonEditPositionFrom( startPosition, false );
-
-            if( provider.FindUnassignedEditPositionInRange( previousSeparatorIndex, nextSeparatorIndex, true ) != -1 )
-            {
-              return true;
-            }
-          }
-        }
-      }
-
-      return false;
-    }
-
-    protected virtual void OnAutoCompletingMask( AutoCompletingMaskEventArgs e )
-    {
-      if( this.AutoCompletingMask != null )
-        this.AutoCompletingMask( this, e );
-    }
-
-    public event EventHandler<AutoCompletingMaskEventArgs> AutoCompletingMask;
-
-
-    private bool PlaceCharCore( MaskedTextProvider provider, char ch, int startPosition, int length, bool overwrite, out int caretPosition )
-    {
-      caretPosition = startPosition;
-
-      if( startPosition < m_maskedTextProvider.Length )
-      {
-        MaskedTextResultHint notUsed;
-
-        if( length > 0 )
-        {
-          int endPosition = ( startPosition + length ) - 1;
-          return provider.Replace( ch, startPosition, endPosition, out caretPosition, out notUsed );
-        }
-
-        if( overwrite )
-          return provider.Replace( ch, startPosition, out caretPosition, out notUsed );
-
-        return provider.InsertAt( ch, startPosition, out caretPosition, out notUsed );
-      }
-
-      return false;
-    }
-
-    internal void Replace( string text, int startPosition, int selectionLength )
-    {
-      MaskedTextProvider provider = ( MaskedTextProvider )m_maskedTextProvider.Clone();
-      int tentativeCaretIndex;
-
-      if( this.CanReplace( provider, text, startPosition, selectionLength, this.RejectInputOnFirstFailure, out tentativeCaretIndex ) )
-      {
-        System.Diagnostics.Debug.WriteLine( "Replace caret index to: " + tentativeCaretIndex.ToString() );
-
-        bool mustRefreshText = this.MaskedTextOutput != provider.ToString();
-        m_maskedTextProvider = provider;
-
-        if( mustRefreshText )
-          this.RefreshCurrentText( false );
-
-        this.CaretIndex = tentativeCaretIndex + 1;
-      }
-      else
-      {
-        if( this.BeepOnError )
-          System.Media.SystemSounds.Beep.Play();
-      }
-    }
-
-    internal virtual bool CanReplace( MaskedTextProvider provider, string text, int startPosition, int selectionLength, bool rejectInputOnFirstFailure, out int tentativeCaretIndex )
-    {
-      int endPosition = ( startPosition + selectionLength ) - 1;
-      tentativeCaretIndex = -1;
-
-
-      bool success = false;
-
-      foreach( char ch in text )
-      {
-        if( !m_maskedTextProvider.VerifyEscapeChar( ch, startPosition ) )
-        {
-          int editPositionFrom = provider.FindEditPositionFrom( startPosition, true );
-
-          if( editPositionFrom == MaskedTextProvider.InvalidIndex )
-            break;
-
-          startPosition = editPositionFrom;
-        }
-
-        int length = ( endPosition >= startPosition ) ? 1 : 0;
-        bool overwrite = length > 0;
-
-        if( this.PlaceChar( provider, ch, startPosition, length, overwrite, out tentativeCaretIndex ) )
-        {
-          // Only one successfully inserted character is enough to declare the replace operation successful.
-          success = true;
-
-          startPosition = tentativeCaretIndex + 1;
-        }
-        else if( rejectInputOnFirstFailure )
-        {
-          return false;
-        }
-      }
-
-      if( ( selectionLength > 0 ) && ( startPosition <= endPosition ) )
-      {
-
-        // Erase the remaining of the assigned edit character.
-        int notUsed;
-        MaskedTextResultHint notUsedHint;
-        if( !provider.RemoveAt( startPosition, endPosition, out notUsed, out notUsedHint ) )
-          success = false;
-      }
-
-      return success;
-    }
-
-    private bool CanDelete( int startPosition, int selectionLength, bool deleteForward, MaskedTextProvider provider )
-    {
-      if( this.IsReadOnly )
-        return false;
-
-
-      if( selectionLength == 0 )
-      {
-        if( !deleteForward )
-        {
-          if( startPosition == 0 )
-            return false;
-
-          startPosition--;
-        }
-        else if( ( startPosition + selectionLength ) == provider.Length )
-        {
-          return false;
-        }
-      }
-
-      MaskedTextResultHint notUsed;
-      int tentativeCaretPosition = startPosition;
-
-      int endPosition = ( selectionLength > 0 ) ? ( ( startPosition + selectionLength ) - 1 ) : startPosition;
-
-      bool success = provider.RemoveAt( startPosition, endPosition, out tentativeCaretPosition, out notUsed );
-
-      return success;
-    }
-
-    private void Delete( int startPosition, int selectionLength, bool deleteForward )
-    {
-      if( this.IsReadOnly )
-        return;
-
-
-      if( selectionLength == 0 )
-      {
-        if( !deleteForward )
-        {
-          if( startPosition == 0 )
-            return;
-
-          startPosition--;
-        }
-        else if( ( startPosition + selectionLength ) == m_maskedTextProvider.Length )
-        {
-          return;
-        }
-      }
-
-      MaskedTextResultHint hint;
-      int tentativeCaretPosition = startPosition;
-
-      int endPosition = ( selectionLength > 0 ) ? ( ( startPosition + selectionLength ) - 1 ) : startPosition;
-
-      string oldTextOutput = this.MaskedTextOutput;
-
-      bool success = m_maskedTextProvider.RemoveAt( startPosition, endPosition, out tentativeCaretPosition, out hint );
-
-      if( !success )
-      {
-        if( this.BeepOnError )
-          System.Media.SystemSounds.Beep.Play();
-
-        return;
-      }
-
-      if( this.MaskedTextOutput != oldTextOutput )
-      {
-        this.RefreshCurrentText( false );
-      }
-      else if( selectionLength > 0 )
-      {
-        tentativeCaretPosition = startPosition;
-      }
-      else if( hint == MaskedTextResultHint.NoEffect )
-      {
-        if( deleteForward )
-        {
-          tentativeCaretPosition = m_maskedTextProvider.FindEditPositionFrom( startPosition, true );
-        }
-        else
-        {
-          if( m_maskedTextProvider.FindAssignedEditPositionFrom( startPosition, true ) == MaskedTextProvider.InvalidIndex )
-          {
-            tentativeCaretPosition = m_maskedTextProvider.FindAssignedEditPositionFrom( startPosition, false );
-          }
-          else
-          {
-            tentativeCaretPosition = m_maskedTextProvider.FindEditPositionFrom( startPosition, false );
-          }
-
-          if( tentativeCaretPosition != MaskedTextProvider.InvalidIndex )
-            tentativeCaretPosition++;
-        }
-
-        if( tentativeCaretPosition == MaskedTextProvider.InvalidIndex )
-          tentativeCaretPosition = startPosition;
-      }
-      else if( !deleteForward )
-      {
-        tentativeCaretPosition = startPosition;
-      }
-
-      this.CaretIndex = tentativeCaretPosition;
-    }
-
-    private string MaskedTextOutput
-    {
-      get
-      {
-        System.Diagnostics.Debug.Assert( m_maskedTextProvider.EditPositionCount > 0 );
-
-        return m_maskedTextProvider.ToString();
-      }
-    }
-
-    private string GetRawText()
-    {
-      if( m_maskIsNull )
-        return this.Text;
-
-      return MaskedTextBox.GetRawText( m_maskedTextProvider );
-    }
-
-    private string GetFormattedString( MaskedTextProvider provider, string text )
-    {
-      if( provider.Mask.StartsWith( ">" ) )
-        return text.ToUpper();
-      if( provider.Mask.StartsWith( "<" ) )
-        return text.ToLower();
-
-      //System.Diagnostics.Debug.Assert( provider.EditPositionCount > 0 );
-
-
-      bool includePrompt = ( this.IsReadOnly ) ? false : ( !this.HidePromptOnLeave || this.IsFocused );
-
-      string displayString = provider.ToString( false, includePrompt, true, 0, m_maskedTextProvider.Length );
-
-      return displayString;
-    }
-
-    private string GetSelectedText()
-    {
-      System.Diagnostics.Debug.Assert( !m_maskIsNull );
-
-      int selectionLength = this.SelectionLength;
-
-      if( selectionLength == 0 )
-        return string.Empty;
-
-      bool includePrompt = ( this.ClipboardMaskFormat & MaskFormat.IncludePrompt ) != MaskFormat.ExcludePromptAndLiterals;
-      bool includeLiterals = ( this.ClipboardMaskFormat & MaskFormat.IncludeLiterals ) != MaskFormat.ExcludePromptAndLiterals;
-
-      return m_maskedTextProvider.ToString( true, includePrompt, includeLiterals, this.SelectionStart, selectionLength );
-    }
-
-    #endregion PRIVATE METHODS
-
-    #region PRIVATE FIELDS
-
-    private MaskedTextProvider m_maskedTextProvider; // = null;
-    private bool m_insertToggled; // = false;
-    private bool m_maskIsNull = true;
-    private bool m_forcingMask; // = false;
-
-    List<int> m_unhandledLiteralsPositions; // = null;
-    private string m_formatSpecifier;
-    private MethodInfo m_valueToStringMethodInfo; // = null;
-
-    #endregion PRIVATE FIELDS
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png
deleted file mode 100644
index 4304d43b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Error48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png
deleted file mode 100644
index 35075187..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Information48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png
deleted file mode 100644
index dad7dd09..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Question48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png
deleted file mode 100644
index ecb7fe86..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Icons/Warning48.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
deleted file mode 100644
index 80fdf126..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-using System.Windows.Input;
-using System.Text;
-using System.Security.Permissions;
-using System.Security;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Diagnostics;
-using System.Windows.Media.Imaging;
-using System.Windows.Threading;
-using System.Windows.Interop;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplateVisualState( Name = VisualStates.OK, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplateVisualState( Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [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 ) )]
-  [TemplatePart( Name = PART_WindowControl, Type = typeof( WindowControl ) )]
-  public class MessageBox : WindowControl
-  {
-    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
-
-    /// <summary>
-    /// Tracks the MessageBoxButon value passed into the InitializeContainer method
-    /// </summary>
-    private MessageBoxButton _button = MessageBoxButton.OK;
-
-    /// <summary>
-    /// Tracks the MessageBoxResult to set as the default and focused button
-    /// </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 IntPtr _ownerHandle;
-
-    private WindowControl _windowControl;
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    static MessageBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( MessageBox ), new FrameworkPropertyMetadata( typeof( MessageBox ) ) );
-    }
-
-    public MessageBox()
-    {
-      this.Visibility = Visibility.Collapsed;
-      this.InitHandlers();
-      this.IsVisibleChanged += this.MessageBox_IsVisibleChanged;
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region Protected Properties
-
-    protected Window Container
-    {
-      get { return ( this.Parent as Window ); }
-    }
-
-    #endregion //Protected Properties
-
-    #region Dependency Properties
-
-    #region ButtonRegionBackground
-
-    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 );
-      }
-    }
-
-    #endregion //ButtonRegionBackground
-
-    #region CancelButtonContent
-
-    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Cancel" ) );
-    public object CancelButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( CancelButtonContentProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonContentProperty, value );
-      }
-    }
-
-    #endregion //CancelButtonContent
-
-    #region CancelButtonStyle
-
-    public static readonly DependencyProperty CancelButtonStyleProperty = DependencyProperty.Register( "CancelButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style CancelButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( CancelButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonStyleProperty, value );
-      }
-    }
-
-    #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 ( ImageSource )GetValue( ImageSourceProperty );
-      }
-      set
-      {
-        SetValue( ImageSourceProperty, value );
-      }
-    }
-
-    #endregion //ImageSource
-
-    #region OkButtonContent
-
-    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
-    public object OkButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( OkButtonContentProperty );
-      }
-      set
-      {
-        SetValue( OkButtonContentProperty, value );
-      }
-    }
-
-    #endregion //OkButtonContent
-
-    #region OkButtonStyle
-
-    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 );
-      }
-    }
-
-    #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
-    {
-      get
-      {
-        return ( object )GetValue( NoButtonContentProperty );
-      }
-      set
-      {
-        SetValue( NoButtonContentProperty, value );
-      }
-    }
-
-    #endregion //NoButtonContent
-
-    #region NoButtonStyle
-
-    public static readonly DependencyProperty NoButtonStyleProperty = DependencyProperty.Register( "NoButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style NoButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( NoButtonStyleProperty );
-      }
-      set
-      {
-        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
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    #endregion //Text
-
-    #region YesButtonContent
-
-    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
-    public object YesButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( YesButtonContentProperty );
-      }
-      set
-      {
-        SetValue( YesButtonContentProperty, value );
-      }
-    }
-
-    #endregion //YesButtonContent
-
-    #region YesButtonStyle
-
-    public static readonly DependencyProperty YesButtonStyleProperty = DependencyProperty.Register( "YesButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style YesButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( YesButtonStyleProperty );
-      }
-      set
-      {
-        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>
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      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 );
-
-      Button closeButton = GetMessageBoxButton( PART_CloseButton );
-      if( closeButton != null )
-        closeButton.IsEnabled = !object.Equals( _button, MessageBoxButton.YesNo );
-
-      Button okButton = GetMessageBoxButton( PART_OkButton );
-      if( okButton != null )
-        okButton.IsCancel = object.Equals( _button, MessageBoxButton.OK );
-
-      SetDefaultResult();
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      base.OnPreviewKeyDown( e );
-
-      // Prevent MenuItem shortcuts while MessageBox is active.
-      if( Keyboard.IsKeyDown( Key.LeftAlt ) || Keyboard.IsKeyDown( Key.RightAlt ) )
-      {
-        e.Handled = true;
-      }
-    }
-
-    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
-
-    #region Public Static
-
-    #region Show with Window as Owner
-
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText )
-    {
-      return Show( messageText, string.Empty, MessageBoxButton.OK, (Style)null );
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="owner">A System.Windows.Window that represents the owner of the MessageBox</param>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( Window owner, string messageText )
-    {
-      return Show( owner, messageText, string.Empty, MessageBoxButton.OK, (Style) null );
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and title bar caption; and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption )
-    {
-        return Show(messageText, caption, MessageBoxButton.OK, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption )
-    {
-        return Show(owner, messageText, caption, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, Style messageBoxStyle )
-    {
-      return Show( owner, messageText, caption, MessageBoxButton.OK, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button )
-    {
-        return Show(messageText, caption, button, (Style)null);
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button )
-    {
-        return Show(owner, messageText, caption, button, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-        return Show(messageText, caption, button, icon, (Style)null);
-    }
-
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-        return Show(owner, messageText, caption, button, icon, (Style)null);
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-        return Show(messageText, caption, button, icon, defaultResult, (Style)null);
-    }
-    /// <summary>
-    /// Displays a message box that has a message and that returns a result.
-    /// </summary>
-    /// <param name="messageText">A System.String that specifies the text to display.</param>
-    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
-    /// <param name="defaultResult">A System.Windows.MessageBoxResult value that specifies the default result of the MessageBox.</param>
-    /// <param name="messageBoxStyle">A Style that will be applied to the MessageBox instance.</param>
-    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( null, IntPtr.Zero, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-        return Show(owner, messageText, caption, button, icon, defaultResult, (Style) null);
-    }
-
-
-    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( owner, IntPtr.Zero, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    #endregion //Show with Window as Owner
-
-    #region Show with Window handle as Owner
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText )
-    {
-      return Show( ownerWindowHandle, messageText, string.Empty, MessageBoxButton.OK, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption )
-    {
-      return Show( ownerWindowHandle, messageText, caption, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, Style messageBoxStyle )
-    {
-      return Show( ownerWindowHandle, messageText, caption, MessageBoxButton.OK, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, icon, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, icon, MessageBoxResult.None, messageBoxStyle );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-      return Show( ownerWindowHandle, messageText, caption, button, icon, defaultResult, ( Style )null );
-    }
-
-    public static MessageBoxResult Show( IntPtr ownerWindowHandle, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
-    {
-      return ShowCore( null, ownerWindowHandle, messageText, caption, button, icon, defaultResult, messageBoxStyle );
-    }
-
-    #endregion //Show with Window handle as Owner
-
-    #endregion //Public Static
-
-    #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>
-    /// 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 )
-    {
-      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>
-    /// <param name="owner">The Window owner.</param>
-    /// <param name="ownerHandle">The Window Handle owner.</param>
-    /// <param name="text">The text.</param>
-    /// <param name="caption">The caption.</param>
-    /// <param name="button">The button.</param>
-    /// <param name="image">The image.</param>
-    /// <param name="defaultResult">The MessageBox result as default.</param>
-    protected void InitializeMessageBox( Window owner, IntPtr ownerHandle, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult )
-    {
-      Text = text;
-      Caption = caption;
-      _button = button;
-      _defaultResult = defaultResult;
-      _owner = owner;
-      _ownerHandle = ownerHandle;
-      SetImageSource( image );
-    }
-
-    /// <summary>
-    /// Changes the control's visual state(s).
-    /// </summary>
-    /// <param name="name">name of the state</param>
-    /// <param name="useTransitions">True if state transitions should be used.</param>
-    protected void ChangeVisualState( string name, bool useTransitions )
-    {
-      VisualStateManager.GoToState( this, name, 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>
-    private void SetDefaultResult()
-    {
-      var defaultButton = GetDefaultButtonFromDefaultResult();
-      if( defaultButton != null )
-      {
-        defaultButton.IsDefault = true;
-        defaultButton.Focus();
-      }
-    }
-
-    /// <summary>
-    /// Gets the default button from the _defaultResult.
-    /// </summary>
-    /// <returns>The default button that represents the defaultResult</returns>
-    private Button GetDefaultButtonFromDefaultResult()
-    {
-      Button defaultButton = null;
-      switch( _defaultResult )
-      {
-        case MessageBoxResult.Cancel:
-          defaultButton = GetMessageBoxButton( PART_CancelButton );
-          break;
-        case MessageBoxResult.No:
-          defaultButton = GetMessageBoxButton( PART_NoButton );
-          break;
-        case MessageBoxResult.OK:
-          defaultButton = GetMessageBoxButton( PART_OkButton );
-          break;
-        case MessageBoxResult.Yes:
-          defaultButton = GetMessageBoxButton( PART_YesButton );
-          break;
-        case MessageBoxResult.None:
-          defaultButton = GetDefaultButton();
-          break;
-      }
-      return defaultButton;
-    }
-
-    /// <summary>
-    /// Gets the default button.
-    /// </summary>
-    /// <remarks>Used when the _defaultResult is set to None</remarks>
-    /// <returns>The button to use as the default</returns>
-    private Button GetDefaultButton()
-    {
-      Button defaultButton = null;
-      switch( _button )
-      {
-        case MessageBoxButton.OK:
-        case MessageBoxButton.OKCancel:
-          defaultButton = GetMessageBoxButton( PART_OkButton );
-          break;
-        case MessageBoxButton.YesNo:
-        case MessageBoxButton.YesNoCancel:
-          defaultButton = GetMessageBoxButton( PART_YesButton );
-          break;
-      }
-      return defaultButton;
-    }
-
-    /// <summary>
-    /// Gets a message box button.
-    /// </summary>
-    /// <param name="name">The name of the button to get.</param>
-    /// <returns>The button</returns>
-    private Button GetMessageBoxButton( string name )
-    {
-      Button button = GetTemplateChild( name ) as Button;
-      return button;
-    }
-
-    private void ShowMessageBoxCore( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
-    {
-      this.InitializeMessageBox( null, IntPtr.Zero, 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>
-    /// <param name="messageText">The message text.</param>
-    /// <param name="caption">The caption.</param>
-    /// <param name="button">The button.</param>
-    /// <param name="icon">The icon.</param>
-    /// <param name="defaultResult">The default result.</param>
-    /// <returns></returns>
-    private static MessageBoxResult ShowCore( Window owner, IntPtr ownerHandle, 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." );
-      }
-
-      if( (owner != null) && (ownerHandle != IntPtr.Zero) )
-      {
-        throw new NotSupportedException( "The owner of a MessageBox can't be both a Window and a WindowHandle." );
-      }
-
-      var msgBox = new MessageBox();
-      msgBox.InitializeMessageBox( owner, ownerHandle, messageText, caption, button, icon, defaultResult );
-
-      // Setting the style to null will inhibit any implicit styles      
-      if( messageBoxStyle != null )
-      {
-        msgBox.Style = messageBoxStyle;
-      }
-
-      msgBox.ShowDialog();
-      return msgBox.MessageBoxResult;
-    }
-
-    private delegate Window ComputeOwnerWindowCoreDelegate();
-
-    /// <summary>
-    /// Resolves the owner Window of the MessageBox.
-    /// </summary>
-    /// <returns>the owner Window</returns>
-    private static Window ComputeOwnerWindow()
-    {
-      Window result = null;
-
-      if( Application.Current != null )
-      {
-        if( Application.Current.Dispatcher.CheckAccess() )
-        {
-          result = ComputeOwnerWindowCore();
-        }
-        else
-        {
-          Application.Current.Dispatcher.BeginInvoke( new Action( () =>
-          {
-            result = ComputeOwnerWindowCore();
-          }
-          ) );
-        }
-      }     
-
-      return result;
-    }
-
-    private static Window ComputeOwnerWindowCore()
-    {
-      Window owner = null;
-
-      if( Application.Current != null )
-      {
-        foreach( Window w in Application.Current.Windows )
-        {
-          if( w.IsActive )
-          {
-            owner = w;
-            break;
-          }
-        }
-      }
-
-      return owner;
-    }
-
-    /// <summary>
-    /// Sets the message image source.
-    /// </summary>
-    /// <param name="image">The image to show.</param>
-    private void SetImageSource( MessageBoxImage image )
-    {
-      String iconName = String.Empty;
-
-      switch( image )
-      {
-        case MessageBoxImage.Error:
-          {
-            iconName = "Error48.png";
-            break;
-          }
-        case MessageBoxImage.Information:
-          {
-            iconName = "Information48.png";
-            break;
-          }
-        case MessageBoxImage.Question:
-          {
-            iconName = "Question48.png";
-            break;
-          }
-        case MessageBoxImage.Warning:
-          {
-            iconName = "Warning48.png";
-            break;
-          }
-        case MessageBoxImage.None:
-        default:
-          {
-            return;
-          }
-      }
-
-      // Use this syntax for other themes to get the icons
-      this.ImageSource = new BitmapImage( new Uri( String.Format( "/Xceed.Wpf.Toolkit;component/MessageBox/Icons/{0}", iconName ), UriKind.RelativeOrAbsolute ) );
-    }
-
-    /// <summary>
-    /// Creates the container which will host the MessageBox control.
-    /// </summary>
-    /// <returns></returns>
-    private Window CreateContainer()
-    {
-      var newWindow = new Window();
-      newWindow.AllowsTransparency = true;
-      newWindow.Background = Brushes.Transparent;
-      newWindow.Content = this;
-
-      if( _ownerHandle != IntPtr.Zero )
-      {
-        var windowHelper = new WindowInteropHelper( newWindow ) { Owner = _ownerHandle };
-        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
-      }
-      else
-      {
-        newWindow.Owner = _owner ?? ComputeOwnerWindow();
-        if( newWindow.Owner != null )
-          newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
-        else
-          newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
-      }
-
-      newWindow.ShowInTaskbar = false;
-      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;
-    }
-
-    #endregion //Private
-
-    #endregion //Methods
-
-    #region Event Handlers
-
-    /// <summary>
-    /// 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>
-    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
-    {
-      if( !this.IsCurrentWindow( e.OriginalSource ) )
-        return;
-
-      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;
-
-      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>
-    /// Sets the MessageBoxResult according to the button pressed and then closes the MessageBox.
-    /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
-    private void Button_Click( object sender, RoutedEventArgs e )
-    {
-      Button button = e.OriginalSource as Button;
-
-      if( button == null )
-        return;
-
-      switch( button.Name )
-      {
-        case PART_NoButton:
-          _dialogResult = MessageBoxResult.No;
-          this.Close();
-          break;
-        case PART_YesButton:
-          _dialogResult = MessageBoxResult.Yes;
-          this.Close();
-          break;
-        case PART_CancelButton:
-          _dialogResult = MessageBoxResult.Cancel;
-          this.Close();
-          break;
-        case PART_OkButton:
-          _dialogResult = MessageBoxResult.OK;
-          this.Close();
-          break;
-      }
-
-      e.Handled = true;
-    }
-
-    /// <summary>
-    /// Callack to the Container.Closed event
-    /// </summary>
-    /// <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()
-    {
-      this.Visibility = Visibility.Collapsed;
-      this.OnClosed( EventArgs.Empty );
-    }
-
-    private void MessageBox_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( (bool)e.NewValue )
-      {
-        Action action = () =>
-        {
-          //Focus first Focusable Child element of MessageBox to prevent Tab outside MessageBox.
-          var defaultButton = this.GetDefaultButtonFromDefaultResult();
-          if( defaultButton != null )
-          {
-            defaultButton.Focus();
-          }
-        };
-
-        Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, action );
-      }
-    }
-
-    #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 )
-    {
-      StringBuilder sb = new StringBuilder();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      sb.Append( Caption );
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      sb.Append( Text );
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-      sb.AppendLine();
-      switch( _button )
-      {
-        case MessageBoxButton.OK:
-          sb.Append( OkButtonContent.ToString() );
-          break;
-        case MessageBoxButton.OKCancel:
-          sb.Append( OkButtonContent + "     " + CancelButtonContent );
-          break;
-        case MessageBoxButton.YesNo:
-          sb.Append( YesButtonContent + "     " + NoButtonContent );
-          break;
-        case MessageBoxButton.YesNoCancel:
-          sb.Append( YesButtonContent + "     " + NoButtonContent + "     " + CancelButtonContent );
-          break;
-      }
-      sb.AppendLine();
-      sb.Append( "---------------------------" );
-
-      try
-      {
-        new UIPermission( UIPermissionClipboard.AllClipboard ).Demand();
-        Clipboard.SetText( sb.ToString() );
-      }
-      catch( SecurityException )
-      {
-        throw new SecurityException();
-      }
-    }
-
-    #endregion COMMANDS
-  }
-}
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
deleted file mode 100644
index 56b91413..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  internal static partial class VisualStates
-  {
-    public const string MessageBoxButtonsGroup = "MessageBoxButtonsGroup";
-    public const string OK = "OK";
-    public const string OKCancel = "OKCancel";
-    public const string YesNo = "YesNo";
-    public const string YesNoCancel = "YesNoCancel";
-  }
-}
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
deleted file mode 100644
index 5f514cef..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,238 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="../../Primitives/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}"
-                          CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                          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}">
-              </Image>
-
-              <!-- 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
deleted file mode 100644
index 5c3d3796..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,238 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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/Generic/Common.xaml" />
-    <ResourceDictionary Source="../../Primitives/Themes/Generic/WindowControl.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- MessageBox                                                                      -->
-  <!-- =============================================================================== -->
-
-  <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">
-                        <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}"
-                                CaptionFontSize="{TemplateBinding CaptionFontSize}"
-                                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}" >
-                    </Image>
-
-                    <!-- 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>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png
deleted file mode 100644
index ebfaee36..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Images/Notes16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
deleted file mode 100644
index 39780891..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_ResizeThumb, Type = typeof( Thumb ) )]
-  [TemplatePart( Name = PART_TextBox, Type = typeof( TextBox ) )]
-  [TemplatePart( Name = PART_DropDownButton, Type = typeof( ToggleButton ) )]
-  public class MultiLineTextEditor : ContentControl
-  {
-    private const string PART_ResizeThumb = "PART_ResizeThumb";
-    private const string PART_TextBox = "PART_TextBox";
-    private const string PART_DropDownButton = "PART_DropDownButton";
-
-    #region Members
-
-    private Thumb _resizeThumb;
-    private TextBox _textBox;
-    private ToggleButton _toggleButton;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region DropDownHeight
-    public static readonly DependencyProperty DropDownHeightProperty = DependencyProperty.Register( "DropDownHeight", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 150.0 ) );
-    public double DropDownHeight
-    {
-      get
-      {
-        return ( double )GetValue( DropDownHeightProperty );
-      }
-      set
-      {
-        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
-    {
-      get
-      {
-        return ( double )GetValue( DropDownWidthProperty );
-      }
-      set
-      {
-        SetValue( DropDownWidthProperty, value );
-      }
-    }
-    #endregion DropDownWidth
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MultiLineTextEditor multiLineTextEditor = o as MultiLineTextEditor;
-      if( multiLineTextEditor != null )
-        multiLineTextEditor.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( _textBox != null )
-      {
-        // Focus the content of the popup, after its loaded
-        Dispatcher.BeginInvoke( new Action( () => _textBox.Focus() ), DispatcherPriority.Background );
-      }
-    }
-
-    #endregion //IsOpen
-
-    #region IsSpellCheckEnabled
-    public static readonly DependencyProperty IsSpellCheckEnabledProperty = DependencyProperty.Register( "IsSpellCheckEnabled", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
-    public bool IsSpellCheckEnabled
-    {
-      get
-      {
-        return ( bool )GetValue( IsSpellCheckEnabledProperty );
-      }
-      set
-      {
-        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
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MultiLineTextEditor textEditor = o as MultiLineTextEditor;
-      if( textEditor != null )
-        textEditor.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    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
-    {
-      get
-      {
-        return ( TextAlignment )GetValue( TextAlignmentProperty );
-      }
-      set
-      {
-        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
-    {
-      get
-      {
-        return ( TextWrapping )GetValue( TextWrappingProperty );
-      }
-      set
-      {
-        SetValue( TextWrappingProperty, value );
-      }
-    }
-    #endregion TextWrapping
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static MultiLineTextEditor()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( typeof( MultiLineTextEditor ) ) );
-    }
-
-    public MultiLineTextEditor()
-    {
-      Keyboard.AddKeyDownHandler( this, OnKeyDown );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Bass Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _resizeThumb != null )
-        _resizeThumb.DragDelta -= ResizeThumb_DragDelta;
-
-      _resizeThumb = GetTemplateChild( PART_ResizeThumb ) as Thumb;
-
-      if( _resizeThumb != null )
-        _resizeThumb.DragDelta += ResizeThumb_DragDelta;
-
-      _textBox = GetTemplateChild( PART_TextBox ) as TextBox;
-      _toggleButton = GetTemplateChild( PART_DropDownButton ) as ToggleButton;
-    }
-
-
-
-
-    #endregion //Bass Class Overrides
-
-    #region Event Handlers
-
-    private void OnKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e )
-          || ( e.Key == Key.Escape )
-          || ( e.Key == Key.Tab ) )
-        {
-          CloseEditor();
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      CloseEditor();
-    }
-
-    void ResizeThumb_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      double yadjust = DropDownHeight + e.VerticalChange;
-      double xadjust = DropDownWidth + e.HorizontalChange;
-
-      if( ( xadjust >= 0 ) && ( yadjust >= 0 ) )
-      {
-        DropDownWidth = xadjust;
-        DropDownHeight = yadjust;
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void CloseEditor()
-    {
-      if( IsOpen )
-        IsOpen = false;
-      ReleaseMouseCapture();
-
-      if( _toggleButton != null )
-      {
-        _toggleButton.Focus();
-      }
-    }
-
-    #endregion //Methods
-  }
-}
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
deleted file mode 100644
index 2fbc03ae..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,217 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <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="IsTabStop"
-            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}">
-            </ToggleButton>
-            <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}"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <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">
-                  </TextBox>
-                  <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
deleted file mode 100644
index 378ade61..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
+++ /dev/null
@@ -1,236 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <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" />
-    <GradientStop Color="#FF8399A9"
-                  Offset="0.375" />
-    <GradientStop Color="#FF718597"
-                  Offset="0.375" />
-    <GradientStop Color="#FF617584"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <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,2.75,2.75,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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </chrome:ButtonChrome>
-            </Grid>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <Setter Property="Foreground"
-                      Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:MultiLineTextEditor}">
-    <Setter Property="Background"
-            Value="White" />
-    <Setter Property="BorderBrush">
-      <Setter.Value>
-        <LinearGradientBrush 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>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="Content"
-            Value="{StaticResource DefaultContent}" />
-    <Setter Property="IsTabStop"
-            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}">
-            </ToggleButton>
-            <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}"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      Background="{StaticResource PopupBackgroundBrush}"
-                      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" >
-                  </TextBox>
-                  <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>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
deleted file mode 100644
index 5eb4628f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  [Flags]
-  public enum AllowedSpecialValues
-  {
-    None = 0,
-    NaN = 1,
-    PositiveInfinity = 2,
-    NegativeInfinity = 4,
-    AnyInfinity = PositiveInfinity | NegativeInfinity,
-    Any = NaN | AnyInfinity
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
deleted file mode 100644
index f18b2847..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ByteUpDown : CommonNumericUpDown<byte>
-  {
-    #region Constructors
-
-    static ByteUpDown()
-    {
-      UpdateMetadata( typeof( ByteUpDown ), ( byte )1, byte.MinValue, byte.MaxValue );
-    }
-
-    public ByteUpDown()
-      : base( Byte.TryParse, Decimal.ToByte, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override byte IncrementValue( byte value, byte increment )
-    {
-      return ( byte )( value + increment );
-    }
-
-    protected override byte DecrementValue( byte value, byte increment )
-    {
-      return ( byte )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
deleted file mode 100644
index d197c875..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
+++ /dev/null
@@ -1,407 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.IO;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public abstract class CommonNumericUpDown<T> : NumericUpDown<T?> where T : struct, IFormattable, IComparable<T>
-  {
-    protected delegate bool FromText( string s, NumberStyles style, IFormatProvider provider, out T result );
-    protected delegate T FromDecimal( decimal d );
-
-    #region Private Members
-
-    private FromText _fromText;
-    private FromDecimal _fromDecimal;
-    private Func<T, T, bool> _fromLowerThan;
-    private Func<T, T, bool> _fromGreaterThan;
-
-    #endregion
-
-    #region Properties
-
-    #region IsInvalid
-
-    internal static readonly DependencyProperty IsInvalidProperty = DependencyProperty.Register( "IsInvalid", typeof( bool ), typeof( CommonNumericUpDown<T> ), new UIPropertyMetadata( false ) );
-    internal bool IsInvalid
-    {
-      get
-      {
-        return ( bool )GetValue( IsInvalidProperty );
-      }
-      private set
-      {
-        SetValue( IsInvalidProperty, value );
-      }
-    }
-
-    #endregion //IsInvalid
-
-    #region ParsingNumberStyle
-
-    public static readonly DependencyProperty ParsingNumberStyleProperty =
-        DependencyProperty.Register( "ParsingNumberStyle", typeof( NumberStyles ), typeof( CommonNumericUpDown<T> ), new UIPropertyMetadata( NumberStyles.Any ) );
-
-    public NumberStyles ParsingNumberStyle
-    {
-      get { return ( NumberStyles )GetValue( ParsingNumberStyleProperty ); }
-      set { SetValue( ParsingNumberStyleProperty, value ); }
-    }
-
-    #endregion //ParsingNumberStyle
-
-    #endregion
-
-    #region Constructors
-
-    protected CommonNumericUpDown( FromText fromText, FromDecimal fromDecimal, Func<T, T, bool> fromLowerThan, Func<T, T, bool> fromGreaterThan )
-    {
-      if( fromText == null )
-        throw new ArgumentNullException( "tryParseMethod" );
-
-      if( fromDecimal == null )
-        throw new ArgumentNullException( "fromDecimal" );
-
-      if( fromLowerThan == null )
-        throw new ArgumentNullException( "fromLowerThan" );
-
-      if( fromGreaterThan == null )
-        throw new ArgumentNullException( "fromGreaterThan" );
-
-      _fromText = fromText;
-      _fromDecimal = fromDecimal;
-      _fromLowerThan = fromLowerThan;
-      _fromGreaterThan = fromGreaterThan;
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    protected static void UpdateMetadata( Type type, T? increment, T? minValue, T? maxValue )
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( type ) );
-      UpdateMetadataCommon( type, increment, minValue, maxValue );
-    }
-
-    protected void TestInputSpecialValue( AllowedSpecialValues allowedValues, AllowedSpecialValues valueToCompare )
-    {
-      if( ( allowedValues & valueToCompare ) != valueToCompare )
-      {
-        switch( valueToCompare )
-        {
-          case AllowedSpecialValues.NaN:
-            throw new InvalidDataException( "Value to parse shouldn't be NaN." );
-          case AllowedSpecialValues.PositiveInfinity:
-            throw new InvalidDataException( "Value to parse shouldn't be Positive Infinity." );
-          case AllowedSpecialValues.NegativeInfinity:
-            throw new InvalidDataException( "Value to parse shouldn't be Negative Infinity." );
-        }
-      }
-    }
-
-    internal bool IsBetweenMinMax( T? value )
-    {
-      return !IsLowerThan( value, Minimum ) && !IsGreaterThan( value, Maximum );
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    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 ) );
-    }
-
-    private bool IsLowerThan( T? value1, T? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return _fromLowerThan( value1.Value, value2.Value );
-    }
-
-    private bool IsGreaterThan( T? value1, T? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return _fromGreaterThan( value1.Value, value2.Value );
-    }
-
-    private bool HandleNullSpin()
-    {
-      if( !Value.HasValue )
-      {
-        T forcedValue = ( DefaultValue.HasValue )
-          ? DefaultValue.Value
-          : default( T );
-
-        Value = CoerceValueMinMax( forcedValue );
-
-        return true;
-      }
-      else if( !Increment.HasValue )
-      {
-        return true;
-      }
-
-      return false;
-    }
-
-    private T? CoerceValueMinMax( T value )
-    {
-      if( IsLowerThan( value, Minimum ) )
-        return Minimum;
-      else if( IsGreaterThan( value, Maximum ) )
-        return Maximum;
-      else
-        return value;
-    }
-
-    #endregion
-
-    #region Base Class Overrides
-
-    protected override void OnIncrement()
-    {
-      if( !HandleNullSpin() )
-      {
-        // if UpdateValueOnEnterKey is true, 
-        // Sync Value on Text only when Enter Key is pressed.
-        if( this.UpdateValueOnEnterKey )
-        {
-          var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-          var result = this.IncrementValue( currentValue.Value, Increment.Value );
-          var newValue = this.CoerceValueMinMax( result );
-          this.TextBox.Text = newValue.Value.ToString( this.FormatString, this.CultureInfo );
-        }
-        else
-        {
-          var result = this.IncrementValue( Value.Value, Increment.Value );
-          this.Value = this.CoerceValueMinMax( result );
-        }
-      }
-    }
-
-    protected override void OnDecrement()
-    {
-      if( !HandleNullSpin() )
-      {
-        // if UpdateValueOnEnterKey is true, 
-        // Sync Value on Text only when Enter Key is pressed.
-        if( this.UpdateValueOnEnterKey )
-        {
-          var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-          var result = this.DecrementValue( currentValue.Value, Increment.Value );
-          var newValue = this.CoerceValueMinMax( result );
-          this.TextBox.Text = newValue.Value.ToString( this.FormatString, this.CultureInfo );
-        }
-        else
-        {
-          var result = this.DecrementValue( Value.Value, Increment.Value );
-          this.Value = this.CoerceValueMinMax( result );
-        }
-      }
-    }
-
-    protected override void OnMinimumChanged( T? oldValue, T? newValue )
-    {
-      base.OnMinimumChanged( oldValue, newValue );
-
-      if( this.Value.HasValue && this.ClipValueToMinMax )
-      {
-        this.Value = this.CoerceValueMinMax( this.Value.Value );
-      }
-    }
-
-    protected override void OnMaximumChanged( T? oldValue, T? newValue )
-    {
-      base.OnMaximumChanged( oldValue, newValue );
-
-      if( this.Value.HasValue && this.ClipValueToMinMax )
-      {
-        this.Value = this.CoerceValueMinMax( this.Value.Value );
-      }
-    }
-
-    protected override T? ConvertTextToValue( string text )
-    {
-      T? result = null;
-
-      if( String.IsNullOrEmpty( text ) )
-        return result;
-
-      // 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 ) )
-      {
-        this.IsInvalid = false;
-        return this.Value;
-      }
-
-      result = this.ConvertTextToValueCore( currentValueText, text );
-
-      if( this.ClipValueToMinMax )
-      {
-        return this.GetClippedMinMaxValue( result );
-      }
-
-      ValidateDefaultMinMax( result );
-
-      return result;
-    }
-
-    protected override string ConvertValueToText()
-    {
-      if( Value == null )
-        return string.Empty;
-
-      this.IsInvalid = false;
-
-      //Manage FormatString of type "{}{0:N2} °" (in xaml) or "{0:N2} °" in code-behind.
-      if( FormatString.Contains( "{0" ) )
-        return string.Format( CultureInfo, FormatString, Value.Value );
-
-      return Value.Value.ToString( FormatString, CultureInfo );
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-      // Null increment always prevents spin.
-      if( (this.Increment != null) && !IsReadOnly )
-      {
-        if( IsLowerThan( Value, Maximum ) || !Value.HasValue || !Maximum.HasValue)
-          validDirections = validDirections | ValidSpinDirections.Increase;
-
-        if( IsGreaterThan( Value, Minimum ) || !Value.HasValue || !Minimum.HasValue )
-          validDirections = validDirections | ValidSpinDirections.Decrease;
-      }
-
-      if( Spinner != null )
-        Spinner.ValidSpinDirection = validDirections;
-    }
-
-    private bool IsPercent( string stringToTest )
-    {
-      int PIndex = stringToTest.IndexOf( "P" );
-      if( PIndex >= 0 )
-      {
-        //stringToTest contains a "P" between 2 "'", it's considered as text, not percent
-        bool isText = (stringToTest.Substring( 0, PIndex ).Contains( "'" )
-                      && stringToTest.Substring( PIndex, FormatString.Length - PIndex ).Contains( "'" ));
-
-        return !isText;
-      }
-      return false;
-    }
-
-    private T? ConvertTextToValueCore( string currentValueText, string text )
-    {
-      T? result;
-
-      if( this.IsPercent( this.FormatString ) )
-      {
-        result = _fromDecimal( ParsePercent( text, CultureInfo ) );
-      }
-      else
-      {
-        T outputValue = new T();
-        // Problem while converting new text
-        if( !_fromText( text, this.ParsingNumberStyle, CultureInfo, out outputValue ) )
-        {
-          bool shouldThrow = true;
-
-          // case 164198: Throw when replacing only the digit part of 99° through UI.
-          // Check if CurrentValueText is also failing => it also contains special characters. ex : 90°
-          T currentValueTextOutputValue;
-          if( !_fromText( currentValueText, this.ParsingNumberStyle, CultureInfo, out currentValueTextOutputValue ) )
-          {
-            // extract non-digit characters
-            var currentValueTextSpecialCharacters = currentValueText.Where( c => !Char.IsDigit( c ) );
-            if( currentValueTextSpecialCharacters.Count() > 0 )
-            {
-              var textSpecialCharacters = text.Where( c => !Char.IsDigit( c ) );
-              // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again.
-              if( currentValueTextSpecialCharacters.Except( textSpecialCharacters ).ToList().Count == 0 )
-              {
-                foreach( var character in textSpecialCharacters )
-                {
-                  text = text.Replace( character.ToString(), string.Empty );
-                }
-                // if without the special characters, parsing is good, do not throw
-                if( _fromText( text, this.ParsingNumberStyle, CultureInfo, out outputValue ) )
-                {
-                  shouldThrow = false;
-                }
-              }
-            }
-          }
-
-          if( shouldThrow )
-          {
-            this.IsInvalid = true;
-            throw new InvalidDataException( "Input string was not in a correct format." );
-          }
-        }
-        result = outputValue;
-      }
-      return result;
-    }
-
-    private T? GetClippedMinMaxValue( T? result )
-    {
-      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.
-      if( object.Equals( value, DefaultValue ) )
-        return;
-
-      if( IsLowerThan( value, Minimum ) )
-        throw new ArgumentOutOfRangeException( "Minimum", String.Format( "Value must be greater than MinValue of {0}", Minimum ) );
-      else if( IsGreaterThan( value, Maximum ) )
-        throw new ArgumentOutOfRangeException( "Maximum", String.Format( "Value must be less than MaxValue of {0}", Maximum ) );
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Abstract Methods
-
-    protected abstract T IncrementValue( T value, T increment );
-
-    protected abstract T DecrementValue( T value, T increment );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
deleted file mode 100644
index 7806ce2a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class DecimalUpDown : CommonNumericUpDown<decimal>
-  {
-    #region Constructors
-
-    static DecimalUpDown()
-    {
-      UpdateMetadata( typeof( DecimalUpDown ), 1m, decimal.MinValue, decimal.MaxValue );
-    }
-
-    public DecimalUpDown()
-      : base( Decimal.TryParse, ( d ) => d, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override decimal IncrementValue( decimal value, decimal increment )
-    {
-      return value + increment;
-    }
-
-    protected override decimal DecrementValue( decimal value, decimal increment )
-    {
-      return value - increment;
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
deleted file mode 100644
index 8b6e4b85..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class DoubleUpDown : CommonNumericUpDown<double>
-  {
-    #region Constructors
-
-    static DoubleUpDown()
-    {
-      UpdateMetadata( typeof( DoubleUpDown ), 1d, double.NegativeInfinity, double.PositiveInfinity );
-    }
-
-    public DoubleUpDown()
-      : base( Double.TryParse, Decimal.ToDouble, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-
-    #region AllowInputSpecialValues
-
-    public static readonly DependencyProperty AllowInputSpecialValuesProperty =
-        DependencyProperty.Register( "AllowInputSpecialValues", typeof( AllowedSpecialValues ), typeof( DoubleUpDown ), new UIPropertyMetadata( AllowedSpecialValues.None ) );
-
-    public AllowedSpecialValues AllowInputSpecialValues
-    {
-      get { return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); }
-      set { SetValue( AllowInputSpecialValuesProperty, value ); }
-    }
-
-    #endregion //AllowInputSpecialValues
-
-    #endregion
-
-    #region Base Class Overrides
-
-    protected override double? OnCoerceIncrement( double? baseValue )
-    {
-      if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Increment." );
-
-      return base.OnCoerceIncrement( baseValue );
-    }
-
-    protected override double? OnCoerceMaximum( double? baseValue )
-    {
-      if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Maximum." );
-
-      return base.OnCoerceMaximum( baseValue );
-    }
-
-    protected override double? OnCoerceMinimum( double? baseValue )
-    {
-      if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Minimum." );
-
-      return base.OnCoerceMinimum( baseValue );
-    }
-
-    protected override double IncrementValue( double value, double increment )
-    {
-      return value + increment;
-    }
-
-    protected override double DecrementValue( double value, double increment )
-    {
-      return value - increment;
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      if( Value.HasValue && double.IsInfinity( Value.Value ) && ( Spinner != null ) )
-      {
-        Spinner.ValidSpinDirection = ValidSpinDirections.None;
-      }
-      else
-      {
-        base.SetValidSpinDirection();
-      }
-    }
-
-    protected override double? ConvertTextToValue( string text )
-    {
-      double? result = base.ConvertTextToValue( text );
-      if( result != null )
-      {
-        if( double.IsNaN( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.NaN );
-        else if( double.IsPositiveInfinity( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.PositiveInfinity );
-        else if( double.IsNegativeInfinity( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.NegativeInfinity );
-      }
-
-      return result;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
deleted file mode 100644
index 8ba2d64b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class IntegerUpDown : CommonNumericUpDown<int>
-  {
-    #region Constructors
-
-    static IntegerUpDown()
-    {
-      UpdateMetadata( typeof( IntegerUpDown ), 1, int.MinValue, int.MaxValue );
-    }
-
-    public IntegerUpDown()
-      : base( Int32.TryParse, Decimal.ToInt32, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override int IncrementValue( int value, int increment )
-    {
-      return value + increment;
-    }
-
-    protected override int DecrementValue( int value, int increment )
-    {
-      return value - increment;
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
deleted file mode 100644
index e76846ad..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class LongUpDown : CommonNumericUpDown<long>
-  {
-    #region Constructors
-
-    static LongUpDown()
-    {
-      UpdateMetadata( typeof( LongUpDown ), 1L, long.MinValue, long.MaxValue );
-    }
-
-    public LongUpDown()
-      : base( Int64.TryParse, Decimal.ToInt64, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override long IncrementValue( long value, long increment )
-    {
-      return value + increment;
-    }
-
-    protected override long DecrementValue( long value, long increment )
-    {
-      return value - increment;
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
deleted file mode 100644
index 0d9e0de5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.Primitives;
-
-
-namespace Xceed.Wpf.Toolkit
-{
-  public abstract class NumericUpDown<T> : UpDownBase<T>
-  {
-#pragma warning disable 0618
-
-    #region Properties
-
-    #region AutoMoveFocus
-
-    public bool AutoMoveFocus
-    {
-      get
-      {
-        return ( bool )GetValue( AutoMoveFocusProperty );
-      }
-      set
-      {
-        SetValue( AutoMoveFocusProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty AutoMoveFocusProperty =
-        DependencyProperty.Register( "AutoMoveFocus", typeof( bool ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( false ) );
-
-    #endregion AutoMoveFocus
-
-    #region AutoSelectBehavior
-
-    public AutoSelectBehavior AutoSelectBehavior
-    {
-      get
-      {
-        return ( AutoSelectBehavior )GetValue( AutoSelectBehaviorProperty );
-      }
-      set
-      {
-        SetValue( AutoSelectBehaviorProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty AutoSelectBehaviorProperty =
-        DependencyProperty.Register( "AutoSelectBehavior", typeof( AutoSelectBehavior ), typeof( NumericUpDown<T> ),
-      new UIPropertyMetadata( AutoSelectBehavior.OnFocus ) );
-
-    #endregion AutoSelectBehavior PROPERTY
-
-    #region FormatString
-
-    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged ) );
-    public string FormatString
-    {
-      get
-      {
-        return ( string )GetValue( FormatStringProperty );
-      }
-      set
-      {
-        SetValue( FormatStringProperty, value );
-      }
-    }
-
-    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
-      if( numericUpDown != null )
-        numericUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
-    {
-      if( IsInitialized )
-      {
-        this.SyncTextAndValueProperties( false, null );
-      }
-    }
-
-    #endregion //FormatString
-
-    #region Increment
-
-    public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register( "Increment", typeof( T ), typeof( NumericUpDown<T> ), new PropertyMetadata( default( T ), OnIncrementChanged, OnCoerceIncrement ) );
-    public T Increment
-    {
-      get
-      {
-        return ( T )GetValue( IncrementProperty );
-      }
-      set
-      {
-        SetValue( IncrementProperty, value );
-      }
-    }
-
-    private static void OnIncrementChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
-      if( numericUpDown != null )
-        numericUpDown.OnIncrementChanged( ( T )e.OldValue, ( T )e.NewValue );
-    }
-
-    protected virtual void OnIncrementChanged( T oldValue, T newValue )
-    {
-      if( this.IsInitialized )
-      {
-        SetValidSpinDirection();
-      }
-    }
-
-    private static object OnCoerceIncrement( DependencyObject d, object baseValue )
-    {
-      NumericUpDown<T> numericUpDown = d as NumericUpDown<T>;
-      if( numericUpDown != null )
-        return numericUpDown.OnCoerceIncrement( ( T )baseValue );
-
-      return baseValue;
-    }
-
-    protected virtual T OnCoerceIncrement( T baseValue )
-    {
-      return baseValue;
-    }
-
-    #endregion
-
-    #region MaxLength
-
-    public static readonly DependencyProperty MaxLengthProperty = DependencyProperty.Register( "MaxLength", typeof( int ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( 0 ) );
-    public int MaxLength
-    {
-      get
-      {
-        return ( int )GetValue( MaxLengthProperty );
-      }
-      set
-      {
-        SetValue( MaxLengthProperty, value );
-      }
-    }
-
-    #endregion //MaxLength
-
-    #endregion //Properties
-
-    #region Overrides
-
-
-    #endregion
-
-    #region Methods
-
-    protected static decimal ParsePercent( string text, IFormatProvider cultureInfo )
-    {
-      NumberFormatInfo info = NumberFormatInfo.GetInstance( cultureInfo );
-
-      text = text.Replace( info.PercentSymbol, null );
-
-      decimal result = Decimal.Parse( text, NumberStyles.Any, info );
-      result = result / 100;
-
-      return result;
-    }
-
-    #endregion //Methods
-  }
-
-#pragma warning restore 0618
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
deleted file mode 100644
index f15e28cf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class SByteUpDown : CommonNumericUpDown<sbyte>
-  {
-    #region Constructors
-
-    static SByteUpDown()
-    {
-      UpdateMetadata( typeof( SByteUpDown ), ( sbyte )1, sbyte.MinValue, sbyte.MaxValue );
-    }
-
-    public SByteUpDown()
-      : base( sbyte.TryParse, Decimal.ToSByte, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override sbyte IncrementValue( sbyte value, sbyte increment )
-    {
-      return ( sbyte )( value + increment );
-    }
-
-    protected override sbyte DecrementValue( sbyte value, sbyte increment )
-    {
-      return ( sbyte )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
deleted file mode 100644
index 39ecc075..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class ShortUpDown : CommonNumericUpDown<short>
-  {
-    #region Constructors
-
-    static ShortUpDown()
-    {
-      UpdateMetadata( typeof( ShortUpDown ), ( short )1, short.MinValue, short.MaxValue );
-    }
-
-    public ShortUpDown()
-      : base( Int16.TryParse, Decimal.ToInt16, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override short IncrementValue( short value, short increment )
-    {
-      return ( short )( value + increment );
-    }
-
-    protected override short DecrementValue( short value, short increment )
-    {
-      return ( short )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
deleted file mode 100644
index 462a880c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class SingleUpDown : CommonNumericUpDown<float>
-  {
-    #region Constructors
-
-    static SingleUpDown()
-    {
-      UpdateMetadata( typeof( SingleUpDown ), 1f, float.NegativeInfinity, float.PositiveInfinity );
-    }
-
-    public SingleUpDown()
-      : base( Single.TryParse, Decimal.ToSingle, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region AllowInputSpecialValues
-
-    public static readonly DependencyProperty AllowInputSpecialValuesProperty =
-        DependencyProperty.Register( "AllowInputSpecialValues", typeof( AllowedSpecialValues ), typeof( SingleUpDown ), new UIPropertyMetadata( AllowedSpecialValues.None ) );
-
-    public AllowedSpecialValues AllowInputSpecialValues
-    {
-      get { return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); }
-      set { SetValue( AllowInputSpecialValuesProperty, value ); }
-    }
-
-    #endregion //AllowInputSpecialValues
-
-    #endregion
-
-    #region Base Class Overrides
-
-    protected override float? OnCoerceIncrement( float? baseValue )
-    {
-      if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Increment." );
-
-      return base.OnCoerceIncrement( baseValue );
-    }
-
-    protected override float? OnCoerceMaximum( float? baseValue )
-    {
-      if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Maximum." );
-
-      return base.OnCoerceMaximum( baseValue );
-    }
-
-    protected override float? OnCoerceMinimum( float? baseValue )
-    {
-      if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Minimum." );
-
-      return base.OnCoerceMinimum( baseValue );
-    }
-
-    protected override float IncrementValue( float value, float increment )
-    {
-      return value + increment;
-    }
-
-    protected override float DecrementValue( float value, float increment )
-    {
-      return value - increment;
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      if( Value.HasValue && float.IsInfinity( Value.Value ) && ( Spinner != null ) )
-      {
-        Spinner.ValidSpinDirection = ValidSpinDirections.None;
-      }
-      else
-      {
-        base.SetValidSpinDirection();
-      }
-    }
-
-    protected override float? ConvertTextToValue( string text )
-    {
-      float? result = base.ConvertTextToValue( text );
-
-      if( result != null )
-      {
-        if( float.IsNaN( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.NaN );
-        else if( float.IsPositiveInfinity( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.PositiveInfinity );
-        else if( float.IsNegativeInfinity( result.Value ) )
-          TestInputSpecialValue( this.AllowInputSpecialValues, AllowedSpecialValues.NegativeInfinity );
-      }
-
-      return result;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
deleted file mode 100644
index c2ecc707..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class UIntegerUpDown : CommonNumericUpDown<uint>
-  {
-    #region Constructors
-
-    static UIntegerUpDown()
-    {
-      UpdateMetadata( typeof( UIntegerUpDown ), ( uint )1, uint.MinValue, uint.MaxValue );
-    }
-
-    public UIntegerUpDown()
-      : base( uint.TryParse, Decimal.ToUInt32, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override uint IncrementValue( uint value, uint increment )
-    {
-      return ( uint )( value + increment );
-    }
-
-    protected override uint DecrementValue( uint value, uint increment )
-    {
-      return ( uint )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
deleted file mode 100644
index 185050cb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class ULongUpDown : CommonNumericUpDown<ulong>
-  {
-    #region Constructors
-
-    static ULongUpDown()
-    {
-      UpdateMetadata( typeof( ULongUpDown ), ( ulong )1, ulong.MinValue, ulong.MaxValue );
-    }
-
-    public ULongUpDown()
-      : base( ulong.TryParse, Decimal.ToUInt64, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override ulong IncrementValue( ulong value, ulong increment )
-    {
-      return ( ulong )( value + increment );
-    }
-
-    protected override ulong DecrementValue( ulong value, ulong increment )
-    {
-      return ( ulong )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
deleted file mode 100644
index c3992441..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  internal class UShortUpDown : CommonNumericUpDown<ushort>
-  {
-    #region Constructors
-
-    static UShortUpDown()
-    {
-      UpdateMetadata( typeof( UShortUpDown ), ( ushort )1, ushort.MinValue, ushort.MaxValue );
-    }
-
-    public UShortUpDown()
-      : base( ushort.TryParse, Decimal.ToUInt16, ( v1, v2 ) => v1 < v2, ( v1, v2 ) => v1 > v2 )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override ushort IncrementValue( ushort value, ushort increment )
-    {
-      return ( ushort )( value + increment );
-    }
-
-    protected override ushort DecrementValue( ushort value, ushort increment )
-    {
-      return ( ushort )( value - increment );
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
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
deleted file mode 100644
index b2e8549f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,214 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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}"
-                               HorizontalContentAlignment="Stretch"
-                               VerticalContentAlignment="Stretch"
-                               AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
-                               ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}"
-                               ButtonSpinnerLocation="{Binding ButtonSpinnerLocation, RelativeSource={RelativeSource TemplatedParent}}">
-            <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}"
-                                    IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                    IsTabStop="True"
-                                    MinWidth="20"
-                                    AcceptsReturn="False"
-                                    Padding="{TemplateBinding Padding}"
-                                    AutoSelectBehavior="{Binding AutoSelectBehavior, RelativeSource={RelativeSource TemplatedParent}}"
-                                    AutoMoveFocus="{Binding AutoMoveFocus, 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}}"
-                                    MaxLength="{Binding MaxLength, RelativeSource={RelativeSource TemplatedParent}}">
-            </local:WatermarkTextBox>
-          </local:ButtonSpinner>
-
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <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 will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- =============================================================================== -->
-  <!-- SByteUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:SByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- UIntegerUpDown                                                                  -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:UIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- ULongUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:ULongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- UShortUpDown                                                                    -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:UShortUpDown}"
-         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
deleted file mode 100644
index cebeb172..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
+++ /dev/null
@@ -1,202 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="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 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.Value>
-        <ControlTemplate TargetType="Control">
-          <local:ButtonSpinner x:Name="PART_Spinner"
-                               IsTabStop="False"
-                               Background="{TemplateBinding Background}"
-                               BorderThickness="{TemplateBinding BorderThickness}"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               HorizontalContentAlignment="Stretch"
-                               VerticalContentAlignment="Stretch"
-                               AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
-                               ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}"
-                               ButtonSpinnerLocation="{Binding ButtonSpinnerLocation, RelativeSource={RelativeSource TemplatedParent}}">
-            <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}"
-                                    IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                    IsTabStop="True"
-                                    MinWidth="20"
-                                    AcceptsReturn="False"
-                                    Padding="{TemplateBinding Padding}"
-                                    AutoSelectBehavior="{Binding AutoSelectBehavior, RelativeSource={RelativeSource TemplatedParent}}"
-                                    AutoMoveFocus="{Binding AutoMoveFocus, 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}}"
-                                    MaxLength="{Binding MaxLength, RelativeSource={RelativeSource TemplatedParent}}">
-            </local:WatermarkTextBox>
-          </local:ButtonSpinner>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <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 will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- =============================================================================== -->
-  <!-- SByteUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:SByteUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- UIntegerUpDown                                                                  -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:UIntegerUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- ULongUpDown                                                                     -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:ULongUpDown}"
-         BasedOn="{StaticResource NumericUpDown}" />
-
-  <!-- =============================================================================== -->
-  <!-- UShortUpDown                                                                    -->
-  <!-- =============================================================================== -->
-  <Style TargetType="{x:Type local:UShortUpDown}"
-         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
deleted file mode 100644
index b118f7fb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ /dev/null
@@ -1,723 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit.Obselete
-{
-  [Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", true)]
-  public class MaskedTextBox : TextBox
-  {
-    #region Members
-
-    /// <summary>
-    /// Flags if the Text and Value properties are in the process of being sync'd
-    /// </summary>
-    private bool _isSyncingTextAndValueProperties;
-    private bool _isInitialized;
-    private bool _convertExceptionOccurred = false;
-
-    #endregion //Members
-
-    #region Properties
-
-    protected MaskedTextProvider MaskProvider
-    {
-      get;
-      set;
-    }
-
-    #region IncludePrompt
-
-    public static readonly DependencyProperty IncludePromptProperty = DependencyProperty.Register( "IncludePrompt", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( false, OnIncludePromptPropertyChanged ) );
-    public bool IncludePrompt
-    {
-      get
-      {
-        return ( bool )GetValue( IncludePromptProperty );
-      }
-      set
-      {
-        SetValue( IncludePromptProperty, value );
-      }
-    }
-
-    private static void OnIncludePromptPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnIncludePromptChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIncludePromptChanged( bool oldValue, bool newValue )
-    {
-      UpdateMaskProvider( Mask );
-    }
-
-    #endregion //IncludePrompt
-
-    #region IncludeLiterals
-
-    public static readonly DependencyProperty IncludeLiteralsProperty = DependencyProperty.Register( "IncludeLiterals", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( true, OnIncludeLiteralsPropertyChanged ) );
-    public bool IncludeLiterals
-    {
-      get
-      {
-        return ( bool )GetValue( IncludeLiteralsProperty );
-      }
-      set
-      {
-        SetValue( IncludeLiteralsProperty, value );
-      }
-    }
-
-    private static void OnIncludeLiteralsPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnIncludeLiteralsChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIncludeLiteralsChanged( bool oldValue, bool newValue )
-    {
-      UpdateMaskProvider( Mask );
-    }
-
-    #endregion //IncludeLiterals
-
-    #region Mask
-
-    public static readonly DependencyProperty MaskProperty = DependencyProperty.Register( "Mask", typeof( string ), typeof( MaskedTextBox ), new UIPropertyMetadata( "<>", OnMaskPropertyChanged ) );
-    public string Mask
-    {
-      get
-      {
-        return ( string )GetValue( MaskProperty );
-      }
-      set
-      {
-        SetValue( MaskProperty, value );
-      }
-    }
-
-    private static void OnMaskPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnMaskChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnMaskChanged( string oldValue, string newValue )
-    {
-      UpdateMaskProvider( newValue );
-      UpdateText( 0 );
-    }
-
-    #endregion //Mask
-
-    #region PromptChar
-
-    public static readonly DependencyProperty PromptCharProperty = DependencyProperty.Register( "PromptChar", typeof( char ), typeof( MaskedTextBox ), new UIPropertyMetadata( '_', OnPromptCharChanged ) );
-    public char PromptChar
-    {
-      get
-      {
-        return ( char )GetValue( PromptCharProperty );
-      }
-      set
-      {
-        SetValue( PromptCharProperty, value );
-      }
-    }
-
-    private static void OnPromptCharChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnPromptCharChanged( ( char )e.OldValue, ( char )e.NewValue );
-    }
-
-    protected virtual void OnPromptCharChanged( char oldValue, char newValue )
-    {
-      UpdateMaskProvider( Mask );
-    }
-
-    #endregion //PromptChar
-
-    #region SelectAllOnGotFocus
-
-    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
-    public bool SelectAllOnGotFocus
-    {
-      get
-      {
-        return ( bool )GetValue( SelectAllOnGotFocusProperty );
-      }
-      set
-      {
-        SetValue( SelectAllOnGotFocusProperty, value );
-      }
-    }
-
-    #endregion //SelectAllOnGotFocus
-
-    #region Text
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox inputBase = o as MaskedTextBox;
-      if( inputBase != null )
-        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-      if( _isInitialized )
-        SyncTextAndValueProperties( MaskedTextBox.TextProperty, newValue );
-    }
-
-    #endregion //Text
-
-    #region Value
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( MaskedTextBox ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
-    public object Value
-    {
-      get
-      {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
-    }
-
-    protected virtual void OnValueChanged( object oldValue, object newValue )
-    {
-      if( _isInitialized )
-        SyncTextAndValueProperties( MaskedTextBox.ValueProperty, newValue );
-
-      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
-      args.RoutedEvent = MaskedTextBox.ValueChangedEvent;
-      RaiseEvent( args );
-    }
-
-    #endregion //Value
-
-    #region ValueType
-
-    public static readonly DependencyProperty ValueTypeProperty = DependencyProperty.Register( "ValueType", typeof( Type ), typeof( MaskedTextBox ), new UIPropertyMetadata( typeof( String ), OnValueTypeChanged ) );
-    public Type ValueType
-    {
-      get
-      {
-        return ( Type )GetValue( ValueTypeProperty );
-      }
-      set
-      {
-        SetValue( ValueTypeProperty, value );
-      }
-    }
-
-    private static void OnValueTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      MaskedTextBox maskedTextBox = o as MaskedTextBox;
-      if( maskedTextBox != null )
-        maskedTextBox.OnValueTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
-    }
-
-    protected virtual void OnValueTypeChanged( Type oldValue, Type newValue )
-    {
-      if( _isInitialized )
-        SyncTextAndValueProperties( MaskedTextBox.TextProperty, Text );
-    }
-
-    #endregion //ValueType
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static MaskedTextBox()
-    {
-      TextProperty.OverrideMetadata( typeof( MaskedTextBox ), new FrameworkPropertyMetadata( OnTextChanged ) );
-    }
-
-    public MaskedTextBox()
-    {
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Paste, Paste ) ); //handle paste
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Cut, null, CanCut ) ); //surpress cut
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      UpdateMaskProvider( Mask );
-      UpdateText( 0 );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-
-      if( !_isInitialized )
-      {
-        _isInitialized = true;
-        SyncTextAndValueProperties( ValueProperty, Value );
-      }
-    }
-
-    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      if( SelectAllOnGotFocus )
-      {
-        SelectAll();
-      }
-
-      base.OnGotKeyboardFocus( e );
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( !e.Handled )
-      {
-        HandlePreviewKeyDown( e );
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
-    {
-      if( !e.Handled )
-      {
-        HandlePreviewTextInput( e );
-      }
-
-      base.OnPreviewTextInput( e );
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Events
-
-    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( MaskedTextBox ) );
-    public event RoutedPropertyChangedEventHandler<object> ValueChanged
-    {
-      add
-      {
-        AddHandler( ValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ValueChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Methods
-
-    #region Private
-
-    private void UpdateText()
-    {
-      UpdateText( SelectionStart );
-    }
-
-    private void UpdateText( int position )
-    {
-      MaskedTextProvider provider = MaskProvider;
-      if( provider == null )
-        throw new InvalidOperationException();
-
-      Text = provider.ToDisplayString();
-      SelectionLength = 0;
-      SelectionStart = position;
-    }
-
-    private int GetNextCharacterPosition( int startPosition )
-    {
-      int position = MaskProvider.FindEditPositionFrom( startPosition, true );
-      return position == -1 ? startPosition : position;
-    }
-
-    private void UpdateMaskProvider( string mask )
-    {
-      //do not create a mask provider if the Mask is empty, which can occur if the IncludePrompt and IncludeLiterals properties
-      //are set prior to the Mask.
-      if( String.IsNullOrEmpty( mask ) )
-        return;
-
-      MaskProvider = new MaskedTextProvider( mask )
-      {
-        IncludePrompt = this.IncludePrompt,
-        IncludeLiterals = this.IncludeLiterals,
-        PromptChar = this.PromptChar,
-        ResetOnSpace = false //should make this a property
-      };
-    }
-
-    private object ConvertTextToValue( string text )
-    {
-      object convertedValue = null;
-
-      Type dataType = ValueType;
-
-      string valueToConvert = MaskProvider.ToString().Trim();
-
-      try
-      {
-        if( valueToConvert.GetType() == dataType || dataType.IsInstanceOfType( valueToConvert ) )
-        {
-          convertedValue = valueToConvert;
-        }
-#if !VS2008
-        else if( String.IsNullOrWhiteSpace( valueToConvert ) )
-        {
-          convertedValue = Activator.CreateInstance( dataType );
-        }
-#else
-        else if ( String.IsNullOrEmpty( valueToConvert ) )
-        {
-          convertedValue = Activator.CreateInstance( dataType );
-        }
-#endif
-        else if( null == convertedValue && valueToConvert is IConvertible )
-        {
-          convertedValue = Convert.ChangeType( valueToConvert, dataType );
-        }
-      }
-      catch
-      {
-        //if an excpetion occurs revert back to original value
-        _convertExceptionOccurred = true;
-        return Value;
-      }
-
-      return convertedValue;
-    }
-
-    private string ConvertValueToText( object value )
-    {
-      if( value == null )
-        value = string.Empty;
-
-      if( _convertExceptionOccurred )
-      {
-        value = Value;
-        _convertExceptionOccurred = false;
-      }
-
-      //I have only seen this occur while in Blend, but we need it here so the Blend designer doesn't crash.
-      if( MaskProvider == null )
-        return value.ToString();
-
-      MaskProvider.Set( value.ToString() );
-      return MaskProvider.ToDisplayString();
-    }
-
-    private void SyncTextAndValueProperties( DependencyProperty p, object newValue )
-    {
-      //prevents recursive syncing properties
-      if( _isSyncingTextAndValueProperties )
-        return;
-
-      _isSyncingTextAndValueProperties = true;
-
-      //this only occures when the user typed in the value
-      if( MaskedTextBox.TextProperty == p )
-      {
-        if( newValue != null )
-          SetValue( MaskedTextBox.ValueProperty, ConvertTextToValue( newValue.ToString() ) );
-      }
-
-      SetValue( MaskedTextBox.TextProperty, ConvertValueToText( newValue ) );
-
-      _isSyncingTextAndValueProperties = false;
-    }
-
-    private void HandlePreviewTextInput( TextCompositionEventArgs e )
-    {
-      if( !IsReadOnly )
-      {
-        this.InsertText( e.Text );
-      }
-
-      e.Handled = true;
-    }
-
-    private void HandlePreviewKeyDown( KeyEventArgs e )
-    {
-      if( e.Key == Key.Delete )
-      {
-        e.Handled = IsReadOnly
-                 || HandleKeyDownDelete();
-      }
-      else if( e.Key == Key.Back )
-      {
-        e.Handled = IsReadOnly
-                 || HandleKeyDownBack();
-      }
-      else if( e.Key == Key.Space )
-      {
-        if( !IsReadOnly )
-        {
-          InsertText( " " );
-        }
-
-        e.Handled = true;
-      }
-      else if( e.Key == Key.Return || e.Key == Key.Enter )
-      {
-        if( !IsReadOnly && AcceptsReturn )
-        {
-          this.InsertText( "\r" );
-        }
-
-        // We don't want the OnPreviewTextInput to be triggered for the Return/Enter key
-        // when it is not accepted.
-        e.Handled = true;
-      }
-      else if( e.Key == Key.Escape )
-      {
-        // We don't want the OnPreviewTextInput to be triggered at all for the Escape key.
-        e.Handled = true;
-      }
-      else if( e.Key == Key.Tab )
-      {
-        if( AcceptsTab )
-        {
-          if( !IsReadOnly )
-          {
-            this.InsertText( "\t" );
-          }
-
-          e.Handled = true;
-        }
-      }
-    }
-
-    private bool HandleKeyDownDelete()
-    {
-      ModifierKeys modifiers = Keyboard.Modifiers;
-      bool handled = true;
-
-      if( modifiers == ModifierKeys.None )
-      {
-        if( !RemoveSelectedText() )
-        {
-          int position = SelectionStart;
-
-          if( position < Text.Length )
-          {
-            RemoveText( position, 1 );
-            UpdateText( position );
-          }
-        }
-        else
-        {
-          UpdateText();
-        }
-      }
-      else if( modifiers == ModifierKeys.Control )
-      {
-        if( !RemoveSelectedText() )
-        {
-          int position = SelectionStart;
-
-          RemoveTextToEnd( position );
-          UpdateText( position );
-        }
-        else
-        {
-          UpdateText();
-        }
-      }
-      else if( modifiers == ModifierKeys.Shift )
-      {
-        if( RemoveSelectedText() )
-        {
-          UpdateText();
-        }
-        else
-        {
-          handled = false;
-        }
-      }
-      else
-      {
-        handled = false;
-      }
-
-      return handled;
-    }
-
-    private bool HandleKeyDownBack()
-    {
-      ModifierKeys modifiers = Keyboard.Modifiers;
-      bool handled = true;
-
-      if( modifiers == ModifierKeys.None || modifiers == ModifierKeys.Shift )
-      {
-        if( !RemoveSelectedText() )
-        {
-          int position = SelectionStart;
-
-          if( position > 0 )
-          {
-            int newPosition = position - 1;
-
-            RemoveText( newPosition, 1 );
-            UpdateText( newPosition );
-          }
-        }
-        else
-        {
-          UpdateText();
-        }
-      }
-      else if( modifiers == ModifierKeys.Control )
-      {
-        if( !RemoveSelectedText() )
-        {
-          RemoveTextFromStart( SelectionStart );
-          UpdateText( 0 );
-        }
-        else
-        {
-          UpdateText();
-        }
-      }
-      else
-      {
-        handled = false;
-      }
-
-      return handled;
-    }
-
-    private void InsertText( string text )
-    {
-      int position = SelectionStart;
-      MaskedTextProvider provider = MaskProvider;
-
-      bool textRemoved = this.RemoveSelectedText();
-
-      position = GetNextCharacterPosition( position );
-
-      if( !textRemoved && Keyboard.IsKeyToggled( Key.Insert ) )
-      {
-        if( provider.Replace( text, position ) )
-        {
-          position += text.Length;
-        }
-      }
-      else
-      {
-        if( provider.InsertAt( text, position ) )
-        {
-          position += text.Length;
-        }
-      }
-
-      position = GetNextCharacterPosition( position );
-
-      this.UpdateText( position );
-    }
-
-    private void RemoveTextFromStart( int endPosition )
-    {
-      RemoveText( 0, endPosition );
-    }
-
-    private void RemoveTextToEnd( int startPosition )
-    {
-      RemoveText( startPosition, Text.Length - startPosition );
-    }
-
-    private void RemoveText( int position, int length )
-    {
-      if( length == 0 )
-        return;
-
-      MaskProvider.RemoveAt( position, position + length - 1 );
-    }
-
-    private bool RemoveSelectedText()
-    {
-      int length = SelectionLength;
-
-      if( length == 0 )
-        return false;
-
-      int position = SelectionStart;
-
-      return MaskProvider.RemoveAt( position, position + length - 1 );
-    }
-
-    #endregion //Private
-
-    #endregion //Methods
-
-    #region Commands
-
-    private void Paste( object sender, RoutedEventArgs e )
-    {
-      if( IsReadOnly )
-        return;
-
-      object data = Clipboard.GetData( DataFormats.Text );
-      if( data != null )
-      {
-        string text = data.ToString().Trim();
-        if( text.Length > 0 )
-        {
-          int position = SelectionStart;
-
-          MaskProvider.Set( text );
-
-          UpdateText( position );
-        }
-      }
-    }
-
-    private void CanCut( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-      e.Handled = true;
-    }
-
-    #endregion //Commands
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
deleted file mode 100644
index dcc130ef..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
+++ /dev/null
@@ -1,1875 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Specialized;
-using System.Reflection;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Media.Animation;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public abstract class AnimationPanel : PanelBase
-  {
-    #region Constructors
-
-    public AnimationPanel()
-    {
-#if DEBUG
-      Type derivedType = GetType();
-
-      FieldInfo[] fields = derivedType.GetFields( BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public );
-
-      foreach( FieldInfo field in fields )
-      {
-        if( field.FieldType == typeof( DependencyProperty ) )
-        {
-          DependencyProperty prop = ( DependencyProperty )field.GetValue( null );
-          PropertyMetadata metaData = prop.GetMetadata( this );
-
-          if( metaData is FrameworkPropertyMetadata )
-          {
-            FrameworkPropertyMetadata frameworkData = ( FrameworkPropertyMetadata )metaData;
-
-            if( frameworkData.AffectsArrange == true || frameworkData.AffectsMeasure == true ||
-                frameworkData.AffectsParentArrange == true || frameworkData.AffectsParentMeasure == true )
-            {
-              System.Console.WriteLine( "AnimationPanel: " + derivedType.Name + "." + field.Name +
-                  " - You should not set dependency property metadata flags that " +
-                  "affect measure or arrange, instead call AnimationPanel's InvalidateMeasure or " +
-                  "InvalidateArrange directly." );
-            }
-          }
-        }
-      }
-#endif
-
-      this.Loaded += new RoutedEventHandler( this.OnLoaded );
-    }
-
-    #endregion
-
-    #region ChildState Private Property
-
-    private static readonly DependencyPropertyKey ChildStatePropertyKey =
-      DependencyProperty.RegisterAttachedReadOnly( "ChildState", typeof( ChildState ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( null ) );
-
-    private static ChildState GetChildState( DependencyObject d )
-    {
-      return ( ChildState )d.GetValue( AnimationPanel.ChildStatePropertyKey.DependencyProperty );
-    }
-
-    private static void SetChildState( DependencyObject d, ChildState value )
-    {
-      d.SetValue( AnimationPanel.ChildStatePropertyKey, value );
-    }
-
-    #endregion
-
-    #region DefaultAnimationRate Property
-
-    public static readonly DependencyProperty DefaultAnimationRateProperty =
-      DependencyProperty.Register( "DefaultAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( ( AnimationRate )1d ),
-          new ValidateValueCallback( AnimationPanel.ValidateDefaultAnimationRate ) );
-
-    public AnimationRate DefaultAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.DefaultAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.DefaultAnimationRateProperty, value );
-      }
-    }
-
-    private static bool ValidateDefaultAnimationRate( object value )
-    {
-      if( ( AnimationRate )value == AnimationRate.Default )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.DefaultAnimationRateAnimationRateDefault ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region DefaultAnimator Property
-
-    public static readonly DependencyProperty DefaultAnimatorProperty =
-      DependencyProperty.Register( "DefaultAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( Animators.Linear ),
-          new ValidateValueCallback( AnimationPanel.ValidateDefaultAnimator ) );
-
-    public IterativeAnimator DefaultAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.DefaultAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.DefaultAnimatorProperty, value );
-      }
-    }
-
-    private static bool ValidateDefaultAnimator( object value )
-    {
-      if( value == IterativeAnimator.Default )
-        throw new ArgumentException( ErrorMessages.GetMessage( ErrorMessages.DefaultAnimatorIterativeAnimationDefault ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region EnterAnimationRate Property
-
-    public static readonly DependencyProperty EnterAnimationRateProperty =
-      DependencyProperty.Register( "EnterAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate EnterAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.EnterAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.EnterAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EnterAnimator Property
-
-    public static readonly DependencyProperty EnterAnimatorProperty =
-      DependencyProperty.Register( "EnterAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator EnterAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.EnterAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.EnterAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EnterFrom Attached Property
-
-    public static readonly DependencyProperty EnterFromProperty =
-      DependencyProperty.RegisterAttached( "EnterFrom", typeof( Rect? ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( ( Rect? )null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static Rect? GetEnterFrom( DependencyObject d )
-    {
-      return ( Rect? )d.GetValue( AnimationPanel.EnterFromProperty );
-    }
-
-    public static void SetEnterFrom( DependencyObject d, Rect? value )
-    {
-      d.SetValue( AnimationPanel.EnterFromProperty, value );
-    }
-
-    #endregion
-
-    #region ExitAnimationRate Property
-
-    public static readonly DependencyProperty ExitAnimationRateProperty =
-      DependencyProperty.Register( "ExitAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate ExitAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.ExitAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.ExitAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ExitAnimator Property
-
-    public static readonly DependencyProperty ExitAnimatorProperty =
-      DependencyProperty.Register( "ExitAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator ExitAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.ExitAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.ExitAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ExitTo Attached Property
-
-    public static readonly DependencyProperty ExitToProperty =
-      DependencyProperty.RegisterAttached( "ExitTo", typeof( Rect? ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( ( Rect? )null, FrameworkPropertyMetadataOptions.Inherits ) );
-
-    public static Rect? GetExitTo( DependencyObject d )
-    {
-      return ( Rect? )d.GetValue( AnimationPanel.ExitToProperty );
-    }
-
-    public static void SetExitTo( DependencyObject d, Rect? value )
-    {
-      d.SetValue( AnimationPanel.ExitToProperty, value );
-    }
-
-    #endregion
-
-    #region LayoutAnimationRate Property
-
-    public static readonly DependencyProperty LayoutAnimationRateProperty =
-      DependencyProperty.Register( "LayoutAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate LayoutAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.LayoutAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.LayoutAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region LayoutAnimator Property
-
-    public static readonly DependencyProperty LayoutAnimatorProperty =
-      DependencyProperty.Register( "LayoutAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator LayoutAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.LayoutAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.LayoutAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchAnimationRate Property
-
-    public static readonly DependencyProperty SwitchAnimationRateProperty =
-      DependencyProperty.Register( "SwitchAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate SwitchAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.SwitchAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.SwitchAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchAnimator Property
-
-    public static readonly DependencyProperty SwitchAnimatorProperty =
-      DependencyProperty.Register( "SwitchAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator SwitchAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.SwitchAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.SwitchAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchParent Property
-
-    private static readonly DependencyPropertyKey SwitchParentPropertyKey =
-      DependencyProperty.RegisterReadOnly( "SwitchParent", typeof( SwitchPanel ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( null,
-          new PropertyChangedCallback( AnimationPanel.OnSwitchParentChanged ) ) );
-
-    public static readonly DependencyProperty SwitchParentProperty = AnimationPanel.SwitchParentPropertyKey.DependencyProperty;
-
-    public SwitchPanel SwitchParent
-    {
-      get
-      {
-        return ( SwitchPanel )this.GetValue( AnimationPanel.SwitchParentProperty );
-      }
-    }
-
-    protected internal void SetSwitchParent( SwitchPanel value )
-    {
-      this.SetValue( AnimationPanel.SwitchParentPropertyKey, value );
-    }
-
-    private static void OnSwitchParentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( AnimationPanel )d ).OnSwitchParentChanged( e );
-    }
-
-    protected virtual void OnSwitchParentChanged( DependencyPropertyChangedEventArgs e )
-    {
-      _switchParent = e.NewValue as SwitchPanel;
-    }
-
-    #endregion
-
-    #region SwitchTemplate Property
-
-    public static readonly DependencyProperty SwitchTemplateProperty =
-      DependencyProperty.Register( "SwitchTemplate", typeof( DataTemplate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( null,
-          new PropertyChangedCallback( AnimationPanel.OnSwitchTemplateChanged ) ) );
-
-    public DataTemplate SwitchTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( AnimationPanel.SwitchTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.SwitchTemplateProperty, value );
-      }
-    }
-
-    private static void OnSwitchTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( AnimationPanel )d ).OnSwitchTemplateChanged( e );
-    }
-
-    protected virtual void OnSwitchTemplateChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( _switchParent != null && _switchParent.ActiveLayout == this )
-      {
-        _switchParent.UpdateSwitchTemplate();
-      }
-    }
-
-    #endregion
-
-    #region TemplateAnimationRate Property
-
-    public static readonly DependencyProperty TemplateAnimationRateProperty =
-      DependencyProperty.Register( "TemplateAnimationRate", typeof( AnimationRate ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate TemplateAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( AnimationPanel.TemplateAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.TemplateAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TemplateAnimator Property
-
-    public static readonly DependencyProperty TemplateAnimatorProperty =
-      DependencyProperty.Register( "TemplateAnimator", typeof( IterativeAnimator ), typeof( AnimationPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator TemplateAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( AnimationPanel.TemplateAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( AnimationPanel.TemplateAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DesiredSize Property
-
-    public new Size DesiredSize
-    {
-      get
-      {
-        return ( _switchParent != null ) ? _switchParent.DesiredSize : base.DesiredSize;
-      }
-    }
-
-    #endregion
-
-    #region RenderSize Property
-
-    public new Size RenderSize
-    {
-      get
-      {
-        return ( _switchParent != null ) ? _switchParent.RenderSize : base.RenderSize;
-      }
-      set
-      {
-        base.RenderSize = value;
-      }
-    }
-
-    #endregion
-
-    #region IsActiveLayout Property
-
-    public bool IsActiveLayout
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsActiveLayout ];
-      }
-      private set
-      {
-        _cacheBits[ ( int )CacheBits.IsActiveLayout ] = value;
-      }
-    }
-
-    #endregion
-
-    #region InternalChildren Protected Property
-
-    protected internal new UIElementCollection InternalChildren
-    {
-      get
-      {
-        return ( _switchParent == null ) ? base.InternalChildren : _switchParent.ChildrenInternal;
-      }
-    }
-
-    #endregion
-
-    #region VisualChildrenCount Protected Property
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return this.HasLoaded ? this.InternalChildren.Count + this.ExitingChildren.Count : base.VisualChildrenCount;
-      }
-    }
-
-    #endregion
-
-    #region ChildrensParent Protected Property
-
-    protected PanelBase ChildrensParent
-    {
-      get
-      {
-        return _switchParent != null ? ( PanelBase )_switchParent : this;
-      }
-    }
-
-    #endregion
-
-    #region VisualChildrenCountInternal Internal Property
-
-    internal int VisualChildrenCountInternal
-    {
-      get
-      {
-        return this.VisualChildrenCount;
-      }
-    }
-
-    #endregion
-
-    #region PhysicalScrollOffset Internal Property
-
-    internal Vector PhysicalScrollOffset
-    {
-      get
-      {
-        return _physicalScrollOffset;
-      }
-      set
-      {
-        _physicalScrollOffset = value;
-      }
-    }
-
-    private Vector _physicalScrollOffset = new Vector();
-
-    #endregion
-
-    #region HasLoaded Internal Property
-
-    internal bool IsRemovingInternalChild
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsRemovingInternalChild ];
-      }
-      private set
-      {
-        _cacheBits[ ( int )CacheBits.IsRemovingInternalChild ] = value;
-      }
-    }
-
-    #endregion
-
-    #region AnimatingChildCount Private Property
-
-    private int AnimatingChildCount
-    {
-      get
-      {
-        return _animatingChildCount;
-      }
-      set
-      {
-        // start the animation pump if the value goes positive
-        if( _animatingChildCount == 0 && value > 0 )
-        {
-          CompositionTarget.Rendering += new EventHandler( OnRendering );
-          RaiseAnimationBegunEvent();
-        }
-
-        // stop the animation pump if the value goes to 0
-        if( _animatingChildCount != 0 && value == 0 )
-        {
-          if( EndSwitchOnAnimationCompleted && _switchParent != null )
-          {
-            EndSwitchOnAnimationCompleted = false;
-            _switchParent.EndLayoutSwitch();
-          }
-
-          CompositionTarget.Rendering -= new EventHandler( OnRendering );
-          RaiseAnimationCompletedEvent();
-        }
-
-        _animatingChildCount = value;
-      }
-    }
-
-    private int _animatingChildCount;
-
-    #endregion
-
-    #region EndSwitchOnAnimationCompleted Private Property
-
-    private bool EndSwitchOnAnimationCompleted
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.EndSwitchOnAnimationCompleted ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.EndSwitchOnAnimationCompleted ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasArranged Private Property
-
-    private bool HasArranged
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasArranged ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasArranged ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasLoaded Private Property
-
-    protected bool HasLoaded
-    {
-      get
-      {
-        return _switchParent == null ? _cacheBits[ ( int )CacheBits.HasLoaded ] : _switchParent.HasLoaded;
-      }
-      private set
-      {
-        _cacheBits[ ( int )CacheBits.HasLoaded ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsSwitchInProgress Private Property
-
-    private bool IsSwitchInProgress
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsSwitchInProgress ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsSwitchInProgress ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ItemsOwner Private Property
-
-    private ItemsControl ItemsOwner
-    {
-      get
-      {
-        return ItemsControl.GetItemsOwner( _switchParent == null ? ( Panel )this : ( Panel )_switchParent );
-      }
-    }
-
-    #endregion
-
-    #region ExitingChildren Private Property
-
-    private List<UIElement> ExitingChildren
-    {
-      get
-      {
-        if( _switchParent != null )
-          return _switchParent.ExitingChildren;
-
-        if( _exitingChildren == null )
-        {
-          _exitingChildren = new List<UIElement>();
-        }
-
-        return _exitingChildren;
-      }
-    }
-
-    #endregion
-
-    #region AnimationBegun Event
-
-    public static readonly RoutedEvent AnimationBegunEvent =
-      EventManager.RegisterRoutedEvent( "AnimationBegun", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( AnimationPanel ) );
-
-    public event RoutedEventHandler AnimationBegun
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.AnimationBegunEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.AnimationBegunEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseAnimationBegunEvent()
-    {
-      return AnimationPanel.RaiseAnimationBegunEvent( ( this._switchParent != null ) ? ( UIElement )this._switchParent : ( UIElement )this );
-    }
-
-    private static RoutedEventArgs RaiseAnimationBegunEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = AnimationPanel.AnimationBegunEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region AnimationCompleted Event
-
-    public static readonly RoutedEvent AnimationCompletedEvent =
-      EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( AnimationPanel ) );
-
-    public event RoutedEventHandler AnimationCompleted
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.AnimationCompletedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.AnimationCompletedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseAnimationCompletedEvent()
-    {
-      return AnimationPanel.RaiseAnimationCompletedEvent( ( this._switchParent != null ) ? ( UIElement )this._switchParent : ( UIElement )this );
-    }
-
-    private static RoutedEventArgs RaiseAnimationCompletedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = AnimationPanel.AnimationCompletedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region ChildEntered Event
-
-    public static readonly RoutedEvent ChildEnteredEvent =
-      EventManager.RegisterRoutedEvent( "ChildEntered", RoutingStrategy.Bubble, typeof( ChildEnteredEventHandler ), typeof( AnimationPanel ) );
-
-    public event ChildEnteredEventHandler ChildEntered
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.ChildEnteredEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.ChildEnteredEvent, value );
-      }
-    }
-
-    protected ChildEnteredEventArgs RaiseChildEnteredEvent( UIElement child, Rect arrangeRect )
-    {
-      return AnimationPanel.RaiseChildEnteredEvent( this, child, arrangeRect );
-    }
-
-    internal static ChildEnteredEventArgs RaiseChildEnteredEvent( UIElement target, UIElement child, Rect arrangeRect )
-    {
-      if( target == null )
-        return null;
-
-      ChildEnteredEventArgs args = new ChildEnteredEventArgs( child, arrangeRect );
-      args.RoutedEvent = AnimationPanel.ChildEnteredEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region ChildEntering Event
-
-    public static readonly RoutedEvent ChildEnteringEvent =
-      EventManager.RegisterRoutedEvent( "ChildEntering", RoutingStrategy.Bubble, typeof( ChildEnteringEventHandler ), typeof( AnimationPanel ) );
-
-    public event ChildEnteringEventHandler ChildEntering
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.ChildEnteringEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.ChildEnteringEvent, value );
-      }
-    }
-
-    protected ChildEnteringEventArgs RaiseChildEnteringEvent( UIElement child, Rect? EnterFrom, Rect ArrangeRect )
-    {
-      return AnimationPanel.RaiseChildEnteringEvent( this, child, EnterFrom, ArrangeRect );
-    }
-
-    private static ChildEnteringEventArgs RaiseChildEnteringEvent( UIElement target, UIElement child, Rect? EnterFrom, Rect ArrangeRect )
-    {
-      if( target == null )
-        return null;
-
-      ChildEnteringEventArgs args = new ChildEnteringEventArgs( child, EnterFrom, ArrangeRect );
-      args.RoutedEvent = AnimationPanel.ChildEnteringEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region ChildExited Event
-
-    public static readonly RoutedEvent ChildExitedEvent =
-      EventManager.RegisterRoutedEvent( "ChildExited", RoutingStrategy.Bubble, typeof( ChildExitedEventHandler ), typeof( AnimationPanel ) );
-
-    public event ChildExitedEventHandler ChildExited
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.ChildExitedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.ChildExitedEvent, value );
-      }
-    }
-
-    protected ChildExitedEventArgs RaiseChildExitedEvent( UIElement child )
-    {
-      return AnimationPanel.RaiseChildExitedEvent( this, child );
-    }
-
-    private static ChildExitedEventArgs RaiseChildExitedEvent( UIElement target, UIElement child )
-    {
-      if( target == null )
-        return null;
-
-      ChildExitedEventArgs args = new ChildExitedEventArgs( child );
-      args.RoutedEvent = AnimationPanel.ChildExitedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region ChildExiting Event
-
-    public static readonly RoutedEvent ChildExitingEvent =
-      EventManager.RegisterRoutedEvent( "ChildExiting", RoutingStrategy.Bubble, typeof( ChildExitingEventHandler ), typeof( AnimationPanel ) );
-
-    public event ChildExitingEventHandler ChildExiting
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.ChildExitingEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.ChildExitingEvent, value );
-      }
-    }
-
-    protected ChildExitingEventArgs RaiseChildExitingEvent( UIElement child, Rect? exitTo, Rect arrangeRect )
-    {
-      return AnimationPanel.RaiseChildExitingEvent( this, child, exitTo, arrangeRect );
-    }
-
-    private static ChildExitingEventArgs RaiseChildExitingEvent( UIElement target, UIElement child, Rect? exitTo, Rect arrangeRect )
-    {
-      if( target == null )
-        return null;
-
-      ChildExitingEventArgs args = new ChildExitingEventArgs( child, exitTo, arrangeRect );
-      args.RoutedEvent = AnimationPanel.ChildExitingEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region SwitchLayoutActivated Event
-
-    public static readonly RoutedEvent SwitchLayoutActivatedEvent =
-      EventManager.RegisterRoutedEvent( "SwitchLayoutActivated", RoutingStrategy.Direct, typeof( RoutedEventHandler ), typeof( AnimationPanel ) );
-
-    public event RoutedEventHandler SwitchLayoutActivated
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.SwitchLayoutActivatedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.SwitchLayoutActivatedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseSwitchLayoutActivatedEvent()
-    {
-      return AnimationPanel.RaiseSwitchLayoutActivatedEvent( this );
-    }
-
-    internal static RoutedEventArgs RaiseSwitchLayoutActivatedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = AnimationPanel.SwitchLayoutActivatedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region SwitchLayoutDeactivated Event
-
-    public static readonly RoutedEvent SwitchLayoutDeactivatedEvent =
-      EventManager.RegisterRoutedEvent( "SwitchLayoutDeactivated", RoutingStrategy.Direct, typeof( RoutedEventHandler ), typeof( AnimationPanel ) );
-
-    public event RoutedEventHandler SwitchLayoutDeactivated
-    {
-      add
-      {
-        this.AddHandler( AnimationPanel.SwitchLayoutDeactivatedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( AnimationPanel.SwitchLayoutDeactivatedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseSwitchLayoutDeactivatedEvent()
-    {
-      return AnimationPanel.RaiseSwitchLayoutDeactivatedEvent( this );
-    }
-
-    internal static RoutedEventArgs RaiseSwitchLayoutDeactivatedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = AnimationPanel.SwitchLayoutDeactivatedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    public new void InvalidateArrange()
-    {
-      if( _switchParent == null )
-      {
-        base.InvalidateArrange();
-      }
-      else
-      {
-        _switchParent.InvalidateArrange();
-      }
-    }
-
-    public new void InvalidateMeasure()
-    {
-      if( _switchParent == null )
-      {
-        base.InvalidateMeasure();
-      }
-      else
-      {
-        _switchParent.InvalidateMeasure();
-      }
-    }
-
-    public new void InvalidateVisual()
-    {
-      if( _switchParent == null )
-      {
-        base.InvalidateVisual();
-      }
-      else
-      {
-        _switchParent.InvalidateVisual();
-      }
-    }
-
-    internal void ActivateLayout()
-    {
-      this.HasArranged = false;
-      this.IsActiveLayout = true;
-      this.OnSwitchLayoutActivated();
-      this.RaiseSwitchLayoutActivatedEvent();
-    }
-
-    internal void BeginChildExit( UIElement child )
-    {
-      ChildState state = AnimationPanel.GetChildState( child );
-      if( state != null )
-      {
-        state.Type = AnimationType.Exit;
-        state.HasExitBegun = true;
-
-        this.ExitingChildren.Add( child );
-
-        if( _switchParent != null )
-        {
-          _switchParent.AddVisualChildInternal( child );
-        }
-        else
-        {
-          this.AddVisualChild( child );
-        }
-
-        // raise the ChildExiting event only after the child has been re-added to the visual tree
-        ChildExitingEventArgs ceea = AnimationPanel.RaiseChildExitingEvent( child, child, AnimationPanel.GetExitTo( child ), state.CurrentPlacement );
-
-        // begin the exit animation, if necessary
-        state.Animator = this.GetEffectiveAnimator( AnimationType.Exit );
-        if( state.Animator != null )
-        {
-          state.TargetPlacement = ceea.ExitTo.HasValue ? ceea.ExitTo.Value : Rect.Empty;
-          state.BeginTimeStamp = DateTime.Now;
-
-          // decrement the animating count if this child is already animating because the 
-          // ArrangeChild call will increment it again
-          if( state.IsAnimating )
-          {
-            this.AnimatingChildCount--;
-          }
-          this.ArrangeChild( child, state.TargetPlacement );
-        }
-        else
-        {
-          // no animation, so immediately end the exit routine
-          this.EndChildExit( child, state );
-        }
-      }
-    }
-
-    internal void BeginGrandchildAnimation( FrameworkElement grandchild, Rect currentRect, Rect placementRect )
-    {
-      bool isDone = true;
-      object placementArgs;
-      ChildState state = new ChildState( currentRect );
-      AnimationPanel.SetChildState( grandchild, state );
-      state.Type = AnimationType.Switch;
-      state.BeginTimeStamp = DateTime.Now;
-      state.TargetPlacement = placementRect;
-      state.Animator = this.GetEffectiveAnimator( AnimationType.Template );
-      if( state.Animator != null && !state.TargetPlacement.IsEmpty )
-      {
-        AnimationRate rate = this.GetEffectiveAnimationRate( AnimationType.Template );
-        state.CurrentPlacement = state.Animator.GetInitialChildPlacement( grandchild, state.CurrentPlacement, state.TargetPlacement, this, ref rate, out placementArgs, out isDone );
-        state.AnimationRate = rate;
-        state.PlacementArgs = placementArgs;
-      }
-      state.IsAnimating = !isDone;
-      grandchild.Arrange( state.IsAnimating ? state.CurrentPlacement : state.TargetPlacement );
-      if( state.IsAnimating )
-      {
-        _animatingGrandchildren.Add( grandchild );
-        this.AnimatingChildCount++;
-      }
-      else
-      {
-        state.CurrentPlacement = state.TargetPlacement;
-      }
-    }
-
-    internal void DeactivateLayout()
-    {
-      this.IsActiveLayout = false;
-      this.AnimatingChildCount = 0;
-      this.OnSwitchLayoutDeactivated();
-      this.RaiseSwitchLayoutDeactivatedEvent();
-    }
-
-    internal static UIElement FindAncestorChildOfAnimationPanel( DependencyObject element, out AnimationPanel panel )
-    {
-      panel = null;
-      if( element == null )
-        return null;
-
-      DependencyObject parent = VisualTreeHelper.GetParent( element );
-      if( parent == null )
-        return null;
-
-      if( parent is AnimationPanel || parent is SwitchPanel )
-      {
-        panel = ( parent is SwitchPanel )
-            ? ( parent as SwitchPanel )._currentLayoutPanel
-            : parent as AnimationPanel;
-        return element as UIElement;
-      }
-
-      return AnimationPanel.FindAncestorChildOfAnimationPanel( parent, out panel );
-    }
-
-    internal Dictionary<string, Rect> GetNewLocationsBasedOnTargetPlacement( SwitchPresenter presenter, UIElement parent )
-    {
-      ChildState state = AnimationPanel.GetChildState( parent );
-
-      // if necessary, temporarily arrange the element at its final placement
-      bool rearrange = ( state.CurrentPlacement != state.TargetPlacement && state.IsAnimating );
-      if( rearrange )
-      {
-        parent.Arrange( state.TargetPlacement );
-      }
-
-      // now create a dictionary of locations for ID'd elements
-      Dictionary<string, Rect> result = new Dictionary<string, Rect>();
-      foreach( KeyValuePair<string, FrameworkElement> entry in presenter._knownIDs )
-      {
-        Size size = entry.Value.RenderSize;
-        Point[] points = { new Point(), new Point( size.Width, size.Height ) };
-        ( entry.Value.TransformToAncestor( VisualTreeHelper.GetParent( entry.Value ) as Visual ) as MatrixTransform ).Matrix.Transform( points );
-        result[ entry.Key ] = new Rect( points[ 0 ], points[ 1 ] );
-      }
-
-      // restore the current placement
-      if( rearrange )
-      {
-        parent.Arrange( state.CurrentPlacement );
-      }
-      return result;
-    }
-
-    internal Visual GetVisualChildInternal( int index )
-    {
-      return this.GetVisualChild( index );
-    }
-
-    internal void OnNotifyVisualChildAddedInternal( UIElement child )
-    {
-      this.OnNotifyVisualChildAdded( child );
-    }
-
-    internal void OnNotifyVisualChildRemovedInternal( UIElement child )
-    {
-      this.OnNotifyVisualChildRemoved( child );
-    }
-
-    internal Size MeasureChildrenCore( UIElementCollection children, Size constraint )
-    {
-      _currentChildren = children;
-      return MeasureChildrenOverride( _currentChildren, constraint );
-    }
-
-    internal Size ArrangeChildrenCore( UIElementCollection children, Size finalSize )
-    {
-      if( _currentChildren != children )
-      {
-        _currentChildren = children;
-      }
-
-      // always reset the animating children count at the beginning of an arrange
-      this.AnimatingChildCount = 0;
-      _animatingGrandchildren.Clear();
-
-      Size result;
-      try
-      {
-        // determine if this arrange represents a layout switch for a SwitchPanel
-        if( !this.HasArranged && _switchParent != null )
-        {
-          this.IsSwitchInProgress = true;
-          _switchParent.BeginLayoutSwitch();
-        }
-
-        // arrange active children
-        result = this.ArrangeChildrenOverride( _currentChildren, finalSize );
-
-        // also arrange exiting children, if necessary
-        if( this.ExitingChildren.Count > 0 )
-        {
-          this.AnimatingChildCount += this.ExitingChildren.Count;
-          this.UpdateExitingChildren();
-        }
-
-        // if this is a layout switch, make sure the switch is ended
-        if( this.IsSwitchInProgress )
-        {
-          if( this.AnimatingChildCount == 0 )
-          {
-            _switchParent.EndLayoutSwitch();
-          }
-          else
-          {
-            this.EndSwitchOnAnimationCompleted = true;
-          }
-        }
-      }
-      finally
-      {
-        this.HasArranged = true;
-        this.IsSwitchInProgress = false;
-      }
-      return result;
-    }
-
-    internal void OnSwitchParentVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      this.OnVisualChildrenChanged( visualAdded, visualRemoved );
-    }
-
-    protected sealed override Size MeasureOverride( Size constraint )
-    {
-      return this.MeasureChildrenCore( InternalChildren, constraint );
-    }
-
-    protected abstract Size MeasureChildrenOverride( UIElementCollection children, Size constraint );
-
-    protected sealed override Size ArrangeOverride( Size finalSize )
-    {
-      return this.ArrangeChildrenCore( _currentChildren, finalSize );
-    }
-
-    protected abstract Size ArrangeChildrenOverride( UIElementCollection children, Size finalSize );
-
-    protected void ArrangeChild( UIElement child, Rect placementRect )
-    {
-      // Offset in case SwitchPanel is handling scroll.
-      if( placementRect.IsEmpty == false && this.PhysicalScrollOffset.Length > 0 )
-      {
-        placementRect.Offset( -this.PhysicalScrollOffset );
-      }
-
-      // cannot start animations unless the panel is loaded
-      if( this.HasLoaded )
-      {
-        if( this.BeginChildAnimation( child, placementRect ) )
-        {
-          this.AnimatingChildCount++;
-        }
-      }
-      else
-      {
-        // just arrange the child if the panel has not yet loaded
-        child.Arrange( placementRect );
-      }
-    }
-
-    protected new void AddVisualChild( Visual child )
-    {
-      if( _switchParent == null )
-      {
-        base.AddVisualChild( child );
-      }
-      else
-      {
-        _switchParent.AddVisualChildInternal( child );
-      }
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( index < 0 )
-      {
-        throw new IndexOutOfRangeException();
-      }
-      if( index >= this.InternalChildren.Count )
-      {
-        int exitIndex = index - this.InternalChildren.Count;
-        if( exitIndex < 0 || exitIndex >= this.ExitingChildren.Count )
-          throw new IndexOutOfRangeException();
-
-        return this.ExitingChildren[ exitIndex ];
-      }
-      return ( _switchParent == null ) ? base.GetVisualChild( index ) : _switchParent.GetVisualChildInternal( index );
-    }
-
-    protected virtual void OnNotifyVisualChildAdded( UIElement child )
-    {
-    }
-
-    protected virtual void OnNotifyVisualChildRemoved( UIElement child )
-    {
-    }
-
-    protected virtual void OnSwitchLayoutActivated()
-    {
-    }
-
-    protected virtual void OnSwitchLayoutDeactivated()
-    {
-    }
-
-    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      if( !this.IsRemovingInternalChild )
-      {
-        if( visualRemoved is UIElement && visualRemoved != null )
-        {
-          this.IsRemovingInternalChild = true;
-          try
-          {
-            this.BeginChildExit( visualRemoved as UIElement );
-          }
-          finally
-          {
-            this.IsRemovingInternalChild = false;
-          }
-        }
-      }
-      if( _switchParent == null )
-      {
-        // The OnNotifyChildAdded/Removed methods get called for all animation panels within a 
-        // SwitchPanel.Layouts collection, regardless of whether they are the active layout 
-        // for the SwitchPanel.  Here, we also ensure that the methods are called for standalone panels.
-        if( visualAdded is UIElement )
-        {
-          this.OnNotifyVisualChildAdded( visualAdded as UIElement );
-        }
-        else if( visualRemoved is UIElement )
-        {
-          this.OnNotifyVisualChildRemoved( visualRemoved as UIElement );
-        }
-        base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-      }
-      else
-      {
-        _switchParent.OnVisualChildrenChangedInternal( visualAdded, visualRemoved );
-      }
-    }
-
-
-    protected new void RemoveVisualChild( Visual child )
-    {
-      if( _switchParent == null )
-      {
-        base.RemoveVisualChild( child );
-      }
-      else
-      {
-        _switchParent.RemoveVisualChildInternal( child );
-      }
-    }
-
-    protected int FindChildFromVisual( Visual vis )
-    {
-      int index = -1;
-
-      DependencyObject parent = vis;
-      DependencyObject child = null;
-
-      do
-      {
-        child = parent;
-        parent = VisualTreeHelper.GetParent( child );
-      }
-      while( parent != null && parent != ChildrensParent );
-
-      if( parent == this.ChildrensParent )
-      {
-        index = this.ChildrensParent.Children.IndexOf( ( UIElement )child );
-      }
-
-      return index;
-    }
-
-    private bool BeginChildAnimation( UIElement child, Rect placementRect )
-    {
-      // a private attached property is used to hold the information needed 
-      // to calculate the location of items on subsequent frame refreshes
-      bool newStateCreated;
-      ChildState state = this.EnsureChildState( child, placementRect, out newStateCreated );
-      if( state.HasEnterCompleted )
-      {
-        if( state.Type != AnimationType.Exit )
-        {
-          state.BeginTimeStamp = DateTime.Now;
-          state.Type = IsSwitchInProgress ? AnimationType.Switch : AnimationType.Layout;
-          state.TargetPlacement = placementRect;
-        }
-      }
-      else
-      {
-        // if the child is in the middle of an enter animation, we
-        // still need to update the placement rect
-        state.BeginTimeStamp = DateTime.Now;
-        state.TargetPlacement = placementRect;
-      }
-
-      if( !state.HasExitCompleted )
-      {
-        bool isDone = true;
-        object placementArgs;
-        if( state.Type != AnimationType.Enter )
-        {
-          state.Animator = this.GetEffectiveAnimator( state.Type );
-        }
-        if( state.Animator != null && !state.TargetPlacement.IsEmpty )
-        {
-          AnimationRate rate = this.GetEffectiveAnimationRate( state.Type );
-          state.CurrentPlacement = state.Animator.GetInitialChildPlacement(
-              child, state.CurrentPlacement, state.TargetPlacement, this,
-              ref rate, out placementArgs, out isDone );
-          state.AnimationRate = rate;
-          state.PlacementArgs = placementArgs;
-        }
-        state.IsAnimating = !isDone;
-        if( !state.IsAnimating )
-        {
-          state.CurrentPlacement = state.TargetPlacement;
-        }
-      }
-
-      // JZ this might not be needed nice the OnRender will arrange
-      if( state.IsAnimating == false )
-      {
-        this.UpdateTrueArrange( child, state );
-      }
-
-      return state.IsAnimating;
-    }
-
-    private void BeginChildEnter( UIElement child, ChildState state )
-    {
-      state.Type = AnimationType.Enter;
-
-      // raise the ChildEntering event
-      ChildEnteringEventArgs ceea = AnimationPanel.RaiseChildEnteringEvent( child,
-          child, GetEnterFrom( child ), state.CurrentPlacement );
-
-      // begin the enter animation, if necessary
-      state.Animator = this.GetEffectiveAnimator( AnimationType.Enter );
-      if( state.Animator != null && ceea.EnterFrom.HasValue )
-      {
-        state.CurrentPlacement = ceea.EnterFrom.Value;
-        state.BeginTimeStamp = DateTime.Now;
-      }
-    }
-
-    private void EndChildEnter( UIElement child, ChildState state )
-    {
-      // raise the ChildExited event
-      state.HasEnterCompleted = true;
-      AnimationPanel.RaiseChildEnteredEvent( child, child, state.TargetPlacement );
-    }
-
-    private void EndChildExit( UIElement child, ChildState state )
-    {
-      // raise the ChildExited event
-      state.HasExitCompleted = true;
-      AnimationPanel.RaiseChildExitedEvent( child, child );
-
-      // remove the visual child relationship
-      if( this.ExitingChildren.Contains( child ) )
-      {
-        this.IsRemovingInternalChild = true;
-        try
-        {
-          if( _switchParent != null )
-          {
-            _switchParent.RemoveVisualChildInternal( child );
-          }
-          else
-          {
-            this.RemoveVisualChild( child );
-          }
-        }
-        finally
-        {
-          this.IsRemovingInternalChild = false;
-        }
-        this.ExitingChildren.Remove( child );
-      }
-
-      child.ClearValue( AnimationPanel.ChildStatePropertyKey );
-    }
-
-    private ChildState EnsureChildState( UIElement child, Rect placementRect, out bool newStateCreated )
-    {
-      newStateCreated = false;
-      ChildState state = AnimationPanel.GetChildState( child );
-      if( state == null )
-      {
-        // if this is null, it's because this is the first time that
-        // the object has been arranged
-        state = new ChildState( placementRect );
-        AnimationPanel.SetChildState( child, state );
-        this.BeginChildEnter( child, state );
-        newStateCreated = true;
-      }
-      return state;
-    }
-
-    internal AnimationRate GetEffectiveAnimationRate( AnimationType animationType )
-    {
-      AnimationRate result = ( _switchParent == null ) ? this.DefaultAnimationRate : _switchParent.DefaultAnimationRate;
-      switch( animationType )
-      {
-        case AnimationType.Enter:
-          if( this.EnterAnimationRate != AnimationRate.Default )
-          {
-            result = this.EnterAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.EnterAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.EnterAnimationRate;
-          }
-          break;
-
-        case AnimationType.Exit:
-          if( this.ExitAnimationRate != AnimationRate.Default )
-          {
-            result = this.ExitAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.ExitAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.ExitAnimationRate;
-          }
-          break;
-
-        case AnimationType.Layout:
-          if( this.LayoutAnimationRate != AnimationRate.Default )
-          {
-            result = LayoutAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.LayoutAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.LayoutAnimationRate;
-          }
-          break;
-
-        case AnimationType.Switch:
-          if( this.SwitchAnimationRate != AnimationRate.Default )
-          {
-            result = SwitchAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.SwitchAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.SwitchAnimationRate;
-          }
-          break;
-
-        case AnimationType.Template:
-          if( this.TemplateAnimationRate != AnimationRate.Default )
-          {
-            result = this.TemplateAnimationRate;
-          }
-          else if( _switchParent != null && _switchParent.TemplateAnimationRate != AnimationRate.Default )
-          {
-            result = _switchParent.TemplateAnimationRate;
-          }
-          break;
-      }
-      return result;
-    }
-
-    private IterativeAnimator GetEffectiveAnimator( AnimationType animationType )
-    {
-      IterativeAnimator result = ( _switchParent == null ) ? this.DefaultAnimator : _switchParent.DefaultAnimator;
-      switch( animationType )
-      {
-        case AnimationType.Enter:
-          if( this.EnterAnimator != IterativeAnimator.Default || ( _switchParent != null && _switchParent.EnterAnimator != IterativeAnimator.Default ) )
-          {
-            result = ( EnterAnimator == IterativeAnimator.Default ) ? _switchParent.EnterAnimator : EnterAnimator;
-          }
-          break;
-
-        case AnimationType.Exit:
-          if( this.ExitAnimator != IterativeAnimator.Default || ( _switchParent != null && _switchParent.ExitAnimator != IterativeAnimator.Default ) )
-          {
-            result = ( ExitAnimator == IterativeAnimator.Default ) ? _switchParent.ExitAnimator : ExitAnimator;
-          }
-          break;
-
-        case AnimationType.Layout:
-          if( this.LayoutAnimator != IterativeAnimator.Default || ( _switchParent != null && _switchParent.LayoutAnimator != IterativeAnimator.Default ) )
-          {
-            result = ( LayoutAnimator == IterativeAnimator.Default ) ? _switchParent.LayoutAnimator : LayoutAnimator;
-          }
-          break;
-
-        case AnimationType.Switch:
-          if( _switchParent != null && !_switchParent.AreLayoutSwitchesAnimated )
-          {
-            result = null;
-          }
-          else
-          {
-            if( this.SwitchAnimator != IterativeAnimator.Default || _switchParent.SwitchAnimator != IterativeAnimator.Default )
-            {
-              result = ( SwitchAnimator == IterativeAnimator.Default ) ? _switchParent.SwitchAnimator : SwitchAnimator;
-            }
-          }
-          break;
-
-        case AnimationType.Template:
-          if( this.TemplateAnimator != IterativeAnimator.Default || ( _switchParent != null && _switchParent.TemplateAnimator != IterativeAnimator.Default ) )
-          {
-            result = ( TemplateAnimator == IterativeAnimator.Default ) ? _switchParent.TemplateAnimator : TemplateAnimator;
-          }
-          break;
-      }
-      return result;
-    }
-
-    private void OnLoaded( object sender, RoutedEventArgs e )
-    {
-      this.HasLoaded = true;
-
-      // invalidate arrange to give enter animations a chance to run
-      this.InvalidateArrange();
-    }
-
-    private void OnRendering( object sender, EventArgs e )
-    {
-      if( !this.IsActiveLayout )
-        return;
-
-      if( _currentChildren != null )
-      {
-        foreach( UIElement child in _currentChildren )
-        {
-          if( child == null )
-            continue;
-
-          ChildState state = AnimationPanel.GetChildState( child );
-          if( state != null )
-          {
-            TimeSpan t = DateTime.Now.Subtract( state.BeginTimeStamp );
-            if( state.IsAnimating )
-            {
-              bool isDone;
-              state.CurrentPlacement = state.Animator.GetNextChildPlacement( child, t, state.CurrentPlacement,
-                  state.TargetPlacement, this, state.AnimationRate, ref state.PlacementArgs, out isDone );
-              state.IsAnimating = !isDone;
-              this.UpdateTrueArrange( child, state );
-              if( !state.IsAnimating )
-              {
-                this.AnimatingChildCount--;
-              }
-            }
-          }
-        }
-      }
-
-      foreach( FrameworkElement grandchild in _animatingGrandchildren )
-      {
-        ChildState state = AnimationPanel.GetChildState( grandchild );
-        if( state != null && state.IsAnimating )
-        {
-          TimeSpan t = DateTime.Now.Subtract( state.BeginTimeStamp );
-          bool isDone;
-          state.CurrentPlacement = state.Animator.GetNextChildPlacement( grandchild, t, state.CurrentPlacement,
-              state.TargetPlacement, this, state.AnimationRate, ref state.PlacementArgs, out isDone );
-          state.IsAnimating = !isDone;
-          Rect rect = state.IsAnimating ? state.CurrentPlacement : state.TargetPlacement;
-          grandchild.Arrange( rect );
-          if( !state.IsAnimating )
-          {
-            this.AnimatingChildCount--;
-          }
-        }
-      }
-
-      this.UpdateExitingChildren();
-
-      if( this.AnimatingChildCount == 0 )
-      {
-        _animatingGrandchildren.Clear();
-      }
-    }
-
-    private void UpdateExitingChildren()
-    {
-      if( this.ExitingChildren.Count > 0 )
-      {
-        List<UIElement> exitingChildren = new List<UIElement>( ExitingChildren );
-        foreach( UIElement child in exitingChildren )
-        {
-          if( child == null )
-            continue;
-
-          ChildState state = AnimationPanel.GetChildState( child );
-          if( state != null )
-          {
-            TimeSpan t = DateTime.Now.Subtract( state.BeginTimeStamp );
-            if( state.IsAnimating )
-            {
-              bool isDone;
-              state.CurrentPlacement = state.Animator.GetNextChildPlacement( child, t, state.CurrentPlacement,
-                  state.TargetPlacement, this, state.AnimationRate, ref state.PlacementArgs, out isDone );
-              state.IsAnimating = !isDone;
-              this.UpdateTrueArrange( child, state );
-              if( !state.IsAnimating )
-              {
-                this.AnimatingChildCount--;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    private void UpdateTrueArrange( UIElement child, ChildState state )
-    {
-      if( !state.TargetPlacement.IsEmpty )
-      {
-        child.Arrange( state.IsAnimating && state.Animator != null ? state.CurrentPlacement : state.TargetPlacement );
-      }
-
-      // if the child is done entering, complete the enter routine
-      if( !state.IsAnimating && !state.HasEnterCompleted )
-      {
-        this.EndChildEnter( child, state );
-      }
-
-      // if the child is done exiting, complete the exit routine
-      if( !state.IsAnimating && state.HasExitBegun )
-      {
-        this.EndChildExit( child, state );
-      }
-    }
-
-    #region Private Fields
-
-    private UIElementCollection _currentChildren;
-    private readonly Collection<FrameworkElement> _animatingGrandchildren = new Collection<FrameworkElement>();
-    private SwitchPanel _switchParent = null;
-    private List<UIElement> _exitingChildren = null;
-    private BitVector32 _cacheBits = new BitVector32( 1 );
-
-    #endregion
-
-    #region ChildState Nested Type
-
-    private sealed class ChildState
-    {
-      public ChildState( Rect currentRect )
-      {
-        this.CurrentPlacement = currentRect;
-        this.TargetPlacement = currentRect;
-        this.BeginTimeStamp = DateTime.Now;
-      }
-
-      public bool HasEnterCompleted
-      {
-        get
-        {
-          return _cacheBits[ ( int )CacheBits.HasEnterCompleted ];
-        }
-        set
-        {
-          _cacheBits[ ( int )CacheBits.HasEnterCompleted ] = value;
-        }
-      }
-
-      public bool HasExitBegun
-      {
-        get
-        {
-          return _cacheBits[ ( int )CacheBits.HasExitBegun ];
-        }
-        set
-        {
-          _cacheBits[ ( int )CacheBits.HasExitBegun ] = value;
-        }
-      }
-
-      public bool HasExitCompleted
-      {
-        get
-        {
-          return _cacheBits[ ( int )CacheBits.HasExitCompleted ];
-        }
-        set
-        {
-          _cacheBits[ ( int )CacheBits.HasExitCompleted ] = value;
-        }
-      }
-
-      public bool IsAnimating
-      {
-        get
-        {
-          return _cacheBits[ ( int )CacheBits.IsAnimating ];
-        }
-        set
-        {
-          _cacheBits[ ( int )CacheBits.IsAnimating ] = value;
-        }
-      }
-
-      public AnimationType Type;
-      public DateTime BeginTimeStamp;
-      public IterativeAnimator Animator;
-      public Rect CurrentPlacement;
-      public Rect TargetPlacement;
-      public AnimationRate AnimationRate;
-      public object PlacementArgs;
-
-      private BitVector32 _cacheBits = new BitVector32( 0 );
-      private enum CacheBits
-      {
-        IsAnimating = 0x00000001,
-        HasEnterCompleted = 0x00000002,
-        HasExitBegun = 0x00000004,
-        HasExitCompleted = 0x00000008,
-      }
-    }
-
-    #endregion
-
-    #region AnimationType Nested Type
-
-    internal enum AnimationType
-    {
-      Enter,
-      Exit,
-      Layout,
-      Switch,
-      Template,
-    }
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      IsActiveLayout = 0x00000001,
-      IsSwitchInProgress = 0x00000002,
-      EndSwitchOnAnimationCompleted = 0x00000010,
-      IsRemovingInternalChild = 0x00000020,
-      HasLoaded = 0x00000040,
-      HasArranged = 0x00000080,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
deleted file mode 100644
index 538628fe..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using Xceed.Wpf.Toolkit.Panels;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public sealed class AnimatorConverter : TypeConverter
-  {
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( string ) );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( IterativeAnimator ) )
-          || ( type == typeof( DoubleAnimator ) );
-    }
-
-    public override object ConvertFrom( 
-      ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value )
-    {
-      IterativeAnimator result = null;
-      if( value is string )
-      {
-        switch( value as string )
-        {
-          case "BackEaseIn":
-            result = Animators.BackEaseIn as IterativeAnimator;
-            break;
-          case "BackEaseInOut":
-            result = Animators.BackEaseInOut as IterativeAnimator;
-            break;
-          case "BackEaseOut":
-            result = Animators.BackEaseOut as IterativeAnimator;
-            break;
-          case "BounceEaseIn":
-            result = Animators.BounceEaseIn as IterativeAnimator;
-            break;
-          case "BounceEaseInOut":
-            result = Animators.BounceEaseInOut as IterativeAnimator;
-            break;
-          case "BounceEaseOut":
-            result = Animators.BounceEaseOut as IterativeAnimator;
-            break;
-          case "CircEaseIn":
-            result = Animators.CircEaseIn as IterativeAnimator;
-            break;
-          case "CircEaseInOut":
-            result = Animators.CircEaseInOut as IterativeAnimator;
-            break;
-          case "CircEaseOut":
-            result = Animators.CircEaseOut as IterativeAnimator;
-            break;
-          case "CubicEaseIn":
-            result = Animators.CubicEaseIn as IterativeAnimator;
-            break;
-          case "CubicEaseInOut":
-            result = Animators.CubicEaseInOut as IterativeAnimator;
-            break;
-          case "CubicEaseOut":
-            result = Animators.CubicEaseOut as IterativeAnimator;
-            break;
-          case "ElasticEaseIn":
-            result = Animators.ElasticEaseIn as IterativeAnimator;
-            break;
-          case "ElasticEaseInOut":
-            result = Animators.ElasticEaseInOut as IterativeAnimator;
-            break;
-          case "ElasticEaseOut":
-            result = Animators.ElasticEaseOut as IterativeAnimator;
-            break;
-          case "ExpoEaseIn":
-            result = Animators.ExpoEaseIn as IterativeAnimator;
-            break;
-          case "ExpoEaseInOut":
-            result = Animators.ExpoEaseInOut as IterativeAnimator;
-            break;
-          case "ExpoEaseOut":
-            result = Animators.ExpoEaseOut as IterativeAnimator;
-            break;
-          case "Linear":
-            result = Animators.Linear as IterativeAnimator;
-            break;
-          case "QuadEaseIn":
-            result = Animators.QuadEaseIn as IterativeAnimator;
-            break;
-          case "QuadEaseInOut":
-            result = Animators.QuadEaseInOut as IterativeAnimator;
-            break;
-          case "QuadEaseOut":
-            result = Animators.QuadEaseOut as IterativeAnimator;
-            break;
-          case "QuartEaseIn":
-            result = Animators.QuartEaseIn as IterativeAnimator;
-            break;
-          case "QuartEaseInOut":
-            result = Animators.QuartEaseInOut as IterativeAnimator;
-            break;
-          case "QuartEaseOut":
-            result = Animators.QuartEaseOut as IterativeAnimator;
-            break;
-          case "QuintEaseIn":
-            result = Animators.QuintEaseIn as IterativeAnimator;
-            break;
-          case "QuintEaseInOut":
-            result = Animators.QuintEaseInOut as IterativeAnimator;
-            break;
-          case "QuintEaseOut":
-            result = Animators.QuintEaseOut as IterativeAnimator;
-            break;
-          case "SineEaseIn":
-            result = Animators.SineEaseIn as IterativeAnimator;
-            break;
-          case "SineEaseInOut":
-            result = Animators.SineEaseInOut as IterativeAnimator;
-            break;
-          case "SineEaseOut":
-            result = Animators.SineEaseOut as IterativeAnimator;
-            break;
-        }
-      }
-
-      return result;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
deleted file mode 100644
index 3d051719..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
+++ /dev/null
@@ -1,581 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using Xceed.Wpf.Toolkit.Media.Animation;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public static class Animators
-  {
-    #region BackEaseIn Static Property
-
-    public static DoubleAnimator BackEaseIn
-    {
-      get
-      {
-        if( _backEaseIn == null )
-        {
-          _backEaseIn = new DoubleAnimator( PennerEquations.BackEaseIn );
-        }
-        return _backEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _backEaseIn;
-
-    #endregion
-
-    #region BackEaseInOut Static Property
-
-    public static DoubleAnimator BackEaseInOut
-    {
-      get
-      {
-        if( _backEaseInOut == null )
-        {
-          _backEaseInOut = new DoubleAnimator( PennerEquations.BackEaseInOut );
-        }
-        return _backEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _backEaseInOut;
-
-    #endregion
-
-    #region BackEaseOut Static Property
-
-    public static DoubleAnimator BackEaseOut
-    {
-      get
-      {
-        if( _backEaseOut == null )
-        {
-          _backEaseOut = new DoubleAnimator( PennerEquations.BackEaseOut );
-        }
-        return _backEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _backEaseOut;
-
-    #endregion
-
-    #region BounceEaseIn Static Property
-
-    public static DoubleAnimator BounceEaseIn
-    {
-      get
-      {
-        if( _bounceEaseIn == null )
-        {
-          _bounceEaseIn = new DoubleAnimator( PennerEquations.BounceEaseIn );
-        }
-        return _bounceEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _bounceEaseIn;
-
-    #endregion
-
-    #region BounceEaseInOut Static Property
-
-    public static DoubleAnimator BounceEaseInOut
-    {
-      get
-      {
-        if( _bounceEaseInOut == null )
-        {
-          _bounceEaseInOut = new DoubleAnimator( PennerEquations.BounceEaseInOut );
-        }
-        return _bounceEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _bounceEaseInOut;
-
-    #endregion
-
-    #region BounceEaseOut Static Property
-
-    public static DoubleAnimator BounceEaseOut
-    {
-      get
-      {
-        if( _bounceEaseOut == null )
-        {
-          _bounceEaseOut = new DoubleAnimator( PennerEquations.BounceEaseOut );
-        }
-        return _bounceEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _bounceEaseOut;
-
-    #endregion
-
-    #region CircEaseIn Static Property
-
-    public static DoubleAnimator CircEaseIn
-    {
-      get
-      {
-        if( _circEaseIn == null )
-        {
-          _circEaseIn = new DoubleAnimator( PennerEquations.CircEaseIn );
-        }
-        return _circEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _circEaseIn;
-
-    #endregion
-
-    #region CircEaseInOut Static Property
-
-    public static DoubleAnimator CircEaseInOut
-    {
-      get
-      {
-        if( _circEaseInOut == null )
-        {
-          _circEaseInOut = new DoubleAnimator( PennerEquations.CircEaseInOut );
-        }
-        return _circEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _circEaseInOut;
-
-    #endregion
-
-    #region CircEaseOut Static Property
-
-    public static DoubleAnimator CircEaseOut
-    {
-      get
-      {
-        if( _circEaseOut == null )
-        {
-          _circEaseOut = new DoubleAnimator( PennerEquations.CircEaseOut );
-        }
-        return _circEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _circEaseOut;
-
-    #endregion
-
-    #region CubicEaseIn Static Property
-
-    public static DoubleAnimator CubicEaseIn
-    {
-      get
-      {
-        if( _cubicEaseIn == null )
-        {
-          _cubicEaseIn = new DoubleAnimator( PennerEquations.CubicEaseIn );
-        }
-        return _cubicEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _cubicEaseIn;
-
-    #endregion
-
-    #region CubicEaseInOut Static Property
-
-    public static DoubleAnimator CubicEaseInOut
-    {
-      get
-      {
-        if( _cubicEaseInOut == null )
-        {
-          _cubicEaseInOut = new DoubleAnimator( PennerEquations.CubicEaseInOut );
-        }
-        return _cubicEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _cubicEaseInOut;
-
-    #endregion
-
-    #region CubicEaseOut Static Property
-
-    public static DoubleAnimator CubicEaseOut
-    {
-      get
-      {
-        if( _cubicEaseOut == null )
-        {
-          _cubicEaseOut = new DoubleAnimator( PennerEquations.CubicEaseOut );
-        }
-        return _cubicEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _cubicEaseOut;
-
-    #endregion
-
-    #region ElasticEaseIn Static Property
-
-    public static DoubleAnimator ElasticEaseIn
-    {
-      get
-      {
-        if( _elasticEaseIn == null )
-        {
-          _elasticEaseIn = new DoubleAnimator( PennerEquations.ElasticEaseIn );
-        }
-        return _elasticEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _elasticEaseIn;
-
-    #endregion
-
-    #region ElasticEaseInOut Static Property
-
-    public static DoubleAnimator ElasticEaseInOut
-    {
-      get
-      {
-        if( _elasticEaseInOut == null )
-        {
-          _elasticEaseInOut = new DoubleAnimator( PennerEquations.ElasticEaseInOut );
-        }
-        return _elasticEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _elasticEaseInOut;
-
-    #endregion
-
-    #region ElasticEaseOut Static Property
-
-    public static DoubleAnimator ElasticEaseOut
-    {
-      get
-      {
-        if( _elasticEaseOut == null )
-        {
-          _elasticEaseOut = new DoubleAnimator( PennerEquations.ElasticEaseOut );
-        }
-        return _elasticEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _elasticEaseOut;
-
-    #endregion
-
-    #region ExpoEaseIn Static Property
-
-    public static DoubleAnimator ExpoEaseIn
-    {
-      get
-      {
-        if( _expoEaseIn == null )
-        {
-          _expoEaseIn = new DoubleAnimator( PennerEquations.ExpoEaseIn );
-        }
-        return _expoEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _expoEaseIn;
-
-    #endregion
-
-    #region ExpoEaseInOut Static Property
-
-    public static DoubleAnimator ExpoEaseInOut
-    {
-      get
-      {
-        if( _expoEaseInOut == null )
-        {
-          _expoEaseInOut = new DoubleAnimator( PennerEquations.ExpoEaseInOut );
-        }
-        return _expoEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _expoEaseInOut;
-
-    #endregion
-
-    #region ExpoEaseOut Static Property
-
-    public static DoubleAnimator ExpoEaseOut
-    {
-      get
-      {
-        if( _expoEaseOut == null )
-        {
-          _expoEaseOut = new DoubleAnimator( PennerEquations.ExpoEaseOut );
-        }
-        return _expoEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _expoEaseOut;
-
-    #endregion
-
-    #region Linear Static Property
-
-    public static DoubleAnimator Linear
-    {
-      get
-      {
-        if( _linear == null )
-        {
-          _linear = new DoubleAnimator( PennerEquations.Linear );
-        }
-        return _linear;
-      }
-    }
-
-    private static DoubleAnimator _linear;
-
-    #endregion
-
-    #region QuadEaseIn Static Property
-
-    public static DoubleAnimator QuadEaseIn
-    {
-      get
-      {
-        if( _quadEaseIn == null )
-        {
-          _quadEaseIn = new DoubleAnimator( PennerEquations.QuadEaseIn );
-        }
-        return _quadEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _quadEaseIn;
-
-    #endregion
-
-    #region QuadEaseInOut Static Property
-
-    public static DoubleAnimator QuadEaseInOut
-    {
-      get
-      {
-        if( _quadEaseInOut == null )
-        {
-          _quadEaseInOut = new DoubleAnimator( PennerEquations.QuadEaseInOut );
-        }
-        return _quadEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _quadEaseInOut;
-
-    #endregion
-
-    #region QuadEaseOut Static Property
-
-    public static DoubleAnimator QuadEaseOut
-    {
-      get
-      {
-        if( _quadEaseOut == null )
-        {
-          _quadEaseOut = new DoubleAnimator( PennerEquations.QuadEaseOut );
-        }
-        return _quadEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _quadEaseOut;
-
-    #endregion
-
-    #region QuartEaseIn Static Property
-
-    public static DoubleAnimator QuartEaseIn
-    {
-      get
-      {
-        if( _quartEaseIn == null )
-        {
-          _quartEaseIn = new DoubleAnimator( PennerEquations.QuartEaseIn );
-        }
-        return _quartEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _quartEaseIn;
-
-    #endregion
-
-    #region QuartEaseInOut Static Property
-
-    public static DoubleAnimator QuartEaseInOut
-    {
-      get
-      {
-        if( _quartEaseInOut == null )
-        {
-          _quartEaseInOut = new DoubleAnimator( PennerEquations.QuartEaseInOut );
-        }
-        return _quartEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _quartEaseInOut;
-
-    #endregion
-
-    #region QuartEaseOut Static Property
-
-    public static DoubleAnimator QuartEaseOut
-    {
-      get
-      {
-        if( _quartEaseOut == null )
-        {
-          _quartEaseOut = new DoubleAnimator( PennerEquations.QuartEaseOut );
-        }
-        return _quartEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _quartEaseOut;
-
-    #endregion
-
-    #region QuintEaseIn Static Property
-
-    public static DoubleAnimator QuintEaseIn
-    {
-      get
-      {
-        if( _quintEaseIn == null )
-        {
-          _quintEaseIn = new DoubleAnimator( PennerEquations.QuintEaseIn );
-        }
-        return _quintEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _quintEaseIn;
-
-    #endregion
-
-    #region QuintEaseInOut Static Property
-
-    public static DoubleAnimator QuintEaseInOut
-    {
-      get
-      {
-        if( _quintEaseInOut == null )
-        {
-          _quintEaseInOut = new DoubleAnimator( PennerEquations.QuintEaseInOut );
-        }
-        return _quintEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _quintEaseInOut;
-
-    #endregion
-
-    #region QuintEaseOut Static Property
-
-    public static DoubleAnimator QuintEaseOut
-    {
-      get
-      {
-        if( _quintEaseOut == null )
-        {
-          _quintEaseOut = new DoubleAnimator( PennerEquations.QuintEaseOut );
-        }
-        return _quintEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _quintEaseOut;
-
-    #endregion
-
-    #region SineEaseIn Static Property
-
-    public static DoubleAnimator SineEaseIn
-    {
-      get
-      {
-        if( _sineEaseIn == null )
-        {
-          _sineEaseIn = new DoubleAnimator( PennerEquations.SineEaseIn );
-        }
-        return _sineEaseIn;
-      }
-    }
-
-    private static DoubleAnimator _sineEaseIn;
-
-    #endregion
-
-    #region SineEaseInOut Static Property
-
-    public static DoubleAnimator SineEaseInOut
-    {
-      get
-      {
-        if( _sineEaseInOut == null )
-        {
-          _sineEaseInOut = new DoubleAnimator( PennerEquations.SineEaseInOut );
-        }
-        return _sineEaseInOut;
-      }
-    }
-
-    private static DoubleAnimator _sineEaseInOut;
-
-    #endregion
-
-    #region SineEaseOut Static Property
-
-    public static DoubleAnimator SineEaseOut
-    {
-      get
-      {
-        if( _sineEaseOut == null )
-        {
-          _sineEaseOut = new DoubleAnimator( PennerEquations.SineEaseOut );
-        }
-        return _sineEaseOut;
-      }
-    }
-
-    private static DoubleAnimator _sineEaseOut;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
deleted file mode 100644
index a89d5edf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class ChildEnteredEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ChildEnteredEventArgs( UIElement child, Rect arrangeRect )
-    {
-      _child = child;
-      _arrangeRect = arrangeRect;
-    }
-
-    #endregion
-
-    #region ArrangeRect Property
-
-    public Rect ArrangeRect
-    {
-      get
-      {
-        return _arrangeRect;
-      }
-    }
-
-    private readonly Rect _arrangeRect;
-
-    #endregion
-
-    #region Child Property
-
-    public UIElement Child
-    {
-      get
-      {
-        return _child;
-      }
-    }
-
-    private readonly UIElement _child;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
deleted file mode 100644
index ab5f4e85..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Panels
-{
-  public delegate void ChildEnteredEventHandler( object sender, ChildEnteredEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
deleted file mode 100644
index 66d4acac..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class ChildEnteringEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ChildEnteringEventArgs( UIElement child, Rect? enterFrom, Rect arrangeRect )
-    {
-      _child = child;
-      _enterFrom = enterFrom;
-      _arrangeRect = arrangeRect;
-    }
-
-    #endregion
-
-    #region ArrangeRect Property
-
-    public Rect ArrangeRect
-    {
-      get
-      {
-        return _arrangeRect;
-      }
-    }
-
-    private readonly Rect _arrangeRect;
-
-    #endregion
-
-    #region Child Property
-
-    public UIElement Child
-    {
-      get
-      {
-        return _child;
-      }
-    }
-
-    private readonly UIElement _child;
-
-    #endregion
-
-    #region EnterFrom Property
-
-    public Rect? EnterFrom
-    {
-      get
-      {
-        return _enterFrom;
-      }
-      set
-      {
-        _enterFrom = value;
-      }
-    }
-
-    private Rect? _enterFrom; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
deleted file mode 100644
index d0fb56c1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Panels
-{
-  public delegate void ChildEnteringEventHandler( object sender, ChildEnteringEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
deleted file mode 100644
index a1dd43b0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class ChildExitedEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ChildExitedEventArgs( UIElement child )
-    {
-      _child = child;
-    }
-
-    #endregion
-
-    #region Child Property
-
-    public UIElement Child
-    {
-      get
-      {
-        return _child;
-      }
-    }
-
-    private readonly UIElement _child;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
deleted file mode 100644
index 64faa9e4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Panels
-{
-  public delegate void ChildExitedEventHandler( object sender, ChildExitedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
deleted file mode 100644
index 7d7d53b7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class ChildExitingEventArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public ChildExitingEventArgs( UIElement child, Rect? exitTo, Rect arrangeRect )
-    {
-      _child = child;
-      _exitTo = exitTo;
-      _arrangeRect = arrangeRect;
-    }
-
-    #endregion
-
-    #region ArrangeRect Property
-
-    public Rect ArrangeRect
-    {
-      get
-      {
-        return _arrangeRect;
-      }
-    }
-
-    private readonly Rect _arrangeRect;
-
-    #endregion
-
-    #region Child Property
-
-    public UIElement Child
-    {
-      get
-      {
-        return _child;
-      }
-    }
-
-    private readonly UIElement _child;
-
-    #endregion
-
-    #region ExitTo Property
-
-    public Rect? ExitTo
-    {
-      get
-      {
-        return _exitTo;
-      }
-      set
-      {
-        _exitTo = value;
-      }
-    }
-
-    private Rect? _exitTo; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
deleted file mode 100644
index e0410522..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Panels
-{
-  public delegate void ChildExitingEventHandler( object sender, ChildExitingEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
deleted file mode 100644
index 4a6af9b2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 Xceed.Wpf.Toolkit.Media.Animation;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class DoubleAnimator : IterativeAnimator
-  {
-    #region Constructors
-
-    public DoubleAnimator( IterativeEquation<double> equation )
-    {
-      _equation = equation;
-    }
-
-    #endregion
-
-    public override Rect GetInitialChildPlacement( UIElement child, Rect currentPlacement,
-        Rect targetPlacement, AnimationPanel activeLayout, ref AnimationRate animationRate,
-        out object placementArgs, out bool isDone )
-    {
-      isDone = ( animationRate.HasSpeed && animationRate.Speed <= 0 ) || ( animationRate.HasDuration && animationRate.Duration.Ticks == 0 );
-      if( !isDone )
-      {
-        Vector startVector = new Vector( currentPlacement.Left + ( currentPlacement.Width / 2 ), currentPlacement.Top + ( currentPlacement.Height / 2 ) );
-        Vector finalVector = new Vector( targetPlacement.Left + ( targetPlacement.Width / 2 ), targetPlacement.Top + ( targetPlacement.Height / 2 ) );
-        Vector distanceVector = startVector - finalVector;
-        animationRate = new AnimationRate( animationRate.HasDuration ? animationRate.Duration
-            : TimeSpan.FromMilliseconds( distanceVector.Length / animationRate.Speed ) );
-      }
-      placementArgs = currentPlacement;
-      return currentPlacement;
-    }
-
-    public override Rect GetNextChildPlacement( UIElement child, TimeSpan currentTime,
-        Rect currentPlacement, Rect targetPlacement, AnimationPanel activeLayout,
-        AnimationRate animationRate, ref object placementArgs, out bool isDone )
-    {
-      Rect result = targetPlacement;
-      isDone = true;
-      if( _equation != null )
-      {
-        Rect from = ( Rect )placementArgs;
-        TimeSpan duration = animationRate.Duration;
-        isDone = currentTime >= duration;
-        if( !isDone )
-        {
-          double x = _equation.Evaluate( currentTime, from.Left, targetPlacement.Left, duration );
-          double y = _equation.Evaluate( currentTime, from.Top, targetPlacement.Top, duration );
-          double width = Math.Max( 0, _equation.Evaluate( currentTime, from.Width, targetPlacement.Width, duration ) );
-          double height = Math.Max( 0, _equation.Evaluate( currentTime, from.Height, targetPlacement.Height, duration ) );
-          result = new Rect( x, y, width, height );
-        }
-      }
-      return result;
-    }
-
-    #region Private Fields
-
-    private readonly IterativeEquation<double> _equation; //null
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
deleted file mode 100644
index 1d079e2a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.Media.Animation;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  [TypeConverter( typeof( AnimatorConverter ) )]
-  public abstract class IterativeAnimator
-  {
-    #region Default Static Property
-
-    public static IterativeAnimator Default
-    {
-      get
-      {
-        return _default;
-      }
-    }
-
-    private static readonly IterativeAnimator _default = new DefaultAnimator();
-
-    #endregion
-
-    public abstract Rect GetInitialChildPlacement(
-      UIElement child,
-      Rect currentPlacement,
-      Rect targetPlacement,
-      AnimationPanel activeLayout,
-      ref AnimationRate animationRate,
-      out object placementArgs,
-      out bool isDone );
-
-    public abstract Rect GetNextChildPlacement(
-      UIElement child,
-      TimeSpan currentTime,
-      Rect currentPlacement,
-      Rect targetPlacement,
-      AnimationPanel activeLayout,
-      AnimationRate animationRate,
-      ref object placementArgs,
-      out bool isDone );
-
-    #region DefaultAnimator Nested Type
-
-    private sealed class DefaultAnimator : IterativeAnimator
-    {
-      public override Rect GetInitialChildPlacement( UIElement child, Rect currentPlacement, Rect targetPlacement, AnimationPanel activeLayout, ref AnimationRate animationRate, out object placementArgs, out bool isDone )
-      {
-        throw new InvalidOperationException( ErrorMessages.GetMessage( ErrorMessages.DefaultAnimatorCantAnimate ) );
-      }
-
-      public override Rect GetNextChildPlacement( UIElement child, TimeSpan currentTime, Rect currentPlacement, Rect targetPlacement, AnimationPanel activeLayout, AnimationRate animationRate, ref object placementArgs, out bool isDone )
-      {
-        throw new InvalidOperationException( ErrorMessages.GetMessage( ErrorMessages.DefaultAnimatorCantAnimate ) );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
deleted file mode 100644
index 3217f008..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public abstract class PanelBase : Panel
-  {
-    #region Constructor
-
-    public PanelBase()
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
deleted file mode 100644
index 7a023c23..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
+++ /dev/null
@@ -1,303 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class RandomPanel : AnimationPanel
-  {
-    #region MinimumWidth Property
-
-    public static readonly DependencyProperty MinimumWidthProperty =
-      DependencyProperty.Register( "MinimumWidth", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata(
-          10d,
-          new PropertyChangedCallback( RandomPanel.OnMinimumWidthChanged ),
-          new CoerceValueCallback( RandomPanel.CoerceMinimumWidth ) ) );
-
-    public double MinimumWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( RandomPanel.MinimumWidthProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.MinimumWidthProperty, value );
-      }
-    }
-
-    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.OnMinimumHeightChanged ),
-          new CoerceValueCallback( RandomPanel.CoerceMinimumHeight ) ) );
-
-    public double MinimumHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( RandomPanel.MinimumHeightProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.MinimumHeightProperty, value );
-      }
-    }
-
-    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.OnMaximumWidthChanged ),
-          new CoerceValueCallback( RandomPanel.CoerceMaximumWidth ) ) );
-
-    public double MaximumWidth
-    {
-      get
-      {
-        return ( double )this.GetValue( RandomPanel.MaximumWidthProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.MaximumWidthProperty, value );
-      }
-    }
-
-    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.OnMaximumHeightChanged ),
-          new CoerceValueCallback( RandomPanel.CoerceMaximumHeight ) ) );
-
-    public double MaximumHeight
-    {
-      get
-      {
-        return ( double )this.GetValue( RandomPanel.MaximumHeightProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.MaximumHeightProperty, value );
-      }
-    }
-
-    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 PropertyChangedCallback( RandomPanel.SeedChanged ) ) );
-
-    public int Seed
-    {
-      get
-      {
-        return ( int )this.GetValue( RandomPanel.SeedProperty );
-      }
-      set
-      {
-        this.SetValue( RandomPanel.SeedProperty, value );
-      }
-    }
-
-    private static void SeedChanged( DependencyObject obj, DependencyPropertyChangedEventArgs args )
-    {
-      if( obj is RandomPanel )
-      {
-        RandomPanel owner = ( RandomPanel )obj;
-        owner._random = new Random( ( int )args.NewValue );
-        owner.InvalidateArrange();
-      }
-    }
-
-    #endregion
-
-    #region ActualSize Private Property
-
-    // 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 ),
-        new UIPropertyMetadata( new Size() ) );
-
-    private static Size GetActualSize( DependencyObject obj )
-    {
-      return ( Size )obj.GetValue( RandomPanel.ActualSizeProperty );
-    }
-
-    private static void SetActualSize( DependencyObject obj, Size value )
-    {
-      obj.SetValue( RandomPanel.ActualSizeProperty, value );
-    }
-
-    #endregion
-
-    protected override Size MeasureChildrenOverride( UIElementCollection children, Size constraint )
-    {
-      Size availableSize = new Size( double.PositiveInfinity, double.PositiveInfinity );
-
-      foreach( UIElement child in children )
-      {
-        if( child == null )
-          continue;
-
-        Size childSize = new Size( 1d * _random.Next( Convert.ToInt32( MinimumWidth ), Convert.ToInt32( MaximumWidth ) ),
-                                   1d * _random.Next( Convert.ToInt32( MinimumHeight ), Convert.ToInt32( MaximumHeight ) ) );
-
-        child.Measure( childSize );
-        RandomPanel.SetActualSize( child, childSize );
-      }
-      return new Size();
-    }
-
-    protected override Size ArrangeChildrenOverride( UIElementCollection children, Size finalSize )
-    {
-      foreach( UIElement child in children )
-      {
-        if( child == null )
-          continue;
-
-        Size childSize = RandomPanel.GetActualSize( child );
-
-        double x = _random.Next( 0, ( int )( Math.Max( finalSize.Width - childSize.Width, 0 ) ) );
-        double y = _random.Next( 0, ( int )( Math.Max( finalSize.Height - childSize.Height, 0 ) ) );
-
-        double width = Math.Min( finalSize.Width, childSize.Width );
-        double height = Math.Min( finalSize.Height, childSize.Height );
-
-        this.ArrangeChild( child, new Rect( new Point( x, y ), new Size( width, height ) ) );
-      }
-      return finalSize;
-    }
-
-    #region Private Fields
-
-    private Random _random = new Random();
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
deleted file mode 100644
index 523041aa..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  internal static class ScrollHelper
-  {
-    public static bool ScrollLeastAmount( Rect physViewRect, Rect itemRect, out Vector newPhysOffset )
-    {
-      bool scrollNeeded = false;
-
-      newPhysOffset = new Vector();
-
-      if( physViewRect.Contains( itemRect ) == false )
-      {
-        // Check if child is inside the view horizontially.
-        if( itemRect.Left > physViewRect.Left && itemRect.Right < physViewRect.Right ||
-            DoubleHelper.AreVirtuallyEqual( itemRect.Left, physViewRect.Left ) == true )
-        {
-          newPhysOffset.X = itemRect.Left;
-        }
-        // Child is to the left of the view or is it bigger than the view
-        else if( itemRect.Left < physViewRect.Left || itemRect.Width > physViewRect.Width )
-        {
-          newPhysOffset.X = itemRect.Left;
-        }
-        // Child is to the right of the view
-        else
-        {
-          newPhysOffset.X = Math.Max( 0, physViewRect.Left + ( itemRect.Right - physViewRect.Right ) );
-        }
-
-        // Check if child is inside the view vertically.
-        if( itemRect.Top > physViewRect.Top && itemRect.Bottom < physViewRect.Bottom ||
-            DoubleHelper.AreVirtuallyEqual( itemRect.Top, physViewRect.Top ) == true )
-        {
-          newPhysOffset.Y = itemRect.Top;
-        }
-        // Child is the above the view or is it bigger than the view
-        else if( itemRect.Top < physViewRect.Top || itemRect.Height > physViewRect.Height )
-        {
-          newPhysOffset.Y = itemRect.Top;
-        }
-        // Child is below the view
-        else
-        {
-          newPhysOffset.Y = Math.Max( 0, physViewRect.Top + ( itemRect.Bottom - physViewRect.Bottom ) );
-        }
-
-        scrollNeeded = true;
-      }
-
-      return scrollNeeded;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
deleted file mode 100644
index c5a05da1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
+++ /dev/null
@@ -1,1383 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Specialized;
-using System.Threading;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Media.Animation;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class SwitchPanel : PanelBase, IScrollInfo
-  {
-    #region Static Fields
-
-    private static readonly Vector ZeroVector = new Vector();
-
-    #endregion
-
-    #region Constructors
-
-    public SwitchPanel()
-    {
-      this.SetLayouts( new ObservableCollection<AnimationPanel>() );
-      this.Loaded += new RoutedEventHandler( this.OnLoaded );
-    }
-
-    #endregion
-
-    #region AreLayoutSwitchesAnimated Property
-
-    public static readonly DependencyProperty AreLayoutSwitchesAnimatedProperty =
-      DependencyProperty.Register( "AreLayoutSwitchesAnimated", typeof( bool ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( true ) );
-
-    public bool AreLayoutSwitchesAnimated
-    {
-      get
-      {
-        return ( bool )this.GetValue( SwitchPanel.AreLayoutSwitchesAnimatedProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.AreLayoutSwitchesAnimatedProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ActiveLayout Property
-
-    private static readonly DependencyPropertyKey ActiveLayoutPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ActiveLayout", typeof( AnimationPanel ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.AffectsMeasure,
-          new PropertyChangedCallback( SwitchPanel.OnActiveLayoutChanged ) ) );
-
-    public static readonly DependencyProperty ActiveLayoutProperty = SwitchPanel.ActiveLayoutPropertyKey.DependencyProperty;
-
-    public AnimationPanel ActiveLayout
-    {
-      get
-      {
-        return ( AnimationPanel )this.GetValue( SwitchPanel.ActiveLayoutProperty );
-      }
-    }
-
-    protected void SetActiveLayout( AnimationPanel value )
-    {
-      this.SetValue( SwitchPanel.ActiveLayoutPropertyKey, value );
-    }
-
-    private static void OnActiveLayoutChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnActiveLayoutChanged( e );
-    }
-
-    protected virtual void OnActiveLayoutChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( _currentLayoutPanel != null )
-      {
-        _currentLayoutPanel.DeactivateLayout();
-      }
-      _currentLayoutPanel = e.NewValue as AnimationPanel;
-      if( _currentLayoutPanel != null )
-      {
-        IScrollInfo info = _currentLayoutPanel as IScrollInfo;
-        if( info != null && info.ScrollOwner != null )
-        {
-          info.ScrollOwner.InvalidateScrollInfo();
-        }
-
-        _currentLayoutPanel.ActivateLayout();
-      }
-
-      this.RaiseActiveLayoutChangedEvent();
-      this.Dispatcher.BeginInvoke(
-        DispatcherPriority.Normal,
-        ( ThreadStart )delegate()
-        {
-          this.UpdateSwitchTemplate();
-        } );
-    }
-
-    #endregion
-
-    #region ActiveLayoutIndex Property
-
-    public static readonly DependencyProperty ActiveLayoutIndexProperty =
-      DependencyProperty.Register( "ActiveLayoutIndex", typeof( int ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( -1,
-          new PropertyChangedCallback( SwitchPanel.OnActiveLayoutIndexChanged ), new CoerceValueCallback( SwitchPanel.CoerceActiveLayoutIndexValue ) ) );
-
-    public int ActiveLayoutIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( SwitchPanel.ActiveLayoutIndexProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.ActiveLayoutIndexProperty, value );
-      }
-    }
-
-    private static void OnActiveLayoutIndexChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnActiveLayoutIndexChanged( e );
-    }
-
-    protected virtual void OnActiveLayoutIndexChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.SetActiveLayout( ( this.Layouts.Count == 0 ) ? null : this.Layouts[ ActiveLayoutIndex ] );
-    }
-
-    private static object CoerceActiveLayoutIndexValue( DependencyObject d, object value )
-    {
-      int panelCount = ( d as SwitchPanel ).Layouts.Count;
-      int result = ( int )value;
-
-      if( result < 0 && panelCount > 0 )
-      {
-        result = 0;
-      }
-      else if( result >= panelCount )
-      {
-        result = panelCount - 1;
-      }
-
-      return result;
-    }
-
-    #endregion
-
-    #region ActiveSwitchTemplate Property
-
-    private static readonly DependencyPropertyKey ActiveSwitchTemplatePropertyKey =
-      DependencyProperty.RegisterReadOnly( "ActiveSwitchTemplate", typeof( DataTemplate ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( null, new PropertyChangedCallback( SwitchPanel.OnActiveSwitchTemplateChanged ) ) );
-
-    public static readonly DependencyProperty ActiveSwitchTemplateProperty = SwitchPanel.ActiveSwitchTemplatePropertyKey.DependencyProperty;
-
-    public DataTemplate ActiveSwitchTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( SwitchPanel.ActiveSwitchTemplateProperty );
-      }
-    }
-
-    protected void SetActiveSwitchTemplate( DataTemplate value )
-    {
-      this.SetValue( SwitchPanel.ActiveSwitchTemplatePropertyKey, value );
-    }
-
-    private static void OnActiveSwitchTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnActiveSwitchTemplateChanged( e );
-    }
-
-    protected virtual void OnActiveSwitchTemplateChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( _presenters.Count > 0 )
-      {
-        DataTemplate template = e.NewValue as DataTemplate;
-        List<UIElement> currentChildren = new List<UIElement>( this.InternalChildren.Count );
-        foreach( UIElement child in this.InternalChildren )
-        {
-          if( child == null )
-            continue;
-
-          currentChildren.Add( child );
-        }
-
-        foreach( SwitchPresenter presenter in _presenters )
-        {
-          if( presenter._switchRoot != null && currentChildren.Contains( presenter._switchRoot ) )
-          {
-            presenter.SwapTheTemplate( template, this.AreLayoutSwitchesAnimated );
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region DefaultAnimationRate Property
-
-    public static readonly DependencyProperty DefaultAnimationRateProperty =
-      AnimationPanel.DefaultAnimationRateProperty.AddOwner( typeof( SwitchPanel ) );
-
-    public AnimationRate DefaultAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.DefaultAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.DefaultAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DefaultAnimator Property
-
-    public static readonly DependencyProperty DefaultAnimatorProperty =
-      AnimationPanel.DefaultAnimatorProperty.AddOwner( typeof( SwitchPanel ) );
-
-    public IterativeAnimator DefaultAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.DefaultAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.DefaultAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EnterAnimationRate Property
-
-    public static readonly DependencyProperty EnterAnimationRateProperty =
-      AnimationPanel.EnterAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate EnterAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.EnterAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.EnterAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EnterAnimator Property
-
-    public static readonly DependencyProperty EnterAnimatorProperty =
-      AnimationPanel.EnterAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator EnterAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.EnterAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.EnterAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ExitAnimationRate Property
-
-    public static readonly DependencyProperty ExitAnimationRateProperty =
-      AnimationPanel.ExitAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate ExitAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.ExitAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.ExitAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ExitAnimator Property
-
-    public static readonly DependencyProperty ExitAnimatorProperty =
-      AnimationPanel.ExitAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator ExitAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.ExitAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.ExitAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region LayoutAnimationRate Property
-
-    public static readonly DependencyProperty LayoutAnimationRateProperty =
-      AnimationPanel.LayoutAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate LayoutAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.LayoutAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.LayoutAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region LayoutAnimator Property
-
-    public static readonly DependencyProperty LayoutAnimatorProperty =
-      AnimationPanel.LayoutAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator LayoutAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.LayoutAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.LayoutAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Layouts Property
-
-    private static readonly DependencyPropertyKey LayoutsPropertyKey =
-      DependencyProperty.RegisterReadOnly( "Layouts", typeof( ObservableCollection<AnimationPanel> ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.AffectsArrange,
-          new PropertyChangedCallback( SwitchPanel.OnLayoutsChanged ) ) );
-
-    public static readonly DependencyProperty LayoutsProperty = SwitchPanel.LayoutsPropertyKey.DependencyProperty;
-
-    public ObservableCollection<AnimationPanel> Layouts
-    {
-      get
-      {
-        return ( ObservableCollection<AnimationPanel> )this.GetValue( SwitchPanel.LayoutsProperty );
-      }
-    }
-
-    protected void SetLayouts( ObservableCollection<AnimationPanel> value )
-    {
-      this.SetValue( SwitchPanel.LayoutsPropertyKey, value );
-    }
-
-    private static void OnLayoutsChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnLayoutsChanged( e );
-    }
-
-    protected virtual void OnLayoutsChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( e.NewValue != null )
-      {
-        ( e.NewValue as ObservableCollection<AnimationPanel> ).CollectionChanged
-          += new NotifyCollectionChangedEventHandler( LayoutsCollectionChanged );
-      }
-      if( e.OldValue != null )
-      {
-        ( e.OldValue as ObservableCollection<AnimationPanel> ).CollectionChanged
-          -= new NotifyCollectionChangedEventHandler( LayoutsCollectionChanged );
-      }
-    }
-
-    #endregion
-
-    #region SwitchAnimationRate Property
-
-    public static readonly DependencyProperty SwitchAnimationRateProperty =
-      AnimationPanel.SwitchAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate SwitchAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.SwitchAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.SwitchAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchAnimator Property
-
-    public static readonly DependencyProperty SwitchAnimatorProperty =
-      AnimationPanel.SwitchAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator SwitchAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.SwitchAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.SwitchAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchTemplate Property
-
-    public static readonly DependencyProperty SwitchTemplateProperty =
-      DependencyProperty.Register( "SwitchTemplate", typeof( DataTemplate ), typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( null,
-          new PropertyChangedCallback( SwitchPanel.OnSwitchTemplateChanged ) ) );
-
-    public DataTemplate SwitchTemplate
-    {
-      get
-      {
-        return ( DataTemplate )this.GetValue( SwitchPanel.SwitchTemplateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.SwitchTemplateProperty, value );
-      }
-    }
-
-    private static void OnSwitchTemplateChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPanel )d ).OnSwitchTemplateChanged( e );
-    }
-
-    protected virtual void OnSwitchTemplateChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.UpdateSwitchTemplate();
-    }
-
-    #endregion
-
-    #region TemplateAnimationRate Property
-
-    public static readonly DependencyProperty TemplateAnimationRateProperty =
-      AnimationPanel.TemplateAnimationRateProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( AnimationRate.Default ) );
-
-    public AnimationRate TemplateAnimationRate
-    {
-      get
-      {
-        return ( AnimationRate )this.GetValue( SwitchPanel.TemplateAnimationRateProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.TemplateAnimationRateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region TemplateAnimator Property
-
-    public static readonly DependencyProperty TemplateAnimatorProperty =
-      AnimationPanel.TemplateAnimatorProperty.AddOwner( typeof( SwitchPanel ),
-        new FrameworkPropertyMetadata( IterativeAnimator.Default ) );
-
-    public IterativeAnimator TemplateAnimator
-    {
-      get
-      {
-        return ( IterativeAnimator )this.GetValue( SwitchPanel.TemplateAnimatorProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPanel.TemplateAnimatorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region VisualChildrenCount Protected Property
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        int result = 0;
-
-        if( this.HasLoaded && _currentLayoutPanel != null )
-        {
-          result = _currentLayoutPanel.VisualChildrenCountInternal;
-        }
-        else
-        {
-          result = base.VisualChildrenCount;
-        }
-
-        return result;
-      }
-    }
-
-    #endregion
-
-    #region ExitingChildren Internal Property
-
-    internal List<UIElement> ExitingChildren
-    {
-      get
-      {
-        return _exitingChildren;
-      }
-    }
-
-    private readonly List<UIElement> _exitingChildren = new List<UIElement>();
-
-    #endregion
-
-    #region ChildrenInternal Internal Property
-
-    internal UIElementCollection ChildrenInternal
-    {
-      get
-      {
-        return this.InternalChildren;
-      }
-    }
-
-    #endregion
-
-    #region HasLoaded Internal Property
-
-    internal bool HasLoaded
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasLoaded ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasLoaded ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsScrollingPhysically Private Property
-
-    private bool IsScrollingPhysically
-    {
-      get
-      {
-        bool isScrollingPhys = false;
-
-        if( _scrollOwner != null )
-        {
-          isScrollingPhys = true;
-
-          if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          {
-            isScrollingPhys = ( ( IScrollInfo )this.ActiveLayout ).ScrollOwner == null;
-          }
-        }
-
-        return isScrollingPhys;
-      }
-    }
-
-    #endregion
-
-    #region ActiveLayoutChanged Event
-
-    public static readonly RoutedEvent ActiveLayoutChangedEvent =
-      EventManager.RegisterRoutedEvent( "ActiveLayoutChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( SwitchPanel ) );
-
-    public event RoutedEventHandler ActiveLayoutChanged
-    {
-      add
-      {
-        this.AddHandler( SwitchPanel.ActiveLayoutChangedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( SwitchPanel.ActiveLayoutChangedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseActiveLayoutChangedEvent()
-    {
-      return SwitchPanel.RaiseActiveLayoutChangedEvent( this );
-    }
-
-    internal static RoutedEventArgs RaiseActiveLayoutChangedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = SwitchPanel.ActiveLayoutChangedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region SwitchAnimationBegun Event
-
-    public static readonly RoutedEvent SwitchAnimationBegunEvent =
-      EventManager.RegisterRoutedEvent( "SwitchAnimationBegun", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( SwitchPanel ) );
-
-    public event RoutedEventHandler SwitchAnimationBegun
-    {
-      add
-      {
-        this.AddHandler( SwitchPanel.SwitchAnimationBegunEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( SwitchPanel.SwitchAnimationBegunEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseSwitchAnimationBegunEvent()
-    {
-      return SwitchPanel.RaiseSwitchAnimationBegunEvent( this );
-    }
-
-    private static RoutedEventArgs RaiseSwitchAnimationBegunEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = SwitchPanel.SwitchAnimationBegunEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    #region SwitchAnimationCompleted Event
-
-    public static readonly RoutedEvent SwitchAnimationCompletedEvent =
-      EventManager.RegisterRoutedEvent( "SwitchAnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( SwitchPanel ) );
-
-    public event RoutedEventHandler SwitchAnimationCompleted
-    {
-      add
-      {
-        this.AddHandler( SwitchPanel.SwitchAnimationCompletedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( SwitchPanel.SwitchAnimationCompletedEvent, value );
-      }
-    }
-
-    protected RoutedEventArgs RaiseSwitchAnimationCompletedEvent()
-    {
-      return SwitchPanel.RaiseSwitchAnimationCompletedEvent( this );
-    }
-
-    private static RoutedEventArgs RaiseSwitchAnimationCompletedEvent( UIElement target )
-    {
-      if( target == null )
-        return null;
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = SwitchPanel.SwitchAnimationCompletedEvent;
-      RoutedEventHelper.RaiseEvent( target, args );
-      return args;
-    }
-
-    #endregion
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      AnimationPanel layout = ( Layouts.Count == 0 ) ? _defaultLayoutCanvas : this.ActiveLayout;
-      Size measureSize = layout.MeasureChildrenCore( this.InternalChildren, availableSize );
-
-      if( this.IsScrollingPhysically )
-      {
-        Size viewport = availableSize;
-        Size extent = measureSize;
-
-        //
-        // Make sure our offset works with the new size of the panel.  We don't want to show
-        // any whitespace if the user scrolled all the way down and then increased the size of the panel.
-        //
-        Vector newOffset = new Vector(
-          Math.Max( 0, Math.Min( _offset.X, extent.Width - viewport.Width ) ),
-          Math.Max( 0, Math.Min( _offset.Y, extent.Height - viewport.Height ) ) );
-
-        this.SetScrollingData( viewport, extent, newOffset );
-      }
-
-      return measureSize;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      AnimationPanel layout = ( Layouts.Count == 0 ) ? _defaultLayoutCanvas : this.ActiveLayout;
-
-      if( this.IsScrollingPhysically )
-      {
-        layout.PhysicalScrollOffset = _offset;
-      }
-      else
-      {
-        layout.PhysicalScrollOffset = ZeroVector;
-      }
-
-      return layout.ArrangeChildrenCore( InternalChildren, finalSize );
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( this.HasLoaded && _currentLayoutPanel != null )
-        return _currentLayoutPanel.GetVisualChildInternal( index );
-
-      return base.GetVisualChild( index );
-    }
-
-    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      // The OnNotifyVisualChildAdded/Removed methods get called for all animation panels within a 
-      // SwitchPanel.Layouts collection, regardless of whether they are the active layout for the SwitchPanel.
-      if( visualAdded is UIElement )
-      {
-        // do not issue notification for a child that is exiting
-        if( _currentLayoutPanel == null || !_currentLayoutPanel.IsRemovingInternalChild )
-        {
-          foreach( AnimationPanel panel in Layouts )
-          {
-            panel.OnNotifyVisualChildAddedInternal( visualAdded as UIElement );
-          }
-        }
-      }
-      else if( visualRemoved is UIElement )
-      {
-        foreach( AnimationPanel panel in Layouts )
-        {
-          panel.OnNotifyVisualChildRemovedInternal( visualRemoved as UIElement );
-        }
-      }
-
-      if( _currentLayoutPanel != null )
-      {
-        _currentLayoutPanel.OnSwitchParentVisualChildrenChanged( visualAdded, visualRemoved );
-      }
-      else
-      {
-        base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-      }
-    }
-
-    internal void AddVisualChildInternal( Visual child )
-    {
-      this.AddVisualChild( child );
-    }
-
-    internal void BeginLayoutSwitch()
-    {
-      this.RaiseSwitchAnimationBegunEvent();
-    }
-
-    internal void EndLayoutSwitch()
-    {
-      this.RaiseSwitchAnimationCompletedEvent();
-    }
-
-    internal Visual GetVisualChildInternal( int index )
-    {
-      // called from AnimationPanel to access base class method
-      return base.GetVisualChild( index );
-    }
-
-    internal void OnVisualChildrenChangedInternal( DependencyObject visualAdded, DependencyObject visualRemoved )
-    {
-      base.OnVisualChildrenChanged( visualAdded, visualRemoved );
-    }
-
-    internal UIElement RegisterPresenter( SwitchPresenter presenter )
-    {
-      UIElement result = null;
-      AnimationPanel ignore;
-      result = AnimationPanel.FindAncestorChildOfAnimationPanel( presenter, out ignore );
-      if( result != null )
-      {
-        _presenters.Add( presenter );
-        presenter.SwapTheTemplate( ActiveSwitchTemplate, false );
-      }
-      return result;
-    }
-
-    internal void RemoveVisualChildInternal( Visual child )
-    {
-      this.RemoveVisualChild( child );
-    }
-
-    internal void UnregisterPresenter( SwitchPresenter presenter, DependencyObject container )
-    {
-      if( container != null )
-      {
-        _presenters.Remove( presenter );
-        presenter.SwapTheTemplate( null, false );
-      }
-    }
-
-    internal void UpdateSwitchTemplate()
-    {
-      this.SetActiveSwitchTemplate( ( this.ActiveLayout == null ) || ( this.ActiveLayout.SwitchTemplate == null )
-          ? this.SwitchTemplate : this.ActiveLayout.SwitchTemplate );
-    }
-
-    private void OnLoaded( object sender, RoutedEventArgs e )
-    {
-      this.HasLoaded = true;
-
-      // invalidate arrange to give enter animations a chance to run
-      this.InvalidateArrange();
-    }
-
-    private void LayoutsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action != NotifyCollectionChangedAction.Move )
-      {
-        if( e.NewItems != null )
-        {
-          foreach( AnimationPanel panel in e.NewItems )
-          {
-            this.AddLogicalChild( panel );
-            panel.SetSwitchParent( this );
-
-            if( panel is IScrollInfo )
-            {
-              ( ( IScrollInfo )panel ).ScrollOwner = this.ScrollOwner;
-            }
-
-            if( this.IsLoaded )
-            {
-              foreach( UIElement child in this.InternalChildren )
-              {
-                if( child == null )
-                  continue;
-
-                panel.OnNotifyVisualChildAddedInternal( child );
-              }
-            }
-          }
-        }
-
-        if( e.OldItems != null )
-        {
-          foreach( AnimationPanel panel in e.OldItems )
-          {
-            if( IsLoaded )
-            {
-              foreach( UIElement child in this.InternalChildren )
-              {
-                if( child == null )
-                  continue;
-
-                panel.OnNotifyVisualChildRemovedInternal( child );
-              }
-            }
-
-            this.RemoveLogicalChild( panel );
-            panel.SetSwitchParent( null );
-
-            if( panel is IScrollInfo )
-            {
-              ( ( IScrollInfo )panel ).ScrollOwner = null;
-            }
-          }
-        }
-      }
-
-      // ensure valid ActiveLayoutIndex value
-      this.CoerceValue( SwitchPanel.ActiveLayoutIndexProperty );
-      this.SetActiveLayout( ( this.Layouts.Count == 0 ) ? null : this.Layouts[ ActiveLayoutIndex ] );
-    }
-
-    private void ResetScrollInfo()
-    {
-      _offset = new Vector();
-      _viewport = _extent = new Size( 0, 0 );
-    }
-
-    private void OnScrollChange()
-    {
-      if( this.ScrollOwner != null )
-      {
-        this.ScrollOwner.InvalidateScrollInfo();
-      }
-    }
-
-    private void SetScrollingData( Size viewport, Size extent, Vector offset )
-    {
-      _offset = offset;
-
-      if( DoubleHelper.AreVirtuallyEqual( viewport, _viewport ) == false || DoubleHelper.AreVirtuallyEqual( extent, _extent ) == false ||
-          DoubleHelper.AreVirtuallyEqual( offset, _computedOffset ) == false )
-      {
-        _viewport = viewport;
-        _extent = extent;
-        _computedOffset = offset;
-        this.OnScrollChange();
-      }
-    }
-
-    private double ValidateInputOffset( double offset, string parameterName )
-    {
-      if( double.IsNaN( offset ) )
-        throw new ArgumentOutOfRangeException( parameterName );
-
-      return Math.Max( 0d, offset );
-    }
-
-    private int FindChildFromVisual( Visual vis )
-    {
-      int index = -1;
-
-      DependencyObject parent = vis;
-      DependencyObject child = null;
-
-      do
-      {
-        child = parent;
-        parent = VisualTreeHelper.GetParent( child );
-      }
-      while( parent != null && parent != this );
-
-      if( parent == this )
-      {
-        index = this.Children.IndexOf( ( UIElement )child );
-      }
-
-      return index;
-    }
-
-    #region IScrollInfo Members
-
-    public bool CanHorizontallyScroll
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).CanHorizontallyScroll;
-
-        return _allowHorizontal;
-      }
-      set
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          ( ( IScrollInfo )this.ActiveLayout ).CanHorizontallyScroll = value;
-        }
-        else
-        {
-          _allowHorizontal = value;
-        }
-      }
-    }
-
-    public bool CanVerticallyScroll
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).CanVerticallyScroll;
-
-        return _allowVertical;
-      }
-      set
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          ( ( IScrollInfo )this.ActiveLayout ).CanVerticallyScroll = value;
-        }
-        else
-        {
-          _allowVertical = value;
-        }
-      }
-    }
-
-    public double ExtentHeight
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).ExtentHeight;
-
-        return _extent.Height;
-      }
-    }
-
-    public double ExtentWidth
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).ExtentWidth;
-
-        return _extent.Width;
-      }
-    }
-
-    public double HorizontalOffset
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-          return ( ( IScrollInfo )this.ActiveLayout ).HorizontalOffset;
-
-        return _offset.X;
-      }
-    }
-
-    public void LineDown()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).LineDown();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + 1d );
-      }
-    }
-
-    public void LineLeft()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).LineLeft();
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.VerticalOffset - 1d );
-      }
-    }
-
-    public void LineRight()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).LineRight();
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.VerticalOffset + 1d );
-      }
-    }
-
-    public void LineUp()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).LineUp();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + 1d );
-      }
-    }
-
-    public Rect MakeVisible( Visual visual, Rect rectangle )
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        return ( ( IScrollInfo )this.ActiveLayout ).MakeVisible( visual, rectangle );
-
-      if( ( rectangle.IsEmpty || ( visual == null ) ) || ( ( visual == this ) || !this.IsAncestorOf( visual ) ) )
-        return Rect.Empty;
-
-      rectangle = visual.TransformToAncestor( ( Visual )this ).TransformBounds( rectangle );
-
-      if( this.IsScrollingPhysically == false )
-        return rectangle;
-
-      //
-      // Make sure we can find the child...
-      //
-      int index = this.FindChildFromVisual( visual );
-
-      if( index == -1 )
-        throw new ArgumentException( "visual" );
-
-      //
-      // Since our _Offset pushes the items down we need to correct it here to 
-      // give a true rectangle of the child.
-      //
-      Rect itemRect = rectangle;
-      itemRect.Offset( _offset );
-
-      Rect viewRect = new Rect( new Point( _offset.X, _offset.Y ), _viewport );
-
-      Vector newPhysOffset;
-      if( ScrollHelper.ScrollLeastAmount( viewRect, itemRect, out newPhysOffset ) )
-      {
-        this.SetHorizontalOffset( newPhysOffset.X );
-        this.SetVerticalOffset( newPhysOffset.Y );
-      }
-
-      return rectangle;
-    }
-
-    public void MouseWheelDown()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )ActiveLayout ).MouseWheelDown();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + SystemParameters.WheelScrollLines );
-      }
-    }
-
-    public void MouseWheelLeft()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).MouseWheelLeft();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset - 3d );
-      }
-    }
-
-    public void MouseWheelRight()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).MouseWheelRight();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + 3d );
-      }
-    }
-
-    public void MouseWheelUp()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).MouseWheelUp();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset - SystemParameters.WheelScrollLines );
-      }
-    }
-
-    public void PageDown()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).PageDown();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset + this.ViewportHeight );
-      }
-    }
-
-    public void PageLeft()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).PageLeft();
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.HorizontalOffset - this.ViewportWidth );
-      }
-    }
-
-    public void PageRight()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).PageRight();
-      }
-      else
-      {
-        this.SetHorizontalOffset( this.HorizontalOffset + this.ViewportWidth );
-      }
-    }
-
-    public void PageUp()
-    {
-      if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-      {
-        ( ( IScrollInfo )this.ActiveLayout ).PageUp();
-      }
-      else
-      {
-        this.SetVerticalOffset( this.VerticalOffset - this.ViewportHeight );
-      }
-    }
-
-    public ScrollViewer ScrollOwner
-    {
-      get
-      {
-        return _scrollOwner;
-      }
-      set
-      {
-        foreach( AnimationPanel layout in this.Layouts )
-        {
-          if( layout != null && layout is IScrollInfo )
-          {
-            ( ( IScrollInfo )layout ).ScrollOwner = value;
-          }
-        }
-
-        if( _scrollOwner != value )
-        {
-          _scrollOwner = value;
-
-          this.ResetScrollInfo();
-        }
-      }
-    }
-
-    public void SetHorizontalOffset( double offset )
-    {
-      offset = this.ValidateInputOffset( offset, "HorizontalOffset" );
-
-      offset = Math.Min( offset, this.ExtentWidth - this.ViewportWidth );
-
-      if( !DoubleHelper.AreVirtuallyEqual( offset, _offset.X ) )
-      {
-        _offset.X = offset;
-        base.InvalidateMeasure();
-      }
-    }
-
-    public void SetVerticalOffset( double offset )
-    {
-      offset = this.ValidateInputOffset( offset, "VerticalOffset" );
-
-      offset = Math.Min( offset, this.ExtentHeight - this.ViewportHeight );
-
-      if( !DoubleHelper.AreVirtuallyEqual( offset, _offset.Y ) )
-      {
-        _offset.Y = offset;
-        base.InvalidateMeasure();
-      }
-    }
-
-    public double VerticalOffset
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          return ( ( IScrollInfo )this.ActiveLayout ).VerticalOffset;
-        }
-
-        return _offset.Y;
-      }
-    }
-
-    public double ViewportHeight
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          return ( ( IScrollInfo )this.ActiveLayout ).ViewportHeight;
-        }
-
-        return _viewport.Height;
-      }
-    }
-
-    public double ViewportWidth
-    {
-      get
-      {
-        if( this.ActiveLayout != null && this.ActiveLayout is IScrollInfo )
-        {
-          return ( ( IScrollInfo )this.ActiveLayout ).ViewportWidth;
-        }
-
-        return _viewport.Width;
-      }
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    internal AnimationPanel _currentLayoutPanel = null;
-
-    private readonly AnimationPanel _defaultLayoutCanvas = new Xceed.Wpf.Toolkit.Panels.WrapPanel();
-    private readonly Collection<SwitchPresenter> _presenters = new Collection<SwitchPresenter>();
-
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    private bool _allowHorizontal = false;
-    private bool _allowVertical = false;
-    private Vector _computedOffset = new Vector( 0.0, 0.0 );
-    private Size _extent = new Size( 0, 0 );
-    private Vector _offset = new Vector( 0, 0 );
-    private ScrollViewer _scrollOwner = null;
-    private Size _viewport;
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      HasLoaded = 0x00000001,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
deleted file mode 100644
index b4585aa7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class SwitchPresenter : FrameworkElement
-  {
-    #region Constructors
-
-    public SwitchPresenter()
-      : base()
-    {
-      this.AddVisualChild( _contentPresenter );
-
-      this.Loaded += new RoutedEventHandler( this.SwitchPresenter_Loaded );
-      this.Unloaded += new RoutedEventHandler( this.SwitchPresenter_Unloaded );
-    }
-
-    #endregion
-
-    #region DelaySwitch Property
-
-    // Using a DependencyProperty as the backing store for DelaySwitch.  This enables animation, styling, binding, etc...
-    public static readonly DependencyProperty DelaySwitchProperty =
-      DependencyProperty.Register( "DelaySwitch", typeof( bool ), typeof( SwitchPresenter ), 
-        new UIPropertyMetadata( false ) );
-
-    public bool DelaySwitch
-    {
-      get
-      {
-        return ( bool )this.GetValue( SwitchPresenter.DelaySwitchProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPresenter.DelaySwitchProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region DelayPriority Property
-
-    // Using a DependencyProperty as the backing store for DelayPriority.  This enables animation, styling, binding, etc...
-    public static readonly DependencyProperty DelayPriorityProperty =
-      DependencyProperty.Register( "DelayPriority", typeof( DispatcherPriority ), typeof( SwitchPresenter ),
-        new UIPropertyMetadata( DispatcherPriority.Background ) );
-
-    public DispatcherPriority DelayPriority
-    {
-      get
-      {
-        return ( DispatcherPriority )this.GetValue( SwitchPresenter.DelayPriorityProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPresenter.DelayPriorityProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region SwitchParent Internal Property
-
-    internal static readonly DependencyProperty SwitchParentProperty =
-      DependencyProperty.Register( "SwitchParent", typeof( SwitchPanel ), typeof( SwitchPresenter ),
-        new FrameworkPropertyMetadata( null, 
-          new PropertyChangedCallback( SwitchPresenter.OnSwitchParentChanged ) ) );
-
-    internal SwitchPanel SwitchParent
-    {
-      get
-      {
-        return ( SwitchPanel )this.GetValue( SwitchPresenter.SwitchParentProperty );
-      }
-      set
-      {
-        this.SetValue( SwitchPresenter.SwitchParentProperty, value );
-      }
-    }
-
-    private static void OnSwitchParentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( SwitchPresenter )d ).OnSwitchParentChanged( e );
-    }
-
-    protected virtual void OnSwitchParentChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( e.OldValue != null )
-      {
-        ( e.OldValue as SwitchPanel ).UnregisterPresenter( this, _switchRoot );
-        _switchRoot = null;
-        BindingOperations.ClearAllBindings( _contentPresenter );
-      }
-
-      if( e.NewValue != null )
-      {
-        _contentPresenter.SetBinding( ContentPresenter.ContentProperty, new Binding() );
-        _switchRoot = ( e.NewValue as SwitchPanel ).RegisterPresenter( this );
-      }
-    }
-
-    private static void OnLoaded( object sender, RoutedEventArgs e )
-    {
-      SwitchPresenter sp = sender as SwitchPresenter;
-      if( sp._switchRoot == null )
-      {
-        sp.SwitchParent = VisualTreeHelperEx.FindAncestorByType( sp, typeof( SwitchPanel ), false ) as SwitchPanel;
-      }
-    }
-
-    private static void OnUnloaded( object sender, RoutedEventArgs e )
-    {
-      ( sender as SwitchPresenter ).SwitchParent = null;
-    }
-
-    #endregion
-
-    #region VisualChildrenCount Protected Property
-
-    protected override int VisualChildrenCount
-    {
-      get
-      {
-        return 1;
-      }
-    }
-
-    #endregion
-
-    internal void RegisterID( string id, FrameworkElement element )
-    {
-      if( element == null )
-        return;
-
-      _knownIDs[ id ] = element;
-    }
-
-    internal void SwapTheTemplate( DataTemplate template, bool beginAnimation )
-    {
-      if( this.DelaySwitch )
-      {
-        _currentTemplate = template;
-
-        this.Dispatcher.BeginInvoke( new Action<DelaySwitchParams>( this.OnSwapTemplate ),
-          this.DelayPriority,
-          new DelaySwitchParams()
-          {
-            Template = template,
-            BeginAnimation = beginAnimation
-          } );
-      }
-      else
-      {
-        this.DoSwapTemplate( template, beginAnimation );
-      }
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      // if first pass, resolve SwitchParent
-      if( !_isMeasured && _switchRoot == null )
-      {
-        SwitchPresenter.OnLoaded( this, null );
-        _isMeasured = true;
-      }
-
-      _contentPresenter.Measure( constraint );
-      return _contentPresenter.DesiredSize;
-    }
-
-    protected override Size ArrangeOverride( Size arrangeBounds )
-    {
-      _contentPresenter.Arrange( new Rect( arrangeBounds ) );
-      return arrangeBounds;
-    }
-
-    protected override Visual GetVisualChild( int index )
-    {
-      if( index != 0 )
-        throw new ArgumentOutOfRangeException( "index", index, "" );
-
-      return _contentPresenter;
-    }
-
-    private void OnSwapTemplate( DelaySwitchParams data )
-    {
-      // If we are switching the templates fast the invokes will lag. So ignore old invokes.
-      if( data.Template == _currentTemplate )
-      {
-        this.DoSwapTemplate( data.Template, data.BeginAnimation );
-        _currentTemplate = null;
-      }
-    }
-
-    private void DoSwapTemplate( DataTemplate template, bool beginAnimation )
-    {
-      // cache transforms for known ID'd elements in the current template
-      Dictionary<string, Rect> knownLocations = null;
-      if( beginAnimation && _knownIDs.Count > 0 )
-      {
-        knownLocations = new Dictionary<string, Rect>();
-        foreach( KeyValuePair<string, FrameworkElement> entry in _knownIDs )
-        {
-          Size size = entry.Value.RenderSize;
-          Matrix m = ( entry.Value.TransformToAncestor( SwitchParent ) as MatrixTransform ).Matrix;
-          Point[] points = { new Point(), new Point( size.Width, size.Height ) };
-          m.Transform( points );
-          knownLocations[ entry.Key ] = new Rect( points[ 0 ], points[ 1 ] );
-        }
-      }
-
-      // clear the known IDs because the new template will have all new IDs
-      _knownIDs.Clear();
-
-      // set and apply the new template
-      _contentPresenter.ContentTemplate = template;
-      if( template != null )
-      {
-        _contentPresenter.ApplyTemplate();
-      }
-
-      // determine locations of ID'd elements in new template
-      // and begin animation to new location
-      if( knownLocations != null && _knownIDs.Count > 0 )
-      {
-        Dictionary<string, Rect> newLocations = null;
-        RoutedEventHandler onLoaded = null;
-        onLoaded = delegate( object sender, RoutedEventArgs e )
-        {
-          FrameworkElement element = sender as FrameworkElement;
-          element.Loaded -= onLoaded;
-          string id = SwitchTemplate.GetID( element );
-          if( knownLocations.ContainsKey( id ) )
-          {
-            // ensure that the new locations have been resolved
-            if( newLocations == null )
-            {
-              newLocations = this.SwitchParent.ActiveLayout.GetNewLocationsBasedOnTargetPlacement( this, _switchRoot );
-            }
-
-            UIElement parent = VisualTreeHelper.GetParent( element ) as UIElement;
-            if( parent != null )
-            {
-              Rect previousLocation = knownLocations[ id ];
-              Point[] points = { previousLocation.TopLeft, previousLocation.BottomRight };
-              Matrix m = ( SwitchParent.TransformToDescendant( parent ) as MatrixTransform ).Matrix;
-              m.Transform( points );
-              Rect oldLocation = new Rect( points[ 0 ], points[ 1 ] );
-              Rect newLocation = newLocations[ id ];
-              this.SwitchParent.ActiveLayout.BeginGrandchildAnimation( element, oldLocation, newLocation );
-            }
-          }
-        };
-
-        foreach( KeyValuePair<string, FrameworkElement> entry in _knownIDs )
-        {
-          entry.Value.Loaded += onLoaded;
-        }
-      }
-    }
-
-    private void SwitchPresenter_Unloaded( object sender, RoutedEventArgs e )
-    {
-      this.SwitchParent = null;
-    }
-
-    private void SwitchPresenter_Loaded( object sender, RoutedEventArgs e )
-    {
-      if( _switchRoot == null )
-      {
-        this.SwitchParent = VisualTreeHelperEx.FindAncestorByType( this, typeof( SwitchPanel ), false ) as SwitchPanel;
-      }
-    }
-
-    #region Private Fields
-
-    // track our topmost ancestor that is the direct child of the SwitchPanel
-    internal UIElement _switchRoot = null;
-    internal Dictionary<string, FrameworkElement> _knownIDs = new Dictionary<string, FrameworkElement>();
-
-    private ContentPresenter _contentPresenter = new ContentPresenter();
-    private bool _isMeasured = false;
-
-    private DataTemplate _currentTemplate;
-
-    #endregion
-
-    #region DelaySwitchParams Nested Type
-
-    private struct DelaySwitchParams
-    {
-      public DataTemplate Template;
-      public bool BeginAnimation;
-    }
-
-    #endregion
-  }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
deleted file mode 100644
index 01c66fe2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Threading;
-using System.Windows;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public static class SwitchTemplate
-  {
-    #region ID Attached Property
-
-    public static readonly DependencyProperty IDProperty =
-      DependencyProperty.RegisterAttached( "ID", typeof( string ), typeof( SwitchTemplate ),
-        new FrameworkPropertyMetadata( null, 
-          new PropertyChangedCallback( SwitchTemplate.OnIDChanged ) ) );
-
-    public static string GetID( DependencyObject d )
-    {
-      return ( string )d.GetValue( SwitchTemplate.IDProperty );
-    }
-
-    public static void SetID( DependencyObject d, string value )
-    {
-      d.SetValue( SwitchTemplate.IDProperty, value );
-    }
-
-    private static void OnIDChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      if( ( e.NewValue == null ) || !( d is UIElement ) )
-        return;
-
-      SwitchPresenter parentPresenter = VisualTreeHelperEx.FindAncestorByType<SwitchPresenter>( d );
-      if( parentPresenter != null )
-      {
-        parentPresenter.RegisterID( e.NewValue as string, d as FrameworkElement );
-      }
-      else
-      {
-        d.Dispatcher.BeginInvoke( DispatcherPriority.Loaded,
-            ( ThreadStart )delegate()
-        {
-          parentPresenter = VisualTreeHelperEx.FindAncestorByType<SwitchPresenter>( d );
-          if( parentPresenter != null )
-          {
-            parentPresenter.RegisterID( e.NewValue as string, d as FrameworkElement );
-          }
-        } );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
deleted file mode 100644
index d99909ab..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Panels
-{
-  public class WrapPanel : AnimationPanel
-  {
-    #region Orientation Property
-
-    public static readonly DependencyProperty OrientationProperty =
-      StackPanel.OrientationProperty.AddOwner( typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( Orientation.Horizontal, 
-          new PropertyChangedCallback( WrapPanel.OnOrientationChanged ) ) );
-
-    public Orientation Orientation
-    {
-      get
-      {
-        return _orientation;
-      }
-      set
-      {
-        base.SetValue( WrapPanel.OrientationProperty, value );
-      }
-    }
-
-    private static void OnOrientationChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      WrapPanel panel = ( WrapPanel )d;
-      panel._orientation = ( Orientation )e.NewValue;
-      panel.InvalidateMeasure();
-    }
-
-    private Orientation _orientation;
-
-    #endregion
-
-    #region ItemWidth Property
-
-    public static readonly DependencyProperty ItemWidthProperty =
-      DependencyProperty.Register( "ItemWidth", typeof( double ), typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( double.NaN,
-          new PropertyChangedCallback( WrapPanel.OnInvalidateMeasure ) ), new ValidateValueCallback( WrapPanel.IsWidthHeightValid ) );
-
-    [TypeConverter( typeof( LengthConverter ) )]
-    public double ItemWidth
-    {
-      get
-      {
-        return ( double )base.GetValue( WrapPanel.ItemWidthProperty );
-      }
-      set
-      {
-        base.SetValue( WrapPanel.ItemWidthProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ItemHeight Property
-
-    public static readonly DependencyProperty ItemHeightProperty =
-      DependencyProperty.Register( "ItemHeight", typeof( double ), typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( double.NaN,
-          new PropertyChangedCallback( WrapPanel.OnInvalidateMeasure ) ), new ValidateValueCallback( WrapPanel.IsWidthHeightValid ) );
-
-    [TypeConverter( typeof( LengthConverter ) )]
-    public double ItemHeight
-    {
-      get
-      {
-        return ( double )base.GetValue( WrapPanel.ItemHeightProperty );
-      }
-      set
-      {
-        base.SetValue( WrapPanel.ItemHeightProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region IsChildOrderReversed Property
-
-    public static readonly DependencyProperty IsStackReversedProperty =
-      DependencyProperty.Register( "IsChildOrderReversed", typeof( bool ), typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( false, 
-          new PropertyChangedCallback( WrapPanel.OnInvalidateMeasure ) ) );
-
-    public bool IsChildOrderReversed
-    {
-      get
-      {
-        return ( bool )this.GetValue( WrapPanel.IsStackReversedProperty );
-      }
-      set
-      {
-        this.SetValue( WrapPanel.IsStackReversedProperty, value );
-      }
-    }
-
-    #endregion
-
-    protected override Size MeasureChildrenOverride( UIElementCollection children, Size constraint )
-    {
-      double desiredExtent = 0;
-      double desiredStack = 0;
-
-      bool isHorizontal = ( this.Orientation == Orientation.Horizontal );
-      double constraintExtent = ( isHorizontal ? constraint.Width : constraint.Height );
-
-      double itemWidth = ItemWidth;
-      double itemHeight = ItemHeight;
-      double itemExtent = ( isHorizontal ? itemWidth : itemHeight );
-
-      bool hasExplicitItemWidth = !double.IsNaN( itemWidth );
-      bool hasExplicitItemHeight = !double.IsNaN( itemHeight );
-      bool useItemExtent = ( isHorizontal ? hasExplicitItemWidth : hasExplicitItemHeight );
-
-      double lineExtent = 0;
-      double lineStack = 0;
-
-      Size childConstraint = new Size( ( hasExplicitItemWidth ? itemWidth : constraint.Width ),
-          ( hasExplicitItemHeight ? itemHeight : constraint.Height ) );
-
-      bool isReversed = this.IsChildOrderReversed;
-      int from = isReversed ? children.Count - 1 : 0;
-      int to = isReversed ? 0 : children.Count - 1;
-      int step = isReversed ? -1 : 1;
-
-      for( int i = from, pass = 0; pass < children.Count; i += step, pass++ )
-      {
-        UIElement child = children[ i ] as UIElement;
-
-        child.Measure( childConstraint );
-
-        double childExtent = isHorizontal
-            ? ( hasExplicitItemWidth ? itemWidth : child.DesiredSize.Width )
-            : ( hasExplicitItemHeight ? itemHeight : child.DesiredSize.Height );
-        double childStack = isHorizontal
-            ? ( hasExplicitItemHeight ? itemHeight : child.DesiredSize.Height )
-            : ( hasExplicitItemWidth ? itemWidth : child.DesiredSize.Width );
-
-        if( lineExtent + childExtent > constraintExtent )
-        {
-          desiredExtent = Math.Max( lineExtent, desiredExtent );
-          desiredStack += lineStack;
-          lineExtent = childExtent;
-          lineStack = childStack;
-
-          if( childExtent > constraintExtent )
-          {
-            desiredExtent = Math.Max( childExtent, desiredExtent );
-            desiredStack += childStack;
-            lineExtent = 0;
-            lineStack = 0;
-          }
-        }
-        else
-        {
-          lineExtent += childExtent;
-          lineStack = Math.Max( childStack, lineStack );
-        }
-      }
-
-      desiredExtent = Math.Max( lineExtent, desiredExtent );
-      desiredStack += lineStack;
-
-      return isHorizontal
-        ? new Size( desiredExtent, desiredStack )
-        : new Size( desiredStack, desiredExtent );
-    }
-
-    protected override Size ArrangeChildrenOverride( UIElementCollection children, Size finalSize )
-    {
-      bool isHorizontal = ( this.Orientation == Orientation.Horizontal );
-      double finalExtent = ( isHorizontal ? finalSize.Width : finalSize.Height );
-
-      double itemWidth = this.ItemWidth;
-      double itemHeight = this.ItemHeight;
-      double itemExtent = ( isHorizontal ? itemWidth : itemHeight );
-
-      bool hasExplicitItemWidth = !double.IsNaN( itemWidth );
-      bool hasExplicitItemHeight = !double.IsNaN( itemHeight );
-      bool useItemExtent = ( isHorizontal ? hasExplicitItemWidth : hasExplicitItemHeight );
-
-      double lineExtent = 0;
-      double lineStack = 0;
-      double lineStackSum = 0;
-
-      int from = this.IsChildOrderReversed ? children.Count - 1 : 0;
-      int to = this.IsChildOrderReversed ? 0 : children.Count - 1;
-      int step = this.IsChildOrderReversed ? -1 : 1;
-
-      Collection<UIElement> childrenInLine = new Collection<UIElement>();
-
-      for( int i = from, pass = 0; pass < children.Count; i += step, pass++ )
-      {
-        UIElement child = children[ i ] as UIElement;
-
-        double childExtent = isHorizontal
-            ? ( hasExplicitItemWidth ? itemWidth : child.DesiredSize.Width )
-            : ( hasExplicitItemHeight ? itemHeight : child.DesiredSize.Height );
-        double childStack = isHorizontal
-            ? ( hasExplicitItemHeight ? itemHeight : child.DesiredSize.Height )
-            : ( hasExplicitItemWidth ? itemWidth : child.DesiredSize.Width );
-
-        if( lineExtent + childExtent > finalExtent )
-        {
-          this.ArrangeLineOfChildren( childrenInLine, isHorizontal, lineStack, lineStackSum, itemExtent, useItemExtent );
-
-          lineStackSum += lineStack;
-          lineExtent = childExtent;
-
-          if( childExtent > finalExtent )
-          {
-            childrenInLine.Add( child );
-            this.ArrangeLineOfChildren( childrenInLine, isHorizontal, childStack, lineStackSum, itemExtent, useItemExtent );
-            lineStackSum += childStack;
-            lineExtent = 0;
-          }
-          childrenInLine.Add( child );
-        }
-        else
-        {
-          childrenInLine.Add( child );
-          lineExtent += childExtent;
-          lineStack = Math.Max( childStack, lineStack );
-        }
-      }
-
-      if( childrenInLine.Count > 0 )
-      {
-        this.ArrangeLineOfChildren( childrenInLine, isHorizontal, lineStack, lineStackSum, itemExtent, useItemExtent );
-      }
-
-      return finalSize;
-    }
-
-    private void ArrangeLineOfChildren( Collection<UIElement> children, bool isHorizontal, double lineStack, double lineStackSum, double itemExtent, bool useItemExtent )
-    {
-      double extent = 0;
-      foreach( UIElement child in children )
-      {
-        double childExtent = ( isHorizontal ? child.DesiredSize.Width : child.DesiredSize.Height );
-        double elementExtent = ( useItemExtent ? itemExtent : childExtent );
-        this.ArrangeChild( child, isHorizontal ? new Rect( extent, lineStackSum, elementExtent, lineStack )
-          : new Rect( lineStackSum, extent, lineStack, elementExtent ) );
-        extent += elementExtent;
-      }
-      children.Clear();
-    }
-
-    private static void OnInvalidateMeasure( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( AnimationPanel )d ).InvalidateMeasure();
-    }
-
-    private static bool IsWidthHeightValid( object value )
-    {
-      double num = ( double )value;
-      return ( DoubleHelper.IsNaN( num ) || ( ( num >= 0d ) && !double.IsPositiveInfinity( num ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
deleted file mode 100644
index 499ebdde..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
+++ /dev/null
@@ -1,628 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public sealed class Pie : ShapeBase
-  {
-    #region Constructors
-
-    static Pie()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( typeof( Pie ) ) );
-      // The default stretch mode of Pie is Fill
-      Pie.StretchProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( Stretch.Fill ) );
-      Pie.StrokeLineJoinProperty.OverrideMetadata( typeof( Pie ), new FrameworkPropertyMetadata( PenLineJoin.Round ) );
-    }
-
-    public Pie()
-      : base()
-    {
-    }
-
-    #endregion
-
-    #region EndAngle Property
-
-    public static readonly DependencyProperty EndAngleProperty =
-      DependencyProperty.Register( "EndAngle", typeof( double ), typeof( Pie ),
-        new FrameworkPropertyMetadata( 360d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-          new PropertyChangedCallback( Pie.OnEndAngleChanged ), new CoerceValueCallback( Pie.CoerceEndAngleValue ) ) );
-
-    public double EndAngle
-    {
-      get
-      {
-        return ( double )this.GetValue( Pie.EndAngleProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.EndAngleProperty, value );
-      }
-    }
-
-    private static void OnEndAngleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnEndAngleChanged( e );
-    }
-
-    private void OnEndAngleChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // avoid re-entrancy
-      if( this.IsUpdatingEndAngle )
-        return;
-
-      if( !( this.IsUpdatingStartAngle || this.IsUpdatingSlice || this.IsUpdatingSweepDirection ) )
-      {
-        switch( this.Mode )
-        {
-          case PieMode.Slice:
-            throw new InvalidOperationException( ErrorMessages.GetMessage( "EndAngleCannotBeSetDirectlyInSlice" ) );
-        }
-      }
-
-      // EndAngle, Slice, and SweepDirection are interrelated and must be kept in sync
-      this.IsUpdatingEndAngle = true;
-      try
-      {
-        if( this.Mode == PieMode.EndAngle )
-        {
-          this.CoerceValue( Pie.SweepDirectionProperty );
-        }
-        this.CoerceValue( Pie.SliceProperty );
-      }
-      finally
-      {
-        this.IsUpdatingEndAngle = false;
-      }
-    }
-
-    private static object CoerceEndAngleValue( DependencyObject d, object value )
-    {
-      // keep EndAngle in sync with Slice and SweepDirection
-      Pie pie = ( Pie )d;
-      if( pie.IsUpdatingSlice || pie.IsUpdatingSweepDirection
-          || ( pie.IsUpdatingStartAngle && pie.Mode == PieMode.Slice ) )
-      {
-        double newValue = pie.StartAngle + ( ( pie.SweepDirection == SweepDirection.Clockwise ) ? 1.0 : -1.0 ) * pie.Slice * 360;
-        if( !DoubleHelper.AreVirtuallyEqual( ( double )value, newValue ) )
-        {
-          value = newValue;
-        }
-      }
-      return value;
-    }
-
-    #endregion
-
-    #region Mode Property
-
-    public static readonly DependencyProperty ModeProperty =
-      DependencyProperty.Register( "Mode", typeof( PieMode ), typeof( Pie ),
-        new FrameworkPropertyMetadata( PieMode.Manual, new PropertyChangedCallback( Pie.OnModeChanged ) ) );
-
-    public PieMode Mode
-    {
-      get
-      {
-        return ( PieMode )this.GetValue( Pie.ModeProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.ModeProperty, value );
-      }
-    }
-
-    private static void OnModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnModeChanged( e );
-    }
-
-    private void OnModeChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // disallow reentrancy
-      if( this.IsUpdatingMode )
-        return;
-
-      this.IsUpdatingMode = true;
-      try
-      {
-        if( this.Mode == PieMode.EndAngle )
-        {
-          this.CoerceValue( Pie.SweepDirectionProperty );
-        }
-      }
-      finally
-      {
-        this.IsUpdatingMode = false;
-      }
-    }
-
-    #endregion
-
-    #region Slice Property
-
-    public static readonly DependencyProperty SliceProperty =
-      DependencyProperty.Register( "Slice", typeof( double ), typeof( Pie ),
-        new FrameworkPropertyMetadata( 1d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-          new PropertyChangedCallback( Pie.OnSliceChanged ), new CoerceValueCallback( Pie.CoerceSliceValue ) ), new ValidateValueCallback( Pie.ValidateSlice ) );
-
-    public double Slice
-    {
-      get
-      {
-        return ( double )this.GetValue( Pie.SliceProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.SliceProperty, value );
-      }
-    }
-
-    private static void OnSliceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnSliceChanged( e );
-    }
-
-    private void OnSliceChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // avoid re-entrancy
-      if( this.IsUpdatingSlice )
-        return;
-
-      if( !( this.IsUpdatingStartAngle || this.IsUpdatingEndAngle || this.IsUpdatingSweepDirection ) )
-      {
-        if( this.Mode == PieMode.EndAngle )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "SliceCannotBeSetDirectlyInEndAngle" ) );
-      }
-
-      // EndAngle and Slice are interrelated and must be kept in sync
-      this.IsUpdatingSlice = true;
-      try
-      {
-        if( !( this.IsUpdatingStartAngle || this.IsUpdatingEndAngle || ( this.Mode == PieMode.Manual && this.IsUpdatingSweepDirection ) ) )
-        {
-          this.CoerceValue( Pie.EndAngleProperty );
-        }
-      }
-      finally
-      {
-        this.IsUpdatingSlice = false;
-      }
-    }
-
-    private static object CoerceSliceValue( DependencyObject d, object value )
-    {
-      // keep Slice in sync with EndAngle, StartAngle, and SweepDirection
-      Pie pie = ( Pie )d;
-      if( pie.IsUpdatingEndAngle || pie.IsUpdatingStartAngle || pie.IsUpdatingSweepDirection )
-      {
-
-        double slice = Math.Max( -360.0, Math.Min( 360.0, ( pie.EndAngle - pie.StartAngle ) ) ) / ( ( pie.SweepDirection == SweepDirection.Clockwise ) ? 360.0 : -360.0 );
-        double newValue = DoubleHelper.AreVirtuallyEqual( slice, 0 ) ? 0 : ( slice < 0 ) ? slice + 1 : slice;
-        if( !DoubleHelper.AreVirtuallyEqual( ( double )value, newValue ) )
-        {
-          value = newValue;
-        }
-      }
-      return value;
-    }
-
-    private static bool ValidateSlice( object value )
-    {
-      double newValue = ( double )value;
-      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
-        throw new ArgumentException( ErrorMessages.GetMessage( "SliceOOR" ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region StartAngle Property
-
-    public static readonly DependencyProperty StartAngleProperty =
-      DependencyProperty.Register( "StartAngle", typeof( double ), typeof( Pie ),
-        new FrameworkPropertyMetadata( 360d, FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-          new PropertyChangedCallback( Pie.OnStartAngleChanged ) ) );
-
-    public double StartAngle
-    {
-      get
-      {
-        return ( double )this.GetValue( Pie.StartAngleProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.StartAngleProperty, value );
-      }
-    }
-
-    private static void OnStartAngleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnStartAngleChanged( e );
-    }
-
-    private void OnStartAngleChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // avoid re-entrancy
-      if( this.IsUpdatingStartAngle )
-        return;
-
-      // StartAngle, Slice, and SweepDirection are interrelated and must be kept in sync
-      this.IsUpdatingStartAngle = true;
-      try
-      {
-        switch( Mode )
-        {
-          case PieMode.Manual:
-            this.CoerceValue( Pie.SliceProperty );
-            break;
-
-          case PieMode.EndAngle:
-            this.CoerceValue( Pie.SweepDirectionProperty );
-            this.CoerceValue( Pie.SliceProperty );
-            break;
-
-          case PieMode.Slice:
-            this.CoerceValue( Pie.EndAngleProperty );
-            break;
-        }
-      }
-      finally
-      {
-        this.IsUpdatingStartAngle = false;
-      }
-    }
-
-    #endregion
-
-    #region SweepDirection Property
-
-    public static readonly DependencyProperty SweepDirectionProperty =
-      DependencyProperty.Register( "SweepDirection", typeof( SweepDirection ), typeof( Pie ),
-        new FrameworkPropertyMetadata( ( SweepDirection )SweepDirection.Clockwise, FrameworkPropertyMetadataOptions.AffectsRender,
-          new PropertyChangedCallback( Pie.OnSweepDirectionChanged ), new CoerceValueCallback( Pie.CoerceSweepDirectionValue ) ) );
-
-    public SweepDirection SweepDirection
-    {
-      get
-      {
-        return ( SweepDirection )this.GetValue( Pie.SweepDirectionProperty );
-      }
-      set
-      {
-        this.SetValue( Pie.SweepDirectionProperty, value );
-      }
-    }
-
-    private static void OnSweepDirectionChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Pie )d ).OnSweepDirectionChanged( e );
-    }
-
-    private void OnSweepDirectionChanged( DependencyPropertyChangedEventArgs e )
-    {
-      // avoid re-entrancy
-      if( this.IsUpdatingSweepDirection )
-        return;
-
-      // EndAngle, Slice, and SweepDirection are interrelated and must be kept in sync
-      this.IsUpdatingSweepDirection = true;
-      try
-      {
-        switch( Mode )
-        {
-          case PieMode.Slice:
-            this.CoerceValue( Pie.EndAngleProperty );
-            break;
-
-          default:
-            this.CoerceValue( Pie.SliceProperty );
-            break;
-        }
-      }
-      finally
-      {
-        this.IsUpdatingSweepDirection = false;
-      }
-    }
-
-    private static object CoerceSweepDirectionValue( DependencyObject d, object value )
-    {
-      // keep SweepDirection in sync with EndAngle and StartAngle
-      Pie pie = ( Pie )d;
-      if( pie.IsUpdatingEndAngle || pie.IsUpdatingStartAngle || pie.IsUpdatingMode )
-      {
-        if( DoubleHelper.AreVirtuallyEqual( pie.StartAngle, pie.EndAngle ) )
-        {
-          // if the values are equal, use previously coerced value
-          value = pie.SweepDirection;
-        }
-        else
-        {
-          value = ( pie.EndAngle < pie.StartAngle ) ? SweepDirection.Counterclockwise : SweepDirection.Clockwise;
-        }
-      }
-      return value;
-    }
-
-    #endregion
-
-    #region GeometryTransform Property
-
-    public override Transform GeometryTransform
-    {
-      get
-      {
-        return Transform.Identity;
-      }
-    }
-
-    #endregion
-
-    #region RenderedGeometry Property
-
-    public override Geometry RenderedGeometry
-    {
-      get
-      {
-        // for a Pie, the RenderedGeometry is the same as the DefiningGeometry
-        return this.DefiningGeometry;
-      }
-    }
-
-    #endregion
-
-    #region DefiningGeometry Protected Property
-
-    protected override Geometry DefiningGeometry
-    {
-      get
-      {
-        double slice = Slice;
-        if( _rect.IsEmpty || slice <= 0 )
-          return Geometry.Empty;
-
-        if( slice >= 1 )
-          return new EllipseGeometry( _rect );
-
-        // direction of flow is determined by the SweepDirection property
-        double directionalFactor = ( this.SweepDirection == SweepDirection.Clockwise ) ? 1.0 : -1.0;
-        double startAngle = StartAngle;
-
-        Point pointA = EllipseHelper.PointOfRadialIntersection( _rect, startAngle );
-        Point pointB = EllipseHelper.PointOfRadialIntersection( _rect, startAngle + directionalFactor * slice * 360 );
-        PathSegmentCollection segments = new PathSegmentCollection();
-        segments.Add( new LineSegment( pointA, true ) );
-        ArcSegment arc = new ArcSegment();
-        arc.Point = pointB;
-        arc.Size = new Size( _rect.Width / 2, _rect.Height / 2 );
-        arc.IsLargeArc = slice > 0.5;
-        arc.SweepDirection = SweepDirection;
-        segments.Add( arc );
-        PathFigureCollection figures = new PathFigureCollection();
-        figures.Add( new PathFigure( RectHelper.Center( _rect ), segments, true ) );
-        return new PathGeometry( figures );
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingEndAngle Private Property
-
-    private bool IsUpdatingEndAngle
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingEndAngle ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingEndAngle ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingMode Private Property
-
-    private bool IsUpdatingMode
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingMode ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingMode ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingSlice Private Property
-
-    private bool IsUpdatingSlice
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingSlice ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingSlice ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingStartAngle Private Property
-
-    private bool IsUpdatingStartAngle
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingStartAngle ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingStartAngle ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingSweepDirection Private Property
-
-    private bool IsUpdatingSweepDirection
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingSweepDirection ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingSweepDirection ] = value;
-      }
-    }
-
-    #endregion
-
-    internal override Size GetNaturalSize()
-    {
-      double strokeThickness = this.GetStrokeThickness();
-      return new Size( strokeThickness, strokeThickness );
-    }
-
-    internal override Rect GetDefiningGeometryBounds()
-    {
-      return _rect;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      double penThickness = this.GetStrokeThickness();
-      double margin = penThickness / 2;
-
-      _rect = new Rect( margin, margin,
-          Math.Max( 0, finalSize.Width - penThickness ),
-          Math.Max( 0, finalSize.Height - penThickness ) );
-
-      switch( Stretch )
-      {
-        case Stretch.None:
-          // empty rectangle
-          _rect.Width = _rect.Height = 0;
-          break;
-
-        case Stretch.Fill:
-          // already initialized for Fill
-          break;
-
-        case Stretch.Uniform:
-          // largest square that fits in the final size
-          if( _rect.Width > _rect.Height )
-          {
-            _rect.Width = _rect.Height;
-          }
-          else
-          {
-            _rect.Height = _rect.Width;
-          }
-          break;
-
-        case Stretch.UniformToFill:
-
-          // smallest square that fills the final size
-          if( _rect.Width < _rect.Height )
-          {
-            _rect.Width = _rect.Height;
-          }
-          else
-          {
-            _rect.Height = _rect.Width;
-          }
-          break;
-      }
-
-      return finalSize;
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      if( this.Stretch == Stretch.UniformToFill )
-      {
-        double width = constraint.Width;
-        double height = constraint.Height;
-
-        if( Double.IsInfinity( width ) && Double.IsInfinity( height ) )
-        {
-          return this.GetNaturalSize();
-        }
-        else if( Double.IsInfinity( width ) || Double.IsInfinity( height ) )
-        {
-          width = Math.Min( width, height );
-        }
-        else
-        {
-          width = Math.Max( width, height );
-        }
-
-        return new Size( width, width );
-      }
-
-      return this.GetNaturalSize();
-    }
-
-    protected override void OnRender( DrawingContext drawingContext )
-    {
-      if( !_rect.IsEmpty )
-      {
-        Pen pen = this.GetPen();
-        drawingContext.DrawGeometry( this.Fill, pen, this.RenderedGeometry );
-      }
-    }
-
-    #region Private Fields
-
-    private Rect _rect = Rect.Empty;
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      IsUpdatingEndAngle = 0x00000001,
-      IsUpdatingMode = 0x00000002,
-      IsUpdatingSlice = 0x00000004,
-      IsUpdatingStartAngle = 0x00000008,
-      IsUpdatingSweepDirection = 0x00000010,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
deleted file mode 100644
index 583e4ab5..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum PieMode
-  {
-    Manual,
-    EndAngle,
-    Slice,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index cd89a90b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-    <!-- =============================================================================== -->
-    <!-- Pie                                                                             -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:Pie}" >
-       <Setter Property="Fill" Value="Black" />
-    </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
deleted file mode 100644
index 65b64557..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <!-- =============================================================================== -->
-   <!-- Pie                                                                             -->
-   <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:Pie}" >
-        <Setter Property="Fill" Value="Black" />
-    </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
deleted file mode 100644
index d72aaa87..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Toolkit.Primitives
-{
-  internal class CachedTextInfo : ICloneable
-  {
-    private CachedTextInfo( string text, int caretIndex, int selectionStart, int selectionLength )
-    {
-      this.Text = text;
-      this.CaretIndex = caretIndex;
-      this.SelectionStart = selectionStart;
-      this.SelectionLength = selectionLength;
-    }
-
-    public CachedTextInfo( TextBox textBox )
-      : this( textBox.Text, textBox.CaretIndex, textBox.SelectionStart, textBox.SelectionLength )
-    {
-    }
-
-    public string Text { get; private set; }
-    public int CaretIndex { get; private set; }
-    public int SelectionStart { get; private set; }
-    public int SelectionLength { get; private set; }
-
-    #region ICloneable Members
-
-    public object Clone()
-    {
-      return new CachedTextInfo( this.Text, this.CaretIndex, this.SelectionStart, this.SelectionLength );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
deleted file mode 100644
index 7e5a907a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Input;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-#if VS2008
-using Microsoft.Windows.Controls;
-using Microsoft.Windows.Controls.Primitives;
-#endif
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  [TemplatePart( Name = PART_Popup, Type = typeof( Popup ) )]
-  public class DateTimePickerBase : DateTimeUpDown
-  {
-    private const string PART_Popup = "PART_Popup";
-
-    #region Members
-
-    private Popup _popup;
-    private DateTime? _initialValue;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region IsOpen
-
-    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DateTimePickerBase ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
-    public bool IsOpen
-    {
-      get
-      {
-        return ( bool )GetValue( IsOpenProperty );
-      }
-      set
-      {
-        SetValue( IsOpenProperty, value );
-      }
-    }
-
-    private static void OnIsOpenChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimePickerBase dateTimePicker = ( DateTimePickerBase )d;
-      if( dateTimePicker != null )
-        dateTimePicker.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-        _initialValue = Value;
-    }
-
-    #endregion //IsOpen
-
-    #region ShowDropDownButton
-
-    public static readonly DependencyProperty ShowDropDownButtonProperty = DependencyProperty.Register( "ShowDropDownButton", typeof( bool ), typeof( DateTimePickerBase ), new UIPropertyMetadata( true ) );
-    public bool ShowDropDownButton
-    {
-      get
-      {
-        return ( bool )GetValue( ShowDropDownButtonProperty );
-      }
-      set
-      {
-        SetValue( ShowDropDownButtonProperty, value );
-      }
-    }
-
-    #endregion //ShowDropDownButton
-
-    #endregion //Properties
-
-    #region Constructors
-
-    public DateTimePickerBase()
-    {
-      AddHandler( UIElement.KeyDownEvent, new KeyEventHandler( HandleKeyDown ), true );
-      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _popup != null )
-      {
-        _popup.Opened -= this.Popup_Opened;
-      }
-
-      _popup = this.GetTemplateChild( PART_Popup ) as Popup;
-
-      if( _popup != null )
-      {
-        _popup.Opened += this.Popup_Opened;
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    protected virtual void HandleKeyDown( object sender, KeyEventArgs e )
-    {
-      if( !IsOpen )
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          IsOpen = true;
-          // Calendar will get focus in Calendar_Loaded().
-          e.Handled = true;
-        }
-      }
-      else
-      {
-        if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
-        {
-          ClosePopup( true );
-          e.Handled = true;
-        }
-        else if( e.Key == Key.Enter )
-        {
-          ClosePopup( 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;
-          }
-          ClosePopup( true );
-          e.Handled = true;
-        }
-      }
-    }
-
-    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
-    {
-      ClosePopup( true );
-    }
-
-    protected virtual void Popup_Opened( object sender, EventArgs e )
-    {
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    protected void ClosePopup( bool isFocusOnTextBox )
-    {
-      if( IsOpen )
-      {
-        IsOpen = false;
-      }
-
-      ReleaseMouseCapture();
-
-      if( isFocusOnTextBox && ( TextBox != null ) )
-        TextBox.Focus();
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
deleted file mode 100644
index 5c98eac3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Input;
-using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public abstract class DateTimeUpDownBase<T> : UpDownBase<T>
-  {
-    #region Members
-
-    internal List<DateTimeInfo> _dateTimeInfoList = new List<DateTimeInfo>();
-    internal DateTimeInfo _selectedDateTimeInfo;
-    internal bool _fireSelectionChangedEvent = true;
-    internal bool _processTextChanged = true;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region CurrentDateTimePart
-
-    public static readonly DependencyProperty CurrentDateTimePartProperty = DependencyProperty.Register( "CurrentDateTimePart", typeof( DateTimePart )
-      , typeof( DateTimeUpDownBase<T> ), new UIPropertyMetadata( DateTimePart.Other, OnCurrentDateTimePartChanged ) );
-    public DateTimePart CurrentDateTimePart
-    {
-      get
-      {
-        return (DateTimePart)GetValue( CurrentDateTimePartProperty );
-      }
-      set
-      {
-        SetValue( CurrentDateTimePartProperty, value );
-      }
-    }
-
-    private static void OnCurrentDateTimePartChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      DateTimeUpDownBase<T> dateTimeUpDownBase = o as DateTimeUpDownBase<T>;
-      if( dateTimeUpDownBase != null )
-        dateTimeUpDownBase.OnCurrentDateTimePartChanged( (DateTimePart)e.OldValue, (DateTimePart)e.NewValue );
-    }
-
-    protected virtual void OnCurrentDateTimePartChanged( DateTimePart oldValue, DateTimePart newValue )
-    {
-      this.Select( this.GetDateTimeInfo( newValue ) );
-    }
-
-    #endregion //CurrentDateTimePart
-
-    #region Step
-
-    public static readonly DependencyProperty StepProperty = DependencyProperty.Register( "Step", typeof( int )
-      , typeof( DateTimeUpDownBase<T> ), new UIPropertyMetadata( 1, OnStepChanged ) );
-    public int Step
-    {
-      get
-      {
-        return (int)GetValue( StepProperty );
-      }
-      set
-      {
-        SetValue( StepProperty, value );
-      }
-    }
-
-    private static void OnStepChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var dateTimeUpDownBase = o as DateTimeUpDownBase<T>;
-      if( dateTimeUpDownBase != null )
-        dateTimeUpDownBase.OnStepChanged( (int)e.OldValue, (int)e.NewValue );
-    }
-
-    protected virtual void OnStepChanged( int oldValue, int newValue )
-    {
-    }
-
-    #endregion //Step
-
-    #endregion
-
-    #region Constructors
-
-    internal DateTimeUpDownBase()
-    {
-      this.InitializeDateTimeInfoList( this.Value );
-      this.Loaded += this.DateTimeUpDownBase_Loaded;
-    }
-
-    #endregion
-
-    #region BaseClass Overrides
-
-    public override void OnApplyTemplate()
-    {
-      if( this.TextBox != null )
-      {
-        this.TextBox.SelectionChanged -= this.TextBox_SelectionChanged;
-      }
-
-      base.OnApplyTemplate();
-
-      if( this.TextBox != null )
-      {
-        this.TextBox.SelectionChanged += this.TextBox_SelectionChanged;
-      }
-    }
-
-    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:
-          {
-            if( !IsReadOnly )
-            {
-              _fireSelectionChangedEvent = false;
-              BindingExpression binding = BindingOperations.GetBindingExpression( TextBox, System.Windows.Controls.TextBox.TextProperty );
-              binding.UpdateSource();
-              _fireSelectionChangedEvent = true;
-            }
-            return;
-          }
-        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.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;
-          }
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    #endregion
-
-    #region Event Hanlders
-
-    private void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
-    {
-      if( _fireSelectionChangedEvent )
-        this.PerformMouseSelection();
-      else
-        _fireSelectionChangedEvent = true;
-    }
-
-    private void DateTimeUpDownBase_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.InitSelection();
-    }
-
-    #endregion
-
-    #region Methods
-
-    protected virtual void InitializeDateTimeInfoList( T value )
-    {
-    }
-
-    protected virtual bool IsCurrentValueValid()
-    {
-      return true;
-    }
-
-    protected virtual void PerformMouseSelection()
-    {
-      var dateTimeInfo = this.GetDateTimeInfo( TextBox.SelectionStart );
-      if( (dateTimeInfo != null) && (dateTimeInfo.Type == DateTimePart.Other) )
-      {
-        this.Dispatcher.BeginInvoke( DispatcherPriority.Background, new Action( () =>
-        {
-          // Select the next dateTime part
-          this.Select( this.GetDateTimeInfo( dateTimeInfo.StartPosition + dateTimeInfo.Length ) );
-        }
-        ) );
-        return;
-      }     
-
-      this.Select( dateTimeInfo );
-    }
-
-    protected virtual bool IsLowerThan( T value1, T value2 )
-    {
-      return false;
-    }
-
-    protected virtual bool IsGreaterThan( T value1, T value2 )
-    {
-      return false;
-    }
-
-    internal DateTimeInfo GetDateTimeInfo( int selectionStart )
-    {
-      return _dateTimeInfoList.FirstOrDefault( ( info ) =>
-                              ( info.StartPosition <= selectionStart ) && ( selectionStart < ( info.StartPosition + info.Length ) ) );
-    }
-
-    internal DateTimeInfo GetDateTimeInfo( DateTimePart part )
-    {
-      return _dateTimeInfoList.FirstOrDefault( ( info ) =>info.Type == part );
-    }
-
-    internal void Select( DateTimeInfo info )
-    {
-      if( (info != null) && !info.Equals( _selectedDateTimeInfo ) && ( this.TextBox != null) && !string.IsNullOrEmpty( this.TextBox.Text ) )
-      {
-        _fireSelectionChangedEvent = false;
-        this.TextBox.Select( info.StartPosition, info.Length );
-        _fireSelectionChangedEvent = true;
-        _selectedDateTimeInfo = info;
-#if VS2008
-        this.CurrentDateTimePart = info.Type;
-#else
-        this.SetCurrentValue( DateTimeUpDownBase<T>.CurrentDateTimePartProperty, info.Type );
-#endif
-      }
-    }
-
-    internal T CoerceValueMinMax( T value )
-    {
-      if( this.IsLowerThan( value, this.Minimum ) )
-        return this.Minimum;
-      else if( this.IsGreaterThan( value, this.Maximum ) )
-        return this.Maximum;
-      else
-        return value;
-    }
-
-    internal void ValidateDefaultMinMax( T value )
-    {
-      // DefaultValue is always accepted.
-      if( object.Equals( value, this.DefaultValue ) )
-        return;
-
-      if( this.IsLowerThan( value, this.Minimum ) )
-        throw new ArgumentOutOfRangeException( "Minimum", String.Format( "Value must be greater than MinValue of {0}", this.Minimum ) );
-      else if( this.IsGreaterThan( value, this.Maximum ) )
-        throw new ArgumentOutOfRangeException( "Maximum", String.Format( "Value must be less than MaxValue of {0}", this.Maximum ) );
-    }
-
-    internal T GetClippedMinMaxValue( T value )
-    {
-      if( this.IsGreaterThan( value, this.Maximum ) )
-        return this.Maximum;
-      else if( this.IsLowerThan( value, this.Minimum ) )
-        return this.Minimum;
-      return value;
-    }
-
-    protected internal virtual void PerformKeyboardSelection( int nextSelectionStart )
-    {
-      this.TextBox.Focus();
-
-      if( !this.UpdateValueOnEnterKey )
-      {
-        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 GetNextDateTimeInfo( int nextSelectionStart )
-    {
-      DateTimeInfo nextDateTimeInfo = this.GetDateTimeInfo( nextSelectionStart );
-      if( nextDateTimeInfo == null )
-      {
-        nextDateTimeInfo = _dateTimeInfoList.First();
-      }
-
-      DateTimeInfo initialDateTimeInfo = nextDateTimeInfo;
-
-      while( nextDateTimeInfo.Type == DateTimePart.Other )
-      {
-        nextDateTimeInfo = this.GetDateTimeInfo( nextDateTimeInfo.StartPosition + nextDateTimeInfo.Length );
-        if( nextDateTimeInfo == null )
-        {
-          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 )
-      {
-        if( _dateTimeInfoList.Count > 0 )
-        {
-          previousDateTimeInfo = _dateTimeInfoList.Last();
-        }
-      }
-
-      DateTimeInfo initialDateTimeInfo = previousDateTimeInfo;
-
-      while( (previousDateTimeInfo != null) && (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 InitSelection()
-    {
-      if( _selectedDateTimeInfo == null )
-      {
-        this.Select( (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : this.GetDateTimeInfo( 0 ) );
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
deleted file mode 100644
index e65f57fb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Primitives
-{
-  internal struct HsvColor
-  {
-    public double H;
-    public double S;
-    public double V;
-
-    public HsvColor( double h, double s, double v )
-    {
-      H = h;
-      S = s;
-      V = v;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
deleted file mode 100644
index 8243acff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public abstract class InputBase : Control
-  {
-    #region Properties
-
-    #region AllowTextInput
-
-    public static readonly DependencyProperty AllowTextInputProperty = DependencyProperty.Register( "AllowTextInput", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( true, OnAllowTextInputChanged ) );
-    public bool AllowTextInput
-    {
-      get
-      {
-        return ( bool )GetValue( AllowTextInputProperty );
-      }
-      set
-      {
-        SetValue( AllowTextInputProperty, value );
-      }
-    }
-
-    private static void OnAllowTextInputChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnAllowTextInputChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnAllowTextInputChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion //AllowTextInput
-
-    #region CultureInfo
-
-    public static readonly DependencyProperty CultureInfoProperty = DependencyProperty.Register( "CultureInfo", typeof( CultureInfo ), typeof( InputBase ), new UIPropertyMetadata( CultureInfo.CurrentCulture, OnCultureInfoChanged ) );
-    public CultureInfo CultureInfo
-    {
-      get
-      {
-        return ( CultureInfo )GetValue( CultureInfoProperty );
-      }
-      set
-      {
-        SetValue( CultureInfoProperty, value );
-      }
-    }
-
-    private static void OnCultureInfoChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnCultureInfoChanged( ( CultureInfo )e.OldValue, ( CultureInfo )e.NewValue );
-    }
-
-    protected virtual void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
-    {
-
-    }
-
-    #endregion //CultureInfo
-
-    #region IsReadOnly
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( false, OnReadOnlyChanged ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    private static void OnReadOnlyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnReadOnlyChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnReadOnlyChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion //IsReadOnly
-
-    #region IsUndoEnabled
-
-    public static readonly DependencyProperty IsUndoEnabledProperty = DependencyProperty.Register( "IsUndoEnabled", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( true, OnIsUndoEnabledChanged ) );
-    public bool IsUndoEnabled
-    {
-      get
-      {
-        return ( bool )GetValue( IsUndoEnabledProperty );
-      }
-      set
-      {
-        SetValue( IsUndoEnabledProperty, value );
-      }
-    }
-
-    private static void OnIsUndoEnabledChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnIsUndoEnabledChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsUndoEnabledChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion //IsUndoEnabled
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( InputBase ), new FrameworkPropertyMetadata( default( String ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged, null, false, UpdateSourceTrigger.LostFocus ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      InputBase inputBase = o as InputBase;
-      if( inputBase != null )
-        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnTextChanged( string oldValue, string newValue )
-    {
-
-    }
-
-    #endregion //Text
-
-    #region TextAlignment
-
-    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( InputBase ), new UIPropertyMetadata( TextAlignment.Left ) );
-    public TextAlignment TextAlignment
-    {
-      get
-      {
-        return ( TextAlignment )GetValue( TextAlignmentProperty );
-      }
-      set
-      {
-        SetValue( TextAlignmentProperty, value );
-      }
-    }
-
-
-    #endregion //TextAlignment
-
-    #region Watermark
-
-    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( InputBase ), new UIPropertyMetadata( null ) );
-    public object Watermark
-    {
-      get
-      {
-        return ( object )GetValue( WatermarkProperty );
-      }
-      set
-      {
-        SetValue( WatermarkProperty, value );
-      }
-    }
-
-    #endregion //Watermark
-
-    #region WatermarkTemplate
-
-    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( InputBase ), new UIPropertyMetadata( null ) );
-    public DataTemplate WatermarkTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
-      }
-      set
-      {
-        SetValue( WatermarkTemplateProperty, value );
-      }
-    }
-
-    #endregion //WatermarkTemplate
-
-    #endregion //Properties
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
deleted file mode 100644
index 1e122a0c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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,
-    FocusedMouseOver,
-    MouseOver,
-    Disabled
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
deleted file mode 100644
index fe383baf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Windows;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  [TemplatePart( Name = PART_SelectAllSelectorItem, Type = typeof( SelectAllSelectorItem ) )]
-  public class SelectAllSelector : Selector
-  {
-    private const string PART_SelectAllSelectorItem = "PART_SelectAllSelectorItem";
-
-    #region Members
-
-    private SelectAllSelectorItem _selectAllSelecotrItem;
-
-    #endregion
-
-    #region Properties
-
-    #region IsSelectAllActive
-
-    public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register( "IsSelectAllActive", typeof( bool ), typeof( SelectAllSelector ), new UIPropertyMetadata( false, OnIsSelectAllActiveChanged ) );
-    public bool IsSelectAllActive
-    {
-      get
-      {
-        return ( bool )GetValue( IsSelectAllActiveProperty );
-      }
-      set
-      {
-        SetValue( IsSelectAllActiveProperty, value );
-      }
-    }
-
-    private static void OnIsSelectAllActiveChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var selector = o as SelectAllSelector;
-      if( selector != null )
-        selector.OnIsSelectAllActiveChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsSelectAllActiveChanged( bool oldValue, bool newValue )
-    {
-      if( newValue && ( this.Items.Count > 0 ) )
-      {
-        this.UpdateSelectAllSelectorItem();
-      }
-    }
-
-    #endregion //IsSelectAllActive
-
-    #region SelectAllContent
-
-    public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register( "SelectAllContent", typeof( object ), typeof( SelectAllSelector ), new UIPropertyMetadata( "Select All" ) );
-    public object SelectAllContent
-    {
-      get
-      {
-        return ( object )GetValue( SelectAllContentProperty );
-      }
-      set
-      {
-        SetValue( SelectAllContentProperty, value );
-      }
-    }
-
-    #endregion
-
-    #endregion
-
-    #region Overrides
-
-    protected override void OnSelectedItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      base.OnSelectedItemsCollectionChanged( sender, e );
-
-      this.UpdateSelectAllSelectorItem();
-    }
-
-    protected override void OnItemsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      base.OnItemsChanged( e );
-
-      this.UpdateSelectAllSelectorItem();
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      _selectAllSelecotrItem = this.GetTemplateChild( PART_SelectAllSelectorItem ) as SelectAllSelectorItem;
-    }
-
-    #endregion
-
-    #region Public Methods
-
-    public void SelectAll()
-    {
-      foreach( var item in this.ItemsCollection )
-      {
-        if( !this.SelectedItems.Contains( item ) )
-        {
-          this.SelectedItems.Add( item );
-        }
-      }
-    }
-
-    public void UnSelectAll()
-    {
-      this.SelectedItems.Clear();
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void UpdateSelectAllSelectorItem()
-    {
-      if( _selectAllSelecotrItem != null )
-      {
-        // All items are selected; select the SelectAll option.
-        if( this.Items.Count == this.SelectedItems.Count )
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( true );
-        }
-        // Some items are selected; set the SelectAll option to null.
-        else if( this.SelectedItems.Count > 0 )
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( null );
-        }
-        // No items are selected; unselect the SelectAll option.
-        else
-        {
-          _selectAllSelecotrItem.ModifyCurrentSelection( false );
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
deleted file mode 100644
index 9f38410a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Primitives
-{
-  public class SelectAllSelectorItem : SelectorItem
-  {
-    #region Members
-
-    private bool _ignoreSelectorChanges = false;
-
-    #endregion
-
-    #region Overrides
-
-    // Do not raise an event when this item is Selected/UnSelected.
-    protected override void OnIsSelectedChanged( bool? oldValue, bool? newValue )
-    {
-      if( _ignoreSelectorChanges )
-        return;
-
-      var templatedParent = this.TemplatedParent as SelectAllSelector;
-      if( templatedParent != null )
-      {
-        if( newValue.HasValue )
-        {
-          // Select All
-          if( newValue.Value )
-          {
-            templatedParent.SelectAll();
-          }
-          // UnSelect All
-          else
-          {
-            templatedParent.UnSelectAll();
-          }
-        }
-      }
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void ModifyCurrentSelection( bool? newSelection )
-    {
-      _ignoreSelectorChanges = true;
-      this.IsSelected = newSelection;
-      _ignoreSelectorChanges = false;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
deleted file mode 100644
index 78355b2e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
+++ /dev/null
@@ -1,986 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Reflection;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class Selector : ItemsControl, IWeakEventListener //should probably make this control an ICommandSource
-  {
-    #region Members
-
-    private bool _surpressItemSelectionChanged;
-    private bool _ignoreSelectedItemChanged;
-    private bool _ignoreSelectedValueChanged;
-    private int _ignoreSelectedItemsCollectionChanged;
-    private int _ignoreSelectedMemberPathValuesChanged;
-    private IList _selectedItems;
-    private IList _removedItems = new ObservableCollection<object>();
-    private object[] _internalSelectedItems;
-
-    private ValueChangeHelper _selectedMemberPathValuesHelper;
-    private ValueChangeHelper _valueMemberPathValuesHelper;
-
-
-
-    #endregion //Members
-
-    #region Constructors
-
-    public Selector()
-    {
-      this.SelectedItems = new ObservableCollection<object>();
-      AddHandler( Selector.SelectedEvent, new RoutedEventHandler( ( s, args ) => this.OnItemSelectionChangedCore( args, false ) ) );
-      AddHandler( Selector.UnSelectedEvent, new RoutedEventHandler( ( s, args ) => this.OnItemSelectionChangedCore( args, true ) ) );
-      _selectedMemberPathValuesHelper = new ValueChangeHelper( this.OnSelectedMemberPathValuesChanged );
-      _valueMemberPathValuesHelper = new ValueChangeHelper( this.OnValueMemberPathValuesChanged );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( Selector ), new PropertyMetadata( ( ICommand )null ) );
-    [TypeConverter( typeof( CommandConverter ) )]
-    public ICommand Command
-    {
-      get
-      {
-        return ( ICommand )GetValue( CommandProperty );
-      }
-      set
-      {
-        SetValue( CommandProperty, value );
-      }
-    }
-
-    #region Delimiter
-
-    public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register( "Delimiter", typeof( string ), typeof( Selector ), new UIPropertyMetadata( ",", OnDelimiterChanged ) );
-    public string Delimiter
-    {
-      get
-      {
-        return ( string )GetValue( DelimiterProperty );
-      }
-      set
-      {
-        SetValue( DelimiterProperty, value );
-      }
-    }
-
-    private static void OnDelimiterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ( (Selector)o ).OnSelectedItemChanged( (string)e.OldValue, (string)e.NewValue );
-    }
-
-    protected virtual void OnSelectedItemChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized )
-        return;
-
-      this.UpdateSelectedValue();
-    }
-
-    #endregion
-
-    #region SelectedItem property
-
-    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( Selector ), new UIPropertyMetadata( null, OnSelectedItemChanged ) );
-    public object SelectedItem
-    {
-      get
-      {
-        return ( object )GetValue( SelectedItemProperty );
-      }
-      set
-      {
-        SetValue( SelectedItemProperty, value );
-      }
-    }
-
-    private static void OnSelectedItemChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      ( ( Selector )sender ).OnSelectedItemChanged( args.OldValue, args.NewValue );
-    }
-
-    protected virtual void OnSelectedItemChanged( object oldValue, object newValue )
-    {
-      if( !this.IsInitialized || _ignoreSelectedItemChanged )
-        return;
-
-      _ignoreSelectedItemsCollectionChanged++;
-      this.SelectedItems.Clear();
-      if( newValue != null )
-      {
-        this.SelectedItems.Add( newValue );
-      }
-      this.UpdateFromSelectedItems();
-      _ignoreSelectedItemsCollectionChanged--;
-    }
-
-    #endregion
-
-    #region SelectedItems Property
-
-    public IList SelectedItems
-    {
-      get
-      {
-        return _selectedItems;
-      }
-      private set
-      {
-        if( value == null )
-          throw new ArgumentNullException( "value" );
-
-        INotifyCollectionChanged oldCollection = _selectedItems as INotifyCollectionChanged;
-        INotifyCollectionChanged newCollection = value as INotifyCollectionChanged;
-
-        if( oldCollection != null )
-        {
-          CollectionChangedEventManager.RemoveListener( oldCollection, this );
-        }
-
-        if( newCollection != null )
-        {
-          CollectionChangedEventManager.AddListener( newCollection, this );
-        }
-
-        var newValue = value;
-        var oldValue = _selectedItems;
-        if( oldValue != null )
-        {
-          foreach( var item in oldValue )
-          {
-            if( ( ( newValue != null ) && !newValue.Contains( item ) ) || ( newValue == null ) )
-            {
-              this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, false ) );
-
-              if( Command != null )
-              {
-                this.Command.Execute( item );
-              }
-            }
-          }
-        }
-        if( newValue != null )
-        {
-          foreach( var item in newValue )
-          {
-            this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, true ) );
-
-            if( ( ( oldValue != null ) && !oldValue.Contains( item ) ) || ( oldValue == null ) )
-            {
-              if( Command != null )
-              {
-                this.Command.Execute( item );
-              }
-            }
-          }
-        }
-
-
-        _selectedItems = value;
-      }
-    }
-
-    #endregion SelectedItems
-
-
-    #region SelectedItemsOverride property
-
-    public static readonly DependencyProperty SelectedItemsOverrideProperty = DependencyProperty.Register( "SelectedItemsOverride", typeof( IList ), typeof( Selector ), new UIPropertyMetadata( null, SelectedItemsOverrideChanged ) );
-    public IList SelectedItemsOverride
-    {
-      get
-      {
-        return ( IList )GetValue( SelectedItemsOverrideProperty );
-      }
-      set
-      {
-        SetValue( SelectedItemsOverrideProperty, value );
-      }
-    }
-
-    private static void SelectedItemsOverrideChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      ( ( Selector )sender ).OnSelectedItemsOverrideChanged( ( IList )args.OldValue, ( IList )args.NewValue );
-    }
-
-    protected virtual void OnSelectedItemsOverrideChanged( IList oldValue, IList newValue )
-    {
-      if( !this.IsInitialized )
-        return;
-
-      this.SelectedItems = ( newValue != null ) ? newValue : new ObservableCollection<object>();
-      this.UpdateFromSelectedItems();
-    }
-
-    #endregion
-
-
-    #region SelectedMemberPath Property
-
-    public static readonly DependencyProperty SelectedMemberPathProperty = DependencyProperty.Register( "SelectedMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( null, OnSelectedMemberPathChanged ) );
-    public string SelectedMemberPath
-    {
-      get
-      {
-        return ( string )GetValue( SelectedMemberPathProperty );
-      }
-      set
-      {
-        SetValue( SelectedMemberPathProperty, value );
-      }
-    }
-
-    private static void OnSelectedMemberPathChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Selector sel = ( ( Selector )o );
-      sel.OnSelectedMemberPathChanged( (string)e.OldValue, (string)e.NewValue );
-    }
-
-    protected virtual void OnSelectedMemberPathChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized )
-        return;
-
-      this.UpdateSelectedMemberPathValuesBindings();
-    }
-
-    #endregion //SelectedMemberPath
-
-    #region SelectedValue
-
-    public static readonly DependencyProperty SelectedValueProperty = DependencyProperty.Register( "SelectedValue", typeof( string ), typeof( Selector ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedValueChanged ) );
-    public string SelectedValue
-    {
-      get
-      {
-        return ( string )GetValue( SelectedValueProperty );
-      }
-      set
-      {
-        SetValue( SelectedValueProperty, value );
-      }
-    }
-
-    private static void OnSelectedValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Selector selector = o as Selector;
-      if( selector != null )
-        selector.OnSelectedValueChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnSelectedValueChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized || _ignoreSelectedValueChanged )
-        return;
-
-      UpdateFromSelectedValue();
-    }
-
-    #endregion //SelectedValue
-
-    #region ValueMemberPath
-
-    public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register( "ValueMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( OnValueMemberPathChanged ) );
-    public string ValueMemberPath
-    {
-      get
-      {
-        return ( string )GetValue( ValueMemberPathProperty );
-      }
-      set
-      {
-        SetValue( ValueMemberPathProperty, value );
-      }
-    }
-
-    private static void OnValueMemberPathChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Selector sel = ( ( Selector )o );
-      sel.OnValueMemberPathChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnValueMemberPathChanged( string oldValue, string newValue )
-    {
-      if( !this.IsInitialized )
-        return;
-
-      this.UpdateValueMemberPathValuesBindings();
-    }
-
-    #endregion
-
-    #region ItemsCollection Property
-
-    protected IEnumerable ItemsCollection
-    {
-      get
-      {
-        return ItemsSource ?? ( ( IEnumerable )Items ?? ( IEnumerable )new object[ 0 ] );
-      }
-    }
-
-    #endregion
-
-    #endregion //Properties
-
-    #region Base Class Overrides
-
-    protected override bool IsItemItsOwnContainerOverride( object item )
-    {
-      return item is SelectorItem;
-    }
-
-    protected override DependencyObject GetContainerForItemOverride()
-    {
-      return new SelectorItem();
-    }
-
-    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
-    {
-      base.PrepareContainerForItemOverride( element, item );
-
-      _surpressItemSelectionChanged = true;
-      var selectorItem = element as FrameworkElement;
-
-      selectorItem.SetValue( SelectorItem.IsSelectedProperty, SelectedItems.Contains(item) );
-
-      _surpressItemSelectionChanged = false;
-    }
-
-    protected override void OnItemsSourceChanged( IEnumerable oldValue, IEnumerable newValue )
-    {
-      base.OnItemsSourceChanged( oldValue, newValue );
-
-      var oldCollection = oldValue as INotifyCollectionChanged;
-      var newCollection = newValue as INotifyCollectionChanged;
-
-      if( oldCollection != null )
-      {
-        CollectionChangedEventManager.RemoveListener( oldCollection, this );
-      }
-
-      if( newCollection != null )
-      {
-        CollectionChangedEventManager.AddListener( newCollection, this );
-      }
-
-      if( !this.IsInitialized )
-        return;
-
-      if( !VirtualizingStackPanel.GetIsVirtualizing( this )
-        || (VirtualizingStackPanel.GetIsVirtualizing( this ) && (newValue != null)) )
-      {
-        this.RemoveUnavailableSelectedItems();
-      }
-
-      this.UpdateSelectedMemberPathValuesBindings();
-      this.UpdateValueMemberPathValuesBindings();
-    }
-
-    protected override void OnItemsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      base.OnItemsChanged( e );
-
-      this.RemoveUnavailableSelectedItems();
-    }
-
-    // When a DataTemplate includes a CheckComboBox, some bindings are
-    // not working, like SelectedValue.
-    // We use a priority system to select the good items after initialization.
-    public override void EndInit()
-    {
-      base.EndInit();
-
-      if( this.SelectedItemsOverride != null )
-      {
-        this.OnSelectedItemsOverrideChanged( null, this.SelectedItemsOverride );
-      }
-      else if( this.SelectedMemberPath != null )
-      {
-        this.OnSelectedMemberPathChanged( null, this.SelectedMemberPath );
-      }
-      else if( this.SelectedValue != null )
-      {
-        this.OnSelectedValueChanged( null, this.SelectedValue );
-      }
-      else if( this.SelectedItem != null )
-      {
-        this.OnSelectedItemChanged( null, this.SelectedItem );
-      }
-
-      if( this.ValueMemberPath != null )
-      {
-        this.OnValueMemberPathChanged( null, this.ValueMemberPath );
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Events
-
-    public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent( "SelectedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Selector ) );
-    public static readonly RoutedEvent UnSelectedEvent = EventManager.RegisterRoutedEvent( "UnSelectedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Selector ) );
-
-    public static readonly RoutedEvent ItemSelectionChangedEvent = EventManager.RegisterRoutedEvent( "ItemSelectionChanged", RoutingStrategy.Bubble, typeof( ItemSelectionChangedEventHandler ), typeof( Selector ) );
-    public event ItemSelectionChangedEventHandler ItemSelectionChanged
-    {
-      add
-      {
-        AddHandler( ItemSelectionChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ItemSelectionChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Methods
-
-    protected object GetPathValue( object item, string propertyPath )
-    {
-      if( item == null )
-        throw new ArgumentNullException( "item" );
-
-      if( String.IsNullOrEmpty( propertyPath )
-        || propertyPath == "." )
-        return item;
-
-
-      PropertyInfo prop = item.GetType().GetProperty( propertyPath );
-      return ( prop != null )
-        ? prop.GetValue( item, null )
-        : null;
-    }
-
-    protected object GetItemValue( object item )
-    {
-      return ( item != null )
-        ? this.GetPathValue( item, this.ValueMemberPath )
-        : null;
-    }
-
-    protected object ResolveItemByValue( string value )
-    {
-      if( !String.IsNullOrEmpty( ValueMemberPath ) )
-      {
-        foreach( object item in ItemsCollection )
-        {
-          var property = item.GetType().GetProperty( ValueMemberPath );
-          if( property != null )
-          {
-            var propertyValue = property.GetValue( item, null );
-            if( value.Equals( propertyValue.ToString(), StringComparison.InvariantCultureIgnoreCase ) )
-              return item;
-          }
-        }
-      }
-
-      return value;
-    }
-
-    internal void UpdateFromList( List<string> selectedValues, Func<object, object> GetItemfunction )
-    {
-      _ignoreSelectedItemsCollectionChanged++;
-      // Just update the SelectedItems collection content 
-      // and let the synchronization be made from UpdateFromSelectedItems();
-      SelectedItems.Clear();
-
-      if( (selectedValues != null) && (selectedValues.Count > 0) )
-      {
-        ValueEqualityComparer comparer = new ValueEqualityComparer();
-
-        foreach( object item in ItemsCollection )
-        {
-          object itemValue = GetItemfunction( item );
-
-          bool isSelected = (itemValue != null)
-            && selectedValues.Contains( itemValue.ToString(), comparer );
-
-          if( isSelected )
-          {
-            SelectedItems.Add( item );
-          }
-        }
-      }
-      _ignoreSelectedItemsCollectionChanged--;
-
-      this.UpdateFromSelectedItems();
-    }
-
-    private bool? GetSelectedMemberPathValue( object item )
-    {
-      if( String.IsNullOrEmpty( this.SelectedMemberPath ) )
-        return null;
-      if( item == null )
-        return null;
-
-      string[] nameParts = this.SelectedMemberPath.Split( '.' );
-      if( nameParts.Length == 1 )
-      {
-        var property = item.GetType().GetProperty( this.SelectedMemberPath );
-        if( (property != null) && (property.PropertyType == typeof( bool )) )
-          return property.GetValue( item, null ) as bool?;
-        return null;
-      }
-
-      for( int i = 0; i < nameParts.Count(); ++i )
-      {
-        var type = item.GetType();
-        var info = type.GetProperty( nameParts[ i ] );
-        if( info == null )
-        {
-          return null;
-        }
-
-        if( i == nameParts.Count() - 1 )
-        {
-          if( info.PropertyType == typeof( bool ) )
-            return info.GetValue( item, null ) as bool?;
-        }
-        else
-        {
-          item = info.GetValue( item, null );
-        }
-      }
-      return null;
-    }
-
-    private void SetSelectedMemberPathValue( object item, bool value )
-    {
-      if( String.IsNullOrEmpty( this.SelectedMemberPath ) )
-        return;
-      if( item == null )
-        return;
-
-      string[] nameParts = this.SelectedMemberPath.Split( '.' );
-      if( nameParts.Length == 1 )
-      {
-        var property = item.GetType().GetProperty( this.SelectedMemberPath );
-        if( (property != null) && (property.PropertyType == typeof( bool )) )
-        {
-          property.SetValue( item, value, null );
-        }
-        return;
-      }
-
-      for( int i = 0; i < nameParts.Count(); ++i )
-      {
-        var type = item.GetType();
-        var info = type.GetProperty( nameParts[ i ] );
-        if( info == null )
-          return;
-
-        if( i == nameParts.Count() - 1 )
-        {
-          if( info.PropertyType == typeof( bool ) )
-          {
-            info.SetValue( item, value, null );
-          }
-        }
-        else
-        {
-          item = info.GetValue( item, null );
-        }
-      }
-    }
-
-    /// <summary>
-    /// When SelectedItems collection implements INotifyPropertyChanged, this is the callback.
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="e"></param>
-    protected virtual void OnSelectedItemsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( e.Action == NotifyCollectionChangedAction.Reset )
-      {
-        if( _internalSelectedItems != null )
-        {
-          foreach( var item in _internalSelectedItems )
-          {
-            this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, false ) );
-
-            if( Command != null )
-            {
-              this.Command.Execute( item );
-            }
-          }
-        }
-      }
-      if( e.OldItems != null )
-      {
-        foreach( var item in e.OldItems )
-        {
-          this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, false ) );
-
-          if( Command != null )
-          {
-            this.Command.Execute( item );
-          }
-        }
-      }
-      if( e.NewItems != null )
-      {
-        foreach( var item in e.NewItems )
-        {
-          this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, true ) );
-
-          if( Command != null )
-          {
-            this.Command.Execute( item );
-          }
-        }
-      }
-
-      if( _ignoreSelectedItemsCollectionChanged > 0 )
-        return;
-
-      // Keep it simple for now. Just update all
-      this.UpdateFromSelectedItems();
-    }
-
-    private void OnItemSelectionChangedCore( RoutedEventArgs args, bool unselected )
-    {
-      object item = this.ItemContainerGenerator.ItemFromContainer( ( DependencyObject )args.OriginalSource );
-
-      // When the item is it's own container, "UnsetValue" will be returned.
-      if( item == DependencyProperty.UnsetValue )
-      {
-        item = args.OriginalSource;
-      }
-
-      if( unselected )
-      {
-        while( SelectedItems.Contains( item ) )
-          SelectedItems.Remove( item );
-      }
-      else
-      {
-        if( !SelectedItems.Contains( item ) )
-          SelectedItems.Add( item );
-      }
-    }
-
-    /// <summary>
-    /// When the ItemsSource implements INotifyPropertyChanged, this is the change callback.
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="args"></param>
-    private void OnItemsSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs args )
-    {
-      this.RemoveUnavailableSelectedItems();
-      this.AddAvailableRemovedItems();
-      this.UpdateSelectedMemberPathValuesBindings();
-      this.UpdateValueMemberPathValuesBindings();
-    }
-
-    /// <summary>
-    /// This is called when any value of any item referenced by SelectedMemberPath
-    /// is modified. This may affect the SelectedItems collection.
-    /// </summary>
-    private void OnSelectedMemberPathValuesChanged()
-    {
-      if( _ignoreSelectedMemberPathValuesChanged > 0 )
-        return;
-
-      this.UpdateFromSelectedMemberPathValues();
-    }
-
-    /// <summary>
-    /// This is called when any value of any item referenced by ValueMemberPath
-    /// is modified. This will affect the SelectedValue property
-    /// </summary>
-    private void OnValueMemberPathValuesChanged()
-    {
-      this.UpdateSelectedValue();
-    }
-
-    private void UpdateSelectedMemberPathValuesBindings()
-    {
-      _selectedMemberPathValuesHelper.UpdateValueSource( ItemsCollection, SelectedMemberPath );
-      this.UpdateFromSelectedMemberPathValues();
-    }
-
-    private void UpdateValueMemberPathValuesBindings()
-    {
-      _valueMemberPathValuesHelper.UpdateValueSource( ItemsCollection, ValueMemberPath );
-    }
-
-    /// <summary>
-    /// This method will be called when the "IsSelected" property of an SelectorItem
-    /// has been modified.
-    /// </summary>
-    /// <param name="args"></param>
-    protected virtual void OnItemSelectionChanged( ItemSelectionChangedEventArgs args )
-    {
-      if( _surpressItemSelectionChanged )
-        return;
-
-      RaiseEvent( args );
-    }
-
-    /// <summary>
-    /// Updates the SelectedValue property based on what is present in the SelectedItems property.
-    /// </summary>
-    private void UpdateSelectedValue()
-    {
-#if VS2008
-      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ).ToString() ).ToArray() );
-#else
-      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ) ) );
-#endif
-      if( String.IsNullOrEmpty( SelectedValue ) || !SelectedValue.Equals( newValue ) )
-      {
-        _ignoreSelectedValueChanged = true;
-        SelectedValue = newValue;
-        _ignoreSelectedValueChanged = false;
-      }
-    }
-
-    /// <summary>
-    /// Updates the SelectedItem property based on what is present in the SelectedItems property.
-    /// </summary>
-    private void UpdateSelectedItem()
-    {
-      if( !SelectedItems.Contains( SelectedItem ) )
-      {
-        _ignoreSelectedItemChanged = true;
-        SelectedItem = ( SelectedItems.Count > 0 ) ? SelectedItems[ 0 ] : null;
-        _ignoreSelectedItemChanged = false;
-      }
-    }
-
-    /// <summary>
-    /// Update the SelectedItems collection based on the values 
-    /// refered to by the SelectedMemberPath property.
-    /// </summary>
-    private void UpdateFromSelectedMemberPathValues()
-    {
-      _ignoreSelectedItemsCollectionChanged++;
-      foreach( var item in ItemsCollection )
-      {
-        bool? isSelected = this.GetSelectedMemberPathValue( item );
-        if( isSelected != null )
-        {
-          if( isSelected.Value )
-          {
-            if( !SelectedItems.Contains( item ) )
-            {
-              SelectedItems.Add( item );
-            }
-          }
-          else
-          {
-            if( SelectedItems.Contains( item ) )
-            {
-              SelectedItems.Remove( item );
-            }
-          }
-        }
-      }
-      _ignoreSelectedItemsCollectionChanged--;
-      this.UpdateFromSelectedItems();
-    }
-
-    internal void UpdateSelectedItems( IList selectedItems )
-    {
-      if( selectedItems == null )
-        throw new ArgumentNullException( "selectedItems" );
-
-      // Just check if the collection is the same..
-      if( selectedItems.Count == this.SelectedItems.Count
-        && selectedItems.Cast<object>().SequenceEqual( this.SelectedItems.Cast<object>() ) )
-        return;
-
-      _ignoreSelectedItemsCollectionChanged++;
-      this.SelectedItems.Clear();
-      foreach( object newItem in selectedItems )
-      {
-        this.SelectedItems.Add( newItem );
-      }
-      _ignoreSelectedItemsCollectionChanged--;
-      this.UpdateFromSelectedItems();
-    }
-
-    /// <summary>
-    /// Updates the following based on the content of SelectedItems:
-    /// - All SelectorItems "IsSelected" properties
-    /// - Values refered to by SelectedMemberPath
-    /// - SelectedItem property
-    /// - SelectedValue property
-    /// Refered to by the SelectedMemberPath property.
-    /// </summary>
-    private void UpdateFromSelectedItems()
-    {
-      foreach( object o in ItemsCollection )
-      {
-        bool isSelected = SelectedItems.Contains( o );
-
-        _ignoreSelectedMemberPathValuesChanged++;
-        this.SetSelectedMemberPathValue(o, isSelected);
-        _ignoreSelectedMemberPathValuesChanged--;
-
-        var selectorItem = ItemContainerGenerator.ContainerFromItem( o ) as SelectorItem;
-        if( selectorItem != null )
-        {
-          selectorItem.IsSelected = isSelected;
-        }
-      }
-
-      UpdateSelectedItem();
-      UpdateSelectedValue();
-
-      _internalSelectedItems = new object[ this.SelectedItems.Count ];
-      this.SelectedItems.CopyTo( _internalSelectedItems, 0 );
-    }
-
-    /// <summary>
-    /// Removes all items from SelectedItems that are no longer in ItemsSource.
-    /// </summary>
-    private void RemoveUnavailableSelectedItems()
-    {
-      _ignoreSelectedItemsCollectionChanged++;
-      HashSet<object> hash = new HashSet<object>( ItemsCollection.Cast<object>() );
-
-      for( int i = 0; i < SelectedItems.Count; i++ )
-      {
-        if( !hash.Contains( SelectedItems[ i ] ) )
-        {
-          _removedItems.Add( SelectedItems[ i ] );
-          SelectedItems.RemoveAt( i );
-          i--;
-        }
-      }
-      _ignoreSelectedItemsCollectionChanged--;
-
-      UpdateSelectedItem();
-      UpdateSelectedValue();
-    }
-
-    private void AddAvailableRemovedItems()
-    {
-      HashSet<object> hash = new HashSet<object>( ItemsCollection.Cast<object>() );
-
-      for( int i = 0; i < _removedItems.Count; i++ )
-      {
-        if( hash.Contains( _removedItems[ i ] ) )
-        {
-          SelectedItems.Add( _removedItems[ i ] );
-          _removedItems.RemoveAt( i );          
-          i--;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Updates the SelectedItems collection based on the content of
-    /// the SelectedValue property.
-    /// </summary>
-    private void UpdateFromSelectedValue()
-    {
-      List<string> selectedValues = null;
-      if( !String.IsNullOrEmpty( SelectedValue ) )
-      {
-        selectedValues = SelectedValue.Split( new string[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries ).ToList();
-      }
-
-      this.UpdateFromList( selectedValues, this.GetItemValue );
-    }
-
-    #endregion //Methods
-
-    #region IWeakEventListener Members
-
-    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        if( object.ReferenceEquals( _selectedItems, sender ) )
-        {
-          this.OnSelectedItemsCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-          return true;
-        }
-        else if( object.ReferenceEquals( ItemsCollection, sender ) )
-        {
-          this.OnItemsSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    #endregion
-
-    #region ValueEqualityComparer private class
-
-    private class ValueEqualityComparer : IEqualityComparer<string>
-    {
-      public bool Equals( string x, string y )
-      {
-        return string.Equals( x, y, StringComparison.InvariantCultureIgnoreCase );
-      }
-
-      public int GetHashCode( string obj )
-      {
-        return 1;
-      }
-    }
-
-    #endregion
-  }
-
-
-  public delegate void ItemSelectionChangedEventHandler( object sender, ItemSelectionChangedEventArgs e );
-  public class ItemSelectionChangedEventArgs : RoutedEventArgs
-  {
-    public bool IsSelected
-    {
-      get;
-      private set;
-    }
-    public object Item
-    {
-      get;
-      private set;
-    }
-
-    public ItemSelectionChangedEventArgs( RoutedEvent routedEvent, object source, object item, bool isSelected )
-      : base( routedEvent, source )
-    {
-      Item = item;
-      IsSelected = isSelected;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
deleted file mode 100644
index 85c0ced8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class SelectorItem : ContentControl
-  {
-    #region Constructors
-
-    static SelectorItem()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( SelectorItem ), new FrameworkPropertyMetadata( typeof( SelectorItem ) ) );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool? ), typeof( SelectorItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
-    public bool? IsSelected
-    {
-      get
-      {
-        return ( bool? )GetValue( IsSelectedProperty );
-      }
-      set
-      {
-        SetValue( IsSelectedProperty, value );
-      }
-    }
-
-    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      SelectorItem selectorItem = o as SelectorItem;
-      if( selectorItem != null )
-        selectorItem.OnIsSelectedChanged( ( bool? )e.OldValue, ( bool? )e.NewValue );
-    }
-
-    protected virtual void OnIsSelectedChanged( bool? oldValue, bool? newValue )
-    {
-      if( newValue.HasValue )
-      {
-        if( newValue.Value )
-        {
-          this.RaiseEvent( new RoutedEventArgs( Selector.SelectedEvent, this ) );
-        }
-        else
-        {
-          this.RaiseEvent( new RoutedEventArgs( Selector.UnSelectedEvent, this ) );
-        }
-      }
-    }
-
-    internal Selector ParentSelector
-    {
-      get
-      {
-        return ItemsControl.ItemsControlFromItemContainer( this ) as Selector;
-      }
-    }
-
-    #endregion //Properties
-
-    #region Events
-
-    public static readonly RoutedEvent SelectedEvent = Selector.SelectedEvent.AddOwner( typeof( SelectorItem ) );
-    public static readonly RoutedEvent UnselectedEvent = Selector.UnSelectedEvent.AddOwner( typeof( SelectorItem ) );
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
deleted file mode 100644
index ccddcb5e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Diagnostics;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public abstract class ShapeBase : Shape
-  {
-    #region Constructors
-
-    static ShapeBase()
-    {
-      ShapeBase.StrokeDashArrayProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeDashCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeDashOffsetProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeEndLineCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeLineJoinProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeMiterLimitProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeStartLineCapProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-      ShapeBase.StrokeThicknessProperty.OverrideMetadata( typeof( ShapeBase ), new FrameworkPropertyMetadata( new PropertyChangedCallback( ShapeBase.OnStrokeChanged ) ) );
-    }
-
-    #endregion
-
-    #region IsPenEmptyOrUndefined Internal Property
-
-    internal bool IsPenEmptyOrUndefined
-    {
-      get
-      {
-        double strokeThickness = this.StrokeThickness;
-        return ( this.Stroke == null ) || DoubleHelper.IsNaN( strokeThickness ) || DoubleHelper.AreVirtuallyEqual( 0, strokeThickness );
-      }
-    }
-
-    #endregion
-
-    #region DefiningGeometry Protected Property
-
-    protected abstract override Geometry DefiningGeometry
-    {
-      get;
-    }
-
-    #endregion
-
-    internal virtual Rect GetDefiningGeometryBounds()
-    {
-      Geometry geometry = this.DefiningGeometry;
-
-      Debug.Assert( geometry != null );
-
-      return geometry.Bounds;
-    }
-
-    internal virtual Size GetNaturalSize()
-    {
-      Geometry geometry = this.DefiningGeometry;
-
-      Debug.Assert( geometry != null );
-
-      Rect bounds = geometry.GetRenderBounds( GetPen() );
-
-      return new Size( Math.Max( bounds.Right, 0 ), Math.Max( bounds.Bottom, 0 ) );
-    }
-
-    internal Pen GetPen()
-    {
-      if( this.IsPenEmptyOrUndefined )
-        return null;
-
-      if( _pen == null )
-      {
-        _pen = this.MakePen();
-      }
-
-      return _pen;
-    }
-
-    internal double GetStrokeThickness()
-    {
-      if( this.IsPenEmptyOrUndefined )
-        return 0d;
-
-      return Math.Abs( this.StrokeThickness );
-    }
-
-    internal bool IsSizeEmptyOrUndefined( Size size )
-    {
-      return ( DoubleHelper.IsNaN( size.Width ) || DoubleHelper.IsNaN( size.Height ) || size.IsEmpty );
-    }
-
-    private static void OnStrokeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( ShapeBase )d )._pen = null;
-    }
-
-    private Pen MakePen()
-    {
-      Pen pen = new Pen();
-      pen.Brush = this.Stroke;
-      pen.DashCap = this.StrokeDashCap;
-      if( this.StrokeDashArray != null || this.StrokeDashOffset != 0.0 )
-      {
-        pen.DashStyle = new DashStyle( this.StrokeDashArray, this.StrokeDashOffset );
-      }
-      pen.EndLineCap = this.StrokeEndLineCap;
-      pen.LineJoin = this.StrokeLineJoin;
-      pen.MiterLimit = this.StrokeMiterLimit;
-      pen.StartLineCap = this.StrokeStartLineCap;
-      pen.Thickness = Math.Abs( this.StrokeThickness );
-
-      return pen;
-    }
-
-    #region Private Fields
-
-    private Pen _pen = null;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
deleted file mode 100644
index ecfdaddf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="HorizontalContentAlignment"
-              Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="Padding"
-              Value="4,0,0,0" />
-      <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}">
-                  <!-- In Classic Theme, The Foreground shouldn't be applied to Checkmark and Text-->
-                  <CheckBox IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                     <CheckBox.Content>
-                        <ContentControl Content="{TemplateBinding Content}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        Foreground="{TemplateBinding Foreground}" />
-                     </CheckBox.Content>
-                  </CheckBox>
-               </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/Primitives/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
deleted file mode 100644
index eaf040a4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
+++ /dev/null
@@ -1,395 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">5</sys:Double>
-
-  <conv:WindowContentBorderMarginConverter x:Key="WindowContentBorderMarginConverter" />
-  <conv:WindowControlBackgroundConverter x:Key="WindowControlBackgroundConverter" />
-
-  <conv:CenterTitleConverter x:Key="CenterTitleConverter" />
-
-  <!-- =============================================================================== -->
-  <!-- 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="Auto" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition x:Name="HeaderRow"
-                             MinHeight="28" />
-              <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"
-                           FontSize="{TemplateBinding CaptionFontSize}"
-                           Text="{TemplateBinding Caption}"
-                           Foreground="{TemplateBinding CaptionForeground}"
-                           TextTrimming="CharacterEllipsis"
-                           Margin="5,0,5,0" />
-              </Grid>
-            </Grid>
-
-            <!-- Close-Maximize-Minimize Buttons -->
-            <StackPanel x:Name="ButtonsPanel"
-                        Grid.Row="0"
-                        Grid.RowSpan="2"
-                        Grid.Column="3"
-                        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"
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    Grid.Column="3"
-                    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="19"
-                      Width="19"
-                      Margin="0,5,0,5"
-                      IsTabStop="False">
-                <Path Height="5"
-                      RenderOptions.EdgeMode="Aliased"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center"
-                      Width="5"
-                      Fill="Transparent"
-                      Stretch="Uniform"
-                      Stroke="White"
-                      Data="{StaticResource toolWindowCloseGeometry}">
-                </Path>
-              </Button>
-            </Border>
-
-            <!-- Header Drag Thumb -->
-            <Thumb x:Name="PART_HeaderThumb"
-                   Grid.Row="0"
-                   Grid.RowSpan="2"
-                   Grid.Column="2"
-                   Opacity="0"
-                   IsTabStop="False">
-            </Thumb>
-          </Grid>
-
-          <!-- Content Border -->
-          <Border x:Name="ContentOuterBorder"
-                  Grid.Row="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}">
-              <AdornerDecorator>
-                <ContentPresenter x:Name="Content"
-                                  Content="{TemplateBinding Content}"
-                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
-              </AdornerDecorator>
-            </Border>
-          </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" />
-        <Setter Property="Height"
-                Value="0"
-                TargetName="HeaderRow" />
-      </Trigger>
-
-
-
-      <Trigger Property="WindowStyle"
-               Value="ToolWindow">
-        <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" />
-        <Setter Property="IsEnabled"
-                Value="False"
-                TargetName="Content" />
-      </Trigger>
-
-      <!-- Remove the Margin when there's 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>
-
-      <!-- Center the Window Title on the entire window -->
-      <DataTrigger Value="1">
-        <DataTrigger.Binding>
-          <MultiBinding Converter="{StaticResource CenterTitleConverter}">
-            <Binding ElementName="TitleText"
-                     Path="DesiredSize" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ActualWidth" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ColumnDefinitions" />
-          </MultiBinding>
-        </DataTrigger.Binding>
-        <Setter TargetName="Title"
-                Property="Column"
-                Value="0" />
-        <Setter TargetName="Title"
-                Property="ColumnSpan"
-                Value="4" />
-        <Setter TargetName="TitleGrid"
-                Property="HorizontalAlignment"
-                Value="Center" />
-      </DataTrigger>
-
-      <!-- Center the Window Title in it's own column -->
-      <DataTrigger Value="2">
-        <DataTrigger.Binding>
-          <MultiBinding Converter="{StaticResource CenterTitleConverter}">
-            <Binding ElementName="TitleText"
-                     Path="DesiredSize" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ActualWidth" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ColumnDefinitions" />
-          </MultiBinding>
-        </DataTrigger.Binding>
-        <Setter TargetName="TitleGrid"
-                Property="HorizontalAlignment"
-                Value="Center" />
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:WindowControl}">
-    <Setter Property="CloseButtonStyle"
-            Value="{StaticResource {ComponentResourceKey 
-                  TypeInTargetAssembly={x:Type local:WindowControl}, 
-                  ResourceId=DefaultCloseButtonStyle}}" />
-    <Setter Property="BorderBrush"
-            Value="#5D6C7A" />
-    <Setter Property="BorderThickness"
-            Value="1,1,1,1" />
-    <Setter Property="Background"
-            Value="{StaticResource Window_Background}" />
-    <Setter Property="CaptionFontSize"
-            Value="{StaticResource Window_CaptionFontSize}" />
-    <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/Primitives/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
deleted file mode 100644
index 970e66e3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="HorizontalContentAlignment"
-              Value="{Binding Path=HorizontalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="VerticalContentAlignment"
-              Value="{Binding Path=VerticalContentAlignment,RelativeSource={RelativeSource AncestorType={x:Type primitives:Selector}}}" />
-      <Setter Property="Padding"
-              Value="4,0,0,0" />
-      <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}">
-                  <!-- In Classic Theme, The Foreground shouldn't be applied to Checkmark and Text-->
-                  <CheckBox IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                            Padding="{TemplateBinding Padding}"
-                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                     <CheckBox.Content>
-                        <ContentControl Content="{TemplateBinding Content}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        Foreground="{TemplateBinding Foreground}" />
-                     </CheckBox.Content>
-                  </CheckBox>
-               </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/Primitives/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
deleted file mode 100644
index cb7bd023..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
+++ /dev/null
@@ -1,386 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">5</sys:Double>
-
-  <conv:WindowContentBorderMarginConverter x:Key="WindowContentBorderMarginConverter" />
-  <conv:WindowControlBackgroundConverter x:Key="WindowControlBackgroundConverter" />
-  <BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter" />
-
-  <conv:CenterTitleConverter x:Key="CenterTitleConverter" />
-
-  <!-- =============================================================================== -->
-  <!-- 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="Auto" />
-              </Grid.ColumnDefinitions>
-              <Grid.RowDefinitions>
-                <RowDefinition x:Name="HeaderRow"
-                               MinHeight="28" />
-                <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"
-                             FontSize="{TemplateBinding CaptionFontSize}"
-                             Text="{TemplateBinding Caption}"
-                             Foreground="{TemplateBinding CaptionForeground}"
-                             TextTrimming="CharacterEllipsis"
-                             Margin="5,0,5,0" />
-                </Grid>
-              </Grid>
-
-              <!-- Close-Maximize-Minimize Buttons -->
-              <StackPanel x:Name="ButtonsPanel"
-                          Grid.Row="0"
-                          Grid.RowSpan="2"
-                          Grid.Column="3"
-                          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}">
-                </Button>
-              </StackPanel>
-
-              <!-- ToolWindow Close Button -->
-              <Border x:Name="ToolWindowBorder"
-                      Grid.Row="0"
-                      Grid.RowSpan="2"
-                      Grid.Column="3"
-                      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>
-
-              <!-- Header Drag Thumb -->
-              <Thumb x:Name="PART_HeaderThumb"
-                     Grid.Row="0"
-                     Grid.RowSpan="2"
-                     Grid.Column="2"
-                     Opacity="0"
-                     IsTabStop="False">
-              </Thumb>
-            </Grid>
-
-            <!-- Content Border -->
-            <Border x:Name="ContentOuterBorder"
-                    Grid.Row="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="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}">
-                <Border x:Name="ContentInnerBorder"
-                        BorderBrush="#FFF2F2F2"
-                        BorderThickness="0">
-                  <!-- only visible for ToolWindow -->
-                  <AdornerDecorator>
-                    <ContentPresenter x:Name="Content"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}" />
-                  </AdornerDecorator>
-                </Border>
-              </Border>
-            </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" />
-        <Setter Property="Height"
-                Value="0"
-                TargetName="HeaderRow" />
-      </Trigger>
-
-
-
-      <Trigger Property="WindowStyle"
-               Value="ToolWindow">
-        <Setter Property="Height"
-                Value="Auto"
-                TargetName="HeaderRow" />
-        <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" />
-        <Setter Property="IsEnabled"
-                Value="False"
-                TargetName="Content" />
-      </Trigger>
-
-      <Trigger Property="IsKeyboardFocusWithin"
-               Value="True">
-        <Setter Property="KeyboardNavigation.TabNavigation"
-                Value="Cycle" />
-      </Trigger>
-
-      <!-- Remove the Margin when there's 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>
-
-      <!-- Center the Window Title on the entire window -->
-      <DataTrigger Value="1">
-        <DataTrigger.Binding>
-          <MultiBinding Converter="{StaticResource CenterTitleConverter}">
-            <Binding ElementName="TitleText"
-                     Path="DesiredSize" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ActualWidth" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ColumnDefinitions" />
-          </MultiBinding>
-        </DataTrigger.Binding>
-        <Setter TargetName="Title"
-                Property="Column"
-                Value="0" />
-        <Setter TargetName="Title"
-                Property="ColumnSpan"
-                Value="4" />
-        <Setter TargetName="TitleGrid"
-                Property="HorizontalAlignment"
-                Value="Center" />
-      </DataTrigger>
-
-      <!-- Center the Window Title in it's own column -->
-      <DataTrigger Value="2">
-        <DataTrigger.Binding>
-          <MultiBinding Converter="{StaticResource CenterTitleConverter}">
-            <Binding ElementName="TitleText"
-                     Path="DesiredSize" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ActualWidth" />
-            <Binding ElementName="PART_HeaderGrid"
-                     Path="ColumnDefinitions" />
-          </MultiBinding>
-        </DataTrigger.Binding>
-        <Setter TargetName="TitleGrid"
-                Property="HorizontalAlignment"
-                Value="Center" />
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <Style TargetType="{x:Type local:WindowControl}">
-    <Setter Property="CloseButtonStyle"
-            Value="{StaticResource {ComponentResourceKey 
-                  TypeInTargetAssembly={x:Type local:WindowControl}, 
-                  ResourceId=DefaultCloseButtonStyle}}" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource Window_BorderBrush}" />
-    <Setter Property="BorderThickness"
-            Value="{StaticResource Window_BorderThickness}" />
-    <Setter Property="Background"
-            Value="{StaticResource Window_Background}" />
-    <Setter Property="CaptionFontSize"
-            Value="{StaticResource Window_CaptionFontSize}" />
-    <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/Primitives/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
deleted file mode 100644
index 5fa821af..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.Themes
-{
-  public static class ResourceKeys
-  {
-    #region Brush Keys
-
-    public static readonly ComponentResourceKey ControlNormalBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlNormalBackgroundKey" );
-    public static readonly ComponentResourceKey ControlDisabledBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" );
-    public static readonly ComponentResourceKey ControlNormalBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" );
-    public static readonly ComponentResourceKey ControlMouseOverBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" );
-    public static readonly ComponentResourceKey ControlSelectedBorderKey = new ComponentResourceKey(typeof(ResourceKeys), "ControlSelectedBorderKey");
-    public static readonly ComponentResourceKey ControlFocusedBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" );
-
-    public static readonly ComponentResourceKey ButtonNormalOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonNormalInnerBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonNormalInnerBorderKey" );
-    public static readonly ComponentResourceKey ButtonNormalBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonNormalBackgroundKey" );
-
-    public static readonly ComponentResourceKey ButtonMouseOverBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonMouseOverBackgroundKey" );
-    public static readonly ComponentResourceKey ButtonMouseOverOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonMouseOverOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonMouseOverInnerBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonMouseOverInnerBorderKey" );
-
-    public static readonly ComponentResourceKey ButtonPressedOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonPressedOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonPressedInnerBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonPressedInnerBorderKey" );
-    public static readonly ComponentResourceKey ButtonPressedBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonPressedBackgroundKey" );
-
-    public static readonly ComponentResourceKey ButtonFocusedOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonFocusedOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonFocusedInnerBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonFocusedInnerBorderKey" );
-    public static readonly ComponentResourceKey ButtonFocusedBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonFocusedBackgroundKey" );
-
-    public static readonly ComponentResourceKey ButtonDisabledOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonDisabledOuterBorderKey" );
-    public static readonly ComponentResourceKey ButtonInnerBorderDisabledKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonInnerBorderDisabledKey" );
-
-    #endregion //Brush Keys
-
-    public static readonly ComponentResourceKey GlyphNormalForegroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "GlyphNormalForegroundKey" );
-    public static readonly ComponentResourceKey GlyphDisabledForegroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "GlyphDisabledForegroundKey" );
-
-    public static readonly ComponentResourceKey SpinButtonCornerRadiusKey = new ComponentResourceKey( typeof( ResourceKeys ), "SpinButtonCornerRadiusKey" );
-
-    public static readonly ComponentResourceKey SpinnerButtonStyleKey = new ComponentResourceKey( typeof( ResourceKeys ), "SpinnerButtonStyleKey" );
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
deleted file mode 100644
index ac2430fc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
+++ /dev/null
@@ -1,859 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Input;
-using System.Globalization;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  [TemplatePart( Name = PART_TextBox, Type = typeof( TextBox ) )]
-  [TemplatePart( Name = PART_Spinner, Type = typeof( Spinner ) )]
-  public abstract class UpDownBase<T> : InputBase, IValidateInput
-  {
-    #region Members
-
-    /// <summary>
-    /// Name constant for Text template part.
-    /// </summary>
-    internal const string PART_TextBox = "PART_TextBox";
-
-    /// <summary>
-    /// Name constant for Spinner template part.
-    /// </summary>
-    internal const string PART_Spinner = "PART_Spinner";
-
-    internal bool _isTextChangedFromUI;
-
-    /// <summary>
-    /// Flags if the Text and Value properties are in the process of being sync'd
-    /// </summary>
-    private bool _isSyncingTextAndValueProperties;
-    private bool _internalValueSet;
-
-    #endregion //Members
-
-    #region Properties
-
-    protected Spinner Spinner
-    {
-      get;
-      private set;
-    }
-    protected TextBox TextBox
-    {
-      get;
-      private set;
-    }
-
-    #region AllowSpin
-
-    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( UpDownBase<T> ),
-
-new UIPropertyMetadata( true ) );
-    public bool AllowSpin
-    {
-      get
-      {
-        return (bool)GetValue( AllowSpinProperty );
-      }
-      set
-      {
-        SetValue( AllowSpinProperty, value );
-      }
-    }
-
-    #endregion //AllowSpin
-
-    #region ButtonSpinnerLocation
-
-    public static readonly DependencyProperty ButtonSpinnerLocationProperty = DependencyProperty.Register( "ButtonSpinnerLocation", typeof( Location
-
-), typeof( UpDownBase<T> ), new UIPropertyMetadata( Location.Right ) );
-    public Location ButtonSpinnerLocation
-    {
-      get
-      {
-        return (Location)GetValue( ButtonSpinnerLocationProperty );
-      }
-      set
-      {
-        SetValue( ButtonSpinnerLocationProperty, value );
-      }
-    }
-
-    #endregion //ButtonSpinnerLocation
-
-    #region ClipValueToMinMax
-
-    public static readonly DependencyProperty ClipValueToMinMaxProperty = DependencyProperty.Register( "ClipValueToMinMax", typeof( bool ), typeof(
-
-UpDownBase<T> ), new UIPropertyMetadata( false ) );
-    public bool ClipValueToMinMax
-    {
-      get
-      {
-        return (bool)GetValue( ClipValueToMinMaxProperty );
-      }
-      set
-      {
-        SetValue( ClipValueToMinMaxProperty, value );
-      }
-    }
-
-    #endregion //ClipValueToMinMax
-
-    #region DisplayDefaultValueOnEmptyText
-
-    public static readonly DependencyProperty DisplayDefaultValueOnEmptyTextProperty = DependencyProperty.Register( "DisplayDefaultValueOnEmptyText",
-
-typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( false, OnDisplayDefaultValueOnEmptyTextChanged ) );
-    public bool DisplayDefaultValueOnEmptyText
-    {
-      get
-      {
-        return (bool)GetValue( DisplayDefaultValueOnEmptyTextProperty );
-      }
-      set
-      {
-        SetValue( DisplayDefaultValueOnEmptyTextProperty, value );
-      }
-    }
-
-    private static void OnDisplayDefaultValueOnEmptyTextChanged( DependencyObject source, DependencyPropertyChangedEventArgs args )
-    {
-      ((UpDownBase<T>)source).OnDisplayDefaultValueOnEmptyTextChanged( (bool)args.OldValue, (bool)args.NewValue );
-    }
-
-    private void OnDisplayDefaultValueOnEmptyTextChanged( bool oldValue, bool newValue )
-    {
-      if( this.IsInitialized && string.IsNullOrEmpty( Text ) )
-      {
-        this.SyncTextAndValueProperties( false, Text );
-      }
-    }
-
-    #endregion //DisplayDefaultValueOnEmptyText
-
-    #region DefaultValue
-
-    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( "DefaultValue", typeof( T ), typeof( UpDownBase<T>
-
-), new UIPropertyMetadata( default( T ), OnDefaultValueChanged ) );
-    public T DefaultValue
-    {
-      get
-      {
-        return (T)GetValue( DefaultValueProperty );
-      }
-      set
-      {
-        SetValue( DefaultValueProperty, value );
-      }
-    }
-
-    private static void OnDefaultValueChanged( DependencyObject source, DependencyPropertyChangedEventArgs args )
-    {
-      ((UpDownBase<T>)source).OnDefaultValueChanged( (T)args.OldValue, (T)args.NewValue );
-    }
-
-    private void OnDefaultValueChanged( T oldValue, T newValue )
-    {
-      if( this.IsInitialized && string.IsNullOrEmpty( Text ) )
-      {
-        this.SyncTextAndValueProperties( true, Text );
-      }
-    }
-
-    #endregion //DefaultValue
-
-    #region Maximum
-
-    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register( "Maximum", typeof( T ), typeof( UpDownBase<T> ), new
-
-UIPropertyMetadata( default( T ), OnMaximumChanged, OnCoerceMaximum ) );
-    public T Maximum
-    {
-      get
-      {
-        return (T)GetValue( MaximumProperty );
-      }
-      set
-      {
-        SetValue( MaximumProperty, value );
-      }
-    }
-
-    private static void OnMaximumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      UpDownBase<T> upDown = o as UpDownBase<T>;
-      if( upDown != null )
-        upDown.OnMaximumChanged( (T)e.OldValue, (T)e.NewValue );
-    }
-
-    protected virtual void OnMaximumChanged( T oldValue, T newValue )
-    {
-      if( this.IsInitialized )
-      {
-        SetValidSpinDirection();
-      }
-    }
-
-    private static object OnCoerceMaximum( DependencyObject d, object baseValue )
-    {
-      UpDownBase<T> upDown = d as UpDownBase<T>;
-      if( upDown != null )
-        return upDown.OnCoerceMaximum( (T)baseValue );
-
-      return baseValue;
-    }
-
-    protected virtual T OnCoerceMaximum( T baseValue )
-    {
-      return baseValue;
-    }
-
-    #endregion //Maximum
-
-    #region Minimum
-
-    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register( "Minimum", typeof( T ), typeof( UpDownBase<T> ), new
-
-UIPropertyMetadata( default( T ), OnMinimumChanged, OnCoerceMinimum ) );
-    public T Minimum
-    {
-      get
-      {
-        return (T)GetValue( MinimumProperty );
-      }
-      set
-      {
-        SetValue( MinimumProperty, value );
-      }
-    }
-
-    private static void OnMinimumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      UpDownBase<T> upDown = o as UpDownBase<T>;
-      if( upDown != null )
-        upDown.OnMinimumChanged( (T)e.OldValue, (T)e.NewValue );
-    }
-
-    protected virtual void OnMinimumChanged( T oldValue, T newValue )
-    {
-      if( this.IsInitialized )
-      {
-        SetValidSpinDirection();
-      }
-    }
-
-    private static object OnCoerceMinimum( DependencyObject d, object baseValue )
-    {
-      UpDownBase<T> upDown = d as UpDownBase<T>;
-      if( upDown != null )
-        return upDown.OnCoerceMinimum( (T)baseValue );
-
-      return baseValue;
-    }
-
-    protected virtual T OnCoerceMinimum( T baseValue )
-    {
-      return baseValue;
-    }
-
-    #endregion //Minimum
-
-    #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.FocusedMouseOver ) );
-
-    /// <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
-
-    [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.FocusedMouseOver
-          : MouseWheelActiveTrigger.MouseOver;
-    }
-
-    #endregion //MouseWheelActiveOnFocus
-
-    #region ShowButtonSpinner
-
-    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof(
-
-UpDownBase<T> ), new UIPropertyMetadata( true ) );
-    public bool ShowButtonSpinner
-    {
-      get
-      {
-        return (bool)GetValue( ShowButtonSpinnerProperty );
-      }
-      set
-      {
-        SetValue( ShowButtonSpinnerProperty, value );
-      }
-    }
-
-    #endregion //ShowButtonSpinner
-
-    #region UpdateValueOnEnterKey
-
-    public static readonly DependencyProperty UpdateValueOnEnterKeyProperty = DependencyProperty.Register( "UpdateValueOnEnterKey", typeof( bool ), typeof( UpDownBase<T> ), 
-      new FrameworkPropertyMetadata( false, OnUpdateValueOnEnterKeyChanged ) );
-    public bool UpdateValueOnEnterKey
-    {
-      get
-      {
-        return (bool)GetValue( UpdateValueOnEnterKeyProperty );
-      }
-      set
-      {
-        SetValue( UpdateValueOnEnterKeyProperty, value );
-      }
-    }
-
-    private static void OnUpdateValueOnEnterKeyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var upDownBase = o as UpDownBase<T>;
-      if( upDownBase != null )
-        upDownBase.OnUpdateValueOnEnterKeyChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnUpdateValueOnEnterKeyChanged( bool oldValue, bool newValue )
-    {
-    }
-
-    #endregion //UpdateValueOnEnterKey
-
-    #region Value
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase<T> ), 
-      new FrameworkPropertyMetadata( default( T ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, OnCoerceValue, false, UpdateSourceTrigger.PropertyChanged ) );
-    public T Value
-    {
-      get
-      {
-        return (T)GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private void SetValueInternal( T value )
-    {
-      _internalValueSet = true;
-      try
-      {
-        this.Value = value;
-      }
-      finally
-      {
-        _internalValueSet = false;
-      }
-    }
-
-    private static object OnCoerceValue( DependencyObject o, object basevalue )
-    {
-      return ((UpDownBase<T>)o).OnCoerceValue( basevalue );
-    }
-
-    protected virtual object OnCoerceValue( object newValue )
-    {
-      return newValue;
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      UpDownBase<T> upDownBase = o as UpDownBase<T>;
-      if( upDownBase != null )
-        upDownBase.OnValueChanged( (T)e.OldValue, (T)e.NewValue );
-    }
-
-    protected virtual void OnValueChanged( T oldValue, T newValue )
-    {
-      if( !_internalValueSet && this.IsInitialized )
-      {
-        SyncTextAndValueProperties( false, null, true );
-      }
-
-      SetValidSpinDirection();
-
-      this.RaiseValueChangedEvent( oldValue, newValue );
-    }
-
-    #endregion //Value
-
-    #endregion //Properties
-
-    #region Constructors
-
-    internal UpDownBase()
-    {
-
-      this.AddHandler( Mouse.PreviewMouseDownOutsideCapturedElementEvent, new RoutedEventHandler( this.HandleClickOutsideOfControlWithMouseCapture ),
-
-true );
-      this.IsKeyboardFocusWithinChanged += this.UpDownBase_IsKeyboardFocusWithinChanged;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override void OnAccessKey( AccessKeyEventArgs e )
-    {
-      if( TextBox != null )
-        TextBox.Focus();
-
-      base.OnAccessKey( e );
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( TextBox != null )
-      {
-        TextBox.TextChanged -= new TextChangedEventHandler( TextBox_TextChanged );
-        TextBox.RemoveHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( this.TextBox_PreviewMouseDown ) );
-      }
-
-      TextBox = GetTemplateChild( PART_TextBox ) as TextBox;
-
-      if( TextBox != null )
-      {
-        TextBox.Text = Text;
-        TextBox.TextChanged += new TextChangedEventHandler( TextBox_TextChanged );
-        TextBox.AddHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( this.TextBox_PreviewMouseDown ), true );
-      }
-
-      if( Spinner != null )
-        Spinner.Spin -= OnSpinnerSpin;
-
-      Spinner = GetTemplateChild( PART_Spinner ) as Spinner;
-
-      if( Spinner != null )
-        Spinner.Spin += OnSpinnerSpin;
-
-      SetValidSpinDirection();
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      switch( e.Key )
-      {
-        case Key.Enter:
-          {
-            // Commit Text on "Enter" to raise Error event 
-            bool commitSuccess = CommitInput();
-            //Only handle if an exception is detected (Commit fails)
-            e.Handled = !commitSuccess;
-            break;
-          }
-      }
-    }
-
-    protected override void OnTextChanged( string oldValue, string newValue )
-    {
-      if( this.IsInitialized )
-      {
-        // When text is typed, if UpdateValueOnEnterKey is true, 
-        // Sync Value on Text only when Enter Key is pressed.
-        if( this.UpdateValueOnEnterKey )
-        {
-          if( !_isTextChangedFromUI )
-          {
-            this.SyncTextAndValueProperties( true, Text );
-          }
-        }
-        else
-        {
-          this.SyncTextAndValueProperties( true, Text );
-        }
-      }
-    }
-
-    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
-    {
-      if( IsInitialized )
-      {
-        SyncTextAndValueProperties( false, null );
-      }
-    }
-
-    protected override void OnReadOnlyChanged( bool oldValue, bool newValue )
-    {
-      SetValidSpinDirection();
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void TextBox_PreviewMouseDown( object sender, RoutedEventArgs e )
-    {
-      if( this.MouseWheelActiveTrigger == Primitives.MouseWheelActiveTrigger.Focused )
-      {
-        //Capture the spinner when user clicks on the control.
-        if( Mouse.Captured != this.Spinner )
-        {
-          //Delay the capture to let the DateTimeUpDown select a new DateTime part.
-          this.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
-          {
-            Mouse.Capture( this.Spinner );
-          }
-          ) );
-        }
-      }
-    }
-
-    private void HandleClickOutsideOfControlWithMouseCapture( object sender, RoutedEventArgs e )
-    {
-      if( Mouse.Captured is Spinner )
-      {
-        //Release the captured spinner when user clicks away from spinner.
-        this.Spinner.ReleaseMouseCapture();
-      }
-    }
-
-    private void OnSpinnerSpin( object sender, SpinEventArgs e )
-    {
-      if( AllowSpin && !IsReadOnly )
-      {
-        var activeTrigger = this.MouseWheelActiveTrigger;
-        bool spin = !e.UsingMouseWheel;
-        spin |= (activeTrigger == MouseWheelActiveTrigger.MouseOver);
-        spin |= ( (TextBox  != null) && TextBox.IsFocused && (activeTrigger == MouseWheelActiveTrigger.FocusedMouseOver));
-        spin |= ( (TextBox != null) && TextBox.IsFocused && (activeTrigger == MouseWheelActiveTrigger.Focused) && (Mouse.Captured is Spinner));
-
-        if( spin )
-        {
-          e.Handled = true;
-          OnSpin( e );
-        }
-      }
-    }
-
-    #endregion //Event Handlers
-
-    #region Events
-
-    public event InputValidationErrorEventHandler InputValidationError;
-
-    public event EventHandler<SpinEventArgs> Spinned;
-
-    #region ValueChanged Event
-
-    //Due to a bug in Visual Studio, you cannot create event handlers for generic T args in XAML, so I have to use object instead.
-    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof(
-
-RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
-    public event RoutedPropertyChangedEventHandler<object> ValueChanged
-    {
-      add
-      {
-        AddHandler( ValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ValueChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #endregion //Events
-
-    #region Methods
-
-    protected virtual void OnSpin( SpinEventArgs e )
-    {
-      if( e == null )
-        throw new ArgumentNullException( "e" );
-
-      // Raise the Spinned event to user
-      EventHandler<SpinEventArgs> handler = this.Spinned;
-      if( handler != null )
-      {
-        handler( this, e );
-      }
-
-      if( e.Direction == SpinDirection.Increase )
-        DoIncrement();
-      else
-        DoDecrement();
-    }
-
-    protected virtual void RaiseValueChangedEvent( T oldValue, T newValue )
-    {
-      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
-      args.RoutedEvent = ValueChangedEvent;
-      RaiseEvent( args );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-      // When both Value and Text are initialized, Value has priority.
-      // 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>
-    internal void DoDecrement()
-    {
-      if( Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease )
-      {
-        OnDecrement();
-      }
-    }
-
-    /// <summary>
-    /// Performs a decrement if conditions allow it.
-    /// </summary>
-    internal void DoIncrement()
-    {
-      if( Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase )
-      {
-        OnIncrement();
-      }
-    }
-
-    private void TextBox_TextChanged( object sender, TextChangedEventArgs e )
-    {
-      if( !this.IsKeyboardFocusWithin )
-        return;
-
-      try
-      {
-        _isTextChangedFromUI = true;
-        Text = ((TextBox)sender).Text;
-      }
-      finally
-      {
-        _isTextChangedFromUI = false;
-      }
-    }
-
-    private void UpDownBase_IsKeyboardFocusWithinChanged( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      if( !(bool)e.NewValue )
-      {
-        this.CommitInput();
-      }
-    }
-
-    private void RaiseInputValidationError( Exception e )
-    {
-      if( InputValidationError != null )
-      {
-        InputValidationErrorEventArgs args = new InputValidationErrorEventArgs( e );
-        InputValidationError( this, args );
-        if( args.ThrowException )
-        {
-          throw args.Exception;
-        }
-      }
-    }
-
-    public virtual bool CommitInput()
-    {
-      return this.SyncTextAndValueProperties( true, 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;
-
-      _isSyncingTextAndValueProperties = true;
-      bool parsedTextIsValid = true;
-      try
-      {
-        if( updateValueFromText )
-        {
-          if( string.IsNullOrEmpty( text ) )
-          {
-            // An empty input sets the value to the default value.
-            this.SetValueInternal( this.DefaultValue );
-          }
-          else
-          {
-            try
-            {
-              T newValue = this.ConvertTextToValue( text );
-              if( !object.Equals( newValue, this.Value ) )
-              {
-                this.SetValueInternal( newValue );
-              }
-            }
-            catch( Exception e )
-            {
-              parsedTextIsValid = false;
-
-              // From the UI, just allow any input.
-              if( !_isTextChangedFromUI )
-              {
-                // This call may throw an exception. 
-                // See RaiseInputValidationError() implementation.
-                this.RaiseInputValidationError( e );
-              }
-            }
-          }
-        }
-
-        // Do not touch the ongoing text input from user.
-        if( !_isTextChangedFromUI )
-        {
-          // Don't replace the empty Text with the non-empty representation of DefaultValue.
-          bool shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty( Text ) && object.Equals( Value, DefaultValue ) && !this.DisplayDefaultValueOnEmptyText;
-          if( !shouldKeepEmpty )
-          {
-            string newText = ConvertValueToText();
-            if( !object.Equals( this.Text, newText ) )
-            {
-              Text = newText;
-            }
-          }
-
-          // Sync Text and textBox
-          if( TextBox != null )
-            TextBox.Text = Text;
-        }
-
-        if( _isTextChangedFromUI && !parsedTextIsValid )
-        {
-          // Text input was made from the user and the text
-          // repesents an invalid value. Disable the spinner
-          // in this case.
-          if( Spinner != null )
-          {
-            Spinner.ValidSpinDirection = ValidSpinDirections.None;
-          }
-        }
-        else
-        {
-          this.SetValidSpinDirection();
-        }
-      }
-      finally
-      {
-        _isSyncingTextAndValueProperties = false;
-      }
-      return parsedTextIsValid;
-    }
-
-    #region Abstract
-
-    /// <summary>
-    /// Converts the formatted text to a value.
-    /// </summary>
-    protected abstract T ConvertTextToValue( string text );
-
-    /// <summary>
-    /// Converts the value to formatted text.
-    /// </summary>
-    /// <returns></returns>
-    protected abstract string ConvertValueToText();
-
-    /// <summary>
-    /// Called by OnSpin when the spin direction is SpinDirection.Increase.
-    /// </summary>
-    protected abstract void OnIncrement();
-
-    /// <summary>
-    /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
-    /// </summary>
-    protected abstract void OnDecrement();
-
-    /// <summary>
-    /// Sets the valid spin directions.
-    /// </summary>
-    protected abstract void SetValidSpinDirection();
-
-    #endregion //Abstract
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
deleted file mode 100644
index 46cb091b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
+++ /dev/null
@@ -1,1212 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows;
-using System.Collections;
-using System.Reflection;
-using System.Windows.Input;
-using System.Windows.Documents;
-using System.Globalization;
-using Microsoft.Win32;
-using System.ComponentModel;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using System.Windows.Automation;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Primitives
-{
-  public class ValueRangeTextBox : AutoSelectTextBox
-  {
-    static ValueRangeTextBox()
-    {
-      ValueRangeTextBox.TextProperty.OverrideMetadata( typeof( ValueRangeTextBox ),
-        new FrameworkPropertyMetadata(
-        null,
-        new CoerceValueCallback( ValueRangeTextBox.TextCoerceValueCallback ) ) );
-
-      ValueRangeTextBox.AcceptsReturnProperty.OverrideMetadata( typeof( ValueRangeTextBox ),
-        new FrameworkPropertyMetadata(
-        false, null, new CoerceValueCallback( ValueRangeTextBox.AcceptsReturnCoerceValueCallback ) ) );
-
-      ValueRangeTextBox.AcceptsTabProperty.OverrideMetadata( typeof( ValueRangeTextBox ),
-        new FrameworkPropertyMetadata(
-        false, null, new CoerceValueCallback( ValueRangeTextBox.AcceptsTabCoerceValueCallback ) ) );
-    }
-
-    public ValueRangeTextBox()
-    {
-    }
-
-    #region AcceptsReturn Property
-
-    private static object AcceptsReturnCoerceValueCallback( DependencyObject sender, object value )
-    {
-      bool acceptsReturn = ( bool )value;
-
-      if( acceptsReturn )
-        throw new NotSupportedException( "The ValueRangeTextBox does not support the AcceptsReturn property." );
-
-      return false;
-    }
-
-    #endregion AcceptsReturn Property
-
-    #region AcceptsTab Property
-
-    private static object AcceptsTabCoerceValueCallback( DependencyObject sender, object value )
-    {
-      bool acceptsTab = ( bool )value;
-
-      if( acceptsTab )
-        throw new NotSupportedException( "The ValueRangeTextBox does not support the AcceptsTab property." );
-
-      return false;
-    }
-
-    #endregion AcceptsTab Property
-
-    #region BeepOnError Property
-
-    public bool BeepOnError
-    {
-      get
-      {
-        return ( bool )GetValue( BeepOnErrorProperty );
-      }
-      set
-      {
-        SetValue( BeepOnErrorProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty BeepOnErrorProperty =
-        DependencyProperty.Register( "BeepOnError", typeof( bool ), typeof( ValueRangeTextBox ), new UIPropertyMetadata( false ) );
-
-    #endregion BeepOnError Property
-
-    #region FormatProvider Property
-
-    public IFormatProvider FormatProvider
-    {
-      get
-      {
-        return ( IFormatProvider )GetValue( FormatProviderProperty );
-      }
-      set
-      {
-        SetValue( FormatProviderProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty FormatProviderProperty =
-        DependencyProperty.Register( "FormatProvider", typeof( IFormatProvider ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata( null,
-      new PropertyChangedCallback( ValueRangeTextBox.FormatProviderPropertyChangedCallback ) ) );
-
-    private static void FormatProviderPropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ValueRangeTextBox valueRangeTextBox = ( ValueRangeTextBox )sender;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return;
-
-      valueRangeTextBox.OnFormatProviderChanged();
-    }
-
-    internal virtual void OnFormatProviderChanged()
-    {
-      this.RefreshConversionHelpers();
-      this.RefreshCurrentText( false );
-      this.RefreshValue();
-    }
-
-    #endregion FormatProvider Property
-
-    #region MinValue Property
-
-    public object MinValue
-    {
-      get
-      {
-        return ( object )GetValue( MinValueProperty );
-      }
-      set
-      {
-        SetValue( MinValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty MinValueProperty =
-        DependencyProperty.Register( "MinValue", typeof( object ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata(
-      null,
-      null,
-      new CoerceValueCallback( ValueRangeTextBox.MinValueCoerceValueCallback ) ) );
-
-    private static object MinValueCoerceValueCallback( DependencyObject sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( value == null )
-        return value;
-
-      Type type = valueRangeTextBox.ValueDataType;
-
-      if( type == null )
-        throw new InvalidOperationException( "An attempt was made to set a minimum value when the ValueDataType property is null." );
-
-      if( valueRangeTextBox.IsFinalizingInitialization )
-        value = ValueRangeTextBox.ConvertValueToDataType( value, valueRangeTextBox.ValueDataType );
-
-      if( value.GetType() != type )
-        throw new ArgumentException( "The value is not of type " + type.Name + ".", "MinValue" );
-
-      IComparable comparable = value as IComparable;
-
-      if( comparable == null )
-        throw new InvalidOperationException( "MinValue does not implement the IComparable interface." );
-
-      // ValidateValueInRange will throw if it must.
-      object maxValue = valueRangeTextBox.MaxValue;
-
-      valueRangeTextBox.ValidateValueInRange( value, maxValue, valueRangeTextBox.Value );
-
-      return value;
-    }
-
-    #endregion MinValue Property
-
-    #region MaxValue Property
-
-    public object MaxValue
-    {
-      get
-      {
-        return ( object )GetValue( MaxValueProperty );
-      }
-      set
-      {
-        SetValue( MaxValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty MaxValueProperty =
-        DependencyProperty.Register( "MaxValue", typeof( object ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata(
-      null,
-      null,
-      new CoerceValueCallback( MaxValueCoerceValueCallback ) ) );
-
-    private static object MaxValueCoerceValueCallback( DependencyObject sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( value == null )
-        return value;
-
-      Type type = valueRangeTextBox.ValueDataType;
-
-      if( type == null )
-        throw new InvalidOperationException( "An attempt was made to set a maximum value when the ValueDataType property is null." );
-
-      if( valueRangeTextBox.IsFinalizingInitialization )
-        value = ValueRangeTextBox.ConvertValueToDataType( value, valueRangeTextBox.ValueDataType );
-
-      if( value.GetType() != type )
-        throw new ArgumentException( "The value is not of type " + type.Name + ".", "MinValue" );
-
-      IComparable comparable = value as IComparable;
-
-      if( comparable == null )
-        throw new InvalidOperationException( "MaxValue does not implement the IComparable interface." );
-
-      object minValue = valueRangeTextBox.MinValue;
-
-      // ValidateValueInRange will throw if it must.
-      valueRangeTextBox.ValidateValueInRange( minValue, value, valueRangeTextBox.Value );
-
-      return value;
-    }
-
-    #endregion MaxValue Property
-
-    #region NullValue Property
-
-    public object NullValue
-    {
-      get
-      {
-        return ( object )GetValue( NullValueProperty );
-      }
-      set
-      {
-        SetValue( NullValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NullValueProperty =
-        DependencyProperty.Register( "NullValue", typeof( object ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata(
-      null,
-      new PropertyChangedCallback( ValueRangeTextBox.NullValuePropertyChangedCallback ),
-      new CoerceValueCallback( NullValueCoerceValueCallback ) ) );
-
-    private static object NullValueCoerceValueCallback( DependencyObject sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( ( value == null ) || ( value == DBNull.Value ) )
-        return value;
-
-      Type type = valueRangeTextBox.ValueDataType;
-
-      if( type == null )
-        throw new InvalidOperationException( "An attempt was made to set a null value when the ValueDataType property is null." );
-
-      if( valueRangeTextBox.IsFinalizingInitialization )
-        value = ValueRangeTextBox.ConvertValueToDataType( value, valueRangeTextBox.ValueDataType );
-
-      if( value.GetType() != type )
-        throw new ArgumentException( "The value is not of type " + type.Name + ".", "NullValue" );
-
-      return value;
-    }
-
-    private static void NullValuePropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( e.OldValue == null )
-      {
-        if( valueRangeTextBox.Value == null )
-          valueRangeTextBox.RefreshValue();
-      }
-      else
-      {
-        if( e.OldValue.Equals( valueRangeTextBox.Value ) )
-          valueRangeTextBox.RefreshValue();
-      }
-    }
-
-    #endregion NullValue Property
-
-    #region Value Property
-
-    public object Value
-    {
-      get
-      {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ValueProperty =
-        DependencyProperty.Register( "Value", typeof( object ), typeof( ValueRangeTextBox ),
-      new FrameworkPropertyMetadata(
-      null,
-      FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-      new PropertyChangedCallback( ValueRangeTextBox.ValuePropertyChangedCallback ),
-      new CoerceValueCallback( ValueRangeTextBox.ValueCoerceValueCallback ) ) );
-
-    private static object ValueCoerceValueCallback( object sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( valueRangeTextBox.IsFinalizingInitialization )
-        value = ValueRangeTextBox.ConvertValueToDataType( value, valueRangeTextBox.ValueDataType );
-
-      if( !valueRangeTextBox.IsForcingValue )
-        valueRangeTextBox.ValidateValue( value );
-
-      return value;
-    }
-
-    private static void ValuePropertyChangedCallback( object sender, DependencyPropertyChangedEventArgs e )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( valueRangeTextBox.IsForcingValue )
-        return;
-
-      // The ValueChangedCallback can be raised even though both values are the same since the property
-      // datatype is Object.
-      if( object.Equals( e.NewValue, e.OldValue ) )
-        return;
-
-      valueRangeTextBox.IsInValueChanged = true;
-      try
-      {
-        valueRangeTextBox.Text = valueRangeTextBox.GetTextFromValue( e.NewValue );
-      }
-      finally
-      {
-        valueRangeTextBox.IsInValueChanged = false;
-      }
-    }
-
-    #endregion Value Property
-
-    #region ValueDataType Property
-
-    public Type ValueDataType
-    {
-      get
-      {
-        return ( Type )GetValue( ValueDataTypeProperty );
-      }
-      set
-      {
-        SetValue( ValueDataTypeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ValueDataTypeProperty =
-        DependencyProperty.Register( "ValueDataType", typeof( Type ), typeof( ValueRangeTextBox ),
-      new UIPropertyMetadata(
-      null,
-      new PropertyChangedCallback( ValueRangeTextBox.ValueDataTypePropertyChangedCallback ),
-      new CoerceValueCallback( ValueRangeTextBox.ValueDataTypeCoerceValueCallback ) ) );
-
-    private static object ValueDataTypeCoerceValueCallback( DependencyObject sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      Type valueDataType = value as Type;
-
-      try
-      {
-        valueRangeTextBox.ValidateDataType( valueDataType );
-      }
-      catch( Exception exception )
-      {
-        throw new ArgumentException( "An error occured while trying to change the ValueDataType.", exception );
-      }
-
-      return value;
-    }
-
-    private static void ValueDataTypePropertyChangedCallback( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      Type valueDataType = e.NewValue as Type;
-
-      valueRangeTextBox.IsNumericValueDataType = ValueRangeTextBox.IsNumericType( valueDataType );
-
-      valueRangeTextBox.RefreshConversionHelpers();
-
-      valueRangeTextBox.ConvertValuesToDataType( valueDataType );
-    }
-
-    internal virtual void ValidateDataType( Type type )
-    {
-      // Null will always be valid and will reset the MinValue, MaxValue, NullValue and Value to null.
-      if( type == null )
-        return;
-
-      // We use InvariantCulture instead of the active format provider since the FormatProvider is only
-      // used when the source type is String.  When we are converting from a string, we are
-      // actually converting a value from XAML.  Therefore, if the string will have a period as a
-      // decimal separator.  If we were using the active format provider, we could end up expecting a coma
-      // as the decimal separator and the ChangeType method would throw.
-
-      object minValue = this.MinValue;
-
-      if( ( minValue != null ) && ( minValue.GetType() != type ) )
-        minValue = System.Convert.ChangeType( minValue, type, CultureInfo.InvariantCulture );
-
-      object maxValue = this.MaxValue;
-
-      if( ( maxValue != null ) && ( maxValue.GetType() != type ) )
-        maxValue = System.Convert.ChangeType( maxValue, type, CultureInfo.InvariantCulture );
-
-      object nullValue = this.NullValue;
-
-      if( ( ( nullValue != null ) && ( nullValue != DBNull.Value ) )
-        && ( nullValue.GetType() != type ) )
-      {
-        nullValue = System.Convert.ChangeType( nullValue, type, CultureInfo.InvariantCulture );
-      }
-
-      object value = this.Value;
-
-      if( ( ( value != null ) && ( value != DBNull.Value ) )
-        && ( value.GetType() != type ) )
-      {
-        value = System.Convert.ChangeType( value, type, CultureInfo.InvariantCulture );
-      }
-
-      if( ( minValue != null ) || ( maxValue != null )
-        || ( ( nullValue != null ) && ( nullValue != DBNull.Value ) ) )
-      {
-        // Value comparaisons will occur.  Therefore, the aspiring data type must implement IComparable.
-
-        Type iComparable = type.GetInterface( "IComparable" );
-
-        if( iComparable == null )
-          throw new InvalidOperationException( "MinValue, MaxValue, and NullValue must implement the IComparable interface." );
-      }
-    }
-
-    private void ConvertValuesToDataType( Type type )
-    {
-      if( type == null )
-      {
-        this.MinValue = null;
-        this.MaxValue = null;
-        this.NullValue = null;
-
-        this.Value = null;
-
-        return;
-      }
-
-      object minValue = this.MinValue;
-
-      if( ( minValue != null ) && ( minValue.GetType() != type ) )
-        this.MinValue = ValueRangeTextBox.ConvertValueToDataType( minValue, type );
-
-      object maxValue = this.MaxValue;
-
-      if( ( maxValue != null ) && ( maxValue.GetType() != type ) )
-        this.MaxValue = ValueRangeTextBox.ConvertValueToDataType( maxValue, type );
-
-      object nullValue = this.NullValue;
-
-      if( ( ( nullValue != null ) && ( nullValue != DBNull.Value ) )
-        && ( nullValue.GetType() != type ) )
-      {
-        this.NullValue = ValueRangeTextBox.ConvertValueToDataType( nullValue, type );
-      }
-
-      object value = this.Value;
-
-      if( ( ( value != null ) && ( value != DBNull.Value ) )
-        && ( value.GetType() != type ) )
-      {
-        this.Value = ValueRangeTextBox.ConvertValueToDataType( value, type );
-      }
-    }
-
-    #endregion ValueDataType Property
-
-    #region Text Property
-
-    private static object TextCoerceValueCallback( object sender, object value )
-    {
-      ValueRangeTextBox valueRangeTextBox = sender as ValueRangeTextBox;
-
-      if( !valueRangeTextBox.IsInitialized )
-        return DependencyProperty.UnsetValue;
-
-      if( value == null )
-        return string.Empty;
-
-      return value;
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      // If in IME Composition, RefreshValue already returns without doing anything.
-      this.RefreshValue();
-
-      base.OnTextChanged( e );
-    }
-
-    #endregion Text Property
-
-    #region HasValidationError Property
-
-    private static readonly DependencyPropertyKey HasValidationErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "HasValidationError", typeof( bool ), typeof( ValueRangeTextBox ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasValidationErrorProperty = ValueRangeTextBox.HasValidationErrorPropertyKey.DependencyProperty;
-
-    public bool HasValidationError
-    {
-      get
-      {
-        return ( bool )this.GetValue( ValueRangeTextBox.HasValidationErrorProperty );
-      }
-    }
-
-    private void SetHasValidationError( bool value )
-    {
-      this.SetValue( ValueRangeTextBox.HasValidationErrorPropertyKey, value );
-    }
-
-    #endregion HasValidationError Property
-
-    #region HasParsingError Property
-
-    private static readonly DependencyPropertyKey HasParsingErrorPropertyKey =
-        DependencyProperty.RegisterReadOnly( "HasParsingError", typeof( bool ), typeof( ValueRangeTextBox ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasParsingErrorProperty = ValueRangeTextBox.HasParsingErrorPropertyKey.DependencyProperty;
-
-    public bool HasParsingError
-    {
-      get
-      {
-        return ( bool )this.GetValue( ValueRangeTextBox.HasParsingErrorProperty );
-      }
-    }
-
-    internal void SetHasParsingError( bool value )
-    {
-      this.SetValue( ValueRangeTextBox.HasParsingErrorPropertyKey, value );
-    }
-
-    #endregion HasParsingError Property
-
-    #region IsValueOutOfRange Property
-
-    private static readonly DependencyPropertyKey IsValueOutOfRangePropertyKey =
-        DependencyProperty.RegisterReadOnly( "IsValueOutOfRange", typeof( bool ), typeof( ValueRangeTextBox ), new UIPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsValueOutOfRangeProperty = ValueRangeTextBox.IsValueOutOfRangePropertyKey.DependencyProperty;
-
-    public bool IsValueOutOfRange
-    {
-      get
-      {
-        return ( bool )this.GetValue( ValueRangeTextBox.IsValueOutOfRangeProperty );
-      }
-    }
-
-    private void SetIsValueOutOfRange( bool value )
-    {
-      this.SetValue( ValueRangeTextBox.IsValueOutOfRangePropertyKey, value );
-    }
-
-    #endregion IsValueOutOfRange Property
-
-    #region IsInValueChanged property
-
-    internal bool IsInValueChanged
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsInValueChanged ];
-      }
-      private set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsInValueChanged ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsForcingValue property
-
-    internal bool IsForcingValue
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsForcingValue ];
-      }
-      private set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsForcingValue ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsForcingText property
-
-    internal bool IsForcingText
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsForcingText ];
-      }
-      private set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsForcingText ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsNumericValueDataType property
-
-    internal bool IsNumericValueDataType
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsNumericValueDataType ];
-      }
-      private set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsNumericValueDataType ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsTextReadyToBeParsed property
-
-    internal virtual bool IsTextReadyToBeParsed
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-    #endregion
-
-    #region IsInIMEComposition property
-
-    internal bool IsInIMEComposition
-    {
-      get
-      {
-        return m_imePreCompositionCachedTextInfo != null;
-      }
-    }
-
-    #endregion
-
-    #region IsFinalizingInitialization Property
-
-    private bool IsFinalizingInitialization
-    {
-      get
-      {
-        return m_flags[ ( int )ValueRangeTextBoxFlags.IsFinalizingInitialization ];
-      }
-      set
-      {
-        m_flags[ ( int )ValueRangeTextBoxFlags.IsFinalizingInitialization ] = value;
-      }
-    }
-
-    #endregion
-
-    #region TEXT FROM VALUE
-
-    public event EventHandler<QueryTextFromValueEventArgs> QueryTextFromValue;
-
-    internal string GetTextFromValue( object value )
-    {
-      string text = this.QueryTextFromValueCore( value );
-
-      QueryTextFromValueEventArgs e = new QueryTextFromValueEventArgs( value, text );
-
-      this.OnQueryTextFromValue( e );
-
-      return e.Text;
-    }
-
-    protected virtual string QueryTextFromValueCore( object value )
-    {
-      if( ( value == null ) || ( value == DBNull.Value ) )
-        return string.Empty;
-
-      IFormatProvider formatProvider = this.GetActiveFormatProvider();
-
-      CultureInfo cultureInfo = formatProvider as CultureInfo;
-
-      if( cultureInfo != null )
-      {
-        TypeConverter converter = TypeDescriptor.GetConverter( value.GetType() );
-
-        if( converter.CanConvertTo( typeof( string ) ) )
-          return ( string )converter.ConvertTo( null, cultureInfo, value, typeof( string ) );
-      }
-
-      try
-      {
-        string result = System.Convert.ToString( value, formatProvider );
-
-        return result;
-      }
-      catch
-      {
-      }
-
-      return value.ToString();
-    }
-
-    private void OnQueryTextFromValue( QueryTextFromValueEventArgs e )
-    {
-      if( this.QueryTextFromValue != null )
-        this.QueryTextFromValue( this, e );
-    }
-
-    #endregion TEXT FROM VALUE
-
-    #region VALUE FROM TEXT
-
-    public event EventHandler<QueryValueFromTextEventArgs> QueryValueFromText;
-
-    internal object GetValueFromText( string text, out bool hasParsingError )
-    {
-      object value = null;
-      bool success = this.QueryValueFromTextCore( text, out value );
-
-      QueryValueFromTextEventArgs e = new QueryValueFromTextEventArgs( text, value );
-      e.HasParsingError = !success;
-
-      this.OnQueryValueFromText( e );
-
-      hasParsingError = e.HasParsingError;
-
-      return e.Value;
-    }
-
-    protected virtual bool QueryValueFromTextCore( string text, out object value )
-    {
-      value = null;
-
-      Type validatingType = this.ValueDataType;
-
-      text = text.Trim();
-
-      if( validatingType == null )
-        return true;
-
-      if( !validatingType.IsValueType && ( validatingType != typeof( string ) ) )
-        return false;
-
-      try
-      {
-        value = ChangeTypeHelper.ChangeType( text, validatingType, this.GetActiveFormatProvider() );
-      }
-      catch
-      {
-        if( this.BeepOnError )
-        {
-          System.Media.SystemSounds.Beep.Play();
-        }
-        return false;
-      }
-
-      return true;
-    }
-
-    private void OnQueryValueFromText( QueryValueFromTextEventArgs e )
-    {
-      if( this.QueryValueFromText != null )
-        this.QueryValueFromText( this, e );
-    }
-
-    #endregion VALUE FROM TEXT
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( ( e.ImeProcessedKey != Key.None ) && ( !this.IsInIMEComposition ) )
-      {
-        // Start of an IME Composition.  Cache all the critical infos.
-        this.StartIMEComposition();
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnGotFocus( RoutedEventArgs e )
-    {
-      base.OnGotFocus( e );
-
-      this.RefreshCurrentText( true );
-    }
-
-    protected override void OnLostFocus( RoutedEventArgs e )
-    {
-      base.OnLostFocus( e );
-
-      this.RefreshCurrentText( true );
-    }
-
-    protected override void OnTextInput( TextCompositionEventArgs e )
-    {
-      if( this.IsInIMEComposition )
-        this.EndIMEComposition();
-
-      base.OnTextInput( e );
-    }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly" )]
-    protected virtual void ValidateValue( object value )
-    {
-      if( value == null )
-        return;
-
-      Type validatingType = this.ValueDataType;
-      if( validatingType.IsGenericType && validatingType.GetGenericTypeDefinition().Equals( typeof( Nullable<> ) ) )
-      {
-        NullableConverter nullableConverter = new NullableConverter( validatingType );
-        validatingType = nullableConverter.UnderlyingType;
-      }
-
-      if( validatingType == null )
-        throw new InvalidOperationException( "An attempt was made to set a value when the ValueDataType property is null." );
-
-      if( ( value != DBNull.Value ) && ( value.GetType() != validatingType ) )
-        throw new ArgumentException( "The value is not of type " + validatingType.Name + ".", "Value" );
-
-      this.ValidateValueInRange( this.MinValue, this.MaxValue, value );
-    }
-
-    internal static bool IsNumericType( Type type )
-    {
-      if( type == null )
-        return false;
-
-      if( type.IsValueType )
-      {
-        if( ( type == typeof( int ) ) || ( type == typeof( double ) ) || ( type == typeof( decimal ) )
-          || ( type == typeof( float ) ) || ( type == typeof( short ) ) || ( type == typeof( long ) )
-          || ( type == typeof( ushort ) ) || ( type == typeof( uint ) ) || ( type == typeof( ulong ) )
-          || ( type == typeof( byte ) )
-          )
-        {
-          return true;
-        }
-      }
-
-      return false;
-    }
-
-    internal void StartIMEComposition()
-    {
-      Debug.Assert( m_imePreCompositionCachedTextInfo == null, "EndIMEComposition should have been called before another IME Composition starts." );
-
-      m_imePreCompositionCachedTextInfo = new CachedTextInfo( this );
-    }
-
-    internal void EndIMEComposition()
-    {
-      CachedTextInfo cachedTextInfo = m_imePreCompositionCachedTextInfo.Clone() as CachedTextInfo;
-      m_imePreCompositionCachedTextInfo = null;
-
-      this.OnIMECompositionEnded( cachedTextInfo );
-    }
-
-    internal virtual void OnIMECompositionEnded( CachedTextInfo cachedTextInfo )
-    {
-    }
-
-    internal virtual void RefreshConversionHelpers()
-    {
-    }
-
-    internal IFormatProvider GetActiveFormatProvider()
-    {
-      IFormatProvider formatProvider = this.FormatProvider;
-
-      if( formatProvider != null )
-        return formatProvider;
-
-      return CultureInfo.CurrentCulture;
-    }
-
-    internal CultureInfo GetCultureInfo()
-    {
-      CultureInfo cultureInfo = this.GetActiveFormatProvider() as CultureInfo;
-
-      if( cultureInfo != null )
-        return cultureInfo;
-
-      return CultureInfo.CurrentCulture;
-    }
-
-    internal virtual string GetCurrentText()
-    {
-      return this.Text;
-    }
-
-    internal virtual string GetParsableText()
-    {
-      return this.Text;
-    }
-
-    internal void ForceText( string text, bool preserveCaret )
-    {
-      this.IsForcingText = true;
-      try
-      {
-        int oldCaretIndex = this.CaretIndex;
-
-        this.Text = text;
-
-        if( ( preserveCaret ) && ( this.IsLoaded ) )
-        {
-          try
-          {
-            this.SelectionStart = oldCaretIndex;
-          }
-          catch( NullReferenceException )
-          {
-          }
-        }
-      }
-      finally
-      {
-        this.IsForcingText = false;
-      }
-    }
-
-    internal bool IsValueNull( object value )
-    {
-      if( ( value == null ) || ( value == DBNull.Value ) )
-        return true;
-
-      Type type = this.ValueDataType;
-      if( type.IsGenericType && type.GetGenericTypeDefinition().Equals( typeof( Nullable<> ) ) )
-      {
-        NullableConverter nullableConverter = new NullableConverter( type );
-        type = nullableConverter.UnderlyingType;
-      }
-
-      if( value.GetType() != type )
-        value = System.Convert.ChangeType( value, type );
-
-      object nullValue = this.NullValue;
-
-      if( nullValue == null )
-        return false;
-
-      if( nullValue.GetType() != type )
-        nullValue = System.Convert.ChangeType( nullValue, type );
-
-      return nullValue.Equals( value );
-    }
-
-    internal void ForceValue( object value )
-    {
-      this.IsForcingValue = true;
-      try
-      {
-        this.Value = value;
-      }
-      finally
-      {
-        this.IsForcingValue = false;
-      }
-    }
-
-    internal void RefreshCurrentText( bool preserveCurrentCaretPosition )
-    {
-      string displayText = this.GetCurrentText();
-
-      if( !string.Equals( displayText, this.Text ) )
-        this.ForceText( displayText, preserveCurrentCaretPosition );
-    }
-
-    internal void RefreshValue()
-    {
-      if( ( this.IsForcingValue ) || ( this.ValueDataType == null ) || ( this.IsInIMEComposition ) )
-        return;
-
-      object value;
-      bool hasParsingError;
-
-      if( this.IsTextReadyToBeParsed )
-      {
-        string parsableText = this.GetParsableText();
-
-        value = this.GetValueFromText( parsableText, out hasParsingError );
-
-        if( this.IsValueNull( value ) )
-          value = this.NullValue;
-      }
-      else
-      {
-        // We don't consider empty text as a parsing error.
-        hasParsingError = !this.GetIsEditTextEmpty();
-        value = this.NullValue;
-      }
-
-      this.SetHasParsingError( hasParsingError );
-
-      bool hasValidationError = hasParsingError;
-      try
-      {
-        this.ValidateValue( value );
-
-        this.SetIsValueOutOfRange( false );
-      }
-      catch( Exception exception )
-      {
-        hasValidationError = true;
-
-        if( this.BeepOnError )
-        {
-          System.Media.SystemSounds.Beep.Play();
-        }
-
-        if( exception is ArgumentOutOfRangeException )
-          this.SetIsValueOutOfRange( true );
-
-        value = this.NullValue;
-      }
-
-      if( !object.Equals( value, this.Value ) )
-        this.ForceValue( value );
-
-      this.SetHasValidationError( hasValidationError );
-    }
-
-    internal virtual bool GetIsEditTextEmpty()
-    {
-      return this.Text == string.Empty;
-    }
-
-    private static object ConvertValueToDataType( object value, Type type )
-    {
-      // We use InvariantCulture instead of the active format provider since the FormatProvider is only
-      // used when the source type is String.  When we are converting from a string, we are
-      // actually converting a value from XAML.  Therefore, if the string will have a period as a
-      // decimal separator.  If we were using the active format provider, we could end up expecting a coma
-      // as the decimal separator and the ChangeType method would throw.
-      if( type == null )
-        return null;
-
-      if( ( ( value != null ) && ( value != DBNull.Value ) )
-        && ( value.GetType() != type ) )
-      {
-        return ChangeTypeHelper.ChangeType( value, type, CultureInfo.InvariantCulture );
-      }
-
-      return value;
-    }
-
-    private void CanEnterLineBreak( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-      e.Handled = true;
-    }
-
-    private void CanEnterParagraphBreak( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = false;
-      e.Handled = true;
-    }
-
-    private void ValidateValueInRange( object minValue, object maxValue, object value )
-    {
-      if( this.IsValueNull( value ) )
-        return;
-
-      Type type = this.ValueDataType;
-      if( type.IsGenericType && type.GetGenericTypeDefinition().Equals( typeof( Nullable<> ) ) )
-      {
-        NullableConverter nullableConverter = new NullableConverter( type );
-        type = nullableConverter.UnderlyingType;
-      }
-
-      if( value.GetType() != type )
-        value = System.Convert.ChangeType( value, type );
-
-      // Validate the value against the range.
-      if( minValue != null )
-      {
-        IComparable minValueComparable = ( IComparable )minValue;
-
-        if( ( maxValue != null ) && ( minValueComparable.CompareTo( maxValue ) > 0 ) )
-          throw new ArgumentOutOfRangeException( "minValue", "MaxValue must be greater than MinValue." );
-
-        if( minValueComparable.CompareTo( value ) > 0 )
-          throw new ArgumentOutOfRangeException( "minValue", "Value must be greater than MinValue." );
-      }
-
-      if( maxValue != null )
-      {
-        IComparable maxValueComparable = ( IComparable )maxValue;
-
-        if( maxValueComparable.CompareTo( value ) < 0 )
-          throw new ArgumentOutOfRangeException( "maxValue", "Value must be less than MaxValue." );
-      }
-    }
-
-    #region ISupportInitialize
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      this.IsFinalizingInitialization = true;
-      try
-      {
-        this.CoerceValue( ValueRangeTextBox.ValueDataTypeProperty );
-
-        this.IsNumericValueDataType = ValueRangeTextBox.IsNumericType( this.ValueDataType );
-        this.RefreshConversionHelpers();
-
-        this.CoerceValue( ValueRangeTextBox.MinValueProperty );
-        this.CoerceValue( ValueRangeTextBox.MaxValueProperty );
-
-        this.CoerceValue( ValueRangeTextBox.ValueProperty );
-
-        this.CoerceValue( ValueRangeTextBox.NullValueProperty );
-
-        this.CoerceValue( ValueRangeTextBox.TextProperty );
-      }
-      catch( Exception exception )
-      {
-        throw new InvalidOperationException( "Initialization of the ValueRangeTextBox failed.", exception );
-      }
-      finally
-      {
-        this.IsFinalizingInitialization = false;
-      }
-
-      base.OnInitialized( e );
-    }
-
-    #endregion ISupportInitialize
-
-    private BitVector32 m_flags;
-    private CachedTextInfo m_imePreCompositionCachedTextInfo;
-
-    [Flags]
-    private enum ValueRangeTextBoxFlags
-    {
-      IsFinalizingInitialization = 1,
-      IsForcingText = 2,
-      IsForcingValue = 4,
-      IsInValueChanged = 8,
-      IsNumericValueDataType = 16
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
deleted file mode 100644
index ee4ad3b4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
+++ /dev/null
@@ -1,451 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 )
-    {
-      foreach( WindowControl window in this.Children )
-      {
-        window.SetIsActiveInternal( false );
-      }
-      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;
-
-      WindowControl modalWindow = this.GetModalWindow();
-      if( modalWindow == null )
-      {
-        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 );
-      }
-    }
-
-    private void ExpandWindowControl( WindowControl windowControl )
-    {
-      if( windowControl != null )
-      {
-        windowControl.Left = 0;
-        windowControl.Top = 0;
-        windowControl.Width = Math.Min( this.ActualWidth, windowControl.MaxWidth );
-        windowControl.Height = Math.Min( this.ActualHeight, windowControl.MaxHeight );
-      }
-    }
-
-    #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 )
-    {
-      windowControl.UpdateLayout();
-
-      if( ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
-      {
-        windowControl.Left = ( this.ActualWidth - windowControl.ActualWidth ) / 2.0;
-        windowControl.Left += (windowControl.Margin.Left - windowControl.Margin.Right);
-        windowControl.Top = ( this.ActualHeight - windowControl.ActualHeight ) / 2.0;
-        windowControl.Top += ( windowControl.Margin.Top - windowControl.Margin.Bottom );
-      }
-    }
-
-    private void SetNextActiveWindow( WindowControl windowControl )
-    {
-      if( !this.IsLoaded )
-        return;
-
-      if( this.IsModalWindow( windowControl ) )
-      {
-        this.BringToFront( windowControl );
-      }
-      else
-      {
-        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>()
-                            .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) )
-                            .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 );
-
-        this.SetActiveWindow( windowControl );
-      }
-    }
-
-    private void SetActiveWindow( WindowControl windowControl )
-    {
-      if( windowControl.IsActive )
-        return;
-
-      foreach( WindowControl window in this.Children )
-      {
-        window.SetIsActiveInternal( false );
-      }
-      windowControl.SetIsActiveInternal( true );
-    }
-
-    private bool IsModalWindow( WindowControl windowControl )
-    {
-      return ( ( ( windowControl is MessageBox ) && (windowControl.Visibility == Visibility.Visible) )
-             || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal && ( ( ChildWindow )windowControl).WindowState == WindowState.Open ) );
-    }
-
-    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/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
deleted file mode 100644
index cd0553b0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
+++ /dev/null
@@ -1,870 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 CaptionFontSize
-
-    public static readonly DependencyProperty CaptionFontSizeProperty = DependencyProperty.Register( "CaptionFontSize", typeof( double ), typeof( WindowControl ), new UIPropertyMetadata( 15d ) );
-    public double CaptionFontSize
-    {
-      get
-      {
-        return (double)GetValue( CaptionFontSizeProperty );
-      }
-      set
-      {
-        SetValue( CaptionFontSizeProperty, value );
-      }
-    }
-
-    #endregion //CaptionFontSize
-
-    #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, OnIsActiveChanged, 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;
-    }
-
-    private static void OnIsActiveChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      var windowControl = obj as WindowControl;
-      if( windowControl != null )
-        windowControl.OnIsActiveChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsActiveChanged( bool oldValue, bool newValue )
-    {
-      if( newValue )
-      {
-        if( this.GetType() == typeof( WindowControl ) )
-        {
-          this.RaiseEvent( new RoutedEventArgs( ActivatedEvent, this ) );
-        }
-      }
-    }
-
-    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 ActivatedEvent
-
-    public static readonly RoutedEvent ActivatedEvent = EventManager.RegisterRoutedEvent( "Activated", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( WindowControl ) );
-    public event RoutedEventHandler Activated
-    {
-      add
-      {
-        AddHandler( ActivatedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( ActivatedEvent, value );
-      }
-    }
-
-    #endregion //ActivatedEvent
-
-    #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/PropertyGrid/Images/AdvancedProperties11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png
deleted file mode 100644
index 0146e932..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/AdvancedProperties11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png
deleted file mode 100644
index 51510df8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Categorize16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png
deleted file mode 100644
index aeaeab8d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/ClearFilter16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png
deleted file mode 100644
index 0f523fbd..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Database11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png
deleted file mode 100644
index 7dd3b491..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Inheritance11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png
deleted file mode 100644
index ec521dd4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Local11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png
deleted file mode 100644
index 7275c981..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Resource11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png
deleted file mode 100644
index b3138ba3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/SortAscending16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png
deleted file mode 100644
index 7a6005d6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Images/Style11.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
deleted file mode 100644
index fff07349..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  [AttributeUsage( AttributeTargets.Class, AllowMultiple = true )]
-  public class CategoryOrderAttribute : Attribute
-  {
-    #region Properties
-
-    #region Order
-
-    public int Order
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region Category
-
-    public virtual string Category
-    {
-      get
-      {
-        return CategoryValue;
-      }
-    }
-
-    #endregion
-
-    #region CategoryValue
-
-    public string CategoryValue
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #endregion
-
-    #region constructor
-
-    public CategoryOrderAttribute()
-    {
-    }
-
-    public CategoryOrderAttribute( string categoryName, int order )
-      :this()
-    {
-      CategoryValue = categoryName;
-      Order = order;
-    }
-
-    #endregion
-  }
-}
-
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
deleted file mode 100644
index c1fbbe54..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  public class ExpandableObjectAttribute : Attribute
-  {
-    #region Constructors
-
-    public ExpandableObjectAttribute()
-    {
-    }
-
-
-    #endregion
-
-    #region Properties
-
-
-
-
-    #endregion
-  }
-}
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
deleted file mode 100644
index 512685fc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  public interface IItemsSource
-  {
-    ItemCollection GetValues();
-  }
-
-  public class Item
-  {
-    public string DisplayName
-    {
-      get;
-      set;
-    }
-    public object Value
-    {
-      get;
-      set;
-    }
-  }
-
-  public class ItemCollection : List<Item>
-  {
-    public void Add( object value )
-    {
-      Item item = new Item();
-      item.DisplayName = value.ToString();
-      item.Value = value;
-      base.Add( item );
-    }
-
-    public void Add( object value, string displayName )
-    {
-      Item newItem = new Item();
-      newItem.DisplayName = displayName;
-      newItem.Value = value;
-      base.Add( newItem );
-    }
-  }
-}
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
deleted file mode 100644
index 420ce78e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  public class ItemsSourceAttribute : Attribute
-  {
-    public Type Type
-    {
-      get;
-      set;
-    }
-
-    public ItemsSourceAttribute( Type type )
-    {
-      var valueSourceInterface = type.GetInterface( typeof( IItemsSource ).FullName );
-      if( valueSourceInterface == null )
-        throw new ArgumentException( "Type must implement the IItemsSource interface.", "type" );
-
-      Type = type;
-    }
-  }
-}
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
deleted file mode 100644
index 0c1179d9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 217ef2dc..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Attributes
-{
-  public enum UsageContextEnum
-  {
-    Alphabetical,
-    Categorized,
-    Both
-  }
-
-  [AttributeUsage( AttributeTargets.Property, AllowMultiple = true, Inherited = true )]
-  public class PropertyOrderAttribute : Attribute
-  {
-    #region Properties
-
-    public int Order
-    {
-      get;
-      set;
-    }
-
-    public UsageContextEnum UsageContext
-    {
-      get;
-      set;
-    }
-
-    public override object TypeId
-    {
-      get
-      {
-        return this;
-      }
-    }
-
-    #endregion
-
-    #region Initialization
-
-    public PropertyOrderAttribute( int order )
-      : this( order, UsageContextEnum.Both )
-    {
-    }
-
-    public PropertyOrderAttribute( int order, UsageContextEnum usageContext )
-    {
-      Order = order;
-      UsageContext = usageContext;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
deleted file mode 100644
index 7e553265..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class CategoryGroupStyleSelector : StyleSelector
-  {
-    public Style SingleDefaultCategoryItemGroupStyle
-    {
-      get;
-      set;
-    }
-    public Style ItemGroupStyle
-    {
-      get;
-      set;
-    }
-
-    public override Style SelectStyle( object item, DependencyObject container )
-    {
-      var group = item as CollectionViewGroup;
-      // Category is not "Misc" => use regular ItemGroupStyle
-      if( (group.Name != null) && !group.Name.Equals( CategoryAttribute.Default.Category ) )
-        return this.ItemGroupStyle;
-
-      // Category is "Misc"
-      while( container != null )
-      {
-        container = VisualTreeHelper.GetParent( container );
-        if( container is ItemsControl )
-          break;
-      }
-
-      var itemsControl = container as ItemsControl;
-      if( itemsControl != null )
-      {
-        // Category is "Misc" and this is the only category => use SingleDefaultCategoryItemGroupContainerStyle
-        if( (itemsControl.Items.Count > 0) && (itemsControl.Items.Groups.Count == 1) )
-          return this.SingleDefaultCategoryItemGroupStyle;
-      }
-
-      // Category is "Misc" and this is NOT the only category => use regular ItemGroupStyle
-      return this.ItemGroupStyle;
-    }
-  }
-}
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
deleted file mode 100644
index b7ecb93a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
-{
-  public class PropertyGridCommands
-  {
-    private static RoutedCommand _clearFilterCommand = new RoutedCommand();
-    public static RoutedCommand ClearFilter
-    {
-      get
-      {
-        return _clearFilterCommand;
-      }
-    }
-  }
-}
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
deleted file mode 100644
index c6ef6598..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Commands
-{
-  public static class PropertyItemCommands
-  {
-    private static RoutedCommand _resetValueCommand = new RoutedCommand();
-    public static RoutedCommand ResetValue
-    {
-      get
-      {
-        return _resetValueCommand;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
deleted file mode 100644
index 7e656da3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index f0d191ad..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-    }
-
-    internal bool IsCleaning
-    {
-      get;
-      private set;
-    }
-
-    public virtual void ClearHelper()
-    {
-      this.IsCleaning = true;
-
-      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();
-      }
-      this.IsCleaning = false;
-    }
-
-    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 )
-    {
-      return ( PropertyContainer.EditorDefinitions != null )
-        ? this.CreateCustomEditor( PropertyContainer.EditorDefinitions.GetRecursiveBaseTypes( definitionKey ), propertyItem )
-        : null;
-    }
-
-    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.HideInheritedProperties ) )
-      {
-        this.OnHideInheritedPropertiesChanged();
-      }
-      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 OnHideInheritedPropertiesChanged() { }
-
-    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();
-
-    protected internal virtual void SetPropertiesExpansion( bool isExpanded )
-    {
-      foreach( var item in this.Properties )
-      {
-        var propertyItem = item as PropertyItemBase;
-        if( (propertyItem != null) && propertyItem.IsExpandable )
-        {
-          if( propertyItem.ContainerHelper != null )
-          {
-            propertyItem.ContainerHelper.SetPropertiesExpansion( isExpanded );
-          }
-          propertyItem.IsExpanded = isExpanded;
-        }
-      }
-    }
-
-    protected internal virtual void SetPropertiesExpansion( string propertyName, bool isExpanded )
-    {
-      foreach( var item in this.Properties )
-      {
-        var propertyItem = item as PropertyItemBase;
-        if( (propertyItem != null) && propertyItem.IsExpandable )
-        {
-          if( propertyItem.DisplayName == propertyName )
-          {
-            propertyItem.IsExpanded = isExpanded;
-            break;
-          }
-
-          if( propertyItem.ContainerHelper != null )
-          {
-            propertyItem.ContainerHelper.SetPropertiesExpansion( propertyName, isExpanded );
-          }
-        }
-      }
-    }
-  }
-}
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
deleted file mode 100644
index 669e01d1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index c2e68614..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.PropertyGrid.Converters
-{
-  public class ExpandableObjectMarginConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      int childLevel = ( int )value;
-      return new Thickness( childLevel * 15, 0, 0, 0 );
-    }
-
-    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/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
deleted file mode 100644
index 548c706f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class IsDefaultCategoryConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      string categoryName = value as string;
-      if( categoryName != null )
-      {
-        return ( categoryName == CategoryAttribute.Default.Category );
-      }
-
-      return false;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
deleted file mode 100644
index 7ed0af19..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class IsStringEmptyConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is string )
-      {
-        return string.IsNullOrEmpty( ( string )value );
-      }
-
-      return false;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
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
deleted file mode 100644
index ad71a2db..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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/ObjectToUIElementConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
deleted file mode 100644
index d74dafdf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class ObjectToUIElementConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is UIElement )
-        return value;
-
-      return new Control();
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
deleted file mode 100644
index e1c31a8f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class PropertyItemEditorConverter : IMultiValueConverter
-  {
-    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( values == null ) || ( values.Length != 2 ) )
-        return null;
-
-      var editor = values[ 0 ];
-      var isReadOnly = values[ 1 ] as bool?;
-
-      if( ( editor == null ) || !isReadOnly.HasValue )
-        return editor;
-
-      // Get Editor.IsReadOnly
-      var editorType = editor.GetType();
-      var editorIsReadOnlyPropertyInfo = editorType.GetProperty( "IsReadOnly" );
-      if( editorIsReadOnlyPropertyInfo != null )
-      {
-        // Set Editor.IsReadOnly to PropertyGrid.IsReadOnly.
-        editorIsReadOnlyPropertyInfo.SetValue( editor, isReadOnly, null );
-      }
-      // No Editor.IsReadOnly property, set the Editor.IsEnabled property.
-      else
-      {
-        var editorIsEnabledPropertyInfo = editorType.GetProperty( "IsEnabled" );
-        if( editorIsEnabledPropertyInfo != null )
-        {
-          // Set Editor.IsEnabled to !PropertyGrid.IsReadOnly.
-          editorIsEnabledPropertyInfo.SetValue( editor, !isReadOnly, null );
-        }
-      }
-
-      return editor;
-    }
-
-    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
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
deleted file mode 100644
index f13b1cbd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.ComponentModel;
-using System.Windows;
-using System.Reflection;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
-{
-  public class SelectedObjectConverter : IValueConverter
-  {
-    private const string ValidParameterMessage = @"parameter must be one of the following strings: 'Type', 'TypeName', 'SelectedObjectName'";
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( parameter == null )
-        throw new ArgumentNullException( "parameter" );
-
-      if( !( parameter is string ) )
-        throw new ArgumentException( SelectedObjectConverter.ValidParameterMessage );
-
-      if( this.CompareParam(parameter, "Type") )
-      {
-        return this.ConvertToType( value, culture );
-      }
-      else if( this.CompareParam( parameter, "TypeName" ) )
-      {
-        return this.ConvertToTypeName( value, culture );
-      }
-      else if( this.CompareParam( parameter, "SelectedObjectName" ) )
-      {
-        return this.ConvertToSelectedObjectName( value, culture );
-      }
-      else
-      {
-        throw new ArgumentException( SelectedObjectConverter.ValidParameterMessage );
-      }
-    }
-
-    private bool CompareParam(object parameter, string parameterValue )
-    {
-      return string.Compare( ( string )parameter, parameterValue, true ) == 0;
-    }
-
-    private object ConvertToType( object value, CultureInfo culture )
-    {
-      return ( value != null )
-        ? value.GetType()
-        : null;
-    }
-
-    private object ConvertToTypeName( object value, CultureInfo culture )
-    {
-      if( value == null )
-        return string.Empty;
-
-      Type newType = value.GetType();
-
-      //ICustomTypeProvider is only available in .net 4.5 and over. Use reflection so the .net 4.0 and .net 3.5 still works.
-      if( newType.GetInterface( "ICustomTypeProvider", true ) != null )
-      {
-        var methodInfo = newType.GetMethod( "GetCustomType" );
-        newType = methodInfo.Invoke( value, null ) as Type;
-      }
-
-      DisplayNameAttribute displayNameAttribute = newType.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
-
-      return (displayNameAttribute == null)
-        ? newType.Name 
-        : displayNameAttribute.DisplayName;
-    }
-
-    private object ConvertToSelectedObjectName( object value, CultureInfo culture )
-    {
-      if( value == null )
-        return String.Empty;
-
-      Type newType = value.GetType();
-      PropertyInfo[] properties = newType.GetProperties();
-      foreach( PropertyInfo property in properties )
-      {
-        if( property.Name == "Name" )
-          return property.GetValue( value, null );
-      }
-
-      return String.Empty;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
deleted file mode 100644
index 25da77bb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-  {
-    #region Constructors
-
-    internal CustomPropertyItem() { }
-
-    internal CustomPropertyItem( bool isPropertyGridCategorized, bool isSortedAlphabetically )
-    {
-      _isPropertyGridCategorized = isPropertyGridCategorized;
-      _isSortedAlphabetically = isSortedAlphabetically;
-    }
-
-
-    #endregion
-
-    #region Properties
-
-    #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 CategoryOrder
-
-    public int CategoryOrder
-    {
-      get
-      {
-        return _categoryOrder;
-      }
-      set
-      {
-        if( _categoryOrder != value )
-        {
-          _categoryOrder = value;
-          // Notify the parent helper since this property may affect ordering.
-          this.RaisePropertyChanged( () => this.CategoryOrder );
-        }
-      }
-    }
-
-    private int _categoryOrder;
-
-    #endregion //CategoryOrder
-
-
-
-
-
-    #region PropertyOrder
-
-    public static readonly DependencyProperty PropertyOrderProperty =
-        DependencyProperty.Register( "PropertyOrder", typeof( int ), typeof( CustomPropertyItem ), new UIPropertyMetadata( 0 ) );
-
-    public int PropertyOrder
-    {
-      get
-      {
-        return ( int )GetValue( PropertyOrderProperty );
-      }
-      set
-      {
-        SetValue( PropertyOrderProperty, value );
-      }
-    }
-
-    #endregion //PropertyOrder
-
-    #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
-
-    #endregion
-
-    #region Overrides
-
-    protected override Type GetPropertyItemType()
-    {
-      return this.Value.GetType();
-    }
-
-    protected override void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
-    {
-      if( oldValue != null )
-      {
-        oldValue.DataContext = null;
-      }
-
-      //case 166547 : Do not overwrite a custom Editor's DataContext set by the user.
-      if( ( newValue != null ) && ( newValue.DataContext == null ) )
-      {
-        newValue.DataContext = this;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
deleted file mode 100644
index 009dd649..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public abstract class DefinitionBase : DependencyObject
-  {
-    private bool _isLocked;
-
-    internal bool IsLocked
-    {
-      get { return _isLocked; }
-    }
-
-    internal void ThrowIfLocked<TMember>( Expression<Func<TMember>> propertyExpression )
-    {
-      //In XAML, when using any properties of PropertyDefinition, the error of ThrowIfLocked is always thrown => prevent it !
-      if( DesignerProperties.GetIsInDesignMode( this ) )
-        return;
-
-      if( this.IsLocked )
-      {
-        string propertyName = ReflectionHelper.GetPropertyOrFieldName( propertyExpression );
-        string message = string.Format(
-            @"Cannot modify {0} once the definition has beed added to a collection.",
-            propertyName );
-        throw new InvalidOperationException( message );
-      }
-    }
-
-    internal virtual void Lock()
-    {
-      if( !_isLocked )
-      {
-        _isLocked = true;
-      }
-    }
-  }
-}
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
deleted file mode 100644
index b1490e1e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 );
-      object elementValue = element.GetValue( elementProp );
-      bool areEquals = false;
-
-      // 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 )
-      {
-        if( ( elementValue != null ) && ( currentValue != null ) )
-        {
-          areEquals = ( elementValue.GetType().IsValueType && currentValue.GetType().IsValueType )
-                      ? elementValue.Equals( currentValue )  // Value Types
-                      : currentValue == element.GetValue( elementProp ); // Reference Types
-        }
-
-        if( !areEquals )
-        {
-          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
deleted file mode 100644
index 3449f5bf..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 81d370be..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public abstract class PropertyDefinitionBase : DefinitionBase
-  {
-    #region Constructors
-
-    internal PropertyDefinitionBase()
-    {
-      _targetProperties = new List<object>();
-      this.PropertyDefinitions = new PropertyDefinitionCollection();
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region TargetProperties
-
-    [TypeConverter(typeof(ListConverter))]
-    public IList TargetProperties 
-    {
-      get { return _targetProperties; }
-      set 
-      {
-        this.ThrowIfLocked( () => this.TargetProperties );
-        _targetProperties = value; 
-      }
-    }
-
-    private IList _targetProperties;
-
-    #endregion
-
-    #region PropertyDefinitions
-
-    public PropertyDefinitionCollection PropertyDefinitions
-    {
-      get
-      {
-        return _propertyDefinitions;
-      }
-      set
-      {
-        this.ThrowIfLocked( () => this.PropertyDefinitions );
-        _propertyDefinitions = value;
-      }
-    }
-
-    private PropertyDefinitionCollection _propertyDefinitions;
-
-    #endregion //PropertyDefinitions
-
-    #endregion
-
-    #region Overrides
-
-    internal override void Lock()
-    {
-      if( this.IsLocked )
-        return;
-
-      base.Lock();
-
-      // 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 );
-        }
-      }
-
-      //In Designer Mode, the Designer is broken if using a ReadOnlyCollection
-      _targetProperties = DesignerProperties.GetIsInDesignMode( this )
-                          ? new Collection<object>( newList )
-                          : new ReadOnlyCollection<object>( newList ) as IList;
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
deleted file mode 100644
index 0550f466..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Data;
-using System.Windows.Input;
-using System.Windows.Markup.Primitives;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Reflection;
-using System.Globalization;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal class DescriptorPropertyDefinition : DescriptorPropertyDefinitionBase
-  {
-    #region Members
-
-    private object _selectedObject;
-    private PropertyDescriptor _propertyDescriptor;
-    private DependencyPropertyDescriptor _dpDescriptor;
-    private MarkupObject _markupObject;
-
-    #endregion
-
-    #region Constructor
-
-    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject, IPropertyContainer propertyContainer )
-       : base( propertyContainer.IsCategorized
-             )
-    {
-      this.Init( propertyDescriptor, selectedObject );
-    }
-
-    #endregion
-
-    #region Custom Properties
-
-    internal override PropertyDescriptor PropertyDescriptor
-    {
-      get
-      {
-        return _propertyDescriptor;
-      }
-    }
-
-    private object SelectedObject
-    {
-      get
-      {
-        return _selectedObject;
-      }
-    }
-
-    #endregion
-
-    #region Override Methods
-
-    internal override ObjectContainerHelperBase CreateContainerHelper( IPropertyContainer parent )
-    {
-      return new ObjectContainerHelper( parent, this.Value );
-    }
-
-    internal override void OnValueChanged( object oldValue, object newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-      this.RaiseContainerHelperInvalidated();
-    }
-
-    protected override BindingBase CreateValueBinding()
-    {
-      var selectedObject = this.SelectedObject;
-      var propertyName = this.PropertyDescriptor.Name;
-
-      //Bind the value property with the source object.
-      var binding = new Binding( propertyName )
-      {
-        Source = this.GetValueInstance( selectedObject ),
-        Mode = PropertyDescriptor.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay,
-        ValidatesOnDataErrors = true,
-        ValidatesOnExceptions = true,
-        ConverterCulture = CultureInfo.CurrentCulture 
-      };
-
-      return binding;
-    }
-
-    protected override bool ComputeIsReadOnly()
-    {
-      return PropertyDescriptor.IsReadOnly;
-    }
-
-    internal override ITypeEditor CreateDefaultEditor( PropertyItem propertyItem )
-    {
-      return PropertyGridUtilities.CreateDefaultEditor( PropertyDescriptor.PropertyType, PropertyDescriptor.Converter, propertyItem );
-    }
-
-    protected override bool ComputeCanResetValue()
-    {
-      if( !PropertyDescriptor.IsReadOnly )
-      {
-        var defaultValue = this.ComputeDefaultValueAttribute();
-        if( defaultValue != null)
-          return !defaultValue.Equals( this.Value ); // can Reset if different from defaultValue.
-
-        return PropertyDescriptor.CanResetValue( SelectedObject );
-      }
-
-      return false;
-    }
-
-    protected override object ComputeAdvancedOptionsTooltip()
-    {
-      object tooltip;
-      UpdateAdvanceOptionsForItem( _markupObject, SelectedObject as DependencyObject, _dpDescriptor, out tooltip );
-
-      return tooltip;
-    }
-
-    protected override string ComputeCategory()
-    {
-#if VS2008
-        return PropertyDescriptor.Category;
-#else
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      return ( (displayAttribute != null) && (displayAttribute.GetGroupName() != null) ) ? displayAttribute.GetGroupName() : PropertyDescriptor.Category;
-#endif
-    }
-
-    protected override string ComputeCategoryValue()
-    {
-      return PropertyDescriptor.Category;
-    }
-
-    protected override bool ComputeExpandableAttribute()
-    {
-      return ( bool )this.ComputeExpandableAttributeForItem( PropertyDescriptor );
-    }
-
-    protected override object ComputeDefaultValueAttribute()
-    {
-      return this.ComputeDefaultValueAttributeForItem( PropertyDescriptor );
-    }
-
-    protected override bool ComputeIsExpandable()
-    {
-      return ( this.Value != null )
-        ;
-    }
-
-    protected override IList<Type> ComputeNewItemTypes()
-    {
-      return ( IList<Type> )ComputeNewItemTypesForItem( PropertyDescriptor );
-    }
-    protected override string ComputeDescription()
-    {
-      return ( string )ComputeDescriptionForItem( PropertyDescriptor );
-    }
-
-    protected override int ComputeDisplayOrder( bool isPropertyGridCategorized )
-    {
-      this.IsPropertyGridCategorized = isPropertyGridCategorized;
-      return ( int )ComputeDisplayOrderForItem( PropertyDescriptor );
-    }
-
-    protected override void ResetValue()
-    {
-      this.PropertyDescriptor.ResetValue( this.SelectedObject );
-      base.ResetValue();
-    }
-
-    internal override ITypeEditor CreateAttributeEditor()
-    {
-      var editorAttribute = GetAttribute<EditorAttribute>();
-      if( editorAttribute != null )
-      {
-        Type type = null;
-#if VS2008
-        type = Type.GetType( editorAttribute.EditorTypeName );
-#else
-        try
-        {
-          type = Type.GetType( editorAttribute.EditorTypeName, ( name ) =>
-          {
-            return AppDomain.CurrentDomain.GetAssemblies().Where( l => l.FullName == name.FullName ).FirstOrDefault();
-          }
-          , null, true );
-        }
-        catch( Exception )
-        {
-          type = Type.GetType( editorAttribute.EditorTypeName );
-        }       
-#endif
-
-        // 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>();
-      if( itemsSourceAttribute != null )
-        return new ItemsSourceAttributeEditor( itemsSourceAttribute );
-
-      return null;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private T GetAttribute<T>() where T : Attribute
-    {
-      return PropertyGridUtilities.GetAttribute<T>( PropertyDescriptor );
-    }
-
-    private void Init( 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( SelectedObject );
-    }
-
-    #endregion //Private Methods
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
deleted file mode 100644
index de0d2030..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ /dev/null
@@ -1,703 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Diagnostics;
-using System.ComponentModel;
-using System.Windows.Markup.Primitives;
-using System.Windows.Data;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal abstract class DescriptorPropertyDefinitionBase : DependencyObject
-  {
-    #region Members
-
-    private string _category;
-    private string _categoryValue;
-    private string _description;
-    private string _displayName;
-    private object _defaultValue;
-    private int _displayOrder;
-    private bool _expandableAttribute;
-    private bool _isReadOnly;
-    private IList<Type> _newItemTypes;
-    private IEnumerable<CommandBinding> _commandBindings;
-
-    #endregion
-
-    internal abstract PropertyDescriptor PropertyDescriptor
-    {
-      get;
-    }
-
-    #region Initialization
-
-
-    internal DescriptorPropertyDefinitionBase( bool isPropertyGridCategorized
-                                             )
-    {
-      this.IsPropertyGridCategorized = isPropertyGridCategorized;
-    }
-
-    #endregion
-
-    #region Virtual Methods
-
-    protected virtual string ComputeCategory()
-    {
-      return null;
-    }
-
-    protected virtual string ComputeCategoryValue()
-    {
-      return null;
-    }
-
-    protected virtual string ComputeDescription()
-    {
-      return null;
-    }
-
-
-
-    protected virtual int ComputeDisplayOrder( bool isPropertyGridCategorized )
-    {
-      return int.MaxValue;
-    }
-
-    protected virtual bool ComputeExpandableAttribute()
-    {
-      return false;
-    }
-
-    protected virtual object ComputeDefaultValueAttribute()
-    {
-      return null;
-    }
-
-    protected abstract bool ComputeIsExpandable();
-
-    protected virtual IList<Type> ComputeNewItemTypes()
-    {
-      return null;
-    }
-
-    protected virtual bool ComputeIsReadOnly()
-    {
-      return false;
-    }
-
-    protected virtual bool ComputeCanResetValue()
-    {
-      return false;
-    }
-
-    protected virtual object ComputeAdvancedOptionsTooltip()
-    {
-      return null;
-    }
-
-    protected virtual void ResetValue()
-    {
-      var binding = BindingOperations.GetBindingExpressionBase( this, DescriptorPropertyDefinition.ValueProperty );
-      if( binding != null )
-      {
-        binding.UpdateTarget();
-      }
-    }
-
-    protected abstract BindingBase CreateValueBinding();
-
-    #endregion
-
-    #region Internal Methods
-
-    internal abstract ObjectContainerHelperBase CreateContainerHelper( IPropertyContainer parent );
-
-    internal void RaiseContainerHelperInvalidated()
-    {
-      if( this.ContainerHelperInvalidated != null )
-      {
-        this.ContainerHelperInvalidated( this, EventArgs.Empty );
-      }
-    }
-
-    internal virtual ITypeEditor CreateDefaultEditor( PropertyItem propertyItem )
-    {
-      return null;
-    }
-
-    internal virtual ITypeEditor CreateAttributeEditor()
-    {
-      return null;
-    }
-
-    internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, DependencyObject dependencyObject, DependencyPropertyDescriptor dpDescriptor,
-                                                out object tooltip )
-    {
-      tooltip = StringConstants.Default;
-
-      bool isResource = false;
-      bool isDynamicResource = false;
-
-      var markupProperty = markupObject.Properties.FirstOrDefault( p => p.Name == PropertyName );
-      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(maybe with StaticResourceExtension)
-        isResource = typeof( Style ).IsAssignableFrom( markupProperty.PropertyType );
-        isDynamicResource = typeof( DynamicResourceExtension ).IsAssignableFrom( markupProperty.PropertyType );
-      }
-
-      if( isResource || isDynamicResource )
-      {
-        tooltip = StringConstants.Resource;
-      }
-      else
-      {
-        if( ( dependencyObject != null ) && ( dpDescriptor != null ) )
-        {
-          if( BindingOperations.GetBindingExpressionBase( dependencyObject, dpDescriptor.DependencyProperty ) != null )
-          {
-            tooltip = StringConstants.Databinding;
-          }
-          else
-          {
-            BaseValueSource bvs =
-              DependencyPropertyHelper
-              .GetValueSource( dependencyObject, dpDescriptor.DependencyProperty )
-              .BaseValueSource;
-
-            switch( bvs )
-            {
-              case BaseValueSource.Inherited:
-              case BaseValueSource.DefaultStyle:
-              case BaseValueSource.ImplicitStyleReference:
-                tooltip = StringConstants.Inheritance;
-                break;
-              case BaseValueSource.DefaultStyleTrigger:
-                break;
-              case BaseValueSource.Style:
-                tooltip = StringConstants.StyleSetter;
-                break;
-
-              case BaseValueSource.Local:
-                tooltip = StringConstants.Local;
-                break;
-            }
-          }
-        }
-        else
-        {
-          // When the Value is diferent from the DefaultValue, use the local icon.
-          if( markupProperty != null && !markupProperty.Value.Equals( this.DefaultValue ) )
-          {
-            if( this.DefaultValue != null )
-            {
-              if( !markupProperty.Value.Equals( this.DefaultValue ) )
-              {
-                tooltip = StringConstants.Local;
-              }
-            }
-            else
-            {
-              if( markupProperty.PropertyType.IsValueType )
-              {
-                var defaultValue = Activator.CreateInstance( markupProperty.PropertyType );
-                // When the Value is diferent from the DefaultValue, use the local icon.
-                if( !markupProperty.Value.Equals( defaultValue ) )
-                {
-                  tooltip = StringConstants.Local;
-                }
-              }
-              else
-              {
-                // When the Value is diferent from the DefaultValue, use the local icon.
-                if( !(markupProperty.Value is System.Windows.Markup.NullExtension) )
-                {
-                  tooltip = StringConstants.Local;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    internal void UpdateAdvanceOptions()
-    {
-      // Only set the Tooltip. The Icon will be added in XAML based on the Tooltip.
-      this.AdvancedOptionsTooltip = this.ComputeAdvancedOptionsTooltip();
-    }
-
-    internal void UpdateIsExpandable()
-    {
-      this.IsExpandable = this.ComputeIsExpandable() 
-                          && ( this.ExpandableAttribute
-                             );
-    }
-
-    internal void UpdateValueFromSource()
-    {
-      var bindingExpr = BindingOperations.GetBindingExpressionBase( this, DescriptorPropertyDefinitionBase.ValueProperty );
-      if( bindingExpr != null )
-      {
-        bindingExpr.UpdateTarget();
-      }
-    }
-
-
-
-
-
-    internal object ComputeDescriptionForItem( object item )
-    {
-      PropertyDescriptor pd = item as PropertyDescriptor;
-
-      //We do not simply rely on the "Description" property of PropertyDescriptor
-      //since this value is cached by PropertyDescriptor and the localized version 
-      //(e.g., LocalizedDescriptionAttribute) value can dynamicaly change.
-#if !VS2008
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( pd );
-      if( displayAttribute != null )
-      {
-        return displayAttribute.GetDescription();
-      }
-#endif
-
-      var descriptionAtt = PropertyGridUtilities.GetAttribute<DescriptionAttribute>( pd );
-      return (descriptionAtt != null)
-              ? descriptionAtt.Description
-              : 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;
-#if !VS2008
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      if( displayAttribute != null )
-      {
-        var order = displayAttribute.GetOrder();
-        if( order.HasValue )
-          return displayAttribute.GetOrder();
-      }
-#endif
-
-      List<PropertyOrderAttribute> list = pd.Attributes.OfType<PropertyOrderAttribute>().ToList();
-
-      if( list.Count > 0 )
-      {
-        this.ValidatePropertyOrderAttributes( list );
-
-        if( this.IsPropertyGridCategorized )
-        {
-          var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Categorized)
-                                                    || (x.UsageContext == UsageContextEnum.Both)) );
-          if( attribute != null )
-            return attribute.Order;
-        }
-        else
-        {
-          var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Alphabetical)
-                                                    || (x.UsageContext == UsageContextEnum.Both)) );
-          if( attribute != null )
-            return attribute.Order;
-        }
-      }
-
-      // Max Value. Properties with no order will be displayed last.
-      return int.MaxValue;
-    }
-
-    internal object ComputeExpandableAttributeForItem( object item )
-    {
-      var pd = (PropertyDescriptor)item;
-
-      var attribute = PropertyGridUtilities.GetAttribute<ExpandableObjectAttribute>( pd );
-      return (attribute != null);
-    }
-
-    internal int ComputeDisplayOrderInternal( bool isPropertyGridCategorized )
-    {
-      return this.ComputeDisplayOrder( isPropertyGridCategorized );
-    }
-
-    internal object GetValueInstance( object sourceObject )
-    {
-      ICustomTypeDescriptor customTypeDescriptor = sourceObject as ICustomTypeDescriptor;
-      if( customTypeDescriptor != null )
-        sourceObject = customTypeDescriptor.GetPropertyOwner( PropertyDescriptor );
-
-      return sourceObject;
-    }
-
-    internal object ComputeDefaultValueAttributeForItem( object item )
-    {
-      var pd = ( PropertyDescriptor )item;
-
-      var defaultValue = PropertyGridUtilities.GetAttribute<DefaultValueAttribute>( pd );
-      return ( defaultValue != null ) ? defaultValue.Value : null;
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private static void ExecuteResetValueCommand( object sender, ExecutedRoutedEventArgs e )
-    {
-      var affectedPropertyItem = e.Parameter as PropertyItem;
-      if( affectedPropertyItem == null )
-      {
-        affectedPropertyItem = sender as PropertyItem;
-      }
-
-      if( ( affectedPropertyItem != null ) && ( affectedPropertyItem.DescriptorDefinition != null ) )
-      {
-        if( affectedPropertyItem.DescriptorDefinition.ComputeCanResetValue() )
-        {
-          affectedPropertyItem.DescriptorDefinition.ResetValue();
-        }
-      }
-    }
-
-    private static void CanExecuteResetValueCommand( object sender, CanExecuteRoutedEventArgs e )
-    {
-      var affectedPropertyItem = e.Parameter as PropertyItem;
-      if( affectedPropertyItem == null )
-      {
-        affectedPropertyItem = sender as PropertyItem;
-      }
-
-      e.CanExecute = ( (affectedPropertyItem != null) && ( affectedPropertyItem.DescriptorDefinition != null) ) 
-                      ? affectedPropertyItem.DescriptorDefinition.ComputeCanResetValue()
-                      : false;
-    }
-
-    private string ComputeDisplayName()
-    {
-#if VS2008
-        var displayName = PropertyDescriptor.DisplayName;
-#else
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      var displayName = (displayAttribute != null) ? displayAttribute.GetName() : PropertyDescriptor.DisplayName;
-#endif
-
-      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( PropertyDescriptor );
-      if( (attribute != null) && attribute.NeedParenthesis )
-      {
-        displayName = "(" + displayName + ")";
-      }
-
-      return displayName;
-    }
-
-    private void ValidatePropertyOrderAttributes( List<PropertyOrderAttribute> list )
-    {
-      if( list.Count > 0 )
-      {
-        PropertyOrderAttribute both = list.FirstOrDefault( x => x.UsageContext == UsageContextEnum.Both );
-        if( (both != null) && (list.Count > 1) )
-          Debug.Assert( false, "A PropertyItem can't have more than 1 PropertyOrderAttribute when it has UsageContext : Both" );
-      }
-    }
-
-    #endregion
-
-    #region Events
-
-    public event EventHandler ContainerHelperInvalidated;
-
-    #endregion
-
-    #region AdvancedOptionsIcon (DP)
-
-    public static readonly DependencyProperty AdvancedOptionsIconProperty =
-        DependencyProperty.Register( "AdvancedOptionsIcon", typeof( ImageSource ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null ) );
-
-    public ImageSource AdvancedOptionsIcon
-    {
-      get
-      {
-        return (ImageSource)GetValue( AdvancedOptionsIconProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsIconProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AdvancedOptionsTooltip (DP)
-
-    public static readonly DependencyProperty AdvancedOptionsTooltipProperty =
-        DependencyProperty.Register( "AdvancedOptionsTooltip", typeof( object ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null ) );
-
-    public object AdvancedOptionsTooltip
-    {
-      get
-      {
-        return (object)GetValue( AdvancedOptionsTooltipProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsTooltipProperty, value );
-      }
-    }
-
-    #endregion //AdvancedOptionsTooltip
-
-    #region IsExpandable (DP)
-
-    public static readonly DependencyProperty IsExpandableProperty =
-        DependencyProperty.Register( "IsExpandable", typeof( bool ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( false ) );
-
-    public bool IsExpandable
-    {
-      get
-      {
-        return (bool)GetValue( IsExpandableProperty );
-      }
-      set
-      {
-        SetValue( IsExpandableProperty, value );
-      }
-    }
-
-    #endregion //IsExpandable
-
-    public string Category
-    {
-      get
-      {
-        return _category;
-      }
-      internal set
-      {
-        _category = value;
-      }
-    }
-
-    public string CategoryValue
-    {
-      get
-      {
-        return _categoryValue;
-      }
-      internal set
-      {
-        _categoryValue = value;
-      }
-    }
-
-    public IEnumerable<CommandBinding> CommandBindings
-    {
-      get
-      {
-        return _commandBindings;
-      }
-    }
-
-    public string DisplayName
-    {
-      get
-      {
-        return _displayName;
-      }
-      internal set
-      {
-        _displayName = value;
-      }
-    }
-
-    public object DefaultValue
-    {
-      get
-      {
-        return _defaultValue;
-      }
-      set
-      {
-        _defaultValue = value;
-      }
-    }
-
-
-
-    public string Description
-    {
-      get
-      {
-        return _description;
-      }
-      internal set
-      {
-        _description = value;
-      }
-    }
-
-    public int DisplayOrder
-    {
-      get
-      {
-        return _displayOrder;
-      }
-      internal set
-      {
-        _displayOrder = value;
-      }
-    }
-
-    public bool IsReadOnly
-    {
-      get
-      {
-        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;
-      }
-    }
-
-    internal bool ExpandableAttribute
-    {
-      get
-      {
-        return _expandableAttribute;
-      }
-      set
-      {
-        _expandableAttribute = value;
-        this.UpdateIsExpandable();
-      }
-    }
-
-
-    internal bool IsPropertyGridCategorized
-    {
-      get;
-      set;
-    }
-
-
-
-    #region Value Property (DP)
-
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( DescriptorPropertyDefinitionBase ), new UIPropertyMetadata( null, OnValueChanged ) );
-    public object Value
-    {
-      get
-      {
-        return GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
-      }
-    }
-
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ((DescriptorPropertyDefinitionBase)o).OnValueChanged( e.OldValue, e.NewValue );
-    }
-
-    internal virtual void OnValueChanged( object oldValue, object newValue )
-    {
-      UpdateIsExpandable();
-      UpdateAdvanceOptions();
-
-      // Reset command also affected.
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    #endregion //Value Property
-
-    public virtual void InitProperties()
-    {
-      // Do "IsReadOnly" and PropertyName first since the others may need that value.
-      _isReadOnly = ComputeIsReadOnly();
-      _category = ComputeCategory();
-      _categoryValue = ComputeCategoryValue();
-      _description = ComputeDescription();
-      _displayName = ComputeDisplayName();
-      _defaultValue = ComputeDefaultValueAttribute();
-      _displayOrder = ComputeDisplayOrder( this.IsPropertyGridCategorized );
-      _expandableAttribute = ComputeExpandableAttribute();
-
-
-      _newItemTypes = ComputeNewItemTypes();
-      _commandBindings = new CommandBinding[] { new CommandBinding( PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand ) };
-
-      UpdateIsExpandable();
-      UpdateAdvanceOptions();
-
-      BindingBase valueBinding = this.CreateValueBinding();
-      BindingOperations.SetBinding( this, DescriptorPropertyDefinitionBase.ValueProperty, valueBinding );
-    }
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
deleted file mode 100644
index 862a309e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Collections.Generic;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [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
-      {
-        return _properties;
-      }
-      set
-      {
-        _properties = value;
-      }
-    }
-
-    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/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
deleted file mode 100644
index 118102c8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class CheckBoxEditor : TypeEditor<CheckBox>
-  {
-    protected override CheckBox CreateEditor()
-    {
-      return new PropertyGridEditorCheckBox();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.Margin = new Thickness( 5, 0, 0, 0 );
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = CheckBox.IsCheckedProperty;
-    }
-  }
-
-  public class PropertyGridEditorCheckBox : CheckBox
-  {
-    static PropertyGridEditorCheckBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorCheckBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorCheckBox ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
deleted file mode 100644
index c95e3814..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class CollectionEditor : TypeEditor<CollectionControlButton>
-  {
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = CollectionControlButton.ItemsSourceProperty;
-    }
-
-    protected override CollectionControlButton CreateEditor()
-    {
-      return new PropertyGridEditorCollectionControl();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-
-      var propertyGrid = propertyItem.ParentElement as PropertyGrid;
-      if( propertyGrid != null )
-      {
-        // Use the PropertyGrid.EditorDefinitions for the CollectionControl's propertyGrid.
-        this.Editor.EditorDefinitions = propertyGrid.EditorDefinitions;
-      }
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var type = propertyItem.PropertyType;
-
-      Editor.ItemsSourceType = type;
-
-      if( type.BaseType == typeof( System.Array ) )
-      {
-        Editor.NewItemTypes = new List<Type>() { type.GetElementType() };
-      }
-      else 
-      {
-        if( (propertyItem.DescriptorDefinition != null)
-            && (propertyItem.DescriptorDefinition.NewItemTypes != null)
-            && (propertyItem.DescriptorDefinition.NewItemTypes.Count > 0) )
-        {
-          Editor.NewItemTypes = propertyItem.DescriptorDefinition.NewItemTypes;
-        }
-        else
-        {
-          //Check if we have a Dictionary
-          var dictionaryTypes = ListUtilities.GetDictionaryItemsType( type );
-          if( (dictionaryTypes != null) && (dictionaryTypes.Length == 2) )
-          {
-            // A Dictionary contains KeyValuePair that can't be edited.
-            // We need to create EditableKeyValuePairs.
-            // Create a EditableKeyValuePair< TKey, TValue> type from dictionary generic arguments type
-            var editableKeyValuePairType = ListUtilities.CreateEditableKeyValuePairType( dictionaryTypes[ 0 ], dictionaryTypes[ 1 ] );
-            Editor.NewItemTypes = new List<Type>() { editableKeyValuePairType };
-          }
-          else
-          {
-            //Check if we have a list
-            var listType = ListUtilities.GetListItemType( type );
-            if( listType != null  )
-            {
-              Editor.NewItemTypes = new List<Type>() { listType };
-            }
-            else
-            {
-              //Check if we have a Collection of T
-              var colType = ListUtilities.GetCollectionItemType( type );
-              if( colType != null )
-              {
-                Editor.NewItemTypes = new List<Type>() { colType };
-              }
-            }
-          }
-        }
-      }
-
-      base.ResolveValueBinding( propertyItem );
-    }
-
-  }
-
-  public class PropertyGridEditorCollectionControl : CollectionControlButton
-  {
-    static PropertyGridEditorCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorCollectionControl ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorCollectionControl ) ) );
-    }
-  }
-}
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
deleted file mode 100644
index 4bc580c8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class ColorEditor : TypeEditor<ColorPicker>
-  {
-    protected override ColorPicker CreateEditor()
-    {
-      return new PropertyGridEditorColorPicker();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      Editor.DisplayColorAndName = true;
-    }
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = ColorPicker.SelectedColorProperty;
-    }
-  }
-
-  public class PropertyGridEditorColorPicker : ColorPicker
-  {
-    static PropertyGridEditorColorPicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorColorPicker ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorColorPicker ) ) );
-    }
-  }
-}
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
deleted file mode 100644
index 668bd103..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public abstract class ComboBoxEditor : TypeEditor<System.Windows.Controls.ComboBox>
-  {
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
-    }
-
-    protected override System.Windows.Controls.ComboBox CreateEditor()
-    {
-      return new PropertyGridEditorComboBox();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      SetItemsSource( propertyItem );
-      base.ResolveValueBinding( propertyItem );
-    }
-
-    protected abstract IEnumerable CreateItemsSource( PropertyItem propertyItem );
-
-    private void SetItemsSource( PropertyItem propertyItem )
-    {
-      Editor.ItemsSource = CreateItemsSource( propertyItem );
-    }
-  }
-
-  public class PropertyGridEditorComboBox : System.Windows.Controls.ComboBox
-  {
-    static PropertyGridEditorComboBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorComboBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorComboBox ) ) );
-    }
-  }
-}
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
deleted file mode 100644
index a607d481..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Reflection;
-using System.Collections;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class EnumComboBoxEditor : ComboBoxEditor
-  {
-    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      return GetValues( propertyItem.PropertyType );
-    }
-
-    private static object[] GetValues( Type enumType )
-    {
-      List<object> values = new List<object>();
-
-      if( enumType != null )
-      {
-        var fields = enumType.GetFields().Where( x => x.IsLiteral );
-        foreach( FieldInfo field in fields )
-        {
-          // Get array of BrowsableAttribute attributes
-          object[] attrs = field.GetCustomAttributes( typeof( BrowsableAttribute ), false );
-          if( attrs.Length == 1 )
-          {
-            // If attribute exists and its value is false continue to the next field...
-            BrowsableAttribute brAttr = ( BrowsableAttribute )attrs[ 0 ];
-            if( brAttr.Browsable == false )
-              continue;
-          }
-
-          values.Add( field.GetValue( enumType ) );
-        }
-      }
-
-      return values.ToArray();
-    }
-  }
-}
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
deleted file mode 100644
index be62f2c6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.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 IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      if( propertyItem.PropertyType == typeof( FontFamily ) )
-        return FontUtilities.Families.OrderBy( x => x.Source);
-      else if( propertyItem.PropertyType == typeof( FontWeight ) )
-        return FontUtilities.Weights;
-      else if( propertyItem.PropertyType == typeof( FontStyle ) )
-        return FontUtilities.Styles;
-      else if( propertyItem.PropertyType == typeof( FontStretch ) )
-        return FontUtilities.Stretches;
-
-      return null;
-    }
-  }
-}
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
deleted file mode 100644
index bfeae6ab..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public interface ITypeEditor
-  {
-    FrameworkElement ResolveEditor( PropertyItem propertyItem );
-  }
-}
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
deleted file mode 100644
index 1b04f93e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class ItemsSourceAttributeEditor : TypeEditor<System.Windows.Controls.ComboBox>
-  {
-    private readonly ItemsSourceAttribute _attribute;
-
-    public ItemsSourceAttributeEditor( ItemsSourceAttribute attribute )
-    {
-      _attribute = attribute;
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = System.Windows.Controls.ComboBox.SelectedValueProperty;
-    }
-
-    protected override System.Windows.Controls.ComboBox CreateEditor()
-    {
-      return new PropertyGridEditorComboBox();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      SetItemsSource();
-      base.ResolveValueBinding( propertyItem );
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.DisplayMemberPath = "DisplayName";
-      Editor.SelectedValuePath = "Value";
-      if( propertyItem != null )
-      {
-        Editor.IsEnabled = !propertyItem.IsReadOnly;
-      }
-    }
-
-    private void SetItemsSource()
-    {
-      Editor.ItemsSource = CreateItemsSource();
-    }
-
-    private System.Collections.IEnumerable CreateItemsSource()
-    {
-      var instance = Activator.CreateInstance( _attribute.Type );
-      return ( instance as IItemsSource ).GetValues();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
deleted file mode 100644
index 374858f2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class MaskedTextBoxEditor : TypeEditor<MaskedTextBox>
-  {
-    public string Mask
-    {
-      get;
-      set;
-    }
-
-    public Type ValueDataType
-    {
-      get;
-      set;
-    }
-
-    protected override MaskedTextBox CreateEditor()
-    {
-      return new PropertyGridEditorMaskedTextBox();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      this.Editor.ValueDataType = this.ValueDataType;
-      this.Editor.Mask = this.Mask;
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      this.ValueProperty = MaskedTextBox.ValueProperty;
-    }
-  }
-
-  public class PropertyGridEditorMaskedTextBox : MaskedTextBox
-  {
-    static PropertyGridEditorMaskedTextBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorMaskedTextBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorMaskedTextBox ) ) );
-    }
-  }
-}
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
deleted file mode 100644
index bd1097df..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class PrimitiveTypeCollectionEditor : TypeEditor<PrimitiveTypeCollectionControl>
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
-      Editor.Content = "(Collection)";
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = PrimitiveTypeCollectionControl.ItemsSourceProperty;
-    }
-
-    protected override PrimitiveTypeCollectionControl CreateEditor()
-    {
-      return new PropertyGridEditorPrimitiveTypeCollectionControl();
-    }
-
-    protected override void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var type = propertyItem.PropertyType;
-      Editor.ItemsSourceType = type;
-
-      if( type.BaseType == typeof( System.Array ) )
-      {
-        Editor.ItemType = type.GetElementType();
-      }
-      else
-      {
-        var typeArguments = type.GetGenericArguments();
-        if( typeArguments.Length > 0 )
-        {
-          Editor.ItemType = typeArguments[ 0 ];
-        }
-      }
-
-      base.ResolveValueBinding( propertyItem );
-    }
-  }
-
-  public class PropertyGridEditorPrimitiveTypeCollectionControl : PrimitiveTypeCollectionControl
-  {
-    static PropertyGridEditorPrimitiveTypeCollectionControl()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorPrimitiveTypeCollectionControl ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorPrimitiveTypeCollectionControl ) ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
deleted file mode 100644
index b227bf42..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.ComponentModel;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class SourceComboBoxEditor : ComboBoxEditor
-  {
-    ICollection _collection;
-    TypeConverter _typeConverter;
-
-    public SourceComboBoxEditor( ICollection collection, TypeConverter typeConverter )
-    {
-      _collection = collection;
-      _typeConverter = typeConverter;
-    }
-
-    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
-    {
-      return _collection;
-    }
-
-    protected override IValueConverter CreateValueConverter()
-    {
-      //When using a stringConverter, we need to convert the value
-      if( (_typeConverter != null) && (_typeConverter is StringConverter) )
-        return new SourceComboBoxEditorConverter( _typeConverter );
-      return null;
-    }
-  }
-
-  internal class SourceComboBoxEditorConverter : IValueConverter
-  {
-    private TypeConverter _typeConverter;
-
-    internal SourceComboBoxEditorConverter( TypeConverter typeConverter )
-    {
-      _typeConverter = typeConverter;
-    }
-
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( _typeConverter != null )
-      {
-        if( _typeConverter.CanConvertTo( typeof(string) ) )
-          return _typeConverter.ConvertTo( value, typeof(string) );
-      }
-      return value;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( _typeConverter != null )
-      {
-        if( _typeConverter.CanConvertFrom( value.GetType() ) )
-          return _typeConverter.ConvertFrom( value );
-      }
-      return value;
-    }
-  }
-}
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
deleted file mode 100644
index 78fad1d7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class TextBlockEditor : TypeEditor<TextBlock>
-  {
-    protected override TextBlock CreateEditor()
-    {
-      return new PropertyGridEditorTextBlock();
-    }
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = TextBlock.TextProperty;
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 );
-      Editor.TextTrimming = TextTrimming.CharacterEllipsis;
-    }
-  }
-
-  public class PropertyGridEditorTextBlock : TextBlock
-  {
-    static PropertyGridEditorTextBlock()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTextBlock ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTextBlock ) ) );
-    }
-  }
-}
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
deleted file mode 100644
index 80db8588..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class TextBoxEditor : TypeEditor<WatermarkTextBox>
-  {
-    protected override WatermarkTextBox CreateEditor()
-    {
-      return new PropertyGridEditorTextBox();
-    }
-
-#if !VS2008
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( propertyItem.PropertyDescriptor );
-      if( displayAttribute != null )
-      {
-        this.Editor.Watermark = displayAttribute.GetPrompt();
-      }
-    }
-#endif
-
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = TextBox.TextProperty;
-    }
-  }
-
-  public class PropertyGridEditorTextBox : WatermarkTextBox
-  {
-    static PropertyGridEditorTextBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTextBox ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTextBox ) ) );
-    }
-  }
-}
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
deleted file mode 100644
index 6f897009..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Data;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public abstract class TypeEditor<T> : ITypeEditor where T : FrameworkElement, new()
-  {
-    #region Properties
-
-    protected T Editor
-    {
-      get;
-      set;
-    }
-    protected DependencyProperty ValueProperty
-    {
-      get;
-      set;
-    }
-
-    #endregion //Properties
-
-    #region ITypeEditor Members
-
-    public virtual FrameworkElement ResolveEditor( PropertyItem propertyItem )
-    {
-      Editor = this.CreateEditor();
-      SetValueDependencyProperty();
-      SetControlProperties( propertyItem );
-      ResolveValueBinding( propertyItem );
-      return Editor;
-    }
-
-    #endregion //ITypeEditor Members
-
-    #region Methods
-
-    protected virtual T CreateEditor()
-    {
-      return new T();
-    }
-
-    protected virtual IValueConverter CreateValueConverter()
-    {
-      return null;
-    }
-
-    protected virtual void ResolveValueBinding( PropertyItem propertyItem )
-    {
-      var _binding = new Binding( "Value" );
-      _binding.Source = propertyItem;
-      _binding.UpdateSourceTrigger = (Editor is InputBase) ? UpdateSourceTrigger.PropertyChanged : UpdateSourceTrigger.Default;
-      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-      _binding.Converter = CreateValueConverter();
-      BindingOperations.SetBinding( Editor, ValueProperty, _binding );
-    }
-
-    protected virtual void SetControlProperties( PropertyItem propertyItem )
-    {
-      //TODO: implement in derived class
-    }
-
-    protected abstract void SetValueDependencyProperty();
-
-    #endregion //Methods
-  }
-}
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
deleted file mode 100644
index ca121037..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using Xceed.Wpf.Toolkit.Primitives;
-using System;
-using System.Windows;
-using System.Windows.Data;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-using System.ComponentModel;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
-{
-  public class UpDownEditor<TEditor, TType> : TypeEditor<TEditor> where TEditor : UpDownBase<TType>, new()
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      Editor.TextAlignment = System.Windows.TextAlignment.Left;
-    }
-    protected override void SetValueDependencyProperty()
-    {
-      ValueProperty = UpDownBase<TType>.ValueProperty;
-    }
-
-#if !VS2008
-    internal void SetMinMaxFromRangeAttribute( PropertyDescriptor propertyDescriptor, TypeConverter converter )
-    {
-      if( propertyDescriptor == null )
-        return;
-
-      var rangeAttribute = PropertyGridUtilities.GetAttribute<RangeAttribute>( propertyDescriptor );
-      if( rangeAttribute != null )
-      {
-        Editor.Maximum = ((TType)converter.ConvertFrom( rangeAttribute.Maximum.ToString() ));
-        Editor.Minimum = ((TType)converter.ConvertFrom( rangeAttribute.Minimum.ToString() ));
-      }
-    }
-#endif
-  }
-
-  public class NumericUpDownEditor<TEditor, TType> : UpDownEditor<TEditor, TType> where TEditor : UpDownBase<TType>, new()
-  {
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-
-      var binding = new Binding( "IsInvalid" );
-      binding.Source = this.Editor;
-      binding.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
-      binding.Mode = BindingMode.TwoWay;
-      BindingOperations.SetBinding( propertyItem, PropertyItem.IsInvalidProperty, binding );
-    }
-  }
-
-  public class ByteUpDownEditor : NumericUpDownEditor<ByteUpDown, byte?>
-  {
-    protected override ByteUpDown CreateEditor()
-    {
-      return new PropertyGridEditorByteUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( byte ) ) );
-#endif
-    }
-  }
-
-  public class DecimalUpDownEditor : NumericUpDownEditor<DecimalUpDown, decimal?>
-  {
-    protected override DecimalUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDecimalUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( decimal ) ) );
-#endif
-    }
-  }
-
-  public class DoubleUpDownEditor : NumericUpDownEditor<DoubleUpDown, double?> 
-  {
-    protected override DoubleUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDoubleUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-      Editor.AllowInputSpecialValues = AllowedSpecialValues.Any;
-
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( double ) ) );      
-#endif
-    }
-  }
-
-  public class IntegerUpDownEditor : NumericUpDownEditor<IntegerUpDown, int?>
-  {
-    protected override IntegerUpDown CreateEditor()
-    {
-      return new PropertyGridEditorIntegerUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( int ) ) );
-#endif
-    }
-  }
-
-  public class LongUpDownEditor : NumericUpDownEditor<LongUpDown, long?>
-  {
-    protected override LongUpDown CreateEditor()
-    {
-      return new PropertyGridEditorLongUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( long ) ) );
-#endif
-    }
-  }
-
-  public class ShortUpDownEditor : NumericUpDownEditor<ShortUpDown, short?>
-  {
-    protected override ShortUpDown CreateEditor()
-    {
-      return new PropertyGridEditorShortUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( short ) ) );
-#endif
-    }
-  }
-
-  public class SingleUpDownEditor : NumericUpDownEditor<SingleUpDown, float?> 
-  {
-    protected override SingleUpDown CreateEditor()
-    {
-      return new PropertyGridEditorSingleUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-      Editor.AllowInputSpecialValues = AllowedSpecialValues.Any;
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( float ) ) );
-#endif
-    }
-  }
-
-  public class DateTimeUpDownEditor : UpDownEditor<DateTimeUpDown, DateTime?>
-  {
-    protected override DateTimeUpDown CreateEditor()
-    {
-      return new PropertyGridEditorDateTimeUpDown();
-    }
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( DateTime ) ) );
-#endif
-    }
-  }
-
-  public class TimeSpanUpDownEditor : UpDownEditor<TimeSpanUpDown, TimeSpan?>
-  {
-    protected override TimeSpanUpDown CreateEditor()
-    {
-      return new PropertyGridEditorTimeSpanUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( TimeSpan ) ) );
-#endif
-    }
-  }
-
-  internal class SByteUpDownEditor : NumericUpDownEditor<SByteUpDown, sbyte?>
-  {
-    protected override SByteUpDown CreateEditor()
-    {
-      return new PropertyGridEditorSByteUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( sbyte ) ) );
-#endif
-    }
-  }
-
-  internal class UIntegerUpDownEditor : NumericUpDownEditor<UIntegerUpDown, uint?>
-  {
-    protected override UIntegerUpDown CreateEditor()
-    {
-      return new PropertyGridEditorUIntegerUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( uint ) ) );
-#endif
-    }
-  }
-
-  internal class ULongUpDownEditor : NumericUpDownEditor<ULongUpDown, ulong?>
-  {
-    protected override ULongUpDown CreateEditor()
-    {
-      return new PropertyGridEditorULongUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( ulong ) ) );
-#endif
-    }
-  }
-
-  internal class UShortUpDownEditor : NumericUpDownEditor<UShortUpDown, ushort?>
-  {
-    protected override UShortUpDown CreateEditor()
-    {
-      return new PropertyGridEditorUShortUpDown();
-    }
-
-    protected override void SetControlProperties( PropertyItem propertyItem )
-    {
-      base.SetControlProperties( propertyItem );
-#if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( ushort ) ) );
-#endif
-    }
-  }
-
-
-
-  public class PropertyGridEditorByteUpDown : ByteUpDown
-  {
-    static PropertyGridEditorByteUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorByteUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorByteUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDecimalUpDown : DecimalUpDown
-  {
-    static PropertyGridEditorDecimalUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDecimalUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDecimalUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDoubleUpDown : DoubleUpDown
-  {
-    static PropertyGridEditorDoubleUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDoubleUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDoubleUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorIntegerUpDown : IntegerUpDown
-  {
-    static PropertyGridEditorIntegerUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorIntegerUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorIntegerUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorLongUpDown : LongUpDown
-  {
-    static PropertyGridEditorLongUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorLongUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorLongUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorShortUpDown : ShortUpDown
-  {
-    static PropertyGridEditorShortUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorShortUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorShortUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorSingleUpDown : SingleUpDown
-  {
-    static PropertyGridEditorSingleUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorSingleUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorSingleUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorDateTimeUpDown : DateTimeUpDown
-  {
-    static PropertyGridEditorDateTimeUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorDateTimeUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorDateTimeUpDown ) ) );
-    }
-  }
-
-  public class PropertyGridEditorTimeSpanUpDown : TimeSpanUpDown
-  {
-    static PropertyGridEditorTimeSpanUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorTimeSpanUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorTimeSpanUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorSByteUpDown : SByteUpDown
-  {
-    static PropertyGridEditorSByteUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorSByteUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorSByteUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorUIntegerUpDown : UIntegerUpDown
-  {
-    static PropertyGridEditorUIntegerUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorUIntegerUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorUIntegerUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorULongUpDown : ULongUpDown
-  {
-    static PropertyGridEditorULongUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorULongUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorULongUpDown ) ) );
-    }
-  }
-
-  internal class PropertyGridEditorUShortUpDown : UShortUpDown
-  {
-    static PropertyGridEditorUShortUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGridEditorUShortUpDown ), new FrameworkPropertyMetadata( typeof( PropertyGridEditorUShortUpDown ) ) );
-    }
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
deleted file mode 100644
index 86be8a12..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
deleted file mode 100644
index 8ba7a517..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 IsSortedAlphabetically { get; }
-
-    bool AutoGenerateProperties { get; }
-
-    bool HideInheritedProperties { get; }
-
-    FilterInfo FilterInfo { get; }
-
-    bool? IsPropertyVisible( PropertyDescriptor pd );
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
deleted file mode 100644
index ded4a44d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.ComponentModel;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-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
-        {
-          var descriptors = new List<PropertyDescriptor>();
-          {
-            descriptors = ObjectContainerHelperBase.GetPropertyDescriptors( SelectedObject, this.PropertyContainer.HideInheritedProperties );
-          }
-
-          foreach( var descriptor in descriptors )
-          {
-            var propertyDef = this.GetPropertyDefinition( descriptor );
-            bool isBrowsable = false;
-
-            var isPropertyBrowsable = this.PropertyContainer.IsPropertyVisible( descriptor );
-            if( isPropertyBrowsable.HasValue )
-            {
-              isBrowsable = isPropertyBrowsable.Value;
-            }
-            else
-            {
-#if !VS2008
-              var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( descriptor );
-              if( displayAttribute != null )
-              {
-                var autoGenerateField = displayAttribute.GetAutoGenerateField();
-                isBrowsable = this.PropertyContainer.AutoGenerateProperties 
-                              && ((autoGenerateField.HasValue && autoGenerateField.Value) || !autoGenerateField.HasValue);
-              }
-              else
-#endif
-              {
-                isBrowsable = descriptor.IsBrowsable && this.PropertyContainer.AutoGenerateProperties;
-              }
-
-              if( propertyDef != null )
-              {
-                isBrowsable = propertyDef.IsBrowsable.GetValueOrDefault( isBrowsable );
-              }
-            }
-
-            if( isBrowsable )
-            {
-              var prop = this.CreatePropertyItem( descriptor, propertyDef );
-              if( prop != null )
-              {
-                propertyItems.Add( prop );
-              }
-            }
-          }
-        }
-        catch( Exception e )
-        {
-          //TODO: handle this some how
-          Debug.WriteLine( "Property creation failed." );
-          Debug.WriteLine( e.StackTrace );
-        }
-      }
-
-      return propertyItems;
-    }
-
-
-    private PropertyItem CreatePropertyItem( PropertyDescriptor property, PropertyDefinition propertyDef )
-    {
-      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject, this.PropertyContainer );                                                                                 
-      definition.InitProperties();
-
-      this.InitializeDescriptorDefinition( definition, propertyDef );
-      PropertyItem propertyItem = new PropertyItem( definition );
-      Debug.Assert( SelectedObject != null );
-      propertyItem.Instance = SelectedObject;
-      propertyItem.CategoryOrder = this.GetCategoryOrder( definition.CategoryValue );
-
-      propertyItem.WillRefreshPropertyGrid = this.GetWillRefreshPropertyGrid( property );
-      return propertyItem;
-    }
-
-    private int GetCategoryOrder( object categoryValue )
-    {
-      Debug.Assert( SelectedObject != null );
-
-      if( categoryValue == null )
-        return int.MaxValue;
-
-      int order = int.MaxValue;
-        object selectedObject = SelectedObject;
-        CategoryOrderAttribute[] orderAttributes = ( selectedObject != null )
-          ? ( CategoryOrderAttribute[] )selectedObject.GetType().GetCustomAttributes( typeof( CategoryOrderAttribute ), true )
-          : new CategoryOrderAttribute[ 0 ];
-
-        var orderAttribute = orderAttributes
-          .FirstOrDefault( ( a ) => object.Equals( a.CategoryValue, categoryValue ) );
-
-        if( orderAttribute != null )
-        {
-          order = orderAttribute.Order;
-        }
-
-      return order;
-    }
-
-
-
-
-
-
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
deleted file mode 100644
index 52a29bf2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
+++ /dev/null
@@ -1,565 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-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( false );
-
-    }
-
-    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( true );
-    }
-
-    protected override void OnAutoGeneratePropertiesChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnHideInheritedPropertiesChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnEditorDefinitionsChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-    protected override void OnPropertyDefinitionsChanged()
-    {
-      this.RegenerateProperties();
-    }
-
-
-
-
-
-
-    protected internal override void SetPropertiesExpansion( bool isExpanded )
-    {
-      if( this.Properties.Count == 0 )
-      {
-        this.GenerateProperties();
-      }
-
-      base.SetPropertiesExpansion( isExpanded );
-    }
-
-    protected internal override void SetPropertiesExpansion( string propertyName, bool isExpanded )
-    {
-      if( this.Properties.Count == 0 )
-      {
-        this.GenerateProperties();
-      }
-
-      base.SetPropertiesExpansion( propertyName, isExpanded );
-    }
-
-    private void UpdateFilter()
-    {
-      FilterInfo filterInfo = this.PropertyContainer.FilterInfo;
-
-      this.PropertyItems.FilterPredicate = filterInfo.Predicate
-        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString, this.PropertyItems, this.PropertyContainer );
-    }
-
-    private void UpdateCategorization( bool updateSubPropertiesCategorization )
-    {
-      _propertyItemCollection.UpdateCategorization( this.ComputeCategoryGroupDescription(), this.PropertyContainer.IsCategorized, this.PropertyContainer.IsSortedAlphabetically );
-      if( updateSubPropertiesCategorization && (_propertyItemCollection.Count > 0) )
-      {
-        foreach( PropertyItem propertyItem in _propertyItemCollection )
-        {
-          PropertyItemCollection subPropertyItemsCollection = propertyItem.Properties as PropertyItemCollection;
-          if( subPropertyItemsCollection != null )
-          {
-            subPropertyItemsCollection.UpdateCategorization( this.ComputeCategoryGroupDescription(), this.PropertyContainer.IsCategorized, this.PropertyContainer.IsSortedAlphabetically );
-          }
-        }
-      }
-    }
-
-    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();
-
-      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, bool hideInheritedProperties )
-    {
-      PropertyDescriptorCollection descriptors;
-
-      TypeConverter tc = TypeDescriptor.GetConverter( instance );
-      if( tc == null || !tc.GetPropertiesSupported() )
-      {
-        if( instance is ICustomTypeDescriptor )
-        {
-          descriptors = ((ICustomTypeDescriptor)instance).GetProperties();
-        }
-        //ICustomTypeProvider is only available in .net 4.5 and over. Use reflection so the .net 4.0 and .net 3.5 still works.
-        else if( instance.GetType().GetInterface( "ICustomTypeProvider", true ) != null )
-        {
-          var methodInfo = instance.GetType().GetMethod( "GetCustomType" );
-          var result = methodInfo.Invoke( instance, null ) as Type;
-          descriptors = TypeDescriptor.GetProperties( result );
-        }
-        else
-        {
-          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
-        }
-      }
-      else
-      {
-        descriptors = tc.GetProperties( instance );
-      }
-
-      if( ( descriptors != null ) )
-      {
-        var descriptorsProperties = descriptors.Cast<PropertyDescriptor>();
-        if( hideInheritedProperties )
-        {
-          var properties = from p in descriptorsProperties
-                           where p.ComponentType == instance.GetType()
-                           select p;
-          return properties.ToList();
-        }
-        else
-        {
-          return descriptorsProperties.ToList();
-        }
-      }
-
-      return null;
-    }
-
-
-
-
-    protected bool GetWillRefreshPropertyGrid( PropertyDescriptor propertyDescriptor )
-    {
-      if( propertyDescriptor == null )
-        return false;
-
-      var attribute = PropertyGridUtilities.GetAttribute<RefreshPropertiesAttribute>( propertyDescriptor );
-      if( attribute != null )
-        return attribute.RefreshProperties != RefreshProperties.None;
-
-      return false;
-    }
-
-    internal void InitializeDescriptorDefinition(
-      DescriptorPropertyDefinitionBase descriptorDef,
-      PropertyDefinition propertyDefinition )
-    {
-      if( descriptorDef == null )
-        throw new ArgumentNullException( "descriptorDef" );
-
-      if( propertyDefinition == null )
-        return;
-
-      // Values defined on PropertyDefinition have priority on the attributes
-      if( propertyDefinition != null )
-      {
-        if( propertyDefinition.Category != null )
-        {
-          descriptorDef.Category = propertyDefinition.Category;
-          descriptorDef.CategoryValue = propertyDefinition.Category;
-        }
-
-        if( propertyDefinition.Description != null )
-        {
-          descriptorDef.Description = propertyDefinition.Description;
-        }
-        if( propertyDefinition.DisplayName != null )
-        {
-          descriptorDef.DisplayName = propertyDefinition.DisplayName;
-        }
-
-        if( propertyDefinition.DisplayOrder != null )
-        {
-          descriptorDef.DisplayOrder = propertyDefinition.DisplayOrder.Value;
-        }
-
-        if( propertyDefinition.IsExpandable != null )
-        {
-          descriptorDef.ExpandableAttribute = propertyDefinition.IsExpandable.Value;
-        }
-      }
-    }
-
-    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;
-
-      //These properties can vary with the value. They need to be bound.
-      if( pd.PropertyDescriptor.Converter is ExpandableObjectConverter )
-      {
-        propertyItem.IsExpandable = true;
-      }
-      else
-      {
-        SetupDefinitionBinding( propertyItem, PropertyItemBase.IsExpandableProperty, pd, () => pd.IsExpandable, BindingMode.OneWay );
-      }
-      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 );
-        }
-      }
-
-      // PropertyItem.PropertyType's defaultValue equals current PropertyItem's value => set the DefaultValue attribute
-      if( pd.DefaultValue != null )
-      {
-        var typeDefaultValue = this.GetTypeDefaultValue( propertyItem.PropertyType );
-
-        if( ( (propertyItem.Value != null) && propertyItem.Value.Equals( typeDefaultValue ) )
-              || ( (propertyItem.Value == null) && ( typeDefaultValue == propertyItem.Value ) ) ) 
-        {
-#if VS2008
-        propertyItem.Value = pd.DefaultValue;
-#else
-          propertyItem.SetCurrentValue( PropertyItem.ValueProperty, pd.DefaultValue );
-#endif
-        }
-      }
-    }
-
-    private object GetTypeDefaultValue( Type type )
-    {
-      if( type.IsGenericType && type.GetGenericTypeDefinition() == typeof( Nullable<> ) )
-      {
-        type = type.GetProperty( "Value" ).PropertyType;
-      }
-
-      return ( type.IsValueType ? Activator.CreateInstance( type ) : null ) ;
-    }
-
-    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 );
-    }
-
-    internal FrameworkElement GenerateChildrenEditorElement( PropertyItem propertyItem )
-    {
-      FrameworkElement editorElement = null;
-      DescriptorPropertyDefinitionBase pd = propertyItem.DescriptorDefinition;
-      object definitionKey = null;
-      Type definitionKeyAsType = definitionKey as Type;
-      ITypeEditor editor = null;
-
-      if( editor == null )
-        editor = pd.CreateAttributeEditor();
-
-      if( editor != null )
-        editorElement = editor.ResolveEditor( propertyItem );
-
-
-      if( (editorElement == null) && (definitionKey == null) && ( propertyItem.PropertyDescriptor != 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, propertyItem )
-          : pd.CreateDefaultEditor( propertyItem );
-        }
-
-        Debug.Assert( editor != null );
-
-        editorElement = editor.ResolveEditor( propertyItem );
-      }
-
-      return editorElement;
-    }
-
-    internal PropertyDefinition GetPropertyDefinition( PropertyDescriptor descriptor )
-    {
-      PropertyDefinition def = null;
-
-      var propertyDefs = this.PropertyContainer.PropertyDefinitions;
-      if( propertyDefs != null )
-      {
-        def = propertyDefs[ descriptor.Name ];
-        if( def == null )
-        {
-          def = propertyDefs.GetRecursiveBaseTypes( descriptor.PropertyType );
-        }
-      }
-
-      return def;
-    }
-
-
-    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
deleted file mode 100644
index 01b51efb..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class PropertyDefinition : PropertyDefinitionBase
-  {
-    private string _name;
-    private bool? _isBrowsable = true;
-    private bool? _isExpandable = null;
-    private string _displayName = null;
-    private string _description = null;
-    private string _category = null;
-    private int? _displayOrder = null;
-
-    [Obsolete(@"Use 'TargetProperties' instead of 'Name'")]
-    public string Name
-    {
-      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; 
-      }
-    }
-
-    public string Category
-    {
-      get { return _category; }
-      set 
-      {
-        this.ThrowIfLocked( () => this.Category );
-        _category = value; 
-      }
-    }
-
-    public string DisplayName
-    {
-      get { return _displayName; }
-      set
-      {
-        this.ThrowIfLocked( () => this.DisplayName );
-        _displayName = value;
-      }
-    }
-
-    public string Description
-    {
-      get { return _description; }
-      set
-      {
-        this.ThrowIfLocked( () => this.Description );
-        _description = value;
-      }
-    }
-
-    public int? DisplayOrder
-    {
-      get { return _displayOrder; }
-      set
-      {
-        this.ThrowIfLocked( () => this.DisplayOrder );
-        _displayOrder = value;
-      }
-    }
-
-    public bool? IsBrowsable
-    {
-      get { return _isBrowsable; }
-      set
-      {
-        this.ThrowIfLocked( () => this.IsBrowsable );
-        _isBrowsable = value;
-      }
-    }
-
-    public bool? IsExpandable
-    {
-      get { return _isExpandable; }
-      set
-      {
-        this.ThrowIfLocked( () => this.IsExpandable );
-        _isExpandable = 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
deleted file mode 100644
index 67c90df6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyDefinitionCollection : PropertyDefinitionBaseCollection<PropertyDefinition>
-  {
-  }
-  public class EditorDefinitionCollection : PropertyDefinitionBaseCollection<EditorDefinitionBase>
-  {
-  }
-
-
-  public abstract class PropertyDefinitionBaseCollection<T> : DefinitionCollectionBase<T> where T : PropertyDefinitionBase
-  {
-    protected PropertyDefinitionBaseCollection()
-    {
-    }
-
-    public virtual T this[ object propertyId ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.TargetProperties.Contains( propertyId ) )
-            return item;
-
-          // Using the special character "*" in a string of TargetProperties will
-          // return all the items containing the string (before or after) the "*".
-          // ex : Prop* will return properties named Prop1, Prop2, Prop3...
-          List<string> stringTargetProperties = item.TargetProperties.OfType<string>().ToList();
-          if( ( stringTargetProperties != null ) && ( stringTargetProperties.Count > 0 ) )
-          {
-            if( propertyId is string )
-            {
-              string stringPropertyID = ( string )propertyId;
-              foreach( var targetPropertyString in stringTargetProperties )
-              {
-                if( targetPropertyString.Contains( "*" ) )
-                {
-                  string searchString = targetPropertyString.Replace( "*", "" );
-                  if( stringPropertyID.StartsWith( searchString ) || stringPropertyID.EndsWith( searchString ) )
-                    return item;
-                }
-              }
-            }
-          }
-          else
-          {
-            //Manage Interfaces
-            var type = propertyId as Type;
-            if( type != null )
-            {
-              foreach( Type targetProperty in item.TargetProperties )
-              {
-                if( targetProperty.IsAssignableFrom( type ) )
-                  return item;
-              }
-            }
-          }
-        }
-
-        return null;
-      }
-    }
-
-    internal T GetRecursiveBaseTypes( Type type )
-    {
-      // If no definition for the current type, fall back on base type editor recursively.
-      T ret = null;
-      while( ret == null && type != null )
-      {
-        ret = this[ type ];
-        type = type.BaseType;
-      }
-      return ret;
-    }
-  }
-
-  public abstract class DefinitionCollectionBase<T> : ObservableCollection<T> where T : DefinitionBase
-  {
-    internal DefinitionCollectionBase()
-    {
-    }
-
-    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/PropertyGrid.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
deleted file mode 100644
index ff4ee52a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ /dev/null
@@ -1,1599 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
-using System.Collections.Specialized;
-using System.Windows.Media;
-using System.Collections.ObjectModel;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [TemplatePart( Name = PART_DragThumb, Type = typeof( Thumb ) )]
-  [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 ContainerHelperBase _containerHelper;
-    private PropertyDefinitionCollection _propertyDefinitions;
-    private WeakEventListener<NotifyCollectionChangedEventArgs> _propertyDefinitionsListener;
-    private WeakEventListener<NotifyCollectionChangedEventArgs> _editorDefinitionsListener;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region AdvancedOptionsMenu
-
-    public static readonly DependencyProperty AdvancedOptionsMenuProperty = DependencyProperty.Register( "AdvancedOptionsMenu", typeof( ContextMenu ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
-    public ContextMenu AdvancedOptionsMenu
-    {
-      get
-      {
-        return ( ContextMenu )GetValue( AdvancedOptionsMenuProperty );
-      }
-      set
-      {
-        SetValue( AdvancedOptionsMenuProperty, value );
-      }
-    }
-
-    #endregion //AdvancedOptionsMenu
-
-    #region AutoGenerateProperties
-
-    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool AutoGenerateProperties
-    {
-      get
-      {
-        return ( bool )GetValue( AutoGeneratePropertiesProperty );
-      }
-      set
-      {
-        SetValue( AutoGeneratePropertiesProperty, value );
-      }
-    }
-
-    #endregion //AutoGenerateProperties
-
-    #region ShowDescriptionByTooltip
-
-    public static readonly DependencyProperty ShowDescriptionByTooltipProperty = DependencyProperty.Register( "ShowDescriptionByTooltip", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowDescriptionByTooltip
-    {
-      get
-      {
-        return ( bool )GetValue( ShowDescriptionByTooltipProperty );
-      }
-      set
-      {
-        SetValue( ShowDescriptionByTooltipProperty, value );
-      }
-    }
-
-    #endregion //ShowDescriptionByTooltip
-
-    #region ShowSummary
-
-    public static readonly DependencyProperty ShowSummaryProperty = DependencyProperty.Register( "ShowSummary", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSummary
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSummaryProperty );
-      }
-      set
-      {
-        SetValue( ShowSummaryProperty, value );
-      }
-    }
-
-    #endregion //ShowSummary
-
-    #region EditorDefinitions
-
-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( null, OnEditorDefinitionsChanged ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
-
-    private static void OnEditorDefinitionsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnEditorDefinitionsChanged( ( EditorDefinitionCollection )e.OldValue, ( EditorDefinitionCollection )e.NewValue );
-    }
-
-    protected virtual void OnEditorDefinitionsChanged( EditorDefinitionCollection oldValue, EditorDefinitionCollection newValue )
-    {
-      if( oldValue != null )
-        CollectionChangedEventManager.RemoveListener( oldValue, _editorDefinitionsListener );
-
-      if( newValue != null )
-        CollectionChangedEventManager.AddListener( newValue, _editorDefinitionsListener );
-
-      this.Notify( this.PropertyChanged, () => this.EditorDefinitions );
-    }
-
-    private void OnEditorDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.NotifyEditorDefinitionsCollectionChanged();
-      }
-    }
-
-    #endregion //EditorDefinitions
-
-    #region Filter
-
-    public static readonly DependencyProperty FilterProperty = DependencyProperty.Register( "Filter", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnFilterChanged ) );
-    public string Filter
-    {
-      get
-      {
-        return ( string )GetValue( FilterProperty );
-      }
-      set
-      {
-        SetValue( FilterProperty, value );
-      }
-    }
-
-    private static void OnFilterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnFilterChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void OnFilterChanged( string oldValue, string 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
-
-    #region FilterWatermark
-
-    public static readonly DependencyProperty FilterWatermarkProperty = DependencyProperty.Register( "FilterWatermark", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( "Search" ) );
-    public string FilterWatermark
-    {
-      get
-      {
-        return ( string )GetValue( FilterWatermarkProperty );
-      }
-      set
-      {
-        SetValue( FilterWatermarkProperty, value );
-      }
-    }
-
-    #endregion //FilterWatermark
-
-    #region HideInheritedProperties
-
-    public static readonly DependencyProperty HideInheritedPropertiesProperty = DependencyProperty.Register( "HideInheritedProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool HideInheritedProperties
-    {
-      get
-      {
-        return ( bool )GetValue( HideInheritedPropertiesProperty );
-      }
-      set
-      {
-        SetValue( HideInheritedPropertiesProperty, value );
-      }
-    }
-
-    #endregion //HideInheritedProperties
-
-    #region IsCategorized
-
-    public static readonly DependencyProperty IsCategorizedProperty = DependencyProperty.Register( "IsCategorized", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true, OnIsCategorizedChanged ) );
-    public bool IsCategorized
-    {
-      get
-      {
-        return ( bool )GetValue( IsCategorizedProperty );
-      }
-      set
-      {
-        SetValue( IsCategorizedProperty, value );
-      }
-    }
-
-    private static void OnIsCategorizedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnIsCategorizedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsCategorizedChanged( bool oldValue, bool newValue )
-    {
-      this.UpdateThumb();
-    }
-
-    #endregion //IsCategorized
-
-    #region IsMiscCategoryLabelHidden
-
-    public static readonly DependencyProperty IsMiscCategoryLabelHiddenProperty = DependencyProperty.Register( "IsMiscCategoryLabelHidden", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool IsMiscCategoryLabelHidden
-    {
-      get
-      {
-        return ( bool )GetValue( IsMiscCategoryLabelHiddenProperty );
-      }
-      set
-      {
-        SetValue( IsMiscCategoryLabelHiddenProperty, value );
-      }
-    }
-
-    #endregion //IsMiscCategoryLabelHidden
-
-    #region IsScrollingToTopAfterRefresh
-
-    public static readonly DependencyProperty IsScrollingToTopAfterRefreshProperty = DependencyProperty.Register( "IsScrollingToTopAfterRefresh", typeof( bool ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( true ) );
-    public bool IsScrollingToTopAfterRefresh
-    {
-      get
-      {
-        return ( bool )GetValue( IsScrollingToTopAfterRefreshProperty );
-      }
-      set
-      {
-        SetValue( IsScrollingToTopAfterRefreshProperty, value );
-      }
-    }
-
-    #endregion //IsScrollingToTopAfterRefresh
-
-    #region IsVirtualizing
-
-    public static readonly DependencyProperty IsVirtualizingProperty = DependencyProperty.Register( "IsVirtualizing", typeof( bool ), typeof( PropertyGrid )
-      , new UIPropertyMetadata( false, OnIsVirtualizingChanged ) );
-    public bool IsVirtualizing
-    {
-      get
-      {
-        return ( bool )GetValue( IsVirtualizingProperty );
-      }
-      set
-      {
-        SetValue( IsVirtualizingProperty, value );
-      }
-    }
-
-    private static void OnIsVirtualizingChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnIsVirtualizingChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsVirtualizingChanged( bool oldValue, bool newValue )
-    {
-      this.UpdateContainerHelper();
-    }
-
-    #endregion //IsVirtualizing
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #region NameColumnWidth
-
-    public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register( "NameColumnWidth", typeof( double ), typeof( PropertyGrid ), new UIPropertyMetadata( 150.0, OnNameColumnWidthChanged ) );
-    public double NameColumnWidth
-    {
-      get
-      {
-        return ( double )GetValue( NameColumnWidthProperty );
-      }
-      set
-      {
-        SetValue( NameColumnWidthProperty, value );
-      }
-    }
-
-    private static void OnNameColumnWidthChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnNameColumnWidthChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnNameColumnWidthChanged( double oldValue, double newValue )
-    {
-      if( _dragThumb != null )
-        ( ( TranslateTransform )_dragThumb.RenderTransform ).X = newValue;
-    }
-
-    #endregion //NameColumnWidth
-
-    #region Properties
-
-    public IList Properties
-    {
-      get
-      {
-        return (_containerHelper != null) ? _containerHelper.Properties : null;
-      }
-    }
-
-    #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
-    {
-      get
-      {
-        return _propertyDefinitions;
-      }
-      set
-      {
-        if( _propertyDefinitions != value )
-        {
-          PropertyDefinitionCollection oldValue = _propertyDefinitions;
-          _propertyDefinitions = value;
-          this.OnPropertyDefinitionsChanged( oldValue, value );
-        }
-      }
-    }
-
-    protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue )
-    {
-      if( oldValue != null )
-        CollectionChangedEventManager.RemoveListener( oldValue, _propertyDefinitionsListener );
-
-      if( newValue != null )
-        CollectionChangedEventManager.AddListener( newValue, _propertyDefinitionsListener );
-
-      this.Notify( this.PropertyChanged, () => this.PropertyDefinitions );
-    }
-
-    private void OnPropertyDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.NotifyPropertyDefinitionsCollectionChanged();
-      }
-      if( this.IsLoaded )
-      {
-        this.UpdateContainerHelper();
-      }
-    }
-
-    #endregion //PropertyDefinitions
-
-    #region IsReadOnly
-
-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
-
-    #endregion //ReadOnly
-
-    #region SelectedObject
-
-    public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register( "SelectedObject", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectChanged ) );
-    public object SelectedObject
-    {
-      get
-      {
-        return ( object )GetValue( SelectedObjectProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectProperty, value );
-      }
-    }
-
-    private static void OnSelectedObjectChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyInspector = o as PropertyGrid;
-      if( propertyInspector != null )
-        propertyInspector.OnSelectedObjectChanged( ( object )e.OldValue, ( object )e.NewValue );
-    }
-
-    protected virtual void OnSelectedObjectChanged( object oldValue, object newValue )
-    {
-      // We do not want to process the change now if the grid is initializing (ie. BeginInit/EndInit).
-      if( _initializationCount != 0 )
-      {
-        _hasPendingSelectedObjectChanged = true;
-        return;
-      }
-
-      this.UpdateContainerHelper();
-
-      RaiseEvent( new RoutedPropertyChangedEventArgs<object>( oldValue, newValue, PropertyGrid.SelectedObjectChangedEvent ) );
-    }
-
-    #endregion //SelectedObject
-
-    #region SelectedObjectType
-
-    public static readonly DependencyProperty SelectedObjectTypeProperty = DependencyProperty.Register( "SelectedObjectType", typeof( Type ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectTypeChanged ) );
-    public Type SelectedObjectType
-    {
-      get
-      {
-        return ( Type )GetValue( SelectedObjectTypeProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectTypeProperty, value );
-      }
-    }
-
-    private static void OnSelectedObjectTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnSelectedObjectTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
-    }
-
-    protected virtual void OnSelectedObjectTypeChanged( Type oldValue, Type newValue )
-    {
-    }
-
-    #endregion //SelectedObjectType
-
-    #region SelectedObjectTypeName
-
-    public static readonly DependencyProperty SelectedObjectTypeNameProperty = DependencyProperty.Register( "SelectedObjectTypeName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty ) );
-    public string SelectedObjectTypeName
-    {
-      get
-      {
-        return ( string )GetValue( SelectedObjectTypeNameProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectTypeNameProperty, value );
-      }
-    }
-
-    #endregion //SelectedObjectTypeName
-
-    #region SelectedObjectName
-
-    public static readonly DependencyProperty SelectedObjectNameProperty = DependencyProperty.Register( "SelectedObjectName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty, OnSelectedObjectNameChanged, OnCoerceSelectedObjectName ) );
-    public string SelectedObjectName
-    {
-      get
-      {
-        return ( string )GetValue( SelectedObjectNameProperty );
-      }
-      set
-      {
-        SetValue( SelectedObjectNameProperty, value );
-      }
-    }
-
-    private static object OnCoerceSelectedObjectName( DependencyObject o, object baseValue )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-      {
-        if( (propertyGrid.SelectedObject is FrameworkElement) && ( String.IsNullOrEmpty( ( String )baseValue ) ))
-          return "<no name>";
-      }
-
-      return baseValue;
-    }
-
-    private static void OnSelectedObjectNameChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.SelectedObjectNameChanged( ( string )e.OldValue, ( string )e.NewValue );
-    }
-
-    protected virtual void SelectedObjectNameChanged( string oldValue, string newValue )
-    {
-    }
-
-    #endregion //SelectedObjectName
-
-
-
-
-
-
-
-
-
-
-
-
-    #region 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 ( PropertyItemBase )GetValue( SelectedPropertyItemProperty );
-      }
-      internal set
-      {
-        SetValue( SelectedPropertyItemPropertyKey, value );
-      }
-    }
-
-    private static void OnSelectedPropertyItemChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyGrid propertyGrid = o as PropertyGrid;
-      if( propertyGrid != null )
-        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItemBase )e.OldValue, ( PropertyItemBase )e.NewValue );
-    }
-
-    protected virtual void OnSelectedPropertyItemChanged( PropertyItemBase oldValue, PropertyItemBase newValue )
-    {
-      if( oldValue != null )
-        oldValue.IsSelected = false;
-
-      if( newValue != null )
-        newValue.IsSelected = true;
-
-      this.SelectedProperty = ( (newValue != null) && (_containerHelper != 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.
-      if( _containerHelper != null )
-      {
-        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 ) );
-    public bool ShowAdvancedOptions
-    {
-      get
-      {
-        return ( bool )GetValue( ShowAdvancedOptionsProperty );
-      }
-      set
-      {
-        SetValue( ShowAdvancedOptionsProperty, value );
-      }
-    }
-
-    #endregion //ShowAdvancedOptions
-
-    #region ShowHorizontalScrollBar
-
-    public static readonly DependencyProperty ShowHorizontalScrollBarProperty = DependencyProperty.Register( "ShowHorizontalScrollBar", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowHorizontalScrollBar
-    {
-      get
-      {
-        return ( bool )GetValue( ShowHorizontalScrollBarProperty );
-      }
-      set
-      {
-        SetValue( ShowHorizontalScrollBarProperty, value );
-      }
-    }
-
-    #endregion //ShowHorizontalScrollBar
-
-    #region ShowPreview
-
-    public static readonly DependencyProperty ShowPreviewProperty = DependencyProperty.Register( "ShowPreview", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
-    public bool ShowPreview
-    {
-      get
-      {
-        return ( bool )GetValue( ShowPreviewProperty );
-      }
-      set
-      {
-        SetValue( ShowPreviewProperty, value );
-      }
-    }
-
-    #endregion //ShowPreview
-
-    #region ShowSearchBox
-
-    public static readonly DependencyProperty ShowSearchBoxProperty = DependencyProperty.Register( "ShowSearchBox", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSearchBox
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSearchBoxProperty );
-      }
-      set
-      {
-        SetValue( ShowSearchBoxProperty, value );
-      }
-    }
-
-    #endregion //ShowSearchBox
-
-    #region ShowSortOptions
-
-    public static readonly DependencyProperty ShowSortOptionsProperty = DependencyProperty.Register( "ShowSortOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowSortOptions
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSortOptionsProperty );
-      }
-      set
-      {
-        SetValue( ShowSortOptionsProperty, value );
-      }
-    }
-
-    #endregion //ShowSortOptions
-
-    #region ShowTitle
-
-    public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register( "ShowTitle", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool ShowTitle
-    {
-      get
-      {
-        return ( bool )GetValue( ShowTitleProperty );
-      }
-      set
-      {
-        SetValue( ShowTitleProperty, value );
-      }
-    }
-
-    #endregion //ShowTitle
-
-    #region UpdateTextBoxSourceOnEnterKey
-
-    public static readonly DependencyProperty UpdateTextBoxSourceOnEnterKeyProperty = DependencyProperty.Register( "UpdateTextBoxSourceOnEnterKey", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
-    public bool UpdateTextBoxSourceOnEnterKey
-    {
-      get
-      {
-        return ( bool )GetValue( UpdateTextBoxSourceOnEnterKeyProperty );
-      }
-      set
-      {
-        SetValue( UpdateTextBoxSourceOnEnterKeyProperty, value );
-      }
-    }
-
-    #endregion //UpdateTextBoxSourceOnEnterKey
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static PropertyGrid()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGrid ), new FrameworkPropertyMetadata( typeof( PropertyGrid ) ) );
-    }
-
-    public PropertyGrid()
-    {
-      _propertyDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnPropertyDefinitionsCollectionChanged );
-      _editorDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnEditorDefinitionsCollectionChanged);     
-      UpdateContainerHelper();
-#if VS2008
-        EditorDefinitions = new EditorDefinitionCollection();
-#else
-      this.SetCurrentValue( PropertyGrid.EditorDefinitionsProperty, new EditorDefinitionCollection() );
-#endif
-
-      PropertyDefinitions = new PropertyDefinitionCollection();      
-      this.PropertyValueChanged += this.PropertyGrid_PropertyValueChanged;
-
-      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 ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _dragThumb != null )
-        _dragThumb.DragDelta -= DragThumb_DragDelta;
-      _dragThumb = GetTemplateChild( PART_DragThumb ) as Thumb;
-      if( _dragThumb != null )
-        _dragThumb.DragDelta += DragThumb_DragDelta;
-
-      if( _containerHelper != null )
-      {
-        _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 
-      //into its ancestor element, Visual Studio displays data warning messages in output window when 
-      //binding engine meets unmatched target type during visual tree traversal though it does the proper 
-      //binding when it receives expected target type during visual tree traversal
-      //ref : http://www.codeproject.com/Tips/124556/How-to-suppress-the-System-Windows-Data-Error-warn
-      TranslateTransform _moveTransform = new TranslateTransform();
-      _moveTransform.X = NameColumnWidth;
-      if( _dragThumb != null )
-      {
-        _dragThumb.RenderTransform = _moveTransform;
-      }
-
-      this.UpdateThumb();
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      var textBox = e.OriginalSource as TextBox;
-
-      //hitting enter on textbox will update value of underlying source if UpdateTextBoxSourceOnEnterKey is true
-      if( (this.SelectedPropertyItem != null) 
-          && (e.Key == Key.Enter)
-          && this.UpdateTextBoxSourceOnEnterKey
-          && (textBox != null)
-          && !textBox.AcceptsReturn )
-      {
-        BindingExpression be = textBox.GetBindingExpression( TextBox.TextProperty );
-        if( be != null )
-          be.UpdateSource();
-      }
-    }
-
-    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 )
-    {
-      PropertyItemBase item = ( PropertyItemBase )args.OriginalSource;
-      if( item.IsSelected )
-      {
-        SelectedPropertyItem = item;
-      }
-      else
-      {
-        if( object.ReferenceEquals( item, SelectedPropertyItem ) )
-        {
-          SelectedPropertyItem = null;
-        }
-      }
-    }
-
-    private void OnPreparePropertyItemInternal( object sender, PropertyItemEventArgs args )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.PrepareChildrenPropertyItem( args.PropertyItem, args.Item );
-      }
-      args.Handled = true;
-    }
-
-    private void OnClearPropertyItemInternal( object sender, PropertyItemEventArgs args )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.ClearChildrenPropertyItem( args.PropertyItem, args.Item );
-      }
-      args.Handled = true;
-    }
-
-    private void DragThumb_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      NameColumnWidth = Math.Min( Math.Max( this.ActualWidth * 0.1, NameColumnWidth + e.HorizontalChange ), this.ActualWidth * 0.9 );
-    }
-
-
-    private void PropertyGrid_PropertyValueChanged( object sender, PropertyValueChangedEventArgs e )
-    {
-      var modifiedPropertyItem = e.OriginalSource as PropertyItem;
-      if( modifiedPropertyItem != null )
-      {
-        // Need to refresh the PropertyGrid Properties.
-        if( modifiedPropertyItem.WillRefreshPropertyGrid )
-        {
-          // Refresh the PropertyGrid...this will set the initial Categories states.
-          this.UpdateContainerHelper();
-        }
-
-        var parentPropertyItem = modifiedPropertyItem.ParentNode as PropertyItem;
-        if( ( parentPropertyItem != null ) && parentPropertyItem.IsExpandable )
-        {
-          //Rebuild Editor for parent propertyItem if one of its sub-propertyItem have changed.
-          this.RebuildEditor( parentPropertyItem );
-        }
-      }
-    }
-
-
-    #endregion //Event Handlers
-
-    #region Commands
-
-    private void ClearFilter( object sender, ExecutedRoutedEventArgs e )
-    {
-      Filter = String.Empty;
-    }
-
-    private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = !String.IsNullOrEmpty( Filter );
-    }
-
-    #endregion //Commands
-
-    #region Methods
-
-
-
-
-
-
-
-
-
-
-
-
-    public double GetScrollPosition()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        return scrollViewer.VerticalOffset;
-      }
-      return 0d;
-    }
-
-    public void ScrollToPosition( double position )
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToVerticalOffset( position );
-      }
-    }
-
-    public void ScrollToTop()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToTop();
-      }
-    }
-
-    public void ScrollToBottom()
-    {
-      var scrollViewer = this.GetScrollViewer();
-      if( scrollViewer != null )
-      {
-        scrollViewer.ScrollToBottom();
-      }
-    }
-
-    public void CollapseAllProperties()
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( false );
-      }
-    }
-
-    public void ExpandAllProperties()
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( true );
-      }
-    }
-
-    public void ExpandProperty( string propertyName )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( propertyName, true );
-      }
-    }
-
-    public void CollapseProperty( string propertyName )
-    {
-      if( _containerHelper != null )
-      {
-        _containerHelper.SetPropertiesExpansion( propertyName, false );
-      }
-    }
-
-    private ScrollViewer GetScrollViewer()
-    {
-      if( (_containerHelper != null) && (_containerHelper.ChildrenItemsControl != null) )
-      {
-        return TreeHelper.FindChild<ScrollViewer>( _containerHelper.ChildrenItemsControl );
-      }
-      return null;
-    }
-
-    private void RebuildEditor( PropertyItem propertyItem )
-    {
-      ObjectContainerHelperBase objectContainerHelperBase = propertyItem.ContainerHelper as ObjectContainerHelperBase;
-      //Re-build the editor to update this propertyItem
-      FrameworkElement editor = objectContainerHelperBase.GenerateChildrenEditorElement( propertyItem );
-      if( editor != null )
-      {
-        // Tag the editor as generated to know if we should clear it.
-        ContainerHelperBase.SetIsGenerated( editor, true );
-        propertyItem.Editor = editor;
-
-        //Update Source of binding and Validation of PropertyItem to update
-        var be = propertyItem.GetBindingExpression( PropertyItem.ValueProperty );
-        if( be != null )
-        {
-          be.UpdateSource();
-          propertyItem.SetRedInvalidBorder( be );
-        }
-      }
-    }
-
-    private void UpdateContainerHelper()
-    {
-      // Keep a backup of the template element and initialize the
-      // new helper with it.
-      ItemsControl childrenItemsControl = null;
-      if( _containerHelper != null )
-      {
-        childrenItemsControl = _containerHelper.ChildrenItemsControl;
-        _containerHelper.ClearHelper();
-        if( _containerHelper is ObjectContainerHelperBase )
-        {
-          // 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 )
-          //{
-            this.AdvancedOptionsMenu = null;
-          //}
-        }
-      }
-
-
-
-
-      if( SelectedObject != null )
-      {
-        _containerHelper = new ObjectContainerHelper( this, SelectedObject );
-        ( ( ObjectContainerHelper )_containerHelper ).GenerateProperties();
-      }
-
-
-      if( _containerHelper != null )
-      {
-        _containerHelper.ChildrenItemsControl = childrenItemsControl;
-      }
-
-      if( this.IsScrollingToTopAfterRefresh )
-      {
-        this.ScrollToTop();
-      }
-
-      // 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 );
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    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 );
-      }
-    }
-
-    /// <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()
-    {
-      if( _containerHelper != null )
-      {
-        _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
-    {
-      add
-      {
-        AddHandler( PropertyValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PropertyValueChangedEvent, value );
-      }
-    }
-    #endregion
-
-    #region SelectedPropertyItemChangedEvent Routed Event
-
-    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<PropertyItemBase> ), typeof( PropertyGrid ) );
-    public event RoutedPropertyChangedEventHandler<PropertyItemBase> SelectedPropertyItemChanged
-    {
-      add
-      {
-        AddHandler( SelectedPropertyItemChangedEvent, value );
-      }
-      remove
-      {
-        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
-    {
-      add
-      {
-        AddHandler( SelectedObjectChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( SelectedObjectChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region IsPropertyBrowsable Event
-
-    public event IsPropertyBrowsableHandler IsPropertyBrowsable;
-
-    #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
-
-    #region ISupportInitialize Members
-
-    public override void BeginInit()
-    {
-      base.BeginInit();
-      _initializationCount++;
-    }
-
-    public override void EndInit()
-    {
-      base.EndInit();
-      if( --_initializationCount == 0 )
-      {
-        if( _hasPendingSelectedObjectChanged )
-        {
-          //This will update SelectedObject, Type, Name based on the actual config.
-          this.UpdateContainerHelper();
-          _hasPendingSelectedObjectChanged = false;
-        }
-        if( _containerHelper != null )
-        {
-          _containerHelper.OnEndInit();
-        }
-      }
-    }
-
-    #endregion
-
-    #region IPropertyContainer Members
-
-    FilterInfo IPropertyContainer.FilterInfo
-    {
-      get 
-      {
-        return new FilterInfo()
-        {
-          Predicate = this.CreateFilter(this.Filter),
-          InputString = this.Filter
-        };
-      }
-    }
-
-    ContainerHelperBase IPropertyContainer.ContainerHelper
-    {
-      get
-      {
-        return _containerHelper;
-      }
-    }
-
-    bool IPropertyContainer.IsSortedAlphabetically
-    {
-      get
-      {
-        return true;
-      }
-    }
-
-
-    bool? IPropertyContainer.IsPropertyVisible( PropertyDescriptor pd )
-    {
-      var handler = this.IsPropertyBrowsable;
-      //If anyone is registered to PropertyGrid.IsPropertyBrowsable event
-      if( handler != null )
-      {
-        var isBrowsableArgs = new IsPropertyBrowsableArgs( pd );
-        handler( this, isBrowsableArgs );
-
-        return isBrowsableArgs.IsBrowsable;
-      }
-
-      return null;
-    }
-
-
-
-
-    #endregion
-
-
-    #endregion
-
-  }
-
-  #region PropertyValueChangedEvent Handler/Args
-  public delegate void PropertyValueChangedEventHandler( object sender, PropertyValueChangedEventArgs e );
-  public class PropertyValueChangedEventArgs : RoutedEventArgs
-  {
-    public object NewValue
-    {
-      get;
-      set;
-    }
-    public object OldValue
-    {
-      get;
-      set;
-    }
-
-    public PropertyValueChangedEventArgs( RoutedEvent routedEvent, object source, object oldValue, object newValue )
-      : base( routedEvent, source )
-    {
-      NewValue = newValue;
-      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
-
-  #region IsPropertyArgs class
-
-  public class PropertyArgs : RoutedEventArgs
-  {
-    #region Constructors
-
-    public PropertyArgs( PropertyDescriptor pd )
-    {
-      this.PropertyDescriptor = pd;
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region PropertyDescriptor Property
-
-    public PropertyDescriptor PropertyDescriptor
-    {
-      get;
-      private set;
-    }
-
-    #endregion
-
-    #endregion
-  }
-
-  #endregion
-
-  #region isPropertyBrowsableEvent Handler/Args
-
-  public delegate void IsPropertyBrowsableHandler( object sender, IsPropertyBrowsableArgs e );
-
-  public class IsPropertyBrowsableArgs : PropertyArgs
-  {
-    #region Constructors
-
-    public IsPropertyBrowsableArgs( PropertyDescriptor pd )
-      : base( pd )
-    {
-    }
-
-    #endregion
-
-    #region Properties
-
-    #region IsBrowsable Property
-
-    public bool? IsBrowsable
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #endregion
-  }
-
-  #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
deleted file mode 100644
index ad8afead..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Data;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Linq.Expressions;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Controls;
-using System.Reflection;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.IO;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal class PropertyGridUtilities
-  {
-    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
-    {
-      return property.Attributes.OfType<T>().FirstOrDefault();
-    }
-
-
-
-
-    internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverter typeConverter, PropertyItem propertyItem )
-    {
-      ITypeEditor editor = null;
-
-      var context = new EditorTypeDescriptorContext( null, propertyItem.Instance, propertyItem.PropertyDescriptor );
-      if( (typeConverter != null)
-        && typeConverter.GetStandardValuesSupported( context )
-        && typeConverter.GetStandardValuesExclusive( context )
-        && (propertyType != typeof( bool )) && (propertyType != typeof( bool? )) )  //Bool type always have a BooleanConverter with standardValues : True/False.
-      {
-        var items = typeConverter.GetStandardValues( context );
-        editor = new SourceComboBoxEditor( items, typeConverter );
-      }
-      else 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();
-      else if( propertyType == typeof( double ) || propertyType == typeof( double? ) )
-        editor = new DoubleUpDownEditor();
-      else if( propertyType == typeof( int ) || propertyType == typeof( int? ) )
-        editor = new IntegerUpDownEditor();
-      else if( propertyType == typeof( short ) || propertyType == typeof( short? ) )
-        editor = new ShortUpDownEditor();
-      else if( propertyType == typeof( long ) || propertyType == typeof( long? ) )
-        editor = new LongUpDownEditor();
-      else if( propertyType == typeof( float ) || propertyType == typeof( float? ) )
-        editor = new SingleUpDownEditor();
-      else if( propertyType == typeof( byte ) || propertyType == typeof( byte? ) )
-        editor = new ByteUpDownEditor();
-      else if( propertyType == typeof( sbyte ) || propertyType == typeof( sbyte? ) )
-        editor = new SByteUpDownEditor();
-      else if( propertyType == typeof( uint ) || propertyType == typeof( uint? ) )
-        editor = new UIntegerUpDownEditor();
-      else if( propertyType == typeof( ulong ) || propertyType == typeof( ulong? ) )
-        editor = new ULongUpDownEditor();
-      else if( propertyType == typeof( ushort ) || propertyType == typeof( ushort? ) )
-        editor = new UShortUpDownEditor();
-      else if( propertyType == typeof( DateTime ) || propertyType == typeof( DateTime? ) )
-        editor = new DateTimeUpDownEditor();
-      else if( ( propertyType == typeof( Color ) ) || ( propertyType == typeof( Color? ) ) )
-        editor = new ColorEditor();
-      else if( propertyType.IsEnum )
-        editor = new EnumComboBoxEditor();
-      else if( propertyType == typeof( TimeSpan ) || propertyType == typeof( TimeSpan? ) )
-        editor = new TimeSpanUpDownEditor();
-      else if( propertyType == typeof( FontFamily ) || propertyType == typeof( FontWeight ) || propertyType == typeof( FontStyle ) || propertyType == typeof( FontStretch ) )
-        editor = new FontComboBoxEditor();
-      else if (propertyType == typeof(Guid) || propertyType == typeof(Guid?))
-        editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA" };
-      else if (propertyType == typeof(char) || propertyType == typeof(char?))
-        editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "&" };
-      else if( propertyType == typeof( object ) )
-        // If any type of object is possible in the property, default to the TextBoxEditor.
-        // Useful in some case (e.g., Button.Content).
-        // Can be reconsidered but was the legacy behavior on the PropertyGrid.
-        editor = new TextBoxEditor();
-      else
-      {
-        var listType = ListUtilities.GetListItemType( propertyType );
-
-        // A List of T
-        if( listType != null )
-        {
-          if( !listType.IsPrimitive && !listType.Equals( typeof( String ) ) && !listType.IsEnum )
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
-          else
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.PrimitiveTypeCollectionEditor();
-        }
-        else
-        {
-          var dictionaryType = ListUtilities.GetDictionaryItemsType( propertyType );
-          var collectionType = ListUtilities.GetCollectionItemType( propertyType );
-          // A dictionary of T or a Collection of T or an ICollection
-          if( (dictionaryType != null) || (collectionType != null) || typeof( ICollection ).IsAssignableFrom( propertyType ) )
-          {
-            editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
-          }
-          else
-          {
-            // If the type is not supported, check if there is a converter that supports
-            // string conversion to the object type. Use TextBox in theses cases.
-            // Otherwise, return a TextBlock editor since no valid editor exists.
-            editor = (typeConverter != null && typeConverter.CanConvertFrom( typeof( string ) ))
-              ? (ITypeEditor)new TextBoxEditor()
-              : (ITypeEditor)new TextBlockEditor();
-          }
-        }
-      }
-
-      return editor;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #region Private class
-
-    private class EditorTypeDescriptorContext : ITypeDescriptorContext
-    {
-      IContainer _container;
-      object _instance;
-      PropertyDescriptor _propertyDescriptor;
-
-      internal EditorTypeDescriptorContext( IContainer container, object instance, PropertyDescriptor pd )
-      {
-        _container = container;
-        _instance = instance;
-        _propertyDescriptor = pd;
-      }
-
-      IContainer ITypeDescriptorContext.Container
-      {
-        get
-        {
-          return _container;
-        }
-      }
-      object ITypeDescriptorContext.Instance
-      {
-        get
-        {
-          return _instance;
-        }
-      }
-      PropertyDescriptor ITypeDescriptorContext.PropertyDescriptor
-      {
-        get
-        {
-          return _propertyDescriptor;
-        }
-      }
-
-      void ITypeDescriptorContext.OnComponentChanged()
-      {
-      }
-
-      bool ITypeDescriptorContext.OnComponentChanging()
-      {
-        return false;
-      }
-
-      object IServiceProvider.GetService( Type serviceType )
-      {
-        return null;
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
deleted file mode 100644
index e2b90cb2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
+++ /dev/null
@@ -1,298 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq.Expressions;
-using System.Diagnostics;
-using System.Globalization;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  [TemplatePart( Name = "content", Type = typeof( ContentControl ) )]
-  public class PropertyItem : CustomPropertyItem
-  {
-    #region Properties
-
-    #region IsReadOnly
-
-    /// <summary>
-    /// Identifies the IsReadOnly dependency property
-    /// </summary>
-    public static readonly DependencyProperty IsReadOnlyProperty =
-        DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
-
-    public bool IsReadOnly
-    {
-      get { return ( bool )GetValue( IsReadOnlyProperty ); }
-      set { SetValue( IsReadOnlyProperty, value ); }
-    }
-
-    #endregion //IsReadOnly
-
-    #region IsInValid
-
-    /// <summary>
-    /// Identifies the IsInvalid dependency property
-    /// </summary>
-    public static readonly DependencyProperty IsInvalidProperty =
-        DependencyProperty.Register( "IsInvalid", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsInvalidChanged ) );
-
-    public bool IsInvalid
-    {
-      get
-      {
-        return ( bool )GetValue( IsInvalidProperty );
-      }
-      internal set
-      {
-        SetValue( IsInvalidProperty, value );
-      }
-    }
-
-    private static void OnIsInvalidChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnIsInvalidChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsInvalidChanged( bool oldValue, bool newValue )
-    {
-      var be = this.GetBindingExpression( PropertyItem.ValueProperty );
-
-      if( newValue )
-      {
-        var validationError = new ValidationError( new InvalidValueValidationRule(), be );
-        validationError.ErrorContent = "Value could not be converted.";
-        Validation.MarkInvalid( be, validationError );
-      }
-      else
-      {
-        Validation.ClearInvalid( be );
-      }
-    }
-
-
-    #endregion // IsInvalid
-
-    #region PropertyDescriptor
-
-    public PropertyDescriptor PropertyDescriptor
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //PropertyDescriptor
-
-    #region PropertyName
-
-    public string PropertyName
-    {
-      get
-      {
-        return (this.DescriptorDefinition != null) ? this.DescriptorDefinition.PropertyName : null;
-      }
-    }
-
-    #endregion
-
-    #region PropertyType
-
-    public Type PropertyType
-    {
-      get
-      {
-        return ( PropertyDescriptor != null )
-          ? PropertyDescriptor.PropertyType
-          : null;
-      }
-    }
-
-    #endregion //PropertyType
-
-    #region DescriptorDefinition
-
-    internal DescriptorPropertyDefinitionBase DescriptorDefinition
-    {
-      get;
-      private set;
-    }
-
-    #endregion DescriptorDefinition    
-
-    #region Instance
-
-    public object Instance
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //Instance
-
-    #endregion //Properties
-
-    #region Overrides
-
-    protected override string GetPropertyItemName()
-    {
-      return this.PropertyName;
-    }
-
-    protected override Type GetPropertyItemType()
-    {
-      return this.PropertyType;
-    }
-
-    protected override void OnIsExpandedChanged( bool oldValue, bool newValue )
-    {
-      if( newValue && this.IsLoaded )
-      {
-        this.GenerateExpandedPropertyItems();
-      }
-    }
-
-    protected override object OnCoerceValueChanged( object baseValue )
-    {
-      // Propagate error from DescriptorPropertyDefinitionBase to PropertyItem.Value
-      // to see the red error rectangle in the propertyGrid.
-      BindingExpression be = this.GetBindingExpression( PropertyItem.ValueProperty );
-      this.SetRedInvalidBorder( be );
-      return baseValue;
-    }
-
-    protected override void OnValueChanged( object oldValue, object newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-
-      // A Default Value is defined and newValue is null => set the Default Value
-      if( ( newValue == null ) && ( this.DescriptorDefinition != null ) && ( this.DescriptorDefinition.DefaultValue != null ) )
-      {
-#if VS2008
-        this.Value = this.DescriptorDefinition.DefaultValue;
-#else
-        this.SetCurrentValue( PropertyItem.ValueProperty, this.DescriptorDefinition.DefaultValue );
-#endif
-      }
-    }
-
-    #endregion
-
-    #region Internal Methods
-
-    internal void SetRedInvalidBorder( BindingExpression be )
-    {
-      if( (be != null) && be.DataItem is DescriptorPropertyDefinitionBase )
-      {
-        DescriptorPropertyDefinitionBase descriptor = be.DataItem as DescriptorPropertyDefinitionBase;
-        if( Validation.GetHasError( descriptor ) )
-        {
-          ReadOnlyObservableCollection<ValidationError> errors = Validation.GetErrors( descriptor );
-          Validation.MarkInvalid( be, errors[ 0 ] );
-        }
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private void OnDefinitionContainerHelperInvalidated( object sender, EventArgs e )
-    {
-      if( this.ContainerHelper != null )
-      {
-        this.ContainerHelper.ClearHelper();
-      }
-      var helper = this.DescriptorDefinition.CreateContainerHelper( this );
-      this.ContainerHelper = helper;
-      if( this.IsExpanded )
-      {
-        helper.GenerateProperties();
-      }
-    }
-
-    private void Init( DescriptorPropertyDefinitionBase definition )
-    {
-      if( definition == null )
-        throw new ArgumentNullException( "definition" );
-
-      if( this.ContainerHelper != null )
-      {
-        this.ContainerHelper.ClearHelper();
-      }
-      this.DescriptorDefinition = definition;
-      this.ContainerHelper = definition.CreateContainerHelper( this );
-      definition.ContainerHelperInvalidated += new EventHandler( OnDefinitionContainerHelperInvalidated );
-      this.Loaded += this.PropertyItem_Loaded;
-    }
-
-    private void GenerateExpandedPropertyItems()
-    {
-      if( this.IsExpanded )
-      {
-        // This withholds the generation of all PropertyItem instances (recursively)
-        // until the PropertyItem is expanded.
-        var objectContainerHelper = ContainerHelper as ObjectContainerHelperBase;
-        if( objectContainerHelper != null )
-        {
-          objectContainerHelper.GenerateProperties();
-        }
-      }
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    private void PropertyItem_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.GenerateExpandedPropertyItems();
-    }
-
-    #endregion
-
-    #region Constructors
-
-    internal PropertyItem( DescriptorPropertyDefinitionBase definition )
-      : base( definition.IsPropertyGridCategorized, !definition.PropertyType.IsArray )
-    {
-      this.Init( definition );
-    }
-
-    #endregion //Constructors
-
-    private class InvalidValueValidationRule : ValidationRule
-    {
-      public override ValidationResult Validate( object value, CultureInfo cultureInfo )
-      {
-        // Will always return an error.
-        return new ValidationResult( false, null );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
deleted file mode 100644
index 5d80bac9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
+++ /dev/null
@@ -1,602 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-using System.Windows.Media;
-using System.Windows.Data;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-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;
-    internal bool _isPropertyGridCategorized;
-    internal bool _isSortedAlphabetically = true;
-
-    #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 )
-    {
-      PropertyItemBase propertyItem = o as PropertyItemBase;
-      if( propertyItem != null )
-        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
-    }
-
-    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
-    {
-    }
-
-    #endregion //Editor
-
-    #region HighlightedText
-
-    public static readonly DependencyProperty HighlightedTextProperty = DependencyProperty.Register( "HighlightedText", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
-
-    public string HighlightedText
-    {
-      get
-      {
-        return ( string )GetValue( HighlightedTextProperty );
-      }
-      set
-      {
-        SetValue( HighlightedTextProperty, value );
-      }
-    }
-
-    #endregion //HighlightedText
-
-    #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
-      {
-        if( _containerHelper == null )
-        {
-          _containerHelper = new ObjectContainerHelper( this, null );
-        }
-        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
-
-    #region WillRefreshPropertyGrid
-
-    public static readonly DependencyProperty WillRefreshPropertyGridProperty =
-        DependencyProperty.Register( "WillRefreshPropertyGrid", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false ) );
-
-    public bool WillRefreshPropertyGrid
-    {
-      get
-      {
-        return ( bool )GetValue( WillRefreshPropertyGridProperty );
-      }
-      set
-      {
-        SetValue( WillRefreshPropertyGridProperty, value );
-      }
-    }
-
-    #endregion //WillRefreshPropertyGrid
-
-    #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()
-    {
-      this.GotFocus += new RoutedEventHandler( PropertyItemBase_GotFocus );
-      this.RequestBringIntoView += this.PropertyItemBase_RequestBringIntoView;
-      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;
-    }
-
-    private void PropertyItemBase_RequestBringIntoView( object sender, RequestBringIntoViewEventArgs e )
-    {
-      e.Handled = true;
-    }
-
-    #endregion  //Event Handlers
-
-    #region Methods
-
-    protected virtual Type GetPropertyItemType()
-    {
-      return null;
-    }
-
-    protected virtual string GetPropertyItemName()
-    {
-      return this.DisplayName;
-    }
-
-    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.IsLoaded 
-        && (_parentNode != null) 
-        && !_parentNode.ContainerHelper.IsCleaning)
-      {
-        this.RaisePropertyChanged( e.Property.Name );
-      }
-    }
-
-    private PropertyDefinitionCollection GetPropertItemPropertyDefinitions()
-    {
-      if( (this.ParentNode != null) && (this.ParentNode.PropertyDefinitions != null) )
-      {
-        var name = this.GetPropertyItemName();
-        foreach( var pd in this.ParentNode.PropertyDefinitions )
-        {
-          if( pd.TargetProperties.Contains( name ) )
-          {
-            // PropertyDefinitions contains a PropertyDefinition for this PropertyItem Name => return its PropertyDefinitions.
-            return pd.PropertyDefinitions;
-          }
-          else
-          {
-            var type = this.GetPropertyItemType();
-            if( type != null )
-            {
-              foreach( var targetProperty in pd.TargetProperties )
-              {
-                var targetPropertyType = targetProperty as Type;
-                // PropertyDefinitions contains a PropertyDefinition for this PropertyItem Type => return its PropertyDefinitions.
-                if( (targetPropertyType != null) && targetPropertyType.IsAssignableFrom( type ) )
-                  return pd.PropertyDefinitions;
-              }
-            }
-          }
-        }
-      }
-      return null;
-    }
-
-    #endregion //Methods
-
-    #region IPropertyContainer Members
-
-
-
-
-
-
-    Style IPropertyContainer.PropertyContainerStyle
-    {
-      get { return this.PropertyContainerStyle; }
-    }
-
-    EditorDefinitionCollection IPropertyContainer.EditorDefinitions
-    {
-      get
-      {
-        return (this.ParentNode != null) ? this.ParentNode.EditorDefinitions : null;
-      }
-    }
-
-    PropertyDefinitionCollection IPropertyContainer.PropertyDefinitions
-    {
-      get
-      {
-        return this.GetPropertItemPropertyDefinitions();
-      }
-    }
-
-    ContainerHelperBase IPropertyContainer.ContainerHelper 
-    {
-      get
-      {
-        return this.ContainerHelper;
-      }
-    }
-
-    bool IPropertyContainer.IsCategorized 
-    {
-      get
-      {
-        return _isPropertyGridCategorized;
-      }
-    }
-
-    bool IPropertyContainer.IsSortedAlphabetically
-    {
-      get
-      {
-        return _isSortedAlphabetically;
-      }
-    }
-
-    bool IPropertyContainer.AutoGenerateProperties
-    {
-      get
-      {
-        if( this.ParentNode != null )
-        {
-          var propertyItemPropertyDefinitions = this.GetPropertItemPropertyDefinitions();
-          // No PropertyDefinitions specified : show all properties of this PropertyItem.
-          if( (propertyItemPropertyDefinitions == null) || (propertyItemPropertyDefinitions.Count == 0) )
-            return true;
-
-          // A PropertyDefinitions is specified : show only the properties of the PropertyDefinitions from this PropertyItem.
-          return this.ParentNode.AutoGenerateProperties;
-        }
-        return true;
-      }
-    }
-
-    bool IPropertyContainer.HideInheritedProperties
-    {
-      get
-      {
-        return false;
-      }
-    }
-
-    FilterInfo IPropertyContainer.FilterInfo
-    {
-      get { return new FilterInfo(); }
-    }
-
-    bool? IPropertyContainer.IsPropertyVisible( PropertyDescriptor pd )
-    {
-      if( _parentNode != null )
-      {
-        return _parentNode.IsPropertyVisible( pd );
-      }
-
-      return null;
-    }
-
-
-
-#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
deleted file mode 100644
index 5f54fd2b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Data;
-using System;
-using System.Collections.Specialized;
-using System.Diagnostics;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using System.Linq;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Reflection;
-#if !VS2008
-using System.ComponentModel.DataAnnotations;
-#endif
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyItemCollection : ReadOnlyObservableCollection<PropertyItem>
-  {
-    internal static readonly string CategoryPropertyName;
-    internal static readonly string CategoryOrderPropertyName;
-    internal static readonly string PropertyOrderPropertyName;
-    internal static readonly string DisplayNamePropertyName;
-
-    private bool _preventNotification;
-
-    static PropertyItemCollection()
-    {
-      PropertyItem p = null;
-      CategoryPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.Category );
-      CategoryOrderPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.CategoryOrder );
-      PropertyOrderPropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.PropertyOrder );
-      DisplayNamePropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.DisplayName );
-    }
-
-    public PropertyItemCollection(ObservableCollection<PropertyItem> editableCollection)
-      :base(editableCollection)
-    {
-      EditableCollection = editableCollection;
-    }
-
-    internal Predicate<object> FilterPredicate
-    {
-      get { return GetDefaultView().Filter; }
-      set { GetDefaultView().Filter = value; }
-    }
-
-    public ObservableCollection<PropertyItem> EditableCollection { get; private set; }
-
-    private ICollectionView GetDefaultView()
-    {
-      return CollectionViewSource.GetDefaultView( this );
-    }
-
-    public void GroupBy( string name )
-    {
-      GetDefaultView().GroupDescriptions.Add( new PropertyGroupDescription( name ) );
-    }
-
-    public void SortBy( string name, ListSortDirection sortDirection )
-    {
-      GetDefaultView().SortDescriptions.Add( new SortDescription( name, sortDirection ) );
-    }
-
-    public void Filter( string text )
-    {
-      Predicate<object> filter = PropertyItemCollection.CreateFilter( text, this.Items, null );
-      GetDefaultView().Filter = filter;
-    }
-
-    protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs args )
-    {
-      if( _preventNotification )
-        return;
-
-      base.OnCollectionChanged( args );
-    }
-
-    internal void UpdateItems( IEnumerable<PropertyItem> newItems )
-    {
-      if( newItems == null )
-        throw new ArgumentNullException( "newItems" );
-
-      _preventNotification = true;
-      using( GetDefaultView().DeferRefresh() )
-      {
-        EditableCollection.Clear();
-        foreach( var item in newItems )
-        {
-          this.EditableCollection.Add( item );
-        }
-      }
-      _preventNotification = false;
-      OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
-    }
-
-    internal void UpdateCategorization( GroupDescription groupDescription, bool isPropertyGridCategorized, bool sortAlphabetically )
-    {
-      // Compute Display Order relative to PropertyOrderAttributes on PropertyItem
-      // which could be different in Alphabetical or Categorized mode.
-      foreach( PropertyItem item in this.Items )
-      {
-        item.DescriptorDefinition.DisplayOrder = item.DescriptorDefinition.ComputeDisplayOrderInternal( isPropertyGridCategorized );
-        item.PropertyOrder = item.DescriptorDefinition.DisplayOrder;
-      }
-
-      // Clear view values
-      ICollectionView view = this.GetDefaultView();
-      using( view.DeferRefresh() )
-      {
-        view.GroupDescriptions.Clear();
-        view.SortDescriptions.Clear();
-
-        // Update view values
-        if( groupDescription != null )
-        {
-          view.GroupDescriptions.Add( groupDescription );
-          if( sortAlphabetically )
-          {
-            SortBy( CategoryOrderPropertyName, ListSortDirection.Ascending );
-            SortBy( CategoryPropertyName, ListSortDirection.Ascending );
-          }
-        }
-
-        if( sortAlphabetically )
-        {
-          SortBy( PropertyOrderPropertyName, ListSortDirection.Ascending );
-          SortBy( DisplayNamePropertyName, ListSortDirection.Ascending );
-        }
-      }
-    }
-
-    internal void RefreshView()
-    {
-      GetDefaultView().Refresh();
-    }
-
-    internal static Predicate<object> CreateFilter( string text, IList<PropertyItem> PropertyItems, IPropertyContainer propertyContainer )
-    {
-      Predicate<object> filter = null;
-
-      if( !string.IsNullOrEmpty( text ) )
-      {
-        filter = ( item ) =>
-        {
-          var property = item as PropertyItem;
-          if( property.DisplayName != null )
-          {
-#if !VS2008
-            var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( property.PropertyDescriptor );
-            if( displayAttribute != null )
-            {
-              var canBeFiltered = displayAttribute.GetAutoGenerateFilter();
-              if( canBeFiltered.HasValue && !canBeFiltered.Value )
-                return false;
-            }
-#endif
-            property.HighlightedText = property.DisplayName.ToLower().Contains( text.ToLower() ) ? text : null;
-            return (property.HighlightedText != null);
-          }
-
-          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
deleted file mode 100644
index 2839de49..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Windows;
-using System.ComponentModel;
-
-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
-  {
-    public PropertyItemsControl()
-    {
-      var propertyItemsControlProperties = TypeDescriptor.GetProperties( this, new Attribute[] { new PropertyFilterAttribute( PropertyFilterOptions.All ) } );
-      var prop1 = propertyItemsControlProperties.Find( "VirtualizingPanel.IsVirtualizingWhenGrouping", false );
-      if( prop1 != null )
-      {
-        prop1.SetValue( this, true );
-      }
-      var prop2 = propertyItemsControlProperties.Find( "VirtualizingPanel.CacheLengthUnit", false );
-      if( prop2 != null )
-      {
-        prop2.SetValue( this, Enum.ToObject( prop2.PropertyType, 1 ) );
-      }
-    }
-
-    #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/StringConstants.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
deleted file mode 100644
index dd3ce60c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public static class StringConstants
-  {
-    public static string Local
-    {
-      get { return "Local"; }
-    }
-
-    public static string Resource
-    {
-      get { return "Resource"; }
-    }
-
-    public static string Databinding
-    {
-      get { return "Databinding"; }
-    }
-
-    public static string Inheritance
-    {
-      get { return "Inheritance"; }
-    }
-
-    public static string StyleSetter
-    {
-      get { return "Style Setter"; }
-    }
-
-    public static string Default
-    {
-      get { return "Default"; }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
deleted file mode 100644
index d1445c04..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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/Implementation/TrimmedTextBlock.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
deleted file mode 100644
index d0fbbd9b..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Documents;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class TrimmedTextBlock : TextBlock
-  {
-    #region Constructor
-
-    public TrimmedTextBlock()
-    {
-      this.SizeChanged += this.TrimmedTextBlock_SizeChanged;
-    }
-
-    #endregion
-
-    #region IsTextTrimmed Property
-
-    public static readonly DependencyProperty IsTextTrimmedProperty = DependencyProperty.Register( "IsTextTrimmed", typeof( bool ), typeof( TrimmedTextBlock ), new PropertyMetadata( false, OnIsTextTrimmedChanged ) );
-    public bool IsTextTrimmed
-    {
-      get
-      {
-        return ( bool )GetValue( IsTextTrimmedProperty );
-      }
-      private set
-      {
-        SetValue( IsTextTrimmedProperty, value );
-      }
-    }
-
-    private static void OnIsTextTrimmedChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      var textBlock = d as TrimmedTextBlock;
-      if( textBlock != null )
-      {
-        textBlock.OnIsTextTrimmedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-      }
-    }
-
-    private void OnIsTextTrimmedChanged( bool oldValue, bool newValue )
-    {
-        this.ToolTip = ( newValue ) ? this.Text : null;
-    }
-
-    #endregion
-
-    #region HighlightedBrush
-
-    public static readonly DependencyProperty HighlightedBrushProperty = DependencyProperty.Register( "HighlightedBrush", typeof( Brush ), typeof( TrimmedTextBlock ), new FrameworkPropertyMetadata( Brushes.Yellow ) );
-
-    public Brush HighlightedBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( HighlightedBrushProperty );
-      }
-      set
-      {
-        SetValue( HighlightedBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region HighlightedText
-
-    public static readonly DependencyProperty HighlightedTextProperty = DependencyProperty.Register( "HighlightedText", typeof( string ), typeof( TrimmedTextBlock ), new FrameworkPropertyMetadata( null, HighlightedTextChanged ) );
-
-    public string HighlightedText
-    {
-      get
-      {
-        return ( string )GetValue( HighlightedTextProperty );
-      }
-      set
-      {
-        SetValue( HighlightedTextProperty, value );
-      }
-    }
-
-    private static void HighlightedTextChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var trimmedTextBlock = sender as TrimmedTextBlock;
-      if( trimmedTextBlock != null )
-      {
-        trimmedTextBlock.HighlightedTextChanged( ( string )e.OldValue, ( string )e.NewValue );
-      }
-    }
-
-    protected virtual void HighlightedTextChanged( string oldValue, string newValue )
-    {
-      if( this.Text.Length == 0 )
-        return;
-
-      // Set original text without highlight.
-      if( newValue == null )
-      {
-        var newrRun = new Run( this.Text );
-        this.Inlines.Clear();        
-        this.Inlines.Add( newrRun );
-
-        return;
-      }
-
-      var startHighlightedIndex = this.Text.IndexOf( newValue, StringComparison.InvariantCultureIgnoreCase );
-      var endHighlightedIndex = startHighlightedIndex + newValue.Length;
-
-      var startUnHighlightedText = this.Text.Substring( 0, startHighlightedIndex );
-      var highlightedText = this.Text.Substring( startHighlightedIndex, newValue.Length );
-      var endUnHighlightedText = this.Text.Substring( endHighlightedIndex, this.Text.Length - endHighlightedIndex );
-
-      this.Inlines.Clear();
-
-      // Start Un-Highlighted text
-      var run = new Run( startUnHighlightedText );
-      this.Inlines.Add( run );
-
-      // Highlighted text
-      run = new Run( highlightedText );
-      run.Background = this.HighlightedBrush;
-      this.Inlines.Add( run );
-
-      // End Un-Highlighted text
-      run = new Run( endUnHighlightedText );
-      this.Inlines.Add( run );
-    }
-
-    #endregion
-
-    #region Event Handler
-
-    private void TrimmedTextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
-    {
-      var textBlock = sender as TextBlock;
-      if( textBlock != null )
-      {
-        this.IsTextTrimmed = this.GetIsTextTrimmed( textBlock );
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    private bool GetIsTextTrimmed( TextBlock textBlock )
-    {
-      if( textBlock == null )
-        return false;
-      if( textBlock.TextTrimming == TextTrimming.None )
-        return false;
-      if( textBlock.TextWrapping != TextWrapping.NoWrap )
-        return false;
-
-      var textBlockActualWidth = textBlock.ActualWidth;
-      textBlock.Measure( new Size( double.MaxValue, double.MaxValue ) );
-      var textBlockDesiredWidth = textBlock.DesiredSize.Width;
-
-      return ( textBlockActualWidth < textBlockDesiredWidth );
-    }
-
-    #endregion
-  }
-}
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
deleted file mode 100644
index 58950ea9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,1306 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:editor="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Editors"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    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 Source="../../NumericUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../DateTimeUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../TimeSpanUpDown/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../WatermarkTextBox/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../ColorPicker/Themes/Aero2.NormalColor.xaml" />
-    <ResourceDictionary Source="../../CollectionControl/Themes/Aero2.NormalColor.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- PropertyGrid                                                                    -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:HalfConverter x:Key="HalfConverter" />
-  <conv:NullToBoolConverter x:Key="NullToBoolConverter" />
-  <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
-  <pgconv:ObjectToUIElementConverter x:Key="ObjectToUIElementConverter" />
-  <pgconv:IsStringEmptyConverter x:Key="IsStringEmptyConverter" />
-  <pgconv:IsDefaultCategoryConverter x:Key="IsDefaultCategoryConverter" />
-  <pgconv:SelectedObjectConverter x:Key="objectConverter" />
-  <pgconv:PropertyItemEditorConverter x:Key="PropertyItemEditorConverter" />
-
-  <x:Static x:Key="EmptyString"
-            Member="sys:String.Empty" />
-
-  <!-- PropertyGrid numeric Editors -->
-  <Style x:Key="PropertyGridNumericUpDown"
-         TargetType="{x:Type prim:InputBase}"
-         BasedOn="{StaticResource NumericUpDown}">
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid DateTime Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorDateTimeUpDown}"
-         BasedOn="{StaticResource DateTimeUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TimeSpan Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTimeSpanUpDown}"
-         BasedOn="{StaticResource TimeSpanUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid ComboBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorComboBox}"
-         BasedOn="{StaticResource {x:Type ComboBox}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="Background"
-                Value="Transparent" />
-      </MultiTrigger>
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid CheckBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCheckBox}"
-         BasedOn="{StaticResource {x:Type CheckBox}}">
-    <Setter Property="Margin"
-            Value="5,0,0,0" />
-  </Style>
-
-  <!-- PropertyGrid TextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TextBlock Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBlock}"
-         BasedOn="{StaticResource {x:Type TextBlock}}">
-    <Setter Property="Foreground"
-            Value="Gray" />
-  </Style>
-
-  <!-- PropertyGrid MaskedTextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorMaskedTextBox}"
-         BasedOn="{StaticResource {x:Type TextBox}}">
-  </Style>
-
-  <!-- PropertyGrid ColorPicker Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorColorPicker}"
-         BasedOn="{StaticResource ColorPicker}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowDropDownButton"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- PropertyGrid PrimitiveTypeCollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorPrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-  </Style>
-
-  <!-- PropertyGrid CollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCollectionControl}"
-         BasedOn="{StaticResource CollectionControlButton}">
-  </Style>
-
-  <!-- ===============================================================================   -->
-  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- Internal PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-
-
-  <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>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="20" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <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>
-
-      <ContentPresenter Grid.Column="1" />
-    </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">
-              <ToggleButton Template="{StaticResource ExpanderToggleButton}"
-                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            OverridesDefaultStyle="True">
-                <ContentPresenter Margin="1"
-                                  RecognizesAccessKey="True"
-                                  ContentSource="Header"
-                                  TextElement.FontWeight="Bold" />
-              </ToggleButton>
-            </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>
-
-  <Style x:Key="PropertyItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Style.Resources>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border>
-            <Expander x:Name="expander"
-                      Header="{Binding Name}"
-                      Style="{StaticResource ExpanderStyle}"
-                      IsExpanded="True">
-              <ItemsPresenter />
-            </Expander>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-
-    <Style.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding Name, Converter={StaticResource IsDefaultCategoryConverter}}"
-                     Value="True" />
-          <Condition Binding="{Binding IsMiscCategoryLabelHidden, RelativeSource={RelativeSource AncestorType={x:Type pg:PropertyGrid}}}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type GroupItem}">
-              <!-- No Expander for the Misc Category if IsMiscCategoryLabelHidden == true-->
-              <ItemsPresenter />
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </MultiDataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="SingleDefaultCategoryItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <!-- No Expander for the Misc Category if Misc category is the only category-->
-          <ItemsPresenter />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ContextMenu x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}">
-    <MenuItem Header="Reset Value"
-              Command="commands:PropertyItemCommands.ResetValue"
-              CommandParameter="{Binding}"
-              CommandTarget="{Binding Path=PlacementTarget, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}}"/>
-  </ContextMenu>
-
-  <pg:CategoryGroupStyleSelector x:Key="categoryGroupStyleSelector"
-                                 SingleDefaultCategoryItemGroupStyle="{StaticResource SingleDefaultCategoryItemGroupContainerStyle}"
-                                 ItemGroupStyle="{StaticResource PropertyItemGroupContainerStyle}" />
-
-  <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="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <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}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      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 x:Name="_expandableButton"
-                                  Grid.Column="0"
-                                  Template="{StaticResource ExpanderToggleButton}"
-                                  OverridesDefaultStyle="True"
-                                  IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    </ToggleButton>
-
-                    <pg:TrimmedTextBlock x:Name="_text"
-                                         Grid.Column="1"
-                                         Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HighlightedText="{Binding HighlightedText, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HorizontalAlignment="Stretch"
-                                         VerticalAlignment="Center"
-                                         TextTrimming="CharacterEllipsis"
-                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
-                      </pg:TrimmedTextBlock>
-                  </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}}">
-
-                    <!-- ImageSource is set in Triggers for others Themes to set their proper icons -->
-                    <Image x:Name="_optionsImage"
-                           Width="11"
-                           Height="11"
-                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
-                    </Image>
-                  </Grid>
-                </Grid>
-              </Border>
-
-              <Border x:Name="PART_Editor"
-                      Grid.Column="1"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      KeyboardNavigation.DirectionalNavigation="None"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <Border.ToolTip>
-                  <ToolTip Visibility="Collapsed" />
-                </Border.ToolTip>
-                <ContentControl x:Name="PART_ValueContainer"
-                                Focusable="False"
-                                IsTabStop="False"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <ContentControl.Content>
-                    <MultiBinding Converter="{StaticResource PropertyItemEditorConverter}">
-                      <Binding Path="Editor" 
-                               RelativeSource="{RelativeSource TemplatedParent}" />
-                      <Binding Path="IsReadOnly"
-                               RelativeSource="{RelativeSource AncestorType={x:Type pg:PropertyGrid}}" />
-                    </MultiBinding>
-                  </ContentControl.Content>
-                </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}}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </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}}" />
-              <Setter Property="Foreground"
-                      TargetName="_text"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding ShowDescriptionByTooltip, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                           Value="True" />
-                <Condition Binding="{Binding Description, RelativeSource={RelativeSource Self}, Converter={StaticResource IsStringEmptyConverter}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="ToolTipService.ToolTip"
-                      Value="{Binding Description, RelativeSource={RelativeSource TemplatedParent}}"
-                      TargetName="PART_Name" />
-            </MultiDataTrigger>
-            <Trigger Property="Validation.HasError"
-                     Value="true">
-              <Setter Property="ToolTip"
-                      Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-            </Trigger>
-            <Trigger Property="Visibility"
-                     Value="Visible"
-                     SourceName="_expandableButton">
-              <Setter Property="Focusable"
-                      Value="False" />
-            </Trigger>
-
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Local}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Local11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Resource}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Resource11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Databinding}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Database11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Inheritance}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Inheritance11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.StyleSetter}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Style11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Default}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/AdvancedProperties11.png" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type pg:PropertyGrid}">
-    <Setter Property="AdvancedOptionsMenu"
-            Value="{StaticResource {ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}}" />
-    <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, Converter={StaticResource objectConverter}, ConverterParameter=SelectedObjectName}" />
-    <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 x:Name="selectObjectNamePanel"
-                          Orientation="Horizontal">
-                <Border Background="White"
-                        BorderBrush="Black"
-                        Visibility="{Binding ShowPreview, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        BorderThickness="1"
-                        Width="44"
-                        Height="44"
-                        Margin="6,4,0,4"
-                        Padding="2">
-                  <Rectangle>
-                    <Rectangle.Fill>
-                      <VisualBrush Stretch="Uniform"
-                                   Visual="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ObjectToUIElementConverter}, Path=SelectedObject}" />
-                    </Rectangle.Fill>
-                  </Rectangle>
-                </Border>
-                <StackPanel Orientation="Horizontal"
-                            VerticalAlignment="Center"
-                            Margin="6,2,6,4"
-                            Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
-                                         TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}"
-                        Margin="5,0,0,0">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectName}"
-                                         TextTrimming="CharacterEllipsis">
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                </StackPanel>
-              </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" >
-                      </Image>
-                    </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" >
-                      </Image>
-                    </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}"
-                                            BorderThickness="1">
-                      <local:WatermarkTextBox.Style>
-                        <Style TargetType="Control">
-                          <Setter Property="BorderBrush"
-                                  Value="Transparent" />
-                          <Style.Triggers>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                              <Setter Property="BorderBrush"
-                                      Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
-                            </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" >
-                      </Image>
-                    </Button>
-                  </Grid>
-                </Border>
-              </Grid>
-
-              <Grid Grid.Row="2"
-                    Background="{x:Static SystemColors.WindowBrush}">
-                <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}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource TemplatedParent}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True"
-                                         VerticalAlignment="Top">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer x:Name="ScrollBar"
-                                      Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="Disabled">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                      <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding ShowHorizontalScrollBar, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                     Value="True">
-                          <Setter Property="HorizontalScrollBarVisibility"
-                                  Value="Auto"
-                                  TargetName="ScrollBar" />
-                        </DataTrigger>
-                      </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-
-                <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}}">
-              </GridSplitter>
-              <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>
-                <TextBlock Padding="5 2 2 0"
-                           TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}">
-                </TextBlock>
-              </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
deleted file mode 100644
index 215239fd..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
+++ /dev/null
@@ -1,1425 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:editor="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Editors"
-                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
-                    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:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../NumericUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../DateTimeUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../TimeSpanUpDown/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../WatermarkTextBox/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../ColorPicker/Themes/Generic.xaml" />
-    <ResourceDictionary Source="../../CollectionControl/Themes/Generic.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <!-- =============================================================================== -->
-  <!-- PropertyGrid                                                                    -->
-  <!-- =============================================================================== -->
-
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:HalfConverter x:Key="HalfConverter" />
-  <conv:NullToBoolConverter x:Key="NullToBoolConverter" />
-  <pgconv:ObjectToUIElementConverter x:Key="ObjectToUIElementConverter" />
-  <pgconv:IsStringEmptyConverter x:Key="IsStringEmptyConverter" />
-  <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
-  <pgconv:IsDefaultCategoryConverter x:Key="IsDefaultCategoryConverter" />
-  <pgconv:SelectedObjectConverter x:Key="objectConverter" />
-  <pgconv:PropertyItemEditorConverter x:Key="PropertyItemEditorConverter" />
-
-  <x:Static x:Key="EmptyString"
-            Member="sys:String.Empty" />
-
-  <!-- PropertyGrid numeric Editors -->
-  <Style x:Key="PropertyGridNumericUpDown"
-         TargetType="{x:Type prim:InputBase}"
-         BasedOn="{StaticResource NumericUpDown}">
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDecimalUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorDoubleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorLongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorSingleUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid DateTime Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorDateTimeUpDown}"
-         BasedOn="{StaticResource DateTimeUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TimeSpan Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTimeSpanUpDown}"
-         BasedOn="{StaticResource TimeSpanUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid ComboBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorComboBox}"
-         BasedOn="{StaticResource {x:Type ComboBox}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="Background"
-                Value="Transparent" />
-      </MultiTrigger>
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Foreground"
-                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid CheckBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCheckBox}"
-         BasedOn="{StaticResource {x:Type CheckBox}}">
-    <Setter Property="Margin"
-            Value="5,0,0,0" />
-  </Style>
-
-  <!-- PropertyGrid TextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEnabled"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderThickness"
-                Value="0" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- PropertyGrid TextBlock Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorTextBlock}"
-         BasedOn="{StaticResource {x:Type TextBlock}}">
-    <Setter Property="Foreground"
-            Value="Gray" />
-  </Style>
-
-  <!-- PropertyGrid MaskedTextBox Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorMaskedTextBox}"
-         BasedOn="{StaticResource {x:Type TextBox}}">
-  </Style>
-
-  <!-- PropertyGrid ColorPicker Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorColorPicker}"
-         BasedOn="{StaticResource {x:Type local:ColorPicker}}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowDropDownButton"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- PropertyGrid PrimitiveTypeCollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorPrimitiveTypeCollectionControl}"
-         BasedOn="{StaticResource PrimitiveTypeCollectionControl}">
-    <Setter Property="BorderThickness"
-            Value="0" />
-    <Setter Property="Content"
-            Value="(Collection)" />
-  </Style>
-
-  <!-- PropertyGrid CollectionControl Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorCollectionControl}"
-         BasedOn="{StaticResource CollectionControlButton}">
-  </Style>
-
-  <!-- ===============================================================================   -->
-  <!-- Style for all internal derived types of NumericUpDown will be done in code-behind -->
-  <!-- for external themes to redefine the default style. The reason is that the         -->
-  <!-- toolkit.dll uses the InternalsVisibleTo attribute which makes internal data only  -->
-  <!-- available in code-behind (not xaml).                                              -->
-  <!-- (ex. Office2007 theme)                                                            -->
-  <!-- ===============================================================================   -->
-
-  <!-- Internal PropertyGrid numeric Editors -->
-  <Style TargetType="{x:Type editor:PropertyGridEditorSByteUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUIntegerUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorULongUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style TargetType="{x:Type editor:PropertyGridEditorUShortUpDown}"
-         BasedOn="{StaticResource PropertyGridNumericUpDown}">
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
-        <Setter Property="ShowButtonSpinner"
-                Value="False" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-
-  <SolidColorBrush x:Key="MouseOverBorderBrush"
-                   Color="#FFFFB700" />
-  <LinearGradientBrush x:Key="MouseOverBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFEFBF4" />
-    <GradientStop Offset="0.19"
-                  Color="#FFFDE7CE" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFDDEB8" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFCE6B" />
-    <GradientStop Offset="0.79"
-                  Color="#FFFFDE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFFFEBAA" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="CheckedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="CheckedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFFDCA0" />
-    <GradientStop Offset="0.18"
-                  Color="#FFFFD692" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFC45D" />
-    <GradientStop Offset="1"
-                  Color="#FFFFD178" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="PressedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="PressedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFE3C085" />
-    <GradientStop Offset="0.19"
-                  Color="#FFF4CC89" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5C777" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5BB56" />
-    <GradientStop Offset="0.79"
-                  Color="#FFF4CE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFF3E28D" />
-  </LinearGradientBrush>
-
-  <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="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      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="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </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="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </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="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      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="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </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="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <SolidColorBrush x:Key="GlyphBrush"
-                   Color="#FF31347C" />
-
-  <ControlTemplate x:Key="ExpanderToggleButton"
-                   TargetType="{x:Type ToggleButton}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="20" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <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>
-
-      <ContentPresenter Grid.Column="1" />
-    </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">
-              <ToggleButton Template="{StaticResource ExpanderToggleButton}"
-                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            OverridesDefaultStyle="True">
-                <ContentPresenter Margin="1"
-                                  RecognizesAccessKey="True"
-                                  ContentSource="Header"
-                                  TextElement.FontWeight="Bold" />
-              </ToggleButton>
-            </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>
-
-  <Style x:Key="PropertyItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Style.Resources>
-    </Style.Resources>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Border>
-            <Expander x:Name="expander"
-                      Header="{Binding Name}"
-                      Style="{StaticResource ExpanderStyle}"
-                      IsExpanded="True">
-              <ItemsPresenter />
-            </Expander>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding Name, Converter={StaticResource IsDefaultCategoryConverter}}"
-                     Value="True" />
-          <Condition Binding="{Binding IsMiscCategoryLabelHidden, RelativeSource={RelativeSource AncestorType={x:Type pg:PropertyGrid}}}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type GroupItem}">
-              <!-- No Expander for the Misc Category if IsMiscCategoryLabelHidden == true-->
-              <ItemsPresenter />
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </MultiDataTrigger>
-    </Style.Triggers>
-  </Style>
-
-  <Style x:Key="SingleDefaultCategoryItemGroupContainerStyle"
-         TargetType="{x:Type GroupItem}">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <!-- No Expander for the Misc Category if Misc category is the only category-->
-          <ItemsPresenter />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <ContextMenu x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}">
-    <MenuItem Header="Reset Value"
-              Command="commands:PropertyItemCommands.ResetValue"
-              CommandParameter="{Binding}"
-              CommandTarget="{Binding Path=PlacementTarget, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ContextMenu}}}"/>
-  </ContextMenu>
-
-  <pg:CategoryGroupStyleSelector x:Key="categoryGroupStyleSelector"
-                                 SingleDefaultCategoryItemGroupStyle="{StaticResource SingleDefaultCategoryItemGroupContainerStyle}"
-                                 ItemGroupStyle="{StaticResource PropertyItemGroupContainerStyle}" />
-
-
-  <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="SnapsToDevicePixels"
-            Value="True" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <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}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      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 x:Name="_expandableButton"
-                                  Grid.Column="0"
-                                  Template="{StaticResource ExpanderToggleButton}"
-                                  OverridesDefaultStyle="True"
-                                  IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                  Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                    </ToggleButton>
-
-                    <pg:TrimmedTextBlock x:Name="_text"
-                                         Grid.Column="1"
-                                         Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HighlightedText="{Binding HighlightedText, RelativeSource={RelativeSource TemplatedParent}}"
-                                         HorizontalAlignment="Stretch"
-                                         VerticalAlignment="Center"
-                                         TextTrimming="CharacterEllipsis"
-                                         IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
-                    </pg:TrimmedTextBlock>
-                  </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}}">
-
-                    <!-- ImageSource is set in Triggers for others Themes to set their proper icons -->
-                    <Image x:Name="_optionsImage"
-                           Width="11"
-                           Height="11"
-                           ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" >
-                    </Image>
-                  </Grid>
-                </Grid>
-              </Border>
-
-              <Border x:Name="PART_Editor"
-                      Grid.Column="1"
-                      Background="{TemplateBinding Background}"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      KeyboardNavigation.DirectionalNavigation="None"
-                      VerticalAlignment="Stretch"
-                      HorizontalAlignment="Stretch">
-                <Border.ToolTip>
-                  <ToolTip Visibility="Collapsed" />
-                </Border.ToolTip >
-                <ContentControl x:Name="PART_ValueContainer"
-                                Focusable="False"
-                                IsTabStop="False"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                  <ContentControl.Content>
-                    <MultiBinding Converter="{StaticResource PropertyItemEditorConverter}">
-                      <Binding Path="Editor"
-                               RelativeSource="{RelativeSource TemplatedParent}" />
-                      <Binding Path="IsReadOnly"
-                               RelativeSource="{RelativeSource AncestorType={x:Type pg:PropertyGrid}}" />
-                    </MultiBinding>
-                  </ContentControl.Content>
-                </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}}"
-                                         VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                         VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                         ScrollViewer.CanContentScroll="True">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-              </Expander>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter TargetName="PART_Name"
-                      Property="Background"
-                      Value="#CED4DF" />
-            </Trigger>
-            <Trigger Property="IsSelected"
-                     Value="True">
-              <Setter TargetName="PART_Name"
-                      Property="Background"
-                      Value="#43577B" />
-              <Setter TargetName="PART_Name"
-                      Property="TextElement.Foreground"
-                      Value="White" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      TargetName="PART_ValueContainer"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-              <Setter Property="Foreground"
-                      TargetName="_text"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding ShowDescriptionByTooltip, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                           Value="True" />
-                <Condition Binding="{Binding Description, RelativeSource={RelativeSource Self}, Converter={StaticResource IsStringEmptyConverter}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="ToolTipService.ToolTip"
-                      Value="{Binding Description, RelativeSource={RelativeSource TemplatedParent}}"
-                      TargetName="PART_Name" />
-            </MultiDataTrigger>
-            <Trigger Property="Validation.HasError"
-                     Value="true">
-              <Setter Property="ToolTip"
-                      Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-            </Trigger>
-            <Trigger Property="Visibility"
-                     Value="Visible"
-                     SourceName="_expandableButton">
-              <Setter Property="Focusable"
-                      Value="False" />
-            </Trigger>
-
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Local}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Local11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Resource}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Resource11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Databinding}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Database11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Inheritance}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Inheritance11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.StyleSetter}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/Style11.png" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding ElementName=_optionsImage, Path=ToolTip}"
-                         Value="{x:Static pg:StringConstants.Default}">
-              <Setter TargetName="_optionsImage"
-                      Property="Source"
-                      Value="../Images/AdvancedProperties11.png" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type pg:PropertyGrid}">
-    <Setter Property="AdvancedOptionsMenu"
-            Value="{StaticResource {ComponentResourceKey TypeInTargetAssembly={x:Type pg:PropertyGrid}, ResourceId=SelectedObjectAdvancedOptionsMenu}}" />
-    <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}" />
-    <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, Converter={StaticResource objectConverter}, ConverterParameter=SelectedObjectName}" />
-    <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 x:Name="selectObjectNamePanel"
-                          Orientation="Horizontal">
-                <Border Background="White"
-                        BorderBrush="Black"
-                        Visibility="{Binding ShowPreview, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                        BorderThickness="1"
-                        Width="44"
-                        Height="44"
-                        Margin="6,4,0,4"
-                        Padding="2">
-                  <Rectangle>
-                    <Rectangle.Fill>
-                      <VisualBrush Stretch="Uniform"
-                                   Visual="{Binding RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ObjectToUIElementConverter}, Path=SelectedObject}" />
-                    </Rectangle.Fill>
-                  </Rectangle>
-                </Border>
-                <StackPanel Orientation="Horizontal"
-                            VerticalAlignment="Center"
-                            Margin="6,2,6,4"
-                            Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectTypeName}"
-                                         TextTrimming="CharacterEllipsis"
-                                         FontWeight="Bold" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                  <Grid MaxWidth="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource HalfConverter}, ConverterParameter=17}"
-                        Margin="5,0,0,0">
-                    <pg:TrimmedTextBlock Text="{TemplateBinding SelectedObjectName}"
-                                         TextTrimming="CharacterEllipsis" >
-                    </pg:TrimmedTextBlock>
-                  </Grid>
-                </StackPanel>
-              </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" >
-                      </Image>
-                    </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" >
-                      </Image>
-                    </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}"
-                                            BorderThickness="1">
-                      <local:WatermarkTextBox.Style>
-                        <Style TargetType="Control">
-                          <Setter Property="BorderBrush"
-                                  Value="Transparent" />
-                          <Style.Triggers>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                              <Setter Property="BorderBrush"
-                                      Value="{StaticResource MouseOverBorderBrush}" />
-                            </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" >
-                      </Image>
-                    </Button>
-                  </Grid>
-                </Border>
-              </Grid>
-
-              <Grid Grid.Row="2"
-                    Background="{x:Static SystemColors.WindowBrush}">
-                <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}"
-                                          VirtualizingStackPanel.IsVirtualizing="{Binding IsVirtualizing, RelativeSource={RelativeSource TemplatedParent}}"
-                                          VirtualizingStackPanel.VirtualizationMode="Recycling"
-                                          ScrollViewer.CanContentScroll="True"
-                                          VerticalAlignment="Top">
-                  <ItemsControl.ItemsPanel>
-                    <ItemsPanelTemplate>
-                      <VirtualizingStackPanel />
-                    </ItemsPanelTemplate>
-                  </ItemsControl.ItemsPanel>
-
-                  <ItemsControl.GroupStyle>
-                    <GroupStyle ContainerStyleSelector="{StaticResource categoryGroupStyleSelector}" />
-                  </ItemsControl.GroupStyle>
-
-                  <ItemsControl.Template>
-                    <ControlTemplate>
-                      <Border BorderThickness="{TemplateBinding BorderThickness}"
-                              Padding="{TemplateBinding Padding}"
-                              BorderBrush="{TemplateBinding BorderBrush}"
-                              Background="{TemplateBinding Background}"
-                              SnapsToDevicePixels="True">
-                        <ScrollViewer x:Name="ScrollBar"
-                                      Padding="{TemplateBinding Padding}"
-                                      Focusable="False"
-                                      VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="Disabled">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                      </Border>
-                      <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding ShowHorizontalScrollBar, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}"
-                                     Value="True">
-                          <Setter Property="HorizontalScrollBarVisibility"
-                                  Value="Auto"
-                                  TargetName="ScrollBar" />
-                        </DataTrigger>
-                      </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                  </ItemsControl.Template>
-
-                </pg:PropertyItemsControl>
-
-                <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}}" >
-               </GridSplitter>
-               <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>
-                <TextBlock Padding="5 2 2 0"
-                           TextWrapping="WrapWithOverflow"
-                           Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" >
-                </TextBlock>
-              </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/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
deleted file mode 100644
index a36deced..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Converters
-{
-  [Obsolete("This class is no longer used internaly and may be removed in a future release")]
-  public class SliderThumbWidthConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is Slider )
-      {
-        string param = parameter.ToString();
-        if( param == "0" )
-          return RangeSlider.GetThumbWidth( ( Slider )value );
-        else if( param == "1" )
-          return RangeSlider.GetThumbHeight( ( Slider )value );
-      }
-      return 0d;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
deleted file mode 100644
index 40528354..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
+++ /dev/null
@@ -1,1083 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_LowerRange, Type = typeof( RepeatButton ) )]
-  [TemplatePart( Name = PART_HigherRange, Type = typeof( RepeatButton ) )]
-  [TemplatePart( Name = PART_HigherSlider, Type = typeof( Slider ) )]
-  [TemplatePart( Name = PART_LowerSlider, Type = typeof( Slider ) )]
-  [TemplatePart( Name = PART_Track, Type = typeof( Track ) )]
-
-  public class RangeSlider : Control
-  {
-    #region Members
-
-    private const String PART_LowerRange = "PART_LowerRange";
-    private const String PART_Range = "PART_Range";
-    private const String PART_HigherRange = "PART_HigherRange";
-    private const String PART_HigherSlider = "PART_HigherSlider";
-    private const String PART_LowerSlider = "PART_LowerSlider";
-    private const String PART_Track = "PART_Track";
-
-    private RepeatButton _lowerRange;
-    private RepeatButton _higherRange;
-    private Slider _lowerSlider;
-    private Slider _higherSlider;
-    private Track _lowerTrack;
-    private Track _higherTrack;
-    private double _deferredUpdateValue;
-
-    #endregion Members
-
-    #region Constructors
-
-    static RangeSlider()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( RangeSlider ), new FrameworkPropertyMetadata( typeof( RangeSlider ) ) );
-    }
-
-    public RangeSlider()
-    {
-      this.SizeChanged += this.RangeSlider_SizeChanged;
-    }
-
-    #endregion Constructors
-
-    #region Properties
-
-    #region AutoToolTipPlacement
-
-    public static readonly DependencyProperty AutoToolTipPlacementProperty = DependencyProperty.Register( "AutoToolTipPlacement", typeof( AutoToolTipPlacement ), typeof( RangeSlider ),
-        new FrameworkPropertyMetadata( AutoToolTipPlacement.None, RangeSlider.OnAutoToolTipPlacementChanged ) );
-
-    public AutoToolTipPlacement AutoToolTipPlacement
-    {
-      get
-      {
-        return (AutoToolTipPlacement)GetValue( RangeSlider.AutoToolTipPlacementProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.AutoToolTipPlacementProperty, value );
-      }
-    }
-
-    private static void OnAutoToolTipPlacementChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnAutoToolTipPlacementChanged( (AutoToolTipPlacement)e.OldValue, (AutoToolTipPlacement)e.NewValue );
-      }
-    }
-
-    protected virtual void OnAutoToolTipPlacementChanged( AutoToolTipPlacement oldValue, AutoToolTipPlacement newValue )
-    {
-    }
-
-    #endregion //AutoToolTipPlacement
-
-    #region AutoToolTipPrecision
-
-    public static readonly DependencyProperty AutoToolTipPrecisionProperty = DependencyProperty.Register( "AutoToolTipPrecision", typeof( int ), typeof( RangeSlider ),
-        new FrameworkPropertyMetadata( 0 ) );
-
-    public int AutoToolTipPrecision
-    {
-      get
-      {
-        return (int)GetValue( RangeSlider.AutoToolTipPrecisionProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.AutoToolTipPrecisionProperty, value );
-      }
-    }
-
-    #endregion //AutoToolTipPrecision
-
-    #region HigherRangeBackground
-    /// <summary>
-    /// Get/Set the Brush for the Range between Higher and Maximum values. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty HigherRangeBackgroundProperty = DependencyProperty.Register( "HigherRangeBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush HigherRangeBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.HigherRangeBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.HigherRangeBackgroundProperty, value );
-      }
-    }
-
-    #endregion HigherRangeBackground
-
-    #region HigherRangeStyle
-    /// <summary>
-    /// Get/Set the Style for the Range between Higher and Maximum values. (Style)
-    /// </summary>
-
-    public static readonly DependencyProperty HigherRangeStyleProperty = DependencyProperty.Register( "HigherRangeStyle", typeof( Style ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( null ) );
-
-    public Style HigherRangeStyle
-    {
-      get
-      {
-        return (Style)this.GetValue( RangeSlider.HigherRangeStyleProperty );
-      }
-      set
-      {
-        this.SetValue( RangeSlider.HigherRangeStyleProperty, value );
-      }
-    }
-
-    #endregion HigherRangeStyle
-
-    #region HigherRangeWidth
-    /// <summary>
-    /// HigherRangeWidth property is a readonly property, used to calculate the percentage of the HigherRange within the entire min/max range.
-    /// </summary>
-    /// 
-
-    private static readonly DependencyPropertyKey HigherRangeWidthPropertyKey = DependencyProperty.RegisterAttachedReadOnly( "HigherRangeWidth", typeof( double )
-        , typeof( RangeSlider ), new PropertyMetadata( 0d ) );
-
-    public static readonly DependencyProperty HigherRangeWidthProperty = HigherRangeWidthPropertyKey.DependencyProperty;
-
-    public double HigherRangeWidth
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.HigherRangeWidthProperty );
-      }
-      private set
-      {
-        SetValue( RangeSlider.HigherRangeWidthPropertyKey, value );
-      }
-    }
-
-
-    #endregion HigherRangeWidth
-
-    #region HigherThumbBackground
-    /// <summary>
-    /// Get/Set the Brush for the HigherValue thumb's background [active state]. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty HigherThumbBackgroundProperty = DependencyProperty.Register( "HigherThumbBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush HigherThumbBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.HigherThumbBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.HigherThumbBackgroundProperty, value );
-      }
-    }
-
-    #endregion HigherThumbBackground
-
-    #region HigherValue
-    /// <summary>
-    /// HigherValue property represents the higher value within the selected range.
-    /// </summary>
-    public static readonly DependencyProperty HigherValueProperty = DependencyProperty.Register( "HigherValue", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, RangeSlider.OnHigherValueChanged, RangeSlider.OnCoerceHigherValueChanged ) );
-
-    public double HigherValue
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.HigherValueProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.HigherValueProperty, value );
-      }
-    }
-
-    private static object OnCoerceHigherValueChanged( DependencyObject d, object basevalue )
-    {
-      var rangeSlider = (RangeSlider)d;
-      if( (rangeSlider == null) || !rangeSlider.IsLoaded)
-        return basevalue;
-
-      var min = Math.Min( rangeSlider.Minimum, rangeSlider.Maximum );
-      var max = Math.Max( rangeSlider.Minimum, rangeSlider.Maximum );
-      var higherValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, (double)basevalue ) );
-      higherValue = Math.Max( rangeSlider.LowerValue, ( double)basevalue );
-
-      return higherValue;
-    }
-
-    private static void OnHigherValueChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnHigherValueChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnHigherValueChanged( double oldValue, double newValue )
-    {
-      this.AdjustView();
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = RangeSlider.HigherValueChangedEvent;
-      this.RaiseEvent( args );
-    }
-
-    #endregion HigherValue
-
-    #region IsDeferredUpdateValues
-    /// <summary>
-    /// Gets/Sets if the LowerValue and HigherValue should be updated only on mouse up.
-    /// </summary>
-    public static readonly DependencyProperty IsDeferredUpdateValuesProperty = DependencyProperty.Register( "IsDeferredUpdateValues", typeof( bool ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( false ) );
-
-    public bool IsDeferredUpdateValues
-    {
-      get
-      {
-        return (bool)GetValue( RangeSlider.IsDeferredUpdateValuesProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.IsDeferredUpdateValuesProperty, value );
-      }
-    }
-
-    #endregion IsDeferredUpdateValues
-
-    #region IsSnapToTickEnabled
-
-    public static readonly DependencyProperty IsSnapToTickEnabledProperty = DependencyProperty.Register( "IsSnapToTickEnabled", typeof( bool ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( false ) );
-
-    public bool IsSnapToTickEnabled
-    {
-      get
-      {
-        return (bool)GetValue( RangeSlider.IsSnapToTickEnabledProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.IsSnapToTickEnabledProperty, value );
-      }
-    }
-
-    #endregion IsSnapToTickEnabled
-
-    #region LowerRangeBackground
-    /// <summary>
-    /// Get/Set the Brush for the Range between Minimum and Lower values. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty LowerRangeBackgroundProperty = DependencyProperty.Register( "LowerRangeBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush LowerRangeBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.LowerRangeBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.LowerRangeBackgroundProperty, value );
-      }
-    }
-
-    #endregion LowerRangeBackground
-
-    #region LowerRangeStyle
-    /// <summary>
-    /// Get/Set the Style for the Range between Minimum and Lower values. (Style)
-    /// </summary>
-
-    public static readonly DependencyProperty LowerRangeStyleProperty = DependencyProperty.Register( "LowerRangeStyle", typeof( Style ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( null ) );
-
-    public Style LowerRangeStyle
-    {
-      get
-      {
-        return (Style)this.GetValue( RangeSlider.LowerRangeStyleProperty );
-      }
-      set
-      {
-        this.SetValue( RangeSlider.LowerRangeStyleProperty, value );
-      }
-    }
-
-    #endregion LowerRangeStyle
-
-    #region LowerRangeWidth
-    /// <summary>
-    /// LowerRangeWidth property is a readonly property, used to calculate the percentage of the LowerRange, within the entire min/max range.
-    /// </summary>
-    /// 
-
-    private static DependencyPropertyKey LowerRangeWidthPropertyKey = DependencyProperty.RegisterAttachedReadOnly( "LowerRangeWidth", typeof( double )
-      , typeof( RangeSlider ), new PropertyMetadata( 0d ) );
-
-    public static readonly DependencyProperty LowerRangeWidthProperty = LowerRangeWidthPropertyKey.DependencyProperty;
-
-    public double LowerRangeWidth
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.LowerRangeWidthProperty );
-      }
-      private set
-      {
-        SetValue( RangeSlider.LowerRangeWidthPropertyKey, value );
-      }
-    }
-
-    #endregion LowerRangeWidth
-
-    #region LowerThumbBackground
-    /// <summary>
-    /// Get/Set the Brush for the LowerValue thumb's background [active state]. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty LowerThumbBackgroundProperty = DependencyProperty.Register( "LowerThumbBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush LowerThumbBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.LowerThumbBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.LowerThumbBackgroundProperty, value );
-      }
-    }
-
-    #endregion LowerThumbBackground
-
-    #region LowerValue
-    /// <summary>
-    /// LowerValue property represents the lower value within the selected range.
-    /// </summary>
-    public static readonly DependencyProperty LowerValueProperty = DependencyProperty.Register( "LowerValue", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, RangeSlider.OnLowerValueChanged, RangeSlider.OnCoerceLowerValueChanged ) );
-
-    public double LowerValue
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.LowerValueProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.LowerValueProperty, value );
-      }
-    }
-
-    private static object OnCoerceLowerValueChanged( DependencyObject d, object basevalue )
-    {
-      var rangeSlider = (RangeSlider)d;
-      if( (rangeSlider == null) || !rangeSlider.IsLoaded )
-        return basevalue;
-
-      var min = Math.Min( rangeSlider.Minimum, rangeSlider.Maximum );
-      var max = Math.Max( rangeSlider.Minimum, rangeSlider.Maximum );
-      var lowerValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, (double)basevalue ) );
-      lowerValue = Math.Min( (double)basevalue, rangeSlider.HigherValue );
-
-      return lowerValue;
-    }
-
-    private static void OnLowerValueChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnLowerValueChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnLowerValueChanged( double oldValue, double newValue )
-    {
-      this.AdjustView();
-
-      RoutedEventArgs args = new RoutedEventArgs();
-      args.RoutedEvent = RangeSlider.LowerValueChangedEvent;
-      this.RaiseEvent( args );
-    }
-
-    #endregion LowerValue
-
-    #region Maximum
-    /// <summary>
-    /// Maximum property represents the maximum value, which can be selected, in a range.
-    /// </summary>
-    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register( "Maximum", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( RangeSlider.OnMaximumChanged ) );
-
-    public double Maximum
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.MaximumProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.MaximumProperty, value );
-      }
-    }
-
-    private static void OnMaximumChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnMaximumChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnMaximumChanged( double oldValue, double newValue )
-    {
-      this.AdjustView();
-    }
-
-    #endregion Maximum
-
-    #region Minimum
-    /// <summary>
-    /// Minimum property represents the minimum value, which can be selected, in a range.
-    /// </summary>
-    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register( "Minimum", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( RangeSlider.OnMinimumChanged ) );
-
-    public double Minimum
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.MinimumProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.MinimumProperty, value );
-      }
-    }
-
-    private static void OnMinimumChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnMinimumChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnMinimumChanged( double oldValue, double newValue )
-    {
-      // adjust the range width
-      this.AdjustView();
-    }
-
-    #endregion Minimum
-
-    #region Orientation
-
-    /// <summary>
-    /// Get/Set the RangeSlider's orientation.
-    /// </summary>
-    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register( "Orientation", typeof( Orientation ), typeof( RangeSlider ),
-        new FrameworkPropertyMetadata( Orientation.Horizontal, RangeSlider.OnOrientationChanged ) );
-
-    public Orientation Orientation
-    {
-      get
-      {
-        return (Orientation)GetValue( RangeSlider.OrientationProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.OrientationProperty, value );
-      }
-    }
-
-    private static void OnOrientationChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnOrientationChanged( (Orientation)e.OldValue, (Orientation)e.NewValue );
-      }
-    }
-
-    protected virtual void OnOrientationChanged( Orientation oldValue, Orientation newValue )
-    {
-    }
-
-    #endregion //Orientation
-
-    #region RangeBackground
-    /// <summary>
-    /// Get/Set the Brush for the Range between Lower and Higher values [active state]. (Brush)
-    /// </summary>
-
-    public static readonly DependencyProperty RangeBackgroundProperty = DependencyProperty.Register( "RangeBackground", typeof( Brush ), typeof( RangeSlider ) );
-
-    public Brush RangeBackground
-    {
-      get
-      {
-        return (Brush)GetValue( RangeSlider.RangeBackgroundProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.RangeBackgroundProperty, value );
-      }
-    }
-
-    #endregion RangeBackground
-
-    #region RangeStyle
-    /// <summary>
-    /// Get/Set the Style for the Range between Lower and Higher values. (Style)
-    /// </summary>
-
-    public static readonly DependencyProperty RangeStyleProperty = DependencyProperty.Register( "RangeStyle", typeof( Style ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( null ) );
-
-    public Style RangeStyle
-    {
-      get
-      {
-        return (Style)this.GetValue( RangeSlider.RangeStyleProperty );
-      }
-      set
-      {
-        this.SetValue( RangeSlider.RangeStyleProperty, value );
-      }
-    }
-
-    #endregion RangeStyle
-
-    #region RangeWidth
-    /// <summary>
-    /// RangeWidth property is a readonly property, used to calculate the percentage of the range within the entire min/max range.
-    /// </summary>
-
-    private static readonly DependencyPropertyKey RangeWidthPropertyKey = DependencyProperty.RegisterAttachedReadOnly( "RangeWidth", typeof( double )
-      , typeof( RangeSlider ), new PropertyMetadata( 0d ) );
-
-    public static readonly DependencyProperty RangeWidthProperty = RangeWidthPropertyKey.DependencyProperty;
-
-    public double RangeWidth
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.RangeWidthProperty );
-      }
-      private set
-      {
-        SetValue( RangeSlider.RangeWidthPropertyKey, value );
-      }
-    }
-
-    #endregion RangeWidth
-
-    #region Step
-    /// <summary>
-    /// Step property is used to identify the RangeSlider's size of individual move, when clicking on the LowerRange, HigherRange, not while scrolling the thumbs.
-    /// </summary>
-    private static readonly DependencyProperty StepProperty = DependencyProperty.Register( "Step", typeof( double ), typeof( RangeSlider )
-      , new PropertyMetadata( 1.0, null, RangeSlider.CoerceStep ) );
-
-    public double Step
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.StepProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.StepProperty, value );
-      }
-    }
-
-    private static object CoerceStep( DependencyObject sender, object value )
-    {
-      RangeSlider rangeSlider = sender as RangeSlider;
-      double newValue = (double)value;
-
-      return Math.Max( 0.01, newValue );
-    }
-
-    #endregion
-
-    #region TickFrequency
-    /// <summary>       
-    /// Gets or sets the interval between tick marks.
-    /// </summary>
-    public static readonly DependencyProperty TickFrequencyProperty = DependencyProperty.Register( "TickFrequency", typeof( double ), typeof( RangeSlider )
-      , new FrameworkPropertyMetadata( 1d, RangeSlider.OnTickFrequencyChanged ) );
-
-    public double TickFrequency
-    {
-      get
-      {
-        return (double)GetValue( RangeSlider.TickFrequencyProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.TickFrequencyProperty, value );
-      }
-    }
-
-    private static void OnTickFrequencyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
-    {
-      var rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnTickFrequencyChanged( (double)args.OldValue, (double)args.NewValue );
-      }
-    }
-
-    protected virtual void OnTickFrequencyChanged( double oldValue, double newValue )
-    {
-    }
-
-    #endregion TickFrequency
-
-    #region TickPlacement
-
-    public static readonly DependencyProperty TickPlacementProperty = DependencyProperty.Register( "TickPlacement", typeof( TickPlacement ), typeof( RangeSlider ),
-        new FrameworkPropertyMetadata( TickPlacement.None, RangeSlider.OnTickPlacementChanged ) );
-
-    public TickPlacement TickPlacement
-    {
-      get
-      {
-        return (TickPlacement)GetValue( RangeSlider.TickPlacementProperty );
-      }
-      set
-      {
-        SetValue( RangeSlider.TickPlacementProperty, value );
-      }
-    }
-
-    private static void OnTickPlacementChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
-    {
-      var rangeSlider = sender as RangeSlider;
-      if( rangeSlider != null )
-      {
-        rangeSlider.OnTickPlacementChanged( (TickPlacement)e.OldValue, (TickPlacement)e.NewValue );
-      }
-    }
-
-    protected virtual void OnTickPlacementChanged( TickPlacement oldValue, TickPlacement newValue )
-    {
-    }
-
-    #endregion //TickPlacement
-
-    #endregion Properties
-
-    #region Override
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _lowerRange != null )
-      {
-        _lowerRange.Click -= new RoutedEventHandler( this.LowerRange_Click );
-      }
-      _lowerRange = this.Template.FindName( PART_LowerRange, this ) as RepeatButton;
-      if( _lowerRange != null )
-      {
-        _lowerRange.Click += new RoutedEventHandler( this.LowerRange_Click );
-      }
-
-      if( _higherRange != null )
-      {
-        _higherRange.Click -= new RoutedEventHandler( this.HigherRange_Click );
-      }
-      _higherRange = this.Template.FindName( PART_HigherRange, this ) as RepeatButton;
-      if( _higherRange != null )
-      {
-        _higherRange.Click += new RoutedEventHandler( this.HigherRange_Click );
-      }
-
-      if( _lowerSlider != null )
-      {
-        _lowerSlider.Loaded -= this.Slider_Loaded;
-        _lowerSlider.ValueChanged -= LowerSlider_ValueChanged;
-        if( _lowerTrack != null )
-        {
-          _lowerTrack.Thumb.DragCompleted -= this.LowerSlider_DragCompleted;
-        }
-      }
-      _lowerSlider = this.Template.FindName( PART_LowerSlider, this ) as Slider;
-      if( _lowerSlider != null )
-      {
-        _lowerSlider.Loaded += this.Slider_Loaded;
-        _lowerSlider.ValueChanged += LowerSlider_ValueChanged;
-        _lowerSlider.ApplyTemplate();
-        _lowerTrack = _lowerSlider.Template.FindName( PART_Track, _lowerSlider ) as Track;
-        if( _lowerTrack != null )
-        {
-          _lowerTrack.Thumb.DragCompleted += this.LowerSlider_DragCompleted;
-        }
-      }
-
-      if( _higherSlider != null )
-      {
-        _higherSlider.Loaded -= this.Slider_Loaded;
-        _higherSlider.ValueChanged -= HigherSlider_ValueChanged;
-        if( _higherTrack != null )
-        {
-          _higherTrack.Thumb.DragCompleted -= this.HigherSlider_DragCompleted;
-        }
-      }
-      _higherSlider = this.Template.FindName( PART_HigherSlider, this ) as Slider;
-      if( _higherSlider != null )
-      {
-        _higherSlider.Loaded += this.Slider_Loaded;
-        _higherSlider.ValueChanged += HigherSlider_ValueChanged;
-        _higherSlider.ApplyTemplate();
-        _higherTrack = _higherSlider.Template.FindName( PART_Track, _higherSlider ) as Track;
-        if( _higherTrack != null )
-        {
-          _higherTrack.Thumb.DragCompleted += this.HigherSlider_DragCompleted;
-        }
-      }
-    }
-
-    public override string ToString()
-    {
-      return this.LowerValue.ToString() + "-" + this.HigherValue.ToString();
-    }
-
-
-    #endregion Override
-
-    #region Methods
-
-    internal static double GetThumbWidth( Slider slider )
-    {
-      if( slider != null )
-      {
-        var track = (Track)slider.Template.FindName( "PART_Track", slider );
-        if( track != null )
-        {
-          var thumb = track.Thumb;
-          return thumb.ActualWidth;
-        }
-      }
-      return 0d;
-    }
-
-    internal static double GetThumbHeight( Slider slider )
-    {
-      if( slider != null )
-      {
-        var track = (Track)slider.Template.FindName( "PART_Track", slider );
-        if( track != null )
-        {
-          var thumb = track.Thumb;
-          return thumb.ActualHeight;
-        }
-      }
-      return 0d;
-    }
-
-    private void AdjustView()
-    {
-      //Coerce values to make them consistent.
-      var cv = this.GetCoercedValues();
-
-      double actualWidth = 0;
-      double lowerSliderThumbWidth = 0d;
-      double higherSliderThumbWidth = 0d;
-
-      if( this.Orientation == Orientation.Horizontal )
-      {
-        actualWidth = this.ActualWidth;
-        lowerSliderThumbWidth = RangeSlider.GetThumbWidth( _lowerSlider );
-        higherSliderThumbWidth = RangeSlider.GetThumbWidth( _higherSlider );
-      }
-      else if( this.Orientation == Orientation.Vertical )
-      {
-        actualWidth = this.ActualHeight;
-        lowerSliderThumbWidth = RangeSlider.GetThumbHeight( _lowerSlider );
-        higherSliderThumbWidth = RangeSlider.GetThumbHeight( _higherSlider );
-      }
-
-      actualWidth -= (lowerSliderThumbWidth + higherSliderThumbWidth);
-
-      this.SetLowerSliderValues( cv.LowerValue, cv.Minimum, cv.Maximum );
-      this.SetHigherSliderValues( cv.HigherValue, cv.Minimum, cv.Maximum );
-
-      double entireRange = cv.Maximum - cv.Minimum;
-
-      if( entireRange > 0 )
-      {
-        this.HigherRangeWidth = (actualWidth * (cv.Maximum - cv.HigherValue)) / entireRange;
-
-        this.RangeWidth = (actualWidth * (cv.HigherValue - cv.LowerValue)) / entireRange;
-
-        this.LowerRangeWidth = (actualWidth * (cv.LowerValue - cv.Minimum)) / entireRange;
-      }
-      else
-      {
-        this.HigherRangeWidth = 0d;
-        this.RangeWidth = 0d;
-        this.LowerRangeWidth = actualWidth;
-      }
-    }
-
-    private void SetSlidersMargins()
-    {
-      if( (_lowerSlider != null) && (_higherSlider != null) )
-      {
-        if( this.Orientation == Orientation.Horizontal )
-        {
-          double lowerSliderThumbWidth = RangeSlider.GetThumbWidth( _lowerSlider );
-          double higherSliderThumbWidth = RangeSlider.GetThumbWidth( _higherSlider );
-
-          _higherSlider.Margin = new Thickness( lowerSliderThumbWidth, 0d, 0d, 0d );
-          _lowerSlider.Margin = new Thickness( 0d, 0d, higherSliderThumbWidth, 0d );
-        }
-        else
-        {
-          double lowerSliderThumbHeight = RangeSlider.GetThumbHeight( _lowerSlider );
-          double higherSliderThumbHeight = RangeSlider.GetThumbHeight( _higherSlider );
-
-          _higherSlider.Margin = new Thickness( 0d, 0d, 0d, lowerSliderThumbHeight );
-          _lowerSlider.Margin = new Thickness( 0d, higherSliderThumbHeight, 0d, 0d );
-        }
-      }
-    }
-
-    private CoercedValues GetCoercedValues()
-    {
-      CoercedValues cv = new CoercedValues();
-      cv.Minimum = Math.Min( this.Minimum, this.Maximum );
-      cv.Maximum = Math.Max( cv.Minimum, this.Maximum );
-      cv.LowerValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, this.LowerValue ) );
-      cv.HigherValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, this.HigherValue ) );
-      cv.HigherValue = Math.Max( cv.LowerValue, cv.HigherValue );
-
-      return cv;
-    }
-
-    private void SetLowerSliderValues( double value, double? minimum, double? maximum )
-    {
-      this.SetSliderValues( _lowerSlider, this.LowerSlider_ValueChanged, value, minimum, maximum );
-    }
-
-    private void SetHigherSliderValues( double value, double? minimum, double? maximum )
-    {
-      this.SetSliderValues( _higherSlider, this.HigherSlider_ValueChanged, value, minimum, maximum );
-    }
-
-    private void SetSliderValues(
-      Slider slider,
-      RoutedPropertyChangedEventHandler<double> handler,
-      double value,
-      double? minimum,
-      double? maximum )
-    {
-      if( slider != null )
-      {
-        slider.ValueChanged -= handler;
-
-        slider.Value = value;
-        if( minimum != null )
-        {
-          slider.Minimum = minimum.Value;
-        }
-        if( maximum != null )
-        {
-          slider.Maximum = maximum.Value;
-        }
-
-        slider.ValueChanged += handler;
-      }
-    }
-
-    private void UpdateHigherValue( double value )
-    {
-      CoercedValues cv = this.GetCoercedValues();
-      double newValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, value ) );
-      newValue = Math.Max( newValue, cv.LowerValue );
-      this.SetHigherSliderValues( newValue, null, null );
-      this.HigherValue = newValue;
-    }
-
-    private void UpdateLowerValue( double value )
-    {
-      CoercedValues cv = this.GetCoercedValues();
-      double newValue = Math.Max( cv.Minimum, Math.Min( cv.Maximum, value ) );
-      newValue = Math.Min( newValue, cv.HigherValue );
-      this.SetLowerSliderValues( newValue, null, null );
-      this.LowerValue = newValue;
-    }
-
-    #endregion
-
-    #region Events
-
-    public static readonly RoutedEvent LowerValueChangedEvent = EventManager.RegisterRoutedEvent( "LowerValueChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( RangeSlider ) );
-    public event RoutedEventHandler LowerValueChanged
-    {
-      add
-      {
-        AddHandler( RangeSlider.LowerValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( RangeSlider.LowerValueChangedEvent, value );
-      }
-    }
-
-    public static readonly RoutedEvent HigherValueChangedEvent = EventManager.RegisterRoutedEvent( "HigherValueChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( RangeSlider ) );
-    public event RoutedEventHandler HigherValueChanged
-    {
-      add
-      {
-        AddHandler( RangeSlider.HigherValueChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( RangeSlider.HigherValueChangedEvent, value );
-      }
-    }
-
-    #endregion //Events
-
-    #region Events Handlers
-
-    private void LowerRange_Click( object sender, RoutedEventArgs e )
-    {
-      CoercedValues cv = this.GetCoercedValues();
-      //When Maximum is not greater than Minimum, the
-      //slider display is in an inconsistant state. Don't 
-      //consider any operation from the user
-      if( cv.Minimum < cv.Maximum )
-      {
-        double newValue = cv.LowerValue - this.Step;
-        this.LowerValue = Math.Min( cv.Maximum, Math.Max( cv.Minimum, newValue ) );
-      }
-    }
-
-    private void HigherRange_Click( object sender, RoutedEventArgs e )
-    {
-      CoercedValues cv = this.GetCoercedValues();
-      //When Maximum is not greater than Minimum, the
-      //slider display is in an inconsistant state. Don't 
-      //consider any operation from the user
-      if( cv.Minimum < cv.Maximum )
-      {
-        double newValue = cv.HigherValue + this.Step;
-        this.HigherValue = Math.Min( cv.Maximum, Math.Max( cv.Minimum, newValue ) );
-      }
-    }
-
-    private void RangeSlider_SizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      this.AdjustView();
-    }
-
-    private void Slider_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.SetSlidersMargins();
-      this.AdjustView();
-    }
-
-    private void LowerSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
-    {
-      if( (_lowerSlider != null) && _lowerSlider.IsLoaded )
-      {
-        if( !this.IsDeferredUpdateValues )
-        {
-          this.UpdateLowerValue( e.NewValue );
-        }
-        else
-        {
-          _deferredUpdateValue = e.NewValue;
-        }
-      }
-    }
-
-    private void HigherSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
-    {
-      if( ( _higherSlider != null) && _higherSlider.IsLoaded )
-      {
-        if( !this.IsDeferredUpdateValues )
-        {
-          this.UpdateHigherValue( e.NewValue );
-        }
-        else
-        {
-          _deferredUpdateValue = e.NewValue;
-        }
-      }
-    }
-
-    private void HigherSlider_DragCompleted( object sender, DragCompletedEventArgs e )
-    {
-      if( this.IsDeferredUpdateValues )
-      {
-        this.UpdateHigherValue( _deferredUpdateValue );
-      }
-    }
-
-    private void LowerSlider_DragCompleted( object sender, DragCompletedEventArgs e )
-    {
-      if( this.IsDeferredUpdateValues )
-      {
-        this.UpdateLowerValue( _deferredUpdateValue );
-      }
-    }
-
-    #endregion Events Handlers
-
-    private struct CoercedValues
-    {
-      public double Minimum;
-      public double Maximum;
-      public double LowerValue;
-      public double HigherValue;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index f4890a1f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,570 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:coreConv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <coreConv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-  <!-- Repeat Button - This is used by the RangeSlider for the LowerRange, Range, and HigherRange buttons -->
-  <Style x:Key="DefaultRangeStyle"
-         TargetType="{x:Type RepeatButton}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Grid>
-            <Rectangle x:Name="MainBorder"
-                       Fill="{TemplateBinding Background}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- Since a thumb is pretty small, we put a bigger visual clue
-        outside the thumb bounds to give the user a hint where the focus is -->
-  <Style x:Key="ThumbFocusVisualStyle">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="-2"
-                     StrokeThickness="1"
-                     Stroke="Black"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************** -->
-  <!-- Thumb Template    -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="ThumbTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Grid>
-      <Rectangle x:Name="BackgroundFadingRect"
-                 Fill="Black"
-                 Width="11"
-                 Height="20"
-                 SnapsToDevicePixels="True" />
-      <Rectangle x:Name="MainBorder"
-                 Fill="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background, TargetNullValue=#FFF0F0F0}"
-                 StrokeThickness="1"
-                 Stroke="#FFACACAC"
-                 Opacity="1"
-                 Width="11"
-                 Height="20"
-                 SnapsToDevicePixels="True" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background, Converter={StaticResource SolidColorBrushToColorConverter}}"
-                   Value="Transparent">
-        <Setter Property="Visibility"
-                TargetName="BackgroundFadingRect"
-                Value="Collapsed" />
-      </DataTrigger>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="0.75" />
-      </Trigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}"
-                     Value="{x:Null}" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="1" />
-        <Setter Property="Stroke"
-                TargetName="MainBorder"
-                Value="#FF7EB4EA" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="#FFDCECFC" />
-      </MultiDataTrigger>
-
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="1" />
-        <Setter Property="Stroke"
-                TargetName="MainBorder"
-                Value="#FFD9D9D9" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="#FFF0F0F0" />
-      </Trigger>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Slider}}, Path=Orientation}"
-                   Value="Vertical">
-        <Setter TargetName="MainBorder"
-                Property="Width"
-                Value="20" />
-        <Setter TargetName="MainBorder"
-                Property="Height"
-                Value="11" />
-        <Setter TargetName="BackgroundFadingRect"
-                Property="Width"
-                Value="20" />
-        <Setter TargetName="BackgroundFadingRect"
-                Property="Height"
-                Value="11" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- Slider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="SliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Border SnapsToDevicePixels="True"
-            BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}">
-      <Track x:Name="PART_Track"
-             Orientation="{TemplateBinding Orientation}">
-        <Track.Thumb>
-          <Thumb x:Name="Thumb"
-                 Focusable="True"
-                 FocusVisualStyle="{StaticResource ThumbFocusVisualStyle}"
-                 Background="{TemplateBinding Background}"
-                 Template="{StaticResource ThumbTemplate}">
-          </Thumb>
-        </Track.Thumb>
-      </Track>
-    </Border>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- HorizontalTickSlider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="HorizontalTickSliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <TickBar Name="TopTick"
-               Grid.Row="0"
-               SnapsToDevicePixels="True"
-               Placement="Top"
-               Fill="Black"
-               Height="4"
-               Visibility="Collapsed" />
-
-      <Border Grid.Row="1"
-              SnapsToDevicePixels="true"
-              Visibility="Hidden">
-        <Track x:Name="PART_Track"
-               Orientation="{TemplateBinding Orientation}">
-          <Track.Thumb>
-            <Thumb x:Name="Thumb"
-                   Focusable="True"
-                   Template="{StaticResource ThumbTemplate}">
-            </Thumb>
-          </Track.Thumb>
-        </Track>
-      </Border>
-
-      <TickBar Name="BottomTick"
-               Grid.Row="2"
-               SnapsToDevicePixels="True"
-               Fill="Black"
-               Placement="Bottom"
-               Height="4"
-               Visibility="Collapsed" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="TopLeft">
-        <Setter TargetName="TopTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="BottomRight">
-        <Setter TargetName="BottomTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="Both">
-        <Setter TargetName="TopTick"
-                Property="Visibility"
-                Value="Visible" />
-        <Setter TargetName="BottomTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- VerticalTickSlider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="VerticalTickSliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-
-      <TickBar Name="LeftTick"
-               Grid.Column="0"
-               SnapsToDevicePixels="True"
-               Placement="Left"
-               Fill="Black"
-               Width="4"
-               Visibility="Collapsed" />
-
-      <Border Grid.Column="1"
-              SnapsToDevicePixels="true"
-              Visibility="Hidden">
-        <Track x:Name="PART_Track"
-               Orientation="{TemplateBinding Orientation}">
-          <Track.Thumb>
-            <Thumb x:Name="Thumb"
-                   Focusable="True"
-                   Template="{StaticResource ThumbTemplate}">
-            </Thumb>
-          </Track.Thumb>
-        </Track>
-      </Border>
-
-      <TickBar Name="RightTick"
-               Grid.Column="2"
-               SnapsToDevicePixels="True"
-               Fill="Black"
-               Placement="Right"
-               Width="4"
-               Visibility="Collapsed" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="TopLeft">
-        <Setter TargetName="LeftTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="BottomRight">
-        <Setter TargetName="RightTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="Both">
-        <Setter TargetName="LeftTick"
-                Property="Visibility"
-                Value="Visible" />
-        <Setter TargetName="RightTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- Vertical RangeSlider Template -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="VerticalRangeSlider"
-                   TargetType="{x:Type local:RangeSlider}">
-    <Border BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}"
-            Background="{TemplateBinding Background}">
-      <Grid HorizontalAlignment="Left"
-            VerticalAlignment="Top">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition x:Name="LeftColumn"
-                            Width="0" />
-          <ColumnDefinition Width="Auto" />
-          <ColumnDefinition x:Name="RightColumn"
-                            Width="0" />
-        </Grid.ColumnDefinitions>
-        <!-- Get the Thumbs's height to set a good height for the RangeSlider.-->
-        <Grid.RowDefinitions>
-          <RowDefinition Height="11" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="11" />
-        </Grid.RowDefinitions>
-
-        <Border Grid.Row="1"
-                Grid.RowSpan="3"
-                Grid.Column="1"
-                BorderThickness="1"
-                BorderBrush="#FFD6D6D6"
-                Background="#FFE7EAEA"
-                VerticalAlignment="Stretch"
-                HorizontalAlignment="Center"
-                Width="4" />
-
-        <!-- Create a Hidden Slider to only display its Ticks -->
-        <Slider x:Name="TickSlider"
-                Orientation="Vertical"
-                Grid.RowSpan="5"
-                Grid.ColumnSpan="3"
-                Focusable="False"
-                Margin="0,5.5,0,5.5"
-                Template="{StaticResource VerticalTickSliderTemplate}"
-                Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
-                Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
-                TickFrequency="{TemplateBinding TickFrequency}">
-        </Slider>
-
-        <RepeatButton x:Name="PART_LowerRange"
-                      Height="{TemplateBinding LowerRangeWidth}"
-                      Grid.Row="3"
-                      Grid.Column="1"
-                      Background="{TemplateBinding LowerRangeBackground}"
-                      Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <RepeatButton Height="{TemplateBinding RangeWidth}"
-                      Grid.Row="2"
-                      Grid.Column="1"
-                      Background="{TemplateBinding RangeBackground}"
-                      Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <RepeatButton x:Name="PART_HigherRange"
-                      Height="{TemplateBinding HigherRangeWidth}"
-                      Grid.Row="1"
-                      Grid.Column="1"
-                      Background="{TemplateBinding HigherRangeBackground}"
-                      Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb Height -->
-        <Slider x:Name="PART_LowerSlider"
-                Orientation="Vertical"
-                Grid.RowSpan="5"
-                Grid.Column="1"
-                Focusable="False"
-                Background="{TemplateBinding LowerThumbBackground}"
-                Template="{StaticResource SliderTemplate}"
-                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                TickFrequency="{TemplateBinding TickFrequency}"
-                HorizontalAlignment="Left"
-                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
-        </Slider>
-
-        <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
-        <Slider x:Name="PART_HigherSlider"
-                Grid.RowSpan="5"
-                Grid.Column="1"
-                Orientation="Vertical"
-                Focusable="False"
-                Background="{TemplateBinding HigherThumbBackground}"
-                Template="{StaticResource SliderTemplate}"
-                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                TickFrequency="{TemplateBinding TickFrequency}"
-                HorizontalAlignment="Left"
-                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
-        </Slider>
-      </Grid>
-    </Border>
-    <ControlTemplate.Triggers>
-      <Trigger Property="TickPlacement"
-               Value="TopLeft">
-        <Setter TargetName="LeftColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-      <Trigger Property="TickPlacement"
-               Value="BottomRight">
-        <Setter TargetName="RightColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-      <Trigger Property="TickPlacement"
-               Value="Both">
-        <Setter TargetName="LeftColumn"
-                Property="Width"
-                Value="4" />
-        <Setter TargetName="RightColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- RangeSlider Style -->
-  <!-- ********************** -->
-  <Style TargetType="{x:Type local:RangeSlider}">
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:RangeSlider}">
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Background="{TemplateBinding Background}">
-            <Grid HorizontalAlignment="Left"
-                  VerticalAlignment="Top">
-              <Grid.RowDefinitions>
-                <RowDefinition x:Name="TopRow"
-                               Height="0" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition x:Name="BottomRow"
-                               Height="0" />
-              </Grid.RowDefinitions>
-              <!-- Get the Thumbs's width to set a good width for the RangeSlider. -->
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="11" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="11" />
-              </Grid.ColumnDefinitions>
-
-              <Border Grid.Column="1"
-                      Grid.ColumnSpan="3"
-                      Grid.Row="1"
-                      BorderThickness="1"
-                      BorderBrush="#FFD6D6D6"
-                      Background="#FFE7EAEA"
-                      VerticalAlignment="Center"
-                      Height="4" />
-
-              <!-- Create a Hidden Slider to only display its Ticks -->
-              <Slider x:Name="TickSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.RowSpan="3"
-                      Focusable="False"
-                      Margin="5.5,0,5.5,0"
-                      Template="{StaticResource HorizontalTickSliderTemplate}"
-                      Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
-                      Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
-                      TickFrequency="{TemplateBinding TickFrequency}">
-              </Slider>
-
-              <RepeatButton x:Name="PART_LowerRange"
-                            Width="{TemplateBinding LowerRangeWidth}"
-                            Grid.Column="1"
-                            Grid.Row="1"
-                            Background="{TemplateBinding LowerRangeBackground}"
-                            Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True">
-              </RepeatButton>
-
-              <RepeatButton Width="{TemplateBinding RangeWidth}"
-                            Grid.Column="2"
-                            Grid.Row="1"
-                            Background="{TemplateBinding RangeBackground}"
-                            Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True">
-              </RepeatButton>
-
-              <RepeatButton x:Name="PART_HigherRange"
-                            Width="{TemplateBinding HigherRangeWidth}"
-                            Grid.Column="3"
-                            Grid.Row="1"
-                            Background="{TemplateBinding HigherRangeBackground}"
-                            Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True">
-              </RepeatButton>
-
-              <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb width -->
-              <Slider x:Name="PART_LowerSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.Row="1"
-                      Focusable="False"
-                      Background="{TemplateBinding LowerThumbBackground}"
-                      Template="{StaticResource SliderTemplate}"
-                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                      TickFrequency="{TemplateBinding TickFrequency}"
-                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
-              </Slider>
-
-              <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
-              <Slider x:Name="PART_HigherSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.Row="1"
-                      Focusable="False"
-                      Background="{TemplateBinding HigherThumbBackground}"
-                      Template="{StaticResource SliderTemplate}"
-                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                      TickFrequency="{TemplateBinding TickFrequency}"
-                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}">
-              </Slider>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="TickPlacement"
-                     Value="TopLeft">
-              <Setter TargetName="TopRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-            <Trigger Property="TickPlacement"
-                     Value="BottomRight">
-              <Setter TargetName="BottomRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-            <Trigger Property="TickPlacement"
-                     Value="Both">
-              <Setter TargetName="TopRow"
-                      Property="Height"
-                      Value="4" />
-              <Setter TargetName="BottomRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Orientation"
-               Value="Vertical">
-        <Setter Property="Template"
-                Value="{StaticResource VerticalRangeSlider}" />
-      </Trigger>
-    </Style.Triggers>
-
-
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
deleted file mode 100644
index 95a47482..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
+++ /dev/null
@@ -1,636 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
-                    xmlns:coreConv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
-
-  <coreConv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-
-  <LinearGradientBrush x:Key="NormalThumbFillBackground"
-                       StartPoint="0.5,0"
-                       EndPoint="0.5,1">
-    <GradientStop Color="White"
-                  Offset="0" />
-    <GradientStop Color="#FFEBEBEB"
-                  Offset="0.5" />
-    <GradientStop Color="#FFD6D6D6"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="MouseOverThumbFillBackground"
-                       StartPoint="0.5,0"
-                       EndPoint="0.5,1">
-    <GradientStop Color="White"
-                  Offset="0" />
-    <GradientStop Color="#FFBBE3F9"
-                  Offset="0.5" />
-    <GradientStop Color="#FFB1E0F8"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PressedThumbFillBackground"
-                       StartPoint="0.5,0"
-                       EndPoint="0.5,1">
-    <GradientStop Color="White"
-                  Offset="0" />
-    <GradientStop Color="#FF5DB2E0"
-                  Offset="0.5" />
-    <GradientStop Color="#FF4F93BD"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="SliderBorderBrush"
-                       StartPoint="0.5,0"
-                       EndPoint="0.5,1">
-    <GradientStop Color="#FFB2B5B3"
-                  Offset="0" />
-    <GradientStop Color="#FFFAFAFA"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="SliderVerticalBorderBrush"
-                       StartPoint="0,0.5"
-                       EndPoint="1,0.5">
-    <GradientStop Color="#FFB2B5B3"
-                  Offset="0" />
-    <GradientStop Color="#FFFAFAFA"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <!-- Repeat Button - This is used by RangeSlider for the LowerRange, Range, and HigherRange buttons -->
-  <Style x:Key="DefaultRangeStyle"
-         TargetType="{x:Type RepeatButton}">
-    <Setter Property="Focusable"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type RepeatButton}">
-          <Grid>
-            <Rectangle x:Name="MainBorder"
-                       Fill="{TemplateBinding Background}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- Since a thumb is pretty small, we put a bigger visual clue
-        outside the thumb bounds to give the user a hint where the focus is -->
-  <Style x:Key="ThumbFocusVisualStyle">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Margin="-2"
-                     StrokeThickness="1"
-                     Stroke="Black"
-                     StrokeDashArray="1 2" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- ********************** -->
-  <!-- Thumb Template    -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="ThumbTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Grid>
-      <Border x:Name="BackgroundFadingBorder"
-              Background="Black" />
-      <Border x:Name="BackgroundBorder"
-              BorderBrush="#FF929292"
-              BorderThickness="1"
-              CornerRadius="1">
-        <Rectangle x:Name="MainBorder"
-                   Fill="{Binding Background, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource NormalThumbFillBackground}}"
-                   StrokeThickness="1"
-                   Stroke="White"
-                   Width="9"
-                   Height="20"
-                   Opacity="1"
-                   SnapsToDevicePixels="True" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="0.9" />
-      </Trigger>
-      <Trigger Property="IsMouseCaptureWithin"
-               Value="True">
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="0.8" />
-      </Trigger>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType={x:Type Slider}}, Path=Orientation}"
-                   Value="Vertical">
-        <Setter TargetName="MainBorder"
-                Property="Width"
-                Value="20" />
-        <Setter TargetName="MainBorder"
-                Property="Height"
-                Value="9" />
-      </DataTrigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}"
-                     Value="{x:Null}" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Opacity"
-                TargetName="MainBorder"
-                Value="1" />
-        <Setter Property="BorderBrush"
-                TargetName="BackgroundBorder"
-                Value="#FF3C7FB1" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="{StaticResource MouseOverThumbFillBackground}" />
-      </MultiDataTrigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Background}"
-                     Value="{x:Null}" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseCaptureWithin}"
-                     Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="BorderBrush"
-                TargetName="BackgroundBorder"
-                Value="#FF2C628B" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="{StaticResource PressedThumbFillBackground}" />
-      </MultiDataTrigger>
-
-      <Trigger Property="IsEnabled"
-               Value="False">
-        <Setter Property="BorderBrush"
-                TargetName="BackgroundBorder"
-                Value="#FFD7D7D7" />
-        <Setter Property="Fill"
-                TargetName="MainBorder"
-                Value="#FFF4F4F4" />
-        <Setter Property="Stroke"
-                TargetName="MainBorder"
-                Value="#FFD7D7D7" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- Slider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="SliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <!--<Border SnapsToDevicePixels="true"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">-->
-    <Track x:Name="PART_Track"
-           Orientation="{TemplateBinding Orientation}">
-      <Track.Thumb>
-        <Thumb x:Name="thumb"
-               Focusable="True"
-               FocusVisualStyle="{StaticResource ThumbFocusVisualStyle}"
-               Background="{TemplateBinding Background}"
-               Template="{StaticResource ThumbTemplate}">
-        </Thumb>
-      </Track.Thumb>
-    </Track>
-    <!--</Border>-->
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- HorizontalTickSlider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="HorizontalTickSliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-
-      <TickBar Name="TopTick"
-               Grid.Row="0"
-               SnapsToDevicePixels="True"
-               Placement="Top"
-               Fill="Black"
-               Height="4"
-               Visibility="Collapsed" />
-
-      <Border Grid.Row="1"
-              SnapsToDevicePixels="true"
-              Visibility="Hidden">
-        <Track x:Name="PART_Track"
-               Orientation="{TemplateBinding Orientation}">
-          <Track.Thumb>
-            <Thumb x:Name="Thumb"
-                   Focusable="True"
-                   Template="{StaticResource ThumbTemplate}">
-            </Thumb>
-          </Track.Thumb>
-        </Track>
-      </Border>
-
-      <TickBar Name="BottomTick"
-               Grid.Row="2"
-               SnapsToDevicePixels="True"
-               Fill="Black"
-               Placement="Bottom"
-               Height="4"
-               Visibility="Collapsed" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="TopLeft">
-        <Setter TargetName="TopTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="BottomRight">
-        <Setter TargetName="BottomTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="Both">
-        <Setter TargetName="TopTick"
-                Property="Visibility"
-                Value="Visible" />
-        <Setter TargetName="BottomTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- VerticalTickSlider Template     -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="VerticalTickSliderTemplate"
-                   TargetType="{x:Type Slider}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-
-      <TickBar Name="LeftTick"
-               Grid.Column="0"
-               SnapsToDevicePixels="True"
-               Placement="Left"
-               Fill="Black"
-               Width="4"
-               Visibility="Collapsed" />
-
-      <Border Grid.Column="1"
-              SnapsToDevicePixels="true"
-              Visibility="Hidden">
-        <Track x:Name="PART_Track"
-               Orientation="{TemplateBinding Orientation}">
-          <Track.Thumb>
-            <Thumb x:Name="Thumb"
-                   Focusable="True"
-                   Template="{StaticResource ThumbTemplate}">
-            </Thumb>
-          </Track.Thumb>
-        </Track>
-      </Border>
-
-      <TickBar Name="RightTick"
-               Grid.Column="2"
-               SnapsToDevicePixels="True"
-               Fill="Black"
-               Placement="Right"
-               Width="4"
-               Visibility="Collapsed" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="TopLeft">
-        <Setter TargetName="LeftTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="BottomRight">
-        <Setter TargetName="RightTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding TickPlacement, RelativeSource={RelativeSource AncestorType={x:Type local:RangeSlider}}}"
-                   Value="Both">
-        <Setter TargetName="LeftTick"
-                Property="Visibility"
-                Value="Visible" />
-        <Setter TargetName="RightTick"
-                Property="Visibility"
-                Value="Visible" />
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- Vertical RangeSlider Template -->
-  <!-- ********************** -->
-  <ControlTemplate x:Key="VerticalRangeSlider"
-                   TargetType="{x:Type local:RangeSlider}">
-    <Border BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}"
-            Background="{TemplateBinding Background}">
-      <Grid HorizontalAlignment="Left"
-            VerticalAlignment="Top">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition x:Name="LeftColumn"
-                            Width="0" />
-          <ColumnDefinition Width="Auto" />
-          <ColumnDefinition x:Name="RightColumn"
-                            Width="0" />
-        </Grid.ColumnDefinitions>
-        <!-- Get the Thumbs's height to set a good height for the RangeSlider. -->
-        <Grid.RowDefinitions>
-          <!-- 11 is equal to the width of the horizontal slider thumb, (or the height of the vertical slider thumb)
-               See Thumb template -->
-          <RowDefinition Height="11" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="11" />
-        </Grid.RowDefinitions>
-
-        <Border Grid.Row="1"
-                Grid.RowSpan="3"
-                Grid.Column="1"
-                BorderThickness="1"
-                BorderBrush="{StaticResource SliderVerticalBorderBrush}"
-                Background="#FFE7EAEA"
-                VerticalAlignment="Stretch"
-                HorizontalAlignment="Center"
-                Width="4" />
-
-        <!-- Create a Hidden Slider to only display its Ticks -->
-        <Slider x:Name="TickSlider"
-                Orientation="Vertical"
-                Grid.RowSpan="5"
-                Grid.ColumnSpan="3"
-                Focusable="False"
-                Margin="0,5.5,0,5.5"
-                Template="{StaticResource VerticalTickSliderTemplate}"
-                Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
-                Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
-                TickFrequency="{TemplateBinding TickFrequency}">
-        </Slider>
-
-        <RepeatButton x:Name="PART_LowerRange"
-                      Height="{TemplateBinding LowerRangeWidth}"
-                      Grid.Row="3"
-                      Grid.Column="1"
-                      Background="{TemplateBinding LowerRangeBackground}"
-                      Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <RepeatButton Height="{TemplateBinding RangeWidth}"
-                      Grid.Row="2"
-                      Grid.Column="1"
-                      Background="{TemplateBinding RangeBackground}"
-                      Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <RepeatButton x:Name="PART_HigherRange"
-                      Height="{TemplateBinding HigherRangeWidth}"
-                      Grid.Row="1"
-                      Grid.Column="1"
-                      Background="{TemplateBinding HigherRangeBackground}"
-                      Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                      SnapsToDevicePixels="True" >
-        </RepeatButton>
-
-        <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb Height -->
-        <Slider x:Name="PART_LowerSlider"
-                Orientation="Vertical"
-                Grid.RowSpan="5"
-                Grid.Column="1"
-                Focusable="False"
-                Background="{TemplateBinding LowerThumbBackground}"
-                Template="{StaticResource SliderTemplate}"
-                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                TickFrequency="{TemplateBinding TickFrequency}"
-                HorizontalAlignment="Left"
-                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
-        </Slider>
-
-        <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
-        <Slider x:Name="PART_HigherSlider"
-                Grid.RowSpan="5"
-                Grid.Column="1"
-                Orientation="Vertical"
-                Focusable="False"
-                Background="{TemplateBinding HigherThumbBackground}"
-                Template="{StaticResource SliderTemplate}"
-                IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                TickFrequency="{TemplateBinding TickFrequency}"
-                HorizontalAlignment="Left"
-                AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
-        </Slider>
-      </Grid>
-    </Border>
-    <ControlTemplate.Triggers>
-      <Trigger Property="TickPlacement"
-               Value="TopLeft">
-        <Setter TargetName="LeftColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-      <Trigger Property="TickPlacement"
-               Value="BottomRight">
-        <Setter TargetName="RightColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-      <Trigger Property="TickPlacement"
-               Value="Both">
-        <Setter TargetName="LeftColumn"
-                Property="Width"
-                Value="4" />
-        <Setter TargetName="RightColumn"
-                Property="Width"
-                Value="4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ********************** -->
-  <!-- RangeSlider Style -->
-  <!-- ********************** -->
-  <Style TargetType="{x:Type local:RangeSlider}">
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:RangeSlider}">
-          <Border BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}"
-                  Background="{TemplateBinding Background}">
-            <Grid HorizontalAlignment="Left"
-                  VerticalAlignment="Top">
-
-              <Grid.RowDefinitions>
-                <RowDefinition x:Name="TopRow"
-                               Height="0" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition x:Name="BottomRow"
-                               Height="0" />
-              </Grid.RowDefinitions>
-              <!-- Get the Thumbs's width to set a good width for the RangeSlider. -->
-              <Grid.ColumnDefinitions>
-                <!-- 11 is equal to the width of the horizontal slider thumb, (or the height of the vertical slider thumb)
-                     See Thumb template -->
-                <ColumnDefinition Width="11" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="11" />
-              </Grid.ColumnDefinitions>
-
-              <Border Grid.Column="1"
-                      Grid.ColumnSpan="3"
-                      Grid.Row="1"
-                      BorderThickness="1"
-                      BorderBrush="{StaticResource SliderBorderBrush}"
-                      Background="#FFE7EAEA"
-                      VerticalAlignment="Center"
-                      Height="4" />
-
-              <!-- Create a Hidden Slider to only display its Ticks -->
-              <Slider x:Name="TickSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.RowSpan="3"
-                      Focusable="False"
-                      Margin="5.5,0,5.5,0"
-                      Template="{StaticResource HorizontalTickSliderTemplate}"
-                      Minimum="{Binding Minimum, ElementName=PART_LowerSlider}"
-                      Maximum="{Binding Maximum, ElementName=PART_HigherSlider}"
-                      TickFrequency="{TemplateBinding TickFrequency}">
-              </Slider>
-
-              <RepeatButton x:Name="PART_LowerRange"
-                            Width="{TemplateBinding LowerRangeWidth}"
-                            Grid.Column="1"
-                            Grid.Row="1"
-                            Background="{TemplateBinding LowerRangeBackground}"
-                            Style="{Binding LowerRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True" >
-              </RepeatButton>
-
-              <RepeatButton Width="{TemplateBinding RangeWidth}"
-                            Grid.Column="2"
-                            Grid.Row="1"
-                            Background="{TemplateBinding RangeBackground}"
-                            Style="{Binding RangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True" >
-              </RepeatButton>
-
-              <RepeatButton x:Name="PART_HigherRange"
-                            Width="{TemplateBinding HigherRangeWidth}"
-                            Grid.Column="3"
-                            Grid.Row="1"
-                            Background="{TemplateBinding HigherRangeBackground}"
-                            Style="{Binding HigherRangeStyle, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultRangeStyle}}"
-                            SnapsToDevicePixels="True" >
-              </RepeatButton>
-
-              <!-- Margin is set in CodeBehind, based on HigherSlider's Thumb width -->
-              <Slider x:Name="PART_LowerSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.Row="1"
-                      Focusable="False"
-                      Background="{TemplateBinding LowerThumbBackground}"
-                      Template="{StaticResource SliderTemplate}"
-                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                      TickFrequency="{TemplateBinding TickFrequency}"
-                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
-              </Slider>
-
-              <!-- Margin is set in CodeBehind, based on LowerSlider's Thumb width -->
-              <Slider x:Name="PART_HigherSlider"
-                      Grid.ColumnSpan="5"
-                      Grid.Row="1"
-                      Focusable="False"
-                      Background="{TemplateBinding HigherThumbBackground}"
-                      Template="{StaticResource SliderTemplate}"
-                      IsSnapToTickEnabled="{TemplateBinding IsSnapToTickEnabled}"
-                      TickFrequency="{TemplateBinding TickFrequency}"
-                      AutoToolTipPlacement="{TemplateBinding AutoToolTipPlacement}"
-                      AutoToolTipPrecision="{TemplateBinding AutoToolTipPrecision}" >
-              </Slider>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="TickPlacement"
-                     Value="TopLeft">
-              <Setter TargetName="TopRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-            <Trigger Property="TickPlacement"
-                     Value="BottomRight">
-              <Setter TargetName="BottomRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-            <Trigger Property="TickPlacement"
-                     Value="Both">
-              <Setter TargetName="TopRow"
-                      Property="Height"
-                      Value="4" />
-              <Setter TargetName="BottomRow"
-                      Property="Height"
-                      Value="4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Orientation"
-               Value="Vertical">
-        <Setter Property="Template"
-                Value="{StaticResource VerticalRangeSlider}" />
-      </Trigger>
-    </Style.Triggers>
-
-
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
deleted file mode 100644
index ddbdfd46..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public interface ITextFormatter
-  {
-    string GetText( FlowDocument document );
-    void SetText( FlowDocument document, string text );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
deleted file mode 100644
index bb6d1ff3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Formats the RichTextBox text as plain text
-  /// </summary>
-  public class PlainTextFormatter : ITextFormatter
-  {
-    public string GetText( FlowDocument document )
-    {
-      return new TextRange( document.ContentStart, document.ContentEnd ).Text;
-    }
-
-    public void SetText( FlowDocument document, string text )
-    {
-      new TextRange( document.ContentStart, document.ContentEnd ).Text = text;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
deleted file mode 100644
index aaca7b13..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Text;
-using System.Windows;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Formats the RichTextBox text as RTF
-  /// </summary>
-  public class RtfFormatter : ITextFormatter
-  {
-    public string GetText( FlowDocument document )
-    {
-      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
-      using( MemoryStream ms = new MemoryStream() )
-      {
-        tr.Save( ms, DataFormats.Rtf );
-        return ASCIIEncoding.Default.GetString( ms.ToArray() );
-      }
-    }
-
-    public void SetText( FlowDocument document, string text )
-    {
-      try
-      {
-        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
-        //to the TextRange.Load method an exception would occur.
-        if( String.IsNullOrEmpty( text ) )
-        {
-          document.Blocks.Clear();
-        }
-        else
-        {
-          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
-          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
-          {
-            tr.Load( ms, DataFormats.Rtf );
-          }
-        }
-      }
-      catch
-      {
-        throw new InvalidDataException( "Data provided is not in the correct RTF format." );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
deleted file mode 100644
index 30ed667a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Text;
-using System.Windows;
-using System.Windows.Documents;
-
-namespace Xceed.Wpf.Toolkit
-{
-  /// <summary>
-  /// Formats the RichTextBox text as Xaml
-  /// </summary>
-  public class XamlFormatter : ITextFormatter
-  {
-    public string GetText( System.Windows.Documents.FlowDocument document )
-    {
-      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
-      using( MemoryStream ms = new MemoryStream() )
-      {
-        tr.Save( ms, DataFormats.Xaml );
-        return ASCIIEncoding.Default.GetString( ms.ToArray() );
-      }
-    }
-
-    public void SetText( System.Windows.Documents.FlowDocument document, string text )
-    {
-      try
-      {
-        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
-        //to the TextRange.Load method an exception would occur.
-        if( String.IsNullOrEmpty( text ) )
-        {
-          document.Blocks.Clear();
-        }
-        else
-        {
-          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
-          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
-          {
-            tr.Load( ms, DataFormats.Xaml );
-          }
-        }
-      }
-      catch
-      {
-        throw new InvalidDataException( "Data provided is not in the correct Xaml format." );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
deleted file mode 100644
index 7bd70583..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows.Threading;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class RichTextBox : System.Windows.Controls.RichTextBox
-  {
-    #region Private Members
-
-    private bool _preventDocumentUpdate;
-    private bool _preventTextUpdate;
-
-    #endregion //Private Members
-
-    #region Constructors
-
-    public RichTextBox()
-    {
-    }
-
-    public RichTextBox( System.Windows.Documents.FlowDocument document )
-      : base( document )
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region Text
-
-    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( RichTextBox ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged, CoerceTextProperty, true, UpdateSourceTrigger.LostFocus ) );
-    public string Text
-    {
-      get
-      {
-        return ( string )GetValue( TextProperty );
-      }
-      set
-      {
-        SetValue( TextProperty, value );
-      }
-    }
-
-    private static void OnTextPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( RichTextBox )d ).UpdateDocumentFromText();
-    }
-
-    private static object CoerceTextProperty( DependencyObject d, object value )
-    {
-      return value ?? "";
-    }
-
-    #endregion //Text
-
-    #region TextFormatter
-
-    public static readonly DependencyProperty TextFormatterProperty = DependencyProperty.Register( "TextFormatter", typeof( ITextFormatter ), typeof( RichTextBox ), new FrameworkPropertyMetadata( new RtfFormatter(), OnTextFormatterPropertyChanged ) );
-    public ITextFormatter TextFormatter
-    {
-      get
-      {
-        return ( ITextFormatter )GetValue( TextFormatterProperty );
-      }
-      set
-      {
-        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
-
-    #region Methods
-
-    protected override void OnTextChanged( System.Windows.Controls.TextChangedEventArgs e )
-    {
-      base.OnTextChanged( e );
-      this.UpdateTextFromDocument();
-    }
-
-    private void UpdateTextFromDocument()
-    {
-      if( _preventTextUpdate )
-        return;
-
-      _preventDocumentUpdate = true;
-#if VS2008
-      Text = this.TextFormatter.GetText( this.Document );
-#else
-      this.SetCurrentValue( RichTextBox.TextProperty, this.TextFormatter.GetText( this.Document ) );
-#endif
-      _preventDocumentUpdate = false;
-    }
-
-    private void UpdateDocumentFromText()
-    {
-      if( _preventDocumentUpdate )
-        return;
-
-      _preventTextUpdate = true;
-      this.TextFormatter.SetText( this.Document, Text );
-      _preventTextUpdate = false;
-    }
-
-    /// <summary>
-    /// Clears the content of the RichTextBox.
-    /// </summary>
-    public void Clear()
-    {
-      this.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 ) )
-      {
-        this.UpdateDocumentFromText();
-      }
-      else
-      {
-        this.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
deleted file mode 100644
index e8852f65..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public interface IRichTextBoxFormatBar
-  {
-    /// <summary>
-    /// Represents the RichTextBox that will be the target for all text manipulations in the format bar.
-    /// </summary>
-    System.Windows.Controls.RichTextBox Target
-    {
-      get;
-      set;
-    }
-
-    /// <summary>
-    /// Represents the property that will be used to know if the formatBar should fade when mouse goes away.
-    /// </summary>
-    bool PreventDisplayFadeOut
-    {
-      get;
-    }
-
-    /// <summary>
-    /// Represents the Method that will be used to update the format bar values based on the Selection.
-    /// </summary>
-    void Update();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png
deleted file mode 100644
index 8fb36a1a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bold16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png
deleted file mode 100644
index 73e7c15e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Bullets16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png
deleted file mode 100644
index 1030a021..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/CenterAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png
deleted file mode 100644
index d9207308..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/FontColorPicker16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png
deleted file mode 100644
index 8259a9e1..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Italic16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png
deleted file mode 100644
index c5499bce..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/JustifyAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png
deleted file mode 100644
index 51dffb73..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/LeftAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png
deleted file mode 100644
index 03f6fde2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Numbering16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png
deleted file mode 100644
index cb8e400a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/RightAlign16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png
deleted file mode 100644
index 4a3783f2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png
deleted file mode 100644
index 72689482..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Images/Underline16.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
deleted file mode 100644
index 53b19dfa..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
+++ /dev/null
@@ -1,474 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Linq;
-using System.Windows.Controls;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Media;
-using System.Windows.Documents;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class RichTextBoxFormatBar : Control, IRichTextBoxFormatBar
-  {
-    #region Members
-    private ComboBox _cmbFontFamilies;
-    private ComboBox _cmbFontSizes;
-    private ColorPicker _cmbFontBackgroundColor;
-    private ColorPicker _cmbFontColor;
-
-    private ToggleButton _btnNumbers;
-    private ToggleButton _btnBullets;
-    private ToggleButton _btnBold;
-    private ToggleButton _btnItalic;
-    private ToggleButton _btnUnderline;
-    private ToggleButton _btnAlignLeft;
-    private ToggleButton _btnAlignCenter;
-    private ToggleButton _btnAlignRight;
-
-    private Thumb _dragWidget;
-    private bool _waitingForMouseOver;
-    #endregion
-
-    #region Properties
-
-    public static double[] FontSizes
-    {
-      get
-      {
-        return new double[] { 
-		            3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 
-		            10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0,
-		            16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0,
-		            32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0,
-		            80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0
-		            };
-      }
-    }
-
-    #endregion
-
-    #region Constructors
-
-    static RichTextBoxFormatBar()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( RichTextBoxFormatBar ), new FrameworkPropertyMetadata( typeof( RichTextBoxFormatBar ) ) );
-    }
-
-    public RichTextBoxFormatBar()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-
-
-
-    #endregion
-
-    #region Event Hanlders
-
-    private void FontFamily_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count == 0 )
-        return;
-
-      FontFamily editValue = ( FontFamily )e.AddedItems[ 0 ];
-      ApplyPropertyValueToSelectedText( TextElement.FontFamilyProperty, editValue );
-      _waitingForMouseOver = true;
-    }
-
-    private void FontSize_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count == 0 )
-        return;
-
-      ApplyPropertyValueToSelectedText( TextElement.FontSizeProperty, e.AddedItems[ 0 ] );
-      _waitingForMouseOver = true;
-    }
-
-    void FontColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color?> e )
-    {
-      Color? selectedColor = ( Color? )e.NewValue;
-      ApplyPropertyValueToSelectedText( TextElement.ForegroundProperty, selectedColor.HasValue ? new SolidColorBrush( selectedColor.Value ) : null );
-      _waitingForMouseOver = true;
-    }
-
-    private void FontBackgroundColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color?> e )
-    {
-      Color? selectedColor = ( Color? )e.NewValue;
-      ApplyPropertyValueToSelectedText( TextElement.BackgroundProperty, selectedColor.HasValue ? new SolidColorBrush( selectedColor.Value ) : null );
-      _waitingForMouseOver = true;
-    }
-
-    private void Bullets_Clicked( object sender, RoutedEventArgs e )
-    {
-      if( BothSelectionListsAreChecked() && ( _btnNumbers != null) )
-      {
-        _btnNumbers.IsChecked = false;
-      }
-    }
-
-    private void Numbers_Clicked( object sender, RoutedEventArgs e )
-    {
-      if( BothSelectionListsAreChecked() && ( _btnBullets != null) )
-      {
-        _btnBullets.IsChecked = false;
-      }
-    }
-
-    private void DragWidget_DragDelta( object sender, DragDeltaEventArgs e )
-    {
-      ProcessMove( e );
-    }
-
-    protected override void OnMouseEnter( System.Windows.Input.MouseEventArgs e )
-    {
-      base.OnMouseEnter( e );
-      _waitingForMouseOver = false;
-    }
-
-    #endregion //Event Hanlders
-
-    #region Methods
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( _dragWidget != null )
-      {
-        _dragWidget.DragDelta -= new DragDeltaEventHandler( DragWidget_DragDelta );
-      }
-
-      if( _cmbFontFamilies != null )
-      {
-        _cmbFontFamilies.SelectionChanged -= new SelectionChangedEventHandler( FontFamily_SelectionChanged );
-      }
-
-      if( _cmbFontSizes != null )
-      {
-        _cmbFontSizes.SelectionChanged -= new SelectionChangedEventHandler( FontSize_SelectionChanged );
-      }
-
-      if( _btnBullets != null )
-      {
-        _btnBullets.Click -= new RoutedEventHandler( Bullets_Clicked );
-      }
-
-      if( _btnNumbers != null )
-      {
-        _btnNumbers.Click -= new RoutedEventHandler( Numbers_Clicked );
-      }
-
-      if( _cmbFontBackgroundColor != null )
-      {
-        _cmbFontBackgroundColor.SelectedColorChanged -= new RoutedPropertyChangedEventHandler<Color?>( FontBackgroundColor_SelectedColorChanged );
-      }
-
-      if( _cmbFontColor != null )
-      {
-        _cmbFontColor.SelectedColorChanged -= new RoutedPropertyChangedEventHandler<Color?>( FontColor_SelectedColorChanged );
-      }
-
-      this.GetTemplateComponent( ref _cmbFontFamilies, "_cmbFontFamilies" );
-      this.GetTemplateComponent( ref _cmbFontSizes, "_cmbFontSizes" );
-      this.GetTemplateComponent( ref _cmbFontBackgroundColor, "_cmbFontBackgroundColor" );
-      this.GetTemplateComponent( ref _cmbFontColor, "_cmbFontColor" );
-      this.GetTemplateComponent( ref _btnNumbers, "_btnNumbers" );
-      this.GetTemplateComponent( ref _btnBullets, "_btnBullets" );
-      this.GetTemplateComponent( ref _btnBold, "_btnBold" );
-      this.GetTemplateComponent( ref _btnItalic, "_btnItalic" );
-      this.GetTemplateComponent( ref _btnUnderline, "_btnUnderline" );
-      this.GetTemplateComponent( ref _btnAlignLeft, "_btnAlignLeft" );
-      this.GetTemplateComponent( ref _btnAlignCenter, "_btnAlignCenter" );
-      this.GetTemplateComponent( ref _btnAlignRight, "_btnAlignRight" );
-      this.GetTemplateComponent( ref _dragWidget, "_dragWidget" );
-
-      if( _dragWidget != null )
-      {
-        _dragWidget.DragDelta += new DragDeltaEventHandler( DragWidget_DragDelta );
-      }
-
-      if( _cmbFontFamilies != null )
-      {
-        _cmbFontFamilies.ItemsSource = FontUtilities.Families.OrderBy( fontFamily => fontFamily.Source );
-        _cmbFontFamilies.SelectionChanged += new SelectionChangedEventHandler( FontFamily_SelectionChanged );
-      }
-
-      if( _cmbFontSizes != null )
-      {
-        _cmbFontSizes.ItemsSource = FontSizes;
-        _cmbFontSizes.SelectionChanged += new SelectionChangedEventHandler( FontSize_SelectionChanged );
-      }
-
-      if( _btnBullets != null )
-      {
-        _btnBullets.Click += new RoutedEventHandler( Bullets_Clicked );
-      }
-
-      if( _btnNumbers != null )
-      {
-        _btnNumbers.Click += new RoutedEventHandler( Numbers_Clicked );
-      }
-
-      if( _cmbFontBackgroundColor != null )
-      {
-        _cmbFontBackgroundColor.SelectedColorChanged += new RoutedPropertyChangedEventHandler<Color?>( FontBackgroundColor_SelectedColorChanged );
-      }
-
-      if( _cmbFontColor != null )
-      {
-        _cmbFontColor.SelectedColorChanged += new RoutedPropertyChangedEventHandler<Color?>( FontColor_SelectedColorChanged );
-      }
-
-      // Update the ComboBoxes when changing themes.
-      this.Update();
-    }
-
-    private void GetTemplateComponent<T>( ref T partMember, string partName ) where T : class
-    {
-      partMember = ( this.Template != null )
-        ? this.Template.FindName( partName, this ) as T
-        : null;
-    }
-
-    private void UpdateToggleButtonState()
-    {
-      UpdateItemCheckedState( _btnBold, TextElement.FontWeightProperty, FontWeights.Bold );
-      UpdateItemCheckedState( _btnItalic, TextElement.FontStyleProperty, FontStyles.Italic );
-      UpdateItemCheckedState( _btnUnderline, Inline.TextDecorationsProperty, TextDecorations.Underline );
-
-      UpdateItemCheckedState( _btnAlignLeft, Paragraph.TextAlignmentProperty, TextAlignment.Left );
-      UpdateItemCheckedState( _btnAlignCenter, Paragraph.TextAlignmentProperty, TextAlignment.Center );
-      UpdateItemCheckedState( _btnAlignRight, Paragraph.TextAlignmentProperty, TextAlignment.Right );
-    }
-
-    void UpdateItemCheckedState( ToggleButton button, DependencyProperty formattingProperty, object expectedValue )
-    {
-      object currentValue = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        currentValue = Target.Selection.GetPropertyValue( formattingProperty );
-      }
-
-      if( currentValue == DependencyProperty.UnsetValue )
-        return;
-
-      if( button != null )
-      {
-        button.IsChecked = ( currentValue == null )
-                            ? false
-                            : currentValue != null && currentValue.Equals( expectedValue );
-      }
-    }
-
-    private void UpdateSelectedFontFamily()
-    {
-      object value = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
-      }
-
-      if( value == DependencyProperty.UnsetValue )
-        return;
-
-      FontFamily currentFontFamily = ( FontFamily )value;
-      if( (currentFontFamily != null) && ( _cmbFontFamilies != null) )
-      {
-        _cmbFontFamilies.SelectedItem = currentFontFamily;
-      }
-    }
-
-    private void UpdateSelectedFontSize()
-    {
-      object value = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
-      }
-
-      if( value == DependencyProperty.UnsetValue )
-        return;
-
-      if( _cmbFontSizes != null )
-      {
-        _cmbFontSizes.SelectedValue = value;
-      }
-    }
-
-    private void UpdateFontColor()
-    {
-      object value = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
-      }
-
-      if( value == DependencyProperty.UnsetValue )
-        return;
-
-      Color? currentColor =  ( ( value == null )
-                              ? null
-                              : ( Color? )( ( SolidColorBrush )value ).Color );
-      if( _cmbFontColor != null )
-      {
-        _cmbFontColor.SelectedColor = currentColor;
-      }
-    }
-
-    private void UpdateFontBackgroundColor()
-    {
-      object value = DependencyProperty.UnsetValue;
-      if( ( Target != null ) && ( Target.Selection != null ) )
-      {
-        value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
-      }
-
-      if( value == DependencyProperty.UnsetValue )
-        return;
-
-      Color? currentColor = ( ( value == null )
-                              ? null
-                              : ( Color? )( ( SolidColorBrush )value ).Color );
-      if( _cmbFontBackgroundColor != null )
-      {
-        _cmbFontBackgroundColor.SelectedColor = currentColor;
-      }
-    }
-
-    /// <summary>
-    /// Updates the visual state of the List styles, such as Numbers and Bullets.
-    /// </summary>
-    private void UpdateSelectionListType()
-    {
-      if( (_btnNumbers == null) || ( _btnBullets == null) )
-        return;
-
-      //uncheck both
-      _btnBullets.IsChecked = false;
-      _btnNumbers.IsChecked = false;
-
-      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;
-        if( markerStyle == TextMarkerStyle.Disc ) //bullets
-        {
-          _btnBullets.IsChecked = true;
-        }
-        else if( markerStyle == TextMarkerStyle.Decimal ) //numbers
-        {
-          _btnNumbers.IsChecked = true;
-        }
-      }
-    }
-
-    /// <summary>
-    /// Checks to see if both selection lists are checked. (Bullets and Numbers)
-    /// </summary>
-    /// <returns></returns>
-    private bool BothSelectionListsAreChecked()
-    {
-      return (( _btnBullets != null) && (_btnBullets.IsChecked == true) )
-          && (( _btnNumbers != null) && (_btnNumbers.IsChecked == true));
-    }
-
-    void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value )
-    {
-      if( ( Target == null ) || ( Target.Selection == null ) )
-        return;
-
-      SolidColorBrush solidColorBrush = value as SolidColorBrush;
-      if( ( solidColorBrush != null ) && solidColorBrush.Color.Equals( Colors.Transparent ) )
-      {
-        Target.Selection.ApplyPropertyValue( formattingProperty, null );
-      }
-      else
-      {
-        Target.Selection.ApplyPropertyValue( formattingProperty, value );
-      }
-    }
-
-    private void ProcessMove( DragDeltaEventArgs e )
-    {
-      AdornerLayer layer = AdornerLayer.GetAdornerLayer( Target );
-      UIElementAdorner<Control> adorner = layer.GetAdorners( Target ).OfType<UIElementAdorner<Control>>().First();
-      adorner.SetOffsets( adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange );
-    }
-
-    #endregion //Methods
-
-    #region IRichTextBoxFormatBar Interface
-
-    #region Target
-
-    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( global::System.Windows.Controls.RichTextBox ), typeof( RichTextBoxFormatBar ), new PropertyMetadata( null, OnRichTextBoxPropertyChanged ) );
-    public global::System.Windows.Controls.RichTextBox Target
-    {
-      get
-      {
-        return ( global::System.Windows.Controls.RichTextBox )GetValue( TargetProperty );
-      }
-      set
-      {
-        SetValue( TargetProperty, value );
-      }
-    }
-
-    private static void OnRichTextBoxPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RichTextBoxFormatBar formatBar = d as RichTextBoxFormatBar;
-    }
-
-    #endregion //Target
-
-    public bool PreventDisplayFadeOut
-    {
-      get
-      {
-        return ( (( _cmbFontFamilies != null) && _cmbFontFamilies.IsDropDownOpen)
-              || (( _cmbFontSizes != null) && _cmbFontSizes.IsDropDownOpen)
-              ||  (( _cmbFontBackgroundColor != null) && _cmbFontBackgroundColor.IsOpen)
-              || (( _cmbFontColor != null) && _cmbFontColor.IsOpen)
-              || _waitingForMouseOver );
-      }
-    }
-
-    public void Update()
-    {
-      UpdateToggleButtonState();
-      UpdateSelectedFontFamily();
-      UpdateSelectedFontSize();
-      UpdateFontColor();
-      UpdateFontBackgroundColor();
-      UpdateSelectionListType();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
deleted file mode 100644
index 1b3c53d9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Controls;
-using System.Windows.Documents;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class RichTextBoxFormatBarManager : DependencyObject
-  {
-    #region Members
-
-    private global::System.Windows.Controls.RichTextBox _richTextBox;
-    private UIElementAdorner<Control> _adorner;
-    private IRichTextBoxFormatBar _toolbar;
-    private Window _parentWindow;
-
-    private const double _hideAdornerDistance = 150d;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region FormatBar
-
-    public static readonly DependencyProperty FormatBarProperty = DependencyProperty.RegisterAttached( "FormatBar", typeof( IRichTextBoxFormatBar ), typeof( RichTextBox ), new PropertyMetadata( null, OnFormatBarPropertyChanged ) );
-    public static void SetFormatBar( UIElement element, IRichTextBoxFormatBar value )
-    {
-      element.SetValue( FormatBarProperty, value );
-    }
-    public static IRichTextBoxFormatBar GetFormatBar( UIElement element )
-    {
-      return ( IRichTextBoxFormatBar )element.GetValue( FormatBarProperty );
-    }
-
-    private static void OnFormatBarPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      global::System.Windows.Controls.RichTextBox rtb = d as global::System.Windows.Controls.RichTextBox;
-      if( rtb == null )
-        throw new Exception( "A FormatBar can only be applied to a RichTextBox." );
-
-      RichTextBoxFormatBarManager manager = new RichTextBoxFormatBarManager();
-      manager.AttachFormatBarToRichtextBox( rtb, e.NewValue as IRichTextBoxFormatBar );
-    }
-
-    #endregion //FormatBar
-
-    public bool IsAdornerVisible
-    {
-      get
-      {
-        return _adorner.Visibility == Visibility.Visible;
-      }
-    }
-
-    #endregion //Properties
-
-    #region Event Handlers
-
-    void RichTextBox_MouseButtonUp( object sender, MouseButtonEventArgs e )
-    {
-      if( e.ChangedButton == MouseButton.Left && e.LeftButton == MouseButtonState.Released )
-      {
-        if( !_richTextBox.IsReadOnly )
-        {
-          TextRange selectedText = new TextRange( _richTextBox.Selection.Start, _richTextBox.Selection.End );
-#if !VS2008
-          if( selectedText.Text.Length > 0 && !String.IsNullOrWhiteSpace( selectedText.Text ) )
-            ShowAdorner();
-#else
-          if( selectedText.Text.Length > 0 && !String.IsNullOrEmpty( selectedText.Text ) )
-            ShowAdorner();
-#endif
-          else
-            HideAdorner();
-
-          e.Handled = true;
-        }
-      }
-      else
-        HideAdorner();
-    }
-
-    private void OnPreviewMouseMoveParentWindow( object sender, MouseEventArgs e )
-    {
-      Point p = e.GetPosition( _adorner );
-      double maxDist = 0d;
-      bool preventDisplayFadeOut = ( ( _adorner.Child != null ) && ( _adorner.Child is IRichTextBoxFormatBar ) ) ?
-                                  ( ( IRichTextBoxFormatBar )_adorner.Child ).PreventDisplayFadeOut :
-                                  false;
-
-      //Mouse is inside FormatBar: Nothing to do.
-      if( preventDisplayFadeOut ||
-        ( p.X >= 0 ) && ( p.X <= _adorner.ActualWidth ) && ( p.Y >= 0 ) && ( p.Y <= _adorner.ActualHeight ) )
-      {
-        return;
-      }
-      //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.
-      else
-      {
-        if( p.X < 0 )
-          maxDist = -p.X;
-        else if( p.X > _adorner.ActualWidth )
-          maxDist = p.X - _adorner.ActualWidth;
-
-        if( p.Y < 0 )
-          maxDist = Math.Max( maxDist, -p.Y );
-        else if( p.Y > _adorner.ActualHeight )
-          maxDist = Math.Max( maxDist, p.Y - _adorner.ActualHeight );
-
-        _adorner.Opacity = 1d - ( Math.Min( maxDist, 100d ) / 100d );
-      }
-    }
-
-    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,
-      //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();
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    /// <summary>
-    /// Attaches a FormatBar to a RichtextBox
-    /// </summary>
-    /// <param name="richTextBox">The RichtextBox to attach to.</param>
-    /// <param name="formatBar">The Formatbar to attach.</param>
-    private void AttachFormatBarToRichtextBox( global::System.Windows.Controls.RichTextBox richTextBox, IRichTextBoxFormatBar formatBar )
-    {
-      _richTextBox = richTextBox;
-      //we cannot use the PreviewMouseLeftButtonUp event because of selection bugs.
-      //we cannot use the MouseLeftButtonUp event because it is handled by the RichTextBox and does not bubble up to here, so we must
-      //add a hander to the MouseUpEvent using the Addhandler syntax, and specify to listen for handled events too.
-      _richTextBox.AddHandler( Mouse.MouseUpEvent, new MouseButtonEventHandler( RichTextBox_MouseButtonUp ), true );
-      _richTextBox.TextChanged += RichTextBox_TextChanged;
-
-      _adorner = new UIElementAdorner<Control>( _richTextBox );
-
-      formatBar.Target = _richTextBox;
-      _toolbar = formatBar;
-    }
-
-    /// <summary>
-    /// Shows the FormatBar
-    /// </summary>
-    void ShowAdorner()
-    {
-      if( _adorner.Visibility == Visibility.Visible )
-        return;
-
-      VerifyAdornerLayer();
-
-      Control adorningEditor = _toolbar as Control;
-
-      if( _adorner.Child == null )
-        _adorner.Child = adorningEditor;
-
-      adorningEditor.ApplyTemplate();
-      _toolbar.Update();
-
-      _adorner.Visibility = Visibility.Visible;
-
-      PositionFormatBar( adorningEditor );
-
-      _parentWindow = TreeHelper.FindParent<Window>( _adorner );
-      if( _parentWindow != null )
-      {
-        Mouse.AddMouseMoveHandler( _parentWindow, OnPreviewMouseMoveParentWindow );
-      }
-    }
-
-    /// <summary>
-    /// Positions the FormatBar so that is does not go outside the bounds of the RichTextBox or covers the selected text
-    /// </summary>
-    /// <param name="adorningEditor"></param>
-    private void PositionFormatBar( Control adorningEditor )
-    {
-      Point mousePosition = Mouse.GetPosition( _richTextBox );
-
-      var left = mousePosition.X;
-      var top = mousePosition.Y;
-
-      // Top boundary
-      if( top < 0 )
-      {
-        top = 5d;
-      }
-
-      // Left boundary
-      if( left < 0 )
-      {
-        left = 5d;
-      }
-
-      // Right boundary
-      if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 10d )
-      {
-        left = _richTextBox.ActualWidth - adorningEditor.ActualWidth - 10d;
-      }
-
-      // Bottom boundary
-      if( top + adorningEditor.ActualHeight > _richTextBox.ActualHeight - 10d )
-      {
-        top = _richTextBox.ActualHeight - adorningEditor.ActualHeight - 10d;
-      }
-
-      _adorner.SetOffsets( left, top );
-    }
-
-    /// <summary>
-    /// Ensures that the IRichTextFormatBar is in the adorner layer.
-    /// </summary>
-    /// <returns>True if the IRichTextFormatBar is in the adorner layer, else false.</returns>
-    bool VerifyAdornerLayer()
-    {
-      if( _adorner.Parent != null )
-        return true;
-
-      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _richTextBox );
-      if( layer == null )
-        return false;
-
-      layer.Add( _adorner );
-      return true;
-    }
-
-    /// <summary>
-    /// Hides the IRichTextFormatBar that is in the adornor layer.
-    /// </summary>
-    void HideAdorner()
-    {
-      if( IsAdornerVisible )
-      {
-        _adorner.Visibility = Visibility.Collapsed;
-        //_adorner.Child = null;
-        if( _parentWindow != null )
-        {
-          Mouse.RemoveMouseMoveHandler( _parentWindow, OnPreviewMouseMoveParentWindow );
-        }
-      }
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 8a6a8f75..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,751 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-  <ControlTemplate x:Key="ThumbControlTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Border Background="Transparent"
-            Cursor="Hand"
-            ToolTip="Click to Drag">
-      <StackPanel VerticalAlignment="Center"
-                  Width="75">
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-      </StackPanel>
-    </Border>
-  </ControlTemplate>
-
-  <SolidColorBrush x:Key="MouseOverBorderBrush"
-                   Color="#FFFFB700" />
-  <LinearGradientBrush x:Key="MouseOverBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFEFBF4" />
-    <GradientStop Offset="0.19"
-                  Color="#FFFDE7CE" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFDDEB8" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFCE6B" />
-    <GradientStop Offset="0.79"
-                  Color="#FFFFDE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFFFEBAA" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="CheckedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="CheckedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFFDCA0" />
-    <GradientStop Offset="0.18"
-                  Color="#FFFFD692" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFC45D" />
-    <GradientStop Offset="1"
-                  Color="#FFFFD178" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="PressedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="PressedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFE3C085" />
-    <GradientStop Offset="0.19"
-                  Color="#FFF4CC89" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5C777" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5BB56" />
-    <GradientStop Offset="0.79"
-                  Color="#FFF4CE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFF3E28D" />
-  </LinearGradientBrush>
-
-  <Style x:Key="FormatBarToggleButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <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 ToggleButton}">
-          <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="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </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="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="FontColorButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <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 ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    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}">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid>
-                    <Image Source="../Images/FontColorPicker16.png"
-                           Width="16"
-                           Height="16">
-                    </Image>
-                    <Rectangle Grid.Row="1"
-                               Height="4"
-                               Margin="0,12,0,0"
-                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                  </Grid>
-
-                  <Path Grid.Column="1"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="FontBackgrounColorButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <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 ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    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}">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid>
-                    <Image Source="../Images/TextHighlightColorPicker16.png"
-                           Width="16"
-                           Height="16">
-                    </Image>
-                    <Rectangle Grid.Row="1"
-                               Height="4"
-                               Margin="0,12,0,0"
-                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                  </Grid>
-
-                  <Path Grid.Column="1"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- =================================================================== -->
-  <!-- Template                                                            -->
-  <!-- =================================================================== -->
-  <ControlTemplate x:Key="richTextBoxFormatBarTemplate"
-                   TargetType="{x:Type local:RichTextBoxFormatBar}">
-    <ControlTemplate.Resources>
-      <Style TargetType="{x:Type Separator}"
-             BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-    </ControlTemplate.Resources>
-    <Border CornerRadius="0"
-            BorderThickness="1"
-            BorderBrush="#FFADC7DE"
-            Background="#FFDAE8F9">
-      <Grid Margin="5,0,5,5">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Thumb x:Name="_dragWidget"
-               Height="10"
-               Template="{StaticResource ThumbControlTemplate}">
-        </Thumb>
-
-        <StackPanel Grid.Row="1">
-          <StackPanel Orientation="Horizontal">
-            <ComboBox x:Name="_cmbFontFamilies"
-                      IsEditable="True"
-                      Width="100"
-                      ToolTip="Font Family">
-            </ComboBox>
-
-            <ComboBox x:Name="_cmbFontSizes"
-                      IsEditable="True"
-                      Width="43"
-                      ToolTip="Font Size">
-            </ComboBox>
-
-            <Separator >
-            </Separator>
-
-            <ToggleButton x:Name="_btnBullets"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleBullets"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Bullets">
-              <Image Source="../Images/Bullets16.png">
-              </Image>
-            </ToggleButton>
-
-            <ToggleButton x:Name="_btnNumbers"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleNumbering"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Numbering">
-              <Image Source="../Images/Numbering16.png">
-              </Image>
-            </ToggleButton>
-
-          </StackPanel>
-
-          <StackPanel Orientation="Horizontal"
-                      Margin="0,3,0,0">
-            <ToggleButton x:Name="_btnBold"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleBold"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Bold">
-              <Image Source="../Images/Bold16.png" >
-              </Image>
-            </ToggleButton>
-            <ToggleButton x:Name="_btnItalic"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="{x:Static EditingCommands.ToggleItalic}"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Italic">
-              <Image Source="../Images/Italic16.png" >
-              </Image>
-            </ToggleButton>
-            <ToggleButton x:Name="_btnUnderline"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="{x:Static EditingCommands.ToggleUnderline}"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Underline">
-              <Image Source="../Images/Underline16.png" >
-              </Image>
-            </ToggleButton>
-
-            <Separator>
-            </Separator>
-
-            <RadioButton x:Name="_btnAlignLeft"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignLeft}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Left">
-              <Image Source="../Images/LeftAlign16.png">
-              </Image>
-            </RadioButton>
-            <RadioButton x:Name="_btnAlignCenter"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignCenter}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Center">
-              <Image Source="../Images/CenterAlign16.png">
-              </Image>
-            </RadioButton>
-            <RadioButton x:Name="_btnAlignRight"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignRight}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Right">
-              <Image Source="../Images/RightAlign16.png">
-              </Image>
-            </RadioButton>
-
-            <Separator>
-            </Separator>
-
-            <local:ColorPicker x:Name="_cmbFontBackgroundColor"
-                               BorderThickness="0"
-                               ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                               ToolTip="Text Highlight Color">
-            </local:ColorPicker>
-
-            <local:ColorPicker x:Name="_cmbFontColor"
-                               BorderThickness="0"
-                               ButtonStyle="{StaticResource FontColorButtonStyle}"
-                               ToolTip="Font Color">
-            </local:ColorPicker>
-
-          </StackPanel>
-
-        </StackPanel>
-      </Grid>
-    </Border>
-  </ControlTemplate>
-
-  <!-- =================================================================== -->
-  <!-- Style                                                               -->
-  <!-- =================================================================== -->
-  <Style TargetType="{x:Type local:RichTextBoxFormatBar}">
-    <Setter Property="IsTabStop"
-            Value="false" />
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="Template"
-            Value="{StaticResource richTextBoxFormatBarTemplate}" />
-    <Setter Property="Effect">
-      <Setter.Value>
-        <DropShadowEffect BlurRadius="5"
-                          Opacity=".25" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
deleted file mode 100644
index 1457bb50..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
+++ /dev/null
@@ -1,750 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-  <ControlTemplate x:Key="ThumbControlTemplate"
-                   TargetType="{x:Type Thumb}">
-    <Border Background="Transparent"
-            Cursor="Hand"
-            ToolTip="Click to Drag">
-      <StackPanel VerticalAlignment="Center"
-                  Width="75">
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-        <Line SnapsToDevicePixels="True"
-              Stretch="Fill"
-              StrokeDashArray="1,2"
-              StrokeThickness="1"
-              X1="0"
-              X2="1"
-              Margin=".5">
-          <Line.Stroke>
-            <SolidColorBrush Color="Gray" />
-          </Line.Stroke>
-        </Line>
-      </StackPanel>
-    </Border>
-  </ControlTemplate>
-
-  <SolidColorBrush x:Key="MouseOverBorderBrush"
-                   Color="#FFFFB700" />
-  <LinearGradientBrush x:Key="MouseOverBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFEFBF4" />
-    <GradientStop Offset="0.19"
-                  Color="#FFFDE7CE" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFDDEB8" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFCE6B" />
-    <GradientStop Offset="0.79"
-                  Color="#FFFFDE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFFFEBAA" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="CheckedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="CheckedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFFFDCA0" />
-    <GradientStop Offset="0.18"
-                  Color="#FFFFD692" />
-    <GradientStop Offset="0.39"
-                  Color="#FFFFC45D" />
-    <GradientStop Offset="1"
-                  Color="#FFFFD178" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="PressedBorderBrush"
-                   Color="#FFC29B29" />
-  <LinearGradientBrush x:Key="PressedBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <GradientStop Offset="0"
-                  Color="#FFE3C085" />
-    <GradientStop Offset="0.19"
-                  Color="#FFF4CC89" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5C777" />
-    <GradientStop Offset="0.36"
-                  Color="#FFF5BB56" />
-    <GradientStop Offset="0.79"
-                  Color="#FFF4CE9A" />
-    <GradientStop Offset="1"
-                  Color="#FFF3E28D" />
-  </LinearGradientBrush>
-
-  <Style x:Key="FormatBarToggleButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <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 ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    CornerRadius="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      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="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </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="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="FontColorButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <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 ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      Padding="{TemplateBinding Padding}">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid>
-                    <Image Source="../Images/FontColorPicker16.png"
-                           Width="16"
-                           Height="16" >
-                    </Image>
-                    <Rectangle Grid.Row="1"
-                               Height="4"
-                               Margin="0,12,0,0"
-                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                  </Grid>
-
-                  <Path Grid.Column="1"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="FontBackgrounColorButtonStyle"
-         TargetType="{x:Type ToggleButton}">
-    <Setter Property="Background"
-            Value="White" />
-    <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 ToggleButton}">
-          <Grid SnapsToDevicePixels="True">
-            <Border x:Name="OuterBorder"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    CornerRadius="2" />
-            <Border x:Name="MiddleBorder"
-                    BorderBrush="Transparent"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="Transparent"
-                    CornerRadius="2">
-              <Border x:Name="InnerBorder"
-                      BorderBrush="Transparent"
-                      BorderThickness="{TemplateBinding BorderThickness}"
-                      Background="Transparent"
-                      CornerRadius="2"
-                      Padding="{TemplateBinding Padding}">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-
-                  <Grid>
-                    <Image Source="../Images/TextHighlightColorPicker16.png"
-                           Width="16"
-                           Height="16" >
-                    </Image>
-                    <Rectangle Grid.Row="1"
-                               Height="4"
-                               Margin="0,12,0,0"
-                               Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                  </Grid>
-
-                  <Path Grid.Column="1"
-                        Width="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Border>
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource MouseOverBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="#80FFFFFF" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="TextElement.Foreground"
-                      TargetName="OuterBorder"
-                      Value="#FF9E9E9E" />
-            </Trigger>
-
-            <Trigger Property="IsChecked"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource CheckedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#FFE7CBAD"
-                                  Offset="0" />
-                    <GradientStop Color="#FFF7D7B5"
-                                  Offset="0.1" />
-                    <GradientStop Color="#FFFFD38C"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFC75A"
-                                  Offset="0.36" />
-                    <GradientStop Color="#FFFFEFA5"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-
-            <Trigger Property="IsPressed"
-                     Value="True">
-              <Setter Property="Background"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBackgroundBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="OuterBorder"
-                      Value="{StaticResource PressedBorderBrush}" />
-              <Setter Property="BorderBrush"
-                      TargetName="InnerBorder"
-                      Value="Transparent" />
-            </Trigger>
-
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked"
-                           Value="True" />
-                <Condition Property="IsMouseOver"
-                           Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background"
-                      TargetName="MiddleBorder">
-                <Setter.Value>
-                  <LinearGradientBrush EndPoint="0,1"
-                                       StartPoint="0,0">
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0" />
-                    <GradientStop Color="#40FFFEFE"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.39" />
-                    <GradientStop Color="#20FFCE68"
-                                  Offset="0.69" />
-                    <GradientStop Color="#10FFFFFF"
-                                  Offset="1" />
-                  </LinearGradientBrush>
-                </Setter.Value>
-              </Setter>
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!-- =================================================================== -->
-  <!-- Template                                                            -->
-  <!-- =================================================================== -->
-  <ControlTemplate x:Key="richTextBoxFormatBarTemplate"
-                   TargetType="{x:Type local:RichTextBoxFormatBar}">
-    <ControlTemplate.Resources>
-      <Style TargetType="{x:Type Separator}"
-             BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
-    </ControlTemplate.Resources>
-    <Border CornerRadius="3"
-            BorderThickness="1"
-            BorderBrush="Gray"
-            Background="WhiteSmoke">
-      <Grid Margin="5,0,5,5">
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <Thumb x:Name="_dragWidget"
-               Height="10"
-               Template="{StaticResource ThumbControlTemplate}" >
-        </Thumb>
-
-        <StackPanel Grid.Row="1">
-          <StackPanel Orientation="Horizontal">
-            <ComboBox x:Name="_cmbFontFamilies"
-                      IsEditable="True"
-                      Width="100"
-                      ToolTip="Font Family" >
-            </ComboBox>
-
-            <ComboBox x:Name="_cmbFontSizes"
-                      IsEditable="True"
-                      Width="43"
-                      ToolTip="Font Size" >
-            </ComboBox>
-
-            <Separator>
-            </Separator>
-
-            <ToggleButton x:Name="_btnBullets"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleBullets"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Bullets">
-              <Image Source="../Images/Bullets16.png" >
-              </Image>
-            </ToggleButton>
-
-            <ToggleButton x:Name="_btnNumbers"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleNumbering"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Numbering">
-              <Image Source="../Images/Numbering16.png" >
-              </Image>
-            </ToggleButton>
-
-          </StackPanel>
-
-          <StackPanel Orientation="Horizontal"
-                      Margin="0,3,0,0">
-            <ToggleButton x:Name="_btnBold"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="EditingCommands.ToggleBold"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Bold">
-              <Image Source="../Images/Bold16.png" >
-              </Image>
-            </ToggleButton>
-            <ToggleButton x:Name="_btnItalic"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="{x:Static EditingCommands.ToggleItalic}"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Italic">
-              <Image Source="../Images/Italic16.png" >
-              </Image>
-            </ToggleButton>
-            <ToggleButton x:Name="_btnUnderline"
-                          Style="{StaticResource FormatBarToggleButtonStyle}"
-                          Command="{x:Static EditingCommands.ToggleUnderline}"
-                          CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                          ToolTip="Underline">
-              <Image Source="../Images/Underline16.png" >
-              </Image>
-            </ToggleButton>
-
-            <Separator>
-            </Separator>
-
-            <RadioButton x:Name="_btnAlignLeft"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignLeft}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Left">
-              <Image Source="../Images/LeftAlign16.png">
-              </Image>
-            </RadioButton>
-            <RadioButton x:Name="_btnAlignCenter"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignCenter}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Center">
-              <Image Source="../Images/CenterAlign16.png" >
-              </Image>
-            </RadioButton>
-            <RadioButton x:Name="_btnAlignRight"
-                         Style="{StaticResource FormatBarToggleButtonStyle}"
-                         Command="{x:Static EditingCommands.AlignRight}"
-                         CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Target}"
-                         ToolTip="Align Right">
-              <Image Source="../Images/RightAlign16.png" >
-              </Image>
-            </RadioButton>
-
-            <Separator>
-            </Separator>
-
-            <local:ColorPicker x:Name="_cmbFontBackgroundColor"
-                               BorderThickness="0"
-                               ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                               ToolTip="Text Highlight Color" >
-            </local:ColorPicker>
-
-            <local:ColorPicker x:Name="_cmbFontColor"
-                               BorderThickness="0"
-                               ButtonStyle="{StaticResource FontColorButtonStyle}"
-                               ToolTip="Font Color" >
-            </local:ColorPicker>
-
-          </StackPanel>
-
-        </StackPanel>
-      </Grid>
-    </Border>
-  </ControlTemplate>
-
-  <!-- =================================================================== -->
-  <!-- Style                                                               -->
-  <!-- =================================================================== -->
-  <Style TargetType="{x:Type local:RichTextBoxFormatBar}">
-    <Setter Property="Template"
-            Value="{StaticResource richTextBoxFormatBarTemplate}" />
-    <Setter Property="Effect">
-      <Setter.Value>
-        <DropShadowEffect BlurRadius="5"
-                          Opacity=".25" />
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background"
-            Value="Transparent" />
-    <Setter Property="IsTabStop"
-            Value="false" />
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
deleted file mode 100644
index 709437b9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_ActionButton, Type = typeof( Button ) )]
-  public class SplitButton : DropDownButton
-  {
-    private const string PART_ActionButton = "PART_ActionButton";
-
-    #region Constructors
-
-    static SplitButton()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( SplitButton ), new FrameworkPropertyMetadata( typeof( SplitButton ) ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-      Button = GetTemplateChild( PART_ActionButton ) as Button;
-    }
-
-
-  #endregion //Base Class Overrides
-  }
-}
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
deleted file mode 100644
index e541166f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,171 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-
-  <!-- =============================================================================== -->
-  <!-- SplitButton                                                                     -->
-  <!-- =============================================================================== -->
-  <conv:ThicknessSideRemovalConverter x:Key="ThicknessSideRemovalConverter" />
-
-  <Style TargetType="{x:Type local:SplitButton}">
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <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="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="DropDownContentBackground"
-            Value="{StaticResource PanelBackgroundBrush}" />
-    <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}"
-                        Style="{x:Null}">
-                  <Button.Template>
-                    <ControlTemplate TargetType="Button">
-                      <ContentPresenter />
-                    </ControlTemplate>
-                  </Button.Template>
-                  <Grid>
-                    <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                         Background="{TemplateBinding Background}"
-                                         Foreground="{TemplateBinding Foreground}"
-                                         BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSideRemovalConverter}, ConverterParameter=2}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         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}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         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="9"
-                              Height="5"
-                              Data="{StaticResource DownArrowGeometry}"
-                              Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                              Margin="0,1,0,0" />
-                      </Grid>
-                    </chrome:ButtonChrome>
-                  </Grid>
-                </ToggleButton>
-              </Grid>
-            </chrome:ButtonChrome>
-
-            <Popup x:Name="PART_Popup"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   Placement="{TemplateBinding DropDownPosition}"
-                   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="{TemplateBinding DropDownContentBackground}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                <ScrollViewer x:Name="DropDownScrollViewer"
-                              VerticalScrollBarVisibility="Auto">
-                  <ContentPresenter x:Name="PART_ContentPresenter"
-                                    Content="{TemplateBinding DropDownContent}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <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
deleted file mode 100644
index 7791fcf0..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ /dev/null
@@ -1,197 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-  <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush"
-                       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="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <!-- =============================================================================== -->
-  <!-- SplitButton                                                                     -->
-  <!-- =============================================================================== -->
-  <conv:ThicknessSideRemovalConverter x:Key="ThicknessSideRemovalConverter" />
-
-  <Style TargetType="{x:Type local:SplitButton}">
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <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="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-    <Setter Property="DropDownContentBackground"
-            Value="{StaticResource PopupBackgroundBrush}" />
-    <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}"
-                                 CornerRadius="2.75">
-              <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}"
-                        Style="{x:Null}">
-                  <Button.Template>
-                    <ControlTemplate TargetType="Button">
-                      <ContentPresenter />
-                    </ControlTemplate>
-                  </Button.Template>
-                  <Grid>
-                    <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                         Background="{TemplateBinding Background}"
-                                         Foreground="{TemplateBinding Foreground}"
-                                         BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSideRemovalConverter}, ConverterParameter=2}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         CornerRadius="2.75, 0, 0, 2.75"
-                                         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}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         Padding="1,0,1,0"
-                                         CornerRadius="0, 2.75, 2.75, 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="9"
-                              Height="5"
-                              Data="{StaticResource DownArrowGeometry}"
-                              Fill="#FF000000"
-                              Margin="0,1,0,0" />
-                      </Grid>
-                    </chrome:ButtonChrome>
-                  </Grid>
-                </ToggleButton>
-              </Grid>
-            </chrome:ButtonChrome>
-
-            <Popup x:Name="PART_Popup"
-                   HorizontalOffset="1"
-                   VerticalOffset="1"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   Placement="{TemplateBinding DropDownPosition}"
-                   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="{TemplateBinding DropDownContentBackground}"
-                      BorderBrush="{StaticResource ColorPickerDarkBorderBrush}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                <ScrollViewer x:Name="DropDownScrollViewer"
-                              VerticalScrollBarVisibility="Auto">
-                  <ContentPresenter x:Name="PART_ContentPresenter"
-                                    Content="{TemplateBinding DropDownContent}" />
-                </ScrollViewer>
-              </Border>
-            </Popup>
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-              <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/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
deleted file mode 100644
index a452b362..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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 StyleableWindowClippingBorderConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      double borderThickness = (double)value;
-      return new Thickness( borderThickness, borderThickness, borderThickness, borderThickness * 2);
-    }
-
-    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
deleted file mode 100644
index bee48674..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:core="clr-namespace:Xceed.Wpf.Toolkit.Core">
-
-   <ResourceDictionary.MergedDictionaries>
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Aero/Brushes_NormalColor.xaml"/>
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit"
-                                      SourcePath="Themes/Aero/Buttons_NormalColor.xaml"/>
-   </ResourceDictionary.MergedDictionaries>
-
-</ResourceDictionary>
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
deleted file mode 100644
index 61e2a4a9..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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" >
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}" 
-                    Color="#FFFFFF" options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}" 
-                    Color="#F4F4F4" options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBorderKey}" 
-                        StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFabadb3" Offset="0" />
-            <GradientStop Color="#FFdbdfe6" Offset="0.05000000074505806" />
-            <GradientStop Color="#FFdbdfe6" Offset="0.949999988079071" />
-            <GradientStop Color="#FFe3e9ef" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}" 
-                        StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FF3d7bad" Offset="0" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-            <GradientStop Color="#FFb7d9ed" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlFocusedBorderKey}" 
-                        StartPoint="0.5,0" EndPoint="0.5,1" options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FF3d7bad" Offset="0" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-            <GradientStop Color="#FFb7d9ed" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
-                    options:Freeze="true"
-                    Color="#FFABADB3" />
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalInnerBorderKey}" 
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFfcfcfc" />
-            <GradientStop Offset="0.5" Color="#FFf9f9f9" />
-            <GradientStop Offset="0.5" Color="#FFf3f3f3" />
-            <GradientStop Offset="1" Color="#FFf3f3f3" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFf2f2f2" />
-            <GradientStop Offset="0.5" Color="#FFe8e8e8" />
-            <GradientStop Offset="0.5" Color="#FFd1d1d1" />
-            <GradientStop Offset="1" Color="#FFd1d1d1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
-                    options:Freeze="true"
-                    Color="#FF3C7FB1" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverInnerBorderKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFfafdfe" Offset="0" />
-            <GradientStop Color="#FFf5fbfe" Offset="0.5" />
-            <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
-            <GradientStop Color="#FFe8f5fc" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFeaf6fd" Offset="0" />
-            <GradientStop Color="#FFd9f0fc" Offset="0.5" />
-            <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
-            <GradientStop Color="#FFa7d9f5" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
-                    options:Freeze="true"
-                    Color="#FF2C628B" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedInnerBorderKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FF9eb0ba" Offset="0" />
-            <GradientStop Color="#FF9abacb" Offset="0.5" />
-            <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
-            <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
-            <GradientStop Color="#FF68b2da" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFe5f4fc" Offset="0" />
-            <GradientStop Color="#FFc4e5f6" Offset="0.5" />
-            <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
-            <GradientStop Color="#FF68b3db" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}" 
-                        options:Freeze="true"
-                        StartPoint="0.5,0" EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FF3d7bad" Offset="0" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-            <GradientStop Color="#FFb7d9ed" Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-</ResourceDictionary>
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
deleted file mode 100644
index 124da4c7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinnerButtonStyleKey}" 
-          TargetType="RepeatButton">
-      <Setter Property="Background" Value="Transparent" />
-      <Setter Property="BorderBrush" Value="Transparent" />
-      <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="False"
-                                       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.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index e9ff8926..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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/Primitives/Themes/Aero2/WindowControl.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Primitives/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/IconButton/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/Pie/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/RangeSlider/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/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/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml" />
-      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/WatermarkComboBox/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
deleted file mode 100644
index a0531d31..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}"
-                    Color="#FFFFFFFF"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}"
-                    Color="#FFF4F4F4"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBorderKey}"
-                    Color="#FFABADB3"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}"
-                    Color="#FF7EB4EA"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlSelectedBorderKey}"
-                    Color="#FF569DE5"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlFocusedBorderKey}"
-                    Color="Red"
-                    options:Freeze="true" />
-
-   <!-- Button -->
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
-                    Color="#FF707070"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
-                    Color="#FFDDDDDD"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
-                    Color="#FF3C7FB1"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"
-                    Color="#FFBEE6FD"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
-                    Color="#FF2C628B"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
-                    Color="#FFC4E5F6"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}"
-                    Color="Red"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedBackgroundKey}"
-                    Color="Orange"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonDisabledOuterBorderKey}"
-                    Color="#FFADB2B5"
-                    options:Freeze="true" />
-
-   <!-- Up/Down Glyphs -->
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphNormalForegroundKey}"
-                    Color="#FF000000" />
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphDisabledForegroundKey}"
-                    Color="#FFA9A9A9" />
-
-   <!-- SpinButton CornerRadius -->
-   <CornerRadius x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=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
deleted file mode 100644
index ec195aa7..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=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
deleted file mode 100644
index 0d24459a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:s="clr-namespace:System;assembly=mscorlib"
-                    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="toolWindowCloseGeometry">
-        M0,0 L0,1 2,1 2,3 4,3 4,6 2,6 2,8 0,8 0,9 3,9 3,7 6,7 6,9 9,9 9,8 7,8 7,6 5,6 5,3 7,3 7,1 9,1 9,0 6,0 6,2 3,2 3,0 z
-    </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 StyleableWindow          -->
-    <!-- =============================================================================== -->
-
-    <!-- ResizeGrip -->
-    <ImageBrush x:Key="resize_grip"
-                ImageSource="../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" />
-
-    <s:Double x:Key="Window_CaptionFontSize">15</s:Double>
-
-    <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
deleted file mode 100644
index 1f8f2b00..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z</Geometry>
-   <Geometry x:Key="DownArrowGeometry">M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z</Geometry>
-
-   <DataTemplate x:Key="IncreaseGlyphNormalKey">
-        <Path Width="9"
-            Height="5"
-            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="9"
-            Height="5"
-            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="9"
-            Height="5"
-            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="9"
-            Height="5"
-            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
deleted file mode 100644
index 0477349a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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:core="clr-namespace:Xceed.Wpf.Toolkit.Core">
-   <ResourceDictionary.MergedDictionaries>
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Generic/Brushes.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Generic/Buttons.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Themes/Generic/Common.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Chromes/Themes/Generic.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="BusyIndicator/Themes/Generic.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ButtonSpinner/Themes/Generic.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Calculator/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CalculatorUpDown/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Primitives/Themes/Generic/WindowControl.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Primitives/Themes/Generic/SelectorItem.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CheckComboBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CheckListBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ChildWindow/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="CollectionControl/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ColorCanvas/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="ColorPicker/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DropDownButton/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="IconButton/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Magnifier/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="MessageBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DateTimeUpDown/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="DateTimePicker/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="MultiLineTextEditor/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="NumericUpDown/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Pie/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="RangeSlider/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="SplitButton/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="PropertyGrid/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="RichTextBoxFormatBar/Themes/Generic.xaml" />
-
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="TimePicker/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="TimeSpanUpDown/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="WatermarkComboBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="WatermarkTextBox/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Wizard/Themes/Generic.xaml" />
-      <core:VersionResourceDictionary AssemblyName="Xceed.Wpf.Toolkit" SourcePath="Zoombox/Themes/Generic.xaml" />
-   </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
deleted file mode 100644
index 07fe1414..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
+++ /dev/null
@@ -1,216 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBackgroundKey}"
-                    Color="#FFFFFFFF"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlDisabledBackgroundKey}"
-                    Color="#F4F4F4"
-                    options:Freeze="true" />
-
-
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlNormalBorderKey}"
-                        EndPoint="0,20"
-                        MappingMode="Absolute"
-                        StartPoint="0,0"
-                        options:Freeze="true">
-      <GradientStop Color="#ABADB3"
-                    Offset="0.05" />
-      <GradientStop Color="#E2E3EA"
-                    Offset="0.07" />
-      <GradientStop Color="#E3E9EF"
-                    Offset="1" />
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlMouseOverBorderKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1"
-                        options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#5794BF"
-                          Offset="0.05" />
-            <GradientStop Color="#B7D5EA"
-                          Offset="0.07" />
-            <GradientStop Color="#C7E2F1"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ControlFocusedBorderKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1"
-                        options:Freeze="true">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#3D7BAD"
-                          Offset="0.05" />
-            <GradientStop Color="#A4C9E3"
-                          Offset="0.07" />
-            <GradientStop Color="#B7D9ED"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalOuterBorderKey}"
-                    Color="#FF707070"
-                    options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalInnerBorderKey}"
-                        EndPoint="0,1"
-                        StartPoint="0,0"
-                        options:Freeze="true">
-      <GradientStop Color="#FAFFFFFF"
-                    Offset="0" />
-      <GradientStop Color="#85FFFFFF"
-                    Offset="1" />
-   </LinearGradientBrush>
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonNormalBackgroundKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#F3F3F3"
-                          Offset="0" />
-            <GradientStop Color="#EBEBEB"
-                          Offset="0.5" />
-            <GradientStop Color="#DDDDDD"
-                          Offset="0.5" />
-            <GradientStop Color="#CDCDCD"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverOuterBorderKey}"
-                    Color="#3C7FB1" />
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverInnerBorderKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FAFFFFFF"
-                          Offset="0" />
-            <GradientStop Color="#85FFFFFF"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonMouseOverBackgroundKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FFEAF6FD"
-                          Offset="0" />
-            <GradientStop Color="#FFD9F0FC"
-                          Offset="0.50" />
-            <GradientStop Color="#FFBEE6FD"
-                          Offset="0.50" />
-            <GradientStop Color="#FFA7D9F5"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedOuterBorderKey}"
-                    Color="#2C628B" />
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedInnerBorderKey}"
-                        StartPoint="0,0"
-                        EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#FAFFFFFF"
-                          Offset="0" />
-            <GradientStop Color="#85FFFFFF"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-   <LinearGradientBrush options:Freeze="true"
-                        x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonPressedBackgroundKey}"
-                        StartPoint="0.5,0"
-                        EndPoint="0.5,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Color="#C2E4F6"
-                          Offset="0.5" />
-            <GradientStop Color="#ABDAF3"
-                          Offset="0.5" />
-            <GradientStop Color="#90CBEB"
-                          Offset="1" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedOuterBorderKey}"
-                    Color="#FF707070"
-                    options:Freeze="true" />
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedInnerBorderKey}"
-                    Color="#F900CCFF"
-                    options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonFocusedBackgroundKey}"
-                        EndPoint="0,1"
-                        StartPoint="0,0"
-                        options:Freeze="true">
-      <GradientStop Color="#FFEAF6FD"
-                    Offset="0" />
-      <GradientStop Color="#FFD9F0FC"
-                    Offset="0.50" />
-      <GradientStop Color="#FFBEE6FD"
-                    Offset="0.50" />
-      <GradientStop Color="#FFA7D9F5"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonDisabledOuterBorderKey}"
-                    Color="#ADB2B5"
-                    options:Freeze="true" />
-   <LinearGradientBrush x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=ButtonInnerBorderDisabledKey}"
-                        EndPoint="0,1"
-                        StartPoint="0,0"
-                        options:Freeze="true">
-      <GradientStop Color="#FAFFFFFF"
-                    Offset="0" />
-      <GradientStop Color="#85FFFFFF"
-                    Offset="1" />
-   </LinearGradientBrush>
-
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphNormalForegroundKey}"
-                    Color="#FF000000" />
-   <SolidColorBrush options:Freeze="true"
-                    x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=GlyphDisabledForegroundKey}"
-                    Color="#A9A9A9" />
-
-   <CornerRadius x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinButtonCornerRadiusKey}"
-                 TopLeft="0"
-                 TopRight="0"
-                 BottomRight="0"
-                 BottomLeft="0"
-                 options:Freeze="true" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
deleted file mode 100644
index f236d736..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="{ComponentResourceKey TypeInTargetAssembly={x:Type themes:ResourceKeys}, ResourceId=SpinnerButtonStyleKey}" 
-          TargetType="RepeatButton">
-      <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/Generic/Common.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
deleted file mode 100644
index 1ad04e9e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
+++ /dev/null
@@ -1,233 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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: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"
-                    xmlns:s="clr-namespace:System;assembly=mscorlib">
-
-
-    <!-- =============================================================================== -->
-    <!-- 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 -->
-   <BitmapImage x:Key="minimize_normal"
-                UriSource="Images/minimize_normal.png" />
-   <BitmapImage x:Key="minimize_hover"
-                UriSource="Images/minimize_hover.png" />
-   <BitmapImage x:Key="minimize_pressed"
-                UriSource="Images/minimize_pressed.png" />
-   <BitmapImage x:Key="minimize_inactive"
-                UriSource="Images/minimize_inactive.png" />
-
-    <!-- Maximize -->
-   <BitmapImage x:Key="maximize_normal"
-                UriSource="Images/maximize_normal.png" />
-   <BitmapImage x:Key="maximize_hover"
-                UriSource="Images/maximize_hover.png" />
-   <BitmapImage x:Key="maximize_pressed"
-                UriSource="Images/maximize_pressed.png" />
-   <BitmapImage x:Key="maximize_inactive"
-                UriSource="Images/maximize_inactive.png" />
-   <BitmapImage x:Key="maximize_disabled"
-                UriSource="Images/maximize_disabled.png" />
-
-    <!-- Restore -->
-   <BitmapImage x:Key="restore_normal"
-                UriSource="Images/restore_normal.png" />
-   <BitmapImage x:Key="restore_hover"
-                UriSource="Images/restore_hover.png" />
-   <BitmapImage x:Key="restore_pressed"
-                UriSource="Images/restore_pressed.png" />
-   <BitmapImage x:Key="restore_inactive"
-                UriSource="Images/restore_inactive.png" />
-   <BitmapImage x:Key="restore_disabled"
-                UriSource="Images/restore_disabled.png" />
-
-    <!-- Close -->
-   <BitmapImage  x:Key="close_normal"
-                 UriSource="Images/close_normal.png" />
-   <BitmapImage  x:Key="close_hover"
-                 UriSource="Images/close_hover.png" />
-   <BitmapImage  x:Key="close_pressed"
-                 UriSource="Images/close_pressed.png" />
-   <BitmapImage  x:Key="close_inactive"
-                 UriSource="Images/close_inactive.png" />
-
-    <!-- Close (with 2 rounded corners) -->
-   <BitmapImage x:Key="close_rounded_normal"
-                UriSource="Images/close_rounded_normal.png" />
-   <BitmapImage x:Key="close_rounded_hover"
-                UriSource="Images/close_rounded_hover.png" />
-   <BitmapImage x:Key="close_rounded_pressed"
-                UriSource="Images/close_rounded_pressed.png" />
-   <BitmapImage x:Key="close_rounded_inactive"
-                UriSource="Images/close_rounded_inactive.png" />
-
-    <!-- Close (for ToolWindow) -->
-   <BitmapImage x:Key="close_toolwindow_normal"
-                UriSource="Images/close_toolwindow_normal.png" />
-   <BitmapImage x:Key="close_toolwindow_hover"
-                UriSource="Images/close_toolwindow_hover.png" />
-   <BitmapImage x:Key="close_toolwindow_pressed"
-                UriSource="Images/close_toolwindow_pressed.png" />
-   <BitmapImage x:Key="close_toolwindow_inactive"
-                UriSource="Images/close_toolwindow_inactive.png" />
-
-
-    <!-- =============================================================================== -->
-    <!-- Common Styles                                                                   -->
-   <!-- Need to find a way to share these for WindowControl and StyleableWindow          -->
-    <!-- =============================================================================== -->
-
-    <!-- Button template -->
-    <ControlTemplate x:Key="buttonTemplate" TargetType="Button">
-        <Border Name="outerBorder" 
-                Background="{TemplateBinding Background}" 
-                BorderBrush="{TemplateBinding BorderBrush}"
-                BorderThickness="{TemplateBinding BorderThickness}">
-            <Image Source="{TemplateBinding Content}" Style="{StaticResource buttonImageStyle}"/>
-        </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) -->
-
-            <!-- 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"/>
-
-   <SolidColorBrush x:Key="Window_BorderBrush" Color="#5D6C7A" />
-
-   <s:Double x:Key="Window_CaptionFontSize">15</s:Double>
-
-   <Thickness x:Key="Window_BorderThickness" Left="1" Right="1" Bottom="1" Top="1" />
-
-   <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
deleted file mode 100644
index 166236e8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">M0,5 L4.5,.5 9,5 6,5 4.5,3.5 3,5 z</Geometry>
-   <Geometry x:Key="DownArrowGeometry">M0,0 L3,0 4.5,1.5 6,0 9,0 4.5,4.5 z</Geometry>
-
-   <DataTemplate x:Key="IncreaseGlyphNormalKey">
-      <Path Width="9"
-            Height="5"
-            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="9"
-            Height="5"
-            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="9"
-            Height="5"
-            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="9"
-            Height="5"
-            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/Images/close_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png
deleted file mode 100644
index 3fe5c919..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png and /dev/null 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
deleted file mode 100644
index 1b461928..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png and /dev/null 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
deleted file mode 100644
index d7fcb801..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png and /dev/null 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
deleted file mode 100644
index e406e334..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png and /dev/null 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
deleted file mode 100644
index a8ef093a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png and /dev/null 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
deleted file mode 100644
index fac35369..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png and /dev/null 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
deleted file mode 100644
index 7d8fede6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png and /dev/null 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
deleted file mode 100644
index 0ee5dfbd..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png and /dev/null 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
deleted file mode 100644
index 9a2987ec..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png and /dev/null 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
deleted file mode 100644
index 4f977353..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png and /dev/null 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
deleted file mode 100644
index bf066962..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png and /dev/null 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
deleted file mode 100644
index 1c3d9a5e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png and /dev/null 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
deleted file mode 100644
index d9805399..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png and /dev/null 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
deleted file mode 100644
index 4715f7d6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png and /dev/null 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
deleted file mode 100644
index 3755d81a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png and /dev/null 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
deleted file mode 100644
index 713a1a2f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png and /dev/null 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
deleted file mode 100644
index ec5d431b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png and /dev/null 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
deleted file mode 100644
index c4c0496c..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png and /dev/null 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
deleted file mode 100644
index 204ea5cc..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png and /dev/null 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
deleted file mode 100644
index 64870392..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png and /dev/null 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
deleted file mode 100644
index 3ab1ec5e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png and /dev/null 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
deleted file mode 100644
index 8a085971..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png and /dev/null 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
deleted file mode 100644
index 1683f61d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png and /dev/null 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
deleted file mode 100644
index 9f1a27e5..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png and /dev/null 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
deleted file mode 100644
index da3f7787..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png and /dev/null 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
deleted file mode 100644
index 595eb1fe..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png and /dev/null 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
deleted file mode 100644
index c94c7016..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index 6d617a30..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
deleted file mode 100644
index f0fd7615..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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/TimeItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
deleted file mode 100644
index b7baac60..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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
-{
-  public class TimeItem
-  {
-    public string Display
-    {
-      get;
-      set;
-    }
-    public TimeSpan Time
-    {
-      get;
-      set;
-    }
-
-    public TimeItem( string display, TimeSpan time )
-    {
-      Display = display;
-      Time = time;
-    }
-
-    #region Base Class Overrides
-
-    public override bool Equals( object obj )
-    {
-      var item = obj as TimeItem;
-      if( item != null )
-        return Time == item.Time;
-      else
-        return false;
-    }
-
-    public override int GetHashCode()
-    {
-      return Time.GetHashCode();
-    }
-
-    #endregion //Base Class Overrides
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
deleted file mode 100644
index 41532b30..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
+++ /dev/null
@@ -1,532 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Collections.Generic;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  [TemplatePart( Name = PART_TimeListItems, Type = typeof( ListBox ) )]
-  public class TimePicker : DateTimePickerBase
-  {
-    private const string PART_TimeListItems = "PART_TimeListItems";
-
-    #region Members
-
-    private ListBox _timeListBox;
-    private bool _isListBoxInvalid = true;
-    internal static readonly TimeSpan EndTimeDefaultValue = new TimeSpan( 23, 59, 0 );
-    internal static readonly TimeSpan StartTimeDefaultValue = new TimeSpan( 0, 0, 0 );
-    internal static readonly TimeSpan TimeIntervalDefaultValue = new TimeSpan( 1, 0, 0 );
-
-    #endregion //Members
-
-    #region Properties
-
-    #region EndTime
-
-    public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register( "EndTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( EndTimeDefaultValue, new PropertyChangedCallback( OnEndTimeChanged ), new CoerceValueCallback( OnCoerceEndTime ) ) );
-
-    private static object OnCoerceEndTime( DependencyObject o, object value )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceEndTime( ( TimeSpan )value );
-      else
-        return value;
-    }
-
-    private static void OnEndTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnEndTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
-
-    protected virtual TimeSpan OnCoerceEndTime( TimeSpan value )
-    {
-      ValidateTime( value );
-      return value;
-    }
-
-    protected virtual void OnEndTimeChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
-
-    public TimeSpan EndTime
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( EndTimeProperty );
-      }
-      set
-      {
-        SetValue( EndTimeProperty, value );
-      }
-    }
-
-    #endregion //EndTime
-
-    #region Format
-
-    protected override void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat newValue )
-    {
-      base.OnFormatChanged( oldValue, newValue );
-      InvalidateListBoxItems();
-    }
-
-    #endregion //Format
-
-    #region MaxDropDownHeight
-
-    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double ), typeof( TimePicker ), new UIPropertyMetadata( 130d, OnMaxDropDownHeightChanged ) );
-    public double MaxDropDownHeight
-    {
-      get
-      {
-        return ( double )GetValue( MaxDropDownHeightProperty );
-      }
-      set
-      {
-        SetValue( MaxDropDownHeightProperty, value );
-      }
-    }
-
-    private static void OnMaxDropDownHeightChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnMaxDropDownHeightChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue )
-    {
-      // TODO: Add your property changed side-effects. Descendants can override as well.
-    }
-
-    #endregion
-
-    #region StartTime
-
-    public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register( "StartTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( StartTimeDefaultValue, new PropertyChangedCallback( OnStartTimeChanged ), new CoerceValueCallback( OnCoerceStartTime ) ) );
-
-    private static object OnCoerceStartTime( DependencyObject o, object value )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceStartTime( ( TimeSpan )value );
-      else
-        return value;
-    }
-
-    private static void OnStartTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnStartTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
-
-    protected virtual TimeSpan OnCoerceStartTime( TimeSpan value )
-    {
-      ValidateTime( value );
-      return value;
-    }
-
-    protected virtual void OnStartTimeChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
-
-    public TimeSpan StartTime
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( StartTimeProperty );
-      }
-      set
-      {
-        SetValue( StartTimeProperty, value );
-      }
-    }
-
-
-    #endregion //StartTime
-
-    #region TimeInterval
-
-    public static readonly DependencyProperty TimeIntervalProperty = DependencyProperty.Register( "TimeInterval", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( TimeIntervalDefaultValue, OnTimeIntervalChanged ) );
-    public TimeSpan TimeInterval
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( TimeIntervalProperty );
-      }
-      set
-      {
-        SetValue( TimeIntervalProperty, value );
-      }
-    }
-
-    private static object OnCoerceTimeInterval( DependencyObject o, object value )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        return timePicker.OnCoerceTimeInterval( ( TimeSpan )value );
-      else
-        return value;
-    }
-
-    private static void OnTimeIntervalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimePicker timePicker = o as TimePicker;
-      if( timePicker != null )
-        timePicker.OnTimeIntervalChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
-    }
-
-    protected virtual TimeSpan OnCoerceTimeInterval( TimeSpan value )
-    {
-      ValidateTime( value );
-
-      if( value.Ticks == 0L )
-        throw new ArgumentException( "TimeInterval must be greater than zero" );
-
-      return value;
-    }
-
-
-    protected virtual void OnTimeIntervalChanged( TimeSpan oldValue, TimeSpan newValue )
-    {
-      InvalidateListBoxItems();
-    }
-
-    #endregion //TimeInterval
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static TimePicker()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( typeof( TimePicker ) ) );
-      FormatProperty.OverrideMetadata( typeof( TimePicker ), new UIPropertyMetadata( DateTimeFormat.ShortTime ) );
-      UpdateValueOnEnterKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( true ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override void OnFormatStringChanged( string oldValue, string newValue )
-    {
-      if( this.Format == DateTimeFormat.Custom )
-      {
-        InvalidateListBoxItems();
-      }
-      base.OnFormatStringChanged( oldValue, newValue );
-    }
-
-    protected override void OnMaximumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMaximumChanged( oldValue, newValue );
-      this.InvalidateListBoxItems();
-    }
-
-
-    protected override void OnMinimumChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnMinimumChanged( oldValue, newValue );
-      this.InvalidateListBoxItems();
-    }
-
-    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
-    {
-      base.OnValueChanged( oldValue, newValue );
-
-      // ListBox content may be affected if value's date changed and the date was
-      // or is equal to Minimum or Maximum value.
-      bool invalidate = false;
-
-      if( DateTimeUtilities.IsSameDate( this.Minimum, oldValue )
-        != DateTimeUtilities.IsSameDate( this.Minimum, newValue ) )
-      {
-        invalidate = true;
-      }
-
-      if( DateTimeUtilities.IsSameDate( this.Maximum, oldValue )
-        != DateTimeUtilities.IsSameDate( this.Maximum, newValue ) )
-      {
-        invalidate = true;
-      }
-
-      // A value change can affect the display of the listbox items
-      // if the Date part of the value has changed. This is the case when
-      // the display text of the items contains part of the Date values.
-      if( oldValue.GetValueOrDefault().Date != newValue.GetValueOrDefault().Date )
-      {
-        invalidate = true;
-      }
-
-      if( invalidate )
-      {
-        //Invalidate the entire listbox content
-        this.InvalidateListBoxItems();
-      }
-      else
-      {
-        //Just update the selected item
-        this.UpdateListBoxSelectedItem();
-      }
-    }
-
-    protected override void Popup_Opened( object sender, EventArgs e )
-    {
-      base.Popup_Opened( sender, e );
-
-      if( _timeListBox != null )
-      {
-        this.UpdateListBoxItems();
-
-        var time = (this.Value != null) ? this.Value.Value.TimeOfDay : TimePicker.StartTimeDefaultValue;
-        var nearestItem = this.GetNearestTimeItem( time );
-        if( nearestItem != null )
-        {
-          _timeListBox.ScrollIntoView( nearestItem );
-          this.UpdateListBoxSelectedItem();
-        }
-        _timeListBox.Focus();
-      }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      if( this.TextBox != null )
-      {
-        this.TextBox.GotKeyboardFocus -= this.TextBoxSpinner_GotKeyboardFocus;
-      }
-      if( this.Spinner != null )
-      {
-        this.Spinner.GotKeyboardFocus -= this.TextBoxSpinner_GotKeyboardFocus;
-      }
-
-      base.OnApplyTemplate();
-
-      if( this.TextBox != null )
-      {
-        this.TextBox.GotKeyboardFocus += this.TextBoxSpinner_GotKeyboardFocus;
-      }
-      if( this.Spinner != null )
-      {
-        this.Spinner.GotKeyboardFocus += this.TextBoxSpinner_GotKeyboardFocus;
-      }
-
-      if( _timeListBox != null )
-      {
-        _timeListBox.SelectionChanged -= this.TimeListBox_SelectionChanged;
-        _timeListBox.MouseUp -= this.TimeListBox_MouseUp;
-      }
-
-      _timeListBox = this.GetTemplateChild( PART_TimeListItems ) as ListBox;
-
-      if( _timeListBox != null )
-      {
-        _timeListBox.SelectionChanged += this.TimeListBox_SelectionChanged;
-        _timeListBox.MouseUp += this.TimeListBox_MouseUp;
-
-        this.InvalidateListBoxItems();
-      }
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Event Handlers
-
-    private void TimeListBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
-    {
-      if( e.AddedItems.Count > 0 )
-      {
-        TimeItem selectedTimeListItem = ( TimeItem )e.AddedItems[ 0 ];
-        var time = selectedTimeListItem.Time;
-
-        if( this.UpdateValueOnEnterKey )
-        {
-          var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-          var date = currentValue ?? this.ContextNow;
-          var newValue = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
-          this.TextBox.Text = newValue.ToString( this.GetFormatString( this.Format ), this.CultureInfo );
-        }
-        else
-        {
-          var date = this.Value ?? this.ContextNow;
-          this.Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
-        }
-      }
-    }
-
-    private void TextBoxSpinner_GotKeyboardFocus( object sender, KeyboardFocusChangedEventArgs e )
-    {
-      this.ClosePopup( true );
-    }
-
-    private void TimeListBox_MouseUp( object sender, MouseButtonEventArgs e )
-    {
-      this.ClosePopup( true );
-    }
-
-    #endregion //Event Handlers
-
-    #region Methods
-
-    private void ValidateTime( TimeSpan time )
-    {
-      if( time.TotalHours >= 24d )
-        throw new ArgumentException( "Time value cannot be greater than or equal to 24 hours." );
-    }
-
-    public IEnumerable GenerateTimeListItemsSource()
-    {
-      TimeSpan time = StartTime;
-      TimeSpan endTime = EndTime;
-
-      if( endTime <= time )
-      {
-        endTime = EndTimeDefaultValue;
-        time = StartTimeDefaultValue;
-      }
-
-      // Limit the content of the list to the Minimum or Maximum
-      // if the date is set to the Minimum or Maximum.
-      if( this.Value.HasValue )
-      {
-        DateTime date = this.Value.Value;
-        DateTime minDate = this.Minimum.GetValueOrDefault( DateTime.MinValue );
-        DateTime maxDate = this.Maximum.GetValueOrDefault( DateTime.MaxValue );
-        TimeSpan minTime = minDate.TimeOfDay;
-        TimeSpan maxTime = maxDate.TimeOfDay;
-
-        if( date.Date == minDate.Date && time.Ticks < minTime.Ticks )
-        {
-          time = minTime;
-        }
-
-        if( date.Date == maxDate.Date && endTime.Ticks > maxTime.Ticks )
-        {
-          endTime = maxTime;
-        }
-
-        if( endTime < time )
-        {
-          time = endTime;
-        }
-      }
-
-
-      TimeSpan timeInterval = TimeInterval;
-      List<TimeItem> timeItemList = new List<TimeItem>();
-
-      if( time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0 )
-      {
-        while( time <= endTime )
-        {
-          timeItemList.Add( this.CreateTimeItem( time ) );
-          time = time.Add( timeInterval );
-        }
-      }
-      return timeItemList;
-    }
-
-    protected virtual TimeItem CreateTimeItem( TimeSpan time )
-    {
-      var date = Value ?? this.ContextNow;
-      string formatString = this.GetFormatString( (DateTimeFormat)this.Format );
-      return new TimeItem( date.Date.Add( time ).ToString( formatString, CultureInfo ), time );
-    }
-
-    private void UpdateListBoxSelectedItem()
-    {
-      if( _timeListBox != null )
-      {
-        TimeItem time = null;
-        if( Value != null )
-        {
-          time = this.CreateTimeItem( Value.Value.TimeOfDay );
-          if( !_timeListBox.Items.Contains( time ) )
-          {
-            time = null;
-          }
-        }
-
-        _timeListBox.SelectedItem = time;
-      }
-    }
-
-    private void InvalidateListBoxItems()
-    {
-      _isListBoxInvalid = true;
-      if( IsOpen )
-      {
-        UpdateListBoxItems();
-      }
-    }
-
-    private void UpdateListBoxItems()
-    {
-      if( _timeListBox != null )
-      {
-        if( _isListBoxInvalid )
-        {
-          _timeListBox.ItemsSource = GenerateTimeListItemsSource();
-          UpdateListBoxSelectedItem();
-          _isListBoxInvalid = false;
-        }
-      }
-    }
-
-    private TimeItem GetNearestTimeItem( TimeSpan time )
-    {
-      if( _timeListBox != null )
-      {
-        int itemCount = _timeListBox.Items.Count;
-        for( int i = 0; i < itemCount; i++ )
-        {
-          TimeItem timeItem = _timeListBox.Items[ i ] as TimeItem;
-          if( timeItem != null )
-          {
-            if( timeItem.Time >= time )
-              return timeItem;
-          }
-        }
-
-        //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;
-        }
-      }
-
-      return null;
-    }
-
-    #endregion //Methods
-  }
-}
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
deleted file mode 100644
index cd7141c6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,305 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
-    <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-            </chrome:ButtonChrome>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style x:Key="TimeItemStyle"
-         TargetType="ListBoxItem">
-    <Style.Setters>
-    <Setter Property="Padding"
-              Value="4" />
-    </Style.Setters>
-    <Style.Triggers>
-      <!-- MouseOver Only -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="True" />
-          <Condition Property="IsSelected"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFB8E0F3" />
-        <Setter Property="BorderBrush"
-                Value="#FF26A0DA" />
-      </MultiTrigger>
-
-      <!-- Selected Only -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-          <Condition Property="IsSelected"
-                     Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFC4E5F6" />
-        <Setter Property="BorderBrush"
-                Value="#FF26A0DA" />
-      </MultiTrigger>
-
-      <!-- MouseOver + Selected -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="True" />
-          <Condition Property="IsSelected"
-                     Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFD1E8FF" />
-        <Setter Property="BorderBrush"
-                Value="#FF66A7E8" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-
-
-  <!-- =============================================================================== -->
-  <!-- TimePicker                                                                      -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:TimePicker}">
-    <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="IsTabStop"
-            Value="False" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:TimePicker}">
-          <Grid x:Name="root">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <local:ButtonSpinner x:Name="PART_Spinner"
-                                 IsTabStop="False"
-                                 Background="{TemplateBinding Background}"
-                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                 HorizontalContentAlignment="Stretch"
-                                 VerticalContentAlignment="Stretch"
-                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                 ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                 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}"
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsTabStop="True"
-                                      MinWidth="20"
-                                      AcceptsReturn="False"
-                                      Padding="{TemplateBinding Padding}"
-                                      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="_timePickerToggleButton"
-                          Grid.Column="1"
-                          Background="White"
-                          Focusable="False"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource TimePickerToggleButtonStyle}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
-            </ToggleButton>
-            <Popup x:Name="PART_Popup"
-                   IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      MinWidth="{Binding ActualWidth, ElementName=root}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                      Background="{StaticResource PanelBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}">
-                <Grid>
-                  <ListBox x:Name="PART_TimeListItems"
-                           BorderThickness="0"
-                           DisplayMemberPath="Display"
-                           ItemContainerStyle="{StaticResource TimeItemStyle}" >
-                  </ListBox>
-                </Grid>
-              </Border>
-            </Popup>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver"
-                     Value="True">
-              <Setter Property="BorderBrush"
-                      Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <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>
-            <!--ToggleButton can be closed when TimePicker is included in DateTimePicker-->
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
-                <Condition Binding="{Binding TemplatedParent, RelativeSource={RelativeSource Self}, Converter={StaticResource ObjectTypeToNameConverter}}"
-                           Value="DateTimePicker" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsHitTestVisible"
-                      Value="True"
-                      TargetName="_timePickerToggleButton" />
-            </MultiDataTrigger>
-          </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
deleted file mode 100644
index 63daafc1..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
+++ /dev/null
@@ -1,283 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
-
-  <!-- =============================================================================== -->
-  <!-- ResourceDictionary for TimePicker and related controls                          -->
-  <!-- =============================================================================== -->
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="..\..\Themes\Generic\Glyphs.xaml" />
-  </ResourceDictionary.MergedDictionaries>
-
-  <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
-  <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
-  <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <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">
-    <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="PopupBackgroundBrush"
-                       StartPoint="0,0"
-                       EndPoint="0,1">
-    <LinearGradientBrush.GradientStops>
-      <GradientStopCollection>
-        <GradientStop Offset="0"
-                      Color="#FFffffff" />
-        <GradientStop Offset="1"
-                      Color="#FFE8EBED" />
-      </GradientStopCollection>
-    </LinearGradientBrush.GradientStops>
-  </LinearGradientBrush>
-
-  <Style x:Key="TimePickerToggleButtonStyle"
-         TargetType="ToggleButton">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid SnapsToDevicePixels="True">
-            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                 CornerRadius="0,2.75,2.75,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="9"
-                        Height="5"
-                        Data="{StaticResource DownArrowGeometry}"
-                        Fill="#FF000000"
-                        Margin="0,1,0,0" />
-                </Grid>
-              </Grid>
-            </chrome:ButtonChrome>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Fill"
-                      TargetName="Arrow"
-                      Value="#AFAFAF" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <SolidColorBrush x:Key="ListItemHover"
-                   Color="#FFE7F5FD" />
-
-  <Style x:Key="TimeItemStyle"
-         TargetType="ListBoxItem">
-    <Style.Setters>
-      <Setter Property="Padding"
-              Value="4" />
-    </Style.Setters>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver"
-               Value="True">
-        <Setter Property="Background"
-                Value="{StaticResource ListItemHover}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!-- =============================================================================== -->
-  <!-- TimePicker                                                                      -->
-  <!-- =============================================================================== -->
-
-  <Style TargetType="{x:Type local:TimePicker}">
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1,1,0,1" />
-    <Setter Property="BorderBrush"
-            Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-    <Setter Property="IsTabStop"
-            Value="False" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="HorizontalContentAlignment"
-            Value="Right" />
-    <Setter Property="VerticalContentAlignment"
-            Value="Center" />
-    <Setter Property="TextAlignment"
-            Value="Right" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type local:TimePicker}">
-          <Grid x:Name="root">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <local:ButtonSpinner x:Name="PART_Spinner"
-                                 IsTabStop="False"
-                                 Background="{TemplateBinding Background}"
-                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                 BorderThickness="{TemplateBinding BorderThickness}"
-                                 HorizontalContentAlignment="Stretch"
-                                 VerticalContentAlignment="Stretch"
-                                 ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                 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}"
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                      IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                      IsTabStop="True"
-                                      MinWidth="20"
-                                      AcceptsReturn="False"
-                                      Padding="{TemplateBinding Padding}"
-                                      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="_timePickerToggleButton"
-                          Grid.Column="1"
-                          Background="White"
-                          Focusable="False"
-                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                          Style="{StaticResource TimePickerToggleButtonStyle}"
-                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                          Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}" >
-            </ToggleButton>
-            <Popup x:Name="PART_Popup"
-                   IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
-                   AllowsTransparency="True"
-                   StaysOpen="False"
-                   ToolTip="{x:Static sys:String.Empty}">
-              <Popup.Resources>
-                <Style TargetType="ToolTip">
-                  <Style.Triggers>
-                    <Trigger Property="Content"
-                             Value="{x:Static sys:String.Empty}">
-                      <Setter Property="Visibility"
-                              Value="Collapsed" />
-                    </Trigger>
-                  </Style.Triggers>
-                </Style>
-              </Popup.Resources>
-              <Border BorderThickness="1"
-                      MinWidth="{Binding ActualWidth, ElementName=root}"
-                      MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                      Background="{StaticResource PopupBackgroundBrush}"
-                      BorderBrush="{StaticResource PopupDarkBorderBrush}">
-                <Grid>
-                  <ListBox x:Name="PART_TimeListItems"
-                           BorderThickness="0"
-                           DisplayMemberPath="Display"
-                           ItemContainerStyle="{StaticResource TimeItemStyle}" >
-                  </ListBox>
-                </Grid>
-              </Border>
-            </Popup>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-                <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                           Value="False" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </MultiDataTrigger>
-            <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                         Value="True">
-              <Setter Property="IsReadOnly"
-                      Value="True"
-                      TargetName="PART_TextBox" />
-            </DataTrigger>
-            <Trigger Property="IsEnabled"
-                     Value="False">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-            <!--ToggleButton can be closed when TimePicker is included in DateTimePicker-->
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                           Value="True" />
-                <Condition Binding="{Binding TemplatedParent, RelativeSource={RelativeSource Self}, Converter={StaticResource ObjectTypeToNameConverter}}"
-                           Value="DateTimePicker" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="IsHitTestVisible"
-                      Value="True"
-                      TargetName="_timePickerToggleButton" />
-            </MultiDataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
deleted file mode 100644
index 49629d6f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
+++ /dev/null
@@ -1,595 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Linq;
-using System.Windows;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Primitives;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class TimeSpanUpDown : DateTimeUpDownBase<TimeSpan?>
-  {
-    #region Constructors
-
-    static TimeSpanUpDown()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimeSpanUpDown ), new FrameworkPropertyMetadata( typeof( TimeSpanUpDown ) ) );
-      MaximumProperty.OverrideMetadata( typeof( TimeSpanUpDown ), new FrameworkPropertyMetadata( TimeSpan.MaxValue ) );
-      MinimumProperty.OverrideMetadata( typeof( TimeSpanUpDown ), new FrameworkPropertyMetadata( TimeSpan.MinValue ) );
-      DefaultValueProperty.OverrideMetadata( typeof( TimeSpanUpDown ), new FrameworkPropertyMetadata( TimeSpan.Zero ) );
-    }
-
-    public TimeSpanUpDown()
-    {
-      DataObject.AddPastingHandler( this, this.OnPasting );
-    }
-
-    #endregion //Constructors
-
-    #region Properties
-
-    #region FractionalSecondsDigitsCount
-
-    public static readonly DependencyProperty FractionalSecondsDigitsCountProperty = DependencyProperty.Register( "FractionalSecondsDigitsCount", typeof( int ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( 0, OnFractionalSecondsDigitsCountChanged, OnCoerceFractionalSecondsDigitsCount ) );
-    public int FractionalSecondsDigitsCount
-    {
-      get
-      {
-        return ( int )GetValue( FractionalSecondsDigitsCountProperty );
-      }
-      set
-      {
-        SetValue( FractionalSecondsDigitsCountProperty, value );
-      }
-    }
-
-    private static object OnCoerceFractionalSecondsDigitsCount( DependencyObject o, object value )
-    {
-      TimeSpanUpDown timeSpanUpDown = o as TimeSpanUpDown;
-      if( timeSpanUpDown != null )
-      {
-        int digitsCount = (int)value;
-        if( digitsCount < 0 || digitsCount > 3 )
-          throw new ArgumentException( "Fractional seconds digits count must be between 0 and 3." );
-      }
-      return value;
-    }
-
-    private static void OnFractionalSecondsDigitsCountChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimeSpanUpDown timeSpanUpDown = o as TimeSpanUpDown;
-      if( timeSpanUpDown != null )
-        timeSpanUpDown.OnFractionalSecondsDigitsCountChanged( ( int )e.OldValue, ( int )e.NewValue );
-    }
-
-    protected virtual void OnFractionalSecondsDigitsCountChanged( int oldValue, int newValue )
-    {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      this.SyncTextAndValueProperties( false, this.Text );
-    }
-
-    #endregion //FractionalSecondsDigitsCount
-
-    #region ShowSeconds
-
-    public static readonly DependencyProperty ShowSecondsProperty = DependencyProperty.Register( "ShowSeconds", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowSecondsChanged ) );
-    public bool ShowSeconds
-    {
-      get
-      {
-        return ( bool )GetValue( ShowSecondsProperty );
-      }
-      set
-      {
-        SetValue( ShowSecondsProperty, value );
-      }
-    }
-
-    private static void OnShowSecondsChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      TimeSpanUpDown timeSpanUpDown = o as TimeSpanUpDown;
-      if( timeSpanUpDown != null )
-        timeSpanUpDown.OnShowSecondsChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnShowSecondsChanged( bool oldValue, bool newValue )
-    {
-      var value = this.UpdateValueOnEnterKey
-                  ? ( this.TextBox != null ) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      this.SyncTextAndValueProperties( false, this.Text );
-    }
-
-    #endregion //ShowSeconds
-
-    #endregion
-
-    #region BaseClass Overrides
-
-    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
-    {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-    }
-
-    protected override void SetValidSpinDirection()
-    {
-      ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-      if( !this.IsReadOnly )
-      {
-        if( this.IsLowerThan( this.Value, this.Maximum ) || !this.Value.HasValue || !this.Maximum.HasValue)
-          validDirections = validDirections | ValidSpinDirections.Increase;
-
-        if( this.IsGreaterThan( this.Value, this.Minimum ) || !this.Value.HasValue || !this.Minimum.HasValue )
-          validDirections = validDirections | ValidSpinDirections.Decrease;
-      }
-
-      if( this.Spinner != null )
-        this.Spinner.ValidSpinDirection = validDirections;
-    }
-
-    protected override void OnIncrement()
-    {
-      this.Increment( this.Step );
-    }
-
-    protected override void OnDecrement()
-    {
-      this.Increment( -this.Step );
-    }
-
-    protected override string ConvertValueToText()
-    {
-      if( this.Value == null )
-        return string.Empty;
-
-      return this.ParseValueIntoTimeSpanInfo( this.Value );
-    }
-
-    protected override TimeSpan? ConvertTextToValue( string text )
-    {
-      if( string.IsNullOrEmpty( text ) )
-        return null;
-
-      TimeSpan timeSpan = TimeSpan.Parse( text );
-
-      if( this.ClipValueToMinMax )
-      {
-        return this.GetClippedMinMaxValue( timeSpan );
-      }
-
-      this.ValidateDefaultMinMax( timeSpan );
-
-      return timeSpan;
-    }
-
-    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
-    {
-      e.Handled = !this.IsNumber( e.Text );
-      base.OnPreviewTextInput( e );
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( e.Key == Key.Space )
-      {
-        e.Handled = true;
-      }
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnTextChanged( string previousValue, string currentValue )
-    {
-      if( !_processTextChanged )
-        return;
-
-      if( String.IsNullOrEmpty( currentValue ) )
-      {
-        if( !this.UpdateValueOnEnterKey )
-        {
-          this.Value = null;
-        }
-        return;
-      }
-
-      TimeSpan current = this.Value.HasValue ? this.Value.Value : new TimeSpan();
-      TimeSpan result;
-      var success = TimeSpan.TryParse( currentValue, out result );
-      if( !success )
-      {
-        // Validate when more than 60 seconds (or more than 60 minutes, or more than 24 hours) are entered.
-        var separators = currentValue.Where( x => x == ':' || x == '.' ).ToList();
-        var values = currentValue.Split( new char[] { ':', '.' } );
-        if( ( values.Count() >= 2 ) && !values.Any( x => string.IsNullOrEmpty( x ) ) )
-        {
-          bool haveDays = separators.First() == '.';
-          bool haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' );
-
-          result = new TimeSpan( haveDays ? int.Parse( values[ 0 ] ) : 0,  //Days
-                                 haveDays ? int.Parse( values[ 1 ] ) : int.Parse( values[ 0 ] ),  //Hours
-                                 haveDays ? int.Parse( values[ 2 ] ) : int.Parse( values[ 1 ] ),  //Minutes
-                                 ( haveDays && this.ShowSeconds ) ? int.Parse( values[ 3 ] ) : this.ShowSeconds ? int.Parse( values[ 2 ] ) : 0,  //Seconds
-                                 haveMS ? int.Parse( values.Last() ) : 0 );  //Milliseconds
-        }
-      }
-
-      currentValue = result.ToString();
-
-      // When text is typed, if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( ( _isTextChangedFromUI && !this.UpdateValueOnEnterKey )
-        || !_isTextChangedFromUI )
-      {
-        this.SyncTextAndValueProperties( true, currentValue );
-      }
-    }
-
-    protected override void OnValueChanged( TimeSpan? oldValue, TimeSpan? newValue )
-    {
-      //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-      //but only if it is not null
-      if( newValue != null )
-      {
-        var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-        this.InitializeDateTimeInfoList( value );
-      }
-      base.OnValueChanged( oldValue, newValue );
-    }
-
-    protected override void PerformMouseSelection()
-    {
-      var value = this.UpdateValueOnEnterKey
-                  ? (this.TextBox != null) ? this.ConvertTextToValue( this.TextBox.Text ) : null
-                  : this.Value;
-      this.InitializeDateTimeInfoList( value );
-      base.PerformMouseSelection();
-    }
-
-    protected override void InitializeDateTimeInfoList( TimeSpan? value )
-    {
-      var lastDayInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Day );
-      bool hasDay = lastDayInfo != null;
-      var negInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Other );
-      bool hasNegative = (negInfo != null) && (negInfo.Content == "-");
-
-      _dateTimeInfoList.Clear();
-
-      if( value.HasValue && value.Value.TotalMilliseconds < 0 )
-      {
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = "-", IsReadOnly = true } );
-        // Negative has been added, move TextBox.Selection to keep it on current DateTimeInfo
-        if( !hasNegative && (this.TextBox != null) )
-        {
-          _fireSelectionChangedEvent = false;
-          this.TextBox.SelectionStart++;
-          _fireSelectionChangedEvent = true;
-        }
-      }
-
-      if( value.HasValue && value.Value.Days != 0 )
-      {
-        int dayLength = Math.Abs( value.Value.Days ).ToString().Length;
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Day, Length = dayLength, Format = "dd" } );
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ".", IsReadOnly = true } );
-
-        if( this.TextBox != null )
-        {
-          //number of digits for days has changed when selection is not on date part, move TextBox.Selection to keep it on current DateTimeInfo
-          if( hasDay && (dayLength != lastDayInfo.Length) && (_selectedDateTimeInfo.Type != DateTimePart.Day) )
-          {
-            _fireSelectionChangedEvent = false;
-            this.TextBox.SelectionStart = Math.Max( 0, this.TextBox.SelectionStart + (dayLength - lastDayInfo.Length) );
-            _fireSelectionChangedEvent = true;
-          }
-          // Day has been added, move TextBox.Selection to keep it on current DateTimeInfo
-          else if( !hasDay )
-          {
-            _fireSelectionChangedEvent = false;
-            this.TextBox.SelectionStart += (dayLength + 1);
-            _fireSelectionChangedEvent = true;
-          }
-        }
-      }
-      // Day has been removed, move TextBox.Selection to keep it on current DateTimeInfo
-      else if( hasDay )
-      {
-        _fireSelectionChangedEvent = false;
-        this.TextBox.SelectionStart = Math.Max( hasNegative ? 1 : 0, this.TextBox.SelectionStart - (lastDayInfo.Length + 1) );
-        _fireSelectionChangedEvent = true;
-      }
-
-      _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Hour24, Length = 2, Format = "hh" } );
-      _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } );
-      _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Minute, Length = 2, Format = "mm" } );
-      if( this.ShowSeconds )
-      {
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } );
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Second, Length = 2, Format = "ss" } );
-      }
-
-      if( this.FractionalSecondsDigitsCount > 0 )
-      {
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ".", IsReadOnly = true } );
-        string fraction = new string( 'f', this.FractionalSecondsDigitsCount );
-        //If the "f" custom format specifier is used alone, specify "%f" so that it is not misinterpreted as a standard format string.
-        if( fraction.Length == 1 )
-        {
-          fraction = "%" + fraction;
-        }
-        _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Millisecond, Length = this.FractionalSecondsDigitsCount, Format = fraction } );
-      }
-
-      if( value.HasValue )
-      {
-        this.ParseValueIntoTimeSpanInfo( value );
-      }
-    }
-
-    protected override bool IsLowerThan( TimeSpan? value1, TimeSpan? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return (value1.Value < value2.Value);
-    }
-
-    protected override bool IsGreaterThan( TimeSpan? value1, TimeSpan? value2 )
-    {
-      if( value1 == null || value2 == null )
-        return false;
-
-      return (value1.Value > value2.Value);
-    }
-
-
-    #endregion
-
-    #region Methods
-
-    private string ParseValueIntoTimeSpanInfo( TimeSpan? value )
-    {
-      string text = string.Empty;
-
-      _dateTimeInfoList.ForEach( info =>
-      {
-        if( info.Format == null )
-        {
-          info.StartPosition = text.Length;
-          info.Length = info.Content.Length;
-          text += info.Content;
-        }
-        else
-        {
-          TimeSpan span = TimeSpan.Parse( value.ToString() );
-          info.StartPosition = text.Length;
-#if VS2008
-          switch (info.Format)
-          {
-              case "hh":
-                  info.Content = span.Hours.ToString("00");
-                  break;
-              case "mm":
-                  info.Content = span.Minutes.ToString("00");
-                  break;
-              case "ss":
-                  info.Content = span.Seconds.ToString("00");
-                  break;
-              case "dd":
-                  info.Content = span.Days.ToString();
-                  break;
-              case "%f":
-                  info.Content = (span.Milliseconds / 100).ToString();
-                  break;
-              case "ff":
-                  info.Content = (span.Milliseconds / 10).ToString();
-                  break;
-              case "fff":
-                  info.Content = span.Milliseconds.ToString();
-                  break;
-              default:
-                  throw new InvalidOperationException("Wrong TimeSpan format");
-          }
-#else
-          info.Content = span.ToString( info.Format, this.CultureInfo.DateTimeFormat );
-#endif
-          if( info.Format == "dd" )
-          {
-            info.Content = Convert.ToInt32( info.Content ).ToString();
-          }
-          info.Length = info.Content.Length;
-          text += info.Content;
-        }
-      } );
-
-      return text;
-    }
-
-    private TimeSpan? UpdateTimeSpan( TimeSpan? currentValue, int value )
-    {
-      DateTimeInfo info = _selectedDateTimeInfo;
-
-      //this only occurs when the user manually type in a value for the Value Property
-      if( info == null )
-      {
-        info = (this.CurrentDateTimePart != DateTimePart.Other)
-               ? this.GetDateTimeInfo( this.CurrentDateTimePart )
-               : (_dateTimeInfoList[ 0 ].Content != "-") ? _dateTimeInfoList[ 0 ] : _dateTimeInfoList[ 1 ]; //Skip negative sign
-      }
-
-      TimeSpan? result = null;
-
-      try
-      {
-        switch( info.Type )
-        {
-          case DateTimePart.Day:
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( value, 0, 0, 0, 0 ) );
-            break;
-          case DateTimePart.Hour24:
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( 0, value, 0, 0, 0 ) );
-            break;
-          case DateTimePart.Minute:
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( 0, 0, value, 0, 0 ) );
-            break;
-          case DateTimePart.Second:
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( 0, 0, 0, value, 0 ) );
-            break;
-          case DateTimePart.Millisecond:
-            switch( this.FractionalSecondsDigitsCount )
-            {
-              case 1:
-                value = value * 100;
-                break;
-              case 2:
-                value = value * 10;
-                break;
-              default:
-                value = value * 1;
-                break;
-            }
-            result = ( ( TimeSpan )currentValue).Add( new TimeSpan( 0, 0, 0, 0, value ) );
-            break;
-          default:
-            break;
-        }
-      }
-      catch
-      {
-        //this can occur if the date/time = 1/1/0001 12:00:00 AM which is the smallest date allowed.
-        //I could write code that would validate the date each and everytime but I think that it would be more
-        //efficient if I just handle the edge case and allow an exeption to occur and swallow it instead.
-      }
-
-      result = ( ( result != null ) && result.HasValue )
-                ? result.Value
-                : result;
-
-      result = this.CoerceValueMinMax( result );
-
-      return result;
-    }
-
-    private void Increment( int step )
-    {
-      // if UpdateValueOnEnterKey is true, 
-      // Sync Value on Text only when Enter Key is pressed.
-      if( this.UpdateValueOnEnterKey )
-      {
-        var currentValue = this.ConvertTextToValue( this.TextBox.Text );
-        var newValue = currentValue.HasValue
-                       ? this.UpdateTimeSpan( currentValue, step )
-                       : this.DefaultValue ?? TimeSpan.Zero;
-
-        if( newValue != null )
-        {
-          this.InitializeDateTimeInfoList( newValue );
-          var selectionStart = this.TextBox.SelectionStart;
-          var selectionLength = this.TextBox.SelectionLength;
-#if VS2008
-          this.TextBox.Text = newValue.Value.ToString();
-#else
-          this.TextBox.Text = newValue.Value.ToString( this.GetTimeSpanFormat() );
-#endif
-          this.TextBox.Select( selectionStart, selectionLength );
-        }
-      }
-      else
-      {
-        if( this.Value.HasValue )
-        {
-          var newValue = this.UpdateTimeSpan( this.Value, step );
-          if( newValue != null )
-          {
-            this.InitializeDateTimeInfoList( newValue );
-            var selectionStart = this.TextBox.SelectionStart;
-            var selectionLength = this.TextBox.SelectionLength;
-            this.Value = newValue;
-            this.TextBox.Select( selectionStart, selectionLength );
-          }
-        }
-        else
-        {
-          this.Value = this.DefaultValue ?? TimeSpan.Zero;
-        }
-      }
-    }
-
-#if !VS2008
-    private string GetTimeSpanFormat()
-    {
-      //use this format : "d.hh\:mm\:ss\.fff"
-      var formatParts = _dateTimeInfoList.Select( part =>
-      {
-        if( part.Format == null )
-          return '\\' + part.Content;
-
-        if( part.Format.Contains( 'd' ) )
-        {
-          var dayInfo = _dateTimeInfoList.FirstOrDefault( info => info.Type == DateTimePart.Day );
-          part.Format = string.Join( "", Enumerable.Repeat( "d", dayInfo.Length ) );
-        }
-        return part.Format;
-      } ).ToList();
-
-      return string.Join( "", formatParts );
-    }
-#endif
-
-    private bool IsNumber( string str )
-    {
-      foreach( char c in str )
-      {
-        if( !char.IsNumber( c ) )
-          return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    private void OnPasting( object sender, DataObjectPastingEventArgs e )
-    {
-      if( e.DataObject.GetDataPresent( typeof( string ) ) )
-      {
-        // Allow pasting only TimeSpan values
-        var pasteText = e.DataObject.GetData( typeof( string ) ) as string;
-        TimeSpan result;
-        var success = TimeSpan.TryParse( pasteText, out result );
-        if( !success )
-        {
-          e.CancelCommand();
-        }
-      }
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index 5581bb6e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,139 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-
-
-    <!-- =============================================================================== -->
-    <!-- TimeSpanUpDown                                                                  -->
-    <!-- =============================================================================== -->
-
-    <Style x:Key="TimeSpanUpDown"
-           TargetType="{x:Type local:TimeSpanUpDown}">
-        <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="VerticalContentAlignment"
-                Value="Center" />
-        <Setter Property="TextAlignment"
-                Value="Right" />
-      <Setter Property="IsTabStop"
-              Value="False" />
-      <Setter Property="WatermarkTemplate"
-                Value="{StaticResource DefaultWatermarkTemplate}" />
-      <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:TimeSpanUpDown}">
-                    <local:ButtonSpinner x:Name="PART_Spinner"
-                                         IsTabStop="False"
-                                         Background="{TemplateBinding Background}"
-                                         BorderBrush="{TemplateBinding BorderBrush}"
-                                         BorderThickness="{TemplateBinding BorderThickness}"
-                                         HorizontalContentAlignment="Stretch"
-                                         VerticalContentAlignment="Stretch"
-                                         ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                         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}"
-                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                                IsTabStop="True"
-                                                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>
-                     <MultiDataTrigger>
-                        <MultiDataTrigger.Conditions>
-                           <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                           <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                      Value="False" />
-                        </MultiDataTrigger.Conditions>
-                        <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                     </MultiDataTrigger>
-                     <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                  Value="True">
-                        <Setter Property="IsReadOnly"
-                                Value="True"
-                                TargetName="PART_TextBox" />
-                     </DataTrigger>
-                     <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>
-
-    <Style TargetType="{x:Type local:TimeSpanUpDown}"
-           BasedOn="{StaticResource TimeSpanUpDown}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
deleted file mode 100644
index fe271781..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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="Gray"
-                      Focusable="False"
-                      Margin="0,0,3,0" />
-   </DataTemplate>
-
-   <!-- =============================================================================== -->
-   <!-- TimeSpanUpDown                                                                  -->
-   <!-- =============================================================================== -->
-
-   <Style x:Key="TimeSpanUpDown"
-          TargetType="{x:Type local:TimeSpanUpDown}">
-      <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="VerticalContentAlignment"
-              Value="Center" />
-      <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:TimeSpanUpDown}">
-               <local:ButtonSpinner x:Name="PART_Spinner"
-                                    IsTabStop="False"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}"
-                                    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}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          IsUndoEnabled="{Binding IsUndoEnabled, RelativeSource={RelativeSource TemplatedParent}}"
-                                          IsTabStop="True"
-                                          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>
-                  <MultiDataTrigger>
-                     <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                        <Condition Binding="{Binding AllowTextInput, RelativeSource={RelativeSource Self}}"
-                                   Value="False" />
-                     </MultiDataTrigger.Conditions>
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </MultiDataTrigger>
-                  <DataTrigger Binding="{Binding IsReadOnly, RelativeSource={RelativeSource Self}}"
-                               Value="True">
-                     <Setter Property="IsReadOnly"
-                             Value="True"
-                             TargetName="PART_TextBox" />
-                  </DataTrigger>
-                  <Trigger Property="IsFocused"
-                           Value="True">
-                     <Setter TargetName="PART_TextBox"
-                             Property="FocusManager.FocusedElement"
-                             Value="{Binding ElementName=PART_TextBox}" />
-                  </Trigger>
-                  <Trigger Property="IsEnabled"
-                           Value="False">
-                     <Setter Property="Foreground"
-                             Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type local:TimeSpanUpDown}"
-          BasedOn="{StaticResource TimeSpanUpDown}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
deleted file mode 100644
index 74307d71..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public sealed class DateElement : IComparable<DateElement>
-  {
-    #region Members
-
-    internal Rect PlacementRectangle;
-
-    private readonly int _originalIndex;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region Date
-
-    public DateTime Date
-    {
-      get
-      {
-        return _date;
-      }
-    }
-
-    private readonly DateTime _date;
-
-    #endregion
-
-    #region DateEnd
-
-    public DateTime DateEnd
-    {
-      get
-      {
-        return _dateEnd;
-      }
-    }
-
-    private readonly DateTime _dateEnd;
-
-    #endregion
-
-    #region Element
-
-    public UIElement Element
-    {
-      get
-      {
-        return _element;
-      }
-    }
-
-    private readonly UIElement _element;
-
-    #endregion
-
-    #endregion
-
-    #region Constructors
-
-    internal DateElement( UIElement element, DateTime date, DateTime dateEnd )
-      : this( element, date, dateEnd, -1 )
-    {
-    }
-
-    internal DateElement( UIElement element, DateTime date, DateTime dateEnd, int originalIndex )
-    {
-      _element = element;
-      _date = date;
-      _dateEnd = dateEnd;
-      _originalIndex = originalIndex;
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    public override string ToString()
-    {
-      var fe = this.Element as FrameworkElement;
-      if( fe == null )
-        return base.ToString();
-
-      if( fe.Tag != null )
-        return fe.Tag.ToString();
-
-      return fe.Name;
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Methods
-
-    public int CompareTo( DateElement d )
-    {
-      int dateCompare = this.Date.CompareTo( d.Date );
-      if( dateCompare != 0 )
-        return dateCompare;
-
-      if( _originalIndex >= 0 )
-        return ( _originalIndex < d._originalIndex ) ? -1 : 1;
-
-      return -this.DateEnd.CompareTo( d.DateEnd );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
deleted file mode 100644
index f2f56c57..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum OverlapBehavior
-  {
-    Stack,
-    Stretch,
-    Hide,
-    None
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
deleted file mode 100644
index 3070064a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
+++ /dev/null
@@ -1,1322 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class TimelinePanel : Panel, IScrollInfo
-  {
-    #region Members
-
-    private List<DateElement> _visibleElements = null;
-
-    #endregion //Members
-
-    #region Properties
-
-    #region BeginDate Property
-
-    public static readonly DependencyProperty BeginDateProperty = DependencyProperty.Register( "BeginDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public DateTime BeginDate
-    {
-      get
-      {
-        return ( DateTime )GetValue( BeginDateProperty );
-      }
-      set
-      {
-        SetValue( BeginDateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EndDate Property
-
-    public static readonly DependencyProperty EndDateProperty = DependencyProperty.Register( "EndDate", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public DateTime EndDate
-    {
-      get
-      {
-        return ( DateTime )GetValue( EndDateProperty );
-      }
-      set
-      {
-        SetValue( EndDateProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region OverlapBehavior Property
-
-    public static readonly DependencyProperty OverlapBehaviorProperty = DependencyProperty.Register( "OverlapBehavior", typeof( OverlapBehavior ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( default( OverlapBehavior ), FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public OverlapBehavior OverlapBehavior
-    {
-      get
-      {
-        return ( OverlapBehavior )GetValue( OverlapBehaviorProperty );
-      }
-      set
-      {
-        SetValue( OverlapBehaviorProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region KeepOriginalOrderForOverlap Property
-
-    public static readonly DependencyProperty KeepOriginalOrderForOverlapProperty = DependencyProperty.Register( "KeepOriginalOrderForOverlap", typeof( bool ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( false, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public bool KeepOriginalOrderForOverlap
-    {
-      get
-      {
-        return ( bool )GetValue( KeepOriginalOrderForOverlapProperty );
-      }
-      set
-      {
-        SetValue( KeepOriginalOrderForOverlapProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Orientation Property
-
-    public static readonly DependencyProperty OrientationProperty = StackPanel.OrientationProperty.AddOwner( typeof( TimelinePanel ), new FrameworkPropertyMetadata( Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public Orientation Orientation
-    {
-      get
-      {
-        return ( Orientation )GetValue( OrientationProperty );
-      }
-      set
-      {
-        SetValue( OrientationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region UnitTimeSpan Property
-
-    public static readonly DependencyProperty UnitTimeSpanProperty = DependencyProperty.Register( "UnitTimeSpan", typeof( TimeSpan ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( TimeSpan.Zero, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public TimeSpan UnitTimeSpan
-    {
-      get
-      {
-        return ( TimeSpan )GetValue( UnitTimeSpanProperty );
-      }
-      set
-      {
-        SetValue( UnitTimeSpanProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region UnitSize Property
-
-    public static readonly DependencyProperty UnitSizeProperty = DependencyProperty.Register( "UnitSize", typeof( double ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( 0d, FrameworkPropertyMetadataOptions.AffectsMeasure ) );
-    public double UnitSize
-    {
-      get
-      {
-        return ( double )GetValue( UnitSizeProperty );
-      }
-      set
-      {
-        SetValue( UnitSizeProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Date Attached Property
-
-    public static readonly DependencyProperty DateProperty = DependencyProperty.RegisterAttached( "Date", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
-
-    public static DateTime GetDate( DependencyObject obj )
-    {
-      return ( DateTime )obj.GetValue( DateProperty );
-    }
-
-    public static void SetDate( DependencyObject obj, DateTime value )
-    {
-      obj.SetValue( DateProperty, value );
-    }
-
-    #endregion
-
-    #region DateEnd Attached Property
-
-    public static readonly DependencyProperty DateEndProperty = DependencyProperty.RegisterAttached( "DateEnd", typeof( DateTime ), typeof( TimelinePanel ), new FrameworkPropertyMetadata( DateTime.MinValue, FrameworkPropertyMetadataOptions.AffectsParentMeasure ) );
-
-    public static DateTime GetDateEnd( DependencyObject obj )
-    {
-      return ( DateTime )obj.GetValue( DateEndProperty );
-    }
-
-    public static void SetDateEnd( DependencyObject obj, DateTime value )
-    {
-      obj.SetValue( DateEndProperty, value );
-    }
-
-    #endregion
-
-    public List<DateElement> VisibleElements
-    {
-      get
-      {
-        return _visibleElements;
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static TimelinePanel()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimelinePanel ), new FrameworkPropertyMetadata( typeof( TimelinePanel ) ) );
-    }
-
-    public TimelinePanel()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      DateTime calcBeginDate = DateTime.MaxValue;
-      DateTime calcEndDate = DateTime.MinValue;
-
-      foreach( UIElement child in InternalChildren )
-      {
-        DateTime date = GetDate( child );
-        DateTime dateEnd = GetDateEnd( child );
-
-        if( date < calcBeginDate )
-        {
-          calcBeginDate = date;
-        }
-
-        if( date > calcEndDate )
-        {
-          calcEndDate = date;
-        }
-
-        if( dateEnd > calcEndDate )
-        {
-          calcEndDate = dateEnd;
-        }
-      }
-
-      if( BeginDate == DateTime.MinValue )
-      {
-        BeginDate = calcBeginDate;
-      }
-
-      if( EndDate == DateTime.MinValue )
-      {
-        EndDate = calcEndDate;
-      }
-
-      foreach( UIElement child in InternalChildren )
-      {
-        DateTime date = GetDate( child );
-        DateTime dateEnd = GetDateEnd( child );
-
-        Size childSize = availableSize;
-
-        if( dateEnd > DateTime.MinValue && dateEnd > date )
-        {
-          if( Orientation == Orientation.Horizontal )
-          {
-            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
-            {
-              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
-
-              childSize.Width = size * UnitSize;
-            }
-            else if( !double.IsPositiveInfinity( availableSize.Width ) )
-            {
-              // width is DateEnd - Date
-              childSize.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
-            }
-          }
-          else
-          {
-            if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
-            {
-              double size = ( double )( dateEnd.Ticks - date.Ticks ) / ( double )UnitTimeSpan.Ticks;
-
-              childSize.Height = size * UnitSize;
-            }
-            else if( !double.IsPositiveInfinity( availableSize.Height ) )
-            {
-              // height is DateEnd - Date
-              childSize.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
-            }
-          }
-        }
-
-        child.Measure( childSize );
-      }
-
-      Size newAvailableSize = new Size( availableSize.Width, availableSize.Height );
-
-      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
-      {
-        double size = ( double )( EndDate.Ticks - BeginDate.Ticks ) / ( double )UnitTimeSpan.Ticks;
-
-        if( Orientation == Orientation.Horizontal )
-        {
-          newAvailableSize.Width = size * UnitSize;
-        }
-        else
-        {
-          newAvailableSize.Height = size * UnitSize;
-        }
-      }
-
-      Size desiredSize = new Size();
-
-      if( ( Orientation == Orientation.Vertical && double.IsPositiveInfinity( newAvailableSize.Height ) ) ||
-          ( Orientation == Orientation.Horizontal && double.IsPositiveInfinity( newAvailableSize.Width ) ) )
-      {
-        // Our panel cannot layout items when we have positive infinity in the layout direction
-        // so defer to arrange pass.
-        _visibleElements = null;
-      }
-      else
-      {
-        LayoutItems( InternalChildren, newAvailableSize );
-
-        Rect desiredRect = new Rect();
-
-        foreach( DateElement child in _visibleElements )
-        {
-          desiredRect.Union( child.PlacementRectangle );
-        }
-
-        if( Orientation == Orientation.Horizontal )
-        {
-          desiredSize.Width = newAvailableSize.Width;
-          desiredSize.Height = desiredRect.Size.Height;
-        }
-        else
-        {
-          desiredSize.Width = desiredRect.Size.Width;
-          desiredSize.Height = newAvailableSize.Height;
-        }
-      }
-
-      if( IsScrolling )
-      {
-        Size viewport = new Size( availableSize.Width, availableSize.Height );
-        Size extent = new Size( desiredSize.Width, desiredSize.Height );
-        Vector offset = new Vector( Math.Max( 0, Math.Min( _offset.X, extent.Width - viewport.Width ) ),
-                                    Math.Max( 0, Math.Min( _offset.Y, extent.Height - viewport.Height ) ) );
-
-        SetScrollingData( viewport, extent, offset );
-
-        desiredSize.Width = Math.Min( desiredSize.Width, availableSize.Width );
-        desiredSize.Height = Math.Min( desiredSize.Height, availableSize.Height );
-
-        _physicalViewport = availableSize;
-      }
-
-      return desiredSize;
-    }
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      Rect finalRect = new Rect();
-
-      if( _visibleElements == null )
-      {
-        LayoutItems( InternalChildren, finalSize );
-      }
-
-      foreach( DateElement child in _visibleElements )
-      {
-        if( IsScrolling )
-        {
-          Rect placement = new Rect( child.PlacementRectangle.Location, child.PlacementRectangle.Size );
-          placement.Offset( -_offset );
-
-          child.Element.Arrange( placement );
-        }
-        else
-        {
-          child.Element.Arrange( child.PlacementRectangle );
-        }
-
-        finalRect.Union( child.PlacementRectangle );
-      }
-
-      Size renderSize;
-
-      if( Orientation == Orientation.Horizontal )
-      {
-        renderSize = new Size( finalSize.Width, finalRect.Size.Height );
-      }
-      else
-      {
-        renderSize = new Size( finalRect.Size.Width, finalSize.Height );
-      }
-
-      return renderSize;
-    }
-
-
-    #endregion //Base Class Overrides
-
-    #region Methods
-
-    private void ResetScrollInfo()
-    {
-      _offset = new Vector();
-      _physicalViewport = _viewport = _extent = new Size( 0, 0 );
-    }
-
-    private void SetScrollingData( Size viewport, Size extent, Vector offset )
-    {
-      _offset = offset;
-
-      if( !AreVirtuallyEqual( viewport, _viewport ) ||
-          !AreVirtuallyEqual( extent, _extent ) ||
-          !AreVirtuallyEqual( offset, _computedOffset ) )
-      {
-        _viewport = viewport;
-        _extent = extent;
-        _offset = offset;
-
-        OnScrollChange();
-      }
-    }
-
-    private double ValidateInputOffset( double offset, string parameterName )
-    {
-      if( double.IsNaN( offset ) )
-        throw new ArgumentOutOfRangeException( parameterName );
-
-      return Math.Max( 0d, offset );
-    }
-
-    private void OnScrollChange()
-    {
-      if( ScrollOwner != null )
-      {
-        ScrollOwner.InvalidateScrollInfo();
-      }
-    }
-
-    private double CalculateTimelineOffset( DateTime d, double finalWidth )
-    {
-      double offset;
-
-      long tickRange = EndDate.Ticks - BeginDate.Ticks;
-      long tickOffset = d.Ticks - BeginDate.Ticks;
-
-      if( UnitTimeSpan != TimeSpan.Zero && UnitSize > 0 )
-      {
-        offset = ( ( double )tickOffset / ( double )UnitTimeSpan.Ticks ) * UnitSize;
-      }
-      else
-      {
-        if( tickRange > 0 )
-        {
-          offset = ( ( double )tickOffset / ( double )tickRange ) * finalWidth;
-        }
-        else
-        {
-          offset = 0;
-        }
-      }
-
-      return offset;
-    }
-
-    private static int CompareElementsByLeft( DateElement a, DateElement b )
-    {
-      return a.PlacementRectangle.Left.CompareTo( b.PlacementRectangle.Left );
-    }
-
-    private static int CompareElementsByTop( DateElement a, DateElement b )
-    {
-      return a.PlacementRectangle.Top.CompareTo( b.PlacementRectangle.Top );
-    }
-
-    private void LayoutItems( UIElementCollection children, Size availableSize )
-    {
-      _visibleElements = new List<DateElement>();
-      List<DateElement> overlappingElements = new List<DateElement>();
-
-      int index = 0;
-      foreach( UIElement child in children )
-      {
-        if( child == null )
-          continue;
-
-        DateTime date = GetDate( child );
-        DateTime dateEnd = GetDateEnd( child );
-
-        if( child.Visibility != Visibility.Collapsed )
-        {
-          if( KeepOriginalOrderForOverlap )
-          {
-            _visibleElements.Add( new DateElement( child, date, dateEnd, index ) );
-          }
-          else
-          {
-            _visibleElements.Add( new DateElement( child, date, dateEnd ) );
-          }
-        }
-
-        index++;
-      }
-
-      _visibleElements.Sort();
-
-      foreach( DateElement child in _visibleElements )
-      {
-        DateTime date = GetDate( child.Element );
-        DateTime dateEnd = GetDateEnd( child.Element );
-
-        if( Orientation == Orientation.Vertical )
-        {
-
-          //---------------------------------------------------------------------
-          // 
-          // Begin Layout Algorithm (Vertical Orientation)
-          //
-          //---------------------------------------------------------------------
-
-          // calculate the values for y (top) and height
-
-          // y
-          child.PlacementRectangle.Y = CalculateTimelineOffset( date, availableSize.Height );
-
-          // height
-          if( dateEnd > DateTime.MinValue && dateEnd > date )
-          {
-            // height is DateEnd - Date
-            child.PlacementRectangle.Height = CalculateTimelineOffset( dateEnd, availableSize.Height ) - CalculateTimelineOffset( date, availableSize.Height );
-          }
-          else
-          {
-            // height is the desired size
-            child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-          }
-
-          // now calcualte the values for x (left) and width based on the OverlapBehavior
-
-          switch( OverlapBehavior )
-          {
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == None (Vertical)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.None:
-
-              #region OverlapBehavior == None (Vertical)
-
-              child.PlacementRectangle.X = 0;
-              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Hide (Vertical)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Hide:
-
-              #region OverlapBehavior = Hide
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              if( overlappingElements.Count > 0 )
-              {
-                child.PlacementRectangle.X = 0;
-                child.PlacementRectangle.Y = 0;
-                child.PlacementRectangle.Width = 0;
-                child.PlacementRectangle.Height = 0;
-              }
-              else
-              {
-                child.PlacementRectangle.X = 0;
-                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-              }
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Stretch (Vertical)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Stretch:
-
-              #region OverlapBehavior = Stretch
-
-              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
-              // only need to look for elements that intersect at the "top" of the item that is being
-              // placed because the _VisibleElements collection has been sorted so that the first 
-              // items come first--this means there won't be anything "below" the current item that
-              // isn't also below the current item
-
-              // find all overlapping elements
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              // sort the elements according to their "left" value so that as we search through
-              // the list we are able to identiy gaps
-
-              overlappingElements.Sort( CompareElementsByLeft );
-
-              // initialize left and width such that the item will be stretch to fill the available 
-              // space and if there are no overlapping items, skip to the end
-
-              double left = 0;
-              double width = availableSize.Width;
-
-              if( overlappingElements.Count > 0 )
-              {
-
-                bool foundGap = false;
-
-                // now, look for a gap (there is a good chance that there won't be one, but if there is 
-                // then we will place the item in it)
-
-                for( int i = 0; i < overlappingElements.Count; i++ )
-                {
-                  Rect r = overlappingElements[ i ].PlacementRectangle;
-
-                  // if this is the first overlapping element, then look for a gap at the beginning
-                  if( i == 0 )
-                  {
-                    if( r.Left > 0 )
-                    {
-                      left = 0;
-                      width = r.Left;
-                      foundGap = true;
-                      break;
-                    }
-                  }
-
-                  // if this is the last overlapping element
-                  if( i == overlappingElements.Count - 1 )
-                  {
-                    //left = r.Right;
-                    break;
-                  }
-
-                  // if this is an element somewhere in the middle, then 
-                  else
-                  {
-                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
-                    if( ( n.Left - r.Right ) > 0 )
-                    {
-                      left = r.Right;
-                      width = n.Left - r.Right;
-                      foundGap = true;
-                      break;
-                    }
-                  }
-
-                }
-
-                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
-                // over and then placing the item at the end
-
-                if( !foundGap )
-                {
-                  width = Math.Min( availableSize.Width / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Width );
-                  left = 0;
-
-                  foreach( DateElement e in overlappingElements )
-                  {
-                    e.PlacementRectangle.Width = width;
-                    e.PlacementRectangle.X = left;
-                    left += width;
-                  }
-                }
-              }
-
-              child.PlacementRectangle.X = left;
-
-              if( double.IsPositiveInfinity( width ) )
-              {
-                child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-              }
-              else
-              {
-                child.PlacementRectangle.Width = width;
-              }
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Stack (Vertical)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Stack:
-
-              #region OverlapBehavior = Stack;
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Top >= compareRect.Top && childRect.Top < compareRect.Bottom )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              // sort the elements according to their "left" value so that as we search through
-              // the list we are able to identiy gaps
-
-              overlappingElements.Sort( CompareElementsByLeft );
-
-              // initialize left and width values, width will always be it's desired size
-
-              left = 0;
-              child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-
-              // find the first gap that is big enough to accomodate the current item
-
-              for( int i = 0; i < overlappingElements.Count; i++ )
-              {
-                Rect r = overlappingElements[ i ].PlacementRectangle;
-
-                if( i == 0 )
-                {
-                  if( r.Left >= child.PlacementRectangle.Width )
-                  {
-                    left = 0;
-                    break;
-                  }
-                }
-
-                if( i == overlappingElements.Count - 1 )
-                {
-                  left = r.Right;
-                  break;
-                }
-                else
-                {
-                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
-                  if( ( n.Left - r.Right ) >= child.PlacementRectangle.Width )
-                  {
-                    left = r.Right;
-                    break;
-                  }
-                }
-              }
-
-              child.PlacementRectangle.X = left;
-
-              break;
-
-              #endregion
-          }
-        }
-        else
-        {
-          //---------------------------------------------------------------------
-          // 
-          // Begin Layout Algorithm (Horizontal Orientation)
-          //
-          //---------------------------------------------------------------------
-
-          // calculate the values for x (left) and width
-
-          // x
-          child.PlacementRectangle.X = CalculateTimelineOffset( date, availableSize.Width );
-
-          // width
-          if( dateEnd > DateTime.MinValue && dateEnd > date )
-          {
-            // width is DateEnd - Date
-            child.PlacementRectangle.Width = CalculateTimelineOffset( dateEnd, availableSize.Width ) - CalculateTimelineOffset( date, availableSize.Width );
-          }
-          else
-          {
-            // width is the desired size
-            child.PlacementRectangle.Width = child.Element.DesiredSize.Width;
-          }
-
-          // now calcualte the values for y (top) and height based on the OverlapBehavior
-
-          switch( OverlapBehavior )
-          {
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == None (Horizontal)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.None:
-
-              #region OverlapBehavior == None (Horizontal)
-
-              child.PlacementRectangle.Y = 0;
-              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Hide (Horizontal)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Hide:
-
-              #region OverlapBehavior = Hide (Horizontal)
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              if( overlappingElements.Count > 0 )
-              {
-                child.PlacementRectangle.X = 0;
-                child.PlacementRectangle.Y = 0;
-                child.PlacementRectangle.Width = 0;
-                child.PlacementRectangle.Height = 0;
-              }
-              else
-              {
-                child.PlacementRectangle.Y = 0;
-                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-              }
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Stretch (Horizontal)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Stretch:
-
-              #region OverlapBehavior = Stretch
-
-              // find the first gap at the desired vertical (Y) location (note that in doing this, we 
-              // only need to look for elements that intersect at the "top" of the item that is being
-              // placed because the _VisibleElements collection has been sorted so that the first 
-              // items come first--this means there won't be anything "below" the current item that
-              // isn't also below the current item
-
-              // find all overlapping elements
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              // sort the elements according to their "left" value so that as we search through
-              // the list we are able to identiy gaps
-
-              overlappingElements.Sort( CompareElementsByTop );
-
-              // initialize left and width such that the item will be stretch to fill the available 
-              // space and if there are no overlapping items, skip to the end
-
-              double top = 0;
-              double height = availableSize.Height;
-
-              if( overlappingElements.Count > 0 )
-              {
-
-                bool foundGap = false;
-
-                // now, look for a gap (there is a good chance that there won't be one, but if there is 
-                // then we will place the item in it)
-
-                for( int i = 0; i < overlappingElements.Count; i++ )
-                {
-                  Rect r = overlappingElements[ i ].PlacementRectangle;
-
-                  // if this is the first overlapping element, then look for a gap at the beginning
-                  if( i == 0 )
-                  {
-                    if( r.Top > 0 )
-                    {
-                      top = 0;
-                      height = r.Top;
-                      foundGap = true;
-                      break;
-                    }
-                  }
-
-                  // if this is the last overlapping element
-                  if( i == overlappingElements.Count - 1 )
-                  {
-                    //left = r.Right;
-                    break;
-                  }
-
-                  // if this is an element somewhere in the middle, then 
-                  else
-                  {
-                    Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
-                    if( ( n.Top - r.Bottom ) > 0 )
-                    {
-                      top = r.Bottom;
-                      height = n.Top - r.Bottom;
-                      foundGap = true;
-                      break;
-                    }
-                  }
-
-                }
-
-                // if we didn't find a gap, we need to make one by scooting the overlapping elements 
-                // over and then placing the item at the end
-
-                if( !foundGap )
-                {
-                  height = Math.Min( availableSize.Height / ( overlappingElements.Count + 1 ), overlappingElements[ 0 ].PlacementRectangle.Height );
-                  top = 0;
-
-                  foreach( DateElement e in overlappingElements )
-                  {
-                    e.PlacementRectangle.Height = height;
-                    e.PlacementRectangle.Y = top;
-                    top += height;
-                  }
-                }
-              }
-
-              child.PlacementRectangle.Y = top;
-
-              if( double.IsPositiveInfinity( height ) )
-              {
-                child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-              }
-              else
-              {
-                child.PlacementRectangle.Height = height;
-              }
-
-              break;
-
-              #endregion
-
-            //---------------------------------------------------------------------
-            //
-            // OverlapBehavior == Stack (Horizontal)
-            //
-            //---------------------------------------------------------------------
-
-            case OverlapBehavior.Stack:
-
-              #region OverlapBehavior = Stack;
-
-              overlappingElements.Clear();
-
-              foreach( DateElement compare in _visibleElements )
-              {
-                if( child == compare )
-                  break;
-
-                Rect childRect = child.PlacementRectangle;
-                Rect compareRect = compare.PlacementRectangle;
-
-                if( childRect.Left >= compareRect.Left && childRect.Left < compareRect.Right )
-                {
-                  overlappingElements.Add( compare );
-                }
-              }
-
-              // sort the elements according to their "left" value so that as we search through
-              // the list we are able to identiy gaps
-
-              overlappingElements.Sort( CompareElementsByTop );
-
-              // initialize left and width values, width will always be it's desired size
-
-              top = 0;
-              child.PlacementRectangle.Height = child.Element.DesiredSize.Height;
-
-              // find the first gap that is big enough to accomodate the current item
-
-              for( int i = 0; i < overlappingElements.Count; i++ )
-              {
-                Rect r = overlappingElements[ i ].PlacementRectangle;
-
-                if( i == 0 )
-                {
-                  if( r.Top >= child.PlacementRectangle.Height )
-                  {
-                    top = 0;
-                    break;
-                  }
-                }
-
-                if( i == overlappingElements.Count - 1 )
-                {
-                  top = r.Bottom;
-                  break;
-                }
-                else
-                {
-                  Rect n = overlappingElements[ i + 1 ].PlacementRectangle;
-                  if( ( n.Top - r.Bottom ) >= child.PlacementRectangle.Height )
-                  {
-                    top = r.Bottom;
-                    break;
-                  }
-                }
-              }
-
-              child.PlacementRectangle.Y = top;
-
-              break;
-
-              #endregion
-          }
-        }
-      }
-    }
-
-    private static bool AreVirtuallyEqual( double d1, double d2 )
-    {
-      if( double.IsPositiveInfinity( d1 ) )
-        return double.IsPositiveInfinity( d2 );
-
-      if( double.IsNegativeInfinity( d1 ) )
-        return double.IsNegativeInfinity( d2 );
-
-      if( double.IsNaN( d1 ) )
-        return double.IsNaN( d2 );
-
-      double n = d1 - d2;
-      double d = ( Math.Abs( d1 ) + Math.Abs( d2 ) + 10 ) * 1.0e-15;
-      return ( -d < n ) && ( d > n );
-    }
-
-    private static bool AreVirtuallyEqual( Size s1, Size s2 )
-    {
-      return AreVirtuallyEqual( s1.Width, s2.Width )
-          && AreVirtuallyEqual( s1.Height, s2.Height );
-    }
-
-    private static bool AreVirtuallyEqual( Vector v1, Vector v2 )
-    {
-      return AreVirtuallyEqual( v1.X, v2.X )
-          && AreVirtuallyEqual( v1.Y, v2.Y );
-    }
-
-    #endregion //Methods
-
-    #region Interfaces
-
-    #region IScrollInfo
-
-    public bool CanHorizontallyScroll
-    {
-      get
-      {
-        return _allowHorizontal;
-      }
-      set
-      {
-        _allowHorizontal = value;
-      }
-    }
-
-    public bool CanVerticallyScroll
-    {
-      get
-      {
-        return _allowVertical;
-      }
-      set
-      {
-        _allowVertical = value;
-      }
-    }
-
-    public double ExtentHeight
-    {
-      get
-      {
-        return _extent.Height;
-      }
-    }
-
-    public double ExtentWidth
-    {
-      get
-      {
-        return _extent.Width;
-      }
-    }
-
-    public double HorizontalOffset
-    {
-      get
-      {
-        return _offset.X;
-      }
-    }
-
-    public void LineDown()
-    {
-      SetVerticalOffset( VerticalOffset + ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
-    }
-
-    public void LineLeft()
-    {
-      SetHorizontalOffset( HorizontalOffset - ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
-    }
-
-    public void LineRight()
-    {
-      SetHorizontalOffset( HorizontalOffset + ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) );
-    }
-
-    public void LineUp()
-    {
-      SetVerticalOffset( VerticalOffset - ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) );
-    }
-
-    public Rect MakeVisible( Visual visual, Rect rectangle )
-    {
-      return rectangle;
-    }
-
-    public void MouseWheelDown()
-    {
-      SetVerticalOffset( VerticalOffset + ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
-    }
-
-    public void MouseWheelLeft()
-    {
-      SetHorizontalOffset( HorizontalOffset - ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
-    }
-
-    public void MouseWheelRight()
-    {
-      SetHorizontalOffset( HorizontalOffset + ( 3d * ( ( Orientation == Orientation.Horizontal ) ? 1d : 16d ) ) );
-    }
-
-    public void MouseWheelUp()
-    {
-      SetVerticalOffset( VerticalOffset - ( SystemParameters.WheelScrollLines * ( ( Orientation == Orientation.Vertical ) ? 1d : 16d ) ) );
-    }
-
-    public void PageDown()
-    {
-      SetVerticalOffset( VerticalOffset + ViewportHeight );
-    }
-
-    public void PageLeft()
-    {
-      SetHorizontalOffset( HorizontalOffset - ViewportWidth );
-    }
-
-    public void PageRight()
-    {
-      SetHorizontalOffset( HorizontalOffset + ViewportWidth );
-    }
-
-    public void PageUp()
-    {
-      SetVerticalOffset( VerticalOffset - ViewportHeight );
-    }
-
-    public ScrollViewer ScrollOwner
-    {
-      get
-      {
-        return _scrollOwner;
-      }
-      set
-      {
-        if( _scrollOwner != value )
-        {
-          _scrollOwner = value;
-
-          ResetScrollInfo();
-        }
-      }
-    }
-
-    public void SetHorizontalOffset( double offset )
-    {
-      offset = ValidateInputOffset( offset, "HorizontalOffset" );
-
-      if( !AreVirtuallyEqual( offset, _offset.X ) )
-      {
-        _offset.X = offset;
-
-        InvalidateMeasure();
-      }
-    }
-
-    public void SetVerticalOffset( double offset )
-    {
-      offset = ValidateInputOffset( offset, "VerticalOffset" );
-
-      if( !AreVirtuallyEqual( offset, _offset.Y ) )
-      {
-        _offset.Y = offset;
-
-        InvalidateMeasure();
-      }
-    }
-
-    public double VerticalOffset
-    {
-      get
-      {
-        return _offset.Y;
-      }
-    }
-
-    public double ViewportHeight
-    {
-      get
-      {
-        return _viewport.Height;
-      }
-    }
-
-    public double ViewportWidth
-    {
-      get
-      {
-        return _viewport.Width;
-      }
-    }
-
-    private bool IsScrolling
-    {
-      get
-      {
-        return ( _scrollOwner != null );
-      }
-    }
-
-    private bool _allowHorizontal = false;
-    private bool _allowVertical = false;
-    private Vector _computedOffset = new Vector( 0d, 0d );
-    private Size _extent = new Size( 0, 0 );
-    private Vector _offset = new Vector( 0, 0 );
-    private ScrollViewer _scrollOwner = null;
-    private Size _viewport;
-    private Size _physicalViewport;
-
-    #endregion //IScrollInfo
-
-    #endregion //Interfaces
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs
deleted file mode 100644
index 145e2092..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  internal static partial class VisualStates
-  {
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
deleted file mode 100644
index 0a61abfe..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class WatermarkComboBox : ComboBox
-  {
-    #region Properties
-
-    #region Watermark
-
-    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( WatermarkComboBox ), new UIPropertyMetadata( null ) );
-    public object Watermark
-    {
-      get
-      {
-        return ( object )GetValue( WatermarkProperty );
-      }
-      set
-      {
-        SetValue( WatermarkProperty, value );
-      }
-    }
-
-    #endregion //Watermark
-
-    #region WatermarkTemplate
-
-    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( WatermarkComboBox ), new UIPropertyMetadata( null ) );
-    public DataTemplate WatermarkTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
-      }
-      set
-      {
-        SetValue( WatermarkTemplateProperty, value );
-      }
-    }
-
-    #endregion //WatermarkTemplate
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static WatermarkComboBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( WatermarkComboBox ), new FrameworkPropertyMetadata( typeof( WatermarkComboBox ) ) );
-    }
-
-    public WatermarkComboBox()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-
-
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
deleted file mode 100644
index f0f4b933..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,477 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 Template                                                       -->
-  <!-- =============================================================================== -->
-  <ControlTemplate x:Key="WatermarkComboBoxTemplate"
-                   TargetType="{x:Type local:WatermarkComboBox}">
-    <Grid x:Name="templateRoot"
-          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}}"
-             Margin="1"
-             PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
-             Placement="Bottom">
-        <Grid x:Name="DropDown"
-              MaxHeight="{TemplateBinding MaxDropDownHeight}"
-              MinWidth="{TemplateBinding ActualWidth}"
-              SnapsToDevicePixels="True">
-          <Border x:Name="DropDownBorder"
-                  BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                  BorderThickness="1"
-                  Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-            <ScrollViewer x:Name="DropDownScrollViewer">
-              <Grid x:Name="grid">
-                <Canvas x:Name="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="ItemsPresenter"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </Grid>
-            </ScrollViewer>
-          </Border>
-        </Grid>
-      </Popup>
-      <ToggleButton x:Name="toggleButton"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    Grid.ColumnSpan="2"
-                    IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
-        <ToggleButton.Style>
-          <Style TargetType="{x:Type ToggleButton}">
-            <Setter Property="OverridesDefaultStyle"
-                    Value="True" />
-            <Setter Property="IsTabStop"
-                    Value="False" />
-            <Setter Property="Focusable"
-                    Value="False" />
-            <Setter Property="ClickMode"
-                    Value="Press" />
-            <Setter Property="Template">
-              <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                  <Border x:Name="templateRoot"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          SnapsToDevicePixels="True">
-                    <Border.Background>
-                      <LinearGradientBrush EndPoint="0,1"
-                                           StartPoint="0,0">
-                        <GradientStop Color="#FFF0F0F0"
-                                      Offset="0" />
-                        <GradientStop Color="#FFE5E5E5"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.Background>
-                    <Border x:Name="splitBorder"
-                            BorderBrush="Transparent"
-                            BorderThickness="1"
-                            HorizontalAlignment="Right"
-                            Margin="0"
-                            SnapsToDevicePixels="True"
-                            Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                      <Path x:Name="Arrow"
-                            Data="F1M0,0L2.667,2.66665 5.3334,0 5.3334,-1.78168 2.6667,0.88501 0,-1.78168 0,0z"
-                            Fill="#FF606060"
-                            HorizontalAlignment="Center"
-                            Margin="0"
-                            VerticalAlignment="Center" />
-                    </Border>
-                  </Border>
-                  <ControlTemplate.Triggers>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsMouseOver"
-                             Value="True">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="Black" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFECF4FC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFDCECFC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF7EB4EA" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF7EB4EA" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFEBF4FC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFDCECFC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="#FF7EB4EA" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsPressed"
-                             Value="True">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="Black" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFDAECFC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFC4E0FC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF569DE5" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF569DE5" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFDAEBFC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFC4E0FC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="#FF569DE5" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsEnabled"
-                             Value="False">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="#FFBFBFBF" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="#FFF0F0F0" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FFD9D9D9" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FFBFBFBF" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                    </MultiDataTrigger>
-                  </ControlTemplate.Triggers>
-                </ControlTemplate>
-              </Setter.Value>
-            </Setter>
-          </Style>
-        </ToggleButton.Style>
-      </ToggleButton>
-      <ContentPresenter x:Name="contentPresenter"
-                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                        Content="{TemplateBinding SelectionBoxItem}"
-                        ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        IsHitTestVisible="False"
-                        Margin="{TemplateBinding Padding}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      <Border x:Name="Border"
-              Background="White"
-              Margin="{TemplateBinding BorderThickness}"
-              Visibility="Collapsed">
-        <TextBox x:Name="PART_EditableTextBox"
-                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                 IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                 Margin="{TemplateBinding Padding}"
-                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-          <TextBox.Style>
-            <Style TargetType="{x:Type TextBox}">
-              <Setter Property="OverridesDefaultStyle"
-                      Value="True" />
-              <Setter Property="AllowDrop"
-                      Value="True" />
-              <Setter Property="MinWidth"
-                      Value="0" />
-              <Setter Property="MinHeight"
-                      Value="0" />
-              <Setter Property="FocusVisualStyle"
-                      Value="{x:Null}" />
-              <Setter Property="Stylus.IsFlicksEnabled"
-                      Value="False" />
-              <Setter Property="Template">
-                <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type TextBox}">
-                    <ScrollViewer x:Name="PART_ContentHost"
-                                  Background="Transparent"
-                                  Focusable="False"
-                                  HorizontalScrollBarVisibility="Hidden"
-                                  VerticalScrollBarVisibility="Hidden" />
-                  </ControlTemplate>
-                </Setter.Value>
-              </Setter>
-            </Style>
-          </TextBox.Style>
-        </TextBox>
-      </Border>
-      <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>
-      <Trigger Property="HasItems"
-               Value="False">
-        <Setter Property="Height"
-                TargetName="DropDownBorder"
-                Value="95" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping"
-                     Value="True" />
-          <!--<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping"
-                          Value="False" />-->
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll"
-                Value="False" />
-      </MultiTrigger>
-      <Trigger Property="CanContentScroll"
-               SourceName="DropDownScrollViewer"
-               Value="False">
-        <Setter Property="Canvas.Top"
-                TargetName="OpaqueRect"
-                Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
-        <Setter Property="Canvas.Left"
-                TargetName="OpaqueRect"
-                Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
-      </Trigger>
-      <Trigger Property="IsEditable"
-               Value="True">
-        <Setter Property="IsTabStop"
-                Value="False" />
-        <Setter Property="Padding"
-                Value="2" />
-        <Setter Property="Visibility"
-                Value="Visible"
-                TargetName="Border" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="contentPresenter" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="Text"
-                     Value="" />
-        </MultiTrigger.Conditions>
-        <MultiTrigger.Setters>
-          <Setter Property="Visibility"
-                  TargetName="PART_WatermarkHost"
-                  Value="Visible" />
-        </MultiTrigger.Setters>
-      </MultiTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- =============================================================================== -->
-  <!-- WatermarkTextBox Style                                                          -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="WatermarkComboBox"
-         TargetType="{x:Type local:WatermarkComboBox}">
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Margin="2"
-                           SnapsToDevicePixels="True"
-                           Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                           StrokeThickness="1"
-                           StrokeDashArray="1 2" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background">
-      <Setter.Value>
-        <LinearGradientBrush EndPoint="0,1"
-                             StartPoint="0,0">
-          <GradientStop Color="#FFF0F0F0"
-                        Offset="0" />
-          <GradientStop Color="#FFE5E5E5"
-                        Offset="1" />
-        </LinearGradientBrush>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="BorderBrush"
-            Value="#FFACACAC" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="Padding"
-            Value="6,3,5,3" />
-    <Setter Property="ScrollViewer.CanContentScroll"
-            Value="True" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template"
-            Value="{StaticResource WatermarkComboBoxTemplate}" />
-  </Style>
-
-  <Style TargetType="{x:Type local:WatermarkComboBox}"
-         BasedOn="{StaticResource WatermarkComboBox}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
deleted file mode 100644
index f0f4b933..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,477 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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 Template                                                       -->
-  <!-- =============================================================================== -->
-  <ControlTemplate x:Key="WatermarkComboBoxTemplate"
-                   TargetType="{x:Type local:WatermarkComboBox}">
-    <Grid x:Name="templateRoot"
-          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}}"
-             Margin="1"
-             PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}"
-             Placement="Bottom">
-        <Grid x:Name="DropDown"
-              MaxHeight="{TemplateBinding MaxDropDownHeight}"
-              MinWidth="{TemplateBinding ActualWidth}"
-              SnapsToDevicePixels="True">
-          <Border x:Name="DropDownBorder"
-                  BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
-                  BorderThickness="1"
-                  Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-            <ScrollViewer x:Name="DropDownScrollViewer">
-              <Grid x:Name="grid">
-                <Canvas x:Name="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="ItemsPresenter"
-                                KeyboardNavigation.DirectionalNavigation="Contained"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </Grid>
-            </ScrollViewer>
-          </Border>
-        </Grid>
-      </Popup>
-      <ToggleButton x:Name="toggleButton"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Background="{TemplateBinding Background}"
-                    Grid.ColumnSpan="2"
-                    IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
-        <ToggleButton.Style>
-          <Style TargetType="{x:Type ToggleButton}">
-            <Setter Property="OverridesDefaultStyle"
-                    Value="True" />
-            <Setter Property="IsTabStop"
-                    Value="False" />
-            <Setter Property="Focusable"
-                    Value="False" />
-            <Setter Property="ClickMode"
-                    Value="Press" />
-            <Setter Property="Template">
-              <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                  <Border x:Name="templateRoot"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          SnapsToDevicePixels="True">
-                    <Border.Background>
-                      <LinearGradientBrush EndPoint="0,1"
-                                           StartPoint="0,0">
-                        <GradientStop Color="#FFF0F0F0"
-                                      Offset="0" />
-                        <GradientStop Color="#FFE5E5E5"
-                                      Offset="1" />
-                      </LinearGradientBrush>
-                    </Border.Background>
-                    <Border x:Name="splitBorder"
-                            BorderBrush="Transparent"
-                            BorderThickness="1"
-                            HorizontalAlignment="Right"
-                            Margin="0"
-                            SnapsToDevicePixels="True"
-                            Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                      <Path x:Name="Arrow"
-                            Data="F1M0,0L2.667,2.66665 5.3334,0 5.3334,-1.78168 2.6667,0.88501 0,-1.78168 0,0z"
-                            Fill="#FF606060"
-                            HorizontalAlignment="Center"
-                            Margin="0"
-                            VerticalAlignment="Center" />
-                    </Border>
-                  </Border>
-                  <ControlTemplate.Triggers>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsMouseOver"
-                             Value="True">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="Black" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFECF4FC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFDCECFC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF7EB4EA" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF7EB4EA" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFEBF4FC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFDCECFC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="#FF7EB4EA" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsPressed"
-                             Value="True">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="Black" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFDAECFC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFC4E0FC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF569DE5" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}"
-                                   Value="true" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FF569DE5" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder">
-                        <Setter.Value>
-                          <LinearGradientBrush EndPoint="0,1"
-                                               StartPoint="0,0">
-                            <GradientStop Color="#FFDAEBFC"
-                                          Offset="0" />
-                            <GradientStop Color="#FFC4E0FC"
-                                          Offset="1" />
-                          </LinearGradientBrush>
-                        </Setter.Value>
-                      </Setter>
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="#FF569DE5" />
-                    </MultiDataTrigger>
-                    <Trigger Property="IsEnabled"
-                             Value="False">
-                      <Setter Property="Fill"
-                              TargetName="Arrow"
-                              Value="#FFBFBFBF" />
-                    </Trigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="false" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="#FFF0F0F0" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FFD9D9D9" />
-                    </MultiDataTrigger>
-                    <MultiDataTrigger>
-                      <MultiDataTrigger.Conditions>
-                        <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
-                                   Value="false" />
-                        <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
-                                   Value="true" />
-                      </MultiDataTrigger.Conditions>
-                      <Setter Property="Background"
-                              TargetName="templateRoot"
-                              Value="White" />
-                      <Setter Property="BorderBrush"
-                              TargetName="templateRoot"
-                              Value="#FFBFBFBF" />
-                      <Setter Property="Background"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                      <Setter Property="BorderBrush"
-                              TargetName="splitBorder"
-                              Value="Transparent" />
-                    </MultiDataTrigger>
-                  </ControlTemplate.Triggers>
-                </ControlTemplate>
-              </Setter.Value>
-            </Setter>
-          </Style>
-        </ToggleButton.Style>
-      </ToggleButton>
-      <ContentPresenter x:Name="contentPresenter"
-                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
-                        Content="{TemplateBinding SelectionBoxItem}"
-                        ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
-                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        IsHitTestVisible="False"
-                        Margin="{TemplateBinding Padding}"
-                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      <Border x:Name="Border"
-              Background="White"
-              Margin="{TemplateBinding BorderThickness}"
-              Visibility="Collapsed">
-        <TextBox x:Name="PART_EditableTextBox"
-                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                 IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                 Margin="{TemplateBinding Padding}"
-                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-          <TextBox.Style>
-            <Style TargetType="{x:Type TextBox}">
-              <Setter Property="OverridesDefaultStyle"
-                      Value="True" />
-              <Setter Property="AllowDrop"
-                      Value="True" />
-              <Setter Property="MinWidth"
-                      Value="0" />
-              <Setter Property="MinHeight"
-                      Value="0" />
-              <Setter Property="FocusVisualStyle"
-                      Value="{x:Null}" />
-              <Setter Property="Stylus.IsFlicksEnabled"
-                      Value="False" />
-              <Setter Property="Template">
-                <Setter.Value>
-                  <ControlTemplate TargetType="{x:Type TextBox}">
-                    <ScrollViewer x:Name="PART_ContentHost"
-                                  Background="Transparent"
-                                  Focusable="False"
-                                  HorizontalScrollBarVisibility="Hidden"
-                                  VerticalScrollBarVisibility="Hidden" />
-                  </ControlTemplate>
-                </Setter.Value>
-              </Setter>
-            </Style>
-          </TextBox.Style>
-        </TextBox>
-      </Border>
-      <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>
-      <Trigger Property="HasItems"
-               Value="False">
-        <Setter Property="Height"
-                TargetName="DropDownBorder"
-                Value="95" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping"
-                     Value="True" />
-          <!--<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping"
-                          Value="False" />-->
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll"
-                Value="False" />
-      </MultiTrigger>
-      <Trigger Property="CanContentScroll"
-               SourceName="DropDownScrollViewer"
-               Value="False">
-        <Setter Property="Canvas.Top"
-                TargetName="OpaqueRect"
-                Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
-        <Setter Property="Canvas.Left"
-                TargetName="OpaqueRect"
-                Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
-      </Trigger>
-      <Trigger Property="IsEditable"
-               Value="True">
-        <Setter Property="IsTabStop"
-                Value="False" />
-        <Setter Property="Padding"
-                Value="2" />
-        <Setter Property="Visibility"
-                Value="Visible"
-                TargetName="Border" />
-        <Setter Property="Visibility"
-                Value="Collapsed"
-                TargetName="contentPresenter" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsKeyboardFocusWithin"
-                     Value="False" />
-          <Condition Property="Text"
-                     Value="" />
-        </MultiTrigger.Conditions>
-        <MultiTrigger.Setters>
-          <Setter Property="Visibility"
-                  TargetName="PART_WatermarkHost"
-                  Value="Visible" />
-        </MultiTrigger.Setters>
-      </MultiTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- =============================================================================== -->
-  <!-- WatermarkTextBox Style                                                          -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="WatermarkComboBox"
-         TargetType="{x:Type local:WatermarkComboBox}">
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Margin="2"
-                           SnapsToDevicePixels="True"
-                           Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                           StrokeThickness="1"
-                           StrokeDashArray="1 2" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background">
-      <Setter.Value>
-        <LinearGradientBrush EndPoint="0,1"
-                             StartPoint="0,0">
-          <GradientStop Color="#FFF0F0F0"
-                        Offset="0" />
-          <GradientStop Color="#FFE5E5E5"
-                        Offset="1" />
-        </LinearGradientBrush>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="BorderBrush"
-            Value="#FFACACAC" />
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
-    <Setter Property="BorderThickness"
-            Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility"
-            Value="Auto" />
-    <Setter Property="Padding"
-            Value="6,3,5,3" />
-    <Setter Property="ScrollViewer.CanContentScroll"
-            Value="True" />
-    <Setter Property="WatermarkTemplate"
-            Value="{StaticResource DefaultWatermarkTemplate}" />
-    <Setter Property="Template"
-            Value="{StaticResource WatermarkComboBoxTemplate}" />
-  </Style>
-
-  <Style TargetType="{x:Type local:WatermarkComboBox}"
-         BasedOn="{StaticResource WatermarkComboBox}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
deleted file mode 100644
index 79249aad..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-using System.Security;
-using System.Windows;
-using System.Linq;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System;
-using System.Runtime.InteropServices;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class WatermarkPasswordBox : WatermarkTextBox
-  {
-    #region Members
-
-    private int _newCaretIndex = -1;
-
-    #endregion
-
-    #region Properties
-
-    #region Password
-
-    public string Password
-    {
-      [SecuritySafeCritical]
-      get
-      {
-        string passwordString;
-        var valuePtr = Marshal.SecureStringToBSTR( this.SecurePassword );
-        try
-        {
-          passwordString = Marshal.PtrToStringUni( valuePtr );
-        }
-        finally
-        {
-          Marshal.ZeroFreeBSTR( valuePtr );
-        }
-        return passwordString;
-      }
-      set
-      {
-        if( value == null )
-        {
-          value = string.Empty;
-        }
-        this.SecurePassword = new SecureString();
-        for( int i = 0; i < value.Length; ++i )
-        {
-          this.SecurePassword.AppendChar( value[ i ] );
-        }
-
-        // Internal changes to Password property will have a _newCaretIndex > 0.
-        this.SyncTextPassword( _newCaretIndex );
-
-        this.RaiseEvent( new RoutedEventArgs( PasswordChangedEvent, this ) );
-      }
-    }
-
-    #endregion
-
-    #region PasswordChar
-
-    public static readonly DependencyProperty PasswordCharProperty = DependencyProperty.Register( "PasswordChar", typeof( char ), typeof( WatermarkPasswordBox )
-      , new UIPropertyMetadata( '\u25CF', OnPasswordCharChanged ) ); //default is black bullet
-
-    public char PasswordChar
-    {
-      get
-      {
-        return (char)GetValue( PasswordCharProperty );
-      }
-
-      set
-      {
-        SetValue( PasswordCharProperty, value );
-      }
-    }
-
-    private static void OnPasswordCharChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      var watermarkPasswordBox = o as WatermarkPasswordBox;
-      if( watermarkPasswordBox != null )
-      {
-        watermarkPasswordBox.OnPasswordCharChanged( (char)e.OldValue, (char)e.NewValue );
-      }
-    }
-
-    protected virtual void OnPasswordCharChanged( char oldValue, char newValue )
-    {
-      this.SyncTextPassword( this.CaretIndex );
-    }
-
-    #endregion
-
-    #region SecurePassword
-
-    public SecureString SecurePassword
-    {
-      get;
-      private set;
-    }
-
-    #endregion SecurePassword
-
-    #endregion //Properties
-
-    #region Constructors
-
-    public WatermarkPasswordBox()
-    {
-      this.Password = string.Empty;
-      this.IsUndoEnabled = false;
-      this.UndoLimit = 0;
-
-      CommandManager.AddPreviewCanExecuteHandler( this, OnPreviewCanExecuteCommand );
-      DataObject.AddPastingHandler( this, OnPaste );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    [SecuritySafeCritical]
-    protected override void OnPreviewTextInput( TextCompositionEventArgs e )
-    {
-      this.PasswordInsert( e.Text, this.CaretIndex );
-
-      e.Handled = true; //Handle to prevent TextChanged when OnPreviewTextInput exist
-
-      base.OnPreviewTextInput( e );
-    }
-
-    [SecuritySafeCritical]
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      // Keys not detected by OnPreviewTextInput
-      switch( e.Key )
-      {
-        case Key.Space:
-          this.PasswordInsert( " ", this.CaretIndex );
-          e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exist
-          break;
-        case Key.Back:
-          // With a selection, delete from CaretIndex. Without a selection delete the character before the CaretIndex.
-          this.PasswordRemove( (this.SelectedText.Length > 0) ? this.CaretIndex : this.CaretIndex - 1 );
-          e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exists
-          break;
-        case Key.Delete:
-          this.PasswordRemove( this.CaretIndex );
-          e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exist
-          break;
-        case Key.V:
-          if( (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control )
-          {
-            if( Clipboard.ContainsText() )
-            {
-              this.PasswordInsert( Clipboard.GetText(), this.CaretIndex );
-              e.Handled = true; //Handle to prevent TextChanged when OnPreviewKeyDown exist
-            }
-          }
-          break;
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnTextChanged( TextChangedEventArgs e )
-    {
-      base.OnTextChanged( e );
-
-      if( this.Text.Length != this.Password.Length )
-      {
-        // When Clear() or Cut() methods are called, we need to update the Password property to empty.
-        if( this.Text == "" )
-        {
-          this.SetPassword( "", 0 );
-        }
-        // When AppendText() method is called, we need to reset the Text property to prevent adding text.
-        else
-        {
-          this.SyncTextPassword( this.Password.Length );
-        }
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Event
-
-    public static readonly RoutedEvent PasswordChangedEvent = EventManager.RegisterRoutedEvent( "PasswordChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler )
-      , typeof( WatermarkPasswordBox ) );
-    public event RoutedEventHandler PasswordChanged
-    {
-      add
-      {
-        AddHandler( PasswordChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PasswordChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region Event Handlers
-
-    [ SecuritySafeCritical]
-    private void OnPaste( object sender, DataObjectPastingEventArgs e )
-    {
-      //Pasting something that is not text
-      if( !e.SourceDataObject.GetDataPresent( DataFormats.UnicodeText, true ) )
-        return;
-
-      var text = e.SourceDataObject.GetData( DataFormats.UnicodeText ) as string;
-      if( text != null )
-      {
-        this.PasswordInsert( text, this.CaretIndex );
-      }
-      e.CancelCommand(); //Cancel to prevent TextChanged
-    }
-
-    private void OnPreviewCanExecuteCommand( object sender, CanExecuteRoutedEventArgs e )
-    {
-      //Will not execute these actions
-      if( e.Command == ApplicationCommands.Copy ||
-          e.Command == ApplicationCommands.Cut ||
-          e.Command == ApplicationCommands.Undo )
-      {
-        e.CanExecute = false;
-        e.Handled = true;  //Handle to prevent actions
-      }
-    }
-
-    #endregion
-
-    #region Private Methods
-
-    [SecurityCritical]
-    private void PasswordInsert( string text, int index )
-    {
-      if( text == null )
-        return;
-      if( (index < 0) || (index > this.Password.Length) )
-        return;
-
-      //If there is a selection, remove it first
-      if( this.SelectedText.Length > 0 )
-      {
-        this.PasswordRemove( index );
-      }
-
-      var newPassword = this.Password;
-      for( int i = 0; i < text.Length; ++i )
-      {
-        // MaxLength == 0 is no limit
-        if( (this.MaxLength == 0) || (newPassword.Length < this.MaxLength) )
-        {
-          newPassword = newPassword.Insert( index++, text[ i ].ToString() );
-        }
-      }
-      this.SetPassword( newPassword, index );
-    }
-
-    [SecurityCritical]
-    private void PasswordRemove( int index )
-    {
-      if( (index < 0) || (index >= this.Password.Length) )
-        return;
-
-      if( this.SelectedText.Length > 0 )
-      {
-        var newPassword = this.Password;
-        for( int i = 0; i < this.SelectedText.Length; ++i )
-        {
-          newPassword = newPassword.Remove( index, 1 );          
-        }
-        this.SetPassword( newPassword, index );
-      }
-      else
-      {
-        var newPassword = this.Password.Remove( index, 1 );
-        this.SetPassword( newPassword, index );
-      }
-    }
-
-    private void SetPassword( string password, int caretIndex )
-    {
-      _newCaretIndex = caretIndex;
-      this.Password = password;
-      _newCaretIndex = -1;
-    }
-
-    private void SyncTextPassword( int nextCarretIndex )
-    {
-      var sb = new StringBuilder();
-      this.Text = sb.Append( Enumerable.Repeat(this.PasswordChar, this.Password.Length).ToArray() ).ToString();
-      //set CaretIndex after Text is changed
-      this.CaretIndex = Math.Max( nextCarretIndex, 0 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
deleted file mode 100644
index 58483022..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-
-namespace Xceed.Wpf.Toolkit
-{
-#pragma warning disable 0618
-
-  public class WatermarkTextBox : AutoSelectTextBox
-  {
-    #region Properties
-
-    #region KeepWatermarkOnGotFocus
-
-    public static readonly DependencyProperty KeepWatermarkOnGotFocusProperty = DependencyProperty.Register( "KeepWatermarkOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new UIPropertyMetadata( false ) );
-    public bool KeepWatermarkOnGotFocus
-    {
-      get
-      {
-        return ( bool )GetValue( KeepWatermarkOnGotFocusProperty );
-      }
-      set
-      {
-        SetValue( KeepWatermarkOnGotFocusProperty, value );
-      }
-    }
-
-    #endregion //KeepWatermarkOnGotFocus
-
-    #region Watermark
-
-    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
-    public object Watermark
-    {
-      get
-      {
-        return ( object )GetValue( WatermarkProperty );
-      }
-      set
-      {
-        SetValue( WatermarkProperty, value );
-      }
-    }
-
-    #endregion //Watermark
-
-    #region WatermarkTemplate
-
-    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
-    public DataTemplate WatermarkTemplate
-    {
-      get
-      {
-        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
-      }
-      set
-      {
-        SetValue( WatermarkTemplateProperty, value );
-      }
-    }
-
-    #endregion //WatermarkTemplate
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static WatermarkTextBox()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( WatermarkTextBox ), new FrameworkPropertyMetadata( typeof( WatermarkTextBox ) ) );
-    }
-
-    public WatermarkTextBox()
-    {
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-
-
-
-    #endregion
-  }
-
-#pragma warning restore 0618
-}
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
deleted file mode 100644
index 700d3c07..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,167 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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>
-
-  <LinearGradientBrush x:Key="TextBox_MouseOver"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#5794BF"
-                  Offset="0.05" />
-    <GradientStop Color="#B7D5EA"
-                  Offset="0.07" />
-    <GradientStop Color="#C7E2F1"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="TextBox_Focused"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#3D7BAD"
-                  Offset="0.05" />
-    <GradientStop Color="#A4C9E3"
-                  Offset="0.07" />
-    <GradientStop Color="#B7D9ED"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-
-  <!-- =============================================================================== -->
-  <!-- WatermarkTextBox                                                                -->
-  <!-- =============================================================================== -->
-
-  <Style x:Key="WatermarkTextBox"
-         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}">
-              <Grid>
-                <ScrollViewer x:Name="PART_ContentHost"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                </ScrollViewer>
-                <ContentPresenter x:Name="PART_WatermarkHost"
-                                  Content="{TemplateBinding Watermark}"
-                                  ContentTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultWatermarkTemplate}}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  IsHitTestVisible="False"
-                                  Margin="{TemplateBinding Padding}"
-                                  Visibility="Collapsed" />
-              </Grid>
-            </Border>
-            <Border x:Name="MouseOverVisual"
-                    Opacity="0"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{StaticResource TextBox_MouseOver}"
-                    CornerRadius="1" />
-            <Border x:Name="FocusVisual"
-                    Opacity="0"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{StaticResource TextBox_Focused}"
-                    CornerRadius="1" />
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="KeepWatermarkOnGotFocus"
-                           Value="False" />
-                <Condition Property="IsFocused"
-                           Value="False" />
-                <Condition Property="Text"
-                           Value="" />
-              </MultiTrigger.Conditions>
-              <MultiTrigger.Setters>
-                <Setter Property="Visibility"
-                        TargetName="PART_WatermarkHost"
-                        Value="Visible" />
-              </MultiTrigger.Setters>
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="KeepWatermarkOnGotFocus"
-                           Value="True" />
-                <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>
-
-  <Style TargetType="{x:Type local:WatermarkTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}" />
-
-</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
deleted file mode 100644
index 2e0c4f29..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
+++ /dev/null
@@ -1,177 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-  <LinearGradientBrush x:Key="TextBoxBorder"
-                       EndPoint="0,20"
-                       MappingMode="Absolute"
-                       StartPoint="0,0">
-    <GradientStop Color="#ABADB3"
-                  Offset="0.05" />
-    <GradientStop Color="#E2E3EA"
-                  Offset="0.07" />
-    <GradientStop Color="#E3E9EF"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="TextBox_MouseOver"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#5794BF"
-                  Offset="0.05" />
-    <GradientStop Color="#B7D5EA"
-                  Offset="0.07" />
-    <GradientStop Color="#C7E2F1"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="TextBox_Focused"
-                       EndPoint="0,1"
-                       StartPoint="0,0">
-    <GradientStop Color="#3D7BAD"
-                  Offset="0.05" />
-    <GradientStop Color="#A4C9E3"
-                  Offset="0.07" />
-    <GradientStop Color="#B7D9ED"
-                  Offset="1" />
-  </LinearGradientBrush>
-
-  <SolidColorBrush x:Key="TextBox_DisabledBorder"
-                   Color="#ADB2B5" />
-  <SolidColorBrush x:Key="TextBox_DisabledBackground"
-                   Color="#F4F4F4" />
-
-  <DataTemplate x:Key="DefaultWatermarkTemplate">
-    <ContentControl Content="{Binding}"
-                    Foreground="Gray"
-                    Focusable="False" />
-  </DataTemplate>
-
-  <Style x:Key="WatermarkTextBox"
-         TargetType="{x:Type local:WatermarkTextBox}">
-    <Setter Property="Foreground"
-            Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
-    <Setter Property="Background"
-            Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-    <Setter Property="BorderBrush"
-            Value="{StaticResource TextBoxBorder}" />
-    <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="1"
-                    Background="{TemplateBinding Background}">
-              <Grid>
-                <ScrollViewer x:Name="PART_ContentHost"
-                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" >
-                </ScrollViewer>
-                <ContentPresenter x:Name="PART_WatermarkHost"
-                                  Content="{TemplateBinding Watermark}"
-                                  ContentTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={StaticResource DefaultWatermarkTemplate}}"
-                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                  IsHitTestVisible="False"
-                                  Margin="{TemplateBinding Padding}"
-                                  Visibility="Collapsed" />
-              </Grid>
-            </Border>
-            <Border x:Name="MouseOverVisual"
-                    Opacity="0"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{StaticResource TextBox_MouseOver}"
-                    CornerRadius="1" />
-            <Border x:Name="FocusVisual"
-                    Opacity="0"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    BorderBrush="{StaticResource TextBox_Focused}"
-                    CornerRadius="1" />
-
-          </Grid>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="KeepWatermarkOnGotFocus"
-                           Value="False" />
-                <Condition Property="IsFocused"
-                           Value="False" />
-                <Condition Property="Text"
-                           Value="" />
-              </MultiTrigger.Conditions>
-              <MultiTrigger.Setters>
-                <Setter Property="Visibility"
-                        TargetName="PART_WatermarkHost"
-                        Value="Visible" />
-              </MultiTrigger.Setters>
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="KeepWatermarkOnGotFocus"
-                           Value="True" />
-                <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="MouseOverVisual"
-                      Property="Opacity"
-                      Value="1" />
-            </Trigger>
-            <Trigger Property="IsFocused"
-                     Value="True">
-              <Setter TargetName="FocusVisual"
-                      Property="Opacity"
-                      Value="1" />
-            </Trigger>
-            <Trigger Property="IsEnabled"
-                     Value="false">
-              <Setter Property="Foreground"
-                      Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <Style TargetType="{x:Type local:WatermarkTextBox}"
-         BasedOn="{StaticResource WatermarkTextBox}" />
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
deleted file mode 100644
index 6daa0ed2..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
+++ /dev/null
@@ -1,691 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Specialized;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Interop;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class Wizard : ItemsControl
-  {
-    #region Properties
-
-    public static readonly DependencyProperty BackButtonContentProperty = DependencyProperty.Register( "BackButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "< Back" ) );
-    public object BackButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( BackButtonContentProperty );
-      }
-      set
-      {
-        SetValue( BackButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility BackButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( BackButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( BackButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CanCancel
-    {
-      get
-      {
-        return ( bool )GetValue( CanCancelProperty );
-      }
-      set
-      {
-        SetValue( CanCancelProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CancelButtonClosesWindowProperty = DependencyProperty.Register( "CancelButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CancelButtonClosesWindow
-    {
-      get
-      {
-        return ( bool )GetValue( CancelButtonClosesWindowProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonClosesWindowProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Cancel" ) );
-    public object CancelButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( CancelButtonContentProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility CancelButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( CancelButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( false ) );
-    public bool CanFinish
-    {
-      get
-      {
-        return ( bool )GetValue( CanFinishProperty );
-      }
-      set
-      {
-        SetValue( CanFinishProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CanHelp
-    {
-      get
-      {
-        return ( bool )GetValue( CanHelpProperty );
-      }
-      set
-      {
-        SetValue( CanHelpProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CanSelectNextPage
-    {
-      get
-      {
-        return ( bool )GetValue( CanSelectNextPageProperty );
-      }
-      set
-      {
-        SetValue( CanSelectNextPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool CanSelectPreviousPage
-    {
-      get
-      {
-        return ( bool )GetValue( CanSelectPreviousPageProperty );
-      }
-      set
-      {
-        SetValue( CanSelectPreviousPageProperty, value );
-      }
-    }
-
-    #region CurrentPage
-
-    public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register( "CurrentPage", typeof( WizardPage ), typeof( Wizard ), new UIPropertyMetadata( null, OnCurrentPageChanged ) );
-    public WizardPage CurrentPage
-    {
-      get
-      {
-        return ( WizardPage )GetValue( CurrentPageProperty );
-      }
-      set
-      {
-        SetValue( CurrentPageProperty, value );
-      }
-    }
-
-    private static void OnCurrentPageChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Wizard wizard = o as Wizard;
-      if( wizard != null )
-        wizard.OnCurrentPageChanged( ( WizardPage )e.OldValue, ( WizardPage )e.NewValue );
-    }
-
-    protected virtual void OnCurrentPageChanged( WizardPage oldValue, WizardPage newValue )
-    {
-      RaiseRoutedEvent( Wizard.PageChangedEvent );
-    }
-
-    #endregion //CurrentPage
-
-    public static readonly DependencyProperty ExteriorPanelMinWidthProperty = DependencyProperty.Register( "ExteriorPanelMinWidth", typeof( double ), typeof( Wizard ), new UIPropertyMetadata( 165.0 ) );
-    public double ExteriorPanelMinWidth
-    {
-      get
-      {
-        return ( double )GetValue( ExteriorPanelMinWidthProperty );
-      }
-      set
-      {
-        SetValue( ExteriorPanelMinWidthProperty, value );
-      }
-    }
-
-
-    public static readonly DependencyProperty FinishButtonClosesWindowProperty = DependencyProperty.Register( "FinishButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
-    public bool FinishButtonClosesWindow
-    {
-      get
-      {
-        return ( bool )GetValue( FinishButtonClosesWindowProperty );
-      }
-      set
-      {
-        SetValue( FinishButtonClosesWindowProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty FinishButtonContentProperty = DependencyProperty.Register( "FinishButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Finish" ) );
-    public object FinishButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( FinishButtonContentProperty );
-      }
-      set
-      {
-        SetValue( FinishButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Collapsed ) );
-    public Visibility FinishButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( FinishButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( FinishButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HelpButtonContentProperty = DependencyProperty.Register( "HelpButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Help" ) );
-    public object HelpButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( HelpButtonContentProperty );
-      }
-      set
-      {
-        SetValue( HelpButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility HelpButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( HelpButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( HelpButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NextButtonContentProperty = DependencyProperty.Register( "NextButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Next >" ) );
-    public object NextButtonContent
-    {
-      get
-      {
-        return ( object )GetValue( NextButtonContentProperty );
-      }
-      set
-      {
-        SetValue( NextButtonContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
-    public Visibility NextButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( NextButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( NextButtonVisibilityProperty, value );
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static Wizard()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( Wizard ), new FrameworkPropertyMetadata( typeof( Wizard ) ) );
-    }
-
-    public Wizard()
-    {
-      CommandBindings.Add( new CommandBinding( WizardCommands.Cancel, ExecuteCancelWizard, CanExecuteCancelWizard ) );
-      CommandBindings.Add( new CommandBinding( WizardCommands.Finish, ExecuteFinishWizard, CanExecuteFinishWizard ) );
-      CommandBindings.Add( new CommandBinding( WizardCommands.Help, ExecuteRequestHelp, CanExecuteRequestHelp ) );
-      CommandBindings.Add( new CommandBinding( WizardCommands.NextPage, ExecuteSelectNextPage, CanExecuteSelectNextPage ) );
-      CommandBindings.Add( new CommandBinding( WizardCommands.PreviousPage, ExecuteSelectPreviousPage, CanExecuteSelectPreviousPage ) );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override DependencyObject GetContainerForItemOverride()
-    {
-      return new WizardPage();
-    }
-
-    protected override bool IsItemItsOwnContainerOverride( object item )
-    {
-      return ( item is WizardPage );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-
-      if( Items.Count > 0 && CurrentPage == null )
-        CurrentPage = Items[ 0 ] as WizardPage;
-    }
-
-    protected override void OnItemsChanged( NotifyCollectionChangedEventArgs e )
-    {
-      base.OnItemsChanged( e );
-
-      foreach( object o in this.Items )
-      {
-        if( !( o is WizardPage ) )
-          throw new NotSupportedException( "Wizard should only contain WizardPages." );
-      }
-
-      if( Items.Count > 0 && CurrentPage == null )
-        CurrentPage = Items[ 0 ] as WizardPage;
-    }
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( ( e.Property.Name == "CanSelectNextPage" ) || ( e.Property.Name == "CanHelp" ) || ( e.Property.Name == "CanFinish" )
-        || ( e.Property.Name == "CanCancel" ) || ( e.Property.Name == "CanSelectPreviousPage" ) )
-      {
-        CommandManager.InvalidateRequerySuggested();
-      }
-    }
-
-
-
-
-    #endregion //Base Class Overrides
-
-    #region Commands
-
-    private void ExecuteCancelWizard( object sender, ExecutedRoutedEventArgs e )
-    {
-      RaiseRoutedEvent( Wizard.CancelEvent );
-
-      if( CancelButtonClosesWindow )
-        CloseParentWindow( false );
-    }
-
-    private void CanExecuteCancelWizard( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanCancel.HasValue )
-          e.CanExecute = CurrentPage.CanCancel.Value;
-        else
-          e.CanExecute = CanCancel;
-      }
-    }
-
-    private void ExecuteFinishWizard( object sender, ExecutedRoutedEventArgs e )
-    {
-      var eventArgs = new CancelRoutedEventArgs( Wizard.FinishEvent );
-      this.RaiseEvent( eventArgs );
-      if( eventArgs.Cancel )
-        return;
-
-      if( FinishButtonClosesWindow )
-        CloseParentWindow( true );
-    }
-
-    private void CanExecuteFinishWizard( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanFinish.HasValue )
-          e.CanExecute = CurrentPage.CanFinish.Value;
-        else
-          e.CanExecute = CanFinish;
-      }
-    }
-
-    private void ExecuteRequestHelp( object sender, ExecutedRoutedEventArgs e )
-    {
-      RaiseRoutedEvent( Wizard.HelpEvent );
-    }
-
-    private void CanExecuteRequestHelp( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanHelp.HasValue )
-          e.CanExecute = CurrentPage.CanHelp.Value;
-        else
-          e.CanExecute = CanHelp;
-      }
-    }
-
-    private void ExecuteSelectNextPage( object sender, ExecutedRoutedEventArgs e )
-    {
-      WizardPage nextPage = null;
-
-      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;
-        else
-        {
-          //no next page defined use index
-          var currentIndex = Items.IndexOf( CurrentPage );
-          var nextPageIndex = currentIndex + 1;
-          if( nextPageIndex < Items.Count )
-            nextPage = Items[ nextPageIndex ] as WizardPage;
-        }
-      }
-
-      CurrentPage = nextPage;
-    }
-
-    private void CanExecuteSelectNextPage( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanSelectNextPage.HasValue ) //check to see if page has overriden default behavior
-        {
-          if( CurrentPage.CanSelectNextPage.Value )
-            e.CanExecute = NextPageExists();
-        }
-        else if( CanSelectNextPage )
-          e.CanExecute = NextPageExists();
-      }
-    }
-
-    private void ExecuteSelectPreviousPage( object sender, ExecutedRoutedEventArgs e )
-    {
-      WizardPage previousPage = null;
-
-      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;
-        else
-        {
-          //no previous page defined so use index
-          var currentIndex = Items.IndexOf( CurrentPage );
-          var previousPageIndex = currentIndex - 1;
-          if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
-            previousPage = Items[ previousPageIndex ] as WizardPage;
-        }
-      }
-
-      CurrentPage = previousPage;
-    }
-
-    private void CanExecuteSelectPreviousPage( object sender, CanExecuteRoutedEventArgs e )
-    {
-      if( CurrentPage != null )
-      {
-        if( CurrentPage.CanSelectPreviousPage.HasValue ) //check to see if page has overriden default behavior
-        {
-          if( CurrentPage.CanSelectPreviousPage.Value )
-            e.CanExecute = PreviousPageExists();
-        }
-        else if( CanSelectPreviousPage )
-          e.CanExecute = PreviousPageExists();
-      }
-    }
-
-    #endregion //Commands
-
-    #region Events
-
-    #region Cancel Event
-
-    public static readonly RoutedEvent CancelEvent = EventManager.RegisterRoutedEvent( "Cancel", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
-    public event RoutedEventHandler Cancel
-    {
-      add
-      {
-        AddHandler( CancelEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( CancelEvent, value );
-      }
-    }
-
-    #endregion //Cancel Event
-
-    #region PageChanged Event
-
-    public static readonly RoutedEvent PageChangedEvent = EventManager.RegisterRoutedEvent( "PageChanged", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
-    public event RoutedEventHandler PageChanged
-    {
-      add
-      {
-        AddHandler( PageChangedEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( PageChangedEvent, value );
-      }
-    }
-
-    #endregion //PageChanged Event
-
-    #region Finish Event
-
-    public static readonly RoutedEvent FinishEvent = EventManager.RegisterRoutedEvent( "Finish", RoutingStrategy.Bubble, typeof( CancelRoutedEventHandler ), typeof( Wizard ) );
-    public event CancelRoutedEventHandler Finish
-    {
-      add
-      {
-        AddHandler( FinishEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( FinishEvent, value );
-      }
-    }
-
-    #endregion //Finish Event
-
-    #region Help Event
-
-    public static readonly RoutedEvent HelpEvent = EventManager.RegisterRoutedEvent( "Help", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
-    public event RoutedEventHandler Help
-    {
-      add
-      {
-        AddHandler( HelpEvent, value );
-      }
-      remove
-      {
-        RemoveHandler( HelpEvent, value );
-      }
-    }
-
-    #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
-
-    private void CloseParentWindow( bool dialogResult )
-    {
-      Window window = Window.GetWindow( this );
-      if( window != null )
-      {
-        //we can only set the DialogResult if the window was opened as modal with the ShowDialog() method. Otherwise an exception would occur
-        if( ComponentDispatcher.IsThreadModal )
-          window.DialogResult = dialogResult;
-
-        window.Close();
-      }
-    }
-
-    private bool NextPageExists()
-    {
-      bool exists = false;
-
-      if( CurrentPage.NextPage != null ) //check to see if a next page has been specified
-        exists = true;
-      else
-      {
-        //lets use an index to find the next page
-        var currentIndex = Items.IndexOf( CurrentPage );
-        var nextPageIndex = currentIndex + 1;
-        if( nextPageIndex < Items.Count )
-          exists = true;
-      }
-
-      return exists;
-    }
-
-    private bool PreviousPageExists()
-    {
-      bool exists = false;
-
-      if( CurrentPage.PreviousPage != null ) //check to see if a previous page has been specified
-        exists = true;
-      else
-      {
-        //lets use an index to find the next page
-        var currentIndex = Items.IndexOf( CurrentPage );
-        var previousPageIndex = currentIndex - 1;
-        if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
-          exists = true;
-      }
-
-      return exists;
-    }
-
-    private void RaiseRoutedEvent( RoutedEvent routedEvent )
-    {
-      RoutedEventArgs newEventArgs = new RoutedEventArgs( routedEvent, this );
-      base.RaiseEvent( newEventArgs );
-    }
-
-    #endregion //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
deleted file mode 100644
index 06931d6f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public static class WizardCommands
-  {
-
-    private static RoutedCommand _cancelCommand = new RoutedCommand();
-    public static RoutedCommand Cancel
-    {
-      get
-      {
-        return _cancelCommand;
-      }
-    }
-
-    private static RoutedCommand _finishCommand = new RoutedCommand();
-    public static RoutedCommand Finish
-    {
-      get
-      {
-        return _finishCommand;
-      }
-    }
-
-    private static RoutedCommand _helpCommand = new RoutedCommand();
-    public static RoutedCommand Help
-    {
-      get
-      {
-        return _helpCommand;
-      }
-    }
-
-    private static RoutedCommand _nextPageCommand = new RoutedCommand();
-    public static RoutedCommand NextPage
-    {
-      get
-      {
-        return _nextPageCommand;
-      }
-    }
-
-    private static RoutedCommand _previousPageCommand = new RoutedCommand();
-    public static RoutedCommand PreviousPage
-    {
-      get
-      {
-        return _previousPageCommand;
-      }
-    }
-
-    private static RoutedCommand _selectPageCommand = new RoutedCommand();
-    public static RoutedCommand SelectPage
-    {
-      get
-      {
-        return _selectPageCommand;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
deleted file mode 100644
index 635e683d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
+++ /dev/null
@@ -1,362 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Windows.Controls;
-using System.Windows.Media;
-using System;
-using System.Windows.Input;
-
-namespace Xceed.Wpf.Toolkit
-{
-  public class WizardPage : ContentControl
-  {
-    #region Properties
-
-    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility BackButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( BackButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( BackButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanCancel
-    {
-      get
-      {
-        return ( bool? )GetValue( CanCancelProperty );
-      }
-      set
-      {
-        SetValue( CanCancelProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility CancelButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( CancelButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( CancelButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanFinish
-    {
-      get
-      {
-        return ( bool? )GetValue( CanFinishProperty );
-      }
-      set
-      {
-        SetValue( CanFinishProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanHelp
-    {
-      get
-      {
-        return ( bool? )GetValue( CanHelpProperty );
-      }
-      set
-      {
-        SetValue( CanHelpProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanSelectNextPage
-    {
-      get
-      {
-        return ( bool? )GetValue( CanSelectNextPageProperty );
-      }
-      set
-      {
-        SetValue( CanSelectNextPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public bool? CanSelectPreviousPage
-    {
-      get
-      {
-        return ( bool? )GetValue( CanSelectPreviousPageProperty );
-      }
-      set
-      {
-        SetValue( CanSelectPreviousPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register( "Description", typeof( string ), typeof( WizardPage ) );
-    public string Description
-    {
-      get
-      {
-        return ( string )base.GetValue( DescriptionProperty );
-      }
-      set
-      {
-        base.SetValue( DescriptionProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ExteriorPanelBackgroundProperty = DependencyProperty.Register( "ExteriorPanelBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public Brush ExteriorPanelBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( ExteriorPanelBackgroundProperty );
-      }
-      set
-      {
-        SetValue( ExteriorPanelBackgroundProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ExteriorPanelContentProperty = DependencyProperty.Register( "ExteriorPanelContent", typeof( object ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public object ExteriorPanelContent
-    {
-      get
-      {
-        return ( object )GetValue( ExteriorPanelContentProperty );
-      }
-      set
-      {
-        SetValue( ExteriorPanelContentProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility FinishButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( FinishButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( FinishButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HeaderBackgroundProperty = DependencyProperty.Register( "HeaderBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( Brushes.White ) );
-    public Brush HeaderBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( HeaderBackgroundProperty );
-      }
-      set
-      {
-        SetValue( HeaderBackgroundProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HeaderImageProperty = DependencyProperty.Register( "HeaderImage", typeof( ImageSource ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public ImageSource HeaderImage
-    {
-      get
-      {
-        return ( ImageSource )GetValue( HeaderImageProperty );
-      }
-      set
-      {
-        SetValue( HeaderImageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility HelpButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( HelpButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( HelpButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
-    public WizardPageButtonVisibility NextButtonVisibility
-    {
-      get
-      {
-        return ( WizardPageButtonVisibility )GetValue( NextButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( NextButtonVisibilityProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty NextPageProperty = DependencyProperty.Register( "NextPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public WizardPage NextPage
-    {
-      get
-      {
-        return ( WizardPage )GetValue( NextPageProperty );
-      }
-      set
-      {
-        SetValue( NextPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty PageTypeProperty = DependencyProperty.Register( "PageType", typeof( WizardPageType ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageType.Exterior ) );
-    public WizardPageType PageType
-    {
-      get
-      {
-        return ( WizardPageType )GetValue( PageTypeProperty );
-      }
-      set
-      {
-        SetValue( PageTypeProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty PreviousPageProperty = DependencyProperty.Register( "PreviousPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
-    public WizardPage PreviousPage
-    {
-      get
-      {
-        return ( WizardPage )GetValue( PreviousPageProperty );
-      }
-      set
-      {
-        SetValue( PreviousPageProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( WizardPage ) );
-    public string Title
-    {
-      get
-      {
-        return ( string )base.GetValue( TitleProperty );
-      }
-      set
-      {
-        base.SetValue( TitleProperty, value );
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    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 Overrides
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( ( e.Property.Name == "CanSelectNextPage" ) || ( e.Property.Name == "CanHelp" ) || ( e.Property.Name == "CanFinish" )
-        || ( e.Property.Name == "CanCancel" ) || ( e.Property.Name == "CanSelectPreviousPage" ) )
-      {
-        CommandManager.InvalidateRequerySuggested();
-      }
-    }
-
-
-
-
-    #endregion
-
-    #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
deleted file mode 100644
index 6351252f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum WizardPageButtonVisibility
-  {
-    Inherit,
-    Collapsed,
-    Hidden,
-    Visible
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
deleted file mode 100644
index 0a9d7668..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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
-{
-  public enum WizardPageType
-  {
-    Blank,
-    Exterior,
-    Interior
-  }
-}
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
deleted file mode 100644
index dbfd0a11..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,303 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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}"
-                  Padding="{TemplateBinding Padding}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
-
-              <Border Grid.Row="1"
-                      BorderBrush="{TemplateBinding BorderBrush}"
-                      BorderThickness="0,1,0,0"
-                      Padding="7">
-                <StackPanel>
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="Auto" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Button Name="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="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>
-                      <Grid MinWidth="75"
-                            Margin="2,0,0,0">
-                        <Button Name="NextButton"
-                                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="FinishButton"
-                                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>
-                      </Grid>
-                      <Button Name="CancelButton"
-                              Margin="7,0,0,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>
-                    </StackPanel>
-                  </Grid>
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="True"
-                     SourceName="FinishButton">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="FinishButton" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </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>
-        <TextBlock Grid.Row="1"
-                   TextWrapping="Wrap"
-                   Margin="0,0,0,14"
-                   Text="{TemplateBinding Description}">
-        </TextBlock>
-        <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>
-          <TextBlock Margin="32,0,0,3"
-                     TextWrapping="Wrap"
-                     Text="{TemplateBinding Description}">
-          </TextBlock>
-        </StackPanel>
-        <Image Grid.Column="1"
-               Margin="4"
-               Source="{TemplateBinding HeaderImage}"
-               Stretch="None"
-               HorizontalAlignment="Center"
-               VerticalAlignment="Center">
-        </Image>
-      </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
deleted file mode 100644
index fa4a8fa6..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
+++ /dev/null
@@ -1,298 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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">
-
-  <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
-
-  <Style TargetType="{x:Type local:Wizard}">
-    <Setter Property="Background"
-            Value="#F0F0F0" />
-    <Setter Property="BorderBrush"
-            Value="#A0A0A0" />
-    <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}"
-                  Padding="{TemplateBinding Padding}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
-
-              <Border Grid.Row="1"
-                      BorderBrush="#A0A0A0"
-                      BorderThickness="0,1,0,0"
-                      Padding="7">
-                <StackPanel>
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="Auto" />
-                      <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Button Name="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="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>
-                      <Grid MinWidth="75"
-                            Margin="2,0,0,0">
-                        <Button Name="NextButton"
-                                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="FinishButton"
-                                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>
-                      </Grid>
-                      <Button Name="CancelButton"
-                              Margin="7,0,0,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>
-                    </StackPanel>
-                  </Grid>
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled"
-                     Value="True"
-                     SourceName="FinishButton">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="FinishButton" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </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>
-        <TextBlock Grid.Row="1"
-                   TextWrapping="Wrap"
-                   Margin="0,0,0,14"
-                   Text="{TemplateBinding Description}" >
-        </TextBlock>
-        <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>
-          <TextBlock Margin="32,0,0,3"
-                     TextWrapping="Wrap"
-                     Text="{TemplateBinding Description}" >
-          </TextBlock>
-        </StackPanel>
-        <Image Grid.Column="1"
-               Margin="4"
-               Source="{TemplateBinding HeaderImage}"
-               Stretch="None"
-               HorizontalAlignment="Center"
-               VerticalAlignment="Center" >
-        </Image>
-      </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="#FFF0F0F0" />
-        <Setter Property="BorderThickness"
-                Value="0" />
-        <Setter Property="Template"
-                Value="{StaticResource BlankWizardPageTemplate}" />
-      </Trigger>
-      <Trigger Property="PageType"
-               Value="Exterior">
-        <Setter Property="Background"
-                Value="#FFFFFF" />
-        <Setter Property="BorderThickness"
-                Value="0" />
-        <Setter Property="ExteriorPanelBackground"
-                Value="#E3EFFF" />
-        <Setter Property="Template"
-                Value="{StaticResource ExteriorWizardPageTemplate}" />
-      </Trigger>
-      <Trigger Property="PageType"
-               Value="Interior">
-        <Setter Property="Background"
-                Value="#FFF0F0F0" />
-        <Setter Property="BorderBrush"
-                Value="{x:Static SystemColors.ActiveBorderBrush}" />
-        <Setter Property="BorderThickness"
-                Value="0,1,0,0" />
-        <Setter Property="HeaderBackground"
-                Value="#FFFFFF" />
-        <Setter Property="Template"
-                Value="{StaticResource InteriorWizardPageTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
deleted file mode 100644
index 6e0bf354..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ /dev/null
@@ -1,806 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{2C3149D9-832B-4754-A27B-898A392344B5}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Wpf.Toolkit</RootNamespace>
-    <AssemblyName>Xceed.Wpf.Toolkit</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <TargetFrameworkSubset>Client</TargetFrameworkSubset>
-    <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;VS2008</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;VS2008</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="UIAutomationProvider">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\WPFToolkit.dll</HintPath>
-    </Reference>
-  </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="IconButton\Themes\Aero2.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="IconButton\Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </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>
-    </Page>
-    <Page Include="CollectionControl\Implementation\CollectionControlDialog.xaml">
-      <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>
-    </Page>
-    <Page Include="CheckComboBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Aero2\SelectorItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Aero2\WindowControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Generic\SelectorItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\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>
-    </Page>
-    <Page Include="Magnifier\Themes\Generic.xaml">
-      <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>
-    </Page>
-    <Page Include="Pie\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Pie\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </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>
-    </Page>
-    <Page Include="RangeSlider\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RangeSlider\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RichTextBoxFormatBar\Themes\Generic.xaml">
-      <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>
-    </Page>
-    <Page Include="Themes\Aero.NormalColor.xaml">
-      <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>
-    </Page>
-    <Page Include="Themes\Aero\Buttons_NormalColor.xaml">
-      <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>
-    </Page>
-    <Page Include="Themes\Generic\Brushes.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic\Buttons.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic\Common.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Generic\Glyphs.xaml">
-      <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="TimeSpanUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimeSpanUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkComboBox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkComboBox\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>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyVersionInfo.cs" />
-    <Compile Include="AssemblyVersionInfoCommon.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\AutoSelectBehaviorEnum.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\AutoSelectTextBox.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\QueryMoveFocusEventArgs.cs" />
-    <Compile Include="BusyIndicator\Implementation\BusyIndicator.cs" />
-    <Compile Include="BusyIndicator\Implementation\Converters\ProgressBarWidthConverter.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorPickerTabItem.cs" />
-    <Compile Include="Core\Converters\ColorModeToTabItemSelectedConverter.cs" />
-    <Compile Include="Primitives\SelectAllSelectorItem.cs" />
-    <Compile Include="Primitives\SelectAllSelector.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\PropertyItemEditorConverter.cs" />
-    <Compile Include="Core\LocationEnum.cs" />
-    <Compile Include="IconButton\Implementation\IconButton.cs" />
-    <Compile Include="ButtonSpinner\Implementation\ButtonSpinner.cs" />
-    <Compile Include="CalculatorUpDown\Implementation\CalculatorUpDown.cs" />
-    <Compile Include="Calculator\Implementation\Calculator.cs" />
-    <Compile Include="Calculator\Implementation\CalculatorCommands.cs" />
-    <Compile Include="CheckListBox\Implementation\CheckListBox.cs" />
-    <Compile Include="ChildWindow\Implementation\ChildWindow.cs" />
-    <Compile Include="ChildWindow\Implementation\WindowStartupLocation.cs" />
-    <Compile Include="ChildWindow\Implementation\WindowState.cs" />
-    <Compile Include="ButtonSpinner\Implementation\SpinDirection.cs" />
-    <Compile Include="ButtonSpinner\Implementation\SpinEventArgs.cs" />
-    <Compile Include="ButtonSpinner\Implementation\Spinner.cs" />
-    <Compile Include="ButtonSpinner\Implementation\ValidSpinDirections.cs" />
-    <Compile Include="Chromes\Implementation\ButtonChrome.cs" />
-    <Compile Include="CheckComboBox\Implementation\CheckComboBox.cs" />
-    <Compile Include="CollectionControl\Implementation\CollectionControl.cs" />
-    <Compile Include="CollectionControl\Implementation\CollectionControlButton.cs" />
-    <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="ColorPicker\Implementation\ColorSorter.cs" />
-    <Compile Include="Core\CancelRoutedEventArgs.cs" />
-    <Compile Include="Core\Converters\AditionConverter.cs" />
-    <Compile Include="Core\Converters\CenterTitleConverter.cs" />
-    <Compile Include="Core\Converters\ColorBlendConverter.cs" />
-    <Compile Include="Core\Converters\CornerRadiusToDoubleConverter.cs" />
-    <Compile Include="Core\Converters\HalfConverter.cs" />
-    <Compile Include="Core\Converters\IntToThicknessConverter.cs" />
-    <Compile Include="Core\Converters\NullToBoolConverter.cs" />
-    <Compile Include="Core\Converters\ThicknessSideRemovalConverter.cs" />
-    <Compile Include="Core\Converters\ThicknessToDoubleConverter.cs" />
-    <Compile Include="Core\EditableKeyValuePair.cs" />
-    <Compile Include="Primitives\DateTimePickerBase.cs" />
-    <Compile Include="Core\Utilities\DateTimeUtilities.cs" />
-    <Compile Include="PropertyGrid\Implementation\CategoryGroupStyleSelector.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\IsDefaultCategoryConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\IsStringEmptyConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\CollectionEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\SourceComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\TrimmedTextBlock.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" />
-    <Compile Include="Core\Media\Animation\AnimationRateConverter.cs" />
-    <Compile Include="Core\Media\Animation\IterativeAnimationEquation.cs" />
-    <Compile Include="Core\Media\Animation\IterativeAnimationEquationDelegate.cs" />
-    <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="Primitives\CachedTextInfo.cs" />
-    <Compile Include="Core\Converters\ObjectTypeToNameConverter.cs" />
-    <Compile Include="ColorCanvas\Implementation\ColorCanvas.cs" />
-    <Compile Include="Core\Converters\CalculatorMemoryToVisibilityConverter.cs" />
-    <Compile Include="Core\Converters\RoundedValueConverter.cs" />
-    <Compile Include="Core\Converters\VisibilityToBoolConverter.cs" />
-    <Compile Include="Core\Converters\WizardPageButtonVisibilityConverter.cs" />
-    <Compile Include="Core\ErrorMessages.cs" />
-    <Compile Include="Core\IndexChangedEventArgs.cs" />
-    <Compile Include="Core\IndexChangedEventHandler.cs" />
-    <Compile Include="Core\Input\KeyModifier.cs" />
-    <Compile Include="Core\Input\KeyModifierCollection.cs" />
-    <Compile Include="Core\Input\KeyModifierCollectionConverter.cs" />
-    <Compile Include="Core\InvalidContentException.cs" />
-    <Compile Include="Core\InvalidTemplateException.cs" />
-    <Compile Include="Primitives\DateTimeUpDownBase.cs" />
-    <Compile Include="Primitives\HsvColor.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorItem.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
-    <Compile Include="Primitives\MouseWheelActiveTriggerEnum.cs" />
-    <Compile Include="Primitives\WindowContainer.cs" />
-    <Compile Include="Primitives\WindowControl.cs" />
-    <Compile Include="Core\Utilities\ChangeTypeHelper.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\VersionResourceDictionary.cs" />
-    <Compile Include="Core\WeakCollectionChangedWrapper.cs" />
-    <Compile Include="NumericUpDown\Implementation\AllowedSpecialValuesEnum.cs" />
-    <Compile Include="Panels\AnimatorConverter.cs" />
-    <Compile Include="Panels\Animators.cs" />
-    <Compile Include="Panels\ChildEnteredEventArgs.cs" />
-    <Compile Include="Panels\ChildEnteredEventHandler.cs" />
-    <Compile Include="Panels\ChildEnteringEventArgs.cs" />
-    <Compile Include="Panels\ChildEnteringEventHandler.cs" />
-    <Compile Include="Panels\ChildExitedEventArgs.cs" />
-    <Compile Include="Panels\ChildExitedEventHandler.cs" />
-    <Compile Include="Panels\ChildExitingEventArgs.cs" />
-    <Compile Include="Panels\ChildExitingEventHandler.cs" />
-    <Compile Include="Panels\DoubleAnimator.cs" />
-    <Compile Include="Panels\IterativeAnimator.cs" />
-    <Compile Include="Panels\PanelBase.cs" />
-    <Compile Include="Primitives\Selector.cs" />
-    <Compile Include="Primitives\SelectorItem.cs" />
-    <Compile Include="Primitives\ShapeBase.cs" />
-    <Compile Include="Primitives\ValueRangeTextBox.cs" />
-    <Compile Include="Core\PropertyChangedEventArgs.cs" />
-    <Compile Include="Core\PropertyChangedEventHandler.cs" />
-    <Compile Include="Core\QueryTextFromValueEventArgs.cs" />
-    <Compile Include="Core\QueryValueFromTextEventArgs.cs" />
-    <Compile Include="Core\Utilities\CalculatorUtilities.cs" />
-    <Compile Include="Core\Utilities\ColorUtilities.cs" />
-    <Compile Include="ColorCanvas\Implementation\ColorSpectrumSlider.cs" />
-    <Compile Include="Core\Converters\ColorToSolidColorBrushConverter.cs" />
-    <Compile Include="Core\Converters\InverseBoolConverter.cs" />
-    <Compile Include="Core\Converters\SolidColorBrushToColorConverter.cs" />
-    <Compile Include="Core\Utilities\ContextMenuUtilities.cs" />
-    <Compile Include="Core\Utilities\TreeHelper.cs" />
-    <Compile Include="Core\Utilities\ValueChangeHelper.cs" />
-    <Compile Include="Core\Utilities\DoubleHelper.cs" />
-    <Compile Include="Core\Utilities\EllipseHelper.cs" />
-    <Compile Include="Core\Utilities\PointHelper.cs" />
-    <Compile Include="Core\Utilities\RectHelper.cs" />
-    <Compile Include="Core\Utilities\ReflectionHelper.cs" />
-    <Compile Include="Core\Utilities\ResourceHelper.cs" />
-    <Compile Include="Core\Utilities\Segment.cs" />
-    <Compile Include="Core\Utilities\VisualTreeHelperEx.cs" />
-    <Compile Include="DateTimePicker\Implementation\DateTimePicker.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeFormat.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeInfo.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimePart.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeUpDown.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeParser.cs" />
-    <Compile Include="DropDownButton\Implementation\DropDownButton.cs" />
-    <Compile Include="Magnifier\Implementation\FrameType.cs" />
-    <Compile Include="MaskedTextBox\Implementation\AutoCompletingMaskEventArgs.cs" />
-    <Compile Include="MaskedTextBox\Implementation\InsertKeyModeEnum.cs" />
-    <Compile Include="MaskedTextBox\Implementation\MaskedTextBox.cs" />
-    <Compile Include="MaskedTextBox\Implementation\MaskFormatEnum.cs" />
-    <Compile Include="MultiLineTextEditor\Implementation\MultiLineTextEditor.cs" />
-    <Compile Include="NumericUpDown\Implementation\ByteUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\CommonNumericUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\DecimalUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\DoubleUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\SByteUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\SingleUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\IntegerUpDown.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" />
-    <Compile Include="Magnifier\Implementation\MagnifierManager.cs" />
-    <Compile Include="Primitives\InputBase.cs" />
-    <Compile Include="Obselete\MaskedTextBox\Implementation\MaskedTextBox.cs" />
-    <Compile Include="MessageBox\Implementation\MessageBox.cs" />
-    <Compile Include="NumericUpDown\Implementation\LongUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\NumericUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\ShortUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\UIntegerUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\ULongUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\UShortUpDown.cs" />
-    <Compile Include="Panels\AnimationPanel.cs" />
-    <Compile Include="Panels\RandomPanel.cs" />
-    <Compile Include="Panels\ScrollHelper.cs" />
-    <Compile Include="Panels\SwitchPanel.cs" />
-    <Compile Include="Panels\SwitchPresenter.cs" />
-    <Compile Include="Panels\SwitchTemplate.cs" />
-    <Compile Include="Panels\WrapPanel.cs" />
-    <Compile Include="Pie\Implementation\Pie.cs" />
-    <Compile Include="Pie\Implementation\PieModeEnum.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="BusyIndicator\Implementation\VisualStates.BusyIndicator.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\CategoryOrderAttribute.cs" />
-    <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\Converters\ObjectToUIElementConverter.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\Editors\MaskedTextBoxEditor.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\ColorEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\EditorDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceAttributeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\UpDownEditors.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TextBlockEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TextBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TypeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\ExpandableObjectMarginConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\IPropertyContainer.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyGrid.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\StringConstants.cs" />
-    <Compile Include="PropertyGrid\Implementation\TargetPropertyType.cs" />
-    <Compile Include="RangeSlider\Implementation\Converters\SliderThumbWidthConverter.cs" />
-    <Compile Include="RangeSlider\Implementation\RangeSlider.cs" />
-    <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
-    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.cs" />
-    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBarManager.cs" />
-    <Compile Include="Core\UIElementAdorner.cs" />
-    <Compile Include="RichTextBox\Formatters\ITextFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\PlainTextFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\RtfFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\XamlFormatter.cs" />
-    <Compile Include="RichTextBox\RichTextBox.cs" />
-    <Compile Include="Primitives\UpDownBase.cs" />
-    <Compile Include="SplitButton\Implementation\SplitButton.cs" />
-    <Compile Include="Primitives\Themes\ResourceKeys.cs" />
-    <Compile Include="StyleableWindow\Implementation\Converters\StyleableWindowClippingBorderConverter.cs" />
-    <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
-    <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
-    <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
-    <Compile Include="TimePicker\Implementation\TimeItem.cs" />
-    <Compile Include="TimePicker\Implementation\TimePicker.cs" />
-    <Compile Include="TimeSpanUpDown\Implementation\TimeSpanUpDown.cs" />
-    <Compile Include="VisualStates.cs" />
-    <Compile Include="MessageBox\Implementation\VisualStates.MessageBox.cs" />
-    <Compile Include="WatermarkComboBox\Implementation\WatermarkComboBox.cs" />
-    <Compile Include="WatermarkPasswordBox\Implementation\WatermarkPasswordBox.cs" />
-    <Compile Include="WatermarkTextBox\Implementation\WatermarkTextBox.cs" />
-    <Compile Include="Wizard\Implementation\WizardCommands.cs" />
-    <Compile Include="Wizard\Implementation\WizardPage.cs" />
-    <Compile Include="Wizard\Implementation\Wizard.cs" />
-    <Compile Include="Wizard\Implementation\WizardPageButtonVisibility.cs" />
-    <Compile Include="Wizard\Implementation\WizardPageType.cs" />
-    <AppDesigner Include="Properties\" />
-    <Compile Include="Zoombox\Zoombox.cs" />
-    <Compile Include="Zoombox\ZoomboxCursors.cs" />
-    <Compile Include="Zoombox\ZoomboxView.cs" />
-    <Compile Include="Zoombox\ZoomboxViewChangedEventArgs.cs" />
-    <Compile Include="Zoombox\ZoomboxViewChangedEventHandler.cs" />
-    <Compile Include="Zoombox\ZoomboxViewConverter.cs" />
-    <Compile Include="Zoombox\ZoomboxViewException.cs" />
-    <Compile Include="Zoombox\ZoomboxViewFinderDisplay.cs" />
-    <Compile Include="Zoombox\ZoomboxViewKind.cs" />
-    <Compile Include="Zoombox\ZoomboxViewStack.cs" />
-    <Compile Include="Zoombox\ZoomboxViewStackMode.cs" />
-    <Compile Include="Zoombox\ZoomboxZoomOn.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="MessageBox\Icons\Error48.png" />
-    <Resource Include="MessageBox\Icons\Information48.png" />
-    <Resource Include="MessageBox\Icons\Question48.png" />
-    <Resource Include="MessageBox\Icons\Warning48.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\FontColorPicker16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\TextHighlightColorPicker16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="RichTextBoxFormatBar\Images\Bullets16.png" />
-    <Resource Include="RichTextBoxFormatBar\Images\Numbering16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\SortAscending16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\Categorize16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\AdvancedProperties11.png" />
-    <Resource Include="PropertyGrid\Images\Inheritance11.png" />
-    <Resource Include="PropertyGrid\Images\Resource11.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\Database11.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\Local11.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\Style11.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="PropertyGrid\Images\ClearFilter16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="MultiLineTextEditor\Images\Notes16.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Zoombox\Resources\Zoom.cur" />
-    <Resource Include="Zoombox\Resources\ZoomRelative.cur" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Core\ErrorMessages.resx">
-      <DependentUpon>ErrorMessages.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <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>
-  <ItemGroup>
-    <Compile Include="PropertyGrid\Implementation\Definitions\DefinitionBase.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="CollectionControl\Images\Duplicate.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-  </PropertyGroup>
-  <PropertyGroup>
-  </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_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur
deleted file mode 100644
index f5001727..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/Zoom.cur and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur
deleted file mode 100644
index 7df27fd6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Resources/ZoomRelative.cur and /dev/null differ
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
deleted file mode 100644
index 5731a303..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
+++ /dev/null
@@ -1,833 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <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="Black" />
-    <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}">
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <ContentPresenter x:Name="_contentPresenter"
-                              Grid.Row="0"
-                              Grid.Column="0" />
-            <ScrollBar x:Name="PART_VerticalScrollBar"
-                       Grid.Row="0"
-                       Grid.Column="1"
-                       Orientation="Vertical"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <ScrollBar x:Name="PART_HorizontalScrollBar"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Orientation="Horizontal"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <Border Grid.Row="1"
-                    Grid.Column="1"
-                    Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-
-            <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}">
-                    </Image>
-                  </Button>
-                  <Button x:Name="ForwardButton"
-                          Command="local:Zoombox.Forward"
-                          ToolTip="Go Forward"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource NextGlyph}">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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" >
-                    </Image>
-                  </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" >
-                    </Image>
-                  </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" >
-                    </Image>
-                  </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" >
-                    </Image>
-                  </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" >
-                  </Image>
-                </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}">
-                </Image>
-              </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>
-            <Trigger Property="IsUsingScrollBars"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_VerticalScrollBar" />
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_HorizontalScrollBar" />
-            </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
deleted file mode 100644
index fa053728..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
+++ /dev/null
@@ -1,833 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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"
-                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
-
-  <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="Black" />
-    <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}">
-
-            <Grid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <ContentPresenter x:Name="_contentPresenter"
-                              Grid.Row="0"
-                              Grid.Column="0" />
-            <ScrollBar x:Name="PART_VerticalScrollBar"
-                       Grid.Row="0"
-                       Grid.Column="1"
-                       Orientation="Vertical"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <ScrollBar x:Name="PART_HorizontalScrollBar"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Orientation="Horizontal"
-                       Visibility="Collapsed">
-            </ScrollBar>
-            <Border Grid.Row="1"
-                    Grid.Column="1"
-                    Background="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-
-            <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}">
-                    </Image>
-                  </Button>
-                  <Button x:Name="ForwardButton"
-                          Command="local:Zoombox.Forward"
-                          ToolTip="Go Forward"
-                          Width="20px"
-                          Height="20px"
-                          Style="{StaticResource TransparentButton}">
-                    <Image Source="{StaticResource NextGlyph}">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                    </Image>
-                  </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">
-                  </Image>
-                </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}">
-                </Image>
-              </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>
-            <Trigger Property="IsUsingScrollBars"
-                     Value="True">
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_VerticalScrollBar" />
-              <Setter Property="Visibility"
-                      Value="Visible"
-                      TargetName="PART_HorizontalScrollBar" />
-            </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/Zoombox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
deleted file mode 100644
index d3804e7d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
+++ /dev/null
@@ -1,4058 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Globalization;
-using System.Security;
-using System.Security.Permissions;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using Xceed.Wpf.Toolkit.Core.Input;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  [TemplatePart( Name = PART_VerticalScrollBar, Type = typeof( ScrollBar ) )]
-  [TemplatePart( Name = PART_HorizontalScrollBar, Type = typeof( ScrollBar ) )]
-  public sealed class Zoombox : ContentControl
-  {
-    private const string PART_VerticalScrollBar = "PART_VerticalScrollBar";
-    private const string PART_HorizontalScrollBar = "PART_HorizontalScrollBar";
-    private bool _isUpdatingVisualTree = false;
-
-    #region Constructors
-
-    static Zoombox()
-    {
-      Zoombox.DefaultStyleKeyProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( typeof( Zoombox ) ) );
-      Zoombox.ClipToBoundsProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
-      Zoombox.FocusableProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( true ) );
-      Zoombox.HorizontalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( HorizontalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
-      Zoombox.VerticalContentAlignmentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( VerticalAlignment.Center, new PropertyChangedCallback( Zoombox.RefocusView ) ) );
-      Zoombox.ContentProperty.OverrideMetadata( typeof( Zoombox ), new FrameworkPropertyMetadata( ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceContentValue ) ) );
-    }
-
-    public Zoombox()
-      : base()
-    {
-      try
-      {
-        new UIPermission( PermissionState.Unrestricted ).Demand();
-        _cacheBits[ ( int )CacheBits.HasUIPermission ] = true;
-      }
-      catch( SecurityException )
-      {
-      }
-
-      this.InitCommands();
-
-      // use the LayoutUpdated event to keep the Viewport in sync
-      this.LayoutUpdated += new EventHandler( this.OnLayoutUpdated );
-      this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnSizeChanged ), true );
-
-      this.CoerceValue( Zoombox.ViewStackModeProperty );
-
-      this.Loaded += this.Zoombox_Loaded;
-    }
-
-    #endregion
-
-    #region AnimationAccelerationRatio Property
-
-    public static readonly DependencyProperty AnimationAccelerationRatioProperty =
-      DependencyProperty.Register( "AnimationAccelerationRatio", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0d ), 
-          new ValidateValueCallback( Zoombox.ValidateAccelerationRatio ) );
-
-    public double AnimationAccelerationRatio
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.AnimationAccelerationRatioProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationAccelerationRatioProperty, value );
-      }
-    }
-
-    private static bool ValidateAccelerationRatio( object value )
-    {
-      double newValue = ( double )value;
-      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
-        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationAccelerationRatioOOR" ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region AnimationDecelerationRatio Property
-
-    public static readonly DependencyProperty AnimationDecelerationRatioProperty =
-      DependencyProperty.Register( "AnimationDecelerationRatio", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0d ), 
-          new ValidateValueCallback( Zoombox.ValidateDecelerationRatio ) );
-
-    public double AnimationDecelerationRatio
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.AnimationDecelerationRatioProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationDecelerationRatioProperty, value );
-      }
-    }
-
-    private static bool ValidateDecelerationRatio( object value )
-    {
-      double newValue = ( double )value;
-      if( newValue < 0 || newValue > 1 || DoubleHelper.IsNaN( newValue ) )
-        throw new ArgumentException( ErrorMessages.GetMessage( "AnimationDecelerationRatioOOR" ) );
-
-      return true;
-    }
-
-    #endregion
-
-    #region AnimationDuration Property
-
-    public static readonly DependencyProperty AnimationDurationProperty =
-      DependencyProperty.Register( "AnimationDuration", typeof( Duration ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( new Duration( TimeSpan.FromMilliseconds( 300 ) ) ) );
-
-    public Duration AnimationDuration
-    {
-      get
-      {
-        return ( Duration )this.GetValue( Zoombox.AnimationDurationProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AnimationDurationProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region AreDragModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreDragModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreDragModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreDragModifiersActiveProperty = Zoombox.AreDragModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreDragModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreDragModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreDragModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreDragModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreRelativeZoomModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreRelativeZoomModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreRelativeZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreRelativeZoomModifiersActiveProperty = Zoombox.AreRelativeZoomModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreRelativeZoomModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreRelativeZoomModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreRelativeZoomModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreRelativeZoomModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreZoomModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreZoomModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreZoomModifiersActiveProperty = Zoombox.AreZoomModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreZoomModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreZoomModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreZoomModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreZoomModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AreZoomToSelectionModifiersActive Property
-
-    private static readonly DependencyPropertyKey AreZoomToSelectionModifiersActivePropertyKey =
-      DependencyProperty.RegisterReadOnly( "AreZoomToSelectionModifiersActive", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty AreZoomToSelectionModifiersActiveProperty = Zoombox.AreZoomToSelectionModifiersActivePropertyKey.DependencyProperty;
-
-    public bool AreZoomToSelectionModifiersActive
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AreZoomToSelectionModifiersActiveProperty );
-      }
-    }
-
-    private void SetAreZoomToSelectionModifiersActive( bool value )
-    {
-      this.SetValue( Zoombox.AreZoomToSelectionModifiersActivePropertyKey, value );
-    }
-
-    #endregion
-
-    #region AutoWrapContentWithViewbox Property
-
-    public static readonly DependencyProperty AutoWrapContentWithViewboxProperty =
-      DependencyProperty.Register( "AutoWrapContentWithViewbox", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true, 
-          new PropertyChangedCallback( Zoombox.OnAutoWrapContentWithViewboxChanged ) ) );
-
-    public bool AutoWrapContentWithViewbox
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.AutoWrapContentWithViewboxProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.AutoWrapContentWithViewboxProperty, value );
-      }
-    }
-
-    private static void OnAutoWrapContentWithViewboxChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      o.CoerceValue( Zoombox.ContentProperty );
-    }
-
-    private static object CoerceContentValue( DependencyObject d, object value )
-    {
-      return ( ( Zoombox )d ).CoerceContentValue( value );
-    }
-
-    private object CoerceContentValue( object value )
-    {
-      if( value != null && !( value is UIElement ) && !( ( bool )this.GetValue( DesignerProperties.IsInDesignModeProperty ) ) )
-        throw new InvalidContentException( ErrorMessages.GetMessage( "ZoomboxContentMustBeUIElement" ) );
-
-      object oldContent = _content;
-      if( value != _trueContent || ( this.IsContentWrapped != this.AutoWrapContentWithViewbox ) )
-      {
-        // check whether the content is currently wrapped and needs to be unwrapped
-        if( this.IsContentWrapped && _content is Viewbox && _content != _trueContent )
-        {
-          Viewbox viewbox = ( Viewbox )_content;
-
-          BindingOperations.ClearAllBindings( viewbox );
-          if( viewbox.Child is FrameworkElement )
-          {
-            ( viewbox.Child as FrameworkElement ).RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-          }
-          ( viewbox as Viewbox ).Child = null;
-
-          this.RemoveLogicalChild( viewbox );
-        }
-
-        // make sure the view finder's visual brush is null
-        if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
-        {
-          _viewFinderDisplay.VisualBrush.Visual = null;
-          _viewFinderDisplay.VisualBrush = null;
-        }
-
-        // update the cached content and true content values
-        _content = value as UIElement;
-        _trueContent = value as UIElement;
-
-        // if necessary, unparent the existing content
-        if( _contentPresenter != null && _contentPresenter.Content != null )
-        {
-          _contentPresenter.Content = null;
-        }
-
-        // if necessary, wrap the content
-        this.IsContentWrapped = false;
-        if( this.AutoWrapContentWithViewbox )
-        {
-          // create a viewbox and make it the logical child of the Zoombox
-          Viewbox viewbox = new Viewbox();
-          this.AddLogicalChild( viewbox );
-
-          // now set the new parent to be the viewbox
-          viewbox.Child = value as UIElement;
-          _content = viewbox;
-          viewbox.HorizontalAlignment = HorizontalAlignment.Left;
-          viewbox.VerticalAlignment = VerticalAlignment.Top;
-          this.IsContentWrapped = true;
-        }
-
-        if( ( _content is Viewbox ) && ( this.IsContentWrapped ) && ( _trueContent is FrameworkElement ) )
-        {
-          ( _trueContent as FrameworkElement ).AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-        }
-
-        if( _contentPresenter != null )
-        {
-          _contentPresenter.Content = _content;
-        }
-
-        if( _viewFinderDisplay != null )
-        {
-          this.CreateVisualBrushForViewFinder( _content );
-        }
-        this.UpdateViewFinderDisplayContentBounds();
-      }
-
-      // if the content changes, we need to reset the flags used to first render and arrange the content
-      if( oldContent != _content
-          && this.HasArrangedContentPresenter
-          && this.HasRenderedFirstView )
-      {
-        this.HasArrangedContentPresenter = false;
-        this.HasRenderedFirstView = false;
-        this.RefocusViewOnFirstRender = true;
-        _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
-      }
-      return _content;
-    }
-
-    private UIElement _trueContent; //null
-
-    #endregion
-
-    #region CurrentView Property
-
-    private static readonly DependencyPropertyKey CurrentViewPropertyKey =
-      DependencyProperty.RegisterReadOnly( "CurrentView", typeof( ZoomboxView ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxView.Empty, 
-          new PropertyChangedCallback( Zoombox.OnCurrentViewChanged ) ) );
-
-    public static readonly DependencyProperty CurrentViewProperty = Zoombox.CurrentViewPropertyKey.DependencyProperty;
-
-    public ZoomboxView CurrentView
-    {
-      get
-      {
-        return ( ZoomboxView )this.GetValue( Zoombox.CurrentViewProperty );
-      }
-    }
-
-    private void SetCurrentView( ZoomboxView value )
-    {
-      this.SetValue( Zoombox.CurrentViewPropertyKey, value );
-    }
-
-    private static void OnCurrentViewChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingView )
-      {
-        zoombox.ZoomTo( zoombox.CurrentView );
-      }
-      zoombox.RaiseEvent( new ZoomboxViewChangedEventArgs( e.OldValue as ZoomboxView, e.NewValue as ZoomboxView, zoombox._lastViewIndex, zoombox.CurrentViewIndex ) );
-    }
-
-    #endregion
-
-    #region CurrentViewIndex Property
-
-    private static readonly DependencyPropertyKey CurrentViewIndexPropertyKey =
-      DependencyProperty.RegisterReadOnly( "CurrentViewIndex", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1 ) );
-
-    public static readonly DependencyProperty CurrentViewIndexProperty = Zoombox.CurrentViewIndexPropertyKey.DependencyProperty;
-
-    public int CurrentViewIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.CurrentViewIndexProperty );
-      }
-    }
-
-    internal void SetCurrentViewIndex( int value )
-    {
-      this.SetValue( Zoombox.CurrentViewIndexPropertyKey, value );
-    }
-
-    #endregion
-
-    #region DragModifiers Property
-
-    public static readonly DependencyProperty DragModifiersProperty =
-      DependencyProperty.Register( "DragModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultDragModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection DragModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.DragModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.DragModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultDragModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Ctrl );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region DragOnPreview Property
-
-    public static readonly DependencyProperty DragOnPreviewProperty =
-      DependencyProperty.Register( "DragOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public bool DragOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.DragOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.DragOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region EffectiveViewStackMode Property
-
-    private static readonly DependencyPropertyKey EffectiveViewStackModePropertyKey =
-      DependencyProperty.RegisterReadOnly( "EffectiveViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Auto ) );
-
-    public static readonly DependencyProperty EffectiveViewStackModeProperty = Zoombox.EffectiveViewStackModePropertyKey.DependencyProperty;
-
-    public ZoomboxViewStackMode EffectiveViewStackMode
-    {
-      get
-      {
-        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.EffectiveViewStackModeProperty );
-      }
-    }
-
-    private void SetEffectiveViewStackMode( ZoomboxViewStackMode value )
-    {
-      this.SetValue( Zoombox.EffectiveViewStackModePropertyKey, value );
-    }
-
-    #endregion
-
-    #region HasBackStack Property
-
-    private static readonly DependencyPropertyKey HasBackStackPropertyKey =
-      DependencyProperty.RegisterReadOnly( "HasBackStack", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasBackStackProperty = Zoombox.HasBackStackPropertyKey.DependencyProperty;
-
-    public bool HasBackStack
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.HasBackStackProperty );
-      }
-    }
-
-    #endregion
-
-    #region HasForwardStack Property
-
-    private static readonly DependencyPropertyKey HasForwardStackPropertyKey =
-      DependencyProperty.RegisterReadOnly( "HasForwardStack", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty HasForwardStackProperty = Zoombox.HasForwardStackPropertyKey.DependencyProperty;
-
-    public bool HasForwardStack
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.HasForwardStackProperty );
-      }
-    }
-
-    #endregion
-
-    #region IsAnimated Property
-
-    public static readonly DependencyProperty IsAnimatedProperty =
-      DependencyProperty.Register( "IsAnimated", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true, 
-          ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceIsAnimatedValue ) ) );
-
-    public bool IsAnimated
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsAnimatedProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.IsAnimatedProperty, value );
-      }
-    }
-
-    private static object CoerceIsAnimatedValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      bool result = ( bool )value;
-      if( !zoombox.IsInitialized )
-      {
-        result = false;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region IsDraggingContent Property
-
-    private static readonly DependencyPropertyKey IsDraggingContentPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsDraggingContent", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsDraggingContentProperty = Zoombox.IsDraggingContentPropertyKey.DependencyProperty;
-
-    public bool IsDraggingContent
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsDraggingContentProperty );
-      }
-    }
-
-    private void SetIsDraggingContent( bool value )
-    {
-      this.SetValue( Zoombox.IsDraggingContentPropertyKey, value );
-    }
-
-    #endregion
-
-    #region IsSelectingRegion Property
-
-    private static readonly DependencyPropertyKey IsSelectingRegionPropertyKey =
-      DependencyProperty.RegisterReadOnly( "IsSelectingRegion", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public static readonly DependencyProperty IsSelectingRegionProperty = Zoombox.IsSelectingRegionPropertyKey.DependencyProperty;
-
-    public bool IsSelectingRegion
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsSelectingRegionProperty );
-      }
-    }
-
-    private void SetIsSelectingRegion( bool value )
-    {
-      this.SetValue( Zoombox.IsSelectingRegionPropertyKey, value );
-    }
-
-    #endregion
-
-    #region IsUsingScrollBars Property
-
-    public static readonly DependencyProperty IsUsingScrollBarsProperty =
-      DependencyProperty.Register( "IsUsingScrollBars", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false, ( PropertyChangedCallback )null ) );
-
-    public bool IsUsingScrollBars
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.IsUsingScrollBarsProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.IsUsingScrollBarsProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region MaxScale Property
-
-    public static readonly DependencyProperty MaxScaleProperty =
-      DependencyProperty.Register( "MaxScale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 100d, FrameworkPropertyMetadataOptions.AffectsMeasure,
-          new PropertyChangedCallback( Zoombox.OnMaxScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMaxScaleValue ) ) );
-
-    public double MaxScale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.MaxScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.MaxScaleProperty, value );
-      }
-    }
-
-    private static void OnMaxScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.CoerceValue( Zoombox.MinScaleProperty );
-      zoombox.CoerceValue( Zoombox.ScaleProperty );
-    }
-
-    private static object CoerceMaxScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-      if( result < zoombox.MinScale )
-      {
-        result = zoombox.MinScale;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region MinScale Property
-
-    public static readonly DependencyProperty MinScaleProperty =
-      DependencyProperty.Register( "MinScale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0.01d, FrameworkPropertyMetadataOptions.AffectsMeasure,
-          new PropertyChangedCallback( Zoombox.OnMinScaleChanged ), new CoerceValueCallback( Zoombox.CoerceMinScaleValue ) ) );
-
-    public double MinScale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.MinScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.MinScaleProperty, value );
-      }
-    }
-
-    private static void OnMinScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.CoerceValue( Zoombox.MinScaleProperty );
-      zoombox.CoerceValue( Zoombox.ScaleProperty );
-    }
-
-    private static object CoerceMinScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-      if( result > zoombox.MaxScale )
-      {
-        result = zoombox.MaxScale;
-      }
-      return result;
-    }
-
-    #endregion
-
-    #region NavigateOnPreview Property
-
-    public static readonly DependencyProperty NavigateOnPreviewProperty =
-      DependencyProperty.Register( "NavigateOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false ) );
-
-    public bool NavigateOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.NavigateOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.NavigateOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region PanDistance Property
-
-    public static readonly DependencyProperty PanDistanceProperty =
-      DependencyProperty.Register( "PanDistance", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 5d ) );
-
-    public double PanDistance
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.PanDistanceProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.PanDistanceProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region Position Property
-
-    public static readonly DependencyProperty PositionProperty =
-      DependencyProperty.Register( "Position", typeof( Point ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( PointHelper.Empty, new PropertyChangedCallback( Zoombox.OnPositionChanged ) ) );
-
-    public Point Position
-    {
-      get
-      {
-        return ( Point )this.GetValue( Zoombox.PositionProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.PositionProperty, value );
-      }
-    }
-
-    private static void OnPositionChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingViewport )
-      {
-        Point newPosition = ( Point )e.NewValue;
-        double scale = zoombox.Scale;
-        if( scale > 0 )
-        {
-          zoombox.ZoomTo( new Point( -newPosition.X, -newPosition.Y ) );
-        }
-      }
-    }
-
-    #endregion
-
-    #region RelativeZoomModifiers Property
-
-    public static readonly DependencyProperty RelativeZoomModifiersProperty =
-      DependencyProperty.Register( "RelativeZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultRelativeZoomModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection RelativeZoomModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.RelativeZoomModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.RelativeZoomModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultRelativeZoomModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Ctrl );
-      result.Add( KeyModifier.Alt );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region Scale Property
-
-    public static readonly DependencyProperty ScaleProperty =
-      DependencyProperty.Register( "Scale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( double.NaN, 
-          new PropertyChangedCallback( Zoombox.OnScaleChanged ), new CoerceValueCallback( Zoombox.CoerceScaleValue ) ) );
-
-    public double Scale
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.ScaleProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ScaleProperty, value );
-      }
-    }
-
-    private static void OnScaleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )o;
-      if( !zoombox.IsUpdatingView )
-      {
-        double newScale = ( double )e.NewValue;
-        zoombox.ZoomTo( newScale );
-      }
-    }
-
-    private static object CoerceScaleValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      double result = ( double )value;
-
-      if( result < zoombox.MinScale )
-      {
-        result = zoombox.MinScale;
-      }
-
-      if( result > zoombox.MaxScale )
-      {
-        result = zoombox.MaxScale;
-      }
-
-      return result;
-    }
-
-    #endregion
-
-    #region ViewFinder Property
-
-    private static readonly DependencyPropertyKey ViewFinderPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( null, new PropertyChangedCallback( Zoombox.OnViewFinderChanged ) ) );
-
-    public static readonly DependencyProperty ViewFinderProperty = Zoombox.ViewFinderPropertyKey.DependencyProperty;
-
-    public FrameworkElement ViewFinder
-    {
-      get
-      {
-        return ( FrameworkElement )this.GetValue( Zoombox.ViewFinderProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewFinderPropertyKey, value );
-      }
-    }
-
-    private static void OnViewFinderChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewFinderChanged( e );
-    }
-
-    private void OnViewFinderChanged( DependencyPropertyChangedEventArgs e )
-    {
-      this.AttachToVisualTree();
-    }
-
-    #endregion
-
-    #region ViewFinderVisibility Attached Property
-
-    public static readonly DependencyProperty ViewFinderVisibilityProperty =
-      DependencyProperty.RegisterAttached( "ViewFinderVisibility", typeof( Visibility ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Visibility.Visible ) );
-
-    public static Visibility GetViewFinderVisibility( DependencyObject d )
-    {
-      return ( Visibility )( d.GetValue( Zoombox.ViewFinderVisibilityProperty ) );
-    }
-
-    public static void SetViewFinderVisibility( DependencyObject d, Visibility value )
-    {
-      d.SetValue( Zoombox.ViewFinderVisibilityProperty, value );
-    }
-
-    #endregion
-
-    #region Viewport Property
-
-    private static readonly DependencyPropertyKey ViewportPropertyKey =
-      DependencyProperty.RegisterReadOnly( "Viewport", typeof( Rect ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Rect.Empty, 
-          new PropertyChangedCallback( Zoombox.OnViewportChanged ) ) );
-
-    public static readonly DependencyProperty ViewportProperty = Zoombox.ViewportPropertyKey.DependencyProperty;
-
-    public Rect Viewport
-    {
-      get
-      {
-        return ( Rect )this.GetValue( Zoombox.ViewportProperty );
-      }
-    }
-
-    private static void OnViewportChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      // keep the Position property in sync with the Viewport
-      Zoombox zoombox = ( Zoombox )o;
-      zoombox.Position = new Point( -zoombox.Viewport.Left * zoombox.Scale / zoombox._viewboxFactor, -zoombox.Viewport.Top * zoombox.Scale / zoombox._viewboxFactor );
-    }
-
-    #endregion
-
-    #region ViewStackCount Property
-
-    private static readonly DependencyPropertyKey ViewStackCountPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ViewStackCount", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1,
-          new PropertyChangedCallback( Zoombox.OnViewStackCountChanged ) ) );
-
-    public static readonly DependencyProperty ViewStackCountProperty = Zoombox.ViewStackCountPropertyKey.DependencyProperty;
-
-    public int ViewStackCount
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.ViewStackCountProperty );
-      }
-    }
-
-    internal void SetViewStackCount( int value )
-    {
-      this.SetValue( Zoombox.ViewStackCountPropertyKey, value );
-    }
-
-    private static void OnViewStackCountChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackCountChanged( e );
-    }
-
-    private void OnViewStackCountChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      this.UpdateStackProperties();
-    }
-
-    #endregion
-
-    #region ViewStackIndex Property
-
-    public static readonly DependencyProperty ViewStackIndexProperty =
-      DependencyProperty.Register( "ViewStackIndex", typeof( int ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( -1,
-          new PropertyChangedCallback( Zoombox.OnViewStackIndexChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackIndexValue ) ) );
-
-    public int ViewStackIndex
-    {
-      get
-      {
-        return ( int )this.GetValue( Zoombox.ViewStackIndexProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewStackIndexProperty, value );
-      }
-    }
-
-    private static void OnViewStackIndexChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackIndexChanged( e );
-    }
-
-    private void OnViewStackIndexChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( !this.IsUpdatingView )
-      {
-        int viewIndex = this.ViewStackIndex;
-        if( viewIndex >= 0 && viewIndex < ViewStack.Count )
-        {
-          // update the current view, but don't allow the new view 
-          // to be added to the view stack
-          this.UpdateView( this.ViewStack[ viewIndex ], true, false, viewIndex );
-        }
-      }
-
-      this.UpdateStackProperties();
-      this.RaiseEvent( new IndexChangedEventArgs( Zoombox.ViewStackIndexChangedEvent, ( int )e.OldValue, ( int )e.NewValue ) );
-    }
-
-    private static object CoerceViewStackIndexValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = d as Zoombox;
-      return ( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled ) ? -1 : value;
-    }
-
-    #endregion
-
-    #region ViewStackMode Property
-
-    public static readonly DependencyProperty ViewStackModeProperty = 
-      DependencyProperty.Register( "ViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxViewStackMode.Default,
-          new PropertyChangedCallback( Zoombox.OnViewStackModeChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackModeValue ) ) );
-
-    public ZoomboxViewStackMode ViewStackMode
-    {
-      get
-      {
-        return ( ZoomboxViewStackMode )this.GetValue( Zoombox.ViewStackModeProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ViewStackModeProperty, value );
-      }
-    }
-
-    private static void OnViewStackModeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnViewStackModeChanged( e );
-    }
-
-    private void OnViewStackModeChanged( DependencyPropertyChangedEventArgs e )
-    {
-      if( ( ZoomboxViewStackMode )e.NewValue == ZoomboxViewStackMode.Disabled && _viewStack != null )
-      {
-        _viewStack.ClearViewStackSource();
-        _viewStack = null;
-      }
-    }
-
-    private static object CoerceViewStackModeValue( DependencyObject d, object value )
-    {
-      Zoombox zoombox = d as Zoombox;
-      ZoomboxViewStackMode effectiveMode = ( ZoomboxViewStackMode )value;
-
-      // if the effective mode is currently disabled, it must be updated first
-      if( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-      {
-        zoombox.SetEffectiveViewStackMode( effectiveMode );
-      }
-
-      // now determine the correct effective mode
-      if( effectiveMode != ZoomboxViewStackMode.Disabled )
-      {
-        if( effectiveMode == ZoomboxViewStackMode.Default )
-        {
-          effectiveMode = ( zoombox.ViewStack.AreViewsFromSource ? ZoomboxViewStackMode.Manual : ZoomboxViewStackMode.Auto );
-        }
-        if( zoombox.ViewStack.AreViewsFromSource && ( ZoomboxViewStackMode )effectiveMode != ZoomboxViewStackMode.Manual )
-        {
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewModeInvalidForSource" ) );
-        }
-      }
-
-      // update the effective mode
-      zoombox.SetEffectiveViewStackMode( effectiveMode );
-      return value;
-    }
-
-    #endregion
-
-    #region ViewStackSource Property
-
-    public static readonly DependencyProperty ViewStackSourceProperty =
-      DependencyProperty.Register( "ViewStackSource", typeof( IEnumerable ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ( IEnumerable )null,
-          new PropertyChangedCallback( Zoombox.OnViewStackSourceChanged ) ) );
-
-    [Bindable( true )]
-    public IEnumerable ViewStackSource
-    {
-      get
-      {
-        return ( _viewStack == null ) ? null : ViewStack.Source;
-      }
-      set
-      {
-        if( value == null )
-        {
-          this.ClearValue( Zoombox.ViewStackSourceProperty );
-        }
-        else
-        {
-          this.SetValue( Zoombox.ViewStackSourceProperty, value );
-        }
-      }
-    }
-
-    private static void OnViewStackSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = ( Zoombox )d;
-      IEnumerable oldValue = ( IEnumerable )e.OldValue;
-      IEnumerable newValue = ( IEnumerable )e.NewValue;
-
-      // We need to know whether the new value represents an explicit null value 
-      // or whether it came from a binding. The latter indicates that we stay in ViewStackSource mode,
-      // but with a null collection.
-      if( e.NewValue == null && !BindingOperations.IsDataBound( d, Zoombox.ViewStackSourceProperty ) )
-      {
-        if( zoombox.ViewStack != null )
-        {
-          zoombox.ViewStack.ClearViewStackSource();
-        }
-      }
-      else
-      {
-        zoombox.ViewStack.SetViewStackSource( newValue );
-      }
-
-      zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-    }
-
-    #endregion
-
-    #region ZoomModifiers Property
-
-    public static readonly DependencyProperty ZoomModifiersProperty =
-      DependencyProperty.Register( "ZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection ZoomModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultZoomModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Shift );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region ZoomOnPreview Property
-
-    public static readonly DependencyProperty ZoomOnPreviewProperty =
-      DependencyProperty.Register( "ZoomOnPreview", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true ) );
-
-    public bool ZoomOnPreview
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.ZoomOnPreviewProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOnPreviewProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomOrigin Property
-
-    public static readonly DependencyProperty ZoomOriginProperty =
-      DependencyProperty.Register( "ZoomOrigin", typeof( Point ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( new Point( 0.5d, 0.5d ) ) );
-
-    public Point ZoomOrigin
-    {
-      get
-      {
-        return ( Point )this.GetValue( Zoombox.ZoomOriginProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOriginProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomPercentage Property
-
-    public static readonly DependencyProperty ZoomPercentageProperty =
-      DependencyProperty.Register( "ZoomPercentage", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 5d ) );
-
-    public double ZoomPercentage
-    {
-      get
-      {
-        return ( double )this.GetValue( Zoombox.ZoomPercentageProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomPercentageProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomOn Property
-
-    public static readonly DependencyProperty ZoomOnProperty =
-      DependencyProperty.Register( "ZoomOn", typeof( ZoomboxZoomOn ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxZoomOn.Content ) );
-
-    public ZoomboxZoomOn ZoomOn
-    {
-      get
-      {
-        return ( ZoomboxZoomOn )this.GetValue( Zoombox.ZoomOnProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomOnProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ZoomToSelectionModifiers Property
-
-    public static readonly DependencyProperty ZoomToSelectionModifiersProperty =
-      DependencyProperty.Register( "ZoomToSelectionModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Zoombox.GetDefaultZoomToSelectionModifiers() ) );
-
-    [TypeConverter( typeof( KeyModifierCollectionConverter ) )]
-    public KeyModifierCollection ZoomToSelectionModifiers
-    {
-      get
-      {
-        return ( KeyModifierCollection )this.GetValue( Zoombox.ZoomToSelectionModifiersProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.ZoomToSelectionModifiersProperty, value );
-      }
-    }
-
-    private static KeyModifierCollection GetDefaultZoomToSelectionModifiers()
-    {
-      KeyModifierCollection result = new KeyModifierCollection();
-      result.Add( KeyModifier.Alt );
-      result.Add( KeyModifier.Exact );
-      return result;
-    }
-
-    #endregion
-
-    #region KeepContentInBounds Property
-
-    public static readonly DependencyProperty KeepContentInBoundsProperty =
-      DependencyProperty.Register( "KeepContentInBounds", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false, 
-          new PropertyChangedCallback( Zoombox.OnKeepContentInBoundsChanged ) ) );
-
-    public bool KeepContentInBounds
-    {
-      get
-      {
-        return ( bool )this.GetValue( Zoombox.KeepContentInBoundsProperty );
-      }
-      set
-      {
-        this.SetValue( Zoombox.KeepContentInBoundsProperty, value );
-      }
-    }
-
-    private static void OnKeepContentInBoundsChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( Zoombox )d ).OnKeepContentInBoundsChanged( e );
-    }
-
-    private void OnKeepContentInBoundsChanged( DependencyPropertyChangedEventArgs e )
-    {
-      //
-      // Update view and see if we need to reposition the content
-      //
-      bool oldIsAnimated = this.IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
-      }
-      finally
-      {
-        this.IsAnimated = oldIsAnimated;
-      }
-    }
-
-    #endregion
-
-    #region ViewStack Property
-
-    public ZoomboxViewStack ViewStack
-    {
-      get
-      {
-        if( _viewStack == null && this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-        {
-          _viewStack = new ZoomboxViewStack( this );
-        }
-        return _viewStack;
-      }
-    }
-
-    #endregion
-
-    #region HasArrangedContentPresenter Internal Property
-
-    internal bool HasArrangedContentPresenter
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasArrangedContentPresenter ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingView Internal Property
-
-    internal bool IsUpdatingView
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingView ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingView ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ContentOffset Private Property
-
-    private Vector ContentOffset
-    {
-      get
-      {
-        // auto-wrapped content is always left and top aligned
-        if( this.IsContentWrapped || _content == null || !( _content is FrameworkElement ) )
-          return new Vector( 0, 0 );
-
-        double x = 0;
-        double y = 0;
-        Size contentSize = this.ContentRect.Size;
-
-        switch( ( _content as FrameworkElement ).HorizontalAlignment )
-        {
-          case HorizontalAlignment.Center:
-          case HorizontalAlignment.Stretch:
-            x = ( this.RenderSize.Width - contentSize.Width ) / 2;
-            break;
-
-          case HorizontalAlignment.Right:
-            x = this.RenderSize.Width - contentSize.Width;
-            break;
-        }
-
-        switch( ( _content as FrameworkElement ).VerticalAlignment )
-        {
-          case VerticalAlignment.Center:
-          case VerticalAlignment.Stretch:
-            y = ( this.RenderSize.Height - contentSize.Height ) / 2;
-            break;
-
-          case VerticalAlignment.Bottom:
-            y = this.RenderSize.Height - contentSize.Height;
-            break;
-        }
-
-        return new Vector( x, y );
-      }
-    }
-
-    #endregion
-
-    #region ContentRect Private Property
-
-    private Rect ContentRect
-    {
-      get
-      {
-        return ( _content == null ) ? Rect.Empty
-            : new Rect( new Size( _content.RenderSize.Width / _viewboxFactor, _content.RenderSize.Height / _viewboxFactor ) );
-      }
-    }
-
-    #endregion
-
-    #region HasRenderedFirstView Private Property
-
-    private bool HasRenderedFirstView
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasRenderedFirstView ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.HasRenderedFirstView ] = value;
-      }
-    }
-
-    #endregion
-
-    #region HasUIPermission Private Property
-
-    private bool HasUIPermission
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.HasUIPermission ];
-      }
-    }
-
-    #endregion
-
-    #region IsContentWrapped Private Property
-
-    private bool IsContentWrapped
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsContentWrapped ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsContentWrapped ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsDraggingViewport Private Property
-
-    private bool IsDraggingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsDraggingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsDraggingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsMonitoringInput Private Property
-
-    private bool IsMonitoringInput
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsMonitoringInput ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsMonitoringInput ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsResizingViewport Private Property
-
-    private bool IsResizingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsResizingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsResizingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsUpdatingViewport Private Property
-
-    private bool IsUpdatingViewport
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsUpdatingViewport ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsUpdatingViewport ] = value;
-      }
-    }
-
-    #endregion
-
-    #region RefocusViewOnFirstRender Private Property
-
-    private bool RefocusViewOnFirstRender
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.RefocusViewOnFirstRender ] = value;
-      }
-    }
-
-    #endregion
-
-    #region ViewFinderDisplayRect Private Property
-
-    private Rect ViewFinderDisplayRect
-    {
-      get
-      {
-        return ( _viewFinderDisplay == null ) ? Rect.Empty
-            : new Rect( new Point( 0, 0 ), new Point( _viewFinderDisplay.RenderSize.Width, _viewFinderDisplay.RenderSize.Height ) );
-      }
-    }
-
-    #endregion
-
-    #region AnimationBeginning Event
-
-    public static readonly RoutedEvent AnimationBeginningEvent = EventManager.RegisterRoutedEvent( "AnimationBeginning", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
-
-    public event RoutedEventHandler AnimationBeginning
-    {
-      add
-      {
-        this.AddHandler( Zoombox.AnimationBeginningEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.AnimationBeginningEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region AnimationCompleted Event
-
-    public static readonly RoutedEvent AnimationCompletedEvent = EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
-
-    public event RoutedEventHandler AnimationCompleted
-    {
-      add
-      {
-        this.AddHandler( Zoombox.AnimationCompletedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.AnimationCompletedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region CurrentViewChanged Event
-
-    public static readonly RoutedEvent CurrentViewChangedEvent = EventManager.RegisterRoutedEvent( "CurrentViewChanged", RoutingStrategy.Bubble, typeof( ZoomboxViewChangedEventHandler ), typeof( Zoombox ) );
-
-    public event ZoomboxViewChangedEventHandler CurrentViewChanged
-    {
-      add
-      {
-        this.AddHandler( Zoombox.CurrentViewChangedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.CurrentViewChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    public event EventHandler<ScrollEventArgs> Scroll;
-
-    #region ViewStackIndexChanged Event
-
-    public static readonly RoutedEvent ViewStackIndexChangedEvent = EventManager.RegisterRoutedEvent( "ViewStackIndexChanged", RoutingStrategy.Bubble, typeof( IndexChangedEventHandler ), typeof( Zoombox ) );
-
-    public event IndexChangedEventHandler ViewStackIndexChanged
-    {
-      add
-      {
-        this.AddHandler( Zoombox.ViewStackIndexChangedEvent, value );
-      }
-      remove
-      {
-        this.RemoveHandler( Zoombox.ViewStackIndexChangedEvent, value );
-      }
-    }
-
-    #endregion
-
-    #region Back Command
-
-    public static RoutedUICommand Back = new RoutedUICommand( "Go Back", "GoBack", typeof( Zoombox ) );
-
-    private void CanGoBack( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStackIndex > 0 );
-    }
-
-    private void GoBack( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoBack();
-    }
-
-    #endregion
-
-    #region Center Command
-
-    public static RoutedUICommand Center = new RoutedUICommand( "Center Content", "Center", typeof( Zoombox ) );
-
-    private void CenterContent( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.CenterContent();
-    }
-
-    #endregion
-
-    #region Fill Command
-
-    public static RoutedUICommand Fill = new RoutedUICommand( "Fill Bounds with Content", "FillToBounds", typeof( Zoombox ) );
-
-    private void FillToBounds( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.FillToBounds();
-    }
-
-    #endregion
-
-    #region Fit Command
-
-    public static RoutedUICommand Fit = new RoutedUICommand( "Fit Content within Bounds", "FitToBounds", typeof( Zoombox ) );
-
-    private void FitToBounds( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.FitToBounds();
-    }
-
-    #endregion
-
-    #region Forward Command
-
-    public static RoutedUICommand Forward = new RoutedUICommand( "Go Forward", "GoForward", typeof( Zoombox ) );
-
-    private void CanGoForward( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStackIndex < this.ViewStack.Count - 1 );
-    }
-
-    private void GoForward( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoForward();
-    }
-
-    #endregion
-
-    #region Home Command
-
-    public static RoutedUICommand Home = new RoutedUICommand( "Go Home", "GoHome", typeof( Zoombox ) );
-
-    private void CanGoHome( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-                  && ( this.ViewStack.Count > 0 )
-                  && ( this.ViewStackIndex != 0 );
-    }
-
-    private void GoHome( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.GoHome();
-    }
-
-    #endregion
-
-    #region PanDown Command
-
-    public static RoutedUICommand PanDown = new RoutedUICommand( "Pan Down", "PanDown", typeof( Zoombox ) );
-
-    private void PanDownExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X, _basePosition.Y + PanDistance );
-    }
-
-    #endregion
-
-    #region PanLeft Command
-
-    public static RoutedUICommand PanLeft = new RoutedUICommand( "Pan Left", "PanLeft", typeof( Zoombox ) );
-
-    private void PanLeftExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X - this.PanDistance, _basePosition.Y );
-    }
-
-    #endregion
-
-    #region PanRight Command
-
-    public static RoutedUICommand PanRight = new RoutedUICommand( "Pan Right", "PanRight", typeof( Zoombox ) );
-
-    private void PanRightExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X + this.PanDistance, _basePosition.Y );
-    }
-
-    #endregion
-
-    #region PanUp Command
-
-    public static RoutedUICommand PanUp = new RoutedUICommand( "Pan Up", "PanUp", typeof( Zoombox ) );
-
-    private void PanUpExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Position = new Point( _basePosition.X, _basePosition.Y - this.PanDistance );
-    }
-
-    #endregion
-
-    #region Refocus Command
-
-    public static RoutedUICommand Refocus = new RoutedUICommand( "Refocus View", "Refocus", typeof( Zoombox ) );
-
-    private void CanRefocusView( object sender, CanExecuteRoutedEventArgs e )
-    {
-      e.CanExecute = ( this.EffectiveViewStackMode == ZoomboxViewStackMode.Manual )
-                  && ( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count )
-                  && ( this.CurrentView != this.ViewStack[ this.ViewStackIndex ] );
-    }
-
-    private void RefocusView( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.RefocusView();
-    }
-
-    #endregion
-
-    #region ZoomIn Command
-
-    public static RoutedUICommand ZoomIn = new RoutedUICommand( "Zoom In", "ZoomIn", typeof( Zoombox ) );
-
-    private void ZoomInExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Zoom( this.ZoomPercentage / 100 );
-    }
-
-    #endregion
-
-    #region ZoomOut Command
-
-    public static RoutedUICommand ZoomOut = new RoutedUICommand( "Zoom Out", "ZoomOut", typeof( Zoombox ) );
-
-    private void ZoomOutExecuted( object sender, ExecutedRoutedEventArgs e )
-    {
-      this.Zoom( -this.ZoomPercentage / 100 );
-    }
-
-    #endregion
-
-    public void CenterContent()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Center );
-      }
-    }
-
-    public void FillToBounds()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Fill );
-      }
-    }
-
-    public void FitToBounds()
-    {
-      if( _content != null )
-      {
-        this.SetScrollBars();
-        this.ZoomTo( ZoomboxView.Fit );
-      }
-    }
-
-    public void GoBack()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex > 0 )
-      {
-        this.ViewStackIndex--;
-      }
-    }
-
-    public void GoForward()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex < this.ViewStack.Count - 1 )
-      {
-        this.ViewStackIndex++;
-      }
-    }
-
-    public void GoHome()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex > 0 )
-      {
-        this.ViewStackIndex = 0;
-      }
-    }
-
-    public override void OnApplyTemplate()
-    {
-      this.AttachToVisualTree();
-      base.OnApplyTemplate();
-    }
-
-    public void RefocusView()
-    {
-      if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled )
-        return;
-
-      if( this.ViewStackIndex >= 0 && this.ViewStackIndex < this.ViewStack.Count
-          && this.CurrentView != this.ViewStack[ this.ViewStackIndex ] )
-      {
-        this.UpdateView( this.ViewStack[ this.ViewStackIndex ], true, false, this.ViewStackIndex );
-      }
-    }
-
-    public void Zoom( double percentage )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      this.Zoom( percentage, this.GetZoomRelativePoint() );
-    }
-
-    public void Zoom( double percentage, Point relativeTo )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the given point
-      double scale = this.Scale * ( 1 + percentage );
-      this.ZoomTo( scale, relativeTo );
-    }
-
-    public void ZoomTo( Point position )
-    {
-      // if there is nothing to pan, just return
-      if( _content == null )
-        return;
-
-      // zoom to the new region
-      this.ZoomTo( new ZoomboxView( new Point( -position.X, -position.Y ) ) );
-    }
-
-    public void ZoomTo( Rect region )
-    {
-      if( _content == null )
-        return;
-
-      // adjust the current scale and position
-      this.UpdateView( new ZoomboxView( region ), true, true );
-    }
-
-    public void ZoomTo( double scale )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the center of the content within the control
-      this.ZoomTo( scale, true );
-    }
-
-    public void ZoomTo( double scale, Point relativeTo )
-    {
-      this.ZoomTo( scale, relativeTo, true, true );
-    }
-
-    public void ZoomTo( ZoomboxView view )
-    {
-      this.UpdateView( view, true, true );
-    }
-
-    internal void UpdateStackProperties()
-    {
-      this.SetValue( Zoombox.HasBackStackPropertyKey, this.ViewStackIndex > 0 );
-      this.SetValue( Zoombox.HasForwardStackPropertyKey, this.ViewStack.Count > this.ViewStackIndex + 1 );
-      CommandManager.InvalidateRequerySuggested();
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      if( _content != null )
-      {
-        // measure visuals according to supplied constraint
-        Size size = base.MeasureOverride( constraint );
-
-        // now re-measure content to let the child be whatever size it desires
-        _content.Measure( new Size( double.PositiveInfinity, double.PositiveInfinity ) );
-        return size;
-      }
-
-
-      // avoid returning infinity
-      if( double.IsInfinity( constraint.Height ) )
-      {
-        constraint.Height = 0;
-      }
-
-      if( double.IsInfinity( constraint.Width ) )
-      {
-        constraint.Width = 0;
-      }
-      return constraint;
-    }
-
-    protected override void OnContentChanged( object oldContent, object newContent )
-    {
-      // disconnect SizeChanged handler from old content
-      if( oldContent is FrameworkElement )
-      {
-        ( oldContent as FrameworkElement ).RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-      }
-      else
-      {
-        this.RemoveHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ) );
-      }
-
-      // connect SizeChanged handler to new content
-      if( _content is FrameworkElement )
-      {
-        ( _content as FrameworkElement ).AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-      }
-      else
-      {
-        this.AddHandler( FrameworkElement.SizeChangedEvent, new SizeChangedEventHandler( this.OnContentSizeChanged ), true );
-      }
-
-      // update the Visual property of the view finder display panel's VisualBrush
-      if( _viewFinderDisplay != null && _viewFinderDisplay.VisualBrush != null )
-      {
-        _viewFinderDisplay.VisualBrush.Visual = _content;
-      }
-    }
-
-    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      this.MonitorInput();
-      base.OnGotKeyboardFocus( e );
-    }
-
-    protected override void OnLostKeyboardFocus( KeyboardFocusChangedEventArgs e )
-    {
-      this.MonitorInput();
-      base.OnLostKeyboardFocus( e );
-    }
-
-    protected override void OnInitialized( EventArgs e )
-    {
-      base.OnInitialized( e );
-      this.CoerceValue( Zoombox.IsAnimatedProperty );
-    }
-
-    protected override void OnRender( DrawingContext drawingContext )
-    {
-      if( this.HasArrangedContentPresenter && !this.HasRenderedFirstView )
-      {
-        this.HasRenderedFirstView = true;
-        if( this.RefocusViewOnFirstRender )
-        {
-          this.RefocusViewOnFirstRender = false;
-          bool oldAnimated = this.IsAnimated;
-          this.IsAnimated = false;
-          try
-          {
-            this.RefocusView();
-          }
-          finally
-          {
-            this.IsAnimated = oldAnimated;
-          }
-        }
-      }
-
-      base.OnRender( drawingContext );
-    }
-
-
-
-
-    private static void RefocusView( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      Zoombox zoombox = o as Zoombox;
-      zoombox.UpdateView( zoombox.CurrentView, true, false, zoombox.ViewStackIndex );
-    }
-
-    private void AttachToVisualTree()
-    {
-      if( _isUpdatingVisualTree )
-        return;
-
-      _isUpdatingVisualTree = true;
-
-      // detach from the old tree
-      this.DetachFromVisualTree();
-
-      // create the drag adorner for selection operations
-      _dragAdorner = new DragAdorner( this );
-
-      // check the template for a SelectionBrush resource
-      if( this.Template.Resources.Contains( "SelectionBrush" ) )
-        _dragAdorner.Brush = this.Template.Resources[ "SelectionBrush" ] as Brush;
-
-      // check the template for a SelectionPen resource
-      if( this.Template.Resources.Contains( "SelectionPen" ) )
-        _dragAdorner.Pen = this.Template.Resources[ "SelectionPen" ] as Pen;
-
-      // check the template for key bindings
-      if( this.Template.Resources.Contains( "InputBindings" ) )
-      {
-        InputBindingCollection inputBindings = this.Template.Resources[ "InputBindings" ] as InputBindingCollection;
-        if( inputBindings != null )
-        {
-          this.InputBindings.AddRange( inputBindings );
-        }
-      }
-
-      // locate the content presenter
-      _contentPresenter = VisualTreeHelperEx.FindDescendantByType( this, typeof( ContentPresenter ) ) as ContentPresenter;
-      if( _contentPresenter == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxTemplateNeedsContent" ) );
-
-      _verticalScrollBar = this.GetTemplateChild( PART_VerticalScrollBar ) as ScrollBar;
-      if( _verticalScrollBar == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox vertical scrollBar not found." ) );
-
-      _verticalScrollBar.Scroll += this.VerticalScrollBar_Scroll;
-
-      _horizontalScrollBar = this.GetTemplateChild( PART_HorizontalScrollBar ) as ScrollBar;
-      if( _horizontalScrollBar == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "Zoombox horizontal scrollBar not found." ) );
-
-      _horizontalScrollBar.Scroll += this.HorizontalScrollBar_Scroll;
-
-      // check the template for an AdornerDecorator
-      AdornerLayer al = null;
-      AdornerDecorator ad = VisualTreeHelperEx.FindDescendantByType( this, typeof( AdornerDecorator ) ) as AdornerDecorator;
-      if( ad != null )
-      {
-        al = ad.AdornerLayer;
-      }
-      else
-      {
-        // look for an inherited adorner layer
-        try
-        {
-          al = AdornerLayer.GetAdornerLayer( this );
-        }
-        catch( Exception )
-        {
-        }
-      }
-
-      // add the drag adorner to the adorner layer
-      if( al != null )
-      {
-        al.Add( _dragAdorner );
-      }
-
-      // TODO: Why is it necessary to walk the visual tree the first time through?
-      // If we don't do the following, the content is not laid out correctly (centered) initially.
-      VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true );
-
-      // User has not defined a ViewFinder, use the one from this template
-      if( this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null )
-      {
-        // set a reference to the ViewFinder element, if present
-        this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement );
-        Zoombox.SetViewFinderVisibility( this, Visibility.Collapsed );
-      }
-      else
-      {
-        //user has defined a ViewFinder, hide the one from this template
-        Zoombox.SetViewFinderVisibility( this, Visibility.Hidden );
-      }
-
-      // locate the view finder display panel
-      if( this.ViewFinder != null )
-      {
-        _viewFinderDisplay = VisualTreeHelperEx.FindDescendantByType( this.ViewFinder, typeof( ZoomboxViewFinderDisplay ) ) as ZoomboxViewFinderDisplay;
-      }
-
-      // if a ViewFinder was specified but no display panel is present, throw an exception
-      if( this.ViewFinder != null && _viewFinderDisplay == null )
-        throw new InvalidTemplateException( ErrorMessages.GetMessage( "ZoomboxHasViewFinderButNotDisplay" ) );
-
-      // set up the VisualBrush and adorner for the display panel
-      if( _viewFinderDisplay != null )
-      {
-        // create VisualBrush for the view finder display panel
-        this.CreateVisualBrushForViewFinder( _content );
-
-        // hook up event handlers for dragging and resizing the viewport
-        _viewFinderDisplay.MouseMove += new MouseEventHandler( this.ViewFinderDisplayMouseMove );
-        _viewFinderDisplay.MouseLeftButtonDown += new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture );
-        _viewFinderDisplay.MouseLeftButtonUp += new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture );
-
-        // bind the ViewportRect property of the display to the Viewport of the Zoombox
-        Binding binding = new Binding( "Viewport" );
-        binding.Mode = BindingMode.OneWay;
-        binding.Converter = new ViewFinderSelectionConverter( this );
-        binding.Source = this;
-        _viewFinderDisplay.SetBinding( ZoomboxViewFinderDisplay.ViewportRectProperty, binding );
-      }
-
-      this.UpdateViewFinderDisplayContentBounds();
-
-      // set up event handler to run once the content presenter has been arranged
-      _contentPresenter.LayoutUpdated += new EventHandler( this.ContentPresenterFirstArranged );
-
-      _isUpdatingVisualTree = false;
-    }
-
-    private void CreateVisualBrushForViewFinder( Visual visual )
-    {
-      _viewFinderDisplay.VisualBrush = new VisualBrush( visual );
-      _viewFinderDisplay.VisualBrush.Stretch = Stretch.Uniform;
-      _viewFinderDisplay.VisualBrush.AlignmentX = AlignmentX.Left;
-      _viewFinderDisplay.VisualBrush.AlignmentY = AlignmentY.Top;
-    }
-
-    private void ContentPresenterFirstArranged( object sender, EventArgs e )
-    {
-      // remove the handler
-      _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
-
-      // it's now safe to update the view
-      this.HasArrangedContentPresenter = true;
-      this.InvalidateVisual();
-
-      // temporarily disable animations
-      bool oldAnimated = IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        // set the initial view
-        double scale = this.Scale;
-        Point position = this.Position;
-
-        // if there are items in the ViewStack and a ViewStackIndex is set, use it
-        if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Disabled )
-        {
-          bool isInitialViewSet = false;
-          if( this.ViewStack.Count > 0 )
-          {
-            if( this.ViewStackIndex >= 0 )
-            {
-              if( this.ViewStackIndex > this.ViewStack.Count - 1 )
-              {
-                this.ViewStackIndex = this.ViewStack.Count - 1;
-              }
-              else
-              {
-                this.UpdateView( this.ViewStack[ this.ViewStackIndex ], false, false, this.ViewStackIndex );
-              }
-            }
-            else if( this.EffectiveViewStackMode != ZoomboxViewStackMode.Auto )
-            {
-              // if this is not an auto-stack, then ensure the index is set to a valid value
-              if( this.ViewStackIndex < 0 )
-              {
-                this.ViewStackIndex = 0;
-              }
-            }
-
-            // if a ViewStackIndex has been set, apply the scale and position values, iff different than the default values
-            if( this.ViewStackIndex >= 0 )
-            {
-              isInitialViewSet = true;
-              if( !DoubleHelper.IsNaN( scale ) || !PointHelper.IsEmpty( position ) )
-              {
-                this.UpdateView( new ZoomboxView( scale, position ), false, false );
-              }
-            }
-          }
-
-          if( !isInitialViewSet )
-          {
-            // set initial view according to the scale and position values and push it on the stack, as necessary
-            ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : Scale,
-              PointHelper.IsEmpty( position ) ? new Point() : position );
-
-            if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto )
-            {
-              this.ViewStack.PushView( initialView );
-              this.ViewStackIndex = 0;
-            }
-            else
-            {
-              this.UpdateView( initialView, false, false );
-            }
-          }
-        }
-        else
-        {
-          // just set initial view according to the scale and position values
-          ZoomboxView initialView = new ZoomboxView( DoubleHelper.IsNaN( Scale ) ? 1.0 : this.Scale, position );
-          this.UpdateView( initialView, false, false );
-        }
-      }
-      finally
-      {
-        IsAnimated = oldAnimated;
-      }
-      //When ViewFinder is modified, this will refresh the ZoomboxViewFinderDisplay
-      this.ZoomTo( this.Scale );
-    }
-
-    private void DetachFromVisualTree()
-    {
-      // remove the drag adorner
-      if( (_dragAdorner != null) && ( AdornerLayer.GetAdornerLayer( this ) != null ) )
-        AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner );
-
-      // remove the layout updated handler, if present
-      if( _contentPresenter != null )
-      {
-        _contentPresenter.LayoutUpdated -= new EventHandler( this.ContentPresenterFirstArranged );
-      }
-
-      //locate the vertical scrollBar
-      if( _verticalScrollBar != null )
-      {
-        _verticalScrollBar.Scroll -= this.VerticalScrollBar_Scroll;
-      }
-
-      //locate the horizontal scrollBar
-      if( _horizontalScrollBar != null )
-      {
-        _horizontalScrollBar.Scroll -= this.HorizontalScrollBar_Scroll;
-      }
-
-      // remove the view finder display panel's visual brush and adorner
-      if( _viewFinderDisplay != null )
-      {
-        _viewFinderDisplay.MouseMove -= new MouseEventHandler( this.ViewFinderDisplayMouseMove );
-        _viewFinderDisplay.MouseLeftButtonDown -= new MouseButtonEventHandler( this.ViewFinderDisplayBeginCapture );
-        _viewFinderDisplay.MouseLeftButtonUp -= new MouseButtonEventHandler( this.ViewFinderDisplayEndCapture );
-        BindingOperations.ClearBinding( _viewFinderDisplay, ZoomboxViewFinderDisplay.ViewportRectProperty );
-        _viewFinderDisplay = null;
-      }
-
-      // set object references to null
-      _contentPresenter = null;
-    }
-
-    private void Zoombox_Loaded( object sender, RoutedEventArgs e )
-    {
-      this.SetScrollBars();
-    }
-
-    private void VerticalScrollBar_Scroll( object sender, ScrollEventArgs e )
-    {
-      double diff = -(e.NewValue + _relativePosition.Y);
-
-      if( e.ScrollEventType == ScrollEventType.LargeIncrement )
-      {
-        diff = -_verticalScrollBar.ViewportSize;
-      }
-      else if( e.ScrollEventType == ScrollEventType.LargeDecrement )
-      {
-        diff = _verticalScrollBar.ViewportSize;
-      }
-
-      this.OnDrag( new DragDeltaEventArgs( 0d, diff / this.Scale ), false );
-
-      // Raise the Scroll event to user
-      EventHandler<ScrollEventArgs> handler = this.Scroll;
-      if( handler != null )
-      {
-        handler( this, e );
-      }
-    }
-
-    private void HorizontalScrollBar_Scroll( object sender, ScrollEventArgs e )
-    {
-      double diff = -( e.NewValue + _relativePosition.X );
-      if( e.ScrollEventType == ScrollEventType.LargeIncrement )
-      {
-        diff = -_horizontalScrollBar.ViewportSize;
-      }
-      else if( e.ScrollEventType == ScrollEventType.LargeDecrement )
-      {
-        diff = _horizontalScrollBar.ViewportSize;
-      }
-
-      this.OnDrag( new DragDeltaEventArgs( diff / this.Scale, 0d ), false );
-
-      // Raise the Scroll event to user
-      EventHandler<ScrollEventArgs> handler = this.Scroll;
-      if( handler != null )
-      {
-        handler( this, e );
-      }
-    }
-
-    private void DragDisplayViewport( DragDeltaEventArgs e, bool end )
-    {
-      // get the scale of the view finder display panel, the selection rect, and the VisualBrush rect
-      double scale = _viewFinderDisplay.Scale;
-      Rect viewportRect = _viewFinderDisplay.ViewportRect;
-      Rect vbRect = _viewFinderDisplay.ContentBounds;
-
-      // if the entire content is visible, do nothing
-      if( viewportRect.Contains( vbRect ) )
-        return;
-
-      // ensure that we stay within the bounds of the VisualBrush
-      double dx = e.HorizontalChange;
-      double dy = e.VerticalChange;
-
-      // check left boundary
-      if( viewportRect.Left < vbRect.Left )
-      {
-        dx = Math.Max( 0, dx );
-      }
-      else if( viewportRect.Left + dx < vbRect.Left )
-      {
-        dx = vbRect.Left - viewportRect.Left;
-      }
-
-      // check right boundary
-      if( viewportRect.Right > vbRect.Right )
-      {
-        dx = Math.Min( 0, dx );
-      }
-      else if( viewportRect.Right + dx > vbRect.Left + vbRect.Width )
-      {
-        dx = vbRect.Left + vbRect.Width - viewportRect.Right;
-      }
-
-      // check top boundary
-      if( viewportRect.Top < vbRect.Top )
-      {
-        dy = Math.Max( 0, dy );
-      }
-      else if( viewportRect.Top + dy < vbRect.Top )
-      {
-        dy = vbRect.Top - viewportRect.Top;
-      }
-
-      // check bottom boundary
-      if( viewportRect.Bottom > vbRect.Bottom )
-      {
-        dy = Math.Min( 0, dy );
-      }
-      else if( viewportRect.Bottom + dy > vbRect.Top + vbRect.Height )
-      {
-        dy = vbRect.Top + vbRect.Height - viewportRect.Bottom;
-      }
-
-      // call the main OnDrag handler that is used when dragging the content directly
-      this.OnDrag( new DragDeltaEventArgs( -dx / scale / _viewboxFactor, -dy / scale / _viewboxFactor ), end );
-
-      // for a drag operation, update the origin with each delta
-      _originPoint = _originPoint + new Vector( dx, dy );
-    }
-
-    private void InitCommands()
-    {
-      CommandBinding binding = new CommandBinding( Zoombox.Back, this.GoBack, this.CanGoBack );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Center, this.CenterContent );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Fill, this.FillToBounds );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Fit, this.FitToBounds );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Forward, this.GoForward, this.CanGoForward );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Home, this.GoHome, this.CanGoHome );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanDown, this.PanDownExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanLeft, this.PanLeftExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanRight, this.PanRightExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.PanUp, this.PanUpExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.Refocus, this.RefocusView, this.CanRefocusView );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.ZoomIn, this.ZoomInExecuted );
-      this.CommandBindings.Add( binding );
-
-      binding = new CommandBinding( Zoombox.ZoomOut, this.ZoomOutExecuted );
-      this.CommandBindings.Add( binding );
-    }
-
-    private void MonitorInput()
-    {
-      // cannot pre-process input in partial trust
-      if( this.HasUIPermission )
-      {
-        this.PreProcessInput();
-      }
-    }
-
-    private void OnContentSizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      this.UpdateViewFinderDisplayContentBounds();
-
-      if( this.HasArrangedContentPresenter )
-      {
-        if( this.HasRenderedFirstView )
-        {
-          this.SetScrollBars();
-          this.UpdateView( this.CurrentView, true, false, this.CurrentViewIndex );
-        }
-        else
-        {
-          // if the content size changes after the content presenter has been arranged,
-          // but before the first view is rendered, invalidate the render so we can refocus 
-          // the view on the first render
-          this.RefocusViewOnFirstRender = true;
-          this.InvalidateVisual();
-        }
-      }
-    }
-
-    private void OnDrag( DragDeltaEventArgs e, bool end )
-    {
-      Point relativePosition = _relativePosition;
-      double scale = this.Scale;
-      Point newPosition = relativePosition + ( this.ContentOffset * scale ) + new Vector( e.HorizontalChange * scale, e.VerticalChange * scale );
-      if( this.IsUsingScrollBars )
-      {
-        newPosition.X = Math.Max( Math.Min( newPosition.X, 0d ), -_horizontalScrollBar.Maximum );
-        newPosition.Y = Math.Max( Math.Min( newPosition.Y, 0d ), -_verticalScrollBar.Maximum );
-      }
-
-      // update the transform
-      this.UpdateView( new ZoomboxView( scale, newPosition ), false, end );
-    }
-
-    private void OnLayoutUpdated( object sender, EventArgs e )
-    {
-      this.UpdateViewport();
-    }
-
-    private void OnSelectRegion( DragDeltaEventArgs e, bool end )
-    {
-      // draw adorner rect
-      if( end )
-      {
-        _dragAdorner.Rect = Rect.Empty;
-
-        if( _trueContent != null )
-        {
-          // get the selected region (in the content's coordinate space) based on the adorner's last position and size
-          Rect selection =
-            new Rect(
-              this.TranslatePoint( _dragAdorner.LastPosition, _trueContent ),
-              this.TranslatePoint( _dragAdorner.LastPosition + new Vector( _dragAdorner.LastSize.Width, _dragAdorner.LastSize.Height ), _trueContent ) );
-
-          // zoom to the selection
-          this.ZoomTo( selection );
-        }
-      }
-      else
-      {
-        _dragAdorner.Rect =
-          Rect.Intersect(
-            new Rect(
-              _originPoint,
-              new Vector( e.HorizontalChange, e.VerticalChange ) ),
-            new Rect(
-              new Point( 0, 0 ),
-              new Point( this.RenderSize.Width, this.RenderSize.Height ) ) );
-      }
-    }
-
-    private void OnSizeChanged( object sender, SizeChangedEventArgs e )
-    {
-      if( !this.HasArrangedContentPresenter )
-        return;
-
-      this.SetScrollBars();
-
-      // when the size is changing, the viewbox factor must be updated before updating the view
-      this.UpdateViewboxFactor();
-
-      bool oldIsAnimated = this.IsAnimated;
-      this.IsAnimated = false;
-      try
-      {
-        this.UpdateView( this.CurrentView, false, false, this.ViewStackIndex );
-      }
-      finally
-      {
-        this.IsAnimated = oldIsAnimated;
-      }
-    }
-
-    private void SetScrollBars()
-    {
-      if( _content == null || _verticalScrollBar == null || _horizontalScrollBar == null )
-        return;
-
-      var contentSize = ( _content is Viewbox ) ? ( ( Viewbox )_content ).Child.DesiredSize : this.RenderSize;
-
-      _verticalScrollBar.SmallChange = 10d;
-      _verticalScrollBar.LargeChange = 10d;
-      _verticalScrollBar.Minimum = 0d;
-      _verticalScrollBar.ViewportSize = this.RenderSize.Height;
-      _verticalScrollBar.Maximum = contentSize.Height - _verticalScrollBar.ViewportSize;
-
-      _horizontalScrollBar.SmallChange = 10d;
-      _horizontalScrollBar.LargeChange = 10d;
-      _horizontalScrollBar.Minimum = 0d;
-      _horizontalScrollBar.ViewportSize = this.RenderSize.Width;
-      _horizontalScrollBar.Maximum = contentSize.Width - _horizontalScrollBar.ViewportSize;
-    }
-
-    private void PreProcessInput()
-    {
-      // if mouse is over the Zoombox element or if it has keyboard focus, pre-process input 
-      // to update the KeyModifier trigger properties (e.g., DragModifiersAreActive)
-      if( this.IsMouseOver || this.IsKeyboardFocusWithin )
-      {
-        if( !this.IsMonitoringInput )
-        {
-          this.IsMonitoringInput = true;
-          InputManager.Current.PreNotifyInput += new NotifyInputEventHandler( this.PreProcessInput );
-          this.UpdateKeyModifierTriggerProperties();
-        }
-      }
-      else
-      {
-        if( this.IsMonitoringInput )
-        {
-          this.IsMonitoringInput = false;
-          InputManager.Current.PreNotifyInput -= new NotifyInputEventHandler( this.PreProcessInput );
-
-          this.SetAreDragModifiersActive( false );
-          this.SetAreRelativeZoomModifiersActive( false );
-          this.SetAreZoomModifiersActive( false );
-          this.SetAreZoomToSelectionModifiersActive( false );
-        }
-      }
-    }
-
-    private void PreProcessInput( object sender, NotifyInputEventArgs e )
-    {
-      if( e.StagingItem.Input is KeyEventArgs )
-      {
-        this.UpdateKeyModifierTriggerProperties();
-      }
-    }
-
-    private void ProcessMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( this.ZoomToSelectionModifiers.AreActive )
-      {
-        this.SetIsDraggingContent( false );
-        this.SetIsSelectingRegion( true );
-      }
-      else if( this.DragModifiers.AreActive )
-      {
-        this.SetIsSelectingRegion( false );
-        this.SetIsDraggingContent( true );
-      }
-      else
-      {
-        this.SetIsSelectingRegion( false );
-        this.SetIsDraggingContent( false );
-      }
-
-      // if nothing to do, just return
-      if( !this.IsSelectingRegion && !this.IsDraggingContent )
-        return;
-
-      // set the origin point and capture the mouse
-      _originPoint = e.GetPosition( this );
-      _contentPresenter.CaptureMouse();
-      e.Handled = true;
-      if( this.IsDraggingContent )
-      {
-        // execute the Drag operation
-        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), false );
-      }
-      else if( this.IsSelectingRegion )
-      {
-        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), false );
-      }
-    }
-
-    private void ProcessMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( !this.IsDraggingContent && !this.IsSelectingRegion )
-        return;
-
-      bool endDrag = this.IsDraggingContent;
-
-      this.SetIsDraggingContent( false );
-      this.SetIsSelectingRegion( false );
-
-      _originPoint = new Point();
-      _contentPresenter.ReleaseMouseCapture();
-      e.Handled = true;
-
-      if( endDrag )
-      {
-        this.OnDrag( new DragDeltaEventArgs( 0, 0 ), true );
-      }
-      else
-      {
-        this.OnSelectRegion( new DragDeltaEventArgs( 0, 0 ), true );
-      }
-    }
-
-    private void ProcessMouseMove( MouseEventArgs e )
-    {
-      if( e.MouseDevice.LeftButton != MouseButtonState.Pressed )
-        return;
-
-      if( !this.IsDraggingContent && !this.IsSelectingRegion )
-        return;
-
-      Point pos = e.GetPosition( this );
-      e.Handled = true;
-
-      if( this.IsDraggingContent )
-      {
-        Vector delta = ( pos - _originPoint ) / this.Scale;
-        this.OnDrag( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-        _originPoint = pos;
-      }
-      else if( this.IsSelectingRegion )
-      {
-        Vector delta = pos - _originPoint;
-        this.OnSelectRegion( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-      }
-    }
-
-    private void ProcessMouseWheelZoom( MouseWheelEventArgs e )
-    {
-      if( _content == null )
-        return;
-
-      // check modifiers to see if there's work to do
-      bool doZoom = this.ZoomModifiers.AreActive;
-      bool doRelativeZoom = this.RelativeZoomModifiers.AreActive;
-
-      // can't do both, so assume relative zoom
-      if( doZoom && doRelativeZoom )
-      {
-        doZoom = false;
-      }
-
-      if( !( doZoom || doRelativeZoom ) )
-        return;
-
-      e.Handled = true;
-      double percentage = ( ( e.Delta / Zoombox.MOUSE_WHEEL_DELTA ) * this.ZoomPercentage ) / 100;
-
-      // Are we doing a zoom relative to the current mouse position?
-      if( doRelativeZoom )
-      {
-        this.Zoom( percentage, Mouse.GetPosition( _content ) );
-      }
-      else
-      {
-        this.Zoom( percentage );
-      }
-    }
-
-    private void ProcessNavigationButton( RoutedEventArgs e )
-    {
-      if( e is MouseButtonEventArgs )
-      {
-        MouseButtonEventArgs mbea = e as MouseButtonEventArgs;
-        if( mbea.ChangedButton == MouseButton.XButton1
-            || mbea.ChangedButton == MouseButton.XButton2 )
-        {
-          if( mbea.ChangedButton == MouseButton.XButton2 )
-          {
-            this.GoForward();
-          }
-          else
-          {
-            this.GoBack();
-          }
-          mbea.Handled = true;
-        }
-      }
-      else if( e is KeyEventArgs )
-      {
-        KeyEventArgs kea = e as KeyEventArgs;
-        if( kea.Key == Key.Back || kea.Key == Key.BrowserBack || kea.Key == Key.BrowserForward )
-        {
-          if( kea.Key == Key.BrowserForward )
-          {
-            this.GoForward();
-          }
-          else
-          {
-            this.GoBack();
-          }
-          kea.Handled = true;
-        }
-      }
-    }
-
-    private void ResizeDisplayViewport( DragDeltaEventArgs e, ResizeEdge relativeTo )
-    {
-      // get the existing viewport rect and scale
-      Rect viewportRect = _viewFinderDisplay.ViewportRect;
-      double scale = _viewFinderDisplay.Scale;
-
-      // ensure that we stay within the bounds of the VisualBrush
-      double x = Math.Max( _resizeViewportBounds.Left, Math.Min( _resizeDraggingPoint.X + e.HorizontalChange, _resizeViewportBounds.Right ) );
-      double y = Math.Max( _resizeViewportBounds.Top, Math.Min( _resizeDraggingPoint.Y + e.VerticalChange, _resizeViewportBounds.Bottom ) );
-
-      // get the selected region in the coordinate space of the content
-      Point anchorPoint = new Point( _resizeAnchorPoint.X / scale, _resizeAnchorPoint.Y / scale );
-      Vector newRegionVector = new Vector( ( x - _resizeAnchorPoint.X ) / scale / _viewboxFactor, ( y - _resizeAnchorPoint.Y ) / scale / _viewboxFactor );
-      Rect region = new Rect( anchorPoint, newRegionVector );
-
-      // now translate the region from the coordinate space of the content 
-      // to the coordinate space of the content presenter
-      region =
-        new Rect(
-          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
-          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
-
-      // calculate actual scale value
-      double aspectX = this.RenderSize.Width / region.Width;
-      double aspectY = this.RenderSize.Height / region.Height;
-      scale = aspectX < aspectY ? aspectX : aspectY;
-
-      // scale relative to the anchor point
-      this.ZoomTo( scale, anchorPoint, false, false );
-    }
-
-    private void UpdateKeyModifierTriggerProperties()
-    {
-      this.SetAreDragModifiersActive( this.DragModifiers.AreActive );
-      this.SetAreRelativeZoomModifiersActive( this.RelativeZoomModifiers.AreActive );
-      this.SetAreZoomModifiersActive( this.ZoomModifiers.AreActive );
-      this.SetAreZoomToSelectionModifiersActive( this.ZoomToSelectionModifiers.AreActive );
-    }
-
-    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition )
-    {
-      this.UpdateView( view, allowAnimation, allowStackAddition, -1 );
-    }
-
-    private void UpdateView( ZoomboxView view, bool allowAnimation, bool allowStackAddition, int stackIndex )
-    {
-      if( _contentPresenter == null || _content == null || !this.HasArrangedContentPresenter )
-        return;
-
-      // if an absolute view is being used and only a Scale value has been specified,
-      // use the ZoomTo() function to perform a relative zoom
-      if( view.ViewKind == ZoomboxViewKind.Absolute && PointHelper.IsEmpty( view.Position ) )
-      {
-        this.ZoomTo( view.Scale, allowStackAddition );
-        return;
-      }
-
-      // disallow reentrancy
-      if( !this.IsUpdatingView )
-      {
-        this.IsUpdatingView = true;
-        try
-        {
-          // determine the new scale and position
-          double newRelativeScale = _viewboxFactor;
-          Point newRelativePosition = new Point();
-          Rect region = Rect.Empty;
-          switch( view.ViewKind )
-          {
-            case ZoomboxViewKind.Empty:
-              break;
-
-            case ZoomboxViewKind.Absolute:
-              newRelativeScale = DoubleHelper.IsNaN( view.Scale ) ? _relativeScale : view.Scale;
-              newRelativePosition = PointHelper.IsEmpty( view.Position ) ? _relativePosition
-                  : new Point( view.Position.X, view.Position.Y ) - this.ContentOffset * newRelativeScale;
-              break;
-
-            case ZoomboxViewKind.Region:
-              region = view.Region;
-              break;
-
-            case ZoomboxViewKind.Center:
-              {
-                // get the current ContentRect in the coordinate space of the Zoombox control
-                Rect currentContentRect =
-                  new Rect(
-                    _content.TranslatePoint( this.ContentRect.TopLeft, this ),
-                    _content.TranslatePoint( this.ContentRect.BottomRight, this ) );
-
-                // inflate (or deflate) the rect by the appropriate amounts in the x & y directions
-                region = Rect.Inflate( currentContentRect,
-                    ( this.RenderSize.Width / _viewboxFactor - currentContentRect.Width ) / 2,
-                    ( this.RenderSize.Height / _viewboxFactor - currentContentRect.Height ) / 2 );
-
-                // now translate the centered rect back to the coordinate space of the content
-                region = new Rect( this.TranslatePoint( region.TopLeft, _content ), this.TranslatePoint( region.BottomRight, _content ) );
-              }
-              break;
-
-            case ZoomboxViewKind.Fit:
-              region = this.ContentRect;
-              break;
-
-            case ZoomboxViewKind.Fill:
-              region = this.CalculateFillRect();
-              break;
-          }
-
-          if( view.ViewKind != ZoomboxViewKind.Empty )
-          {
-            if( !region.IsEmpty )
-            {   // ZOOMING TO A REGION
-              this.CalculatePositionAndScale( region, ref newRelativePosition, ref newRelativeScale );
-            }
-            else if( view != ZoomboxView.Empty )
-            {   // USING ABSOLUTE POSITION AND SCALE VALUES
-
-              // ensure that the scale value falls within the valid range
-              if( newRelativeScale > MaxScale )
-              {
-                newRelativeScale = MaxScale;
-              }
-              else if( newRelativeScale < MinScale )
-              {
-                newRelativeScale = MinScale;
-              }
-            }
-
-            double currentScale = _relativeScale;
-            double currentX = _relativePosition.X;
-            double currentY = _relativePosition.Y;
-
-            ScaleTransform st = null;
-            TranslateTransform tt = null;
-            TransformGroup tg = null;
-
-            if( _contentPresenter.RenderTransform != Transform.Identity )
-            {
-              tg = _contentPresenter.RenderTransform as TransformGroup;
-              st = tg.Children[ 0 ] as ScaleTransform;
-              tt = tg.Children[ 1 ] as TranslateTransform;
-              currentScale = st.ScaleX;
-              currentX = tt.X;
-              currentY = tt.Y;
-            }
-
-            if( KeepContentInBounds == true )
-            {
-              Rect boundsRect = new Rect( new Size( this.ContentRect.Width * newRelativeScale, this.ContentRect.Height * newRelativeScale ) );
-
-              // Calc viewport rect (should be inside bounds content rect)
-              Point viewportPosition = new Point( -newRelativePosition.X, -newRelativePosition.Y );
-              Rect viewportRect = new Rect( viewportPosition, _contentPresenter.RenderSize );
-
-              if( DoubleHelper.AreVirtuallyEqual( _relativeScale, newRelativeScale ) ) // we are positioning the content, not scaling
-              {
-                // Handle the width and height seperately since the content extent 
-                // could be contained only partially in the viewport.  Also if the viewport is only 
-                // partially contained within the content extent.
-
-                //
-                // Content extent width is greater than the viewport's width (Zoomed in).  Make sure we restrict
-                // the viewport X inside the content.
-                //
-                if( this.IsGreaterThanOrClose( boundsRect.Width, viewportRect.Width ) )
-                {
-                  if( boundsRect.Right < viewportRect.Right )
-                  {
-                    newRelativePosition.X = -( boundsRect.Width - viewportRect.Width );
-                  }
-
-                  if( boundsRect.Left > viewportRect.Left )
-                  {
-                    newRelativePosition.X = 0;
-                  }
-                }
-                //
-                // Viewport width is greater than the content extent's width (Zoomed out).  Make sure we restrict
-                // the content X inside the viewport.
-                //
-                else if( this.IsGreaterThanOrClose( viewportRect.Width, boundsRect.Width ) )
-                {
-                  if( viewportRect.Right < boundsRect.Right )
-                  {
-                    newRelativePosition.X = viewportRect.Width - boundsRect.Width;
-                  }
-
-                  if( viewportRect.Left > boundsRect.Left )
-                  {
-                    newRelativePosition.X = 0;
-                  }
-                }
-
-                //
-                // Content extent height is greater than the viewport's height (Zoomed in).  Make sure we restrict
-                // the viewport Y inside the content.
-                //
-                if( this.IsGreaterThanOrClose( boundsRect.Height, viewportRect.Height ) )
-                {
-                  if( boundsRect.Bottom < viewportRect.Bottom )
-                  {
-                    newRelativePosition.Y = -( boundsRect.Height - viewportRect.Height );
-                  }
-
-                  if( boundsRect.Top > viewportRect.Top )
-                  {
-                    newRelativePosition.Y = 0;
-                  }
-                }
-                //
-                // Viewport height is greater than the content extent's height (Zoomed out).  Make sure we restrict
-                // the content Y inside the viewport.
-                //
-                else if( this.IsGreaterThanOrClose( viewportRect.Height, boundsRect.Height ) )
-                {
-                  if( viewportRect.Bottom < boundsRect.Bottom )
-                  {
-                    newRelativePosition.Y = viewportRect.Height - boundsRect.Height;
-                  }
-
-                  if( viewportRect.Top > boundsRect.Top )
-                  {
-                    newRelativePosition.Y = 0;
-                  }
-                }
-              }
-            }
-
-            st = new ScaleTransform( newRelativeScale / _viewboxFactor, newRelativeScale / _viewboxFactor );
-            tt = new TranslateTransform( newRelativePosition.X, newRelativePosition.Y );
-            tg = new TransformGroup();
-            tg.Children.Add( st );
-            tg.Children.Add( tt );
-
-            _contentPresenter.RenderTransform = tg;
-
-            var initialContentSize = ( _content is Viewbox ) ? ( ( Viewbox )_content ).Child.DesiredSize : this.RenderSize;
-            var scaledContentSize = new Size( initialContentSize.Width * newRelativeScale, initialContentSize.Height * newRelativeScale );
-
-            if( allowAnimation && IsAnimated )
-            {
-              DoubleAnimation daScale = new DoubleAnimation( currentScale, newRelativeScale / _viewboxFactor, AnimationDuration );
-              daScale.AccelerationRatio = this.AnimationAccelerationRatio;
-              daScale.DecelerationRatio = this.AnimationDecelerationRatio;
-
-              DoubleAnimation daTranslateX = new DoubleAnimation( currentX, newRelativePosition.X, AnimationDuration );
-              daTranslateX.AccelerationRatio = this.AnimationAccelerationRatio;
-              daTranslateX.DecelerationRatio = this.AnimationDecelerationRatio;
-
-              DoubleAnimation daTranslateY = new DoubleAnimation( currentY, newRelativePosition.Y, AnimationDuration );
-              daTranslateY.AccelerationRatio = this.AnimationAccelerationRatio;
-              daTranslateY.DecelerationRatio = this.AnimationDecelerationRatio;
-              daTranslateY.CurrentTimeInvalidated += new EventHandler( this.UpdateViewport );
-              daTranslateY.CurrentStateInvalidated += new EventHandler( this.ZoomAnimationCompleted );
-
-              // raise animation beginning event before beginning the animations
-              RaiseEvent( new RoutedEventArgs( AnimationBeginningEvent, this ) );
-
-              st.BeginAnimation( ScaleTransform.ScaleXProperty, daScale );
-              st.BeginAnimation( ScaleTransform.ScaleYProperty, daScale );
-              tt.BeginAnimation( TranslateTransform.XProperty, daTranslateX );
-              tt.BeginAnimation( TranslateTransform.YProperty, daTranslateY );
-
-              if( this.IsUsingScrollBars )
-              {
-                //Vertical scrollBar animations
-                DoubleAnimation verticalMaxAnimation = new DoubleAnimation();
-                verticalMaxAnimation.From = _verticalScrollBar.Maximum;
-                verticalMaxAnimation.To = scaledContentSize.Height - _verticalScrollBar.ViewportSize;
-                verticalMaxAnimation.Duration = AnimationDuration;
-                _verticalScrollBar.BeginAnimation( ScrollBar.MaximumProperty, verticalMaxAnimation );
-
-                DoubleAnimation verticalValueAnimation = new DoubleAnimation();
-                verticalValueAnimation.From = _verticalScrollBar.Value;
-                verticalValueAnimation.To = -newRelativePosition.Y;
-                verticalValueAnimation.Duration = AnimationDuration;
-                verticalValueAnimation.Completed += this.VerticalValueAnimation_Completed;
-                _verticalScrollBar.BeginAnimation( ScrollBar.ValueProperty, verticalValueAnimation );
-
-                //Horizontal scrollBar animations
-                DoubleAnimation horizontalMaxAnimation = new DoubleAnimation();
-                horizontalMaxAnimation.From = _horizontalScrollBar.Maximum;
-                horizontalMaxAnimation.To = scaledContentSize.Width - _horizontalScrollBar.ViewportSize;
-                horizontalMaxAnimation.Duration = AnimationDuration;
-                _horizontalScrollBar.BeginAnimation( ScrollBar.MaximumProperty, horizontalMaxAnimation );
-
-                DoubleAnimation horizontalValueAnimation = new DoubleAnimation();
-                horizontalValueAnimation.From = _horizontalScrollBar.Value;
-                horizontalValueAnimation.To = -newRelativePosition.X;
-                horizontalValueAnimation.Duration = AnimationDuration;
-                horizontalValueAnimation.Completed += this.HorizontalValueAnimation_Completed;
-                _horizontalScrollBar.BeginAnimation( ScrollBar.ValueProperty, horizontalValueAnimation );
-              }
-            }
-            else if( this.IsUsingScrollBars )
-            {
-              //Vertical scrollBar
-              _verticalScrollBar.Maximum = scaledContentSize.Height - _verticalScrollBar.ViewportSize;
-              _verticalScrollBar.Value = -newRelativePosition.Y;
-              //Horizontal scrollBar
-              _horizontalScrollBar.Maximum = scaledContentSize.Width - _horizontalScrollBar.ViewportSize;
-              _horizontalScrollBar.Value = -newRelativePosition.X;
-            }
-
-            // maintain the relative scale and position for dragging and animating purposes
-            _relativePosition = newRelativePosition;
-            _relativeScale = newRelativeScale;
-
-            // update the Scale and Position properties to keep them in sync with the current view
-            this.Scale = newRelativeScale;
-            _basePosition = newRelativePosition + this.ContentOffset * newRelativeScale;
-            this.UpdateViewport();
-          }
-
-          // add the current view to the view stack
-          if( this.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && allowStackAddition )
-          {
-            // if the last view was pushed on the stack within the last 300 milliseconds, discard it
-            // since proximally close views are probably the result of a mouse wheel scroll
-            if( this.ViewStack.Count > 1
-              && Math.Abs( DateTime.Now.Ticks - _lastStackAddition.Ticks ) < TimeSpan.FromMilliseconds( 300 ).Ticks )
-            {
-              this.ViewStack.RemoveAt( this.ViewStack.Count - 1 );
-              _lastStackAddition = DateTime.Now - TimeSpan.FromMilliseconds( 300 );
-            }
-
-            // if the current view is the same as the last view, do nothing
-            if( this.ViewStack.Count > 0 && view == this.ViewStack.SelectedView )
-            {
-              // do nothing
-            }
-            else
-            {
-              // otherwise, push the current view on stack
-              this.ViewStack.PushView( view );
-              this.ViewStackIndex++;
-              stackIndex = this.ViewStackIndex;
-
-              // update the timestamp for the last stack addition
-              _lastStackAddition = DateTime.Now;
-            }
-          }
-
-          // update the stack indices used by CurrentViewChanged event
-          _lastViewIndex = this.CurrentViewIndex;
-          this.SetCurrentViewIndex( stackIndex );
-
-          // set the new view parameters
-          // NOTE: this is the only place where the CurrentView member should be set
-          this.SetCurrentView( view );
-        }
-        finally
-        {
-          this.IsUpdatingView = false;
-        }
-      }
-    }
-
-    private bool IsGreaterThanOrClose( double value1, double value2 )
-    {
-      return value1 <= value2 ? DoubleHelper.AreVirtuallyEqual( value1, value2 ) : true;
-    }
-
-    private Rect CalculateFillRect()
-    {
-      // determine the x-y ratio of the current Viewport
-      double xyRatio = this.RenderSize.Width / this.RenderSize.Height;
-
-      // now find the maximal rect within the ContentRect that has the same ratio
-      double x = 0;
-      double y = 0;
-      double width = this.ContentRect.Width;
-      double height = this.ContentRect.Height;
-      if( xyRatio > width / height )
-      {
-        height = width / xyRatio;
-        y = ( this.ContentRect.Height - height ) / 2;
-      }
-      else
-      {
-        width = height * xyRatio;
-        x = ( this.ContentRect.Width - width ) / 2;
-      }
-
-      return new Rect( x, y, width, height );
-    }
-
-    private void CalculatePositionAndScale( Rect region, ref Point newRelativePosition, ref double newRelativeScale )
-    {
-      // if there is nothing to scale, just return
-      // if the region has no area, just return
-      if( region.Width == 0 || region.Height == 0 )
-        return;
-
-      // verify that the selected region intersects with the content, which prevents 
-      // the scale operation from zooming the content out of the current view
-      if( !this.ContentRect.IntersectsWith( region ) )
-        return;
-
-      // translate the region from the coordinate space of the content 
-      // to the coordinate space of the content presenter
-      region =
-        new Rect(
-          _content.TranslatePoint( region.TopLeft, _contentPresenter ),
-          _content.TranslatePoint( region.BottomRight, _contentPresenter ) );
-
-      // calculate actual zoom, which must fit the entire selection 
-      // while maintaining a 1:1 ratio
-      double aspectX = this.RenderSize.Width / region.Width;
-      double aspectY = this.RenderSize.Height / region.Height;
-      newRelativeScale = aspectX < aspectY ? aspectX : aspectY;
-
-      // ensure that the scale value falls within the valid range
-      if( newRelativeScale > this.MaxScale )
-      {
-        newRelativeScale = this.MaxScale;
-      }
-      else if( newRelativeScale < this.MinScale )
-      {
-        newRelativeScale = this.MinScale;
-      }
-
-      // determine the new content position for this zoom operation based 
-      // on HorizontalContentAlignment and VerticalContentAlignment
-      double horizontalOffset = 0;
-      double verticalOffset = 0;
-      switch( this.HorizontalContentAlignment )
-      {
-        case HorizontalAlignment.Center:
-        case HorizontalAlignment.Stretch:
-          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale ) / 2;
-          break;
-
-        case HorizontalAlignment.Right:
-          horizontalOffset = ( this.RenderSize.Width - region.Width * newRelativeScale );
-          break;
-      }
-      switch( VerticalContentAlignment )
-      {
-        case VerticalAlignment.Center:
-        case VerticalAlignment.Stretch:
-          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale ) / 2;
-          break;
-
-        case VerticalAlignment.Bottom:
-          verticalOffset = ( this.RenderSize.Height - region.Height * newRelativeScale );
-          break;
-      }
-      newRelativePosition =
-        new Point( -region.TopLeft.X * newRelativeScale, -region.TopLeft.Y * newRelativeScale )
-          + new Vector( horizontalOffset, verticalOffset );
-    }
-
-    private void UpdateViewFinderDisplayContentBounds()
-    {
-      if( _content == null || _trueContent == null || _viewFinderDisplay == null )
-        return;
-
-      this.UpdateViewboxFactor();
-
-      // ensure the display panel has a size
-      Size contentSize = _content.RenderSize;
-      Size viewFinderSize = _viewFinderDisplay.AvailableSize;
-      if( viewFinderSize.Width > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Height, 0d ) )
-      {
-        // update height to accomodate width, while keeping a ratio equal to the actual content
-        viewFinderSize = new Size( viewFinderSize.Width, contentSize.Height * viewFinderSize.Width / contentSize.Width );
-      }
-      else if( viewFinderSize.Height > 0d && DoubleHelper.AreVirtuallyEqual( viewFinderSize.Width, 0d ) )
-      {
-        // update width to accomodate height, while keeping a ratio equal to the actual content
-        viewFinderSize = new Size( contentSize.Width * viewFinderSize.Height / contentSize.Height, viewFinderSize.Width );
-      }
-
-      // determine the scale of the view finder display panel
-      double aspectX = viewFinderSize.Width / contentSize.Width;
-      double aspectY = viewFinderSize.Height / contentSize.Height;
-      double scale = aspectX < aspectY ? aspectX : aspectY;
-
-      // determine the rect of the VisualBrush
-      double vbWidth = contentSize.Width * scale;
-      double vbHeight = contentSize.Height * scale;
-
-      // set the ContentBounds and Scale properties on the view finder display panel
-      _viewFinderDisplay.Scale = scale;
-      _viewFinderDisplay.ContentBounds = new Rect( new Size( vbWidth, vbHeight ) );
-    }
-
-    private void UpdateViewboxFactor()
-    {
-      if( _content == null || _trueContent == null )
-        return;
-
-      double contentWidth = _content.RenderSize.Width;
-      double trueContentWidth = _trueContent.RenderSize.Width;
-
-      if( DoubleHelper.AreVirtuallyEqual( contentWidth, 0d ) || DoubleHelper.AreVirtuallyEqual( trueContentWidth, 0d ) )
-      {
-        _viewboxFactor = 1d;
-      }
-      else
-      {
-        _viewboxFactor = contentWidth / trueContentWidth;
-      }
-    }
-
-    private void UpdateViewport()
-    {
-      // if we haven't attached to the visual tree yet or we don't have content, just return
-      if( _contentPresenter == null || _trueContent == null )
-        return;
-
-      this.IsUpdatingViewport = true;
-      try
-      {
-        // calculate the current viewport
-        Rect viewport =
-          new Rect(
-            this.TranslatePoint( new Point( 0d, 0d ), _trueContent ),
-            this.TranslatePoint( new Point( RenderSize.Width, RenderSize.Height ), _trueContent ) );
-
-        // if the viewport has changed, set the Viewport dependency property
-        if( !DoubleHelper.AreVirtuallyEqual( viewport, this.Viewport ) )
-        {
-          this.SetValue( Zoombox.ViewportPropertyKey, viewport );
-        }
-      }
-      finally
-      {
-        this.IsUpdatingViewport = false;
-      }
-    }
-
-    private void UpdateViewport( object sender, EventArgs e )
-    {
-      this.UpdateViewport();
-    }
-
-    private void ViewFinderDisplayBeginCapture( object sender, MouseButtonEventArgs e )
-    {
-      const double ARBITRARY_LARGE_VALUE = 10000000000;
-
-      // if we need to acquire capture, the Tag property of the view finder display panel
-      // will be a ResizeEdge value.
-      if( _viewFinderDisplay.Tag is ResizeEdge )
-      {
-        // if the Tag is ResizeEdge.None, then its a drag operation; otherwise, its a resize
-        if( ( ResizeEdge )_viewFinderDisplay.Tag == ResizeEdge.None )
-        {
-          this.IsDraggingViewport = true;
-        }
-        else
-        {
-          this.IsResizingViewport = true;
-          Vector direction = new Vector();
-          switch( ( ResizeEdge )_viewFinderDisplay.Tag )
-          {
-            case ResizeEdge.TopLeft:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopLeft;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomRight;
-              direction = new Vector( -1, -1 );
-              break;
-
-            case ResizeEdge.TopRight:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.TopRight;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
-              direction = new Vector( 1, -1 );
-              break;
-
-            case ResizeEdge.BottomLeft:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomLeft;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopRight;
-              direction = new Vector( -1, 1 );
-              break;
-
-            case ResizeEdge.BottomRight:
-              _resizeDraggingPoint = _viewFinderDisplay.ViewportRect.BottomRight;
-              _resizeAnchorPoint = _viewFinderDisplay.ViewportRect.TopLeft;
-              direction = new Vector( 1, 1 );
-              break;
-            case ResizeEdge.Left:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              direction = new Vector( -1, 0 );
-              break;
-            case ResizeEdge.Top:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Top );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Bottom );
-              direction = new Vector( 0, -1 );
-              break;
-            case ResizeEdge.Right:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Right,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left,
-                  _viewFinderDisplay.ViewportRect.Top + ( _viewFinderDisplay.ViewportRect.Height / 2 ) );
-              direction = new Vector( 1, 0 );
-              break;
-            case ResizeEdge.Bottom:
-              _resizeDraggingPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Bottom );
-              _resizeAnchorPoint = new Point( _viewFinderDisplay.ViewportRect.Left + ( _viewFinderDisplay.ViewportRect.Width / 2 ),
-                  _viewFinderDisplay.ViewportRect.Top );
-              direction = new Vector( 0, 1 );
-              break;
-          }
-          double scale = _viewFinderDisplay.Scale;
-          Rect contentRect = _viewFinderDisplay.ContentBounds;
-          Vector minVector = new Vector( direction.X * ARBITRARY_LARGE_VALUE, direction.Y * ARBITRARY_LARGE_VALUE );
-          Vector maxVector = new Vector( direction.X * contentRect.Width / MaxScale, direction.Y * contentRect.Height / MaxScale );
-          _resizeViewportBounds = new Rect( _resizeAnchorPoint + minVector, _resizeAnchorPoint + maxVector );
-        }
-
-        // store the origin of the operation and acquire capture
-        _originPoint = e.GetPosition( _viewFinderDisplay );
-        _viewFinderDisplay.CaptureMouse();
-        e.Handled = true;
-      }
-    }
-
-    private void ViewFinderDisplayEndCapture( object sender, MouseButtonEventArgs e )
-    {
-      // if a drag or resize is in progress, end it and release capture
-      if( this.IsDraggingViewport || this.IsResizingViewport )
-      {
-        // call the DragDisplayViewport method to end the operation
-        // and store the current position on the stack
-        this.DragDisplayViewport( new DragDeltaEventArgs( 0, 0 ), true );
-
-        // reset the dragging state variables and release capture
-        this.IsDraggingViewport = false;
-        this.IsResizingViewport = false;
-        _originPoint = new Point();
-        _viewFinderDisplay.ReleaseMouseCapture();
-        e.Handled = true;
-      }
-    }
-
-    private void ViewFinderDisplayMouseMove( object sender, MouseEventArgs e )
-    {
-      // if a drag operation is in progress, update the operation
-      if( e.MouseDevice.LeftButton == MouseButtonState.Pressed
-          && ( this.IsDraggingViewport || this.IsResizingViewport ) )
-      {
-        Point pos = e.GetPosition( _viewFinderDisplay );
-        Vector delta = pos - _originPoint;
-        if( this.IsDraggingViewport )
-        {
-          this.DragDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), false );
-        }
-        else
-        {
-          this.ResizeDisplayViewport( new DragDeltaEventArgs( delta.X, delta.Y ), ( ResizeEdge )_viewFinderDisplay.Tag );
-        }
-        e.Handled = true;
-      }
-      else
-      {
-        // update the cursor based on the nearest corner
-        Point mousePos = e.GetPosition( _viewFinderDisplay );
-        Rect viewportRect = _viewFinderDisplay.ViewportRect;
-        double cornerDelta = viewportRect.Width * viewportRect.Height > 100 ? 5.0
-            : Math.Sqrt( viewportRect.Width * viewportRect.Height ) / 2;
-
-        // if the mouse is within the Rect and the Rect does not encompass the entire content, set the appropriate cursor
-        if( viewportRect.Contains( mousePos )
-            && !DoubleHelper.AreVirtuallyEqual( Rect.Intersect( viewportRect, _viewFinderDisplay.ContentBounds ), _viewFinderDisplay.ContentBounds ) )
-        {
-          if( PointHelper.DistanceBetween( mousePos, viewportRect.TopLeft ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.TopLeft;
-            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomRight ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.BottomRight;
-            _viewFinderDisplay.Cursor = Cursors.SizeNWSE;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.TopRight ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.TopRight;
-            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
-          }
-          else if( PointHelper.DistanceBetween( mousePos, viewportRect.BottomLeft ) < cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.BottomLeft;
-            _viewFinderDisplay.Cursor = Cursors.SizeNESW;
-          }
-          else if( mousePos.X <= viewportRect.Left + cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Left;
-            _viewFinderDisplay.Cursor = Cursors.SizeWE;
-          }
-          else if( mousePos.Y <= viewportRect.Top + cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Top;
-            _viewFinderDisplay.Cursor = Cursors.SizeNS;
-          }
-          else if( mousePos.X >= viewportRect.Right - cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Right;
-            _viewFinderDisplay.Cursor = Cursors.SizeWE;
-          }
-          else if( mousePos.Y >= viewportRect.Bottom - cornerDelta )
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.Bottom;
-            _viewFinderDisplay.Cursor = Cursors.SizeNS;
-          }
-          else
-          {
-            _viewFinderDisplay.Tag = ResizeEdge.None;
-            _viewFinderDisplay.Cursor = Cursors.SizeAll;
-          }
-        }
-        else
-        {
-          _viewFinderDisplay.Tag = null;
-          _viewFinderDisplay.Cursor = Cursors.Arrow;
-        }
-      }
-    }
-
-    private void ZoomAnimationCompleted( object sender, EventArgs e )
-    {
-      if( ( sender as AnimationClock ).CurrentState != ClockState.Active )
-      {
-        // remove the event handlers
-        ( sender as AnimationClock ).CurrentStateInvalidated -= new EventHandler( this.ZoomAnimationCompleted );
-        ( sender as AnimationClock ).CurrentTimeInvalidated -= new EventHandler( this.UpdateViewport );
-
-        // raise animation completed event
-        this.RaiseEvent( new RoutedEventArgs( Zoombox.AnimationCompletedEvent, this ) );
-      }
-    }
-
-    private void VerticalValueAnimation_Completed( object sender, EventArgs e )
-    {
-      //When the animaton is completed, with the FillBehavior to HoldEnd, 
-      //the ScrollBarValue will be overriden with the final animation value, preventing future scroll.
-      //To remove it use BeginAnimation with null.
-      //http://msdn.microsoft.com/en-us/library/aa970493(v=vs.110).aspx      
-
-      // only do this when all the overlapped animations are done or limits values reached.
-      if( ( _verticalScrollBar.Value == -_relativePosition.Y )
-        || ( _verticalScrollBar.Value == _verticalScrollBar.Maximum )
-        || ( _verticalScrollBar.Value == _verticalScrollBar.Minimum ) )
-      {
-        var finalValue = _verticalScrollBar.Value;
-        //this will reset Value to original value of animation
-        _verticalScrollBar.BeginAnimation( ScrollBar.ValueProperty, null );
-        //this will set to last value of the animation.
-        _verticalScrollBar.Value = finalValue;
-      }
-    }
-
-    private void HorizontalValueAnimation_Completed( object sender, EventArgs e )
-    {
-      //When the animaton is completed, with the FillBehavior to HoldEnd, 
-      //the ScrollBarValue will be overriden with the final animation value, preventing future scroll.
-      //To remove it use BeginAnimation with null.
-      //http://msdn.microsoft.com/en-us/library/aa970493(v=vs.110).aspx      
-
-      // only do this when all the overlapped animations are done or limits values reached.
-      if( ( _horizontalScrollBar.Value == -_relativePosition.X )
-        || ( _horizontalScrollBar.Value == _horizontalScrollBar.Maximum )
-        || ( _horizontalScrollBar.Value == _horizontalScrollBar.Minimum ) )
-      {
-        var finalValue = _horizontalScrollBar.Value;
-        //this will reset Value to original value of animation
-        _horizontalScrollBar.BeginAnimation( ScrollBar.ValueProperty, null );
-        //this will set to last value of the animation.
-        _horizontalScrollBar.Value = finalValue;
-      }
-    }
-
-    private void ZoomTo( double scale, bool allowStackAddition )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      // adjust the current scale relative to the zoom origin
-      this.ZoomTo( scale, this.GetZoomRelativePoint(), true, allowStackAddition );
-    }
-
-    private void ZoomTo( double scale, Point relativeTo, bool restrictRelativePointToContent, bool allowStackAddition )
-    {
-      // if there is nothing to scale, just return
-      if( _content == null )
-        return;
-
-      if( double.IsNaN( scale ) )
-        return;
-
-      // if necessary, verify that the relativeTo point falls within the content
-      if( restrictRelativePointToContent && !( new Rect( _content.RenderSize ) ).Contains( relativeTo ) )
-        return;
-
-      // ensure that the scale value falls within the valid range
-      if( scale > this.MaxScale )
-      {
-        scale = this.MaxScale;
-      }
-      else if( scale < this.MinScale )
-      {
-        scale = this.MinScale;
-      }
-
-      // internally, updates are always relative to the Zoombox control
-      Point translateFrom = relativeTo;
-      if( this.HasRenderedFirstView )
-      {
-        // Note that this TranslatePoint approach will not work until the first render occurs
-        relativeTo = _content.TranslatePoint( relativeTo, this );
-
-        // adjust translateFrom based on relativeTo
-        translateFrom = this.TranslatePoint( relativeTo, _contentPresenter );
-      }
-      else if( _contentPresenter != null )
-      {
-        // prior to the first render, just use the ContentPresenter's transform and do not adjust translateFrom
-        if( _contentPresenter.RenderTransform == Transform.Identity )
-        {
-          // in order for this approach to work, we must at least make one pass to update a generic view
-          // with Scale = 1.0 and Position = 0,0
-          this.UpdateView( new ZoomboxView( 1, new Point( 0, 0 ) ), false, false );
-        }
-
-        // now there should be a valid RenderTransform
-        relativeTo = ( _contentPresenter.RenderTransform as Transform ).Transform( relativeTo );
-      }
-
-      // determine the new content position for this zoom operation
-      Point translateTo = new Point( relativeTo.X - ( translateFrom.X * scale / _viewboxFactor ),
-          relativeTo.Y - ( translateFrom.Y * scale / _viewboxFactor ) )
-          + this.ContentOffset * scale / _viewboxFactor;
-      this.UpdateView( new ZoomboxView( scale, translateTo ), !this.IsResizingViewport, allowStackAddition );
-    }
-
-    private Point GetZoomRelativePoint()
-    {
-      Point zoomPoint;
-
-      if( ZoomOn == ZoomboxZoomOn.View )
-      {
-        // Transform the viewport point to the content
-        Point viewportZoomOrigin = new Point();
-
-        viewportZoomOrigin.X = this.Viewport.X + ( this.Viewport.Width * this.ZoomOrigin.X );
-        viewportZoomOrigin.Y = this.Viewport.Y + ( this.Viewport.Height * this.ZoomOrigin.Y );
-
-        Point contentZoomOrigin = _trueContent.TranslatePoint( viewportZoomOrigin, _content );
-
-        if( contentZoomOrigin.X < 0 )
-        {
-          contentZoomOrigin.X = 0;
-        }
-        else if( contentZoomOrigin.X > _content.RenderSize.Width )
-        {
-          contentZoomOrigin.X = _content.RenderSize.Width;
-        }
-
-        if( contentZoomOrigin.Y < 0 )
-        {
-          contentZoomOrigin.Y = 0;
-        }
-        else if( contentZoomOrigin.Y > _content.RenderSize.Height )
-        {
-          contentZoomOrigin.Y = _content.RenderSize.Height;
-        }
-
-        zoomPoint = contentZoomOrigin;
-      }
-      else
-      {
-        zoomPoint = new Point( _content.RenderSize.Width * ZoomOrigin.X, _content.RenderSize.Height * ZoomOrigin.Y );
-      }
-
-      return zoomPoint;
-    }
-
-    #region OnKeyDown Methods
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      if( this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnPreviewKeyDown( e );
-    }
-
-    protected override void OnKeyDown( KeyEventArgs e )
-    {
-      if( !this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnKeyDown( e );
-    }
-
-    #endregion
-
-    #region OnMouseDown Methods
-
-    protected override void OnPreviewMouseDown( MouseButtonEventArgs e )
-    {
-      if( this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnPreviewMouseDown( e );
-    }
-
-    protected override void OnMouseDown( MouseButtonEventArgs e )
-    {
-      if( !this.NavigateOnPreview && !e.Handled )
-      {
-        this.ProcessNavigationButton( e );
-      }
-
-      base.OnMouseDown( e );
-    }
-
-    #endregion
-
-    #region OnMouseEnter Methods
-
-    protected override void OnMouseEnter( MouseEventArgs e )
-    {
-      this.MonitorInput();
-
-      base.OnMouseEnter( e );
-    }
-
-    #endregion
-
-    #region OnMouseLeave Methods
-
-    protected override void OnMouseLeave( MouseEventArgs e )
-    {
-      this.MonitorInput();
-
-      base.OnMouseLeave( e );
-    }
-
-    #endregion
-
-    #region OnMouseLeftButton Methods
-
-    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonDown( e );
-      }
-
-      base.OnPreviewMouseLeftButtonDown( e );
-    }
-
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonDown( e );
-      }
-
-      base.OnMouseLeftButtonDown( e );
-    }
-
-    protected override void OnPreviewMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonUp( e );
-      }
-
-      base.OnPreviewMouseLeftButtonUp( e );
-    }
-
-    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseLeftButtonUp( e );
-      }
-
-      base.OnMouseLeftButtonUp( e );
-    }
-
-    #endregion
-
-    #region OnMouseMove Methods
-
-    protected override void OnPreviewMouseMove( MouseEventArgs e )
-    {
-      if( this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseMove( e );
-      }
-
-      base.OnPreviewMouseMove( e );
-    }
-
-    protected override void OnMouseMove( MouseEventArgs e )
-    {
-      if( !this.DragOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseMove( e );
-      }
-
-      base.OnMouseMove( e );
-    }
-
-    #endregion
-
-    #region OnMouseWheel Methods
-
-    protected override void OnPreviewMouseWheel( MouseWheelEventArgs e )
-    {
-      if( this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseWheelZoom( e );
-      }
-
-      base.OnPreviewMouseWheel( e );
-    }
-
-    protected override void OnMouseWheel( MouseWheelEventArgs e )
-    {
-      if( !this.ZoomOnPreview && !e.Handled && _contentPresenter != null )
-      {
-        this.ProcessMouseWheelZoom( e );
-      }
-
-      base.OnMouseWheel( e );
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    // the default value for a single mouse wheel delta appears to be 28
-    private static int MOUSE_WHEEL_DELTA = 28;
-
-    // the content control's one and only content presenter
-    private ContentPresenter _contentPresenter = null;
-
-    //The Scrollbars
-    private ScrollBar _verticalScrollBar = null;
-    private ScrollBar _horizontalScrollBar = null;
-
-    // the content of the Zoombox (cast as a UIElement)
-    private UIElement _content = null;
-
-    // the drag adorner used for selecting a region in a zoom-to-selection operation
-    private DragAdorner _dragAdorner = null;
-
-    // the view stack
-    private ZoomboxViewStack _viewStack = null;
-
-    // the view finder display panel
-    // this is used to show the current viewport
-    private ZoomboxViewFinderDisplay _viewFinderDisplay = null;
-
-    // state variables used during drag and select operations
-    private Rect _resizeViewportBounds = Rect.Empty;
-    private Point _resizeAnchorPoint = new Point( 0, 0 );
-    private Point _resizeDraggingPoint = new Point( 0, 0 );
-    private Point _originPoint = new Point( 0, 0 );
-
-    private double _viewboxFactor = 1.0;
-    private double _relativeScale = 1.0;
-    private Point _relativePosition = new Point();
-    private Point _basePosition = new Point();
-
-    // used to track the time delta between stack operations
-    private DateTime _lastStackAddition;
-
-    // used to provide stack index when view changes
-    private int _lastViewIndex = -1;
-
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    #endregion
-
-    #region ViewFinderSelectionConverter Nested Type
-
-    private sealed class ViewFinderSelectionConverter : IValueConverter
-    {
-      public ViewFinderSelectionConverter( Zoombox zoombox )
-      {
-        _zoombox = zoombox;
-      }
-
-      public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        Rect viewport = ( Rect )value;
-        if( viewport.IsEmpty )
-          return viewport;
-
-        // adjust the viewport from the coordinate space of the Content element
-        // to the coordinate space of the view finder display panel
-        double scale = _zoombox._viewFinderDisplay.Scale * _zoombox._viewboxFactor;
-        Rect result = new Rect( viewport.Left * scale, viewport.Top * scale,
-            viewport.Width * scale, viewport.Height * scale );
-        result.Offset( _zoombox._viewFinderDisplay.ContentBounds.Left,
-            _zoombox._viewFinderDisplay.ContentBounds.Top );
-        return result;
-      }
-
-      public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        return null;
-      }
-
-      private readonly Zoombox _zoombox;
-    }
-
-    #endregion
-
-    #region DragAdorner Nested Type
-
-    internal sealed class DragAdorner : Adorner
-    {
-      public DragAdorner( UIElement adornedElement )
-        : base( adornedElement )
-      {
-        this.ClipToBounds = true;
-      }
-
-      public static readonly DependencyProperty BrushProperty =
-        DependencyProperty.Register( "Brush", typeof( Brush ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-      public Brush Brush
-      {
-        get
-        {
-          return ( Brush )this.GetValue( DragAdorner.BrushProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.BrushProperty, value );
-        }
-      }
-
-      public static readonly DependencyProperty PenProperty =
-        DependencyProperty.Register( "Pen", typeof( Pen ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x7F, 0x3F, 0x3F, 0x3F ) ), 2d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-      public Pen Pen
-      {
-        get
-        {
-          return ( Pen )this.GetValue( DragAdorner.PenProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.PenProperty, value );
-        }
-      }
-
-      public static readonly DependencyProperty RectProperty =
-        DependencyProperty.Register( "Rect", typeof( Rect ), typeof( DragAdorner ),
-          new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender,
-            new PropertyChangedCallback( DragAdorner.OnRectChanged ) ) );
-
-      public Rect Rect
-      {
-        get
-        {
-          return ( Rect )this.GetValue( DragAdorner.RectProperty );
-        }
-        set
-        {
-          this.SetValue( DragAdorner.RectProperty, value );
-        }
-      }
-
-      private static void OnRectChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-      {
-        DragAdorner dragAdorner = ( DragAdorner )d;
-        Rect rect = ( Rect )e.NewValue;
-
-        // ignore empty values
-        if( rect.IsEmpty )
-          return;
-
-        // if the value is not empty, cache the position and size
-        dragAdorner._cachedPosition = ( ( Rect )e.NewValue ).TopLeft;
-        dragAdorner._cachedSize = ( ( Rect )e.NewValue ).Size;
-      }
-
-      public Point LastPosition
-      {
-        get
-        {
-          return _cachedPosition;
-        }
-      }
-
-      public Size LastSize
-      {
-        get
-        {
-          return _cachedSize;
-        }
-      }
-
-      protected override void OnRender( DrawingContext drawingContext )
-      {
-        drawingContext.DrawRectangle( Brush, Pen, Rect );
-      }
-
-      private Point _cachedPosition;
-      private Size _cachedSize;
-    }
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      IsUpdatingView = 0x00000001,
-      IsUpdatingViewport = 0x00000002,
-      IsDraggingViewport = 0x00000004,
-      IsResizingViewport = 0x00000008,
-      IsMonitoringInput = 0x00000010,
-      IsContentWrapped = 0x00000020,
-      HasArrangedContentPresenter = 0x00000040,
-      HasRenderedFirstView = 0x00000080,
-      RefocusViewOnFirstRender = 0x00000100,
-      HasUIPermission = 0x00000200,
-    }
-
-    #endregion
-
-    #region ResizeEdge Nested Type
-
-    private enum ResizeEdge
-    {
-      None,
-      TopLeft,
-      TopRight,
-      BottomLeft,
-      BottomRight,
-      Left,
-      Top,
-      Right,
-      Bottom,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
deleted file mode 100644
index bdbd47a3..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Security;
-using System.Security.Permissions;
-using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxCursors
-  {
-    #region Constructors
-
-    static ZoomboxCursors()
-    {
-      try
-      {
-        new EnvironmentPermission( PermissionState.Unrestricted ).Demand();
-        _zoom = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/Zoom.cur" ) );
-        _zoomRelative = new Cursor( ResourceHelper.LoadResourceStream( Assembly.GetExecutingAssembly(), "Zoombox/Resources/ZoomRelative.cur" ) );
-      }
-      catch( SecurityException )
-      {
-        // partial trust, so just use default cursors
-      }
-    }
-
-    #endregion
-
-    #region Zoom Static Property
-
-    public static Cursor Zoom
-    {
-      get
-      {
-        return _zoom;
-      }
-    }
-
-    private static readonly Cursor _zoom = Cursors.Arrow;
-
-    #endregion
-
-    #region ZoomRelative Static Property
-
-    public static Cursor ZoomRelative
-    {
-      get
-      {
-        return _zoomRelative;
-      }
-    }
-
-    private static readonly Cursor _zoomRelative = Cursors.Arrow;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
deleted file mode 100644
index 124a27aa..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
+++ /dev/null
@@ -1,314 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  [TypeConverter( typeof( ZoomboxViewConverter ) )]
-  public class ZoomboxView
-  {
-    #region Constructors
-
-    public ZoomboxView()
-    {
-    }
-
-    public ZoomboxView( double scale )
-    {
-      this.Scale = scale;
-    }
-
-    public ZoomboxView( Point position )
-    {
-      this.Position = position;
-    }
-
-    public ZoomboxView( double scale, Point position )
-    {
-      this.Position = position;
-      this.Scale = scale;
-    }
-
-    public ZoomboxView( Rect region )
-    {
-      this.Region = region;
-    }
-
-    public ZoomboxView( double x, double y )
-      : this( new Point( x, y ) )
-    {
-    }
-
-    public ZoomboxView( double scale, double x, double y )
-      : this( scale, new Point( x, y ) )
-    {
-    }
-
-    public ZoomboxView( double x, double y, double width, double height )
-      : this( new Rect( x, y, width, height ) )
-    {
-    }
-
-    #endregion
-
-    #region Empty Static Property
-
-    public static ZoomboxView Empty
-    {
-      get
-      {
-        return _empty;
-      }
-    }
-
-    private static readonly ZoomboxView _empty = new ZoomboxView( ZoomboxViewKind.Empty );
-
-    #endregion
-
-    #region Fill Static Property
-
-    public static ZoomboxView Fill
-    {
-      get
-      {
-        return _fill;
-      }
-    }
-
-    private static readonly ZoomboxView _fill = new ZoomboxView( ZoomboxViewKind.Fill );
-
-    #endregion
-
-    #region Fit Static Property
-
-    public static ZoomboxView Fit
-    {
-      get
-      {
-        return _fit;
-      }
-    }
-
-    private static readonly ZoomboxView _fit = new ZoomboxView( ZoomboxViewKind.Fit );
-
-    #endregion
-
-    #region Center Static Property
-
-    public static ZoomboxView Center
-    {
-      get
-      {
-        return _center;
-      }
-    }
-
-    private static readonly ZoomboxView _center = new ZoomboxView( ZoomboxViewKind.Center );
-
-    #endregion
-
-    #region ViewKind Property
-
-    public ZoomboxViewKind ViewKind
-    {
-      get
-      {
-        if( _kindHeight > 0 )
-        {
-          return ZoomboxViewKind.Region;
-        }
-        else
-        {
-          return ( ZoomboxViewKind )( int )_kindHeight;
-        }
-      }
-    }
-
-    private double _kindHeight = ( int )ZoomboxViewKind.Empty;
-
-    #endregion
-
-    #region Position Property
-
-    public Point Position
-    {
-      get
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "PositionOnlyAccessibleOnAbsolute" ) );
-
-        return new Point( _x, _y );
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        _x = value.X;
-        _y = value.Y;
-        _kindHeight = ( int )ZoomboxViewKind.Absolute;
-      }
-    }
-
-    private double _x = double.NaN;
-    private double _y = double.NaN;
-
-    #endregion
-
-    #region Scale Property
-
-    public double Scale
-    {
-      get
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "ScaleOnlyAccessibleOnAbsolute" ) );
-
-        return _scaleWidth;
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Absolute && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        _scaleWidth = value;
-        _kindHeight = ( int )ZoomboxViewKind.Absolute;
-      }
-    }
-
-    private double _scaleWidth = double.NaN;
-
-    #endregion
-
-    #region Region Property
-
-    public Rect Region
-    {
-      get
-      {
-        // a region view has a positive _typeHeight value
-        if( _kindHeight < 0 )
-          throw new InvalidOperationException( ErrorMessages.GetMessage( "RegionOnlyAccessibleOnRegionalView" ) );
-
-        return new Rect( _x, _y, _scaleWidth, _kindHeight );
-      }
-      set
-      {
-        if( this.ViewKind != ZoomboxViewKind.Region && this.ViewKind != ZoomboxViewKind.Empty )
-          throw new InvalidOperationException( String.Format( ErrorMessages.GetMessage( "ZoomboxViewAlreadyInitialized" ), this.ViewKind.ToString() ) );
-
-        if( !value.IsEmpty )
-        {
-          _x = value.X;
-          _y = value.Y;
-          _scaleWidth = value.Width;
-          _kindHeight = value.Height;
-        }
-      }
-    }
-
-    #endregion
-
-    public override int GetHashCode()
-    {
-      return _x.GetHashCode() ^ _y.GetHashCode() ^ _scaleWidth.GetHashCode() ^ _kindHeight.GetHashCode();
-    }
-
-    public override bool Equals( object o )
-    {
-      bool result = false;
-      if( o is ZoomboxView )
-      {
-        ZoomboxView other = ( ZoomboxView )o;
-        if( this.ViewKind == other.ViewKind )
-        {
-          switch( this.ViewKind )
-          {
-            case ZoomboxViewKind.Absolute:
-              result = ( DoubleHelper.AreVirtuallyEqual( _scaleWidth, other._scaleWidth ) )
-                    && ( DoubleHelper.AreVirtuallyEqual( Position, other.Position ) );
-              break;
-
-            case ZoomboxViewKind.Region:
-              result = DoubleHelper.AreVirtuallyEqual( Region, other.Region );
-              break;
-
-            default:
-              result = true;
-              break;
-          }
-        }
-      }
-      return result;
-    }
-
-    public override string ToString()
-    {
-      switch( ViewKind )
-      {
-        case ZoomboxViewKind.Empty:
-          return "ZoomboxView: Empty";
-
-        case ZoomboxViewKind.Center:
-          return "ZoomboxView: Center";
-
-        case ZoomboxViewKind.Fill:
-          return "ZoomboxView: Fill";
-
-        case ZoomboxViewKind.Fit:
-          return "ZoomboxView: Fit";
-
-        case ZoomboxViewKind.Absolute:
-          return string.Format( "ZoomboxView: Scale = {0}; Position = ({1}, {2})", _scaleWidth.ToString( "f" ), _x.ToString( "f" ), _y.ToString( "f" ) );
-
-        case ZoomboxViewKind.Region:
-          return string.Format( "ZoomboxView: Region = ({0}, {1}, {2}, {3})", _x.ToString( "f" ), _y.ToString( "f" ), _scaleWidth.ToString( "f" ), _kindHeight.ToString( "f" ) );
-      }
-
-      return base.ToString();
-    }
-
-    private ZoomboxView( ZoomboxViewKind viewType )
-    {
-      _kindHeight = ( int )viewType;
-    }
-
-    #region Operators Methods
-
-    public static bool operator ==( ZoomboxView v1, ZoomboxView v2 )
-    {
-      if( ( object )v1 == null )
-        return ( object )v2 == null;
-
-      if( ( object )v2 == null )
-        return ( object )v1 == null;
-
-      return v1.Equals( v2 );
-    }
-
-    public static bool operator !=( ZoomboxView v1, ZoomboxView v2 )
-    {
-      return !( v1 == v2 );
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
deleted file mode 100644
index 1575827c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxViewChangedEventArgs : PropertyChangedEventArgs<ZoomboxView>
-  {
-    #region Constructors
-
-    public ZoomboxViewChangedEventArgs(
-      ZoomboxView oldView,
-      ZoomboxView newView,
-      int oldViewStackIndex,
-      int newViewStackIndex )
-      : base( Zoombox.CurrentViewChangedEvent, oldView, newView )
-    {
-      _newViewStackIndex = newViewStackIndex;
-      _oldViewStackIndex = oldViewStackIndex;
-    }
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public int NewViewStackIndex
-    {
-      get
-      {
-        return _newViewStackIndex;
-      }
-    }
-
-    private readonly int _newViewStackIndex = -1;
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public int OldViewStackIndex
-    {
-      get
-      {
-        return _oldViewStackIndex;
-      }
-    }
-
-    private readonly int _oldViewStackIndex = -1;
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public bool IsNewViewFromStack
-    {
-      get
-      {
-        return _newViewStackIndex >= 0;
-      }
-    }
-
-    #endregion
-
-    #region NewViewStackIndex Property
-
-    public bool IsOldViewFromStack
-    {
-      get
-      {
-        return _oldViewStackIndex >= 0;
-      }
-    }
-
-    #endregion
-
-    protected override void InvokeEventHandler( Delegate genericHandler, object genericTarget )
-    {
-      ( ( ZoomboxViewChangedEventHandler )genericHandler )( genericTarget, this );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
deleted file mode 100644
index 1931a414..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Zoombox
-{
-  public delegate void ZoomboxViewChangedEventHandler( object sender, ZoomboxViewChangedEventArgs e );
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
deleted file mode 100644
index 67cdaa7f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Globalization;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public sealed class ZoomboxViewConverter : TypeConverter
-  {
-    #region Converter Static Property
-
-    internal static ZoomboxViewConverter Converter
-    {
-      get
-      {
-        if( _converter == null )
-        {
-          _converter = new ZoomboxViewConverter();
-        }
-        return _converter;
-      }
-    }
-
-    private static ZoomboxViewConverter _converter; //null
-
-    #endregion
-
-    public override bool CanConvertFrom( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( string ) )
-          || ( type == typeof( double ) )
-          || ( type == typeof( Point ) )
-          || ( type == typeof( Rect ) )
-          || ( base.CanConvertFrom( typeDescriptorContext, type ) );
-    }
-
-    public override bool CanConvertTo( ITypeDescriptorContext typeDescriptorContext, Type type )
-    {
-      return ( type == typeof( string ) )
-          || ( base.CanConvertTo( typeDescriptorContext, type ) );
-    }
-
-    public override object ConvertFrom( 
-      ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value )
-    {
-      ZoomboxView result = null;
-      if( value is double )
-      {
-        result = new ZoomboxView( ( double )value );
-      }
-      else if( value is Point )
-      {
-        result = new ZoomboxView( ( Point )value );
-      }
-      else if( value is Rect )
-      {
-        result = new ZoomboxView( ( Rect )value );
-      }
-      else if( value is string )
-      {
-        if( string.IsNullOrEmpty( ( value as string ).Trim() ) )
-        {
-          result = ZoomboxView.Empty;
-        }
-        else
-        {
-          switch( ( value as string ).Trim().ToLower() )
-          {
-            case "center":
-              result = ZoomboxView.Center;
-              break;
-
-            case "empty":
-              result = ZoomboxView.Empty;
-              break;
-
-            case "fill":
-              result = ZoomboxView.Fill;
-              break;
-
-            case "fit":
-              result = ZoomboxView.Fit;
-              break;
-
-            default:
-              // parse double values; respect the following separators: ' ', ';', or ','
-              List<double> values = new List<double>();
-              foreach( string token in ( value as string ).Split( new char[] { ' ', ';', ',' }, StringSplitOptions.RemoveEmptyEntries ) )
-              {
-                double d;
-                if( double.TryParse( token, out d ) )
-                {
-                  values.Add( d );
-                }
-                if( values.Count >= 4 )
-                {
-                  // disregard additional values
-                  break;
-                }
-              }
-
-              switch( values.Count )
-              {
-                case 1: // scale
-                  result = new ZoomboxView( values[ 0 ] );
-                  break;
-
-                case 2: // x, y
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ] );
-                  break;
-
-                case 3: // scale, x, y
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ] );
-                  break;
-
-                case 4: // x, y, width, height
-                  result = new ZoomboxView( values[ 0 ], values[ 1 ], values[ 2 ], values[ 3 ] );
-                  break;
-              }
-              break;
-          }
-        }
-      }
-      return ( result == null ? base.ConvertFrom( typeDescriptorContext, cultureInfo, value ) : result );
-    }
-
-    public override object ConvertTo( 
-      ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value, 
-      Type destinationType )
-    {
-      object result = null;
-      ZoomboxView view = value as ZoomboxView;
-
-      if( view != null )
-      {
-        if( destinationType == typeof( string ) )
-        {
-          result = "Empty";
-          switch( view.ViewKind )
-          {
-            case ZoomboxViewKind.Absolute:
-              if( PointHelper.IsEmpty( view.Position ) )
-              {
-                if( !DoubleHelper.IsNaN( view.Scale ) )
-                {
-                  result = view.Scale.ToString();
-                }
-              }
-              else if( DoubleHelper.IsNaN( view.Scale ) )
-              {
-                result = view.Position.X.ToString() + "," + view.Position.Y.ToString();
-              }
-              else
-              {
-                result = view.Scale.ToString() + ","
-                    + view.Position.X.ToString() + ","
-                    + view.Position.Y.ToString();
-              }
-              break;
-
-            case ZoomboxViewKind.Center:
-              result = "Center";
-              break;
-
-            case ZoomboxViewKind.Fill:
-              result = "Fill";
-              break;
-
-            case ZoomboxViewKind.Fit:
-              result = "Fit";
-              break;
-
-            case ZoomboxViewKind.Region:
-              result = view.Region.X.ToString() + ","
-                  + view.Region.Y.ToString() + ","
-                  + view.Region.Width.ToString() + ","
-                  + view.Region.Height.ToString();
-              break;
-          }
-        }
-      }
-      return ( result == null ? base.ConvertTo( typeDescriptorContext, cultureInfo, value, destinationType ) : result );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
deleted file mode 100644
index 52417ed4..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Zoombox
-{
-  public class ZoomboxViewException : Exception
-  {
-    #region Constructors
-
-    public ZoomboxViewException( string message ) 
-      : base( message )
-    {
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
deleted file mode 100644
index e2077a89..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public class ZoomboxViewFinderDisplay : FrameworkElement
-  {
-    #region Constructors
-
-    static ZoomboxViewFinderDisplay()
-    {
-      ZoomboxViewFinderDisplay.DefaultStyleKeyProperty.OverrideMetadata( typeof( ZoomboxViewFinderDisplay ), new FrameworkPropertyMetadata( typeof( ZoomboxViewFinderDisplay ) ) );
-    }
-
-    public ZoomboxViewFinderDisplay()
-    {
-    }
-
-    #endregion
-
-    #region Background Property
-
-    public static readonly DependencyProperty BackgroundProperty =
-      DependencyProperty.Register( "Background", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0xC0, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush Background
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.BackgroundProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.BackgroundProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ContentBounds Property
-
-    private static readonly DependencyPropertyKey ContentBoundsPropertyKey =
-      DependencyProperty.RegisterReadOnly( "ContentBounds", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( ( Rect )Rect.Empty, FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public static readonly DependencyProperty ContentBoundsProperty = ZoomboxViewFinderDisplay.ContentBoundsPropertyKey.DependencyProperty;
-
-    internal Rect ContentBounds
-    {
-      get
-      {
-        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ContentBoundsProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ContentBoundsPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region ShadowBrush Property
-
-    public static readonly DependencyProperty ShadowBrushProperty =
-      DependencyProperty.Register( "ShadowBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new SolidColorBrush( Color.FromArgb( 0x80, 0xFF, 0xFF, 0xFF ) ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush ShadowBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ShadowBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportBrush Property
-
-    public static readonly DependencyProperty ViewportBrushProperty =
-      DependencyProperty.Register( "ViewportBrush", typeof( Brush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( Brushes.Transparent, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Brush ViewportBrush
-    {
-      get
-      {
-        return ( Brush )this.GetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportBrushProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportPen Property
-
-    public static readonly DependencyProperty ViewportPenProperty =
-      DependencyProperty.Register( "ViewportPen", typeof( Pen ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( new Pen( new SolidColorBrush( Color.FromArgb( 0x80, 0x00, 0x00, 0x00 ) ), 1d ), FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Pen ViewportPen
-    {
-      get
-      {
-        return ( Pen )this.GetValue( ZoomboxViewFinderDisplay.ViewportPenProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportPenProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region ViewportRect Property
-
-    public static readonly DependencyProperty ViewportRectProperty =
-      DependencyProperty.Register( "ViewportRect", typeof( Rect ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( Rect.Empty, FrameworkPropertyMetadataOptions.AffectsRender ) );
-
-    public Rect ViewportRect
-    {
-      get
-      {
-        return ( Rect )this.GetValue( ZoomboxViewFinderDisplay.ViewportRectProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.ViewportRectProperty, value );
-      }
-    }
-
-    #endregion
-
-    #region VisualBrush Property
-
-    private static readonly DependencyPropertyKey VisualBrushPropertyKey =
-      DependencyProperty.RegisterReadOnly( "VisualBrush", typeof( VisualBrush ), typeof( ZoomboxViewFinderDisplay ),
-        new FrameworkPropertyMetadata( ( VisualBrush )null ) );
-
-    public static readonly DependencyProperty VisualBrushProperty = ZoomboxViewFinderDisplay.VisualBrushPropertyKey.DependencyProperty;
-
-    internal VisualBrush VisualBrush
-    {
-      get
-      {
-        return ( VisualBrush )this.GetValue( ZoomboxViewFinderDisplay.VisualBrushProperty );
-      }
-      set
-      {
-        this.SetValue( ZoomboxViewFinderDisplay.VisualBrushPropertyKey, value );
-      }
-    }
-
-    #endregion
-
-    #region AvailableSize Internal Property
-
-    internal Size AvailableSize
-    {
-      get
-      {
-        return _availableSize;
-      }
-    }
-
-    private Size _availableSize = Size.Empty;
-
-    #endregion
-
-    #region Scale Internal Property
-
-    internal double Scale
-    {
-      get
-      {
-        return _scale;
-      }
-      set
-      {
-        _scale = value;
-      }
-    }
-
-    private double _scale = 1d;
-
-    #endregion
-
-    protected override Size ArrangeOverride( Size finalSize )
-    {
-      // Note that we do not call the Arrange method on any children
-      // because a ViewFinderDisplay has no children
-
-      // the control's RenderSize should always match its DesiredSize
-      return this.DesiredSize;
-    }
-
-    protected override Size MeasureOverride( Size availableSize )
-    {
-      // Note that we do not call the Measure method on any children
-      // because a ViewFinderDisplay has no children.  It is merely used 
-      // as a surface for the view finder's VisualBrush.
-
-      // store the available size for use by the Zoombox control
-      _availableSize = availableSize;
-
-      // Simulate size-to-content for the display panel by ensuring a width and height
-      // based on the content bounds. Otherwise, the display panel may have no size, since it doesn't 
-      // contain content.
-      double width = DoubleHelper.IsNaN( this.ContentBounds.Width ) ? 0 : Math.Max( 0, this.ContentBounds.Width );
-      double height = DoubleHelper.IsNaN( this.ContentBounds.Height ) ? 0 : Math.Max( 0, this.ContentBounds.Height );
-      Size displayPanelSize = new Size( width, height );
-
-      // Now ensure that the result fits within the available size while maintaining
-      // the width/height ratio of the content bounds
-      if( displayPanelSize.Width > availableSize.Width || displayPanelSize.Height > availableSize.Height )
-      {
-        double aspectX = availableSize.Width / displayPanelSize.Width;
-        double aspectY = availableSize.Height / displayPanelSize.Height;
-        double scale = ( aspectX < aspectY ) ? aspectX : aspectY;
-        displayPanelSize = new Size( displayPanelSize.Width * scale, displayPanelSize.Height * scale );
-      }
-
-      return displayPanelSize;
-    }
-
-    protected override void OnRender( DrawingContext dc )
-    {
-      base.OnRender( dc );
-
-      dc.DrawRectangle( this.Background, null, this.ContentBounds );
-
-      dc.DrawRectangle( this.VisualBrush, null, this.ContentBounds );
-
-      if( this.ViewportRect.IntersectsWith( new Rect( this.RenderSize ) ) )
-      {
-        // draw shadow rectangles over the non-viewport regions
-        Rect r1 = new Rect( new Point( 0, 0 ), new Size( this.RenderSize.Width, Math.Max( 0, this.ViewportRect.Top ) ) );
-        Rect r2 = new Rect( new Point( 0, this.ViewportRect.Top ), new Size( Math.Max( 0, this.ViewportRect.Left ), this.ViewportRect.Height ) );
-        Rect r3 = new Rect( new Point( this.ViewportRect.Right, this.ViewportRect.Top ), new Size( Math.Max( 0, this.RenderSize.Width - this.ViewportRect.Right ), this.ViewportRect.Height ) );
-        Rect r4 = new Rect( new Point( 0, this.ViewportRect.Bottom ), new Size( this.RenderSize.Width, Math.Max( 0, this.RenderSize.Height - this.ViewportRect.Bottom ) ) );
-        dc.DrawRectangle( this.ShadowBrush, null, r1 );
-        dc.DrawRectangle( this.ShadowBrush, null, r2 );
-        dc.DrawRectangle( this.ShadowBrush, null, r3 );
-        dc.DrawRectangle( this.ShadowBrush, null, r4 );
-
-        // draw the rectangle around the viewport region
-        dc.DrawRectangle( this.ViewportBrush, this.ViewportPen, this.ViewportRect );
-      }
-      else
-      {
-        // if no part of the Rect is visible, just draw a 
-        // shadow over the entire content bounds
-        dc.DrawRectangle( this.ShadowBrush, null, new Rect( this.RenderSize ) );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
deleted file mode 100644
index ce90e01c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Zoombox
-{
-  public enum ZoomboxViewKind
-  {
-    Absolute = -5,
-    Fit = -4,
-    Fill = -3,
-    Center = -2,
-    Empty = -1,
-    Region,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
deleted file mode 100644
index d44acb9d..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
+++ /dev/null
@@ -1,555 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick 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;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Core;
-
-namespace Xceed.Wpf.Toolkit.Zoombox
-{
-  public sealed class ZoomboxViewStack : Collection<ZoomboxView>, IWeakEventListener
-  {
-    #region Constructors
-
-    public ZoomboxViewStack( Zoombox zoombox )
-    {
-      _zoomboxRef = new WeakReference( zoombox );
-    }
-
-    #endregion
-
-    #region SelectedView Property
-
-    public ZoomboxView SelectedView
-    {
-      get
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        return ( currentIndex < 0 || currentIndex > Count - 1 ) ? ZoomboxView.Empty : this[ currentIndex ];
-      }
-    }
-
-    #endregion
-
-    #region AreViewsFromSource Internal Property
-
-    internal bool AreViewsFromSource
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.AreViewsFromSource ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.AreViewsFromSource ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Source Internal Property
-
-    internal IEnumerable Source
-    {
-      get
-      {
-        return _source;
-      }
-    }
-
-    // if the view stack is generated by items within the ViewStackSource collection
-    // of the Zoombox, then we maintain a strong reference to the source
-    private IEnumerable _source; //null
-
-    #endregion
-
-    #region IsChangeFromSource Private Property
-
-    private bool IsChangeFromSource
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsChangeFromSource ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsChangeFromSource ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsMovingViews Private Property
-
-    private bool IsMovingViews
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsMovingViews ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsMovingViews ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsResettingViews Private Property
-
-    private bool IsResettingViews
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsResettingViews ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsResettingViews ] = value;
-      }
-    }
-
-    #endregion
-
-    #region IsSettingInitialViewAfterClear Private Property
-
-    private bool IsSettingInitialViewAfterClear
-    {
-      get
-      {
-        return _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ];
-      }
-      set
-      {
-        _cacheBits[ ( int )CacheBits.IsSettingInitialViewAfterClear ] = value;
-      }
-    }
-
-    #endregion
-
-    #region Zoombox Private Property
-
-    private Zoombox Zoombox
-    {
-      get
-      {
-        return _zoomboxRef.Target as Zoombox;
-      }
-    }
-
-    // maintain a weak reference to the Zoombox that owns the stack
-    private WeakReference _zoomboxRef;
-
-    #endregion
-
-    internal void ClearViewStackSource()
-    {
-      if( this.AreViewsFromSource )
-      {
-        this.AreViewsFromSource = false;
-        this.MonitorSource( false );
-        _source = null;
-        using( new SourceAccess( this ) )
-        {
-          this.Clear();
-        }
-        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-      }
-    }
-
-    internal void PushView( ZoomboxView view )
-    {
-      // clear the forward stack
-      int currentIndex = this.Zoombox.ViewStackIndex;
-      while( this.Count - 1 > currentIndex )
-      {
-        this.RemoveAt( Count - 1 );
-      }
-      this.Add( view );
-    }
-
-    internal void SetViewStackSource( IEnumerable source )
-    {
-      if( _source != source )
-      {
-        this.MonitorSource( false );
-        _source = source;
-        this.MonitorSource( true );
-        this.AreViewsFromSource = true;
-        this.Zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
-        this.ResetViews();
-      }
-    }
-
-    protected override void ClearItems()
-    {
-      this.VerifyStackModification();
-
-      bool currentDeleted = ( this.Zoombox.CurrentViewIndex >= 0 );
-      base.ClearItems();
-      this.Zoombox.SetViewStackCount( Count );
-
-      // if resetting the views due to a change in the view source collection, just return
-      if( this.IsResettingViews )
-        return;
-
-      if( this.Zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Auto && this.Zoombox.CurrentView != ZoomboxView.Empty )
-      {
-        this.IsSettingInitialViewAfterClear = true;
-        try
-        {
-          this.Add( this.Zoombox.CurrentView );
-        }
-        finally
-        {
-          this.IsSettingInitialViewAfterClear = false;
-        }
-        this.Zoombox.ViewStackIndex = 0;
-        if( currentDeleted )
-        {
-          this.Zoombox.SetCurrentViewIndex( 0 );
-        }
-      }
-      else
-      {
-        this.Zoombox.ViewStackIndex = -1;
-        this.Zoombox.SetCurrentViewIndex( -1 );
-      }
-    }
-
-    protected override void InsertItem( int index, ZoomboxView view )
-    {
-      this.VerifyStackModification();
-
-      if( this.Zoombox.HasArrangedContentPresenter
-          && this.Zoombox.ViewStackIndex >= index
-          && !this.IsSettingInitialViewAfterClear
-          && !this.IsResettingViews
-          && !this.IsMovingViews )
-      {
-        bool oldUpdatingView = this.Zoombox.IsUpdatingView;
-        this.Zoombox.IsUpdatingView = true;
-        try
-        {
-          this.Zoombox.ViewStackIndex++;
-          if( this.Zoombox.CurrentViewIndex != -1 )
-          {
-            this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex + 1 );
-          }
-        }
-        finally
-        {
-          this.Zoombox.IsUpdatingView = oldUpdatingView;
-        }
-      }
-
-      base.InsertItem( index, view );
-      this.Zoombox.SetViewStackCount( Count );
-    }
-
-    protected override void RemoveItem( int index )
-    {
-      this.VerifyStackModification();
-
-      bool currentDeleted = ( this.Zoombox.ViewStackIndex == index );
-      if( !this.IsMovingViews )
-      {
-        // if an item below the current index was deleted 
-        // (or if the last item is currently selected and it was deleted),
-        // adjust the ViewStackIndex and CurrentViewIndex values
-        if( this.Zoombox.HasArrangedContentPresenter
-            && ( this.Zoombox.ViewStackIndex > index
-                || ( currentDeleted && this.Zoombox.ViewStackIndex == this.Zoombox.ViewStack.Count - 1 ) ) )
-        {
-          // if removing the last item, just clear the stack, which ensures the proper
-          // behavior based on the ViewStackMode
-          if( currentDeleted && this.Zoombox.ViewStack.Count == 1 )
-          {
-            this.Clear();
-            return;
-          }
-
-          bool oldUpdatingView = this.Zoombox.IsUpdatingView;
-          this.Zoombox.IsUpdatingView = true;
-          try
-          {
-            this.Zoombox.ViewStackIndex--;
-            if( this.Zoombox.CurrentViewIndex != -1 )
-            {
-              this.Zoombox.SetCurrentViewIndex( this.Zoombox.CurrentViewIndex - 1 );
-            }
-          }
-          finally
-          {
-            this.Zoombox.IsUpdatingView = oldUpdatingView;
-          }
-        }
-      }
-
-      base.RemoveItem( index );
-
-      // if the current view was deleted, we may need to update the view index 
-      // (unless a non-stack view is in effect)
-      if( !this.IsMovingViews && currentDeleted && this.Zoombox.CurrentViewIndex != -1 )
-      {
-        this.Zoombox.RefocusView();
-      }
-
-      this.Zoombox.SetViewStackCount( Count );
-    }
-
-    protected override void SetItem( int index, ZoomboxView view )
-    {
-      this.VerifyStackModification();
-
-      base.SetItem( index, view );
-
-      // if the set item is the current item, update the zoombox
-      if( index == this.Zoombox.CurrentViewIndex )
-      {
-        this.Zoombox.RefocusView();
-      }
-    }
-
-    private static ZoomboxView GetViewFromSourceItem( object item )
-    {
-      ZoomboxView view = ( item is ZoomboxView ) ? item as ZoomboxView : ZoomboxViewConverter.Converter.ConvertFrom( item ) as ZoomboxView;
-      if( view == null )
-        throw new InvalidCastException( string.Format( ErrorMessages.GetMessage( "UnableToConvertToZoomboxView" ), item ) );
-
-      return view;
-    }
-
-    private void InsertViews( int index, IList newItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        foreach( object item in newItems )
-        {
-          ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
-          if( index >= this.Count )
-          {
-            this.Add( view );
-          }
-          else
-          {
-            this.Insert( index, view );
-          }
-          index++;
-        }
-      }
-    }
-
-    private void MonitorSource( bool monitor )
-    {
-      if( _source != null && ( _source is INotifyCollectionChanged ) )
-      {
-        if( monitor )
-        {
-          CollectionChangedEventManager.AddListener( _source as INotifyCollectionChanged, this );
-        }
-        else
-        {
-          CollectionChangedEventManager.RemoveListener( _source as INotifyCollectionChanged, this );
-        }
-      }
-    }
-
-    private void MoveViews( int oldIndex, int newIndex, IList movedItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        int indexAfterMove = currentIndex;
-
-        // adjust the current index, if it was affected by the move
-        if( !( ( oldIndex < currentIndex && newIndex < currentIndex )
-            || ( oldIndex > currentIndex && newIndex > currentIndex ) ) )
-        {
-          if( currentIndex >= oldIndex && currentIndex < oldIndex + movedItems.Count )
-          {
-            indexAfterMove += newIndex - oldIndex;
-          }
-          else if( currentIndex >= newIndex )
-          {
-            indexAfterMove += movedItems.Count;
-          }
-        }
-
-        this.IsMovingViews = true;
-        try
-        {
-          for( int i = 0; i < movedItems.Count; i++ )
-          {
-            this.RemoveAt( oldIndex );
-          }
-          for( int i = 0; i < movedItems.Count; i++ )
-          {
-            this.Insert( newIndex + i, ZoomboxViewStack.GetViewFromSourceItem( movedItems[ i ] ) );
-          }
-          if( indexAfterMove != currentIndex )
-          {
-            this.Zoombox.ViewStackIndex = indexAfterMove;
-            this.Zoombox.SetCurrentViewIndex( indexAfterMove );
-          }
-        }
-        finally
-        {
-          this.IsMovingViews = false;
-        }
-      }
-    }
-
-    private void OnSourceCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
-    {
-      switch( e.Action )
-      {
-        case NotifyCollectionChangedAction.Add:
-          this.InsertViews( e.NewStartingIndex, e.NewItems );
-          break;
-
-        case NotifyCollectionChangedAction.Move:
-          this.MoveViews( e.OldStartingIndex, e.NewStartingIndex, e.OldItems );
-          break;
-
-        case NotifyCollectionChangedAction.Remove:
-          this.RemoveViews( e.OldStartingIndex, e.OldItems );
-          break;
-
-        case NotifyCollectionChangedAction.Replace:
-          this.ResetViews();
-          break;
-
-        case NotifyCollectionChangedAction.Reset:
-          this.ResetViews();
-          break;
-      }
-    }
-
-    private void ResetViews()
-    {
-      using( new SourceAccess( this ) )
-      {
-        int currentIndex = this.Zoombox.ViewStackIndex;
-        this.IsResettingViews = true;
-        try
-        {
-          this.Clear();
-          foreach( object item in _source )
-          {
-            ZoomboxView view = ZoomboxViewStack.GetViewFromSourceItem( item );
-            this.Add( view );
-          }
-
-          currentIndex = Math.Min( Math.Max( 0, currentIndex ), this.Count - 1 );
-
-          this.Zoombox.ViewStackIndex = currentIndex;
-          this.Zoombox.SetCurrentViewIndex( currentIndex );
-          this.Zoombox.RefocusView();
-        }
-        finally
-        {
-          this.IsResettingViews = false;
-        }
-      }
-    }
-
-    private void RemoveViews( int index, IList removedItems )
-    {
-      using( new SourceAccess( this ) )
-      {
-        for( int i = 0; i < removedItems.Count; i++ )
-        {
-          this.RemoveAt( index );
-        }
-      }
-    }
-
-    private void VerifyStackModification()
-    {
-      if( this.AreViewsFromSource && !this.IsChangeFromSource )
-        throw new InvalidOperationException( ErrorMessages.GetMessage( "ViewStackCannotBeManipulatedNow" ) );
-    }
-
-    #region IWeakEventListener Members
-
-    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
-    {
-      if( managerType == typeof( CollectionChangedEventManager ) )
-      {
-        this.OnSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
-      }
-      else
-      {
-        return false;
-      }
-
-      return true;
-    }
-
-    #endregion
-
-    #region Private Fields
-
-    // to save memory, store bool variables in a bit vector
-    private BitVector32 _cacheBits = new BitVector32( 0 );
-
-    #endregion
-
-    #region SourceAccess Nested Type
-
-    private sealed class SourceAccess : IDisposable
-    {
-      public SourceAccess( ZoomboxViewStack viewStack )
-      {
-        _viewStack = viewStack;
-        _viewStack.IsChangeFromSource = true;
-      }
-
-      ~SourceAccess()
-      {
-        this.Dispose();
-      }
-
-      public void Dispose()
-      {
-        _viewStack.IsChangeFromSource = false;
-        _viewStack = null;
-        GC.SuppressFinalize( this );
-      }
-
-      private ZoomboxViewStack _viewStack;
-    }
-
-    #endregion
-
-    #region CacheBits Nested Type
-
-    private enum CacheBits
-    {
-      AreViewsFromSource = 0x00000001,
-      IsChangeFromSource = 0x00000002,
-      IsResettingViews = 0x00000004,
-      IsMovingViews = 0x00000008,
-      IsSettingInitialViewAfterClear = 0x00000010,
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
deleted file mode 100644
index b2cd4d22..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Zoombox
-{
-  public enum ZoomboxViewStackMode
-  {
-    Auto,
-    Default,
-    Disabled,
-    Manual,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
deleted file mode 100644
index e79fa42f..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional 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.Zoombox
-{
-  public enum ZoomboxZoomOn
-  {
-    Content = 1,
-    View,
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index b874ff28..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml
deleted file mode 100644
index 1ff141ef..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/BusyIndicator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 6520b032..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml
deleted file mode 100644
index c66c7a5b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ButtonSpinner/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index a5de4c90..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml
deleted file mode 100644
index ebc36087..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Calculator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 577f53ef..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml
deleted file mode 100644
index bac32b64..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CalculatorUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3c883a5d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml
deleted file mode 100644
index 21005230..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 7ef7d488..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml
deleted file mode 100644
index fac4f88b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CheckListBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 6dbffa9d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml
deleted file mode 100644
index 6073e848..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ChildWindow/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 64983f6b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml
deleted file mode 100644
index ac4f8e91..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Chromes/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml
deleted file mode 100644
index 20441958..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs
deleted file mode 100644
index 21c7c150..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Implementation/CollectionControlDialog.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "67CE6BABC918BB0DFE8DC3461FC60CFC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.8794
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Themes;
-
-
-namespace Xceed.Wpf.Toolkit {
-    
-    
-    /// <summary>
-    /// CollectionControlDialog
-    /// </summary>
-    public partial class CollectionControlDialog : Xceed.Wpf.Toolkit.CollectionControlDialogBase, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 32 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-        internal Xceed.Wpf.Toolkit.CollectionControl _collectionControl;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit;component/collectioncontrol/implementation/collectioncontroldi" +
-                    "alog.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._collectionControl = ((Xceed.Wpf.Toolkit.CollectionControl)(target));
-            return;
-            case 2:
-            
-            #line 45 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 49 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index b916a02a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml
deleted file mode 100644
index 38846b7a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/CollectionControl/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0619c304..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml
deleted file mode 100644
index 3f196648..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorCanvas/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fa5ee8bc..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml
deleted file mode 100644
index 4cd63494..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/ColorPicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index baac2c04..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml
deleted file mode 100644
index 08e3f389..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 9c940e01..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml
deleted file mode 100644
index 2e0cd636..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DateTimeUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 253434d9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml
deleted file mode 100644
index 333a0531..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/DropDownButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 4a59f27e..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.8794
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 7450ffff..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml
deleted file mode 100644
index 7450ffff..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/IconButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml
deleted file mode 100644
index 5cc6ef9c..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Magnifier/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 60ab61b2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml
deleted file mode 100644
index c61fb4e3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MessageBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index c6bbc938..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml
deleted file mode 100644
index 908b213b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/MultiLineTextEditor/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0ec76570..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml
deleted file mode 100644
index 48bc2fb8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/NumericUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index f5c9b250..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml
deleted file mode 100644
index ac215ede..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Pie/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml
deleted file mode 100644
index be0e168f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml
deleted file mode 100644
index 49dcccc9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Aero2/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml
deleted file mode 100644
index d975e666..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml
deleted file mode 100644
index c1ff98ce..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Primitives/Themes/Generic/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1f1f961d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml
deleted file mode 100644
index a34a412c..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/PropertyGrid/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0422692a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml
deleted file mode 100644
index f3cb63d0..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RangeSlider/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 477cd5d9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml
deleted file mode 100644
index fe33b95b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/RichTextBoxFormatBar/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 542cc0c0..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml
deleted file mode 100644
index 18413ed2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/SplitButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml
deleted file mode 100644
index 9185a595..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml
deleted file mode 100644
index 48a31512..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Brushes_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml
deleted file mode 100644
index 9d236e94..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero/Buttons_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 27bf28c9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml
deleted file mode 100644
index fcd60daf..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml
deleted file mode 100644
index 61cd3187..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml
deleted file mode 100644
index 33162478..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml
deleted file mode 100644
index a9265266..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Aero2/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml
deleted file mode 100644
index 961324fd..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml
deleted file mode 100644
index 852364b1..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml
deleted file mode 100644
index eb05d062..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml
deleted file mode 100644
index 513f2bc8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml
deleted file mode 100644
index bbc5f6da..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/Generic/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/classic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml
deleted file mode 100644
index befe3d6f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Themes/royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index ec6ee972..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml
deleted file mode 100644
index 63401f2e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1e02b0c0..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml
deleted file mode 100644
index 60f8b538..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/TimeSpanUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 75f9f2ac..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml
deleted file mode 100644
index 75f9f2ac..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index eb728d1e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml
deleted file mode 100644
index 031d137f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/WatermarkTextBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index d851302f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml
deleted file mode 100644
index 2ced9da3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Wizard/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
deleted file mode 100644
index 67ef7128..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5075ed49..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Debug\WPFToolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\classic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\BusyIndicator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\IconButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ButtonSpinner\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CalculatorUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Calculator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckListBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ChildWindow\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Chromes\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Implementation\CollectionControlDialog.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CollectionControl\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorCanvas\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\ColorPicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\CheckComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Aero2\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Primitives\Themes\Generic\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DateTimeUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\DropDownButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Magnifier\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MessageBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\MultiLineTextEditor\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\NumericUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Pie\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\PropertyGrid\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RangeSlider\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\RichTextBoxFormatBar\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\SplitButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero2\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Brushes_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Aero\Buttons_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Themes\Generic\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\TimeSpanUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\WatermarkTextBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Wizard\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Zoombox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.g.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\Xceed.Wpf.Toolkit.pdb
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources
deleted file mode 100644
index 0177b981..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref
deleted file mode 100644
index 3197da8a..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Xceed.Wpf.Toolkit_MarkupCompile.lref
+++ /dev/null
@@ -1,78 +0,0 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Debug\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index b906f59f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml
deleted file mode 100644
index b906f59f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Debug/Zoombox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 361b0ab7..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml
deleted file mode 100644
index d33fb716..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/BusyIndicator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 600a3129..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml
deleted file mode 100644
index 56741d38..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ButtonSpinner/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 935e4660..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml
deleted file mode 100644
index 23af1f73..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Calculator/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3508e2b8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml
deleted file mode 100644
index 6e5a1ab5..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CalculatorUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3b900538..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml
deleted file mode 100644
index d9bb1085..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fd051fae..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml
deleted file mode 100644
index 120591d9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CheckListBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3597652c..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml
deleted file mode 100644
index de378cf5..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ChildWindow/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 30677ae9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml
deleted file mode 100644
index 15807053..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Chromes/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml
deleted file mode 100644
index ad8a69d7..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
deleted file mode 100644
index 17bbf6ff..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Implementation/CollectionControlDialog.g.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma checksum "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "67CE6BABC918BB0DFE8DC3461FC60CFC"
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.8922
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Automation;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Markup;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Imaging;
-using System.Windows.Media.Media3D;
-using System.Windows.Media.TextFormatting;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Chromes;
-using Xceed.Wpf.Toolkit.Converters;
-using Xceed.Wpf.Toolkit.Core.Converters;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Themes;
-
-
-namespace Xceed.Wpf.Toolkit {
-    
-    
-    /// <summary>
-    /// CollectionControlDialog
-    /// </summary>
-    public partial class CollectionControlDialog : Xceed.Wpf.Toolkit.CollectionControlDialogBase, System.Windows.Markup.IComponentConnector {
-        
-        
-        #line 32 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-        internal Xceed.Wpf.Toolkit.CollectionControl _collectionControl;
-        
-        #line default
-        #line hidden
-        
-        private bool _contentLoaded;
-        
-        /// <summary>
-        /// InitializeComponent
-        /// </summary>
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        public void InitializeComponent() {
-            if (_contentLoaded) {
-                return;
-            }
-            _contentLoaded = true;
-            System.Uri resourceLocater = new System.Uri("/Xceed.Wpf.Toolkit;component/collectioncontrol/implementation/collectioncontroldi" +
-                    "alog.xaml", System.UriKind.Relative);
-            
-            #line 1 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            System.Windows.Application.LoadComponent(this, resourceLocater);
-            
-            #line default
-            #line hidden
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
-        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            this._collectionControl = ((Xceed.Wpf.Toolkit.CollectionControl)(target));
-            return;
-            case 2:
-            
-            #line 45 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.OkButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 3:
-            
-            #line 49 "..\..\..\..\CollectionControl\Implementation\CollectionControlDialog.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.CancelButton_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
-            this._contentLoaded = true;
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index a95a483a..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml
deleted file mode 100644
index a43fd438..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/CollectionControl/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 05790c6d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml
deleted file mode 100644
index aa007bd5..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorCanvas/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 94a4c243..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml
deleted file mode 100644
index d6578189..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/ColorPicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index dfb0d647..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml
deleted file mode 100644
index 70464bbb..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0a5575d3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml
deleted file mode 100644
index 0fcddc72..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DateTimeUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fd24dc8e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml
deleted file mode 100644
index 9e640a9e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/DropDownButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index b47e38f8..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.8922
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index bc3168d1..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml
deleted file mode 100644
index bc3168d1..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/IconButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml
deleted file mode 100644
index 72821cad..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Magnifier/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index f5d623a3..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml
deleted file mode 100644
index 83b800b4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MessageBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 3dadf347..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml
deleted file mode 100644
index 483585f8..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/MultiLineTextEditor/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 03cfcf7f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml
deleted file mode 100644
index 244b3b4f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/NumericUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index fae2919e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml
deleted file mode 100644
index fae2919e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Pie/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml
deleted file mode 100644
index 020b7339..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml
deleted file mode 100644
index 9f82a188..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Aero2/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml
deleted file mode 100644
index 209980ed..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/SelectorItem.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml
deleted file mode 100644
index 2323891b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Primitives/Themes/Generic/WindowControl.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index dfa9a959..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml
deleted file mode 100644
index 2c5af8ad..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/PropertyGrid/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 725db470..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml
deleted file mode 100644
index 9f6f721d..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RangeSlider/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 76958085..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml
deleted file mode 100644
index e25a32cb..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/RichTextBoxFormatBar/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index f0ce31d9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml
deleted file mode 100644
index b3931ab9..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/SplitButton/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml
deleted file mode 100644
index ec8f8bb2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml
deleted file mode 100644
index 75831342..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Brushes_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml
deleted file mode 100644
index 51f36c85..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero/Buttons_NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 0b4639b6..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml
deleted file mode 100644
index d8d2d5c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml
deleted file mode 100644
index 44a9ab30..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml
deleted file mode 100644
index a20e8ee2..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml
deleted file mode 100644
index f0ed69be..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Aero2/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml
deleted file mode 100644
index afc0b488..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml
deleted file mode 100644
index b3f08921..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Brushes.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml
deleted file mode 100644
index df9c6e8b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Buttons.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml
deleted file mode 100644
index e262254f..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Common.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml
deleted file mode 100644
index f0ed69be..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/Generic/Glyphs.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/classic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.homestead.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.metallic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/luna.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml
deleted file mode 100644
index 6c0ac4c4..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Themes/royale.normalcolor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 50589740..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml
deleted file mode 100644
index 15911dea..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimePicker/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 1ce6d444..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml
deleted file mode 100644
index 3516773b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/TimeSpanUpDown/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index 4708a235..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml
deleted file mode 100644
index 4708a235..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkComboBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index b7a2615b..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml
deleted file mode 100644
index 24fab6dc..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/WatermarkTextBox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index de3c6ca7..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml
deleted file mode 100644
index 70365904..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Wizard/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
deleted file mode 100644
index 67ef7128..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.Core.ErrorMessages.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
deleted file mode 100644
index 29b79d19..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ResolveAssemblyReference.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\classic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.homestead.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.metallic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\luna.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\royale.normalcolor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit_MarkupCompile.lref
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\Xceed.Wpf.Toolkit.pdb
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\bin\Release\WPFToolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\BusyIndicator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\IconButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ButtonSpinner\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CalculatorUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Calculator\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckListBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ChildWindow\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Chromes\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Implementation\CollectionControlDialog.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CollectionControl\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorCanvas\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\ColorPicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\CheckComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Aero2\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\SelectorItem.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Primitives\Themes\Generic\WindowControl.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DateTimeUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\DropDownButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Magnifier\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MessageBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\MultiLineTextEditor\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\NumericUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Pie\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\PropertyGrid\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RangeSlider\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\RichTextBoxFormatBar\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\SplitButton\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero2\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Brushes_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Aero\Buttons_NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Brushes.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Buttons.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Common.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Themes\Generic\Glyphs.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimePicker\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\TimeSpanUpDown\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkComboBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\WatermarkTextBox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Wizard\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Aero2.NormalColor.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Zoombox\Themes\Generic.baml
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.g.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.Core.ErrorMessages.resources
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.csproj.GenerateResource.Cache
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.dll
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\Xceed.Wpf.Toolkit.pdb
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources
deleted file mode 100644
index 90a6813e..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit.g.resources and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
deleted file mode 100644
index 87a2758c..00000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Xceed.Wpf.Toolkit_MarkupCompile.lref
+++ /dev/null
@@ -1,78 +0,0 @@
-D:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\obj\Release\GeneratedInternalTypeHelper.g.cs
-
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\BusyIndicator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\IconButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ButtonSpinner\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CalculatorUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Calculator\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckListBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ChildWindow\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Chromes\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Implementation\CollectionControlDialog.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CollectionControl\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorCanvas\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\ColorPicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\CheckComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Aero2\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\SelectorItem.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Primitives\Themes\Generic\WindowControl.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DateTimeUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\DropDownButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Magnifier\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MessageBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\MultiLineTextEditor\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\NumericUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Pie\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\PropertyGrid\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RangeSlider\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\RichTextBoxFormatBar\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\SplitButton\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero2\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Brushes_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Aero\Buttons_NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Brushes.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Buttons.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Common.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Themes\Generic\Glyphs.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimePicker\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\TimeSpanUpDown\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkComboBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\WatermarkTextBox\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Wizard\Themes\Generic.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Aero2.NormalColor.xaml
-FD:\Dev\ExtendedWPFToolKit_3.5\Release\3.4.0\OpenSource\Generated\Src\Xceed.Wpf.Toolkit\Zoombox\Themes\Generic.xaml
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml
deleted file mode 100644
index e194c8bb..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Aero2.NormalColor.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml
deleted file mode 100644
index e194c8bb..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/obj/Release/Zoombox/Themes/Generic.baml and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/sn.snk b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/sn.snk
deleted file mode 100644
index 1bdc9120..00000000
Binary files a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/sn.snk and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution_35/Xceed.Wpf.Toolkit.sln b/ExtendedWPFToolkitSolution_35/Xceed.Wpf.Toolkit.sln
deleted file mode 100644
index 80c162ce..00000000
--- a/ExtendedWPFToolkitSolution_35/Xceed.Wpf.Toolkit.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{2C3149D9-832B-4754-A27B-898A392344B5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2C3149D9-832B-4754-A27B-898A392344B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C3149D9-832B-4754-A27B-898A392344B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C3149D9-832B-4754-A27B-898A392344B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C3149D9-832B-4754-A27B-898A392344B5}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/README.md b/README.md
index 19694fbd..fa9628ed 100644
--- a/README.md
+++ b/README.md
@@ -2,19 +2,27 @@
 
 Extended WPF Toolkit™ by [Xceed](https://xceed.com) is the number one collection of WPF controls, components and utilities for creating next generation Windows applications. Use it to build professional looking, modern, and easy to use WPF applications. It has been downloaded more than 1 million times here, on Codeplex, and on [NuGet](http://www.nuget.org/packages/Extended.Wpf.Toolkit/).
 
-This free and open source toolkit is provided under the [Microsoft Public License](https://opensource.org/licenses/MS-PL). A summary can be found on [tl;drLegal](https://tldrlegal.com/license/microsoft-public-license-(ms-pl)).
+Starting at v3.7.0, this free and open source toolkit is provided under the [Xceed Community License agreement](license.md)(for non-commercial use).
 
 <a href="../../wiki/Xceed-Toolkit-Plus-for-WPF"><img align="right" src="https://user-images.githubusercontent.com/21266763/27969643-a5977614-6319-11e7-828e-b40fd1f8a283.png" width="233" style="margin:0px 30px" alt="Learn about Xceed Toolkit Plus for WPF here on Github"></a>Xceed offers the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) for developers that want to support the project, get additional controls and features, get updates and professional support, and work with a version a few releases ahead.
 
 ## Latest news
 
-**June 18, 2018** v3.7.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [27 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus370)
+**November 26, 2019** v3.7.0 released with [18 bug fixes and improvements](../../wiki/Improvements-in-v3.7.0). 
 
-**March 5, 2018** v3.3.0 released with [a major update to the DataGrid and 35 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0). Users of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) received v3.3.0 on March 1, 2017 with [45 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus330), v3.4.0 on June 5, 2017 with [52 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus340), and v3.5.0 on September 12, 2017 with [29 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus350), and v3.6.0 on January 15, 2018 with [1 new control and 40 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus360)
+**September 27, 2019** v3.6.0 released with [36 bug fixes and improvements](../../wiki/Improvements-in-v3.6.0). 
+
+**February 7, 2019** v3.5.0 released with [26 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0). 
+
+*January 30, 2019* v3.8.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [45 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0#Plus380)
+
+*June 18, 2018* v3.7.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [27 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0#Plus370)
+
+*January 15, 2018* v3.6.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [1 new control and 40 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0#Plus360)
 
 **July 11, 2017:** The project's new home is Github. All issues from Codeplex are now located here.
 
-<a href=""><img src="https://user-images.githubusercontent.com/21266763/27752265-1db3056c-5dae-11e7-8ef4-9728f01494e7.png" width="172"/></a>
+<img src="https://user-images.githubusercontent.com/21266763/27752265-1db3056c-5dae-11e7-8ef4-9728f01494e7.png" width="172"/>
 
 ## Controls included
 
@@ -40,59 +48,56 @@ This free and open source toolkit is provided under the [Microsoft Public Licens
 <tr>
 <td><a href="../../wiki/ColorCanvas">ColorCanvas</a></td>
 <td><a href="../../wiki/ColorPicker">ColorPicker</a></td>
-<td><a href="../../wiki/DataGrid">DataGrid</a></td>
 <td><a href="../../wiki/DateTimePicker">DateTimePicker</a></td>
+<td><a href="../../wiki/DateTimeUpDown">DateTimeUpDown</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/DateTimeUpDown">DateTimeUpDown</a></td>
 <td><a href="../../wiki/DecimalUpDown">DecimalUpDown</a></td>
 <td><a href="../../wiki/DoubleUpDown">DoubleUpDown</a></td>
 <td><a href="../../wiki/DropDownButton">DropDownButton</a></td>
+<td><a href="../../wiki/IconButton">IconButton</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/IconButton">IconButton</a></td>
 <td><a href="../../wiki/IntegerUpDown">IntegerUpDown</a></td>
 <td><a href="../../wiki/LongUpDown">LongUpDown</a></td>
 <td><a href="../../wiki/Magnifier">Magnifier</a></td>
+<td><a href="../../wiki/MaskedTextBox">MaskedTextBox</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/MaskedTextBox">MaskedTextBox</a></td>
 <td><a href="../../wiki/MessageBox">MessageBox</a></td>
 <td><a href="../../wiki/MultiLineTextEditor">MultiLineTextEditor</a></td>
 <td><a href="../../wiki/PieChart">PieChart</a></td>
+<td><a href="../../wiki/PrimitiveTypeCollectionEditor">PrimitiveTypeCollEditor</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/PrimitiveTypeCollectionEditor">PrimitiveTypeCollEditor</a></td>
 <td><a href="../../wiki/PropertyGrid">PropertyGrid</a></td>
 <td><a href="../../wiki/RangeSlider">RangeSlider</a></td>
 <td><a href="../../wiki/RichTextBox">RichTextBox</a></td>
+<td><a href="../../wiki/RichTextBoxFormatBar">RichTextBoxFormatBar</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/RichTextBoxFormatBar">RichTextBoxFormatBar</a></td>
 <td><a href="../../wiki/ShortUpDown">ShortUpDown</a></td>
 <td><a href="../../wiki/SingleUpDown">SingleUpDown</a></td>
 <td><a href="../../wiki/SplitButton">SplitButton</a></td>
+<td><a href="../../wiki/SwitchPanel">2 SwitchPanels</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/SwitchPanel">SwitchPanel</a></td>
 <td><a href="../../wiki/TimelinePanel">TimelinePanel</a></td>
 <td><a href="../../wiki/TimePicker">TimePicker</a></td>
 <td><a href="../../wiki/TimeSpanUpDown">TimeSpanUpDown</a></td>
+<td><a href="../../wiki/ValueRangeTextBox">ValueRangeTextBox</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/ValueRangeTextBox">ValueRangeTextBox</a></td>
 <td><a href="../../wiki/WatermarkPasswordBox">WatermarkPasswordBox</a></td>
 <td><a href="../../wiki/WatermarkTextBox">WatermarkTextBox</a></td>
 <td><a href="../../wiki/WatermarkComboBox">WatermarkComboBox</a></td>
+<td><a href="../../wiki/WindowContainer">WindowContainer</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/WindowContainer">WindowContainer</a></td>
 <td><a href="../../wiki/WindowControl">WindowControl</a></td>
 <td><a href="../../wiki/Wizard">Wizard</a></td>
 <td><a href="../../wiki/Zoombox">Zoombox</a></td>
-</tr>
-<tr>
-<td><a href="">Windows 8 Theme</a></td>
+<td><a href="../../wiki/Themes-Usage-Instructions">Windows 8 Theme</a></td>
 </tr>
 </table>
 
@@ -103,37 +108,37 @@ This free and open source toolkit is provided under the [Microsoft Public Licens
 <td><a href="../../wiki/Charts">Charts</a></td>
 <td><a href="../../wiki/ChildWindow-Plus">ChildWindow Plus</a></td>
 <td><a href="../../wiki/ExtendedTabControl">ExtendedTabControl</a></td>
-<td><a href="../../wiki/FilePicker-Plus">FilePicker Plus</a></td>
+<td><a href="../../wiki/DataGrid">DataGrid</a></td>
 </tr>
 <tr>
-<td><a href="../../wiki/Material-Design-controls">Material Design controls</a></td>
+<td><a href="../../wiki/FilePicker">FilePicker</a></td>
+<td><a href="../../wiki/Material-Design-controls">21 Material Design controls</a></td>
 <td><a href="../../wiki/MessageBox-Plus">MessageBox Plus</a></td>
 <td><a href="../../wiki/MultiCalendar">MultiCalendar</a></td>
-<td><a href="../../wiki/MultiColumnComboBox">MultiColumnComboBox</a></td>
 </tr>
 <tr>
+<td><a href="../../wiki/MultiColumnComboBox">MultiColumnComboBox</a></td>
 <td><a href="../../wiki/PileFlowPanel">PileFlowPanel</a></td>
 <td><a href="../../wiki/PropertyGrid-Plus">PropertyGrid Plus</a></td>
 <td><a href="../../wiki/RadialGauge">RadialGauge</a></td>
-<td><a href="../../wiki/Rating">Rating</a></td>
 </tr>
 <tr>
+<td><a href="../../wiki/Rating">Rating</a></td>
 <td><a href="../../wiki/SlideShow">SlideShow</a></td>
 <td><a href="../../wiki/StyleableWindow">StyleableWindow</a></td>
-<td><a href="../../wiki/SwitchPanel-Plus">SwitchPanel Plus</a></td>
-<td><a href="../../wiki/ToggleSwitch">ToggleSwitch</a></td>
+<td><a href="../../wiki/SwitchPanel-Plus">12 new SwitchPanels</a></td>
 </tr>
 <tr>
+<td><a href="../../wiki/ToggleSwitch">ToggleSwitch</a></td>
 <td><a href="../../wiki/TokenizedTextBox">TokenizedTextBox</a></td>
 <td><a href="../../wiki/Ultimate-ListBox">Ultimate ListBox</a></td>
-<td><a href="../../wiki/WatermarkPasswordBox">WatermarkPasswordBox</a></td>
 <td><a href="../../wiki/WindowControl-Plus">WindowControl Plus</a></td>
 </tr>
 <tr>
-<td><a href="">Windows 10 theme</a></td>
-<td><a href="">Metro theme</a></td>
-<td><a href="">Office theme</a></td>
-<td><a href="">1+ release ahead</a></td>
+<td><a href="../../wiki/Themes-Usage-Instructions">Windows 10 theme</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">2 Metro themes</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">3 Office themes</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">2+ releases ahead</a></td>
 </tr>
 </table>
 
@@ -142,17 +147,33 @@ This free and open source toolkit is provided under the [Microsoft Public Licens
 <table>
 <tr>
 <td><a href="../../wiki/Advanced-DataGrid">Advanced DataGrid</a></td>
-<td><a href="">3D Views for WPF</a></td>
-<td><a href="">More themes</a></td>
-<td><a href="">All base WPF controls themed</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">10 new DataGrid editors</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">3D Views for WPF</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">More themes</a></td>
+<td><a href="../../wiki/Xceed-Toolkit-Plus-for-WPF#feature-comparison">All base WPF controls themed</a></td>
 </tr>
 </table>
 
+## License Information
+
+Extended WPF Toolkit™ is provided under the Xceed Software, Inc. Community License.
+
+[<img src="https://user-images.githubusercontent.com/29377763/69274195-d9382200-0ba7-11ea-9ab7-bfce3126f35a.png"/>](license.md)
+
+More information can be found in the [License](license.md) page.
+
+A commercial license can be purchased at [Xceed](https://xceed.com).
+
 ## Release history
 
-* June 18, 2018, released v3.7.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [27 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus370)
+* **November 26, 2019 v3.7.0 released with [18 bug fixes and improvements](../../wiki/Improvements-in-v3.7.0).**
+* **September 27, 2019 v3.6.0 released with [36 bug fixes and improvements](../../wiki/Improvements-in-v3.6.0).**
+* **February 7, 2019 v3.5.0 released with [26 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0).**
+* January 30, 2019, released v3.8.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [45 bug fixes and improvements](../../wiki/Improvements-in-v3.5.0#Plus380).
+* **June 27, 2018 v3.4.0 released with [42 bug fixes and improvements](../../wiki/Improvements-in-v3.4.0).**
+* June 18, 2018, released v3.7.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [27 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0#Plus370).
 * **March 5, 2018, released v3.3.0 with [a major update to the DataGrid and 35 bug fixes and improvements](../../wiki/Improvements-in-v3.3.0).**
-* Jan. 15, 2018, released v3.6.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [1 new control and 40 bug fixes and improvements](../../wiki/Improvements-in-v3.2.0#Plus360)
+* Jan. 15, 2018, released v3.6.0 of the [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) released with [1 new control and 40 bug fixes and improvements](../../wiki/Improvements-in-v3.2.0#Plus360).
 * **September 25, 2017, released v3.2.0 with [1 new control and 24 bug fixes and improvements](../../wiki/Improvements-in-v3.2.0).**
 * September 12, 2017, released [Plus Edition](../../wiki/Xceed-Toolkit-Plus-for-WPF) v3.5.0 with [29 bug fixes and improvements](../../wiki/Improvements-in-v3.2.0#Plus350).
 * **July 11, 2017, released v3.1.0 with [37 bug fixes and improvements](../../wiki/Improvements-in-v3.1.0).**
diff --git a/license.md b/license.md
index d834f77f..00db3414 100644
--- a/license.md
+++ b/license.md
@@ -1,31 +1,75 @@
-# Microsoft Public License (Ms-PL)
+XCEED SOFTWARE, INC.
 
-This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
+COMMUNITY LICENSE AGREEMENT
+(for non-commercial use)
 
-## 1. Definitions
+This “Agreement” is a legal agreement between you, a software developer (“Licensee”) and Xceed Software, Inc. (“Xceed”). 
+You, the Licensee, wish to use Xceed’s product “Xceed Extended WPF Toolkit™” (the “Software”), an Xceed product, for use 
+in a non-commercial application or system or program. “Non-Commercial use” means not primarily intended for commercial 
+advantages or for monetary compensation or any other type of compensation. 
+Xceed agrees to license its products to developers like you as along as all terms & conditions set forth herein are
+respected. Xceed Software is provided under a license; it is not “sold” in any manner.
+By installing, copying or otherwise using the Software, you confirm your agreement to the terms and conditions expressed 
+in this Agreement. If you do not agree, you are not authorized to use our Software. If you are not a software developer, 
+you are not authorized to use our Software.
 
-The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
+GENERAL
 
-A "contribution" is the original software, or any additions or changes to the software.
+This license is perpetual (or until revoked by Xceed), provided that:
 
-A "contributor" is any person that distributes its contribution under this license.
+-All License Agreement terms & conditions are strictly followed by the Licensee;
 
-"Licensed patents" are a contributor's patent claims that read directly on its contribution.
+-Xceed Software is used for non-commercial purposes only (no re-selling, licensing or sub-licensing or any other rights 
+of use);
 
-## 2. Grant of Rights
+-Xceed’s name and logo must appear clearly in the resulting work with an Xceed Copyright notice; the name and notice 
+must be visible, not be hidden.
 
-(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
+Pursuant to these conditions, Xceed grants to Licensee a non-exclusive right to install and use the Software for 
+designing, building, testing and/or deploying an application or system or program for non-commercial purposes only, 
+without the need to acquire a subscription. Would Licensee need to use the Software in any commercial way or purpose, 
+Licensee must acquire a Commercial License (with a paid subscription).
 
-(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
+Licensee is not authorized to:
 
-## 3. Conditions and Limitations
+-sell or license/sub-license/lease the resulting work to anyone nor charge any amounts of money or exchange services 
+for the said resulting work;
 
-(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+-“deploy” the Software for/in a commercial environment;
 
-(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
+-create a competitive software product based on Xceed Software;
 
-(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
 
-(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
+SUPPORT
+
+Support is not included in Community Licenses. The Software is provided on an “as is” basis only. Licensee can send 
+requests to Xceed’s technical support team only if a commercial license has been obtained. Bugs may be corrected at 
+Xceed’s discretion. 
+
+WARRANTY 
+
+Xceed clearly states that this Community License includes no warranty of any type. Xceed products are provided 
+on an “as is” basis. In no case shall Xceed be responsible or liable for any direct or indirect, or consequential 
+damages whatsoever (including, without limitation, any damages for loss of revenues, of business profits, business 
+interruption, or loss of business information, or any other type of loss or damages) arising out of the use of the 
+Software even if Xceed may have been advised of such potential damages or loss.
+
+OTHER
+
+Xceed does not allow Community Licensees to publish results from benchmarks or performance comparison tests (with 
+other products) without advance permission by Xceed. Licensee is not authorized to use Xceed’s name, tradenames 
+and trademarks without Xceed’s written permission (other than the Copyright notice stated above in the “General” 
+section). 
+
+GOVERNING LAW
+
+This Agreement shall be governed by the laws of the Province of Quebec (Canada). Any claim, dispute or problem 
+arising out of this Agreement shall be deemed non-receivable or may be settled or disposed of at Xceed’s discretion. 
+Xceed reserves the right to settle any action before an arbitration board in Quebec as per generally accepted, 
+international rules of arbitration prevailing in Quebec.       
+
+Xceed reserves the right to modify this Agreement at all times without notice. 
+
+© Copyright: Xceed Software, Inc. - 2019. All rights reserved.
+
 
-(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.